diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d0c07bb86fa3d..b023c7de37cd7 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -15,7 +15,7 @@
 
     // Use 'postCreateCommand' to run commands after the container is created.
     "postCreateCommand": {
-        "Configure Build Tools": "sudo corepack enable npm; sudo npm install -g hereby; npm ci",
+        "Configure Build Tools": "sudo npm install -g hereby; npm ci",
         "Install pprof": "go install github.com/google/pprof@latest",
         "Install Graphviz": "sudo apt install graphviz"
     },
diff --git a/.github/workflows/accept-baselines-fix-lints.yaml b/.github/workflows/accept-baselines-fix-lints.yaml
index 4f3ee8ef0767b..6a6c5caadd7e1 100644
--- a/.github/workflows/accept-baselines-fix-lints.yaml
+++ b/.github/workflows/accept-baselines-fix-lints.yaml
@@ -17,10 +17,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 388db63970372..6b7552609cbaa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -121,9 +121,9 @@ jobs:
     name: Test Node ${{ matrix.config.node-version }} on ${{ matrix.config.os }}${{ (!matrix.config.bundle && ' with --no-bundle') || '' }}
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Use node version ${{ matrix.config.node-version }}
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: ${{ matrix.config.node-version }}
           check-latest: true
@@ -154,8 +154,8 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: npm ci
@@ -179,8 +179,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: npm ci
@@ -192,8 +192,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: npm ci
@@ -205,13 +205,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: npm ci
 
-      - uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+      - uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: ~/.cache/dprint
           key: ${{ runner.os }}-dprint-${{ hashFiles('package-lock.json', '.dprint.jsonc') }}
@@ -227,8 +227,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: npm ci
@@ -243,8 +243,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: npm ci
@@ -256,9 +256,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: |
@@ -297,16 +297,16 @@ jobs:
     if: github.event_name == 'pull_request'
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           path: pr
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           path: base
           ref: ${{ github.base_ref }}
 
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: |
@@ -344,8 +344,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: npm ci
@@ -360,8 +360,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: npm ci
@@ -381,8 +381,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: npm ci
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index d715312240f51..c659ebdfdde92 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -42,11 +42,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+        uses: github/codeql-action/init@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
         with:
           config-file: ./.github/codeql/codeql-configuration.yml
         # Override language selection by uncommenting this and choosing your languages
@@ -56,7 +56,7 @@ jobs:
       # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below).
       - name: Autobuild
-        uses: github/codeql-action/autobuild@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+        uses: github/codeql-action/autobuild@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -70,4 +70,4 @@ jobs:
       #     make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+        uses: github/codeql-action/analyze@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
index 5c8c2dd2485b2..3ba278f47a99a 100644
--- a/.github/workflows/copilot-setup-steps.yml
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -15,8 +15,8 @@ jobs:
     # You can define any steps you want, and they will run before the agent starts.
     # If you do not check out your code, Copilot will do this for you.
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
       - run: npm ci
       # pull dprint caches before network access is blocked
       - run: npx hereby check-format || true
diff --git a/.github/workflows/create-cherry-pick-pr.yml b/.github/workflows/create-cherry-pick-pr.yml
index 47c2be940481d..ecdd770e02776 100644
--- a/.github/workflows/create-cherry-pick-pr.yml
+++ b/.github/workflows/create-cherry-pick-pr.yml
@@ -47,7 +47,7 @@ jobs:
     if: github.repository == 'microsoft/TypeScript'
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           filter: blob:none # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
           fetch-depth: 0 # Default is 1; need to set to 0 to get the benefits of blob:none.
diff --git a/.github/workflows/insiders.yaml b/.github/workflows/insiders.yaml
index 9c27709dae89b..7d33556e1b7bb 100644
--- a/.github/workflows/insiders.yaml
+++ b/.github/workflows/insiders.yaml
@@ -20,8 +20,8 @@ jobs:
     if: github.repository == 'microsoft/TypeScript'
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: |
@@ -42,8 +42,8 @@ jobs:
     if: github.repository == 'microsoft/TypeScript'
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
           # Use NODE_AUTH_TOKEN environment variable to authenticate to this registry.
diff --git a/.github/workflows/lkg.yml b/.github/workflows/lkg.yml
index 3d1d1f50d27c8..5a3491d6c5e32 100644
--- a/.github/workflows/lkg.yml
+++ b/.github/workflows/lkg.yml
@@ -27,11 +27,11 @@ jobs:
             exit 1
           fi
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           ref: ${{ inputs.branch_name }}
           token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: |
diff --git a/.github/workflows/new-release-branch.yaml b/.github/workflows/new-release-branch.yaml
index 7d96198753384..558162756c196 100644
--- a/.github/workflows/new-release-branch.yaml
+++ b/.github/workflows/new-release-branch.yaml
@@ -50,12 +50,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           filter: blob:none # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
           fetch-depth: 0 # Default is 1; need to set to 0 to get the benefits of blob:none.
           token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: |
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index faa9f3d615a73..92c74366730a1 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -21,8 +21,8 @@ jobs:
     if: github.repository == 'microsoft/TypeScript'
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: |
@@ -42,8 +42,8 @@ jobs:
     if: github.repository == 'microsoft/TypeScript'
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
           # Use NODE_AUTH_TOKEN environment variable to authenticate to this registry.
diff --git a/.github/workflows/release-branch-artifact.yaml b/.github/workflows/release-branch-artifact.yaml
index 70ccb39435a83..27b1335bc3bb2 100644
--- a/.github/workflows/release-branch-artifact.yaml
+++ b/.github/workflows/release-branch-artifact.yaml
@@ -19,8 +19,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: |
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index b5c0239a9301d..b23eba9b2a4b5 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: 'Checkout code'
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
@@ -55,6 +55,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: 'Upload to code-scanning'
-        uses: github/codeql-action/upload-sarif@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+        uses: github/codeql-action/upload-sarif@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/set-version.yaml b/.github/workflows/set-version.yaml
index 77455eb3c7bd2..43729312642ff 100644
--- a/.github/workflows/set-version.yaml
+++ b/.github/workflows/set-version.yaml
@@ -49,11 +49,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           ref: ${{ inputs.branch_name }}
           token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: |
diff --git a/.github/workflows/sync-branch.yaml b/.github/workflows/sync-branch.yaml
index 62c27289ebc94..c37eae0a14eb1 100644
--- a/.github/workflows/sync-branch.yaml
+++ b/.github/workflows/sync-branch.yaml
@@ -42,10 +42,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           ref: ${{ inputs.branch_name }}
           filter: blob:none # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
diff --git a/.github/workflows/sync-wiki.yml b/.github/workflows/sync-wiki.yml
index 610f8170127e7..ebe024316b7ef 100644
--- a/.github/workflows/sync-wiki.yml
+++ b/.github/workflows/sync-wiki.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Get repo name
         run: R=${GITHUB_REPOSITORY%?wiki}; echo "BASENAME=${R##*/}" >> $GITHUB_ENV
       - name: Checkout ${{ env.BASENAME }}-wiki
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           repository: '${{ GITHUB.repository_owner }}/${{ env.BASENAME }}-wiki'
           token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
diff --git a/.github/workflows/twoslash-repros.yaml b/.github/workflows/twoslash-repros.yaml
index 414be032b6d80..1b5b140026d9a 100644
--- a/.github/workflows/twoslash-repros.yaml
+++ b/.github/workflows/twoslash-repros.yaml
@@ -51,13 +51,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - if: ${{ github.event.inputs.bisect }}
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           filter: blob:none # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
           fetch-depth: 0 # Default is 1; need to set to 0 to get the benefits of blob:none.
       - if: ${{ !github.event.inputs.bisect }}
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - uses: microsoft/TypeScript-Twoslash-Repro-Action@master
diff --git a/.github/workflows/update-package-lock.yaml b/.github/workflows/update-package-lock.yaml
index 7fa5d6ad6bf6f..4aaf3c451826d 100644
--- a/.github/workflows/update-package-lock.yaml
+++ b/.github/workflows/update-package-lock.yaml
@@ -22,10 +22,10 @@ jobs:
     if: github.repository == 'microsoft/TypeScript'
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - run: |
diff --git a/Herebyfile.mjs b/Herebyfile.mjs
index aca96dc28c911..9195f631914e8 100644
--- a/Herebyfile.mjs
+++ b/Herebyfile.mjs
@@ -677,7 +677,7 @@ export const watchLocal = task({
     dependencies: [localize, watchTsc, watchTsserver, watchServices, lssl, watchOtherOutputs, dts, watchSrc],
 });
 
-const runtestsDeps = [tests, generateLibs].concat(cmdLineOptions.typecheck ? [dts] : []);
+const runtestsDeps = [tests, generateLibs, generateTypesMap].concat(cmdLineOptions.typecheck ? [dts] : []);
 
 export const runTests = task({
     name: "runtests",
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index d0d53aea61c00..5d446f6799418 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3794,6 +3794,21 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 // are ESM, there cannot be a synthetic default.
                 return false;
             }
+            // For other files (not node16/nodenext with impliedNodeFormat), check if we can determine
+            // the module format from project references
+            if (!targetMode && file.isDeclarationFile) {
+                // Try to get the project reference - try both source file mapping and output file mapping
+                // since declaration files can be mapped either way depending on how they're resolved
+                const redirect = host.getRedirectFromSourceFile(file.path) || host.getRedirectFromOutput(file.path);
+                if (redirect) {
+                    // This is a declaration file from a project reference, so we can determine
+                    // its module format from the referenced project's options
+                    const targetModuleKind = host.getEmitModuleFormatOfFile(file);
+                    if (usageMode === ModuleKind.ESNext && ModuleKind.ES2015 <= targetModuleKind && targetModuleKind <= ModuleKind.ESNext) {
+                        return false;
+                    }
+                }
+            }
         }
         if (!allowSyntheticDefaultImports) {
             return false;
@@ -15332,6 +15347,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     undefined;
             }
             if (t.flags & TypeFlags.Index) {
+                if (isGenericMappedType((t as IndexType).type)) {
+                    const mappedType = (t as IndexType).type as MappedType;
+                    if (getNameTypeFromMappedType(mappedType) && !isMappedTypeWithKeyofConstraintDeclaration(mappedType)) {
+                        return getBaseConstraint(getIndexTypeForMappedType(mappedType, IndexFlags.None));
+                    }
+                }
                 return stringNumberSymbolType;
             }
             if (t.flags & TypeFlags.TemplateLiteral) {
@@ -18824,7 +18845,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         // a circular definition. For this reason, we only eagerly manifest the keys if the constraint is non-generic.
         if (isGenericIndexType(constraintType)) {
             if (isMappedTypeWithKeyofConstraintDeclaration(type)) {
-                // We have a generic index and a homomorphic mapping (but a distributive key remapping) - we need to defer
+                // We have a generic index and a homomorphic mapping and a key remapping - we need to defer
                 // the whole `keyof whatever` for later since it's not safe to resolve the shape of modifier type.
                 return getIndexTypeForGenericType(type, indexFlags);
             }
@@ -18854,25 +18875,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
     }
 
-    // Ordinarily we reduce a keyof M, where M is a mapped type { [P in K as N<P>]: X }, to simply N<K>. This however presumes
-    // that N distributes over union types, i.e. that N<A | B | C> is equivalent to N<A> | N<B> | N<C>. Specifically, we only
-    // want to perform the reduction when the name type of a mapped type is distributive with respect to the type variable
-    // introduced by the 'in' clause of the mapped type. Note that non-generic types are considered to be distributive because
-    // they're the same type regardless of what's being distributed over.
-    function hasDistributiveNameType(mappedType: MappedType) {
-        const typeVariable = getTypeParameterFromMappedType(mappedType);
-        return isDistributive(getNameTypeFromMappedType(mappedType) || typeVariable);
-        function isDistributive(type: Type): boolean {
-            return type.flags & (TypeFlags.AnyOrUnknown | TypeFlags.Primitive | TypeFlags.Never | TypeFlags.TypeParameter | TypeFlags.Object | TypeFlags.NonPrimitive) ? true :
-                type.flags & TypeFlags.Conditional ? (type as ConditionalType).root.isDistributive && (type as ConditionalType).checkType === typeVariable :
-                type.flags & (TypeFlags.UnionOrIntersection | TypeFlags.TemplateLiteral) ? every((type as UnionOrIntersectionType | TemplateLiteralType).types, isDistributive) :
-                type.flags & TypeFlags.IndexedAccess ? isDistributive((type as IndexedAccessType).objectType) && isDistributive((type as IndexedAccessType).indexType) :
-                type.flags & TypeFlags.Substitution ? isDistributive((type as SubstitutionType).baseType) && isDistributive((type as SubstitutionType).constraint) :
-                type.flags & TypeFlags.StringMapping ? isDistributive((type as StringMappingType).type) :
-                false;
-        }
-    }
-
     function getLiteralTypeFromPropertyName(name: PropertyName | JsxAttributeName) {
         if (isPrivateIdentifier(name)) {
             return neverType;
@@ -18924,7 +18926,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     function shouldDeferIndexType(type: Type, indexFlags = IndexFlags.None) {
         return !!(type.flags & TypeFlags.InstantiableNonPrimitive ||
             isGenericTupleType(type) ||
-            isGenericMappedType(type) && (!hasDistributiveNameType(type) || getMappedTypeNameTypeKind(type) === MappedTypeNameTypeKind.Remapping) ||
+            isGenericMappedType(type) && getNameTypeFromMappedType(type) ||
             type.flags & TypeFlags.Union && !(indexFlags & IndexFlags.NoReducibleCheck) && isGenericReducibleType(type) ||
             type.flags & TypeFlags.Intersection && maybeTypeOfKind(type, TypeFlags.Instantiable) && some((type as IntersectionType).types, isEmptyAnonymousObjectType));
     }
@@ -19445,6 +19447,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     function getSimplifiedType(type: Type, writing: boolean): Type {
         return type.flags & TypeFlags.IndexedAccess ? getSimplifiedIndexedAccessType(type as IndexedAccessType, writing) :
             type.flags & TypeFlags.Conditional ? getSimplifiedConditionalType(type as ConditionalType, writing) :
+            type.flags & TypeFlags.Index ? getSimplifiedIndexType(type as IndexType) :
             type;
     }
 
@@ -19544,6 +19547,13 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         return type;
     }
 
+    function getSimplifiedIndexType(type: IndexType) {
+        if (isGenericMappedType(type.type) && getNameTypeFromMappedType(type.type) && !isMappedTypeWithKeyofConstraintDeclaration(type.type)) {
+            return getIndexTypeForMappedType(type.type, IndexFlags.None);
+        }
+        return type;
+    }
+
     /**
      * Invokes union simplification logic to determine if an intersection is considered empty as a union constituent
      */
@@ -24881,7 +24891,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
     function discriminateTypeByDiscriminableItems(target: UnionType, discriminators: (readonly [() => Type, __String])[], related: (source: Type, target: Type) => boolean | Ternary) {
         const types = target.types;
-        const include: Ternary[] = types.map(t => t.flags & TypeFlags.Primitive ? Ternary.False : Ternary.True);
+        const include: Ternary[] = types.map(t => t.flags & TypeFlags.Primitive || getReducedType(t).flags & TypeFlags.Never ? Ternary.False : Ternary.True);
         for (const [getDiscriminatingType, propertyName] of discriminators) {
             // If the remaining target types include at least one with a matching discriminant, eliminate those that
             // have non-matching discriminants. This ensures that we ignore erroneous discriminators and gradually
@@ -31113,7 +31123,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         // We only look for uninitialized variables in strict null checking mode, and only when we can analyze
         // the entire control flow graph from the variable's declaration (i.e. when the flow container and
         // declaration container are the same).
-        const isNeverInitialized = immediateDeclaration && isVariableDeclaration(immediateDeclaration) && !immediateDeclaration.initializer && !immediateDeclaration.exclamationToken && isMutableLocalVariableDeclaration(immediateDeclaration) && !isSymbolAssignedDefinitely(symbol);
+        const isNeverInitialized = immediateDeclaration && isVariableDeclaration(immediateDeclaration) && !isForInOrOfStatement(immediateDeclaration.parent.parent) && !immediateDeclaration.initializer && !immediateDeclaration.exclamationToken && isMutableLocalVariableDeclaration(immediateDeclaration) && !isSymbolAssignedDefinitely(symbol);
         const assumeInitialized = isParameter || isAlias ||
             (isOuterVariable && !isNeverInitialized) ||
             isSpreadDestructuringAssignmentTarget || isModuleExports || isSameScopedBindingElement(node, declaration) ||
@@ -40548,12 +40558,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             }
         }
         checkNullishCoalesceOperandLeft(node);
-        checkNullishCoalesceOperandRight(node);
     }
 
     function checkNullishCoalesceOperandLeft(node: BinaryExpression) {
         const leftTarget = skipOuterExpressions(node.left, OuterExpressionKinds.All);
-
         const nullishSemantics = getSyntacticNullishnessSemantics(leftTarget);
         if (nullishSemantics !== PredicateSemantics.Sometimes) {
             if (nullishSemantics === PredicateSemantics.Always) {
@@ -40565,25 +40573,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
     }
 
-    function checkNullishCoalesceOperandRight(node: BinaryExpression) {
-        const rightTarget = skipOuterExpressions(node.right, OuterExpressionKinds.All);
-        const nullishSemantics = getSyntacticNullishnessSemantics(rightTarget);
-        if (isNotWithinNullishCoalesceExpression(node)) {
-            return;
-        }
-
-        if (nullishSemantics === PredicateSemantics.Always) {
-            error(rightTarget, Diagnostics.This_expression_is_always_nullish);
-        }
-        else if (nullishSemantics === PredicateSemantics.Never) {
-            error(rightTarget, Diagnostics.This_expression_is_never_nullish);
-        }
-    }
-
-    function isNotWithinNullishCoalesceExpression(node: BinaryExpression) {
-        return !isBinaryExpression(node.parent) || node.parent.operatorToken.kind !== SyntaxKind.QuestionQuestionToken;
-    }
-
     function getSyntacticNullishnessSemantics(node: Node): PredicateSemantics {
         node = skipOuterExpressions(node);
         switch (node.kind) {
@@ -40601,15 +40590,16 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 // List of operators that can produce null/undefined:
                 // = ??= ?? || ||= && &&=
                 switch ((node as BinaryExpression).operatorToken.kind) {
-                    case SyntaxKind.EqualsToken:
-                    case SyntaxKind.QuestionQuestionToken:
-                    case SyntaxKind.QuestionQuestionEqualsToken:
                     case SyntaxKind.BarBarToken:
                     case SyntaxKind.BarBarEqualsToken:
                     case SyntaxKind.AmpersandAmpersandToken:
                     case SyntaxKind.AmpersandAmpersandEqualsToken:
                         return PredicateSemantics.Sometimes;
+                    // For these operator kinds, the right operand is effectively controlling
                     case SyntaxKind.CommaToken:
+                    case SyntaxKind.EqualsToken:
+                    case SyntaxKind.QuestionQuestionToken:
+                    case SyntaxKind.QuestionQuestionEqualsToken:
                         return getSyntacticNullishnessSemantics((node as BinaryExpression).right);
                 }
                 return PredicateSemantics.Never;
@@ -42859,12 +42849,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         // Check if the index type is assignable to 'keyof T' for the object type.
         const objectType = (type as IndexedAccessType).objectType;
         const indexType = (type as IndexedAccessType).indexType;
-        // skip index type deferral on remapping mapped types
-        const objectIndexType = isGenericMappedType(objectType) && getMappedTypeNameTypeKind(objectType) === MappedTypeNameTypeKind.Remapping
-            ? getIndexTypeForMappedType(objectType, IndexFlags.None)
-            : getIndexType(objectType, IndexFlags.None);
         const hasNumberIndexInfo = !!getIndexInfoOfType(objectType, numberType);
-        if (everyType(indexType, t => isTypeAssignableTo(t, objectIndexType) || hasNumberIndexInfo && isApplicableIndexType(t, numberType))) {
+        if (everyType(indexType, t => isTypeAssignableTo(t, getIndexType(objectType, IndexFlags.None)) || hasNumberIndexInfo && isApplicableIndexType(t, numberType))) {
             if (
                 accessNode.kind === SyntaxKind.ElementAccessExpression && isAssignmentTarget(accessNode) &&
                 getObjectFlags(objectType) & ObjectFlags.Mapped && getMappedTypeModifiers(objectType as MappedType) & MappedTypeModifiers.IncludeReadonly
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 03f5f19a69877..1a69dba02a6c1 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -4480,6 +4480,10 @@
         "category": "Error",
         "code": 5010
     },
+    "The common source directory of '{0}' is '{1}'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.": {
+        "category": "Error",
+        "code": 5011
+    },
     "Cannot read file '{0}': {1}.": {
         "category": "Error",
         "code": 5012
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 000861e55dd44..9ba1afcae27ea 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -646,7 +646,7 @@ export function getCommonSourceDirectory(
         commonSourceDirectory = getNormalizedAbsolutePath(options.rootDir, currentDirectory);
         checkSourceFilesBelongToPath?.(options.rootDir);
     }
-    else if (options.composite && options.configFilePath) {
+    else if (options.configFilePath) {
         // Project compilations never infer their root from the input source paths
         commonSourceDirectory = getDirectoryPath(normalizeSlashes(options.configFilePath));
         checkSourceFilesBelongToPath?.(commonSourceDirectory);
@@ -664,6 +664,23 @@ export function getCommonSourceDirectory(
     return commonSourceDirectory;
 }
 
+/** @internal */
+export function getComputedCommonSourceDirectory(
+    emittedFiles: readonly string[],
+    currentDirectory: string,
+    getCanonicalFileName: GetCanonicalFileName,
+): string {
+    let commonSourceDirectory = computeCommonSourceDirectoryOfFilenames(emittedFiles, currentDirectory, getCanonicalFileName);
+
+    if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== directorySeparator) {
+        // Make sure directory path ends with directory separator so this string can directly
+        // used to replace with "" to get the relative path of the source file and the relative path doesn't
+        // start with / making it rooted path
+        commonSourceDirectory += directorySeparator;
+    }
+    return commonSourceDirectory;
+}
+
 /** @internal */
 export function getCommonSourceDirectoryOfConfig({ options, fileNames }: ParsedCommandLine, ignoreCase: boolean): string {
     return getCommonSourceDirectory(
diff --git a/src/compiler/executeCommandLine.ts b/src/compiler/executeCommandLine.ts
index 6b6fb23683ca2..0ed4cfd96a45f 100644
--- a/src/compiler/executeCommandLine.ts
+++ b/src/compiler/executeCommandLine.ts
@@ -157,7 +157,13 @@ function updateReportDiagnostic(
 }
 
 function defaultIsPretty(sys: System) {
-    return !!sys.writeOutputIsTTY && sys.writeOutputIsTTY() && !sys.getEnvironmentVariable("NO_COLOR");
+    if (sys.getEnvironmentVariable("NO_COLOR")) {
+        return false;
+    }
+    if (sys.getEnvironmentVariable("FORCE_COLOR")) {
+        return true;
+    }
+    return !!sys.writeOutputIsTTY && sys.writeOutputIsTTY();
 }
 
 function shouldBePretty(sys: System, options: CompilerOptions | BuildOptions) {
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index 2bf692f6298a6..d665072ae51b5 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -2889,7 +2889,7 @@ function getLoadModuleFromTargetExportOrImport(extensions: Extensions, state: Mo
                 const commonSourceDirGuesses: string[] = [];
                 // A `rootDir` compiler option strongly indicates the root location
                 // A `composite` project is using project references and has it's common src dir set to `.`, so it shouldn't need to check any other locations
-                if (state.compilerOptions.rootDir || (state.compilerOptions.composite && state.compilerOptions.configFilePath)) {
+                if (state.compilerOptions.rootDir || state.compilerOptions.configFilePath) {
                     const commonDir = toAbsolutePath(getCommonSourceDirectory(state.compilerOptions, () => [], state.host.getCurrentDirectory?.() || "", getCanonicalFileName));
                     commonSourceDirGuesses.push(commonDir);
                 }
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 323b887b20c2b..e56c0353cd3bc 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -109,6 +109,7 @@ import {
     GetCanonicalFileName,
     getCommonSourceDirectory as ts_getCommonSourceDirectory,
     getCommonSourceDirectoryOfConfig,
+    getComputedCommonSourceDirectory,
     getDeclarationDiagnostics as ts_getDeclarationDiagnostics,
     getDefaultLibFileName,
     getDirectoryPath,
@@ -132,6 +133,7 @@ import {
     getPackageScopeForPath,
     getPathFromPathComponents,
     getPositionOfLineAndCharacter,
+    getRelativePathFromFile,
     getResolvedModuleFromResolution,
     getResolvedTypeReferenceDirectiveFromResolution,
     getResolveJsonModule,
@@ -4254,6 +4256,35 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
             }
         }
 
+        if (
+            !options.noEmit &&
+            !options.composite &&
+            !options.rootDir &&
+            options.configFilePath &&
+            (options.outDir || // there is --outDir specified
+                (getEmitDeclarations(options) && options.declarationDir) || // there is --declarationDir specified
+                options.outFile)
+        ) {
+            // Check if rootDir inferred changed and issue diagnostic
+            const dir = getCommonSourceDirectory();
+            const emittedFiles = mapDefined(files, file => !file.isDeclarationFile && sourceFileMayBeEmitted(file, program) ? file.fileName : undefined);
+            const dir59 = getComputedCommonSourceDirectory(emittedFiles, currentDirectory, getCanonicalFileName);
+            if (dir59 !== "" && getCanonicalFileName(dir) !== getCanonicalFileName(dir59)) {
+                // change in layout
+                createDiagnosticForOption(
+                    /*onKey*/ true,
+                    options.outFile ? "outFile" : options.outDir ? "outDir" : "declarationDir",
+                    !options.outFile && options.outDir ? "declarationDir" : undefined,
+                    chainDiagnosticMessages(
+                        chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Visit_https_Colon_Slash_Slashaka_ms_Slashts6_for_migration_information),
+                        Diagnostics.The_common_source_directory_of_0_is_1_The_rootDir_setting_must_be_explicitly_set_to_this_or_another_path_to_adjust_your_output_s_file_layout,
+                        getBaseFileName(options.configFilePath),
+                        getRelativePathFromFile(options.configFilePath, dir59, getCanonicalFileName),
+                    ),
+                );
+            }
+        }
+
         if (options.checkJs && !getAllowJSCompilerOption(options)) {
             createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "checkJs", "allowJs");
         }
@@ -4484,7 +4515,7 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
                 createDeprecatedDiagnostic("charset");
             }
             if (options.out) {
-                createDeprecatedDiagnostic("out", /*value*/ undefined, "outFile");
+                createDeprecatedDiagnostic("out");
             }
             if (options.importsNotUsedAsValues) {
                 createDeprecatedDiagnostic("importsNotUsedAsValues", /*value*/ undefined, "verbatimModuleSyntax");
@@ -4510,6 +4541,9 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
             if (options.allowSyntheticDefaultImports === false) {
                 createDeprecatedDiagnostic("allowSyntheticDefaultImports", "false", /*useInstead*/ undefined, /*related*/ undefined);
             }
+            if (options.outFile) {
+                createDeprecatedDiagnostic("outFile");
+            }
             if (options.module === ModuleKind.None || options.module === ModuleKind.AMD || options.module === ModuleKind.UMD || options.module === ModuleKind.System) {
                 createDeprecatedDiagnostic("module", ModuleKind[options.module], /*useInstead*/ undefined, /*related*/ undefined);
             }
diff --git a/src/compiler/resolutionCache.ts b/src/compiler/resolutionCache.ts
index 7bced48353b82..6f1fc390723ad 100644
--- a/src/compiler/resolutionCache.ts
+++ b/src/compiler/resolutionCache.ts
@@ -199,6 +199,9 @@ export interface ResolutionCacheHost extends MinimalResolutionCacheHost {
     fileIsOpen(filePath: Path): boolean;
     onDiscoveredSymlink?(): void;
 
+    skipWatchingFailedLookups?(path: Path): boolean | undefined;
+    skipWatchingTypeRoots?(): boolean | undefined;
+
     // For incremental testing
     beforeResolveSingleModuleNameWithoutWatching?(
         moduleResolutionCache: ModuleResolutionCache,
@@ -895,7 +898,7 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD
                     resolutionHost.onDiscoveredSymlink();
                 }
                 resolutionsInFile.set(name, mode, resolution);
-                if (resolution !== existingResolution) {
+                if (resolution !== existingResolution && !resolutionHost.skipWatchingFailedLookups?.(path)) {
                     watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName, deferWatchingNonRelativeResolution);
                     if (existingResolution) {
                         stopWatchFailedLookupLocationOfResolution(existingResolution, path, getResolutionWithResolvedFileName);
@@ -947,7 +950,9 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD
             // Stop watching and remove the unused name
             resolutionsInFile.forEach((resolution, name, mode) => {
                 if (!seenNamesInFile.has(name, mode)) {
-                    stopWatchFailedLookupLocationOfResolution(resolution, path, getResolutionWithResolvedFileName);
+                    if (!resolutionHost.skipWatchingFailedLookups?.(path)) {
+                        stopWatchFailedLookupLocationOfResolution(resolution, path, getResolutionWithResolvedFileName);
+                    }
                     resolutionsInFile.delete(name, mode);
                 }
             });
@@ -1434,13 +1439,15 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD
         // Deleted file, stop watching failed lookups for all the resolutions in the file
         const resolutions = cache.get(filePath);
         if (resolutions) {
-            resolutions.forEach(resolution =>
-                stopWatchFailedLookupLocationOfResolution(
-                    resolution,
-                    filePath,
-                    getResolutionWithResolvedFileName,
-                )
-            );
+            if (!resolutionHost.skipWatchingFailedLookups?.(filePath)) {
+                resolutions.forEach(resolution =>
+                    stopWatchFailedLookupLocationOfResolution(
+                        resolution,
+                        filePath,
+                        getResolutionWithResolvedFileName,
+                    )
+                );
+            }
             cache.delete(filePath);
         }
     }
@@ -1667,6 +1674,12 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD
             return;
         }
 
+        // if this is inferred project with non watchable root or current directory that is lib location, skip watching type roots
+        if (!isRootWatchable || resolutionHost.skipWatchingTypeRoots?.()) {
+            closeTypeRootsWatch();
+            return;
+        }
+
         // we need to assume the directories exist to ensure that we can get all the type root directories that get included
         // But filter directories that are at root level to say directory doesnt exist, so that we arent watching them
         const typeRoots = getEffectiveTypeRoots(options, { getCurrentDirectory });
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index cc3da23d2067b..2219f2b1211a1 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -1055,6 +1055,10 @@ export function transformTypeScript(context: TransformationContext): Transformer
 
         if (parametersWithPropertyAssignments) {
             for (const parameter of parametersWithPropertyAssignments) {
+                // Ignore parameter properties with destructured names; we will have errored on them earlier.
+                if (!isIdentifier(parameter.name)) {
+                    continue;
+                }
                 const parameterProperty = factory.createPropertyDeclaration(
                     /*modifiers*/ undefined,
                     parameter.name,
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index ef01015982139..4e9f872720d79 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -6394,7 +6394,7 @@ export const enum TypeFlags {
     /** @internal */
     ObjectFlagsType = Any | Nullable | Never | Object | Union | Intersection,
     /** @internal */
-    Simplifiable = IndexedAccess | Conditional,
+    Simplifiable = IndexedAccess | Conditional | Index,
     /** @internal */
     Singleton = Any | Unknown | String | Number | Boolean | BigInt | ESSymbol | Void | Undefined | Null | Never | NonPrimitive,
     // 'Narrowable' types are types where narrowing actually narrows.
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index ba6b6d253a31c..9a78e2de7a949 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -6632,7 +6632,7 @@ export function sourceFileMayBeEmitted(sourceFile: SourceFile, host: SourceFileM
     // Json file is not emitted if outDir is not specified
     if (!options.outDir) return false;
     // Otherwise if rootDir or composite config file, we know common sourceDir and can check if file would be emitted in same location
-    if (options.rootDir || (options.composite && options.configFilePath)) {
+    if (options.rootDir || options.configFilePath) {
         const commonDir = getNormalizedAbsolutePath(getCommonSourceDirectory(options, () => [], host.getCurrentDirectory(), host.getCanonicalFileName), host.getCurrentDirectory());
         const outputPath = getSourceFilePathInNewDirWorker(sourceFile.fileName, options.outDir, host.getCurrentDirectory(), commonDir, host.getCanonicalFileName);
         if (comparePaths(sourceFile.fileName, outputPath, host.getCurrentDirectory(), !host.useCaseSensitiveFileNames()) === Comparison.EqualTo) return false;
diff --git a/src/harness/evaluatorImpl.ts b/src/harness/evaluatorImpl.ts
index 2e2124b64e068..7b434403eb15c 100644
--- a/src/harness/evaluatorImpl.ts
+++ b/src/harness/evaluatorImpl.ts
@@ -39,6 +39,7 @@ export function evaluateTypeScript(source: string | { files: vfs.FileSet; rootFi
     const compilerOptions: ts.CompilerOptions = {
         target: ts.ScriptTarget.ES5,
         module: ts.ModuleKind.CommonJS,
+        strict: false,
         lib: ["lib.esnext.d.ts", "lib.dom.d.ts"],
         ...options,
     };
diff --git a/src/harness/fourslashImpl.ts b/src/harness/fourslashImpl.ts
index 5b1c66546da88..dc6341ef018f7 100644
--- a/src/harness/fourslashImpl.ts
+++ b/src/harness/fourslashImpl.ts
@@ -9,10 +9,7 @@ import * as vpath from "./_namespaces/vpath.js";
 import { LoggerWithInMemoryLogs } from "./tsserverLogger.js";
 
 import ArrayOrSingle = FourSlashInterface.ArrayOrSingle;
-import {
-    harnessSessionLibLocation,
-    harnessTypingInstallerCacheLocation,
-} from "./harnessLanguageService.js";
+import { harnessTypingInstallerCacheLocation } from "./harnessLanguageService.js";
 import { ensureWatchablePath } from "./watchUtils.js";
 
 export const enum FourSlashTestType {
@@ -105,7 +102,7 @@ const enum MetadataOptionNames {
 const fileMetadataNames = [MetadataOptionNames.fileName, MetadataOptionNames.emitThisFile, MetadataOptionNames.resolveReference, MetadataOptionNames.symlink];
 
 function convertGlobalOptionsToCompilerOptions(globalOptions: Harness.TestCaseParser.CompilerSettings): ts.CompilerOptions {
-    const settings: ts.CompilerOptions = { target: ts.ScriptTarget.ES5, newLine: ts.NewLineKind.CarriageReturnLineFeed };
+    const settings: ts.CompilerOptions = { ...ts.getDefaultCompilerOptions(), jsx: undefined, newLine: ts.NewLineKind.CarriageReturnLineFeed };
     Harness.Compiler.setCompilerOptionsFromHarnessSetting(globalOptions, settings);
     return settings;
 }
@@ -367,11 +364,6 @@ export class TestState {
             }
         }
 
-        const libName = (name: string) =>
-            this.testType !== FourSlashTestType.Server ?
-                name :
-                `${harnessSessionLibLocation}/${name}`;
-
         let configParseResult: ts.ParsedCommandLine | undefined;
         if (configFileName) {
             const baseDir = ts.normalizePath(ts.getDirectoryPath(configFileName));
@@ -422,24 +414,6 @@ export class TestState {
                 const importedFilePath = this.basePath + "/" + importedFile.fileName;
                 this.addMatchedInputFile(importedFilePath, exts);
             });
-
-            this.languageServiceAdapterHost.addScript(
-                libName(Harness.Compiler.defaultLibFileName),
-                Harness.Compiler.getDefaultLibrarySourceFile()!.text,
-                /*isRootFile*/ false,
-            );
-
-            compilationOptions.lib?.forEach(fileName => {
-                const libFile = Harness.Compiler.getDefaultLibrarySourceFile(fileName);
-                ts.Debug.assertIsDefined(libFile, `Could not find lib file '${fileName}'`);
-                if (libFile) {
-                    this.languageServiceAdapterHost.addScript(
-                        libName(fileName),
-                        libFile.text,
-                        /*isRootFile*/ false,
-                    );
-                }
-            });
         }
         else {
             // resolveReference file-option is not specified then do not resolve any files and include all inputFiles
@@ -452,24 +426,6 @@ export class TestState {
                     this.languageServiceAdapterHost.addScript(fileName, file, isRootFile);
                 }
             });
-
-            if (!compilationOptions.noLib) {
-                const seen = new Set<string>();
-                const addSourceFile = (fileName: string) => {
-                    if (seen.has(fileName)) return;
-                    seen.add(fileName);
-                    const libFile = Harness.Compiler.getDefaultLibrarySourceFile(fileName);
-                    ts.Debug.assertIsDefined(libFile, `Could not find lib file '${fileName}'`);
-                    this.languageServiceAdapterHost.addScript(libName(fileName), libFile.text, /*isRootFile*/ false);
-                    if (!ts.some(libFile.libReferenceDirectives)) return;
-                    for (const directive of libFile.libReferenceDirectives) {
-                        addSourceFile(`lib.${directive.fileName}.d.ts`);
-                    }
-                };
-
-                addSourceFile(Harness.Compiler.defaultLibFileName);
-                compilationOptions.lib?.forEach(addSourceFile);
-            }
         }
 
         for (const file of testData.files) {
@@ -557,7 +513,13 @@ export class TestState {
     }
     private tryGetFileContent(fileName: string): string | undefined {
         const script = this.languageServiceAdapterHost.getScriptInfo(fileName);
-        return script && script.content;
+        if (script) return script.content;
+        try {
+            return this.languageServiceAdapterHost.vfs.readFileSync(fileName, "utf8");
+        }
+        catch {
+            return undefined;
+        }
     }
 
     // Entry points from fourslash.ts
@@ -4870,18 +4832,6 @@ function parseTestData(basePath: string, contents: string, fileName: string): Fo
         }
     }
 
-    // @Filename is the only directive that can be used in a test that contains tsconfig.json file.
-    const config = ts.find(files, isConfig);
-    if (config) {
-        let directive = getNonFileNameOptionInFileList(files);
-        if (!directive) {
-            directive = getNonFileNameOptionInObject(globalOptions);
-        }
-        if (directive) {
-            throw Error(`It is not allowed to use ${config.fileName} along with directive '${directive}'`);
-        }
-    }
-
     return {
         markerPositions,
         markers,
@@ -4896,24 +4846,6 @@ function isConfig(file: FourSlashFile): boolean {
     return Harness.getConfigNameFromFileName(file.fileName) !== undefined;
 }
 
-function getNonFileNameOptionInFileList(files: FourSlashFile[]): string | undefined {
-    return ts.forEach(files, f => getNonFileNameOptionInObject(f.fileOptions));
-}
-
-function getNonFileNameOptionInObject(optionObject: { [s: string]: string; }): string | undefined {
-    for (const option in optionObject) {
-        switch (option) {
-            case MetadataOptionNames.fileName:
-            case MetadataOptionNames.baselineFile:
-            case MetadataOptionNames.emitThisFile:
-                break;
-            default:
-                return option;
-        }
-    }
-    return undefined;
-}
-
 const enum State {
     none,
     inSlashStarMarker,
diff --git a/src/harness/harnessIO.ts b/src/harness/harnessIO.ts
index 62eb692058e67..a06bde1c95182 100644
--- a/src/harness/harnessIO.ts
+++ b/src/harness/harnessIO.ts
@@ -229,48 +229,6 @@ export namespace Compiler {
         return result;
     }
 
-    export const defaultLibFileName = "lib.d.ts";
-    export const es2015DefaultLibFileName = "lib.es2015.d.ts";
-
-    // Cache of lib files from "built/local"
-    export let libFileNameSourceFileMap: Map<string, { file: ts.SourceFile; stringified: string; }> | undefined;
-
-    export function getDefaultLibrarySourceFile(fileName: string = defaultLibFileName): ts.SourceFile | undefined {
-        if (!isDefaultLibraryFile(fileName)) {
-            return undefined;
-        }
-
-        if (!libFileNameSourceFileMap) {
-            const file = createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.es5.d.ts")!, /*languageVersion*/ ts.ScriptTarget.Latest);
-            libFileNameSourceFileMap = new Map(Object.entries({
-                [defaultLibFileName]: { file, stringified: JSON.stringify(file.text) },
-            }));
-        }
-
-        let sourceFile = libFileNameSourceFileMap.get(fileName);
-        if (!sourceFile) {
-            const file = createSourceFileAndAssertInvariants(fileName, IO.readFile(libFolder + fileName)!, ts.ScriptTarget.Latest);
-            sourceFile = { file, stringified: JSON.stringify(file.text) };
-            libFileNameSourceFileMap.set(fileName, sourceFile);
-        }
-        return sourceFile.file;
-    }
-
-    export function getDefaultLibFileName(options: ts.CompilerOptions): string {
-        switch (ts.getEmitScriptTarget(options)) {
-            case ts.ScriptTarget.ESNext:
-            case ts.ScriptTarget.ES2017:
-                return "lib.es2017.d.ts";
-            case ts.ScriptTarget.ES2016:
-                return "lib.es2016.d.ts";
-            case ts.ScriptTarget.ES2015:
-                return es2015DefaultLibFileName;
-
-            default:
-                return defaultLibFileName;
-        }
-    }
-
     // Cache these between executions so we don't have to re-parse them for every test
     export const fourslashFileName = "fourslash.ts";
     export let fourslashSourceFile: ts.SourceFile;
@@ -281,9 +239,7 @@ export namespace Compiler {
 
     interface HarnessOptions {
         useCaseSensitiveFileNames?: boolean;
-        includeBuiltFile?: string;
         baselineFile?: string;
-        libFiles?: string;
         noTypesAndSymbols?: boolean;
         captureSuggestions?: boolean;
     }
@@ -293,9 +249,7 @@ export namespace Compiler {
         { name: "allowNonTsExtensions", type: "boolean", defaultValueDescription: false },
         { name: "useCaseSensitiveFileNames", type: "boolean", defaultValueDescription: false },
         { name: "baselineFile", type: "string" },
-        { name: "includeBuiltFile", type: "string" },
         { name: "fileName", type: "string" },
-        { name: "libFiles", type: "string" },
         { name: "noErrorTruncation", type: "boolean", defaultValueDescription: false },
         { name: "suppressOutputPathCheck", type: "boolean", defaultValueDescription: false },
         { name: "noImplicitReferences", type: "boolean", defaultValueDescription: false },
@@ -412,23 +366,6 @@ export namespace Compiler {
             .map(file => options.configFile ? ts.getNormalizedAbsolutePath(file.unitName, currentDirectory) : file.unitName)
             .filter(fileName => !ts.fileExtensionIs(fileName, ts.Extension.Json));
 
-        // Files from built\local that are requested by test "@includeBuiltFiles" to be in the context.
-        // Treat them as library files, so include them in build, but not in baselines.
-        if (options.includeBuiltFile) {
-            programFileNames.push(vpath.combine(vfs.builtFolder, options.includeBuiltFile));
-        }
-
-        // Files from tests\lib that are requested by "@libFiles"
-        if (options.libFiles) {
-            for (const fileName of options.libFiles.split(",")) {
-                if (fileName === "lib.d.ts" && !options.noLib) {
-                    // Hack from Corsa.
-                    continue;
-                }
-                programFileNames.push(vpath.combine(vfs.testLibFolder, fileName));
-            }
-        }
-
         const docs = inputFiles.concat(otherFiles).map(documents.TextDocument.fromTestFile);
         const fs = vfs.createFromFileSystem(IO, !useCaseSensitiveFileNames, { documents: docs, cwd: currentDirectory });
         if (symlinks) {
@@ -1062,7 +999,7 @@ export namespace Compiler {
 
     function fileOutput(file: documents.TextDocument, harnessSettings: TestCaseParser.CompilerSettings): string {
         const fileName = harnessSettings.fullEmitPaths ? Utils.removeTestPathPrefixes(file.file) : ts.getBaseFileName(file.file);
-        return "//// [" + fileName + "]\r\n" + Utils.removeTestPathPrefixes(file.text);
+        return "//// [" + fileName + "]\r\n" + file.text;
     }
 
     export function collateOutputs(outputFiles: readonly documents.TextDocument[]): string {
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
index 7aff47310a4b6..1703d466619aa 100644
--- a/src/harness/harnessLanguageService.ts
+++ b/src/harness/harnessLanguageService.ts
@@ -1,7 +1,7 @@
 import * as collections from "./_namespaces/collections.js";
 import * as fakes from "./_namespaces/fakes.js";
 import {
-    Compiler,
+    IO,
     mockHash,
     virtualFileSystemRoot,
 } from "./_namespaces/Harness.js";
@@ -128,13 +128,122 @@ export interface LanguageServiceAdapter {
     getLogger(): LoggerWithInMemoryLogs | undefined;
 }
 
+/** Create VFS with libs only at fourslashLibFolder */
+function createLanguageServiceVfs(): vfs.FileSystem {
+    return vfs.createFourslashVfs(IO, /*ignoreCase*/ true, { cwd: virtualFileSystemRoot });
+}
+
+// Cache lib file SourceFiles directly to avoid reparsing across tests.
+// Lib .d.ts files parse identically regardless of compiler settings, so we cache
+// just one copy per path. This persists for the entire test run.
+const libSourceFileCache = new Map<string, ts.SourceFile>();
+
+function createLibCachingDocumentRegistry(): ts.DocumentRegistry {
+    const localRegistry = ts.createDocumentRegistry(/*useCaseSensitiveFileNames*/ false, virtualFileSystemRoot);
+
+    function isLibFile(fileName: string): boolean {
+        return vpath.beneath(vfs.fourslashLibFolder, fileName);
+    }
+
+    return {
+        acquireDocument(fileName, compilationSettingsOrHost, scriptSnapshot, version, scriptKind, sourceFileOptions) {
+            if (isLibFile(fileName)) {
+                const cached = libSourceFileCache.get(fileName);
+                if (cached) {
+                    return cached;
+                }
+                // Not cached - acquire from local registry to parse it, then cache
+                const sourceFile = localRegistry.acquireDocument(fileName, compilationSettingsOrHost, scriptSnapshot, version, scriptKind, sourceFileOptions);
+                libSourceFileCache.set(fileName, sourceFile);
+                // Release from local registry immediately - we don't need ref counting for cached libs
+                const settings = typeof (compilationSettingsOrHost as ts.MinimalResolutionCacheHost).getCompilationSettings === "function"
+                    ? (compilationSettingsOrHost as ts.MinimalResolutionCacheHost).getCompilationSettings()
+                    : compilationSettingsOrHost as ts.CompilerOptions;
+                localRegistry.releaseDocument(fileName, settings, scriptKind!, typeof sourceFileOptions === "object" ? sourceFileOptions.impliedNodeFormat : undefined);
+                return sourceFile;
+            }
+            return localRegistry.acquireDocument(fileName, compilationSettingsOrHost, scriptSnapshot, version, scriptKind, sourceFileOptions);
+        },
+        acquireDocumentWithKey(fileName, path, compilationSettingsOrHost, key, scriptSnapshot, version, scriptKind, sourceFileOptions) {
+            if (isLibFile(fileName)) {
+                const cached = libSourceFileCache.get(fileName);
+                if (cached) {
+                    return cached;
+                }
+                // Not cached - acquire from local registry to parse it, then cache
+                const sourceFile = localRegistry.acquireDocumentWithKey(fileName, path, compilationSettingsOrHost, key, scriptSnapshot, version, scriptKind, sourceFileOptions);
+                libSourceFileCache.set(fileName, sourceFile);
+                // Release from local registry immediately
+                const impliedNodeFormat = typeof sourceFileOptions === "object" ? sourceFileOptions.impliedNodeFormat : undefined;
+                localRegistry.releaseDocumentWithKey(path, key, scriptKind!, impliedNodeFormat);
+                return sourceFile;
+            }
+            return localRegistry.acquireDocumentWithKey(fileName, path, compilationSettingsOrHost, key, scriptSnapshot, version, scriptKind, sourceFileOptions);
+        },
+        updateDocument(fileName, compilationSettingsOrHost, scriptSnapshot, version, scriptKind, sourceFileOptions) {
+            if (isLibFile(fileName)) {
+                // Lib files should never be updated - just return the cached version
+                const cached = libSourceFileCache.get(fileName);
+                if (cached) {
+                    return cached;
+                }
+                // Fall through to acquire if somehow not cached
+                return this.acquireDocument(fileName, compilationSettingsOrHost, scriptSnapshot, version, scriptKind, sourceFileOptions);
+            }
+            return localRegistry.updateDocument(fileName, compilationSettingsOrHost, scriptSnapshot, version, scriptKind, sourceFileOptions);
+        },
+        updateDocumentWithKey(fileName, path, compilationSettingsOrHost, key, scriptSnapshot, version, scriptKind, sourceFileOptions) {
+            if (isLibFile(fileName)) {
+                // Lib files should never be updated - just return the cached version
+                const cached = libSourceFileCache.get(fileName);
+                if (cached) {
+                    return cached;
+                }
+                // Fall through to acquire if somehow not cached
+                return this.acquireDocumentWithKey(fileName, path, compilationSettingsOrHost, key, scriptSnapshot, version, scriptKind, sourceFileOptions);
+            }
+            return localRegistry.updateDocumentWithKey(fileName, path, compilationSettingsOrHost, key, scriptSnapshot, version, scriptKind, sourceFileOptions);
+        },
+        getKeyForCompilationSettings(settings) {
+            return localRegistry.getKeyForCompilationSettings(settings);
+        },
+        getDocumentRegistryBucketKeyWithMode(key, mode) {
+            return localRegistry.getDocumentRegistryBucketKeyWithMode(key, mode);
+        },
+        releaseDocument(fileName: string, compilationSettings: ts.CompilerOptions, scriptKind?: ts.ScriptKind, impliedNodeFormat?: ts.ResolutionMode) {
+            if (isLibFile(fileName)) {
+                // Lib files are cached separately - no ref counting needed, so no-op
+                return;
+            }
+            return localRegistry.releaseDocument(fileName, compilationSettings, scriptKind!, impliedNodeFormat);
+        },
+        releaseDocumentWithKey(path: ts.Path, key: ts.DocumentRegistryBucketKey, scriptKind?: ts.ScriptKind, impliedNodeFormat?: ts.ResolutionMode) {
+            // We can't easily tell if this is a lib file from just the path without the fileName,
+            // so try to release from local registry and ignore errors
+            try {
+                localRegistry.releaseDocumentWithKey(path, key, scriptKind!, impliedNodeFormat);
+            }
+            catch {
+                // Ignore - might be a lib file that was never in the local registry
+            }
+        },
+        reportStats() {
+            return `Lib cache: ${libSourceFileCache.size} files\nLocal registry: ${localRegistry.reportStats()}`;
+        },
+        getBuckets() {
+            return localRegistry.getBuckets();
+        },
+    };
+}
+
 export abstract class LanguageServiceAdapterHost {
-    public readonly sys: fakes.System = new fakes.System(new vfs.FileSystem(/*ignoreCase*/ true, { cwd: virtualFileSystemRoot }));
+    public readonly sys: fakes.System;
     public typesRegistry: Map<string, void> | undefined;
     private scriptInfos: collections.SortedMap<string, ScriptInfo>;
     public jsDocParsingMode: ts.JSDocParsingMode | undefined;
 
     constructor(protected cancellationToken: DefaultHostCancellationToken = DefaultHostCancellationToken.instance, protected settings: ts.CompilerOptions = ts.getDefaultCompilerOptions()) {
+        this.sys = new fakes.System(createLanguageServiceVfs());
         this.scriptInfos = new collections.SortedMap({ comparer: this.vfs.stringComparer, sort: "insertion" });
     }
 
@@ -280,7 +389,7 @@ class NativeLanguageServiceHost extends LanguageServiceAdapterHost implements ts
     }
 
     getDefaultLibFileName(): string {
-        return Compiler.defaultLibFileName;
+        return vpath.combine(vfs.fourslashLibFolder, ts.getDefaultLibFileName(this.settings));
     }
 
     getScriptFileNames(): string[] {
@@ -289,7 +398,10 @@ class NativeLanguageServiceHost extends LanguageServiceAdapterHost implements ts
 
     getScriptSnapshot(fileName: string): ts.IScriptSnapshot | undefined {
         const script = this.getScriptInfo(fileName);
-        return script ? new ScriptSnapshot(script) : undefined;
+        if (script) return new ScriptSnapshot(script);
+        // Fall back to reading from VFS for files not in scriptInfos (e.g., lib files)
+        const content = this.readFile(fileName);
+        return content !== undefined ? ts.ScriptSnapshot.fromString(content) : undefined;
     }
 
     getScriptKind(): ts.ScriptKind {
@@ -332,15 +444,17 @@ class NativeLanguageServiceHost extends LanguageServiceAdapterHost implements ts
 
 export class NativeLanguageServiceAdapter implements LanguageServiceAdapter {
     private host: NativeLanguageServiceHost;
+    private documentRegistry: ts.DocumentRegistry;
     getLogger: typeof ts.returnUndefined = ts.returnUndefined;
     constructor(cancellationToken?: ts.HostCancellationToken, options?: ts.CompilerOptions) {
         this.host = new NativeLanguageServiceHost(cancellationToken, options);
+        this.documentRegistry = createLibCachingDocumentRegistry();
     }
     getHost(): LanguageServiceAdapterHost {
         return this.host;
     }
     getLanguageService(): ts.LanguageService {
-        return ts.createLanguageService(this.host);
+        return ts.createLanguageService(this.host, this.documentRegistry);
     }
     getClassifier(): ts.Classifier {
         return ts.createClassifier();
@@ -394,8 +508,6 @@ interface ServerHostDirectoryWatcher {
     cb: ts.DirectoryWatcherCallback;
 }
 
-/** Default typescript and lib installs location for tests */
-export const harnessSessionLibLocation = "/home/src/tslibs/TS/Lib";
 class SessionServerHost implements ts.server.ServerHost {
     args: string[] = [];
     newLine: string;
@@ -420,7 +532,9 @@ class SessionServerHost implements ts.server.ServerHost {
     readFile(fileName: string): string | undefined {
         // System FS would follow symlinks, even though snapshots are stored by original file name
         const snapshot = this.host.getScriptSnapshot(fileName) || this.host.getScriptSnapshot(this.realpath(fileName));
-        return snapshot && ts.getSnapshotText(snapshot);
+        if (snapshot) return ts.getSnapshotText(snapshot);
+        // Fall back to reading from VFS for files not in scriptInfos (e.g., lib files)
+        return this.host.readFile(fileName);
     }
 
     realpath(path: string) {
@@ -443,7 +557,7 @@ class SessionServerHost implements ts.server.ServerHost {
     }
 
     getExecutingFilePath(): string {
-        return harnessSessionLibLocation + "/tsc.js";
+        return vfs.fourslashLibFolder + "/tsc.js";
     }
 
     exit = ts.noop;
@@ -671,6 +785,11 @@ export class ServerLanguageServiceAdapter implements LanguageServiceAdapter {
         // or edited.
         clientHost.setClient(client);
 
+        // Apply test options (e.g. @lib) to inferred projects
+        if (options) {
+            client.setCompilerOptionsForInferredProjects(ts.optionMapToObject(ts.serializeCompilerOptions(options)) as ts.server.protocol.CompilerOptions);
+        }
+
         // Set the properties
         this.client = client;
         this.host = clientHost;
diff --git a/src/harness/harnessUtils.ts b/src/harness/harnessUtils.ts
index b0b0edd8af868..f768325897167 100644
--- a/src/harness/harnessUtils.ts
+++ b/src/harness/harnessUtils.ts
@@ -15,19 +15,15 @@ export function evalFile(fileContents: string, fileName: string, nodeContext?: a
     }
 }
 
-/** Splits the given string on \r\n, or on only \n if that fails, or on only \r if *that* fails. */
+const newlineRegex = /\r?\n/;
+
+/**
+ * Splits the given string on the two reasonable line terminators (\r\n or \n).
+ * Does NOT split on `\r` alone, \u2028, or \u2029.
+ */
 export function splitContentByNewlines(content: string): string[] {
     // Split up the input file by line
-    // Note: IE JS engine incorrectly handles consecutive delimiters here when using RegExp split, so
-    // we have to use string-based splitting instead and try to figure out the delimiting chars
-    let lines = content.split("\r\n");
-    if (lines.length === 1) {
-        lines = content.split("\n");
-
-        if (lines.length === 1) {
-            lines = content.split("\r");
-        }
-    }
+    const lines = content.split(newlineRegex);
     return lines;
 }
 
diff --git a/src/harness/incrementalUtils.ts b/src/harness/incrementalUtils.ts
index 47114c88d5151..d7459f1ba489f 100644
--- a/src/harness/incrementalUtils.ts
+++ b/src/harness/incrementalUtils.ts
@@ -107,6 +107,7 @@ interface ResolutionInfo {
     fileName: string;
     name: string;
     mode: ts.ResolutionMode;
+    watched: boolean;
 }
 
 function getResolutionCacheDetails<File, T extends ts.ResolutionWithFailedLookupLocations>(
@@ -254,8 +255,8 @@ export function verifyResolutionCache(
     // Verify ref count
     resolutionToRefs.forEach((info, resolution) => {
         ts.Debug.assert(
-            resolution.files?.size === info.length,
-            `${projectName}:: Expected Resolution ref count ${info.length} but got ${resolution.files?.size}`,
+            (resolution.files?.size ?? 0) === info.filter(i => i.watched).length,
+            `${projectName}:: Expected Resolution ref count ${info.filter(i => i.watched).length} but got ${resolution.files?.size}`,
             () =>
                 `Expected from:: ${JSON.stringify(info, undefined, " ")}` +
                 `Actual from: ${resolution.files?.size}`,
@@ -317,12 +318,13 @@ export function verifyResolutionCache(
     ): ExpectedResolution {
         const existing = resolutionToRefs.get(resolved);
         let expectedResolution: ExpectedResolution;
+        const watched = !resolutionHostCacheHost.skipWatchingFailedLookups?.(fileName);
         if (existing) {
-            existing.push({ cacheType, fileName, name, mode });
+            existing.push({ cacheType, fileName, name, mode, watched });
             expectedResolution = resolutionToExpected.get(resolved)!;
         }
         else {
-            resolutionToRefs.set(resolved, [{ cacheType, fileName, name, mode }]);
+            resolutionToRefs.set(resolved, [{ cacheType, fileName, name, mode, watched }]);
             expectedResolution = {
                 resolvedModule: (resolved as any).resolvedModule,
                 resolvedTypeReferenceDirective: (resolved as any).resolvedTypeReferenceDirective,
@@ -333,7 +335,9 @@ export function verifyResolutionCache(
             expectedToResolution.set(expectedResolution, resolved);
             resolutionToExpected.set(resolved, expectedResolution);
         }
-        expected.watchFailedLookupLocationsOfExternalModuleResolutions(name, expectedResolution, fileName, () => ({ resolvedFileName }), deferWatchingNonRelativeResolution);
+        if (watched) {
+            expected.watchFailedLookupLocationsOfExternalModuleResolutions(name, expectedResolution, fileName, () => ({ resolvedFileName }), deferWatchingNonRelativeResolution);
+        }
         return expectedResolution;
     }
 
@@ -527,6 +531,8 @@ function verifyProgram(service: ts.server.ProjectService, project: ts.server.Pro
         getGlobalTypingsCacheLocation: project.getGlobalTypingsCacheLocation.bind(project),
         globalCacheResolutionModuleName: project.globalCacheResolutionModuleName.bind(project),
         fileIsOpen: project.fileIsOpen.bind(project),
+        skipWatchingFailedLookups: project.skipWatchingFailedLookups.bind(project),
+        skipWatchingTypeRoots: project.skipWatchingTypeRoots.bind(project),
         getCurrentProgram: () => project.getCurrentProgram(),
 
         preferNonRecursiveWatch: project.preferNonRecursiveWatch,
diff --git a/src/harness/tsserverLogger.ts b/src/harness/tsserverLogger.ts
index 85d81ebfb217b..8f260b5304a43 100644
--- a/src/harness/tsserverLogger.ts
+++ b/src/harness/tsserverLogger.ts
@@ -1,5 +1,8 @@
 import * as ts from "./_namespaces/ts.js";
-import { Compiler } from "./harnessIO.js";
+import {
+    IO,
+    libFolder,
+} from "./harnessIO.js";
 
 export const HarnessLSCouldNotResolveModule = "HarnessLanguageService:: Could not resolve module";
 
@@ -142,11 +145,25 @@ function sanitizeHarnessLSException(s: string) {
     return s;
 }
 
+const libFileTextReplacements = ts.memoize(() => {
+    const replacements: { text: string; jsonText: string; replacement: string; }[] = [];
+    // Read all lib files from built/local
+    const libFiles = IO.listFiles(libFolder, /^lib.*\.d\.ts$/);
+    for (const libPath of libFiles) {
+        const content = IO.readFile(libPath);
+        if (content) {
+            const fileName = ts.getBaseFileName(libPath);
+            replacements.push({ text: content, jsonText: JSON.stringify(content), replacement: `${fileName}-Text` });
+        }
+    }
+    return replacements;
+});
+
 export function sanitizeLibFileText(s: string): string {
-    Compiler.libFileNameSourceFileMap?.forEach((lib, fileName) => {
-        s = replaceAll(s, lib.stringified, `${fileName}-Text`);
-        s = replaceAll(s, lib.file.text, `${fileName}-Text`);
-    });
+    for (const { text, jsonText, replacement } of libFileTextReplacements()) {
+        s = replaceAll(s, jsonText, replacement);
+        s = replaceAll(s, text, replacement);
+    }
     return s;
 }
 
diff --git a/src/harness/vfsUtil.ts b/src/harness/vfsUtil.ts
index 596575beece2c..b217fb57bba95 100644
--- a/src/harness/vfsUtil.ts
+++ b/src/harness/vfsUtil.ts
@@ -9,6 +9,11 @@ import * as vpath from "./_namespaces/vpath.js";
  */
 export const builtFolder = "/.ts";
 
+/**
+ * Posix-style path to libs for fourslash server tests (mounted to same location as builtFolder)
+ */
+export const fourslashLibFolder = "/home/src/tslibs/TS/Lib";
+
 /**
  * Posix-style path to additional mountable folders (./tests/projects in this repo)
  */
@@ -1583,6 +1588,73 @@ function getBuiltLocal(host: FileSystemResolverHost, ignoreCase: boolean): FileS
     return builtLocalCS;
 }
 
+let fourslashLibsOnlyHost: FileSystemResolverHost | undefined;
+let fourslashLibsOnlyCI: FileSystem | undefined;
+let fourslashLibsOnlyCS: FileSystem | undefined;
+
+function getFourslashLibsOnly(host: FileSystemResolverHost, ignoreCase: boolean): FileSystem {
+    if (fourslashLibsOnlyHost !== host) {
+        fourslashLibsOnlyCI = undefined;
+        fourslashLibsOnlyCS = undefined;
+        fourslashLibsOnlyHost = host;
+    }
+    if (!fourslashLibsOnlyCI) {
+        const resolver = createResolver(host);
+        fourslashLibsOnlyCI = new FileSystem(/*ignoreCase*/ true, {
+            files: {
+                [fourslashLibFolder]: new Mount(vpath.resolve(host.getWorkspaceRoot(), "built/local"), resolver),
+            },
+            cwd: "/",
+            meta: { defaultLibLocation: fourslashLibFolder },
+        });
+        fourslashLibsOnlyCI.makeReadonly();
+    }
+    if (ignoreCase) return fourslashLibsOnlyCI;
+    if (!fourslashLibsOnlyCS) {
+        fourslashLibsOnlyCS = fourslashLibsOnlyCI.shadow(/*ignoreCase*/ false);
+        fourslashLibsOnlyCS.makeReadonly();
+    }
+    return fourslashLibsOnlyCS;
+}
+
+/**
+ * Creates a VFS with only libs mounted at fourslashLibFolder, suitable for fourslash tests.
+ */
+export function createFourslashVfs(host: FileSystemResolverHost, ignoreCase: boolean, { documents, files, cwd, time, meta }: FileSystemCreateOptions = {}): FileSystem {
+    const fs = getFourslashLibsOnly(host, ignoreCase).shadow();
+    if (meta) {
+        for (const key of Object.keys(meta)) {
+            fs.meta.set(key, meta[key]);
+        }
+    }
+    if (time) {
+        fs.time(time);
+    }
+    if (cwd) {
+        fs.mkdirpSync(cwd);
+        fs.chdir(cwd);
+    }
+    if (documents) {
+        for (const document of documents) {
+            fs.mkdirpSync(vpath.dirname(document.file));
+            fs.writeFileSync(document.file, document.text, "utf8");
+            fs.filemeta(document.file).set("document", document);
+            // Add symlinks
+            const symlink = document.meta.get("symlink");
+            if (symlink) {
+                for (const link of symlink.split(",").map(link => link.trim())) {
+                    fs.mkdirpSync(vpath.dirname(link));
+                    fs.symlinkSync(vpath.resolve(fs.cwd(), document.file), link);
+                }
+            }
+        }
+    }
+    if (files) {
+        fs.apply(files);
+    }
+    return fs;
+}
+
 /* eslint-disable no-restricted-syntax */
 function normalizeFileSetEntry(value: FileSet[string]) {
     if (
diff --git a/src/lib/es2015.core.d.ts b/src/lib/es2015.core.d.ts
index d3b487d7a52c1..93b103bd8b83e 100644
--- a/src/lib/es2015.core.d.ts
+++ b/src/lib/es2015.core.d.ts
@@ -173,7 +173,7 @@ interface Math {
     hypot(...values: number[]): number;
 
     /**
-     * Returns the integral part of the a numeric expression, x, removing any fractional digits.
+     * Returns the integral part of the numeric expression x, removing any fractional digits.
      * If x is already an integer, the result is x.
      * @param x A numeric expression.
      */
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 23f8d844c9856..aa578c7ed0815 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -80,6 +80,7 @@ import {
     JSDocParsingMode,
     LanguageServiceMode,
     length,
+    libMap,
     map,
     mapDefinedIterator,
     matchesExcludeWorker,
@@ -464,6 +465,10 @@ export function convertCompilerOptions(protocolOptions: protocol.ExternalProject
             protocolOptions[id] = mappedValues.get(propertyValue.toLowerCase());
         }
     });
+    // Convert lib short names (e.g. "es6") to full filenames (e.g. "lib.es6.d.ts")
+    if (isArray(protocolOptions.lib)) {
+        protocolOptions.lib = protocolOptions.lib.map(libName => libMap.get(libName) ?? libName);
+    }
     return protocolOptions as any;
 }
 
diff --git a/src/server/project.ts b/src/server/project.ts
index 2786ad033a3af..88fa23c1bc263 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -1530,6 +1530,15 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
 
     /** @internal */
     watchTypingLocations(files: readonly string[] | undefined): void {
+        // Skip watching typing locations for inferred project whose currentDirectory is not watchable or
+        // is same as server's current directory
+        if (
+            this.currentDirectory === this.projectService.currentDirectory ||
+            !canWatchDirectoryOrFilePath(this.toPath(this.currentDirectory))
+        ) {
+            return;
+        }
+
         if (!files) {
             this.typingWatchers!.isInvoked = false;
             return;
@@ -1626,6 +1635,18 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
         });
     }
 
+    /** @internal */
+    skipWatchingFailedLookups(path: Path): boolean | undefined {
+        const info = this.projectService.getScriptInfoForPath(path);
+        return info?.isDynamic;
+    }
+
+    /** @internal */
+    skipWatchingTypeRoots(): boolean | undefined {
+        // Skip watching inferrd project where current directory is lib location
+        return isInferredProject(this) && this.currentDirectory === this.projectService.currentDirectory;
+    }
+
     /** @internal */
     getCurrentProgram(): Program | undefined {
         return this.program;
diff --git a/src/testRunner/unittests/helpers/contents.ts b/src/testRunner/unittests/helpers/contents.ts
index 780ca4b1d81ee..ddfd14d5695a4 100644
--- a/src/testRunner/unittests/helpers/contents.ts
+++ b/src/testRunner/unittests/helpers/contents.ts
@@ -1,13 +1,11 @@
-import {
-    harnessSessionLibLocation,
-    harnessTypingInstallerCacheLocation,
-} from "../../../harness/harnessLanguageService.js";
+import * as vfs from "../../../harness/_namespaces/vfs.js";
+import { harnessTypingInstallerCacheLocation } from "../../../harness/harnessLanguageService.js";
 import * as ts from "../../_namespaces/ts.js";
 
 /** Default typescript and lib installs location for tests */
 export const tscTypeScriptTestLocation: string = getPathForTypeScriptTestLocation("tsc.js");
 export function getPathForTypeScriptTestLocation(fileName: string): string {
-    return ts.combinePaths(harnessSessionLibLocation, fileName);
+    return ts.combinePaths(vfs.fourslashLibFolder, fileName);
 }
 
 export function getTypeScriptLibTestLocation(libName: string): string {
diff --git a/src/testRunner/unittests/helpers/monorepoSymlinkedSiblingPackages.ts b/src/testRunner/unittests/helpers/monorepoSymlinkedSiblingPackages.ts
index 2f0139f2595d3..7084298e1a72a 100644
--- a/src/testRunner/unittests/helpers/monorepoSymlinkedSiblingPackages.ts
+++ b/src/testRunner/unittests/helpers/monorepoSymlinkedSiblingPackages.ts
@@ -151,6 +151,7 @@ function getMonorepoSymlinkedSiblingPackagesSysWithUnRelatedFolders(
             compilerOptions: {
                 outDir: "lib",
                 declaration: true,
+                rootDir: "src",
             },
             include: ["src/**/*.ts"],
         }),
@@ -169,6 +170,7 @@ function getMonorepoSymlinkedSiblingPackagesSysWithUnRelatedFolders(
             compilerOptions: {
                 outDir: "lib",
                 declaration: true,
+                rootDir: "src",
             },
             include: ["src/**/*.ts"],
         }),
@@ -183,6 +185,7 @@ function getMonorepoSymlinkedSiblingPackagesSysWithUnRelatedFolders(
         "/home/src/projects/b/2/b-impl/b/tsconfig.json": jsonToReadableText({
             compilerOptions: {
                 outDir: "lib",
+                rootDir: "src",
             },
             include: ["src/**/*.ts"],
         }),
diff --git a/src/testRunner/unittests/tsbuild/outputPaths.ts b/src/testRunner/unittests/tsbuild/outputPaths.ts
index 48007978ace8b..40a30f6e6d98a 100644
--- a/src/testRunner/unittests/tsbuild/outputPaths.ts
+++ b/src/testRunner/unittests/tsbuild/outputPaths.ts
@@ -26,7 +26,7 @@ describe("unittests:: tsbuild:: outputPaths::", () => {
             ...input,
         });
 
-        it("verify getOutputFileNames", () => {
+        it("verify getOutputFileNames " + input.subScenario, () => {
             const sys = input.sys();
             assert.deepEqual(
                 ts.getOutputFileNames(
@@ -58,7 +58,7 @@ describe("unittests:: tsbuild:: outputPaths::", () => {
                 }),
             }),
         edits,
-    }, ["/home/src/workspaces/project/dist/index.js"]);
+    }, ["/home/src/workspaces/project/dist/src/index.js"]);
 
     verify({
         subScenario: "when rootDir is not specified and is composite",
diff --git a/src/testRunner/unittests/tsc/commandLine.ts b/src/testRunner/unittests/tsc/commandLine.ts
index d56f293f61111..fd2fe029218b7 100644
--- a/src/testRunner/unittests/tsc/commandLine.ts
+++ b/src/testRunner/unittests/tsc/commandLine.ts
@@ -30,6 +30,26 @@ describe("unittests:: tsc:: commandLine::", () => {
         commandLineArgs: emptyArray,
     });
 
+    verifyTsc({
+        scenario: "commandLine",
+        subScenario: "adds color when FORCE_COLOR is set",
+        sys: () =>
+            TestServerHost.createWatchedSystem(emptyArray, {
+                environmentVariables: new Map([["FORCE_COLOR", "true"]]),
+            }),
+        commandLineArgs: emptyArray,
+    });
+
+    verifyTsc({
+        scenario: "commandLine",
+        subScenario: "does not add color when NO_COLOR is set even if FORCE_COLOR is set",
+        sys: () =>
+            TestServerHost.createWatchedSystem(emptyArray, {
+                environmentVariables: new Map([["NO_COLOR", "true"], ["FORCE_COLOR", "true"]]),
+            }),
+        commandLineArgs: emptyArray,
+    });
+
     verifyTsc({
         scenario: "commandLine",
         subScenario: "when build not first argument",
diff --git a/src/testRunner/unittests/tsc/projectReferences.ts b/src/testRunner/unittests/tsc/projectReferences.ts
index 3a5b1e09de7ad..39ca6ce5f71fe 100644
--- a/src/testRunner/unittests/tsc/projectReferences.ts
+++ b/src/testRunner/unittests/tsc/projectReferences.ts
@@ -90,6 +90,42 @@ describe("unittests:: tsc:: projectReferences::", () => {
         commandLineArgs: ["--p", "app", "--pretty", "false"],
     });
 
+    verifyTsc({
+        scenario: "projectReferences",
+        subScenario: "referenced project with esnext module disallows synthetic default imports",
+        sys: () =>
+            TestServerHost.createWatchedSystem({
+                "/home/src/workspaces/project/lib/tsconfig.json": jsonToReadableText({
+                    compilerOptions: {
+                        composite: true,
+                        declaration: true,
+                        module: "esnext",
+                        moduleResolution: "bundler",
+                        rootDir: "src",
+                        outDir: "dist",
+                    },
+                    include: ["src"],
+                }),
+                "/home/src/workspaces/project/lib/src/utils.ts": "export const test = () => 'test';",
+                "/home/src/workspaces/project/lib/dist/utils.d.ts": "export declare const test: () => string;",
+                "/home/src/workspaces/project/app/tsconfig.json": jsonToReadableText({
+                    compilerOptions: {
+                        module: "esnext",
+                        moduleResolution: "bundler",
+                    },
+                    references: [
+                        { path: "../lib" },
+                    ],
+                }),
+                "/home/src/workspaces/project/app/index.ts": `
+                    import TestSrc from '../lib/src/utils'; // Error
+                    import TestDecl from '../lib/dist/utils'; // Error
+                    console.log(TestSrc.test());
+                    console.log(TestDecl.test());`,
+            }),
+        commandLineArgs: ["--p", "app", "--pretty", "false"],
+    });
+
     verifyTsc({
         scenario: "projectReferences",
         subScenario: "referencing ambient const enum from referenced project with preserveConstEnums",
diff --git a/src/testRunner/unittests/tsserver/dynamicFiles.ts b/src/testRunner/unittests/tsserver/dynamicFiles.ts
index d3d3945e19286..5a5906f08c3de 100644
--- a/src/testRunner/unittests/tsserver/dynamicFiles.ts
+++ b/src/testRunner/unittests/tsserver/dynamicFiles.ts
@@ -270,4 +270,27 @@ describe("unittests:: tsserver:: dynamicFiles:: ", () => {
         verifyPathRecognizedAsDynamic("walkThroughSnippet", "walkThroughSnippet:/usr/share/code/resources/app/out/vs/workbench/contrib/welcome/walkThrough/browser/editor/^vs_code_editor_walkthrough.md#1.ts");
         verifyPathRecognizedAsDynamic("untitled", "untitled:/Users/matb/projects/san/^newFile.ts");
     });
+
+    it("chat block with imports", () => {
+        const host = TestServerHost.createServerHost({
+            "/user/username/projects/myproject/a.ts": "",
+            "/user/username/projects/myproject/tsconfig.json": "{}",
+        });
+        const session = new TestSession({ host, useInferredProjectPerProjectRoot: true });
+        openFilesForSession([{ file: "/user/username/projects/myproject/a.ts", projectRootPath: "/user/username/projects/myproject" }], session);
+        // Without projectRoot
+        openFilesForSession([{
+            file: "^/chat-editing-snapshot-text-model/ts-nul-authority/c/temp/codeRepo/src/services/user.service.ts",
+            content: "",
+            scriptKindName: "TS",
+        }], session);
+        // with "/" as project root
+        openFilesForSession([{
+            file: '^/vscode-chat-code-block/dnnjb2rllwnoyxqtc2vzc2lvbjovl2xvy2fsl1peag1oelv6tkdvde9uvtvnuzawtxpbnuxxstrare10tvrobfpuvtbpvgmytudwaq/response_6b1244f1-9aca-4b8b-8f65-0ff7ed4e6b4e/2#{"references":[]}',
+            content: `import { UserService from './src/services/user.service';}`,
+            projectRootPath: "/",
+            scriptKindName: "TS",
+        }], session);
+        baselineTsserverLogs("dynamicFiles", "chat block with imports", session);
+    });
 });
diff --git a/tests/baselines/reference/2dArrays.js b/tests/baselines/reference/2dArrays.js
index 67ca55be5f1e1..3c12da4a25ef8 100644
--- a/tests/baselines/reference/2dArrays.js
+++ b/tests/baselines/reference/2dArrays.js
@@ -5,12 +5,12 @@ class Cell {
 }
 
 class Ship {
-    isSunk: boolean;
+    isSunk: boolean = false;
 }
 
 class Board {
-    ships: Ship[];
-    cells: Cell[];
+    ships: Ship[] = [];
+    cells: Cell[] = [];
 
     private allShipsSunk() {
         return this.ships.every(function (val) { return val.isSunk; });
@@ -25,11 +25,14 @@ var Cell = /** @class */ (function () {
 }());
 var Ship = /** @class */ (function () {
     function Ship() {
+        this.isSunk = false;
     }
     return Ship;
 }());
 var Board = /** @class */ (function () {
     function Board() {
+        this.ships = [];
+        this.cells = [];
     }
     Board.prototype.allShipsSunk = function () {
         return this.ships.every(function (val) { return val.isSunk; });
diff --git a/tests/baselines/reference/2dArrays.symbols b/tests/baselines/reference/2dArrays.symbols
index 3974e5e803d82..109c8307ff9fc 100644
--- a/tests/baselines/reference/2dArrays.symbols
+++ b/tests/baselines/reference/2dArrays.symbols
@@ -8,23 +8,23 @@ class Cell {
 class Ship {
 >Ship : Symbol(Ship, Decl(2dArrays.ts, 1, 1))
 
-    isSunk: boolean;
+    isSunk: boolean = false;
 >isSunk : Symbol(Ship.isSunk, Decl(2dArrays.ts, 3, 12))
 }
 
 class Board {
 >Board : Symbol(Board, Decl(2dArrays.ts, 5, 1))
 
-    ships: Ship[];
+    ships: Ship[] = [];
 >ships : Symbol(Board.ships, Decl(2dArrays.ts, 7, 13))
 >Ship : Symbol(Ship, Decl(2dArrays.ts, 1, 1))
 
-    cells: Cell[];
->cells : Symbol(Board.cells, Decl(2dArrays.ts, 8, 18))
+    cells: Cell[] = [];
+>cells : Symbol(Board.cells, Decl(2dArrays.ts, 8, 23))
 >Cell : Symbol(Cell, Decl(2dArrays.ts, 0, 0))
 
     private allShipsSunk() {
->allShipsSunk : Symbol(Board.allShipsSunk, Decl(2dArrays.ts, 9, 18))
+>allShipsSunk : Symbol(Board.allShipsSunk, Decl(2dArrays.ts, 9, 23))
 
         return this.ships.every(function (val) { return val.isSunk; });
 >this.ships.every : Symbol(Array.every, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
diff --git a/tests/baselines/reference/2dArrays.types b/tests/baselines/reference/2dArrays.types
index 74a962fff0424..3ad88ae6b15dc 100644
--- a/tests/baselines/reference/2dArrays.types
+++ b/tests/baselines/reference/2dArrays.types
@@ -10,22 +10,28 @@ class Ship {
 >Ship : Ship
 >     : ^^^^
 
-    isSunk: boolean;
+    isSunk: boolean = false;
 >isSunk : boolean
 >       : ^^^^^^^
+>false : false
+>      : ^^^^^
 }
 
 class Board {
 >Board : Board
 >      : ^^^^^
 
-    ships: Ship[];
+    ships: Ship[] = [];
 >ships : Ship[]
 >      : ^^^^^^
+>[] : undefined[]
+>   : ^^^^^^^^^^^
 
-    cells: Cell[];
+    cells: Cell[] = [];
 >cells : Cell[]
 >      : ^^^^^^
+>[] : undefined[]
+>   : ^^^^^^^^^^^
 
     private allShipsSunk() {
 >allShipsSunk : () => boolean
diff --git a/tests/baselines/reference/APISample_Watch.js b/tests/baselines/reference/APISample_Watch.js
index 8659e969ffb66..608d0e00a1dda 100644
--- a/tests/baselines/reference/APISample_Watch.js
+++ b/tests/baselines/reference/APISample_Watch.js
@@ -51,7 +51,7 @@ function watchMain() {
     // You can technically override any given hook on the host, though you probably don't need to.
     // Note that we're assuming `origCreateProgram` and `origPostProgramCreate` doesn't use `this` at all.
     const origCreateProgram = host.createProgram;
-    host.createProgram = (rootNames: ReadonlyArray<string>, options, host, oldProgram) => {
+    host.createProgram = (rootNames: ReadonlyArray<string> | undefined, options, host, oldProgram) => {
         console.log("** We're about to create the program! **");
         return origCreateProgram(rootNames, options, host, oldProgram);
     }
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck11.errors.txt b/tests/baselines/reference/ES5For-ofTypeCheck11.errors.txt
index 0c850f5ff5499..4ccd0dc727574 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck11.errors.txt
+++ b/tests/baselines/reference/ES5For-ofTypeCheck11.errors.txt
@@ -3,7 +3,7 @@ ES5For-ofTypeCheck11.ts(3,6): error TS2322: Type 'string | number' is not assign
 
 
 ==== ES5For-ofTypeCheck11.ts (1 errors) ====
-    var union: string | number[];
+    declare var union: string | number[];
     var v: string;
     for (v of union) { }
          ~
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck11.js b/tests/baselines/reference/ES5For-ofTypeCheck11.js
index a601d2f658a11..3f1e87cd7050b 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck11.js
+++ b/tests/baselines/reference/ES5For-ofTypeCheck11.js
@@ -1,12 +1,11 @@
 //// [tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck11.ts] ////
 
 //// [ES5For-ofTypeCheck11.ts]
-var union: string | number[];
+declare var union: string | number[];
 var v: string;
 for (v of union) { }
 
 //// [ES5For-ofTypeCheck11.js]
-var union;
 var v;
 for (var _i = 0, union_1 = union; _i < union_1.length; _i++) {
     v = union_1[_i];
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck11.symbols b/tests/baselines/reference/ES5For-ofTypeCheck11.symbols
index 51a72d9f37362..cfdf8ac0287c6 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck11.symbols
+++ b/tests/baselines/reference/ES5For-ofTypeCheck11.symbols
@@ -1,13 +1,13 @@
 //// [tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck11.ts] ////
 
 === ES5For-ofTypeCheck11.ts ===
-var union: string | number[];
->union : Symbol(union, Decl(ES5For-ofTypeCheck11.ts, 0, 3))
+declare var union: string | number[];
+>union : Symbol(union, Decl(ES5For-ofTypeCheck11.ts, 0, 11))
 
 var v: string;
 >v : Symbol(v, Decl(ES5For-ofTypeCheck11.ts, 1, 3))
 
 for (v of union) { }
 >v : Symbol(v, Decl(ES5For-ofTypeCheck11.ts, 1, 3))
->union : Symbol(union, Decl(ES5For-ofTypeCheck11.ts, 0, 3))
+>union : Symbol(union, Decl(ES5For-ofTypeCheck11.ts, 0, 11))
 
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck11.types b/tests/baselines/reference/ES5For-ofTypeCheck11.types
index 3c85a2698d2ee..f1551d5b1b1cd 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck11.types
+++ b/tests/baselines/reference/ES5For-ofTypeCheck11.types
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck11.ts] ////
 
 === ES5For-ofTypeCheck11.ts ===
-var union: string | number[];
+declare var union: string | number[];
 >union : string | number[]
 >      : ^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck14.errors.txt b/tests/baselines/reference/ES5For-ofTypeCheck14.errors.txt
index 68d5353f1a606..71d2526927a70 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck14.errors.txt
+++ b/tests/baselines/reference/ES5For-ofTypeCheck14.errors.txt
@@ -2,7 +2,7 @@ ES5For-ofTypeCheck14.ts(2,17): error TS2802: Type 'Set<number>' can only be iter
 
 
 ==== ES5For-ofTypeCheck14.ts (1 errors) ====
-    var union: string | Set<number>
+    declare var union: string | Set<number>
     for (const e of union) { }
                     ~~~~~
 !!! error TS2802: Type 'Set<number>' can only be iterated through when using the '--downlevelIteration' flag or with a '--target' of 'es2015' or higher.
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck14.js b/tests/baselines/reference/ES5For-ofTypeCheck14.js
index c97179f60e279..3dd6049bc315d 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck14.js
+++ b/tests/baselines/reference/ES5For-ofTypeCheck14.js
@@ -1,11 +1,10 @@
 //// [tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck14.ts] ////
 
 //// [ES5For-ofTypeCheck14.ts]
-var union: string | Set<number>
+declare var union: string | Set<number>
 for (const e of union) { }
 
 //// [ES5For-ofTypeCheck14.js]
-var union;
 for (var _i = 0, union_1 = union; _i < union_1.length; _i++) {
     var e = union_1[_i];
 }
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck14.symbols b/tests/baselines/reference/ES5For-ofTypeCheck14.symbols
index 49354157b12a0..d964cb61ed992 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck14.symbols
+++ b/tests/baselines/reference/ES5For-ofTypeCheck14.symbols
@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck14.ts] ////
 
 === ES5For-ofTypeCheck14.ts ===
-var union: string | Set<number>
->union : Symbol(union, Decl(ES5For-ofTypeCheck14.ts, 0, 3))
+declare var union: string | Set<number>
+>union : Symbol(union, Decl(ES5For-ofTypeCheck14.ts, 0, 11))
 >Set : Symbol(Set, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 for (const e of union) { }
 >e : Symbol(e, Decl(ES5For-ofTypeCheck14.ts, 1, 10))
->union : Symbol(union, Decl(ES5For-ofTypeCheck14.ts, 0, 3))
+>union : Symbol(union, Decl(ES5For-ofTypeCheck14.ts, 0, 11))
 
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck14.types b/tests/baselines/reference/ES5For-ofTypeCheck14.types
index ac54cd58fb4b2..63af9b654ca59 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck14.types
+++ b/tests/baselines/reference/ES5For-ofTypeCheck14.types
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck14.ts] ////
 
 === ES5For-ofTypeCheck14.ts ===
-var union: string | Set<number>
+declare var union: string | Set<number>
 >union : string | Set<number>
 >      : ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck7.errors.txt b/tests/baselines/reference/ES5For-ofTypeCheck7.errors.txt
index 2b66cf9f1fedb..653f2be91661e 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck7.errors.txt
+++ b/tests/baselines/reference/ES5For-ofTypeCheck7.errors.txt
@@ -2,7 +2,7 @@ ES5For-ofTypeCheck7.ts(2,15): error TS2461: Type 'number' is not an array type.
 
 
 ==== ES5For-ofTypeCheck7.ts (1 errors) ====
-    var union: string | number;
+    declare var union: string | number;
     for (var v of union) { }
                   ~~~~~
 !!! error TS2461: Type 'number' is not an array type.
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck7.js b/tests/baselines/reference/ES5For-ofTypeCheck7.js
index 1fe4b50ebaeb7..517422a33ab57 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck7.js
+++ b/tests/baselines/reference/ES5For-ofTypeCheck7.js
@@ -1,11 +1,10 @@
 //// [tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck7.ts] ////
 
 //// [ES5For-ofTypeCheck7.ts]
-var union: string | number;
+declare var union: string | number;
 for (var v of union) { }
 
 //// [ES5For-ofTypeCheck7.js]
-var union;
 for (var _i = 0, union_1 = union; _i < union_1.length; _i++) {
     var v = union_1[_i];
 }
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck7.symbols b/tests/baselines/reference/ES5For-ofTypeCheck7.symbols
index f6af471545832..68dbdf6f50db5 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck7.symbols
+++ b/tests/baselines/reference/ES5For-ofTypeCheck7.symbols
@@ -1,10 +1,10 @@
 //// [tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck7.ts] ////
 
 === ES5For-ofTypeCheck7.ts ===
-var union: string | number;
->union : Symbol(union, Decl(ES5For-ofTypeCheck7.ts, 0, 3))
+declare var union: string | number;
+>union : Symbol(union, Decl(ES5For-ofTypeCheck7.ts, 0, 11))
 
 for (var v of union) { }
 >v : Symbol(v, Decl(ES5For-ofTypeCheck7.ts, 1, 8))
->union : Symbol(union, Decl(ES5For-ofTypeCheck7.ts, 0, 3))
+>union : Symbol(union, Decl(ES5For-ofTypeCheck7.ts, 0, 11))
 
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck7.types b/tests/baselines/reference/ES5For-ofTypeCheck7.types
index 7901b1d185637..2a004a90d60e6 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck7.types
+++ b/tests/baselines/reference/ES5For-ofTypeCheck7.types
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck7.ts] ////
 
 === ES5For-ofTypeCheck7.ts ===
-var union: string | number;
+declare var union: string | number;
 >union : string | number
 >      : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck8.errors.txt b/tests/baselines/reference/ES5For-ofTypeCheck8.errors.txt
index 0ad1495cebc23..3f82df8f45f66 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck8.errors.txt
+++ b/tests/baselines/reference/ES5For-ofTypeCheck8.errors.txt
@@ -3,7 +3,7 @@ ES5For-ofTypeCheck8.ts(3,6): error TS2322: Type 'string | number | symbol' is no
 
 
 ==== ES5For-ofTypeCheck8.ts (1 errors) ====
-    var union: string | string[]| number[]| symbol[];
+    declare var union: string | string[]| number[]| symbol[];
     var v: symbol;
     for (v of union) { }
          ~
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck8.js b/tests/baselines/reference/ES5For-ofTypeCheck8.js
index 6f126c036b4ca..04d929fbcb014 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck8.js
+++ b/tests/baselines/reference/ES5For-ofTypeCheck8.js
@@ -1,12 +1,11 @@
 //// [tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck8.ts] ////
 
 //// [ES5For-ofTypeCheck8.ts]
-var union: string | string[]| number[]| symbol[];
+declare var union: string | string[]| number[]| symbol[];
 var v: symbol;
 for (v of union) { }
 
 //// [ES5For-ofTypeCheck8.js]
-var union;
 var v;
 for (var _i = 0, union_1 = union; _i < union_1.length; _i++) {
     v = union_1[_i];
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck8.symbols b/tests/baselines/reference/ES5For-ofTypeCheck8.symbols
index a73daf86cf977..faf229923b679 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck8.symbols
+++ b/tests/baselines/reference/ES5For-ofTypeCheck8.symbols
@@ -1,13 +1,13 @@
 //// [tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck8.ts] ////
 
 === ES5For-ofTypeCheck8.ts ===
-var union: string | string[]| number[]| symbol[];
->union : Symbol(union, Decl(ES5For-ofTypeCheck8.ts, 0, 3))
+declare var union: string | string[]| number[]| symbol[];
+>union : Symbol(union, Decl(ES5For-ofTypeCheck8.ts, 0, 11))
 
 var v: symbol;
 >v : Symbol(v, Decl(ES5For-ofTypeCheck8.ts, 1, 3))
 
 for (v of union) { }
 >v : Symbol(v, Decl(ES5For-ofTypeCheck8.ts, 1, 3))
->union : Symbol(union, Decl(ES5For-ofTypeCheck8.ts, 0, 3))
+>union : Symbol(union, Decl(ES5For-ofTypeCheck8.ts, 0, 11))
 
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck8.types b/tests/baselines/reference/ES5For-ofTypeCheck8.types
index cbf3aececc047..4616a6fe6bae9 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck8.types
+++ b/tests/baselines/reference/ES5For-ofTypeCheck8.types
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck8.ts] ////
 
 === ES5For-ofTypeCheck8.ts ===
-var union: string | string[]| number[]| symbol[];
+declare var union: string | string[]| number[]| symbol[];
 >union : string | string[] | number[] | symbol[]
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck9.errors.txt b/tests/baselines/reference/ES5For-ofTypeCheck9.errors.txt
index 681af2013de23..47f971f9d6303 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck9.errors.txt
+++ b/tests/baselines/reference/ES5For-ofTypeCheck9.errors.txt
@@ -2,7 +2,7 @@ ES5For-ofTypeCheck9.ts(2,15): error TS2461: Type 'number | symbol | string[]' is
 
 
 ==== ES5For-ofTypeCheck9.ts (1 errors) ====
-    var union: string | string[] | number | symbol;
+    declare var union: string | string[] | number | symbol;
     for (let v of union) { }
                   ~~~~~
 !!! error TS2461: Type 'number | symbol | string[]' is not an array type.
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck9.js b/tests/baselines/reference/ES5For-ofTypeCheck9.js
index 00667fc24d45b..fc66bb2967db7 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck9.js
+++ b/tests/baselines/reference/ES5For-ofTypeCheck9.js
@@ -1,11 +1,10 @@
 //// [tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck9.ts] ////
 
 //// [ES5For-ofTypeCheck9.ts]
-var union: string | string[] | number | symbol;
+declare var union: string | string[] | number | symbol;
 for (let v of union) { }
 
 //// [ES5For-ofTypeCheck9.js]
-var union;
 for (var _i = 0, union_1 = union; _i < union_1.length; _i++) {
     var v = union_1[_i];
 }
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck9.symbols b/tests/baselines/reference/ES5For-ofTypeCheck9.symbols
index 8e157cb7c299d..8bcf34bf7682c 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck9.symbols
+++ b/tests/baselines/reference/ES5For-ofTypeCheck9.symbols
@@ -1,10 +1,10 @@
 //// [tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck9.ts] ////
 
 === ES5For-ofTypeCheck9.ts ===
-var union: string | string[] | number | symbol;
->union : Symbol(union, Decl(ES5For-ofTypeCheck9.ts, 0, 3))
+declare var union: string | string[] | number | symbol;
+>union : Symbol(union, Decl(ES5For-ofTypeCheck9.ts, 0, 11))
 
 for (let v of union) { }
 >v : Symbol(v, Decl(ES5For-ofTypeCheck9.ts, 1, 8))
->union : Symbol(union, Decl(ES5For-ofTypeCheck9.ts, 0, 3))
+>union : Symbol(union, Decl(ES5For-ofTypeCheck9.ts, 0, 11))
 
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck9.types b/tests/baselines/reference/ES5For-ofTypeCheck9.types
index 69e56c7665860..c0783320660cd 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck9.types
+++ b/tests/baselines/reference/ES5For-ofTypeCheck9.types
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck9.ts] ////
 
 === ES5For-ofTypeCheck9.ts ===
-var union: string | string[] | number | symbol;
+declare var union: string | string[] | number | symbol;
 >union : string | number | symbol | string[]
 >      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/ES5SymbolProperty5.errors.txt b/tests/baselines/reference/ES5SymbolProperty5.errors.txt
index e53226f91bea4..962069c9d2a70 100644
--- a/tests/baselines/reference/ES5SymbolProperty5.errors.txt
+++ b/tests/baselines/reference/ES5SymbolProperty5.errors.txt
@@ -1,10 +1,10 @@
-ES5SymbolProperty5.ts(1,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 'Symbol' must be of type 'SymbolConstructor', but here has type '{ iterator: symbol; }'.
+ES5SymbolProperty5.ts(1,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'Symbol' must be of type 'SymbolConstructor', but here has type '{ iterator: symbol; }'.
 ES5SymbolProperty5.ts(7,26): error TS2554: Expected 0 arguments, but got 1.
 
 
 ==== ES5SymbolProperty5.ts (2 errors) ====
-    var Symbol: { iterator: symbol };
-        ~~~~~~
+    declare var Symbol: { iterator: symbol };
+                ~~~~~~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'Symbol' must be of type 'SymbolConstructor', but here has type '{ iterator: symbol; }'.
 !!! related TS6203 lib.es2015.symbol.d.ts:--:--: 'Symbol' was also declared here.
     
diff --git a/tests/baselines/reference/ES5SymbolProperty5.js b/tests/baselines/reference/ES5SymbolProperty5.js
index b7d21bec4a0a4..45ff6b9e56199 100644
--- a/tests/baselines/reference/ES5SymbolProperty5.js
+++ b/tests/baselines/reference/ES5SymbolProperty5.js
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/Symbols/ES5SymbolProperty5.ts] ////
 
 //// [ES5SymbolProperty5.ts]
-var Symbol: { iterator: symbol };
+declare var Symbol: { iterator: symbol };
 
 class C {
     [Symbol.iterator]() { }
@@ -10,7 +10,6 @@ class C {
 (new C)[Symbol.iterator](0) // Should error
 
 //// [ES5SymbolProperty5.js]
-var Symbol;
 var C = /** @class */ (function () {
     function C() {
     }
diff --git a/tests/baselines/reference/ES5SymbolProperty5.symbols b/tests/baselines/reference/ES5SymbolProperty5.symbols
index 40ca8431fe20f..c0b016b14b44f 100644
--- a/tests/baselines/reference/ES5SymbolProperty5.symbols
+++ b/tests/baselines/reference/ES5SymbolProperty5.symbols
@@ -1,23 +1,23 @@
 //// [tests/cases/conformance/Symbols/ES5SymbolProperty5.ts] ////
 
 === ES5SymbolProperty5.ts ===
-var Symbol: { iterator: symbol };
->Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(ES5SymbolProperty5.ts, 0, 3))
->iterator : Symbol(iterator, Decl(ES5SymbolProperty5.ts, 0, 13))
+declare var Symbol: { iterator: symbol };
+>Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(ES5SymbolProperty5.ts, 0, 11))
+>iterator : Symbol(iterator, Decl(ES5SymbolProperty5.ts, 0, 21))
 
 class C {
->C : Symbol(C, Decl(ES5SymbolProperty5.ts, 0, 33))
+>C : Symbol(C, Decl(ES5SymbolProperty5.ts, 0, 41))
 
     [Symbol.iterator]() { }
 >[Symbol.iterator] : Symbol(C[Symbol.iterator], Decl(ES5SymbolProperty5.ts, 2, 9))
 >Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(ES5SymbolProperty5.ts, 0, 3))
+>Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(ES5SymbolProperty5.ts, 0, 11))
 >iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --))
 }
 
 (new C)[Symbol.iterator](0) // Should error
->C : Symbol(C, Decl(ES5SymbolProperty5.ts, 0, 33))
+>C : Symbol(C, Decl(ES5SymbolProperty5.ts, 0, 41))
 >Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(ES5SymbolProperty5.ts, 0, 3))
+>Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(ES5SymbolProperty5.ts, 0, 11))
 >iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --))
 
diff --git a/tests/baselines/reference/ES5SymbolProperty5.types b/tests/baselines/reference/ES5SymbolProperty5.types
index 719789d894772..72bd530e52e21 100644
--- a/tests/baselines/reference/ES5SymbolProperty5.types
+++ b/tests/baselines/reference/ES5SymbolProperty5.types
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/Symbols/ES5SymbolProperty5.ts] ////
 
 === ES5SymbolProperty5.ts ===
-var Symbol: { iterator: symbol };
+declare var Symbol: { iterator: symbol };
 >Symbol : SymbolConstructor
 >       : ^^^^^^^^^^^^^^^^^
 >iterator : symbol
diff --git a/tests/baselines/reference/abstractPropertyBasics.js b/tests/baselines/reference/abstractPropertyBasics.js
index c9026e5f3424d..c20a295242ff3 100644
--- a/tests/baselines/reference/abstractPropertyBasics.js
+++ b/tests/baselines/reference/abstractPropertyBasics.js
@@ -19,7 +19,7 @@ class C extends B {
     set prop(v) { }
     raw = "edge";
     readonly ro = "readonly please";
-    readonlyProp: string; // don't have to give a value, in fact
+    readonlyProp!: string;
     m() { }
 }
 
diff --git a/tests/baselines/reference/abstractPropertyBasics.symbols b/tests/baselines/reference/abstractPropertyBasics.symbols
index b7c7a74483d02..b251e283c2965 100644
--- a/tests/baselines/reference/abstractPropertyBasics.symbols
+++ b/tests/baselines/reference/abstractPropertyBasics.symbols
@@ -53,9 +53,9 @@ class C extends B {
     readonly ro = "readonly please";
 >ro : Symbol(C.ro, Decl(abstractPropertyBasics.ts, 16, 17))
 
-    readonlyProp: string; // don't have to give a value, in fact
+    readonlyProp!: string;
 >readonlyProp : Symbol(C.readonlyProp, Decl(abstractPropertyBasics.ts, 17, 36))
 
     m() { }
->m : Symbol(C.m, Decl(abstractPropertyBasics.ts, 18, 25))
+>m : Symbol(C.m, Decl(abstractPropertyBasics.ts, 18, 26))
 }
diff --git a/tests/baselines/reference/abstractPropertyBasics.types b/tests/baselines/reference/abstractPropertyBasics.types
index e578dfc1a3d83..c62b71a86e149 100644
--- a/tests/baselines/reference/abstractPropertyBasics.types
+++ b/tests/baselines/reference/abstractPropertyBasics.types
@@ -74,7 +74,7 @@ class C extends B {
 >"readonly please" : "readonly please"
 >                  : ^^^^^^^^^^^^^^^^^
 
-    readonlyProp: string; // don't have to give a value, in fact
+    readonlyProp!: string;
 >readonlyProp : string
 >             : ^^^^^^
 
diff --git a/tests/baselines/reference/additionOperatorWithInvalidOperands.errors.txt b/tests/baselines/reference/additionOperatorWithInvalidOperands.errors.txt
index 6051993f2e260..c1c3c7da2cde8 100644
--- a/tests/baselines/reference/additionOperatorWithInvalidOperands.errors.txt
+++ b/tests/baselines/reference/additionOperatorWithInvalidOperands.errors.txt
@@ -28,10 +28,10 @@ additionOperatorWithInvalidOperands.ts(40,11): error TS2365: Operator '+' cannot
     enum E { a, b, c }
     namespace M { export var a }
     
-    var a: boolean;
-    var b: number;
-    var c: Object;
-    var d: Number;
+    declare var a: boolean;
+    declare var b: number;
+    declare var c: Object;
+    declare var d: Number;
     
     // boolean + every type except any and string
     var r1 = a + a;
diff --git a/tests/baselines/reference/additionOperatorWithInvalidOperands.js b/tests/baselines/reference/additionOperatorWithInvalidOperands.js
index 1093452897cef..d42f381dfd70c 100644
--- a/tests/baselines/reference/additionOperatorWithInvalidOperands.js
+++ b/tests/baselines/reference/additionOperatorWithInvalidOperands.js
@@ -9,10 +9,10 @@ class C {
 enum E { a, b, c }
 namespace M { export var a }
 
-var a: boolean;
-var b: number;
-var c: Object;
-var d: Number;
+declare var a: boolean;
+declare var b: number;
+declare var c: Object;
+declare var d: Number;
 
 // boolean + every type except any and string
 var r1 = a + a;
@@ -59,10 +59,6 @@ var E;
 var M;
 (function (M) {
 })(M || (M = {}));
-var a;
-var b;
-var c;
-var d;
 // boolean + every type except any and string
 var r1 = a + a;
 var r2 = a + b;
diff --git a/tests/baselines/reference/additionOperatorWithInvalidOperands.symbols b/tests/baselines/reference/additionOperatorWithInvalidOperands.symbols
index 697ea7cc0bbe5..4dc696b6f9247 100644
--- a/tests/baselines/reference/additionOperatorWithInvalidOperands.symbols
+++ b/tests/baselines/reference/additionOperatorWithInvalidOperands.symbols
@@ -23,72 +23,72 @@ namespace M { export var a }
 >M : Symbol(M, Decl(additionOperatorWithInvalidOperands.ts, 5, 18))
 >a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 6, 24))
 
-var a: boolean;
->a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 3))
+declare var a: boolean;
+>a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 11))
 
-var b: number;
->b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 3))
+declare var b: number;
+>b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 11))
 
-var c: Object;
->c : Symbol(c, Decl(additionOperatorWithInvalidOperands.ts, 10, 3))
+declare var c: Object;
+>c : Symbol(c, Decl(additionOperatorWithInvalidOperands.ts, 10, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
-var d: Number;
->d : Symbol(d, Decl(additionOperatorWithInvalidOperands.ts, 11, 3))
+declare var d: Number;
+>d : Symbol(d, Decl(additionOperatorWithInvalidOperands.ts, 11, 11))
 >Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 // boolean + every type except any and string
 var r1 = a + a;
 >r1 : Symbol(r1, Decl(additionOperatorWithInvalidOperands.ts, 14, 3))
->a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 11))
+>a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 11))
 
 var r2 = a + b;
 >r2 : Symbol(r2, Decl(additionOperatorWithInvalidOperands.ts, 15, 3))
->a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 3))
->b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 3))
+>a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 11))
+>b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 11))
 
 var r3 = a + c;
 >r3 : Symbol(r3, Decl(additionOperatorWithInvalidOperands.ts, 16, 3))
->a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 3))
->c : Symbol(c, Decl(additionOperatorWithInvalidOperands.ts, 10, 3))
+>a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 11))
+>c : Symbol(c, Decl(additionOperatorWithInvalidOperands.ts, 10, 11))
 
 // number + every type except any and string
 var r4 = b + a;
 >r4 : Symbol(r4, Decl(additionOperatorWithInvalidOperands.ts, 19, 3))
->b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 3))
->a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 3))
+>b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 11))
+>a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 11))
 
 var r5 = b + b; // number + number is valid
 >r5 : Symbol(r5, Decl(additionOperatorWithInvalidOperands.ts, 20, 3))
->b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 3))
->b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 11))
+>b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 11))
 
 var r6 = b + c;
 >r6 : Symbol(r6, Decl(additionOperatorWithInvalidOperands.ts, 21, 3))
->b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 3))
->c : Symbol(c, Decl(additionOperatorWithInvalidOperands.ts, 10, 3))
+>b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 11))
+>c : Symbol(c, Decl(additionOperatorWithInvalidOperands.ts, 10, 11))
 
 // object + every type except any and string
 var r7 = c + a;
 >r7 : Symbol(r7, Decl(additionOperatorWithInvalidOperands.ts, 24, 3))
->c : Symbol(c, Decl(additionOperatorWithInvalidOperands.ts, 10, 3))
->a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 3))
+>c : Symbol(c, Decl(additionOperatorWithInvalidOperands.ts, 10, 11))
+>a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 11))
 
 var r8 = c + b;
 >r8 : Symbol(r8, Decl(additionOperatorWithInvalidOperands.ts, 25, 3))
->c : Symbol(c, Decl(additionOperatorWithInvalidOperands.ts, 10, 3))
->b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 3))
+>c : Symbol(c, Decl(additionOperatorWithInvalidOperands.ts, 10, 11))
+>b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 11))
 
 var r9 = c + c;
 >r9 : Symbol(r9, Decl(additionOperatorWithInvalidOperands.ts, 26, 3))
->c : Symbol(c, Decl(additionOperatorWithInvalidOperands.ts, 10, 3))
->c : Symbol(c, Decl(additionOperatorWithInvalidOperands.ts, 10, 3))
+>c : Symbol(c, Decl(additionOperatorWithInvalidOperands.ts, 10, 11))
+>c : Symbol(c, Decl(additionOperatorWithInvalidOperands.ts, 10, 11))
 
 // other cases
 var r10 = a + true;
 >r10 : Symbol(r10, Decl(additionOperatorWithInvalidOperands.ts, 29, 3))
->a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 11))
 
 var r11 = true + false;
 >r11 : Symbol(r11, Decl(additionOperatorWithInvalidOperands.ts, 30, 3))
@@ -101,22 +101,22 @@ var r13 = {} + {};
 
 var r14 = b + d;
 >r14 : Symbol(r14, Decl(additionOperatorWithInvalidOperands.ts, 33, 3))
->b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 3))
->d : Symbol(d, Decl(additionOperatorWithInvalidOperands.ts, 11, 3))
+>b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 11))
+>d : Symbol(d, Decl(additionOperatorWithInvalidOperands.ts, 11, 11))
 
 var r15 = b + foo;
 >r15 : Symbol(r15, Decl(additionOperatorWithInvalidOperands.ts, 34, 3))
->b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 11))
 >foo : Symbol(foo, Decl(additionOperatorWithInvalidOperands.ts, 0, 0))
 
 var r16 = b + foo();
 >r16 : Symbol(r16, Decl(additionOperatorWithInvalidOperands.ts, 35, 3))
->b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 11))
 >foo : Symbol(foo, Decl(additionOperatorWithInvalidOperands.ts, 0, 0))
 
 var r17 = b + C;
 >r17 : Symbol(r17, Decl(additionOperatorWithInvalidOperands.ts, 36, 3))
->b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(additionOperatorWithInvalidOperands.ts, 9, 11))
 >C : Symbol(C, Decl(additionOperatorWithInvalidOperands.ts, 0, 18))
 
 var r18 = E.a + new C();
diff --git a/tests/baselines/reference/additionOperatorWithInvalidOperands.types b/tests/baselines/reference/additionOperatorWithInvalidOperands.types
index f49e6f2b06b3d..9ed3272bad699 100644
--- a/tests/baselines/reference/additionOperatorWithInvalidOperands.types
+++ b/tests/baselines/reference/additionOperatorWithInvalidOperands.types
@@ -33,19 +33,19 @@ namespace M { export var a }
 >a : any
 >  : ^^^
 
-var a: boolean;
+declare var a: boolean;
 >a : boolean
 >  : ^^^^^^^
 
-var b: number;
+declare var b: number;
 >b : number
 >  : ^^^^^^
 
-var c: Object;
+declare var c: Object;
 >c : Object
 >  : ^^^^^^
 
-var d: Number;
+declare var d: Number;
 >d : Number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.errors.txt b/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.errors.txt
index 0a51361b10848..30c26aace1a40 100644
--- a/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.errors.txt
+++ b/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.errors.txt
@@ -16,10 +16,10 @@ additionOperatorWithNullValueAndInvalidOperator.ts(23,11): error TS2365: Operato
     
     function foo(): void { return undefined }
     
-    var a: boolean;
-    var b: Object;
-    var c: void;
-    var d: Number;
+    declare var a: boolean;
+    declare var b: Object;
+    declare var c: void;
+    declare var d: Number;
     
     // null + boolean/Object
     var r1 = null + a;
diff --git a/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.js b/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.js
index 8388dbebb3955..6a38d10bd00aa 100644
--- a/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.js
+++ b/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.js
@@ -5,10 +5,10 @@
 
 function foo(): void { return undefined }
 
-var a: boolean;
-var b: Object;
-var c: void;
-var d: Number;
+declare var a: boolean;
+declare var b: Object;
+declare var c: void;
+declare var d: Number;
 
 // null + boolean/Object
 var r1 = null + a;
@@ -28,10 +28,6 @@ var r11 = null + (() => { });
 //// [additionOperatorWithNullValueAndInvalidOperator.js]
 // If one operand is the null or undefined value, it is treated as having the type of the other operand.
 function foo() { return undefined; }
-var a;
-var b;
-var c;
-var d;
 // null + boolean/Object
 var r1 = null + a;
 var r2 = null + b;
diff --git a/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.symbols b/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.symbols
index 4e0844055bb5e..405bbe72a0b2d 100644
--- a/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.symbols
+++ b/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.symbols
@@ -7,49 +7,49 @@ function foo(): void { return undefined }
 >foo : Symbol(foo, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 0, 0))
 >undefined : Symbol(undefined)
 
-var a: boolean;
->a : Symbol(a, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 4, 3))
+declare var a: boolean;
+>a : Symbol(a, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 4, 11))
 
-var b: Object;
->b : Symbol(b, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 5, 3))
+declare var b: Object;
+>b : Symbol(b, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 5, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
-var c: void;
->c : Symbol(c, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 6, 3))
+declare var c: void;
+>c : Symbol(c, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 6, 11))
 
-var d: Number;
->d : Symbol(d, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 7, 3))
+declare var d: Number;
+>d : Symbol(d, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 7, 11))
 >Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 // null + boolean/Object
 var r1 = null + a;
 >r1 : Symbol(r1, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 10, 3))
->a : Symbol(a, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 4, 3))
+>a : Symbol(a, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 4, 11))
 
 var r2 = null + b;
 >r2 : Symbol(r2, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 11, 3))
->b : Symbol(b, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 5, 3))
+>b : Symbol(b, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 5, 11))
 
 var r3 = null + c;
 >r3 : Symbol(r3, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 12, 3))
->c : Symbol(c, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 6, 3))
+>c : Symbol(c, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 6, 11))
 
 var r4 = a + null;
 >r4 : Symbol(r4, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 13, 3))
->a : Symbol(a, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 4, 3))
+>a : Symbol(a, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 4, 11))
 
 var r5 = b + null;
 >r5 : Symbol(r5, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 14, 3))
->b : Symbol(b, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 5, 3))
+>b : Symbol(b, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 5, 11))
 
 var r6 = null + c;
 >r6 : Symbol(r6, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 15, 3))
->c : Symbol(c, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 6, 3))
+>c : Symbol(c, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 6, 11))
 
 // other cases
 var r7 = null + d;
 >r7 : Symbol(r7, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 18, 3))
->d : Symbol(d, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 7, 3))
+>d : Symbol(d, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 7, 11))
 
 var r8 = null + true;
 >r8 : Symbol(r8, Decl(additionOperatorWithNullValueAndInvalidOperator.ts, 19, 3))
diff --git a/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.types b/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.types
index ee664f35f3f92..cb4b2660b74a3 100644
--- a/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.types
+++ b/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.types
@@ -9,19 +9,19 @@ function foo(): void { return undefined }
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var a: boolean;
+declare var a: boolean;
 >a : boolean
 >  : ^^^^^^^
 
-var b: Object;
+declare var b: Object;
 >b : Object
 >  : ^^^^^^
 
-var c: void;
+declare var c: void;
 >c : void
 >  : ^^^^
 
-var d: Number;
+declare var d: Number;
 >d : Number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.errors.txt b/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.errors.txt
index eb13ff16ed092..a046d0f0b0f8f 100644
--- a/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.errors.txt
+++ b/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.errors.txt
@@ -15,10 +15,10 @@ additionOperatorWithNullValueAndValidOperator.ts(24,11): error TS2365: Operator
     
     enum E { a, b, c }
     
-    var a: any;
-    var b: number;
-    var c: E;
-    var d: string;
+    declare var a: any;
+    declare var b: number;
+    declare var c: E;
+    declare var d: string;
     
     // null + any
     var r1: any = null + a;
diff --git a/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.js b/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.js
index 460b5eb5fc358..0c9c6750982ed 100644
--- a/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.js
+++ b/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.js
@@ -5,10 +5,10 @@
 
 enum E { a, b, c }
 
-var a: any;
-var b: number;
-var c: E;
-var d: string;
+declare var a: any;
+declare var b: number;
+declare var c: E;
+declare var d: string;
 
 // null + any
 var r1: any = null + a;
@@ -40,10 +40,6 @@ var E;
     E[E["b"] = 1] = "b";
     E[E["c"] = 2] = "c";
 })(E || (E = {}));
-var a;
-var b;
-var c;
-var d;
 // null + any
 var r1 = null + a;
 var r2 = a + null;
diff --git a/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.symbols b/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.symbols
index 416e99c767155..d539264fd1743 100644
--- a/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.symbols
+++ b/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.symbols
@@ -9,39 +9,39 @@ enum E { a, b, c }
 >b : Symbol(E.b, Decl(additionOperatorWithNullValueAndValidOperator.ts, 2, 11))
 >c : Symbol(E.c, Decl(additionOperatorWithNullValueAndValidOperator.ts, 2, 14))
 
-var a: any;
->a : Symbol(a, Decl(additionOperatorWithNullValueAndValidOperator.ts, 4, 3))
+declare var a: any;
+>a : Symbol(a, Decl(additionOperatorWithNullValueAndValidOperator.ts, 4, 11))
 
-var b: number;
->b : Symbol(b, Decl(additionOperatorWithNullValueAndValidOperator.ts, 5, 3))
+declare var b: number;
+>b : Symbol(b, Decl(additionOperatorWithNullValueAndValidOperator.ts, 5, 11))
 
-var c: E;
->c : Symbol(c, Decl(additionOperatorWithNullValueAndValidOperator.ts, 6, 3))
+declare var c: E;
+>c : Symbol(c, Decl(additionOperatorWithNullValueAndValidOperator.ts, 6, 11))
 >E : Symbol(E, Decl(additionOperatorWithNullValueAndValidOperator.ts, 0, 0))
 
-var d: string;
->d : Symbol(d, Decl(additionOperatorWithNullValueAndValidOperator.ts, 7, 3))
+declare var d: string;
+>d : Symbol(d, Decl(additionOperatorWithNullValueAndValidOperator.ts, 7, 11))
 
 // null + any
 var r1: any = null + a;
 >r1 : Symbol(r1, Decl(additionOperatorWithNullValueAndValidOperator.ts, 10, 3))
->a : Symbol(a, Decl(additionOperatorWithNullValueAndValidOperator.ts, 4, 3))
+>a : Symbol(a, Decl(additionOperatorWithNullValueAndValidOperator.ts, 4, 11))
 
 var r2: any = a + null;
 >r2 : Symbol(r2, Decl(additionOperatorWithNullValueAndValidOperator.ts, 11, 3))
->a : Symbol(a, Decl(additionOperatorWithNullValueAndValidOperator.ts, 4, 3))
+>a : Symbol(a, Decl(additionOperatorWithNullValueAndValidOperator.ts, 4, 11))
 
 // null + number/enum
 var r3 = null + b;
 >r3 : Symbol(r3, Decl(additionOperatorWithNullValueAndValidOperator.ts, 14, 3))
->b : Symbol(b, Decl(additionOperatorWithNullValueAndValidOperator.ts, 5, 3))
+>b : Symbol(b, Decl(additionOperatorWithNullValueAndValidOperator.ts, 5, 11))
 
 var r4 = null + 1;
 >r4 : Symbol(r4, Decl(additionOperatorWithNullValueAndValidOperator.ts, 15, 3))
 
 var r5 = null + c;
 >r5 : Symbol(r5, Decl(additionOperatorWithNullValueAndValidOperator.ts, 16, 3))
->c : Symbol(c, Decl(additionOperatorWithNullValueAndValidOperator.ts, 6, 3))
+>c : Symbol(c, Decl(additionOperatorWithNullValueAndValidOperator.ts, 6, 11))
 
 var r6 = null + E.a;
 >r6 : Symbol(r6, Decl(additionOperatorWithNullValueAndValidOperator.ts, 17, 3))
@@ -56,14 +56,14 @@ var r7 = null + E['a'];
 
 var r8 = b + null;
 >r8 : Symbol(r8, Decl(additionOperatorWithNullValueAndValidOperator.ts, 19, 3))
->b : Symbol(b, Decl(additionOperatorWithNullValueAndValidOperator.ts, 5, 3))
+>b : Symbol(b, Decl(additionOperatorWithNullValueAndValidOperator.ts, 5, 11))
 
 var r9 = 1 + null;
 >r9 : Symbol(r9, Decl(additionOperatorWithNullValueAndValidOperator.ts, 20, 3))
 
 var r10 = c + null
 >r10 : Symbol(r10, Decl(additionOperatorWithNullValueAndValidOperator.ts, 21, 3))
->c : Symbol(c, Decl(additionOperatorWithNullValueAndValidOperator.ts, 6, 3))
+>c : Symbol(c, Decl(additionOperatorWithNullValueAndValidOperator.ts, 6, 11))
 
 var r11 = E.a + null;
 >r11 : Symbol(r11, Decl(additionOperatorWithNullValueAndValidOperator.ts, 22, 3))
@@ -79,14 +79,14 @@ var r12 = E['a'] + null;
 // null + string
 var r13 = null + d;
 >r13 : Symbol(r13, Decl(additionOperatorWithNullValueAndValidOperator.ts, 26, 3))
->d : Symbol(d, Decl(additionOperatorWithNullValueAndValidOperator.ts, 7, 3))
+>d : Symbol(d, Decl(additionOperatorWithNullValueAndValidOperator.ts, 7, 11))
 
 var r14 = null + '';
 >r14 : Symbol(r14, Decl(additionOperatorWithNullValueAndValidOperator.ts, 27, 3))
 
 var r15 = d + null;
 >r15 : Symbol(r15, Decl(additionOperatorWithNullValueAndValidOperator.ts, 28, 3))
->d : Symbol(d, Decl(additionOperatorWithNullValueAndValidOperator.ts, 7, 3))
+>d : Symbol(d, Decl(additionOperatorWithNullValueAndValidOperator.ts, 7, 11))
 
 var r16 = '' + null;
 >r16 : Symbol(r16, Decl(additionOperatorWithNullValueAndValidOperator.ts, 29, 3))
diff --git a/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.types b/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.types
index b2e3a1b34d6a4..59be50dfa81fb 100644
--- a/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.types
+++ b/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.types
@@ -13,19 +13,19 @@ enum E { a, b, c }
 >c : E.c
 >  : ^^^
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
-var b: number;
+declare var b: number;
 >b : number
 >  : ^^^^^^
 
-var c: E;
+declare var c: E;
 >c : E
 >  : ^
 
-var d: string;
+declare var d: string;
 >d : string
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/additionOperatorWithTypeParameter.errors.txt b/tests/baselines/reference/additionOperatorWithTypeParameter.errors.txt
index 42e6850300c75..6bf776b120d4b 100644
--- a/tests/baselines/reference/additionOperatorWithTypeParameter.errors.txt
+++ b/tests/baselines/reference/additionOperatorWithTypeParameter.errors.txt
@@ -21,13 +21,13 @@ additionOperatorWithTypeParameter.ts(37,15): error TS2365: Operator '+' cannot b
     enum E { a, b }
     
     function foo<T, U>(t: T, u: U) {
-        var a: any;
-        var b: boolean;
-        var c: number;
-        var d: string;
-        var e: Object;
-        var g: E;
-        var f: void;
+        let a!: any;
+        let b!: boolean;
+        let c!: number;
+        let d!: string;
+        let e!: Object;
+        let g!: E;
+        let f!: void;
     
         // type parameter as left operand
         var r1: any = t + a; // ok, one operand is any
diff --git a/tests/baselines/reference/additionOperatorWithTypeParameter.js b/tests/baselines/reference/additionOperatorWithTypeParameter.js
index 7f321c748aeb0..aaf8c9d72d9b2 100644
--- a/tests/baselines/reference/additionOperatorWithTypeParameter.js
+++ b/tests/baselines/reference/additionOperatorWithTypeParameter.js
@@ -5,13 +5,13 @@
 enum E { a, b }
 
 function foo<T, U>(t: T, u: U) {
-    var a: any;
-    var b: boolean;
-    var c: number;
-    var d: string;
-    var e: Object;
-    var g: E;
-    var f: void;
+    let a!: any;
+    let b!: boolean;
+    let c!: number;
+    let d!: string;
+    let e!: Object;
+    let g!: E;
+    let f!: void;
 
     // type parameter as left operand
     var r1: any = t + a; // ok, one operand is any
diff --git a/tests/baselines/reference/additionOperatorWithTypeParameter.symbols b/tests/baselines/reference/additionOperatorWithTypeParameter.symbols
index 4b765c129d755..70ed83db31ebc 100644
--- a/tests/baselines/reference/additionOperatorWithTypeParameter.symbols
+++ b/tests/baselines/reference/additionOperatorWithTypeParameter.symbols
@@ -16,27 +16,27 @@ function foo<T, U>(t: T, u: U) {
 >u : Symbol(u, Decl(additionOperatorWithTypeParameter.ts, 3, 24))
 >U : Symbol(U, Decl(additionOperatorWithTypeParameter.ts, 3, 15))
 
-    var a: any;
+    let a!: any;
 >a : Symbol(a, Decl(additionOperatorWithTypeParameter.ts, 4, 7))
 
-    var b: boolean;
+    let b!: boolean;
 >b : Symbol(b, Decl(additionOperatorWithTypeParameter.ts, 5, 7))
 
-    var c: number;
+    let c!: number;
 >c : Symbol(c, Decl(additionOperatorWithTypeParameter.ts, 6, 7))
 
-    var d: string;
+    let d!: string;
 >d : Symbol(d, Decl(additionOperatorWithTypeParameter.ts, 7, 7))
 
-    var e: Object;
+    let e!: Object;
 >e : Symbol(e, Decl(additionOperatorWithTypeParameter.ts, 8, 7))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
-    var g: E;
+    let g!: E;
 >g : Symbol(g, Decl(additionOperatorWithTypeParameter.ts, 9, 7))
 >E : Symbol(E, Decl(additionOperatorWithTypeParameter.ts, 0, 0))
 
-    var f: void;
+    let f!: void;
 >f : Symbol(f, Decl(additionOperatorWithTypeParameter.ts, 10, 7))
 
     // type parameter as left operand
diff --git a/tests/baselines/reference/additionOperatorWithTypeParameter.types b/tests/baselines/reference/additionOperatorWithTypeParameter.types
index 5291fc2fe0e57..200f1ebab23a1 100644
--- a/tests/baselines/reference/additionOperatorWithTypeParameter.types
+++ b/tests/baselines/reference/additionOperatorWithTypeParameter.types
@@ -18,31 +18,31 @@ function foo<T, U>(t: T, u: U) {
 >u : U
 >  : ^
 
-    var a: any;
+    let a!: any;
 >a : any
 >  : ^^^
 
-    var b: boolean;
+    let b!: boolean;
 >b : boolean
 >  : ^^^^^^^
 
-    var c: number;
+    let c!: number;
 >c : number
 >  : ^^^^^^
 
-    var d: string;
+    let d!: string;
 >d : string
 >  : ^^^^^^
 
-    var e: Object;
+    let e!: Object;
 >e : Object
 >  : ^^^^^^
 
-    var g: E;
+    let g!: E;
 >g : E
 >  : ^
 
-    var f: void;
+    let f!: void;
 >f : void
 >  : ^^^^
 
diff --git a/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.errors.txt b/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.errors.txt
index 7546a67f9f332..1c50937aad0a7 100644
--- a/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.errors.txt
+++ b/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.errors.txt
@@ -16,10 +16,10 @@ additionOperatorWithUndefinedValueAndInvalidOperands.ts(23,11): error TS2365: Op
     
     function foo(): void { return undefined }
     
-    var a: boolean;
-    var b: Object;
-    var c: void;
-    var d: Number;
+    declare var a: boolean;
+    declare var b: Object;
+    declare var c: void;
+    declare var d: Number;
     
     // undefined + boolean/Object
     var r1 = undefined + a;
diff --git a/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.js b/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.js
index 755ddc7bc18e3..c4d1cafd628d3 100644
--- a/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.js
+++ b/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.js
@@ -5,10 +5,10 @@
 
 function foo(): void { return undefined }
 
-var a: boolean;
-var b: Object;
-var c: void;
-var d: Number;
+declare var a: boolean;
+declare var b: Object;
+declare var c: void;
+declare var d: Number;
 
 // undefined + boolean/Object
 var r1 = undefined + a;
@@ -28,10 +28,6 @@ var r11 = undefined + (() => { });
 //// [additionOperatorWithUndefinedValueAndInvalidOperands.js]
 // If one operand is the null or undefined value, it is treated as having the type of the other operand.
 function foo() { return undefined; }
-var a;
-var b;
-var c;
-var d;
 // undefined + boolean/Object
 var r1 = undefined + a;
 var r2 = undefined + b;
diff --git a/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.symbols b/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.symbols
index 0ea20fccc4a65..b6fc78b177ea4 100644
--- a/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.symbols
+++ b/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.symbols
@@ -7,56 +7,56 @@ function foo(): void { return undefined }
 >foo : Symbol(foo, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 0, 0))
 >undefined : Symbol(undefined)
 
-var a: boolean;
->a : Symbol(a, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+declare var a: boolean;
+>a : Symbol(a, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 
-var b: Object;
->b : Symbol(b, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+declare var b: Object;
+>b : Symbol(b, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
-var c: void;
->c : Symbol(c, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 6, 3))
+declare var c: void;
+>c : Symbol(c, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 6, 11))
 
-var d: Number;
->d : Symbol(d, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 7, 3))
+declare var d: Number;
+>d : Symbol(d, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 7, 11))
 >Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 // undefined + boolean/Object
 var r1 = undefined + a;
 >r1 : Symbol(r1, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 10, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 
 var r2 = undefined + b;
 >r2 : Symbol(r2, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 11, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 
 var r3 = undefined + c;
 >r3 : Symbol(r3, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 12, 3))
 >undefined : Symbol(undefined)
->c : Symbol(c, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 6, 11))
 
 var r4 = a + undefined;
 >r4 : Symbol(r4, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 13, 3))
->a : Symbol(a, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 >undefined : Symbol(undefined)
 
 var r5 = b + undefined;
 >r5 : Symbol(r5, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 14, 3))
->b : Symbol(b, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 >undefined : Symbol(undefined)
 
 var r6 = undefined + c;
 >r6 : Symbol(r6, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 15, 3))
 >undefined : Symbol(undefined)
->c : Symbol(c, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 6, 11))
 
 // other cases
 var r7 = undefined + d;
 >r7 : Symbol(r7, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 18, 3))
 >undefined : Symbol(undefined)
->d : Symbol(d, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 7, 11))
 
 var r8 = undefined + true;
 >r8 : Symbol(r8, Decl(additionOperatorWithUndefinedValueAndInvalidOperands.ts, 19, 3))
diff --git a/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.types b/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.types
index d9bf840aa0695..39fc32e765ba8 100644
--- a/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.types
+++ b/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.types
@@ -9,19 +9,19 @@ function foo(): void { return undefined }
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var a: boolean;
+declare var a: boolean;
 >a : boolean
 >  : ^^^^^^^
 
-var b: Object;
+declare var b: Object;
 >b : Object
 >  : ^^^^^^
 
-var c: void;
+declare var c: void;
 >c : void
 >  : ^^^^
 
-var d: Number;
+declare var d: Number;
 >d : Number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.errors.txt b/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.errors.txt
index 36a4ce620cb5a..bf1f4cd3e4fd3 100644
--- a/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.errors.txt
+++ b/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.errors.txt
@@ -15,10 +15,10 @@ additionOperatorWithUndefinedValueAndValidOperator.ts(24,11): error TS2365: Oper
     
     enum E { a, b, c }
     
-    var a: any;
-    var b: number;
-    var c: E;
-    var d: string;
+    declare var a: any;
+    declare var b: number;
+    declare var c: E;
+    declare var d: string;
     
     // undefined + any
     var r1: any = undefined + a;
diff --git a/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.js b/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.js
index bff58795e7683..f80fb1253c3f4 100644
--- a/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.js
+++ b/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.js
@@ -5,10 +5,10 @@
 
 enum E { a, b, c }
 
-var a: any;
-var b: number;
-var c: E;
-var d: string;
+declare var a: any;
+declare var b: number;
+declare var c: E;
+declare var d: string;
 
 // undefined + any
 var r1: any = undefined + a;
@@ -40,10 +40,6 @@ var E;
     E[E["b"] = 1] = "b";
     E[E["c"] = 2] = "c";
 })(E || (E = {}));
-var a;
-var b;
-var c;
-var d;
 // undefined + any
 var r1 = undefined + a;
 var r2 = a + undefined;
diff --git a/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.symbols b/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.symbols
index a45dfe9f559b6..55cd1d2e95ace 100644
--- a/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.symbols
+++ b/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.symbols
@@ -9,35 +9,35 @@ enum E { a, b, c }
 >b : Symbol(E.b, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 2, 11))
 >c : Symbol(E.c, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 2, 14))
 
-var a: any;
->a : Symbol(a, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 4, 3))
+declare var a: any;
+>a : Symbol(a, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 4, 11))
 
-var b: number;
->b : Symbol(b, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 5, 3))
+declare var b: number;
+>b : Symbol(b, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 5, 11))
 
-var c: E;
->c : Symbol(c, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 6, 3))
+declare var c: E;
+>c : Symbol(c, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 6, 11))
 >E : Symbol(E, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 0, 0))
 
-var d: string;
->d : Symbol(d, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 7, 3))
+declare var d: string;
+>d : Symbol(d, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 7, 11))
 
 // undefined + any
 var r1: any = undefined + a;
 >r1 : Symbol(r1, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 10, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 4, 3))
+>a : Symbol(a, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 4, 11))
 
 var r2: any = a + undefined;
 >r2 : Symbol(r2, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 11, 3))
->a : Symbol(a, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 4, 3))
+>a : Symbol(a, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 4, 11))
 >undefined : Symbol(undefined)
 
 // undefined + number/enum
 var r3 = undefined + b;
 >r3 : Symbol(r3, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 14, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 5, 3))
+>b : Symbol(b, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 5, 11))
 
 var r4 = undefined + 1;
 >r4 : Symbol(r4, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 15, 3))
@@ -46,7 +46,7 @@ var r4 = undefined + 1;
 var r5 = undefined + c;
 >r5 : Symbol(r5, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 16, 3))
 >undefined : Symbol(undefined)
->c : Symbol(c, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 6, 3))
+>c : Symbol(c, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 6, 11))
 
 var r6 = undefined + E.a;
 >r6 : Symbol(r6, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 17, 3))
@@ -63,7 +63,7 @@ var r7 = undefined + E['a'];
 
 var r8 = b + undefined;
 >r8 : Symbol(r8, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 19, 3))
->b : Symbol(b, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 5, 3))
+>b : Symbol(b, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 5, 11))
 >undefined : Symbol(undefined)
 
 var r9 = 1 + undefined;
@@ -72,7 +72,7 @@ var r9 = 1 + undefined;
 
 var r10 = c + undefined
 >r10 : Symbol(r10, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 21, 3))
->c : Symbol(c, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 6, 3))
+>c : Symbol(c, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 6, 11))
 >undefined : Symbol(undefined)
 
 var r11 = E.a + undefined;
@@ -92,7 +92,7 @@ var r12 = E['a'] + undefined;
 var r13 = undefined + d;
 >r13 : Symbol(r13, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 26, 3))
 >undefined : Symbol(undefined)
->d : Symbol(d, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 7, 3))
+>d : Symbol(d, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 7, 11))
 
 var r14 = undefined + '';
 >r14 : Symbol(r14, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 27, 3))
@@ -100,7 +100,7 @@ var r14 = undefined + '';
 
 var r15 = d + undefined;
 >r15 : Symbol(r15, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 28, 3))
->d : Symbol(d, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 7, 3))
+>d : Symbol(d, Decl(additionOperatorWithUndefinedValueAndValidOperator.ts, 7, 11))
 >undefined : Symbol(undefined)
 
 var r16 = '' + undefined;
diff --git a/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.types b/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.types
index 5f36bcdc37951..3c87e85c3bded 100644
--- a/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.types
+++ b/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.types
@@ -13,19 +13,19 @@ enum E { a, b, c }
 >c : E.c
 >  : ^^^
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
-var b: number;
+declare var b: number;
 >b : number
 >  : ^^^^^^
 
-var c: E;
+declare var c: E;
 >c : E
 >  : ^
 
-var d: string;
+declare var d: string;
 >d : string
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.errors.txt b/tests/baselines/reference/aliasOnMergedModuleInterface.errors.txt
index 327faccff8a54..cd328111bba70 100644
--- a/tests/baselines/reference/aliasOnMergedModuleInterface.errors.txt
+++ b/tests/baselines/reference/aliasOnMergedModuleInterface.errors.txt
@@ -4,7 +4,7 @@ aliasOnMergedModuleInterface_1.ts(5,16): error TS2708: Cannot use namespace 'foo
 ==== aliasOnMergedModuleInterface_1.ts (1 errors) ====
     ///<reference path='aliasOnMergedModuleInterface_0.ts' />
     import foo = require("foo")
-    var z: foo;
+    declare var z: foo;
     z.bar("hello"); // This should be ok
     var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be error
                    ~~~
diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.js b/tests/baselines/reference/aliasOnMergedModuleInterface.js
index e7cac961b653a..3d032add8eb62 100644
--- a/tests/baselines/reference/aliasOnMergedModuleInterface.js
+++ b/tests/baselines/reference/aliasOnMergedModuleInterface.js
@@ -16,7 +16,7 @@ declare module "foo"
 //// [aliasOnMergedModuleInterface_1.ts]
 ///<reference path='aliasOnMergedModuleInterface_0.ts' />
 import foo = require("foo")
-var z: foo;
+declare var z: foo;
 z.bar("hello"); // This should be ok
 var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be error
 
@@ -25,6 +25,5 @@ var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be err
 //// [aliasOnMergedModuleInterface_1.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var z;
 z.bar("hello"); // This should be ok
 var x = foo.bar("hello"); // foo.A should be ok but foo.bar should be error
diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.symbols b/tests/baselines/reference/aliasOnMergedModuleInterface.symbols
index 6544197e32e71..16f71fc1185ff 100644
--- a/tests/baselines/reference/aliasOnMergedModuleInterface.symbols
+++ b/tests/baselines/reference/aliasOnMergedModuleInterface.symbols
@@ -5,13 +5,13 @@
 import foo = require("foo")
 >foo : Symbol(foo, Decl(aliasOnMergedModuleInterface_1.ts, 0, 0))
 
-var z: foo;
->z : Symbol(z, Decl(aliasOnMergedModuleInterface_1.ts, 2, 3))
+declare var z: foo;
+>z : Symbol(z, Decl(aliasOnMergedModuleInterface_1.ts, 2, 11))
 >foo : Symbol(foo, Decl(aliasOnMergedModuleInterface_1.ts, 0, 0))
 
 z.bar("hello"); // This should be ok
 >z.bar : Symbol(foo.bar, Decl(aliasOnMergedModuleInterface_0.ts, 6, 17))
->z : Symbol(z, Decl(aliasOnMergedModuleInterface_1.ts, 2, 3))
+>z : Symbol(z, Decl(aliasOnMergedModuleInterface_1.ts, 2, 11))
 >bar : Symbol(foo.bar, Decl(aliasOnMergedModuleInterface_0.ts, 6, 17))
 
 var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be error
diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.types b/tests/baselines/reference/aliasOnMergedModuleInterface.types
index 756caf50f4beb..08d42e1f8ed53 100644
--- a/tests/baselines/reference/aliasOnMergedModuleInterface.types
+++ b/tests/baselines/reference/aliasOnMergedModuleInterface.types
@@ -6,7 +6,7 @@ import foo = require("foo")
 >foo : any
 >    : ^^^
 
-var z: foo;
+declare var z: foo;
 >z : foo
 >  : ^^^
 
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.errors.txt b/tests/baselines/reference/aliasUsageInOrExpression.errors.txt
index 2ac162439c2c7..85113b6a55d79 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.errors.txt
+++ b/tests/baselines/reference/aliasUsageInOrExpression.errors.txt
@@ -8,7 +8,7 @@ aliasUsageInOrExpression_main.ts(11,40): error TS2873: This kind of expression i
     interface IHasVisualizationModel {
         VisualizationModel: typeof Backbone.Model;
     }
-    var i: IHasVisualizationModel;
+    declare var i: IHasVisualizationModel;
     var d1 = i || moduleA;
     var d2: IHasVisualizationModel = i || moduleA;
     var d2: IHasVisualizationModel = moduleA || i;
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js
index 63f9cade8fef1..25545e99de318 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.js
+++ b/tests/baselines/reference/aliasUsageInOrExpression.js
@@ -17,7 +17,7 @@ import moduleA = require("./aliasUsageInOrExpression_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
-var i: IHasVisualizationModel;
+declare var i: IHasVisualizationModel;
 var d1 = i || moduleA;
 var d2: IHasVisualizationModel = i || moduleA;
 var d2: IHasVisualizationModel = moduleA || i;
@@ -66,7 +66,6 @@ exports.VisualizationModel = VisualizationModel;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var moduleA = require("./aliasUsageInOrExpression_moduleA");
-var i;
 var d1 = i || moduleA;
 var d2 = i || moduleA;
 var d2 = moduleA || i;
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.symbols b/tests/baselines/reference/aliasUsageInOrExpression.symbols
index 8c56640fb27a2..6cb0647c087df 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.symbols
+++ b/tests/baselines/reference/aliasUsageInOrExpression.symbols
@@ -16,26 +16,26 @@ interface IHasVisualizationModel {
 >Backbone : Symbol(Backbone, Decl(aliasUsageInOrExpression_main.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInOrExpression_backbone.ts, 0, 0))
 }
-var i: IHasVisualizationModel;
->i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 3))
+declare var i: IHasVisualizationModel;
+>i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 11))
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 
 var d1 = i || moduleA;
 >d1 : Symbol(d1, Decl(aliasUsageInOrExpression_main.ts, 6, 3))
->i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 3))
+>i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 11))
 >moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 65))
 
 var d2: IHasVisualizationModel = i || moduleA;
 >d2 : Symbol(d2, Decl(aliasUsageInOrExpression_main.ts, 7, 3), Decl(aliasUsageInOrExpression_main.ts, 8, 3))
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
->i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 3))
+>i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 11))
 >moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 65))
 
 var d2: IHasVisualizationModel = moduleA || i;
 >d2 : Symbol(d2, Decl(aliasUsageInOrExpression_main.ts, 7, 3), Decl(aliasUsageInOrExpression_main.ts, 8, 3))
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 >moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 65))
->i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 3))
+>i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 11))
 
 var e: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null || { x: moduleA };
 >e : Symbol(e, Decl(aliasUsageInOrExpression_main.ts, 9, 3))
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.types b/tests/baselines/reference/aliasUsageInOrExpression.types
index f79acc30c5c75..ab24f27750295 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.types
+++ b/tests/baselines/reference/aliasUsageInOrExpression.types
@@ -20,7 +20,7 @@ interface IHasVisualizationModel {
 >Model : typeof Backbone.Model
 >      : ^^^^^^^^^^^^^^^^^^^^^
 }
-var i: IHasVisualizationModel;
+declare var i: IHasVisualizationModel;
 >i : IHasVisualizationModel
 >  : ^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/alwaysStrictModule2.errors.txt b/tests/baselines/reference/alwaysStrictModule2.errors.txt
index d1302f9c0c5f0..9f15368183c0a 100644
--- a/tests/baselines/reference/alwaysStrictModule2.errors.txt
+++ b/tests/baselines/reference/alwaysStrictModule2.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 a.ts(3,13): error TS1100: Invalid use of 'arguments' in strict mode.
 b.ts(3,13): error TS1100: Invalid use of 'arguments' in strict mode.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (1 errors) ====
     namespace M {
         export function f() {
diff --git a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.errors.txt b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.errors.txt
index 3e48ae27ac125..b78698d948e8a 100644
--- a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.errors.txt
+++ b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== Class.ts (0 errors) ====
     import { Configurable } from "./Configurable"
diff --git a/tests/baselines/reference/amdModuleBundleNoDuplicateDeclarationEmitComments.errors.txt b/tests/baselines/reference/amdModuleBundleNoDuplicateDeclarationEmitComments.errors.txt
index a0f10142a0010..c4877ef823505 100644
--- a/tests/baselines/reference/amdModuleBundleNoDuplicateDeclarationEmitComments.errors.txt
+++ b/tests/baselines/reference/amdModuleBundleNoDuplicateDeclarationEmitComments.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file1.ts (0 errors) ====
     /// <amd-module name="mynamespace::SomeModuleA" />
diff --git a/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.errors.txt b/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.errors.txt
index 7fe239623fa97..8f7727381f762 100644
--- a/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.errors.txt
+++ b/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.errors.txt
@@ -562,12 +562,12 @@ arithmeticOperatorWithInvalidOperands.ts(581,13): error TS2362: The left-hand si
     // an enum type
     enum E { a, b, c }
     
-    var a: any;
-    var b: boolean;
-    var c: number;
-    var d: string;
-    var e: { a: number };
-    var f: Number;
+    declare var a: any;
+    declare var b: boolean;
+    declare var c: number;
+    declare var d: string;
+    declare var e: { a: number };
+    declare var f: Number;
     
     // All of the below should be an error unless otherwise noted
     // operator *
diff --git a/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.js b/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.js
index 691081b53722b..e8a6cfa93d418 100644
--- a/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.js
+++ b/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.js
@@ -5,12 +5,12 @@
 // an enum type
 enum E { a, b, c }
 
-var a: any;
-var b: boolean;
-var c: number;
-var d: string;
-var e: { a: number };
-var f: Number;
+declare var a: any;
+declare var b: boolean;
+declare var c: number;
+declare var d: string;
+declare var e: { a: number };
+declare var f: Number;
 
 // All of the below should be an error unless otherwise noted
 // operator *
@@ -592,12 +592,6 @@ var E;
     E[E["b"] = 1] = "b";
     E[E["c"] = 2] = "c";
 })(E || (E = {}));
-var a;
-var b;
-var c;
-var d;
-var e;
-var f;
 // All of the below should be an error unless otherwise noted
 // operator *
 var r1a1 = a * a; //ok
diff --git a/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.symbols b/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.symbols
index b087cff2b360d..59697e9684c70 100644
--- a/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.symbols
+++ b/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.symbols
@@ -9,288 +9,288 @@ enum E { a, b, c }
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >c : Symbol(E.c, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 14))
 
-var a: any;
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+declare var a: any;
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
-var b: boolean;
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+declare var b: boolean;
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
-var c: number;
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+declare var c: number;
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
-var d: string;
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+declare var d: string;
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
-var e: { a: number };
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 8))
+declare var e: { a: number };
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 16))
 
-var f: Number;
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+declare var f: Number;
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 >Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 // All of the below should be an error unless otherwise noted
 // operator *
 var r1a1 = a * a; //ok
 >r1a1 : Symbol(r1a1, Decl(arithmeticOperatorWithInvalidOperands.ts, 13, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r1a2 = a * b;
 >r1a2 : Symbol(r1a2, Decl(arithmeticOperatorWithInvalidOperands.ts, 14, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r1a3 = a * c; //ok
 >r1a3 : Symbol(r1a3, Decl(arithmeticOperatorWithInvalidOperands.ts, 15, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r1a4 = a * d;
 >r1a4 : Symbol(r1a4, Decl(arithmeticOperatorWithInvalidOperands.ts, 16, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r1a5 = a * e;
 >r1a5 : Symbol(r1a5, Decl(arithmeticOperatorWithInvalidOperands.ts, 17, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r1a6 = a * f;
 >r1a6 : Symbol(r1a6, Decl(arithmeticOperatorWithInvalidOperands.ts, 18, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r1b1 = b * a;
 >r1b1 : Symbol(r1b1, Decl(arithmeticOperatorWithInvalidOperands.ts, 20, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r1b2 = b * b;
 >r1b2 : Symbol(r1b2, Decl(arithmeticOperatorWithInvalidOperands.ts, 21, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r1b3 = b * c;
 >r1b3 : Symbol(r1b3, Decl(arithmeticOperatorWithInvalidOperands.ts, 22, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r1b4 = b * d;
 >r1b4 : Symbol(r1b4, Decl(arithmeticOperatorWithInvalidOperands.ts, 23, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r1b5 = b * e;
 >r1b5 : Symbol(r1b5, Decl(arithmeticOperatorWithInvalidOperands.ts, 24, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r1b6 = b * f;
 >r1b6 : Symbol(r1b6, Decl(arithmeticOperatorWithInvalidOperands.ts, 25, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r1c1 = c * a; //ok
 >r1c1 : Symbol(r1c1, Decl(arithmeticOperatorWithInvalidOperands.ts, 27, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r1c2 = c * b;
 >r1c2 : Symbol(r1c2, Decl(arithmeticOperatorWithInvalidOperands.ts, 28, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r1c3 = c * c; //ok
 >r1c3 : Symbol(r1c3, Decl(arithmeticOperatorWithInvalidOperands.ts, 29, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r1c4 = c * d;
 >r1c4 : Symbol(r1c4, Decl(arithmeticOperatorWithInvalidOperands.ts, 30, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r1c5 = c * e;
 >r1c5 : Symbol(r1c5, Decl(arithmeticOperatorWithInvalidOperands.ts, 31, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r1c6 = c * f;
 >r1c6 : Symbol(r1c6, Decl(arithmeticOperatorWithInvalidOperands.ts, 32, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r1d1 = d * a;
 >r1d1 : Symbol(r1d1, Decl(arithmeticOperatorWithInvalidOperands.ts, 34, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r1d2 = d * b;
 >r1d2 : Symbol(r1d2, Decl(arithmeticOperatorWithInvalidOperands.ts, 35, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r1d3 = d * c;
 >r1d3 : Symbol(r1d3, Decl(arithmeticOperatorWithInvalidOperands.ts, 36, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r1d4 = d * d;
 >r1d4 : Symbol(r1d4, Decl(arithmeticOperatorWithInvalidOperands.ts, 37, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r1d5 = d * e;
 >r1d5 : Symbol(r1d5, Decl(arithmeticOperatorWithInvalidOperands.ts, 38, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r1d6 = d * f;
 >r1d6 : Symbol(r1d6, Decl(arithmeticOperatorWithInvalidOperands.ts, 39, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r1e1 = e * a;
 >r1e1 : Symbol(r1e1, Decl(arithmeticOperatorWithInvalidOperands.ts, 41, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r1e2 = e * b;
 >r1e2 : Symbol(r1e2, Decl(arithmeticOperatorWithInvalidOperands.ts, 42, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r1e3 = e * c;
 >r1e3 : Symbol(r1e3, Decl(arithmeticOperatorWithInvalidOperands.ts, 43, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r1e4 = e * d;
 >r1e4 : Symbol(r1e4, Decl(arithmeticOperatorWithInvalidOperands.ts, 44, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r1e5 = e * e;
 >r1e5 : Symbol(r1e5, Decl(arithmeticOperatorWithInvalidOperands.ts, 45, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r1e6 = e * f;
 >r1e6 : Symbol(r1e6, Decl(arithmeticOperatorWithInvalidOperands.ts, 46, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r1f1 = f * a;
 >r1f1 : Symbol(r1f1, Decl(arithmeticOperatorWithInvalidOperands.ts, 48, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r1f2 = f * b;
 >r1f2 : Symbol(r1f2, Decl(arithmeticOperatorWithInvalidOperands.ts, 49, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r1f3 = f * c;
 >r1f3 : Symbol(r1f3, Decl(arithmeticOperatorWithInvalidOperands.ts, 50, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r1f4 = f * d;
 >r1f4 : Symbol(r1f4, Decl(arithmeticOperatorWithInvalidOperands.ts, 51, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r1f5 = f * e;
 >r1f5 : Symbol(r1f5, Decl(arithmeticOperatorWithInvalidOperands.ts, 52, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r1f6 = f * f;
 >r1f6 : Symbol(r1f6, Decl(arithmeticOperatorWithInvalidOperands.ts, 53, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r1g1 = E.a * a; //ok
 >r1g1 : Symbol(r1g1, Decl(arithmeticOperatorWithInvalidOperands.ts, 55, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r1g2 = E.a * b;
 >r1g2 : Symbol(r1g2, Decl(arithmeticOperatorWithInvalidOperands.ts, 56, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r1g3 = E.a * c; //ok
 >r1g3 : Symbol(r1g3, Decl(arithmeticOperatorWithInvalidOperands.ts, 57, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r1g4 = E.a * d;
 >r1g4 : Symbol(r1g4, Decl(arithmeticOperatorWithInvalidOperands.ts, 58, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r1g5 = E.a * e;
 >r1g5 : Symbol(r1g5, Decl(arithmeticOperatorWithInvalidOperands.ts, 59, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r1g6 = E.a * f;
 >r1g6 : Symbol(r1g6, Decl(arithmeticOperatorWithInvalidOperands.ts, 60, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r1h1 = a * E.b; //ok
 >r1h1 : Symbol(r1h1, Decl(arithmeticOperatorWithInvalidOperands.ts, 62, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r1h2 = b * E.b;
 >r1h2 : Symbol(r1h2, Decl(arithmeticOperatorWithInvalidOperands.ts, 63, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r1h3 = c * E.b; //ok
 >r1h3 : Symbol(r1h3, Decl(arithmeticOperatorWithInvalidOperands.ts, 64, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r1h4 = d * E.b;
 >r1h4 : Symbol(r1h4, Decl(arithmeticOperatorWithInvalidOperands.ts, 65, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r1h5 = e * E.b;
 >r1h5 : Symbol(r1h5, Decl(arithmeticOperatorWithInvalidOperands.ts, 66, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r1h6 = f * E.b;
 >r1h6 : Symbol(r1h6, Decl(arithmeticOperatorWithInvalidOperands.ts, 67, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
@@ -298,264 +298,264 @@ var r1h6 = f * E.b;
 // operator /
 var r2a1 = a / a; //ok
 >r2a1 : Symbol(r2a1, Decl(arithmeticOperatorWithInvalidOperands.ts, 70, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r2a2 = a / b;
 >r2a2 : Symbol(r2a2, Decl(arithmeticOperatorWithInvalidOperands.ts, 71, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r2a3 = a / c; //ok
 >r2a3 : Symbol(r2a3, Decl(arithmeticOperatorWithInvalidOperands.ts, 72, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r2a4 = a / d;
 >r2a4 : Symbol(r2a4, Decl(arithmeticOperatorWithInvalidOperands.ts, 73, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r2a5 = a / e;
 >r2a5 : Symbol(r2a5, Decl(arithmeticOperatorWithInvalidOperands.ts, 74, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r2a6 = a / f;
 >r2a6 : Symbol(r2a6, Decl(arithmeticOperatorWithInvalidOperands.ts, 75, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r2b1 = b / a;
 >r2b1 : Symbol(r2b1, Decl(arithmeticOperatorWithInvalidOperands.ts, 77, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r2b2 = b / b;
 >r2b2 : Symbol(r2b2, Decl(arithmeticOperatorWithInvalidOperands.ts, 78, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r2b3 = b / c;
 >r2b3 : Symbol(r2b3, Decl(arithmeticOperatorWithInvalidOperands.ts, 79, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r2b4 = b / d;
 >r2b4 : Symbol(r2b4, Decl(arithmeticOperatorWithInvalidOperands.ts, 80, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r2b5 = b / e;
 >r2b5 : Symbol(r2b5, Decl(arithmeticOperatorWithInvalidOperands.ts, 81, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r2b6 = b / f;
 >r2b6 : Symbol(r2b6, Decl(arithmeticOperatorWithInvalidOperands.ts, 82, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r2c1 = c / a; //ok
 >r2c1 : Symbol(r2c1, Decl(arithmeticOperatorWithInvalidOperands.ts, 84, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r2c2 = c / b;
 >r2c2 : Symbol(r2c2, Decl(arithmeticOperatorWithInvalidOperands.ts, 85, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r2c3 = c / c; //ok
 >r2c3 : Symbol(r2c3, Decl(arithmeticOperatorWithInvalidOperands.ts, 86, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r2c4 = c / d;
 >r2c4 : Symbol(r2c4, Decl(arithmeticOperatorWithInvalidOperands.ts, 87, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r2c5 = c / e;
 >r2c5 : Symbol(r2c5, Decl(arithmeticOperatorWithInvalidOperands.ts, 88, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r2c6 = c / f;
 >r2c6 : Symbol(r2c6, Decl(arithmeticOperatorWithInvalidOperands.ts, 89, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r2d1 = d / a;
 >r2d1 : Symbol(r2d1, Decl(arithmeticOperatorWithInvalidOperands.ts, 91, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r2d2 = d / b;
 >r2d2 : Symbol(r2d2, Decl(arithmeticOperatorWithInvalidOperands.ts, 92, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r2d3 = d / c;
 >r2d3 : Symbol(r2d3, Decl(arithmeticOperatorWithInvalidOperands.ts, 93, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r2d4 = d / d;
 >r2d4 : Symbol(r2d4, Decl(arithmeticOperatorWithInvalidOperands.ts, 94, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r2d5 = d / e;
 >r2d5 : Symbol(r2d5, Decl(arithmeticOperatorWithInvalidOperands.ts, 95, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r2d6 = d / f;
 >r2d6 : Symbol(r2d6, Decl(arithmeticOperatorWithInvalidOperands.ts, 96, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r2e1 = e / a;
 >r2e1 : Symbol(r2e1, Decl(arithmeticOperatorWithInvalidOperands.ts, 98, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r2e2 = e / b;
 >r2e2 : Symbol(r2e2, Decl(arithmeticOperatorWithInvalidOperands.ts, 99, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r2e3 = e / c;
 >r2e3 : Symbol(r2e3, Decl(arithmeticOperatorWithInvalidOperands.ts, 100, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r2e4 = e / d;
 >r2e4 : Symbol(r2e4, Decl(arithmeticOperatorWithInvalidOperands.ts, 101, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r2e5 = e / e;
 >r2e5 : Symbol(r2e5, Decl(arithmeticOperatorWithInvalidOperands.ts, 102, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r2e6 = e / f;
 >r2e6 : Symbol(r2e6, Decl(arithmeticOperatorWithInvalidOperands.ts, 103, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r2f1 = f / a;
 >r2f1 : Symbol(r2f1, Decl(arithmeticOperatorWithInvalidOperands.ts, 105, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r2f2 = f / b;
 >r2f2 : Symbol(r2f2, Decl(arithmeticOperatorWithInvalidOperands.ts, 106, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r2f3 = f / c;
 >r2f3 : Symbol(r2f3, Decl(arithmeticOperatorWithInvalidOperands.ts, 107, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r2f4 = f / d;
 >r2f4 : Symbol(r2f4, Decl(arithmeticOperatorWithInvalidOperands.ts, 108, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r2f5 = f / e;
 >r2f5 : Symbol(r2f5, Decl(arithmeticOperatorWithInvalidOperands.ts, 109, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r2f6 = f / f;
 >r2f6 : Symbol(r2f6, Decl(arithmeticOperatorWithInvalidOperands.ts, 110, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r2g1 = E.a / a; //ok
 >r2g1 : Symbol(r2g1, Decl(arithmeticOperatorWithInvalidOperands.ts, 112, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r2g2 = E.a / b;
 >r2g2 : Symbol(r2g2, Decl(arithmeticOperatorWithInvalidOperands.ts, 113, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r2g3 = E.a / c; //ok
 >r2g3 : Symbol(r2g3, Decl(arithmeticOperatorWithInvalidOperands.ts, 114, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r2g4 = E.a / d;
 >r2g4 : Symbol(r2g4, Decl(arithmeticOperatorWithInvalidOperands.ts, 115, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r2g5 = E.a / e;
 >r2g5 : Symbol(r2g5, Decl(arithmeticOperatorWithInvalidOperands.ts, 116, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r2g6 = E.a / f;
 >r2g6 : Symbol(r2g6, Decl(arithmeticOperatorWithInvalidOperands.ts, 117, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r2h1 = a / E.b; //ok
 >r2h1 : Symbol(r2h1, Decl(arithmeticOperatorWithInvalidOperands.ts, 119, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r2h2 = b / E.b;
 >r2h2 : Symbol(r2h2, Decl(arithmeticOperatorWithInvalidOperands.ts, 120, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r2h3 = c / E.b; //ok
 >r2h3 : Symbol(r2h3, Decl(arithmeticOperatorWithInvalidOperands.ts, 121, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r2h4 = d / E.b;
 >r2h4 : Symbol(r2h4, Decl(arithmeticOperatorWithInvalidOperands.ts, 122, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r2h5 = e / E.b;
 >r2h5 : Symbol(r2h5, Decl(arithmeticOperatorWithInvalidOperands.ts, 123, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r2h6 = f / E.b;
 >r2h6 : Symbol(r2h6, Decl(arithmeticOperatorWithInvalidOperands.ts, 124, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
@@ -563,264 +563,264 @@ var r2h6 = f / E.b;
 // operator %
 var r3a1 = a % a; //ok
 >r3a1 : Symbol(r3a1, Decl(arithmeticOperatorWithInvalidOperands.ts, 127, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r3a2 = a % b;
 >r3a2 : Symbol(r3a2, Decl(arithmeticOperatorWithInvalidOperands.ts, 128, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r3a3 = a % c; //ok
 >r3a3 : Symbol(r3a3, Decl(arithmeticOperatorWithInvalidOperands.ts, 129, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r3a4 = a % d;
 >r3a4 : Symbol(r3a4, Decl(arithmeticOperatorWithInvalidOperands.ts, 130, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r3a5 = a % e;
 >r3a5 : Symbol(r3a5, Decl(arithmeticOperatorWithInvalidOperands.ts, 131, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r3a6 = a % f;
 >r3a6 : Symbol(r3a6, Decl(arithmeticOperatorWithInvalidOperands.ts, 132, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r3b1 = b % a;
 >r3b1 : Symbol(r3b1, Decl(arithmeticOperatorWithInvalidOperands.ts, 134, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r3b2 = b % b;
 >r3b2 : Symbol(r3b2, Decl(arithmeticOperatorWithInvalidOperands.ts, 135, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r3b3 = b % c;
 >r3b3 : Symbol(r3b3, Decl(arithmeticOperatorWithInvalidOperands.ts, 136, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r3b4 = b % d;
 >r3b4 : Symbol(r3b4, Decl(arithmeticOperatorWithInvalidOperands.ts, 137, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r3b5 = b % e;
 >r3b5 : Symbol(r3b5, Decl(arithmeticOperatorWithInvalidOperands.ts, 138, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r3b6 = b % f;
 >r3b6 : Symbol(r3b6, Decl(arithmeticOperatorWithInvalidOperands.ts, 139, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r3c1 = c % a; //ok
 >r3c1 : Symbol(r3c1, Decl(arithmeticOperatorWithInvalidOperands.ts, 141, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r3c2 = c % b;
 >r3c2 : Symbol(r3c2, Decl(arithmeticOperatorWithInvalidOperands.ts, 142, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r3c3 = c % c; //ok
 >r3c3 : Symbol(r3c3, Decl(arithmeticOperatorWithInvalidOperands.ts, 143, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r3c4 = c % d;
 >r3c4 : Symbol(r3c4, Decl(arithmeticOperatorWithInvalidOperands.ts, 144, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r3c5 = c % e;
 >r3c5 : Symbol(r3c5, Decl(arithmeticOperatorWithInvalidOperands.ts, 145, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r3c6 = c % f;
 >r3c6 : Symbol(r3c6, Decl(arithmeticOperatorWithInvalidOperands.ts, 146, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r3d1 = d % a;
 >r3d1 : Symbol(r3d1, Decl(arithmeticOperatorWithInvalidOperands.ts, 148, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r3d2 = d % b;
 >r3d2 : Symbol(r3d2, Decl(arithmeticOperatorWithInvalidOperands.ts, 149, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r3d3 = d % c;
 >r3d3 : Symbol(r3d3, Decl(arithmeticOperatorWithInvalidOperands.ts, 150, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r3d4 = d % d;
 >r3d4 : Symbol(r3d4, Decl(arithmeticOperatorWithInvalidOperands.ts, 151, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r3d5 = d % e;
 >r3d5 : Symbol(r3d5, Decl(arithmeticOperatorWithInvalidOperands.ts, 152, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r3d6 = d % f;
 >r3d6 : Symbol(r3d6, Decl(arithmeticOperatorWithInvalidOperands.ts, 153, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r3e1 = e % a;
 >r3e1 : Symbol(r3e1, Decl(arithmeticOperatorWithInvalidOperands.ts, 155, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r3e2 = e % b;
 >r3e2 : Symbol(r3e2, Decl(arithmeticOperatorWithInvalidOperands.ts, 156, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r3e3 = e % c;
 >r3e3 : Symbol(r3e3, Decl(arithmeticOperatorWithInvalidOperands.ts, 157, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r3e4 = e % d;
 >r3e4 : Symbol(r3e4, Decl(arithmeticOperatorWithInvalidOperands.ts, 158, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r3e5 = e % e;
 >r3e5 : Symbol(r3e5, Decl(arithmeticOperatorWithInvalidOperands.ts, 159, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r3e6 = e % f;
 >r3e6 : Symbol(r3e6, Decl(arithmeticOperatorWithInvalidOperands.ts, 160, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r3f1 = f % a;
 >r3f1 : Symbol(r3f1, Decl(arithmeticOperatorWithInvalidOperands.ts, 162, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r3f2 = f % b;
 >r3f2 : Symbol(r3f2, Decl(arithmeticOperatorWithInvalidOperands.ts, 163, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r3f3 = f % c;
 >r3f3 : Symbol(r3f3, Decl(arithmeticOperatorWithInvalidOperands.ts, 164, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r3f4 = f % d;
 >r3f4 : Symbol(r3f4, Decl(arithmeticOperatorWithInvalidOperands.ts, 165, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r3f5 = f % e;
 >r3f5 : Symbol(r3f5, Decl(arithmeticOperatorWithInvalidOperands.ts, 166, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r3f6 = f % f;
 >r3f6 : Symbol(r3f6, Decl(arithmeticOperatorWithInvalidOperands.ts, 167, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r3g1 = E.a % a; //ok
 >r3g1 : Symbol(r3g1, Decl(arithmeticOperatorWithInvalidOperands.ts, 169, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r3g2 = E.a % b;
 >r3g2 : Symbol(r3g2, Decl(arithmeticOperatorWithInvalidOperands.ts, 170, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r3g3 = E.a % c; //ok
 >r3g3 : Symbol(r3g3, Decl(arithmeticOperatorWithInvalidOperands.ts, 171, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r3g4 = E.a % d;
 >r3g4 : Symbol(r3g4, Decl(arithmeticOperatorWithInvalidOperands.ts, 172, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r3g5 = E.a % e;
 >r3g5 : Symbol(r3g5, Decl(arithmeticOperatorWithInvalidOperands.ts, 173, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r3g6 = E.a % f;
 >r3g6 : Symbol(r3g6, Decl(arithmeticOperatorWithInvalidOperands.ts, 174, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r3h1 = a % E.b; //ok
 >r3h1 : Symbol(r3h1, Decl(arithmeticOperatorWithInvalidOperands.ts, 176, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r3h2 = b % E.b;
 >r3h2 : Symbol(r3h2, Decl(arithmeticOperatorWithInvalidOperands.ts, 177, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r3h3 = c % E.b; //ok
 >r3h3 : Symbol(r3h3, Decl(arithmeticOperatorWithInvalidOperands.ts, 178, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r3h4 = d % E.b;
 >r3h4 : Symbol(r3h4, Decl(arithmeticOperatorWithInvalidOperands.ts, 179, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r3h5 = e % E.b;
 >r3h5 : Symbol(r3h5, Decl(arithmeticOperatorWithInvalidOperands.ts, 180, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r3h6 = f % E.b;
 >r3h6 : Symbol(r3h6, Decl(arithmeticOperatorWithInvalidOperands.ts, 181, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
@@ -828,264 +828,264 @@ var r3h6 = f % E.b;
 // operator -
 var r4a1 = a - a; //ok
 >r4a1 : Symbol(r4a1, Decl(arithmeticOperatorWithInvalidOperands.ts, 184, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r4a2 = a - b;
 >r4a2 : Symbol(r4a2, Decl(arithmeticOperatorWithInvalidOperands.ts, 185, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r4a3 = a - c; //ok
 >r4a3 : Symbol(r4a3, Decl(arithmeticOperatorWithInvalidOperands.ts, 186, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r4a4 = a - d;
 >r4a4 : Symbol(r4a4, Decl(arithmeticOperatorWithInvalidOperands.ts, 187, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r4a5 = a - e;
 >r4a5 : Symbol(r4a5, Decl(arithmeticOperatorWithInvalidOperands.ts, 188, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r4a6 = a - f;
 >r4a6 : Symbol(r4a6, Decl(arithmeticOperatorWithInvalidOperands.ts, 189, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r4b1 = b - a;
 >r4b1 : Symbol(r4b1, Decl(arithmeticOperatorWithInvalidOperands.ts, 191, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r4b2 = b - b;
 >r4b2 : Symbol(r4b2, Decl(arithmeticOperatorWithInvalidOperands.ts, 192, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r4b3 = b - c;
 >r4b3 : Symbol(r4b3, Decl(arithmeticOperatorWithInvalidOperands.ts, 193, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r4b4 = b - d;
 >r4b4 : Symbol(r4b4, Decl(arithmeticOperatorWithInvalidOperands.ts, 194, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r4b5 = b - e;
 >r4b5 : Symbol(r4b5, Decl(arithmeticOperatorWithInvalidOperands.ts, 195, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r4b6 = b - f;
 >r4b6 : Symbol(r4b6, Decl(arithmeticOperatorWithInvalidOperands.ts, 196, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r4c1 = c - a; //ok
 >r4c1 : Symbol(r4c1, Decl(arithmeticOperatorWithInvalidOperands.ts, 198, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r4c2 = c - b;
 >r4c2 : Symbol(r4c2, Decl(arithmeticOperatorWithInvalidOperands.ts, 199, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r4c3 = c - c; //ok
 >r4c3 : Symbol(r4c3, Decl(arithmeticOperatorWithInvalidOperands.ts, 200, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r4c4 = c - d;
 >r4c4 : Symbol(r4c4, Decl(arithmeticOperatorWithInvalidOperands.ts, 201, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r4c5 = c - e;
 >r4c5 : Symbol(r4c5, Decl(arithmeticOperatorWithInvalidOperands.ts, 202, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r4c6 = c - f;
 >r4c6 : Symbol(r4c6, Decl(arithmeticOperatorWithInvalidOperands.ts, 203, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r4d1 = d - a;
 >r4d1 : Symbol(r4d1, Decl(arithmeticOperatorWithInvalidOperands.ts, 205, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r4d2 = d - b;
 >r4d2 : Symbol(r4d2, Decl(arithmeticOperatorWithInvalidOperands.ts, 206, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r4d3 = d - c;
 >r4d3 : Symbol(r4d3, Decl(arithmeticOperatorWithInvalidOperands.ts, 207, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r4d4 = d - d;
 >r4d4 : Symbol(r4d4, Decl(arithmeticOperatorWithInvalidOperands.ts, 208, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r4d5 = d - e;
 >r4d5 : Symbol(r4d5, Decl(arithmeticOperatorWithInvalidOperands.ts, 209, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r4d6 = d - f;
 >r4d6 : Symbol(r4d6, Decl(arithmeticOperatorWithInvalidOperands.ts, 210, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r4e1 = e - a;
 >r4e1 : Symbol(r4e1, Decl(arithmeticOperatorWithInvalidOperands.ts, 212, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r4e2 = e - b;
 >r4e2 : Symbol(r4e2, Decl(arithmeticOperatorWithInvalidOperands.ts, 213, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r4e3 = e - c;
 >r4e3 : Symbol(r4e3, Decl(arithmeticOperatorWithInvalidOperands.ts, 214, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r4e4 = e - d;
 >r4e4 : Symbol(r4e4, Decl(arithmeticOperatorWithInvalidOperands.ts, 215, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r4e5 = e - e;
 >r4e5 : Symbol(r4e5, Decl(arithmeticOperatorWithInvalidOperands.ts, 216, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r4e6 = e - f;
 >r4e6 : Symbol(r4e6, Decl(arithmeticOperatorWithInvalidOperands.ts, 217, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r4f1 = f - a;
 >r4f1 : Symbol(r4f1, Decl(arithmeticOperatorWithInvalidOperands.ts, 219, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r4f2 = f - b;
 >r4f2 : Symbol(r4f2, Decl(arithmeticOperatorWithInvalidOperands.ts, 220, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r4f3 = f - c;
 >r4f3 : Symbol(r4f3, Decl(arithmeticOperatorWithInvalidOperands.ts, 221, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r4f4 = f - d;
 >r4f4 : Symbol(r4f4, Decl(arithmeticOperatorWithInvalidOperands.ts, 222, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r4f5 = f - e;
 >r4f5 : Symbol(r4f5, Decl(arithmeticOperatorWithInvalidOperands.ts, 223, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r4f6 = f - f;
 >r4f6 : Symbol(r4f6, Decl(arithmeticOperatorWithInvalidOperands.ts, 224, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r4g1 = E.a - a; //ok
 >r4g1 : Symbol(r4g1, Decl(arithmeticOperatorWithInvalidOperands.ts, 226, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r4g2 = E.a - b;
 >r4g2 : Symbol(r4g2, Decl(arithmeticOperatorWithInvalidOperands.ts, 227, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r4g3 = E.a - c; //ok
 >r4g3 : Symbol(r4g3, Decl(arithmeticOperatorWithInvalidOperands.ts, 228, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r4g4 = E.a - d;
 >r4g4 : Symbol(r4g4, Decl(arithmeticOperatorWithInvalidOperands.ts, 229, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r4g5 = E.a - e;
 >r4g5 : Symbol(r4g5, Decl(arithmeticOperatorWithInvalidOperands.ts, 230, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r4g6 = E.a - f;
 >r4g6 : Symbol(r4g6, Decl(arithmeticOperatorWithInvalidOperands.ts, 231, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r4h1 = a - E.b; //ok
 >r4h1 : Symbol(r4h1, Decl(arithmeticOperatorWithInvalidOperands.ts, 233, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r4h2 = b - E.b;
 >r4h2 : Symbol(r4h2, Decl(arithmeticOperatorWithInvalidOperands.ts, 234, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r4h3 = c - E.b; //ok
 >r4h3 : Symbol(r4h3, Decl(arithmeticOperatorWithInvalidOperands.ts, 235, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r4h4 = d - E.b;
 >r4h4 : Symbol(r4h4, Decl(arithmeticOperatorWithInvalidOperands.ts, 236, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r4h5 = e - E.b;
 >r4h5 : Symbol(r4h5, Decl(arithmeticOperatorWithInvalidOperands.ts, 237, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r4h6 = f - E.b;
 >r4h6 : Symbol(r4h6, Decl(arithmeticOperatorWithInvalidOperands.ts, 238, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
@@ -1093,264 +1093,264 @@ var r4h6 = f - E.b;
 // operator <<
 var r5a1 = a << a; //ok
 >r5a1 : Symbol(r5a1, Decl(arithmeticOperatorWithInvalidOperands.ts, 241, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r5a2 = a << b;
 >r5a2 : Symbol(r5a2, Decl(arithmeticOperatorWithInvalidOperands.ts, 242, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r5a3 = a << c; //ok
 >r5a3 : Symbol(r5a3, Decl(arithmeticOperatorWithInvalidOperands.ts, 243, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r5a4 = a << d;
 >r5a4 : Symbol(r5a4, Decl(arithmeticOperatorWithInvalidOperands.ts, 244, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r5a5 = a << e;
 >r5a5 : Symbol(r5a5, Decl(arithmeticOperatorWithInvalidOperands.ts, 245, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r5a6 = a << f;
 >r5a6 : Symbol(r5a6, Decl(arithmeticOperatorWithInvalidOperands.ts, 246, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r5b1 = b << a;
 >r5b1 : Symbol(r5b1, Decl(arithmeticOperatorWithInvalidOperands.ts, 248, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r5b2 = b << b;
 >r5b2 : Symbol(r5b2, Decl(arithmeticOperatorWithInvalidOperands.ts, 249, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r5b3 = b << c;
 >r5b3 : Symbol(r5b3, Decl(arithmeticOperatorWithInvalidOperands.ts, 250, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r5b4 = b << d;
 >r5b4 : Symbol(r5b4, Decl(arithmeticOperatorWithInvalidOperands.ts, 251, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r5b5 = b << e;
 >r5b5 : Symbol(r5b5, Decl(arithmeticOperatorWithInvalidOperands.ts, 252, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r5b6 = b << f;
 >r5b6 : Symbol(r5b6, Decl(arithmeticOperatorWithInvalidOperands.ts, 253, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r5c1 = c << a; //ok
 >r5c1 : Symbol(r5c1, Decl(arithmeticOperatorWithInvalidOperands.ts, 255, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r5c2 = c << b;
 >r5c2 : Symbol(r5c2, Decl(arithmeticOperatorWithInvalidOperands.ts, 256, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r5c3 = c << c; //ok
 >r5c3 : Symbol(r5c3, Decl(arithmeticOperatorWithInvalidOperands.ts, 257, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r5c4 = c << d;
 >r5c4 : Symbol(r5c4, Decl(arithmeticOperatorWithInvalidOperands.ts, 258, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r5c5 = c << e;
 >r5c5 : Symbol(r5c5, Decl(arithmeticOperatorWithInvalidOperands.ts, 259, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r5c6 = c << f;
 >r5c6 : Symbol(r5c6, Decl(arithmeticOperatorWithInvalidOperands.ts, 260, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r5d1 = d << a;
 >r5d1 : Symbol(r5d1, Decl(arithmeticOperatorWithInvalidOperands.ts, 262, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r5d2 = d << b;
 >r5d2 : Symbol(r5d2, Decl(arithmeticOperatorWithInvalidOperands.ts, 263, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r5d3 = d << c;
 >r5d3 : Symbol(r5d3, Decl(arithmeticOperatorWithInvalidOperands.ts, 264, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r5d4 = d << d;
 >r5d4 : Symbol(r5d4, Decl(arithmeticOperatorWithInvalidOperands.ts, 265, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r5d5 = d << e;
 >r5d5 : Symbol(r5d5, Decl(arithmeticOperatorWithInvalidOperands.ts, 266, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r5d6 = d << f;
 >r5d6 : Symbol(r5d6, Decl(arithmeticOperatorWithInvalidOperands.ts, 267, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r5e1 = e << a;
 >r5e1 : Symbol(r5e1, Decl(arithmeticOperatorWithInvalidOperands.ts, 269, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r5e2 = e << b;
 >r5e2 : Symbol(r5e2, Decl(arithmeticOperatorWithInvalidOperands.ts, 270, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r5e3 = e << c;
 >r5e3 : Symbol(r5e3, Decl(arithmeticOperatorWithInvalidOperands.ts, 271, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r5e4 = e << d;
 >r5e4 : Symbol(r5e4, Decl(arithmeticOperatorWithInvalidOperands.ts, 272, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r5e5 = e << e;
 >r5e5 : Symbol(r5e5, Decl(arithmeticOperatorWithInvalidOperands.ts, 273, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r5e6 = e << f;
 >r5e6 : Symbol(r5e6, Decl(arithmeticOperatorWithInvalidOperands.ts, 274, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r5f1 = f << a;
 >r5f1 : Symbol(r5f1, Decl(arithmeticOperatorWithInvalidOperands.ts, 276, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r5f2 = f << b;
 >r5f2 : Symbol(r5f2, Decl(arithmeticOperatorWithInvalidOperands.ts, 277, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r5f3 = f << c;
 >r5f3 : Symbol(r5f3, Decl(arithmeticOperatorWithInvalidOperands.ts, 278, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r5f4 = f << d;
 >r5f4 : Symbol(r5f4, Decl(arithmeticOperatorWithInvalidOperands.ts, 279, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r5f5 = f << e;
 >r5f5 : Symbol(r5f5, Decl(arithmeticOperatorWithInvalidOperands.ts, 280, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r5f6 = f << f;
 >r5f6 : Symbol(r5f6, Decl(arithmeticOperatorWithInvalidOperands.ts, 281, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r5g1 = E.a << a; //ok
 >r5g1 : Symbol(r5g1, Decl(arithmeticOperatorWithInvalidOperands.ts, 283, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r5g2 = E.a << b;
 >r5g2 : Symbol(r5g2, Decl(arithmeticOperatorWithInvalidOperands.ts, 284, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r5g3 = E.a << c; //ok
 >r5g3 : Symbol(r5g3, Decl(arithmeticOperatorWithInvalidOperands.ts, 285, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r5g4 = E.a << d;
 >r5g4 : Symbol(r5g4, Decl(arithmeticOperatorWithInvalidOperands.ts, 286, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r5g5 = E.a << e;
 >r5g5 : Symbol(r5g5, Decl(arithmeticOperatorWithInvalidOperands.ts, 287, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r5g6 = E.a << f;
 >r5g6 : Symbol(r5g6, Decl(arithmeticOperatorWithInvalidOperands.ts, 288, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r5h1 = a << E.b; //ok
 >r5h1 : Symbol(r5h1, Decl(arithmeticOperatorWithInvalidOperands.ts, 290, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r5h2 = b << E.b;
 >r5h2 : Symbol(r5h2, Decl(arithmeticOperatorWithInvalidOperands.ts, 291, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r5h3 = c << E.b; //ok
 >r5h3 : Symbol(r5h3, Decl(arithmeticOperatorWithInvalidOperands.ts, 292, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r5h4 = d << E.b;
 >r5h4 : Symbol(r5h4, Decl(arithmeticOperatorWithInvalidOperands.ts, 293, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r5h5 = e << E.b;
 >r5h5 : Symbol(r5h5, Decl(arithmeticOperatorWithInvalidOperands.ts, 294, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r5h6 = f << E.b;
 >r5h6 : Symbol(r5h6, Decl(arithmeticOperatorWithInvalidOperands.ts, 295, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
@@ -1358,264 +1358,264 @@ var r5h6 = f << E.b;
 // operator >>
 var r6a1 = a >> a; //ok
 >r6a1 : Symbol(r6a1, Decl(arithmeticOperatorWithInvalidOperands.ts, 298, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r6a2 = a >> b;
 >r6a2 : Symbol(r6a2, Decl(arithmeticOperatorWithInvalidOperands.ts, 299, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r6a3 = a >> c; //ok
 >r6a3 : Symbol(r6a3, Decl(arithmeticOperatorWithInvalidOperands.ts, 300, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r6a4 = a >> d;
 >r6a4 : Symbol(r6a4, Decl(arithmeticOperatorWithInvalidOperands.ts, 301, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r6a5 = a >> e;
 >r6a5 : Symbol(r6a5, Decl(arithmeticOperatorWithInvalidOperands.ts, 302, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r6a6 = a >> f;
 >r6a6 : Symbol(r6a6, Decl(arithmeticOperatorWithInvalidOperands.ts, 303, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r6b1 = b >> a;
 >r6b1 : Symbol(r6b1, Decl(arithmeticOperatorWithInvalidOperands.ts, 305, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r6b2 = b >> b;
 >r6b2 : Symbol(r6b2, Decl(arithmeticOperatorWithInvalidOperands.ts, 306, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r6b3 = b >> c;
 >r6b3 : Symbol(r6b3, Decl(arithmeticOperatorWithInvalidOperands.ts, 307, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r6b4 = b >> d;
 >r6b4 : Symbol(r6b4, Decl(arithmeticOperatorWithInvalidOperands.ts, 308, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r6b5 = b >> e;
 >r6b5 : Symbol(r6b5, Decl(arithmeticOperatorWithInvalidOperands.ts, 309, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r6b6 = b >> f;
 >r6b6 : Symbol(r6b6, Decl(arithmeticOperatorWithInvalidOperands.ts, 310, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r6c1 = c >> a; //ok
 >r6c1 : Symbol(r6c1, Decl(arithmeticOperatorWithInvalidOperands.ts, 312, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r6c2 = c >> b;
 >r6c2 : Symbol(r6c2, Decl(arithmeticOperatorWithInvalidOperands.ts, 313, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r6c3 = c >> c; //ok
 >r6c3 : Symbol(r6c3, Decl(arithmeticOperatorWithInvalidOperands.ts, 314, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r6c4 = c >> d;
 >r6c4 : Symbol(r6c4, Decl(arithmeticOperatorWithInvalidOperands.ts, 315, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r6c5 = c >> e;
 >r6c5 : Symbol(r6c5, Decl(arithmeticOperatorWithInvalidOperands.ts, 316, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r6c6 = c >> f;
 >r6c6 : Symbol(r6c6, Decl(arithmeticOperatorWithInvalidOperands.ts, 317, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r6d1 = d >> a;
 >r6d1 : Symbol(r6d1, Decl(arithmeticOperatorWithInvalidOperands.ts, 319, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r6d2 = d >> b;
 >r6d2 : Symbol(r6d2, Decl(arithmeticOperatorWithInvalidOperands.ts, 320, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r6d3 = d >> c;
 >r6d3 : Symbol(r6d3, Decl(arithmeticOperatorWithInvalidOperands.ts, 321, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r6d4 = d >> d;
 >r6d4 : Symbol(r6d4, Decl(arithmeticOperatorWithInvalidOperands.ts, 322, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r6d5 = d >> e;
 >r6d5 : Symbol(r6d5, Decl(arithmeticOperatorWithInvalidOperands.ts, 323, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r6d6 = d >> f;
 >r6d6 : Symbol(r6d6, Decl(arithmeticOperatorWithInvalidOperands.ts, 324, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r6e1 = e >> a;
 >r6e1 : Symbol(r6e1, Decl(arithmeticOperatorWithInvalidOperands.ts, 326, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r6e2 = e >> b;
 >r6e2 : Symbol(r6e2, Decl(arithmeticOperatorWithInvalidOperands.ts, 327, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r6e3 = e >> c;
 >r6e3 : Symbol(r6e3, Decl(arithmeticOperatorWithInvalidOperands.ts, 328, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r6e4 = e >> d;
 >r6e4 : Symbol(r6e4, Decl(arithmeticOperatorWithInvalidOperands.ts, 329, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r6e5 = e >> e;
 >r6e5 : Symbol(r6e5, Decl(arithmeticOperatorWithInvalidOperands.ts, 330, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r6e6 = e >> f;
 >r6e6 : Symbol(r6e6, Decl(arithmeticOperatorWithInvalidOperands.ts, 331, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r6f1 = f >> a;
 >r6f1 : Symbol(r6f1, Decl(arithmeticOperatorWithInvalidOperands.ts, 333, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r6f2 = f >> b;
 >r6f2 : Symbol(r6f2, Decl(arithmeticOperatorWithInvalidOperands.ts, 334, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r6f3 = f >> c;
 >r6f3 : Symbol(r6f3, Decl(arithmeticOperatorWithInvalidOperands.ts, 335, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r6f4 = f >> d;
 >r6f4 : Symbol(r6f4, Decl(arithmeticOperatorWithInvalidOperands.ts, 336, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r6f5 = f >> e;
 >r6f5 : Symbol(r6f5, Decl(arithmeticOperatorWithInvalidOperands.ts, 337, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r6f6 = f >> f;
 >r6f6 : Symbol(r6f6, Decl(arithmeticOperatorWithInvalidOperands.ts, 338, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r6g1 = E.a >> a; //ok
 >r6g1 : Symbol(r6g1, Decl(arithmeticOperatorWithInvalidOperands.ts, 340, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r6g2 = E.a >> b;
 >r6g2 : Symbol(r6g2, Decl(arithmeticOperatorWithInvalidOperands.ts, 341, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r6g3 = E.a >> c; //ok
 >r6g3 : Symbol(r6g3, Decl(arithmeticOperatorWithInvalidOperands.ts, 342, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r6g4 = E.a >> d;
 >r6g4 : Symbol(r6g4, Decl(arithmeticOperatorWithInvalidOperands.ts, 343, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r6g5 = E.a >> e;
 >r6g5 : Symbol(r6g5, Decl(arithmeticOperatorWithInvalidOperands.ts, 344, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r6g6 = E.a >> f;
 >r6g6 : Symbol(r6g6, Decl(arithmeticOperatorWithInvalidOperands.ts, 345, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r6h1 = a >> E.b; //ok
 >r6h1 : Symbol(r6h1, Decl(arithmeticOperatorWithInvalidOperands.ts, 347, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r6h2 = b >> E.b;
 >r6h2 : Symbol(r6h2, Decl(arithmeticOperatorWithInvalidOperands.ts, 348, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r6h3 = c >> E.b; //ok
 >r6h3 : Symbol(r6h3, Decl(arithmeticOperatorWithInvalidOperands.ts, 349, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r6h4 = d >> E.b;
 >r6h4 : Symbol(r6h4, Decl(arithmeticOperatorWithInvalidOperands.ts, 350, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r6h5 = e >> E.b;
 >r6h5 : Symbol(r6h5, Decl(arithmeticOperatorWithInvalidOperands.ts, 351, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r6h6 = f >> E.b;
 >r6h6 : Symbol(r6h6, Decl(arithmeticOperatorWithInvalidOperands.ts, 352, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
@@ -1623,264 +1623,264 @@ var r6h6 = f >> E.b;
 // operator >>>
 var r7a1 = a >>> a; //ok
 >r7a1 : Symbol(r7a1, Decl(arithmeticOperatorWithInvalidOperands.ts, 355, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r7a2 = a >>> b;
 >r7a2 : Symbol(r7a2, Decl(arithmeticOperatorWithInvalidOperands.ts, 356, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r7a3 = a >>> c; //ok
 >r7a3 : Symbol(r7a3, Decl(arithmeticOperatorWithInvalidOperands.ts, 357, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r7a4 = a >>> d;
 >r7a4 : Symbol(r7a4, Decl(arithmeticOperatorWithInvalidOperands.ts, 358, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r7a5 = a >>> e;
 >r7a5 : Symbol(r7a5, Decl(arithmeticOperatorWithInvalidOperands.ts, 359, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r7a6 = a >>> f;
 >r7a6 : Symbol(r7a6, Decl(arithmeticOperatorWithInvalidOperands.ts, 360, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r7b1 = b >>> a;
 >r7b1 : Symbol(r7b1, Decl(arithmeticOperatorWithInvalidOperands.ts, 362, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r7b2 = b >>> b;
 >r7b2 : Symbol(r7b2, Decl(arithmeticOperatorWithInvalidOperands.ts, 363, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r7b3 = b >>> c;
 >r7b3 : Symbol(r7b3, Decl(arithmeticOperatorWithInvalidOperands.ts, 364, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r7b4 = b >>> d;
 >r7b4 : Symbol(r7b4, Decl(arithmeticOperatorWithInvalidOperands.ts, 365, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r7b5 = b >>> e;
 >r7b5 : Symbol(r7b5, Decl(arithmeticOperatorWithInvalidOperands.ts, 366, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r7b6 = b >>> f;
 >r7b6 : Symbol(r7b6, Decl(arithmeticOperatorWithInvalidOperands.ts, 367, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r7c1 = c >>> a; //ok
 >r7c1 : Symbol(r7c1, Decl(arithmeticOperatorWithInvalidOperands.ts, 369, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r7c2 = c >>> b;
 >r7c2 : Symbol(r7c2, Decl(arithmeticOperatorWithInvalidOperands.ts, 370, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r7c3 = c >>> c; //ok
 >r7c3 : Symbol(r7c3, Decl(arithmeticOperatorWithInvalidOperands.ts, 371, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r7c4 = c >>> d;
 >r7c4 : Symbol(r7c4, Decl(arithmeticOperatorWithInvalidOperands.ts, 372, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r7c5 = c >>> e;
 >r7c5 : Symbol(r7c5, Decl(arithmeticOperatorWithInvalidOperands.ts, 373, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r7c6 = c >>> f;
 >r7c6 : Symbol(r7c6, Decl(arithmeticOperatorWithInvalidOperands.ts, 374, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r7d1 = d >>> a;
 >r7d1 : Symbol(r7d1, Decl(arithmeticOperatorWithInvalidOperands.ts, 376, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r7d2 = d >>> b;
 >r7d2 : Symbol(r7d2, Decl(arithmeticOperatorWithInvalidOperands.ts, 377, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r7d3 = d >>> c;
 >r7d3 : Symbol(r7d3, Decl(arithmeticOperatorWithInvalidOperands.ts, 378, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r7d4 = d >>> d;
 >r7d4 : Symbol(r7d4, Decl(arithmeticOperatorWithInvalidOperands.ts, 379, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r7d5 = d >>> e;
 >r7d5 : Symbol(r7d5, Decl(arithmeticOperatorWithInvalidOperands.ts, 380, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r7d6 = d >>> f;
 >r7d6 : Symbol(r7d6, Decl(arithmeticOperatorWithInvalidOperands.ts, 381, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r7e1 = e >>> a;
 >r7e1 : Symbol(r7e1, Decl(arithmeticOperatorWithInvalidOperands.ts, 383, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r7e2 = e >>> b;
 >r7e2 : Symbol(r7e2, Decl(arithmeticOperatorWithInvalidOperands.ts, 384, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r7e3 = e >>> c;
 >r7e3 : Symbol(r7e3, Decl(arithmeticOperatorWithInvalidOperands.ts, 385, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r7e4 = e >>> d;
 >r7e4 : Symbol(r7e4, Decl(arithmeticOperatorWithInvalidOperands.ts, 386, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r7e5 = e >>> e;
 >r7e5 : Symbol(r7e5, Decl(arithmeticOperatorWithInvalidOperands.ts, 387, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r7e6 = e >>> f;
 >r7e6 : Symbol(r7e6, Decl(arithmeticOperatorWithInvalidOperands.ts, 388, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r7f1 = f >>> a;
 >r7f1 : Symbol(r7f1, Decl(arithmeticOperatorWithInvalidOperands.ts, 390, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r7f2 = f >>> b;
 >r7f2 : Symbol(r7f2, Decl(arithmeticOperatorWithInvalidOperands.ts, 391, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r7f3 = f >>> c;
 >r7f3 : Symbol(r7f3, Decl(arithmeticOperatorWithInvalidOperands.ts, 392, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r7f4 = f >>> d;
 >r7f4 : Symbol(r7f4, Decl(arithmeticOperatorWithInvalidOperands.ts, 393, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r7f5 = f >>> e;
 >r7f5 : Symbol(r7f5, Decl(arithmeticOperatorWithInvalidOperands.ts, 394, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r7f6 = f >>> f;
 >r7f6 : Symbol(r7f6, Decl(arithmeticOperatorWithInvalidOperands.ts, 395, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r7g1 = E.a >>> a; //ok
 >r7g1 : Symbol(r7g1, Decl(arithmeticOperatorWithInvalidOperands.ts, 397, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r7g2 = E.a >>> b;
 >r7g2 : Symbol(r7g2, Decl(arithmeticOperatorWithInvalidOperands.ts, 398, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r7g3 = E.a >>> c; //ok
 >r7g3 : Symbol(r7g3, Decl(arithmeticOperatorWithInvalidOperands.ts, 399, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r7g4 = E.a >>> d;
 >r7g4 : Symbol(r7g4, Decl(arithmeticOperatorWithInvalidOperands.ts, 400, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r7g5 = E.a >>> e;
 >r7g5 : Symbol(r7g5, Decl(arithmeticOperatorWithInvalidOperands.ts, 401, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r7g6 = E.a >>> f;
 >r7g6 : Symbol(r7g6, Decl(arithmeticOperatorWithInvalidOperands.ts, 402, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r7h1 = a >>> E.b; //ok
 >r7h1 : Symbol(r7h1, Decl(arithmeticOperatorWithInvalidOperands.ts, 404, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r7h2 = b >>> E.b;
 >r7h2 : Symbol(r7h2, Decl(arithmeticOperatorWithInvalidOperands.ts, 405, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r7h3 = c >>> E.b; //ok
 >r7h3 : Symbol(r7h3, Decl(arithmeticOperatorWithInvalidOperands.ts, 406, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r7h4 = d >>> E.b;
 >r7h4 : Symbol(r7h4, Decl(arithmeticOperatorWithInvalidOperands.ts, 407, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r7h5 = e >>> E.b;
 >r7h5 : Symbol(r7h5, Decl(arithmeticOperatorWithInvalidOperands.ts, 408, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r7h6 = f >>> E.b;
 >r7h6 : Symbol(r7h6, Decl(arithmeticOperatorWithInvalidOperands.ts, 409, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
@@ -1888,264 +1888,264 @@ var r7h6 = f >>> E.b;
 // operator &
 var r8a1 = a & a; //ok
 >r8a1 : Symbol(r8a1, Decl(arithmeticOperatorWithInvalidOperands.ts, 412, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r8a2 = a & b;
 >r8a2 : Symbol(r8a2, Decl(arithmeticOperatorWithInvalidOperands.ts, 413, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r8a3 = a & c; //ok
 >r8a3 : Symbol(r8a3, Decl(arithmeticOperatorWithInvalidOperands.ts, 414, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r8a4 = a & d;
 >r8a4 : Symbol(r8a4, Decl(arithmeticOperatorWithInvalidOperands.ts, 415, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r8a5 = a & e;
 >r8a5 : Symbol(r8a5, Decl(arithmeticOperatorWithInvalidOperands.ts, 416, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r8a6 = a & f;
 >r8a6 : Symbol(r8a6, Decl(arithmeticOperatorWithInvalidOperands.ts, 417, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r8b1 = b & a;
 >r8b1 : Symbol(r8b1, Decl(arithmeticOperatorWithInvalidOperands.ts, 419, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r8b2 = b & b;
 >r8b2 : Symbol(r8b2, Decl(arithmeticOperatorWithInvalidOperands.ts, 420, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r8b3 = b & c;
 >r8b3 : Symbol(r8b3, Decl(arithmeticOperatorWithInvalidOperands.ts, 421, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r8b4 = b & d;
 >r8b4 : Symbol(r8b4, Decl(arithmeticOperatorWithInvalidOperands.ts, 422, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r8b5 = b & e;
 >r8b5 : Symbol(r8b5, Decl(arithmeticOperatorWithInvalidOperands.ts, 423, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r8b6 = b & f;
 >r8b6 : Symbol(r8b6, Decl(arithmeticOperatorWithInvalidOperands.ts, 424, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r8c1 = c & a; //ok
 >r8c1 : Symbol(r8c1, Decl(arithmeticOperatorWithInvalidOperands.ts, 426, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r8c2 = c & b;
 >r8c2 : Symbol(r8c2, Decl(arithmeticOperatorWithInvalidOperands.ts, 427, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r8c3 = c & c; //ok
 >r8c3 : Symbol(r8c3, Decl(arithmeticOperatorWithInvalidOperands.ts, 428, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r8c4 = c & d;
 >r8c4 : Symbol(r8c4, Decl(arithmeticOperatorWithInvalidOperands.ts, 429, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r8c5 = c & e;
 >r8c5 : Symbol(r8c5, Decl(arithmeticOperatorWithInvalidOperands.ts, 430, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r8c6 = c & f;
 >r8c6 : Symbol(r8c6, Decl(arithmeticOperatorWithInvalidOperands.ts, 431, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r8d1 = d & a;
 >r8d1 : Symbol(r8d1, Decl(arithmeticOperatorWithInvalidOperands.ts, 433, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r8d2 = d & b;
 >r8d2 : Symbol(r8d2, Decl(arithmeticOperatorWithInvalidOperands.ts, 434, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r8d3 = d & c;
 >r8d3 : Symbol(r8d3, Decl(arithmeticOperatorWithInvalidOperands.ts, 435, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r8d4 = d & d;
 >r8d4 : Symbol(r8d4, Decl(arithmeticOperatorWithInvalidOperands.ts, 436, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r8d5 = d & e;
 >r8d5 : Symbol(r8d5, Decl(arithmeticOperatorWithInvalidOperands.ts, 437, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r8d6 = d & f;
 >r8d6 : Symbol(r8d6, Decl(arithmeticOperatorWithInvalidOperands.ts, 438, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r8e1 = e & a;
 >r8e1 : Symbol(r8e1, Decl(arithmeticOperatorWithInvalidOperands.ts, 440, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r8e2 = e & b;
 >r8e2 : Symbol(r8e2, Decl(arithmeticOperatorWithInvalidOperands.ts, 441, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r8e3 = e & c;
 >r8e3 : Symbol(r8e3, Decl(arithmeticOperatorWithInvalidOperands.ts, 442, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r8e4 = e & d;
 >r8e4 : Symbol(r8e4, Decl(arithmeticOperatorWithInvalidOperands.ts, 443, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r8e5 = e & e;
 >r8e5 : Symbol(r8e5, Decl(arithmeticOperatorWithInvalidOperands.ts, 444, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r8e6 = e & f;
 >r8e6 : Symbol(r8e6, Decl(arithmeticOperatorWithInvalidOperands.ts, 445, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r8f1 = f & a;
 >r8f1 : Symbol(r8f1, Decl(arithmeticOperatorWithInvalidOperands.ts, 447, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r8f2 = f & b;
 >r8f2 : Symbol(r8f2, Decl(arithmeticOperatorWithInvalidOperands.ts, 448, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r8f3 = f & c;
 >r8f3 : Symbol(r8f3, Decl(arithmeticOperatorWithInvalidOperands.ts, 449, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r8f4 = f & d;
 >r8f4 : Symbol(r8f4, Decl(arithmeticOperatorWithInvalidOperands.ts, 450, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r8f5 = f & e;
 >r8f5 : Symbol(r8f5, Decl(arithmeticOperatorWithInvalidOperands.ts, 451, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r8f6 = f & f;
 >r8f6 : Symbol(r8f6, Decl(arithmeticOperatorWithInvalidOperands.ts, 452, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r8g1 = E.a & a; //ok
 >r8g1 : Symbol(r8g1, Decl(arithmeticOperatorWithInvalidOperands.ts, 454, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r8g2 = E.a & b;
 >r8g2 : Symbol(r8g2, Decl(arithmeticOperatorWithInvalidOperands.ts, 455, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r8g3 = E.a & c; //ok
 >r8g3 : Symbol(r8g3, Decl(arithmeticOperatorWithInvalidOperands.ts, 456, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r8g4 = E.a & d;
 >r8g4 : Symbol(r8g4, Decl(arithmeticOperatorWithInvalidOperands.ts, 457, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r8g5 = E.a & e;
 >r8g5 : Symbol(r8g5, Decl(arithmeticOperatorWithInvalidOperands.ts, 458, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r8g6 = E.a & f;
 >r8g6 : Symbol(r8g6, Decl(arithmeticOperatorWithInvalidOperands.ts, 459, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r8h1 = a & E.b; //ok
 >r8h1 : Symbol(r8h1, Decl(arithmeticOperatorWithInvalidOperands.ts, 461, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r8h2 = b & E.b;
 >r8h2 : Symbol(r8h2, Decl(arithmeticOperatorWithInvalidOperands.ts, 462, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r8h3 = c & E.b; //ok
 >r8h3 : Symbol(r8h3, Decl(arithmeticOperatorWithInvalidOperands.ts, 463, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r8h4 = d & E.b;
 >r8h4 : Symbol(r8h4, Decl(arithmeticOperatorWithInvalidOperands.ts, 464, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r8h5 = e & E.b;
 >r8h5 : Symbol(r8h5, Decl(arithmeticOperatorWithInvalidOperands.ts, 465, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r8h6 = f & E.b;
 >r8h6 : Symbol(r8h6, Decl(arithmeticOperatorWithInvalidOperands.ts, 466, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
@@ -2153,264 +2153,264 @@ var r8h6 = f & E.b;
 // operator ^
 var r9a1 = a ^ a; //ok
 >r9a1 : Symbol(r9a1, Decl(arithmeticOperatorWithInvalidOperands.ts, 469, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r9a2 = a ^ b;
 >r9a2 : Symbol(r9a2, Decl(arithmeticOperatorWithInvalidOperands.ts, 470, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r9a3 = a ^ c; //ok
 >r9a3 : Symbol(r9a3, Decl(arithmeticOperatorWithInvalidOperands.ts, 471, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r9a4 = a ^ d;
 >r9a4 : Symbol(r9a4, Decl(arithmeticOperatorWithInvalidOperands.ts, 472, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r9a5 = a ^ e;
 >r9a5 : Symbol(r9a5, Decl(arithmeticOperatorWithInvalidOperands.ts, 473, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r9a6 = a ^ f;
 >r9a6 : Symbol(r9a6, Decl(arithmeticOperatorWithInvalidOperands.ts, 474, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r9b1 = b ^ a;
 >r9b1 : Symbol(r9b1, Decl(arithmeticOperatorWithInvalidOperands.ts, 476, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r9b2 = b ^ b;
 >r9b2 : Symbol(r9b2, Decl(arithmeticOperatorWithInvalidOperands.ts, 477, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r9b3 = b ^ c;
 >r9b3 : Symbol(r9b3, Decl(arithmeticOperatorWithInvalidOperands.ts, 478, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r9b4 = b ^ d;
 >r9b4 : Symbol(r9b4, Decl(arithmeticOperatorWithInvalidOperands.ts, 479, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r9b5 = b ^ e;
 >r9b5 : Symbol(r9b5, Decl(arithmeticOperatorWithInvalidOperands.ts, 480, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r9b6 = b ^ f;
 >r9b6 : Symbol(r9b6, Decl(arithmeticOperatorWithInvalidOperands.ts, 481, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r9c1 = c ^ a; //ok
 >r9c1 : Symbol(r9c1, Decl(arithmeticOperatorWithInvalidOperands.ts, 483, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r9c2 = c ^ b;
 >r9c2 : Symbol(r9c2, Decl(arithmeticOperatorWithInvalidOperands.ts, 484, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r9c3 = c ^ c; //ok
 >r9c3 : Symbol(r9c3, Decl(arithmeticOperatorWithInvalidOperands.ts, 485, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r9c4 = c ^ d;
 >r9c4 : Symbol(r9c4, Decl(arithmeticOperatorWithInvalidOperands.ts, 486, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r9c5 = c ^ e;
 >r9c5 : Symbol(r9c5, Decl(arithmeticOperatorWithInvalidOperands.ts, 487, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r9c6 = c ^ f;
 >r9c6 : Symbol(r9c6, Decl(arithmeticOperatorWithInvalidOperands.ts, 488, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r9d1 = d ^ a;
 >r9d1 : Symbol(r9d1, Decl(arithmeticOperatorWithInvalidOperands.ts, 490, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r9d2 = d ^ b;
 >r9d2 : Symbol(r9d2, Decl(arithmeticOperatorWithInvalidOperands.ts, 491, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r9d3 = d ^ c;
 >r9d3 : Symbol(r9d3, Decl(arithmeticOperatorWithInvalidOperands.ts, 492, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r9d4 = d ^ d;
 >r9d4 : Symbol(r9d4, Decl(arithmeticOperatorWithInvalidOperands.ts, 493, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r9d5 = d ^ e;
 >r9d5 : Symbol(r9d5, Decl(arithmeticOperatorWithInvalidOperands.ts, 494, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r9d6 = d ^ f;
 >r9d6 : Symbol(r9d6, Decl(arithmeticOperatorWithInvalidOperands.ts, 495, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r9e1 = e ^ a;
 >r9e1 : Symbol(r9e1, Decl(arithmeticOperatorWithInvalidOperands.ts, 497, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r9e2 = e ^ b;
 >r9e2 : Symbol(r9e2, Decl(arithmeticOperatorWithInvalidOperands.ts, 498, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r9e3 = e ^ c;
 >r9e3 : Symbol(r9e3, Decl(arithmeticOperatorWithInvalidOperands.ts, 499, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r9e4 = e ^ d;
 >r9e4 : Symbol(r9e4, Decl(arithmeticOperatorWithInvalidOperands.ts, 500, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r9e5 = e ^ e;
 >r9e5 : Symbol(r9e5, Decl(arithmeticOperatorWithInvalidOperands.ts, 501, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r9e6 = e ^ f;
 >r9e6 : Symbol(r9e6, Decl(arithmeticOperatorWithInvalidOperands.ts, 502, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r9f1 = f ^ a;
 >r9f1 : Symbol(r9f1, Decl(arithmeticOperatorWithInvalidOperands.ts, 504, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r9f2 = f ^ b;
 >r9f2 : Symbol(r9f2, Decl(arithmeticOperatorWithInvalidOperands.ts, 505, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r9f3 = f ^ c;
 >r9f3 : Symbol(r9f3, Decl(arithmeticOperatorWithInvalidOperands.ts, 506, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r9f4 = f ^ d;
 >r9f4 : Symbol(r9f4, Decl(arithmeticOperatorWithInvalidOperands.ts, 507, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r9f5 = f ^ e;
 >r9f5 : Symbol(r9f5, Decl(arithmeticOperatorWithInvalidOperands.ts, 508, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r9f6 = f ^ f;
 >r9f6 : Symbol(r9f6, Decl(arithmeticOperatorWithInvalidOperands.ts, 509, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r9g1 = E.a ^ a; //ok
 >r9g1 : Symbol(r9g1, Decl(arithmeticOperatorWithInvalidOperands.ts, 511, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r9g2 = E.a ^ b;
 >r9g2 : Symbol(r9g2, Decl(arithmeticOperatorWithInvalidOperands.ts, 512, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r9g3 = E.a ^ c; //ok
 >r9g3 : Symbol(r9g3, Decl(arithmeticOperatorWithInvalidOperands.ts, 513, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r9g4 = E.a ^ d;
 >r9g4 : Symbol(r9g4, Decl(arithmeticOperatorWithInvalidOperands.ts, 514, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r9g5 = E.a ^ e;
 >r9g5 : Symbol(r9g5, Decl(arithmeticOperatorWithInvalidOperands.ts, 515, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r9g6 = E.a ^ f;
 >r9g6 : Symbol(r9g6, Decl(arithmeticOperatorWithInvalidOperands.ts, 516, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r9h1 = a ^ E.b; //ok
 >r9h1 : Symbol(r9h1, Decl(arithmeticOperatorWithInvalidOperands.ts, 518, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r9h2 = b ^ E.b;
 >r9h2 : Symbol(r9h2, Decl(arithmeticOperatorWithInvalidOperands.ts, 519, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r9h3 = c ^ E.b; //ok
 >r9h3 : Symbol(r9h3, Decl(arithmeticOperatorWithInvalidOperands.ts, 520, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r9h4 = d ^ E.b;
 >r9h4 : Symbol(r9h4, Decl(arithmeticOperatorWithInvalidOperands.ts, 521, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r9h5 = e ^ E.b;
 >r9h5 : Symbol(r9h5, Decl(arithmeticOperatorWithInvalidOperands.ts, 522, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r9h6 = f ^ E.b;
 >r9h6 : Symbol(r9h6, Decl(arithmeticOperatorWithInvalidOperands.ts, 523, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
@@ -2418,264 +2418,264 @@ var r9h6 = f ^ E.b;
 // operator |
 var r10a1 = a | a; //ok
 >r10a1 : Symbol(r10a1, Decl(arithmeticOperatorWithInvalidOperands.ts, 526, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r10a2 = a | b;
 >r10a2 : Symbol(r10a2, Decl(arithmeticOperatorWithInvalidOperands.ts, 527, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r10a3 = a | c; //ok
 >r10a3 : Symbol(r10a3, Decl(arithmeticOperatorWithInvalidOperands.ts, 528, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r10a4 = a | d;
 >r10a4 : Symbol(r10a4, Decl(arithmeticOperatorWithInvalidOperands.ts, 529, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r10a5 = a | e;
 >r10a5 : Symbol(r10a5, Decl(arithmeticOperatorWithInvalidOperands.ts, 530, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r10a6 = a | f;
 >r10a6 : Symbol(r10a6, Decl(arithmeticOperatorWithInvalidOperands.ts, 531, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r10b1 = b | a;
 >r10b1 : Symbol(r10b1, Decl(arithmeticOperatorWithInvalidOperands.ts, 533, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r10b2 = b | b;
 >r10b2 : Symbol(r10b2, Decl(arithmeticOperatorWithInvalidOperands.ts, 534, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r10b3 = b | c;
 >r10b3 : Symbol(r10b3, Decl(arithmeticOperatorWithInvalidOperands.ts, 535, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r10b4 = b | d;
 >r10b4 : Symbol(r10b4, Decl(arithmeticOperatorWithInvalidOperands.ts, 536, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r10b5 = b | e;
 >r10b5 : Symbol(r10b5, Decl(arithmeticOperatorWithInvalidOperands.ts, 537, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r10b6 = b | f;
 >r10b6 : Symbol(r10b6, Decl(arithmeticOperatorWithInvalidOperands.ts, 538, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r10c1 = c | a; //ok
 >r10c1 : Symbol(r10c1, Decl(arithmeticOperatorWithInvalidOperands.ts, 540, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r10c2 = c | b;
 >r10c2 : Symbol(r10c2, Decl(arithmeticOperatorWithInvalidOperands.ts, 541, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r10c3 = c | c; //ok
 >r10c3 : Symbol(r10c3, Decl(arithmeticOperatorWithInvalidOperands.ts, 542, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r10c4 = c | d;
 >r10c4 : Symbol(r10c4, Decl(arithmeticOperatorWithInvalidOperands.ts, 543, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r10c5 = c | e;
 >r10c5 : Symbol(r10c5, Decl(arithmeticOperatorWithInvalidOperands.ts, 544, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r10c6 = c | f;
 >r10c6 : Symbol(r10c6, Decl(arithmeticOperatorWithInvalidOperands.ts, 545, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r10d1 = d | a;
 >r10d1 : Symbol(r10d1, Decl(arithmeticOperatorWithInvalidOperands.ts, 547, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r10d2 = d | b;
 >r10d2 : Symbol(r10d2, Decl(arithmeticOperatorWithInvalidOperands.ts, 548, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r10d3 = d | c;
 >r10d3 : Symbol(r10d3, Decl(arithmeticOperatorWithInvalidOperands.ts, 549, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r10d4 = d | d;
 >r10d4 : Symbol(r10d4, Decl(arithmeticOperatorWithInvalidOperands.ts, 550, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r10d5 = d | e;
 >r10d5 : Symbol(r10d5, Decl(arithmeticOperatorWithInvalidOperands.ts, 551, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r10d6 = d | f;
 >r10d6 : Symbol(r10d6, Decl(arithmeticOperatorWithInvalidOperands.ts, 552, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r10e1 = e | a;
 >r10e1 : Symbol(r10e1, Decl(arithmeticOperatorWithInvalidOperands.ts, 554, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r10e2 = e | b;
 >r10e2 : Symbol(r10e2, Decl(arithmeticOperatorWithInvalidOperands.ts, 555, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r10e3 = e | c;
 >r10e3 : Symbol(r10e3, Decl(arithmeticOperatorWithInvalidOperands.ts, 556, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r10e4 = e | d;
 >r10e4 : Symbol(r10e4, Decl(arithmeticOperatorWithInvalidOperands.ts, 557, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r10e5 = e | e;
 >r10e5 : Symbol(r10e5, Decl(arithmeticOperatorWithInvalidOperands.ts, 558, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r10e6 = e | f;
 >r10e6 : Symbol(r10e6, Decl(arithmeticOperatorWithInvalidOperands.ts, 559, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r10f1 = f | a;
 >r10f1 : Symbol(r10f1, Decl(arithmeticOperatorWithInvalidOperands.ts, 561, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r10f2 = f | b;
 >r10f2 : Symbol(r10f2, Decl(arithmeticOperatorWithInvalidOperands.ts, 562, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r10f3 = f | c;
 >r10f3 : Symbol(r10f3, Decl(arithmeticOperatorWithInvalidOperands.ts, 563, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r10f4 = f | d;
 >r10f4 : Symbol(r10f4, Decl(arithmeticOperatorWithInvalidOperands.ts, 564, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r10f5 = f | e;
 >r10f5 : Symbol(r10f5, Decl(arithmeticOperatorWithInvalidOperands.ts, 565, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r10f6 = f | f;
 >r10f6 : Symbol(r10f6, Decl(arithmeticOperatorWithInvalidOperands.ts, 566, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r10g1 = E.a | a; //ok
 >r10g1 : Symbol(r10g1, Decl(arithmeticOperatorWithInvalidOperands.ts, 568, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 
 var r10g2 = E.a | b;
 >r10g2 : Symbol(r10g2, Decl(arithmeticOperatorWithInvalidOperands.ts, 569, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 
 var r10g3 = E.a | c; //ok
 >r10g3 : Symbol(r10g3, Decl(arithmeticOperatorWithInvalidOperands.ts, 570, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 
 var r10g4 = E.a | d;
 >r10g4 : Symbol(r10g4, Decl(arithmeticOperatorWithInvalidOperands.ts, 571, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 
 var r10g5 = E.a | e;
 >r10g5 : Symbol(r10g5, Decl(arithmeticOperatorWithInvalidOperands.ts, 572, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 
 var r10g6 = E.a | f;
 >r10g6 : Symbol(r10g6, Decl(arithmeticOperatorWithInvalidOperands.ts, 573, 3))
 >E.a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 8))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 
 var r10h1 = a | E.b; //ok
 >r10h1 : Symbol(r10h1, Decl(arithmeticOperatorWithInvalidOperands.ts, 575, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithInvalidOperands.ts, 4, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r10h2 = b | E.b;
 >r10h2 : Symbol(r10h2, Decl(arithmeticOperatorWithInvalidOperands.ts, 576, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithInvalidOperands.ts, 5, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r10h3 = c | E.b; //ok
 >r10h3 : Symbol(r10h3, Decl(arithmeticOperatorWithInvalidOperands.ts, 577, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithInvalidOperands.ts, 6, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r10h4 = d | E.b;
 >r10h4 : Symbol(r10h4, Decl(arithmeticOperatorWithInvalidOperands.ts, 578, 3))
->d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(arithmeticOperatorWithInvalidOperands.ts, 7, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r10h5 = e | E.b;
 >r10h5 : Symbol(r10h5, Decl(arithmeticOperatorWithInvalidOperands.ts, 579, 3))
->e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(arithmeticOperatorWithInvalidOperands.ts, 8, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 
 var r10h6 = f | E.b;
 >r10h6 : Symbol(r10h6, Decl(arithmeticOperatorWithInvalidOperands.ts, 580, 3))
->f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(arithmeticOperatorWithInvalidOperands.ts, 9, 11))
 >E.b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(arithmeticOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(arithmeticOperatorWithInvalidOperands.ts, 2, 11))
diff --git a/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.types b/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.types
index f891e3ee4fbc7..1cef952e10efa 100644
--- a/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.types
+++ b/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.types
@@ -13,29 +13,29 @@ enum E { a, b, c }
 >c : E.c
 >  : ^^^
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
-var b: boolean;
+declare var b: boolean;
 >b : boolean
 >  : ^^^^^^^
 
-var c: number;
+declare var c: number;
 >c : number
 >  : ^^^^^^
 
-var d: string;
+declare var d: string;
 >d : string
 >  : ^^^^^^
 
-var e: { a: number };
+declare var e: { a: number };
 >e : { a: number; }
 >  : ^^^^^      ^^^
 >a : number
 >  : ^^^^^^
 
-var f: Number;
+declare var f: Number;
 >f : Number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.errors.txt b/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.errors.txt
index 2d254bda40710..a71c0deaa7922 100644
--- a/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.errors.txt
+++ b/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.errors.txt
@@ -244,9 +244,9 @@ arithmeticOperatorWithNullValueAndInvalidOperands.ts(176,18): error TS18050: The
     // If one operand is the null or undefined value, it is treated as having the type of the
     // other operand.
     
-    var a: boolean;
-    var b: string;
-    var c: Object;
+    declare var a: boolean;
+    declare var b: string;
+    declare var c: Object;
     
     // operator *
     var r1a1 = null * a;
diff --git a/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.js b/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.js
index 244abd14561e6..9cd24a96541d2 100644
--- a/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.js
+++ b/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.js
@@ -4,9 +4,9 @@
 // If one operand is the null or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
-var b: string;
-var c: Object;
+declare var a: boolean;
+declare var b: string;
+declare var c: Object;
 
 // operator *
 var r1a1 = null * a;
@@ -181,9 +181,6 @@ var r10d3 = {} | null;
 //// [arithmeticOperatorWithNullValueAndInvalidOperands.js]
 // If one operand is the null or undefined value, it is treated as having the type of the
 // other operand.
-var a;
-var b;
-var c;
 // operator *
 var r1a1 = null * a;
 var r1a2 = null * b;
diff --git a/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.symbols b/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.symbols
index 09060fcd5f1ca..d5ba2cf80d8c7 100644
--- a/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.symbols
+++ b/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.symbols
@@ -4,40 +4,40 @@
 // If one operand is the null or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+declare var a: boolean;
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
-var b: string;
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+declare var b: string;
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
-var c: Object;
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+declare var c: Object;
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 // operator *
 var r1a1 = null * a;
 >r1a1 : Symbol(r1a1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r1a2 = null * b;
 >r1a2 : Symbol(r1a2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 9, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r1a3 = null * c;
 >r1a3 : Symbol(r1a3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 10, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r1b1 = a * null;
 >r1b1 : Symbol(r1b1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 12, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r1b2 = b * null;
 >r1b2 : Symbol(r1b2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 13, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r1b3 = c * null;
 >r1b3 : Symbol(r1b3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 14, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r1c1 = null * true;
 >r1c1 : Symbol(r1c1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 16, 3))
@@ -60,27 +60,27 @@ var r1d3 = {} * null;
 // operator /
 var r2a1 = null / a;
 >r2a1 : Symbol(r2a1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 25, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r2a2 = null / b;
 >r2a2 : Symbol(r2a2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 26, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r2a3 = null / c;
 >r2a3 : Symbol(r2a3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 27, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r2b1 = a / null;
 >r2b1 : Symbol(r2b1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 29, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r2b2 = b / null;
 >r2b2 : Symbol(r2b2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 30, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r2b3 = c / null;
 >r2b3 : Symbol(r2b3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 31, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r2c1 = null / true;
 >r2c1 : Symbol(r2c1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 33, 3))
@@ -103,27 +103,27 @@ var r2d3 = {} / null;
 // operator %
 var r3a1 = null % a;
 >r3a1 : Symbol(r3a1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 42, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r3a2 = null % b;
 >r3a2 : Symbol(r3a2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 43, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r3a3 = null % c;
 >r3a3 : Symbol(r3a3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 44, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r3b1 = a % null;
 >r3b1 : Symbol(r3b1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 46, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r3b2 = b % null;
 >r3b2 : Symbol(r3b2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 47, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r3b3 = c % null;
 >r3b3 : Symbol(r3b3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 48, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r3c1 = null % true;
 >r3c1 : Symbol(r3c1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 50, 3))
@@ -146,27 +146,27 @@ var r3d3 = {} % null;
 // operator -
 var r4a1 = null - a;
 >r4a1 : Symbol(r4a1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 59, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r4a2 = null - b;
 >r4a2 : Symbol(r4a2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 60, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r4a3 = null - c;
 >r4a3 : Symbol(r4a3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 61, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r4b1 = a - null;
 >r4b1 : Symbol(r4b1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 63, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r4b2 = b - null;
 >r4b2 : Symbol(r4b2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 64, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r4b3 = c - null;
 >r4b3 : Symbol(r4b3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 65, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r4c1 = null - true;
 >r4c1 : Symbol(r4c1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 67, 3))
@@ -189,27 +189,27 @@ var r4d3 = {} - null;
 // operator <<
 var r5a1 = null << a;
 >r5a1 : Symbol(r5a1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 76, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r5a2 = null << b;
 >r5a2 : Symbol(r5a2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 77, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r5a3 = null << c;
 >r5a3 : Symbol(r5a3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 78, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r5b1 = a << null;
 >r5b1 : Symbol(r5b1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 80, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r5b2 = b << null;
 >r5b2 : Symbol(r5b2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 81, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r5b3 = c << null;
 >r5b3 : Symbol(r5b3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 82, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r5c1 = null << true;
 >r5c1 : Symbol(r5c1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 84, 3))
@@ -232,27 +232,27 @@ var r5d3 = {} << null;
 // operator >>
 var r6a1 = null >> a;
 >r6a1 : Symbol(r6a1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 93, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r6a2 = null >> b;
 >r6a2 : Symbol(r6a2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 94, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r6a3 = null >> c;
 >r6a3 : Symbol(r6a3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 95, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r6b1 = a >> null;
 >r6b1 : Symbol(r6b1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 97, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r6b2 = b >> null;
 >r6b2 : Symbol(r6b2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 98, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r6b3 = c >> null;
 >r6b3 : Symbol(r6b3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 99, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r6c1 = null >> true;
 >r6c1 : Symbol(r6c1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 101, 3))
@@ -275,27 +275,27 @@ var r6d3 = {} >> null;
 // operator >>>
 var r7a1 = null >>> a;
 >r7a1 : Symbol(r7a1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 110, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r7a2 = null >>> b;
 >r7a2 : Symbol(r7a2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 111, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r7a3 = null >>> c;
 >r7a3 : Symbol(r7a3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 112, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r7b1 = a >>> null;
 >r7b1 : Symbol(r7b1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 114, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r7b2 = b >>> null;
 >r7b2 : Symbol(r7b2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 115, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r7b3 = c >>> null;
 >r7b3 : Symbol(r7b3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 116, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r7c1 = null >>> true;
 >r7c1 : Symbol(r7c1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 118, 3))
@@ -318,27 +318,27 @@ var r7d3 = {} >>> null;
 // operator &
 var r8a1 = null & a;
 >r8a1 : Symbol(r8a1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 127, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r8a2 = null & b;
 >r8a2 : Symbol(r8a2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 128, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r8a3 = null & c;
 >r8a3 : Symbol(r8a3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 129, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r8b1 = a & null;
 >r8b1 : Symbol(r8b1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 131, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r8b2 = b & null;
 >r8b2 : Symbol(r8b2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 132, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r8b3 = c & null;
 >r8b3 : Symbol(r8b3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 133, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r8c1 = null & true;
 >r8c1 : Symbol(r8c1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 135, 3))
@@ -361,27 +361,27 @@ var r8d3 = {} & null;
 // operator ^
 var r9a1 = null ^ a;
 >r9a1 : Symbol(r9a1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 144, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r9a2 = null ^ b;
 >r9a2 : Symbol(r9a2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 145, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r9a3 = null ^ c;
 >r9a3 : Symbol(r9a3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 146, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r9b1 = a ^ null;
 >r9b1 : Symbol(r9b1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 148, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r9b2 = b ^ null;
 >r9b2 : Symbol(r9b2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 149, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r9b3 = c ^ null;
 >r9b3 : Symbol(r9b3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 150, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r9c1 = null ^ true;
 >r9c1 : Symbol(r9c1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 152, 3))
@@ -404,27 +404,27 @@ var r9d3 = {} ^ null;
 // operator |
 var r10a1 = null | a;
 >r10a1 : Symbol(r10a1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 161, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r10a2 = null | b;
 >r10a2 : Symbol(r10a2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 162, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r10a3 = null | c;
 >r10a3 : Symbol(r10a3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 163, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r10b1 = a | null;
 >r10b1 : Symbol(r10b1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 165, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r10b2 = b | null;
 >r10b2 : Symbol(r10b2, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 166, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r10b3 = c | null;
 >r10b3 : Symbol(r10b3, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 167, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r10c1 = null | true;
 >r10c1 : Symbol(r10c1, Decl(arithmeticOperatorWithNullValueAndInvalidOperands.ts, 169, 3))
diff --git a/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.types b/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.types
index ba7ec86c6502b..8701591dc517b 100644
--- a/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.types
+++ b/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.types
@@ -4,15 +4,15 @@
 // If one operand is the null or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
+declare var a: boolean;
 >a : boolean
 >  : ^^^^^^^
 
-var b: string;
+declare var b: string;
 >b : string
 >  : ^^^^^^
 
-var c: Object;
+declare var c: Object;
 >c : Object
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.errors.txt b/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.errors.txt
index dbb3c8ee7036a..4a4e273a4ac82 100644
--- a/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.errors.txt
+++ b/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.errors.txt
@@ -89,8 +89,8 @@ arithmeticOperatorWithNullValueAndValidOperands.ts(110,17): error TS18050: The v
         b
     }
     
-    var a: any;
-    var b: number;
+    declare var a: any;
+    declare var b: number;
     
     // operator *
     var ra1 = null * a;
diff --git a/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.js b/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.js
index fa3b897c3cc54..eef8b00890737 100644
--- a/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.js
+++ b/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.js
@@ -9,8 +9,8 @@ enum E {
     b
 }
 
-var a: any;
-var b: number;
+declare var a: any;
+declare var b: number;
 
 // operator *
 var ra1 = null * a;
@@ -120,8 +120,6 @@ var E;
     E[E["a"] = 0] = "a";
     E[E["b"] = 1] = "b";
 })(E || (E = {}));
-var a;
-var b;
 // operator *
 var ra1 = null * a;
 var ra2 = null * b;
diff --git a/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.symbols b/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.symbols
index 971e192d68aa7..16429a1b9a7a2 100644
--- a/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.symbols
+++ b/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.symbols
@@ -14,20 +14,20 @@ enum E {
 >b : Symbol(E.b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 4, 6))
 }
 
-var a: any;
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+declare var a: any;
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
-var b: number;
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+declare var b: number;
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 // operator *
 var ra1 = null * a;
 >ra1 : Symbol(ra1, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 12, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var ra2 = null * b;
 >ra2 : Symbol(ra2, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 13, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var ra3 = null * 1;
 >ra3 : Symbol(ra3, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 14, 3))
@@ -40,11 +40,11 @@ var ra4 = null * E.a;
 
 var ra5 = a * null;
 >ra5 : Symbol(ra5, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 16, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var ra6 = b * null;
 >ra6 : Symbol(ra6, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 17, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var ra7 = 0 * null;
 >ra7 : Symbol(ra7, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 18, 3))
@@ -58,11 +58,11 @@ var ra8 = E.b * null;
 // operator /
 var rb1 = null / a;
 >rb1 : Symbol(rb1, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 22, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var rb2 = null / b;
 >rb2 : Symbol(rb2, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 23, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var rb3 = null / 1;
 >rb3 : Symbol(rb3, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 24, 3))
@@ -75,11 +75,11 @@ var rb4 = null / E.a;
 
 var rb5 = a / null;
 >rb5 : Symbol(rb5, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 26, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var rb6 = b / null;
 >rb6 : Symbol(rb6, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 27, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var rb7 = 0 / null;
 >rb7 : Symbol(rb7, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 28, 3))
@@ -93,11 +93,11 @@ var rb8 = E.b / null;
 // operator %
 var rc1 = null % a;
 >rc1 : Symbol(rc1, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 32, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var rc2 = null % b;
 >rc2 : Symbol(rc2, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 33, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var rc3 = null % 1;
 >rc3 : Symbol(rc3, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 34, 3))
@@ -110,11 +110,11 @@ var rc4 = null % E.a;
 
 var rc5 = a % null;
 >rc5 : Symbol(rc5, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 36, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var rc6 = b % null;
 >rc6 : Symbol(rc6, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 37, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var rc7 = 0 % null;
 >rc7 : Symbol(rc7, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 38, 3))
@@ -128,11 +128,11 @@ var rc8 = E.b % null;
 // operator -
 var rd1 = null - a;
 >rd1 : Symbol(rd1, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 42, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var rd2 = null - b;
 >rd2 : Symbol(rd2, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 43, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var rd3 = null - 1;
 >rd3 : Symbol(rd3, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 44, 3))
@@ -145,11 +145,11 @@ var rd4 = null - E.a;
 
 var rd5 = a - null;
 >rd5 : Symbol(rd5, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 46, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var rd6 = b - null;
 >rd6 : Symbol(rd6, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 47, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var rd7 = 0 - null;
 >rd7 : Symbol(rd7, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 48, 3))
@@ -163,11 +163,11 @@ var rd8 = E.b - null;
 // operator <<
 var re1 = null << a;
 >re1 : Symbol(re1, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 52, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var re2 = null << b;
 >re2 : Symbol(re2, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 53, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var re3 = null << 1;
 >re3 : Symbol(re3, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 54, 3))
@@ -180,11 +180,11 @@ var re4 = null << E.a;
 
 var re5 = a << null;
 >re5 : Symbol(re5, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 56, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var re6 = b << null;
 >re6 : Symbol(re6, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 57, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var re7 = 0 << null;
 >re7 : Symbol(re7, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 58, 3))
@@ -198,11 +198,11 @@ var re8 = E.b << null;
 // operator >>
 var rf1 = null >> a;
 >rf1 : Symbol(rf1, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 62, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var rf2 = null >> b;
 >rf2 : Symbol(rf2, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 63, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var rf3 = null >> 1;
 >rf3 : Symbol(rf3, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 64, 3))
@@ -215,11 +215,11 @@ var rf4 = null >> E.a;
 
 var rf5 = a >> null;
 >rf5 : Symbol(rf5, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 66, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var rf6 = b >> null;
 >rf6 : Symbol(rf6, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 67, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var rf7 = 0 >> null;
 >rf7 : Symbol(rf7, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 68, 3))
@@ -233,11 +233,11 @@ var rf8 = E.b >> null;
 // operator >>>
 var rg1 = null >>> a;
 >rg1 : Symbol(rg1, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 72, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var rg2 = null >>> b;
 >rg2 : Symbol(rg2, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 73, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var rg3 = null >>> 1;
 >rg3 : Symbol(rg3, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 74, 3))
@@ -250,11 +250,11 @@ var rg4 = null >>> E.a;
 
 var rg5 = a >>> null;
 >rg5 : Symbol(rg5, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 76, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var rg6 = b >>> null;
 >rg6 : Symbol(rg6, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 77, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var rg7 = 0 >>> null;
 >rg7 : Symbol(rg7, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 78, 3))
@@ -268,11 +268,11 @@ var rg8 = E.b >>> null;
 // operator &
 var rh1 = null & a;
 >rh1 : Symbol(rh1, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 82, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var rh2 = null & b;
 >rh2 : Symbol(rh2, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 83, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var rh3 = null & 1;
 >rh3 : Symbol(rh3, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 84, 3))
@@ -285,11 +285,11 @@ var rh4 = null & E.a;
 
 var rh5 = a & null;
 >rh5 : Symbol(rh5, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 86, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var rh6 = b & null;
 >rh6 : Symbol(rh6, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 87, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var rh7 = 0 & null;
 >rh7 : Symbol(rh7, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 88, 3))
@@ -303,11 +303,11 @@ var rh8 = E.b & null;
 // operator ^
 var ri1 = null ^ a;
 >ri1 : Symbol(ri1, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 92, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var ri2 = null ^ b;
 >ri2 : Symbol(ri2, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 93, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var ri3 = null ^ 1;
 >ri3 : Symbol(ri3, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 94, 3))
@@ -320,11 +320,11 @@ var ri4 = null ^ E.a;
 
 var ri5 = a ^ null;
 >ri5 : Symbol(ri5, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 96, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var ri6 = b ^ null;
 >ri6 : Symbol(ri6, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 97, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var ri7 = 0 ^ null;
 >ri7 : Symbol(ri7, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 98, 3))
@@ -338,11 +338,11 @@ var ri8 = E.b ^ null;
 // operator |
 var rj1 = null | a;
 >rj1 : Symbol(rj1, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 102, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var rj2 = null | b;
 >rj2 : Symbol(rj2, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 103, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var rj3 = null | 1;
 >rj3 : Symbol(rj3, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 104, 3))
@@ -355,11 +355,11 @@ var rj4 = null | E.a;
 
 var rj5 = a | null;
 >rj5 : Symbol(rj5, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 106, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var rj6 = b | null;
 >rj6 : Symbol(rj6, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 107, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var rj7 = 0 | null;
 >rj7 : Symbol(rj7, Decl(arithmeticOperatorWithNullValueAndValidOperands.ts, 108, 3))
diff --git a/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.types b/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.types
index 98cc230a9471c..028613f87ccdc 100644
--- a/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.types
+++ b/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.types
@@ -17,11 +17,11 @@ enum E {
 >  : ^^^
 }
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
-var b: number;
+declare var b: number;
 >b : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/arithmeticOperatorWithTypeParameter.errors.txt b/tests/baselines/reference/arithmeticOperatorWithTypeParameter.errors.txt
index 8d895278b97f7..f64a079e3ca9b 100644
--- a/tests/baselines/reference/arithmeticOperatorWithTypeParameter.errors.txt
+++ b/tests/baselines/reference/arithmeticOperatorWithTypeParameter.errors.txt
@@ -183,11 +183,11 @@ arithmeticOperatorWithTypeParameter.ts(128,21): error TS2363: The right-hand sid
 ==== arithmeticOperatorWithTypeParameter.ts (180 errors) ====
     // type parameter type is not valid for arithmetic operand
     function foo<T>(t: T) {
-        var a: any;
-        var b: boolean;
-        var c: number;
-        var d: string;
-        var e: {};
+        let a!: any;
+        let b!: boolean;
+        let c!: number;
+        let d!: string;
+        let e!: {};
     
         var r1a1 = a * t;
                        ~
diff --git a/tests/baselines/reference/arithmeticOperatorWithTypeParameter.js b/tests/baselines/reference/arithmeticOperatorWithTypeParameter.js
index 6c76194913b6e..b25225c6e579a 100644
--- a/tests/baselines/reference/arithmeticOperatorWithTypeParameter.js
+++ b/tests/baselines/reference/arithmeticOperatorWithTypeParameter.js
@@ -3,11 +3,11 @@
 //// [arithmeticOperatorWithTypeParameter.ts]
 // type parameter type is not valid for arithmetic operand
 function foo<T>(t: T) {
-    var a: any;
-    var b: boolean;
-    var c: number;
-    var d: string;
-    var e: {};
+    let a!: any;
+    let b!: boolean;
+    let c!: number;
+    let d!: string;
+    let e!: {};
 
     var r1a1 = a * t;
     var r1a2 = a / t;
diff --git a/tests/baselines/reference/arithmeticOperatorWithTypeParameter.symbols b/tests/baselines/reference/arithmeticOperatorWithTypeParameter.symbols
index 4228f2ffad0a5..3063f4d1a54a6 100644
--- a/tests/baselines/reference/arithmeticOperatorWithTypeParameter.symbols
+++ b/tests/baselines/reference/arithmeticOperatorWithTypeParameter.symbols
@@ -8,19 +8,19 @@ function foo<T>(t: T) {
 >t : Symbol(t, Decl(arithmeticOperatorWithTypeParameter.ts, 1, 16))
 >T : Symbol(T, Decl(arithmeticOperatorWithTypeParameter.ts, 1, 13))
 
-    var a: any;
+    let a!: any;
 >a : Symbol(a, Decl(arithmeticOperatorWithTypeParameter.ts, 2, 7))
 
-    var b: boolean;
+    let b!: boolean;
 >b : Symbol(b, Decl(arithmeticOperatorWithTypeParameter.ts, 3, 7))
 
-    var c: number;
+    let c!: number;
 >c : Symbol(c, Decl(arithmeticOperatorWithTypeParameter.ts, 4, 7))
 
-    var d: string;
+    let d!: string;
 >d : Symbol(d, Decl(arithmeticOperatorWithTypeParameter.ts, 5, 7))
 
-    var e: {};
+    let e!: {};
 >e : Symbol(e, Decl(arithmeticOperatorWithTypeParameter.ts, 6, 7))
 
     var r1a1 = a * t;
diff --git a/tests/baselines/reference/arithmeticOperatorWithTypeParameter.types b/tests/baselines/reference/arithmeticOperatorWithTypeParameter.types
index 11e91bc03c362..fd7f11770780c 100644
--- a/tests/baselines/reference/arithmeticOperatorWithTypeParameter.types
+++ b/tests/baselines/reference/arithmeticOperatorWithTypeParameter.types
@@ -8,23 +8,23 @@ function foo<T>(t: T) {
 >t : T
 >  : ^
 
-    var a: any;
+    let a!: any;
 >a : any
 >  : ^^^
 
-    var b: boolean;
+    let b!: boolean;
 >b : boolean
 >  : ^^^^^^^
 
-    var c: number;
+    let c!: number;
 >c : number
 >  : ^^^^^^
 
-    var d: string;
+    let d!: string;
 >d : string
 >  : ^^^^^^
 
-    var e: {};
+    let e!: {};
 >e : {}
 >  : ^^
 
diff --git a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.errors.txt b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.errors.txt
index 2597dbc861257..35ab0d3f2ec19 100644
--- a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.errors.txt
+++ b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.errors.txt
@@ -244,9 +244,9 @@ arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts(176,18): error TS18050
     // If one operand is the undefined or undefined value, it is treated as having the type of the
     // other operand.
     
-    var a: boolean;
-    var b: string;
-    var c: Object;
+    declare var a: boolean;
+    declare var b: string;
+    declare var c: Object;
     
     // operator *
     var r1a1 = undefined * a;
diff --git a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.js b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.js
index e50c37344ca49..a771640b820d3 100644
--- a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.js
+++ b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.js
@@ -4,9 +4,9 @@
 // If one operand is the undefined or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
-var b: string;
-var c: Object;
+declare var a: boolean;
+declare var b: string;
+declare var c: Object;
 
 // operator *
 var r1a1 = undefined * a;
@@ -181,9 +181,6 @@ var r10d3 = {} | undefined;
 //// [arithmeticOperatorWithUndefinedValueAndInvalidOperands.js]
 // If one operand is the undefined or undefined value, it is treated as having the type of the
 // other operand.
-var a;
-var b;
-var c;
 // operator *
 var r1a1 = undefined * a;
 var r1a2 = undefined * b;
diff --git a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.symbols b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.symbols
index a0c409aaf92b4..6c6643316a38c 100644
--- a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.symbols
+++ b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.symbols
@@ -4,45 +4,45 @@
 // If one operand is the undefined or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+declare var a: boolean;
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 
-var b: string;
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+declare var b: string;
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 
-var c: Object;
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+declare var c: Object;
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 // operator *
 var r1a1 = undefined * a;
 >r1a1 : Symbol(r1a1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 8, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 
 var r1a2 = undefined * b;
 >r1a2 : Symbol(r1a2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 9, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 
 var r1a3 = undefined * c;
 >r1a3 : Symbol(r1a3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 10, 3))
 >undefined : Symbol(undefined)
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 
 var r1b1 = a * undefined;
 >r1b1 : Symbol(r1b1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 12, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 >undefined : Symbol(undefined)
 
 var r1b2 = b * undefined;
 >r1b2 : Symbol(r1b2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 13, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 >undefined : Symbol(undefined)
 
 var r1b3 = c * undefined;
 >r1b3 : Symbol(r1b3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 14, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 >undefined : Symbol(undefined)
 
 var r1c1 = undefined * true;
@@ -73,31 +73,31 @@ var r1d3 = {} * undefined;
 var r2a1 = undefined / a;
 >r2a1 : Symbol(r2a1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 25, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 
 var r2a2 = undefined / b;
 >r2a2 : Symbol(r2a2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 26, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 
 var r2a3 = undefined / c;
 >r2a3 : Symbol(r2a3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 27, 3))
 >undefined : Symbol(undefined)
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 
 var r2b1 = a / undefined;
 >r2b1 : Symbol(r2b1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 29, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 >undefined : Symbol(undefined)
 
 var r2b2 = b / undefined;
 >r2b2 : Symbol(r2b2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 30, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 >undefined : Symbol(undefined)
 
 var r2b3 = c / undefined;
 >r2b3 : Symbol(r2b3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 31, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 >undefined : Symbol(undefined)
 
 var r2c1 = undefined / true;
@@ -128,31 +128,31 @@ var r2d3 = {} / undefined;
 var r3a1 = undefined % a;
 >r3a1 : Symbol(r3a1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 42, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 
 var r3a2 = undefined % b;
 >r3a2 : Symbol(r3a2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 43, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 
 var r3a3 = undefined % c;
 >r3a3 : Symbol(r3a3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 44, 3))
 >undefined : Symbol(undefined)
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 
 var r3b1 = a % undefined;
 >r3b1 : Symbol(r3b1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 46, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 >undefined : Symbol(undefined)
 
 var r3b2 = b % undefined;
 >r3b2 : Symbol(r3b2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 47, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 >undefined : Symbol(undefined)
 
 var r3b3 = c % undefined;
 >r3b3 : Symbol(r3b3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 48, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 >undefined : Symbol(undefined)
 
 var r3c1 = undefined % true;
@@ -183,31 +183,31 @@ var r3d3 = {} % undefined;
 var r4a1 = undefined - a;
 >r4a1 : Symbol(r4a1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 59, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 
 var r4a2 = undefined - b;
 >r4a2 : Symbol(r4a2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 60, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 
 var r4a3 = undefined - c;
 >r4a3 : Symbol(r4a3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 61, 3))
 >undefined : Symbol(undefined)
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 
 var r4b1 = a - undefined;
 >r4b1 : Symbol(r4b1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 63, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 >undefined : Symbol(undefined)
 
 var r4b2 = b - undefined;
 >r4b2 : Symbol(r4b2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 64, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 >undefined : Symbol(undefined)
 
 var r4b3 = c - undefined;
 >r4b3 : Symbol(r4b3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 65, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 >undefined : Symbol(undefined)
 
 var r4c1 = undefined - true;
@@ -238,31 +238,31 @@ var r4d3 = {} - undefined;
 var r5a1 = undefined << a;
 >r5a1 : Symbol(r5a1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 76, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 
 var r5a2 = undefined << b;
 >r5a2 : Symbol(r5a2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 77, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 
 var r5a3 = undefined << c;
 >r5a3 : Symbol(r5a3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 78, 3))
 >undefined : Symbol(undefined)
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 
 var r5b1 = a << undefined;
 >r5b1 : Symbol(r5b1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 80, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 >undefined : Symbol(undefined)
 
 var r5b2 = b << undefined;
 >r5b2 : Symbol(r5b2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 81, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 >undefined : Symbol(undefined)
 
 var r5b3 = c << undefined;
 >r5b3 : Symbol(r5b3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 82, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 >undefined : Symbol(undefined)
 
 var r5c1 = undefined << true;
@@ -293,31 +293,31 @@ var r5d3 = {} << undefined;
 var r6a1 = undefined >> a;
 >r6a1 : Symbol(r6a1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 93, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 
 var r6a2 = undefined >> b;
 >r6a2 : Symbol(r6a2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 94, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 
 var r6a3 = undefined >> c;
 >r6a3 : Symbol(r6a3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 95, 3))
 >undefined : Symbol(undefined)
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 
 var r6b1 = a >> undefined;
 >r6b1 : Symbol(r6b1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 97, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 >undefined : Symbol(undefined)
 
 var r6b2 = b >> undefined;
 >r6b2 : Symbol(r6b2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 98, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 >undefined : Symbol(undefined)
 
 var r6b3 = c >> undefined;
 >r6b3 : Symbol(r6b3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 99, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 >undefined : Symbol(undefined)
 
 var r6c1 = undefined >> true;
@@ -348,31 +348,31 @@ var r6d3 = {} >> undefined;
 var r7a1 = undefined >>> a;
 >r7a1 : Symbol(r7a1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 110, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 
 var r7a2 = undefined >>> b;
 >r7a2 : Symbol(r7a2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 111, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 
 var r7a3 = undefined >>> c;
 >r7a3 : Symbol(r7a3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 112, 3))
 >undefined : Symbol(undefined)
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 
 var r7b1 = a >>> undefined;
 >r7b1 : Symbol(r7b1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 114, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 >undefined : Symbol(undefined)
 
 var r7b2 = b >>> undefined;
 >r7b2 : Symbol(r7b2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 115, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 >undefined : Symbol(undefined)
 
 var r7b3 = c >>> undefined;
 >r7b3 : Symbol(r7b3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 116, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 >undefined : Symbol(undefined)
 
 var r7c1 = undefined >>> true;
@@ -403,31 +403,31 @@ var r7d3 = {} >>> undefined;
 var r8a1 = undefined & a;
 >r8a1 : Symbol(r8a1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 127, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 
 var r8a2 = undefined & b;
 >r8a2 : Symbol(r8a2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 128, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 
 var r8a3 = undefined & c;
 >r8a3 : Symbol(r8a3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 129, 3))
 >undefined : Symbol(undefined)
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 
 var r8b1 = a & undefined;
 >r8b1 : Symbol(r8b1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 131, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 >undefined : Symbol(undefined)
 
 var r8b2 = b & undefined;
 >r8b2 : Symbol(r8b2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 132, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 >undefined : Symbol(undefined)
 
 var r8b3 = c & undefined;
 >r8b3 : Symbol(r8b3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 133, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 >undefined : Symbol(undefined)
 
 var r8c1 = undefined & true;
@@ -458,31 +458,31 @@ var r8d3 = {} & undefined;
 var r9a1 = undefined ^ a;
 >r9a1 : Symbol(r9a1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 144, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 
 var r9a2 = undefined ^ b;
 >r9a2 : Symbol(r9a2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 145, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 
 var r9a3 = undefined ^ c;
 >r9a3 : Symbol(r9a3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 146, 3))
 >undefined : Symbol(undefined)
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 
 var r9b1 = a ^ undefined;
 >r9b1 : Symbol(r9b1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 148, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 >undefined : Symbol(undefined)
 
 var r9b2 = b ^ undefined;
 >r9b2 : Symbol(r9b2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 149, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 >undefined : Symbol(undefined)
 
 var r9b3 = c ^ undefined;
 >r9b3 : Symbol(r9b3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 150, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 >undefined : Symbol(undefined)
 
 var r9c1 = undefined ^ true;
@@ -513,31 +513,31 @@ var r9d3 = {} ^ undefined;
 var r10a1 = undefined | a;
 >r10a1 : Symbol(r10a1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 161, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 
 var r10a2 = undefined | b;
 >r10a2 : Symbol(r10a2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 162, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 
 var r10a3 = undefined | c;
 >r10a3 : Symbol(r10a3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 163, 3))
 >undefined : Symbol(undefined)
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 
 var r10b1 = a | undefined;
 >r10b1 : Symbol(r10b1, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 165, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 >undefined : Symbol(undefined)
 
 var r10b2 = b | undefined;
 >r10b2 : Symbol(r10b2, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 166, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 >undefined : Symbol(undefined)
 
 var r10b3 = c | undefined;
 >r10b3 : Symbol(r10b3, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 167, 3))
->c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 >undefined : Symbol(undefined)
 
 var r10c1 = undefined | true;
diff --git a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.types b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.types
index 6c3ec53c7c60a..d5334eca68273 100644
--- a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.types
+++ b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.types
@@ -4,15 +4,15 @@
 // If one operand is the undefined or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
+declare var a: boolean;
 >a : boolean
 >  : ^^^^^^^
 
-var b: string;
+declare var b: string;
 >b : string
 >  : ^^^^^^
 
-var c: Object;
+declare var c: Object;
 >c : Object
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.errors.txt b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.errors.txt
index 53924924d504e..79c343eb2edca 100644
--- a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.errors.txt
+++ b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.errors.txt
@@ -89,8 +89,8 @@ arithmeticOperatorWithUndefinedValueAndValidOperands.ts(110,17): error TS18050:
         b
     }
     
-    var a: any;
-    var b: number;
+    declare var a: any;
+    declare var b: number;
     
     // operator *
     var ra1 = undefined * a;
diff --git a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.js b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.js
index fdb16d22f3009..b87edf044ecd8 100644
--- a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.js
+++ b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.js
@@ -9,8 +9,8 @@ enum E {
     b
 }
 
-var a: any;
-var b: number;
+declare var a: any;
+declare var b: number;
 
 // operator *
 var ra1 = undefined * a;
@@ -120,8 +120,6 @@ var E;
     E[E["a"] = 0] = "a";
     E[E["b"] = 1] = "b";
 })(E || (E = {}));
-var a;
-var b;
 // operator *
 var ra1 = undefined * a;
 var ra2 = undefined * b;
diff --git a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.symbols b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.symbols
index 6219bebd69096..e3f247befa219 100644
--- a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.symbols
+++ b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.symbols
@@ -14,22 +14,22 @@ enum E {
 >b : Symbol(E.b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 4, 6))
 }
 
-var a: any;
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+declare var a: any;
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 
-var b: number;
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+declare var b: number;
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 
 // operator *
 var ra1 = undefined * a;
 >ra1 : Symbol(ra1, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 12, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 
 var ra2 = undefined * b;
 >ra2 : Symbol(ra2, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 13, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 
 var ra3 = undefined * 1;
 >ra3 : Symbol(ra3, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 14, 3))
@@ -44,12 +44,12 @@ var ra4 = undefined * E.a;
 
 var ra5 = a * undefined;
 >ra5 : Symbol(ra5, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 16, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 >undefined : Symbol(undefined)
 
 var ra6 = b * undefined;
 >ra6 : Symbol(ra6, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 17, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 >undefined : Symbol(undefined)
 
 var ra7 = 0 * undefined;
@@ -67,12 +67,12 @@ var ra8 = E.b * undefined;
 var rb1 = undefined / a;
 >rb1 : Symbol(rb1, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 22, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 
 var rb2 = undefined / b;
 >rb2 : Symbol(rb2, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 23, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 
 var rb3 = undefined / 1;
 >rb3 : Symbol(rb3, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 24, 3))
@@ -87,12 +87,12 @@ var rb4 = undefined / E.a;
 
 var rb5 = a / undefined;
 >rb5 : Symbol(rb5, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 26, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 >undefined : Symbol(undefined)
 
 var rb6 = b / undefined;
 >rb6 : Symbol(rb6, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 27, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 >undefined : Symbol(undefined)
 
 var rb7 = 0 / undefined;
@@ -110,12 +110,12 @@ var rb8 = E.b / undefined;
 var rc1 = undefined % a;
 >rc1 : Symbol(rc1, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 32, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 
 var rc2 = undefined % b;
 >rc2 : Symbol(rc2, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 33, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 
 var rc3 = undefined % 1;
 >rc3 : Symbol(rc3, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 34, 3))
@@ -130,12 +130,12 @@ var rc4 = undefined % E.a;
 
 var rc5 = a % undefined;
 >rc5 : Symbol(rc5, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 36, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 >undefined : Symbol(undefined)
 
 var rc6 = b % undefined;
 >rc6 : Symbol(rc6, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 37, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 >undefined : Symbol(undefined)
 
 var rc7 = 0 % undefined;
@@ -153,12 +153,12 @@ var rc8 = E.b % undefined;
 var rd1 = undefined - a;
 >rd1 : Symbol(rd1, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 42, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 
 var rd2 = undefined - b;
 >rd2 : Symbol(rd2, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 43, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 
 var rd3 = undefined - 1;
 >rd3 : Symbol(rd3, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 44, 3))
@@ -173,12 +173,12 @@ var rd4 = undefined - E.a;
 
 var rd5 = a - undefined;
 >rd5 : Symbol(rd5, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 46, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 >undefined : Symbol(undefined)
 
 var rd6 = b - undefined;
 >rd6 : Symbol(rd6, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 47, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 >undefined : Symbol(undefined)
 
 var rd7 = 0 - undefined;
@@ -196,12 +196,12 @@ var rd8 = E.b - undefined;
 var re1 = undefined << a;
 >re1 : Symbol(re1, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 52, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 
 var re2 = undefined << b;
 >re2 : Symbol(re2, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 53, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 
 var re3 = undefined << 1;
 >re3 : Symbol(re3, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 54, 3))
@@ -216,12 +216,12 @@ var re4 = undefined << E.a;
 
 var re5 = a << undefined;
 >re5 : Symbol(re5, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 56, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 >undefined : Symbol(undefined)
 
 var re6 = b << undefined;
 >re6 : Symbol(re6, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 57, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 >undefined : Symbol(undefined)
 
 var re7 = 0 << undefined;
@@ -239,12 +239,12 @@ var re8 = E.b << undefined;
 var rf1 = undefined >> a;
 >rf1 : Symbol(rf1, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 62, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 
 var rf2 = undefined >> b;
 >rf2 : Symbol(rf2, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 63, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 
 var rf3 = undefined >> 1;
 >rf3 : Symbol(rf3, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 64, 3))
@@ -259,12 +259,12 @@ var rf4 = undefined >> E.a;
 
 var rf5 = a >> undefined;
 >rf5 : Symbol(rf5, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 66, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 >undefined : Symbol(undefined)
 
 var rf6 = b >> undefined;
 >rf6 : Symbol(rf6, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 67, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 >undefined : Symbol(undefined)
 
 var rf7 = 0 >> undefined;
@@ -282,12 +282,12 @@ var rf8 = E.b >> undefined;
 var rg1 = undefined >>> a;
 >rg1 : Symbol(rg1, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 72, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 
 var rg2 = undefined >>> b;
 >rg2 : Symbol(rg2, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 73, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 
 var rg3 = undefined >>> 1;
 >rg3 : Symbol(rg3, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 74, 3))
@@ -302,12 +302,12 @@ var rg4 = undefined >>> E.a;
 
 var rg5 = a >>> undefined;
 >rg5 : Symbol(rg5, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 76, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 >undefined : Symbol(undefined)
 
 var rg6 = b >>> undefined;
 >rg6 : Symbol(rg6, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 77, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 >undefined : Symbol(undefined)
 
 var rg7 = 0 >>> undefined;
@@ -325,12 +325,12 @@ var rg8 = E.b >>> undefined;
 var rh1 = undefined & a;
 >rh1 : Symbol(rh1, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 82, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 
 var rh2 = undefined & b;
 >rh2 : Symbol(rh2, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 83, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 
 var rh3 = undefined & 1;
 >rh3 : Symbol(rh3, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 84, 3))
@@ -345,12 +345,12 @@ var rh4 = undefined & E.a;
 
 var rh5 = a & undefined;
 >rh5 : Symbol(rh5, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 86, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 >undefined : Symbol(undefined)
 
 var rh6 = b & undefined;
 >rh6 : Symbol(rh6, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 87, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 >undefined : Symbol(undefined)
 
 var rh7 = 0 & undefined;
@@ -368,12 +368,12 @@ var rh8 = E.b & undefined;
 var ri1 = undefined ^ a;
 >ri1 : Symbol(ri1, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 92, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 
 var ri2 = undefined ^ b;
 >ri2 : Symbol(ri2, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 93, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 
 var ri3 = undefined ^ 1;
 >ri3 : Symbol(ri3, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 94, 3))
@@ -388,12 +388,12 @@ var ri4 = undefined ^ E.a;
 
 var ri5 = a ^ undefined;
 >ri5 : Symbol(ri5, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 96, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 >undefined : Symbol(undefined)
 
 var ri6 = b ^ undefined;
 >ri6 : Symbol(ri6, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 97, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 >undefined : Symbol(undefined)
 
 var ri7 = 0 ^ undefined;
@@ -411,12 +411,12 @@ var ri8 = E.b ^ undefined;
 var rj1 = undefined | a;
 >rj1 : Symbol(rj1, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 102, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 
 var rj2 = undefined | b;
 >rj2 : Symbol(rj2, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 103, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 
 var rj3 = undefined | 1;
 >rj3 : Symbol(rj3, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 104, 3))
@@ -431,12 +431,12 @@ var rj4 = undefined | E.a;
 
 var rj5 = a | undefined;
 >rj5 : Symbol(rj5, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 106, 3))
->a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 >undefined : Symbol(undefined)
 
 var rj6 = b | undefined;
 >rj6 : Symbol(rj6, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 107, 3))
->b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(arithmeticOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 >undefined : Symbol(undefined)
 
 var rj7 = 0 | undefined;
diff --git a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.types b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.types
index 607c764e48c2e..37f3d457e99ca 100644
--- a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.types
+++ b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.types
@@ -17,11 +17,11 @@ enum E {
 >  : ^^^
 }
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
-var b: number;
+declare var b: number;
 >b : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt b/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt
index b4e4cdbcf67a4..188e9e1160afc 100644
--- a/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt
+++ b/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt
@@ -36,9 +36,9 @@ arityAndOrderCompatibility01.ts(32,5): error TS2322: Type '{ 0: string; 1: numbe
         length: 2;
     }
     
-    var x: [string, number];
-    var y: StrNum
-    var z: {
+    declare var x: [string, number];
+    declare var y: StrNum
+    declare var z: {
         0: string;
         1: number;
         length: 2;
diff --git a/tests/baselines/reference/arityAndOrderCompatibility01.js b/tests/baselines/reference/arityAndOrderCompatibility01.js
index 81f2df8dd8165..4226f80656b02 100644
--- a/tests/baselines/reference/arityAndOrderCompatibility01.js
+++ b/tests/baselines/reference/arityAndOrderCompatibility01.js
@@ -7,9 +7,9 @@ interface StrNum extends Array<string|number> {
     length: 2;
 }
 
-var x: [string, number];
-var y: StrNum
-var z: {
+declare var x: [string, number];
+declare var y: StrNum
+declare var z: {
     0: string;
     1: number;
     length: 2;
@@ -39,9 +39,6 @@ var o3: [string, number] = y;
 
 
 //// [arityAndOrderCompatibility01.js]
-var x;
-var y;
-var z;
 var a = x[0], b = x[1], c = x[2];
 var d = y[0], e = y[1], f = y[2];
 var g = z[0], h = z[1], i = z[2];
diff --git a/tests/baselines/reference/arityAndOrderCompatibility01.symbols b/tests/baselines/reference/arityAndOrderCompatibility01.symbols
index b3cde5bd55213..aa22946313bad 100644
--- a/tests/baselines/reference/arityAndOrderCompatibility01.symbols
+++ b/tests/baselines/reference/arityAndOrderCompatibility01.symbols
@@ -15,18 +15,18 @@ interface StrNum extends Array<string|number> {
 >length : Symbol(StrNum.length, Decl(arityAndOrderCompatibility01.ts, 2, 14))
 }
 
-var x: [string, number];
->x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 3))
+declare var x: [string, number];
+>x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 11))
 
-var y: StrNum
->y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 3))
+declare var y: StrNum
+>y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 11))
 >StrNum : Symbol(StrNum, Decl(arityAndOrderCompatibility01.ts, 0, 0))
 
-var z: {
->z : Symbol(z, Decl(arityAndOrderCompatibility01.ts, 8, 3))
+declare var z: {
+>z : Symbol(z, Decl(arityAndOrderCompatibility01.ts, 8, 11))
 
     0: string;
->0 : Symbol(0, Decl(arityAndOrderCompatibility01.ts, 8, 8))
+>0 : Symbol(0, Decl(arityAndOrderCompatibility01.ts, 8, 16))
 
     1: number;
 >1 : Symbol(1, Decl(arityAndOrderCompatibility01.ts, 9, 14))
@@ -39,89 +39,89 @@ var [a, b, c] = x;
 >a : Symbol(a, Decl(arityAndOrderCompatibility01.ts, 14, 5))
 >b : Symbol(b, Decl(arityAndOrderCompatibility01.ts, 14, 7))
 >c : Symbol(c, Decl(arityAndOrderCompatibility01.ts, 14, 10))
->x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 3))
+>x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 11))
 
 var [d, e, f] = y;
 >d : Symbol(d, Decl(arityAndOrderCompatibility01.ts, 15, 5))
 >e : Symbol(e, Decl(arityAndOrderCompatibility01.ts, 15, 7))
 >f : Symbol(f, Decl(arityAndOrderCompatibility01.ts, 15, 10))
->y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 3))
+>y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 11))
 
 var [g, h, i] = z;
 >g : Symbol(g, Decl(arityAndOrderCompatibility01.ts, 16, 5))
 >h : Symbol(h, Decl(arityAndOrderCompatibility01.ts, 16, 7))
 >i : Symbol(i, Decl(arityAndOrderCompatibility01.ts, 16, 10))
->z : Symbol(z, Decl(arityAndOrderCompatibility01.ts, 8, 3))
+>z : Symbol(z, Decl(arityAndOrderCompatibility01.ts, 8, 11))
 
 var j1: [number, number, number] = x;
 >j1 : Symbol(j1, Decl(arityAndOrderCompatibility01.ts, 17, 3))
->x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 3))
+>x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 11))
 
 var j2: [number, number, number] = y;
 >j2 : Symbol(j2, Decl(arityAndOrderCompatibility01.ts, 18, 3))
->y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 3))
+>y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 11))
 
 var j3: [number, number, number] = z;
 >j3 : Symbol(j3, Decl(arityAndOrderCompatibility01.ts, 19, 3))
->z : Symbol(z, Decl(arityAndOrderCompatibility01.ts, 8, 3))
+>z : Symbol(z, Decl(arityAndOrderCompatibility01.ts, 8, 11))
 
 var k1: [string, number, number] = x;
 >k1 : Symbol(k1, Decl(arityAndOrderCompatibility01.ts, 20, 3))
->x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 3))
+>x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 11))
 
 var k2: [string, number, number] = y;
 >k2 : Symbol(k2, Decl(arityAndOrderCompatibility01.ts, 21, 3))
->y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 3))
+>y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 11))
 
 var k3: [string, number, number] = z;
 >k3 : Symbol(k3, Decl(arityAndOrderCompatibility01.ts, 22, 3))
->z : Symbol(z, Decl(arityAndOrderCompatibility01.ts, 8, 3))
+>z : Symbol(z, Decl(arityAndOrderCompatibility01.ts, 8, 11))
 
 var l1: [number] = x;
 >l1 : Symbol(l1, Decl(arityAndOrderCompatibility01.ts, 23, 3))
->x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 3))
+>x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 11))
 
 var l2: [number] = y;
 >l2 : Symbol(l2, Decl(arityAndOrderCompatibility01.ts, 24, 3))
->y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 3))
+>y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 11))
 
 var l3: [number] = z;
 >l3 : Symbol(l3, Decl(arityAndOrderCompatibility01.ts, 25, 3))
->z : Symbol(z, Decl(arityAndOrderCompatibility01.ts, 8, 3))
+>z : Symbol(z, Decl(arityAndOrderCompatibility01.ts, 8, 11))
 
 var m1: [string] = x;
 >m1 : Symbol(m1, Decl(arityAndOrderCompatibility01.ts, 26, 3))
->x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 3))
+>x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 11))
 
 var m2: [string] = y;
 >m2 : Symbol(m2, Decl(arityAndOrderCompatibility01.ts, 27, 3))
->y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 3))
+>y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 11))
 
 var m3: [string] = z;
 >m3 : Symbol(m3, Decl(arityAndOrderCompatibility01.ts, 28, 3))
->z : Symbol(z, Decl(arityAndOrderCompatibility01.ts, 8, 3))
+>z : Symbol(z, Decl(arityAndOrderCompatibility01.ts, 8, 11))
 
 var n1: [number, string] = x;
 >n1 : Symbol(n1, Decl(arityAndOrderCompatibility01.ts, 29, 3))
->x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 3))
+>x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 11))
 
 var n2: [number, string] = y;
 >n2 : Symbol(n2, Decl(arityAndOrderCompatibility01.ts, 30, 3))
->y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 3))
+>y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 11))
 
 var n3: [number, string] = z;
 >n3 : Symbol(n3, Decl(arityAndOrderCompatibility01.ts, 31, 3))
->z : Symbol(z, Decl(arityAndOrderCompatibility01.ts, 8, 3))
+>z : Symbol(z, Decl(arityAndOrderCompatibility01.ts, 8, 11))
 
 var o1: [string, number] = x;
 >o1 : Symbol(o1, Decl(arityAndOrderCompatibility01.ts, 32, 3))
->x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 3))
+>x : Symbol(x, Decl(arityAndOrderCompatibility01.ts, 6, 11))
 
 var o2: [string, number] = y;
 >o2 : Symbol(o2, Decl(arityAndOrderCompatibility01.ts, 33, 3))
->y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 3))
+>y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 11))
 
 var o3: [string, number] = y;
 >o3 : Symbol(o3, Decl(arityAndOrderCompatibility01.ts, 34, 3))
->y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 3))
+>y : Symbol(y, Decl(arityAndOrderCompatibility01.ts, 7, 11))
 
diff --git a/tests/baselines/reference/arityAndOrderCompatibility01.types b/tests/baselines/reference/arityAndOrderCompatibility01.types
index 5c37248c3ebc0..a7109edfe8ae1 100644
--- a/tests/baselines/reference/arityAndOrderCompatibility01.types
+++ b/tests/baselines/reference/arityAndOrderCompatibility01.types
@@ -15,15 +15,15 @@ interface StrNum extends Array<string|number> {
 >       : ^
 }
 
-var x: [string, number];
+declare var x: [string, number];
 >x : [string, number]
 >  : ^^^^^^^^^^^^^^^^
 
-var y: StrNum
+declare var y: StrNum
 >y : StrNum
 >  : ^^^^^^
 
-var z: {
+declare var z: {
 >z : { 0: string; 1: number; length: 2; }
 >  : ^^^^^      ^^^^^      ^^^^^^^^^^ ^^^
 
diff --git a/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.errors.txt b/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.errors.txt
index 61c9f33cada3f..a62cb8e3b56c8 100644
--- a/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.errors.txt
+++ b/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.errors.txt
@@ -1,13 +1,13 @@
-arrayLiteralAndArrayConstructorEquivalence1.ts(3,14): error TS2314: Generic type 'Array<T>' requires 1 type argument(s).
+arrayLiteralAndArrayConstructorEquivalence1.ts(3,22): error TS2314: Generic type 'Array<T>' requires 1 type argument(s).
 
 
 ==== arrayLiteralAndArrayConstructorEquivalence1.ts (1 errors) ====
     var myCars=new Array(); 
     var myCars3 = new Array({});
-    var myCars4: Array; // error
-                 ~~~~~
+    declare var myCars4: Array; // error
+                         ~~~~~
 !!! error TS2314: Generic type 'Array<T>' requires 1 type argument(s).
-    var myCars5: Array<any>[];
+    declare var myCars5: Array<any>[];
      
     myCars = myCars3;
     myCars = myCars4;
diff --git a/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.js b/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.js
index 3876a90b17c2c..555eddfeeed70 100644
--- a/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.js
+++ b/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.js
@@ -3,8 +3,8 @@
 //// [arrayLiteralAndArrayConstructorEquivalence1.ts]
 var myCars=new Array(); 
 var myCars3 = new Array({});
-var myCars4: Array; // error
-var myCars5: Array<any>[];
+declare var myCars4: Array; // error
+declare var myCars5: Array<any>[];
  
 myCars = myCars3;
 myCars = myCars4;
@@ -18,8 +18,6 @@ myCars3 = myCars5;
 //// [arrayLiteralAndArrayConstructorEquivalence1.js]
 var myCars = new Array();
 var myCars3 = new Array({});
-var myCars4; // error
-var myCars5;
 myCars = myCars3;
 myCars = myCars4;
 myCars = myCars5;
diff --git a/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.symbols b/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.symbols
index 3793641e69586..c862cdf1756e6 100644
--- a/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.symbols
+++ b/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.symbols
@@ -9,12 +9,12 @@ var myCars3 = new Array({});
 >myCars3 : Symbol(myCars3, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 1, 3))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
-var myCars4: Array; // error
->myCars4 : Symbol(myCars4, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 2, 3))
+declare var myCars4: Array; // error
+>myCars4 : Symbol(myCars4, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 2, 11))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
-var myCars5: Array<any>[];
->myCars5 : Symbol(myCars5, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 3, 3))
+declare var myCars5: Array<any>[];
+>myCars5 : Symbol(myCars5, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 3, 11))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
  
 myCars = myCars3;
@@ -23,11 +23,11 @@ myCars = myCars3;
 
 myCars = myCars4;
 >myCars : Symbol(myCars, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 0, 3))
->myCars4 : Symbol(myCars4, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 2, 3))
+>myCars4 : Symbol(myCars4, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 2, 11))
 
 myCars = myCars5;
 >myCars : Symbol(myCars, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 0, 3))
->myCars5 : Symbol(myCars5, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 3, 3))
+>myCars5 : Symbol(myCars5, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 3, 11))
  
 myCars3 = myCars;
 >myCars3 : Symbol(myCars3, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 1, 3))
@@ -35,9 +35,9 @@ myCars3 = myCars;
 
 myCars3 = myCars4;
 >myCars3 : Symbol(myCars3, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 1, 3))
->myCars4 : Symbol(myCars4, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 2, 3))
+>myCars4 : Symbol(myCars4, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 2, 11))
 
 myCars3 = myCars5;   
 >myCars3 : Symbol(myCars3, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 1, 3))
->myCars5 : Symbol(myCars5, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 3, 3))
+>myCars5 : Symbol(myCars5, Decl(arrayLiteralAndArrayConstructorEquivalence1.ts, 3, 11))
 
diff --git a/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.types b/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.types
index 002a8c7b9ae14..5fa1a325ca9e0 100644
--- a/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.types
+++ b/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.types
@@ -19,11 +19,11 @@ var myCars3 = new Array({});
 >{} : {}
 >   : ^^
 
-var myCars4: Array; // error
+declare var myCars4: Array; // error
 >myCars4 : any
 >        : ^^^
 
-var myCars5: Array<any>[];
+declare var myCars5: Array<any>[];
 >myCars5 : any[][]
 >        : ^^^^^^^
  
diff --git a/tests/baselines/reference/arraySigChecking.errors.txt b/tests/baselines/reference/arraySigChecking.errors.txt
index d39a86ec11622..74dbd3487bfe2 100644
--- a/tests/baselines/reference/arraySigChecking.errors.txt
+++ b/tests/baselines/reference/arraySigChecking.errors.txt
@@ -23,7 +23,7 @@ arraySigChecking.ts(22,16): error TS2322: Type 'number' is not assignable to typ
     interface myInt {
         voidFn(): void;
     }
-    var myVar: myInt;
+    declare var myVar: myInt;
     var strArray: string[] = [myVar.voidFn()];
                               ~~~~~~~~~~~~~~
 !!! error TS2322: Type 'void' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/arraySigChecking.js b/tests/baselines/reference/arraySigChecking.js
index 12b13af0ef452..b114161260bad 100644
--- a/tests/baselines/reference/arraySigChecking.js
+++ b/tests/baselines/reference/arraySigChecking.js
@@ -17,7 +17,7 @@ declare namespace M {
 interface myInt {
     voidFn(): void;
 }
-var myVar: myInt;
+declare var myVar: myInt;
 var strArray: string[] = [myVar.voidFn()];
 
 
@@ -35,7 +35,6 @@ isEmpty(['a']);
 
 
 //// [arraySigChecking.js]
-var myVar;
 var strArray = [myVar.voidFn()];
 var myArray;
 myArray = [[1, 2]];
diff --git a/tests/baselines/reference/arraySigChecking.symbols b/tests/baselines/reference/arraySigChecking.symbols
index 675232020ffa8..ec798833f2f34 100644
--- a/tests/baselines/reference/arraySigChecking.symbols
+++ b/tests/baselines/reference/arraySigChecking.symbols
@@ -34,14 +34,14 @@ interface myInt {
     voidFn(): void;
 >voidFn : Symbol(myInt.voidFn, Decl(arraySigChecking.ts, 13, 17))
 }
-var myVar: myInt;
->myVar : Symbol(myVar, Decl(arraySigChecking.ts, 16, 3))
+declare var myVar: myInt;
+>myVar : Symbol(myVar, Decl(arraySigChecking.ts, 16, 11))
 >myInt : Symbol(myInt, Decl(arraySigChecking.ts, 11, 1))
 
 var strArray: string[] = [myVar.voidFn()];
 >strArray : Symbol(strArray, Decl(arraySigChecking.ts, 17, 3))
 >myVar.voidFn : Symbol(myInt.voidFn, Decl(arraySigChecking.ts, 13, 17))
->myVar : Symbol(myVar, Decl(arraySigChecking.ts, 16, 3))
+>myVar : Symbol(myVar, Decl(arraySigChecking.ts, 16, 11))
 >voidFn : Symbol(myInt.voidFn, Decl(arraySigChecking.ts, 13, 17))
 
 
diff --git a/tests/baselines/reference/arraySigChecking.types b/tests/baselines/reference/arraySigChecking.types
index e06a70c576933..81f479fe85ec1 100644
--- a/tests/baselines/reference/arraySigChecking.types
+++ b/tests/baselines/reference/arraySigChecking.types
@@ -36,7 +36,7 @@ interface myInt {
 >voidFn : () => void
 >       : ^^^^^^    
 }
-var myVar: myInt;
+declare var myVar: myInt;
 >myVar : myInt
 >      : ^^^^^
 
diff --git a/tests/baselines/reference/asiPreventsParsingAsInterface05.errors.txt b/tests/baselines/reference/asiPreventsParsingAsInterface05.errors.txt
index 61d669aec1ff6..e8fc62fbde16d 100644
--- a/tests/baselines/reference/asiPreventsParsingAsInterface05.errors.txt
+++ b/tests/baselines/reference/asiPreventsParsingAsInterface05.errors.txt
@@ -6,7 +6,7 @@ asiPreventsParsingAsInterface05.ts(11,1): error TS2304: Cannot find name 'I'.
 ==== asiPreventsParsingAsInterface05.ts (3 errors) ====
     "use strict"
     
-    var interface: number;
+    var interface: number = 123;
         ~~~~~~~~~
 !!! error TS1212: Identifier expected. 'interface' is a reserved word in strict mode.
     
diff --git a/tests/baselines/reference/asiPreventsParsingAsInterface05.js b/tests/baselines/reference/asiPreventsParsingAsInterface05.js
index 82aea79bba0b6..51f002b5a9d04 100644
--- a/tests/baselines/reference/asiPreventsParsingAsInterface05.js
+++ b/tests/baselines/reference/asiPreventsParsingAsInterface05.js
@@ -3,7 +3,7 @@
 //// [asiPreventsParsingAsInterface05.ts]
 "use strict"
 
-var interface: number;
+var interface: number = 123;
 
 // 'interface' is a strict mode reserved word, and so it would be permissible
 // to allow 'interface' and the name of the interface to be on separate lines;
@@ -16,7 +16,7 @@ I           // This should be the identifier 'I'
 
 //// [asiPreventsParsingAsInterface05.js]
 "use strict";
-var interface;
+var interface = 123;
 // 'interface' is a strict mode reserved word, and so it would be permissible
 // to allow 'interface' and the name of the interface to be on separate lines;
 // however, this complicates things, and so it is preferable to restrict interface 
diff --git a/tests/baselines/reference/asiPreventsParsingAsInterface05.symbols b/tests/baselines/reference/asiPreventsParsingAsInterface05.symbols
index e3730eef1fae9..28eee75d44b0f 100644
--- a/tests/baselines/reference/asiPreventsParsingAsInterface05.symbols
+++ b/tests/baselines/reference/asiPreventsParsingAsInterface05.symbols
@@ -3,7 +3,7 @@
 === asiPreventsParsingAsInterface05.ts ===
 "use strict"
 
-var interface: number;
+var interface: number = 123;
 >interface : Symbol(interface, Decl(asiPreventsParsingAsInterface05.ts, 2, 3))
 
 // 'interface' is a strict mode reserved word, and so it would be permissible
diff --git a/tests/baselines/reference/asiPreventsParsingAsInterface05.types b/tests/baselines/reference/asiPreventsParsingAsInterface05.types
index 504e351db0a1f..8e43fa7b75698 100644
--- a/tests/baselines/reference/asiPreventsParsingAsInterface05.types
+++ b/tests/baselines/reference/asiPreventsParsingAsInterface05.types
@@ -5,9 +5,11 @@
 >"use strict" : "use strict"
 >             : ^^^^^^^^^^^^
 
-var interface: number;
+var interface: number = 123;
 >interface : number
 >          : ^^^^^^
+>123 : 123
+>    : ^^^
 
 // 'interface' is a strict mode reserved word, and so it would be permissible
 // to allow 'interface' and the name of the interface to be on separate lines;
diff --git a/tests/baselines/reference/assignFromBooleanInterface.errors.txt b/tests/baselines/reference/assignFromBooleanInterface.errors.txt
index 6671373734381..95a9628c1336b 100644
--- a/tests/baselines/reference/assignFromBooleanInterface.errors.txt
+++ b/tests/baselines/reference/assignFromBooleanInterface.errors.txt
@@ -4,7 +4,7 @@ assignFromBooleanInterface.ts(3,1): error TS2322: Type 'Boolean' is not assignab
 
 ==== assignFromBooleanInterface.ts (1 errors) ====
     var x = true;
-    var a: Boolean;
+    declare var a: Boolean;
     x = a;
     ~
 !!! error TS2322: Type 'Boolean' is not assignable to type 'boolean'.
diff --git a/tests/baselines/reference/assignFromBooleanInterface.js b/tests/baselines/reference/assignFromBooleanInterface.js
index f539081384d0e..21b05dedd0d14 100644
--- a/tests/baselines/reference/assignFromBooleanInterface.js
+++ b/tests/baselines/reference/assignFromBooleanInterface.js
@@ -2,12 +2,11 @@
 
 //// [assignFromBooleanInterface.ts]
 var x = true;
-var a: Boolean;
+declare var a: Boolean;
 x = a;
 a = x;
 
 //// [assignFromBooleanInterface.js]
 var x = true;
-var a;
 x = a;
 a = x;
diff --git a/tests/baselines/reference/assignFromBooleanInterface.symbols b/tests/baselines/reference/assignFromBooleanInterface.symbols
index 4177c7169e5b0..569459faeaecc 100644
--- a/tests/baselines/reference/assignFromBooleanInterface.symbols
+++ b/tests/baselines/reference/assignFromBooleanInterface.symbols
@@ -4,15 +4,15 @@
 var x = true;
 >x : Symbol(x, Decl(assignFromBooleanInterface.ts, 0, 3))
 
-var a: Boolean;
->a : Symbol(a, Decl(assignFromBooleanInterface.ts, 1, 3))
+declare var a: Boolean;
+>a : Symbol(a, Decl(assignFromBooleanInterface.ts, 1, 11))
 >Boolean : Symbol(Boolean, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 x = a;
 >x : Symbol(x, Decl(assignFromBooleanInterface.ts, 0, 3))
->a : Symbol(a, Decl(assignFromBooleanInterface.ts, 1, 3))
+>a : Symbol(a, Decl(assignFromBooleanInterface.ts, 1, 11))
 
 a = x;
->a : Symbol(a, Decl(assignFromBooleanInterface.ts, 1, 3))
+>a : Symbol(a, Decl(assignFromBooleanInterface.ts, 1, 11))
 >x : Symbol(x, Decl(assignFromBooleanInterface.ts, 0, 3))
 
diff --git a/tests/baselines/reference/assignFromBooleanInterface.types b/tests/baselines/reference/assignFromBooleanInterface.types
index 8959ee10ba076..15b4bfbb9c866 100644
--- a/tests/baselines/reference/assignFromBooleanInterface.types
+++ b/tests/baselines/reference/assignFromBooleanInterface.types
@@ -7,7 +7,7 @@ var x = true;
 >true : true
 >     : ^^^^
 
-var a: Boolean;
+declare var a: Boolean;
 >a : Boolean
 >  : ^^^^^^^
 
diff --git a/tests/baselines/reference/assignFromBooleanInterface2.errors.txt b/tests/baselines/reference/assignFromBooleanInterface2.errors.txt
index ebd3e9a5477b9..cb2ee61e45fbc 100644
--- a/tests/baselines/reference/assignFromBooleanInterface2.errors.txt
+++ b/tests/baselines/reference/assignFromBooleanInterface2.errors.txt
@@ -16,8 +16,8 @@ assignFromBooleanInterface2.ts(20,1): error TS2322: Type 'NotBoolean' is not ass
     }
     
     var x = true;
-    var a: Boolean;
-    var b: NotBoolean;
+    declare var a: Boolean;
+    declare var b: NotBoolean;
     
     a = x;
     a = b;
diff --git a/tests/baselines/reference/assignFromBooleanInterface2.js b/tests/baselines/reference/assignFromBooleanInterface2.js
index 5a903182bb980..0ac4657706ff4 100644
--- a/tests/baselines/reference/assignFromBooleanInterface2.js
+++ b/tests/baselines/reference/assignFromBooleanInterface2.js
@@ -10,8 +10,8 @@ interface NotBoolean {
 }
 
 var x = true;
-var a: Boolean;
-var b: NotBoolean;
+declare var a: Boolean;
+declare var b: NotBoolean;
 
 a = x;
 a = b;
@@ -26,8 +26,6 @@ x = b; // expected error
 
 //// [assignFromBooleanInterface2.js]
 var x = true;
-var a;
-var b;
 a = x;
 a = b;
 b = a;
diff --git a/tests/baselines/reference/assignFromBooleanInterface2.symbols b/tests/baselines/reference/assignFromBooleanInterface2.symbols
index 1d3dc6b474e0c..51cfc18382fea 100644
--- a/tests/baselines/reference/assignFromBooleanInterface2.symbols
+++ b/tests/baselines/reference/assignFromBooleanInterface2.symbols
@@ -18,36 +18,36 @@ interface NotBoolean {
 var x = true;
 >x : Symbol(x, Decl(assignFromBooleanInterface2.ts, 8, 3))
 
-var a: Boolean;
->a : Symbol(a, Decl(assignFromBooleanInterface2.ts, 9, 3))
+declare var a: Boolean;
+>a : Symbol(a, Decl(assignFromBooleanInterface2.ts, 9, 11))
 >Boolean : Symbol(Boolean, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(assignFromBooleanInterface2.ts, 0, 0))
 
-var b: NotBoolean;
->b : Symbol(b, Decl(assignFromBooleanInterface2.ts, 10, 3))
+declare var b: NotBoolean;
+>b : Symbol(b, Decl(assignFromBooleanInterface2.ts, 10, 11))
 >NotBoolean : Symbol(NotBoolean, Decl(assignFromBooleanInterface2.ts, 2, 1))
 
 a = x;
->a : Symbol(a, Decl(assignFromBooleanInterface2.ts, 9, 3))
+>a : Symbol(a, Decl(assignFromBooleanInterface2.ts, 9, 11))
 >x : Symbol(x, Decl(assignFromBooleanInterface2.ts, 8, 3))
 
 a = b;
->a : Symbol(a, Decl(assignFromBooleanInterface2.ts, 9, 3))
->b : Symbol(b, Decl(assignFromBooleanInterface2.ts, 10, 3))
+>a : Symbol(a, Decl(assignFromBooleanInterface2.ts, 9, 11))
+>b : Symbol(b, Decl(assignFromBooleanInterface2.ts, 10, 11))
 
 b = a;
->b : Symbol(b, Decl(assignFromBooleanInterface2.ts, 10, 3))
->a : Symbol(a, Decl(assignFromBooleanInterface2.ts, 9, 3))
+>b : Symbol(b, Decl(assignFromBooleanInterface2.ts, 10, 11))
+>a : Symbol(a, Decl(assignFromBooleanInterface2.ts, 9, 11))
 
 b = x;
->b : Symbol(b, Decl(assignFromBooleanInterface2.ts, 10, 3))
+>b : Symbol(b, Decl(assignFromBooleanInterface2.ts, 10, 11))
 >x : Symbol(x, Decl(assignFromBooleanInterface2.ts, 8, 3))
 
 x = a; // expected error
 >x : Symbol(x, Decl(assignFromBooleanInterface2.ts, 8, 3))
->a : Symbol(a, Decl(assignFromBooleanInterface2.ts, 9, 3))
+>a : Symbol(a, Decl(assignFromBooleanInterface2.ts, 9, 11))
 
 x = b; // expected error
 >x : Symbol(x, Decl(assignFromBooleanInterface2.ts, 8, 3))
->b : Symbol(b, Decl(assignFromBooleanInterface2.ts, 10, 3))
+>b : Symbol(b, Decl(assignFromBooleanInterface2.ts, 10, 11))
 
 
diff --git a/tests/baselines/reference/assignFromBooleanInterface2.types b/tests/baselines/reference/assignFromBooleanInterface2.types
index 75691bba1997b..0038c4b696d03 100644
--- a/tests/baselines/reference/assignFromBooleanInterface2.types
+++ b/tests/baselines/reference/assignFromBooleanInterface2.types
@@ -19,11 +19,11 @@ var x = true;
 >true : true
 >     : ^^^^
 
-var a: Boolean;
+declare var a: Boolean;
 >a : Boolean
 >  : ^^^^^^^
 
-var b: NotBoolean;
+declare var b: NotBoolean;
 >b : NotBoolean
 >  : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/assignFromNumberInterface.errors.txt b/tests/baselines/reference/assignFromNumberInterface.errors.txt
index 421e4d34e5c2e..bc3e7f8f40ca2 100644
--- a/tests/baselines/reference/assignFromNumberInterface.errors.txt
+++ b/tests/baselines/reference/assignFromNumberInterface.errors.txt
@@ -4,7 +4,7 @@ assignFromNumberInterface.ts(3,1): error TS2322: Type 'Number' is not assignable
 
 ==== assignFromNumberInterface.ts (1 errors) ====
     var x = 1;
-    var a: Number;
+    declare var a: Number;
     x = a;
     ~
 !!! error TS2322: Type 'Number' is not assignable to type 'number'.
diff --git a/tests/baselines/reference/assignFromNumberInterface.js b/tests/baselines/reference/assignFromNumberInterface.js
index ea4cd1b8b6814..d4b57147fd22c 100644
--- a/tests/baselines/reference/assignFromNumberInterface.js
+++ b/tests/baselines/reference/assignFromNumberInterface.js
@@ -2,12 +2,11 @@
 
 //// [assignFromNumberInterface.ts]
 var x = 1;
-var a: Number;
+declare var a: Number;
 x = a;
 a = x;
 
 //// [assignFromNumberInterface.js]
 var x = 1;
-var a;
 x = a;
 a = x;
diff --git a/tests/baselines/reference/assignFromNumberInterface.symbols b/tests/baselines/reference/assignFromNumberInterface.symbols
index f0f7c8443d81c..35300e180e8e3 100644
--- a/tests/baselines/reference/assignFromNumberInterface.symbols
+++ b/tests/baselines/reference/assignFromNumberInterface.symbols
@@ -4,15 +4,15 @@
 var x = 1;
 >x : Symbol(x, Decl(assignFromNumberInterface.ts, 0, 3))
 
-var a: Number;
->a : Symbol(a, Decl(assignFromNumberInterface.ts, 1, 3))
+declare var a: Number;
+>a : Symbol(a, Decl(assignFromNumberInterface.ts, 1, 11))
 >Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 x = a;
 >x : Symbol(x, Decl(assignFromNumberInterface.ts, 0, 3))
->a : Symbol(a, Decl(assignFromNumberInterface.ts, 1, 3))
+>a : Symbol(a, Decl(assignFromNumberInterface.ts, 1, 11))
 
 a = x;
->a : Symbol(a, Decl(assignFromNumberInterface.ts, 1, 3))
+>a : Symbol(a, Decl(assignFromNumberInterface.ts, 1, 11))
 >x : Symbol(x, Decl(assignFromNumberInterface.ts, 0, 3))
 
diff --git a/tests/baselines/reference/assignFromNumberInterface.types b/tests/baselines/reference/assignFromNumberInterface.types
index ad33c6cccaa47..92edae097dd3e 100644
--- a/tests/baselines/reference/assignFromNumberInterface.types
+++ b/tests/baselines/reference/assignFromNumberInterface.types
@@ -7,7 +7,7 @@ var x = 1;
 >1 : 1
 >  : ^
 
-var a: Number;
+declare var a: Number;
 >a : Number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/assignFromNumberInterface2.errors.txt b/tests/baselines/reference/assignFromNumberInterface2.errors.txt
index eae1519fd6d6d..112f1a5fc0023 100644
--- a/tests/baselines/reference/assignFromNumberInterface2.errors.txt
+++ b/tests/baselines/reference/assignFromNumberInterface2.errors.txt
@@ -18,8 +18,8 @@ assignFromNumberInterface2.ts(25,1): error TS2322: Type 'NotNumber' is not assig
     }
     
     var x = 1;
-    var a: Number;
-    var b: NotNumber;
+    declare var a: Number;
+    declare var b: NotNumber;
     
     a = x; 
     a = b; 
diff --git a/tests/baselines/reference/assignFromNumberInterface2.js b/tests/baselines/reference/assignFromNumberInterface2.js
index fac0aba9ff5e9..7fd396aa7673d 100644
--- a/tests/baselines/reference/assignFromNumberInterface2.js
+++ b/tests/baselines/reference/assignFromNumberInterface2.js
@@ -15,8 +15,8 @@ interface NotNumber {
 }
 
 var x = 1;
-var a: Number;
-var b: NotNumber;
+declare var a: Number;
+declare var b: NotNumber;
 
 a = x; 
 a = b; 
@@ -31,8 +31,6 @@ x = b; // expected error
 
 //// [assignFromNumberInterface2.js]
 var x = 1;
-var a;
-var b;
 a = x;
 a = b;
 b = a;
diff --git a/tests/baselines/reference/assignFromNumberInterface2.symbols b/tests/baselines/reference/assignFromNumberInterface2.symbols
index 2a1f46e208195..a163ba3a31afd 100644
--- a/tests/baselines/reference/assignFromNumberInterface2.symbols
+++ b/tests/baselines/reference/assignFromNumberInterface2.symbols
@@ -37,36 +37,36 @@ interface NotNumber {
 var x = 1;
 >x : Symbol(x, Decl(assignFromNumberInterface2.ts, 13, 3))
 
-var a: Number;
->a : Symbol(a, Decl(assignFromNumberInterface2.ts, 14, 3))
+declare var a: Number;
+>a : Symbol(a, Decl(assignFromNumberInterface2.ts, 14, 11))
 >Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(assignFromNumberInterface2.ts, 0, 0))
 
-var b: NotNumber;
->b : Symbol(b, Decl(assignFromNumberInterface2.ts, 15, 3))
+declare var b: NotNumber;
+>b : Symbol(b, Decl(assignFromNumberInterface2.ts, 15, 11))
 >NotNumber : Symbol(NotNumber, Decl(assignFromNumberInterface2.ts, 2, 1))
 
 a = x; 
->a : Symbol(a, Decl(assignFromNumberInterface2.ts, 14, 3))
+>a : Symbol(a, Decl(assignFromNumberInterface2.ts, 14, 11))
 >x : Symbol(x, Decl(assignFromNumberInterface2.ts, 13, 3))
 
 a = b; 
->a : Symbol(a, Decl(assignFromNumberInterface2.ts, 14, 3))
->b : Symbol(b, Decl(assignFromNumberInterface2.ts, 15, 3))
+>a : Symbol(a, Decl(assignFromNumberInterface2.ts, 14, 11))
+>b : Symbol(b, Decl(assignFromNumberInterface2.ts, 15, 11))
 
 b = a; 
->b : Symbol(b, Decl(assignFromNumberInterface2.ts, 15, 3))
->a : Symbol(a, Decl(assignFromNumberInterface2.ts, 14, 3))
+>b : Symbol(b, Decl(assignFromNumberInterface2.ts, 15, 11))
+>a : Symbol(a, Decl(assignFromNumberInterface2.ts, 14, 11))
 
 b = x; 
->b : Symbol(b, Decl(assignFromNumberInterface2.ts, 15, 3))
+>b : Symbol(b, Decl(assignFromNumberInterface2.ts, 15, 11))
 >x : Symbol(x, Decl(assignFromNumberInterface2.ts, 13, 3))
 
 x = a; // expected error
 >x : Symbol(x, Decl(assignFromNumberInterface2.ts, 13, 3))
->a : Symbol(a, Decl(assignFromNumberInterface2.ts, 14, 3))
+>a : Symbol(a, Decl(assignFromNumberInterface2.ts, 14, 11))
 
 x = b; // expected error
 >x : Symbol(x, Decl(assignFromNumberInterface2.ts, 13, 3))
->b : Symbol(b, Decl(assignFromNumberInterface2.ts, 15, 3))
+>b : Symbol(b, Decl(assignFromNumberInterface2.ts, 15, 11))
 
 
diff --git a/tests/baselines/reference/assignFromNumberInterface2.types b/tests/baselines/reference/assignFromNumberInterface2.types
index fb717bf271921..c3cc6fb24a7db 100644
--- a/tests/baselines/reference/assignFromNumberInterface2.types
+++ b/tests/baselines/reference/assignFromNumberInterface2.types
@@ -47,11 +47,11 @@ var x = 1;
 >1 : 1
 >  : ^
 
-var a: Number;
+declare var a: Number;
 >a : Number
 >  : ^^^^^^
 
-var b: NotNumber;
+declare var b: NotNumber;
 >b : NotNumber
 >  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/assignFromStringInterface.errors.txt b/tests/baselines/reference/assignFromStringInterface.errors.txt
index d01a2c1e33524..d043b7155812c 100644
--- a/tests/baselines/reference/assignFromStringInterface.errors.txt
+++ b/tests/baselines/reference/assignFromStringInterface.errors.txt
@@ -4,7 +4,7 @@ assignFromStringInterface.ts(3,1): error TS2322: Type 'String' is not assignable
 
 ==== assignFromStringInterface.ts (1 errors) ====
     var x = '';
-    var a: String;
+    declare var a: String;
     x = a;
     ~
 !!! error TS2322: Type 'String' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/assignFromStringInterface.js b/tests/baselines/reference/assignFromStringInterface.js
index c458439013a2f..bb220c9ae28f8 100644
--- a/tests/baselines/reference/assignFromStringInterface.js
+++ b/tests/baselines/reference/assignFromStringInterface.js
@@ -2,12 +2,11 @@
 
 //// [assignFromStringInterface.ts]
 var x = '';
-var a: String;
+declare var a: String;
 x = a;
 a = x;
 
 //// [assignFromStringInterface.js]
 var x = '';
-var a;
 x = a;
 a = x;
diff --git a/tests/baselines/reference/assignFromStringInterface.symbols b/tests/baselines/reference/assignFromStringInterface.symbols
index 3b128582ab842..6f82db0b86eb0 100644
--- a/tests/baselines/reference/assignFromStringInterface.symbols
+++ b/tests/baselines/reference/assignFromStringInterface.symbols
@@ -4,15 +4,15 @@
 var x = '';
 >x : Symbol(x, Decl(assignFromStringInterface.ts, 0, 3))
 
-var a: String;
->a : Symbol(a, Decl(assignFromStringInterface.ts, 1, 3))
+declare var a: String;
+>a : Symbol(a, Decl(assignFromStringInterface.ts, 1, 11))
 >String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --) ... and 1 more)
 
 x = a;
 >x : Symbol(x, Decl(assignFromStringInterface.ts, 0, 3))
->a : Symbol(a, Decl(assignFromStringInterface.ts, 1, 3))
+>a : Symbol(a, Decl(assignFromStringInterface.ts, 1, 11))
 
 a = x;
->a : Symbol(a, Decl(assignFromStringInterface.ts, 1, 3))
+>a : Symbol(a, Decl(assignFromStringInterface.ts, 1, 11))
 >x : Symbol(x, Decl(assignFromStringInterface.ts, 0, 3))
 
diff --git a/tests/baselines/reference/assignFromStringInterface.types b/tests/baselines/reference/assignFromStringInterface.types
index 7c921267f7ee8..7a434edc5986a 100644
--- a/tests/baselines/reference/assignFromStringInterface.types
+++ b/tests/baselines/reference/assignFromStringInterface.types
@@ -7,7 +7,7 @@ var x = '';
 >'' : ""
 >   : ^^
 
-var a: String;
+declare var a: String;
 >a : String
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/assignFromStringInterface2.errors.txt b/tests/baselines/reference/assignFromStringInterface2.errors.txt
index 3517bf4d1d9f4..6aff3eb4bce0f 100644
--- a/tests/baselines/reference/assignFromStringInterface2.errors.txt
+++ b/tests/baselines/reference/assignFromStringInterface2.errors.txt
@@ -42,8 +42,8 @@ assignFromStringInterface2.ts(48,1): error TS2322: Type 'NotString' is not assig
     }
     
     var x = '';
-    var a: String;
-    var b: NotString;
+    declare var a: String;
+    declare var b: NotString;
     
     a = x;
     a = b;
diff --git a/tests/baselines/reference/assignFromStringInterface2.js b/tests/baselines/reference/assignFromStringInterface2.js
index 308491f89cee8..653ba0bce6ef0 100644
--- a/tests/baselines/reference/assignFromStringInterface2.js
+++ b/tests/baselines/reference/assignFromStringInterface2.js
@@ -38,8 +38,8 @@ interface NotString {
 }
 
 var x = '';
-var a: String;
-var b: NotString;
+declare var a: String;
+declare var b: NotString;
 
 a = x;
 a = b;
@@ -54,8 +54,6 @@ x = b; // expected error
 
 //// [assignFromStringInterface2.js]
 var x = '';
-var a;
-var b;
 a = x;
 a = b;
 b = a;
diff --git a/tests/baselines/reference/assignFromStringInterface2.symbols b/tests/baselines/reference/assignFromStringInterface2.symbols
index d1e77cda723f8..f0a452d9e6d59 100644
--- a/tests/baselines/reference/assignFromStringInterface2.symbols
+++ b/tests/baselines/reference/assignFromStringInterface2.symbols
@@ -143,36 +143,36 @@ interface NotString {
 var x = '';
 >x : Symbol(x, Decl(assignFromStringInterface2.ts, 36, 3))
 
-var a: String;
->a : Symbol(a, Decl(assignFromStringInterface2.ts, 37, 3))
+declare var a: String;
+>a : Symbol(a, Decl(assignFromStringInterface2.ts, 37, 11))
 >String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --) ... and 2 more)
 
-var b: NotString;
->b : Symbol(b, Decl(assignFromStringInterface2.ts, 38, 3))
+declare var b: NotString;
+>b : Symbol(b, Decl(assignFromStringInterface2.ts, 38, 11))
 >NotString : Symbol(NotString, Decl(assignFromStringInterface2.ts, 2, 1))
 
 a = x;
->a : Symbol(a, Decl(assignFromStringInterface2.ts, 37, 3))
+>a : Symbol(a, Decl(assignFromStringInterface2.ts, 37, 11))
 >x : Symbol(x, Decl(assignFromStringInterface2.ts, 36, 3))
 
 a = b;
->a : Symbol(a, Decl(assignFromStringInterface2.ts, 37, 3))
->b : Symbol(b, Decl(assignFromStringInterface2.ts, 38, 3))
+>a : Symbol(a, Decl(assignFromStringInterface2.ts, 37, 11))
+>b : Symbol(b, Decl(assignFromStringInterface2.ts, 38, 11))
 
 b = a;
->b : Symbol(b, Decl(assignFromStringInterface2.ts, 38, 3))
->a : Symbol(a, Decl(assignFromStringInterface2.ts, 37, 3))
+>b : Symbol(b, Decl(assignFromStringInterface2.ts, 38, 11))
+>a : Symbol(a, Decl(assignFromStringInterface2.ts, 37, 11))
 
 b = x;
->b : Symbol(b, Decl(assignFromStringInterface2.ts, 38, 3))
+>b : Symbol(b, Decl(assignFromStringInterface2.ts, 38, 11))
 >x : Symbol(x, Decl(assignFromStringInterface2.ts, 36, 3))
 
 x = a; // expected error
 >x : Symbol(x, Decl(assignFromStringInterface2.ts, 36, 3))
->a : Symbol(a, Decl(assignFromStringInterface2.ts, 37, 3))
+>a : Symbol(a, Decl(assignFromStringInterface2.ts, 37, 11))
 
 x = b; // expected error
 >x : Symbol(x, Decl(assignFromStringInterface2.ts, 36, 3))
->b : Symbol(b, Decl(assignFromStringInterface2.ts, 38, 3))
+>b : Symbol(b, Decl(assignFromStringInterface2.ts, 38, 11))
 
 
diff --git a/tests/baselines/reference/assignFromStringInterface2.types b/tests/baselines/reference/assignFromStringInterface2.types
index ad5e66cff4334..07abd49b32fc4 100644
--- a/tests/baselines/reference/assignFromStringInterface2.types
+++ b/tests/baselines/reference/assignFromStringInterface2.types
@@ -199,11 +199,11 @@ var x = '';
 >'' : ""
 >   : ^^
 
-var a: String;
+declare var a: String;
 >a : String
 >  : ^^^^^^
 
-var b: NotString;
+declare var b: NotString;
 >b : NotString
 >  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt b/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt
index 828311e627ef9..5252d2b49a4ab 100644
--- a/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt
+++ b/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt
@@ -7,7 +7,7 @@ assigningFromObjectToAnythingElse.ts(8,5): error TS2696: The 'Object' type is as
 
 
 ==== assigningFromObjectToAnythingElse.ts (4 errors) ====
-    var x: Object;
+    declare var x: Object;
     var y: RegExp;
     y = x;
     ~
diff --git a/tests/baselines/reference/assigningFromObjectToAnythingElse.js b/tests/baselines/reference/assigningFromObjectToAnythingElse.js
index 39cddae6eee45..393cda52bead6 100644
--- a/tests/baselines/reference/assigningFromObjectToAnythingElse.js
+++ b/tests/baselines/reference/assigningFromObjectToAnythingElse.js
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/assigningFromObjectToAnythingElse.ts] ////
 
 //// [assigningFromObjectToAnythingElse.ts]
-var x: Object;
+declare var x: Object;
 var y: RegExp;
 y = x;
 
@@ -12,7 +12,6 @@ var w: Error = new Object();
 
 
 //// [assigningFromObjectToAnythingElse.js]
-var x;
 var y;
 y = x;
 var a = Object.create("");
diff --git a/tests/baselines/reference/assigningFromObjectToAnythingElse.symbols b/tests/baselines/reference/assigningFromObjectToAnythingElse.symbols
index b9981cbf27c77..2dfe427e64294 100644
--- a/tests/baselines/reference/assigningFromObjectToAnythingElse.symbols
+++ b/tests/baselines/reference/assigningFromObjectToAnythingElse.symbols
@@ -1,8 +1,8 @@
 //// [tests/cases/compiler/assigningFromObjectToAnythingElse.ts] ////
 
 === assigningFromObjectToAnythingElse.ts ===
-var x: Object;
->x : Symbol(x, Decl(assigningFromObjectToAnythingElse.ts, 0, 3))
+declare var x: Object;
+>x : Symbol(x, Decl(assigningFromObjectToAnythingElse.ts, 0, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 var y: RegExp;
@@ -11,7 +11,7 @@ var y: RegExp;
 
 y = x;
 >y : Symbol(y, Decl(assigningFromObjectToAnythingElse.ts, 1, 3))
->x : Symbol(x, Decl(assigningFromObjectToAnythingElse.ts, 0, 3))
+>x : Symbol(x, Decl(assigningFromObjectToAnythingElse.ts, 0, 11))
 
 var a: String = Object.create<Object>("");
 >a : Symbol(a, Decl(assigningFromObjectToAnythingElse.ts, 4, 3))
diff --git a/tests/baselines/reference/assigningFromObjectToAnythingElse.types b/tests/baselines/reference/assigningFromObjectToAnythingElse.types
index ac2b3e1d33cb6..5cca0414e9679 100644
--- a/tests/baselines/reference/assigningFromObjectToAnythingElse.types
+++ b/tests/baselines/reference/assigningFromObjectToAnythingElse.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/assigningFromObjectToAnythingElse.ts] ////
 
 === assigningFromObjectToAnythingElse.ts ===
-var x: Object;
+declare var x: Object;
 >x : Object
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/assignmentCompat1.errors.txt b/tests/baselines/reference/assignmentCompat1.errors.txt
index 21f47f1464878..7c0d0ad0e4cfa 100644
--- a/tests/baselines/reference/assignmentCompat1.errors.txt
+++ b/tests/baselines/reference/assignmentCompat1.errors.txt
@@ -6,8 +6,8 @@ assignmentCompat1.ts(10,1): error TS2322: Type 'boolean' is not assignable to ty
 
 ==== assignmentCompat1.ts (4 errors) ====
     var x = { one: 1 };
-    var y: { [index: string]: any };
-    var z: { [index: number]: any };
+    declare var y: { [index: string]: any };
+    declare var z: { [index: number]: any };
     x = y;  // Error
     ~
 !!! error TS2741: Property 'one' is missing in type '{ [index: string]: any; }' but required in type '{ one: number; }'.
diff --git a/tests/baselines/reference/assignmentCompat1.js b/tests/baselines/reference/assignmentCompat1.js
index 7aa4680ff2a04..46129a3486827 100644
--- a/tests/baselines/reference/assignmentCompat1.js
+++ b/tests/baselines/reference/assignmentCompat1.js
@@ -2,8 +2,8 @@
 
 //// [assignmentCompat1.ts]
 var x = { one: 1 };
-var y: { [index: string]: any };
-var z: { [index: number]: any };
+declare var y: { [index: string]: any };
+declare var z: { [index: number]: any };
 x = y;  // Error
 y = x;  // Ok because index signature type is any
 x = z;  // Error
@@ -16,8 +16,6 @@ z = false; // Error
 
 //// [assignmentCompat1.js]
 var x = { one: 1 };
-var y;
-var z;
 x = y; // Error
 y = x; // Ok because index signature type is any
 x = z; // Error
diff --git a/tests/baselines/reference/assignmentCompat1.symbols b/tests/baselines/reference/assignmentCompat1.symbols
index 8603aabcaea2e..a1d5f7470abf1 100644
--- a/tests/baselines/reference/assignmentCompat1.symbols
+++ b/tests/baselines/reference/assignmentCompat1.symbols
@@ -5,37 +5,37 @@ var x = { one: 1 };
 >x : Symbol(x, Decl(assignmentCompat1.ts, 0, 3))
 >one : Symbol(one, Decl(assignmentCompat1.ts, 0, 9))
 
-var y: { [index: string]: any };
->y : Symbol(y, Decl(assignmentCompat1.ts, 1, 3))
->index : Symbol(index, Decl(assignmentCompat1.ts, 1, 10))
+declare var y: { [index: string]: any };
+>y : Symbol(y, Decl(assignmentCompat1.ts, 1, 11))
+>index : Symbol(index, Decl(assignmentCompat1.ts, 1, 18))
 
-var z: { [index: number]: any };
->z : Symbol(z, Decl(assignmentCompat1.ts, 2, 3))
->index : Symbol(index, Decl(assignmentCompat1.ts, 2, 10))
+declare var z: { [index: number]: any };
+>z : Symbol(z, Decl(assignmentCompat1.ts, 2, 11))
+>index : Symbol(index, Decl(assignmentCompat1.ts, 2, 18))
 
 x = y;  // Error
 >x : Symbol(x, Decl(assignmentCompat1.ts, 0, 3))
->y : Symbol(y, Decl(assignmentCompat1.ts, 1, 3))
+>y : Symbol(y, Decl(assignmentCompat1.ts, 1, 11))
 
 y = x;  // Ok because index signature type is any
->y : Symbol(y, Decl(assignmentCompat1.ts, 1, 3))
+>y : Symbol(y, Decl(assignmentCompat1.ts, 1, 11))
 >x : Symbol(x, Decl(assignmentCompat1.ts, 0, 3))
 
 x = z;  // Error
 >x : Symbol(x, Decl(assignmentCompat1.ts, 0, 3))
->z : Symbol(z, Decl(assignmentCompat1.ts, 2, 3))
+>z : Symbol(z, Decl(assignmentCompat1.ts, 2, 11))
 
 z = x;  // Ok because index signature type is any
->z : Symbol(z, Decl(assignmentCompat1.ts, 2, 3))
+>z : Symbol(z, Decl(assignmentCompat1.ts, 2, 11))
 >x : Symbol(x, Decl(assignmentCompat1.ts, 0, 3))
 
 y = "foo"; // Error
->y : Symbol(y, Decl(assignmentCompat1.ts, 1, 3))
+>y : Symbol(y, Decl(assignmentCompat1.ts, 1, 11))
 
 z = "foo"; // OK, string has numeric indexer
->z : Symbol(z, Decl(assignmentCompat1.ts, 2, 3))
+>z : Symbol(z, Decl(assignmentCompat1.ts, 2, 11))
 
 z = false; // Error
->z : Symbol(z, Decl(assignmentCompat1.ts, 2, 3))
+>z : Symbol(z, Decl(assignmentCompat1.ts, 2, 11))
 
 
diff --git a/tests/baselines/reference/assignmentCompat1.types b/tests/baselines/reference/assignmentCompat1.types
index 6eb5a6ae394df..0e44dbe8a1923 100644
--- a/tests/baselines/reference/assignmentCompat1.types
+++ b/tests/baselines/reference/assignmentCompat1.types
@@ -11,13 +11,13 @@ var x = { one: 1 };
 >1 : 1
 >  : ^
 
-var y: { [index: string]: any };
+declare var y: { [index: string]: any };
 >y : { [index: string]: any; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >index : string
 >      : ^^^^^^
 
-var z: { [index: number]: any };
+declare var z: { [index: number]: any };
 >z : { [index: number]: any; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >index : number
diff --git a/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt b/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt
index 861f1ca4a05a1..d470f57434ed2 100644
--- a/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt
+++ b/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt
@@ -6,13 +6,13 @@ assignmentCompatBetweenTupleAndArray.ts(18,1): error TS2322: Type '{}[]' is not
 
 
 ==== assignmentCompatBetweenTupleAndArray.ts (2 errors) ====
-    var numStrTuple: [number, string];
-    var numNumTuple: [number, number];
-    var numEmptyObjTuple: [number, {}];
-    var emptyObjTuple: [{}];
+    declare var numStrTuple: [number, string];
+    declare var numNumTuple: [number, number];
+    declare var numEmptyObjTuple: [number, {}];
+    declare var emptyObjTuple: [{}];
     
-    var numArray: number[];
-    var emptyObjArray: {}[];
+    declare var numArray: number[];
+    declare var emptyObjArray: {}[];
     
     // no error
     numArray = numNumTuple;
diff --git a/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.js b/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.js
index eab8267b89688..682af0db3825c 100644
--- a/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.js
+++ b/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.js
@@ -1,13 +1,13 @@
 //// [tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts] ////
 
 //// [assignmentCompatBetweenTupleAndArray.ts]
-var numStrTuple: [number, string];
-var numNumTuple: [number, number];
-var numEmptyObjTuple: [number, {}];
-var emptyObjTuple: [{}];
+declare var numStrTuple: [number, string];
+declare var numNumTuple: [number, number];
+declare var numEmptyObjTuple: [number, {}];
+declare var emptyObjTuple: [{}];
 
-var numArray: number[];
-var emptyObjArray: {}[];
+declare var numArray: number[];
+declare var emptyObjArray: {}[];
 
 // no error
 numArray = numNumTuple;
@@ -22,12 +22,6 @@ emptyObjTuple = emptyObjArray;
 
 
 //// [assignmentCompatBetweenTupleAndArray.js]
-var numStrTuple;
-var numNumTuple;
-var numEmptyObjTuple;
-var emptyObjTuple;
-var numArray;
-var emptyObjArray;
 // no error
 numArray = numNumTuple;
 emptyObjArray = emptyObjTuple;
diff --git a/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.symbols b/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.symbols
index ebc52c1ccc15e..1a0b2cd7e0743 100644
--- a/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.symbols
+++ b/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.symbols
@@ -1,51 +1,51 @@
 //// [tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts] ////
 
 === assignmentCompatBetweenTupleAndArray.ts ===
-var numStrTuple: [number, string];
->numStrTuple : Symbol(numStrTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 0, 3))
+declare var numStrTuple: [number, string];
+>numStrTuple : Symbol(numStrTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 0, 11))
 
-var numNumTuple: [number, number];
->numNumTuple : Symbol(numNumTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 1, 3))
+declare var numNumTuple: [number, number];
+>numNumTuple : Symbol(numNumTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 1, 11))
 
-var numEmptyObjTuple: [number, {}];
->numEmptyObjTuple : Symbol(numEmptyObjTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 2, 3))
+declare var numEmptyObjTuple: [number, {}];
+>numEmptyObjTuple : Symbol(numEmptyObjTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 2, 11))
 
-var emptyObjTuple: [{}];
->emptyObjTuple : Symbol(emptyObjTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 3, 3))
+declare var emptyObjTuple: [{}];
+>emptyObjTuple : Symbol(emptyObjTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 3, 11))
 
-var numArray: number[];
->numArray : Symbol(numArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 5, 3))
+declare var numArray: number[];
+>numArray : Symbol(numArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 5, 11))
 
-var emptyObjArray: {}[];
->emptyObjArray : Symbol(emptyObjArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 6, 3))
+declare var emptyObjArray: {}[];
+>emptyObjArray : Symbol(emptyObjArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 6, 11))
 
 // no error
 numArray = numNumTuple;
->numArray : Symbol(numArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 5, 3))
->numNumTuple : Symbol(numNumTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 1, 3))
+>numArray : Symbol(numArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 5, 11))
+>numNumTuple : Symbol(numNumTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 1, 11))
 
 emptyObjArray = emptyObjTuple;
->emptyObjArray : Symbol(emptyObjArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 6, 3))
->emptyObjTuple : Symbol(emptyObjTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 3, 3))
+>emptyObjArray : Symbol(emptyObjArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 6, 11))
+>emptyObjTuple : Symbol(emptyObjTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 3, 11))
 
 emptyObjArray = numStrTuple;
->emptyObjArray : Symbol(emptyObjArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 6, 3))
->numStrTuple : Symbol(numStrTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 0, 3))
+>emptyObjArray : Symbol(emptyObjArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 6, 11))
+>numStrTuple : Symbol(numStrTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 0, 11))
 
 emptyObjArray = numNumTuple;
->emptyObjArray : Symbol(emptyObjArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 6, 3))
->numNumTuple : Symbol(numNumTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 1, 3))
+>emptyObjArray : Symbol(emptyObjArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 6, 11))
+>numNumTuple : Symbol(numNumTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 1, 11))
 
 emptyObjArray = numEmptyObjTuple;
->emptyObjArray : Symbol(emptyObjArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 6, 3))
->numEmptyObjTuple : Symbol(numEmptyObjTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 2, 3))
+>emptyObjArray : Symbol(emptyObjArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 6, 11))
+>numEmptyObjTuple : Symbol(numEmptyObjTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 2, 11))
 
 // error
 numArray = numStrTuple;
->numArray : Symbol(numArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 5, 3))
->numStrTuple : Symbol(numStrTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 0, 3))
+>numArray : Symbol(numArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 5, 11))
+>numStrTuple : Symbol(numStrTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 0, 11))
 
 emptyObjTuple = emptyObjArray;
->emptyObjTuple : Symbol(emptyObjTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 3, 3))
->emptyObjArray : Symbol(emptyObjArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 6, 3))
+>emptyObjTuple : Symbol(emptyObjTuple, Decl(assignmentCompatBetweenTupleAndArray.ts, 3, 11))
+>emptyObjArray : Symbol(emptyObjArray, Decl(assignmentCompatBetweenTupleAndArray.ts, 6, 11))
 
diff --git a/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.types b/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.types
index 1c9bc07b8fd3a..424c0b64baf86 100644
--- a/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.types
+++ b/tests/baselines/reference/assignmentCompatBetweenTupleAndArray.types
@@ -1,27 +1,27 @@
 //// [tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts] ////
 
 === assignmentCompatBetweenTupleAndArray.ts ===
-var numStrTuple: [number, string];
+declare var numStrTuple: [number, string];
 >numStrTuple : [number, string]
 >            : ^^^^^^^^^^^^^^^^
 
-var numNumTuple: [number, number];
+declare var numNumTuple: [number, number];
 >numNumTuple : [number, number]
 >            : ^^^^^^^^^^^^^^^^
 
-var numEmptyObjTuple: [number, {}];
+declare var numEmptyObjTuple: [number, {}];
 >numEmptyObjTuple : [number, {}]
 >                 : ^^^^^^^^^^^^
 
-var emptyObjTuple: [{}];
+declare var emptyObjTuple: [{}];
 >emptyObjTuple : [{}]
 >              : ^^^^
 
-var numArray: number[];
+declare var numArray: number[];
 >numArray : number[]
 >         : ^^^^^^^^
 
-var emptyObjArray: {}[];
+declare var emptyObjArray: {}[];
 >emptyObjArray : {}[]
 >              : ^^^^
 
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures.errors.txt
index 905c8e33ce6ff..3810663a12145 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures.errors.txt
@@ -30,8 +30,8 @@ assignmentCompatWithCallSignatures.ts(42,1): error TS2322: Type '(x: string) =>
     interface T {
         (x: number): void;
     }
-    var t: T;
-    var a: { (x: number): void };
+    declare var t: T;
+    declare var a: { (x: number): void };
     
     t = a;
     a = t;
@@ -39,8 +39,8 @@ assignmentCompatWithCallSignatures.ts(42,1): error TS2322: Type '(x: string) =>
     interface S {
         (x: number): string;
     }
-    var s: S;
-    var a2: { (x: number): string };
+    declare var s: S;
+    declare var a2: { (x: number): string };
     t = s;
     t = a2;
     a = s;
@@ -56,8 +56,8 @@ assignmentCompatWithCallSignatures.ts(42,1): error TS2322: Type '(x: string) =>
     interface S2 {
         (x: string): void;
     }
-    var s2: S2;
-    var a3: { (x: string): void };
+    declare var s2: S2;
+    declare var a3: { (x: string): void };
     // these are errors
     t = s2;
     ~
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures.js b/tests/baselines/reference/assignmentCompatWithCallSignatures.js
index b590146a43b3a..c22e0d3b838af 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures.js
@@ -6,8 +6,8 @@
 interface T {
     (x: number): void;
 }
-var t: T;
-var a: { (x: number): void };
+declare var t: T;
+declare var a: { (x: number): void };
 
 t = a;
 a = t;
@@ -15,8 +15,8 @@ a = t;
 interface S {
     (x: number): string;
 }
-var s: S;
-var a2: { (x: number): string };
+declare var s: S;
+declare var a2: { (x: number): string };
 t = s;
 t = a2;
 a = s;
@@ -32,8 +32,8 @@ a = function (x: number) { return ''; }
 interface S2 {
     (x: string): void;
 }
-var s2: S2;
-var a3: { (x: string): void };
+declare var s2: S2;
+declare var a3: { (x: string): void };
 // these are errors
 t = s2;
 t = a3;
@@ -47,12 +47,8 @@ a = function (x: string) { return ''; }
 
 //// [assignmentCompatWithCallSignatures.js]
 // void returning call signatures can be assigned a non-void returning call signature that otherwise matches
-var t;
-var a;
 t = a;
 a = t;
-var s;
-var a2;
 t = s;
 t = a2;
 a = s;
@@ -63,8 +59,6 @@ t = function (x) { return ''; };
 a = function (x) { return 1; };
 a = function () { return 1; };
 a = function (x) { return ''; };
-var s2;
-var a3;
 // these are errors
 t = s2;
 t = a3;
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures.symbols b/tests/baselines/reference/assignmentCompatWithCallSignatures.symbols
index aeaaa7a460154..5dac03976e3ab 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures.symbols
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures.symbols
@@ -9,21 +9,21 @@ interface T {
     (x: number): void;
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 3, 5))
 }
-var t: T;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 3))
+declare var t: T;
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 11))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures.ts, 0, 0))
 
-var a: { (x: number): void };
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 6, 10))
+declare var a: { (x: number): void };
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 6, 18))
 
 t = a;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 3))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 11))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 11))
 
 a = t;
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 3))
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 11))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 11))
 
 interface S {
 >S : Symbol(S, Decl(assignmentCompatWithCallSignatures.ts, 9, 6))
@@ -31,54 +31,54 @@ interface S {
     (x: number): string;
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 12, 5))
 }
-var s: S;
->s : Symbol(s, Decl(assignmentCompatWithCallSignatures.ts, 14, 3))
+declare var s: S;
+>s : Symbol(s, Decl(assignmentCompatWithCallSignatures.ts, 14, 11))
 >S : Symbol(S, Decl(assignmentCompatWithCallSignatures.ts, 9, 6))
 
-var a2: { (x: number): string };
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures.ts, 15, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 15, 11))
+declare var a2: { (x: number): string };
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures.ts, 15, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 15, 19))
 
 t = s;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 3))
->s : Symbol(s, Decl(assignmentCompatWithCallSignatures.ts, 14, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 11))
+>s : Symbol(s, Decl(assignmentCompatWithCallSignatures.ts, 14, 11))
 
 t = a2;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 3))
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures.ts, 15, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures.ts, 15, 11))
 
 a = s;
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 3))
->s : Symbol(s, Decl(assignmentCompatWithCallSignatures.ts, 14, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 11))
+>s : Symbol(s, Decl(assignmentCompatWithCallSignatures.ts, 14, 11))
 
 a = a2;
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 3))
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures.ts, 15, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures.ts, 15, 11))
 
 t = <T>(x: T) => 1;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 11))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures.ts, 21, 5))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 21, 8))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures.ts, 21, 5))
 
 t = () => 1;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 11))
 
 t = function (x: number) { return ''; }
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 23, 14))
 
 a = <T>(x: T) => 1;
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 11))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures.ts, 24, 5))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 24, 8))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures.ts, 24, 5))
 
 a = () => 1;
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 11))
 
 a = function (x: number) { return ''; }
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 26, 14))
 
 interface S2 {
@@ -87,44 +87,44 @@ interface S2 {
     (x: string): void;
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 29, 5))
 }
-var s2: S2;
->s2 : Symbol(s2, Decl(assignmentCompatWithCallSignatures.ts, 31, 3))
+declare var s2: S2;
+>s2 : Symbol(s2, Decl(assignmentCompatWithCallSignatures.ts, 31, 11))
 >S2 : Symbol(S2, Decl(assignmentCompatWithCallSignatures.ts, 26, 39))
 
-var a3: { (x: string): void };
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures.ts, 32, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 32, 11))
+declare var a3: { (x: string): void };
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures.ts, 32, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 32, 19))
 
 // these are errors
 t = s2;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 3))
->s2 : Symbol(s2, Decl(assignmentCompatWithCallSignatures.ts, 31, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 11))
+>s2 : Symbol(s2, Decl(assignmentCompatWithCallSignatures.ts, 31, 11))
 
 t = a3;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 3))
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures.ts, 32, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 11))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures.ts, 32, 11))
 
 t = (x: string) => 1;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 36, 5))
 
 t = function (x: string) { return ''; }
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures.ts, 5, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 37, 14))
 
 a = s2;
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 3))
->s2 : Symbol(s2, Decl(assignmentCompatWithCallSignatures.ts, 31, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 11))
+>s2 : Symbol(s2, Decl(assignmentCompatWithCallSignatures.ts, 31, 11))
 
 a = a3;
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 3))
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures.ts, 32, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 11))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures.ts, 32, 11))
 
 a = (x: string) => 1;
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 40, 5))
 
 a = function (x: string) { return ''; }
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures.ts, 6, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures.ts, 41, 14))
 
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures.types b/tests/baselines/reference/assignmentCompatWithCallSignatures.types
index ebe2000df48b2..c7ff1dcf1fc1f 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures.types
@@ -8,11 +8,11 @@ interface T {
 >x : number
 >  : ^^^^^^
 }
-var t: T;
+declare var t: T;
 >t : T
 >  : ^
 
-var a: { (x: number): void };
+declare var a: { (x: number): void };
 >a : (x: number) => void
 >  : ^ ^^      ^^^^^    
 >x : number
@@ -39,11 +39,11 @@ interface S {
 >x : number
 >  : ^^^^^^
 }
-var s: S;
+declare var s: S;
 >s : S
 >  : ^
 
-var a2: { (x: number): string };
+declare var a2: { (x: number): string };
 >a2 : (x: number) => string
 >   : ^ ^^      ^^^^^      
 >x : number
@@ -154,11 +154,11 @@ interface S2 {
 >x : string
 >  : ^^^^^^
 }
-var s2: S2;
+declare var s2: S2;
 >s2 : S2
 >   : ^^
 
-var a3: { (x: string): void };
+declare var a3: { (x: string): void };
 >a3 : (x: string) => void
 >   : ^ ^^      ^^^^^    
 >x : string
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
index 3cefc45caab17..62137d31048c1 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
@@ -34,8 +34,8 @@ assignmentCompatWithCallSignatures2.ts(49,1): error TS2322: Type '(x: string) =>
     interface T {
         f(x: number): void;
     }
-    var t: T;
-    var a: { f(x: number): void };
+    declare var t: T;
+    declare var a: { f(x: number): void };
     
     t = a;
     a = t;
@@ -43,8 +43,8 @@ assignmentCompatWithCallSignatures2.ts(49,1): error TS2322: Type '(x: string) =>
     interface S {
         f(x: number): string;
     }
-    var s: S;
-    var a2: { f(x: number): string };
+    declare var s: S;
+    declare var a2: { f(x: number): string };
     t = s;
     t = a2;
     a = s;
@@ -75,8 +75,8 @@ assignmentCompatWithCallSignatures2.ts(49,1): error TS2322: Type '(x: string) =>
     interface S2 {
         f(x: string): void;
     }
-    var s2: S2;
-    var a3: { f(x: string): void };
+    declare var s2: S2;
+    declare var a3: { f(x: string): void };
     // these are errors
     t = s2;
     ~
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures2.js b/tests/baselines/reference/assignmentCompatWithCallSignatures2.js
index c7bf9a81f5a58..1528b9305f2a7 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures2.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures2.js
@@ -6,8 +6,8 @@
 interface T {
     f(x: number): void;
 }
-var t: T;
-var a: { f(x: number): void };
+declare var t: T;
+declare var a: { f(x: number): void };
 
 t = a;
 a = t;
@@ -15,8 +15,8 @@ a = t;
 interface S {
     f(x: number): string;
 }
-var s: S;
-var a2: { f(x: number): string };
+declare var s: S;
+declare var a2: { f(x: number): string };
 t = s;
 t = a2;
 a = s;
@@ -39,8 +39,8 @@ a = function (x: number) { return ''; }
 interface S2 {
     f(x: string): void;
 }
-var s2: S2;
-var a3: { f(x: string): void };
+declare var s2: S2;
+declare var a3: { f(x: string): void };
 // these are errors
 t = s2;
 t = a3;
@@ -54,12 +54,8 @@ a = function (x: string) { return ''; }
 
 //// [assignmentCompatWithCallSignatures2.js]
 // void returning call signatures can be assigned a non-void returning call signature that otherwise matches
-var t;
-var a;
 t = a;
 a = t;
-var s;
-var a2;
 t = s;
 t = a2;
 a = s;
@@ -76,8 +72,6 @@ t = function () { return 1; };
 t = function (x) { return ''; };
 a = function () { return 1; };
 a = function (x) { return ''; };
-var s2;
-var a3;
 // these are errors
 t = s2;
 t = a3;
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures2.symbols b/tests/baselines/reference/assignmentCompatWithCallSignatures2.symbols
index b861c36caeeb8..788bf1f479bae 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures2.symbols
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures2.symbols
@@ -10,22 +10,22 @@ interface T {
 >f : Symbol(T.f, Decl(assignmentCompatWithCallSignatures2.ts, 2, 13))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 3, 6))
 }
-var t: T;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 3))
+declare var t: T;
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 11))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures2.ts, 0, 0))
 
-var a: { f(x: number): void };
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 3))
->f : Symbol(f, Decl(assignmentCompatWithCallSignatures2.ts, 6, 8))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 6, 11))
+declare var a: { f(x: number): void };
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 11))
+>f : Symbol(f, Decl(assignmentCompatWithCallSignatures2.ts, 6, 16))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 6, 19))
 
 t = a;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 3))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 11))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 11))
 
 a = t;
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 3))
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 11))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 11))
 
 interface S {
 >S : Symbol(S, Decl(assignmentCompatWithCallSignatures2.ts, 9, 6))
@@ -34,81 +34,81 @@ interface S {
 >f : Symbol(S.f, Decl(assignmentCompatWithCallSignatures2.ts, 11, 13))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 12, 6))
 }
-var s: S;
->s : Symbol(s, Decl(assignmentCompatWithCallSignatures2.ts, 14, 3))
+declare var s: S;
+>s : Symbol(s, Decl(assignmentCompatWithCallSignatures2.ts, 14, 11))
 >S : Symbol(S, Decl(assignmentCompatWithCallSignatures2.ts, 9, 6))
 
-var a2: { f(x: number): string };
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures2.ts, 15, 3))
->f : Symbol(f, Decl(assignmentCompatWithCallSignatures2.ts, 15, 9))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 15, 12))
+declare var a2: { f(x: number): string };
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures2.ts, 15, 11))
+>f : Symbol(f, Decl(assignmentCompatWithCallSignatures2.ts, 15, 17))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 15, 20))
 
 t = s;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 3))
->s : Symbol(s, Decl(assignmentCompatWithCallSignatures2.ts, 14, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 11))
+>s : Symbol(s, Decl(assignmentCompatWithCallSignatures2.ts, 14, 11))
 
 t = a2;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 3))
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures2.ts, 15, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures2.ts, 15, 11))
 
 a = s;
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 3))
->s : Symbol(s, Decl(assignmentCompatWithCallSignatures2.ts, 14, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 11))
+>s : Symbol(s, Decl(assignmentCompatWithCallSignatures2.ts, 14, 11))
 
 a = a2;
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 3))
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures2.ts, 15, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures2.ts, 15, 11))
 
 t = { f: () => 1 };
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 11))
 >f : Symbol(f, Decl(assignmentCompatWithCallSignatures2.ts, 21, 5))
 
 t = { f: <T>(x:T) => 1 };
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 11))
 >f : Symbol(f, Decl(assignmentCompatWithCallSignatures2.ts, 22, 5))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures2.ts, 22, 10))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 22, 13))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures2.ts, 22, 10))
 
 t = { f: function f() { return 1 } };
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 11))
 >f : Symbol(f, Decl(assignmentCompatWithCallSignatures2.ts, 23, 5))
 >f : Symbol(f, Decl(assignmentCompatWithCallSignatures2.ts, 23, 8))
 
 t = { f(x: number) { return ''; } }
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 11))
 >f : Symbol(f, Decl(assignmentCompatWithCallSignatures2.ts, 24, 5))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 24, 8))
 
 a = { f: () => 1 }
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 11))
 >f : Symbol(f, Decl(assignmentCompatWithCallSignatures2.ts, 25, 5))
 
 a = { f: <T>(x: T) => 1 };
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 11))
 >f : Symbol(f, Decl(assignmentCompatWithCallSignatures2.ts, 26, 5))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures2.ts, 26, 10))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 26, 13))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures2.ts, 26, 10))
 
 a = { f: function (x: number) { return ''; } }
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 11))
 >f : Symbol(f, Decl(assignmentCompatWithCallSignatures2.ts, 27, 5))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 27, 19))
 
 // errors
 t = () => 1;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 11))
 
 t = function (x: number) { return ''; }
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 31, 14))
 
 a = () => 1;
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 11))
 
 a = function (x: number) { return ''; }
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 33, 14))
 
 interface S2 {
@@ -118,45 +118,45 @@ interface S2 {
 >f : Symbol(S2.f, Decl(assignmentCompatWithCallSignatures2.ts, 35, 14))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 36, 6))
 }
-var s2: S2;
->s2 : Symbol(s2, Decl(assignmentCompatWithCallSignatures2.ts, 38, 3))
+declare var s2: S2;
+>s2 : Symbol(s2, Decl(assignmentCompatWithCallSignatures2.ts, 38, 11))
 >S2 : Symbol(S2, Decl(assignmentCompatWithCallSignatures2.ts, 33, 39))
 
-var a3: { f(x: string): void };
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures2.ts, 39, 3))
->f : Symbol(f, Decl(assignmentCompatWithCallSignatures2.ts, 39, 9))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 39, 12))
+declare var a3: { f(x: string): void };
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures2.ts, 39, 11))
+>f : Symbol(f, Decl(assignmentCompatWithCallSignatures2.ts, 39, 17))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 39, 20))
 
 // these are errors
 t = s2;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 3))
->s2 : Symbol(s2, Decl(assignmentCompatWithCallSignatures2.ts, 38, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 11))
+>s2 : Symbol(s2, Decl(assignmentCompatWithCallSignatures2.ts, 38, 11))
 
 t = a3;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 3))
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures2.ts, 39, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 11))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures2.ts, 39, 11))
 
 t = (x: string) => 1;
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 43, 5))
 
 t = function (x: string) { return ''; }
->t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithCallSignatures2.ts, 5, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 44, 14))
 
 a = s2;
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 3))
->s2 : Symbol(s2, Decl(assignmentCompatWithCallSignatures2.ts, 38, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 11))
+>s2 : Symbol(s2, Decl(assignmentCompatWithCallSignatures2.ts, 38, 11))
 
 a = a3;
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 3))
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures2.ts, 39, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 11))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures2.ts, 39, 11))
 
 a = (x: string) => 1;
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 47, 5))
 
 a = function (x: string) { return ''; }
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures2.ts, 6, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures2.ts, 48, 14))
 
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures2.types b/tests/baselines/reference/assignmentCompatWithCallSignatures2.types
index 1da1324ee7c3f..8d6b4d5cde730 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures2.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures2.types
@@ -10,11 +10,11 @@ interface T {
 >x : number
 >  : ^^^^^^
 }
-var t: T;
+declare var t: T;
 >t : T
 >  : ^
 
-var a: { f(x: number): void };
+declare var a: { f(x: number): void };
 >a : { f(x: number): void; }
 >  : ^^^^ ^^      ^^^    ^^^
 >f : (x: number) => void
@@ -45,11 +45,11 @@ interface S {
 >x : number
 >  : ^^^^^^
 }
-var s: S;
+declare var s: S;
 >s : S
 >  : ^
 
-var a2: { f(x: number): string };
+declare var a2: { f(x: number): string };
 >a2 : { f(x: number): string; }
 >   : ^^^^ ^^      ^^^      ^^^
 >f : (x: number) => string
@@ -247,11 +247,11 @@ interface S2 {
 >x : string
 >  : ^^^^^^
 }
-var s2: S2;
+declare var s2: S2;
 >s2 : S2
 >   : ^^
 
-var a3: { f(x: string): void };
+declare var a3: { f(x: string): void };
 >a3 : { f(x: string): void; }
 >   : ^^^^ ^^      ^^^    ^^^
 >f : (x: string) => void
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt
index 1d1c9bfdcebd3..b72fa97762c6f 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.errors.txt
@@ -70,33 +70,33 @@ assignmentCompatWithCallSignatures3.ts(86,1): error TS2322: Type '(x: { a: strin
     class Derived2 extends Derived { baz: string; }
     class OtherDerived extends Base { bing: string; }
     
-    var a: (x: number) => number[];
-    var a2: (x: number) => string[];
-    var a3: (x: number) => void;
-    var a4: (x: string, y: number) => string;
-    var a5: (x: (arg: string) => number) => string;
-    var a6: (x: (arg: Base) => Derived) => Base;
-    var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
-    var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-    var a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-    var a10: (...x: Derived[]) => Derived;
-    var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
-    var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
-    var a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
-    var a14: (x: { a: string; b: number }) => Object;
-    var a15: {
+    declare var a: (x: number) => number[];
+    declare var a2: (x: number) => string[];
+    declare var a3: (x: number) => void;
+    declare var a4: (x: string, y: number) => string;
+    declare var a5: (x: (arg: string) => number) => string;
+    declare var a6: (x: (arg: Base) => Derived) => Base;
+    declare var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
+    declare var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+    declare var a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+    declare var a10: (...x: Derived[]) => Derived;
+    declare var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+    declare var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+    declare var a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
+    declare var a14: (x: { a: string; b: number }) => Object;
+    declare var a15: {
         (x: number): number[];
         (x: string): string[];
     }
-    var a16: {
+    declare var a16: {
         <T extends Derived>(x: T): number[];
         <U extends Base>(x: U): number[];
     }
-    var a17: {
+    declare var a17: {
         (x: (a: number) => number): number[];
         (x: (a: string) => string): string[];
     };
-    var a18: {
+    declare var a18: {
         (x: {
             (a: number): number;
             (a: string): string;
@@ -107,39 +107,39 @@ assignmentCompatWithCallSignatures3.ts(86,1): error TS2322: Type '(x: { a: strin
         }): any[];
     }
     
-    var b: <T>(x: T) => T[]; 
+    declare var b: <T>(x: T) => T[]; 
     a = b; // ok
     b = a; // ok
     ~
 !!! error TS2322: Type '(x: number) => number[]' is not assignable to type '<T>(x: T) => T[]'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type 'number'.
-!!! related TS2208 assignmentCompatWithCallSignatures3.ts:45:9: This type parameter might need an `extends number` constraint.
-    var b2: <T>(x: T) => string[]; 
+!!! related TS2208 assignmentCompatWithCallSignatures3.ts:45:17: This type parameter might need an `extends number` constraint.
+    declare var b2: <T>(x: T) => string[]; 
     a2 = b2; // ok 
     b2 = a2; // ok
     ~~
 !!! error TS2322: Type '(x: number) => string[]' is not assignable to type '<T>(x: T) => string[]'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type 'number'.
-!!! related TS2208 assignmentCompatWithCallSignatures3.ts:48:10: This type parameter might need an `extends number` constraint.
-    var b3: <T>(x: T) => T; 
+!!! related TS2208 assignmentCompatWithCallSignatures3.ts:48:18: This type parameter might need an `extends number` constraint.
+    declare var b3: <T>(x: T) => T; 
     a3 = b3; // ok
     b3 = a3; // ok
     ~~
 !!! error TS2322: Type '(x: number) => void' is not assignable to type '<T>(x: T) => T'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type 'number'.
-!!! related TS2208 assignmentCompatWithCallSignatures3.ts:51:10: This type parameter might need an `extends number` constraint.
-    var b4: <T, U>(x: T, y: U) => T; 
+!!! related TS2208 assignmentCompatWithCallSignatures3.ts:51:18: This type parameter might need an `extends number` constraint.
+    declare var b4: <T, U>(x: T, y: U) => T; 
     a4 = b4; // ok
     b4 = a4; // ok
     ~~
 !!! error TS2322: Type '(x: string, y: number) => string' is not assignable to type '<T, U>(x: T, y: U) => T'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type 'string'.
-!!! related TS2208 assignmentCompatWithCallSignatures3.ts:54:10: This type parameter might need an `extends string` constraint.
-    var b5: <T, U>(x: (arg: T) => U) => T; 
+!!! related TS2208 assignmentCompatWithCallSignatures3.ts:54:18: This type parameter might need an `extends string` constraint.
+    declare var b5: <T, U>(x: (arg: T) => U) => T; 
     a5 = b5; // ok
     b5 = a5; // ok
     ~~
@@ -148,7 +148,7 @@ assignmentCompatWithCallSignatures3.ts(86,1): error TS2322: Type '(x: { a: strin
 !!! error TS2322:     Types of parameters 'arg' and 'arg' are incompatible.
 !!! error TS2322:       Type 'string' is not assignable to type 'T'.
 !!! error TS2322:         'T' could be instantiated with an arbitrary type which could be unrelated to 'string'.
-    var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
+    declare var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
     a6 = b6; // ok
     b6 = a6; // ok
     ~~
@@ -157,7 +157,7 @@ assignmentCompatWithCallSignatures3.ts(86,1): error TS2322: Type '(x: { a: strin
 !!! error TS2322:     Types of parameters 'arg' and 'arg' are incompatible.
 !!! error TS2322:       Type 'Base' is not assignable to type 'T'.
 !!! error TS2322:         'Base' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Base'.
-    var b7: <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
+    declare var b7: <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
     a7 = b7; // ok
     b7 = a7; // ok
     ~~
@@ -166,7 +166,7 @@ assignmentCompatWithCallSignatures3.ts(86,1): error TS2322: Type '(x: { a: strin
 !!! error TS2322:     Types of parameters 'arg' and 'arg' are incompatible.
 !!! error TS2322:       Type 'Base' is not assignable to type 'T'.
 !!! error TS2322:         'Base' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Base'.
-    var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
+    declare var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
     a8 = b8; // ok
     b8 = a8; // ok
     ~~
@@ -175,7 +175,7 @@ assignmentCompatWithCallSignatures3.ts(86,1): error TS2322: Type '(x: { a: strin
 !!! error TS2322:     Types of parameters 'arg' and 'arg' are incompatible.
 !!! error TS2322:       Type 'Base' is not assignable to type 'T'.
 !!! error TS2322:         'Base' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Base'.
-    var b9: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
+    declare var b9: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
     a9 = b9; // ok
     b9 = a9; // ok
     ~~
@@ -184,14 +184,14 @@ assignmentCompatWithCallSignatures3.ts(86,1): error TS2322: Type '(x: { a: strin
 !!! error TS2322:     Types of parameters 'arg' and 'arg' are incompatible.
 !!! error TS2322:       Type 'Base' is not assignable to type 'T'.
 !!! error TS2322:         'Base' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Base'.
-    var b10: <T extends Derived>(...x: T[]) => T; 
+    declare var b10: <T extends Derived>(...x: T[]) => T; 
     a10 = b10; // ok
     b10 = a10; // ok
     ~~~
 !!! error TS2322: Type '(...x: Derived[]) => Derived' is not assignable to type '<T extends Derived>(...x: T[]) => T'.
 !!! error TS2322:   Type 'Derived' is not assignable to type 'T'.
 !!! error TS2322:     'Derived' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Derived'.
-    var b11: <T extends Base>(x: T, y: T) => T; 
+    declare var b11: <T extends Base>(x: T, y: T) => T; 
     a11 = b11; // ok
     b11 = a11; // ok
     ~~~
@@ -199,8 +199,8 @@ assignmentCompatWithCallSignatures3.ts(86,1): error TS2322: Type '(x: { a: strin
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
 !!! error TS2322:       Property 'bar' is missing in type 'Base' but required in type '{ foo: string; bar: string; }'.
-!!! related TS2728 assignmentCompatWithCallSignatures3.ts:18:49: 'bar' is declared here.
-    var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
+!!! related TS2728 assignmentCompatWithCallSignatures3.ts:18:57: 'bar' is declared here.
+    declare var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
     a12 = b12; // ok
     b12 = a12; // ok
     ~~~
@@ -209,14 +209,14 @@ assignmentCompatWithCallSignatures3.ts(86,1): error TS2322: Type '(x: { a: strin
 !!! error TS2322:     Type 'T' is not assignable to type 'Derived2[]'.
 !!! error TS2322:       Type 'Base[]' is not assignable to type 'Derived2[]'.
 !!! error TS2322:         Type 'Base' is missing the following properties from type 'Derived2': baz, bar
-    var b13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
+    declare var b13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
     a13 = b13; // ok
     b13 = a13; // ok
     ~~~
 !!! error TS2322: Type '(x: Base[], y: Derived[]) => Derived[]' is not assignable to type '<T extends Array<Derived>>(x: Base[], y: T) => T'.
 !!! error TS2322:   Type 'Derived[]' is not assignable to type 'T'.
 !!! error TS2322:     'Derived[]' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Derived[]'.
-    var b14: <T>(x: { a: T; b: T }) => T; 
+    declare var b14: <T>(x: { a: T; b: T }) => T; 
     a14 = b14; // ok
     ~~~
 !!! error TS2322: Type '<T>(x: { a: T; b: T; }) => T' is not assignable to type '(x: { a: string; b: number; }) => Object'.
@@ -231,17 +231,17 @@ assignmentCompatWithCallSignatures3.ts(86,1): error TS2322: Type '(x: { a: strin
 !!! error TS2322:     Type '{ a: T; b: T; }' is not assignable to type '{ a: string; b: number; }'.
 !!! error TS2322:       Types of property 'a' are incompatible.
 !!! error TS2322:         Type 'T' is not assignable to type 'string'.
-!!! related TS2208 assignmentCompatWithCallSignatures3.ts:84:11: This type parameter might need an `extends string` constraint.
-    var b15: <T>(x: T) => T[]; 
+!!! related TS2208 assignmentCompatWithCallSignatures3.ts:84:19: This type parameter might need an `extends string` constraint.
+    declare var b15: <T>(x: T) => T[]; 
     a15 = b15; // ok
     b15 = a15; // ok
-    var b16: <T extends Base>(x: T) => number[];
+    declare var b16: <T extends Base>(x: T) => number[];
     a16 = b16; // ok
     b16 = a16; // ok
-    var b17: <T>(x: (a: T) => T) => T[]; // ok
+    declare var b17: <T>(x: (a: T) => T) => T[]; // ok
     a17 = b17; // ok
     b17 = a17; // ok
-    var b18: <T>(x: (a: T) => T) => T[]; 
+    declare var b18: <T>(x: (a: T) => T) => T[]; 
     a18 = b18; // ok
     b18 = a18; // ok
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.js b/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
index 7c3cfb81b994f..cdc9bdebef257 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
@@ -8,33 +8,33 @@ class Derived extends Base { bar: string; }
 class Derived2 extends Derived { baz: string; }
 class OtherDerived extends Base { bing: string; }
 
-var a: (x: number) => number[];
-var a2: (x: number) => string[];
-var a3: (x: number) => void;
-var a4: (x: string, y: number) => string;
-var a5: (x: (arg: string) => number) => string;
-var a6: (x: (arg: Base) => Derived) => Base;
-var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
-var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-var a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-var a10: (...x: Derived[]) => Derived;
-var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
-var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
-var a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
-var a14: (x: { a: string; b: number }) => Object;
-var a15: {
+declare var a: (x: number) => number[];
+declare var a2: (x: number) => string[];
+declare var a3: (x: number) => void;
+declare var a4: (x: string, y: number) => string;
+declare var a5: (x: (arg: string) => number) => string;
+declare var a6: (x: (arg: Base) => Derived) => Base;
+declare var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
+declare var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+declare var a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+declare var a10: (...x: Derived[]) => Derived;
+declare var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+declare var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+declare var a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
+declare var a14: (x: { a: string; b: number }) => Object;
+declare var a15: {
     (x: number): number[];
     (x: string): string[];
 }
-var a16: {
+declare var a16: {
     <T extends Derived>(x: T): number[];
     <U extends Base>(x: U): number[];
 }
-var a17: {
+declare var a17: {
     (x: (a: number) => number): number[];
     (x: (a: string) => string): string[];
 };
-var a18: {
+declare var a18: {
     (x: {
         (a: number): number;
         (a: string): string;
@@ -45,58 +45,58 @@ var a18: {
     }): any[];
 }
 
-var b: <T>(x: T) => T[]; 
+declare var b: <T>(x: T) => T[]; 
 a = b; // ok
 b = a; // ok
-var b2: <T>(x: T) => string[]; 
+declare var b2: <T>(x: T) => string[]; 
 a2 = b2; // ok 
 b2 = a2; // ok
-var b3: <T>(x: T) => T; 
+declare var b3: <T>(x: T) => T; 
 a3 = b3; // ok
 b3 = a3; // ok
-var b4: <T, U>(x: T, y: U) => T; 
+declare var b4: <T, U>(x: T, y: U) => T; 
 a4 = b4; // ok
 b4 = a4; // ok
-var b5: <T, U>(x: (arg: T) => U) => T; 
+declare var b5: <T, U>(x: (arg: T) => U) => T; 
 a5 = b5; // ok
 b5 = a5; // ok
-var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
+declare var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
 a6 = b6; // ok
 b6 = a6; // ok
-var b7: <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
+declare var b7: <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
 a7 = b7; // ok
 b7 = a7; // ok
-var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
+declare var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
 a8 = b8; // ok
 b8 = a8; // ok
-var b9: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
+declare var b9: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
 a9 = b9; // ok
 b9 = a9; // ok
-var b10: <T extends Derived>(...x: T[]) => T; 
+declare var b10: <T extends Derived>(...x: T[]) => T; 
 a10 = b10; // ok
 b10 = a10; // ok
-var b11: <T extends Base>(x: T, y: T) => T; 
+declare var b11: <T extends Base>(x: T, y: T) => T; 
 a11 = b11; // ok
 b11 = a11; // ok
-var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
+declare var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
 a12 = b12; // ok
 b12 = a12; // ok
-var b13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
+declare var b13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
 a13 = b13; // ok
 b13 = a13; // ok
-var b14: <T>(x: { a: T; b: T }) => T; 
+declare var b14: <T>(x: { a: T; b: T }) => T; 
 a14 = b14; // ok
 b14 = a14; // ok
-var b15: <T>(x: T) => T[]; 
+declare var b15: <T>(x: T) => T[]; 
 a15 = b15; // ok
 b15 = a15; // ok
-var b16: <T extends Base>(x: T) => number[];
+declare var b16: <T extends Base>(x: T) => number[];
 a16 = b16; // ok
 b16 = a16; // ok
-var b17: <T>(x: (a: T) => T) => T[]; // ok
+declare var b17: <T>(x: (a: T) => T) => T[]; // ok
 a17 = b17; // ok
 b17 = a17; // ok
-var b18: <T>(x: (a: T) => T) => T[]; 
+declare var b18: <T>(x: (a: T) => T) => T[]; 
 a18 = b18; // ok
 b18 = a18; // ok
 
@@ -144,75 +144,39 @@ var OtherDerived = /** @class */ (function (_super) {
     }
     return OtherDerived;
 }(Base));
-var a;
-var a2;
-var a3;
-var a4;
-var a5;
-var a6;
-var a7;
-var a8;
-var a9;
-var a10;
-var a11;
-var a12;
-var a13;
-var a14;
-var a15;
-var a16;
-var a17;
-var a18;
-var b;
 a = b; // ok
 b = a; // ok
-var b2;
 a2 = b2; // ok 
 b2 = a2; // ok
-var b3;
 a3 = b3; // ok
 b3 = a3; // ok
-var b4;
 a4 = b4; // ok
 b4 = a4; // ok
-var b5;
 a5 = b5; // ok
 b5 = a5; // ok
-var b6;
 a6 = b6; // ok
 b6 = a6; // ok
-var b7;
 a7 = b7; // ok
 b7 = a7; // ok
-var b8;
 a8 = b8; // ok
 b8 = a8; // ok
-var b9;
 a9 = b9; // ok
 b9 = a9; // ok
-var b10;
 a10 = b10; // ok
 b10 = a10; // ok
-var b11;
 a11 = b11; // ok
 b11 = a11; // ok
-var b12;
 a12 = b12; // ok
 b12 = a12; // ok
-var b13;
 a13 = b13; // ok
 b13 = a13; // ok
-var b14;
 a14 = b14; // ok
 b14 = a14; // ok
-var b15;
 a15 = b15; // ok
 b15 = a15; // ok
-var b16;
 a16 = b16; // ok
 b16 = a16; // ok
-var b17; // ok
 a17 = b17; // ok
 b17 = a17; // ok
-var b18;
 a18 = b18; // ok
 b18 = a18; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.symbols b/tests/baselines/reference/assignmentCompatWithCallSignatures3.symbols
index 6561c6e85dce7..3124eb15b5c01 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.symbols
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.symbols
@@ -22,120 +22,120 @@ class OtherDerived extends Base { bing: string; }
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
 >bing : Symbol(OtherDerived.bing, Decl(assignmentCompatWithCallSignatures3.ts, 5, 33))
 
-var a: (x: number) => number[];
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 7, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 7, 8))
-
-var a2: (x: number) => string[];
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures3.ts, 8, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 8, 9))
-
-var a3: (x: number) => void;
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures3.ts, 9, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 9, 9))
-
-var a4: (x: string, y: number) => string;
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignatures3.ts, 10, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 10, 9))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 10, 19))
-
-var a5: (x: (arg: string) => number) => string;
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignatures3.ts, 11, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 11, 9))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 11, 13))
-
-var a6: (x: (arg: Base) => Derived) => Base;
->a6 : Symbol(a6, Decl(assignmentCompatWithCallSignatures3.ts, 12, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 12, 9))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 12, 13))
+declare var a: (x: number) => number[];
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 7, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 7, 16))
+
+declare var a2: (x: number) => string[];
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures3.ts, 8, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 8, 17))
+
+declare var a3: (x: number) => void;
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures3.ts, 9, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 9, 17))
+
+declare var a4: (x: string, y: number) => string;
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignatures3.ts, 10, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 10, 17))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 10, 27))
+
+declare var a5: (x: (arg: string) => number) => string;
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignatures3.ts, 11, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 11, 17))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 11, 21))
+
+declare var a6: (x: (arg: Base) => Derived) => Base;
+>a6 : Symbol(a6, Decl(assignmentCompatWithCallSignatures3.ts, 12, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 12, 17))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 12, 21))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
 
-var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
->a7 : Symbol(a7, Decl(assignmentCompatWithCallSignatures3.ts, 13, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 13, 9))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 13, 13))
+declare var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
+>a7 : Symbol(a7, Decl(assignmentCompatWithCallSignatures3.ts, 13, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 13, 17))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 13, 21))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
->r : Symbol(r, Decl(assignmentCompatWithCallSignatures3.ts, 13, 40))
+>r : Symbol(r, Decl(assignmentCompatWithCallSignatures3.ts, 13, 48))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
 
-var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a8 : Symbol(a8, Decl(assignmentCompatWithCallSignatures3.ts, 14, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 14, 9))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 14, 13))
+declare var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+>a8 : Symbol(a8, Decl(assignmentCompatWithCallSignatures3.ts, 14, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 14, 17))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 14, 21))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 14, 35))
->arg2 : Symbol(arg2, Decl(assignmentCompatWithCallSignatures3.ts, 14, 40))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 14, 43))
+>arg2 : Symbol(arg2, Decl(assignmentCompatWithCallSignatures3.ts, 14, 48))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
->r : Symbol(r, Decl(assignmentCompatWithCallSignatures3.ts, 14, 68))
+>r : Symbol(r, Decl(assignmentCompatWithCallSignatures3.ts, 14, 76))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
 
-var a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a9 : Symbol(a9, Decl(assignmentCompatWithCallSignatures3.ts, 15, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 15, 9))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 15, 13))
+declare var a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+>a9 : Symbol(a9, Decl(assignmentCompatWithCallSignatures3.ts, 15, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 15, 17))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 15, 21))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 15, 35))
->arg2 : Symbol(arg2, Decl(assignmentCompatWithCallSignatures3.ts, 15, 40))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 15, 43))
+>arg2 : Symbol(arg2, Decl(assignmentCompatWithCallSignatures3.ts, 15, 48))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
->r : Symbol(r, Decl(assignmentCompatWithCallSignatures3.ts, 15, 68))
+>r : Symbol(r, Decl(assignmentCompatWithCallSignatures3.ts, 15, 76))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
 
-var a10: (...x: Derived[]) => Derived;
->a10 : Symbol(a10, Decl(assignmentCompatWithCallSignatures3.ts, 16, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 16, 10))
+declare var a10: (...x: Derived[]) => Derived;
+>a10 : Symbol(a10, Decl(assignmentCompatWithCallSignatures3.ts, 16, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 16, 18))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
 
-var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
->a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures3.ts, 17, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 17, 10))
->foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures3.ts, 17, 14))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 17, 29))
->foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures3.ts, 17, 34))
->bar : Symbol(bar, Decl(assignmentCompatWithCallSignatures3.ts, 17, 47))
+declare var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+>a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures3.ts, 17, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 17, 18))
+>foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures3.ts, 17, 22))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 17, 37))
+>foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures3.ts, 17, 42))
+>bar : Symbol(bar, Decl(assignmentCompatWithCallSignatures3.ts, 17, 55))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
 
-var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
->a12 : Symbol(a12, Decl(assignmentCompatWithCallSignatures3.ts, 18, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 18, 10))
+declare var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+>a12 : Symbol(a12, Decl(assignmentCompatWithCallSignatures3.ts, 18, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 18, 18))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 18, 25))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 18, 33))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithCallSignatures3.ts, 3, 43))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
 
-var a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
->a13 : Symbol(a13, Decl(assignmentCompatWithCallSignatures3.ts, 19, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 19, 10))
+declare var a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
+>a13 : Symbol(a13, Decl(assignmentCompatWithCallSignatures3.ts, 19, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 19, 18))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 19, 25))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 19, 33))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
 
-var a14: (x: { a: string; b: number }) => Object;
->a14 : Symbol(a14, Decl(assignmentCompatWithCallSignatures3.ts, 20, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 20, 10))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 20, 14))
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures3.ts, 20, 25))
+declare var a14: (x: { a: string; b: number }) => Object;
+>a14 : Symbol(a14, Decl(assignmentCompatWithCallSignatures3.ts, 20, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 20, 18))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 20, 22))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures3.ts, 20, 33))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
-var a15: {
->a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures3.ts, 21, 3))
+declare var a15: {
+>a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures3.ts, 21, 11))
 
     (x: number): number[];
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 22, 5))
@@ -143,8 +143,8 @@ var a15: {
     (x: string): string[];
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 23, 5))
 }
-var a16: {
->a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures3.ts, 25, 3))
+declare var a16: {
+>a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures3.ts, 25, 11))
 
     <T extends Derived>(x: T): number[];
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 26, 5))
@@ -158,8 +158,8 @@ var a16: {
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 27, 21))
 >U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 27, 5))
 }
-var a17: {
->a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures3.ts, 29, 3))
+declare var a17: {
+>a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures3.ts, 29, 11))
 
     (x: (a: number) => number): number[];
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 30, 5))
@@ -170,8 +170,8 @@ var a17: {
 >a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 31, 9))
 
 };
-var a18: {
->a18 : Symbol(a18, Decl(assignmentCompatWithCallSignatures3.ts, 33, 3))
+declare var a18: {
+>a18 : Symbol(a18, Decl(assignmentCompatWithCallSignatures3.ts, 33, 11))
 
     (x: {
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 34, 5))
@@ -197,335 +197,335 @@ var a18: {
     }): any[];
 }
 
-var b: <T>(x: T) => T[]; 
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures3.ts, 44, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 44, 8))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 44, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 44, 8))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 44, 8))
+declare var b: <T>(x: T) => T[]; 
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures3.ts, 44, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 44, 16))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 44, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 44, 16))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 44, 16))
 
 a = b; // ok
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 7, 3))
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures3.ts, 44, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 7, 11))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures3.ts, 44, 11))
 
 b = a; // ok
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures3.ts, 44, 3))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 7, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures3.ts, 44, 11))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 7, 11))
 
-var b2: <T>(x: T) => string[]; 
->b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures3.ts, 47, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 47, 9))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 47, 12))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 47, 9))
+declare var b2: <T>(x: T) => string[]; 
+>b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures3.ts, 47, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 47, 17))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 47, 20))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 47, 17))
 
 a2 = b2; // ok 
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures3.ts, 8, 3))
->b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures3.ts, 47, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures3.ts, 8, 11))
+>b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures3.ts, 47, 11))
 
 b2 = a2; // ok
->b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures3.ts, 47, 3))
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures3.ts, 8, 3))
+>b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures3.ts, 47, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures3.ts, 8, 11))
 
-var b3: <T>(x: T) => T; 
->b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures3.ts, 50, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 50, 9))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 50, 12))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 50, 9))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 50, 9))
+declare var b3: <T>(x: T) => T; 
+>b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures3.ts, 50, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 50, 17))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 50, 20))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 50, 17))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 50, 17))
 
 a3 = b3; // ok
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures3.ts, 9, 3))
->b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures3.ts, 50, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures3.ts, 9, 11))
+>b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures3.ts, 50, 11))
 
 b3 = a3; // ok
->b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures3.ts, 50, 3))
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures3.ts, 9, 3))
-
-var b4: <T, U>(x: T, y: U) => T; 
->b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures3.ts, 53, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 53, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 53, 11))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 53, 15))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 53, 9))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 53, 20))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 53, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 53, 9))
+>b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures3.ts, 50, 11))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures3.ts, 9, 11))
+
+declare var b4: <T, U>(x: T, y: U) => T; 
+>b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures3.ts, 53, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 53, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 53, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 53, 23))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 53, 17))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 53, 28))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 53, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 53, 17))
 
 a4 = b4; // ok
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignatures3.ts, 10, 3))
->b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures3.ts, 53, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignatures3.ts, 10, 11))
+>b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures3.ts, 53, 11))
 
 b4 = a4; // ok
->b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures3.ts, 53, 3))
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignatures3.ts, 10, 3))
-
-var b5: <T, U>(x: (arg: T) => U) => T; 
->b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures3.ts, 56, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 56, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 56, 11))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 56, 15))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 56, 19))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 56, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 56, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 56, 9))
+>b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures3.ts, 53, 11))
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignatures3.ts, 10, 11))
+
+declare var b5: <T, U>(x: (arg: T) => U) => T; 
+>b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures3.ts, 56, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 56, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 56, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 56, 23))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 56, 27))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 56, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 56, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 56, 17))
 
 a5 = b5; // ok
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignatures3.ts, 11, 3))
->b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures3.ts, 56, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignatures3.ts, 11, 11))
+>b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures3.ts, 56, 11))
 
 b5 = a5; // ok
->b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures3.ts, 56, 3))
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignatures3.ts, 11, 3))
+>b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures3.ts, 56, 11))
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignatures3.ts, 11, 11))
 
-var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
->b6 : Symbol(b6, Decl(assignmentCompatWithCallSignatures3.ts, 59, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 59, 9))
+declare var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
+>b6 : Symbol(b6, Decl(assignmentCompatWithCallSignatures3.ts, 59, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 59, 17))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 59, 24))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 59, 32))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 59, 44))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 59, 48))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 59, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 59, 24))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 59, 9))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 59, 52))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 59, 56))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 59, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 59, 32))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 59, 17))
 
 a6 = b6; // ok
->a6 : Symbol(a6, Decl(assignmentCompatWithCallSignatures3.ts, 12, 3))
->b6 : Symbol(b6, Decl(assignmentCompatWithCallSignatures3.ts, 59, 3))
+>a6 : Symbol(a6, Decl(assignmentCompatWithCallSignatures3.ts, 12, 11))
+>b6 : Symbol(b6, Decl(assignmentCompatWithCallSignatures3.ts, 59, 11))
 
 b6 = a6; // ok
->b6 : Symbol(b6, Decl(assignmentCompatWithCallSignatures3.ts, 59, 3))
->a6 : Symbol(a6, Decl(assignmentCompatWithCallSignatures3.ts, 12, 3))
+>b6 : Symbol(b6, Decl(assignmentCompatWithCallSignatures3.ts, 59, 11))
+>a6 : Symbol(a6, Decl(assignmentCompatWithCallSignatures3.ts, 12, 11))
 
-var b7: <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
->b7 : Symbol(b7, Decl(assignmentCompatWithCallSignatures3.ts, 62, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 62, 9))
+declare var b7: <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
+>b7 : Symbol(b7, Decl(assignmentCompatWithCallSignatures3.ts, 62, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 62, 17))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 62, 24))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 62, 32))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 62, 44))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 62, 48))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 62, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 62, 24))
->r : Symbol(r, Decl(assignmentCompatWithCallSignatures3.ts, 62, 66))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 62, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 62, 24))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 62, 52))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 62, 56))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 62, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 62, 32))
+>r : Symbol(r, Decl(assignmentCompatWithCallSignatures3.ts, 62, 74))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 62, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 62, 32))
 
 a7 = b7; // ok
->a7 : Symbol(a7, Decl(assignmentCompatWithCallSignatures3.ts, 13, 3))
->b7 : Symbol(b7, Decl(assignmentCompatWithCallSignatures3.ts, 62, 3))
+>a7 : Symbol(a7, Decl(assignmentCompatWithCallSignatures3.ts, 13, 11))
+>b7 : Symbol(b7, Decl(assignmentCompatWithCallSignatures3.ts, 62, 11))
 
 b7 = a7; // ok
->b7 : Symbol(b7, Decl(assignmentCompatWithCallSignatures3.ts, 62, 3))
->a7 : Symbol(a7, Decl(assignmentCompatWithCallSignatures3.ts, 13, 3))
+>b7 : Symbol(b7, Decl(assignmentCompatWithCallSignatures3.ts, 62, 11))
+>a7 : Symbol(a7, Decl(assignmentCompatWithCallSignatures3.ts, 13, 11))
 
-var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
->b8 : Symbol(b8, Decl(assignmentCompatWithCallSignatures3.ts, 65, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 65, 9))
+declare var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
+>b8 : Symbol(b8, Decl(assignmentCompatWithCallSignatures3.ts, 65, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 65, 17))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 65, 24))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 65, 32))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 65, 44))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 65, 48))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 65, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 65, 24))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 65, 61))
->arg2 : Symbol(arg2, Decl(assignmentCompatWithCallSignatures3.ts, 65, 66))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 65, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 65, 24))
->r : Symbol(r, Decl(assignmentCompatWithCallSignatures3.ts, 65, 85))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 65, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 65, 24))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 65, 52))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 65, 56))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 65, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 65, 32))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 65, 69))
+>arg2 : Symbol(arg2, Decl(assignmentCompatWithCallSignatures3.ts, 65, 74))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 65, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 65, 32))
+>r : Symbol(r, Decl(assignmentCompatWithCallSignatures3.ts, 65, 93))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 65, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 65, 32))
 
 a8 = b8; // ok
->a8 : Symbol(a8, Decl(assignmentCompatWithCallSignatures3.ts, 14, 3))
->b8 : Symbol(b8, Decl(assignmentCompatWithCallSignatures3.ts, 65, 3))
+>a8 : Symbol(a8, Decl(assignmentCompatWithCallSignatures3.ts, 14, 11))
+>b8 : Symbol(b8, Decl(assignmentCompatWithCallSignatures3.ts, 65, 11))
 
 b8 = a8; // ok
->b8 : Symbol(b8, Decl(assignmentCompatWithCallSignatures3.ts, 65, 3))
->a8 : Symbol(a8, Decl(assignmentCompatWithCallSignatures3.ts, 14, 3))
+>b8 : Symbol(b8, Decl(assignmentCompatWithCallSignatures3.ts, 65, 11))
+>a8 : Symbol(a8, Decl(assignmentCompatWithCallSignatures3.ts, 14, 11))
 
-var b9: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
->b9 : Symbol(b9, Decl(assignmentCompatWithCallSignatures3.ts, 68, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 68, 9))
+declare var b9: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
+>b9 : Symbol(b9, Decl(assignmentCompatWithCallSignatures3.ts, 68, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 68, 17))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 68, 24))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 68, 32))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 68, 44))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 68, 48))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 68, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 68, 24))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 68, 61))
->arg2 : Symbol(arg2, Decl(assignmentCompatWithCallSignatures3.ts, 68, 66))
->foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures3.ts, 68, 73))
->bing : Symbol(bing, Decl(assignmentCompatWithCallSignatures3.ts, 68, 86))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 68, 24))
->r : Symbol(r, Decl(assignmentCompatWithCallSignatures3.ts, 68, 113))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 68, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 68, 24))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 68, 52))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures3.ts, 68, 56))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 68, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 68, 32))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 68, 69))
+>arg2 : Symbol(arg2, Decl(assignmentCompatWithCallSignatures3.ts, 68, 74))
+>foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures3.ts, 68, 81))
+>bing : Symbol(bing, Decl(assignmentCompatWithCallSignatures3.ts, 68, 94))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 68, 32))
+>r : Symbol(r, Decl(assignmentCompatWithCallSignatures3.ts, 68, 121))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 68, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures3.ts, 68, 32))
 
 a9 = b9; // ok
->a9 : Symbol(a9, Decl(assignmentCompatWithCallSignatures3.ts, 15, 3))
->b9 : Symbol(b9, Decl(assignmentCompatWithCallSignatures3.ts, 68, 3))
+>a9 : Symbol(a9, Decl(assignmentCompatWithCallSignatures3.ts, 15, 11))
+>b9 : Symbol(b9, Decl(assignmentCompatWithCallSignatures3.ts, 68, 11))
 
 b9 = a9; // ok
->b9 : Symbol(b9, Decl(assignmentCompatWithCallSignatures3.ts, 68, 3))
->a9 : Symbol(a9, Decl(assignmentCompatWithCallSignatures3.ts, 15, 3))
+>b9 : Symbol(b9, Decl(assignmentCompatWithCallSignatures3.ts, 68, 11))
+>a9 : Symbol(a9, Decl(assignmentCompatWithCallSignatures3.ts, 15, 11))
 
-var b10: <T extends Derived>(...x: T[]) => T; 
->b10 : Symbol(b10, Decl(assignmentCompatWithCallSignatures3.ts, 71, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 71, 10))
+declare var b10: <T extends Derived>(...x: T[]) => T; 
+>b10 : Symbol(b10, Decl(assignmentCompatWithCallSignatures3.ts, 71, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 71, 18))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 71, 29))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 71, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 71, 10))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 71, 37))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 71, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 71, 18))
 
 a10 = b10; // ok
->a10 : Symbol(a10, Decl(assignmentCompatWithCallSignatures3.ts, 16, 3))
->b10 : Symbol(b10, Decl(assignmentCompatWithCallSignatures3.ts, 71, 3))
+>a10 : Symbol(a10, Decl(assignmentCompatWithCallSignatures3.ts, 16, 11))
+>b10 : Symbol(b10, Decl(assignmentCompatWithCallSignatures3.ts, 71, 11))
 
 b10 = a10; // ok
->b10 : Symbol(b10, Decl(assignmentCompatWithCallSignatures3.ts, 71, 3))
->a10 : Symbol(a10, Decl(assignmentCompatWithCallSignatures3.ts, 16, 3))
+>b10 : Symbol(b10, Decl(assignmentCompatWithCallSignatures3.ts, 71, 11))
+>a10 : Symbol(a10, Decl(assignmentCompatWithCallSignatures3.ts, 16, 11))
 
-var b11: <T extends Base>(x: T, y: T) => T; 
->b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures3.ts, 74, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 74, 10))
+declare var b11: <T extends Base>(x: T, y: T) => T; 
+>b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures3.ts, 74, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 74, 18))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 74, 26))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 74, 10))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 74, 31))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 74, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 74, 10))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 74, 34))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 74, 18))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 74, 39))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 74, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 74, 18))
 
 a11 = b11; // ok
->a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures3.ts, 17, 3))
->b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures3.ts, 74, 3))
+>a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures3.ts, 17, 11))
+>b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures3.ts, 74, 11))
 
 b11 = a11; // ok
->b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures3.ts, 74, 3))
->a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures3.ts, 17, 3))
+>b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures3.ts, 74, 11))
+>a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures3.ts, 17, 11))
 
-var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
->b12 : Symbol(b12, Decl(assignmentCompatWithCallSignatures3.ts, 77, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 77, 10))
+declare var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
+>b12 : Symbol(b12, Decl(assignmentCompatWithCallSignatures3.ts, 77, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 77, 18))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 77, 33))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 77, 41))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 77, 48))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 77, 10))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 77, 56))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 77, 18))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
 
 a12 = b12; // ok
->a12 : Symbol(a12, Decl(assignmentCompatWithCallSignatures3.ts, 18, 3))
->b12 : Symbol(b12, Decl(assignmentCompatWithCallSignatures3.ts, 77, 3))
+>a12 : Symbol(a12, Decl(assignmentCompatWithCallSignatures3.ts, 18, 11))
+>b12 : Symbol(b12, Decl(assignmentCompatWithCallSignatures3.ts, 77, 11))
 
 b12 = a12; // ok
->b12 : Symbol(b12, Decl(assignmentCompatWithCallSignatures3.ts, 77, 3))
->a12 : Symbol(a12, Decl(assignmentCompatWithCallSignatures3.ts, 18, 3))
+>b12 : Symbol(b12, Decl(assignmentCompatWithCallSignatures3.ts, 77, 11))
+>a12 : Symbol(a12, Decl(assignmentCompatWithCallSignatures3.ts, 18, 11))
 
-var b13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
->b13 : Symbol(b13, Decl(assignmentCompatWithCallSignatures3.ts, 80, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 80, 10))
+declare var b13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
+>b13 : Symbol(b13, Decl(assignmentCompatWithCallSignatures3.ts, 80, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 80, 18))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 80, 36))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 80, 44))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 80, 51))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 80, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 80, 10))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures3.ts, 80, 59))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 80, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 80, 18))
 
 a13 = b13; // ok
->a13 : Symbol(a13, Decl(assignmentCompatWithCallSignatures3.ts, 19, 3))
->b13 : Symbol(b13, Decl(assignmentCompatWithCallSignatures3.ts, 80, 3))
+>a13 : Symbol(a13, Decl(assignmentCompatWithCallSignatures3.ts, 19, 11))
+>b13 : Symbol(b13, Decl(assignmentCompatWithCallSignatures3.ts, 80, 11))
 
 b13 = a13; // ok
->b13 : Symbol(b13, Decl(assignmentCompatWithCallSignatures3.ts, 80, 3))
->a13 : Symbol(a13, Decl(assignmentCompatWithCallSignatures3.ts, 19, 3))
-
-var b14: <T>(x: { a: T; b: T }) => T; 
->b14 : Symbol(b14, Decl(assignmentCompatWithCallSignatures3.ts, 83, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 83, 10))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 83, 13))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 83, 17))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 83, 10))
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures3.ts, 83, 23))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 83, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 83, 10))
+>b13 : Symbol(b13, Decl(assignmentCompatWithCallSignatures3.ts, 80, 11))
+>a13 : Symbol(a13, Decl(assignmentCompatWithCallSignatures3.ts, 19, 11))
+
+declare var b14: <T>(x: { a: T; b: T }) => T; 
+>b14 : Symbol(b14, Decl(assignmentCompatWithCallSignatures3.ts, 83, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 83, 18))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 83, 21))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 83, 25))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 83, 18))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures3.ts, 83, 31))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 83, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 83, 18))
 
 a14 = b14; // ok
->a14 : Symbol(a14, Decl(assignmentCompatWithCallSignatures3.ts, 20, 3))
->b14 : Symbol(b14, Decl(assignmentCompatWithCallSignatures3.ts, 83, 3))
+>a14 : Symbol(a14, Decl(assignmentCompatWithCallSignatures3.ts, 20, 11))
+>b14 : Symbol(b14, Decl(assignmentCompatWithCallSignatures3.ts, 83, 11))
 
 b14 = a14; // ok
->b14 : Symbol(b14, Decl(assignmentCompatWithCallSignatures3.ts, 83, 3))
->a14 : Symbol(a14, Decl(assignmentCompatWithCallSignatures3.ts, 20, 3))
+>b14 : Symbol(b14, Decl(assignmentCompatWithCallSignatures3.ts, 83, 11))
+>a14 : Symbol(a14, Decl(assignmentCompatWithCallSignatures3.ts, 20, 11))
 
-var b15: <T>(x: T) => T[]; 
->b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures3.ts, 86, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 86, 10))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 86, 13))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 86, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 86, 10))
+declare var b15: <T>(x: T) => T[]; 
+>b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures3.ts, 86, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 86, 18))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 86, 21))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 86, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 86, 18))
 
 a15 = b15; // ok
->a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures3.ts, 21, 3))
->b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures3.ts, 86, 3))
+>a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures3.ts, 21, 11))
+>b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures3.ts, 86, 11))
 
 b15 = a15; // ok
->b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures3.ts, 86, 3))
->a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures3.ts, 21, 3))
+>b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures3.ts, 86, 11))
+>a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures3.ts, 21, 11))
 
-var b16: <T extends Base>(x: T) => number[];
->b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures3.ts, 89, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 89, 10))
+declare var b16: <T extends Base>(x: T) => number[];
+>b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures3.ts, 89, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 89, 18))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 89, 26))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 89, 10))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 89, 34))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 89, 18))
 
 a16 = b16; // ok
->a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures3.ts, 25, 3))
->b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures3.ts, 89, 3))
+>a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures3.ts, 25, 11))
+>b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures3.ts, 89, 11))
 
 b16 = a16; // ok
->b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures3.ts, 89, 3))
->a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures3.ts, 25, 3))
-
-var b17: <T>(x: (a: T) => T) => T[]; // ok
->b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures3.ts, 92, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 92, 10))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 92, 13))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 92, 17))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 92, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 92, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 92, 10))
+>b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures3.ts, 89, 11))
+>a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures3.ts, 25, 11))
+
+declare var b17: <T>(x: (a: T) => T) => T[]; // ok
+>b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures3.ts, 92, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 92, 18))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 92, 21))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 92, 25))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 92, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 92, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 92, 18))
 
 a17 = b17; // ok
->a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures3.ts, 29, 3))
->b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures3.ts, 92, 3))
+>a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures3.ts, 29, 11))
+>b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures3.ts, 92, 11))
 
 b17 = a17; // ok
->b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures3.ts, 92, 3))
->a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures3.ts, 29, 3))
-
-var b18: <T>(x: (a: T) => T) => T[]; 
->b18 : Symbol(b18, Decl(assignmentCompatWithCallSignatures3.ts, 95, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 95, 10))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 95, 13))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 95, 17))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 95, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 95, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 95, 10))
+>b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures3.ts, 92, 11))
+>a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures3.ts, 29, 11))
+
+declare var b18: <T>(x: (a: T) => T) => T[]; 
+>b18 : Symbol(b18, Decl(assignmentCompatWithCallSignatures3.ts, 95, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 95, 18))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures3.ts, 95, 21))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 95, 25))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 95, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 95, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures3.ts, 95, 18))
 
 a18 = b18; // ok
->a18 : Symbol(a18, Decl(assignmentCompatWithCallSignatures3.ts, 33, 3))
->b18 : Symbol(b18, Decl(assignmentCompatWithCallSignatures3.ts, 95, 3))
+>a18 : Symbol(a18, Decl(assignmentCompatWithCallSignatures3.ts, 33, 11))
+>b18 : Symbol(b18, Decl(assignmentCompatWithCallSignatures3.ts, 95, 11))
 
 b18 = a18; // ok
->b18 : Symbol(b18, Decl(assignmentCompatWithCallSignatures3.ts, 95, 3))
->a18 : Symbol(a18, Decl(assignmentCompatWithCallSignatures3.ts, 33, 3))
+>b18 : Symbol(b18, Decl(assignmentCompatWithCallSignatures3.ts, 95, 11))
+>a18 : Symbol(a18, Decl(assignmentCompatWithCallSignatures3.ts, 33, 11))
 
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.types b/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
index 225a7032edf1a..8792ad4ccc335 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
@@ -33,25 +33,25 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 >     : ^^^^^^
 
-var a: (x: number) => number[];
+declare var a: (x: number) => number[];
 >a : (x: number) => number[]
 >  : ^ ^^      ^^^^^        
 >x : number
 >  : ^^^^^^
 
-var a2: (x: number) => string[];
+declare var a2: (x: number) => string[];
 >a2 : (x: number) => string[]
 >   : ^ ^^      ^^^^^        
 >x : number
 >  : ^^^^^^
 
-var a3: (x: number) => void;
+declare var a3: (x: number) => void;
 >a3 : (x: number) => void
 >   : ^ ^^      ^^^^^    
 >x : number
 >  : ^^^^^^
 
-var a4: (x: string, y: number) => string;
+declare var a4: (x: string, y: number) => string;
 >a4 : (x: string, y: number) => string
 >   : ^ ^^      ^^ ^^      ^^^^^      
 >x : string
@@ -59,7 +59,7 @@ var a4: (x: string, y: number) => string;
 >y : number
 >  : ^^^^^^
 
-var a5: (x: (arg: string) => number) => string;
+declare var a5: (x: (arg: string) => number) => string;
 >a5 : (x: (arg: string) => number) => string
 >   : ^ ^^                       ^^^^^      
 >x : (arg: string) => number
@@ -67,7 +67,7 @@ var a5: (x: (arg: string) => number) => string;
 >arg : string
 >    : ^^^^^^
 
-var a6: (x: (arg: Base) => Derived) => Base;
+declare var a6: (x: (arg: Base) => Derived) => Base;
 >a6 : (x: (arg: Base) => Derived) => Base
 >   : ^ ^^                      ^^^^^    
 >x : (arg: Base) => Derived
@@ -75,7 +75,7 @@ var a6: (x: (arg: Base) => Derived) => Base;
 >arg : Base
 >    : ^^^^
 
-var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
+declare var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
 >a7 : (x: (arg: Base) => Derived) => (r: Base) => Derived
 >   : ^ ^^                      ^^^^^                    
 >x : (arg: Base) => Derived
@@ -85,7 +85,7 @@ var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
 >r : Base
 >  : ^^^^
 
-var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+declare var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a8 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >   : ^ ^^                      ^^ ^^                       ^^^^^                    
 >x : (arg: Base) => Derived
@@ -99,7 +99,7 @@ var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) =>
 >r : Base
 >  : ^^^^
 
-var a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+declare var a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a9 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >   : ^ ^^                      ^^ ^^                       ^^^^^                    
 >x : (arg: Base) => Derived
@@ -113,13 +113,13 @@ var a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) =>
 >r : Base
 >  : ^^^^
 
-var a10: (...x: Derived[]) => Derived;
+declare var a10: (...x: Derived[]) => Derived;
 >a10 : (...x: Derived[]) => Derived
 >    : ^^^^ ^^         ^^^^^       
 >x : Derived[]
 >  : ^^^^^^^^^
 
-var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+declare var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >a11 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >    : ^ ^^                ^^ ^^                             ^^^^^    
 >x : { foo: string; }
@@ -133,7 +133,7 @@ var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >bar : string
 >    : ^^^^^^
 
-var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+declare var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >    : ^ ^^           ^^ ^^               ^^^^^              
 >x : Base[]
@@ -141,7 +141,7 @@ var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >y : Derived2[]
 >  : ^^^^^^^^^^
 
-var a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
+declare var a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : (x: Array<Base>, y: Array<Derived>) => Array<Derived>
 >    : ^ ^^           ^^ ^^              ^^^^^              
 >x : Base[]
@@ -149,7 +149,7 @@ var a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >y : Derived[]
 >  : ^^^^^^^^^
 
-var a14: (x: { a: string; b: number }) => Object;
+declare var a14: (x: { a: string; b: number }) => Object;
 >a14 : (x: { a: string; b: number; }) => Object
 >    : ^ ^^                         ^^^^^      
 >x : { a: string; b: number; }
@@ -159,7 +159,7 @@ var a14: (x: { a: string; b: number }) => Object;
 >b : number
 >  : ^^^^^^
 
-var a15: {
+declare var a15: {
 >a15 : { (x: number): number[]; (x: string): string[]; }
 >    : ^^^ ^^      ^^^        ^^^ ^^      ^^^        ^^^
 
@@ -171,7 +171,7 @@ var a15: {
 >x : string
 >  : ^^^^^^
 }
-var a16: {
+declare var a16: {
 >a16 : { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }
 >    : ^^^ ^^^^^^^^^       ^^ ^^ ^^^        ^^^ ^^^^^^^^^    ^^ ^^ ^^^        ^^^
 
@@ -183,7 +183,7 @@ var a16: {
 >x : U
 >  : ^
 }
-var a17: {
+declare var a17: {
 >a17 : { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }
 >    : ^^^ ^^                     ^^^        ^^^ ^^                     ^^^        ^^^
 
@@ -200,7 +200,7 @@ var a17: {
 >  : ^^^^^^
 
 };
-var a18: {
+declare var a18: {
 >a18 : { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }
 >    : ^^^ ^^                                             ^^^     ^^^ ^^                                           ^^^     ^^^
 
@@ -232,7 +232,7 @@ var a18: {
     }): any[];
 }
 
-var b: <T>(x: T) => T[]; 
+declare var b: <T>(x: T) => T[]; 
 >b : <T>(x: T) => T[]
 >  : ^ ^^ ^^ ^^^^^   
 >x : T
@@ -254,7 +254,7 @@ b = a; // ok
 >a : (x: number) => number[]
 >  : ^ ^^      ^^^^^        
 
-var b2: <T>(x: T) => string[]; 
+declare var b2: <T>(x: T) => string[]; 
 >b2 : <T>(x: T) => string[]
 >   : ^ ^^ ^^ ^^^^^        
 >x : T
@@ -276,7 +276,7 @@ b2 = a2; // ok
 >a2 : (x: number) => string[]
 >   : ^ ^^      ^^^^^        
 
-var b3: <T>(x: T) => T; 
+declare var b3: <T>(x: T) => T; 
 >b3 : <T>(x: T) => T
 >   : ^ ^^ ^^ ^^^^^ 
 >x : T
@@ -298,7 +298,7 @@ b3 = a3; // ok
 >a3 : (x: number) => void
 >   : ^ ^^      ^^^^^    
 
-var b4: <T, U>(x: T, y: U) => T; 
+declare var b4: <T, U>(x: T, y: U) => T; 
 >b4 : <T, U>(x: T, y: U) => T
 >   : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
 >x : T
@@ -322,7 +322,7 @@ b4 = a4; // ok
 >a4 : (x: string, y: number) => string
 >   : ^ ^^      ^^ ^^      ^^^^^      
 
-var b5: <T, U>(x: (arg: T) => U) => T; 
+declare var b5: <T, U>(x: (arg: T) => U) => T; 
 >b5 : <T, U>(x: (arg: T) => U) => T
 >   : ^ ^^ ^^ ^^             ^^^^^ 
 >x : (arg: T) => U
@@ -346,7 +346,7 @@ b5 = a5; // ok
 >a5 : (x: (arg: string) => number) => string
 >   : ^ ^^                       ^^^^^      
 
-var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
+declare var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
 >b6 : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
 >   : ^ ^^^^^^^^^    ^^ ^^^^^^^^^       ^^ ^^             ^^^^^ 
 >x : (arg: T) => U
@@ -370,7 +370,7 @@ b6 = a6; // ok
 >a6 : (x: (arg: Base) => Derived) => Base
 >   : ^ ^^                      ^^^^^    
 
-var b7: <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
+declare var b7: <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
 >b7 : <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
 >   : ^ ^^^^^^^^^    ^^ ^^^^^^^^^       ^^ ^^             ^^^^^           
 >x : (arg: T) => U
@@ -396,7 +396,7 @@ b7 = a7; // ok
 >a7 : (x: (arg: Base) => Derived) => (r: Base) => Derived
 >   : ^ ^^                      ^^^^^                    
 
-var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
+declare var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
 >b8 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
 >   : ^ ^^^^^^^^^    ^^ ^^^^^^^^^       ^^ ^^             ^^ ^^              ^^^^^           
 >x : (arg: T) => U
@@ -426,7 +426,7 @@ b8 = a8; // ok
 >a8 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >   : ^ ^^                      ^^ ^^                       ^^^^^                    
 
-var b9: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
+declare var b9: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
 >b9 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => (r: T) => U
 >   : ^ ^^^^^^^^^    ^^ ^^^^^^^^^       ^^ ^^             ^^ ^^                                           ^^^^^           
 >x : (arg: T) => U
@@ -460,7 +460,7 @@ b9 = a9; // ok
 >a9 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >   : ^ ^^                      ^^ ^^                       ^^^^^                    
 
-var b10: <T extends Derived>(...x: T[]) => T; 
+declare var b10: <T extends Derived>(...x: T[]) => T; 
 >b10 : <T extends Derived>(...x: T[]) => T
 >    : ^ ^^^^^^^^^       ^^^^^ ^^   ^^^^^ 
 >x : T[]
@@ -482,7 +482,7 @@ b10 = a10; // ok
 >a10 : (...x: Derived[]) => Derived
 >    : ^^^^ ^^         ^^^^^       
 
-var b11: <T extends Base>(x: T, y: T) => T; 
+declare var b11: <T extends Base>(x: T, y: T) => T; 
 >b11 : <T extends Base>(x: T, y: T) => T
 >    : ^ ^^^^^^^^^    ^^ ^^ ^^ ^^ ^^^^^ 
 >x : T
@@ -506,7 +506,7 @@ b11 = a11; // ok
 >a11 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >    : ^ ^^                ^^ ^^                             ^^^^^    
 
-var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
+declare var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
 >b12 : <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>
 >    : ^ ^^^^^^^^^           ^^ ^^           ^^ ^^ ^^^^^              
 >x : Base[]
@@ -530,7 +530,7 @@ b12 = a12; // ok
 >a12 : (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >    : ^ ^^           ^^ ^^               ^^^^^              
 
-var b13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
+declare var b13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
 >b13 : <T extends Array<Derived>>(x: Array<Base>, y: T) => T
 >    : ^ ^^^^^^^^^              ^^ ^^           ^^ ^^ ^^^^^ 
 >x : Base[]
@@ -554,7 +554,7 @@ b13 = a13; // ok
 >a13 : (x: Array<Base>, y: Array<Derived>) => Array<Derived>
 >    : ^ ^^           ^^ ^^              ^^^^^              
 
-var b14: <T>(x: { a: T; b: T }) => T; 
+declare var b14: <T>(x: { a: T; b: T }) => T; 
 >b14 : <T>(x: { a: T; b: T; }) => T
 >    : ^ ^^ ^^               ^^^^^ 
 >x : { a: T; b: T; }
@@ -580,7 +580,7 @@ b14 = a14; // ok
 >a14 : (x: { a: string; b: number; }) => Object
 >    : ^ ^^                         ^^^^^      
 
-var b15: <T>(x: T) => T[]; 
+declare var b15: <T>(x: T) => T[]; 
 >b15 : <T>(x: T) => T[]
 >    : ^ ^^ ^^ ^^^^^   
 >x : T
@@ -602,7 +602,7 @@ b15 = a15; // ok
 >a15 : { (x: number): number[]; (x: string): string[]; }
 >    : ^^^ ^^      ^^^        ^^^ ^^      ^^^        ^^^
 
-var b16: <T extends Base>(x: T) => number[];
+declare var b16: <T extends Base>(x: T) => number[];
 >b16 : <T extends Base>(x: T) => number[]
 >    : ^ ^^^^^^^^^    ^^ ^^ ^^^^^        
 >x : T
@@ -624,7 +624,7 @@ b16 = a16; // ok
 >a16 : { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }
 >    : ^^^ ^^^^^^^^^       ^^ ^^ ^^^        ^^^ ^^^^^^^^^    ^^ ^^ ^^^        ^^^
 
-var b17: <T>(x: (a: T) => T) => T[]; // ok
+declare var b17: <T>(x: (a: T) => T) => T[]; // ok
 >b17 : <T>(x: (a: T) => T) => T[]
 >    : ^ ^^ ^^           ^^^^^   
 >x : (a: T) => T
@@ -648,7 +648,7 @@ b17 = a17; // ok
 >a17 : { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }
 >    : ^^^ ^^                     ^^^        ^^^ ^^                     ^^^        ^^^
 
-var b18: <T>(x: (a: T) => T) => T[]; 
+declare var b18: <T>(x: (a: T) => T) => T[]; 
 >b18 : <T>(x: (a: T) => T) => T[]
 >    : ^ ^^ ^^           ^^^^^   
 >x : (a: T) => T
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures4.errors.txt
index 47b298347b0c1..20203d4160ab4 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.errors.txt
@@ -74,18 +74,18 @@ assignmentCompatWithCallSignatures4.ts(96,9): error TS2322: Type '<T>(x: T) => s
     
         namespace WithNonGenericSignaturesInBaseType {
             // target type with non-generic call signatures
-            var a2: (x: number) => string[];
-            var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived2;
-            var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-            var a10: (...x: Base[]) => Base;
-            var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
-            var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
-            var a14: {
+            declare var a2: (x: number) => string[];
+            declare var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived2;
+            declare var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+            declare var a10: (...x: Base[]) => Base;
+            declare var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+            declare var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+            declare var a14: {
                     (x: number): number[];
                     (x: string): string[];
                 };
-            var a15: (x: { a: string; b: number }) => number;
-            var a16: {
+            declare var a15: (x: { a: string; b: number }) => number;
+            declare var a16: {
                     (x: {
                         (a: number): number;
                         (a?: number): number;
@@ -95,7 +95,7 @@ assignmentCompatWithCallSignatures4.ts(96,9): error TS2322: Type '<T>(x: T) => s
                         (a?: boolean): boolean;
                     }): boolean[];
                 };
-            var a17: {
+            declare var a17: {
                     (x: {
                         <T extends Derived>(a: T): T;
                         <T extends Base>(a: T): T;
@@ -106,16 +106,16 @@ assignmentCompatWithCallSignatures4.ts(96,9): error TS2322: Type '<T>(x: T) => s
                     }): any[];
                 };
     
-            var b2: <T, U>(x: T) => U[]; 
+            declare var b2: <T, U>(x: T) => U[]; 
             a2 = b2;
             b2 = a2;
             ~~
 !!! error TS2322: Type '(x: number) => string[]' is not assignable to type '<T, U>(x: T) => U[]'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type 'number'.
-!!! related TS2208 assignmentCompatWithCallSignatures4.ts:43:18: This type parameter might need an `extends number` constraint.
+!!! related TS2208 assignmentCompatWithCallSignatures4.ts:43:26: This type parameter might need an `extends number` constraint.
     
-            var b7: <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
+            declare var b7: <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
             a7 = b7;
             b7 = a7;
             ~~
@@ -125,7 +125,7 @@ assignmentCompatWithCallSignatures4.ts(96,9): error TS2322: Type '<T>(x: T) => s
 !!! error TS2322:       Type 'Base' is not assignable to type 'T'.
 !!! error TS2322:         'Base' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Base'.
     
-            var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
+            declare var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
             a8 = b8; // error, { foo: number } and Base are incompatible
             ~~
 !!! error TS2322: Type '<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U' is not assignable to type '(x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived'.
@@ -143,7 +143,7 @@ assignmentCompatWithCallSignatures4.ts(96,9): error TS2322: Type '<T>(x: T) => s
 !!! error TS2322:         'Base' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Base'.
     
             
-            var b10: <T extends Derived>(...x: T[]) => T; 
+            declare var b10: <T extends Derived>(...x: T[]) => T; 
             a10 = b10;
             b10 = a10;
             ~~~
@@ -151,7 +151,7 @@ assignmentCompatWithCallSignatures4.ts(96,9): error TS2322: Type '<T>(x: T) => s
 !!! error TS2322:   Type 'Base' is not assignable to type 'T'.
 !!! error TS2322:     'T' could be instantiated with an arbitrary type which could be unrelated to 'Base'.
     
-            var b11: <T extends Derived>(x: T, y: T) => T; 
+            declare var b11: <T extends Derived>(x: T, y: T) => T; 
             a11 = b11;
             b11 = a11;
             ~~~
@@ -159,7 +159,7 @@ assignmentCompatWithCallSignatures4.ts(96,9): error TS2322: Type '<T>(x: T) => s
 !!! error TS2322:   Type 'Base' is not assignable to type 'T'.
 !!! error TS2322:     'T' could be instantiated with an arbitrary type which could be unrelated to 'Base'.
     
-            var b12: <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
+            declare var b12: <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
             a12 = b12;
             b12 = a12;
             ~~~
@@ -167,7 +167,7 @@ assignmentCompatWithCallSignatures4.ts(96,9): error TS2322: Type '<T>(x: T) => s
 !!! error TS2322:   Type 'Derived[]' is not assignable to type 'T'.
 !!! error TS2322:     'T' could be instantiated with an arbitrary type which could be unrelated to 'Derived[]'.
     
-            var b15: <T>(x: { a: T; b: T }) => T; 
+            declare var b15: <T>(x: { a: T; b: T }) => T; 
             a15 = b15;
             ~~~
 !!! error TS2322: Type '<T>(x: { a: T; b: T; }) => T' is not assignable to type '(x: { a: string; b: number; }) => number'.
@@ -182,9 +182,9 @@ assignmentCompatWithCallSignatures4.ts(96,9): error TS2322: Type '<T>(x: T) => s
 !!! error TS2322:     Type '{ a: T; b: T; }' is not assignable to type '{ a: string; b: number; }'.
 !!! error TS2322:       Types of property 'a' are incompatible.
 !!! error TS2322:         Type 'T' is not assignable to type 'string'.
-!!! related TS2208 assignmentCompatWithCallSignatures4.ts:68:19: This type parameter might need an `extends string` constraint.
+!!! related TS2208 assignmentCompatWithCallSignatures4.ts:68:27: This type parameter might need an `extends string` constraint.
     
-            var b15a: <T extends Base>(x: { a: T; b: T }) => number; 
+            declare var b15a: <T extends Base>(x: { a: T; b: T }) => number; 
             a15 = b15a;
             ~~~
 !!! error TS2322: Type '<T extends Base>(x: { a: T; b: T; }) => number' is not assignable to type '(x: { a: string; b: number; }) => number'.
@@ -201,19 +201,19 @@ assignmentCompatWithCallSignatures4.ts(96,9): error TS2322: Type '<T>(x: T) => s
 !!! error TS2322:         Type 'T' is not assignable to type 'string'.
 !!! error TS2322:           Type 'Base' is not assignable to type 'string'.
     
-            var b16: <T>(x: (a: T) => T) => T[];
+            declare var b16: <T>(x: (a: T) => T) => T[];
             a16 = b16;
             b16 = a16;
     
-            var b17: <T>(x: (a: T) => T) => any[];
+            declare var b17: <T>(x: (a: T) => T) => any[];
             a17 = b17;
             b17 = a17;
         }
     
         namespace WithGenericSignaturesInBaseType {
             // target type has generic call signature
-            var a2: <T>(x: T) => T[];
-            var b2: <T>(x: T) => string[];
+            declare var a2: <T>(x: T) => T[];
+            declare var b2: <T>(x: T) => string[];
             a2 = b2;
             ~~
 !!! error TS2322: Type '<T>(x: T) => string[]' is not assignable to type '<T>(x: T) => T[]'.
@@ -225,17 +225,17 @@ assignmentCompatWithCallSignatures4.ts(96,9): error TS2322: Type '<T>(x: T) => s
 !!! error TS2322: Type '<T>(x: T) => T[]' is not assignable to type '<T>(x: T) => string[]'.
 !!! error TS2322:   Type 'T[]' is not assignable to type 'string[]'.
 !!! error TS2322:     Type 'T' is not assignable to type 'string'.
-!!! related TS2208 assignmentCompatWithCallSignatures4.ts:88:18: This type parameter might need an `extends string` constraint.
+!!! related TS2208 assignmentCompatWithCallSignatures4.ts:88:26: This type parameter might need an `extends string` constraint.
     
             // target type has generic call signature
-            var a3: <T>(x: T) => string[];
-            var b3: <T>(x: T) => T[]; 
+            declare var a3: <T>(x: T) => string[];
+            declare var b3: <T>(x: T) => T[]; 
             a3 = b3;
             ~~
 !!! error TS2322: Type '<T>(x: T) => T[]' is not assignable to type '<T>(x: T) => string[]'.
 !!! error TS2322:   Type 'T[]' is not assignable to type 'string[]'.
 !!! error TS2322:     Type 'T' is not assignable to type 'string'.
-!!! related TS2208 assignmentCompatWithCallSignatures4.ts:93:18: This type parameter might need an `extends string` constraint.
+!!! related TS2208 assignmentCompatWithCallSignatures4.ts:93:26: This type parameter might need an `extends string` constraint.
             b3 = a3;
             ~~
 !!! error TS2322: Type '<T>(x: T) => string[]' is not assignable to type '<T>(x: T) => T[]'.
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
index 90fd3cc7e6ae4..7be077910bbdb 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
@@ -11,18 +11,18 @@ namespace Errors {
 
     namespace WithNonGenericSignaturesInBaseType {
         // target type with non-generic call signatures
-        var a2: (x: number) => string[];
-        var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived2;
-        var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-        var a10: (...x: Base[]) => Base;
-        var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
-        var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
-        var a14: {
+        declare var a2: (x: number) => string[];
+        declare var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived2;
+        declare var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+        declare var a10: (...x: Base[]) => Base;
+        declare var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+        declare var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+        declare var a14: {
                 (x: number): number[];
                 (x: string): string[];
             };
-        var a15: (x: { a: string; b: number }) => number;
-        var a16: {
+        declare var a15: (x: { a: string; b: number }) => number;
+        declare var a16: {
                 (x: {
                     (a: number): number;
                     (a?: number): number;
@@ -32,7 +32,7 @@ namespace Errors {
                     (a?: boolean): boolean;
                 }): boolean[];
             };
-        var a17: {
+        declare var a17: {
                 (x: {
                     <T extends Derived>(a: T): T;
                     <T extends Base>(a: T): T;
@@ -43,58 +43,58 @@ namespace Errors {
                 }): any[];
             };
 
-        var b2: <T, U>(x: T) => U[]; 
+        declare var b2: <T, U>(x: T) => U[]; 
         a2 = b2;
         b2 = a2;
 
-        var b7: <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
+        declare var b7: <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
         a7 = b7;
         b7 = a7;
 
-        var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
+        declare var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
         a8 = b8; // error, { foo: number } and Base are incompatible
         b8 = a8; // error, { foo: number } and Base are incompatible
 
         
-        var b10: <T extends Derived>(...x: T[]) => T; 
+        declare var b10: <T extends Derived>(...x: T[]) => T; 
         a10 = b10;
         b10 = a10;
 
-        var b11: <T extends Derived>(x: T, y: T) => T; 
+        declare var b11: <T extends Derived>(x: T, y: T) => T; 
         a11 = b11;
         b11 = a11;
 
-        var b12: <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
+        declare var b12: <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
         a12 = b12;
         b12 = a12;
 
-        var b15: <T>(x: { a: T; b: T }) => T; 
+        declare var b15: <T>(x: { a: T; b: T }) => T; 
         a15 = b15;
         b15 = a15;
 
-        var b15a: <T extends Base>(x: { a: T; b: T }) => number; 
+        declare var b15a: <T extends Base>(x: { a: T; b: T }) => number; 
         a15 = b15a;
         b15a = a15;
 
-        var b16: <T>(x: (a: T) => T) => T[];
+        declare var b16: <T>(x: (a: T) => T) => T[];
         a16 = b16;
         b16 = a16;
 
-        var b17: <T>(x: (a: T) => T) => any[];
+        declare var b17: <T>(x: (a: T) => T) => any[];
         a17 = b17;
         b17 = a17;
     }
 
     namespace WithGenericSignaturesInBaseType {
         // target type has generic call signature
-        var a2: <T>(x: T) => T[];
-        var b2: <T>(x: T) => string[];
+        declare var a2: <T>(x: T) => T[];
+        declare var b2: <T>(x: T) => string[];
         a2 = b2;
         b2 = a2;
 
         // target type has generic call signature
-        var a3: <T>(x: T) => string[];
-        var b3: <T>(x: T) => T[]; 
+        declare var a3: <T>(x: T) => string[];
+        declare var b3: <T>(x: T) => T[]; 
         a3 = b3;
         b3 = a3;
     }
@@ -147,58 +147,31 @@ var Errors;
     }(Base));
     var WithNonGenericSignaturesInBaseType;
     (function (WithNonGenericSignaturesInBaseType) {
-        // target type with non-generic call signatures
-        var a2;
-        var a7;
-        var a8;
-        var a10;
-        var a11;
-        var a12;
-        var a14;
-        var a15;
-        var a16;
-        var a17;
-        var b2;
         a2 = b2;
         b2 = a2;
-        var b7;
         a7 = b7;
         b7 = a7;
-        var b8;
         a8 = b8; // error, { foo: number } and Base are incompatible
         b8 = a8; // error, { foo: number } and Base are incompatible
-        var b10;
         a10 = b10;
         b10 = a10;
-        var b11;
         a11 = b11;
         b11 = a11;
-        var b12;
         a12 = b12;
         b12 = a12;
-        var b15;
         a15 = b15;
         b15 = a15;
-        var b15a;
         a15 = b15a;
         b15a = a15;
-        var b16;
         a16 = b16;
         b16 = a16;
-        var b17;
         a17 = b17;
         b17 = a17;
     })(WithNonGenericSignaturesInBaseType || (WithNonGenericSignaturesInBaseType = {}));
     var WithGenericSignaturesInBaseType;
     (function (WithGenericSignaturesInBaseType) {
-        // target type has generic call signature
-        var a2;
-        var b2;
         a2 = b2;
         b2 = a2;
-        // target type has generic call signature
-        var a3;
-        var b3;
         a3 = b3;
         b3 = a3;
     })(WithGenericSignaturesInBaseType || (WithGenericSignaturesInBaseType = {}));
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.symbols b/tests/baselines/reference/assignmentCompatWithCallSignatures4.symbols
index 3048b50967426..027674a0350df 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.symbols
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.symbols
@@ -29,62 +29,62 @@ namespace Errors {
 >WithNonGenericSignaturesInBaseType : Symbol(WithNonGenericSignaturesInBaseType, Decl(assignmentCompatWithCallSignatures4.ts, 6, 53))
 
         // target type with non-generic call signatures
-        var a2: (x: number) => string[];
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures4.ts, 10, 11))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 10, 17))
-
-        var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived2;
->a7 : Symbol(a7, Decl(assignmentCompatWithCallSignatures4.ts, 11, 11))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 11, 17))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures4.ts, 11, 21))
+        declare var a2: (x: number) => string[];
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures4.ts, 10, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 10, 25))
+
+        declare var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived2;
+>a7 : Symbol(a7, Decl(assignmentCompatWithCallSignatures4.ts, 11, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 11, 25))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures4.ts, 11, 29))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31))
->r : Symbol(r, Decl(assignmentCompatWithCallSignatures4.ts, 11, 48))
+>r : Symbol(r, Decl(assignmentCompatWithCallSignatures4.ts, 11, 56))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithCallSignatures4.ts, 4, 47))
 
-        var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a8 : Symbol(a8, Decl(assignmentCompatWithCallSignatures4.ts, 12, 11))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 12, 17))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures4.ts, 12, 21))
+        declare var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+>a8 : Symbol(a8, Decl(assignmentCompatWithCallSignatures4.ts, 12, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 12, 25))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures4.ts, 12, 29))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 12, 43))
->arg2 : Symbol(arg2, Decl(assignmentCompatWithCallSignatures4.ts, 12, 48))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 12, 51))
+>arg2 : Symbol(arg2, Decl(assignmentCompatWithCallSignatures4.ts, 12, 56))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31))
->r : Symbol(r, Decl(assignmentCompatWithCallSignatures4.ts, 12, 76))
+>r : Symbol(r, Decl(assignmentCompatWithCallSignatures4.ts, 12, 84))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31))
 
-        var a10: (...x: Base[]) => Base;
->a10 : Symbol(a10, Decl(assignmentCompatWithCallSignatures4.ts, 13, 11))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 13, 18))
+        declare var a10: (...x: Base[]) => Base;
+>a10 : Symbol(a10, Decl(assignmentCompatWithCallSignatures4.ts, 13, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 13, 26))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18))
 
-        var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
->a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures4.ts, 14, 11))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 14, 18))
->foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures4.ts, 14, 22))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 14, 37))
->foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures4.ts, 14, 42))
->bar : Symbol(bar, Decl(assignmentCompatWithCallSignatures4.ts, 14, 55))
+        declare var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+>a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures4.ts, 14, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 14, 26))
+>foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures4.ts, 14, 30))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 14, 45))
+>foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures4.ts, 14, 50))
+>bar : Symbol(bar, Decl(assignmentCompatWithCallSignatures4.ts, 14, 63))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18))
 
-        var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
->a12 : Symbol(a12, Decl(assignmentCompatWithCallSignatures4.ts, 15, 11))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 15, 18))
+        declare var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+>a12 : Symbol(a12, Decl(assignmentCompatWithCallSignatures4.ts, 15, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 15, 26))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 15, 33))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 15, 41))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithCallSignatures4.ts, 4, 47))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31))
 
-        var a14: {
->a14 : Symbol(a14, Decl(assignmentCompatWithCallSignatures4.ts, 16, 11))
+        declare var a14: {
+>a14 : Symbol(a14, Decl(assignmentCompatWithCallSignatures4.ts, 16, 19))
 
                 (x: number): number[];
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 17, 17))
@@ -93,14 +93,14 @@ namespace Errors {
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 18, 17))
 
             };
-        var a15: (x: { a: string; b: number }) => number;
->a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures4.ts, 20, 11))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 20, 18))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures4.ts, 20, 22))
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures4.ts, 20, 33))
+        declare var a15: (x: { a: string; b: number }) => number;
+>a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures4.ts, 20, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 20, 26))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures4.ts, 20, 30))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures4.ts, 20, 41))
 
-        var a16: {
->a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures4.ts, 21, 11))
+        declare var a16: {
+>a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures4.ts, 21, 19))
 
                 (x: {
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 22, 17))
@@ -123,8 +123,8 @@ namespace Errors {
 
                 }): boolean[];
             };
-        var a17: {
->a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures4.ts, 31, 11))
+        declare var a17: {
+>a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures4.ts, 31, 19))
 
                 (x: {
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 32, 17))
@@ -164,243 +164,243 @@ namespace Errors {
                 }): any[];
             };
 
-        var b2: <T, U>(x: T) => U[]; 
->b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures4.ts, 42, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 42, 17))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 42, 19))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 42, 23))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 42, 17))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 42, 19))
+        declare var b2: <T, U>(x: T) => U[]; 
+>b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures4.ts, 42, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 42, 25))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 42, 27))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 42, 31))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 42, 25))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 42, 27))
 
         a2 = b2;
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures4.ts, 10, 11))
->b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures4.ts, 42, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures4.ts, 10, 19))
+>b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures4.ts, 42, 19))
 
         b2 = a2;
->b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures4.ts, 42, 11))
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures4.ts, 10, 11))
+>b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures4.ts, 42, 19))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures4.ts, 10, 19))
 
-        var b7: <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
->b7 : Symbol(b7, Decl(assignmentCompatWithCallSignatures4.ts, 46, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 46, 17))
+        declare var b7: <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
+>b7 : Symbol(b7, Decl(assignmentCompatWithCallSignatures4.ts, 46, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 46, 25))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 46, 32))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 46, 40))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31))
->V : Symbol(V, Decl(assignmentCompatWithCallSignatures4.ts, 46, 51))
+>V : Symbol(V, Decl(assignmentCompatWithCallSignatures4.ts, 46, 59))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithCallSignatures4.ts, 4, 47))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 46, 72))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures4.ts, 46, 76))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 46, 17))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 46, 32))
->r : Symbol(r, Decl(assignmentCompatWithCallSignatures4.ts, 46, 94))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 46, 17))
->V : Symbol(V, Decl(assignmentCompatWithCallSignatures4.ts, 46, 51))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 46, 80))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures4.ts, 46, 84))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 46, 25))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 46, 40))
+>r : Symbol(r, Decl(assignmentCompatWithCallSignatures4.ts, 46, 102))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 46, 25))
+>V : Symbol(V, Decl(assignmentCompatWithCallSignatures4.ts, 46, 59))
 
         a7 = b7;
->a7 : Symbol(a7, Decl(assignmentCompatWithCallSignatures4.ts, 11, 11))
->b7 : Symbol(b7, Decl(assignmentCompatWithCallSignatures4.ts, 46, 11))
+>a7 : Symbol(a7, Decl(assignmentCompatWithCallSignatures4.ts, 11, 19))
+>b7 : Symbol(b7, Decl(assignmentCompatWithCallSignatures4.ts, 46, 19))
 
         b7 = a7;
->b7 : Symbol(b7, Decl(assignmentCompatWithCallSignatures4.ts, 46, 11))
->a7 : Symbol(a7, Decl(assignmentCompatWithCallSignatures4.ts, 11, 11))
+>b7 : Symbol(b7, Decl(assignmentCompatWithCallSignatures4.ts, 46, 19))
+>a7 : Symbol(a7, Decl(assignmentCompatWithCallSignatures4.ts, 11, 19))
 
-        var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
->b8 : Symbol(b8, Decl(assignmentCompatWithCallSignatures4.ts, 50, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 50, 17))
+        declare var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
+>b8 : Symbol(b8, Decl(assignmentCompatWithCallSignatures4.ts, 50, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 50, 25))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 50, 32))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 50, 40))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 50, 52))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures4.ts, 50, 56))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 50, 17))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 50, 32))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 50, 69))
->arg2 : Symbol(arg2, Decl(assignmentCompatWithCallSignatures4.ts, 50, 74))
->foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures4.ts, 50, 81))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 50, 32))
->r : Symbol(r, Decl(assignmentCompatWithCallSignatures4.ts, 50, 108))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 50, 17))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 50, 32))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 50, 60))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures4.ts, 50, 64))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 50, 25))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 50, 40))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 50, 77))
+>arg2 : Symbol(arg2, Decl(assignmentCompatWithCallSignatures4.ts, 50, 82))
+>foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures4.ts, 50, 89))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 50, 40))
+>r : Symbol(r, Decl(assignmentCompatWithCallSignatures4.ts, 50, 116))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 50, 25))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 50, 40))
 
         a8 = b8; // error, { foo: number } and Base are incompatible
->a8 : Symbol(a8, Decl(assignmentCompatWithCallSignatures4.ts, 12, 11))
->b8 : Symbol(b8, Decl(assignmentCompatWithCallSignatures4.ts, 50, 11))
+>a8 : Symbol(a8, Decl(assignmentCompatWithCallSignatures4.ts, 12, 19))
+>b8 : Symbol(b8, Decl(assignmentCompatWithCallSignatures4.ts, 50, 19))
 
         b8 = a8; // error, { foo: number } and Base are incompatible
->b8 : Symbol(b8, Decl(assignmentCompatWithCallSignatures4.ts, 50, 11))
->a8 : Symbol(a8, Decl(assignmentCompatWithCallSignatures4.ts, 12, 11))
+>b8 : Symbol(b8, Decl(assignmentCompatWithCallSignatures4.ts, 50, 19))
+>a8 : Symbol(a8, Decl(assignmentCompatWithCallSignatures4.ts, 12, 19))
 
         
-        var b10: <T extends Derived>(...x: T[]) => T; 
->b10 : Symbol(b10, Decl(assignmentCompatWithCallSignatures4.ts, 55, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 55, 18))
+        declare var b10: <T extends Derived>(...x: T[]) => T; 
+>b10 : Symbol(b10, Decl(assignmentCompatWithCallSignatures4.ts, 55, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 55, 26))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 55, 37))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 55, 18))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 55, 18))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 55, 45))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 55, 26))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 55, 26))
 
         a10 = b10;
->a10 : Symbol(a10, Decl(assignmentCompatWithCallSignatures4.ts, 13, 11))
->b10 : Symbol(b10, Decl(assignmentCompatWithCallSignatures4.ts, 55, 11))
+>a10 : Symbol(a10, Decl(assignmentCompatWithCallSignatures4.ts, 13, 19))
+>b10 : Symbol(b10, Decl(assignmentCompatWithCallSignatures4.ts, 55, 19))
 
         b10 = a10;
->b10 : Symbol(b10, Decl(assignmentCompatWithCallSignatures4.ts, 55, 11))
->a10 : Symbol(a10, Decl(assignmentCompatWithCallSignatures4.ts, 13, 11))
+>b10 : Symbol(b10, Decl(assignmentCompatWithCallSignatures4.ts, 55, 19))
+>a10 : Symbol(a10, Decl(assignmentCompatWithCallSignatures4.ts, 13, 19))
 
-        var b11: <T extends Derived>(x: T, y: T) => T; 
->b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures4.ts, 59, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 59, 18))
+        declare var b11: <T extends Derived>(x: T, y: T) => T; 
+>b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures4.ts, 59, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 59, 26))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 59, 37))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 59, 18))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 59, 42))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 59, 18))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 59, 18))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 59, 45))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 59, 26))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 59, 50))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 59, 26))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 59, 26))
 
         a11 = b11;
->a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures4.ts, 14, 11))
->b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures4.ts, 59, 11))
+>a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures4.ts, 14, 19))
+>b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures4.ts, 59, 19))
 
         b11 = a11;
->b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures4.ts, 59, 11))
->a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures4.ts, 14, 11))
+>b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures4.ts, 59, 19))
+>a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures4.ts, 14, 19))
 
-        var b12: <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
->b12 : Symbol(b12, Decl(assignmentCompatWithCallSignatures4.ts, 63, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 63, 18))
+        declare var b12: <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
+>b12 : Symbol(b12, Decl(assignmentCompatWithCallSignatures4.ts, 63, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 63, 26))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithCallSignatures4.ts, 4, 47))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 63, 45))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 63, 53))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 63, 60))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 63, 68))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 63, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 63, 26))
 
         a12 = b12;
->a12 : Symbol(a12, Decl(assignmentCompatWithCallSignatures4.ts, 15, 11))
->b12 : Symbol(b12, Decl(assignmentCompatWithCallSignatures4.ts, 63, 11))
+>a12 : Symbol(a12, Decl(assignmentCompatWithCallSignatures4.ts, 15, 19))
+>b12 : Symbol(b12, Decl(assignmentCompatWithCallSignatures4.ts, 63, 19))
 
         b12 = a12;
->b12 : Symbol(b12, Decl(assignmentCompatWithCallSignatures4.ts, 63, 11))
->a12 : Symbol(a12, Decl(assignmentCompatWithCallSignatures4.ts, 15, 11))
-
-        var b15: <T>(x: { a: T; b: T }) => T; 
->b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures4.ts, 67, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 67, 18))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 67, 21))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures4.ts, 67, 25))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 67, 18))
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures4.ts, 67, 31))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 67, 18))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 67, 18))
+>b12 : Symbol(b12, Decl(assignmentCompatWithCallSignatures4.ts, 63, 19))
+>a12 : Symbol(a12, Decl(assignmentCompatWithCallSignatures4.ts, 15, 19))
+
+        declare var b15: <T>(x: { a: T; b: T }) => T; 
+>b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures4.ts, 67, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 67, 26))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 67, 29))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures4.ts, 67, 33))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 67, 26))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures4.ts, 67, 39))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 67, 26))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 67, 26))
 
         a15 = b15;
->a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures4.ts, 20, 11))
->b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures4.ts, 67, 11))
+>a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures4.ts, 20, 19))
+>b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures4.ts, 67, 19))
 
         b15 = a15;
->b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures4.ts, 67, 11))
->a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures4.ts, 20, 11))
+>b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures4.ts, 67, 19))
+>a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures4.ts, 20, 19))
 
-        var b15a: <T extends Base>(x: { a: T; b: T }) => number; 
->b15a : Symbol(b15a, Decl(assignmentCompatWithCallSignatures4.ts, 71, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 71, 19))
+        declare var b15a: <T extends Base>(x: { a: T; b: T }) => number; 
+>b15a : Symbol(b15a, Decl(assignmentCompatWithCallSignatures4.ts, 71, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 71, 27))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 71, 35))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures4.ts, 71, 39))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 71, 19))
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures4.ts, 71, 45))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 71, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 71, 43))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures4.ts, 71, 47))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 71, 27))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures4.ts, 71, 53))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 71, 27))
 
         a15 = b15a;
->a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures4.ts, 20, 11))
->b15a : Symbol(b15a, Decl(assignmentCompatWithCallSignatures4.ts, 71, 11))
+>a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures4.ts, 20, 19))
+>b15a : Symbol(b15a, Decl(assignmentCompatWithCallSignatures4.ts, 71, 19))
 
         b15a = a15;
->b15a : Symbol(b15a, Decl(assignmentCompatWithCallSignatures4.ts, 71, 11))
->a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures4.ts, 20, 11))
-
-        var b16: <T>(x: (a: T) => T) => T[];
->b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures4.ts, 75, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 75, 18))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 75, 21))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures4.ts, 75, 25))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 75, 18))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 75, 18))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 75, 18))
+>b15a : Symbol(b15a, Decl(assignmentCompatWithCallSignatures4.ts, 71, 19))
+>a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures4.ts, 20, 19))
+
+        declare var b16: <T>(x: (a: T) => T) => T[];
+>b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures4.ts, 75, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 75, 26))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 75, 29))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures4.ts, 75, 33))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 75, 26))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 75, 26))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 75, 26))
 
         a16 = b16;
->a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures4.ts, 21, 11))
->b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures4.ts, 75, 11))
+>a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures4.ts, 21, 19))
+>b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures4.ts, 75, 19))
 
         b16 = a16;
->b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures4.ts, 75, 11))
->a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures4.ts, 21, 11))
+>b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures4.ts, 75, 19))
+>a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures4.ts, 21, 19))
 
-        var b17: <T>(x: (a: T) => T) => any[];
->b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures4.ts, 79, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 79, 18))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 79, 21))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures4.ts, 79, 25))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 79, 18))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 79, 18))
+        declare var b17: <T>(x: (a: T) => T) => any[];
+>b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures4.ts, 79, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 79, 26))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 79, 29))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures4.ts, 79, 33))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 79, 26))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 79, 26))
 
         a17 = b17;
->a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures4.ts, 31, 11))
->b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures4.ts, 79, 11))
+>a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures4.ts, 31, 19))
+>b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures4.ts, 79, 19))
 
         b17 = a17;
->b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures4.ts, 79, 11))
->a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures4.ts, 31, 11))
+>b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures4.ts, 79, 19))
+>a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures4.ts, 31, 19))
     }
 
     namespace WithGenericSignaturesInBaseType {
 >WithGenericSignaturesInBaseType : Symbol(WithGenericSignaturesInBaseType, Decl(assignmentCompatWithCallSignatures4.ts, 82, 5))
 
         // target type has generic call signature
-        var a2: <T>(x: T) => T[];
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures4.ts, 86, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 86, 17))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 86, 20))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 86, 17))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 86, 17))
-
-        var b2: <T>(x: T) => string[];
->b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures4.ts, 87, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 87, 17))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 87, 20))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 87, 17))
+        declare var a2: <T>(x: T) => T[];
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures4.ts, 86, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 86, 25))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 86, 28))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 86, 25))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 86, 25))
+
+        declare var b2: <T>(x: T) => string[];
+>b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures4.ts, 87, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 87, 25))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 87, 28))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 87, 25))
 
         a2 = b2;
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures4.ts, 86, 11))
->b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures4.ts, 87, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures4.ts, 86, 19))
+>b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures4.ts, 87, 19))
 
         b2 = a2;
->b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures4.ts, 87, 11))
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures4.ts, 86, 11))
+>b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures4.ts, 87, 19))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures4.ts, 86, 19))
 
         // target type has generic call signature
-        var a3: <T>(x: T) => string[];
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures4.ts, 92, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 92, 17))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 92, 20))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 92, 17))
-
-        var b3: <T>(x: T) => T[]; 
->b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures4.ts, 93, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 93, 17))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 93, 20))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 93, 17))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 93, 17))
+        declare var a3: <T>(x: T) => string[];
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures4.ts, 92, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 92, 25))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 92, 28))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 92, 25))
+
+        declare var b3: <T>(x: T) => T[]; 
+>b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures4.ts, 93, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 93, 25))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 93, 28))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 93, 25))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 93, 25))
 
         a3 = b3;
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures4.ts, 92, 11))
->b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures4.ts, 93, 11))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures4.ts, 92, 19))
+>b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures4.ts, 93, 19))
 
         b3 = a3;
->b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures4.ts, 93, 11))
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures4.ts, 92, 11))
+>b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures4.ts, 93, 19))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures4.ts, 92, 19))
     }
 }
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.types b/tests/baselines/reference/assignmentCompatWithCallSignatures4.types
index 1e00fbdafbe72..95ef2a827ac37 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.types
@@ -42,13 +42,13 @@ namespace Errors {
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         // target type with non-generic call signatures
-        var a2: (x: number) => string[];
+        declare var a2: (x: number) => string[];
 >a2 : (x: number) => string[]
 >   : ^ ^^      ^^^^^        
 >x : number
 >  : ^^^^^^
 
-        var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived2;
+        declare var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived2;
 >a7 : (x: (arg: Base) => Derived) => (r: Base) => Derived2
 >   : ^ ^^                      ^^^^^                     
 >x : (arg: Base) => Derived
@@ -58,7 +58,7 @@ namespace Errors {
 >r : Base
 >  : ^^^^
 
-        var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+        declare var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a8 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >   : ^ ^^                      ^^ ^^                       ^^^^^                    
 >x : (arg: Base) => Derived
@@ -72,13 +72,13 @@ namespace Errors {
 >r : Base
 >  : ^^^^
 
-        var a10: (...x: Base[]) => Base;
+        declare var a10: (...x: Base[]) => Base;
 >a10 : (...x: Base[]) => Base
 >    : ^^^^ ^^      ^^^^^    
 >x : Base[]
 >  : ^^^^^^
 
-        var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+        declare var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >a11 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >    : ^ ^^                ^^ ^^                             ^^^^^    
 >x : { foo: string; }
@@ -92,7 +92,7 @@ namespace Errors {
 >bar : string
 >    : ^^^^^^
 
-        var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+        declare var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >    : ^ ^^           ^^ ^^               ^^^^^              
 >x : Base[]
@@ -100,7 +100,7 @@ namespace Errors {
 >y : Derived2[]
 >  : ^^^^^^^^^^
 
-        var a14: {
+        declare var a14: {
 >a14 : { (x: number): number[]; (x: string): string[]; }
 >    : ^^^ ^^      ^^^        ^^^ ^^      ^^^        ^^^
 
@@ -113,7 +113,7 @@ namespace Errors {
 >  : ^^^^^^
 
             };
-        var a15: (x: { a: string; b: number }) => number;
+        declare var a15: (x: { a: string; b: number }) => number;
 >a15 : (x: { a: string; b: number; }) => number
 >    : ^ ^^                         ^^^^^      
 >x : { a: string; b: number; }
@@ -123,7 +123,7 @@ namespace Errors {
 >b : number
 >  : ^^^^^^
 
-        var a16: {
+        declare var a16: {
 >a16 : { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }
 >    : ^^^ ^^                                              ^^^        ^^^ ^^                                                  ^^^         ^^^
 
@@ -154,7 +154,7 @@ namespace Errors {
 
                 }): boolean[];
             };
-        var a17: {
+        declare var a17: {
 >a17 : { (x: { <T extends Derived>(a: T): T; <T extends Base>(a: T): T; }): any[]; (x: { <T extends Derived2>(a: T): T; <T extends Base>(a: T): T; }): any[]; }
 >    : ^^^ ^^                                                            ^^^     ^^^ ^^                                                             ^^^     ^^^
 
@@ -186,7 +186,7 @@ namespace Errors {
                 }): any[];
             };
 
-        var b2: <T, U>(x: T) => U[]; 
+        declare var b2: <T, U>(x: T) => U[]; 
 >b2 : <T, U>(x: T) => U[]
 >   : ^ ^^ ^^ ^^ ^^^^^   
 >x : T
@@ -208,7 +208,7 @@ namespace Errors {
 >a2 : (x: number) => string[]
 >   : ^ ^^      ^^^^^        
 
-        var b7: <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
+        declare var b7: <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
 >b7 : <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V
 >   : ^ ^^^^^^^^^    ^^ ^^^^^^^^^       ^^ ^^^^^^^^^        ^^ ^^             ^^^^^           
 >x : (arg: T) => U
@@ -234,7 +234,7 @@ namespace Errors {
 >a7 : (x: (arg: Base) => Derived) => (r: Base) => Derived2
 >   : ^ ^^                      ^^^^^                     
 
-        var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
+        declare var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
 >b8 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U
 >   : ^ ^^^^^^^^^    ^^ ^^^^^^^^^       ^^ ^^             ^^ ^^                             ^^^^^           
 >x : (arg: T) => U
@@ -267,7 +267,7 @@ namespace Errors {
 >   : ^ ^^                      ^^ ^^                       ^^^^^                    
 
         
-        var b10: <T extends Derived>(...x: T[]) => T; 
+        declare var b10: <T extends Derived>(...x: T[]) => T; 
 >b10 : <T extends Derived>(...x: T[]) => T
 >    : ^ ^^^^^^^^^       ^^^^^ ^^   ^^^^^ 
 >x : T[]
@@ -289,7 +289,7 @@ namespace Errors {
 >a10 : (...x: Base[]) => Base
 >    : ^^^^ ^^      ^^^^^    
 
-        var b11: <T extends Derived>(x: T, y: T) => T; 
+        declare var b11: <T extends Derived>(x: T, y: T) => T; 
 >b11 : <T extends Derived>(x: T, y: T) => T
 >    : ^ ^^^^^^^^^       ^^ ^^ ^^ ^^ ^^^^^ 
 >x : T
@@ -313,7 +313,7 @@ namespace Errors {
 >a11 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >    : ^ ^^                ^^ ^^                             ^^^^^    
 
-        var b12: <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
+        declare var b12: <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
 >b12 : <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T
 >    : ^ ^^^^^^^^^               ^^ ^^           ^^ ^^           ^^^^^ 
 >x : Base[]
@@ -337,7 +337,7 @@ namespace Errors {
 >a12 : (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >    : ^ ^^           ^^ ^^               ^^^^^              
 
-        var b15: <T>(x: { a: T; b: T }) => T; 
+        declare var b15: <T>(x: { a: T; b: T }) => T; 
 >b15 : <T>(x: { a: T; b: T; }) => T
 >    : ^ ^^ ^^               ^^^^^ 
 >x : { a: T; b: T; }
@@ -363,7 +363,7 @@ namespace Errors {
 >a15 : (x: { a: string; b: number; }) => number
 >    : ^ ^^                         ^^^^^      
 
-        var b15a: <T extends Base>(x: { a: T; b: T }) => number; 
+        declare var b15a: <T extends Base>(x: { a: T; b: T }) => number; 
 >b15a : <T extends Base>(x: { a: T; b: T; }) => number
 >     : ^ ^^^^^^^^^    ^^ ^^               ^^^^^      
 >x : { a: T; b: T; }
@@ -389,7 +389,7 @@ namespace Errors {
 >a15 : (x: { a: string; b: number; }) => number
 >    : ^ ^^                         ^^^^^      
 
-        var b16: <T>(x: (a: T) => T) => T[];
+        declare var b16: <T>(x: (a: T) => T) => T[];
 >b16 : <T>(x: (a: T) => T) => T[]
 >    : ^ ^^ ^^           ^^^^^   
 >x : (a: T) => T
@@ -413,7 +413,7 @@ namespace Errors {
 >a16 : { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }
 >    : ^^^ ^^                                              ^^^        ^^^ ^^                                                  ^^^         ^^^
 
-        var b17: <T>(x: (a: T) => T) => any[];
+        declare var b17: <T>(x: (a: T) => T) => any[];
 >b17 : <T>(x: (a: T) => T) => any[]
 >    : ^ ^^ ^^           ^^^^^     
 >x : (a: T) => T
@@ -443,13 +443,13 @@ namespace Errors {
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         // target type has generic call signature
-        var a2: <T>(x: T) => T[];
+        declare var a2: <T>(x: T) => T[];
 >a2 : <T>(x: T) => T[]
 >   : ^ ^^ ^^ ^^^^^   
 >x : T
 >  : ^
 
-        var b2: <T>(x: T) => string[];
+        declare var b2: <T>(x: T) => string[];
 >b2 : <T>(x: T) => string[]
 >   : ^ ^^ ^^ ^^^^^        
 >x : T
@@ -472,13 +472,13 @@ namespace Errors {
 >   : ^ ^^ ^^ ^^^^^   
 
         // target type has generic call signature
-        var a3: <T>(x: T) => string[];
+        declare var a3: <T>(x: T) => string[];
 >a3 : <T>(x: T) => string[]
 >   : ^ ^^ ^^ ^^^^^        
 >x : T
 >  : ^
 
-        var b3: <T>(x: T) => T[]; 
+        declare var b3: <T>(x: T) => T[]; 
 >b3 : <T>(x: T) => T[]
 >   : ^ ^^ ^^ ^^^^^   
 >x : T
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures5.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures5.errors.txt
index 07d3fc5394645..2d140be8e62f0 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures5.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures5.errors.txt
@@ -28,20 +28,20 @@ assignmentCompatWithCallSignatures5.ts(58,1): error TS2322: Type '<T extends Bas
     class Derived2 extends Derived { baz: string; }
     class OtherDerived extends Base { bing: string; }
     
-    var a: <T>(x: T) => T[];
-    var a2: <T>(x: T) => string[];
-    var a3: <T>(x: T) => void;
-    var a4: <T,U>(x: T, y: U) => string;
-    var a5: <T,U>(x: (arg: T) => U) => T;
-    var a6: <T extends Base>(x: (arg: T) => Derived) => T;
-    var a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
-    var a15: <T>(x: { a: T; b: T }) => T[];
-    var a16: <T extends Base>(x: { a: T; b: T }) => T[];
-    var a17: {
+    declare var a: <T>(x: T) => T[];
+    declare var a2: <T>(x: T) => string[];
+    declare var a3: <T>(x: T) => void;
+    declare var a4: <T,U>(x: T, y: U) => string;
+    declare var a5: <T,U>(x: (arg: T) => U) => T;
+    declare var a6: <T extends Base>(x: (arg: T) => Derived) => T;
+    declare var a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
+    declare var a15: <T>(x: { a: T; b: T }) => T[];
+    declare var a16: <T extends Base>(x: { a: T; b: T }) => T[];
+    declare var a17: {
         <T extends Derived>(x: (a: T) => T): T[];
         <T extends Base>(x: (a: T) => T): T[];        
     };
-    var a18: {
+    declare var a18: {
         (x: {
             <T extends Derived>(a: T): T;
             <T extends Base>(a: T): T;
@@ -52,29 +52,29 @@ assignmentCompatWithCallSignatures5.ts(58,1): error TS2322: Type '<T extends Bas
         }): any[];
     };
     
-    var b: <T>(x: T) => T[]; 
+    declare var b: <T>(x: T) => T[]; 
     a = b; // ok
     b = a; // ok
-    var b2: <T>(x: T) => string[]; 
+    declare var b2: <T>(x: T) => string[]; 
     a2 = b2; // ok
     b2 = a2; // ok
-    var b3: <T>(x: T) => T; 
+    declare var b3: <T>(x: T) => T; 
     a3 = b3; // ok
     b3 = a3; // ok
     ~~
 !!! error TS2322: Type '<T>(x: T) => void' is not assignable to type '<T>(x: T) => T'.
 !!! error TS2322:   Type 'void' is not assignable to type 'T'.
 !!! error TS2322:     'T' could be instantiated with an arbitrary type which could be unrelated to 'void'.
-    var b4: <T, U>(x: T, y: U) => string; 
+    declare var b4: <T, U>(x: T, y: U) => string; 
     a4 = b4; // ok
     b4 = a4; // ok
-    var b5: <T, U>(x: (arg: T) => U) => T; 
+    declare var b5: <T, U>(x: (arg: T) => U) => T; 
     a5 = b5; // ok
     b5 = a5; // ok
-    var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
+    declare var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
     a6 = b6; // ok
     b6 = a6; // ok
-    var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+    declare var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
     a11 = b11; // ok
     b11 = a11; // ok
     ~~~
@@ -84,8 +84,8 @@ assignmentCompatWithCallSignatures5.ts(58,1): error TS2322: Type '<T extends Bas
 !!! error TS2322:       Types of property 'foo' are incompatible.
 !!! error TS2322:         Type 'U' is not assignable to type 'T'.
 !!! error TS2322:           'T' could be instantiated with an arbitrary type which could be unrelated to 'U'.
-!!! related TS2208 assignmentCompatWithCallSignatures5.ts:50:14: This type parameter might need an `extends T` constraint.
-    var b15: <U, V>(x: { a: U; b: V; }) => U[]; 
+!!! related TS2208 assignmentCompatWithCallSignatures5.ts:50:22: This type parameter might need an `extends T` constraint.
+    declare var b15: <U, V>(x: { a: U; b: V; }) => U[]; 
     a15 = b15; // ok, T = U, T = V
     b15 = a15; // ok
     ~~~
@@ -95,8 +95,8 @@ assignmentCompatWithCallSignatures5.ts(58,1): error TS2322: Type '<T extends Bas
 !!! error TS2322:       Types of property 'b' are incompatible.
 !!! error TS2322:         Type 'V' is not assignable to type 'U'.
 !!! error TS2322:           'U' could be instantiated with an arbitrary type which could be unrelated to 'V'.
-!!! related TS2208 assignmentCompatWithCallSignatures5.ts:53:14: This type parameter might need an `extends U` constraint.
-    var b16: <T>(x: { a: T; b: T }) => T[]; 
+!!! related TS2208 assignmentCompatWithCallSignatures5.ts:53:22: This type parameter might need an `extends U` constraint.
+    declare var b16: <T>(x: { a: T; b: T }) => T[]; 
     a15 = b16; // ok
     b15 = a16; // ok
     ~~~
@@ -105,11 +105,11 @@ assignmentCompatWithCallSignatures5.ts(58,1): error TS2322: Type '<T extends Bas
 !!! error TS2322:     Type '{ a: U; b: V; }' is not assignable to type '{ a: Base; b: Base; }'.
 !!! error TS2322:       Types of property 'a' are incompatible.
 !!! error TS2322:         Type 'U' is not assignable to type 'Base'.
-!!! related TS2208 assignmentCompatWithCallSignatures5.ts:53:11: This type parameter might need an `extends Base` constraint.
-    var b17: <T>(x: (a: T) => T) => T[]; 
+!!! related TS2208 assignmentCompatWithCallSignatures5.ts:53:19: This type parameter might need an `extends Base` constraint.
+    declare var b17: <T>(x: (a: T) => T) => T[]; 
     a17 = b17; // ok
     b17 = a17; // ok
-    var b18: (x: <T>(a: T) => T) => any[]; 
+    declare var b18: (x: <T>(a: T) => T) => any[]; 
     a18 = b18; // ok
     b18 = a18; // ok
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures5.js b/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
index 097f6ac2dca22..458d0f9444d57 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
@@ -8,20 +8,20 @@ class Derived extends Base { bar: string; }
 class Derived2 extends Derived { baz: string; }
 class OtherDerived extends Base { bing: string; }
 
-var a: <T>(x: T) => T[];
-var a2: <T>(x: T) => string[];
-var a3: <T>(x: T) => void;
-var a4: <T,U>(x: T, y: U) => string;
-var a5: <T,U>(x: (arg: T) => U) => T;
-var a6: <T extends Base>(x: (arg: T) => Derived) => T;
-var a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
-var a15: <T>(x: { a: T; b: T }) => T[];
-var a16: <T extends Base>(x: { a: T; b: T }) => T[];
-var a17: {
+declare var a: <T>(x: T) => T[];
+declare var a2: <T>(x: T) => string[];
+declare var a3: <T>(x: T) => void;
+declare var a4: <T,U>(x: T, y: U) => string;
+declare var a5: <T,U>(x: (arg: T) => U) => T;
+declare var a6: <T extends Base>(x: (arg: T) => Derived) => T;
+declare var a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
+declare var a15: <T>(x: { a: T; b: T }) => T[];
+declare var a16: <T extends Base>(x: { a: T; b: T }) => T[];
+declare var a17: {
     <T extends Derived>(x: (a: T) => T): T[];
     <T extends Base>(x: (a: T) => T): T[];        
 };
-var a18: {
+declare var a18: {
     (x: {
         <T extends Derived>(a: T): T;
         <T extends Base>(a: T): T;
@@ -32,37 +32,37 @@ var a18: {
     }): any[];
 };
 
-var b: <T>(x: T) => T[]; 
+declare var b: <T>(x: T) => T[]; 
 a = b; // ok
 b = a; // ok
-var b2: <T>(x: T) => string[]; 
+declare var b2: <T>(x: T) => string[]; 
 a2 = b2; // ok
 b2 = a2; // ok
-var b3: <T>(x: T) => T; 
+declare var b3: <T>(x: T) => T; 
 a3 = b3; // ok
 b3 = a3; // ok
-var b4: <T, U>(x: T, y: U) => string; 
+declare var b4: <T, U>(x: T, y: U) => string; 
 a4 = b4; // ok
 b4 = a4; // ok
-var b5: <T, U>(x: (arg: T) => U) => T; 
+declare var b5: <T, U>(x: (arg: T) => U) => T; 
 a5 = b5; // ok
 b5 = a5; // ok
-var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
+declare var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
 a6 = b6; // ok
 b6 = a6; // ok
-var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+declare var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 a11 = b11; // ok
 b11 = a11; // ok
-var b15: <U, V>(x: { a: U; b: V; }) => U[]; 
+declare var b15: <U, V>(x: { a: U; b: V; }) => U[]; 
 a15 = b15; // ok, T = U, T = V
 b15 = a15; // ok
-var b16: <T>(x: { a: T; b: T }) => T[]; 
+declare var b16: <T>(x: { a: T; b: T }) => T[]; 
 a15 = b16; // ok
 b15 = a16; // ok
-var b17: <T>(x: (a: T) => T) => T[]; 
+declare var b17: <T>(x: (a: T) => T) => T[]; 
 a17 = b17; // ok
 b17 = a17; // ok
-var b18: (x: <T>(a: T) => T) => any[]; 
+declare var b18: (x: <T>(a: T) => T) => any[]; 
 a18 = b18; // ok
 b18 = a18; // ok
 
@@ -110,47 +110,25 @@ var OtherDerived = /** @class */ (function (_super) {
     }
     return OtherDerived;
 }(Base));
-var a;
-var a2;
-var a3;
-var a4;
-var a5;
-var a6;
-var a11;
-var a15;
-var a16;
-var a17;
-var a18;
-var b;
 a = b; // ok
 b = a; // ok
-var b2;
 a2 = b2; // ok
 b2 = a2; // ok
-var b3;
 a3 = b3; // ok
 b3 = a3; // ok
-var b4;
 a4 = b4; // ok
 b4 = a4; // ok
-var b5;
 a5 = b5; // ok
 b5 = a5; // ok
-var b6;
 a6 = b6; // ok
 b6 = a6; // ok
-var b11;
 a11 = b11; // ok
 b11 = a11; // ok
-var b15;
 a15 = b15; // ok, T = U, T = V
 b15 = a15; // ok
-var b16;
 a15 = b16; // ok
 b15 = a16; // ok
-var b17;
 a17 = b17; // ok
 b17 = a17; // ok
-var b18;
 a18 = b18; // ok
 b18 = a18; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures5.symbols b/tests/baselines/reference/assignmentCompatWithCallSignatures5.symbols
index de33824ac824c..ebe43f0d007ee 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures5.symbols
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures5.symbols
@@ -22,90 +22,90 @@ class OtherDerived extends Base { bing: string; }
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures5.ts, 0, 0))
 >bing : Symbol(OtherDerived.bing, Decl(assignmentCompatWithCallSignatures5.ts, 5, 33))
 
-var a: <T>(x: T) => T[];
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 7, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 7, 8))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 7, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 7, 8))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 7, 8))
-
-var a2: <T>(x: T) => string[];
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures5.ts, 8, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 8, 9))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 8, 12))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 8, 9))
-
-var a3: <T>(x: T) => void;
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures5.ts, 9, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 9, 9))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 9, 12))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 9, 9))
-
-var a4: <T,U>(x: T, y: U) => string;
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignatures5.ts, 10, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 10, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 10, 11))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 10, 14))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 10, 9))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures5.ts, 10, 19))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 10, 11))
-
-var a5: <T,U>(x: (arg: T) => U) => T;
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignatures5.ts, 11, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 11, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 11, 11))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 11, 14))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures5.ts, 11, 18))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 11, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 11, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 11, 9))
-
-var a6: <T extends Base>(x: (arg: T) => Derived) => T;
->a6 : Symbol(a6, Decl(assignmentCompatWithCallSignatures5.ts, 12, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 12, 9))
+declare var a: <T>(x: T) => T[];
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 7, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 7, 16))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 7, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 7, 16))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 7, 16))
+
+declare var a2: <T>(x: T) => string[];
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures5.ts, 8, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 8, 17))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 8, 20))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 8, 17))
+
+declare var a3: <T>(x: T) => void;
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures5.ts, 9, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 9, 17))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 9, 20))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 9, 17))
+
+declare var a4: <T,U>(x: T, y: U) => string;
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignatures5.ts, 10, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 10, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 10, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 10, 22))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 10, 17))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures5.ts, 10, 27))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 10, 19))
+
+declare var a5: <T,U>(x: (arg: T) => U) => T;
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignatures5.ts, 11, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 11, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 11, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 11, 22))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures5.ts, 11, 26))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 11, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 11, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 11, 17))
+
+declare var a6: <T extends Base>(x: (arg: T) => Derived) => T;
+>a6 : Symbol(a6, Decl(assignmentCompatWithCallSignatures5.ts, 12, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 12, 17))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures5.ts, 0, 0))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 12, 25))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures5.ts, 12, 29))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 12, 9))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 12, 33))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures5.ts, 12, 37))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 12, 17))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures5.ts, 2, 27))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 12, 9))
-
-var a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures5.ts, 13, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 13, 10))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 13, 13))
->foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures5.ts, 13, 17))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 13, 10))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures5.ts, 13, 27))
->foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures5.ts, 13, 32))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 13, 10))
->bar : Symbol(bar, Decl(assignmentCompatWithCallSignatures5.ts, 13, 40))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 13, 10))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 12, 17))
+
+declare var a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
+>a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures5.ts, 13, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 13, 18))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 13, 21))
+>foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures5.ts, 13, 25))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 13, 18))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures5.ts, 13, 35))
+>foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures5.ts, 13, 40))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 13, 18))
+>bar : Symbol(bar, Decl(assignmentCompatWithCallSignatures5.ts, 13, 48))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 13, 18))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures5.ts, 0, 0))
 
-var a15: <T>(x: { a: T; b: T }) => T[];
->a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures5.ts, 14, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 14, 10))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 14, 13))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 14, 17))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 14, 10))
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures5.ts, 14, 23))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 14, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 14, 10))
-
-var a16: <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures5.ts, 15, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 15, 10))
+declare var a15: <T>(x: { a: T; b: T }) => T[];
+>a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures5.ts, 14, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 14, 18))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 14, 21))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 14, 25))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 14, 18))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures5.ts, 14, 31))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 14, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 14, 18))
+
+declare var a16: <T extends Base>(x: { a: T; b: T }) => T[];
+>a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures5.ts, 15, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 15, 18))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures5.ts, 0, 0))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 15, 26))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 15, 30))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 15, 10))
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures5.ts, 15, 36))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 15, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 15, 10))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 15, 34))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 15, 38))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 15, 18))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures5.ts, 15, 44))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 15, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 15, 18))
 
-var a17: {
->a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures5.ts, 16, 3))
+declare var a17: {
+>a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures5.ts, 16, 11))
 
     <T extends Derived>(x: (a: T) => T): T[];
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 17, 5))
@@ -126,8 +126,8 @@ var a17: {
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 18, 5))
 
 };
-var a18: {
->a18 : Symbol(a18, Decl(assignmentCompatWithCallSignatures5.ts, 20, 3))
+declare var a18: {
+>a18 : Symbol(a18, Decl(assignmentCompatWithCallSignatures5.ts, 20, 11))
 
     (x: {
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 21, 5))
@@ -167,194 +167,194 @@ var a18: {
     }): any[];
 };
 
-var b: <T>(x: T) => T[]; 
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures5.ts, 31, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 31, 8))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 31, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 31, 8))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 31, 8))
+declare var b: <T>(x: T) => T[]; 
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures5.ts, 31, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 31, 16))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 31, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 31, 16))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 31, 16))
 
 a = b; // ok
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 7, 3))
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures5.ts, 31, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 7, 11))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures5.ts, 31, 11))
 
 b = a; // ok
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures5.ts, 31, 3))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 7, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures5.ts, 31, 11))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 7, 11))
 
-var b2: <T>(x: T) => string[]; 
->b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures5.ts, 34, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 34, 9))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 34, 12))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 34, 9))
+declare var b2: <T>(x: T) => string[]; 
+>b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures5.ts, 34, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 34, 17))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 34, 20))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 34, 17))
 
 a2 = b2; // ok
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures5.ts, 8, 3))
->b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures5.ts, 34, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures5.ts, 8, 11))
+>b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures5.ts, 34, 11))
 
 b2 = a2; // ok
->b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures5.ts, 34, 3))
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures5.ts, 8, 3))
+>b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures5.ts, 34, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures5.ts, 8, 11))
 
-var b3: <T>(x: T) => T; 
->b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures5.ts, 37, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 37, 9))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 37, 12))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 37, 9))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 37, 9))
+declare var b3: <T>(x: T) => T; 
+>b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures5.ts, 37, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 37, 17))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 37, 20))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 37, 17))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 37, 17))
 
 a3 = b3; // ok
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures5.ts, 9, 3))
->b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures5.ts, 37, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures5.ts, 9, 11))
+>b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures5.ts, 37, 11))
 
 b3 = a3; // ok
->b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures5.ts, 37, 3))
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures5.ts, 9, 3))
-
-var b4: <T, U>(x: T, y: U) => string; 
->b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures5.ts, 40, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 40, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 40, 11))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 40, 15))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 40, 9))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures5.ts, 40, 20))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 40, 11))
+>b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures5.ts, 37, 11))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures5.ts, 9, 11))
+
+declare var b4: <T, U>(x: T, y: U) => string; 
+>b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures5.ts, 40, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 40, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 40, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 40, 23))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 40, 17))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures5.ts, 40, 28))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 40, 19))
 
 a4 = b4; // ok
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignatures5.ts, 10, 3))
->b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures5.ts, 40, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignatures5.ts, 10, 11))
+>b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures5.ts, 40, 11))
 
 b4 = a4; // ok
->b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures5.ts, 40, 3))
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignatures5.ts, 10, 3))
-
-var b5: <T, U>(x: (arg: T) => U) => T; 
->b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures5.ts, 43, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 43, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 43, 11))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 43, 15))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures5.ts, 43, 19))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 43, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 43, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 43, 9))
+>b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures5.ts, 40, 11))
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignatures5.ts, 10, 11))
+
+declare var b5: <T, U>(x: (arg: T) => U) => T; 
+>b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures5.ts, 43, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 43, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 43, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 43, 23))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures5.ts, 43, 27))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 43, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 43, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 43, 17))
 
 a5 = b5; // ok
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignatures5.ts, 11, 3))
->b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures5.ts, 43, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignatures5.ts, 11, 11))
+>b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures5.ts, 43, 11))
 
 b5 = a5; // ok
->b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures5.ts, 43, 3))
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignatures5.ts, 11, 3))
+>b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures5.ts, 43, 11))
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignatures5.ts, 11, 11))
 
-var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
->b6 : Symbol(b6, Decl(assignmentCompatWithCallSignatures5.ts, 46, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 46, 9))
+declare var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
+>b6 : Symbol(b6, Decl(assignmentCompatWithCallSignatures5.ts, 46, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 46, 17))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures5.ts, 0, 0))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 46, 24))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 46, 32))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures5.ts, 2, 27))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 46, 44))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures5.ts, 46, 48))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 46, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 46, 24))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 46, 9))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 46, 52))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures5.ts, 46, 56))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 46, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 46, 32))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 46, 17))
 
 a6 = b6; // ok
->a6 : Symbol(a6, Decl(assignmentCompatWithCallSignatures5.ts, 12, 3))
->b6 : Symbol(b6, Decl(assignmentCompatWithCallSignatures5.ts, 46, 3))
+>a6 : Symbol(a6, Decl(assignmentCompatWithCallSignatures5.ts, 12, 11))
+>b6 : Symbol(b6, Decl(assignmentCompatWithCallSignatures5.ts, 46, 11))
 
 b6 = a6; // ok
->b6 : Symbol(b6, Decl(assignmentCompatWithCallSignatures5.ts, 46, 3))
->a6 : Symbol(a6, Decl(assignmentCompatWithCallSignatures5.ts, 12, 3))
-
-var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
->b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures5.ts, 49, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 49, 10))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 49, 12))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 49, 16))
->foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures5.ts, 49, 20))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 49, 10))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures5.ts, 49, 30))
->foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures5.ts, 49, 35))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 49, 12))
->bar : Symbol(bar, Decl(assignmentCompatWithCallSignatures5.ts, 49, 43))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 49, 12))
+>b6 : Symbol(b6, Decl(assignmentCompatWithCallSignatures5.ts, 46, 11))
+>a6 : Symbol(a6, Decl(assignmentCompatWithCallSignatures5.ts, 12, 11))
+
+declare var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+>b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures5.ts, 49, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 49, 18))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 49, 20))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 49, 24))
+>foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures5.ts, 49, 28))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 49, 18))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures5.ts, 49, 38))
+>foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures5.ts, 49, 43))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 49, 20))
+>bar : Symbol(bar, Decl(assignmentCompatWithCallSignatures5.ts, 49, 51))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 49, 20))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures5.ts, 0, 0))
 
 a11 = b11; // ok
->a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures5.ts, 13, 3))
->b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures5.ts, 49, 3))
+>a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures5.ts, 13, 11))
+>b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures5.ts, 49, 11))
 
 b11 = a11; // ok
->b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures5.ts, 49, 3))
->a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures5.ts, 13, 3))
-
-var b15: <U, V>(x: { a: U; b: V; }) => U[]; 
->b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures5.ts, 52, 3))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 52, 10))
->V : Symbol(V, Decl(assignmentCompatWithCallSignatures5.ts, 52, 12))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 52, 16))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 52, 20))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 52, 10))
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures5.ts, 52, 26))
->V : Symbol(V, Decl(assignmentCompatWithCallSignatures5.ts, 52, 12))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 52, 10))
+>b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures5.ts, 49, 11))
+>a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures5.ts, 13, 11))
+
+declare var b15: <U, V>(x: { a: U; b: V; }) => U[]; 
+>b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures5.ts, 52, 11))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 52, 18))
+>V : Symbol(V, Decl(assignmentCompatWithCallSignatures5.ts, 52, 20))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 52, 24))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 52, 28))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 52, 18))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures5.ts, 52, 34))
+>V : Symbol(V, Decl(assignmentCompatWithCallSignatures5.ts, 52, 20))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures5.ts, 52, 18))
 
 a15 = b15; // ok, T = U, T = V
->a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures5.ts, 14, 3))
->b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures5.ts, 52, 3))
+>a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures5.ts, 14, 11))
+>b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures5.ts, 52, 11))
 
 b15 = a15; // ok
->b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures5.ts, 52, 3))
->a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures5.ts, 14, 3))
-
-var b16: <T>(x: { a: T; b: T }) => T[]; 
->b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures5.ts, 55, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 55, 10))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 55, 13))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 55, 17))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 55, 10))
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures5.ts, 55, 23))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 55, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 55, 10))
+>b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures5.ts, 52, 11))
+>a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures5.ts, 14, 11))
+
+declare var b16: <T>(x: { a: T; b: T }) => T[]; 
+>b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures5.ts, 55, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 55, 18))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 55, 21))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 55, 25))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 55, 18))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures5.ts, 55, 31))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 55, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 55, 18))
 
 a15 = b16; // ok
->a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures5.ts, 14, 3))
->b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures5.ts, 55, 3))
+>a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures5.ts, 14, 11))
+>b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures5.ts, 55, 11))
 
 b15 = a16; // ok
->b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures5.ts, 52, 3))
->a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures5.ts, 15, 3))
-
-var b17: <T>(x: (a: T) => T) => T[]; 
->b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures5.ts, 58, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 58, 10))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 58, 13))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 58, 17))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 58, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 58, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 58, 10))
+>b15 : Symbol(b15, Decl(assignmentCompatWithCallSignatures5.ts, 52, 11))
+>a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures5.ts, 15, 11))
+
+declare var b17: <T>(x: (a: T) => T) => T[]; 
+>b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures5.ts, 58, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 58, 18))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 58, 21))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 58, 25))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 58, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 58, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 58, 18))
 
 a17 = b17; // ok
->a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures5.ts, 16, 3))
->b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures5.ts, 58, 3))
+>a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures5.ts, 16, 11))
+>b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures5.ts, 58, 11))
 
 b17 = a17; // ok
->b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures5.ts, 58, 3))
->a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures5.ts, 16, 3))
+>b17 : Symbol(b17, Decl(assignmentCompatWithCallSignatures5.ts, 58, 11))
+>a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures5.ts, 16, 11))
 
-var b18: (x: <T>(a: T) => T) => any[]; 
->b18 : Symbol(b18, Decl(assignmentCompatWithCallSignatures5.ts, 61, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 61, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 61, 14))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 61, 17))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 61, 14))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 61, 14))
+declare var b18: (x: <T>(a: T) => T) => any[]; 
+>b18 : Symbol(b18, Decl(assignmentCompatWithCallSignatures5.ts, 61, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures5.ts, 61, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 61, 22))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 61, 25))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 61, 22))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures5.ts, 61, 22))
 
 a18 = b18; // ok
->a18 : Symbol(a18, Decl(assignmentCompatWithCallSignatures5.ts, 20, 3))
->b18 : Symbol(b18, Decl(assignmentCompatWithCallSignatures5.ts, 61, 3))
+>a18 : Symbol(a18, Decl(assignmentCompatWithCallSignatures5.ts, 20, 11))
+>b18 : Symbol(b18, Decl(assignmentCompatWithCallSignatures5.ts, 61, 11))
 
 b18 = a18; // ok
->b18 : Symbol(b18, Decl(assignmentCompatWithCallSignatures5.ts, 61, 3))
->a18 : Symbol(a18, Decl(assignmentCompatWithCallSignatures5.ts, 20, 3))
+>b18 : Symbol(b18, Decl(assignmentCompatWithCallSignatures5.ts, 61, 11))
+>a18 : Symbol(a18, Decl(assignmentCompatWithCallSignatures5.ts, 20, 11))
 
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures5.types b/tests/baselines/reference/assignmentCompatWithCallSignatures5.types
index 911c4db793b3f..5eece3edd4c48 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures5.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures5.types
@@ -33,25 +33,25 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 >     : ^^^^^^
 
-var a: <T>(x: T) => T[];
+declare var a: <T>(x: T) => T[];
 >a : <T>(x: T) => T[]
 >  : ^ ^^ ^^ ^^^^^   
 >x : T
 >  : ^
 
-var a2: <T>(x: T) => string[];
+declare var a2: <T>(x: T) => string[];
 >a2 : <T>(x: T) => string[]
 >   : ^ ^^ ^^ ^^^^^        
 >x : T
 >  : ^
 
-var a3: <T>(x: T) => void;
+declare var a3: <T>(x: T) => void;
 >a3 : <T>(x: T) => void
 >   : ^ ^^ ^^ ^^^^^    
 >x : T
 >  : ^
 
-var a4: <T,U>(x: T, y: U) => string;
+declare var a4: <T,U>(x: T, y: U) => string;
 >a4 : <T, U>(x: T, y: U) => string
 >   : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^      
 >x : T
@@ -59,7 +59,7 @@ var a4: <T,U>(x: T, y: U) => string;
 >y : U
 >  : ^
 
-var a5: <T,U>(x: (arg: T) => U) => T;
+declare var a5: <T,U>(x: (arg: T) => U) => T;
 >a5 : <T, U>(x: (arg: T) => U) => T
 >   : ^ ^^ ^^ ^^             ^^^^^ 
 >x : (arg: T) => U
@@ -67,7 +67,7 @@ var a5: <T,U>(x: (arg: T) => U) => T;
 >arg : T
 >    : ^
 
-var a6: <T extends Base>(x: (arg: T) => Derived) => T;
+declare var a6: <T extends Base>(x: (arg: T) => Derived) => T;
 >a6 : <T extends Base>(x: (arg: T) => Derived) => T
 >   : ^ ^^^^^^^^^    ^^ ^^                   ^^^^^ 
 >x : (arg: T) => Derived
@@ -75,7 +75,7 @@ var a6: <T extends Base>(x: (arg: T) => Derived) => T;
 >arg : T
 >    : ^
 
-var a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
+declare var a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
 >    : ^ ^^ ^^           ^^ ^^                   ^^^^^    
 >x : { foo: T; }
@@ -89,7 +89,7 @@ var a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >bar : T
 >    : ^
 
-var a15: <T>(x: { a: T; b: T }) => T[];
+declare var a15: <T>(x: { a: T; b: T }) => T[];
 >a15 : <T>(x: { a: T; b: T; }) => T[]
 >    : ^ ^^ ^^               ^^^^^   
 >x : { a: T; b: T; }
@@ -99,7 +99,7 @@ var a15: <T>(x: { a: T; b: T }) => T[];
 >b : T
 >  : ^
 
-var a16: <T extends Base>(x: { a: T; b: T }) => T[];
+declare var a16: <T extends Base>(x: { a: T; b: T }) => T[];
 >a16 : <T extends Base>(x: { a: T; b: T; }) => T[]
 >    : ^ ^^^^^^^^^    ^^ ^^               ^^^^^   
 >x : { a: T; b: T; }
@@ -109,7 +109,7 @@ var a16: <T extends Base>(x: { a: T; b: T }) => T[];
 >b : T
 >  : ^
 
-var a17: {
+declare var a17: {
 >a17 : { <T extends Derived>(x: (a: T) => T): T[]; <T extends Base>(x: (a: T) => T): T[]; }
 >    : ^^^ ^^^^^^^^^       ^^ ^^           ^^^   ^^^ ^^^^^^^^^    ^^ ^^           ^^^   ^^^
 
@@ -126,7 +126,7 @@ var a17: {
 >  : ^
 
 };
-var a18: {
+declare var a18: {
 >a18 : { (x: { <T extends Derived>(a: T): T; <T extends Base>(a: T): T; }): any[]; (x: { <T extends Derived2>(a: T): T; <T extends Base>(a: T): T; }): any[]; }
 >    : ^^^ ^^                                                            ^^^     ^^^ ^^                                                             ^^^     ^^^
 
@@ -158,7 +158,7 @@ var a18: {
     }): any[];
 };
 
-var b: <T>(x: T) => T[]; 
+declare var b: <T>(x: T) => T[]; 
 >b : <T>(x: T) => T[]
 >  : ^ ^^ ^^ ^^^^^   
 >x : T
@@ -180,7 +180,7 @@ b = a; // ok
 >a : <T>(x: T) => T[]
 >  : ^ ^^ ^^ ^^^^^   
 
-var b2: <T>(x: T) => string[]; 
+declare var b2: <T>(x: T) => string[]; 
 >b2 : <T>(x: T) => string[]
 >   : ^ ^^ ^^ ^^^^^        
 >x : T
@@ -202,7 +202,7 @@ b2 = a2; // ok
 >a2 : <T>(x: T) => string[]
 >   : ^ ^^ ^^ ^^^^^        
 
-var b3: <T>(x: T) => T; 
+declare var b3: <T>(x: T) => T; 
 >b3 : <T>(x: T) => T
 >   : ^ ^^ ^^ ^^^^^ 
 >x : T
@@ -224,7 +224,7 @@ b3 = a3; // ok
 >a3 : <T>(x: T) => void
 >   : ^ ^^ ^^ ^^^^^    
 
-var b4: <T, U>(x: T, y: U) => string; 
+declare var b4: <T, U>(x: T, y: U) => string; 
 >b4 : <T, U>(x: T, y: U) => string
 >   : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^      
 >x : T
@@ -248,7 +248,7 @@ b4 = a4; // ok
 >a4 : <T, U>(x: T, y: U) => string
 >   : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^      
 
-var b5: <T, U>(x: (arg: T) => U) => T; 
+declare var b5: <T, U>(x: (arg: T) => U) => T; 
 >b5 : <T, U>(x: (arg: T) => U) => T
 >   : ^ ^^ ^^ ^^             ^^^^^ 
 >x : (arg: T) => U
@@ -272,7 +272,7 @@ b5 = a5; // ok
 >a5 : <T, U>(x: (arg: T) => U) => T
 >   : ^ ^^ ^^ ^^             ^^^^^ 
 
-var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
+declare var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
 >b6 : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
 >   : ^ ^^^^^^^^^    ^^ ^^^^^^^^^       ^^ ^^             ^^^^^ 
 >x : (arg: T) => U
@@ -296,7 +296,7 @@ b6 = a6; // ok
 >a6 : <T extends Base>(x: (arg: T) => Derived) => T
 >   : ^ ^^^^^^^^^    ^^ ^^                   ^^^^^ 
 
-var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+declare var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 >b11 : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
 >    : ^ ^^ ^^ ^^           ^^ ^^                   ^^^^^    
 >x : { foo: T; }
@@ -326,7 +326,7 @@ b11 = a11; // ok
 >a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
 >    : ^ ^^ ^^           ^^ ^^                   ^^^^^    
 
-var b15: <U, V>(x: { a: U; b: V; }) => U[]; 
+declare var b15: <U, V>(x: { a: U; b: V; }) => U[]; 
 >b15 : <U, V>(x: { a: U; b: V; }) => U[]
 >    : ^ ^^ ^^ ^^               ^^^^^   
 >x : { a: U; b: V; }
@@ -352,7 +352,7 @@ b15 = a15; // ok
 >a15 : <T>(x: { a: T; b: T; }) => T[]
 >    : ^ ^^ ^^               ^^^^^   
 
-var b16: <T>(x: { a: T; b: T }) => T[]; 
+declare var b16: <T>(x: { a: T; b: T }) => T[]; 
 >b16 : <T>(x: { a: T; b: T; }) => T[]
 >    : ^ ^^ ^^               ^^^^^   
 >x : { a: T; b: T; }
@@ -378,7 +378,7 @@ b15 = a16; // ok
 >a16 : <T extends Base>(x: { a: T; b: T; }) => T[]
 >    : ^ ^^^^^^^^^    ^^ ^^               ^^^^^   
 
-var b17: <T>(x: (a: T) => T) => T[]; 
+declare var b17: <T>(x: (a: T) => T) => T[]; 
 >b17 : <T>(x: (a: T) => T) => T[]
 >    : ^ ^^ ^^           ^^^^^   
 >x : (a: T) => T
@@ -402,7 +402,7 @@ b17 = a17; // ok
 >a17 : { <T extends Derived>(x: (a: T) => T): T[]; <T extends Base>(x: (a: T) => T): T[]; }
 >    : ^^^ ^^^^^^^^^       ^^ ^^           ^^^   ^^^ ^^^^^^^^^    ^^ ^^           ^^^   ^^^
 
-var b18: (x: <T>(a: T) => T) => any[]; 
+declare var b18: (x: <T>(a: T) => T) => any[]; 
 >b18 : (x: <T>(a: T) => T) => any[]
 >    : ^ ^^              ^^^^^     
 >x : <T>(a: T) => T
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures6.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures6.errors.txt
index 98d798bde9a81..8d25046286fd1 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures6.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures6.errors.txt
@@ -34,28 +34,28 @@ assignmentCompatWithCallSignatures6.ts(42,1): error TS2322: Type '<T extends Bas
         a16: <T extends Base>(x: { a: T; b: T }) => T[];
     }
     
-    var x: A;
+    declare var x: A;
     
-    var b: <T>(x: T) => T[]; 
+    declare var b: <T>(x: T) => T[]; 
     x.a = b;
     b = x.a;
-    var b2: <T>(x: T) => string[]; 
+    declare var b2: <T>(x: T) => string[]; 
     x.a2 = b2;
     b2 = x.a2;
-    var b3: <T>(x: T) => T;
+    declare var b3: <T>(x: T) => T;
     x.a3 = b3;
     b3 = x.a3;
     ~~
 !!! error TS2322: Type '<T>(x: T) => void' is not assignable to type '<T>(x: T) => T'.
 !!! error TS2322:   Type 'void' is not assignable to type 'T'.
 !!! error TS2322:     'T' could be instantiated with an arbitrary type which could be unrelated to 'void'.
-    var b4: <T, U>(x: T, y: U) => string; 
+    declare var b4: <T, U>(x: T, y: U) => string; 
     x.a4 = b4;
     b4 = x.a4;
-    var b5: <T, U>(x: (arg: T) => U) => T; 
+    declare var b5: <T, U>(x: (arg: T) => U) => T; 
     x.a5 = b5;
     b5 = x.a5;
-    var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+    declare var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
     x.a11 = b11;
     b11 = x.a11;
     ~~~
@@ -65,8 +65,8 @@ assignmentCompatWithCallSignatures6.ts(42,1): error TS2322: Type '<T extends Bas
 !!! error TS2322:       Types of property 'foo' are incompatible.
 !!! error TS2322:         Type 'U' is not assignable to type 'T'.
 !!! error TS2322:           'T' could be instantiated with an arbitrary type which could be unrelated to 'U'.
-!!! related TS2208 assignmentCompatWithCallSignatures6.ts:37:14: This type parameter might need an `extends T` constraint.
-    var b16: <T>(x: { a: T; b: T }) => T[]; 
+!!! related TS2208 assignmentCompatWithCallSignatures6.ts:37:22: This type parameter might need an `extends T` constraint.
+    declare var b16: <T>(x: { a: T; b: T }) => T[]; 
     x.a16 = b16;
     b16 = x.a16;
     ~~~
@@ -75,4 +75,4 @@ assignmentCompatWithCallSignatures6.ts(42,1): error TS2322: Type '<T extends Bas
 !!! error TS2322:     Type '{ a: T; b: T; }' is not assignable to type '{ a: Base; b: Base; }'.
 !!! error TS2322:       Types of property 'a' are incompatible.
 !!! error TS2322:         Type 'T' is not assignable to type 'Base'.
-!!! related TS2208 assignmentCompatWithCallSignatures6.ts:40:11: This type parameter might need an `extends Base` constraint.
\ No newline at end of file
+!!! related TS2208 assignmentCompatWithCallSignatures6.ts:40:19: This type parameter might need an `extends Base` constraint.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures6.js b/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
index 740ed15c17c7d..07364b412fbbd 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
@@ -20,27 +20,27 @@ interface A {
     a16: <T extends Base>(x: { a: T; b: T }) => T[];
 }
 
-var x: A;
+declare var x: A;
 
-var b: <T>(x: T) => T[]; 
+declare var b: <T>(x: T) => T[]; 
 x.a = b;
 b = x.a;
-var b2: <T>(x: T) => string[]; 
+declare var b2: <T>(x: T) => string[]; 
 x.a2 = b2;
 b2 = x.a2;
-var b3: <T>(x: T) => T;
+declare var b3: <T>(x: T) => T;
 x.a3 = b3;
 b3 = x.a3;
-var b4: <T, U>(x: T, y: U) => string; 
+declare var b4: <T, U>(x: T, y: U) => string; 
 x.a4 = b4;
 b4 = x.a4;
-var b5: <T, U>(x: (arg: T) => U) => T; 
+declare var b5: <T, U>(x: (arg: T) => U) => T; 
 x.a5 = b5;
 b5 = x.a5;
-var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+declare var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 x.a11 = b11;
 b11 = x.a11;
-var b16: <T>(x: { a: T; b: T }) => T[]; 
+declare var b16: <T>(x: { a: T; b: T }) => T[]; 
 x.a16 = b16;
 b16 = x.a16;
 
@@ -87,25 +87,17 @@ var OtherDerived = /** @class */ (function (_super) {
     }
     return OtherDerived;
 }(Base));
-var x;
-var b;
 x.a = b;
 b = x.a;
-var b2;
 x.a2 = b2;
 b2 = x.a2;
-var b3;
 x.a3 = b3;
 b3 = x.a3;
-var b4;
 x.a4 = b4;
 b4 = x.a4;
-var b5;
 x.a5 = b5;
 b5 = x.a5;
-var b11;
 x.a11 = b11;
 b11 = x.a11;
-var b16;
 x.a16 = b16;
 b16 = x.a16;
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures6.symbols b/tests/baselines/reference/assignmentCompatWithCallSignatures6.symbols
index 95b783cdecaeb..b260d20308cb3 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures6.symbols
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures6.symbols
@@ -108,154 +108,154 @@ interface A {
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 16, 10))
 }
 
-var x: A;
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 3))
+declare var x: A;
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 11))
 >A : Symbol(A, Decl(assignmentCompatWithCallSignatures6.ts, 5, 49))
 
-var b: <T>(x: T) => T[]; 
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures6.ts, 21, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 21, 8))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 21, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 21, 8))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 21, 8))
+declare var b: <T>(x: T) => T[]; 
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures6.ts, 21, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 21, 16))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 21, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 21, 16))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 21, 16))
 
 x.a = b;
 >x.a : Symbol(A.a, Decl(assignmentCompatWithCallSignatures6.ts, 7, 13))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 11))
 >a : Symbol(A.a, Decl(assignmentCompatWithCallSignatures6.ts, 7, 13))
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures6.ts, 21, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures6.ts, 21, 11))
 
 b = x.a;
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures6.ts, 21, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures6.ts, 21, 11))
 >x.a : Symbol(A.a, Decl(assignmentCompatWithCallSignatures6.ts, 7, 13))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 11))
 >a : Symbol(A.a, Decl(assignmentCompatWithCallSignatures6.ts, 7, 13))
 
-var b2: <T>(x: T) => string[]; 
->b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures6.ts, 24, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 24, 9))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 24, 12))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 24, 9))
+declare var b2: <T>(x: T) => string[]; 
+>b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures6.ts, 24, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 24, 17))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 24, 20))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 24, 17))
 
 x.a2 = b2;
 >x.a2 : Symbol(A.a2, Decl(assignmentCompatWithCallSignatures6.ts, 8, 24))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 11))
 >a2 : Symbol(A.a2, Decl(assignmentCompatWithCallSignatures6.ts, 8, 24))
->b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures6.ts, 24, 3))
+>b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures6.ts, 24, 11))
 
 b2 = x.a2;
->b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures6.ts, 24, 3))
+>b2 : Symbol(b2, Decl(assignmentCompatWithCallSignatures6.ts, 24, 11))
 >x.a2 : Symbol(A.a2, Decl(assignmentCompatWithCallSignatures6.ts, 8, 24))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 11))
 >a2 : Symbol(A.a2, Decl(assignmentCompatWithCallSignatures6.ts, 8, 24))
 
-var b3: <T>(x: T) => T;
->b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures6.ts, 27, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 27, 9))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 27, 12))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 27, 9))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 27, 9))
+declare var b3: <T>(x: T) => T;
+>b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures6.ts, 27, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 27, 17))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 27, 20))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 27, 17))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 27, 17))
 
 x.a3 = b3;
 >x.a3 : Symbol(A.a3, Decl(assignmentCompatWithCallSignatures6.ts, 9, 30))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 11))
 >a3 : Symbol(A.a3, Decl(assignmentCompatWithCallSignatures6.ts, 9, 30))
->b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures6.ts, 27, 3))
+>b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures6.ts, 27, 11))
 
 b3 = x.a3;
->b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures6.ts, 27, 3))
+>b3 : Symbol(b3, Decl(assignmentCompatWithCallSignatures6.ts, 27, 11))
 >x.a3 : Symbol(A.a3, Decl(assignmentCompatWithCallSignatures6.ts, 9, 30))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 11))
 >a3 : Symbol(A.a3, Decl(assignmentCompatWithCallSignatures6.ts, 9, 30))
 
-var b4: <T, U>(x: T, y: U) => string; 
->b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures6.ts, 30, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 30, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 30, 11))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 30, 15))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 30, 9))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures6.ts, 30, 20))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 30, 11))
+declare var b4: <T, U>(x: T, y: U) => string; 
+>b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures6.ts, 30, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 30, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 30, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 30, 23))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 30, 17))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures6.ts, 30, 28))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 30, 19))
 
 x.a4 = b4;
 >x.a4 : Symbol(A.a4, Decl(assignmentCompatWithCallSignatures6.ts, 10, 26))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 11))
 >a4 : Symbol(A.a4, Decl(assignmentCompatWithCallSignatures6.ts, 10, 26))
->b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures6.ts, 30, 3))
+>b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures6.ts, 30, 11))
 
 b4 = x.a4;
->b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures6.ts, 30, 3))
+>b4 : Symbol(b4, Decl(assignmentCompatWithCallSignatures6.ts, 30, 11))
 >x.a4 : Symbol(A.a4, Decl(assignmentCompatWithCallSignatures6.ts, 10, 26))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 11))
 >a4 : Symbol(A.a4, Decl(assignmentCompatWithCallSignatures6.ts, 10, 26))
 
-var b5: <T, U>(x: (arg: T) => U) => T; 
->b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures6.ts, 33, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 33, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 33, 11))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 33, 15))
->arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures6.ts, 33, 19))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 33, 9))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 33, 11))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 33, 9))
+declare var b5: <T, U>(x: (arg: T) => U) => T; 
+>b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures6.ts, 33, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 33, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 33, 19))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 33, 23))
+>arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures6.ts, 33, 27))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 33, 17))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 33, 19))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 33, 17))
 
 x.a5 = b5;
 >x.a5 : Symbol(A.a5, Decl(assignmentCompatWithCallSignatures6.ts, 11, 36))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 11))
 >a5 : Symbol(A.a5, Decl(assignmentCompatWithCallSignatures6.ts, 11, 36))
->b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures6.ts, 33, 3))
+>b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures6.ts, 33, 11))
 
 b5 = x.a5;
->b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures6.ts, 33, 3))
+>b5 : Symbol(b5, Decl(assignmentCompatWithCallSignatures6.ts, 33, 11))
 >x.a5 : Symbol(A.a5, Decl(assignmentCompatWithCallSignatures6.ts, 11, 36))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 11))
 >a5 : Symbol(A.a5, Decl(assignmentCompatWithCallSignatures6.ts, 11, 36))
 
-var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
->b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures6.ts, 36, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 36, 10))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 36, 12))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 36, 16))
->foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures6.ts, 36, 20))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 36, 10))
->y : Symbol(y, Decl(assignmentCompatWithCallSignatures6.ts, 36, 30))
->foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures6.ts, 36, 35))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 36, 12))
->bar : Symbol(bar, Decl(assignmentCompatWithCallSignatures6.ts, 36, 43))
->U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 36, 12))
+declare var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+>b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures6.ts, 36, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 36, 18))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 36, 20))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 36, 24))
+>foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures6.ts, 36, 28))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 36, 18))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignatures6.ts, 36, 38))
+>foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures6.ts, 36, 43))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 36, 20))
+>bar : Symbol(bar, Decl(assignmentCompatWithCallSignatures6.ts, 36, 51))
+>U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 36, 20))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures6.ts, 0, 0))
 
 x.a11 = b11;
 >x.a11 : Symbol(A.a11, Decl(assignmentCompatWithCallSignatures6.ts, 13, 54))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 11))
 >a11 : Symbol(A.a11, Decl(assignmentCompatWithCallSignatures6.ts, 13, 54))
->b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures6.ts, 36, 3))
+>b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures6.ts, 36, 11))
 
 b11 = x.a11;
->b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures6.ts, 36, 3))
+>b11 : Symbol(b11, Decl(assignmentCompatWithCallSignatures6.ts, 36, 11))
 >x.a11 : Symbol(A.a11, Decl(assignmentCompatWithCallSignatures6.ts, 13, 54))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 11))
 >a11 : Symbol(A.a11, Decl(assignmentCompatWithCallSignatures6.ts, 13, 54))
 
-var b16: <T>(x: { a: T; b: T }) => T[]; 
->b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures6.ts, 39, 3))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 39, 10))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 39, 13))
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures6.ts, 39, 17))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 39, 10))
->b : Symbol(b, Decl(assignmentCompatWithCallSignatures6.ts, 39, 23))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 39, 10))
->T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 39, 10))
+declare var b16: <T>(x: { a: T; b: T }) => T[]; 
+>b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures6.ts, 39, 11))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 39, 18))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 39, 21))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignatures6.ts, 39, 25))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 39, 18))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignatures6.ts, 39, 31))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 39, 18))
+>T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 39, 18))
 
 x.a16 = b16;
 >x.a16 : Symbol(A.a16, Decl(assignmentCompatWithCallSignatures6.ts, 15, 39))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 11))
 >a16 : Symbol(A.a16, Decl(assignmentCompatWithCallSignatures6.ts, 15, 39))
->b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures6.ts, 39, 3))
+>b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures6.ts, 39, 11))
 
 b16 = x.a16;
->b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures6.ts, 39, 3))
+>b16 : Symbol(b16, Decl(assignmentCompatWithCallSignatures6.ts, 39, 11))
 >x.a16 : Symbol(A.a16, Decl(assignmentCompatWithCallSignatures6.ts, 15, 39))
->x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 19, 11))
 >a16 : Symbol(A.a16, Decl(assignmentCompatWithCallSignatures6.ts, 15, 39))
 
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures6.types b/tests/baselines/reference/assignmentCompatWithCallSignatures6.types
index 0fecc27a18058..2e452e5038952 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures6.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures6.types
@@ -111,11 +111,11 @@ interface A {
 >  : ^
 }
 
-var x: A;
+declare var x: A;
 >x : A
 >  : ^
 
-var b: <T>(x: T) => T[]; 
+declare var b: <T>(x: T) => T[]; 
 >b : <T>(x: T) => T[]
 >  : ^ ^^ ^^ ^^^^^   
 >x : T
@@ -145,7 +145,7 @@ b = x.a;
 >a : <T>(x: T) => T[]
 >  : ^ ^^ ^^ ^^^^^   
 
-var b2: <T>(x: T) => string[]; 
+declare var b2: <T>(x: T) => string[]; 
 >b2 : <T>(x: T) => string[]
 >   : ^ ^^ ^^ ^^^^^        
 >x : T
@@ -175,7 +175,7 @@ b2 = x.a2;
 >a2 : <T>(x: T) => string[]
 >   : ^ ^^ ^^ ^^^^^        
 
-var b3: <T>(x: T) => T;
+declare var b3: <T>(x: T) => T;
 >b3 : <T>(x: T) => T
 >   : ^ ^^ ^^ ^^^^^ 
 >x : T
@@ -205,7 +205,7 @@ b3 = x.a3;
 >a3 : <T>(x: T) => void
 >   : ^ ^^ ^^ ^^^^^    
 
-var b4: <T, U>(x: T, y: U) => string; 
+declare var b4: <T, U>(x: T, y: U) => string; 
 >b4 : <T, U>(x: T, y: U) => string
 >   : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^      
 >x : T
@@ -237,7 +237,7 @@ b4 = x.a4;
 >a4 : <T, U>(x: T, y: U) => string
 >   : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^      
 
-var b5: <T, U>(x: (arg: T) => U) => T; 
+declare var b5: <T, U>(x: (arg: T) => U) => T; 
 >b5 : <T, U>(x: (arg: T) => U) => T
 >   : ^ ^^ ^^ ^^             ^^^^^ 
 >x : (arg: T) => U
@@ -269,7 +269,7 @@ b5 = x.a5;
 >a5 : <T, U>(x: (arg: T) => U) => T
 >   : ^ ^^ ^^ ^^             ^^^^^ 
 
-var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+declare var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 >b11 : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
 >    : ^ ^^ ^^ ^^           ^^ ^^                   ^^^^^    
 >x : { foo: T; }
@@ -307,7 +307,7 @@ b11 = x.a11;
 >a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
 >    : ^ ^^ ^^           ^^ ^^                   ^^^^^    
 
-var b16: <T>(x: { a: T; b: T }) => T[]; 
+declare var b16: <T>(x: { a: T; b: T }) => T[]; 
 >b16 : <T>(x: { a: T; b: T; }) => T[]
 >    : ^ ^^ ^^               ^^^^^   
 >x : { a: T; b: T; }
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.errors.txt
index 0563b2842532d..60511bef2fe75 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.errors.txt
@@ -25,9 +25,9 @@ assignmentCompatWithCallSignaturesWithOptionalParameters.ts(45,5): error TS2322:
         a5: (x?: number, y?: number) => number;
         a6: (x: number, y: number) => number;
     }
-    var b: Base;
+    declare var b: Base;
     
-    var a: () => number;
+    declare var a: () => number;
         a = () => 1 // ok, same number of required params
         a = (x?: number) => 1; // ok, same number of required params
         a = (x: number) => 1; // error, too many required params
@@ -50,7 +50,7 @@ assignmentCompatWithCallSignaturesWithOptionalParameters.ts(45,5): error TS2322:
 !!! error TS2322: Type '(x: number, y: number) => number' is not assignable to type '() => number'.
 !!! error TS2322:   Target signature provides too few arguments. Expected 2 or more, but got 0.
     
-    var a2: (x?: number) => number; 
+    declare var a2: (x?: number) => number; 
         a2 = () => 1; // ok, same number of required params
         a2 = (x?: number) => 1; // ok, same number of required params
         a2 = (x: number) => 1; // ok, same number of params
@@ -64,7 +64,7 @@ assignmentCompatWithCallSignaturesWithOptionalParameters.ts(45,5): error TS2322:
 !!! error TS2322: Type '(x: number, y: number) => number' is not assignable to type '(x?: number) => number'.
 !!! error TS2322:   Target signature provides too few arguments. Expected 2 or more, but got 1.
     
-    var a3: (x: number) => number; 
+    declare var a3: (x: number) => number; 
         a3 = () => 1; // ok, fewer required params
         a3 = (x?: number) => 1; // ok, fewer required params
         a3 = (x: number) => 1; // ok, same number of required params
@@ -82,7 +82,7 @@ assignmentCompatWithCallSignaturesWithOptionalParameters.ts(45,5): error TS2322:
 !!! error TS2322: Type '(x: number, y: number) => number' is not assignable to type '(x: number) => number'.
 !!! error TS2322:   Target signature provides too few arguments. Expected 2 or more, but got 1.
     
-    var a4: (x: number, y?: number) => number;
+    declare var a4: (x: number, y?: number) => number;
         a4 = () => 1; // ok, fewer required params
         a4 = (x?: number, y?: number) => 1; // ok, fewer required params
         a4 = (x: number) => 1; // ok, same number of required params
@@ -94,7 +94,7 @@ assignmentCompatWithCallSignaturesWithOptionalParameters.ts(45,5): error TS2322:
         a4 = b.a5; // ok
         a4 = b.a6; // ok, same number of params
     
-    var a5: (x?: number, y?: number) => number;
+    declare var a5: (x?: number, y?: number) => number;
         a5 = () => 1; // ok, fewer required params
         a5 = (x?: number, y?: number) => 1; // ok, fewer required params
         a5 = (x: number) => 1; // ok, fewer params in lambda
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.js b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.js
index 255e10e1ecf13..21cabbf0bea02 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.js
@@ -11,9 +11,9 @@ interface Base {
     a5: (x?: number, y?: number) => number;
     a6: (x: number, y: number) => number;
 }
-var b: Base;
+declare var b: Base;
 
-var a: () => number;
+declare var a: () => number;
     a = () => 1 // ok, same number of required params
     a = (x?: number) => 1; // ok, same number of required params
     a = (x: number) => 1; // error, too many required params
@@ -24,7 +24,7 @@ var a: () => number;
     a = b.a5; // ok
     a = b.a6; // error
 
-var a2: (x?: number) => number; 
+declare var a2: (x?: number) => number; 
     a2 = () => 1; // ok, same number of required params
     a2 = (x?: number) => 1; // ok, same number of required params
     a2 = (x: number) => 1; // ok, same number of params
@@ -35,7 +35,7 @@ var a2: (x?: number) => number;
     a2 = b.a5; // ok
     a2 = b.a6; // error
 
-var a3: (x: number) => number; 
+declare var a3: (x: number) => number; 
     a3 = () => 1; // ok, fewer required params
     a3 = (x?: number) => 1; // ok, fewer required params
     a3 = (x: number) => 1; // ok, same number of required params
@@ -47,7 +47,7 @@ var a3: (x: number) => number;
     a3 = b.a5; // ok
     a3 = b.a6; // error
 
-var a4: (x: number, y?: number) => number;
+declare var a4: (x: number, y?: number) => number;
     a4 = () => 1; // ok, fewer required params
     a4 = (x?: number, y?: number) => 1; // ok, fewer required params
     a4 = (x: number) => 1; // ok, same number of required params
@@ -59,7 +59,7 @@ var a4: (x: number, y?: number) => number;
     a4 = b.a5; // ok
     a4 = b.a6; // ok, same number of params
 
-var a5: (x?: number, y?: number) => number;
+declare var a5: (x?: number, y?: number) => number;
     a5 = () => 1; // ok, fewer required params
     a5 = (x?: number, y?: number) => 1; // ok, fewer required params
     a5 = (x: number) => 1; // ok, fewer params in lambda
@@ -73,8 +73,6 @@ var a5: (x?: number, y?: number) => number;
 
 //// [assignmentCompatWithCallSignaturesWithOptionalParameters.js]
 // call signatures in derived types must have the same or fewer optional parameters as the base type
-var b;
-var a;
 a = function () { return 1; }; // ok, same number of required params
 a = function (x) { return 1; }; // ok, same number of required params
 a = function (x) { return 1; }; // error, too many required params
@@ -84,7 +82,6 @@ a = b.a3; // error
 a = b.a4; // error
 a = b.a5; // ok
 a = b.a6; // error
-var a2;
 a2 = function () { return 1; }; // ok, same number of required params
 a2 = function (x) { return 1; }; // ok, same number of required params
 a2 = function (x) { return 1; }; // ok, same number of params
@@ -94,7 +91,6 @@ a2 = b.a3; // ok, same number of params
 a2 = b.a4; // ok, excess params are optional in b.a3
 a2 = b.a5; // ok
 a2 = b.a6; // error
-var a3;
 a3 = function () { return 1; }; // ok, fewer required params
 a3 = function (x) { return 1; }; // ok, fewer required params
 a3 = function (x) { return 1; }; // ok, same number of required params
@@ -105,7 +101,6 @@ a3 = b.a3; // ok
 a3 = b.a4; // ok
 a3 = b.a5; // ok
 a3 = b.a6; // error
-var a4;
 a4 = function () { return 1; }; // ok, fewer required params
 a4 = function (x, y) { return 1; }; // ok, fewer required params
 a4 = function (x) { return 1; }; // ok, same number of required params
@@ -116,7 +111,6 @@ a4 = b.a3; // ok
 a4 = b.a4; // ok
 a4 = b.a5; // ok
 a4 = b.a6; // ok, same number of params
-var a5;
 a5 = function () { return 1; }; // ok, fewer required params
 a5 = function (x, y) { return 1; }; // ok, fewer required params
 a5 = function (x) { return 1; }; // ok, fewer params in lambda
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.symbols b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.symbols
index c0328bd27141a..10eaed7c30204 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.symbols
+++ b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.symbols
@@ -32,280 +32,280 @@ interface Base {
 >x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 8, 9))
 >y : Symbol(y, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 8, 19))
 }
-var b: Base;
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+declare var b: Base;
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 0, 0))
 
-var a: () => number;
->a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 3))
+declare var a: () => number;
+>a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 11))
 
     a = () => 1 // ok, same number of required params
->a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 11))
 
     a = (x?: number) => 1; // ok, same number of required params
->a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 14, 9))
 
     a = (x: number) => 1; // error, too many required params
->a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 15, 9))
 
     a = b.a; // ok
->a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 11))
 >b.a : Symbol(Base.a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 2, 16))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a : Symbol(Base.a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 2, 16))
 
     a = b.a2; // ok
->a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 11))
 >b.a2 : Symbol(Base.a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 3, 20))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a2 : Symbol(Base.a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 3, 20))
 
     a = b.a3; // error
->a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 11))
 >b.a3 : Symbol(Base.a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 4, 31))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a3 : Symbol(Base.a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 4, 31))
 
     a = b.a4; // error
->a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 11))
 >b.a4 : Symbol(Base.a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 5, 30))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a4 : Symbol(Base.a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 5, 30))
 
     a = b.a5; // ok
->a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 11))
 >b.a5 : Symbol(Base.a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 6, 42))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a5 : Symbol(Base.a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 6, 42))
 
     a = b.a6; // error
->a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 12, 11))
 >b.a6 : Symbol(Base.a6, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 7, 43))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a6 : Symbol(Base.a6, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 7, 43))
 
-var a2: (x?: number) => number; 
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 9))
+declare var a2: (x?: number) => number; 
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 17))
 
     a2 = () => 1; // ok, same number of required params
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 11))
 
     a2 = (x?: number) => 1; // ok, same number of required params
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 25, 10))
 
     a2 = (x: number) => 1; // ok, same number of params
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 26, 10))
 
     a2 = b.a; // ok
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 11))
 >b.a : Symbol(Base.a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 2, 16))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a : Symbol(Base.a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 2, 16))
 
     a2 = b.a2; // ok
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 11))
 >b.a2 : Symbol(Base.a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 3, 20))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a2 : Symbol(Base.a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 3, 20))
 
     a2 = b.a3; // ok, same number of params
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 11))
 >b.a3 : Symbol(Base.a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 4, 31))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a3 : Symbol(Base.a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 4, 31))
 
     a2 = b.a4; // ok, excess params are optional in b.a3
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 11))
 >b.a4 : Symbol(Base.a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 5, 30))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a4 : Symbol(Base.a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 5, 30))
 
     a2 = b.a5; // ok
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 11))
 >b.a5 : Symbol(Base.a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 6, 42))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a5 : Symbol(Base.a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 6, 42))
 
     a2 = b.a6; // error
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 23, 11))
 >b.a6 : Symbol(Base.a6, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 7, 43))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a6 : Symbol(Base.a6, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 7, 43))
 
-var a3: (x: number) => number; 
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 9))
+declare var a3: (x: number) => number; 
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 17))
 
     a3 = () => 1; // ok, fewer required params
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 11))
 
     a3 = (x?: number) => 1; // ok, fewer required params
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 36, 10))
 
     a3 = (x: number) => 1; // ok, same number of required params
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 37, 10))
 
     a3 = (x: number, y: number) => 1;  // error, too many required params
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 38, 10))
 >y : Symbol(y, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 38, 20))
 
     a3 = b.a; // ok
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 11))
 >b.a : Symbol(Base.a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 2, 16))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a : Symbol(Base.a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 2, 16))
 
     a3 = b.a2; // ok
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 11))
 >b.a2 : Symbol(Base.a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 3, 20))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a2 : Symbol(Base.a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 3, 20))
 
     a3 = b.a3; // ok
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 11))
 >b.a3 : Symbol(Base.a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 4, 31))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a3 : Symbol(Base.a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 4, 31))
 
     a3 = b.a4; // ok
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 11))
 >b.a4 : Symbol(Base.a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 5, 30))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a4 : Symbol(Base.a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 5, 30))
 
     a3 = b.a5; // ok
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 11))
 >b.a5 : Symbol(Base.a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 6, 42))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a5 : Symbol(Base.a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 6, 42))
 
     a3 = b.a6; // error
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 34, 11))
 >b.a6 : Symbol(Base.a6, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 7, 43))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a6 : Symbol(Base.a6, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 7, 43))
 
-var a4: (x: number, y?: number) => number;
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 9))
->y : Symbol(y, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 19))
+declare var a4: (x: number, y?: number) => number;
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 17))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 27))
 
     a4 = () => 1; // ok, fewer required params
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 11))
 
     a4 = (x?: number, y?: number) => 1; // ok, fewer required params
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 48, 10))
 >y : Symbol(y, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 48, 21))
 
     a4 = (x: number) => 1; // ok, same number of required params
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 49, 10))
 
     a4 = (x: number, y: number) => 1; // ok, same number of params
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 50, 10))
 >y : Symbol(y, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 50, 20))
 
     a4 = b.a; // ok
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 11))
 >b.a : Symbol(Base.a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 2, 16))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a : Symbol(Base.a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 2, 16))
 
     a4 = b.a2; // ok
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 11))
 >b.a2 : Symbol(Base.a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 3, 20))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a2 : Symbol(Base.a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 3, 20))
 
     a4 = b.a3; // ok
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 11))
 >b.a3 : Symbol(Base.a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 4, 31))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a3 : Symbol(Base.a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 4, 31))
 
     a4 = b.a4; // ok
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 11))
 >b.a4 : Symbol(Base.a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 5, 30))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a4 : Symbol(Base.a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 5, 30))
 
     a4 = b.a5; // ok
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 11))
 >b.a5 : Symbol(Base.a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 6, 42))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a5 : Symbol(Base.a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 6, 42))
 
     a4 = b.a6; // ok, same number of params
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 46, 11))
 >b.a6 : Symbol(Base.a6, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 7, 43))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a6 : Symbol(Base.a6, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 7, 43))
 
-var a5: (x?: number, y?: number) => number;
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 3))
->x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 9))
->y : Symbol(y, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 20))
+declare var a5: (x?: number, y?: number) => number;
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 11))
+>x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 17))
+>y : Symbol(y, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 28))
 
     a5 = () => 1; // ok, fewer required params
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 11))
 
     a5 = (x?: number, y?: number) => 1; // ok, fewer required params
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 60, 10))
 >y : Symbol(y, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 60, 21))
 
     a5 = (x: number) => 1; // ok, fewer params in lambda
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 61, 10))
 
     a5 = (x: number, y: number) => 1;  // ok, same number of params
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 62, 10))
 >y : Symbol(y, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 62, 20))
 
     a5 = b.a; // ok
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 11))
 >b.a : Symbol(Base.a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 2, 16))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a : Symbol(Base.a, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 2, 16))
 
     a5 = b.a2; // ok
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 11))
 >b.a2 : Symbol(Base.a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 3, 20))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a2 : Symbol(Base.a2, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 3, 20))
 
     a5 = b.a3; // ok, fewer params in b.a3
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 11))
 >b.a3 : Symbol(Base.a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 4, 31))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a3 : Symbol(Base.a3, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 4, 31))
 
     a5 = b.a4; // ok, same number of params
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 11))
 >b.a4 : Symbol(Base.a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 5, 30))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a4 : Symbol(Base.a4, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 5, 30))
 
     a5 = b.a5; // ok
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 11))
 >b.a5 : Symbol(Base.a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 6, 42))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a5 : Symbol(Base.a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 6, 42))
 
     a5 = b.a6; // ok, same number of params
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 58, 11))
 >b.a6 : Symbol(Base.a6, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 7, 43))
->b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 10, 11))
 >a6 : Symbol(Base.a6, Decl(assignmentCompatWithCallSignaturesWithOptionalParameters.ts, 7, 43))
 
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.types b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.types
index d8155c6bf4f84..fd29872450ef3 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.types
@@ -44,11 +44,11 @@ interface Base {
 >y : number
 >  : ^^^^^^
 }
-var b: Base;
+declare var b: Base;
 >b : Base
 >  : ^^^^
 
-var a: () => number;
+declare var a: () => number;
 >a : () => number
 >  : ^^^^^^      
 
@@ -158,7 +158,7 @@ var a: () => number;
 >a6 : (x: number, y: number) => number
 >   : ^ ^^      ^^ ^^      ^^^^^      
 
-var a2: (x?: number) => number; 
+declare var a2: (x?: number) => number; 
 >a2 : (x?: number) => number
 >   : ^ ^^^      ^^^^^      
 >x : number
@@ -270,7 +270,7 @@ var a2: (x?: number) => number;
 >a6 : (x: number, y: number) => number
 >   : ^ ^^      ^^ ^^      ^^^^^      
 
-var a3: (x: number) => number; 
+declare var a3: (x: number) => number; 
 >a3 : (x: number) => number
 >   : ^ ^^      ^^^^^      
 >x : number
@@ -396,7 +396,7 @@ var a3: (x: number) => number;
 >a6 : (x: number, y: number) => number
 >   : ^ ^^      ^^ ^^      ^^^^^      
 
-var a4: (x: number, y?: number) => number;
+declare var a4: (x: number, y?: number) => number;
 >a4 : (x: number, y?: number) => number
 >   : ^ ^^      ^^ ^^^      ^^^^^      
 >x : number
@@ -526,7 +526,7 @@ var a4: (x: number, y?: number) => number;
 >a6 : (x: number, y: number) => number
 >   : ^ ^^      ^^ ^^      ^^^^^      
 
-var a5: (x?: number, y?: number) => number;
+declare var a5: (x?: number, y?: number) => number;
 >a5 : (x?: number, y?: number) => number
 >   : ^ ^^^      ^^ ^^^      ^^^^^      
 >x : number
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures.errors.txt
index 7ce4e3e9b02c9..8cb0c28423fd6 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures.errors.txt
@@ -22,8 +22,8 @@ assignmentCompatWithConstructSignatures.ts(35,1): error TS2322: Type '(x: string
     interface T {
         new (x: number): void;
     }
-    var t: T;
-    var a: { new (x: number): void };
+    declare var t: T;
+    declare var a: { new (x: number): void };
     
     t = a;
     a = t;
@@ -31,8 +31,8 @@ assignmentCompatWithConstructSignatures.ts(35,1): error TS2322: Type '(x: string
     interface S {
         new (x: number): string;
     }
-    var s: S;
-    var a2: { new (x: number): string };
+    declare var s: S;
+    declare var a2: { new (x: number): string };
     t = s;
     t = a2;
     a = s;
@@ -41,8 +41,8 @@ assignmentCompatWithConstructSignatures.ts(35,1): error TS2322: Type '(x: string
     interface S2 {
         (x: string): void;
     }
-    var s2: S2;
-    var a3: { (x: string): void };
+    declare var s2: S2;
+    declare var a3: { (x: string): void };
     // these are errors
     t = s2;
     ~
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures.js
index 91f4bad4f16ed..fc3f1032914b4 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures.js
@@ -6,8 +6,8 @@
 interface T {
     new (x: number): void;
 }
-var t: T;
-var a: { new (x: number): void };
+declare var t: T;
+declare var a: { new (x: number): void };
 
 t = a;
 a = t;
@@ -15,8 +15,8 @@ a = t;
 interface S {
     new (x: number): string;
 }
-var s: S;
-var a2: { new (x: number): string };
+declare var s: S;
+declare var a2: { new (x: number): string };
 t = s;
 t = a2;
 a = s;
@@ -25,8 +25,8 @@ a = a2;
 interface S2 {
     (x: string): void;
 }
-var s2: S2;
-var a3: { (x: string): void };
+declare var s2: S2;
+declare var a3: { (x: string): void };
 // these are errors
 t = s2;
 t = a3;
@@ -40,18 +40,12 @@ a = function (x: string) { return ''; }
 
 //// [assignmentCompatWithConstructSignatures.js]
 // void returning call signatures can be assigned a non-void returning call signature that otherwise matches
-var t;
-var a;
 t = a;
 a = t;
-var s;
-var a2;
 t = s;
 t = a2;
 a = s;
 a = a2;
-var s2;
-var a3;
 // these are errors
 t = s2;
 t = a3;
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures.symbols b/tests/baselines/reference/assignmentCompatWithConstructSignatures.symbols
index 669fbe2e80306..f821652ec2158 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures.symbols
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures.symbols
@@ -9,21 +9,21 @@ interface T {
     new (x: number): void;
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures.ts, 3, 9))
 }
-var t: T;
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 3))
+declare var t: T;
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 11))
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures.ts, 0, 0))
 
-var a: { new (x: number): void };
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures.ts, 6, 14))
+declare var a: { new (x: number): void };
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures.ts, 6, 22))
 
 t = a;
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 3))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 11))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 11))
 
 a = t;
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 3))
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 11))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 11))
 
 interface S {
 >S : Symbol(S, Decl(assignmentCompatWithConstructSignatures.ts, 9, 6))
@@ -31,29 +31,29 @@ interface S {
     new (x: number): string;
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures.ts, 12, 9))
 }
-var s: S;
->s : Symbol(s, Decl(assignmentCompatWithConstructSignatures.ts, 14, 3))
+declare var s: S;
+>s : Symbol(s, Decl(assignmentCompatWithConstructSignatures.ts, 14, 11))
 >S : Symbol(S, Decl(assignmentCompatWithConstructSignatures.ts, 9, 6))
 
-var a2: { new (x: number): string };
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures.ts, 15, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures.ts, 15, 15))
+declare var a2: { new (x: number): string };
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures.ts, 15, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures.ts, 15, 23))
 
 t = s;
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 3))
->s : Symbol(s, Decl(assignmentCompatWithConstructSignatures.ts, 14, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 11))
+>s : Symbol(s, Decl(assignmentCompatWithConstructSignatures.ts, 14, 11))
 
 t = a2;
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 3))
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures.ts, 15, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures.ts, 15, 11))
 
 a = s;
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 3))
->s : Symbol(s, Decl(assignmentCompatWithConstructSignatures.ts, 14, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 11))
+>s : Symbol(s, Decl(assignmentCompatWithConstructSignatures.ts, 14, 11))
 
 a = a2;
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 3))
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures.ts, 15, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures.ts, 15, 11))
 
 interface S2 {
 >S2 : Symbol(S2, Decl(assignmentCompatWithConstructSignatures.ts, 19, 7))
@@ -61,44 +61,44 @@ interface S2 {
     (x: string): void;
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures.ts, 22, 5))
 }
-var s2: S2;
->s2 : Symbol(s2, Decl(assignmentCompatWithConstructSignatures.ts, 24, 3))
+declare var s2: S2;
+>s2 : Symbol(s2, Decl(assignmentCompatWithConstructSignatures.ts, 24, 11))
 >S2 : Symbol(S2, Decl(assignmentCompatWithConstructSignatures.ts, 19, 7))
 
-var a3: { (x: string): void };
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures.ts, 25, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures.ts, 25, 11))
+declare var a3: { (x: string): void };
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures.ts, 25, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures.ts, 25, 19))
 
 // these are errors
 t = s2;
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 3))
->s2 : Symbol(s2, Decl(assignmentCompatWithConstructSignatures.ts, 24, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 11))
+>s2 : Symbol(s2, Decl(assignmentCompatWithConstructSignatures.ts, 24, 11))
 
 t = a3;
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 3))
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures.ts, 25, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 11))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures.ts, 25, 11))
 
 t = (x: string) => 1;
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 11))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures.ts, 29, 5))
 
 t = function (x: string) { return ''; }
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures.ts, 5, 11))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures.ts, 30, 14))
 
 a = s2;
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 3))
->s2 : Symbol(s2, Decl(assignmentCompatWithConstructSignatures.ts, 24, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 11))
+>s2 : Symbol(s2, Decl(assignmentCompatWithConstructSignatures.ts, 24, 11))
 
 a = a3;
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 3))
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures.ts, 25, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 11))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures.ts, 25, 11))
 
 a = (x: string) => 1;
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 11))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures.ts, 33, 5))
 
 a = function (x: string) { return ''; }
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures.ts, 6, 11))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures.ts, 34, 14))
 
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures.types
index d804a060bf046..90caadee6839f 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures.types
@@ -8,11 +8,11 @@ interface T {
 >x : number
 >  : ^^^^^^
 }
-var t: T;
+declare var t: T;
 >t : T
 >  : ^
 
-var a: { new (x: number): void };
+declare var a: { new (x: number): void };
 >a : new (x: number) => void
 >  : ^^^^^ ^^      ^^^^^    
 >x : number
@@ -39,11 +39,11 @@ interface S {
 >x : number
 >  : ^^^^^^
 }
-var s: S;
+declare var s: S;
 >s : S
 >  : ^
 
-var a2: { new (x: number): string };
+declare var a2: { new (x: number): string };
 >a2 : new (x: number) => string
 >   : ^^^^^ ^^      ^^^^^      
 >x : number
@@ -86,11 +86,11 @@ interface S2 {
 >x : string
 >  : ^^^^^^
 }
-var s2: S2;
+declare var s2: S2;
 >s2 : S2
 >   : ^^
 
-var a3: { (x: string): void };
+declare var a3: { (x: string): void };
 >a3 : (x: string) => void
 >   : ^ ^^      ^^^^^    
 >x : string
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt
index e9d188fca97ec..45b8a1966e59a 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.errors.txt
@@ -30,8 +30,8 @@ assignmentCompatWithConstructSignatures2.ts(41,1): error TS2322: Type '(x: strin
     interface T {
         f: new (x: number) => void;
     }
-    var t: T;
-    var a: { f: new (x: number) => void };
+    declare var t: T;
+    declare var a: { f: new (x: number) => void };
     
     t = a;
     a = t;
@@ -39,8 +39,8 @@ assignmentCompatWithConstructSignatures2.ts(41,1): error TS2322: Type '(x: strin
     interface S {
         f: new (x: number) => string;
     }
-    var s: S;
-    var a2: { f: new (x: number) => string };
+    declare var s: S;
+    declare var a2: { f: new (x: number) => string };
     t = s;
     t = a2;
     a = s;
@@ -63,8 +63,8 @@ assignmentCompatWithConstructSignatures2.ts(41,1): error TS2322: Type '(x: strin
     interface S2 {
         f(x: string): void;
     }
-    var s2: S2;
-    var a3: { f(x: string): void };
+    declare var s2: S2;
+    declare var a3: { f(x: string): void };
     // these are errors
     t = s2;
     ~
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.js
index 68173d62aca87..137507b68a57b 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.js
@@ -6,8 +6,8 @@
 interface T {
     f: new (x: number) => void;
 }
-var t: T;
-var a: { f: new (x: number) => void };
+declare var t: T;
+declare var a: { f: new (x: number) => void };
 
 t = a;
 a = t;
@@ -15,8 +15,8 @@ a = t;
 interface S {
     f: new (x: number) => string;
 }
-var s: S;
-var a2: { f: new (x: number) => string };
+declare var s: S;
+declare var a2: { f: new (x: number) => string };
 t = s;
 t = a2;
 a = s;
@@ -31,8 +31,8 @@ a = function (x: number) { return ''; }
 interface S2 {
     f(x: string): void;
 }
-var s2: S2;
-var a3: { f(x: string): void };
+declare var s2: S2;
+declare var a3: { f(x: string): void };
 // these are errors
 t = s2;
 t = a3;
@@ -46,12 +46,8 @@ a = function (x: string) { return ''; }
 
 //// [assignmentCompatWithConstructSignatures2.js]
 // void returning call signatures can be assigned a non-void returning call signature that otherwise matches
-var t;
-var a;
 t = a;
 a = t;
-var s;
-var a2;
 t = s;
 t = a2;
 a = s;
@@ -61,8 +57,6 @@ t = function () { return 1; };
 t = function (x) { return ''; };
 a = function () { return 1; };
 a = function (x) { return ''; };
-var s2;
-var a3;
 // these are errors
 t = s2;
 t = a3;
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.symbols b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.symbols
index 5b543a5118a5d..a43f7aa6035ae 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.symbols
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.symbols
@@ -10,22 +10,22 @@ interface T {
 >f : Symbol(T.f, Decl(assignmentCompatWithConstructSignatures2.ts, 2, 13))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures2.ts, 3, 12))
 }
-var t: T;
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 3))
+declare var t: T;
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 11))
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures2.ts, 0, 0))
 
-var a: { f: new (x: number) => void };
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 3))
->f : Symbol(f, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 8))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 17))
+declare var a: { f: new (x: number) => void };
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 11))
+>f : Symbol(f, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 16))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 25))
 
 t = a;
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 3))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 11))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 11))
 
 a = t;
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 3))
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 11))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 11))
 
 interface S {
 >S : Symbol(S, Decl(assignmentCompatWithConstructSignatures2.ts, 9, 6))
@@ -34,44 +34,44 @@ interface S {
 >f : Symbol(S.f, Decl(assignmentCompatWithConstructSignatures2.ts, 11, 13))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures2.ts, 12, 12))
 }
-var s: S;
->s : Symbol(s, Decl(assignmentCompatWithConstructSignatures2.ts, 14, 3))
+declare var s: S;
+>s : Symbol(s, Decl(assignmentCompatWithConstructSignatures2.ts, 14, 11))
 >S : Symbol(S, Decl(assignmentCompatWithConstructSignatures2.ts, 9, 6))
 
-var a2: { f: new (x: number) => string };
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures2.ts, 15, 3))
->f : Symbol(f, Decl(assignmentCompatWithConstructSignatures2.ts, 15, 9))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures2.ts, 15, 18))
+declare var a2: { f: new (x: number) => string };
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures2.ts, 15, 11))
+>f : Symbol(f, Decl(assignmentCompatWithConstructSignatures2.ts, 15, 17))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures2.ts, 15, 26))
 
 t = s;
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 3))
->s : Symbol(s, Decl(assignmentCompatWithConstructSignatures2.ts, 14, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 11))
+>s : Symbol(s, Decl(assignmentCompatWithConstructSignatures2.ts, 14, 11))
 
 t = a2;
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 3))
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures2.ts, 15, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures2.ts, 15, 11))
 
 a = s;
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 3))
->s : Symbol(s, Decl(assignmentCompatWithConstructSignatures2.ts, 14, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 11))
+>s : Symbol(s, Decl(assignmentCompatWithConstructSignatures2.ts, 14, 11))
 
 a = a2;
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 3))
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures2.ts, 15, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures2.ts, 15, 11))
 
 // errors
 t = () => 1;
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 11))
 
 t = function (x: number) { return ''; }
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 11))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures2.ts, 23, 14))
 
 a = () => 1;
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 11))
 
 a = function (x: number) { return ''; }
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 11))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures2.ts, 25, 14))
 
 interface S2 {
@@ -81,45 +81,45 @@ interface S2 {
 >f : Symbol(S2.f, Decl(assignmentCompatWithConstructSignatures2.ts, 27, 14))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures2.ts, 28, 6))
 }
-var s2: S2;
->s2 : Symbol(s2, Decl(assignmentCompatWithConstructSignatures2.ts, 30, 3))
+declare var s2: S2;
+>s2 : Symbol(s2, Decl(assignmentCompatWithConstructSignatures2.ts, 30, 11))
 >S2 : Symbol(S2, Decl(assignmentCompatWithConstructSignatures2.ts, 25, 39))
 
-var a3: { f(x: string): void };
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures2.ts, 31, 3))
->f : Symbol(f, Decl(assignmentCompatWithConstructSignatures2.ts, 31, 9))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures2.ts, 31, 12))
+declare var a3: { f(x: string): void };
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures2.ts, 31, 11))
+>f : Symbol(f, Decl(assignmentCompatWithConstructSignatures2.ts, 31, 17))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures2.ts, 31, 20))
 
 // these are errors
 t = s2;
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 3))
->s2 : Symbol(s2, Decl(assignmentCompatWithConstructSignatures2.ts, 30, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 11))
+>s2 : Symbol(s2, Decl(assignmentCompatWithConstructSignatures2.ts, 30, 11))
 
 t = a3;
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 3))
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures2.ts, 31, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 11))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures2.ts, 31, 11))
 
 t = (x: string) => 1;
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 11))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures2.ts, 35, 5))
 
 t = function (x: string) { return ''; }
->t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 3))
+>t : Symbol(t, Decl(assignmentCompatWithConstructSignatures2.ts, 5, 11))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures2.ts, 36, 14))
 
 a = s2;
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 3))
->s2 : Symbol(s2, Decl(assignmentCompatWithConstructSignatures2.ts, 30, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 11))
+>s2 : Symbol(s2, Decl(assignmentCompatWithConstructSignatures2.ts, 30, 11))
 
 a = a3;
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 3))
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures2.ts, 31, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 11))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures2.ts, 31, 11))
 
 a = (x: string) => 1;
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 11))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures2.ts, 39, 5))
 
 a = function (x: string) { return ''; }
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures2.ts, 6, 11))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures2.ts, 40, 14))
 
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.types
index fe21cb472e55d..d60a719b76971 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.types
@@ -10,11 +10,11 @@ interface T {
 >x : number
 >  : ^^^^^^
 }
-var t: T;
+declare var t: T;
 >t : T
 >  : ^
 
-var a: { f: new (x: number) => void };
+declare var a: { f: new (x: number) => void };
 >a : { f: new (x: number) => void; }
 >  : ^^^^^                       ^^^
 >f : new (x: number) => void
@@ -45,11 +45,11 @@ interface S {
 >x : number
 >  : ^^^^^^
 }
-var s: S;
+declare var s: S;
 >s : S
 >  : ^
 
-var a2: { f: new (x: number) => string };
+declare var a2: { f: new (x: number) => string };
 >a2 : { f: new (x: number) => string; }
 >   : ^^^^^                         ^^^
 >f : new (x: number) => string
@@ -141,11 +141,11 @@ interface S2 {
 >x : string
 >  : ^^^^^^
 }
-var s2: S2;
+declare var s2: S2;
 >s2 : S2
 >   : ^^
 
-var a3: { f(x: string): void };
+declare var a3: { f(x: string): void };
 >a3 : { f(x: string): void; }
 >   : ^^^^ ^^      ^^^    ^^^
 >f : (x: string) => void
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt
index ce2b75804682f..6155cd83cf730 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.errors.txt
@@ -70,33 +70,33 @@ assignmentCompatWithConstructSignatures3.ts(86,1): error TS2322: Type 'new (x: {
     class Derived2 extends Derived { baz: string; }
     class OtherDerived extends Base { bing: string; }
     
-    var a: new (x: number) => number[];
-    var a2: new (x: number) => string[];
-    var a3: new (x: number) => void;
-    var a4: new (x: string, y: number) => string;
-    var a5: new (x: (arg: string) => number) => string;
-    var a6: new (x: (arg: Base) => Derived) => Base;
-    var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
-    var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-    var a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-    var a10: new (...x: Derived[]) => Derived;
-    var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
-    var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
-    var a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
-    var a14: new (x: { a: string; b: number }) => Object;
-    var a15: {
+    declare var a: new (x: number) => number[];
+    declare var a2: new (x: number) => string[];
+    declare var a3: new (x: number) => void;
+    declare var a4: new (x: string, y: number) => string;
+    declare var a5: new (x: (arg: string) => number) => string;
+    declare var a6: new (x: (arg: Base) => Derived) => Base;
+    declare var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
+    declare var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+    declare var a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+    declare var a10: new (...x: Derived[]) => Derived;
+    declare var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+    declare var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+    declare var a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
+    declare var a14: new (x: { a: string; b: number }) => Object;
+    declare var a15: {
         new (x: number): number[];
         new (x: string): string[];
     }
-    var a16: {
+    declare var a16: {
         new <T extends Derived>(x: T): number[];
         new <U extends Base>(x: U): number[];
     }
-    var a17: {
+    declare var a17: {
         new (x: new (a: number) => number): number[];
         new (x: new (a: string) => string): string[];
     };
-    var a18: {
+    declare var a18: {
         new (x: {
             new (a: number): number;
             new (a: string): string;
@@ -107,39 +107,39 @@ assignmentCompatWithConstructSignatures3.ts(86,1): error TS2322: Type 'new (x: {
         }): any[];
     }
     
-    var b: new <T>(x: T) => T[]; 
+    declare var b: new <T>(x: T) => T[]; 
     a = b; // ok
     b = a; // ok
     ~
 !!! error TS2322: Type 'new (x: number) => number[]' is not assignable to type 'new <T>(x: T) => T[]'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type 'number'.
-!!! related TS2208 assignmentCompatWithConstructSignatures3.ts:45:13: This type parameter might need an `extends number` constraint.
-    var b2: new <T>(x: T) => string[]; 
+!!! related TS2208 assignmentCompatWithConstructSignatures3.ts:45:21: This type parameter might need an `extends number` constraint.
+    declare var b2: new <T>(x: T) => string[]; 
     a2 = b2; // ok 
     b2 = a2; // ok
     ~~
 !!! error TS2322: Type 'new (x: number) => string[]' is not assignable to type 'new <T>(x: T) => string[]'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type 'number'.
-!!! related TS2208 assignmentCompatWithConstructSignatures3.ts:48:14: This type parameter might need an `extends number` constraint.
-    var b3: new <T>(x: T) => T; 
+!!! related TS2208 assignmentCompatWithConstructSignatures3.ts:48:22: This type parameter might need an `extends number` constraint.
+    declare var b3: new <T>(x: T) => T; 
     a3 = b3; // ok
     b3 = a3; // ok
     ~~
 !!! error TS2322: Type 'new (x: number) => void' is not assignable to type 'new <T>(x: T) => T'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type 'number'.
-!!! related TS2208 assignmentCompatWithConstructSignatures3.ts:51:14: This type parameter might need an `extends number` constraint.
-    var b4: new <T, U>(x: T, y: U) => T; 
+!!! related TS2208 assignmentCompatWithConstructSignatures3.ts:51:22: This type parameter might need an `extends number` constraint.
+    declare var b4: new <T, U>(x: T, y: U) => T; 
     a4 = b4; // ok
     b4 = a4; // ok
     ~~
 !!! error TS2322: Type 'new (x: string, y: number) => string' is not assignable to type 'new <T, U>(x: T, y: U) => T'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type 'string'.
-!!! related TS2208 assignmentCompatWithConstructSignatures3.ts:54:14: This type parameter might need an `extends string` constraint.
-    var b5: new <T, U>(x: (arg: T) => U) => T; 
+!!! related TS2208 assignmentCompatWithConstructSignatures3.ts:54:22: This type parameter might need an `extends string` constraint.
+    declare var b5: new <T, U>(x: (arg: T) => U) => T; 
     a5 = b5; // ok
     b5 = a5; // ok
     ~~
@@ -148,7 +148,7 @@ assignmentCompatWithConstructSignatures3.ts(86,1): error TS2322: Type 'new (x: {
 !!! error TS2322:     Types of parameters 'arg' and 'arg' are incompatible.
 !!! error TS2322:       Type 'string' is not assignable to type 'T'.
 !!! error TS2322:         'T' could be instantiated with an arbitrary type which could be unrelated to 'string'.
-    var b6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
+    declare var b6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
     a6 = b6; // ok
     b6 = a6; // ok
     ~~
@@ -157,7 +157,7 @@ assignmentCompatWithConstructSignatures3.ts(86,1): error TS2322: Type 'new (x: {
 !!! error TS2322:     Types of parameters 'arg' and 'arg' are incompatible.
 !!! error TS2322:       Type 'Base' is not assignable to type 'T'.
 !!! error TS2322:         'Base' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Base'.
-    var b7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
+    declare var b7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
     a7 = b7; // ok
     b7 = a7; // ok
     ~~
@@ -166,7 +166,7 @@ assignmentCompatWithConstructSignatures3.ts(86,1): error TS2322: Type 'new (x: {
 !!! error TS2322:     Types of parameters 'arg' and 'arg' are incompatible.
 !!! error TS2322:       Type 'Base' is not assignable to type 'T'.
 !!! error TS2322:         'Base' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Base'.
-    var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
+    declare var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
     a8 = b8; // ok
     b8 = a8; // ok
     ~~
@@ -175,7 +175,7 @@ assignmentCompatWithConstructSignatures3.ts(86,1): error TS2322: Type 'new (x: {
 !!! error TS2322:     Types of parameters 'arg' and 'arg' are incompatible.
 !!! error TS2322:       Type 'Base' is not assignable to type 'T'.
 !!! error TS2322:         'Base' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Base'.
-    var b9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
+    declare var b9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
     a9 = b9; // ok
     b9 = a9; // ok
     ~~
@@ -184,14 +184,14 @@ assignmentCompatWithConstructSignatures3.ts(86,1): error TS2322: Type 'new (x: {
 !!! error TS2322:     Types of parameters 'arg' and 'arg' are incompatible.
 !!! error TS2322:       Type 'Base' is not assignable to type 'T'.
 !!! error TS2322:         'Base' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Base'.
-    var b10: new <T extends Derived>(...x: T[]) => T; 
+    declare var b10: new <T extends Derived>(...x: T[]) => T; 
     a10 = b10; // ok
     b10 = a10; // ok
     ~~~
 !!! error TS2322: Type 'new (...x: Derived[]) => Derived' is not assignable to type 'new <T extends Derived>(...x: T[]) => T'.
 !!! error TS2322:   Type 'Derived' is not assignable to type 'T'.
 !!! error TS2322:     'Derived' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Derived'.
-    var b11: new <T extends Base>(x: T, y: T) => T; 
+    declare var b11: new <T extends Base>(x: T, y: T) => T; 
     a11 = b11; // ok
     b11 = a11; // ok
     ~~~
@@ -199,8 +199,8 @@ assignmentCompatWithConstructSignatures3.ts(86,1): error TS2322: Type 'new (x: {
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type '{ foo: string; bar: string; }'.
 !!! error TS2322:       Property 'bar' is missing in type 'Base' but required in type '{ foo: string; bar: string; }'.
-!!! related TS2728 assignmentCompatWithConstructSignatures3.ts:18:53: 'bar' is declared here.
-    var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
+!!! related TS2728 assignmentCompatWithConstructSignatures3.ts:18:61: 'bar' is declared here.
+    declare var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
     a12 = b12; // ok
     b12 = a12; // ok
     ~~~
@@ -209,14 +209,14 @@ assignmentCompatWithConstructSignatures3.ts(86,1): error TS2322: Type 'new (x: {
 !!! error TS2322:     Type 'T' is not assignable to type 'Derived2[]'.
 !!! error TS2322:       Type 'Base[]' is not assignable to type 'Derived2[]'.
 !!! error TS2322:         Type 'Base' is missing the following properties from type 'Derived2': baz, bar
-    var b13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
+    declare var b13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
     a13 = b13; // ok
     b13 = a13; // ok
     ~~~
 !!! error TS2322: Type 'new (x: Base[], y: Derived[]) => Derived[]' is not assignable to type 'new <T extends Array<Derived>>(x: Base[], y: T) => T'.
 !!! error TS2322:   Type 'Derived[]' is not assignable to type 'T'.
 !!! error TS2322:     'Derived[]' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Derived[]'.
-    var b14: new <T>(x: { a: T; b: T }) => T; 
+    declare var b14: new <T>(x: { a: T; b: T }) => T; 
     a14 = b14; // ok
     ~~~
 !!! error TS2322: Type 'new <T>(x: { a: T; b: T; }) => T' is not assignable to type 'new (x: { a: string; b: number; }) => Object'.
@@ -231,17 +231,17 @@ assignmentCompatWithConstructSignatures3.ts(86,1): error TS2322: Type 'new (x: {
 !!! error TS2322:     Type '{ a: T; b: T; }' is not assignable to type '{ a: string; b: number; }'.
 !!! error TS2322:       Types of property 'a' are incompatible.
 !!! error TS2322:         Type 'T' is not assignable to type 'string'.
-!!! related TS2208 assignmentCompatWithConstructSignatures3.ts:84:15: This type parameter might need an `extends string` constraint.
-    var b15: new <T>(x: T) => T[]; 
+!!! related TS2208 assignmentCompatWithConstructSignatures3.ts:84:23: This type parameter might need an `extends string` constraint.
+    declare var b15: new <T>(x: T) => T[]; 
     a15 = b15; // ok
     b15 = a15; // ok
-    var b16: new <T extends Base>(x: T) => number[];
+    declare var b16: new <T extends Base>(x: T) => number[];
     a16 = b16; // ok
     b16 = a16; // ok
-    var b17: new <T>(x: new (a: T) => T) => T[]; // ok
+    declare var b17: new <T>(x: new (a: T) => T) => T[]; // ok
     a17 = b17; // ok
     b17 = a17; // ok
-    var b18: new <T>(x: new (a: T) => T) => T[]; 
+    declare var b18: new <T>(x: new (a: T) => T) => T[]; 
     a18 = b18; // ok
     b18 = a18; // ok
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
index c529a6599cd05..4e018ae363ac3 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
@@ -8,33 +8,33 @@ class Derived extends Base { bar: string; }
 class Derived2 extends Derived { baz: string; }
 class OtherDerived extends Base { bing: string; }
 
-var a: new (x: number) => number[];
-var a2: new (x: number) => string[];
-var a3: new (x: number) => void;
-var a4: new (x: string, y: number) => string;
-var a5: new (x: (arg: string) => number) => string;
-var a6: new (x: (arg: Base) => Derived) => Base;
-var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
-var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-var a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-var a10: new (...x: Derived[]) => Derived;
-var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
-var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
-var a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
-var a14: new (x: { a: string; b: number }) => Object;
-var a15: {
+declare var a: new (x: number) => number[];
+declare var a2: new (x: number) => string[];
+declare var a3: new (x: number) => void;
+declare var a4: new (x: string, y: number) => string;
+declare var a5: new (x: (arg: string) => number) => string;
+declare var a6: new (x: (arg: Base) => Derived) => Base;
+declare var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
+declare var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+declare var a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+declare var a10: new (...x: Derived[]) => Derived;
+declare var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+declare var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+declare var a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
+declare var a14: new (x: { a: string; b: number }) => Object;
+declare var a15: {
     new (x: number): number[];
     new (x: string): string[];
 }
-var a16: {
+declare var a16: {
     new <T extends Derived>(x: T): number[];
     new <U extends Base>(x: U): number[];
 }
-var a17: {
+declare var a17: {
     new (x: new (a: number) => number): number[];
     new (x: new (a: string) => string): string[];
 };
-var a18: {
+declare var a18: {
     new (x: {
         new (a: number): number;
         new (a: string): string;
@@ -45,58 +45,58 @@ var a18: {
     }): any[];
 }
 
-var b: new <T>(x: T) => T[]; 
+declare var b: new <T>(x: T) => T[]; 
 a = b; // ok
 b = a; // ok
-var b2: new <T>(x: T) => string[]; 
+declare var b2: new <T>(x: T) => string[]; 
 a2 = b2; // ok 
 b2 = a2; // ok
-var b3: new <T>(x: T) => T; 
+declare var b3: new <T>(x: T) => T; 
 a3 = b3; // ok
 b3 = a3; // ok
-var b4: new <T, U>(x: T, y: U) => T; 
+declare var b4: new <T, U>(x: T, y: U) => T; 
 a4 = b4; // ok
 b4 = a4; // ok
-var b5: new <T, U>(x: (arg: T) => U) => T; 
+declare var b5: new <T, U>(x: (arg: T) => U) => T; 
 a5 = b5; // ok
 b5 = a5; // ok
-var b6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
+declare var b6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
 a6 = b6; // ok
 b6 = a6; // ok
-var b7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
+declare var b7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
 a7 = b7; // ok
 b7 = a7; // ok
-var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
+declare var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
 a8 = b8; // ok
 b8 = a8; // ok
-var b9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
+declare var b9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
 a9 = b9; // ok
 b9 = a9; // ok
-var b10: new <T extends Derived>(...x: T[]) => T; 
+declare var b10: new <T extends Derived>(...x: T[]) => T; 
 a10 = b10; // ok
 b10 = a10; // ok
-var b11: new <T extends Base>(x: T, y: T) => T; 
+declare var b11: new <T extends Base>(x: T, y: T) => T; 
 a11 = b11; // ok
 b11 = a11; // ok
-var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
+declare var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
 a12 = b12; // ok
 b12 = a12; // ok
-var b13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
+declare var b13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
 a13 = b13; // ok
 b13 = a13; // ok
-var b14: new <T>(x: { a: T; b: T }) => T; 
+declare var b14: new <T>(x: { a: T; b: T }) => T; 
 a14 = b14; // ok
 b14 = a14; // ok
-var b15: new <T>(x: T) => T[]; 
+declare var b15: new <T>(x: T) => T[]; 
 a15 = b15; // ok
 b15 = a15; // ok
-var b16: new <T extends Base>(x: T) => number[];
+declare var b16: new <T extends Base>(x: T) => number[];
 a16 = b16; // ok
 b16 = a16; // ok
-var b17: new <T>(x: new (a: T) => T) => T[]; // ok
+declare var b17: new <T>(x: new (a: T) => T) => T[]; // ok
 a17 = b17; // ok
 b17 = a17; // ok
-var b18: new <T>(x: new (a: T) => T) => T[]; 
+declare var b18: new <T>(x: new (a: T) => T) => T[]; 
 a18 = b18; // ok
 b18 = a18; // ok
 
@@ -144,75 +144,39 @@ var OtherDerived = /** @class */ (function (_super) {
     }
     return OtherDerived;
 }(Base));
-var a;
-var a2;
-var a3;
-var a4;
-var a5;
-var a6;
-var a7;
-var a8;
-var a9;
-var a10;
-var a11;
-var a12;
-var a13;
-var a14;
-var a15;
-var a16;
-var a17;
-var a18;
-var b;
 a = b; // ok
 b = a; // ok
-var b2;
 a2 = b2; // ok 
 b2 = a2; // ok
-var b3;
 a3 = b3; // ok
 b3 = a3; // ok
-var b4;
 a4 = b4; // ok
 b4 = a4; // ok
-var b5;
 a5 = b5; // ok
 b5 = a5; // ok
-var b6;
 a6 = b6; // ok
 b6 = a6; // ok
-var b7;
 a7 = b7; // ok
 b7 = a7; // ok
-var b8;
 a8 = b8; // ok
 b8 = a8; // ok
-var b9;
 a9 = b9; // ok
 b9 = a9; // ok
-var b10;
 a10 = b10; // ok
 b10 = a10; // ok
-var b11;
 a11 = b11; // ok
 b11 = a11; // ok
-var b12;
 a12 = b12; // ok
 b12 = a12; // ok
-var b13;
 a13 = b13; // ok
 b13 = a13; // ok
-var b14;
 a14 = b14; // ok
 b14 = a14; // ok
-var b15;
 a15 = b15; // ok
 b15 = a15; // ok
-var b16;
 a16 = b16; // ok
 b16 = a16; // ok
-var b17; // ok
 a17 = b17; // ok
 b17 = a17; // ok
-var b18;
 a18 = b18; // ok
 b18 = a18; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.symbols b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.symbols
index ce07bd3084659..df21bb936122c 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.symbols
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.symbols
@@ -22,120 +22,120 @@ class OtherDerived extends Base { bing: string; }
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
 >bing : Symbol(OtherDerived.bing, Decl(assignmentCompatWithConstructSignatures3.ts, 5, 33))
 
-var a: new (x: number) => number[];
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 7, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 7, 12))
-
-var a2: new (x: number) => string[];
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures3.ts, 8, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 8, 13))
-
-var a3: new (x: number) => void;
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures3.ts, 9, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 9, 13))
-
-var a4: new (x: string, y: number) => string;
->a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignatures3.ts, 10, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 10, 13))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 10, 23))
-
-var a5: new (x: (arg: string) => number) => string;
->a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignatures3.ts, 11, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 11, 13))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 11, 17))
-
-var a6: new (x: (arg: Base) => Derived) => Base;
->a6 : Symbol(a6, Decl(assignmentCompatWithConstructSignatures3.ts, 12, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 12, 13))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 12, 17))
+declare var a: new (x: number) => number[];
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 7, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 7, 20))
+
+declare var a2: new (x: number) => string[];
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures3.ts, 8, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 8, 21))
+
+declare var a3: new (x: number) => void;
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures3.ts, 9, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 9, 21))
+
+declare var a4: new (x: string, y: number) => string;
+>a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignatures3.ts, 10, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 10, 21))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 10, 31))
+
+declare var a5: new (x: (arg: string) => number) => string;
+>a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignatures3.ts, 11, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 11, 21))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 11, 25))
+
+declare var a6: new (x: (arg: Base) => Derived) => Base;
+>a6 : Symbol(a6, Decl(assignmentCompatWithConstructSignatures3.ts, 12, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 12, 21))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 12, 25))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
 
-var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
->a7 : Symbol(a7, Decl(assignmentCompatWithConstructSignatures3.ts, 13, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 13, 13))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 13, 17))
+declare var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
+>a7 : Symbol(a7, Decl(assignmentCompatWithConstructSignatures3.ts, 13, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 13, 21))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 13, 25))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
->r : Symbol(r, Decl(assignmentCompatWithConstructSignatures3.ts, 13, 44))
+>r : Symbol(r, Decl(assignmentCompatWithConstructSignatures3.ts, 13, 52))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
 
-var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a8 : Symbol(a8, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 13))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 17))
+declare var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+>a8 : Symbol(a8, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 21))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 25))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 39))
->arg2 : Symbol(arg2, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 44))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 47))
+>arg2 : Symbol(arg2, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 52))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
->r : Symbol(r, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 72))
+>r : Symbol(r, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 80))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
 
-var a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a9 : Symbol(a9, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 13))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 17))
+declare var a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+>a9 : Symbol(a9, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 21))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 25))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 39))
->arg2 : Symbol(arg2, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 44))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 47))
+>arg2 : Symbol(arg2, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 52))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
->r : Symbol(r, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 72))
+>r : Symbol(r, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 80))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
 
-var a10: new (...x: Derived[]) => Derived;
->a10 : Symbol(a10, Decl(assignmentCompatWithConstructSignatures3.ts, 16, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 16, 14))
+declare var a10: new (...x: Derived[]) => Derived;
+>a10 : Symbol(a10, Decl(assignmentCompatWithConstructSignatures3.ts, 16, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 16, 22))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
 
-var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
->a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 14))
->foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 18))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 33))
->foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 38))
->bar : Symbol(bar, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 51))
+declare var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+>a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 22))
+>foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 26))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 41))
+>foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 46))
+>bar : Symbol(bar, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 59))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
 
-var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
->a12 : Symbol(a12, Decl(assignmentCompatWithConstructSignatures3.ts, 18, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 18, 14))
+declare var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+>a12 : Symbol(a12, Decl(assignmentCompatWithConstructSignatures3.ts, 18, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 18, 22))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 18, 29))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 18, 37))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithConstructSignatures3.ts, 3, 43))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
 
-var a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
->a13 : Symbol(a13, Decl(assignmentCompatWithConstructSignatures3.ts, 19, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 19, 14))
+declare var a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
+>a13 : Symbol(a13, Decl(assignmentCompatWithConstructSignatures3.ts, 19, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 19, 22))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 19, 29))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 19, 37))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
 
-var a14: new (x: { a: string; b: number }) => Object;
->a14 : Symbol(a14, Decl(assignmentCompatWithConstructSignatures3.ts, 20, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 20, 14))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 20, 18))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures3.ts, 20, 29))
+declare var a14: new (x: { a: string; b: number }) => Object;
+>a14 : Symbol(a14, Decl(assignmentCompatWithConstructSignatures3.ts, 20, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 20, 22))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 20, 26))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures3.ts, 20, 37))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
-var a15: {
->a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures3.ts, 21, 3))
+declare var a15: {
+>a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures3.ts, 21, 11))
 
     new (x: number): number[];
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 22, 9))
@@ -143,8 +143,8 @@ var a15: {
     new (x: string): string[];
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 23, 9))
 }
-var a16: {
->a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures3.ts, 25, 3))
+declare var a16: {
+>a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures3.ts, 25, 11))
 
     new <T extends Derived>(x: T): number[];
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 26, 9))
@@ -158,8 +158,8 @@ var a16: {
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 27, 25))
 >U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 27, 9))
 }
-var a17: {
->a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures3.ts, 29, 3))
+declare var a17: {
+>a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures3.ts, 29, 11))
 
     new (x: new (a: number) => number): number[];
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 30, 9))
@@ -170,8 +170,8 @@ var a17: {
 >a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 31, 17))
 
 };
-var a18: {
->a18 : Symbol(a18, Decl(assignmentCompatWithConstructSignatures3.ts, 33, 3))
+declare var a18: {
+>a18 : Symbol(a18, Decl(assignmentCompatWithConstructSignatures3.ts, 33, 11))
 
     new (x: {
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 34, 9))
@@ -197,335 +197,335 @@ var a18: {
     }): any[];
 }
 
-var b: new <T>(x: T) => T[]; 
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures3.ts, 44, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 44, 12))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 44, 15))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 44, 12))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 44, 12))
+declare var b: new <T>(x: T) => T[]; 
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures3.ts, 44, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 44, 20))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 44, 23))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 44, 20))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 44, 20))
 
 a = b; // ok
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 7, 3))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures3.ts, 44, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 7, 11))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures3.ts, 44, 11))
 
 b = a; // ok
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures3.ts, 44, 3))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 7, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures3.ts, 44, 11))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 7, 11))
 
-var b2: new <T>(x: T) => string[]; 
->b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures3.ts, 47, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 47, 13))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 47, 16))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 47, 13))
+declare var b2: new <T>(x: T) => string[]; 
+>b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures3.ts, 47, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 47, 21))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 47, 24))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 47, 21))
 
 a2 = b2; // ok 
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures3.ts, 8, 3))
->b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures3.ts, 47, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures3.ts, 8, 11))
+>b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures3.ts, 47, 11))
 
 b2 = a2; // ok
->b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures3.ts, 47, 3))
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures3.ts, 8, 3))
+>b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures3.ts, 47, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures3.ts, 8, 11))
 
-var b3: new <T>(x: T) => T; 
->b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures3.ts, 50, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 50, 13))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 50, 16))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 50, 13))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 50, 13))
+declare var b3: new <T>(x: T) => T; 
+>b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures3.ts, 50, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 50, 21))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 50, 24))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 50, 21))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 50, 21))
 
 a3 = b3; // ok
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures3.ts, 9, 3))
->b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures3.ts, 50, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures3.ts, 9, 11))
+>b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures3.ts, 50, 11))
 
 b3 = a3; // ok
->b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures3.ts, 50, 3))
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures3.ts, 9, 3))
-
-var b4: new <T, U>(x: T, y: U) => T; 
->b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 15))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 19))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 13))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 24))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 15))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 13))
+>b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures3.ts, 50, 11))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures3.ts, 9, 11))
+
+declare var b4: new <T, U>(x: T, y: U) => T; 
+>b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 23))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 27))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 21))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 32))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 23))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 21))
 
 a4 = b4; // ok
->a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignatures3.ts, 10, 3))
->b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignatures3.ts, 10, 11))
+>b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 11))
 
 b4 = a4; // ok
->b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 3))
->a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignatures3.ts, 10, 3))
-
-var b5: new <T, U>(x: (arg: T) => U) => T; 
->b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 15))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 19))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 23))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 15))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 13))
+>b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures3.ts, 53, 11))
+>a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignatures3.ts, 10, 11))
+
+declare var b5: new <T, U>(x: (arg: T) => U) => T; 
+>b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 23))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 27))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 31))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 23))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 21))
 
 a5 = b5; // ok
->a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignatures3.ts, 11, 3))
->b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignatures3.ts, 11, 11))
+>b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 11))
 
 b5 = a5; // ok
->b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 3))
->a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignatures3.ts, 11, 3))
+>b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures3.ts, 56, 11))
+>a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignatures3.ts, 11, 11))
 
-var b6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
->b6 : Symbol(b6, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 13))
+declare var b6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
+>b6 : Symbol(b6, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 21))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 28))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 36))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 48))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 52))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 28))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 13))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 56))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 60))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 36))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 21))
 
 a6 = b6; // ok
->a6 : Symbol(a6, Decl(assignmentCompatWithConstructSignatures3.ts, 12, 3))
->b6 : Symbol(b6, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 3))
+>a6 : Symbol(a6, Decl(assignmentCompatWithConstructSignatures3.ts, 12, 11))
+>b6 : Symbol(b6, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 11))
 
 b6 = a6; // ok
->b6 : Symbol(b6, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 3))
->a6 : Symbol(a6, Decl(assignmentCompatWithConstructSignatures3.ts, 12, 3))
+>b6 : Symbol(b6, Decl(assignmentCompatWithConstructSignatures3.ts, 59, 11))
+>a6 : Symbol(a6, Decl(assignmentCompatWithConstructSignatures3.ts, 12, 11))
 
-var b7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
->b7 : Symbol(b7, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 13))
+declare var b7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
+>b7 : Symbol(b7, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 21))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 28))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 36))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 48))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 52))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 28))
->r : Symbol(r, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 70))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 28))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 56))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 60))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 36))
+>r : Symbol(r, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 78))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 36))
 
 a7 = b7; // ok
->a7 : Symbol(a7, Decl(assignmentCompatWithConstructSignatures3.ts, 13, 3))
->b7 : Symbol(b7, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 3))
+>a7 : Symbol(a7, Decl(assignmentCompatWithConstructSignatures3.ts, 13, 11))
+>b7 : Symbol(b7, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 11))
 
 b7 = a7; // ok
->b7 : Symbol(b7, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 3))
->a7 : Symbol(a7, Decl(assignmentCompatWithConstructSignatures3.ts, 13, 3))
+>b7 : Symbol(b7, Decl(assignmentCompatWithConstructSignatures3.ts, 62, 11))
+>a7 : Symbol(a7, Decl(assignmentCompatWithConstructSignatures3.ts, 13, 11))
 
-var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
->b8 : Symbol(b8, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 13))
+declare var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
+>b8 : Symbol(b8, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 21))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 28))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 36))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 48))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 52))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 28))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 65))
->arg2 : Symbol(arg2, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 70))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 28))
->r : Symbol(r, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 89))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 28))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 56))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 60))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 36))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 73))
+>arg2 : Symbol(arg2, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 78))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 36))
+>r : Symbol(r, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 97))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 36))
 
 a8 = b8; // ok
->a8 : Symbol(a8, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 3))
->b8 : Symbol(b8, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 3))
+>a8 : Symbol(a8, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 11))
+>b8 : Symbol(b8, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 11))
 
 b8 = a8; // ok
->b8 : Symbol(b8, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 3))
->a8 : Symbol(a8, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 3))
+>b8 : Symbol(b8, Decl(assignmentCompatWithConstructSignatures3.ts, 65, 11))
+>a8 : Symbol(a8, Decl(assignmentCompatWithConstructSignatures3.ts, 14, 11))
 
-var b9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
->b9 : Symbol(b9, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 13))
+declare var b9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
+>b9 : Symbol(b9, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 21))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 28))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 36))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 48))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 52))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 28))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 65))
->arg2 : Symbol(arg2, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 70))
->foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 77))
->bing : Symbol(bing, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 90))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 28))
->r : Symbol(r, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 117))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 28))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 56))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 60))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 36))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 73))
+>arg2 : Symbol(arg2, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 78))
+>foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 85))
+>bing : Symbol(bing, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 98))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 36))
+>r : Symbol(r, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 125))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 36))
 
 a9 = b9; // ok
->a9 : Symbol(a9, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 3))
->b9 : Symbol(b9, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 3))
+>a9 : Symbol(a9, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 11))
+>b9 : Symbol(b9, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 11))
 
 b9 = a9; // ok
->b9 : Symbol(b9, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 3))
->a9 : Symbol(a9, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 3))
+>b9 : Symbol(b9, Decl(assignmentCompatWithConstructSignatures3.ts, 68, 11))
+>a9 : Symbol(a9, Decl(assignmentCompatWithConstructSignatures3.ts, 15, 11))
 
-var b10: new <T extends Derived>(...x: T[]) => T; 
->b10 : Symbol(b10, Decl(assignmentCompatWithConstructSignatures3.ts, 71, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 71, 14))
+declare var b10: new <T extends Derived>(...x: T[]) => T; 
+>b10 : Symbol(b10, Decl(assignmentCompatWithConstructSignatures3.ts, 71, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 71, 22))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 71, 33))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 71, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 71, 14))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 71, 41))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 71, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 71, 22))
 
 a10 = b10; // ok
->a10 : Symbol(a10, Decl(assignmentCompatWithConstructSignatures3.ts, 16, 3))
->b10 : Symbol(b10, Decl(assignmentCompatWithConstructSignatures3.ts, 71, 3))
+>a10 : Symbol(a10, Decl(assignmentCompatWithConstructSignatures3.ts, 16, 11))
+>b10 : Symbol(b10, Decl(assignmentCompatWithConstructSignatures3.ts, 71, 11))
 
 b10 = a10; // ok
->b10 : Symbol(b10, Decl(assignmentCompatWithConstructSignatures3.ts, 71, 3))
->a10 : Symbol(a10, Decl(assignmentCompatWithConstructSignatures3.ts, 16, 3))
+>b10 : Symbol(b10, Decl(assignmentCompatWithConstructSignatures3.ts, 71, 11))
+>a10 : Symbol(a10, Decl(assignmentCompatWithConstructSignatures3.ts, 16, 11))
 
-var b11: new <T extends Base>(x: T, y: T) => T; 
->b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 14))
+declare var b11: new <T extends Base>(x: T, y: T) => T; 
+>b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 22))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 30))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 14))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 35))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 14))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 38))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 22))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 43))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 22))
 
 a11 = b11; // ok
->a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 3))
->b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 3))
+>a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 11))
+>b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 11))
 
 b11 = a11; // ok
->b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 3))
->a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 3))
+>b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures3.ts, 74, 11))
+>a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures3.ts, 17, 11))
 
-var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
->b12 : Symbol(b12, Decl(assignmentCompatWithConstructSignatures3.ts, 77, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 77, 14))
+declare var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
+>b12 : Symbol(b12, Decl(assignmentCompatWithConstructSignatures3.ts, 77, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 77, 22))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 77, 37))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 77, 45))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 77, 52))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 77, 14))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 77, 60))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 77, 22))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
 
 a12 = b12; // ok
->a12 : Symbol(a12, Decl(assignmentCompatWithConstructSignatures3.ts, 18, 3))
->b12 : Symbol(b12, Decl(assignmentCompatWithConstructSignatures3.ts, 77, 3))
+>a12 : Symbol(a12, Decl(assignmentCompatWithConstructSignatures3.ts, 18, 11))
+>b12 : Symbol(b12, Decl(assignmentCompatWithConstructSignatures3.ts, 77, 11))
 
 b12 = a12; // ok
->b12 : Symbol(b12, Decl(assignmentCompatWithConstructSignatures3.ts, 77, 3))
->a12 : Symbol(a12, Decl(assignmentCompatWithConstructSignatures3.ts, 18, 3))
+>b12 : Symbol(b12, Decl(assignmentCompatWithConstructSignatures3.ts, 77, 11))
+>a12 : Symbol(a12, Decl(assignmentCompatWithConstructSignatures3.ts, 18, 11))
 
-var b13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
->b13 : Symbol(b13, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 14))
+declare var b13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
+>b13 : Symbol(b13, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 22))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 40))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 48))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 55))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 14))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 63))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 22))
 
 a13 = b13; // ok
->a13 : Symbol(a13, Decl(assignmentCompatWithConstructSignatures3.ts, 19, 3))
->b13 : Symbol(b13, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 3))
+>a13 : Symbol(a13, Decl(assignmentCompatWithConstructSignatures3.ts, 19, 11))
+>b13 : Symbol(b13, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 11))
 
 b13 = a13; // ok
->b13 : Symbol(b13, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 3))
->a13 : Symbol(a13, Decl(assignmentCompatWithConstructSignatures3.ts, 19, 3))
-
-var b14: new <T>(x: { a: T; b: T }) => T; 
->b14 : Symbol(b14, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 14))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 17))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 21))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 14))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 27))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 14))
+>b13 : Symbol(b13, Decl(assignmentCompatWithConstructSignatures3.ts, 80, 11))
+>a13 : Symbol(a13, Decl(assignmentCompatWithConstructSignatures3.ts, 19, 11))
+
+declare var b14: new <T>(x: { a: T; b: T }) => T; 
+>b14 : Symbol(b14, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 22))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 25))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 29))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 22))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 35))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 22))
 
 a14 = b14; // ok
->a14 : Symbol(a14, Decl(assignmentCompatWithConstructSignatures3.ts, 20, 3))
->b14 : Symbol(b14, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 3))
+>a14 : Symbol(a14, Decl(assignmentCompatWithConstructSignatures3.ts, 20, 11))
+>b14 : Symbol(b14, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 11))
 
 b14 = a14; // ok
->b14 : Symbol(b14, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 3))
->a14 : Symbol(a14, Decl(assignmentCompatWithConstructSignatures3.ts, 20, 3))
+>b14 : Symbol(b14, Decl(assignmentCompatWithConstructSignatures3.ts, 83, 11))
+>a14 : Symbol(a14, Decl(assignmentCompatWithConstructSignatures3.ts, 20, 11))
 
-var b15: new <T>(x: T) => T[]; 
->b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures3.ts, 86, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 86, 14))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 86, 17))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 86, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 86, 14))
+declare var b15: new <T>(x: T) => T[]; 
+>b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures3.ts, 86, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 86, 22))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 86, 25))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 86, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 86, 22))
 
 a15 = b15; // ok
->a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures3.ts, 21, 3))
->b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures3.ts, 86, 3))
+>a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures3.ts, 21, 11))
+>b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures3.ts, 86, 11))
 
 b15 = a15; // ok
->b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures3.ts, 86, 3))
->a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures3.ts, 21, 3))
+>b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures3.ts, 86, 11))
+>a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures3.ts, 21, 11))
 
-var b16: new <T extends Base>(x: T) => number[];
->b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures3.ts, 89, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 89, 14))
+declare var b16: new <T extends Base>(x: T) => number[];
+>b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures3.ts, 89, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 89, 22))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 89, 30))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 89, 14))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 89, 38))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 89, 22))
 
 a16 = b16; // ok
->a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures3.ts, 25, 3))
->b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures3.ts, 89, 3))
+>a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures3.ts, 25, 11))
+>b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures3.ts, 89, 11))
 
 b16 = a16; // ok
->b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures3.ts, 89, 3))
->a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures3.ts, 25, 3))
-
-var b17: new <T>(x: new (a: T) => T) => T[]; // ok
->b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 14))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 17))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 25))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 14))
+>b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures3.ts, 89, 11))
+>a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures3.ts, 25, 11))
+
+declare var b17: new <T>(x: new (a: T) => T) => T[]; // ok
+>b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 22))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 25))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 33))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 22))
 
 a17 = b17; // ok
->a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures3.ts, 29, 3))
->b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 3))
+>a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures3.ts, 29, 11))
+>b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 11))
 
 b17 = a17; // ok
->b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 3))
->a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures3.ts, 29, 3))
-
-var b18: new <T>(x: new (a: T) => T) => T[]; 
->b18 : Symbol(b18, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 14))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 17))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 25))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 14))
+>b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures3.ts, 92, 11))
+>a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures3.ts, 29, 11))
+
+declare var b18: new <T>(x: new (a: T) => T) => T[]; 
+>b18 : Symbol(b18, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 22))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 25))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 33))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 22))
 
 a18 = b18; // ok
->a18 : Symbol(a18, Decl(assignmentCompatWithConstructSignatures3.ts, 33, 3))
->b18 : Symbol(b18, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 3))
+>a18 : Symbol(a18, Decl(assignmentCompatWithConstructSignatures3.ts, 33, 11))
+>b18 : Symbol(b18, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 11))
 
 b18 = a18; // ok
->b18 : Symbol(b18, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 3))
->a18 : Symbol(a18, Decl(assignmentCompatWithConstructSignatures3.ts, 33, 3))
+>b18 : Symbol(b18, Decl(assignmentCompatWithConstructSignatures3.ts, 95, 11))
+>a18 : Symbol(a18, Decl(assignmentCompatWithConstructSignatures3.ts, 33, 11))
 
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
index db13d8160940d..b5050204c327f 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
@@ -33,25 +33,25 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 >     : ^^^^^^
 
-var a: new (x: number) => number[];
+declare var a: new (x: number) => number[];
 >a : new (x: number) => number[]
 >  : ^^^^^ ^^      ^^^^^        
 >x : number
 >  : ^^^^^^
 
-var a2: new (x: number) => string[];
+declare var a2: new (x: number) => string[];
 >a2 : new (x: number) => string[]
 >   : ^^^^^ ^^      ^^^^^        
 >x : number
 >  : ^^^^^^
 
-var a3: new (x: number) => void;
+declare var a3: new (x: number) => void;
 >a3 : new (x: number) => void
 >   : ^^^^^ ^^      ^^^^^    
 >x : number
 >  : ^^^^^^
 
-var a4: new (x: string, y: number) => string;
+declare var a4: new (x: string, y: number) => string;
 >a4 : new (x: string, y: number) => string
 >   : ^^^^^ ^^      ^^ ^^      ^^^^^      
 >x : string
@@ -59,7 +59,7 @@ var a4: new (x: string, y: number) => string;
 >y : number
 >  : ^^^^^^
 
-var a5: new (x: (arg: string) => number) => string;
+declare var a5: new (x: (arg: string) => number) => string;
 >a5 : new (x: (arg: string) => number) => string
 >   : ^^^^^ ^^                       ^^^^^      
 >x : (arg: string) => number
@@ -67,7 +67,7 @@ var a5: new (x: (arg: string) => number) => string;
 >arg : string
 >    : ^^^^^^
 
-var a6: new (x: (arg: Base) => Derived) => Base;
+declare var a6: new (x: (arg: Base) => Derived) => Base;
 >a6 : new (x: (arg: Base) => Derived) => Base
 >   : ^^^^^ ^^                      ^^^^^    
 >x : (arg: Base) => Derived
@@ -75,7 +75,7 @@ var a6: new (x: (arg: Base) => Derived) => Base;
 >arg : Base
 >    : ^^^^
 
-var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
+declare var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
 >a7 : new (x: (arg: Base) => Derived) => (r: Base) => Derived
 >   : ^^^^^ ^^                      ^^^^^                    
 >x : (arg: Base) => Derived
@@ -85,7 +85,7 @@ var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
 >r : Base
 >  : ^^^^
 
-var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+declare var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a8 : new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >   : ^^^^^ ^^                      ^^ ^^                       ^^^^^                    
 >x : (arg: Base) => Derived
@@ -99,7 +99,7 @@ var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base)
 >r : Base
 >  : ^^^^
 
-var a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+declare var a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a9 : new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >   : ^^^^^ ^^                      ^^ ^^                       ^^^^^                    
 >x : (arg: Base) => Derived
@@ -113,13 +113,13 @@ var a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base)
 >r : Base
 >  : ^^^^
 
-var a10: new (...x: Derived[]) => Derived;
+declare var a10: new (...x: Derived[]) => Derived;
 >a10 : new (...x: Derived[]) => Derived
 >    : ^^^^^^^^ ^^         ^^^^^       
 >x : Derived[]
 >  : ^^^^^^^^^
 
-var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+declare var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >a11 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >    : ^^^^^ ^^                ^^ ^^                             ^^^^^    
 >x : { foo: string; }
@@ -133,7 +133,7 @@ var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >bar : string
 >    : ^^^^^^
 
-var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+declare var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >    : ^^^^^ ^^           ^^ ^^               ^^^^^              
 >x : Base[]
@@ -141,7 +141,7 @@ var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >y : Derived2[]
 >  : ^^^^^^^^^^
 
-var a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
+declare var a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : new (x: Array<Base>, y: Array<Derived>) => Array<Derived>
 >    : ^^^^^ ^^           ^^ ^^              ^^^^^              
 >x : Base[]
@@ -149,7 +149,7 @@ var a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >y : Derived[]
 >  : ^^^^^^^^^
 
-var a14: new (x: { a: string; b: number }) => Object;
+declare var a14: new (x: { a: string; b: number }) => Object;
 >a14 : new (x: { a: string; b: number; }) => Object
 >    : ^^^^^ ^^                         ^^^^^      
 >x : { a: string; b: number; }
@@ -159,7 +159,7 @@ var a14: new (x: { a: string; b: number }) => Object;
 >b : number
 >  : ^^^^^^
 
-var a15: {
+declare var a15: {
 >a15 : { new (x: number): number[]; new (x: string): string[]; }
 >    : ^^^^^^^ ^^      ^^^        ^^^^^^^ ^^      ^^^        ^^^
 
@@ -171,7 +171,7 @@ var a15: {
 >x : string
 >  : ^^^^^^
 }
-var a16: {
+declare var a16: {
 >a16 : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
 >    : ^^^^^^^ ^^^^^^^^^       ^^ ^^ ^^^        ^^^^^^^ ^^^^^^^^^    ^^ ^^ ^^^        ^^^
 
@@ -183,7 +183,7 @@ var a16: {
 >x : U
 >  : ^
 }
-var a17: {
+declare var a17: {
 >a17 : { new (x: new (a: number) => number): number[]; new (x: new (a: string) => string): string[]; }
 >    : ^^^^^^^ ^^                         ^^^        ^^^^^^^ ^^                         ^^^        ^^^
 
@@ -200,7 +200,7 @@ var a17: {
 >  : ^^^^^^
 
 };
-var a18: {
+declare var a18: {
 >a18 : { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }
 >    : ^^^^^^^ ^^                                                     ^^^     ^^^^^^^ ^^                                                   ^^^     ^^^
 
@@ -232,7 +232,7 @@ var a18: {
     }): any[];
 }
 
-var b: new <T>(x: T) => T[]; 
+declare var b: new <T>(x: T) => T[]; 
 >b : new <T>(x: T) => T[]
 >  : ^^^^^ ^^ ^^ ^^^^^   
 >x : T
@@ -254,7 +254,7 @@ b = a; // ok
 >a : new (x: number) => number[]
 >  : ^^^^^ ^^      ^^^^^        
 
-var b2: new <T>(x: T) => string[]; 
+declare var b2: new <T>(x: T) => string[]; 
 >b2 : new <T>(x: T) => string[]
 >   : ^^^^^ ^^ ^^ ^^^^^        
 >x : T
@@ -276,7 +276,7 @@ b2 = a2; // ok
 >a2 : new (x: number) => string[]
 >   : ^^^^^ ^^      ^^^^^        
 
-var b3: new <T>(x: T) => T; 
+declare var b3: new <T>(x: T) => T; 
 >b3 : new <T>(x: T) => T
 >   : ^^^^^ ^^ ^^ ^^^^^ 
 >x : T
@@ -298,7 +298,7 @@ b3 = a3; // ok
 >a3 : new (x: number) => void
 >   : ^^^^^ ^^      ^^^^^    
 
-var b4: new <T, U>(x: T, y: U) => T; 
+declare var b4: new <T, U>(x: T, y: U) => T; 
 >b4 : new <T, U>(x: T, y: U) => T
 >   : ^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
 >x : T
@@ -322,7 +322,7 @@ b4 = a4; // ok
 >a4 : new (x: string, y: number) => string
 >   : ^^^^^ ^^      ^^ ^^      ^^^^^      
 
-var b5: new <T, U>(x: (arg: T) => U) => T; 
+declare var b5: new <T, U>(x: (arg: T) => U) => T; 
 >b5 : new <T, U>(x: (arg: T) => U) => T
 >   : ^^^^^ ^^ ^^ ^^             ^^^^^ 
 >x : (arg: T) => U
@@ -346,7 +346,7 @@ b5 = a5; // ok
 >a5 : new (x: (arg: string) => number) => string
 >   : ^^^^^ ^^                       ^^^^^      
 
-var b6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
+declare var b6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
 >b6 : new <T extends Base, U extends Derived>(x: (arg: T) => U) => T
 >   : ^^^^^ ^^^^^^^^^    ^^ ^^^^^^^^^       ^^ ^^             ^^^^^ 
 >x : (arg: T) => U
@@ -370,7 +370,7 @@ b6 = a6; // ok
 >a6 : new (x: (arg: Base) => Derived) => Base
 >   : ^^^^^ ^^                      ^^^^^    
 
-var b7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
+declare var b7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
 >b7 : new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
 >   : ^^^^^ ^^^^^^^^^    ^^ ^^^^^^^^^       ^^ ^^             ^^^^^           
 >x : (arg: T) => U
@@ -396,7 +396,7 @@ b7 = a7; // ok
 >a7 : new (x: (arg: Base) => Derived) => (r: Base) => Derived
 >   : ^^^^^ ^^                      ^^^^^                    
 
-var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
+declare var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
 >b8 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
 >   : ^^^^^ ^^^^^^^^^    ^^ ^^^^^^^^^       ^^ ^^             ^^ ^^              ^^^^^           
 >x : (arg: T) => U
@@ -426,7 +426,7 @@ b8 = a8; // ok
 >a8 : new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >   : ^^^^^ ^^                      ^^ ^^                       ^^^^^                    
 
-var b9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
+declare var b9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
 >b9 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => (r: T) => U
 >   : ^^^^^ ^^^^^^^^^    ^^ ^^^^^^^^^       ^^ ^^             ^^ ^^                                           ^^^^^           
 >x : (arg: T) => U
@@ -460,7 +460,7 @@ b9 = a9; // ok
 >a9 : new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >   : ^^^^^ ^^                      ^^ ^^                       ^^^^^                    
 
-var b10: new <T extends Derived>(...x: T[]) => T; 
+declare var b10: new <T extends Derived>(...x: T[]) => T; 
 >b10 : new <T extends Derived>(...x: T[]) => T
 >    : ^^^^^ ^^^^^^^^^       ^^^^^ ^^   ^^^^^ 
 >x : T[]
@@ -482,7 +482,7 @@ b10 = a10; // ok
 >a10 : new (...x: Derived[]) => Derived
 >    : ^^^^^^^^ ^^         ^^^^^       
 
-var b11: new <T extends Base>(x: T, y: T) => T; 
+declare var b11: new <T extends Base>(x: T, y: T) => T; 
 >b11 : new <T extends Base>(x: T, y: T) => T
 >    : ^^^^^ ^^^^^^^^^    ^^ ^^ ^^ ^^ ^^^^^ 
 >x : T
@@ -506,7 +506,7 @@ b11 = a11; // ok
 >a11 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >    : ^^^^^ ^^                ^^ ^^                             ^^^^^    
 
-var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
+declare var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
 >b12 : new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>
 >    : ^^^^^ ^^^^^^^^^           ^^ ^^           ^^ ^^ ^^^^^              
 >x : Base[]
@@ -530,7 +530,7 @@ b12 = a12; // ok
 >a12 : new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >    : ^^^^^ ^^           ^^ ^^               ^^^^^              
 
-var b13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
+declare var b13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
 >b13 : new <T extends Array<Derived>>(x: Array<Base>, y: T) => T
 >    : ^^^^^ ^^^^^^^^^              ^^ ^^           ^^ ^^ ^^^^^ 
 >x : Base[]
@@ -554,7 +554,7 @@ b13 = a13; // ok
 >a13 : new (x: Array<Base>, y: Array<Derived>) => Array<Derived>
 >    : ^^^^^ ^^           ^^ ^^              ^^^^^              
 
-var b14: new <T>(x: { a: T; b: T }) => T; 
+declare var b14: new <T>(x: { a: T; b: T }) => T; 
 >b14 : new <T>(x: { a: T; b: T; }) => T
 >    : ^^^^^ ^^ ^^               ^^^^^ 
 >x : { a: T; b: T; }
@@ -580,7 +580,7 @@ b14 = a14; // ok
 >a14 : new (x: { a: string; b: number; }) => Object
 >    : ^^^^^ ^^                         ^^^^^      
 
-var b15: new <T>(x: T) => T[]; 
+declare var b15: new <T>(x: T) => T[]; 
 >b15 : new <T>(x: T) => T[]
 >    : ^^^^^ ^^ ^^ ^^^^^   
 >x : T
@@ -602,7 +602,7 @@ b15 = a15; // ok
 >a15 : { new (x: number): number[]; new (x: string): string[]; }
 >    : ^^^^^^^ ^^      ^^^        ^^^^^^^ ^^      ^^^        ^^^
 
-var b16: new <T extends Base>(x: T) => number[];
+declare var b16: new <T extends Base>(x: T) => number[];
 >b16 : new <T extends Base>(x: T) => number[]
 >    : ^^^^^ ^^^^^^^^^    ^^ ^^ ^^^^^        
 >x : T
@@ -624,7 +624,7 @@ b16 = a16; // ok
 >a16 : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
 >    : ^^^^^^^ ^^^^^^^^^       ^^ ^^ ^^^        ^^^^^^^ ^^^^^^^^^    ^^ ^^ ^^^        ^^^
 
-var b17: new <T>(x: new (a: T) => T) => T[]; // ok
+declare var b17: new <T>(x: new (a: T) => T) => T[]; // ok
 >b17 : new <T>(x: new (a: T) => T) => T[]
 >    : ^^^^^ ^^ ^^               ^^^^^   
 >x : new (a: T) => T
@@ -648,7 +648,7 @@ b17 = a17; // ok
 >a17 : { new (x: new (a: number) => number): number[]; new (x: new (a: string) => string): string[]; }
 >    : ^^^^^^^ ^^                         ^^^        ^^^^^^^ ^^                         ^^^        ^^^
 
-var b18: new <T>(x: new (a: T) => T) => T[]; 
+declare var b18: new <T>(x: new (a: T) => T) => T[]; 
 >b18 : new <T>(x: new (a: T) => T) => T[]
 >    : ^^^^^ ^^ ^^               ^^^^^   
 >x : new (a: T) => T
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.errors.txt
index 92b02dd683491..ed38e53db46ea 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.errors.txt
@@ -90,18 +90,18 @@ assignmentCompatWithConstructSignatures4.ts(96,9): error TS2322: Type 'new <T>(x
     
         namespace WithNonGenericSignaturesInBaseType {
             // target type with non-generic call signatures
-            var a2: new (x: number) => string[];
-            var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived2;
-            var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-            var a10: new (...x: Base[]) => Base;
-            var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
-            var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
-            var a14: {
+            declare var a2: new (x: number) => string[];
+            declare var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived2;
+            declare var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+            declare var a10: new (...x: Base[]) => Base;
+            declare var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+            declare var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+            declare var a14: {
                     new (x: number): number[];
                     new (x: string): string[];
                 };
-            var a15: new (x: { a: string; b: number }) => number;
-            var a16: {
+            declare var a15: new (x: { a: string; b: number }) => number;
+            declare var a16: {
                     new (x: {
                         new (a: number): number;
                         new (a?: number): number;
@@ -111,7 +111,7 @@ assignmentCompatWithConstructSignatures4.ts(96,9): error TS2322: Type 'new <T>(x
                         new (a?: boolean): boolean;
                     }): boolean[];
                 };
-            var a17: {
+            declare var a17: {
                     new (x: {
                         new <T extends Derived>(a: T): T;
                         new <T extends Base>(a: T): T;
@@ -122,16 +122,16 @@ assignmentCompatWithConstructSignatures4.ts(96,9): error TS2322: Type 'new <T>(x
                     }): any[];
                 };
     
-            var b2: new <T, U>(x: T) => U[]; 
+            declare var b2: new <T, U>(x: T) => U[]; 
             a2 = b2; // ok
             b2 = a2; // ok
             ~~
 !!! error TS2322: Type 'new (x: number) => string[]' is not assignable to type 'new <T, U>(x: T) => U[]'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
 !!! error TS2322:     Type 'T' is not assignable to type 'number'.
-!!! related TS2208 assignmentCompatWithConstructSignatures4.ts:43:22: This type parameter might need an `extends number` constraint.
+!!! related TS2208 assignmentCompatWithConstructSignatures4.ts:43:30: This type parameter might need an `extends number` constraint.
     
-            var b7: new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
+            declare var b7: new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
             a7 = b7; // ok
             b7 = a7; // ok
             ~~
@@ -141,7 +141,7 @@ assignmentCompatWithConstructSignatures4.ts(96,9): error TS2322: Type 'new <T>(x
 !!! error TS2322:       Type 'Base' is not assignable to type 'T'.
 !!! error TS2322:         'Base' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Base'.
     
-            var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
+            declare var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
             a8 = b8; // error, type mismatch
             ~~
 !!! error TS2322: Type 'new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U' is not assignable to type 'new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived'.
@@ -159,7 +159,7 @@ assignmentCompatWithConstructSignatures4.ts(96,9): error TS2322: Type 'new <T>(x
 !!! error TS2322:         'Base' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Base'.
     
             
-            var b10: new <T extends Derived>(...x: T[]) => T; 
+            declare var b10: new <T extends Derived>(...x: T[]) => T; 
             a10 = b10; // ok
             b10 = a10; // ok
             ~~~
@@ -167,7 +167,7 @@ assignmentCompatWithConstructSignatures4.ts(96,9): error TS2322: Type 'new <T>(x
 !!! error TS2322:   Type 'Base' is not assignable to type 'T'.
 !!! error TS2322:     'T' could be instantiated with an arbitrary type which could be unrelated to 'Base'.
     
-            var b11: new <T extends Derived>(x: T, y: T) => T; 
+            declare var b11: new <T extends Derived>(x: T, y: T) => T; 
             a11 = b11; // ok
             b11 = a11; // ok
             ~~~
@@ -175,7 +175,7 @@ assignmentCompatWithConstructSignatures4.ts(96,9): error TS2322: Type 'new <T>(x
 !!! error TS2322:   Type 'Base' is not assignable to type 'T'.
 !!! error TS2322:     'T' could be instantiated with an arbitrary type which could be unrelated to 'Base'.
     
-            var b12: new <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
+            declare var b12: new <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
             a12 = b12; // ok
             b12 = a12; // ok
             ~~~
@@ -183,7 +183,7 @@ assignmentCompatWithConstructSignatures4.ts(96,9): error TS2322: Type 'new <T>(x
 !!! error TS2322:   Type 'Derived[]' is not assignable to type 'T'.
 !!! error TS2322:     'T' could be instantiated with an arbitrary type which could be unrelated to 'Derived[]'.
     
-            var b15: new <T>(x: { a: T; b: T }) => T; 
+            declare var b15: new <T>(x: { a: T; b: T }) => T; 
             a15 = b15; // ok
             ~~~
 !!! error TS2322: Type 'new <T>(x: { a: T; b: T; }) => T' is not assignable to type 'new (x: { a: string; b: number; }) => number'.
@@ -198,9 +198,9 @@ assignmentCompatWithConstructSignatures4.ts(96,9): error TS2322: Type 'new <T>(x
 !!! error TS2322:     Type '{ a: T; b: T; }' is not assignable to type '{ a: string; b: number; }'.
 !!! error TS2322:       Types of property 'a' are incompatible.
 !!! error TS2322:         Type 'T' is not assignable to type 'string'.
-!!! related TS2208 assignmentCompatWithConstructSignatures4.ts:68:23: This type parameter might need an `extends string` constraint.
+!!! related TS2208 assignmentCompatWithConstructSignatures4.ts:68:31: This type parameter might need an `extends string` constraint.
     
-            var b15a: new <T extends Base>(x: { a: T; b: T }) => number; 
+            declare var b15a: new <T extends Base>(x: { a: T; b: T }) => number; 
             a15 = b15a; // ok
             ~~~
 !!! error TS2322: Type 'new <T extends Base>(x: { a: T; b: T; }) => number' is not assignable to type 'new (x: { a: string; b: number; }) => number'.
@@ -217,7 +217,7 @@ assignmentCompatWithConstructSignatures4.ts(96,9): error TS2322: Type 'new <T>(x
 !!! error TS2322:         Type 'T' is not assignable to type 'string'.
 !!! error TS2322:           Type 'Base' is not assignable to type 'string'.
     
-            var b16: new <T>(x: (a: T) => T) => T[];
+            declare var b16: new <T>(x: (a: T) => T) => T[];
             a16 = b16; // error
             ~~~
 !!! error TS2322: Type 'new <T>(x: (a: T) => T) => T[]' is not assignable to type '{ new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }'.
@@ -231,7 +231,7 @@ assignmentCompatWithConstructSignatures4.ts(96,9): error TS2322: Type 'new <T>(x
 !!! error TS2322:     Type '(a: any) => any' is not assignable to type '{ new (a: number): number; new (a?: number): number; }'.
 !!! error TS2322:       Type '(a: any) => any' provides no match for the signature 'new (a: number): number'.
     
-            var b17: new <T>(x: (a: T) => T) => any[];
+            declare var b17: new <T>(x: (a: T) => T) => any[];
             a17 = b17; // error
             ~~~
 !!! error TS2322: Type 'new <T>(x: (a: T) => T) => any[]' is not assignable to type '{ new (x: { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }): any[]; new (x: { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }): any[]; }'.
@@ -248,8 +248,8 @@ assignmentCompatWithConstructSignatures4.ts(96,9): error TS2322: Type 'new <T>(x
     
         namespace WithGenericSignaturesInBaseType {
             // target type has generic call signature
-            var a2: new <T>(x: T) => T[];
-            var b2: new <T>(x: T) => string[];
+            declare var a2: new <T>(x: T) => T[];
+            declare var b2: new <T>(x: T) => string[];
             a2 = b2; // ok
             ~~
 !!! error TS2322: Type 'new <T>(x: T) => string[]' is not assignable to type 'new <T>(x: T) => T[]'.
@@ -261,17 +261,17 @@ assignmentCompatWithConstructSignatures4.ts(96,9): error TS2322: Type 'new <T>(x
 !!! error TS2322: Type 'new <T>(x: T) => T[]' is not assignable to type 'new <T>(x: T) => string[]'.
 !!! error TS2322:   Type 'T[]' is not assignable to type 'string[]'.
 !!! error TS2322:     Type 'T' is not assignable to type 'string'.
-!!! related TS2208 assignmentCompatWithConstructSignatures4.ts:88:22: This type parameter might need an `extends string` constraint.
+!!! related TS2208 assignmentCompatWithConstructSignatures4.ts:88:30: This type parameter might need an `extends string` constraint.
     
             // target type has generic call signature
-            var a3: new <T>(x: T) => string[];
-            var b3: new <T>(x: T) => T[]; 
+            declare var a3: new <T>(x: T) => string[];
+            declare var b3: new <T>(x: T) => T[]; 
             a3 = b3; // ok
             ~~
 !!! error TS2322: Type 'new <T>(x: T) => T[]' is not assignable to type 'new <T>(x: T) => string[]'.
 !!! error TS2322:   Type 'T[]' is not assignable to type 'string[]'.
 !!! error TS2322:     Type 'T' is not assignable to type 'string'.
-!!! related TS2208 assignmentCompatWithConstructSignatures4.ts:93:22: This type parameter might need an `extends string` constraint.
+!!! related TS2208 assignmentCompatWithConstructSignatures4.ts:93:30: This type parameter might need an `extends string` constraint.
             b3 = a3; // ok
             ~~
 !!! error TS2322: Type 'new <T>(x: T) => string[]' is not assignable to type 'new <T>(x: T) => T[]'.
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
index 4962d658c18ec..9e3b6c58fc9e3 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
@@ -11,18 +11,18 @@ namespace Errors {
 
     namespace WithNonGenericSignaturesInBaseType {
         // target type with non-generic call signatures
-        var a2: new (x: number) => string[];
-        var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived2;
-        var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-        var a10: new (...x: Base[]) => Base;
-        var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
-        var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
-        var a14: {
+        declare var a2: new (x: number) => string[];
+        declare var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived2;
+        declare var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+        declare var a10: new (...x: Base[]) => Base;
+        declare var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+        declare var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+        declare var a14: {
                 new (x: number): number[];
                 new (x: string): string[];
             };
-        var a15: new (x: { a: string; b: number }) => number;
-        var a16: {
+        declare var a15: new (x: { a: string; b: number }) => number;
+        declare var a16: {
                 new (x: {
                     new (a: number): number;
                     new (a?: number): number;
@@ -32,7 +32,7 @@ namespace Errors {
                     new (a?: boolean): boolean;
                 }): boolean[];
             };
-        var a17: {
+        declare var a17: {
                 new (x: {
                     new <T extends Derived>(a: T): T;
                     new <T extends Base>(a: T): T;
@@ -43,58 +43,58 @@ namespace Errors {
                 }): any[];
             };
 
-        var b2: new <T, U>(x: T) => U[]; 
+        declare var b2: new <T, U>(x: T) => U[]; 
         a2 = b2; // ok
         b2 = a2; // ok
 
-        var b7: new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
+        declare var b7: new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
         a7 = b7; // ok
         b7 = a7; // ok
 
-        var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
+        declare var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
         a8 = b8; // error, type mismatch
         b8 = a8; // error
 
         
-        var b10: new <T extends Derived>(...x: T[]) => T; 
+        declare var b10: new <T extends Derived>(...x: T[]) => T; 
         a10 = b10; // ok
         b10 = a10; // ok
 
-        var b11: new <T extends Derived>(x: T, y: T) => T; 
+        declare var b11: new <T extends Derived>(x: T, y: T) => T; 
         a11 = b11; // ok
         b11 = a11; // ok
 
-        var b12: new <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
+        declare var b12: new <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
         a12 = b12; // ok
         b12 = a12; // ok
 
-        var b15: new <T>(x: { a: T; b: T }) => T; 
+        declare var b15: new <T>(x: { a: T; b: T }) => T; 
         a15 = b15; // ok
         b15 = a15; // ok
 
-        var b15a: new <T extends Base>(x: { a: T; b: T }) => number; 
+        declare var b15a: new <T extends Base>(x: { a: T; b: T }) => number; 
         a15 = b15a; // ok
         b15a = a15; // ok
 
-        var b16: new <T>(x: (a: T) => T) => T[];
+        declare var b16: new <T>(x: (a: T) => T) => T[];
         a16 = b16; // error
         b16 = a16; // error
 
-        var b17: new <T>(x: (a: T) => T) => any[];
+        declare var b17: new <T>(x: (a: T) => T) => any[];
         a17 = b17; // error
         b17 = a17; // error
     }
 
     namespace WithGenericSignaturesInBaseType {
         // target type has generic call signature
-        var a2: new <T>(x: T) => T[];
-        var b2: new <T>(x: T) => string[];
+        declare var a2: new <T>(x: T) => T[];
+        declare var b2: new <T>(x: T) => string[];
         a2 = b2; // ok
         b2 = a2; // ok
 
         // target type has generic call signature
-        var a3: new <T>(x: T) => string[];
-        var b3: new <T>(x: T) => T[]; 
+        declare var a3: new <T>(x: T) => string[];
+        declare var b3: new <T>(x: T) => T[]; 
         a3 = b3; // ok
         b3 = a3; // ok
     }
@@ -147,58 +147,31 @@ var Errors;
     }(Base));
     var WithNonGenericSignaturesInBaseType;
     (function (WithNonGenericSignaturesInBaseType) {
-        // target type with non-generic call signatures
-        var a2;
-        var a7;
-        var a8;
-        var a10;
-        var a11;
-        var a12;
-        var a14;
-        var a15;
-        var a16;
-        var a17;
-        var b2;
         a2 = b2; // ok
         b2 = a2; // ok
-        var b7;
         a7 = b7; // ok
         b7 = a7; // ok
-        var b8;
         a8 = b8; // error, type mismatch
         b8 = a8; // error
-        var b10;
         a10 = b10; // ok
         b10 = a10; // ok
-        var b11;
         a11 = b11; // ok
         b11 = a11; // ok
-        var b12;
         a12 = b12; // ok
         b12 = a12; // ok
-        var b15;
         a15 = b15; // ok
         b15 = a15; // ok
-        var b15a;
         a15 = b15a; // ok
         b15a = a15; // ok
-        var b16;
         a16 = b16; // error
         b16 = a16; // error
-        var b17;
         a17 = b17; // error
         b17 = a17; // error
     })(WithNonGenericSignaturesInBaseType || (WithNonGenericSignaturesInBaseType = {}));
     var WithGenericSignaturesInBaseType;
     (function (WithGenericSignaturesInBaseType) {
-        // target type has generic call signature
-        var a2;
-        var b2;
         a2 = b2; // ok
         b2 = a2; // ok
-        // target type has generic call signature
-        var a3;
-        var b3;
         a3 = b3; // ok
         b3 = a3; // ok
     })(WithGenericSignaturesInBaseType || (WithGenericSignaturesInBaseType = {}));
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.symbols b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.symbols
index 7e39e895ef646..8738577394051 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.symbols
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.symbols
@@ -29,62 +29,62 @@ namespace Errors {
 >WithNonGenericSignaturesInBaseType : Symbol(WithNonGenericSignaturesInBaseType, Decl(assignmentCompatWithConstructSignatures4.ts, 6, 53))
 
         // target type with non-generic call signatures
-        var a2: new (x: number) => string[];
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures4.ts, 10, 11))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 10, 21))
-
-        var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived2;
->a7 : Symbol(a7, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 11))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 21))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 25))
+        declare var a2: new (x: number) => string[];
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures4.ts, 10, 19))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 10, 29))
+
+        declare var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived2;
+>a7 : Symbol(a7, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 19))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 29))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 33))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31))
->r : Symbol(r, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 52))
+>r : Symbol(r, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 60))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithConstructSignatures4.ts, 4, 47))
 
-        var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a8 : Symbol(a8, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 11))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 21))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 25))
+        declare var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+>a8 : Symbol(a8, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 19))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 29))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 33))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 47))
->arg2 : Symbol(arg2, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 52))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 55))
+>arg2 : Symbol(arg2, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 60))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31))
->r : Symbol(r, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 80))
+>r : Symbol(r, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 88))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31))
 
-        var a10: new (...x: Base[]) => Base;
->a10 : Symbol(a10, Decl(assignmentCompatWithConstructSignatures4.ts, 13, 11))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 13, 22))
+        declare var a10: new (...x: Base[]) => Base;
+>a10 : Symbol(a10, Decl(assignmentCompatWithConstructSignatures4.ts, 13, 19))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 13, 30))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18))
 
-        var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
->a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 11))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 22))
->foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 26))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 41))
->foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 46))
->bar : Symbol(bar, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 59))
+        declare var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+>a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 19))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 30))
+>foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 34))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 49))
+>foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 54))
+>bar : Symbol(bar, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 67))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18))
 
-        var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
->a12 : Symbol(a12, Decl(assignmentCompatWithConstructSignatures4.ts, 15, 11))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 15, 22))
+        declare var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+>a12 : Symbol(a12, Decl(assignmentCompatWithConstructSignatures4.ts, 15, 19))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 15, 30))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 15, 37))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 15, 45))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithConstructSignatures4.ts, 4, 47))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31))
 
-        var a14: {
->a14 : Symbol(a14, Decl(assignmentCompatWithConstructSignatures4.ts, 16, 11))
+        declare var a14: {
+>a14 : Symbol(a14, Decl(assignmentCompatWithConstructSignatures4.ts, 16, 19))
 
                 new (x: number): number[];
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 17, 21))
@@ -93,14 +93,14 @@ namespace Errors {
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 18, 21))
 
             };
-        var a15: new (x: { a: string; b: number }) => number;
->a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 11))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 22))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 26))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 37))
+        declare var a15: new (x: { a: string; b: number }) => number;
+>a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 19))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 30))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 34))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 45))
 
-        var a16: {
->a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures4.ts, 21, 11))
+        declare var a16: {
+>a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures4.ts, 21, 19))
 
                 new (x: {
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 22, 21))
@@ -123,8 +123,8 @@ namespace Errors {
 
                 }): boolean[];
             };
-        var a17: {
->a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures4.ts, 31, 11))
+        declare var a17: {
+>a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures4.ts, 31, 19))
 
                 new (x: {
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 32, 21))
@@ -164,243 +164,243 @@ namespace Errors {
                 }): any[];
             };
 
-        var b2: new <T, U>(x: T) => U[]; 
->b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 11))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 21))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 23))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 27))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 21))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 23))
+        declare var b2: new <T, U>(x: T) => U[]; 
+>b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 19))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 29))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 31))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 35))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 29))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 31))
 
         a2 = b2; // ok
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures4.ts, 10, 11))
->b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures4.ts, 10, 19))
+>b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 19))
 
         b2 = a2; // ok
->b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 11))
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures4.ts, 10, 11))
+>b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures4.ts, 42, 19))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures4.ts, 10, 19))
 
-        var b7: new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
->b7 : Symbol(b7, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 11))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 21))
+        declare var b7: new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
+>b7 : Symbol(b7, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 19))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 29))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 36))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 44))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31))
->V : Symbol(V, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 55))
+>V : Symbol(V, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 63))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithConstructSignatures4.ts, 4, 47))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 76))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 80))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 21))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 36))
->r : Symbol(r, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 98))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 21))
->V : Symbol(V, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 55))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 84))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 88))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 29))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 44))
+>r : Symbol(r, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 106))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 29))
+>V : Symbol(V, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 63))
 
         a7 = b7; // ok
->a7 : Symbol(a7, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 11))
->b7 : Symbol(b7, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 11))
+>a7 : Symbol(a7, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 19))
+>b7 : Symbol(b7, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 19))
 
         b7 = a7; // ok
->b7 : Symbol(b7, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 11))
->a7 : Symbol(a7, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 11))
+>b7 : Symbol(b7, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 19))
+>a7 : Symbol(a7, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 19))
 
-        var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
->b8 : Symbol(b8, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 11))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 21))
+        declare var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
+>b8 : Symbol(b8, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 19))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 29))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 36))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 44))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 56))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 60))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 21))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 36))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 73))
->arg2 : Symbol(arg2, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 78))
->foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 85))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 36))
->r : Symbol(r, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 112))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 21))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 36))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 64))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 68))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 29))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 44))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 81))
+>arg2 : Symbol(arg2, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 86))
+>foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 93))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 44))
+>r : Symbol(r, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 120))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 29))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 44))
 
         a8 = b8; // error, type mismatch
->a8 : Symbol(a8, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 11))
->b8 : Symbol(b8, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 11))
+>a8 : Symbol(a8, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 19))
+>b8 : Symbol(b8, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 19))
 
         b8 = a8; // error
->b8 : Symbol(b8, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 11))
->a8 : Symbol(a8, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 11))
+>b8 : Symbol(b8, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 19))
+>a8 : Symbol(a8, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 19))
 
         
-        var b10: new <T extends Derived>(...x: T[]) => T; 
->b10 : Symbol(b10, Decl(assignmentCompatWithConstructSignatures4.ts, 55, 11))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 55, 22))
+        declare var b10: new <T extends Derived>(...x: T[]) => T; 
+>b10 : Symbol(b10, Decl(assignmentCompatWithConstructSignatures4.ts, 55, 19))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 55, 30))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 55, 41))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 55, 22))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 55, 22))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 55, 49))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 55, 30))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 55, 30))
 
         a10 = b10; // ok
->a10 : Symbol(a10, Decl(assignmentCompatWithConstructSignatures4.ts, 13, 11))
->b10 : Symbol(b10, Decl(assignmentCompatWithConstructSignatures4.ts, 55, 11))
+>a10 : Symbol(a10, Decl(assignmentCompatWithConstructSignatures4.ts, 13, 19))
+>b10 : Symbol(b10, Decl(assignmentCompatWithConstructSignatures4.ts, 55, 19))
 
         b10 = a10; // ok
->b10 : Symbol(b10, Decl(assignmentCompatWithConstructSignatures4.ts, 55, 11))
->a10 : Symbol(a10, Decl(assignmentCompatWithConstructSignatures4.ts, 13, 11))
+>b10 : Symbol(b10, Decl(assignmentCompatWithConstructSignatures4.ts, 55, 19))
+>a10 : Symbol(a10, Decl(assignmentCompatWithConstructSignatures4.ts, 13, 19))
 
-        var b11: new <T extends Derived>(x: T, y: T) => T; 
->b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 11))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 22))
+        declare var b11: new <T extends Derived>(x: T, y: T) => T; 
+>b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 19))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 30))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 41))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 22))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 46))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 22))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 22))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 49))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 30))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 54))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 30))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 30))
 
         a11 = b11; // ok
->a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 11))
->b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 11))
+>a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 19))
+>b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 19))
 
         b11 = a11; // ok
->b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 11))
->a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 11))
+>b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures4.ts, 59, 19))
+>a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 19))
 
-        var b12: new <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
->b12 : Symbol(b12, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 11))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 22))
+        declare var b12: new <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
+>b12 : Symbol(b12, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 19))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 30))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithConstructSignatures4.ts, 4, 47))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 49))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 57))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 64))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 72))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 30))
 
         a12 = b12; // ok
->a12 : Symbol(a12, Decl(assignmentCompatWithConstructSignatures4.ts, 15, 11))
->b12 : Symbol(b12, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 11))
+>a12 : Symbol(a12, Decl(assignmentCompatWithConstructSignatures4.ts, 15, 19))
+>b12 : Symbol(b12, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 19))
 
         b12 = a12; // ok
->b12 : Symbol(b12, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 11))
->a12 : Symbol(a12, Decl(assignmentCompatWithConstructSignatures4.ts, 15, 11))
-
-        var b15: new <T>(x: { a: T; b: T }) => T; 
->b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 11))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 22))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 25))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 29))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 22))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 35))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 22))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 22))
+>b12 : Symbol(b12, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 19))
+>a12 : Symbol(a12, Decl(assignmentCompatWithConstructSignatures4.ts, 15, 19))
+
+        declare var b15: new <T>(x: { a: T; b: T }) => T; 
+>b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 19))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 30))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 33))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 37))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 30))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 43))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 30))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 30))
 
         a15 = b15; // ok
->a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 11))
->b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 11))
+>a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 19))
+>b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 19))
 
         b15 = a15; // ok
->b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 11))
->a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 11))
+>b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures4.ts, 67, 19))
+>a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 19))
 
-        var b15a: new <T extends Base>(x: { a: T; b: T }) => number; 
->b15a : Symbol(b15a, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 11))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 23))
+        declare var b15a: new <T extends Base>(x: { a: T; b: T }) => number; 
+>b15a : Symbol(b15a, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 19))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 31))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 39))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 43))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 23))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 49))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 23))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 47))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 51))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 31))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 57))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 31))
 
         a15 = b15a; // ok
->a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 11))
->b15a : Symbol(b15a, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 11))
+>a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 19))
+>b15a : Symbol(b15a, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 19))
 
         b15a = a15; // ok
->b15a : Symbol(b15a, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 11))
->a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 11))
-
-        var b16: new <T>(x: (a: T) => T) => T[];
->b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 11))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 22))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 25))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 29))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 22))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 22))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 22))
+>b15a : Symbol(b15a, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 19))
+>a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures4.ts, 20, 19))
+
+        declare var b16: new <T>(x: (a: T) => T) => T[];
+>b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 19))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 30))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 33))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 37))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 30))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 30))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 30))
 
         a16 = b16; // error
->a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures4.ts, 21, 11))
->b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 11))
+>a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures4.ts, 21, 19))
+>b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 19))
 
         b16 = a16; // error
->b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 11))
->a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures4.ts, 21, 11))
+>b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures4.ts, 75, 19))
+>a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures4.ts, 21, 19))
 
-        var b17: new <T>(x: (a: T) => T) => any[];
->b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 11))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 22))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 25))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 29))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 22))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 22))
+        declare var b17: new <T>(x: (a: T) => T) => any[];
+>b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 19))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 30))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 33))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 37))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 30))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 30))
 
         a17 = b17; // error
->a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures4.ts, 31, 11))
->b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 11))
+>a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures4.ts, 31, 19))
+>b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 19))
 
         b17 = a17; // error
->b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 11))
->a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures4.ts, 31, 11))
+>b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures4.ts, 79, 19))
+>a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures4.ts, 31, 19))
     }
 
     namespace WithGenericSignaturesInBaseType {
 >WithGenericSignaturesInBaseType : Symbol(WithGenericSignaturesInBaseType, Decl(assignmentCompatWithConstructSignatures4.ts, 82, 5))
 
         // target type has generic call signature
-        var a2: new <T>(x: T) => T[];
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures4.ts, 86, 11))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 86, 21))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 86, 24))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 86, 21))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 86, 21))
-
-        var b2: new <T>(x: T) => string[];
->b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures4.ts, 87, 11))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 87, 21))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 87, 24))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 87, 21))
+        declare var a2: new <T>(x: T) => T[];
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures4.ts, 86, 19))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 86, 29))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 86, 32))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 86, 29))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 86, 29))
+
+        declare var b2: new <T>(x: T) => string[];
+>b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures4.ts, 87, 19))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 87, 29))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 87, 32))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 87, 29))
 
         a2 = b2; // ok
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures4.ts, 86, 11))
->b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures4.ts, 87, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures4.ts, 86, 19))
+>b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures4.ts, 87, 19))
 
         b2 = a2; // ok
->b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures4.ts, 87, 11))
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures4.ts, 86, 11))
+>b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures4.ts, 87, 19))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures4.ts, 86, 19))
 
         // target type has generic call signature
-        var a3: new <T>(x: T) => string[];
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures4.ts, 92, 11))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 92, 21))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 92, 24))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 92, 21))
-
-        var b3: new <T>(x: T) => T[]; 
->b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures4.ts, 93, 11))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 93, 21))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 93, 24))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 93, 21))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 93, 21))
+        declare var a3: new <T>(x: T) => string[];
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures4.ts, 92, 19))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 92, 29))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 92, 32))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 92, 29))
+
+        declare var b3: new <T>(x: T) => T[]; 
+>b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures4.ts, 93, 19))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 93, 29))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 93, 32))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 93, 29))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 93, 29))
 
         a3 = b3; // ok
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures4.ts, 92, 11))
->b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures4.ts, 93, 11))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures4.ts, 92, 19))
+>b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures4.ts, 93, 19))
 
         b3 = a3; // ok
->b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures4.ts, 93, 11))
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures4.ts, 92, 11))
+>b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures4.ts, 93, 19))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures4.ts, 92, 19))
     }
 }
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types
index 965689ed74cab..8351243da4be8 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types
@@ -42,13 +42,13 @@ namespace Errors {
 >                                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         // target type with non-generic call signatures
-        var a2: new (x: number) => string[];
+        declare var a2: new (x: number) => string[];
 >a2 : new (x: number) => string[]
 >   : ^^^^^ ^^      ^^^^^        
 >x : number
 >  : ^^^^^^
 
-        var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived2;
+        declare var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived2;
 >a7 : new (x: (arg: Base) => Derived) => (r: Base) => Derived2
 >   : ^^^^^ ^^                      ^^^^^                     
 >x : (arg: Base) => Derived
@@ -58,7 +58,7 @@ namespace Errors {
 >r : Base
 >  : ^^^^
 
-        var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+        declare var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a8 : new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >   : ^^^^^ ^^                      ^^ ^^                       ^^^^^                    
 >x : (arg: Base) => Derived
@@ -72,13 +72,13 @@ namespace Errors {
 >r : Base
 >  : ^^^^
 
-        var a10: new (...x: Base[]) => Base;
+        declare var a10: new (...x: Base[]) => Base;
 >a10 : new (...x: Base[]) => Base
 >    : ^^^^^^^^ ^^      ^^^^^    
 >x : Base[]
 >  : ^^^^^^
 
-        var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+        declare var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >a11 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >    : ^^^^^ ^^                ^^ ^^                             ^^^^^    
 >x : { foo: string; }
@@ -92,7 +92,7 @@ namespace Errors {
 >bar : string
 >    : ^^^^^^
 
-        var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+        declare var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >    : ^^^^^ ^^           ^^ ^^               ^^^^^              
 >x : Base[]
@@ -100,7 +100,7 @@ namespace Errors {
 >y : Derived2[]
 >  : ^^^^^^^^^^
 
-        var a14: {
+        declare var a14: {
 >a14 : { new (x: number): number[]; new (x: string): string[]; }
 >    : ^^^^^^^ ^^      ^^^        ^^^^^^^ ^^      ^^^        ^^^
 
@@ -113,7 +113,7 @@ namespace Errors {
 >  : ^^^^^^
 
             };
-        var a15: new (x: { a: string; b: number }) => number;
+        declare var a15: new (x: { a: string; b: number }) => number;
 >a15 : new (x: { a: string; b: number; }) => number
 >    : ^^^^^ ^^                         ^^^^^      
 >x : { a: string; b: number; }
@@ -123,7 +123,7 @@ namespace Errors {
 >b : number
 >  : ^^^^^^
 
-        var a16: {
+        declare var a16: {
 >a16 : { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }
 >    : ^^^^^^^ ^^                                                      ^^^        ^^^^^^^ ^^                                                          ^^^         ^^^
 
@@ -154,7 +154,7 @@ namespace Errors {
 
                 }): boolean[];
             };
-        var a17: {
+        declare var a17: {
 >a17 : { new (x: { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }): any[]; new (x: { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }): any[]; }
 >    : ^^^^^^^ ^^                                                                    ^^^     ^^^^^^^ ^^                                                                     ^^^     ^^^
 
@@ -186,7 +186,7 @@ namespace Errors {
                 }): any[];
             };
 
-        var b2: new <T, U>(x: T) => U[]; 
+        declare var b2: new <T, U>(x: T) => U[]; 
 >b2 : new <T, U>(x: T) => U[]
 >   : ^^^^^ ^^ ^^ ^^ ^^^^^   
 >x : T
@@ -208,7 +208,7 @@ namespace Errors {
 >a2 : new (x: number) => string[]
 >   : ^^^^^ ^^      ^^^^^        
 
-        var b7: new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
+        declare var b7: new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
 >b7 : new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V
 >   : ^^^^^ ^^^^^^^^^    ^^ ^^^^^^^^^       ^^ ^^^^^^^^^        ^^ ^^             ^^^^^           
 >x : (arg: T) => U
@@ -234,7 +234,7 @@ namespace Errors {
 >a7 : new (x: (arg: Base) => Derived) => (r: Base) => Derived2
 >   : ^^^^^ ^^                      ^^^^^                     
 
-        var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
+        declare var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
 >b8 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U
 >   : ^^^^^ ^^^^^^^^^    ^^ ^^^^^^^^^       ^^ ^^             ^^ ^^                             ^^^^^           
 >x : (arg: T) => U
@@ -267,7 +267,7 @@ namespace Errors {
 >   : ^^^^^ ^^                      ^^ ^^                       ^^^^^                    
 
         
-        var b10: new <T extends Derived>(...x: T[]) => T; 
+        declare var b10: new <T extends Derived>(...x: T[]) => T; 
 >b10 : new <T extends Derived>(...x: T[]) => T
 >    : ^^^^^ ^^^^^^^^^       ^^^^^ ^^   ^^^^^ 
 >x : T[]
@@ -289,7 +289,7 @@ namespace Errors {
 >a10 : new (...x: Base[]) => Base
 >    : ^^^^^^^^ ^^      ^^^^^    
 
-        var b11: new <T extends Derived>(x: T, y: T) => T; 
+        declare var b11: new <T extends Derived>(x: T, y: T) => T; 
 >b11 : new <T extends Derived>(x: T, y: T) => T
 >    : ^^^^^ ^^^^^^^^^       ^^ ^^ ^^ ^^ ^^^^^ 
 >x : T
@@ -313,7 +313,7 @@ namespace Errors {
 >a11 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >    : ^^^^^ ^^                ^^ ^^                             ^^^^^    
 
-        var b12: new <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
+        declare var b12: new <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
 >b12 : new <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T
 >    : ^^^^^ ^^^^^^^^^               ^^ ^^           ^^ ^^           ^^^^^ 
 >x : Base[]
@@ -337,7 +337,7 @@ namespace Errors {
 >a12 : new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >    : ^^^^^ ^^           ^^ ^^               ^^^^^              
 
-        var b15: new <T>(x: { a: T; b: T }) => T; 
+        declare var b15: new <T>(x: { a: T; b: T }) => T; 
 >b15 : new <T>(x: { a: T; b: T; }) => T
 >    : ^^^^^ ^^ ^^               ^^^^^ 
 >x : { a: T; b: T; }
@@ -363,7 +363,7 @@ namespace Errors {
 >a15 : new (x: { a: string; b: number; }) => number
 >    : ^^^^^ ^^                         ^^^^^      
 
-        var b15a: new <T extends Base>(x: { a: T; b: T }) => number; 
+        declare var b15a: new <T extends Base>(x: { a: T; b: T }) => number; 
 >b15a : new <T extends Base>(x: { a: T; b: T; }) => number
 >     : ^^^^^ ^^^^^^^^^    ^^ ^^               ^^^^^      
 >x : { a: T; b: T; }
@@ -389,7 +389,7 @@ namespace Errors {
 >a15 : new (x: { a: string; b: number; }) => number
 >    : ^^^^^ ^^                         ^^^^^      
 
-        var b16: new <T>(x: (a: T) => T) => T[];
+        declare var b16: new <T>(x: (a: T) => T) => T[];
 >b16 : new <T>(x: (a: T) => T) => T[]
 >    : ^^^^^ ^^ ^^           ^^^^^   
 >x : (a: T) => T
@@ -413,7 +413,7 @@ namespace Errors {
 >a16 : { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }
 >    : ^^^^^^^ ^^                                                      ^^^        ^^^^^^^ ^^                                                          ^^^         ^^^
 
-        var b17: new <T>(x: (a: T) => T) => any[];
+        declare var b17: new <T>(x: (a: T) => T) => any[];
 >b17 : new <T>(x: (a: T) => T) => any[]
 >    : ^^^^^ ^^ ^^           ^^^^^     
 >x : (a: T) => T
@@ -443,13 +443,13 @@ namespace Errors {
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         // target type has generic call signature
-        var a2: new <T>(x: T) => T[];
+        declare var a2: new <T>(x: T) => T[];
 >a2 : new <T>(x: T) => T[]
 >   : ^^^^^ ^^ ^^ ^^^^^   
 >x : T
 >  : ^
 
-        var b2: new <T>(x: T) => string[];
+        declare var b2: new <T>(x: T) => string[];
 >b2 : new <T>(x: T) => string[]
 >   : ^^^^^ ^^ ^^ ^^^^^        
 >x : T
@@ -472,13 +472,13 @@ namespace Errors {
 >   : ^^^^^ ^^ ^^ ^^^^^   
 
         // target type has generic call signature
-        var a3: new <T>(x: T) => string[];
+        declare var a3: new <T>(x: T) => string[];
 >a3 : new <T>(x: T) => string[]
 >   : ^^^^^ ^^ ^^ ^^^^^        
 >x : T
 >  : ^
 
-        var b3: new <T>(x: T) => T[]; 
+        declare var b3: new <T>(x: T) => T[]; 
 >b3 : new <T>(x: T) => T[]
 >   : ^^^^^ ^^ ^^ ^^^^^   
 >x : T
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.errors.txt
index adb0972082fdb..af7665124c159 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.errors.txt
@@ -28,20 +28,20 @@ assignmentCompatWithConstructSignatures5.ts(58,1): error TS2322: Type 'new <T ex
     class Derived2 extends Derived { baz: string; }
     class OtherDerived extends Base { bing: string; }
     
-    var a: new <T>(x: T) => T[];
-    var a2: new <T>(x: T) => string[];
-    var a3: new <T>(x: T) => void;
-    var a4: new <T, U>(x: T, y: U) => string;
-    var a5: new <T, U>(x: new (arg: T) => U) => T;
-    var a6: new <T extends Base>(x: new (arg: T) => Derived) => T;
-    var a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
-    var a15: new <T>(x: { a: T; b: T }) => T[];
-    var a16: new <T extends Base>(x: { a: T; b: T }) => T[];
-    var a17: {
+    declare var a: new <T>(x: T) => T[];
+    declare var a2: new <T>(x: T) => string[];
+    declare var a3: new <T>(x: T) => void;
+    declare var a4: new <T, U>(x: T, y: U) => string;
+    declare var a5: new <T, U>(x: new (arg: T) => U) => T;
+    declare var a6: new <T extends Base>(x: new (arg: T) => Derived) => T;
+    declare var a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
+    declare var a15: new <T>(x: { a: T; b: T }) => T[];
+    declare var a16: new <T extends Base>(x: { a: T; b: T }) => T[];
+    declare var a17: {
         new <T extends Derived>(x: new (a: T) => T): T[];
         new <T extends Base>(x: new (a: T) => T): T[];        
     };
-    var a18: {
+    declare var a18: {
         new (x: {
             new <T extends Derived>(a: T): T;
             new <T extends Base>(a: T): T;
@@ -52,29 +52,29 @@ assignmentCompatWithConstructSignatures5.ts(58,1): error TS2322: Type 'new <T ex
         }): any[];
     };
     
-    var b: new <T>(x: T) => T[]; 
+    declare var b: new <T>(x: T) => T[]; 
     a = b; // ok
     b = a; // ok
-    var b2: new <T>(x: T) => string[]; 
+    declare var b2: new <T>(x: T) => string[]; 
     a2 = b2; // ok
     b2 = a2; // ok
-    var b3: new <T>(x: T) => T; 
+    declare var b3: new <T>(x: T) => T; 
     a3 = b3; // ok
     b3 = a3; // ok
     ~~
 !!! error TS2322: Type 'new <T>(x: T) => void' is not assignable to type 'new <T>(x: T) => T'.
 !!! error TS2322:   Type 'void' is not assignable to type 'T'.
 !!! error TS2322:     'T' could be instantiated with an arbitrary type which could be unrelated to 'void'.
-    var b4: new <T, U>(x: T, y: U) => string; 
+    declare var b4: new <T, U>(x: T, y: U) => string; 
     a4 = b4; // ok
     b4 = a4; // ok
-    var b5: new <T, U>(x: new (arg: T) => U) => T; 
+    declare var b5: new <T, U>(x: new (arg: T) => U) => T; 
     a5 = b5; // ok
     b5 = a5; // ok
-    var b6: new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T; 
+    declare var b6: new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T; 
     a6 = b6; // ok
     b6 = a6; // ok
-    var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+    declare var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
     a11 = b11; // ok
     b11 = a11; // ok
     ~~~
@@ -84,8 +84,8 @@ assignmentCompatWithConstructSignatures5.ts(58,1): error TS2322: Type 'new <T ex
 !!! error TS2322:       Types of property 'foo' are incompatible.
 !!! error TS2322:         Type 'U' is not assignable to type 'T'.
 !!! error TS2322:           'T' could be instantiated with an arbitrary type which could be unrelated to 'U'.
-!!! related TS2208 assignmentCompatWithConstructSignatures5.ts:50:18: This type parameter might need an `extends T` constraint.
-    var b15: new <U, V>(x: { a: U; b: V; }) => U[]; 
+!!! related TS2208 assignmentCompatWithConstructSignatures5.ts:50:26: This type parameter might need an `extends T` constraint.
+    declare var b15: new <U, V>(x: { a: U; b: V; }) => U[]; 
     a15 = b15; // ok
     b15 = a15; // ok
     ~~~
@@ -95,8 +95,8 @@ assignmentCompatWithConstructSignatures5.ts(58,1): error TS2322: Type 'new <T ex
 !!! error TS2322:       Types of property 'b' are incompatible.
 !!! error TS2322:         Type 'V' is not assignable to type 'U'.
 !!! error TS2322:           'U' could be instantiated with an arbitrary type which could be unrelated to 'V'.
-!!! related TS2208 assignmentCompatWithConstructSignatures5.ts:53:18: This type parameter might need an `extends U` constraint.
-    var b16: new <T>(x: { a: T; b: T }) => T[]; 
+!!! related TS2208 assignmentCompatWithConstructSignatures5.ts:53:26: This type parameter might need an `extends U` constraint.
+    declare var b16: new <T>(x: { a: T; b: T }) => T[]; 
     a15 = b16; // ok
     b15 = a16; // ok
     ~~~
@@ -105,11 +105,11 @@ assignmentCompatWithConstructSignatures5.ts(58,1): error TS2322: Type 'new <T ex
 !!! error TS2322:     Type '{ a: U; b: V; }' is not assignable to type '{ a: Base; b: Base; }'.
 !!! error TS2322:       Types of property 'a' are incompatible.
 !!! error TS2322:         Type 'U' is not assignable to type 'Base'.
-!!! related TS2208 assignmentCompatWithConstructSignatures5.ts:53:15: This type parameter might need an `extends Base` constraint.
-    var b17: new <T>(x: new (a: T) => T) => T[]; 
+!!! related TS2208 assignmentCompatWithConstructSignatures5.ts:53:23: This type parameter might need an `extends Base` constraint.
+    declare var b17: new <T>(x: new (a: T) => T) => T[]; 
     a17 = b17; // ok
     b17 = a17; // ok
-    var b18: new (x: new <T>(a: T) => T) => any[]; 
+    declare var b18: new (x: new <T>(a: T) => T) => any[]; 
     a18 = b18; // ok
     b18 = a18; // ok
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
index ccad983de027b..07460f736472f 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
@@ -8,20 +8,20 @@ class Derived extends Base { bar: string; }
 class Derived2 extends Derived { baz: string; }
 class OtherDerived extends Base { bing: string; }
 
-var a: new <T>(x: T) => T[];
-var a2: new <T>(x: T) => string[];
-var a3: new <T>(x: T) => void;
-var a4: new <T, U>(x: T, y: U) => string;
-var a5: new <T, U>(x: new (arg: T) => U) => T;
-var a6: new <T extends Base>(x: new (arg: T) => Derived) => T;
-var a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
-var a15: new <T>(x: { a: T; b: T }) => T[];
-var a16: new <T extends Base>(x: { a: T; b: T }) => T[];
-var a17: {
+declare var a: new <T>(x: T) => T[];
+declare var a2: new <T>(x: T) => string[];
+declare var a3: new <T>(x: T) => void;
+declare var a4: new <T, U>(x: T, y: U) => string;
+declare var a5: new <T, U>(x: new (arg: T) => U) => T;
+declare var a6: new <T extends Base>(x: new (arg: T) => Derived) => T;
+declare var a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
+declare var a15: new <T>(x: { a: T; b: T }) => T[];
+declare var a16: new <T extends Base>(x: { a: T; b: T }) => T[];
+declare var a17: {
     new <T extends Derived>(x: new (a: T) => T): T[];
     new <T extends Base>(x: new (a: T) => T): T[];        
 };
-var a18: {
+declare var a18: {
     new (x: {
         new <T extends Derived>(a: T): T;
         new <T extends Base>(a: T): T;
@@ -32,37 +32,37 @@ var a18: {
     }): any[];
 };
 
-var b: new <T>(x: T) => T[]; 
+declare var b: new <T>(x: T) => T[]; 
 a = b; // ok
 b = a; // ok
-var b2: new <T>(x: T) => string[]; 
+declare var b2: new <T>(x: T) => string[]; 
 a2 = b2; // ok
 b2 = a2; // ok
-var b3: new <T>(x: T) => T; 
+declare var b3: new <T>(x: T) => T; 
 a3 = b3; // ok
 b3 = a3; // ok
-var b4: new <T, U>(x: T, y: U) => string; 
+declare var b4: new <T, U>(x: T, y: U) => string; 
 a4 = b4; // ok
 b4 = a4; // ok
-var b5: new <T, U>(x: new (arg: T) => U) => T; 
+declare var b5: new <T, U>(x: new (arg: T) => U) => T; 
 a5 = b5; // ok
 b5 = a5; // ok
-var b6: new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T; 
+declare var b6: new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T; 
 a6 = b6; // ok
 b6 = a6; // ok
-var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+declare var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 a11 = b11; // ok
 b11 = a11; // ok
-var b15: new <U, V>(x: { a: U; b: V; }) => U[]; 
+declare var b15: new <U, V>(x: { a: U; b: V; }) => U[]; 
 a15 = b15; // ok
 b15 = a15; // ok
-var b16: new <T>(x: { a: T; b: T }) => T[]; 
+declare var b16: new <T>(x: { a: T; b: T }) => T[]; 
 a15 = b16; // ok
 b15 = a16; // ok
-var b17: new <T>(x: new (a: T) => T) => T[]; 
+declare var b17: new <T>(x: new (a: T) => T) => T[]; 
 a17 = b17; // ok
 b17 = a17; // ok
-var b18: new (x: new <T>(a: T) => T) => any[]; 
+declare var b18: new (x: new <T>(a: T) => T) => any[]; 
 a18 = b18; // ok
 b18 = a18; // ok
 
@@ -110,47 +110,25 @@ var OtherDerived = /** @class */ (function (_super) {
     }
     return OtherDerived;
 }(Base));
-var a;
-var a2;
-var a3;
-var a4;
-var a5;
-var a6;
-var a11;
-var a15;
-var a16;
-var a17;
-var a18;
-var b;
 a = b; // ok
 b = a; // ok
-var b2;
 a2 = b2; // ok
 b2 = a2; // ok
-var b3;
 a3 = b3; // ok
 b3 = a3; // ok
-var b4;
 a4 = b4; // ok
 b4 = a4; // ok
-var b5;
 a5 = b5; // ok
 b5 = a5; // ok
-var b6;
 a6 = b6; // ok
 b6 = a6; // ok
-var b11;
 a11 = b11; // ok
 b11 = a11; // ok
-var b15;
 a15 = b15; // ok
 b15 = a15; // ok
-var b16;
 a15 = b16; // ok
 b15 = a16; // ok
-var b17;
 a17 = b17; // ok
 b17 = a17; // ok
-var b18;
 a18 = b18; // ok
 b18 = a18; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.symbols b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.symbols
index fd01679e6a986..f67a6f262820d 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.symbols
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.symbols
@@ -22,90 +22,90 @@ class OtherDerived extends Base { bing: string; }
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures5.ts, 0, 0))
 >bing : Symbol(OtherDerived.bing, Decl(assignmentCompatWithConstructSignatures5.ts, 5, 33))
 
-var a: new <T>(x: T) => T[];
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 7, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 7, 12))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 7, 15))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 7, 12))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 7, 12))
-
-var a2: new <T>(x: T) => string[];
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures5.ts, 8, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 8, 13))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 8, 16))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 8, 13))
-
-var a3: new <T>(x: T) => void;
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures5.ts, 9, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 9, 13))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 9, 16))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 9, 13))
-
-var a4: new <T, U>(x: T, y: U) => string;
->a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 15))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 19))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 13))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 24))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 15))
-
-var a5: new <T, U>(x: new (arg: T) => U) => T;
->a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 15))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 19))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 27))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 15))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 13))
-
-var a6: new <T extends Base>(x: new (arg: T) => Derived) => T;
->a6 : Symbol(a6, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 13))
+declare var a: new <T>(x: T) => T[];
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 7, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 7, 20))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 7, 23))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 7, 20))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 7, 20))
+
+declare var a2: new <T>(x: T) => string[];
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures5.ts, 8, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 8, 21))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 8, 24))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 8, 21))
+
+declare var a3: new <T>(x: T) => void;
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures5.ts, 9, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 9, 21))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 9, 24))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 9, 21))
+
+declare var a4: new <T, U>(x: T, y: U) => string;
+>a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 23))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 27))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 21))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 32))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 23))
+
+declare var a5: new <T, U>(x: new (arg: T) => U) => T;
+>a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 23))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 27))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 35))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 23))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 21))
+
+declare var a6: new <T extends Base>(x: new (arg: T) => Derived) => T;
+>a6 : Symbol(a6, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 21))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures5.ts, 0, 0))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 29))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 37))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 13))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 37))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 45))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 21))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures5.ts, 2, 27))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 13))
-
-var a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 14))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 17))
->foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 21))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 14))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 31))
->foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 36))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 14))
->bar : Symbol(bar, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 44))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 14))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 21))
+
+declare var a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
+>a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 22))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 25))
+>foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 29))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 22))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 39))
+>foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 44))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 22))
+>bar : Symbol(bar, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 52))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 22))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures5.ts, 0, 0))
 
-var a15: new <T>(x: { a: T; b: T }) => T[];
->a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 14))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 17))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 21))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 14))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 27))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 14))
-
-var a16: new <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 14))
+declare var a15: new <T>(x: { a: T; b: T }) => T[];
+>a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 22))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 25))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 29))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 22))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 35))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 22))
+
+declare var a16: new <T extends Base>(x: { a: T; b: T }) => T[];
+>a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 22))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures5.ts, 0, 0))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 30))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 34))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 14))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 40))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 14))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 38))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 42))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 22))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 48))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 22))
 
-var a17: {
->a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures5.ts, 16, 3))
+declare var a17: {
+>a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures5.ts, 16, 11))
 
     new <T extends Derived>(x: new (a: T) => T): T[];
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 17, 9))
@@ -126,8 +126,8 @@ var a17: {
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 18, 9))
 
 };
-var a18: {
->a18 : Symbol(a18, Decl(assignmentCompatWithConstructSignatures5.ts, 20, 3))
+declare var a18: {
+>a18 : Symbol(a18, Decl(assignmentCompatWithConstructSignatures5.ts, 20, 11))
 
     new (x: {
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 21, 9))
@@ -167,194 +167,194 @@ var a18: {
     }): any[];
 };
 
-var b: new <T>(x: T) => T[]; 
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures5.ts, 31, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 31, 12))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 31, 15))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 31, 12))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 31, 12))
+declare var b: new <T>(x: T) => T[]; 
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures5.ts, 31, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 31, 20))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 31, 23))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 31, 20))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 31, 20))
 
 a = b; // ok
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 7, 3))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures5.ts, 31, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 7, 11))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures5.ts, 31, 11))
 
 b = a; // ok
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures5.ts, 31, 3))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 7, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures5.ts, 31, 11))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 7, 11))
 
-var b2: new <T>(x: T) => string[]; 
->b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures5.ts, 34, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 34, 13))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 34, 16))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 34, 13))
+declare var b2: new <T>(x: T) => string[]; 
+>b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures5.ts, 34, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 34, 21))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 34, 24))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 34, 21))
 
 a2 = b2; // ok
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures5.ts, 8, 3))
->b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures5.ts, 34, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures5.ts, 8, 11))
+>b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures5.ts, 34, 11))
 
 b2 = a2; // ok
->b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures5.ts, 34, 3))
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures5.ts, 8, 3))
+>b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures5.ts, 34, 11))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures5.ts, 8, 11))
 
-var b3: new <T>(x: T) => T; 
->b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures5.ts, 37, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 37, 13))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 37, 16))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 37, 13))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 37, 13))
+declare var b3: new <T>(x: T) => T; 
+>b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures5.ts, 37, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 37, 21))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 37, 24))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 37, 21))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 37, 21))
 
 a3 = b3; // ok
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures5.ts, 9, 3))
->b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures5.ts, 37, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures5.ts, 9, 11))
+>b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures5.ts, 37, 11))
 
 b3 = a3; // ok
->b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures5.ts, 37, 3))
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures5.ts, 9, 3))
-
-var b4: new <T, U>(x: T, y: U) => string; 
->b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 15))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 19))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 13))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 24))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 15))
+>b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures5.ts, 37, 11))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures5.ts, 9, 11))
+
+declare var b4: new <T, U>(x: T, y: U) => string; 
+>b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 23))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 27))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 21))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 32))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 23))
 
 a4 = b4; // ok
->a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 3))
->b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 11))
+>b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 11))
 
 b4 = a4; // ok
->b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 3))
->a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 3))
-
-var b5: new <T, U>(x: new (arg: T) => U) => T; 
->b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 15))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 19))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 27))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 15))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 13))
+>b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures5.ts, 40, 11))
+>a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignatures5.ts, 10, 11))
+
+declare var b5: new <T, U>(x: new (arg: T) => U) => T; 
+>b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 23))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 27))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 35))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 23))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 21))
 
 a5 = b5; // ok
->a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 3))
->b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 11))
+>b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 11))
 
 b5 = a5; // ok
->b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 3))
->a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 3))
+>b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures5.ts, 43, 11))
+>a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignatures5.ts, 11, 11))
 
-var b6: new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T; 
->b6 : Symbol(b6, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 13))
+declare var b6: new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T; 
+>b6 : Symbol(b6, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 21))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures5.ts, 0, 0))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 28))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 36))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures5.ts, 2, 27))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 48))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 56))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 28))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 13))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 56))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 64))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 36))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 21))
 
 a6 = b6; // ok
->a6 : Symbol(a6, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 3))
->b6 : Symbol(b6, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 3))
+>a6 : Symbol(a6, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 11))
+>b6 : Symbol(b6, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 11))
 
 b6 = a6; // ok
->b6 : Symbol(b6, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 3))
->a6 : Symbol(a6, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 3))
-
-var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
->b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 14))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 16))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 20))
->foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 24))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 14))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 34))
->foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 39))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 16))
->bar : Symbol(bar, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 47))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 16))
+>b6 : Symbol(b6, Decl(assignmentCompatWithConstructSignatures5.ts, 46, 11))
+>a6 : Symbol(a6, Decl(assignmentCompatWithConstructSignatures5.ts, 12, 11))
+
+declare var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+>b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 22))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 24))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 28))
+>foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 32))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 22))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 42))
+>foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 47))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 24))
+>bar : Symbol(bar, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 55))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 24))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures5.ts, 0, 0))
 
 a11 = b11; // ok
->a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 3))
->b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 3))
+>a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 11))
+>b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 11))
 
 b11 = a11; // ok
->b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 3))
->a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 3))
-
-var b15: new <U, V>(x: { a: U; b: V; }) => U[]; 
->b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 3))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 14))
->V : Symbol(V, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 16))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 20))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 24))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 14))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 30))
->V : Symbol(V, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 16))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 14))
+>b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures5.ts, 49, 11))
+>a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures5.ts, 13, 11))
+
+declare var b15: new <U, V>(x: { a: U; b: V; }) => U[]; 
+>b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 11))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 22))
+>V : Symbol(V, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 24))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 28))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 32))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 22))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 38))
+>V : Symbol(V, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 24))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 22))
 
 a15 = b15; // ok
->a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 3))
->b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 3))
+>a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 11))
+>b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 11))
 
 b15 = a15; // ok
->b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 3))
->a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 3))
-
-var b16: new <T>(x: { a: T; b: T }) => T[]; 
->b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 14))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 17))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 21))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 14))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 27))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 14))
+>b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 11))
+>a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 11))
+
+declare var b16: new <T>(x: { a: T; b: T }) => T[]; 
+>b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 22))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 25))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 29))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 22))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 35))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 22))
 
 a15 = b16; // ok
->a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 3))
->b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 3))
+>a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures5.ts, 14, 11))
+>b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures5.ts, 55, 11))
 
 b15 = a16; // ok
->b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 3))
->a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 3))
-
-var b17: new <T>(x: new (a: T) => T) => T[]; 
->b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 14))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 17))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 25))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 14))
+>b15 : Symbol(b15, Decl(assignmentCompatWithConstructSignatures5.ts, 52, 11))
+>a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures5.ts, 15, 11))
+
+declare var b17: new <T>(x: new (a: T) => T) => T[]; 
+>b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 22))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 25))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 33))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 22))
 
 a17 = b17; // ok
->a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures5.ts, 16, 3))
->b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 3))
+>a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures5.ts, 16, 11))
+>b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 11))
 
 b17 = a17; // ok
->b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 3))
->a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures5.ts, 16, 3))
+>b17 : Symbol(b17, Decl(assignmentCompatWithConstructSignatures5.ts, 58, 11))
+>a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures5.ts, 16, 11))
 
-var b18: new (x: new <T>(a: T) => T) => any[]; 
->b18 : Symbol(b18, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 22))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 25))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 22))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 22))
+declare var b18: new (x: new <T>(a: T) => T) => any[]; 
+>b18 : Symbol(b18, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 30))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 33))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 30))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 30))
 
 a18 = b18; // ok
->a18 : Symbol(a18, Decl(assignmentCompatWithConstructSignatures5.ts, 20, 3))
->b18 : Symbol(b18, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 3))
+>a18 : Symbol(a18, Decl(assignmentCompatWithConstructSignatures5.ts, 20, 11))
+>b18 : Symbol(b18, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 11))
 
 b18 = a18; // ok
->b18 : Symbol(b18, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 3))
->a18 : Symbol(a18, Decl(assignmentCompatWithConstructSignatures5.ts, 20, 3))
+>b18 : Symbol(b18, Decl(assignmentCompatWithConstructSignatures5.ts, 61, 11))
+>a18 : Symbol(a18, Decl(assignmentCompatWithConstructSignatures5.ts, 20, 11))
 
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.types
index 9d799dad6853c..2b0ddea033e96 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.types
@@ -33,25 +33,25 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 >     : ^^^^^^
 
-var a: new <T>(x: T) => T[];
+declare var a: new <T>(x: T) => T[];
 >a : new <T>(x: T) => T[]
 >  : ^^^^^ ^^ ^^ ^^^^^   
 >x : T
 >  : ^
 
-var a2: new <T>(x: T) => string[];
+declare var a2: new <T>(x: T) => string[];
 >a2 : new <T>(x: T) => string[]
 >   : ^^^^^ ^^ ^^ ^^^^^        
 >x : T
 >  : ^
 
-var a3: new <T>(x: T) => void;
+declare var a3: new <T>(x: T) => void;
 >a3 : new <T>(x: T) => void
 >   : ^^^^^ ^^ ^^ ^^^^^    
 >x : T
 >  : ^
 
-var a4: new <T, U>(x: T, y: U) => string;
+declare var a4: new <T, U>(x: T, y: U) => string;
 >a4 : new <T, U>(x: T, y: U) => string
 >   : ^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^      
 >x : T
@@ -59,7 +59,7 @@ var a4: new <T, U>(x: T, y: U) => string;
 >y : U
 >  : ^
 
-var a5: new <T, U>(x: new (arg: T) => U) => T;
+declare var a5: new <T, U>(x: new (arg: T) => U) => T;
 >a5 : new <T, U>(x: new (arg: T) => U) => T
 >   : ^^^^^ ^^ ^^ ^^                 ^^^^^ 
 >x : new (arg: T) => U
@@ -67,7 +67,7 @@ var a5: new <T, U>(x: new (arg: T) => U) => T;
 >arg : T
 >    : ^
 
-var a6: new <T extends Base>(x: new (arg: T) => Derived) => T;
+declare var a6: new <T extends Base>(x: new (arg: T) => Derived) => T;
 >a6 : new <T extends Base>(x: new (arg: T) => Derived) => T
 >   : ^^^^^ ^^^^^^^^^    ^^ ^^                       ^^^^^ 
 >x : new (arg: T) => Derived
@@ -75,7 +75,7 @@ var a6: new <T extends Base>(x: new (arg: T) => Derived) => T;
 >arg : T
 >    : ^
 
-var a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
+declare var a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
 >    : ^^^^^ ^^ ^^           ^^ ^^                   ^^^^^    
 >x : { foo: T; }
@@ -89,7 +89,7 @@ var a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >bar : T
 >    : ^
 
-var a15: new <T>(x: { a: T; b: T }) => T[];
+declare var a15: new <T>(x: { a: T; b: T }) => T[];
 >a15 : new <T>(x: { a: T; b: T; }) => T[]
 >    : ^^^^^ ^^ ^^               ^^^^^   
 >x : { a: T; b: T; }
@@ -99,7 +99,7 @@ var a15: new <T>(x: { a: T; b: T }) => T[];
 >b : T
 >  : ^
 
-var a16: new <T extends Base>(x: { a: T; b: T }) => T[];
+declare var a16: new <T extends Base>(x: { a: T; b: T }) => T[];
 >a16 : new <T extends Base>(x: { a: T; b: T; }) => T[]
 >    : ^^^^^ ^^^^^^^^^    ^^ ^^               ^^^^^   
 >x : { a: T; b: T; }
@@ -109,7 +109,7 @@ var a16: new <T extends Base>(x: { a: T; b: T }) => T[];
 >b : T
 >  : ^
 
-var a17: {
+declare var a17: {
 >a17 : { new <T extends Derived>(x: new (a: T) => T): T[]; new <T extends Base>(x: new (a: T) => T): T[]; }
 >    : ^^^^^^^ ^^^^^^^^^       ^^ ^^               ^^^   ^^^^^^^ ^^^^^^^^^    ^^ ^^               ^^^   ^^^
 
@@ -126,7 +126,7 @@ var a17: {
 >  : ^
 
 };
-var a18: {
+declare var a18: {
 >a18 : { new (x: { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }): any[]; new (x: { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }): any[]; }
 >    : ^^^^^^^ ^^                                                                    ^^^     ^^^^^^^ ^^                                                                     ^^^     ^^^
 
@@ -158,7 +158,7 @@ var a18: {
     }): any[];
 };
 
-var b: new <T>(x: T) => T[]; 
+declare var b: new <T>(x: T) => T[]; 
 >b : new <T>(x: T) => T[]
 >  : ^^^^^ ^^ ^^ ^^^^^   
 >x : T
@@ -180,7 +180,7 @@ b = a; // ok
 >a : new <T>(x: T) => T[]
 >  : ^^^^^ ^^ ^^ ^^^^^   
 
-var b2: new <T>(x: T) => string[]; 
+declare var b2: new <T>(x: T) => string[]; 
 >b2 : new <T>(x: T) => string[]
 >   : ^^^^^ ^^ ^^ ^^^^^        
 >x : T
@@ -202,7 +202,7 @@ b2 = a2; // ok
 >a2 : new <T>(x: T) => string[]
 >   : ^^^^^ ^^ ^^ ^^^^^        
 
-var b3: new <T>(x: T) => T; 
+declare var b3: new <T>(x: T) => T; 
 >b3 : new <T>(x: T) => T
 >   : ^^^^^ ^^ ^^ ^^^^^ 
 >x : T
@@ -224,7 +224,7 @@ b3 = a3; // ok
 >a3 : new <T>(x: T) => void
 >   : ^^^^^ ^^ ^^ ^^^^^    
 
-var b4: new <T, U>(x: T, y: U) => string; 
+declare var b4: new <T, U>(x: T, y: U) => string; 
 >b4 : new <T, U>(x: T, y: U) => string
 >   : ^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^      
 >x : T
@@ -248,7 +248,7 @@ b4 = a4; // ok
 >a4 : new <T, U>(x: T, y: U) => string
 >   : ^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^      
 
-var b5: new <T, U>(x: new (arg: T) => U) => T; 
+declare var b5: new <T, U>(x: new (arg: T) => U) => T; 
 >b5 : new <T, U>(x: new (arg: T) => U) => T
 >   : ^^^^^ ^^ ^^ ^^                 ^^^^^ 
 >x : new (arg: T) => U
@@ -272,7 +272,7 @@ b5 = a5; // ok
 >a5 : new <T, U>(x: new (arg: T) => U) => T
 >   : ^^^^^ ^^ ^^ ^^                 ^^^^^ 
 
-var b6: new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T; 
+declare var b6: new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T; 
 >b6 : new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T
 >   : ^^^^^ ^^^^^^^^^    ^^ ^^^^^^^^^       ^^ ^^                 ^^^^^ 
 >x : new (arg: T) => U
@@ -296,7 +296,7 @@ b6 = a6; // ok
 >a6 : new <T extends Base>(x: new (arg: T) => Derived) => T
 >   : ^^^^^ ^^^^^^^^^    ^^ ^^                       ^^^^^ 
 
-var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+declare var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 >b11 : new <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
 >    : ^^^^^ ^^ ^^ ^^           ^^ ^^                   ^^^^^    
 >x : { foo: T; }
@@ -326,7 +326,7 @@ b11 = a11; // ok
 >a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
 >    : ^^^^^ ^^ ^^           ^^ ^^                   ^^^^^    
 
-var b15: new <U, V>(x: { a: U; b: V; }) => U[]; 
+declare var b15: new <U, V>(x: { a: U; b: V; }) => U[]; 
 >b15 : new <U, V>(x: { a: U; b: V; }) => U[]
 >    : ^^^^^ ^^ ^^ ^^               ^^^^^   
 >x : { a: U; b: V; }
@@ -352,7 +352,7 @@ b15 = a15; // ok
 >a15 : new <T>(x: { a: T; b: T; }) => T[]
 >    : ^^^^^ ^^ ^^               ^^^^^   
 
-var b16: new <T>(x: { a: T; b: T }) => T[]; 
+declare var b16: new <T>(x: { a: T; b: T }) => T[]; 
 >b16 : new <T>(x: { a: T; b: T; }) => T[]
 >    : ^^^^^ ^^ ^^               ^^^^^   
 >x : { a: T; b: T; }
@@ -378,7 +378,7 @@ b15 = a16; // ok
 >a16 : new <T extends Base>(x: { a: T; b: T; }) => T[]
 >    : ^^^^^ ^^^^^^^^^    ^^ ^^               ^^^^^   
 
-var b17: new <T>(x: new (a: T) => T) => T[]; 
+declare var b17: new <T>(x: new (a: T) => T) => T[]; 
 >b17 : new <T>(x: new (a: T) => T) => T[]
 >    : ^^^^^ ^^ ^^               ^^^^^   
 >x : new (a: T) => T
@@ -402,7 +402,7 @@ b17 = a17; // ok
 >a17 : { new <T extends Derived>(x: new (a: T) => T): T[]; new <T extends Base>(x: new (a: T) => T): T[]; }
 >    : ^^^^^^^ ^^^^^^^^^       ^^ ^^               ^^^   ^^^^^^^ ^^^^^^^^^    ^^ ^^               ^^^   ^^^
 
-var b18: new (x: new <T>(a: T) => T) => any[]; 
+declare var b18: new (x: new <T>(a: T) => T) => any[]; 
 >b18 : new (x: new <T>(a: T) => T) => any[]
 >    : ^^^^^ ^^                  ^^^^^     
 >x : new <T>(a: T) => T
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.errors.txt
index 59034ca10b03f..15c7c64f04863 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.errors.txt
@@ -34,28 +34,28 @@ assignmentCompatWithConstructSignatures6.ts(42,1): error TS2322: Type 'new <T ex
         a16: new <T extends Base>(x: { a: T; b: T }) => T[];
     }
     
-    var x: A;
+    declare var x: A;
     
-    var b: new <T>(x: T) => T[]; 
+    declare var b: new <T>(x: T) => T[]; 
     x.a = b;
     b = x.a;
-    var b2: new <T>(x: T) => string[]; 
+    declare var b2: new <T>(x: T) => string[]; 
     x.a2 = b2;
     b2 = x.a2;
-    var b3: new <T>(x: T) => T;
+    declare var b3: new <T>(x: T) => T;
     x.a3 = b3;
     b3 = x.a3;
     ~~
 !!! error TS2322: Type 'new <T>(x: T) => void' is not assignable to type 'new <T>(x: T) => T'.
 !!! error TS2322:   Type 'void' is not assignable to type 'T'.
 !!! error TS2322:     'T' could be instantiated with an arbitrary type which could be unrelated to 'void'.
-    var b4: new <T, U>(x: T, y: U) => string; 
+    declare var b4: new <T, U>(x: T, y: U) => string; 
     x.a4 = b4;
     b4 = x.a4;
-    var b5: new <T, U>(x: (arg: T) => U) => T; 
+    declare var b5: new <T, U>(x: (arg: T) => U) => T; 
     x.a5 = b5;
     b5 = x.a5;
-    var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+    declare var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
     x.a11 = b11;
     b11 = x.a11;
     ~~~
@@ -65,8 +65,8 @@ assignmentCompatWithConstructSignatures6.ts(42,1): error TS2322: Type 'new <T ex
 !!! error TS2322:       Types of property 'foo' are incompatible.
 !!! error TS2322:         Type 'U' is not assignable to type 'T'.
 !!! error TS2322:           'T' could be instantiated with an arbitrary type which could be unrelated to 'U'.
-!!! related TS2208 assignmentCompatWithConstructSignatures6.ts:37:18: This type parameter might need an `extends T` constraint.
-    var b16: new <T>(x: { a: T; b: T }) => T[]; 
+!!! related TS2208 assignmentCompatWithConstructSignatures6.ts:37:26: This type parameter might need an `extends T` constraint.
+    declare var b16: new <T>(x: { a: T; b: T }) => T[]; 
     x.a16 = b16;
     b16 = x.a16;
     ~~~
@@ -75,4 +75,4 @@ assignmentCompatWithConstructSignatures6.ts(42,1): error TS2322: Type 'new <T ex
 !!! error TS2322:     Type '{ a: T; b: T; }' is not assignable to type '{ a: Base; b: Base; }'.
 !!! error TS2322:       Types of property 'a' are incompatible.
 !!! error TS2322:         Type 'T' is not assignable to type 'Base'.
-!!! related TS2208 assignmentCompatWithConstructSignatures6.ts:40:15: This type parameter might need an `extends Base` constraint.
\ No newline at end of file
+!!! related TS2208 assignmentCompatWithConstructSignatures6.ts:40:23: This type parameter might need an `extends Base` constraint.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
index 5c3f1ab68ebb5..d85d3e9b8f690 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
@@ -20,27 +20,27 @@ interface A {
     a16: new <T extends Base>(x: { a: T; b: T }) => T[];
 }
 
-var x: A;
+declare var x: A;
 
-var b: new <T>(x: T) => T[]; 
+declare var b: new <T>(x: T) => T[]; 
 x.a = b;
 b = x.a;
-var b2: new <T>(x: T) => string[]; 
+declare var b2: new <T>(x: T) => string[]; 
 x.a2 = b2;
 b2 = x.a2;
-var b3: new <T>(x: T) => T;
+declare var b3: new <T>(x: T) => T;
 x.a3 = b3;
 b3 = x.a3;
-var b4: new <T, U>(x: T, y: U) => string; 
+declare var b4: new <T, U>(x: T, y: U) => string; 
 x.a4 = b4;
 b4 = x.a4;
-var b5: new <T, U>(x: (arg: T) => U) => T; 
+declare var b5: new <T, U>(x: (arg: T) => U) => T; 
 x.a5 = b5;
 b5 = x.a5;
-var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+declare var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 x.a11 = b11;
 b11 = x.a11;
-var b16: new <T>(x: { a: T; b: T }) => T[]; 
+declare var b16: new <T>(x: { a: T; b: T }) => T[]; 
 x.a16 = b16;
 b16 = x.a16;
 
@@ -87,25 +87,17 @@ var OtherDerived = /** @class */ (function (_super) {
     }
     return OtherDerived;
 }(Base));
-var x;
-var b;
 x.a = b;
 b = x.a;
-var b2;
 x.a2 = b2;
 b2 = x.a2;
-var b3;
 x.a3 = b3;
 b3 = x.a3;
-var b4;
 x.a4 = b4;
 b4 = x.a4;
-var b5;
 x.a5 = b5;
 b5 = x.a5;
-var b11;
 x.a11 = b11;
 b11 = x.a11;
-var b16;
 x.a16 = b16;
 b16 = x.a16;
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.symbols b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.symbols
index eaac9f33e7099..2a46dc531de2a 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.symbols
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.symbols
@@ -108,154 +108,154 @@ interface A {
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 16, 14))
 }
 
-var x: A;
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 3))
+declare var x: A;
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 11))
 >A : Symbol(A, Decl(assignmentCompatWithConstructSignatures6.ts, 5, 49))
 
-var b: new <T>(x: T) => T[]; 
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures6.ts, 21, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 21, 12))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 21, 15))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 21, 12))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 21, 12))
+declare var b: new <T>(x: T) => T[]; 
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures6.ts, 21, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 21, 20))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 21, 23))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 21, 20))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 21, 20))
 
 x.a = b;
 >x.a : Symbol(A.a, Decl(assignmentCompatWithConstructSignatures6.ts, 7, 13))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 11))
 >a : Symbol(A.a, Decl(assignmentCompatWithConstructSignatures6.ts, 7, 13))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures6.ts, 21, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures6.ts, 21, 11))
 
 b = x.a;
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures6.ts, 21, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures6.ts, 21, 11))
 >x.a : Symbol(A.a, Decl(assignmentCompatWithConstructSignatures6.ts, 7, 13))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 11))
 >a : Symbol(A.a, Decl(assignmentCompatWithConstructSignatures6.ts, 7, 13))
 
-var b2: new <T>(x: T) => string[]; 
->b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures6.ts, 24, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 24, 13))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 24, 16))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 24, 13))
+declare var b2: new <T>(x: T) => string[]; 
+>b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures6.ts, 24, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 24, 21))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 24, 24))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 24, 21))
 
 x.a2 = b2;
 >x.a2 : Symbol(A.a2, Decl(assignmentCompatWithConstructSignatures6.ts, 8, 28))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 11))
 >a2 : Symbol(A.a2, Decl(assignmentCompatWithConstructSignatures6.ts, 8, 28))
->b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures6.ts, 24, 3))
+>b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures6.ts, 24, 11))
 
 b2 = x.a2;
->b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures6.ts, 24, 3))
+>b2 : Symbol(b2, Decl(assignmentCompatWithConstructSignatures6.ts, 24, 11))
 >x.a2 : Symbol(A.a2, Decl(assignmentCompatWithConstructSignatures6.ts, 8, 28))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 11))
 >a2 : Symbol(A.a2, Decl(assignmentCompatWithConstructSignatures6.ts, 8, 28))
 
-var b3: new <T>(x: T) => T;
->b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures6.ts, 27, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 27, 13))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 27, 16))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 27, 13))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 27, 13))
+declare var b3: new <T>(x: T) => T;
+>b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures6.ts, 27, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 27, 21))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 27, 24))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 27, 21))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 27, 21))
 
 x.a3 = b3;
 >x.a3 : Symbol(A.a3, Decl(assignmentCompatWithConstructSignatures6.ts, 9, 34))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 11))
 >a3 : Symbol(A.a3, Decl(assignmentCompatWithConstructSignatures6.ts, 9, 34))
->b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures6.ts, 27, 3))
+>b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures6.ts, 27, 11))
 
 b3 = x.a3;
->b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures6.ts, 27, 3))
+>b3 : Symbol(b3, Decl(assignmentCompatWithConstructSignatures6.ts, 27, 11))
 >x.a3 : Symbol(A.a3, Decl(assignmentCompatWithConstructSignatures6.ts, 9, 34))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 11))
 >a3 : Symbol(A.a3, Decl(assignmentCompatWithConstructSignatures6.ts, 9, 34))
 
-var b4: new <T, U>(x: T, y: U) => string; 
->b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 15))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 19))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 13))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 24))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 15))
+declare var b4: new <T, U>(x: T, y: U) => string; 
+>b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 23))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 27))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 21))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 32))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 23))
 
 x.a4 = b4;
 >x.a4 : Symbol(A.a4, Decl(assignmentCompatWithConstructSignatures6.ts, 10, 30))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 11))
 >a4 : Symbol(A.a4, Decl(assignmentCompatWithConstructSignatures6.ts, 10, 30))
->b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 3))
+>b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 11))
 
 b4 = x.a4;
->b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 3))
+>b4 : Symbol(b4, Decl(assignmentCompatWithConstructSignatures6.ts, 30, 11))
 >x.a4 : Symbol(A.a4, Decl(assignmentCompatWithConstructSignatures6.ts, 10, 30))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 11))
 >a4 : Symbol(A.a4, Decl(assignmentCompatWithConstructSignatures6.ts, 10, 30))
 
-var b5: new <T, U>(x: (arg: T) => U) => T; 
->b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 15))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 19))
->arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 23))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 13))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 15))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 13))
+declare var b5: new <T, U>(x: (arg: T) => U) => T; 
+>b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 23))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 27))
+>arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 31))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 21))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 23))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 21))
 
 x.a5 = b5;
 >x.a5 : Symbol(A.a5, Decl(assignmentCompatWithConstructSignatures6.ts, 11, 41))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 11))
 >a5 : Symbol(A.a5, Decl(assignmentCompatWithConstructSignatures6.ts, 11, 41))
->b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 3))
+>b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 11))
 
 b5 = x.a5;
->b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 3))
+>b5 : Symbol(b5, Decl(assignmentCompatWithConstructSignatures6.ts, 33, 11))
 >x.a5 : Symbol(A.a5, Decl(assignmentCompatWithConstructSignatures6.ts, 11, 41))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 11))
 >a5 : Symbol(A.a5, Decl(assignmentCompatWithConstructSignatures6.ts, 11, 41))
 
-var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
->b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 14))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 16))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 20))
->foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 24))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 14))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 34))
->foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 39))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 16))
->bar : Symbol(bar, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 47))
->U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 16))
+declare var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+>b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 22))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 24))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 28))
+>foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 32))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 22))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 42))
+>foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 47))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 24))
+>bar : Symbol(bar, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 55))
+>U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 24))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures6.ts, 0, 0))
 
 x.a11 = b11;
 >x.a11 : Symbol(A.a11, Decl(assignmentCompatWithConstructSignatures6.ts, 13, 58))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 11))
 >a11 : Symbol(A.a11, Decl(assignmentCompatWithConstructSignatures6.ts, 13, 58))
->b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 3))
+>b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 11))
 
 b11 = x.a11;
->b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 3))
+>b11 : Symbol(b11, Decl(assignmentCompatWithConstructSignatures6.ts, 36, 11))
 >x.a11 : Symbol(A.a11, Decl(assignmentCompatWithConstructSignatures6.ts, 13, 58))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 11))
 >a11 : Symbol(A.a11, Decl(assignmentCompatWithConstructSignatures6.ts, 13, 58))
 
-var b16: new <T>(x: { a: T; b: T }) => T[]; 
->b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 3))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 14))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 17))
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 21))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 14))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 27))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 14))
->T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 14))
+declare var b16: new <T>(x: { a: T; b: T }) => T[]; 
+>b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 11))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 22))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 25))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 29))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 22))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 35))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 22))
+>T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 22))
 
 x.a16 = b16;
 >x.a16 : Symbol(A.a16, Decl(assignmentCompatWithConstructSignatures6.ts, 15, 43))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 11))
 >a16 : Symbol(A.a16, Decl(assignmentCompatWithConstructSignatures6.ts, 15, 43))
->b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 3))
+>b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 11))
 
 b16 = x.a16;
->b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 3))
+>b16 : Symbol(b16, Decl(assignmentCompatWithConstructSignatures6.ts, 39, 11))
 >x.a16 : Symbol(A.a16, Decl(assignmentCompatWithConstructSignatures6.ts, 15, 43))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 3))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 19, 11))
 >a16 : Symbol(A.a16, Decl(assignmentCompatWithConstructSignatures6.ts, 15, 43))
 
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.types
index 49e305196573a..67473dac8dcd0 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.types
@@ -111,11 +111,11 @@ interface A {
 >  : ^
 }
 
-var x: A;
+declare var x: A;
 >x : A
 >  : ^
 
-var b: new <T>(x: T) => T[]; 
+declare var b: new <T>(x: T) => T[]; 
 >b : new <T>(x: T) => T[]
 >  : ^^^^^ ^^ ^^ ^^^^^   
 >x : T
@@ -145,7 +145,7 @@ b = x.a;
 >a : new <T>(x: T) => T[]
 >  : ^^^^^ ^^ ^^ ^^^^^   
 
-var b2: new <T>(x: T) => string[]; 
+declare var b2: new <T>(x: T) => string[]; 
 >b2 : new <T>(x: T) => string[]
 >   : ^^^^^ ^^ ^^ ^^^^^        
 >x : T
@@ -175,7 +175,7 @@ b2 = x.a2;
 >a2 : new <T>(x: T) => string[]
 >   : ^^^^^ ^^ ^^ ^^^^^        
 
-var b3: new <T>(x: T) => T;
+declare var b3: new <T>(x: T) => T;
 >b3 : new <T>(x: T) => T
 >   : ^^^^^ ^^ ^^ ^^^^^ 
 >x : T
@@ -205,7 +205,7 @@ b3 = x.a3;
 >a3 : new <T>(x: T) => void
 >   : ^^^^^ ^^ ^^ ^^^^^    
 
-var b4: new <T, U>(x: T, y: U) => string; 
+declare var b4: new <T, U>(x: T, y: U) => string; 
 >b4 : new <T, U>(x: T, y: U) => string
 >   : ^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^      
 >x : T
@@ -237,7 +237,7 @@ b4 = x.a4;
 >a4 : new <T, U>(x: T, y: U) => string
 >   : ^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^      
 
-var b5: new <T, U>(x: (arg: T) => U) => T; 
+declare var b5: new <T, U>(x: (arg: T) => U) => T; 
 >b5 : new <T, U>(x: (arg: T) => U) => T
 >   : ^^^^^ ^^ ^^ ^^             ^^^^^ 
 >x : (arg: T) => U
@@ -269,7 +269,7 @@ b5 = x.a5;
 >a5 : new <T, U>(x: (arg: T) => U) => T
 >   : ^^^^^ ^^ ^^ ^^             ^^^^^ 
 
-var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+declare var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 >b11 : new <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
 >    : ^^^^^ ^^ ^^ ^^           ^^ ^^                   ^^^^^    
 >x : { foo: T; }
@@ -307,7 +307,7 @@ b11 = x.a11;
 >a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
 >    : ^^^^^ ^^ ^^           ^^ ^^                   ^^^^^    
 
-var b16: new <T>(x: { a: T; b: T }) => T[]; 
+declare var b16: new <T>(x: { a: T; b: T }) => T[]; 
 >b16 : new <T>(x: { a: T; b: T; }) => T[]
 >    : ^^^^^ ^^ ^^               ^^^^^   
 >x : { a: T; b: T; }
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.errors.txt
index 61495aa38b9f2..1ce4f49f737b9 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.errors.txt
@@ -21,9 +21,9 @@ assignmentCompatWithConstructSignaturesWithOptionalParameters.ts(35,5): error TS
         a5: new (x?: number, y?: number) => number;
         a6: new (x: number, y: number) => number;
     }
-    var b: Base;
+    declare var b: Base;
     
-    var a: new () => number;
+    declare var a: new () => number;
         a = b.a; // ok
         a = b.a2; // ok
         a = b.a3; // error
@@ -40,7 +40,7 @@ assignmentCompatWithConstructSignaturesWithOptionalParameters.ts(35,5): error TS
 !!! error TS2322: Type 'new (x: number, y: number) => number' is not assignable to type 'new () => number'.
 !!! error TS2322:   Target signature provides too few arguments. Expected 2 or more, but got 0.
     
-    var a2: new (x?: number) => number; 
+    declare var a2: new (x?: number) => number; 
         a2 = b.a; // ok
         a2 = b.a2; // ok
         a2 = b.a3; // ok
@@ -51,7 +51,7 @@ assignmentCompatWithConstructSignaturesWithOptionalParameters.ts(35,5): error TS
 !!! error TS2322: Type 'new (x: number, y: number) => number' is not assignable to type 'new (x?: number) => number'.
 !!! error TS2322:   Target signature provides too few arguments. Expected 2 or more, but got 1.
     
-    var a3: new (x: number) => number; 
+    declare var a3: new (x: number) => number; 
         a3 = b.a; // ok
         a3 = b.a2; // ok
         a3 = b.a3; // ok
@@ -62,7 +62,7 @@ assignmentCompatWithConstructSignaturesWithOptionalParameters.ts(35,5): error TS
 !!! error TS2322: Type 'new (x: number, y: number) => number' is not assignable to type 'new (x: number) => number'.
 !!! error TS2322:   Target signature provides too few arguments. Expected 2 or more, but got 1.
     
-    var a4: new (x: number, y?: number) => number;
+    declare var a4: new (x: number, y?: number) => number;
         a4 = b.a; // ok
         a4 = b.a2; // ok
         a4 = b.a3; // ok
@@ -70,7 +70,7 @@ assignmentCompatWithConstructSignaturesWithOptionalParameters.ts(35,5): error TS
         a4 = b.a5; // ok
         a4 = b.a6; // ok
     
-    var a5: new (x?: number, y?: number) => number;
+    declare var a5: new (x?: number, y?: number) => number;
         a5 = b.a; // ok
         a5 = b.a2; // ok
         a5 = b.a3; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.js b/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.js
index 11b24bc4902be..c5c90eb13e1f4 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.js
@@ -11,9 +11,9 @@ interface Base {
     a5: new (x?: number, y?: number) => number;
     a6: new (x: number, y: number) => number;
 }
-var b: Base;
+declare var b: Base;
 
-var a: new () => number;
+declare var a: new () => number;
     a = b.a; // ok
     a = b.a2; // ok
     a = b.a3; // error
@@ -21,7 +21,7 @@ var a: new () => number;
     a = b.a5; // ok
     a = b.a6; // error
 
-var a2: new (x?: number) => number; 
+declare var a2: new (x?: number) => number; 
     a2 = b.a; // ok
     a2 = b.a2; // ok
     a2 = b.a3; // ok
@@ -29,7 +29,7 @@ var a2: new (x?: number) => number;
     a2 = b.a5; // ok
     a2 = b.a6; // error
 
-var a3: new (x: number) => number; 
+declare var a3: new (x: number) => number; 
     a3 = b.a; // ok
     a3 = b.a2; // ok
     a3 = b.a3; // ok
@@ -37,7 +37,7 @@ var a3: new (x: number) => number;
     a3 = b.a5; // ok
     a3 = b.a6; // error
 
-var a4: new (x: number, y?: number) => number;
+declare var a4: new (x: number, y?: number) => number;
     a4 = b.a; // ok
     a4 = b.a2; // ok
     a4 = b.a3; // ok
@@ -45,7 +45,7 @@ var a4: new (x: number, y?: number) => number;
     a4 = b.a5; // ok
     a4 = b.a6; // ok
 
-var a5: new (x?: number, y?: number) => number;
+declare var a5: new (x?: number, y?: number) => number;
     a5 = b.a; // ok
     a5 = b.a2; // ok
     a5 = b.a3; // ok
@@ -56,36 +56,30 @@ var a5: new (x?: number, y?: number) => number;
 
 //// [assignmentCompatWithConstructSignaturesWithOptionalParameters.js]
 // call signatures in derived types must have the same or fewer optional parameters as the base type
-var b;
-var a;
 a = b.a; // ok
 a = b.a2; // ok
 a = b.a3; // error
 a = b.a4; // error
 a = b.a5; // ok
 a = b.a6; // error
-var a2;
 a2 = b.a; // ok
 a2 = b.a2; // ok
 a2 = b.a3; // ok
 a2 = b.a4; // ok
 a2 = b.a5; // ok
 a2 = b.a6; // error
-var a3;
 a3 = b.a; // ok
 a3 = b.a2; // ok
 a3 = b.a3; // ok
 a3 = b.a4; // ok
 a3 = b.a5; // ok
 a3 = b.a6; // error
-var a4;
 a4 = b.a; // ok
 a4 = b.a2; // ok
 a4 = b.a3; // ok
 a4 = b.a4; // ok
 a4 = b.a5; // ok
 a4 = b.a6; // ok
-var a5;
 a5 = b.a; // ok
 a5 = b.a2; // ok
 a5 = b.a3; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.symbols b/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.symbols
index f560ccf052345..9b8508d870414 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.symbols
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.symbols
@@ -32,208 +32,208 @@ interface Base {
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 8, 13))
 >y : Symbol(y, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 8, 23))
 }
-var b: Base;
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+declare var b: Base;
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 0, 0))
 
-var a: new () => number;
->a : Symbol(a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 12, 3))
+declare var a: new () => number;
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 12, 11))
 
     a = b.a; // ok
->a : Symbol(a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 12, 11))
 >b.a : Symbol(Base.a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 2, 16))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a : Symbol(Base.a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 2, 16))
 
     a = b.a2; // ok
->a : Symbol(a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 12, 11))
 >b.a2 : Symbol(Base.a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 3, 24))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a2 : Symbol(Base.a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 3, 24))
 
     a = b.a3; // error
->a : Symbol(a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 12, 11))
 >b.a3 : Symbol(Base.a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 4, 35))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a3 : Symbol(Base.a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 4, 35))
 
     a = b.a4; // error
->a : Symbol(a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 12, 11))
 >b.a4 : Symbol(Base.a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 5, 34))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a4 : Symbol(Base.a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 5, 34))
 
     a = b.a5; // ok
->a : Symbol(a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 12, 11))
 >b.a5 : Symbol(Base.a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 6, 46))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a5 : Symbol(Base.a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 6, 46))
 
     a = b.a6; // error
->a : Symbol(a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 12, 11))
 >b.a6 : Symbol(Base.a6, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 7, 47))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a6 : Symbol(Base.a6, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 7, 47))
 
-var a2: new (x?: number) => number; 
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 13))
+declare var a2: new (x?: number) => number; 
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 21))
 
     a2 = b.a; // ok
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 11))
 >b.a : Symbol(Base.a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 2, 16))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a : Symbol(Base.a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 2, 16))
 
     a2 = b.a2; // ok
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 11))
 >b.a2 : Symbol(Base.a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 3, 24))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a2 : Symbol(Base.a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 3, 24))
 
     a2 = b.a3; // ok
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 11))
 >b.a3 : Symbol(Base.a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 4, 35))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a3 : Symbol(Base.a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 4, 35))
 
     a2 = b.a4; // ok
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 11))
 >b.a4 : Symbol(Base.a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 5, 34))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a4 : Symbol(Base.a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 5, 34))
 
     a2 = b.a5; // ok
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 11))
 >b.a5 : Symbol(Base.a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 6, 46))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a5 : Symbol(Base.a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 6, 46))
 
     a2 = b.a6; // error
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 3))
+>a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 20, 11))
 >b.a6 : Symbol(Base.a6, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 7, 47))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a6 : Symbol(Base.a6, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 7, 47))
 
-var a3: new (x: number) => number; 
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 13))
+declare var a3: new (x: number) => number; 
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 21))
 
     a3 = b.a; // ok
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 11))
 >b.a : Symbol(Base.a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 2, 16))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a : Symbol(Base.a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 2, 16))
 
     a3 = b.a2; // ok
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 11))
 >b.a2 : Symbol(Base.a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 3, 24))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a2 : Symbol(Base.a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 3, 24))
 
     a3 = b.a3; // ok
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 11))
 >b.a3 : Symbol(Base.a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 4, 35))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a3 : Symbol(Base.a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 4, 35))
 
     a3 = b.a4; // ok
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 11))
 >b.a4 : Symbol(Base.a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 5, 34))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a4 : Symbol(Base.a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 5, 34))
 
     a3 = b.a5; // ok
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 11))
 >b.a5 : Symbol(Base.a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 6, 46))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a5 : Symbol(Base.a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 6, 46))
 
     a3 = b.a6; // error
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 3))
+>a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 28, 11))
 >b.a6 : Symbol(Base.a6, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 7, 47))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a6 : Symbol(Base.a6, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 7, 47))
 
-var a4: new (x: number, y?: number) => number;
->a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 13))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 23))
+declare var a4: new (x: number, y?: number) => number;
+>a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 21))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 31))
 
     a4 = b.a; // ok
->a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 11))
 >b.a : Symbol(Base.a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 2, 16))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a : Symbol(Base.a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 2, 16))
 
     a4 = b.a2; // ok
->a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 11))
 >b.a2 : Symbol(Base.a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 3, 24))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a2 : Symbol(Base.a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 3, 24))
 
     a4 = b.a3; // ok
->a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 11))
 >b.a3 : Symbol(Base.a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 4, 35))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a3 : Symbol(Base.a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 4, 35))
 
     a4 = b.a4; // ok
->a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 11))
 >b.a4 : Symbol(Base.a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 5, 34))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a4 : Symbol(Base.a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 5, 34))
 
     a4 = b.a5; // ok
->a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 11))
 >b.a5 : Symbol(Base.a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 6, 46))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a5 : Symbol(Base.a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 6, 46))
 
     a4 = b.a6; // ok
->a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 3))
+>a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 36, 11))
 >b.a6 : Symbol(Base.a6, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 7, 47))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a6 : Symbol(Base.a6, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 7, 47))
 
-var a5: new (x?: number, y?: number) => number;
->a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 3))
->x : Symbol(x, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 13))
->y : Symbol(y, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 24))
+declare var a5: new (x?: number, y?: number) => number;
+>a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 11))
+>x : Symbol(x, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 21))
+>y : Symbol(y, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 32))
 
     a5 = b.a; // ok
->a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 11))
 >b.a : Symbol(Base.a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 2, 16))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a : Symbol(Base.a, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 2, 16))
 
     a5 = b.a2; // ok
->a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 11))
 >b.a2 : Symbol(Base.a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 3, 24))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a2 : Symbol(Base.a2, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 3, 24))
 
     a5 = b.a3; // ok
->a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 11))
 >b.a3 : Symbol(Base.a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 4, 35))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a3 : Symbol(Base.a3, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 4, 35))
 
     a5 = b.a4; // ok
->a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 11))
 >b.a4 : Symbol(Base.a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 5, 34))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a4 : Symbol(Base.a4, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 5, 34))
 
     a5 = b.a5; // ok
->a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 11))
 >b.a5 : Symbol(Base.a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 6, 46))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a5 : Symbol(Base.a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 6, 46))
 
     a5 = b.a6; // ok
->a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 3))
+>a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 44, 11))
 >b.a6 : Symbol(Base.a6, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 7, 47))
->b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 10, 11))
 >a6 : Symbol(Base.a6, Decl(assignmentCompatWithConstructSignaturesWithOptionalParameters.ts, 7, 47))
 
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.types b/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.types
index aa239f7b8fc06..3db3af3d51d63 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.types
@@ -44,11 +44,11 @@ interface Base {
 >y : number
 >  : ^^^^^^
 }
-var b: Base;
+declare var b: Base;
 >b : Base
 >  : ^^^^
 
-var a: new () => number;
+declare var a: new () => number;
 >a : new () => number
 >  : ^^^^^^^^^^      
 
@@ -124,7 +124,7 @@ var a: new () => number;
 >a6 : new (x: number, y: number) => number
 >   : ^^^^^ ^^      ^^ ^^      ^^^^^      
 
-var a2: new (x?: number) => number; 
+declare var a2: new (x?: number) => number; 
 >a2 : new (x?: number) => number
 >   : ^^^^^ ^^^      ^^^^^      
 >x : number
@@ -202,7 +202,7 @@ var a2: new (x?: number) => number;
 >a6 : new (x: number, y: number) => number
 >   : ^^^^^ ^^      ^^ ^^      ^^^^^      
 
-var a3: new (x: number) => number; 
+declare var a3: new (x: number) => number; 
 >a3 : new (x: number) => number
 >   : ^^^^^ ^^      ^^^^^      
 >x : number
@@ -280,7 +280,7 @@ var a3: new (x: number) => number;
 >a6 : new (x: number, y: number) => number
 >   : ^^^^^ ^^      ^^ ^^      ^^^^^      
 
-var a4: new (x: number, y?: number) => number;
+declare var a4: new (x: number, y?: number) => number;
 >a4 : new (x: number, y?: number) => number
 >   : ^^^^^ ^^      ^^ ^^^      ^^^^^      
 >x : number
@@ -360,7 +360,7 @@ var a4: new (x: number, y?: number) => number;
 >a6 : new (x: number, y: number) => number
 >   : ^^^^^ ^^      ^^ ^^      ^^^^^      
 
-var a5: new (x?: number, y?: number) => number;
+declare var a5: new (x?: number, y?: number) => number;
 >a5 : new (x?: number, y?: number) => number
 >   : ^^^^^ ^^^      ^^ ^^^      ^^^^^      
 >x : number
diff --git a/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.errors.txt b/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.errors.txt
index 91f79a95e46a5..d843b963b6239 100644
--- a/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.errors.txt
@@ -131,7 +131,7 @@ assignmentCompatWithDiscriminatedUnion.ts(82,5): error TS2322: Type 'S' is not a
         }
     
         const a: Style2 = { type: "A", data: "whatevs" };
-        let b: Style1;
+        declare let b: Style1;
         a.type; // "A" | "B"
         b.type; // "A" | "B"
         b = a; // should be assignable
diff --git a/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.js b/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.js
index 97fb4a9d2b1a6..5d9d2a9f8bea9 100644
--- a/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.js
+++ b/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.js
@@ -101,7 +101,7 @@ namespace GH14865 {
     }
 
     const a: Style2 = { type: "A", data: "whatevs" };
-    let b: Style1;
+    declare let b: Style1;
     a.type; // "A" | "B"
     b.type; // "A" | "B"
     b = a; // should be assignable
@@ -270,7 +270,6 @@ var Example5;
 var GH14865;
 (function (GH14865) {
     var a = { type: "A", data: "whatevs" };
-    var b;
     a.type; // "A" | "B"
     b.type; // "A" | "B"
     b = a; // should be assignable
diff --git a/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.symbols b/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.symbols
index e52ea8f834394..721bba67afc5d 100644
--- a/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.symbols
+++ b/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.symbols
@@ -287,8 +287,8 @@ namespace GH14865 {
 >type : Symbol(type, Decl(assignmentCompatWithDiscriminatedUnion.ts, 99, 23))
 >data : Symbol(data, Decl(assignmentCompatWithDiscriminatedUnion.ts, 99, 34))
 
-    let b: Style1;
->b : Symbol(b, Decl(assignmentCompatWithDiscriminatedUnion.ts, 100, 7))
+    declare let b: Style1;
+>b : Symbol(b, Decl(assignmentCompatWithDiscriminatedUnion.ts, 100, 15))
 >Style1 : Symbol(Style1, Decl(assignmentCompatWithDiscriminatedUnion.ts, 85, 19))
 
     a.type; // "A" | "B"
@@ -298,11 +298,11 @@ namespace GH14865 {
 
     b.type; // "A" | "B"
 >b.type : Symbol(type, Decl(assignmentCompatWithDiscriminatedUnion.ts, 86, 19), Decl(assignmentCompatWithDiscriminatedUnion.ts, 89, 9))
->b : Symbol(b, Decl(assignmentCompatWithDiscriminatedUnion.ts, 100, 7))
+>b : Symbol(b, Decl(assignmentCompatWithDiscriminatedUnion.ts, 100, 15))
 >type : Symbol(type, Decl(assignmentCompatWithDiscriminatedUnion.ts, 86, 19), Decl(assignmentCompatWithDiscriminatedUnion.ts, 89, 9))
 
     b = a; // should be assignable
->b : Symbol(b, Decl(assignmentCompatWithDiscriminatedUnion.ts, 100, 7))
+>b : Symbol(b, Decl(assignmentCompatWithDiscriminatedUnion.ts, 100, 15))
 >a : Symbol(a, Decl(assignmentCompatWithDiscriminatedUnion.ts, 99, 9))
 }
 
diff --git a/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.types b/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.types
index be6617683be64..4ae1e1ae3287b 100644
--- a/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.types
+++ b/tests/baselines/reference/assignmentCompatWithDiscriminatedUnion.types
@@ -384,7 +384,7 @@ namespace GH14865 {
 >"whatevs" : "whatevs"
 >          : ^^^^^^^^^
 
-    let b: Style1;
+    declare let b: Style1;
 >b : Style1
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.errors.txt b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.errors.txt
index d58f698ce0cf5..3ae018672d280 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.errors.txt
@@ -18,8 +18,8 @@ assignmentCompatWithGenericCallSignatures2.ts(16,1): error TS2322: Type 'A' is n
         <S>(x: S, ...y: S[]): void
     }
     
-    var a: A;
-    var b: B;
+    declare var a: A;
+    declare var b: B;
     
     // Both errors
     a = b;
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.js b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.js
index e93ea4401c5e3..d4481339ebd19 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.js
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.js
@@ -11,8 +11,8 @@ interface B {
     <S>(x: S, ...y: S[]): void
 }
 
-var a: A;
-var b: B;
+declare var a: A;
+declare var b: B;
 
 // Both errors
 a = b;
@@ -21,8 +21,6 @@ b = a;
 
 //// [assignmentCompatWithGenericCallSignatures2.js]
 // some complex cases of assignment compat of generic signatures. No contextual signature instantiation
-var a;
-var b;
 // Both errors
 a = b;
 b = a;
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.symbols b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.symbols
index 16fb5a70238c7..e67aebb493dbf 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.symbols
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.symbols
@@ -25,20 +25,20 @@ interface B {
 >S : Symbol(S, Decl(assignmentCompatWithGenericCallSignatures2.ts, 7, 5))
 }
 
-var a: A;
->a : Symbol(a, Decl(assignmentCompatWithGenericCallSignatures2.ts, 10, 3))
+declare var a: A;
+>a : Symbol(a, Decl(assignmentCompatWithGenericCallSignatures2.ts, 10, 11))
 >A : Symbol(A, Decl(assignmentCompatWithGenericCallSignatures2.ts, 0, 0))
 
-var b: B;
->b : Symbol(b, Decl(assignmentCompatWithGenericCallSignatures2.ts, 11, 3))
+declare var b: B;
+>b : Symbol(b, Decl(assignmentCompatWithGenericCallSignatures2.ts, 11, 11))
 >B : Symbol(B, Decl(assignmentCompatWithGenericCallSignatures2.ts, 4, 1))
 
 // Both errors
 a = b;
->a : Symbol(a, Decl(assignmentCompatWithGenericCallSignatures2.ts, 10, 3))
->b : Symbol(b, Decl(assignmentCompatWithGenericCallSignatures2.ts, 11, 3))
+>a : Symbol(a, Decl(assignmentCompatWithGenericCallSignatures2.ts, 10, 11))
+>b : Symbol(b, Decl(assignmentCompatWithGenericCallSignatures2.ts, 11, 11))
 
 b = a;
->b : Symbol(b, Decl(assignmentCompatWithGenericCallSignatures2.ts, 11, 3))
->a : Symbol(a, Decl(assignmentCompatWithGenericCallSignatures2.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithGenericCallSignatures2.ts, 11, 11))
+>a : Symbol(a, Decl(assignmentCompatWithGenericCallSignatures2.ts, 10, 11))
 
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.types b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.types
index 798a261b13b87..a98a3e25b6d17 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.types
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.types
@@ -19,11 +19,11 @@ interface B {
 >  : ^^^
 }
 
-var a: A;
+declare var a: A;
 >a : A
 >  : ^
 
-var b: B;
+declare var b: B;
 >b : B
 >  : ^
 
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.errors.txt b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.errors.txt
index 2e17b5682e4ed..a7b9f446381f9 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.errors.txt
@@ -13,8 +13,8 @@ assignmentCompatWithGenericCallSignatures4.ts(12,1): error TS2322: Type '<T exte
         p: T
     }
     
-    var x: <T extends I2<T>>(z: T) => void
-    var y: <T extends I2<I2<T>>>(z: T) => void
+    declare var x: <T extends I2<T>>(z: T) => void;
+    declare var y: <T extends I2<I2<T>>>(z: T) => void;
     
     // These both do not make sense as we would eventually be comparing I2<T> to I2<I2<T>>, and they are self referencing anyway
     x = y 
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.js b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.js
index 1e73ebd4aee51..f93dbf528e3fe 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.js
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.js
@@ -7,8 +7,8 @@ interface I2<T> {
     p: T
 }
 
-var x: <T extends I2<T>>(z: T) => void
-var y: <T extends I2<I2<T>>>(z: T) => void
+declare var x: <T extends I2<T>>(z: T) => void;
+declare var y: <T extends I2<I2<T>>>(z: T) => void;
 
 // These both do not make sense as we would eventually be comparing I2<T> to I2<I2<T>>, and they are self referencing anyway
 x = y 
@@ -17,8 +17,6 @@ y = x
 
 //// [assignmentCompatWithGenericCallSignatures4.js]
 // some complex cases of assignment compat of generic signatures.
-var x;
-var y;
 // These both do not make sense as we would eventually be comparing I2<T> to I2<I2<T>>, and they are self referencing anyway
 x = y;
 y = x;
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.symbols b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.symbols
index 73364359efb0c..18fc14a5b38b9 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.symbols
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.symbols
@@ -12,29 +12,29 @@ interface I2<T> {
 >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 2, 13))
 }
 
-var x: <T extends I2<T>>(z: T) => void
->x : Symbol(x, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 3))
->T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 8))
+declare var x: <T extends I2<T>>(z: T) => void;
+>x : Symbol(x, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 11))
+>T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 16))
 >I2 : Symbol(I2, Decl(assignmentCompatWithGenericCallSignatures4.ts, 0, 0))
->T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 8))
->z : Symbol(z, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 25))
->T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 8))
+>T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 16))
+>z : Symbol(z, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 33))
+>T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 16))
 
-var y: <T extends I2<I2<T>>>(z: T) => void
->y : Symbol(y, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 3))
->T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 8))
+declare var y: <T extends I2<I2<T>>>(z: T) => void;
+>y : Symbol(y, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 11))
+>T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 16))
 >I2 : Symbol(I2, Decl(assignmentCompatWithGenericCallSignatures4.ts, 0, 0))
 >I2 : Symbol(I2, Decl(assignmentCompatWithGenericCallSignatures4.ts, 0, 0))
->T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 8))
->z : Symbol(z, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 29))
->T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 8))
+>T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 16))
+>z : Symbol(z, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 37))
+>T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 16))
 
 // These both do not make sense as we would eventually be comparing I2<T> to I2<I2<T>>, and they are self referencing anyway
 x = y 
->x : Symbol(x, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 3))
->y : Symbol(y, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 3))
+>x : Symbol(x, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 11))
+>y : Symbol(y, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 11))
 
 y = x 
->y : Symbol(y, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 3))
->x : Symbol(x, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 3))
+>y : Symbol(y, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 11))
+>x : Symbol(x, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 11))
 
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.types b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.types
index c80be1723f5eb..098f6d8bca7e0 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.types
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.types
@@ -9,13 +9,13 @@ interface I2<T> {
 >  : ^
 }
 
-var x: <T extends I2<T>>(z: T) => void
+declare var x: <T extends I2<T>>(z: T) => void;
 >x : <T extends I2<T>>(z: T) => void
 >  : ^ ^^^^^^^^^     ^^ ^^ ^^^^^    
 >z : T
 >  : ^
 
-var y: <T extends I2<I2<T>>>(z: T) => void
+declare var y: <T extends I2<I2<T>>>(z: T) => void;
 >y : <T extends I2<I2<T>>>(z: T) => void
 >  : ^ ^^^^^^^^^         ^^ ^^ ^^^^^    
 >z : T
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.errors.txt b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.errors.txt
index 33405e4f8f04b..9e04f20621824 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.errors.txt
@@ -162,8 +162,8 @@ assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts(116,13): erro
     
     
         function foo<T>() {
-            var b: Base2;
-            var t: Target<T>;
+            var b!: Base2;
+            var t!: Target<T>;
     
             // all errors
             b.a = t.a;
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js
index 8155cc5cd1029..722711c2c93ab 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js
@@ -59,8 +59,8 @@ namespace GenericSignaturesInvalid {
 
 
     function foo<T>() {
-        var b: Base2;
-        var t: Target<T>;
+        var b!: Base2;
+        var t!: Target<T>;
 
         // all errors
         b.a = t.a;
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.symbols b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.symbols
index b1f7109cf3f3b..5aa099dfbd1f7 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.symbols
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.symbols
@@ -261,11 +261,11 @@ namespace GenericSignaturesInvalid {
 >foo : Symbol(foo, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 54, 5))
 >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 57, 17))
 
-        var b: Base2;
+        var b!: Base2;
 >b : Symbol(b, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 58, 11))
 >Base2 : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 38, 36))
 
-        var t: Target<T>;
+        var t!: Target<T>;
 >t : Symbol(t, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 59, 11))
 >Target : Symbol(Target, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 46, 5))
 >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 57, 17))
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.types b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.types
index ae8eec81c34a2..c786606f43846 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.types
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.types
@@ -388,11 +388,11 @@ namespace GenericSignaturesInvalid {
 >foo : <T>() => void
 >    : ^ ^^^^^^^^^^^
 
-        var b: Base2;
+        var b!: Base2;
 >b : Base2
 >  : ^^^^^
 
-        var t: Target<T>;
+        var t!: Target<T>;
 >t : Target<T>
 >  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt
index 16dba66897213..a046f258519f6 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt
@@ -33,8 +33,8 @@ assignmentCompatWithNumericIndexer.ts(37,9): error TS2322: Type 'A<T>' is not as
         [x: number]: Base;
     }
     
-    var a: A;
-    var b: { [x: number]: Derived; }
+    declare var a: A;
+    declare var b: { [x: number]: Derived; }
     a = b;
     b = a; // error
     ~
@@ -43,7 +43,7 @@ assignmentCompatWithNumericIndexer.ts(37,9): error TS2322: Type 'A<T>' is not as
 !!! error TS2322:     Property 'bar' is missing in type 'Base' but required in type 'Derived'.
 !!! related TS2728 assignmentCompatWithNumericIndexer.ts:4:34: 'bar' is declared here.
     
-    var b2: { [x: number]: Derived2; }
+    declare var b2: { [x: number]: Derived2; }
     a = b2;
     b2 = a; // error
     ~~
@@ -61,8 +61,8 @@ assignmentCompatWithNumericIndexer.ts(37,9): error TS2322: Type 'A<T>' is not as
         }
     
         function foo<T extends Base>() {
-            var a: A<T>;
-            var b: { [x: number]: Derived; }
+            var a!: A<T>;
+            var b!: { [x: number]: Derived; }
             a = b; // error
             ~
 !!! error TS2322: Type '{ [x: number]: Derived; }' is not assignable to type 'A<T>'.
@@ -77,7 +77,7 @@ assignmentCompatWithNumericIndexer.ts(37,9): error TS2322: Type 'A<T>' is not as
 !!! error TS2322:       Property 'bar' is missing in type 'Base' but required in type 'Derived'.
 !!! related TS2728 assignmentCompatWithNumericIndexer.ts:4:34: 'bar' is declared here.
     
-            var b2: { [x: number]: Derived2; }
+            var b2!: { [x: number]: Derived2; }
             a = b2; // error
             ~
 !!! error TS2322: Type '{ [x: number]: Derived2; }' is not assignable to type 'A<T>'.
@@ -91,7 +91,7 @@ assignmentCompatWithNumericIndexer.ts(37,9): error TS2322: Type 'A<T>' is not as
 !!! error TS2322:     Type 'T' is not assignable to type 'Derived2'.
 !!! error TS2322:       Type 'Base' is missing the following properties from type 'Derived2': baz, bar
     
-            var b3: { [x: number]: T; }
+            var b3!: { [x: number]: T; }
             a = b3; // ok
             b3 = a; // ok
         }
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
index fbfe1a8cfa96f..20720cf290a71 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
@@ -11,12 +11,12 @@ class A {
     [x: number]: Base;
 }
 
-var a: A;
-var b: { [x: number]: Derived; }
+declare var a: A;
+declare var b: { [x: number]: Derived; }
 a = b;
 b = a; // error
 
-var b2: { [x: number]: Derived2; }
+declare var b2: { [x: number]: Derived2; }
 a = b2;
 b2 = a; // error
 
@@ -30,16 +30,16 @@ namespace Generics {
     }
 
     function foo<T extends Base>() {
-        var a: A<T>;
-        var b: { [x: number]: Derived; }
+        var a!: A<T>;
+        var b!: { [x: number]: Derived; }
         a = b; // error
         b = a; // error
 
-        var b2: { [x: number]: Derived2; }
+        var b2!: { [x: number]: Derived2; }
         a = b2; // error
         b2 = a; // error
 
-        var b3: { [x: number]: T; }
+        var b3!: { [x: number]: T; }
         a = b3; // ok
         b3 = a; // ok
     }
@@ -67,11 +67,8 @@ var A = /** @class */ (function () {
     }
     return A;
 }());
-var a;
-var b;
 a = b;
 b = a; // error
-var b2;
 a = b2;
 b2 = a; // error
 var Generics;
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.symbols b/tests/baselines/reference/assignmentCompatWithNumericIndexer.symbols
index 66b8f21c07db1..1e29b814868de 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.symbols
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.symbols
@@ -25,35 +25,35 @@ class A {
 >Base : Symbol(Base, Decl(assignmentCompatWithNumericIndexer.ts, 0, 0))
 }
 
-var a: A;
->a : Symbol(a, Decl(assignmentCompatWithNumericIndexer.ts, 10, 3))
+declare var a: A;
+>a : Symbol(a, Decl(assignmentCompatWithNumericIndexer.ts, 10, 11))
 >A : Symbol(A, Decl(assignmentCompatWithNumericIndexer.ts, 4, 51))
 
-var b: { [x: number]: Derived; }
->b : Symbol(b, Decl(assignmentCompatWithNumericIndexer.ts, 11, 3))
->x : Symbol(x, Decl(assignmentCompatWithNumericIndexer.ts, 11, 10))
+declare var b: { [x: number]: Derived; }
+>b : Symbol(b, Decl(assignmentCompatWithNumericIndexer.ts, 11, 11))
+>x : Symbol(x, Decl(assignmentCompatWithNumericIndexer.ts, 11, 18))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithNumericIndexer.ts, 2, 31))
 
 a = b;
->a : Symbol(a, Decl(assignmentCompatWithNumericIndexer.ts, 10, 3))
->b : Symbol(b, Decl(assignmentCompatWithNumericIndexer.ts, 11, 3))
+>a : Symbol(a, Decl(assignmentCompatWithNumericIndexer.ts, 10, 11))
+>b : Symbol(b, Decl(assignmentCompatWithNumericIndexer.ts, 11, 11))
 
 b = a; // error
->b : Symbol(b, Decl(assignmentCompatWithNumericIndexer.ts, 11, 3))
->a : Symbol(a, Decl(assignmentCompatWithNumericIndexer.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithNumericIndexer.ts, 11, 11))
+>a : Symbol(a, Decl(assignmentCompatWithNumericIndexer.ts, 10, 11))
 
-var b2: { [x: number]: Derived2; }
->b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer.ts, 15, 3))
->x : Symbol(x, Decl(assignmentCompatWithNumericIndexer.ts, 15, 11))
+declare var b2: { [x: number]: Derived2; }
+>b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer.ts, 15, 11))
+>x : Symbol(x, Decl(assignmentCompatWithNumericIndexer.ts, 15, 19))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithNumericIndexer.ts, 3, 47))
 
 a = b2;
->a : Symbol(a, Decl(assignmentCompatWithNumericIndexer.ts, 10, 3))
->b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer.ts, 15, 3))
+>a : Symbol(a, Decl(assignmentCompatWithNumericIndexer.ts, 10, 11))
+>b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer.ts, 15, 11))
 
 b2 = a; // error
->b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer.ts, 15, 3))
->a : Symbol(a, Decl(assignmentCompatWithNumericIndexer.ts, 10, 3))
+>b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer.ts, 15, 11))
+>a : Symbol(a, Decl(assignmentCompatWithNumericIndexer.ts, 10, 11))
 
 namespace Generics {
 >Generics : Symbol(Generics, Decl(assignmentCompatWithNumericIndexer.ts, 17, 7))
@@ -83,14 +83,14 @@ namespace Generics {
 >T : Symbol(T, Decl(assignmentCompatWithNumericIndexer.ts, 28, 17))
 >Base : Symbol(Base, Decl(assignmentCompatWithNumericIndexer.ts, 0, 0))
 
-        var a: A<T>;
+        var a!: A<T>;
 >a : Symbol(a, Decl(assignmentCompatWithNumericIndexer.ts, 29, 11))
 >A : Symbol(A, Decl(assignmentCompatWithNumericIndexer.ts, 19, 20))
 >T : Symbol(T, Decl(assignmentCompatWithNumericIndexer.ts, 28, 17))
 
-        var b: { [x: number]: Derived; }
+        var b!: { [x: number]: Derived; }
 >b : Symbol(b, Decl(assignmentCompatWithNumericIndexer.ts, 30, 11))
->x : Symbol(x, Decl(assignmentCompatWithNumericIndexer.ts, 30, 18))
+>x : Symbol(x, Decl(assignmentCompatWithNumericIndexer.ts, 30, 19))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithNumericIndexer.ts, 2, 31))
 
         a = b; // error
@@ -101,9 +101,9 @@ namespace Generics {
 >b : Symbol(b, Decl(assignmentCompatWithNumericIndexer.ts, 30, 11))
 >a : Symbol(a, Decl(assignmentCompatWithNumericIndexer.ts, 29, 11))
 
-        var b2: { [x: number]: Derived2; }
+        var b2!: { [x: number]: Derived2; }
 >b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer.ts, 34, 11))
->x : Symbol(x, Decl(assignmentCompatWithNumericIndexer.ts, 34, 19))
+>x : Symbol(x, Decl(assignmentCompatWithNumericIndexer.ts, 34, 20))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithNumericIndexer.ts, 3, 47))
 
         a = b2; // error
@@ -114,9 +114,9 @@ namespace Generics {
 >b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer.ts, 34, 11))
 >a : Symbol(a, Decl(assignmentCompatWithNumericIndexer.ts, 29, 11))
 
-        var b3: { [x: number]: T; }
+        var b3!: { [x: number]: T; }
 >b3 : Symbol(b3, Decl(assignmentCompatWithNumericIndexer.ts, 38, 11))
->x : Symbol(x, Decl(assignmentCompatWithNumericIndexer.ts, 38, 19))
+>x : Symbol(x, Decl(assignmentCompatWithNumericIndexer.ts, 38, 20))
 >T : Symbol(T, Decl(assignmentCompatWithNumericIndexer.ts, 28, 17))
 
         a = b3; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.types b/tests/baselines/reference/assignmentCompatWithNumericIndexer.types
index 07e1dedab83de..d8aa6f99f02cf 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.types
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.types
@@ -24,11 +24,11 @@ class A {
 >  : ^^^^^^
 }
 
-var a: A;
+declare var a: A;
 >a : A
 >  : ^
 
-var b: { [x: number]: Derived; }
+declare var b: { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -50,7 +50,7 @@ b = a; // error
 >a : A
 >  : ^
 
-var b2: { [x: number]: Derived2; }
+declare var b2: { [x: number]: Derived2; }
 >b2 : { [x: number]: Derived2; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -100,11 +100,11 @@ namespace Generics {
 >foo : <T extends Base>() => void
 >    : ^ ^^^^^^^^^    ^^^^^^^^^^^
 
-        var a: A<T>;
+        var a!: A<T>;
 >a : A<T>
 >  : ^^^^
 
-        var b: { [x: number]: Derived; }
+        var b!: { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -126,7 +126,7 @@ namespace Generics {
 >a : A<T>
 >  : ^^^^
 
-        var b2: { [x: number]: Derived2; }
+        var b2!: { [x: number]: Derived2; }
 >b2 : { [x: number]: Derived2; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -148,7 +148,7 @@ namespace Generics {
 >a : A<T>
 >  : ^^^^
 
-        var b3: { [x: number]: T; }
+        var b3!: { [x: number]: T; }
 >b3 : { [x: number]: T; }
 >   : ^^^^^^^^^^^^^^^^^^^
 >x : number
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt
index a9535962fb7d6..63ced30e797ce 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt
@@ -33,8 +33,8 @@ assignmentCompatWithNumericIndexer2.ts(37,9): error TS2322: Type 'A<T>' is not a
         [x: number]: Base;
     }
     
-    var a: A;
-    var b: { [x: number]: Derived; }
+    declare var a: A;
+    declare var b: { [x: number]: Derived; }
     a = b;
     b = a; // error
     ~
@@ -43,7 +43,7 @@ assignmentCompatWithNumericIndexer2.ts(37,9): error TS2322: Type 'A<T>' is not a
 !!! error TS2322:     Property 'bar' is missing in type 'Base' but required in type 'Derived'.
 !!! related TS2728 assignmentCompatWithNumericIndexer2.ts:4:34: 'bar' is declared here.
     
-    var b2: { [x: number]: Derived2; }
+    declare var b2: { [x: number]: Derived2; }
     a = b2;
     b2 = a; // error
     ~~
@@ -61,8 +61,8 @@ assignmentCompatWithNumericIndexer2.ts(37,9): error TS2322: Type 'A<T>' is not a
         }
     
         function foo<T extends Base>() {
-            var a: A<T>;
-            var b: { [x: number]: Derived; }
+            var a!: A<T>;
+            var b!: { [x: number]: Derived; }
             a = b; // error
             ~
 !!! error TS2322: Type '{ [x: number]: Derived; }' is not assignable to type 'A<T>'.
@@ -77,7 +77,7 @@ assignmentCompatWithNumericIndexer2.ts(37,9): error TS2322: Type 'A<T>' is not a
 !!! error TS2322:       Property 'bar' is missing in type 'Base' but required in type 'Derived'.
 !!! related TS2728 assignmentCompatWithNumericIndexer2.ts:4:34: 'bar' is declared here.
     
-            var b2: { [x: number]: Derived2; }
+            var b2!: { [x: number]: Derived2; }
             a = b2; // error
             ~
 !!! error TS2322: Type '{ [x: number]: Derived2; }' is not assignable to type 'A<T>'.
@@ -91,7 +91,7 @@ assignmentCompatWithNumericIndexer2.ts(37,9): error TS2322: Type 'A<T>' is not a
 !!! error TS2322:     Type 'T' is not assignable to type 'Derived2'.
 !!! error TS2322:       Type 'Base' is missing the following properties from type 'Derived2': baz, bar
     
-            var b3: { [x: number]: T; }
+            var b3!: { [x: number]: T; }
             a = b3; // ok
             b3 = a; // ok
         }
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.js b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.js
index 57c748ab5bd07..1e15c05187860 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.js
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.js
@@ -11,12 +11,12 @@ interface A {
     [x: number]: Base;
 }
 
-var a: A;
-var b: { [x: number]: Derived; }
+declare var a: A;
+declare var b: { [x: number]: Derived; }
 a = b;
 b = a; // error
 
-var b2: { [x: number]: Derived2; }
+declare var b2: { [x: number]: Derived2; }
 a = b2;
 b2 = a; // error
 
@@ -30,16 +30,16 @@ namespace Generics {
     }
 
     function foo<T extends Base>() {
-        var a: A<T>;
-        var b: { [x: number]: Derived; }
+        var a!: A<T>;
+        var b!: { [x: number]: Derived; }
         a = b; // error
         b = a; // error
 
-        var b2: { [x: number]: Derived2; }
+        var b2!: { [x: number]: Derived2; }
         a = b2; // error
         b2 = a; // error
 
-        var b3: { [x: number]: T; }
+        var b3!: { [x: number]: T; }
         a = b3; // ok
         b3 = a; // ok
     }
@@ -47,11 +47,8 @@ namespace Generics {
 
 //// [assignmentCompatWithNumericIndexer2.js]
 // Derived type indexer must be subtype of base type indexer
-var a;
-var b;
 a = b;
 b = a; // error
-var b2;
 a = b2;
 b2 = a; // error
 var Generics;
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.symbols b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.symbols
index f35591fa2d37b..6d3e048b90b2e 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.symbols
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.symbols
@@ -25,35 +25,35 @@ interface A {
 >Base : Symbol(Base, Decl(assignmentCompatWithNumericIndexer2.ts, 0, 0))
 }
 
-var a: A;
->a : Symbol(a, Decl(assignmentCompatWithNumericIndexer2.ts, 10, 3))
+declare var a: A;
+>a : Symbol(a, Decl(assignmentCompatWithNumericIndexer2.ts, 10, 11))
 >A : Symbol(A, Decl(assignmentCompatWithNumericIndexer2.ts, 4, 51))
 
-var b: { [x: number]: Derived; }
->b : Symbol(b, Decl(assignmentCompatWithNumericIndexer2.ts, 11, 3))
->x : Symbol(x, Decl(assignmentCompatWithNumericIndexer2.ts, 11, 10))
+declare var b: { [x: number]: Derived; }
+>b : Symbol(b, Decl(assignmentCompatWithNumericIndexer2.ts, 11, 11))
+>x : Symbol(x, Decl(assignmentCompatWithNumericIndexer2.ts, 11, 18))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithNumericIndexer2.ts, 2, 31))
 
 a = b;
->a : Symbol(a, Decl(assignmentCompatWithNumericIndexer2.ts, 10, 3))
->b : Symbol(b, Decl(assignmentCompatWithNumericIndexer2.ts, 11, 3))
+>a : Symbol(a, Decl(assignmentCompatWithNumericIndexer2.ts, 10, 11))
+>b : Symbol(b, Decl(assignmentCompatWithNumericIndexer2.ts, 11, 11))
 
 b = a; // error
->b : Symbol(b, Decl(assignmentCompatWithNumericIndexer2.ts, 11, 3))
->a : Symbol(a, Decl(assignmentCompatWithNumericIndexer2.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithNumericIndexer2.ts, 11, 11))
+>a : Symbol(a, Decl(assignmentCompatWithNumericIndexer2.ts, 10, 11))
 
-var b2: { [x: number]: Derived2; }
->b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer2.ts, 15, 3))
->x : Symbol(x, Decl(assignmentCompatWithNumericIndexer2.ts, 15, 11))
+declare var b2: { [x: number]: Derived2; }
+>b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer2.ts, 15, 11))
+>x : Symbol(x, Decl(assignmentCompatWithNumericIndexer2.ts, 15, 19))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithNumericIndexer2.ts, 3, 47))
 
 a = b2;
->a : Symbol(a, Decl(assignmentCompatWithNumericIndexer2.ts, 10, 3))
->b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer2.ts, 15, 3))
+>a : Symbol(a, Decl(assignmentCompatWithNumericIndexer2.ts, 10, 11))
+>b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer2.ts, 15, 11))
 
 b2 = a; // error
->b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer2.ts, 15, 3))
->a : Symbol(a, Decl(assignmentCompatWithNumericIndexer2.ts, 10, 3))
+>b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer2.ts, 15, 11))
+>a : Symbol(a, Decl(assignmentCompatWithNumericIndexer2.ts, 10, 11))
 
 namespace Generics {
 >Generics : Symbol(Generics, Decl(assignmentCompatWithNumericIndexer2.ts, 17, 7))
@@ -83,14 +83,14 @@ namespace Generics {
 >T : Symbol(T, Decl(assignmentCompatWithNumericIndexer2.ts, 28, 17))
 >Base : Symbol(Base, Decl(assignmentCompatWithNumericIndexer2.ts, 0, 0))
 
-        var a: A<T>;
+        var a!: A<T>;
 >a : Symbol(a, Decl(assignmentCompatWithNumericIndexer2.ts, 29, 11))
 >A : Symbol(A, Decl(assignmentCompatWithNumericIndexer2.ts, 19, 20))
 >T : Symbol(T, Decl(assignmentCompatWithNumericIndexer2.ts, 28, 17))
 
-        var b: { [x: number]: Derived; }
+        var b!: { [x: number]: Derived; }
 >b : Symbol(b, Decl(assignmentCompatWithNumericIndexer2.ts, 30, 11))
->x : Symbol(x, Decl(assignmentCompatWithNumericIndexer2.ts, 30, 18))
+>x : Symbol(x, Decl(assignmentCompatWithNumericIndexer2.ts, 30, 19))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithNumericIndexer2.ts, 2, 31))
 
         a = b; // error
@@ -101,9 +101,9 @@ namespace Generics {
 >b : Symbol(b, Decl(assignmentCompatWithNumericIndexer2.ts, 30, 11))
 >a : Symbol(a, Decl(assignmentCompatWithNumericIndexer2.ts, 29, 11))
 
-        var b2: { [x: number]: Derived2; }
+        var b2!: { [x: number]: Derived2; }
 >b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer2.ts, 34, 11))
->x : Symbol(x, Decl(assignmentCompatWithNumericIndexer2.ts, 34, 19))
+>x : Symbol(x, Decl(assignmentCompatWithNumericIndexer2.ts, 34, 20))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithNumericIndexer2.ts, 3, 47))
 
         a = b2; // error
@@ -114,9 +114,9 @@ namespace Generics {
 >b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer2.ts, 34, 11))
 >a : Symbol(a, Decl(assignmentCompatWithNumericIndexer2.ts, 29, 11))
 
-        var b3: { [x: number]: T; }
+        var b3!: { [x: number]: T; }
 >b3 : Symbol(b3, Decl(assignmentCompatWithNumericIndexer2.ts, 38, 11))
->x : Symbol(x, Decl(assignmentCompatWithNumericIndexer2.ts, 38, 19))
+>x : Symbol(x, Decl(assignmentCompatWithNumericIndexer2.ts, 38, 20))
 >T : Symbol(T, Decl(assignmentCompatWithNumericIndexer2.ts, 28, 17))
 
         a = b3; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.types b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.types
index 0eb45b9f0e9b3..1647a77109baf 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.types
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.types
@@ -21,11 +21,11 @@ interface A {
 >  : ^^^^^^
 }
 
-var a: A;
+declare var a: A;
 >a : A
 >  : ^
 
-var b: { [x: number]: Derived; }
+declare var b: { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -47,7 +47,7 @@ b = a; // error
 >a : A
 >  : ^
 
-var b2: { [x: number]: Derived2; }
+declare var b2: { [x: number]: Derived2; }
 >b2 : { [x: number]: Derived2; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -89,11 +89,11 @@ namespace Generics {
 >foo : <T extends Base>() => void
 >    : ^ ^^^^^^^^^    ^^^^^^^^^^^
 
-        var a: A<T>;
+        var a!: A<T>;
 >a : A<T>
 >  : ^^^^
 
-        var b: { [x: number]: Derived; }
+        var b!: { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -115,7 +115,7 @@ namespace Generics {
 >a : A<T>
 >  : ^^^^
 
-        var b2: { [x: number]: Derived2; }
+        var b2!: { [x: number]: Derived2; }
 >b2 : { [x: number]: Derived2; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -137,7 +137,7 @@ namespace Generics {
 >a : A<T>
 >  : ^^^^
 
-        var b3: { [x: number]: T; }
+        var b3!: { [x: number]: T; }
 >b3 : { [x: number]: T; }
 >   : ^^^^^^^^^^^^^^^^^^^
 >x : number
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt
index d2a905297d3a2..a3b667944d93f 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt
@@ -21,8 +21,8 @@ assignmentCompatWithNumericIndexer3.ts(33,9): error TS2322: Type '{ [x: number]:
         [x: number]: Derived;
     }
     
-    var a: A;
-    var b: { [x: number]: Base; };
+    declare var a: A;
+    declare var b: { [x: number]: Base; };
     
     a = b; // error
     ~
@@ -36,7 +36,7 @@ assignmentCompatWithNumericIndexer3.ts(33,9): error TS2322: Type '{ [x: number]:
         [x: number]: Derived2; // ok
     }
     
-    var b2: { [x: number]: Derived2; };
+    declare var b2: { [x: number]: Derived2; };
     a = b2; // ok
     b2 = a; // error
     ~~
@@ -51,8 +51,8 @@ assignmentCompatWithNumericIndexer3.ts(33,9): error TS2322: Type '{ [x: number]:
         }
     
         function foo<T extends Derived>() {
-            var a: A<T>;
-            var b: { [x: number]: Derived; };
+            var a!: A<T>;
+            var b!: { [x: number]: Derived; };
             a = b; // error
             ~
 !!! error TS2322: Type '{ [x: number]: Derived; }' is not assignable to type 'A<T>'.
@@ -61,7 +61,7 @@ assignmentCompatWithNumericIndexer3.ts(33,9): error TS2322: Type '{ [x: number]:
 !!! error TS2322:       'Derived' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'Derived'.
             b = a; // ok
     
-            var b2: { [x: number]: T; };
+            var b2!: { [x: number]: T; };
             a = b2; // ok
             b2 = a; // ok
         }
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
index c55ce7233eb31..9329efbbf3264 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
@@ -11,8 +11,8 @@ class A {
     [x: number]: Derived;
 }
 
-var a: A;
-var b: { [x: number]: Base; };
+declare var a: A;
+declare var b: { [x: number]: Base; };
 
 a = b; // error
 b = a; // ok
@@ -21,7 +21,7 @@ class B2 extends A {
     [x: number]: Derived2; // ok
 }
 
-var b2: { [x: number]: Derived2; };
+declare var b2: { [x: number]: Derived2; };
 a = b2; // ok
 b2 = a; // error
 
@@ -31,12 +31,12 @@ namespace Generics {
     }
 
     function foo<T extends Derived>() {
-        var a: A<T>;
-        var b: { [x: number]: Derived; };
+        var a!: A<T>;
+        var b!: { [x: number]: Derived; };
         a = b; // error
         b = a; // ok
 
-        var b2: { [x: number]: T; };
+        var b2!: { [x: number]: T; };
         a = b2; // ok
         b2 = a; // ok
     }
@@ -64,8 +64,6 @@ var A = /** @class */ (function () {
     }
     return A;
 }());
-var a;
-var b;
 a = b; // error
 b = a; // ok
 var B2 = /** @class */ (function (_super) {
@@ -75,7 +73,6 @@ var B2 = /** @class */ (function (_super) {
     }
     return B2;
 }(A));
-var b2;
 a = b2; // ok
 b2 = a; // error
 var Generics;
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.symbols b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.symbols
index 21030b89b37f5..cdff8fe8249f8 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.symbols
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.symbols
@@ -25,22 +25,22 @@ class A {
 >Derived : Symbol(Derived, Decl(assignmentCompatWithNumericIndexer3.ts, 2, 31))
 }
 
-var a: A;
->a : Symbol(a, Decl(assignmentCompatWithNumericIndexer3.ts, 10, 3))
+declare var a: A;
+>a : Symbol(a, Decl(assignmentCompatWithNumericIndexer3.ts, 10, 11))
 >A : Symbol(A, Decl(assignmentCompatWithNumericIndexer3.ts, 4, 51))
 
-var b: { [x: number]: Base; };
->b : Symbol(b, Decl(assignmentCompatWithNumericIndexer3.ts, 11, 3))
->x : Symbol(x, Decl(assignmentCompatWithNumericIndexer3.ts, 11, 10))
+declare var b: { [x: number]: Base; };
+>b : Symbol(b, Decl(assignmentCompatWithNumericIndexer3.ts, 11, 11))
+>x : Symbol(x, Decl(assignmentCompatWithNumericIndexer3.ts, 11, 18))
 >Base : Symbol(Base, Decl(assignmentCompatWithNumericIndexer3.ts, 0, 0))
 
 a = b; // error
->a : Symbol(a, Decl(assignmentCompatWithNumericIndexer3.ts, 10, 3))
->b : Symbol(b, Decl(assignmentCompatWithNumericIndexer3.ts, 11, 3))
+>a : Symbol(a, Decl(assignmentCompatWithNumericIndexer3.ts, 10, 11))
+>b : Symbol(b, Decl(assignmentCompatWithNumericIndexer3.ts, 11, 11))
 
 b = a; // ok
->b : Symbol(b, Decl(assignmentCompatWithNumericIndexer3.ts, 11, 3))
->a : Symbol(a, Decl(assignmentCompatWithNumericIndexer3.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithNumericIndexer3.ts, 11, 11))
+>a : Symbol(a, Decl(assignmentCompatWithNumericIndexer3.ts, 10, 11))
 
 class B2 extends A {
 >B2 : Symbol(B2, Decl(assignmentCompatWithNumericIndexer3.ts, 14, 6))
@@ -51,18 +51,18 @@ class B2 extends A {
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithNumericIndexer3.ts, 3, 47))
 }
 
-var b2: { [x: number]: Derived2; };
->b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer3.ts, 20, 3))
->x : Symbol(x, Decl(assignmentCompatWithNumericIndexer3.ts, 20, 11))
+declare var b2: { [x: number]: Derived2; };
+>b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer3.ts, 20, 11))
+>x : Symbol(x, Decl(assignmentCompatWithNumericIndexer3.ts, 20, 19))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithNumericIndexer3.ts, 3, 47))
 
 a = b2; // ok
->a : Symbol(a, Decl(assignmentCompatWithNumericIndexer3.ts, 10, 3))
->b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer3.ts, 20, 3))
+>a : Symbol(a, Decl(assignmentCompatWithNumericIndexer3.ts, 10, 11))
+>b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer3.ts, 20, 11))
 
 b2 = a; // error
->b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer3.ts, 20, 3))
->a : Symbol(a, Decl(assignmentCompatWithNumericIndexer3.ts, 10, 3))
+>b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer3.ts, 20, 11))
+>a : Symbol(a, Decl(assignmentCompatWithNumericIndexer3.ts, 10, 11))
 
 namespace Generics {
 >Generics : Symbol(Generics, Decl(assignmentCompatWithNumericIndexer3.ts, 22, 7))
@@ -82,14 +82,14 @@ namespace Generics {
 >T : Symbol(T, Decl(assignmentCompatWithNumericIndexer3.ts, 29, 17))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithNumericIndexer3.ts, 2, 31))
 
-        var a: A<T>;
+        var a!: A<T>;
 >a : Symbol(a, Decl(assignmentCompatWithNumericIndexer3.ts, 30, 11))
 >A : Symbol(A, Decl(assignmentCompatWithNumericIndexer3.ts, 24, 20))
 >T : Symbol(T, Decl(assignmentCompatWithNumericIndexer3.ts, 29, 17))
 
-        var b: { [x: number]: Derived; };
+        var b!: { [x: number]: Derived; };
 >b : Symbol(b, Decl(assignmentCompatWithNumericIndexer3.ts, 31, 11))
->x : Symbol(x, Decl(assignmentCompatWithNumericIndexer3.ts, 31, 18))
+>x : Symbol(x, Decl(assignmentCompatWithNumericIndexer3.ts, 31, 19))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithNumericIndexer3.ts, 2, 31))
 
         a = b; // error
@@ -100,9 +100,9 @@ namespace Generics {
 >b : Symbol(b, Decl(assignmentCompatWithNumericIndexer3.ts, 31, 11))
 >a : Symbol(a, Decl(assignmentCompatWithNumericIndexer3.ts, 30, 11))
 
-        var b2: { [x: number]: T; };
+        var b2!: { [x: number]: T; };
 >b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer3.ts, 35, 11))
->x : Symbol(x, Decl(assignmentCompatWithNumericIndexer3.ts, 35, 19))
+>x : Symbol(x, Decl(assignmentCompatWithNumericIndexer3.ts, 35, 20))
 >T : Symbol(T, Decl(assignmentCompatWithNumericIndexer3.ts, 29, 17))
 
         a = b2; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.types b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.types
index 52a6ed1915bbf..ba39eb84729c3 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.types
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.types
@@ -24,11 +24,11 @@ class A {
 >  : ^^^^^^
 }
 
-var a: A;
+declare var a: A;
 >a : A
 >  : ^
 
-var b: { [x: number]: Base; };
+declare var b: { [x: number]: Base; };
 >b : { [x: number]: Base; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -61,7 +61,7 @@ class B2 extends A {
 >  : ^^^^^^
 }
 
-var b2: { [x: number]: Derived2; };
+declare var b2: { [x: number]: Derived2; };
 >b2 : { [x: number]: Derived2; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -100,11 +100,11 @@ namespace Generics {
 >foo : <T extends Derived>() => void
 >    : ^ ^^^^^^^^^       ^^^^^^^^^^^
 
-        var a: A<T>;
+        var a!: A<T>;
 >a : A<T>
 >  : ^^^^
 
-        var b: { [x: number]: Derived; };
+        var b!: { [x: number]: Derived; };
 >b : { [x: number]: Derived; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
@@ -126,7 +126,7 @@ namespace Generics {
 >a : A<T>
 >  : ^^^^
 
-        var b2: { [x: number]: T; };
+        var b2!: { [x: number]: T; };
 >b2 : { [x: number]: T; }
 >   : ^^^^^^^^^^^^^^^^^^^
 >x : number
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt
index 9d879edbec032..7c5dd3709b2e2 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt
@@ -61,16 +61,16 @@ assignmentCompatWithObjectMembers4.ts(87,5): error TS2322: Type '{ foo: Base; }'
     
         class S { foo: Derived; }
         class T { foo: Derived2; }
-        var s: S;
-        var t: T;
+        declare var s: S;
+        declare var t: T;
     
         interface S2 { foo: Derived; }
         interface T2 { foo: Derived2; }
-        var s2: S2;
-        var t2: T2;
+        declare var s2: S2;
+        declare var t2: T2;
     
-        var a: { foo: Derived; }
-        var b: { foo: Derived2; }
+        declare var a: { foo: Derived; }
+        declare var b: { foo: Derived2; }
     
         var a2 = { foo: new Derived() };
         var b2 = { foo: new Derived2() };
@@ -171,16 +171,16 @@ assignmentCompatWithObjectMembers4.ts(87,5): error TS2322: Type '{ foo: Base; }'
     
         class S { foo: Base; }
         class T { foo: Derived2; }
-        var s: S;
-        var t: T;
+        declare var s: S;
+        declare var t: T;
     
         interface S2 { foo: Base; }
         interface T2 { foo: Derived2; }
-        var s2: S2;
-        var t2: T2;
+        declare var s2: S2;
+        declare var t2: T2;
     
-        var a: { foo: Base; }
-        var b: { foo: Derived2; }
+        declare var a: { foo: Base; }
+        declare var b: { foo: Derived2; }
     
         var a2 = { foo: new Base() };
         var b2 = { foo: new Derived2() };
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
index 3bd797bfe5df8..93cd47af52552 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
@@ -10,16 +10,16 @@ namespace OnlyDerived {
 
     class S { foo: Derived; }
     class T { foo: Derived2; }
-    var s: S;
-    var t: T;
+    declare var s: S;
+    declare var t: T;
 
     interface S2 { foo: Derived; }
     interface T2 { foo: Derived2; }
-    var s2: S2;
-    var t2: T2;
+    declare var s2: S2;
+    declare var t2: T2;
 
-    var a: { foo: Derived; }
-    var b: { foo: Derived2; }
+    declare var a: { foo: Derived; }
+    declare var b: { foo: Derived2; }
 
     var a2 = { foo: new Derived() };
     var b2 = { foo: new Derived2() };
@@ -55,16 +55,16 @@ namespace WithBase {
 
     class S { foo: Base; }
     class T { foo: Derived2; }
-    var s: S;
-    var t: T;
+    declare var s: S;
+    declare var t: T;
 
     interface S2 { foo: Base; }
     interface T2 { foo: Derived2; }
-    var s2: S2;
-    var t2: T2;
+    declare var s2: S2;
+    declare var t2: T2;
 
-    var a: { foo: Base; }
-    var b: { foo: Derived2; }
+    declare var a: { foo: Base; }
+    declare var b: { foo: Derived2; }
 
     var a2 = { foo: new Base() };
     var b2 = { foo: new Derived2() };
@@ -141,12 +141,6 @@ var OnlyDerived;
         }
         return T;
     }());
-    var s;
-    var t;
-    var s2;
-    var t2;
-    var a;
-    var b;
     var a2 = { foo: new Derived() };
     var b2 = { foo: new Derived2() };
     s = t; // error
@@ -200,12 +194,6 @@ var WithBase;
         }
         return T;
     }());
-    var s;
-    var t;
-    var s2;
-    var t2;
-    var a;
-    var b;
     var a2 = { foo: new Base() };
     var b2 = { foo: new Derived2() };
     s = t; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembers4.symbols
index 0a3c66222ed2a..8eadf95d0fcc0 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.symbols
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.symbols
@@ -30,16 +30,16 @@ namespace OnlyDerived {
 >foo : Symbol(T.foo, Decl(assignmentCompatWithObjectMembers4.ts, 8, 13))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithObjectMembers4.ts, 4, 47))
 
-    var s: S;
->s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 9, 7))
+    declare var s: S;
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 9, 15))
 >S : Symbol(S, Decl(assignmentCompatWithObjectMembers4.ts, 5, 48))
 
-    var t: T;
->t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 10, 7))
+    declare var t: T;
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 10, 15))
 >T : Symbol(T, Decl(assignmentCompatWithObjectMembers4.ts, 7, 29))
 
     interface S2 { foo: Derived; }
->S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembers4.ts, 10, 13))
+>S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembers4.ts, 10, 21))
 >foo : Symbol(S2.foo, Decl(assignmentCompatWithObjectMembers4.ts, 12, 18))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithObjectMembers4.ts, 3, 31))
 
@@ -48,22 +48,22 @@ namespace OnlyDerived {
 >foo : Symbol(T2.foo, Decl(assignmentCompatWithObjectMembers4.ts, 13, 18))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithObjectMembers4.ts, 4, 47))
 
-    var s2: S2;
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 7))
->S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembers4.ts, 10, 13))
+    declare var s2: S2;
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 15))
+>S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembers4.ts, 10, 21))
 
-    var t2: T2;
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 15, 7))
+    declare var t2: T2;
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 15, 15))
 >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembers4.ts, 12, 34))
 
-    var a: { foo: Derived; }
->a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 17, 7))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers4.ts, 17, 12))
+    declare var a: { foo: Derived; }
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 17, 15))
+>foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers4.ts, 17, 20))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithObjectMembers4.ts, 3, 31))
 
-    var b: { foo: Derived2; }
->b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 18, 7))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers4.ts, 18, 12))
+    declare var b: { foo: Derived2; }
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 18, 15))
+>foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers4.ts, 18, 20))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithObjectMembers4.ts, 4, 47))
 
     var a2 = { foo: new Derived() };
@@ -77,59 +77,59 @@ namespace OnlyDerived {
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithObjectMembers4.ts, 4, 47))
 
     s = t; // error
->s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 9, 7))
->t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 10, 7))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 9, 15))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 10, 15))
 
     t = s; // error
->t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 10, 7))
->s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 9, 7))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 10, 15))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 9, 15))
 
     s = s2; // ok
->s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 9, 7))
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 7))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 9, 15))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 15))
 
     s = a2; // ok
->s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 9, 7))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 9, 15))
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembers4.ts, 20, 7))
 
     s2 = t2; // error
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 7))
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 15, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 15))
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 15, 15))
 
     t2 = s2; // error
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 15, 7))
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 7))
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 15, 15))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 15))
 
     s2 = t; // error
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 7))
->t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 10, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 15))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 10, 15))
 
     s2 = b; // error
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 18, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 18, 15))
 
     s2 = a2; // ok
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 15))
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembers4.ts, 20, 7))
 
     a = b; // error
->a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 17, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 18, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 17, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 18, 15))
 
     b = a; // error
->b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 18, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 17, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 18, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 17, 15))
 
     a = s; // ok
->a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 17, 7))
->s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 9, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 17, 15))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 9, 15))
 
     a = s2; // ok
->a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 17, 7))
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 17, 15))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 14, 15))
 
     a = a2; // ok
->a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 17, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 17, 15))
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembers4.ts, 20, 7))
 
     a2 = b2; // error
@@ -142,15 +142,15 @@ namespace OnlyDerived {
 
     a2 = b; // error
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembers4.ts, 20, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 18, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 18, 15))
 
     a2 = t2; // error
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembers4.ts, 20, 7))
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 15, 7))
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 15, 15))
 
     a2 = t; // error
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembers4.ts, 20, 7))
->t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 10, 7))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 10, 15))
 }
 
 namespace WithBase {
@@ -180,16 +180,16 @@ namespace WithBase {
 >foo : Symbol(T.foo, Decl(assignmentCompatWithObjectMembers4.ts, 53, 13))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithObjectMembers4.ts, 49, 47))
 
-    var s: S;
->s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 54, 7))
+    declare var s: S;
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 54, 15))
 >S : Symbol(S, Decl(assignmentCompatWithObjectMembers4.ts, 50, 48))
 
-    var t: T;
->t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 55, 7))
+    declare var t: T;
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 55, 15))
 >T : Symbol(T, Decl(assignmentCompatWithObjectMembers4.ts, 52, 26))
 
     interface S2 { foo: Base; }
->S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembers4.ts, 55, 13))
+>S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembers4.ts, 55, 21))
 >foo : Symbol(S2.foo, Decl(assignmentCompatWithObjectMembers4.ts, 57, 18))
 >Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 20))
 
@@ -198,22 +198,22 @@ namespace WithBase {
 >foo : Symbol(T2.foo, Decl(assignmentCompatWithObjectMembers4.ts, 58, 18))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithObjectMembers4.ts, 49, 47))
 
-    var s2: S2;
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 7))
->S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembers4.ts, 55, 13))
+    declare var s2: S2;
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 15))
+>S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembers4.ts, 55, 21))
 
-    var t2: T2;
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 60, 7))
+    declare var t2: T2;
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 60, 15))
 >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembers4.ts, 57, 31))
 
-    var a: { foo: Base; }
->a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 62, 7))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers4.ts, 62, 12))
+    declare var a: { foo: Base; }
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 62, 15))
+>foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers4.ts, 62, 20))
 >Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 20))
 
-    var b: { foo: Derived2; }
->b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 63, 7))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers4.ts, 63, 12))
+    declare var b: { foo: Derived2; }
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 63, 15))
+>foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers4.ts, 63, 20))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithObjectMembers4.ts, 49, 47))
 
     var a2 = { foo: new Base() };
@@ -227,59 +227,59 @@ namespace WithBase {
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithObjectMembers4.ts, 49, 47))
 
     s = t; // ok
->s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 54, 7))
->t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 55, 7))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 54, 15))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 55, 15))
 
     t = s; // error
->t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 55, 7))
->s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 54, 7))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 55, 15))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 54, 15))
 
     s = s2; // ok
->s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 54, 7))
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 7))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 54, 15))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 15))
 
     s = a2; // ok
->s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 54, 7))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 54, 15))
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembers4.ts, 65, 7))
 
     s2 = t2; // ok
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 7))
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 60, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 15))
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 60, 15))
 
     t2 = s2; // error
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 60, 7))
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 7))
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 60, 15))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 15))
 
     s2 = t; // ok
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 7))
->t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 55, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 15))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 55, 15))
 
     s2 = b; // ok
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 63, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 63, 15))
 
     s2 = a2; // ok
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 15))
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembers4.ts, 65, 7))
 
     a = b; // ok
->a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 62, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 63, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 62, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 63, 15))
 
     b = a; // error
->b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 63, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 62, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 63, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 62, 15))
 
     a = s; // ok
->a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 62, 7))
->s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 54, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 62, 15))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembers4.ts, 54, 15))
 
     a = s2; // ok
->a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 62, 7))
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 62, 15))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers4.ts, 59, 15))
 
     a = a2; // ok
->a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 62, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 62, 15))
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembers4.ts, 65, 7))
 
     a2 = b2; // ok
@@ -292,13 +292,13 @@ namespace WithBase {
 
     a2 = b; // ok
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembers4.ts, 65, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 63, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 63, 15))
 
     a2 = t2; // ok
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembers4.ts, 65, 7))
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 60, 7))
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembers4.ts, 60, 15))
 
     a2 = t; // ok
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembers4.ts, 65, 7))
->t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 55, 7))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 55, 15))
 }
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.types b/tests/baselines/reference/assignmentCompatWithObjectMembers4.types
index 941f3034a5d0e..1bdfcda3b1911 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.types
@@ -41,11 +41,11 @@ namespace OnlyDerived {
 >foo : Derived2
 >    : ^^^^^^^^
 
-    var s: S;
+    declare var s: S;
 >s : S
 >  : ^
 
-    var t: T;
+    declare var t: T;
 >t : T
 >  : ^
 
@@ -57,21 +57,21 @@ namespace OnlyDerived {
 >foo : Derived2
 >    : ^^^^^^^^
 
-    var s2: S2;
+    declare var s2: S2;
 >s2 : S2
 >   : ^^
 
-    var t2: T2;
+    declare var t2: T2;
 >t2 : T2
 >   : ^^
 
-    var a: { foo: Derived; }
+    declare var a: { foo: Derived; }
 >a : { foo: Derived; }
 >  : ^^^^^^^       ^^^
 >foo : Derived
 >    : ^^^^^^^
 
-    var b: { foo: Derived2; }
+    declare var b: { foo: Derived2; }
 >b : { foo: Derived2; }
 >  : ^^^^^^^        ^^^
 >foo : Derived2
@@ -292,11 +292,11 @@ namespace WithBase {
 >foo : Derived2
 >    : ^^^^^^^^
 
-    var s: S;
+    declare var s: S;
 >s : S
 >  : ^
 
-    var t: T;
+    declare var t: T;
 >t : T
 >  : ^
 
@@ -308,21 +308,21 @@ namespace WithBase {
 >foo : Derived2
 >    : ^^^^^^^^
 
-    var s2: S2;
+    declare var s2: S2;
 >s2 : S2
 >   : ^^
 
-    var t2: T2;
+    declare var t2: T2;
 >t2 : T2
 >   : ^^
 
-    var a: { foo: Base; }
+    declare var a: { foo: Base; }
 >a : { foo: Base; }
 >  : ^^^^^^^    ^^^
 >foo : Base
 >    : ^^^^
 
-    var b: { foo: Derived2; }
+    declare var b: { foo: Derived2; }
 >b : { foo: Derived2; }
 >  : ^^^^^^^        ^^^
 >foo : Derived2
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt
index caf8eb5695bd1..36b014dea5fb7 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers5.errors.txt
@@ -7,13 +7,13 @@ assignmentCompatWithObjectMembers5.ts(14,1): error TS2741: Property 'fooo' is mi
         foo: string;
     }
     
-    var c: C;
+    declare var c: C;
     
     interface I {
         fooo: string;
     }
     
-    var i: I;
+    declare var i: I;
     
     c = i; // error
     ~
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers5.js b/tests/baselines/reference/assignmentCompatWithObjectMembers5.js
index cb8da85d7e859..0da7ab9d13299 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers5.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers5.js
@@ -5,13 +5,13 @@ class C {
     foo: string;
 }
 
-var c: C;
+declare var c: C;
 
 interface I {
     fooo: string;
 }
 
-var i: I;
+declare var i: I;
 
 c = i; // error
 i = c; // error
@@ -22,7 +22,5 @@ var C = /** @class */ (function () {
     }
     return C;
 }());
-var c;
-var i;
 c = i; // error
 i = c; // error
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers5.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembers5.symbols
index fdc4e5a828ba6..1e1a597489795 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers5.symbols
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers5.symbols
@@ -8,26 +8,26 @@ class C {
 >foo : Symbol(C.foo, Decl(assignmentCompatWithObjectMembers5.ts, 0, 9))
 }
 
-var c: C;
->c : Symbol(c, Decl(assignmentCompatWithObjectMembers5.ts, 4, 3))
+declare var c: C;
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembers5.ts, 4, 11))
 >C : Symbol(C, Decl(assignmentCompatWithObjectMembers5.ts, 0, 0))
 
 interface I {
->I : Symbol(I, Decl(assignmentCompatWithObjectMembers5.ts, 4, 9))
+>I : Symbol(I, Decl(assignmentCompatWithObjectMembers5.ts, 4, 17))
 
     fooo: string;
 >fooo : Symbol(I.fooo, Decl(assignmentCompatWithObjectMembers5.ts, 6, 13))
 }
 
-var i: I;
->i : Symbol(i, Decl(assignmentCompatWithObjectMembers5.ts, 10, 3))
->I : Symbol(I, Decl(assignmentCompatWithObjectMembers5.ts, 4, 9))
+declare var i: I;
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembers5.ts, 10, 11))
+>I : Symbol(I, Decl(assignmentCompatWithObjectMembers5.ts, 4, 17))
 
 c = i; // error
->c : Symbol(c, Decl(assignmentCompatWithObjectMembers5.ts, 4, 3))
->i : Symbol(i, Decl(assignmentCompatWithObjectMembers5.ts, 10, 3))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembers5.ts, 4, 11))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembers5.ts, 10, 11))
 
 i = c; // error
->i : Symbol(i, Decl(assignmentCompatWithObjectMembers5.ts, 10, 3))
->c : Symbol(c, Decl(assignmentCompatWithObjectMembers5.ts, 4, 3))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembers5.ts, 10, 11))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembers5.ts, 4, 11))
 
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers5.types b/tests/baselines/reference/assignmentCompatWithObjectMembers5.types
index 93c42f8467da5..6d1a6ccd607c7 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers5.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers5.types
@@ -10,7 +10,7 @@ class C {
 >    : ^^^^^^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
@@ -20,7 +20,7 @@ interface I {
 >     : ^^^^^^
 }
 
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.errors.txt
index d9603de9fe4b6..931bc9e32919a 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.errors.txt
@@ -61,9 +61,9 @@ assignmentCompatWithObjectMembersAccessibility.ts(106,5): error TS2322: Type 'D'
             foo: string;
         }
     
-        var a: { foo: string; }
-        var b: Base;
-        var i: I;
+        declare var a: { foo: string; };
+        declare var b: Base;
+        declare var i: I;
     
         // sources
         class D {
@@ -73,8 +73,8 @@ assignmentCompatWithObjectMembersAccessibility.ts(106,5): error TS2322: Type 'D'
         class E {
             private foo: string;
         }
-        var d: D;
-        var e: E;
+        declare var d: D;
+        declare var e: E;
     
         a = b;
         a = i;
@@ -137,9 +137,9 @@ assignmentCompatWithObjectMembersAccessibility.ts(106,5): error TS2322: Type 'D'
         interface I extends Base {
         }
     
-        var a: { foo: string; }
-        var b: Base;
-        var i: I;
+        declare var a: { foo: string; };
+        declare var b: Base;
+        declare var i: I;
     
         // sources
         class D {
@@ -150,8 +150,8 @@ assignmentCompatWithObjectMembersAccessibility.ts(106,5): error TS2322: Type 'D'
             private foo: string;
         }
     
-        var d: D;
-        var e: E;
+        declare var d: D;
+        declare var e: E;
     
         a = b; // error
         ~
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js
index b98662a3175aa..5a87f367adfa2 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js
@@ -13,9 +13,9 @@ namespace TargetIsPublic {
         foo: string;
     }
 
-    var a: { foo: string; }
-    var b: Base;
-    var i: I;
+    declare var a: { foo: string; };
+    declare var b: Base;
+    declare var i: I;
 
     // sources
     class D {
@@ -25,8 +25,8 @@ namespace TargetIsPublic {
     class E {
         private foo: string;
     }
-    var d: D;
-    var e: E;
+    declare var d: D;
+    declare var e: E;
 
     a = b;
     a = i;
@@ -65,9 +65,9 @@ namespace TargetIsPublic {
     interface I extends Base {
     }
 
-    var a: { foo: string; }
-    var b: Base;
-    var i: I;
+    declare var a: { foo: string; };
+    declare var b: Base;
+    declare var i: I;
 
     // sources
     class D {
@@ -78,8 +78,8 @@ namespace TargetIsPublic {
         private foo: string;
     }
 
-    var d: D;
-    var e: E;
+    declare var d: D;
+    declare var e: E;
 
     a = b; // error
     a = i; // error
@@ -121,9 +121,6 @@ var TargetIsPublic;
         }
         return Base;
     }());
-    var a;
-    var b;
-    var i;
     // sources
     var D = /** @class */ (function () {
         function D() {
@@ -135,8 +132,6 @@ var TargetIsPublic;
         }
         return E;
     }());
-    var d;
-    var e;
     a = b;
     a = i;
     a = d;
@@ -166,9 +161,6 @@ var TargetIsPublic;
         }
         return Base;
     }());
-    var a;
-    var b;
-    var i;
     // sources
     var D = /** @class */ (function () {
         function D() {
@@ -180,8 +172,6 @@ var TargetIsPublic;
         }
         return E;
     }());
-    var d;
-    var e;
     a = b; // error
     a = i; // error
     a = d;
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.symbols
index dfa2dec9c5f1c..f2372eea05d11 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.symbols
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.symbols
@@ -21,21 +21,21 @@ namespace TargetIsPublic {
 >foo : Symbol(I.foo, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 8, 17))
     }
 
-    var a: { foo: string; }
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 7))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 12))
+    declare var a: { foo: string; };
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 15))
+>foo : Symbol(foo, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 20))
 
-    var b: Base;
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 7))
+    declare var b: Base;
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 15))
 >Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 2, 26))
 
-    var i: I;
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 7))
+    declare var i: I;
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 15))
 >I : Symbol(I, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 6, 5))
 
     // sources
     class D {
->D : Symbol(D, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 13))
+>D : Symbol(D, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 21))
 
         public foo: string;
 >foo : Symbol(D.foo, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 17, 13))
@@ -47,97 +47,97 @@ namespace TargetIsPublic {
         private foo: string;
 >foo : Symbol(E.foo, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 21, 13))
     }
-    var d: D;
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 7))
->D : Symbol(D, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 13))
+    declare var d: D;
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 15))
+>D : Symbol(D, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 21))
 
-    var e: E;
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 7))
+    declare var e: E;
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15))
 >E : Symbol(E, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 19, 5))
 
     a = b;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 15))
 
     a = i;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 7))
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 15))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 15))
 
     a = d;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 15))
 
     a = e; // error
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15))
 
     b = a;
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 15))
 
     b = i;
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 7))
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 15))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 15))
 
     b = d;
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 15))
 
     b = e; // error
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15))
 
     i = a;
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 7))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 15))
 
     i = b;
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 7))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 15))
 
     i = d;
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 7))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 15))
 
     i = e; // error
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 7))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15))
 
     d = a;
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 7))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 15))
 
     d = b;
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 7))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 15))
 
     d = i;
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 7))
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 7))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 15))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 15))
 
     d = e; // error
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 7))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15))
 
     e = a; // errror
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 7))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 15))
 
     e = b; // errror
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 7))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 15))
 
     e = i; // errror
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 7))
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 7))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 15))
 
     e = d; // errror
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 7))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 15))
 
     e = e; 
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 7))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15))
 
 }
 
@@ -157,21 +157,21 @@ namespace TargetIsPublic {
 >Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 55, 26))
     }
 
-    var a: { foo: string; }
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 7))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 12))
+    declare var a: { foo: string; };
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 15))
+>foo : Symbol(foo, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 20))
 
-    var b: Base;
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 7))
+    declare var b: Base;
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 15))
 >Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 55, 26))
 
-    var i: I;
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 7))
+    declare var i: I;
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 15))
 >I : Symbol(I, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 59, 5))
 
     // sources
     class D {
->D : Symbol(D, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 13))
+>D : Symbol(D, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 21))
 
         public foo: string;
 >foo : Symbol(D.foo, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 69, 13))
@@ -184,104 +184,104 @@ namespace TargetIsPublic {
 >foo : Symbol(E.foo, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 73, 13))
     }
 
-    var d: D;
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 7))
->D : Symbol(D, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 13))
+    declare var d: D;
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 15))
+>D : Symbol(D, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 21))
 
-    var e: E;
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 7))
+    declare var e: E;
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15))
 >E : Symbol(E, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 71, 5))
 
     a = b; // error
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 15))
 
     a = i; // error
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 7))
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 15))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 15))
 
     a = d;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 15))
 
     a = e; // error
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15))
 
     b = a; // error
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 15))
 
     b = i;
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 7))
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 15))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 15))
 
     b = d; // error
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 15))
 
     b = e; // error
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15))
 
     b = b;
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 15))
     
     i = a; // error
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 7))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 15))
 
     i = b;
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 7))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 15))
 
     i = d; // error
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 7))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 15))
 
     i = e; // error
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 7))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15))
 
     i = i;
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 7))
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 7))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 15))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 15))
 
     d = a;
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 7))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 15))
 
     d = b; // error
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 7))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 15))
 
     d = i; // error
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 7))
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 7))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 15))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 15))
 
     d = e; // error
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 7))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15))
 
     e = a; // errror
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 7))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 15))
 
     e = b; // errror
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 7))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 15))
 
     e = i; // errror
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 7))
->i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 7))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15))
+>i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 15))
 
     e = d; // errror
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 7))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 15))
 
     e = e;
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 7))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15))
 
 }
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types
index bb9d29095276c..afd00c67b2dda 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types
@@ -23,17 +23,17 @@ namespace TargetIsPublic {
 >    : ^^^^^^
     }
 
-    var a: { foo: string; }
+    declare var a: { foo: string; };
 >a : { foo: string; }
 >  : ^^^^^^^      ^^^
 >foo : string
 >    : ^^^^^^
 
-    var b: Base;
+    declare var b: Base;
 >b : Base
 >  : ^^^^
 
-    var i: I;
+    declare var i: I;
 >i : I
 >  : ^
 
@@ -55,11 +55,11 @@ namespace TargetIsPublic {
 >foo : string
 >    : ^^^^^^
     }
-    var d: D;
+    declare var d: D;
 >d : D
 >  : ^
 
-    var e: E;
+    declare var e: E;
 >e : E
 >  : ^
 
@@ -250,17 +250,17 @@ namespace TargetIsPublic {
     interface I extends Base {
     }
 
-    var a: { foo: string; }
+    declare var a: { foo: string; };
 >a : { foo: string; }
 >  : ^^^^^^^      ^^^
 >foo : string
 >    : ^^^^^^
 
-    var b: Base;
+    declare var b: Base;
 >b : Base
 >  : ^^^^
 
-    var i: I;
+    declare var i: I;
 >i : I
 >  : ^
 
@@ -283,11 +283,11 @@ namespace TargetIsPublic {
 >    : ^^^^^^
     }
 
-    var d: D;
+    declare var d: D;
 >d : D
 >  : ^
 
-    var e: E;
+    declare var e: E;
 >e : E
 >  : ^
 
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.errors.txt
index 30f75f0b2d1e8..48356967652b5 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.errors.txt
@@ -24,9 +24,9 @@ assignmentCompatWithObjectMembersOptionality.ts(84,5): error TS2322: Type 'E' is
         interface C {
             opt?: Base
         }
-        var c: C;
+        declare var c: C;
     
-        var a: { opt?: Base; }
+        declare var a: { opt?: Base; };
         var b: typeof a = { opt: new Base() }
     
         // sources
@@ -39,9 +39,9 @@ assignmentCompatWithObjectMembersOptionality.ts(84,5): error TS2322: Type 'E' is
         interface F {
             opt?: Derived;
         }
-        var d: D;
-        var e: E;
-        var f: F;
+        declare var d: D;
+        declare var e: E;
+        declare var f: F;
     
         // all ok
         c = d;
@@ -66,9 +66,9 @@ assignmentCompatWithObjectMembersOptionality.ts(84,5): error TS2322: Type 'E' is
         interface C {
             opt: Base
         }
-        var c: C;
+        declare var c: C;
     
-        var a: { opt: Base; }
+        declare var a: { opt: Base; };
         var b = { opt: new Base() }
     
         // sources
@@ -81,9 +81,9 @@ assignmentCompatWithObjectMembersOptionality.ts(84,5): error TS2322: Type 'E' is
         interface F {
             opt: Derived;
         }
-        var d: D;
-        var e: E;
-        var f: F;
+        declare var d: D;
+        declare var e: E;
+        declare var f: F;
     
         c = d; // error
         ~
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
index 2c76b037ad1a6..afd0d3f76c549 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
@@ -12,9 +12,9 @@ namespace TargetHasOptional {
     interface C {
         opt?: Base
     }
-    var c: C;
+    declare var c: C;
 
-    var a: { opt?: Base; }
+    declare var a: { opt?: Base; };
     var b: typeof a = { opt: new Base() }
 
     // sources
@@ -27,9 +27,9 @@ namespace TargetHasOptional {
     interface F {
         opt?: Derived;
     }
-    var d: D;
-    var e: E;
-    var f: F;
+    declare var d: D;
+    declare var e: E;
+    declare var f: F;
 
     // all ok
     c = d;
@@ -54,9 +54,9 @@ namespace SourceHasOptional {
     interface C {
         opt: Base
     }
-    var c: C;
+    declare var c: C;
 
-    var a: { opt: Base; }
+    declare var a: { opt: Base; };
     var b = { opt: new Base() }
 
     // sources
@@ -69,9 +69,9 @@ namespace SourceHasOptional {
     interface F {
         opt: Derived;
     }
-    var d: D;
-    var e: E;
-    var f: F;
+    declare var d: D;
+    declare var e: E;
+    declare var f: F;
 
     c = d; // error
     c = e; // error
@@ -128,12 +128,7 @@ var Derived2 = /** @class */ (function (_super) {
 }(Derived));
 var TargetHasOptional;
 (function (TargetHasOptional) {
-    var c;
-    var a;
     var b = { opt: new Base() };
-    var d;
-    var e;
-    var f;
     // all ok
     c = d;
     c = e;
@@ -151,12 +146,7 @@ var TargetHasOptional;
 })(TargetHasOptional || (TargetHasOptional = {}));
 var SourceHasOptional;
 (function (SourceHasOptional) {
-    var c;
-    var a;
     var b = { opt: new Base() };
-    var d;
-    var e;
-    var f;
     c = d; // error
     c = e; // error
     c = f; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.symbols
index 5972a0e8014ef..c9c1162e40232 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.symbols
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.symbols
@@ -28,18 +28,18 @@ namespace TargetHasOptional {
 >opt : Symbol(C.opt, Decl(assignmentCompatWithObjectMembersOptionality.ts, 8, 17))
 >Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersOptionality.ts, 0, 0))
     }
-    var c: C;
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 7))
+    declare var c: C;
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 15))
 >C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality.ts, 6, 29))
 
-    var a: { opt?: Base; }
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 7))
->opt : Symbol(opt, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 12))
+    declare var a: { opt?: Base; };
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 15))
+>opt : Symbol(opt, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 20))
 >Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersOptionality.ts, 0, 0))
 
     var b: typeof a = { opt: new Base() }
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality.ts, 14, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 15))
 >opt : Symbol(opt, Decl(assignmentCompatWithObjectMembersOptionality.ts, 14, 23))
 >Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersOptionality.ts, 0, 0))
 
@@ -65,70 +65,70 @@ namespace TargetHasOptional {
 >opt : Symbol(F.opt, Decl(assignmentCompatWithObjectMembersOptionality.ts, 23, 17))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithObjectMembersOptionality.ts, 2, 27))
     }
-    var d: D;
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 26, 7))
+    declare var d: D;
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 26, 15))
 >D : Symbol(D, Decl(assignmentCompatWithObjectMembersOptionality.ts, 14, 41))
 
-    var e: E;
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 27, 7))
+    declare var e: E;
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 27, 15))
 >E : Symbol(E, Decl(assignmentCompatWithObjectMembersOptionality.ts, 19, 5))
 
-    var f: F;
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 28, 7))
+    declare var f: F;
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 28, 15))
 >F : Symbol(F, Decl(assignmentCompatWithObjectMembersOptionality.ts, 22, 5))
 
     // all ok
     c = d;
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 26, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 26, 15))
 
     c = e;
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 27, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 27, 15))
 
     c = f;
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 7))
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 28, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 15))
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 28, 15))
 
     c = a;
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 15))
 
     a = d;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 26, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 26, 15))
 
     a = e;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 27, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 27, 15))
 
     a = f;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 7))
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 28, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 15))
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 28, 15))
 
     a = c;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 7))
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 15))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 15))
 
     b = d;
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality.ts, 14, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 26, 7))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 26, 15))
 
     b = e;
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality.ts, 14, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 27, 7))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 27, 15))
 
     b = f;
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality.ts, 14, 7))
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 28, 7))
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 28, 15))
 
     b = a;
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality.ts, 14, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 15))
 
     b = c;
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality.ts, 14, 7))
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 15))
 }
 
 namespace SourceHasOptional {
@@ -142,13 +142,13 @@ namespace SourceHasOptional {
 >opt : Symbol(C.opt, Decl(assignmentCompatWithObjectMembersOptionality.ts, 50, 17))
 >Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersOptionality.ts, 0, 0))
     }
-    var c: C;
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 53, 7))
+    declare var c: C;
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 53, 15))
 >C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality.ts, 48, 29))
 
-    var a: { opt: Base; }
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 7))
->opt : Symbol(opt, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 12))
+    declare var a: { opt: Base; };
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 15))
+>opt : Symbol(opt, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 20))
 >Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersOptionality.ts, 0, 0))
 
     var b = { opt: new Base() }
@@ -178,67 +178,67 @@ namespace SourceHasOptional {
 >opt : Symbol(F.opt, Decl(assignmentCompatWithObjectMembersOptionality.ts, 65, 17))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithObjectMembersOptionality.ts, 2, 27))
     }
-    var d: D;
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 68, 7))
+    declare var d: D;
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 68, 15))
 >D : Symbol(D, Decl(assignmentCompatWithObjectMembersOptionality.ts, 56, 31))
 
-    var e: E;
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 69, 7))
+    declare var e: E;
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 69, 15))
 >E : Symbol(E, Decl(assignmentCompatWithObjectMembersOptionality.ts, 61, 5))
 
-    var f: F;
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 70, 7))
+    declare var f: F;
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 70, 15))
 >F : Symbol(F, Decl(assignmentCompatWithObjectMembersOptionality.ts, 64, 5))
 
     c = d; // error
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 53, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 68, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 53, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 68, 15))
 
     c = e; // error
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 53, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 69, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 53, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 69, 15))
 
     c = f; // ok
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 53, 7))
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 70, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 53, 15))
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 70, 15))
 
     c = a; // ok
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 53, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 53, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 15))
 
     a = d; // error
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 68, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 68, 15))
 
     a = e; // error
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 69, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 69, 15))
 
     a = f; // ok
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 7))
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 70, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 15))
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 70, 15))
 
     a = c; // ok
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 7))
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 53, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 15))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 53, 15))
 
     b = d; // error
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality.ts, 56, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 68, 7))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality.ts, 68, 15))
 
     b = e; // error
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality.ts, 56, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 69, 7))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality.ts, 69, 15))
 
     b = f; // ok
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality.ts, 56, 7))
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 70, 7))
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality.ts, 70, 15))
 
     b = a; // ok
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality.ts, 56, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 15))
 
     b = c; // ok
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality.ts, 56, 7))
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 53, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 53, 15))
 }
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.types b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.types
index 513ba72180fd2..77454790263b3 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.types
@@ -35,11 +35,11 @@ namespace TargetHasOptional {
 >opt : Base
 >    : ^^^^
     }
-    var c: C;
+    declare var c: C;
 >c : C
 >  : ^
 
-    var a: { opt?: Base; }
+    declare var a: { opt?: Base; };
 >a : { opt?: Base; }
 >  : ^^^^^^^^    ^^^
 >opt : Base
@@ -75,15 +75,15 @@ namespace TargetHasOptional {
 >opt : Derived
 >    : ^^^^^^^
     }
-    var d: D;
+    declare var d: D;
 >d : D
 >  : ^
 
-    var e: E;
+    declare var e: E;
 >e : E
 >  : ^
 
-    var f: F;
+    declare var f: F;
 >f : F
 >  : ^
 
@@ -203,11 +203,11 @@ namespace SourceHasOptional {
 >opt : Base
 >    : ^^^^
     }
-    var c: C;
+    declare var c: C;
 >c : C
 >  : ^
 
-    var a: { opt: Base; }
+    declare var a: { opt: Base; };
 >a : { opt: Base; }
 >  : ^^^^^^^    ^^^
 >opt : Base
@@ -241,15 +241,15 @@ namespace SourceHasOptional {
 >opt : Derived
 >    : ^^^^^^^
     }
-    var d: D;
+    declare var d: D;
 >d : D
 >  : ^
 
-    var e: E;
+    declare var e: E;
 >e : E
 >  : ^
 
-    var f: F;
+    declare var f: F;
 >f : F
 >  : ^
 
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
index 73efbfd5551f7..98eaea88168af 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt
@@ -31,9 +31,9 @@ assignmentCompatWithObjectMembersOptionality2.ts(86,5): error TS2741: Property '
         interface C {
             opt?: Base
         }
-        var c: C;
+        declare var c: C;
     
-        var a: { opt?: Base; }
+        declare var a: { opt?: Base; };
         var b: typeof a = { opt: new Base() }
     
         // sources
@@ -46,9 +46,9 @@ assignmentCompatWithObjectMembersOptionality2.ts(86,5): error TS2741: Property '
         interface F {
             other?: Derived;
         }
-        var d: D;
-        var e: E;
-        var f: F;
+        declare var d: D;
+        declare var e: E;
+        declare var f: F;
     
         // disallowed by weak type checking
         c = d;
@@ -91,9 +91,9 @@ assignmentCompatWithObjectMembersOptionality2.ts(86,5): error TS2741: Property '
         interface C {
             opt: Base
         }
-        var c: C;
+        declare var c: C;
     
-        var a: { opt: Base; }
+        declare var a: { opt: Base; };
         var b = { opt: new Base() }
     
         // sources
@@ -106,9 +106,9 @@ assignmentCompatWithObjectMembersOptionality2.ts(86,5): error TS2741: Property '
         interface F {
             other: Derived;
         }
-        var d: D;
-        var e: E;
-        var f: F;
+        declare var d: D;
+        declare var e: E;
+        declare var f: F;
     
         c = d; // error
         ~
@@ -127,15 +127,15 @@ assignmentCompatWithObjectMembersOptionality2.ts(86,5): error TS2741: Property '
         a = d; // error
         ~
 !!! error TS2741: Property 'opt' is missing in type 'D' but required in type '{ opt: Base; }'.
-!!! related TS2728 assignmentCompatWithObjectMembersOptionality2.ts:57:14: 'opt' is declared here.
+!!! related TS2728 assignmentCompatWithObjectMembersOptionality2.ts:57:22: 'opt' is declared here.
         a = e; // error
         ~
 !!! error TS2741: Property 'opt' is missing in type 'E' but required in type '{ opt: Base; }'.
-!!! related TS2728 assignmentCompatWithObjectMembersOptionality2.ts:57:14: 'opt' is declared here.
+!!! related TS2728 assignmentCompatWithObjectMembersOptionality2.ts:57:22: 'opt' is declared here.
         a = f; // error
         ~
 !!! error TS2741: Property 'opt' is missing in type 'F' but required in type '{ opt: Base; }'.
-!!! related TS2728 assignmentCompatWithObjectMembersOptionality2.ts:57:14: 'opt' is declared here.
+!!! related TS2728 assignmentCompatWithObjectMembersOptionality2.ts:57:22: 'opt' is declared here.
         a = c; // ok
     
         b = d; // error
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
index 27948a4b8d238..a77437c73b151 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
@@ -13,9 +13,9 @@ namespace TargetHasOptional {
     interface C {
         opt?: Base
     }
-    var c: C;
+    declare var c: C;
 
-    var a: { opt?: Base; }
+    declare var a: { opt?: Base; };
     var b: typeof a = { opt: new Base() }
 
     // sources
@@ -28,9 +28,9 @@ namespace TargetHasOptional {
     interface F {
         other?: Derived;
     }
-    var d: D;
-    var e: E;
-    var f: F;
+    declare var d: D;
+    declare var e: E;
+    declare var f: F;
 
     // disallowed by weak type checking
     c = d;
@@ -55,9 +55,9 @@ namespace SourceHasOptional {
     interface C {
         opt: Base
     }
-    var c: C;
+    declare var c: C;
 
-    var a: { opt: Base; }
+    declare var a: { opt: Base; };
     var b = { opt: new Base() }
 
     // sources
@@ -70,9 +70,9 @@ namespace SourceHasOptional {
     interface F {
         other: Derived;
     }
-    var d: D;
-    var e: E;
-    var f: F;
+    declare var d: D;
+    declare var e: E;
+    declare var f: F;
 
     c = d; // error
     c = e; // error
@@ -131,12 +131,7 @@ var Derived2 = /** @class */ (function (_super) {
 }(Derived));
 var TargetHasOptional;
 (function (TargetHasOptional) {
-    var c;
-    var a;
     var b = { opt: new Base() };
-    var d;
-    var e;
-    var f;
     // disallowed by weak type checking
     c = d;
     c = e;
@@ -155,12 +150,7 @@ var TargetHasOptional;
 })(TargetHasOptional || (TargetHasOptional = {}));
 var SourceHasOptional;
 (function (SourceHasOptional) {
-    var c;
-    var a;
     var b = { opt: new Base() };
-    var d;
-    var e;
-    var f;
     c = d; // error
     c = e; // error
     c = f; // error
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.symbols
index 6346a4031e476..6cef7e0de6f15 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.symbols
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.symbols
@@ -29,18 +29,18 @@ namespace TargetHasOptional {
 >opt : Symbol(C.opt, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 9, 17))
 >Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 0, 0))
     }
-    var c: C;
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 7))
+    declare var c: C;
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 15))
 >C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 7, 29))
 
-    var a: { opt?: Base; }
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 7))
->opt : Symbol(opt, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 12))
+    declare var a: { opt?: Base; };
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 15))
+>opt : Symbol(opt, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 20))
 >Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 0, 0))
 
     var b: typeof a = { opt: new Base() }
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 15, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 15))
 >opt : Symbol(opt, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 15, 23))
 >Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 0, 0))
 
@@ -66,71 +66,71 @@ namespace TargetHasOptional {
 >other : Symbol(F.other, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 24, 17))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 3, 27))
     }
-    var d: D;
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 27, 7))
+    declare var d: D;
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 27, 15))
 >D : Symbol(D, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 15, 41))
 
-    var e: E;
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 28, 7))
+    declare var e: E;
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 28, 15))
 >E : Symbol(E, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 20, 5))
 
-    var f: F;
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 29, 7))
+    declare var f: F;
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 29, 15))
 >F : Symbol(F, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 23, 5))
 
     // disallowed by weak type checking
     c = d;
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 27, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 27, 15))
 
     c = e;
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 28, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 28, 15))
 
     c = f;
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 7))
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 29, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 15))
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 29, 15))
 
     a = d;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 27, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 27, 15))
 
     a = e;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 28, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 28, 15))
 
     a = f;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 7))
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 29, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 15))
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 29, 15))
 
     b = d;
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 15, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 27, 7))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 27, 15))
 
     b = e;
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 15, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 28, 7))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 28, 15))
 
     b = f;
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 15, 7))
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 29, 7))
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 29, 15))
 
     // ok
     c = a;
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 15))
 
     a = c;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 7))
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 15))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 15))
 
     b = a;
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 15, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 15))
 
     b = c;
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 15, 7))
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 15))
 }
 
 namespace SourceHasOptional {
@@ -144,13 +144,13 @@ namespace SourceHasOptional {
 >opt : Symbol(C.opt, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 51, 17))
 >Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 0, 0))
     }
-    var c: C;
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 54, 7))
+    declare var c: C;
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 54, 15))
 >C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 49, 29))
 
-    var a: { opt: Base; }
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 7))
->opt : Symbol(opt, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 12))
+    declare var a: { opt: Base; };
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 15))
+>opt : Symbol(opt, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 20))
 >Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 0, 0))
 
     var b = { opt: new Base() }
@@ -180,68 +180,68 @@ namespace SourceHasOptional {
 >other : Symbol(F.other, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 66, 17))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 3, 27))
     }
-    var d: D;
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 69, 7))
+    declare var d: D;
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 69, 15))
 >D : Symbol(D, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 57, 31))
 
-    var e: E;
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 70, 7))
+    declare var e: E;
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 70, 15))
 >E : Symbol(E, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 62, 5))
 
-    var f: F;
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 71, 7))
+    declare var f: F;
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 71, 15))
 >F : Symbol(F, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 65, 5))
 
     c = d; // error
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 54, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 69, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 54, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 69, 15))
 
     c = e; // error
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 54, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 70, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 54, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 70, 15))
 
     c = f; // error
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 54, 7))
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 71, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 54, 15))
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 71, 15))
 
     c = a; // ok
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 54, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 54, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 15))
 
     a = d; // error
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 69, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 15))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 69, 15))
 
     a = e; // error
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 70, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 15))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 70, 15))
 
     a = f; // error
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 7))
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 71, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 15))
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 71, 15))
 
     a = c; // ok
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 7))
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 54, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 15))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 54, 15))
 
     b = d; // error
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 57, 7))
->d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 69, 7))
+>d : Symbol(d, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 69, 15))
 
     b = e; // error
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 57, 7))
->e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 70, 7))
+>e : Symbol(e, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 70, 15))
 
     b = f; // error
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 57, 7))
->f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 71, 7))
+>f : Symbol(f, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 71, 15))
 
     b = a; // ok
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 57, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 15))
 
     b = c; // ok
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 57, 7))
->c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 54, 7))
+>c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 54, 15))
 }
 
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.types b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.types
index c637a7641c231..8b6e04d708d87 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.types
@@ -36,11 +36,11 @@ namespace TargetHasOptional {
 >opt : Base
 >    : ^^^^
     }
-    var c: C;
+    declare var c: C;
 >c : C
 >  : ^
 
-    var a: { opt?: Base; }
+    declare var a: { opt?: Base; };
 >a : { opt?: Base; }
 >  : ^^^^^^^^    ^^^
 >opt : Base
@@ -76,15 +76,15 @@ namespace TargetHasOptional {
 >other : Derived
 >      : ^^^^^^^
     }
-    var d: D;
+    declare var d: D;
 >d : D
 >  : ^
 
-    var e: E;
+    declare var e: E;
 >e : E
 >  : ^
 
-    var f: F;
+    declare var f: F;
 >f : F
 >  : ^
 
@@ -205,11 +205,11 @@ namespace SourceHasOptional {
 >opt : Base
 >    : ^^^^
     }
-    var c: C;
+    declare var c: C;
 >c : C
 >  : ^
 
-    var a: { opt: Base; }
+    declare var a: { opt: Base; };
 >a : { opt: Base; }
 >  : ^^^^^^^    ^^^
 >opt : Base
@@ -243,15 +243,15 @@ namespace SourceHasOptional {
 >other : Derived
 >      : ^^^^^^^
     }
-    var d: D;
+    declare var d: D;
 >d : D
 >  : ^
 
-    var e: E;
+    declare var e: E;
 >e : E
 >  : ^
 
-    var f: F;
+    declare var f: F;
 >f : F
 >  : ^
 
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt
index 2c395ded5c6de..e48d9172b8958 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt
@@ -36,16 +36,16 @@ assignmentCompatWithObjectMembersStringNumericNames.ts(84,5): error TS2741: Prop
     namespace JustStrings {
         class S { '1': string; }
         class T { '1.': string; }
-        var s: S;
-        var t: T;
+        declare var s: S;
+        declare var t: T;
     
         interface S2 { '1': string; bar?: string }
         interface T2 { '1.0': string; baz?: string }
-        var s2: S2;
-        var t2: T2;
+        declare var s2: S2;
+        declare var t2: T2;
     
-        var a: { '1.': string; bar?: string }
-        var b: { '1.0': string; baz?: string }
+        declare var a: { '1.': string; bar?: string };
+        declare var b: { '1.0': string; baz?: string };
     
         var a2 = { '1.0': '' };
         var b2 = { '1': '' };
@@ -88,23 +88,23 @@ assignmentCompatWithObjectMembersStringNumericNames.ts(84,5): error TS2741: Prop
         a = b;
         ~
 !!! error TS2741: Property ''1.'' is missing in type '{ '1.0': string; baz?: string; }' but required in type '{ '1.': string; bar?: string; }'.
-!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:15:14: ''1.'' is declared here.
+!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:15:22: ''1.'' is declared here.
         b = a;
         ~
 !!! error TS2741: Property ''1.0'' is missing in type '{ '1.': string; bar?: string; }' but required in type '{ '1.0': string; baz?: string; }'.
-!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:16:14: ''1.0'' is declared here.
+!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:16:22: ''1.0'' is declared here.
         a = s;
         ~
 !!! error TS2741: Property ''1.'' is missing in type 'S' but required in type '{ '1.': string; bar?: string; }'.
-!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:15:14: ''1.'' is declared here.
+!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:15:22: ''1.'' is declared here.
         a = s2;
         ~
 !!! error TS2741: Property ''1.'' is missing in type 'S2' but required in type '{ '1.': string; bar?: string; }'.
-!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:15:14: ''1.'' is declared here.
+!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:15:22: ''1.'' is declared here.
         a = a2;
         ~
 !!! error TS2741: Property ''1.'' is missing in type '{ '1.0': string; }' but required in type '{ '1.': string; bar?: string; }'.
-!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:15:14: ''1.'' is declared here.
+!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:15:22: ''1.'' is declared here.
     
         a2 = b2;
         ~~
@@ -125,16 +125,16 @@ assignmentCompatWithObjectMembersStringNumericNames.ts(84,5): error TS2741: Prop
     namespace NumbersAndStrings {
         class S { '1': string; }
         class T { 1: string; }
-        var s: S;
-        var t: T;
+        declare var s: S;
+        declare var t: T;
     
         interface S2 { '1': string; bar?: string }
         interface T2 { 1.0: string; baz?: string }
-        var s2: S2;
-        var t2: T2;
+        declare var s2: S2;
+        declare var t2: T2;
     
-        var a: { '1.': string; bar?: string }
-        var b: { 1.0: string; baz?: string }
+        declare var a: { '1.': string; bar?: string };
+        declare var b: { 1.0: string; baz?: string };
     
         var a2 = { '1.0': '' };
         var b2 = { 1.: '' };
@@ -159,27 +159,27 @@ assignmentCompatWithObjectMembersStringNumericNames.ts(84,5): error TS2741: Prop
         a = b; // error
         ~
 !!! error TS2741: Property ''1.'' is missing in type '{ 1: string; baz?: string; }' but required in type '{ '1.': string; bar?: string; }'.
-!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:56:14: ''1.'' is declared here.
+!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:56:22: ''1.'' is declared here.
         b = a; // error
         ~
 !!! error TS2741: Property '1.0' is missing in type '{ '1.': string; bar?: string; }' but required in type '{ 1: string; baz?: string; }'.
-!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:57:14: '1.0' is declared here.
+!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:57:22: '1.0' is declared here.
         a = s; // error
         ~
 !!! error TS2741: Property ''1.'' is missing in type 'S' but required in type '{ '1.': string; bar?: string; }'.
-!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:56:14: ''1.'' is declared here.
+!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:56:22: ''1.'' is declared here.
         a = s2; // error
         ~
 !!! error TS2741: Property ''1.'' is missing in type 'S2' but required in type '{ '1.': string; bar?: string; }'.
-!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:56:14: ''1.'' is declared here.
+!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:56:22: ''1.'' is declared here.
         a = a2; // error
         ~
 !!! error TS2741: Property ''1.'' is missing in type '{ '1.0': string; }' but required in type '{ '1.': string; bar?: string; }'.
-!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:56:14: ''1.'' is declared here.
+!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:56:22: ''1.'' is declared here.
         a = b2; // error
         ~
 !!! error TS2741: Property ''1.'' is missing in type '{ 1: string; }' but required in type '{ '1.': string; bar?: string; }'.
-!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:56:14: ''1.'' is declared here.
+!!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:56:22: ''1.'' is declared here.
     
         a2 = b2; // error
         ~~
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js
index 4d0aa624d2caa..a9fea11c20cfb 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js
@@ -7,16 +7,16 @@
 namespace JustStrings {
     class S { '1': string; }
     class T { '1.': string; }
-    var s: S;
-    var t: T;
+    declare var s: S;
+    declare var t: T;
 
     interface S2 { '1': string; bar?: string }
     interface T2 { '1.0': string; baz?: string }
-    var s2: S2;
-    var t2: T2;
+    declare var s2: S2;
+    declare var t2: T2;
 
-    var a: { '1.': string; bar?: string }
-    var b: { '1.0': string; baz?: string }
+    declare var a: { '1.': string; bar?: string };
+    declare var b: { '1.0': string; baz?: string };
 
     var a2 = { '1.0': '' };
     var b2 = { '1': '' };
@@ -48,16 +48,16 @@ namespace JustStrings {
 namespace NumbersAndStrings {
     class S { '1': string; }
     class T { 1: string; }
-    var s: S;
-    var t: T;
+    declare var s: S;
+    declare var t: T;
 
     interface S2 { '1': string; bar?: string }
     interface T2 { 1.0: string; baz?: string }
-    var s2: S2;
-    var t2: T2;
+    declare var s2: S2;
+    declare var t2: T2;
 
-    var a: { '1.': string; bar?: string }
-    var b: { 1.0: string; baz?: string }
+    declare var a: { '1.': string; bar?: string };
+    declare var b: { 1.0: string; baz?: string };
 
     var a2 = { '1.0': '' };
     var b2 = { 1.: '' };
@@ -102,12 +102,6 @@ var JustStrings;
         }
         return T;
     }());
-    var s;
-    var t;
-    var s2;
-    var t2;
-    var a;
-    var b;
     var a2 = { '1.0': '' };
     var b2 = { '1': '' };
     s = t;
@@ -142,12 +136,6 @@ var NumbersAndStrings;
         }
         return T;
     }());
-    var s;
-    var t;
-    var s2;
-    var t2;
-    var a;
-    var b;
     var a2 = { '1.0': '' };
     var b2 = { 1.: '' };
     s = t; // ok
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.symbols
index 646e20437a410..ac70c58bcb488 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.symbols
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.symbols
@@ -15,16 +15,16 @@ namespace JustStrings {
 >T : Symbol(T, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 4, 28))
 >'1.' : Symbol(T['1.'], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 5, 13))
 
-    var s: S;
->s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 6, 7))
+    declare var s: S;
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 6, 15))
 >S : Symbol(S, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 3, 23))
 
-    var t: T;
->t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 7))
+    declare var t: T;
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 15))
 >T : Symbol(T, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 4, 28))
 
     interface S2 { '1': string; bar?: string }
->S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 13))
+>S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 21))
 >'1' : Symbol(S2['1'], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 9, 18))
 >bar : Symbol(S2.bar, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 9, 31))
 
@@ -33,23 +33,23 @@ namespace JustStrings {
 >'1.0' : Symbol(T2['1.0'], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 10, 18))
 >baz : Symbol(T2.baz, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 10, 33))
 
-    var s2: S2;
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 7))
->S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 13))
+    declare var s2: S2;
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 15))
+>S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 21))
 
-    var t2: T2;
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 12, 7))
+    declare var t2: T2;
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 12, 15))
 >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 9, 46))
 
-    var a: { '1.': string; bar?: string }
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 7))
->'1.' : Symbol('1.', Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 12))
->bar : Symbol(bar, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 26))
+    declare var a: { '1.': string; bar?: string };
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 15))
+>'1.' : Symbol('1.', Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 20))
+>bar : Symbol(bar, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 34))
 
-    var b: { '1.0': string; baz?: string }
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 7))
->'1.0' : Symbol('1.0', Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 12))
->baz : Symbol(baz, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 27))
+    declare var b: { '1.0': string; baz?: string };
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 15))
+>'1.0' : Symbol('1.0', Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 20))
+>baz : Symbol(baz, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 35))
 
     var a2 = { '1.0': '' };
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 17, 7))
@@ -60,59 +60,59 @@ namespace JustStrings {
 >'1' : Symbol('1', Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 18, 14))
 
     s = t;
->s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 6, 7))
->t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 7))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 6, 15))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 15))
 
     t = s;
->t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 7))
->s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 6, 7))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 15))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 6, 15))
 
     s = s2; // ok
->s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 6, 7))
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 7))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 6, 15))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 15))
 
     s = a2;
->s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 6, 7))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 6, 15))
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 17, 7))
 
     s2 = t2;
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 7))
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 12, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 15))
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 12, 15))
 
     t2 = s2;
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 12, 7))
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 7))
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 12, 15))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 15))
 
     s2 = t;
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 7))
->t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 15))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 15))
 
     s2 = b;
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 15))
 
     s2 = a2;
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 15))
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 17, 7))
 
     a = b;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 15))
 
     b = a;
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 15))
 
     a = s;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 7))
->s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 6, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 15))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 6, 15))
 
     a = s2;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 7))
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 15))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 11, 15))
 
     a = a2;
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 15))
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 17, 7))
 
     a2 = b2;
@@ -125,15 +125,15 @@ namespace JustStrings {
 
     a2 = b; // ok
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 17, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 15))
 
     a2 = t2; // ok
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 17, 7))
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 12, 7))
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 12, 15))
 
     a2 = t;
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 17, 7))
->t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 7))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 15))
 }
 
 namespace NumbersAndStrings {
@@ -147,16 +147,16 @@ namespace NumbersAndStrings {
 >T : Symbol(T, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 45, 28))
 >1 : Symbol(T[1], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 46, 13))
 
-    var s: S;
->s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 47, 7))
+    declare var s: S;
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 47, 15))
 >S : Symbol(S, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 44, 29))
 
-    var t: T;
->t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 7))
+    declare var t: T;
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 15))
 >T : Symbol(T, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 45, 28))
 
     interface S2 { '1': string; bar?: string }
->S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 13))
+>S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 21))
 >'1' : Symbol(S2['1'], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 50, 18))
 >bar : Symbol(S2.bar, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 50, 31))
 
@@ -165,23 +165,23 @@ namespace NumbersAndStrings {
 >1.0 : Symbol(T2[1.0], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 51, 18))
 >baz : Symbol(T2.baz, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 51, 31))
 
-    var s2: S2;
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 7))
->S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 13))
+    declare var s2: S2;
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 15))
+>S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 21))
 
-    var t2: T2;
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 53, 7))
+    declare var t2: T2;
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 53, 15))
 >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 50, 46))
 
-    var a: { '1.': string; bar?: string }
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 7))
->'1.' : Symbol('1.', Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 12))
->bar : Symbol(bar, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 26))
+    declare var a: { '1.': string; bar?: string };
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 15))
+>'1.' : Symbol('1.', Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 20))
+>bar : Symbol(bar, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 34))
 
-    var b: { 1.0: string; baz?: string }
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 7))
->1.0 : Symbol(1.0, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 12))
->baz : Symbol(baz, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 25))
+    declare var b: { 1.0: string; baz?: string };
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 15))
+>1.0 : Symbol(1.0, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 20))
+>baz : Symbol(baz, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 33))
 
     var a2 = { '1.0': '' };
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 58, 7))
@@ -192,63 +192,63 @@ namespace NumbersAndStrings {
 >1. : Symbol(1., Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 59, 14))
 
     s = t; // ok
->s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 47, 7))
->t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 7))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 47, 15))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 15))
 
     t = s; // ok
->t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 7))
->s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 47, 7))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 15))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 47, 15))
 
     s = s2; // ok
->s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 47, 7))
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 7))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 47, 15))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 15))
 
     s = a2; // error
->s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 47, 7))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 47, 15))
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 58, 7))
 
     s2 = t2; // ok
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 7))
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 53, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 15))
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 53, 15))
 
     t2 = s2; // ok
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 53, 7))
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 7))
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 53, 15))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 15))
 
     s2 = t;  // ok
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 7))
->t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 15))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 15))
 
     s2 = b; // ok
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 15))
 
     s2 = a2; // error
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 7))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 15))
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 58, 7))
 
     a = b; // error
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 15))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 15))
 
     b = a; // error
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 7))
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 15))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 15))
 
     a = s; // error
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 7))
->s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 47, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 15))
+>s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 47, 15))
 
     a = s2; // error
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 7))
->s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 15))
+>s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 52, 15))
 
     a = a2; // error
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 15))
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 58, 7))
 
     a = b2; // error
->a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 7))
+>a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 15))
 >b2 : Symbol(b2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 59, 7))
 
     a2 = b2; // error
@@ -261,13 +261,13 @@ namespace NumbersAndStrings {
 
     a2 = b; // error
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 58, 7))
->b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 7))
+>b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 15))
 
     a2 = t2; // error
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 58, 7))
->t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 53, 7))
+>t2 : Symbol(t2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 53, 15))
 
     a2 = t; // error
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 58, 7))
->t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 7))
+>t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 15))
 }
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types
index f20ca2bebc6d2..2016d35d6fa9c 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types
@@ -20,11 +20,11 @@ namespace JustStrings {
 >'1.' : string
 >     : ^^^^^^
 
-    var s: S;
+    declare var s: S;
 >s : S
 >  : ^
 
-    var t: T;
+    declare var t: T;
 >t : T
 >  : ^
 
@@ -40,15 +40,15 @@ namespace JustStrings {
 >baz : string
 >    : ^^^^^^
 
-    var s2: S2;
+    declare var s2: S2;
 >s2 : S2
 >   : ^^
 
-    var t2: T2;
+    declare var t2: T2;
 >t2 : T2
 >   : ^^
 
-    var a: { '1.': string; bar?: string }
+    declare var a: { '1.': string; bar?: string };
 >a : { '1.': string; bar?: string; }
 >  : ^^^^^^^^      ^^^^^^^^      ^^^
 >'1.' : string
@@ -56,7 +56,7 @@ namespace JustStrings {
 >bar : string
 >    : ^^^^^^
 
-    var b: { '1.0': string; baz?: string }
+    declare var b: { '1.0': string; baz?: string };
 >b : { '1.0': string; baz?: string; }
 >  : ^^^^^^^^^      ^^^^^^^^      ^^^
 >'1.0' : string
@@ -253,11 +253,11 @@ namespace NumbersAndStrings {
 >1 : string
 >  : ^^^^^^
 
-    var s: S;
+    declare var s: S;
 >s : S
 >  : ^
 
-    var t: T;
+    declare var t: T;
 >t : T
 >  : ^
 
@@ -273,15 +273,15 @@ namespace NumbersAndStrings {
 >baz : string
 >    : ^^^^^^
 
-    var s2: S2;
+    declare var s2: S2;
 >s2 : S2
 >   : ^^
 
-    var t2: T2;
+    declare var t2: T2;
 >t2 : T2
 >   : ^^
 
-    var a: { '1.': string; bar?: string }
+    declare var a: { '1.': string; bar?: string };
 >a : { '1.': string; bar?: string; }
 >  : ^^^^^^^^      ^^^^^^^^      ^^^
 >'1.' : string
@@ -289,7 +289,7 @@ namespace NumbersAndStrings {
 >bar : string
 >    : ^^^^^^
 
-    var b: { 1.0: string; baz?: string }
+    declare var b: { 1.0: string; baz?: string };
 >b : { 1: string; baz?: string; }
 >  : ^^^^^      ^^^^^^^^      ^^^
 >1.0 : string
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt b/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt
index 33184907db2a8..fa5e764d17b2d 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt
@@ -39,9 +39,9 @@ assignmentCompatWithStringIndexer.ts(51,9): error TS2322: Type 'A<T>' is not ass
         [x: string]: Base;
     }
     
-    var a: A;
+    declare var a: A;
     
-    var b: { [x: string]: Derived; }
+    declare var b: { [x: string]: Derived; };
     a = b; // ok
     b = a; // error
     ~
@@ -50,7 +50,7 @@ assignmentCompatWithStringIndexer.ts(51,9): error TS2322: Type 'A<T>' is not ass
 !!! error TS2322:     Property 'bar' is missing in type 'Base' but required in type 'Derived'.
 !!! related TS2728 assignmentCompatWithStringIndexer.ts:4:34: 'bar' is declared here.
     
-    var b2: { [x: string]: Derived2; }
+    declare var b2: { [x: string]: Derived2; };
     a = b2; // ok
     b2 = a; // error
     ~~
@@ -67,8 +67,8 @@ assignmentCompatWithStringIndexer.ts(51,9): error TS2322: Type 'A<T>' is not ass
             [x: string]: Derived; // ok
         }
     
-        var b1: { [x: string]: Derived; };
-        var a1: A<Base>;
+        declare var b1: { [x: string]: Derived; };
+        declare var a1: A<Base>;
         a1 = b1; // ok
         b1 = a1; // error
         ~~
@@ -81,7 +81,7 @@ assignmentCompatWithStringIndexer.ts(51,9): error TS2322: Type 'A<T>' is not ass
             [x: string]: Derived2; // ok
         }
     
-        var b2: { [x: string]: Derived2; };
+        declare var b2: { [x: string]: Derived2; };
         a1 = b2; // ok
         b2 = a1; // error
         ~~
@@ -120,4 +120,5 @@ assignmentCompatWithStringIndexer.ts(51,9): error TS2322: Type 'A<T>' is not ass
 !!! error TS2322:     Type 'T' is not assignable to type 'Derived2'.
 !!! error TS2322:       Type 'Base' is missing the following properties from type 'Derived2': baz, bar
         }
-    }
\ No newline at end of file
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.js b/tests/baselines/reference/assignmentCompatWithStringIndexer.js
index 37045f4439b33..ec0713fcc280a 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer.js
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.js
@@ -11,13 +11,13 @@ class A {
     [x: string]: Base;
 }
 
-var a: A;
+declare var a: A;
 
-var b: { [x: string]: Derived; }
+declare var b: { [x: string]: Derived; };
 a = b; // ok
 b = a; // error
 
-var b2: { [x: string]: Derived2; }
+declare var b2: { [x: string]: Derived2; };
 a = b2; // ok
 b2 = a; // error
 
@@ -30,8 +30,8 @@ namespace Generics {
         [x: string]: Derived; // ok
     }
 
-    var b1: { [x: string]: Derived; };
-    var a1: A<Base>;
+    declare var b1: { [x: string]: Derived; };
+    declare var a1: A<Base>;
     a1 = b1; // ok
     b1 = a1; // error
 
@@ -39,7 +39,7 @@ namespace Generics {
         [x: string]: Derived2; // ok
     }
 
-    var b2: { [x: string]: Derived2; };
+    declare var b2: { [x: string]: Derived2; };
     a1 = b2; // ok
     b2 = a1; // error
 
@@ -53,7 +53,8 @@ namespace Generics {
         a3 = b4; // error
         b4 = a3; // error
     }
-}
+}
+
 
 //// [assignmentCompatWithStringIndexer.js]
 // index signatures must be compatible in assignments
@@ -77,11 +78,8 @@ var A = /** @class */ (function () {
     }
     return A;
 }());
-var a;
-var b;
 a = b; // ok
 b = a; // error
-var b2;
 a = b2; // ok
 b2 = a; // error
 var Generics;
@@ -98,8 +96,6 @@ var Generics;
         }
         return B;
     }(A));
-    var b1;
-    var a1;
     a1 = b1; // ok
     b1 = a1; // error
     var B2 = /** @class */ (function (_super) {
@@ -109,7 +105,6 @@ var Generics;
         }
         return B2;
     }(A));
-    var b2;
     a1 = b2; // ok
     b2 = a1; // error
     function foo() {
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.symbols b/tests/baselines/reference/assignmentCompatWithStringIndexer.symbols
index 473f4a7ae67e5..838cbc3452e85 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer.symbols
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.symbols
@@ -25,35 +25,35 @@ class A {
 >Base : Symbol(Base, Decl(assignmentCompatWithStringIndexer.ts, 0, 0))
 }
 
-var a: A;
->a : Symbol(a, Decl(assignmentCompatWithStringIndexer.ts, 10, 3))
+declare var a: A;
+>a : Symbol(a, Decl(assignmentCompatWithStringIndexer.ts, 10, 11))
 >A : Symbol(A, Decl(assignmentCompatWithStringIndexer.ts, 4, 51))
 
-var b: { [x: string]: Derived; }
->b : Symbol(b, Decl(assignmentCompatWithStringIndexer.ts, 12, 3))
->x : Symbol(x, Decl(assignmentCompatWithStringIndexer.ts, 12, 10))
+declare var b: { [x: string]: Derived; };
+>b : Symbol(b, Decl(assignmentCompatWithStringIndexer.ts, 12, 11))
+>x : Symbol(x, Decl(assignmentCompatWithStringIndexer.ts, 12, 18))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithStringIndexer.ts, 2, 31))
 
 a = b; // ok
->a : Symbol(a, Decl(assignmentCompatWithStringIndexer.ts, 10, 3))
->b : Symbol(b, Decl(assignmentCompatWithStringIndexer.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithStringIndexer.ts, 10, 11))
+>b : Symbol(b, Decl(assignmentCompatWithStringIndexer.ts, 12, 11))
 
 b = a; // error
->b : Symbol(b, Decl(assignmentCompatWithStringIndexer.ts, 12, 3))
->a : Symbol(a, Decl(assignmentCompatWithStringIndexer.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithStringIndexer.ts, 12, 11))
+>a : Symbol(a, Decl(assignmentCompatWithStringIndexer.ts, 10, 11))
 
-var b2: { [x: string]: Derived2; }
->b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer.ts, 16, 3))
->x : Symbol(x, Decl(assignmentCompatWithStringIndexer.ts, 16, 11))
+declare var b2: { [x: string]: Derived2; };
+>b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer.ts, 16, 11))
+>x : Symbol(x, Decl(assignmentCompatWithStringIndexer.ts, 16, 19))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithStringIndexer.ts, 3, 47))
 
 a = b2; // ok
->a : Symbol(a, Decl(assignmentCompatWithStringIndexer.ts, 10, 3))
->b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer.ts, 16, 3))
+>a : Symbol(a, Decl(assignmentCompatWithStringIndexer.ts, 10, 11))
+>b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer.ts, 16, 11))
 
 b2 = a; // error
->b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer.ts, 16, 3))
->a : Symbol(a, Decl(assignmentCompatWithStringIndexer.ts, 10, 3))
+>b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer.ts, 16, 11))
+>a : Symbol(a, Decl(assignmentCompatWithStringIndexer.ts, 10, 11))
 
 namespace Generics {
 >Generics : Symbol(Generics, Decl(assignmentCompatWithStringIndexer.ts, 18, 7))
@@ -78,23 +78,23 @@ namespace Generics {
 >Derived : Symbol(Derived, Decl(assignmentCompatWithStringIndexer.ts, 2, 31))
     }
 
-    var b1: { [x: string]: Derived; };
->b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer.ts, 29, 7))
->x : Symbol(x, Decl(assignmentCompatWithStringIndexer.ts, 29, 15))
+    declare var b1: { [x: string]: Derived; };
+>b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer.ts, 29, 15))
+>x : Symbol(x, Decl(assignmentCompatWithStringIndexer.ts, 29, 23))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithStringIndexer.ts, 2, 31))
 
-    var a1: A<Base>;
->a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer.ts, 30, 7))
+    declare var a1: A<Base>;
+>a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer.ts, 30, 15))
 >A : Symbol(A, Decl(assignmentCompatWithStringIndexer.ts, 20, 20))
 >Base : Symbol(Base, Decl(assignmentCompatWithStringIndexer.ts, 0, 0))
 
     a1 = b1; // ok
->a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer.ts, 30, 7))
->b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer.ts, 29, 7))
+>a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer.ts, 30, 15))
+>b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer.ts, 29, 15))
 
     b1 = a1; // error
->b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer.ts, 29, 7))
->a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer.ts, 30, 7))
+>b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer.ts, 29, 15))
+>a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer.ts, 30, 15))
 
     class B2 extends A<Base> {
 >B2 : Symbol(B2, Decl(assignmentCompatWithStringIndexer.ts, 32, 12))
@@ -106,18 +106,18 @@ namespace Generics {
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithStringIndexer.ts, 3, 47))
     }
 
-    var b2: { [x: string]: Derived2; };
->b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer.ts, 38, 7))
->x : Symbol(x, Decl(assignmentCompatWithStringIndexer.ts, 38, 15))
+    declare var b2: { [x: string]: Derived2; };
+>b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer.ts, 38, 15))
+>x : Symbol(x, Decl(assignmentCompatWithStringIndexer.ts, 38, 23))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithStringIndexer.ts, 3, 47))
 
     a1 = b2; // ok
->a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer.ts, 30, 7))
->b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer.ts, 38, 7))
+>a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer.ts, 30, 15))
+>b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer.ts, 38, 15))
 
     b2 = a1; // error
->b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer.ts, 38, 7))
->a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer.ts, 30, 7))
+>b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer.ts, 38, 15))
+>a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer.ts, 30, 15))
 
     function foo<T extends Base>() {
 >foo : Symbol(foo, Decl(assignmentCompatWithStringIndexer.ts, 40, 12))
@@ -156,3 +156,4 @@ namespace Generics {
 >a3 : Symbol(a3, Decl(assignmentCompatWithStringIndexer.ts, 44, 11))
     }
 }
+
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.types b/tests/baselines/reference/assignmentCompatWithStringIndexer.types
index 73d9544240f0a..596b193a9f9d6 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer.types
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.types
@@ -24,11 +24,11 @@ class A {
 >  : ^^^^^^
 }
 
-var a: A;
+declare var a: A;
 >a : A
 >  : ^
 
-var b: { [x: string]: Derived; }
+declare var b: { [x: string]: Derived; };
 >b : { [x: string]: Derived; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
@@ -50,7 +50,7 @@ b = a; // error
 >a : A
 >  : ^
 
-var b2: { [x: string]: Derived2; }
+declare var b2: { [x: string]: Derived2; };
 >b2 : { [x: string]: Derived2; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
@@ -96,13 +96,13 @@ namespace Generics {
 >  : ^^^^^^
     }
 
-    var b1: { [x: string]: Derived; };
+    declare var b1: { [x: string]: Derived; };
 >b1 : { [x: string]: Derived; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
 
-    var a1: A<Base>;
+    declare var a1: A<Base>;
 >a1 : A<Base>
 >   : ^^^^^^^
 
@@ -133,7 +133,7 @@ namespace Generics {
 >  : ^^^^^^
     }
 
-    var b2: { [x: string]: Derived2; };
+    declare var b2: { [x: string]: Derived2; };
 >b2 : { [x: string]: Derived2; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
@@ -208,3 +208,4 @@ namespace Generics {
 >   : ^^^^
     }
 }
+
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt b/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt
index c2a99920604c6..6816898284894 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt
@@ -39,9 +39,9 @@ assignmentCompatWithStringIndexer2.ts(51,9): error TS2322: Type 'A<T>' is not as
         [x: string]: Base;
     }
     
-    var a: A;
+    declare var a: A;
     
-    var b: { [x: string]: Derived; }
+    declare var b: { [x: string]: Derived; };
     a = b; // ok
     b = a; // error
     ~
@@ -50,7 +50,7 @@ assignmentCompatWithStringIndexer2.ts(51,9): error TS2322: Type 'A<T>' is not as
 !!! error TS2322:     Property 'bar' is missing in type 'Base' but required in type 'Derived'.
 !!! related TS2728 assignmentCompatWithStringIndexer2.ts:4:34: 'bar' is declared here.
     
-    var b2: { [x: string]: Derived2; }
+    declare var b2: { [x: string]: Derived2; };
     a = b2; // ok
     b2 = a; // error
     ~~
@@ -67,8 +67,8 @@ assignmentCompatWithStringIndexer2.ts(51,9): error TS2322: Type 'A<T>' is not as
             [x: string]: Derived; // ok
         }
     
-        var b1: { [x: string]: Derived; };
-        var a1: A<Base>;
+        declare var b1: { [x: string]: Derived; };
+        declare var a1: A<Base>;
         a1 = b1; // ok
         b1 = a1; // error
         ~~
@@ -81,7 +81,7 @@ assignmentCompatWithStringIndexer2.ts(51,9): error TS2322: Type 'A<T>' is not as
             [x: string]: Derived2; // ok
         }
     
-        var b2: { [x: string]: Derived2; };
+        declare var b2: { [x: string]: Derived2; };
         a1 = b2; // ok
         b2 = a1; // error
         ~~
@@ -90,8 +90,8 @@ assignmentCompatWithStringIndexer2.ts(51,9): error TS2322: Type 'A<T>' is not as
 !!! error TS2322:     Type 'Base' is missing the following properties from type 'Derived2': baz, bar
     
         function foo<T extends Base>() {
-            var b3: { [x: string]: Derived; };
-            var a3: A<T>;
+            var b3!: { [x: string]: Derived; };
+            var a3!: A<T>;
             a3 = b3; // error
             ~~
 !!! error TS2322: Type '{ [x: string]: Derived; }' is not assignable to type 'A<T>'.
@@ -106,7 +106,7 @@ assignmentCompatWithStringIndexer2.ts(51,9): error TS2322: Type 'A<T>' is not as
 !!! error TS2322:       Property 'bar' is missing in type 'Base' but required in type 'Derived'.
 !!! related TS2728 assignmentCompatWithStringIndexer2.ts:4:34: 'bar' is declared here.
     
-            var b4: { [x: string]: Derived2; };
+            var b4!: { [x: string]: Derived2; };
             a3 = b4; // error
             ~~
 !!! error TS2322: Type '{ [x: string]: Derived2; }' is not assignable to type 'A<T>'.
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer2.js b/tests/baselines/reference/assignmentCompatWithStringIndexer2.js
index 38bf435af0526..7f734d1629d65 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer2.js
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer2.js
@@ -11,13 +11,13 @@ interface A {
     [x: string]: Base;
 }
 
-var a: A;
+declare var a: A;
 
-var b: { [x: string]: Derived; }
+declare var b: { [x: string]: Derived; };
 a = b; // ok
 b = a; // error
 
-var b2: { [x: string]: Derived2; }
+declare var b2: { [x: string]: Derived2; };
 a = b2; // ok
 b2 = a; // error
 
@@ -30,8 +30,8 @@ namespace Generics {
         [x: string]: Derived; // ok
     }
 
-    var b1: { [x: string]: Derived; };
-    var a1: A<Base>;
+    declare var b1: { [x: string]: Derived; };
+    declare var a1: A<Base>;
     a1 = b1; // ok
     b1 = a1; // error
 
@@ -39,17 +39,17 @@ namespace Generics {
         [x: string]: Derived2; // ok
     }
 
-    var b2: { [x: string]: Derived2; };
+    declare var b2: { [x: string]: Derived2; };
     a1 = b2; // ok
     b2 = a1; // error
 
     function foo<T extends Base>() {
-        var b3: { [x: string]: Derived; };
-        var a3: A<T>;
+        var b3!: { [x: string]: Derived; };
+        var a3!: A<T>;
         a3 = b3; // error
         b3 = a3; // error
 
-        var b4: { [x: string]: Derived2; };
+        var b4!: { [x: string]: Derived2; };
         a3 = b4; // error
         b4 = a3; // error
     }
@@ -57,20 +57,14 @@ namespace Generics {
 
 //// [assignmentCompatWithStringIndexer2.js]
 // index signatures must be compatible in assignments
-var a;
-var b;
 a = b; // ok
 b = a; // error
-var b2;
 a = b2; // ok
 b2 = a; // error
 var Generics;
 (function (Generics) {
-    var b1;
-    var a1;
     a1 = b1; // ok
     b1 = a1; // error
-    var b2;
     a1 = b2; // ok
     b2 = a1; // error
     function foo() {
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer2.symbols b/tests/baselines/reference/assignmentCompatWithStringIndexer2.symbols
index 6814fdcf21590..558d74b014607 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer2.symbols
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer2.symbols
@@ -25,35 +25,35 @@ interface A {
 >Base : Symbol(Base, Decl(assignmentCompatWithStringIndexer2.ts, 0, 0))
 }
 
-var a: A;
->a : Symbol(a, Decl(assignmentCompatWithStringIndexer2.ts, 10, 3))
+declare var a: A;
+>a : Symbol(a, Decl(assignmentCompatWithStringIndexer2.ts, 10, 11))
 >A : Symbol(A, Decl(assignmentCompatWithStringIndexer2.ts, 4, 51))
 
-var b: { [x: string]: Derived; }
->b : Symbol(b, Decl(assignmentCompatWithStringIndexer2.ts, 12, 3))
->x : Symbol(x, Decl(assignmentCompatWithStringIndexer2.ts, 12, 10))
+declare var b: { [x: string]: Derived; };
+>b : Symbol(b, Decl(assignmentCompatWithStringIndexer2.ts, 12, 11))
+>x : Symbol(x, Decl(assignmentCompatWithStringIndexer2.ts, 12, 18))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithStringIndexer2.ts, 2, 31))
 
 a = b; // ok
->a : Symbol(a, Decl(assignmentCompatWithStringIndexer2.ts, 10, 3))
->b : Symbol(b, Decl(assignmentCompatWithStringIndexer2.ts, 12, 3))
+>a : Symbol(a, Decl(assignmentCompatWithStringIndexer2.ts, 10, 11))
+>b : Symbol(b, Decl(assignmentCompatWithStringIndexer2.ts, 12, 11))
 
 b = a; // error
->b : Symbol(b, Decl(assignmentCompatWithStringIndexer2.ts, 12, 3))
->a : Symbol(a, Decl(assignmentCompatWithStringIndexer2.ts, 10, 3))
+>b : Symbol(b, Decl(assignmentCompatWithStringIndexer2.ts, 12, 11))
+>a : Symbol(a, Decl(assignmentCompatWithStringIndexer2.ts, 10, 11))
 
-var b2: { [x: string]: Derived2; }
->b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer2.ts, 16, 3))
->x : Symbol(x, Decl(assignmentCompatWithStringIndexer2.ts, 16, 11))
+declare var b2: { [x: string]: Derived2; };
+>b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer2.ts, 16, 11))
+>x : Symbol(x, Decl(assignmentCompatWithStringIndexer2.ts, 16, 19))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithStringIndexer2.ts, 3, 47))
 
 a = b2; // ok
->a : Symbol(a, Decl(assignmentCompatWithStringIndexer2.ts, 10, 3))
->b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer2.ts, 16, 3))
+>a : Symbol(a, Decl(assignmentCompatWithStringIndexer2.ts, 10, 11))
+>b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer2.ts, 16, 11))
 
 b2 = a; // error
->b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer2.ts, 16, 3))
->a : Symbol(a, Decl(assignmentCompatWithStringIndexer2.ts, 10, 3))
+>b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer2.ts, 16, 11))
+>a : Symbol(a, Decl(assignmentCompatWithStringIndexer2.ts, 10, 11))
 
 namespace Generics {
 >Generics : Symbol(Generics, Decl(assignmentCompatWithStringIndexer2.ts, 18, 7))
@@ -78,23 +78,23 @@ namespace Generics {
 >Derived : Symbol(Derived, Decl(assignmentCompatWithStringIndexer2.ts, 2, 31))
     }
 
-    var b1: { [x: string]: Derived; };
->b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer2.ts, 29, 7))
->x : Symbol(x, Decl(assignmentCompatWithStringIndexer2.ts, 29, 15))
+    declare var b1: { [x: string]: Derived; };
+>b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer2.ts, 29, 15))
+>x : Symbol(x, Decl(assignmentCompatWithStringIndexer2.ts, 29, 23))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithStringIndexer2.ts, 2, 31))
 
-    var a1: A<Base>;
->a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer2.ts, 30, 7))
+    declare var a1: A<Base>;
+>a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer2.ts, 30, 15))
 >A : Symbol(A, Decl(assignmentCompatWithStringIndexer2.ts, 20, 20))
 >Base : Symbol(Base, Decl(assignmentCompatWithStringIndexer2.ts, 0, 0))
 
     a1 = b1; // ok
->a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer2.ts, 30, 7))
->b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer2.ts, 29, 7))
+>a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer2.ts, 30, 15))
+>b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer2.ts, 29, 15))
 
     b1 = a1; // error
->b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer2.ts, 29, 7))
->a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer2.ts, 30, 7))
+>b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer2.ts, 29, 15))
+>a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer2.ts, 30, 15))
 
     interface B2 extends A<Base> {
 >B2 : Symbol(B2, Decl(assignmentCompatWithStringIndexer2.ts, 32, 12))
@@ -106,30 +106,30 @@ namespace Generics {
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithStringIndexer2.ts, 3, 47))
     }
 
-    var b2: { [x: string]: Derived2; };
->b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer2.ts, 38, 7))
->x : Symbol(x, Decl(assignmentCompatWithStringIndexer2.ts, 38, 15))
+    declare var b2: { [x: string]: Derived2; };
+>b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer2.ts, 38, 15))
+>x : Symbol(x, Decl(assignmentCompatWithStringIndexer2.ts, 38, 23))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithStringIndexer2.ts, 3, 47))
 
     a1 = b2; // ok
->a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer2.ts, 30, 7))
->b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer2.ts, 38, 7))
+>a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer2.ts, 30, 15))
+>b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer2.ts, 38, 15))
 
     b2 = a1; // error
->b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer2.ts, 38, 7))
->a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer2.ts, 30, 7))
+>b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer2.ts, 38, 15))
+>a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer2.ts, 30, 15))
 
     function foo<T extends Base>() {
 >foo : Symbol(foo, Decl(assignmentCompatWithStringIndexer2.ts, 40, 12))
 >T : Symbol(T, Decl(assignmentCompatWithStringIndexer2.ts, 42, 17))
 >Base : Symbol(Base, Decl(assignmentCompatWithStringIndexer2.ts, 0, 0))
 
-        var b3: { [x: string]: Derived; };
+        var b3!: { [x: string]: Derived; };
 >b3 : Symbol(b3, Decl(assignmentCompatWithStringIndexer2.ts, 43, 11))
->x : Symbol(x, Decl(assignmentCompatWithStringIndexer2.ts, 43, 19))
+>x : Symbol(x, Decl(assignmentCompatWithStringIndexer2.ts, 43, 20))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithStringIndexer2.ts, 2, 31))
 
-        var a3: A<T>;
+        var a3!: A<T>;
 >a3 : Symbol(a3, Decl(assignmentCompatWithStringIndexer2.ts, 44, 11))
 >A : Symbol(A, Decl(assignmentCompatWithStringIndexer2.ts, 20, 20))
 >T : Symbol(T, Decl(assignmentCompatWithStringIndexer2.ts, 42, 17))
@@ -142,9 +142,9 @@ namespace Generics {
 >b3 : Symbol(b3, Decl(assignmentCompatWithStringIndexer2.ts, 43, 11))
 >a3 : Symbol(a3, Decl(assignmentCompatWithStringIndexer2.ts, 44, 11))
 
-        var b4: { [x: string]: Derived2; };
+        var b4!: { [x: string]: Derived2; };
 >b4 : Symbol(b4, Decl(assignmentCompatWithStringIndexer2.ts, 48, 11))
->x : Symbol(x, Decl(assignmentCompatWithStringIndexer2.ts, 48, 19))
+>x : Symbol(x, Decl(assignmentCompatWithStringIndexer2.ts, 48, 20))
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithStringIndexer2.ts, 3, 47))
 
         a3 = b4; // error
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer2.types b/tests/baselines/reference/assignmentCompatWithStringIndexer2.types
index 1d2fd6a0c1156..f387bb1d43353 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer2.types
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer2.types
@@ -21,11 +21,11 @@ interface A {
 >  : ^^^^^^
 }
 
-var a: A;
+declare var a: A;
 >a : A
 >  : ^
 
-var b: { [x: string]: Derived; }
+declare var b: { [x: string]: Derived; };
 >b : { [x: string]: Derived; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
@@ -47,7 +47,7 @@ b = a; // error
 >a : A
 >  : ^
 
-var b2: { [x: string]: Derived2; }
+declare var b2: { [x: string]: Derived2; };
 >b2 : { [x: string]: Derived2; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
@@ -85,13 +85,13 @@ namespace Generics {
 >  : ^^^^^^
     }
 
-    var b1: { [x: string]: Derived; };
+    declare var b1: { [x: string]: Derived; };
 >b1 : { [x: string]: Derived; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
 
-    var a1: A<Base>;
+    declare var a1: A<Base>;
 >a1 : A<Base>
 >   : ^^^^^^^
 
@@ -117,7 +117,7 @@ namespace Generics {
 >  : ^^^^^^
     }
 
-    var b2: { [x: string]: Derived2; };
+    declare var b2: { [x: string]: Derived2; };
 >b2 : { [x: string]: Derived2; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
@@ -143,13 +143,13 @@ namespace Generics {
 >foo : <T extends Base>() => void
 >    : ^ ^^^^^^^^^    ^^^^^^^^^^^
 
-        var b3: { [x: string]: Derived; };
+        var b3!: { [x: string]: Derived; };
 >b3 : { [x: string]: Derived; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
 >  : ^^^^^^
 
-        var a3: A<T>;
+        var a3!: A<T>;
 >a3 : A<T>
 >   : ^^^^
 
@@ -169,7 +169,7 @@ namespace Generics {
 >a3 : A<T>
 >   : ^^^^
 
-        var b4: { [x: string]: Derived2; };
+        var b4!: { [x: string]: Derived2; };
 >b4 : { [x: string]: Derived2; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer3.errors.txt b/tests/baselines/reference/assignmentCompatWithStringIndexer3.errors.txt
index 205371c6c6522..7f9e1f45f1bed 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer3.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer3.errors.txt
@@ -1,4 +1,4 @@
-assignmentCompatWithStringIndexer3.ts(7,8): error TS2304: Cannot find name 'A'.
+assignmentCompatWithStringIndexer3.ts(7,16): error TS2304: Cannot find name 'A'.
 assignmentCompatWithStringIndexer3.ts(20,9): error TS2322: Type '{ [x: string]: string; }' is not assignable to type 'A<T>'.
   'string' index signatures are incompatible.
     Type 'string' is not assignable to type 'T'.
@@ -16,10 +16,10 @@ assignmentCompatWithStringIndexer3.ts(21,9): error TS2322: Type 'A<T>' is not as
     interface Derived extends Base { bar: string; }
     interface Derived2 extends Derived { baz: string; }
     
-    var a: A;
-           ~
+    declare var a: A;
+                   ~
 !!! error TS2304: Cannot find name 'A'.
-    var b1: { [x: string]: string; }
+    declare var b1: { [x: string]: string; };
     a = b1; // error
     b1 = a; // error
     
@@ -29,8 +29,8 @@ assignmentCompatWithStringIndexer3.ts(21,9): error TS2322: Type 'A<T>' is not as
         }
        
         function foo<T extends Derived>() {
-            var a: A<T>;
-            var b: { [x: string]: string; }
+            var a!: A<T>;
+            var b!: { [x: string]: string; };
             a = b; // error
             ~
 !!! error TS2322: Type '{ [x: string]: string; }' is not assignable to type 'A<T>'.
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer3.js b/tests/baselines/reference/assignmentCompatWithStringIndexer3.js
index 0b08cbfd7d066..0abdb96a66f69 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer3.js
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer3.js
@@ -7,8 +7,8 @@ interface Base { foo: string; }
 interface Derived extends Base { bar: string; }
 interface Derived2 extends Derived { baz: string; }
 
-var a: A;
-var b1: { [x: string]: string; }
+declare var a: A;
+declare var b1: { [x: string]: string; };
 a = b1; // error
 b1 = a; // error
 
@@ -18,8 +18,8 @@ namespace Generics {
     }
    
     function foo<T extends Derived>() {
-        var a: A<T>;
-        var b: { [x: string]: string; }
+        var a!: A<T>;
+        var b!: { [x: string]: string; };
         a = b; // error
         b = a; // error
     }
@@ -27,8 +27,6 @@ namespace Generics {
 
 //// [assignmentCompatWithStringIndexer3.js]
 // Derived type indexer must be subtype of base type indexer
-var a;
-var b1;
 a = b1; // error
 b1 = a; // error
 var Generics;
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer3.symbols b/tests/baselines/reference/assignmentCompatWithStringIndexer3.symbols
index 074ccde38fc07..814583209a627 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer3.symbols
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer3.symbols
@@ -17,21 +17,21 @@ interface Derived2 extends Derived { baz: string; }
 >Derived : Symbol(Derived, Decl(assignmentCompatWithStringIndexer3.ts, 2, 31))
 >baz : Symbol(Derived2.baz, Decl(assignmentCompatWithStringIndexer3.ts, 4, 36))
 
-var a: A;
->a : Symbol(a, Decl(assignmentCompatWithStringIndexer3.ts, 6, 3))
+declare var a: A;
+>a : Symbol(a, Decl(assignmentCompatWithStringIndexer3.ts, 6, 11))
 >A : Symbol(A)
 
-var b1: { [x: string]: string; }
->b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer3.ts, 7, 3))
->x : Symbol(x, Decl(assignmentCompatWithStringIndexer3.ts, 7, 11))
+declare var b1: { [x: string]: string; };
+>b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer3.ts, 7, 11))
+>x : Symbol(x, Decl(assignmentCompatWithStringIndexer3.ts, 7, 19))
 
 a = b1; // error
->a : Symbol(a, Decl(assignmentCompatWithStringIndexer3.ts, 6, 3))
->b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer3.ts, 7, 3))
+>a : Symbol(a, Decl(assignmentCompatWithStringIndexer3.ts, 6, 11))
+>b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer3.ts, 7, 11))
 
 b1 = a; // error
->b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer3.ts, 7, 3))
->a : Symbol(a, Decl(assignmentCompatWithStringIndexer3.ts, 6, 3))
+>b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer3.ts, 7, 11))
+>a : Symbol(a, Decl(assignmentCompatWithStringIndexer3.ts, 6, 11))
 
 namespace Generics {
 >Generics : Symbol(Generics, Decl(assignmentCompatWithStringIndexer3.ts, 9, 7))
@@ -51,14 +51,14 @@ namespace Generics {
 >T : Symbol(T, Decl(assignmentCompatWithStringIndexer3.ts, 16, 17))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithStringIndexer3.ts, 2, 31))
 
-        var a: A<T>;
+        var a!: A<T>;
 >a : Symbol(a, Decl(assignmentCompatWithStringIndexer3.ts, 17, 11))
 >A : Symbol(A, Decl(assignmentCompatWithStringIndexer3.ts, 11, 20))
 >T : Symbol(T, Decl(assignmentCompatWithStringIndexer3.ts, 16, 17))
 
-        var b: { [x: string]: string; }
+        var b!: { [x: string]: string; };
 >b : Symbol(b, Decl(assignmentCompatWithStringIndexer3.ts, 18, 11))
->x : Symbol(x, Decl(assignmentCompatWithStringIndexer3.ts, 18, 18))
+>x : Symbol(x, Decl(assignmentCompatWithStringIndexer3.ts, 18, 19))
 
         a = b; // error
 >a : Symbol(a, Decl(assignmentCompatWithStringIndexer3.ts, 17, 11))
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer3.types b/tests/baselines/reference/assignmentCompatWithStringIndexer3.types
index ae77b10806e32..81fbe3fb33034 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer3.types
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer3.types
@@ -15,11 +15,11 @@ interface Derived2 extends Derived { baz: string; }
 >baz : string
 >    : ^^^^^^
 
-var a: A;
+declare var a: A;
 >a : A
 >  : ^
 
-var b1: { [x: string]: string; }
+declare var b1: { [x: string]: string; };
 >b1 : { [x: string]: string; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
@@ -58,11 +58,11 @@ namespace Generics {
 >foo : <T extends Derived>() => void
 >    : ^ ^^^^^^^^^       ^^^^^^^^^^^
 
-        var a: A<T>;
+        var a!: A<T>;
 >a : A<T>
 >  : ^^^^
 
-        var b: { [x: string]: string; }
+        var b!: { [x: string]: string; };
 >b : { [x: string]: string; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
diff --git a/tests/baselines/reference/assignmentCompatability25.errors.txt b/tests/baselines/reference/assignmentCompatability25.errors.txt
index 1365d72dbe80b..23ee1d973b762 100644
--- a/tests/baselines/reference/assignmentCompatability25.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability25.errors.txt
@@ -9,7 +9,7 @@ assignmentCompatability25.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt
         export var __val__obj4 = obj4;
     }
     namespace __test2__ {
-        export var aa:{two:number;};;
+        export declare var aa:{two:number;};;
         export var __val__aa = aa;
     }
     __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability25.js b/tests/baselines/reference/assignmentCompatability25.js
index ddecd417f5555..bfbd06830c24d 100644
--- a/tests/baselines/reference/assignmentCompatability25.js
+++ b/tests/baselines/reference/assignmentCompatability25.js
@@ -6,7 +6,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{two:number;};;
+    export declare var aa:{two:number;};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability25.symbols b/tests/baselines/reference/assignmentCompatability25.symbols
index 3d602bb194eae..2e276e66ff6c9 100644
--- a/tests/baselines/reference/assignmentCompatability25.symbols
+++ b/tests/baselines/reference/assignmentCompatability25.symbols
@@ -23,13 +23,13 @@ namespace __test1__ {
 namespace __test2__ {
 >__test2__ : Symbol(__test2__, Decl(assignmentCompatability25.ts, 3, 1))
 
-    export var aa:{two:number;};;
->aa : Symbol(aa, Decl(assignmentCompatability25.ts, 5, 14))
->two : Symbol(two, Decl(assignmentCompatability25.ts, 5, 19))
+    export declare var aa:{two:number;};;
+>aa : Symbol(aa, Decl(assignmentCompatability25.ts, 5, 22))
+>two : Symbol(two, Decl(assignmentCompatability25.ts, 5, 27))
 
     export var __val__aa = aa;
 >__val__aa : Symbol(__val__aa, Decl(assignmentCompatability25.ts, 6, 14))
->aa : Symbol(aa, Decl(assignmentCompatability25.ts, 5, 14))
+>aa : Symbol(aa, Decl(assignmentCompatability25.ts, 5, 22))
 }
 __test2__.__val__aa = __test1__.__val__obj4
 >__test2__.__val__aa : Symbol(__test2__.__val__aa, Decl(assignmentCompatability25.ts, 6, 14))
diff --git a/tests/baselines/reference/assignmentCompatability25.types b/tests/baselines/reference/assignmentCompatability25.types
index 1738f1953ac6b..540528ba2aada 100644
--- a/tests/baselines/reference/assignmentCompatability25.types
+++ b/tests/baselines/reference/assignmentCompatability25.types
@@ -29,7 +29,7 @@ namespace __test2__ {
 >__test2__ : typeof __test2__
 >          : ^^^^^^^^^^^^^^^^
 
-    export var aa:{two:number;};;
+    export declare var aa:{two:number;};;
 >aa : { two: number; }
 >   : ^^^^^^^      ^^^
 >two : number
diff --git a/tests/baselines/reference/assignmentCompatability26.errors.txt b/tests/baselines/reference/assignmentCompatability26.errors.txt
index 09f22ae33cfaa..501a4d404c994 100644
--- a/tests/baselines/reference/assignmentCompatability26.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability26.errors.txt
@@ -9,7 +9,7 @@ assignmentCompatability26.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt
         export var __val__obj4 = obj4;
     }
     namespace __test2__ {
-        export var aa:{one:string;};;
+        export declare var aa:{one:string;};;
         export var __val__aa = aa;
     }
     __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability26.js b/tests/baselines/reference/assignmentCompatability26.js
index c279c20af49e7..5dbee18d2ab8b 100644
--- a/tests/baselines/reference/assignmentCompatability26.js
+++ b/tests/baselines/reference/assignmentCompatability26.js
@@ -6,7 +6,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{one:string;};;
+    export declare var aa:{one:string;};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability26.symbols b/tests/baselines/reference/assignmentCompatability26.symbols
index a4f22faa888bb..95114592fa7a7 100644
--- a/tests/baselines/reference/assignmentCompatability26.symbols
+++ b/tests/baselines/reference/assignmentCompatability26.symbols
@@ -23,13 +23,13 @@ namespace __test1__ {
 namespace __test2__ {
 >__test2__ : Symbol(__test2__, Decl(assignmentCompatability26.ts, 3, 1))
 
-    export var aa:{one:string;};;
->aa : Symbol(aa, Decl(assignmentCompatability26.ts, 5, 14))
->one : Symbol(one, Decl(assignmentCompatability26.ts, 5, 19))
+    export declare var aa:{one:string;};;
+>aa : Symbol(aa, Decl(assignmentCompatability26.ts, 5, 22))
+>one : Symbol(one, Decl(assignmentCompatability26.ts, 5, 27))
 
     export var __val__aa = aa;
 >__val__aa : Symbol(__val__aa, Decl(assignmentCompatability26.ts, 6, 14))
->aa : Symbol(aa, Decl(assignmentCompatability26.ts, 5, 14))
+>aa : Symbol(aa, Decl(assignmentCompatability26.ts, 5, 22))
 }
 __test2__.__val__aa = __test1__.__val__obj4
 >__test2__.__val__aa : Symbol(__test2__.__val__aa, Decl(assignmentCompatability26.ts, 6, 14))
diff --git a/tests/baselines/reference/assignmentCompatability26.types b/tests/baselines/reference/assignmentCompatability26.types
index 0c0d7f1858a24..5cc45834ada84 100644
--- a/tests/baselines/reference/assignmentCompatability26.types
+++ b/tests/baselines/reference/assignmentCompatability26.types
@@ -29,7 +29,7 @@ namespace __test2__ {
 >__test2__ : typeof __test2__
 >          : ^^^^^^^^^^^^^^^^
 
-    export var aa:{one:string;};;
+    export declare var aa:{one:string;};;
 >aa : { one: string; }
 >   : ^^^^^^^      ^^^
 >one : string
diff --git a/tests/baselines/reference/assignmentCompatability27.errors.txt b/tests/baselines/reference/assignmentCompatability27.errors.txt
index ec9952475f512..2d8ca9431480a 100644
--- a/tests/baselines/reference/assignmentCompatability27.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability27.errors.txt
@@ -8,7 +8,7 @@ assignmentCompatability27.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt
         export var __val__obj4 = obj4;
     }
     namespace __test2__ {
-        export var aa:{two:string;};;
+        export declare var aa:{two:string;};;
         export var __val__aa = aa;
     }
     __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability27.js b/tests/baselines/reference/assignmentCompatability27.js
index 13e4ee3a25dc3..45dfd39266bb4 100644
--- a/tests/baselines/reference/assignmentCompatability27.js
+++ b/tests/baselines/reference/assignmentCompatability27.js
@@ -6,7 +6,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{two:string;};;
+    export declare var aa:{two:string;};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability27.symbols b/tests/baselines/reference/assignmentCompatability27.symbols
index 3747307bc5bf4..1ba0e4ab5df0f 100644
--- a/tests/baselines/reference/assignmentCompatability27.symbols
+++ b/tests/baselines/reference/assignmentCompatability27.symbols
@@ -23,13 +23,13 @@ namespace __test1__ {
 namespace __test2__ {
 >__test2__ : Symbol(__test2__, Decl(assignmentCompatability27.ts, 3, 1))
 
-    export var aa:{two:string;};;
->aa : Symbol(aa, Decl(assignmentCompatability27.ts, 5, 14))
->two : Symbol(two, Decl(assignmentCompatability27.ts, 5, 19))
+    export declare var aa:{two:string;};;
+>aa : Symbol(aa, Decl(assignmentCompatability27.ts, 5, 22))
+>two : Symbol(two, Decl(assignmentCompatability27.ts, 5, 27))
 
     export var __val__aa = aa;
 >__val__aa : Symbol(__val__aa, Decl(assignmentCompatability27.ts, 6, 14))
->aa : Symbol(aa, Decl(assignmentCompatability27.ts, 5, 14))
+>aa : Symbol(aa, Decl(assignmentCompatability27.ts, 5, 22))
 }
 __test2__.__val__aa = __test1__.__val__obj4
 >__test2__.__val__aa : Symbol(__test2__.__val__aa, Decl(assignmentCompatability27.ts, 6, 14))
diff --git a/tests/baselines/reference/assignmentCompatability27.types b/tests/baselines/reference/assignmentCompatability27.types
index fdc998a5a475a..d44f18c5dd679 100644
--- a/tests/baselines/reference/assignmentCompatability27.types
+++ b/tests/baselines/reference/assignmentCompatability27.types
@@ -29,7 +29,7 @@ namespace __test2__ {
 >__test2__ : typeof __test2__
 >          : ^^^^^^^^^^^^^^^^
 
-    export var aa:{two:string;};;
+    export declare var aa:{two:string;};;
 >aa : { two: string; }
 >   : ^^^^^^^      ^^^
 >two : string
diff --git a/tests/baselines/reference/assignmentCompatability28.errors.txt b/tests/baselines/reference/assignmentCompatability28.errors.txt
index 91d0fe893a0d4..15973186ba499 100644
--- a/tests/baselines/reference/assignmentCompatability28.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability28.errors.txt
@@ -9,7 +9,7 @@ assignmentCompatability28.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt
         export var __val__obj4 = obj4;
     }
     namespace __test2__ {
-        export var aa:{one:boolean;};;
+        export declare var aa:{one:boolean;};;
         export var __val__aa = aa;
     }
     __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability28.js b/tests/baselines/reference/assignmentCompatability28.js
index a01d47869093d..1f6d520ef9697 100644
--- a/tests/baselines/reference/assignmentCompatability28.js
+++ b/tests/baselines/reference/assignmentCompatability28.js
@@ -6,7 +6,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{one:boolean;};;
+    export declare var aa:{one:boolean;};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability28.symbols b/tests/baselines/reference/assignmentCompatability28.symbols
index 0fff0f4be1e56..d249c04652357 100644
--- a/tests/baselines/reference/assignmentCompatability28.symbols
+++ b/tests/baselines/reference/assignmentCompatability28.symbols
@@ -23,13 +23,13 @@ namespace __test1__ {
 namespace __test2__ {
 >__test2__ : Symbol(__test2__, Decl(assignmentCompatability28.ts, 3, 1))
 
-    export var aa:{one:boolean;};;
->aa : Symbol(aa, Decl(assignmentCompatability28.ts, 5, 14))
->one : Symbol(one, Decl(assignmentCompatability28.ts, 5, 19))
+    export declare var aa:{one:boolean;};;
+>aa : Symbol(aa, Decl(assignmentCompatability28.ts, 5, 22))
+>one : Symbol(one, Decl(assignmentCompatability28.ts, 5, 27))
 
     export var __val__aa = aa;
 >__val__aa : Symbol(__val__aa, Decl(assignmentCompatability28.ts, 6, 14))
->aa : Symbol(aa, Decl(assignmentCompatability28.ts, 5, 14))
+>aa : Symbol(aa, Decl(assignmentCompatability28.ts, 5, 22))
 }
 __test2__.__val__aa = __test1__.__val__obj4
 >__test2__.__val__aa : Symbol(__test2__.__val__aa, Decl(assignmentCompatability28.ts, 6, 14))
diff --git a/tests/baselines/reference/assignmentCompatability28.types b/tests/baselines/reference/assignmentCompatability28.types
index 796c44c03fb37..2bceac4487fa9 100644
--- a/tests/baselines/reference/assignmentCompatability28.types
+++ b/tests/baselines/reference/assignmentCompatability28.types
@@ -29,7 +29,7 @@ namespace __test2__ {
 >__test2__ : typeof __test2__
 >          : ^^^^^^^^^^^^^^^^
 
-    export var aa:{one:boolean;};;
+    export declare var aa:{one:boolean;};;
 >aa : { one: boolean; }
 >   : ^^^^^^^       ^^^
 >one : boolean
diff --git a/tests/baselines/reference/assignmentCompatability29.errors.txt b/tests/baselines/reference/assignmentCompatability29.errors.txt
index 43bd27f8d4309..f837d015b6c98 100644
--- a/tests/baselines/reference/assignmentCompatability29.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability29.errors.txt
@@ -9,7 +9,7 @@ assignmentCompatability29.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt
         export var __val__obj4 = obj4;
     }
     namespace __test2__ {
-        export var aa:{one:any[];};;
+        export declare var aa:{one:any[];};;
         export var __val__aa = aa;
     }
     __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability29.js b/tests/baselines/reference/assignmentCompatability29.js
index c8e322becedf9..1bf4358ba85c4 100644
--- a/tests/baselines/reference/assignmentCompatability29.js
+++ b/tests/baselines/reference/assignmentCompatability29.js
@@ -6,7 +6,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{one:any[];};;
+    export declare var aa:{one:any[];};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability29.symbols b/tests/baselines/reference/assignmentCompatability29.symbols
index 9c17c7e4ce411..b0289e5f22eae 100644
--- a/tests/baselines/reference/assignmentCompatability29.symbols
+++ b/tests/baselines/reference/assignmentCompatability29.symbols
@@ -23,13 +23,13 @@ namespace __test1__ {
 namespace __test2__ {
 >__test2__ : Symbol(__test2__, Decl(assignmentCompatability29.ts, 3, 1))
 
-    export var aa:{one:any[];};;
->aa : Symbol(aa, Decl(assignmentCompatability29.ts, 5, 14))
->one : Symbol(one, Decl(assignmentCompatability29.ts, 5, 19))
+    export declare var aa:{one:any[];};;
+>aa : Symbol(aa, Decl(assignmentCompatability29.ts, 5, 22))
+>one : Symbol(one, Decl(assignmentCompatability29.ts, 5, 27))
 
     export var __val__aa = aa;
 >__val__aa : Symbol(__val__aa, Decl(assignmentCompatability29.ts, 6, 14))
->aa : Symbol(aa, Decl(assignmentCompatability29.ts, 5, 14))
+>aa : Symbol(aa, Decl(assignmentCompatability29.ts, 5, 22))
 }
 __test2__.__val__aa = __test1__.__val__obj4
 >__test2__.__val__aa : Symbol(__test2__.__val__aa, Decl(assignmentCompatability29.ts, 6, 14))
diff --git a/tests/baselines/reference/assignmentCompatability29.types b/tests/baselines/reference/assignmentCompatability29.types
index d63d6f454d6d1..5bb36b7ba33b2 100644
--- a/tests/baselines/reference/assignmentCompatability29.types
+++ b/tests/baselines/reference/assignmentCompatability29.types
@@ -29,7 +29,7 @@ namespace __test2__ {
 >__test2__ : typeof __test2__
 >          : ^^^^^^^^^^^^^^^^
 
-    export var aa:{one:any[];};;
+    export declare var aa:{one:any[];};;
 >aa : { one: any[]; }
 >   : ^^^^^^^     ^^^
 >one : any[]
diff --git a/tests/baselines/reference/assignmentCompatability30.errors.txt b/tests/baselines/reference/assignmentCompatability30.errors.txt
index f6923c3f98015..7dbcaaac1c2ce 100644
--- a/tests/baselines/reference/assignmentCompatability30.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability30.errors.txt
@@ -9,7 +9,7 @@ assignmentCompatability30.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt
         export var __val__obj4 = obj4;
     }
     namespace __test2__ {
-        export var aa:{one:number[];};;
+        export declare var aa:{one:number[];};;
         export var __val__aa = aa;
     }
     __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability30.js b/tests/baselines/reference/assignmentCompatability30.js
index 98b626d4192c5..a1d4fe8bf8298 100644
--- a/tests/baselines/reference/assignmentCompatability30.js
+++ b/tests/baselines/reference/assignmentCompatability30.js
@@ -6,7 +6,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{one:number[];};;
+    export declare var aa:{one:number[];};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability30.symbols b/tests/baselines/reference/assignmentCompatability30.symbols
index 7a1bc266947b1..91e1ee80d4c5e 100644
--- a/tests/baselines/reference/assignmentCompatability30.symbols
+++ b/tests/baselines/reference/assignmentCompatability30.symbols
@@ -23,13 +23,13 @@ namespace __test1__ {
 namespace __test2__ {
 >__test2__ : Symbol(__test2__, Decl(assignmentCompatability30.ts, 3, 1))
 
-    export var aa:{one:number[];};;
->aa : Symbol(aa, Decl(assignmentCompatability30.ts, 5, 14))
->one : Symbol(one, Decl(assignmentCompatability30.ts, 5, 19))
+    export declare var aa:{one:number[];};;
+>aa : Symbol(aa, Decl(assignmentCompatability30.ts, 5, 22))
+>one : Symbol(one, Decl(assignmentCompatability30.ts, 5, 27))
 
     export var __val__aa = aa;
 >__val__aa : Symbol(__val__aa, Decl(assignmentCompatability30.ts, 6, 14))
->aa : Symbol(aa, Decl(assignmentCompatability30.ts, 5, 14))
+>aa : Symbol(aa, Decl(assignmentCompatability30.ts, 5, 22))
 }
 __test2__.__val__aa = __test1__.__val__obj4
 >__test2__.__val__aa : Symbol(__test2__.__val__aa, Decl(assignmentCompatability30.ts, 6, 14))
diff --git a/tests/baselines/reference/assignmentCompatability30.types b/tests/baselines/reference/assignmentCompatability30.types
index 764c8bf3ed1c4..6433a3e5bbf6e 100644
--- a/tests/baselines/reference/assignmentCompatability30.types
+++ b/tests/baselines/reference/assignmentCompatability30.types
@@ -29,7 +29,7 @@ namespace __test2__ {
 >__test2__ : typeof __test2__
 >          : ^^^^^^^^^^^^^^^^
 
-    export var aa:{one:number[];};;
+    export declare var aa:{one:number[];};;
 >aa : { one: number[]; }
 >   : ^^^^^^^        ^^^
 >one : number[]
diff --git a/tests/baselines/reference/assignmentCompatability31.errors.txt b/tests/baselines/reference/assignmentCompatability31.errors.txt
index 695fbe45c99c4..a19c49b72573d 100644
--- a/tests/baselines/reference/assignmentCompatability31.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability31.errors.txt
@@ -9,7 +9,7 @@ assignmentCompatability31.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt
         export var __val__obj4 = obj4;
     }
     namespace __test2__ {
-        export var aa:{one:string[];};;
+        export declare var aa:{one:string[];};;
         export var __val__aa = aa;
     }
     __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability31.js b/tests/baselines/reference/assignmentCompatability31.js
index 50670044f8957..b51435a5f2df6 100644
--- a/tests/baselines/reference/assignmentCompatability31.js
+++ b/tests/baselines/reference/assignmentCompatability31.js
@@ -6,7 +6,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{one:string[];};;
+    export declare var aa:{one:string[];};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability31.symbols b/tests/baselines/reference/assignmentCompatability31.symbols
index 8c6afa9836c2e..18903e7ae4d7e 100644
--- a/tests/baselines/reference/assignmentCompatability31.symbols
+++ b/tests/baselines/reference/assignmentCompatability31.symbols
@@ -23,13 +23,13 @@ namespace __test1__ {
 namespace __test2__ {
 >__test2__ : Symbol(__test2__, Decl(assignmentCompatability31.ts, 3, 1))
 
-    export var aa:{one:string[];};;
->aa : Symbol(aa, Decl(assignmentCompatability31.ts, 5, 14))
->one : Symbol(one, Decl(assignmentCompatability31.ts, 5, 19))
+    export declare var aa:{one:string[];};;
+>aa : Symbol(aa, Decl(assignmentCompatability31.ts, 5, 22))
+>one : Symbol(one, Decl(assignmentCompatability31.ts, 5, 27))
 
     export var __val__aa = aa;
 >__val__aa : Symbol(__val__aa, Decl(assignmentCompatability31.ts, 6, 14))
->aa : Symbol(aa, Decl(assignmentCompatability31.ts, 5, 14))
+>aa : Symbol(aa, Decl(assignmentCompatability31.ts, 5, 22))
 }
 __test2__.__val__aa = __test1__.__val__obj4
 >__test2__.__val__aa : Symbol(__test2__.__val__aa, Decl(assignmentCompatability31.ts, 6, 14))
diff --git a/tests/baselines/reference/assignmentCompatability31.types b/tests/baselines/reference/assignmentCompatability31.types
index b3930e1f337d0..6feb28f0786e7 100644
--- a/tests/baselines/reference/assignmentCompatability31.types
+++ b/tests/baselines/reference/assignmentCompatability31.types
@@ -29,7 +29,7 @@ namespace __test2__ {
 >__test2__ : typeof __test2__
 >          : ^^^^^^^^^^^^^^^^
 
-    export var aa:{one:string[];};;
+    export declare var aa:{one:string[];};;
 >aa : { one: string[]; }
 >   : ^^^^^^^        ^^^
 >one : string[]
diff --git a/tests/baselines/reference/assignmentCompatability32.errors.txt b/tests/baselines/reference/assignmentCompatability32.errors.txt
index 3173634905e57..0400af370d7e1 100644
--- a/tests/baselines/reference/assignmentCompatability32.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability32.errors.txt
@@ -9,7 +9,7 @@ assignmentCompatability32.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt
         export var __val__obj4 = obj4;
     }
     namespace __test2__ {
-        export var aa:{one:boolean[];};;
+        export declare var aa:{one:boolean[];};;
         export var __val__aa = aa;
     }
     __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability32.js b/tests/baselines/reference/assignmentCompatability32.js
index 1e83ba4954947..54f556ec8504f 100644
--- a/tests/baselines/reference/assignmentCompatability32.js
+++ b/tests/baselines/reference/assignmentCompatability32.js
@@ -6,7 +6,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{one:boolean[];};;
+    export declare var aa:{one:boolean[];};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability32.symbols b/tests/baselines/reference/assignmentCompatability32.symbols
index 7198e43ed53ca..1adeaf98bc4bc 100644
--- a/tests/baselines/reference/assignmentCompatability32.symbols
+++ b/tests/baselines/reference/assignmentCompatability32.symbols
@@ -23,13 +23,13 @@ namespace __test1__ {
 namespace __test2__ {
 >__test2__ : Symbol(__test2__, Decl(assignmentCompatability32.ts, 3, 1))
 
-    export var aa:{one:boolean[];};;
->aa : Symbol(aa, Decl(assignmentCompatability32.ts, 5, 14))
->one : Symbol(one, Decl(assignmentCompatability32.ts, 5, 19))
+    export declare var aa:{one:boolean[];};;
+>aa : Symbol(aa, Decl(assignmentCompatability32.ts, 5, 22))
+>one : Symbol(one, Decl(assignmentCompatability32.ts, 5, 27))
 
     export var __val__aa = aa;
 >__val__aa : Symbol(__val__aa, Decl(assignmentCompatability32.ts, 6, 14))
->aa : Symbol(aa, Decl(assignmentCompatability32.ts, 5, 14))
+>aa : Symbol(aa, Decl(assignmentCompatability32.ts, 5, 22))
 }
 __test2__.__val__aa = __test1__.__val__obj4
 >__test2__.__val__aa : Symbol(__test2__.__val__aa, Decl(assignmentCompatability32.ts, 6, 14))
diff --git a/tests/baselines/reference/assignmentCompatability32.types b/tests/baselines/reference/assignmentCompatability32.types
index fb0c23f3f15ed..7701d2dee3511 100644
--- a/tests/baselines/reference/assignmentCompatability32.types
+++ b/tests/baselines/reference/assignmentCompatability32.types
@@ -29,7 +29,7 @@ namespace __test2__ {
 >__test2__ : typeof __test2__
 >          : ^^^^^^^^^^^^^^^^
 
-    export var aa:{one:boolean[];};;
+    export declare var aa:{one:boolean[];};;
 >aa : { one: boolean[]; }
 >   : ^^^^^^^         ^^^
 >one : boolean[]
diff --git a/tests/baselines/reference/assignmentCompatability33.errors.txt b/tests/baselines/reference/assignmentCompatability33.errors.txt
index ddc864025e987..0e68cf6cca45a 100644
--- a/tests/baselines/reference/assignmentCompatability33.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability33.errors.txt
@@ -8,7 +8,7 @@ assignmentCompatability33.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt
         export var __val__obj4 = obj4;
     }
     namespace __test2__ {
-        export var obj: { <Tstring>(a: Tstring): Tstring; };
+        export declare var obj: { <Tstring>(a: Tstring): Tstring; };
         export var __val__obj = obj;
     }
     __test2__.__val__obj = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability33.js b/tests/baselines/reference/assignmentCompatability33.js
index d54efee1ce8ac..16212b2cf9bb5 100644
--- a/tests/baselines/reference/assignmentCompatability33.js
+++ b/tests/baselines/reference/assignmentCompatability33.js
@@ -6,7 +6,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var obj: { <Tstring>(a: Tstring): Tstring; };
+    export declare var obj: { <Tstring>(a: Tstring): Tstring; };
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability33.symbols b/tests/baselines/reference/assignmentCompatability33.symbols
index 00ebf18b0c3f8..8ec1688cc2143 100644
--- a/tests/baselines/reference/assignmentCompatability33.symbols
+++ b/tests/baselines/reference/assignmentCompatability33.symbols
@@ -23,16 +23,16 @@ namespace __test1__ {
 namespace __test2__ {
 >__test2__ : Symbol(__test2__, Decl(assignmentCompatability33.ts, 3, 1))
 
-    export var obj: { <Tstring>(a: Tstring): Tstring; };
->obj : Symbol(obj, Decl(assignmentCompatability33.ts, 5, 14))
->Tstring : Symbol(Tstring, Decl(assignmentCompatability33.ts, 5, 23))
->a : Symbol(a, Decl(assignmentCompatability33.ts, 5, 32))
->Tstring : Symbol(Tstring, Decl(assignmentCompatability33.ts, 5, 23))
->Tstring : Symbol(Tstring, Decl(assignmentCompatability33.ts, 5, 23))
+    export declare var obj: { <Tstring>(a: Tstring): Tstring; };
+>obj : Symbol(obj, Decl(assignmentCompatability33.ts, 5, 22))
+>Tstring : Symbol(Tstring, Decl(assignmentCompatability33.ts, 5, 31))
+>a : Symbol(a, Decl(assignmentCompatability33.ts, 5, 40))
+>Tstring : Symbol(Tstring, Decl(assignmentCompatability33.ts, 5, 31))
+>Tstring : Symbol(Tstring, Decl(assignmentCompatability33.ts, 5, 31))
 
     export var __val__obj = obj;
 >__val__obj : Symbol(__val__obj, Decl(assignmentCompatability33.ts, 6, 14))
->obj : Symbol(obj, Decl(assignmentCompatability33.ts, 5, 14))
+>obj : Symbol(obj, Decl(assignmentCompatability33.ts, 5, 22))
 }
 __test2__.__val__obj = __test1__.__val__obj4
 >__test2__.__val__obj : Symbol(__test2__.__val__obj, Decl(assignmentCompatability33.ts, 6, 14))
diff --git a/tests/baselines/reference/assignmentCompatability33.types b/tests/baselines/reference/assignmentCompatability33.types
index 9ce33b0cae3fd..db71c0aa18923 100644
--- a/tests/baselines/reference/assignmentCompatability33.types
+++ b/tests/baselines/reference/assignmentCompatability33.types
@@ -29,7 +29,7 @@ namespace __test2__ {
 >__test2__ : typeof __test2__
 >          : ^^^^^^^^^^^^^^^^
 
-    export var obj: { <Tstring>(a: Tstring): Tstring; };
+    export declare var obj: { <Tstring>(a: Tstring): Tstring; };
 >obj : <Tstring>(a: Tstring) => Tstring
 >    : ^       ^^ ^^       ^^^^^       
 >a : Tstring
diff --git a/tests/baselines/reference/assignmentCompatability34.errors.txt b/tests/baselines/reference/assignmentCompatability34.errors.txt
index f04d2df6e92fd..6f4adfc867d30 100644
--- a/tests/baselines/reference/assignmentCompatability34.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability34.errors.txt
@@ -8,7 +8,7 @@ assignmentCompatability34.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt
         export var __val__obj4 = obj4;
     }
     namespace __test2__ {
-        export var obj: { <Tnumber>(a:Tnumber):Tnumber;};
+        export declare var obj: { <Tnumber>(a:Tnumber):Tnumber;};
         export var __val__obj = obj;
     }
     __test2__.__val__obj = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability34.js b/tests/baselines/reference/assignmentCompatability34.js
index a754c725badb9..00a0e3254c3e6 100644
--- a/tests/baselines/reference/assignmentCompatability34.js
+++ b/tests/baselines/reference/assignmentCompatability34.js
@@ -6,7 +6,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var obj: { <Tnumber>(a:Tnumber):Tnumber;};
+    export declare var obj: { <Tnumber>(a:Tnumber):Tnumber;};
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability34.symbols b/tests/baselines/reference/assignmentCompatability34.symbols
index f458b6a3fec14..5c810073e99fe 100644
--- a/tests/baselines/reference/assignmentCompatability34.symbols
+++ b/tests/baselines/reference/assignmentCompatability34.symbols
@@ -23,16 +23,16 @@ namespace __test1__ {
 namespace __test2__ {
 >__test2__ : Symbol(__test2__, Decl(assignmentCompatability34.ts, 3, 1))
 
-    export var obj: { <Tnumber>(a:Tnumber):Tnumber;};
->obj : Symbol(obj, Decl(assignmentCompatability34.ts, 5, 14))
->Tnumber : Symbol(Tnumber, Decl(assignmentCompatability34.ts, 5, 23))
->a : Symbol(a, Decl(assignmentCompatability34.ts, 5, 32))
->Tnumber : Symbol(Tnumber, Decl(assignmentCompatability34.ts, 5, 23))
->Tnumber : Symbol(Tnumber, Decl(assignmentCompatability34.ts, 5, 23))
+    export declare var obj: { <Tnumber>(a:Tnumber):Tnumber;};
+>obj : Symbol(obj, Decl(assignmentCompatability34.ts, 5, 22))
+>Tnumber : Symbol(Tnumber, Decl(assignmentCompatability34.ts, 5, 31))
+>a : Symbol(a, Decl(assignmentCompatability34.ts, 5, 40))
+>Tnumber : Symbol(Tnumber, Decl(assignmentCompatability34.ts, 5, 31))
+>Tnumber : Symbol(Tnumber, Decl(assignmentCompatability34.ts, 5, 31))
 
     export var __val__obj = obj;
 >__val__obj : Symbol(__val__obj, Decl(assignmentCompatability34.ts, 6, 14))
->obj : Symbol(obj, Decl(assignmentCompatability34.ts, 5, 14))
+>obj : Symbol(obj, Decl(assignmentCompatability34.ts, 5, 22))
 }
 __test2__.__val__obj = __test1__.__val__obj4
 >__test2__.__val__obj : Symbol(__test2__.__val__obj, Decl(assignmentCompatability34.ts, 6, 14))
diff --git a/tests/baselines/reference/assignmentCompatability34.types b/tests/baselines/reference/assignmentCompatability34.types
index 279673048a5f2..423b3fc0a2958 100644
--- a/tests/baselines/reference/assignmentCompatability34.types
+++ b/tests/baselines/reference/assignmentCompatability34.types
@@ -29,7 +29,7 @@ namespace __test2__ {
 >__test2__ : typeof __test2__
 >          : ^^^^^^^^^^^^^^^^
 
-    export var obj: { <Tnumber>(a:Tnumber):Tnumber;};
+    export declare var obj: { <Tnumber>(a:Tnumber):Tnumber;};
 >obj : <Tnumber>(a: Tnumber) => Tnumber
 >    : ^       ^^ ^^       ^^^^^       
 >a : Tnumber
diff --git a/tests/baselines/reference/assignmentCompatability35.errors.txt b/tests/baselines/reference/assignmentCompatability35.errors.txt
index 3c6be3e35a2bf..539505540545e 100644
--- a/tests/baselines/reference/assignmentCompatability35.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability35.errors.txt
@@ -8,7 +8,7 @@ assignmentCompatability35.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt
         export var __val__obj4 = obj4;
     }
     namespace __test2__ {
-        export var aa:{[index:number]:number;};;
+        export declare var aa:{[index:number]:number;};;
         export var __val__aa = aa;
     }
     __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability35.js b/tests/baselines/reference/assignmentCompatability35.js
index 6a6110fda9bb6..043b98933ed8e 100644
--- a/tests/baselines/reference/assignmentCompatability35.js
+++ b/tests/baselines/reference/assignmentCompatability35.js
@@ -6,7 +6,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{[index:number]:number;};;
+    export declare var aa:{[index:number]:number;};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability35.symbols b/tests/baselines/reference/assignmentCompatability35.symbols
index bc35b795a17a4..901212a591f4a 100644
--- a/tests/baselines/reference/assignmentCompatability35.symbols
+++ b/tests/baselines/reference/assignmentCompatability35.symbols
@@ -23,13 +23,13 @@ namespace __test1__ {
 namespace __test2__ {
 >__test2__ : Symbol(__test2__, Decl(assignmentCompatability35.ts, 3, 1))
 
-    export var aa:{[index:number]:number;};;
->aa : Symbol(aa, Decl(assignmentCompatability35.ts, 5, 14))
->index : Symbol(index, Decl(assignmentCompatability35.ts, 5, 20))
+    export declare var aa:{[index:number]:number;};;
+>aa : Symbol(aa, Decl(assignmentCompatability35.ts, 5, 22))
+>index : Symbol(index, Decl(assignmentCompatability35.ts, 5, 28))
 
     export var __val__aa = aa;
 >__val__aa : Symbol(__val__aa, Decl(assignmentCompatability35.ts, 6, 14))
->aa : Symbol(aa, Decl(assignmentCompatability35.ts, 5, 14))
+>aa : Symbol(aa, Decl(assignmentCompatability35.ts, 5, 22))
 }
 __test2__.__val__aa = __test1__.__val__obj4
 >__test2__.__val__aa : Symbol(__test2__.__val__aa, Decl(assignmentCompatability35.ts, 6, 14))
diff --git a/tests/baselines/reference/assignmentCompatability35.types b/tests/baselines/reference/assignmentCompatability35.types
index 5920d2bf1b369..dce1e8ebc614c 100644
--- a/tests/baselines/reference/assignmentCompatability35.types
+++ b/tests/baselines/reference/assignmentCompatability35.types
@@ -29,7 +29,7 @@ namespace __test2__ {
 >__test2__ : typeof __test2__
 >          : ^^^^^^^^^^^^^^^^
 
-    export var aa:{[index:number]:number;};;
+    export declare var aa:{[index:number]:number;};;
 >aa : { [index: number]: number; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >index : number
diff --git a/tests/baselines/reference/assignmentCompatability37.errors.txt b/tests/baselines/reference/assignmentCompatability37.errors.txt
index 2bac1c7c344bb..2dd17b6f3fd7f 100644
--- a/tests/baselines/reference/assignmentCompatability37.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability37.errors.txt
@@ -8,7 +8,7 @@ assignmentCompatability37.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt
         export var __val__obj4 = obj4;
     }
     namespace __test2__ {
-        export var aa:{ new <Tnumber>(param: Tnumber); };;
+        export declare var aa:{ new <Tnumber>(param: Tnumber); };;
         export var __val__aa = aa;
     }
     __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability37.js b/tests/baselines/reference/assignmentCompatability37.js
index 533f70bda2cb2..2b639372376b4 100644
--- a/tests/baselines/reference/assignmentCompatability37.js
+++ b/tests/baselines/reference/assignmentCompatability37.js
@@ -6,7 +6,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{ new <Tnumber>(param: Tnumber); };;
+    export declare var aa:{ new <Tnumber>(param: Tnumber); };;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability37.symbols b/tests/baselines/reference/assignmentCompatability37.symbols
index b933a59cae465..7ea6732ebf45a 100644
--- a/tests/baselines/reference/assignmentCompatability37.symbols
+++ b/tests/baselines/reference/assignmentCompatability37.symbols
@@ -23,15 +23,15 @@ namespace __test1__ {
 namespace __test2__ {
 >__test2__ : Symbol(__test2__, Decl(assignmentCompatability37.ts, 3, 1))
 
-    export var aa:{ new <Tnumber>(param: Tnumber); };;
->aa : Symbol(aa, Decl(assignmentCompatability37.ts, 5, 14))
->Tnumber : Symbol(Tnumber, Decl(assignmentCompatability37.ts, 5, 25))
->param : Symbol(param, Decl(assignmentCompatability37.ts, 5, 34))
->Tnumber : Symbol(Tnumber, Decl(assignmentCompatability37.ts, 5, 25))
+    export declare var aa:{ new <Tnumber>(param: Tnumber); };;
+>aa : Symbol(aa, Decl(assignmentCompatability37.ts, 5, 22))
+>Tnumber : Symbol(Tnumber, Decl(assignmentCompatability37.ts, 5, 33))
+>param : Symbol(param, Decl(assignmentCompatability37.ts, 5, 42))
+>Tnumber : Symbol(Tnumber, Decl(assignmentCompatability37.ts, 5, 33))
 
     export var __val__aa = aa;
 >__val__aa : Symbol(__val__aa, Decl(assignmentCompatability37.ts, 6, 14))
->aa : Symbol(aa, Decl(assignmentCompatability37.ts, 5, 14))
+>aa : Symbol(aa, Decl(assignmentCompatability37.ts, 5, 22))
 }
 __test2__.__val__aa = __test1__.__val__obj4
 >__test2__.__val__aa : Symbol(__test2__.__val__aa, Decl(assignmentCompatability37.ts, 6, 14))
diff --git a/tests/baselines/reference/assignmentCompatability37.types b/tests/baselines/reference/assignmentCompatability37.types
index 5649e14786c46..b2306e34ad03d 100644
--- a/tests/baselines/reference/assignmentCompatability37.types
+++ b/tests/baselines/reference/assignmentCompatability37.types
@@ -29,7 +29,7 @@ namespace __test2__ {
 >__test2__ : typeof __test2__
 >          : ^^^^^^^^^^^^^^^^
 
-    export var aa:{ new <Tnumber>(param: Tnumber); };;
+    export declare var aa:{ new <Tnumber>(param: Tnumber); };;
 >aa : new <Tnumber>(param: Tnumber) => any
 >   : ^^^^^       ^^     ^^       ^^^^^^^^
 >param : Tnumber
diff --git a/tests/baselines/reference/assignmentCompatability38.errors.txt b/tests/baselines/reference/assignmentCompatability38.errors.txt
index 2e6538c0e9870..04471c39ec204 100644
--- a/tests/baselines/reference/assignmentCompatability38.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability38.errors.txt
@@ -8,7 +8,7 @@ assignmentCompatability38.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt
         export var __val__obj4 = obj4;
     }
     namespace __test2__ {
-        export var aa:{ new <Tstring>(param: Tstring); };;
+        export declare var aa:{ new <Tstring>(param: Tstring); };;
         export var __val__aa = aa;
     }
     __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability38.js b/tests/baselines/reference/assignmentCompatability38.js
index 2d1a23dfa0ffe..66c46eaeeec0f 100644
--- a/tests/baselines/reference/assignmentCompatability38.js
+++ b/tests/baselines/reference/assignmentCompatability38.js
@@ -6,7 +6,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{ new <Tstring>(param: Tstring); };;
+    export declare var aa:{ new <Tstring>(param: Tstring); };;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability38.symbols b/tests/baselines/reference/assignmentCompatability38.symbols
index 7d95a42b504e3..628d61e865b93 100644
--- a/tests/baselines/reference/assignmentCompatability38.symbols
+++ b/tests/baselines/reference/assignmentCompatability38.symbols
@@ -23,15 +23,15 @@ namespace __test1__ {
 namespace __test2__ {
 >__test2__ : Symbol(__test2__, Decl(assignmentCompatability38.ts, 3, 1))
 
-    export var aa:{ new <Tstring>(param: Tstring); };;
->aa : Symbol(aa, Decl(assignmentCompatability38.ts, 5, 14))
->Tstring : Symbol(Tstring, Decl(assignmentCompatability38.ts, 5, 25))
->param : Symbol(param, Decl(assignmentCompatability38.ts, 5, 34))
->Tstring : Symbol(Tstring, Decl(assignmentCompatability38.ts, 5, 25))
+    export declare var aa:{ new <Tstring>(param: Tstring); };;
+>aa : Symbol(aa, Decl(assignmentCompatability38.ts, 5, 22))
+>Tstring : Symbol(Tstring, Decl(assignmentCompatability38.ts, 5, 33))
+>param : Symbol(param, Decl(assignmentCompatability38.ts, 5, 42))
+>Tstring : Symbol(Tstring, Decl(assignmentCompatability38.ts, 5, 33))
 
     export var __val__aa = aa;
 >__val__aa : Symbol(__val__aa, Decl(assignmentCompatability38.ts, 6, 14))
->aa : Symbol(aa, Decl(assignmentCompatability38.ts, 5, 14))
+>aa : Symbol(aa, Decl(assignmentCompatability38.ts, 5, 22))
 }
 __test2__.__val__aa = __test1__.__val__obj4
 >__test2__.__val__aa : Symbol(__test2__.__val__aa, Decl(assignmentCompatability38.ts, 6, 14))
diff --git a/tests/baselines/reference/assignmentCompatability38.types b/tests/baselines/reference/assignmentCompatability38.types
index daf41632e8f1f..49f1d43cdf48a 100644
--- a/tests/baselines/reference/assignmentCompatability38.types
+++ b/tests/baselines/reference/assignmentCompatability38.types
@@ -29,7 +29,7 @@ namespace __test2__ {
 >__test2__ : typeof __test2__
 >          : ^^^^^^^^^^^^^^^^
 
-    export var aa:{ new <Tstring>(param: Tstring); };;
+    export declare var aa:{ new <Tstring>(param: Tstring); };;
 >aa : new <Tstring>(param: Tstring) => any
 >   : ^^^^^       ^^     ^^       ^^^^^^^^
 >param : Tstring
diff --git a/tests/baselines/reference/bestCommonTypeOfTuple2.errors.txt b/tests/baselines/reference/bestCommonTypeOfTuple2.errors.txt
index 2029d92d11f2f..c7615aea73486 100644
--- a/tests/baselines/reference/bestCommonTypeOfTuple2.errors.txt
+++ b/tests/baselines/reference/bestCommonTypeOfTuple2.errors.txt
@@ -16,11 +16,11 @@ bestCommonTypeOfTuple2.ts(21,14): error TS2493: Tuple type '[C1, F]' of length '
     class C1 implements base1 { i = "foo"; c }
     class D1 extends C1 { i = "bar"; d }
     
-    var t1: [C, base];
-    var t2: [C, D];
-    var t3: [C1, D1];
-    var t4: [base1, C1];
-    var t5: [C1, F]
+    declare var t1: [C, base];
+    declare var t2: [C, D];
+    declare var t3: [C1, D1];
+    declare var t4: [base1, C1];
+    declare var t5: [C1, F]
     
     var e11 = t1[4]; // base
                  ~
diff --git a/tests/baselines/reference/bestCommonTypeOfTuple2.js b/tests/baselines/reference/bestCommonTypeOfTuple2.js
index 5d440c14c46f8..2c4fa73218404 100644
--- a/tests/baselines/reference/bestCommonTypeOfTuple2.js
+++ b/tests/baselines/reference/bestCommonTypeOfTuple2.js
@@ -11,11 +11,11 @@ class F extends C { f }
 class C1 implements base1 { i = "foo"; c }
 class D1 extends C1 { i = "bar"; d }
 
-var t1: [C, base];
-var t2: [C, D];
-var t3: [C1, D1];
-var t4: [base1, C1];
-var t5: [C1, F]
+declare var t1: [C, base];
+declare var t2: [C, D];
+declare var t3: [C1, D1];
+declare var t4: [base1, C1];
+declare var t5: [C1, F]
 
 var e11 = t1[4]; // base
 var e21 = t2[4]; // {}
@@ -77,11 +77,6 @@ var D1 = /** @class */ (function (_super) {
     }
     return D1;
 }(C1));
-var t1;
-var t2;
-var t3;
-var t4;
-var t5;
 var e11 = t1[4]; // base
 var e21 = t2[4]; // {}
 var e31 = t3[4]; // C1
diff --git a/tests/baselines/reference/bestCommonTypeOfTuple2.symbols b/tests/baselines/reference/bestCommonTypeOfTuple2.symbols
index a9ee96ecc1a61..87a5145200723 100644
--- a/tests/baselines/reference/bestCommonTypeOfTuple2.symbols
+++ b/tests/baselines/reference/bestCommonTypeOfTuple2.symbols
@@ -40,48 +40,48 @@ class D1 extends C1 { i = "bar"; d }
 >i : Symbol(D1.i, Decl(bestCommonTypeOfTuple2.ts, 8, 21))
 >d : Symbol(D1.d, Decl(bestCommonTypeOfTuple2.ts, 8, 32))
 
-var t1: [C, base];
->t1 : Symbol(t1, Decl(bestCommonTypeOfTuple2.ts, 10, 3))
+declare var t1: [C, base];
+>t1 : Symbol(t1, Decl(bestCommonTypeOfTuple2.ts, 10, 11))
 >C : Symbol(C, Decl(bestCommonTypeOfTuple2.ts, 1, 21))
 >base : Symbol(base, Decl(bestCommonTypeOfTuple2.ts, 0, 0))
 
-var t2: [C, D];
->t2 : Symbol(t2, Decl(bestCommonTypeOfTuple2.ts, 11, 3))
+declare var t2: [C, D];
+>t2 : Symbol(t2, Decl(bestCommonTypeOfTuple2.ts, 11, 11))
 >C : Symbol(C, Decl(bestCommonTypeOfTuple2.ts, 1, 21))
 >D : Symbol(D, Decl(bestCommonTypeOfTuple2.ts, 2, 29))
 
-var t3: [C1, D1];
->t3 : Symbol(t3, Decl(bestCommonTypeOfTuple2.ts, 12, 3))
+declare var t3: [C1, D1];
+>t3 : Symbol(t3, Decl(bestCommonTypeOfTuple2.ts, 12, 11))
 >C1 : Symbol(C1, Decl(bestCommonTypeOfTuple2.ts, 5, 23))
 >D1 : Symbol(D1, Decl(bestCommonTypeOfTuple2.ts, 7, 42))
 
-var t4: [base1, C1];
->t4 : Symbol(t4, Decl(bestCommonTypeOfTuple2.ts, 13, 3))
+declare var t4: [base1, C1];
+>t4 : Symbol(t4, Decl(bestCommonTypeOfTuple2.ts, 13, 11))
 >base1 : Symbol(base1, Decl(bestCommonTypeOfTuple2.ts, 0, 18))
 >C1 : Symbol(C1, Decl(bestCommonTypeOfTuple2.ts, 5, 23))
 
-var t5: [C1, F]
->t5 : Symbol(t5, Decl(bestCommonTypeOfTuple2.ts, 14, 3))
+declare var t5: [C1, F]
+>t5 : Symbol(t5, Decl(bestCommonTypeOfTuple2.ts, 14, 11))
 >C1 : Symbol(C1, Decl(bestCommonTypeOfTuple2.ts, 5, 23))
 >F : Symbol(F, Decl(bestCommonTypeOfTuple2.ts, 4, 29))
 
 var e11 = t1[4]; // base
 >e11 : Symbol(e11, Decl(bestCommonTypeOfTuple2.ts, 16, 3))
->t1 : Symbol(t1, Decl(bestCommonTypeOfTuple2.ts, 10, 3))
+>t1 : Symbol(t1, Decl(bestCommonTypeOfTuple2.ts, 10, 11))
 
 var e21 = t2[4]; // {}
 >e21 : Symbol(e21, Decl(bestCommonTypeOfTuple2.ts, 17, 3))
->t2 : Symbol(t2, Decl(bestCommonTypeOfTuple2.ts, 11, 3))
+>t2 : Symbol(t2, Decl(bestCommonTypeOfTuple2.ts, 11, 11))
 
 var e31 = t3[4]; // C1
 >e31 : Symbol(e31, Decl(bestCommonTypeOfTuple2.ts, 18, 3))
->t3 : Symbol(t3, Decl(bestCommonTypeOfTuple2.ts, 12, 3))
+>t3 : Symbol(t3, Decl(bestCommonTypeOfTuple2.ts, 12, 11))
 
 var e41 = t4[2]; // base1
 >e41 : Symbol(e41, Decl(bestCommonTypeOfTuple2.ts, 19, 3))
->t4 : Symbol(t4, Decl(bestCommonTypeOfTuple2.ts, 13, 3))
+>t4 : Symbol(t4, Decl(bestCommonTypeOfTuple2.ts, 13, 11))
 
 var e51 = t5[2]; // {}
 >e51 : Symbol(e51, Decl(bestCommonTypeOfTuple2.ts, 20, 3))
->t5 : Symbol(t5, Decl(bestCommonTypeOfTuple2.ts, 14, 3))
+>t5 : Symbol(t5, Decl(bestCommonTypeOfTuple2.ts, 14, 11))
 
diff --git a/tests/baselines/reference/bestCommonTypeOfTuple2.types b/tests/baselines/reference/bestCommonTypeOfTuple2.types
index 55cf85d67a748..091f3c621cb40 100644
--- a/tests/baselines/reference/bestCommonTypeOfTuple2.types
+++ b/tests/baselines/reference/bestCommonTypeOfTuple2.types
@@ -54,23 +54,23 @@ class D1 extends C1 { i = "bar"; d }
 >d : any
 >  : ^^^
 
-var t1: [C, base];
+declare var t1: [C, base];
 >t1 : [C, base]
 >   : ^^^^^^^^^
 
-var t2: [C, D];
+declare var t2: [C, D];
 >t2 : [C, D]
 >   : ^^^^^^
 
-var t3: [C1, D1];
+declare var t3: [C1, D1];
 >t3 : [C1, D1]
 >   : ^^^^^^^^
 
-var t4: [base1, C1];
+declare var t4: [base1, C1];
 >t4 : [base1, C1]
 >   : ^^^^^^^^^^^
 
-var t5: [C1, F]
+declare var t5: [C1, F]
 >t5 : [C1, F]
 >   : ^^^^^^^
 
diff --git a/tests/baselines/reference/bestCommonTypeWithContextualTyping.errors.txt b/tests/baselines/reference/bestCommonTypeWithContextualTyping.errors.txt
index 2aafdf2154b9a..92c77bc2dfa3d 100644
--- a/tests/baselines/reference/bestCommonTypeWithContextualTyping.errors.txt
+++ b/tests/baselines/reference/bestCommonTypeWithContextualTyping.errors.txt
@@ -12,7 +12,7 @@ bestCommonTypeWithContextualTyping.ts(19,31): error TS2873: This kind of express
         p: any;
     }
     
-    var e: Ellement;
+    declare var e: Ellement;
     
     // All of these should pass. Neither type is a supertype of the other, but the RHS should
     // always use Ellement in these examples (not Contextual). Because Ellement is assignable
diff --git a/tests/baselines/reference/bestCommonTypeWithContextualTyping.js b/tests/baselines/reference/bestCommonTypeWithContextualTyping.js
index 9374f8b1505b3..4ce6071619817 100644
--- a/tests/baselines/reference/bestCommonTypeWithContextualTyping.js
+++ b/tests/baselines/reference/bestCommonTypeWithContextualTyping.js
@@ -11,7 +11,7 @@ interface Ellement {
     p: any;
 }
 
-var e: Ellement;
+declare var e: Ellement;
 
 // All of these should pass. Neither type is a supertype of the other, but the RHS should
 // always use Ellement in these examples (not Contextual). Because Ellement is assignable
@@ -23,7 +23,6 @@ var conditional: Contextual = null ? e : e; // Ellement
 var contextualOr: Contextual = e || e; // Ellement
 
 //// [bestCommonTypeWithContextualTyping.js]
-var e;
 // All of these should pass. Neither type is a supertype of the other, but the RHS should
 // always use Ellement in these examples (not Contextual). Because Ellement is assignable
 // to Contextual, no errors.
diff --git a/tests/baselines/reference/bestCommonTypeWithContextualTyping.symbols b/tests/baselines/reference/bestCommonTypeWithContextualTyping.symbols
index 38a0a2cd903f2..cd2055da1f232 100644
--- a/tests/baselines/reference/bestCommonTypeWithContextualTyping.symbols
+++ b/tests/baselines/reference/bestCommonTypeWithContextualTyping.symbols
@@ -21,8 +21,8 @@ interface Ellement {
 >p : Symbol(Ellement.p, Decl(bestCommonTypeWithContextualTyping.ts, 6, 10))
 }
 
-var e: Ellement;
->e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 3))
+declare var e: Ellement;
+>e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 11))
 >Ellement : Symbol(Ellement, Decl(bestCommonTypeWithContextualTyping.ts, 3, 1))
 
 // All of these should pass. Neither type is a supertype of the other, but the RHS should
@@ -31,24 +31,24 @@ var e: Ellement;
 var arr: Contextual[] = [e]; // Ellement[]
 >arr : Symbol(arr, Decl(bestCommonTypeWithContextualTyping.ts, 15, 3))
 >Contextual : Symbol(Contextual, Decl(bestCommonTypeWithContextualTyping.ts, 0, 0))
->e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 3))
+>e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 11))
 
 var obj: { [s: string]: Contextual } = { s: e }; // { s: Ellement; [s: string]: Ellement }
 >obj : Symbol(obj, Decl(bestCommonTypeWithContextualTyping.ts, 16, 3))
 >s : Symbol(s, Decl(bestCommonTypeWithContextualTyping.ts, 16, 12))
 >Contextual : Symbol(Contextual, Decl(bestCommonTypeWithContextualTyping.ts, 0, 0))
 >s : Symbol(s, Decl(bestCommonTypeWithContextualTyping.ts, 16, 40))
->e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 3))
+>e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 11))
 
 var conditional: Contextual = null ? e : e; // Ellement
 >conditional : Symbol(conditional, Decl(bestCommonTypeWithContextualTyping.ts, 18, 3))
 >Contextual : Symbol(Contextual, Decl(bestCommonTypeWithContextualTyping.ts, 0, 0))
->e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 3))
->e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 3))
+>e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 11))
+>e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 11))
 
 var contextualOr: Contextual = e || e; // Ellement
 >contextualOr : Symbol(contextualOr, Decl(bestCommonTypeWithContextualTyping.ts, 19, 3))
 >Contextual : Symbol(Contextual, Decl(bestCommonTypeWithContextualTyping.ts, 0, 0))
->e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 3))
->e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 3))
+>e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 11))
+>e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 11))
 
diff --git a/tests/baselines/reference/bestCommonTypeWithContextualTyping.types b/tests/baselines/reference/bestCommonTypeWithContextualTyping.types
index 735202dcd63e1..e60e4114561e8 100644
--- a/tests/baselines/reference/bestCommonTypeWithContextualTyping.types
+++ b/tests/baselines/reference/bestCommonTypeWithContextualTyping.types
@@ -21,7 +21,7 @@ interface Ellement {
 >  : ^^^
 }
 
-var e: Ellement;
+declare var e: Ellement;
 >e : Ellement
 >  : ^^^^^^^^
 
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.errors.txt b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.errors.txt
index ce16af3eaec6e..14ac389071d4b 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.errors.txt
+++ b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.errors.txt
@@ -8,11 +8,11 @@ bitwiseNotOperatorWithAnyOtherType.ts(48,26): error TS2365: Operator '+' cannot
 ==== bitwiseNotOperatorWithAnyOtherType.ts (5 errors) ====
     // ~ operator on any type
     
-    var ANY: any;
-    var ANY1;
-    var ANY2: any[] = ["", ""];
-    var obj: () => {}
-    var obj1 = { x:"", y: () => { }};
+    declare var ANY: any;
+    declare var ANY1;
+    declare var ANY2: any[];
+    declare var obj: () => {};
+    declare var obj1: { x:"", y: () => { }};
     
     function foo(): any {
         var a;
@@ -26,9 +26,9 @@ bitwiseNotOperatorWithAnyOtherType.ts(48,26): error TS2365: Operator '+' cannot
         }
     }
     namespace M {
-        export var n: any;
+        export declare var n: any;
     }
-    var objA = new A();
+    declare var objA: A;
     
     // any other type var
     var ResultIsNumber = ~ANY1;
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js
index fa1dbad9899b4..eb97d7dfa838a 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js
@@ -3,11 +3,11 @@
 //// [bitwiseNotOperatorWithAnyOtherType.ts]
 // ~ operator on any type
 
-var ANY: any;
-var ANY1;
-var ANY2: any[] = ["", ""];
-var obj: () => {}
-var obj1 = { x:"", y: () => { }};
+declare var ANY: any;
+declare var ANY1;
+declare var ANY2: any[];
+declare var obj: () => {};
+declare var obj1: { x:"", y: () => { }};
 
 function foo(): any {
     var a;
@@ -21,9 +21,9 @@ class A {
     }
 }
 namespace M {
-    export var n: any;
+    export declare var n: any;
 }
-var objA = new A();
+declare var objA: A;
 
 // any other type var
 var ResultIsNumber = ~ANY1;
@@ -66,11 +66,6 @@ var ResultIsNumber20 = ~~~(ANY + ANY1);
 
 //// [bitwiseNotOperatorWithAnyOtherType.js]
 // ~ operator on any type
-var ANY;
-var ANY1;
-var ANY2 = ["", ""];
-var obj;
-var obj1 = { x: "", y: function () { } };
 function foo() {
     var a;
     return a;
@@ -87,7 +82,6 @@ var A = /** @class */ (function () {
 var M;
 (function (M) {
 })(M || (M = {}));
-var objA = new A();
 // any other type var
 var ResultIsNumber = ~ANY1;
 var ResultIsNumber1 = ~ANY2;
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.symbols b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.symbols
index 1f4aae51acce2..d89bfcc9b3af7 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.symbols
+++ b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.symbols
@@ -3,25 +3,25 @@
 === bitwiseNotOperatorWithAnyOtherType.ts ===
 // ~ operator on any type
 
-var ANY: any;
->ANY : Symbol(ANY, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 2, 3))
+declare var ANY: any;
+>ANY : Symbol(ANY, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 2, 11))
 
-var ANY1;
->ANY1 : Symbol(ANY1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 3, 3))
+declare var ANY1;
+>ANY1 : Symbol(ANY1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 3, 11))
 
-var ANY2: any[] = ["", ""];
->ANY2 : Symbol(ANY2, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 4, 3))
+declare var ANY2: any[];
+>ANY2 : Symbol(ANY2, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 4, 11))
 
-var obj: () => {}
->obj : Symbol(obj, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 5, 3))
+declare var obj: () => {};
+>obj : Symbol(obj, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 5, 11))
 
-var obj1 = { x:"", y: () => { }};
->obj1 : Symbol(obj1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 3))
->x : Symbol(x, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 12))
->y : Symbol(y, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 18))
+declare var obj1: { x:"", y: () => { }};
+>obj1 : Symbol(obj1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 11))
+>x : Symbol(x, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 19))
+>y : Symbol(y, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 25))
 
 function foo(): any {
->foo : Symbol(foo, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 33))
+>foo : Symbol(foo, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 40))
 
     var a;
 >a : Symbol(a, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 9, 7))
@@ -48,21 +48,21 @@ class A {
 namespace M {
 >M : Symbol(M, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 18, 1))
 
-    export var n: any;
->n : Symbol(n, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 20, 14))
+    export declare var n: any;
+>n : Symbol(n, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 20, 22))
 }
-var objA = new A();
->objA : Symbol(objA, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 22, 3))
+declare var objA: A;
+>objA : Symbol(objA, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 22, 11))
 >A : Symbol(A, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 11, 1))
 
 // any other type var
 var ResultIsNumber = ~ANY1;
 >ResultIsNumber : Symbol(ResultIsNumber, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 25, 3))
->ANY1 : Symbol(ANY1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 3, 3))
+>ANY1 : Symbol(ANY1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 3, 11))
 
 var ResultIsNumber1 = ~ANY2;
 >ResultIsNumber1 : Symbol(ResultIsNumber1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 26, 3))
->ANY2 : Symbol(ANY2, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 4, 3))
+>ANY2 : Symbol(ANY2, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 4, 11))
 
 var ResultIsNumber2 = ~A;
 >ResultIsNumber2 : Symbol(ResultIsNumber2, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 27, 3))
@@ -74,11 +74,11 @@ var ResultIsNumber3 = ~M;
 
 var ResultIsNumber4 = ~obj;
 >ResultIsNumber4 : Symbol(ResultIsNumber4, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 29, 3))
->obj : Symbol(obj, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 5, 3))
+>obj : Symbol(obj, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 5, 11))
 
 var ResultIsNumber5 = ~obj1;
 >ResultIsNumber5 : Symbol(ResultIsNumber5, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 30, 3))
->obj1 : Symbol(obj1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 3))
+>obj1 : Symbol(obj1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 11))
 
 // any type literal
 var ResultIsNumber6 = ~undefined;
@@ -91,35 +91,35 @@ var ResultIsNumber7 = ~null;
 // any type expressions
 var ResultIsNumber8 = ~ANY2[0]
 >ResultIsNumber8 : Symbol(ResultIsNumber8, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 37, 3))
->ANY2 : Symbol(ANY2, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 4, 3))
+>ANY2 : Symbol(ANY2, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 4, 11))
 
 var ResultIsNumber9 = ~obj1.x;
 >ResultIsNumber9 : Symbol(ResultIsNumber9, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 38, 3))
->obj1.x : Symbol(x, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 12))
->obj1 : Symbol(obj1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 3))
->x : Symbol(x, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 12))
+>obj1.x : Symbol(x, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 19))
+>obj1 : Symbol(obj1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 11))
+>x : Symbol(x, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 19))
 
 var ResultIsNumber10 = ~obj1.y;
 >ResultIsNumber10 : Symbol(ResultIsNumber10, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 39, 3))
->obj1.y : Symbol(y, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 18))
->obj1 : Symbol(obj1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 3))
->y : Symbol(y, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 18))
+>obj1.y : Symbol(y, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 25))
+>obj1 : Symbol(obj1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 11))
+>y : Symbol(y, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 25))
 
 var ResultIsNumber11 = ~objA.a;
 >ResultIsNumber11 : Symbol(ResultIsNumber11, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 40, 3))
 >objA.a : Symbol(A.a, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 12, 9))
->objA : Symbol(objA, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 22, 3))
+>objA : Symbol(objA, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 22, 11))
 >a : Symbol(A.a, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 12, 9))
 
 var ResultIsNumber12 = ~M.n;
 >ResultIsNumber12 : Symbol(ResultIsNumber12, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 41, 3))
->M.n : Symbol(M.n, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 20, 14))
+>M.n : Symbol(M.n, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 20, 22))
 >M : Symbol(M, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 18, 1))
->n : Symbol(M.n, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 20, 14))
+>n : Symbol(M.n, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 20, 22))
 
 var ResultIsNumber13 = ~foo();
 >ResultIsNumber13 : Symbol(ResultIsNumber13, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 42, 3))
->foo : Symbol(foo, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 33))
+>foo : Symbol(foo, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 40))
 
 var ResultIsNumber14 = ~A.foo();
 >ResultIsNumber14 : Symbol(ResultIsNumber14, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 43, 3))
@@ -129,8 +129,8 @@ var ResultIsNumber14 = ~A.foo();
 
 var ResultIsNumber15 = ~(ANY + ANY1);
 >ResultIsNumber15 : Symbol(ResultIsNumber15, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 44, 3))
->ANY : Symbol(ANY, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 2, 3))
->ANY1 : Symbol(ANY1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 3, 3))
+>ANY : Symbol(ANY, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 2, 11))
+>ANY1 : Symbol(ANY1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 3, 11))
 
 var ResultIsNumber16 = ~(null + undefined);
 >ResultIsNumber16 : Symbol(ResultIsNumber16, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 45, 3))
@@ -147,44 +147,44 @@ var ResultIsNumber18 = ~(undefined + undefined);
 // multiple ~ operators
 var ResultIsNumber19 = ~~ANY;
 >ResultIsNumber19 : Symbol(ResultIsNumber19, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 50, 3))
->ANY : Symbol(ANY, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 2, 3))
+>ANY : Symbol(ANY, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 2, 11))
 
 var ResultIsNumber20 = ~~~(ANY + ANY1);
 >ResultIsNumber20 : Symbol(ResultIsNumber20, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 51, 3))
->ANY : Symbol(ANY, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 2, 3))
->ANY1 : Symbol(ANY1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 3, 3))
+>ANY : Symbol(ANY, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 2, 11))
+>ANY1 : Symbol(ANY1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 3, 11))
 
 //miss assignment operators
 ~ANY;
->ANY : Symbol(ANY, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 2, 3))
+>ANY : Symbol(ANY, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 2, 11))
 
 ~ANY1;
->ANY1 : Symbol(ANY1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 3, 3))
+>ANY1 : Symbol(ANY1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 3, 11))
 
 ~ANY2[0];
->ANY2 : Symbol(ANY2, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 4, 3))
+>ANY2 : Symbol(ANY2, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 4, 11))
 
 ~ANY, ANY1;
->ANY : Symbol(ANY, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 2, 3))
->ANY1 : Symbol(ANY1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 3, 3))
+>ANY : Symbol(ANY, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 2, 11))
+>ANY1 : Symbol(ANY1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 3, 11))
 
 ~obj1.y;
->obj1.y : Symbol(y, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 18))
->obj1 : Symbol(obj1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 3))
->y : Symbol(y, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 18))
+>obj1.y : Symbol(y, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 25))
+>obj1 : Symbol(obj1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 11))
+>y : Symbol(y, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 25))
 
 ~objA.a;
 >objA.a : Symbol(A.a, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 12, 9))
->objA : Symbol(objA, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 22, 3))
+>objA : Symbol(objA, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 22, 11))
 >a : Symbol(A.a, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 12, 9))
 
 ~M.n;
->M.n : Symbol(M.n, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 20, 14))
+>M.n : Symbol(M.n, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 20, 22))
 >M : Symbol(M, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 18, 1))
->n : Symbol(M.n, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 20, 14))
+>n : Symbol(M.n, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 20, 22))
 
 ~~obj1.x;
->obj1.x : Symbol(x, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 12))
->obj1 : Symbol(obj1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 3))
->x : Symbol(x, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 12))
+>obj1.x : Symbol(x, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 19))
+>obj1 : Symbol(obj1, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 11))
+>x : Symbol(x, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 6, 19))
 
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.types b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.types
index 969a31311a5cd..79a8565022332 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.types
@@ -3,41 +3,29 @@
 === bitwiseNotOperatorWithAnyOtherType.ts ===
 // ~ operator on any type
 
-var ANY: any;
+declare var ANY: any;
 >ANY : any
 >    : ^^^
 
-var ANY1;
+declare var ANY1;
 >ANY1 : any
 >     : ^^^
 
-var ANY2: any[] = ["", ""];
+declare var ANY2: any[];
 >ANY2 : any[]
 >     : ^^^^^
->["", ""] : string[]
->         : ^^^^^^^^
->"" : ""
->   : ^^
->"" : ""
->   : ^^
-
-var obj: () => {}
+
+declare var obj: () => {};
 >obj : () => {}
 >    : ^^^^^^  
 
-var obj1 = { x:"", y: () => { }};
->obj1 : { x: string; y: () => void; }
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->{ x:"", y: () => { }} : { x: string; y: () => void; }
->                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->x : string
->  : ^^^^^^
->"" : ""
->   : ^^
->y : () => void
->  : ^^^^^^^^^^
->() => { } : () => void
->          : ^^^^^^^^^^
+declare var obj1: { x:"", y: () => { }};
+>obj1 : { x: ""; y: () => {}; }
+>     : ^^^^^  ^^^^^        ^^^
+>x : ""
+>  : ^^
+>y : () => {}
+>  : ^^^^^^  
 
 function foo(): any {
 >foo : () => any
@@ -76,17 +64,13 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: any;
+    export declare var n: any;
 >n : any
 >  : ^^^
 }
-var objA = new A();
+declare var objA: A;
 >objA : A
 >     : ^
->new A() : A
->        : ^
->A : typeof A
->  : ^^^^^^^^
 
 // any other type var
 var ResultIsNumber = ~ANY1;
@@ -134,8 +118,8 @@ var ResultIsNumber5 = ~obj1;
 >                : ^^^^^^
 >~obj1 : number
 >      : ^^^^^^
->obj1 : { x: string; y: () => void; }
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>obj1 : { x: ""; y: () => {}; }
+>     : ^^^^^  ^^^^^        ^^^
 
 // any type literal
 var ResultIsNumber6 = ~undefined;
@@ -170,24 +154,24 @@ var ResultIsNumber9 = ~obj1.x;
 >                : ^^^^^^
 >~obj1.x : number
 >        : ^^^^^^
->obj1.x : string
->       : ^^^^^^
->obj1 : { x: string; y: () => void; }
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->x : string
->  : ^^^^^^
+>obj1.x : ""
+>       : ^^
+>obj1 : { x: ""; y: () => {}; }
+>     : ^^^^^  ^^^^^        ^^^
+>x : ""
+>  : ^^
 
 var ResultIsNumber10 = ~obj1.y;
 >ResultIsNumber10 : number
 >                 : ^^^^^^
 >~obj1.y : number
 >        : ^^^^^^
->obj1.y : () => void
->       : ^^^^^^^^^^
->obj1 : { x: string; y: () => void; }
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->y : () => void
->  : ^^^^^^^^^^
+>obj1.y : () => {}
+>       : ^^^^^^  
+>obj1 : { x: ""; y: () => {}; }
+>     : ^^^^^  ^^^^^        ^^^
+>y : () => {}
+>  : ^^^^^^  
 
 var ResultIsNumber11 = ~objA.a;
 >ResultIsNumber11 : number
@@ -352,12 +336,12 @@ var ResultIsNumber20 = ~~~(ANY + ANY1);
 ~obj1.y;
 >~obj1.y : number
 >        : ^^^^^^
->obj1.y : () => void
->       : ^^^^^^^^^^
->obj1 : { x: string; y: () => void; }
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->y : () => void
->  : ^^^^^^^^^^
+>obj1.y : () => {}
+>       : ^^^^^^  
+>obj1 : { x: ""; y: () => {}; }
+>     : ^^^^^  ^^^^^        ^^^
+>y : () => {}
+>  : ^^^^^^  
 
 ~objA.a;
 >~objA.a : number
@@ -384,10 +368,10 @@ var ResultIsNumber20 = ~~~(ANY + ANY1);
 >         : ^^^^^^
 >~obj1.x : number
 >        : ^^^^^^
->obj1.x : string
->       : ^^^^^^
->obj1 : { x: string; y: () => void; }
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->x : string
->  : ^^^^^^
+>obj1.x : ""
+>       : ^^
+>obj1 : { x: ""; y: () => {}; }
+>     : ^^^^^  ^^^^^        ^^^
+>x : ""
+>  : ^^
 
diff --git a/tests/baselines/reference/blockScopedClassDeclarationAcrossFiles.errors.txt b/tests/baselines/reference/blockScopedClassDeclarationAcrossFiles.errors.txt
new file mode 100644
index 0000000000000..b6330212c6cb4
--- /dev/null
+++ b/tests/baselines/reference/blockScopedClassDeclarationAcrossFiles.errors.txt
@@ -0,0 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== c.ts (0 errors) ====
+    let foo: typeof C;
+==== b.ts (0 errors) ====
+    class C { }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/blockScopedNamespaceDifferentFile.errors.txt b/tests/baselines/reference/blockScopedNamespaceDifferentFile.errors.txt
index fa5f3d7a5cc72..dc3f899b5a225 100644
--- a/tests/baselines/reference/blockScopedNamespaceDifferentFile.errors.txt
+++ b/tests/baselines/reference/blockScopedNamespaceDifferentFile.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (0 errors) ====
     namespace C {
diff --git a/tests/baselines/reference/bluebirdStaticThis.errors.txt b/tests/baselines/reference/bluebirdStaticThis.errors.txt
index e63c4c3e3deba..316b0a02ab804 100644
--- a/tests/baselines/reference/bluebirdStaticThis.errors.txt
+++ b/tests/baselines/reference/bluebirdStaticThis.errors.txt
@@ -146,10 +146,10 @@ bluebirdStaticThis.ts(60,73): error TS2694: Namespace '"bluebirdStaticThis".Prom
         a: number;
         b: string;
     }
-    var x: any;
-    var arr: any[];
-    var foo: Foo;
-    var fooProm: Promise<Foo>;
+    declare var x: any;
+    declare var arr: any[];
+    declare var foo: Foo;
+    declare var fooProm: Promise<Foo>;
     
     fooProm = Promise.try(Promise, () => {
     	return foo;
diff --git a/tests/baselines/reference/bluebirdStaticThis.js b/tests/baselines/reference/bluebirdStaticThis.js
index 56abde4064fac..4424200e47596 100644
--- a/tests/baselines/reference/bluebirdStaticThis.js
+++ b/tests/baselines/reference/bluebirdStaticThis.js
@@ -125,10 +125,10 @@ interface Foo {
     a: number;
     b: string;
 }
-var x: any;
-var arr: any[];
-var foo: Foo;
-var fooProm: Promise<Foo>;
+declare var x: any;
+declare var arr: any[];
+declare var foo: Foo;
+declare var fooProm: Promise<Foo>;
 
 fooProm = Promise.try(Promise, () => {
 	return foo;
@@ -143,10 +143,6 @@ fooProm = Promise.try(Promise, () => {
 //// [bluebirdStaticThis.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var x;
-var arr;
-var foo;
-var fooProm;
 fooProm = Promise.try(Promise, function () {
     return foo;
 });
diff --git a/tests/baselines/reference/bluebirdStaticThis.symbols b/tests/baselines/reference/bluebirdStaticThis.symbols
index 267b935f2942d..0ef48d836f475 100644
--- a/tests/baselines/reference/bluebirdStaticThis.symbols
+++ b/tests/baselines/reference/bluebirdStaticThis.symbols
@@ -1122,56 +1122,56 @@ interface Foo {
     b: string;
 >b : Symbol(Foo.b, Decl(bluebirdStaticThis.ts, 121, 14))
 }
-var x: any;
->x : Symbol(x, Decl(bluebirdStaticThis.ts, 124, 3))
+declare var x: any;
+>x : Symbol(x, Decl(bluebirdStaticThis.ts, 124, 11))
 
-var arr: any[];
->arr : Symbol(arr, Decl(bluebirdStaticThis.ts, 125, 3))
+declare var arr: any[];
+>arr : Symbol(arr, Decl(bluebirdStaticThis.ts, 125, 11))
 
-var foo: Foo;
->foo : Symbol(foo, Decl(bluebirdStaticThis.ts, 126, 3))
+declare var foo: Foo;
+>foo : Symbol(foo, Decl(bluebirdStaticThis.ts, 126, 11))
 >Foo : Symbol(Foo, Decl(bluebirdStaticThis.ts, 118, 1))
 
-var fooProm: Promise<Foo>;
->fooProm : Symbol(fooProm, Decl(bluebirdStaticThis.ts, 127, 3))
+declare var fooProm: Promise<Foo>;
+>fooProm : Symbol(fooProm, Decl(bluebirdStaticThis.ts, 127, 11))
 >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1))
 >Foo : Symbol(Foo, Decl(bluebirdStaticThis.ts, 118, 1))
 
 fooProm = Promise.try(Promise, () => {
->fooProm : Symbol(fooProm, Decl(bluebirdStaticThis.ts, 127, 3))
+>fooProm : Symbol(fooProm, Decl(bluebirdStaticThis.ts, 127, 11))
 >Promise.try : Symbol(Promise.try, Decl(bluebirdStaticThis.ts, 5, 125), Decl(bluebirdStaticThis.ts, 6, 107))
 >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1))
 >try : Symbol(Promise.try, Decl(bluebirdStaticThis.ts, 5, 125), Decl(bluebirdStaticThis.ts, 6, 107))
 >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1))
 
 	return foo;
->foo : Symbol(foo, Decl(bluebirdStaticThis.ts, 126, 3))
+>foo : Symbol(foo, Decl(bluebirdStaticThis.ts, 126, 11))
 
 });
 fooProm = Promise.try(Promise, () => {
->fooProm : Symbol(fooProm, Decl(bluebirdStaticThis.ts, 127, 3))
+>fooProm : Symbol(fooProm, Decl(bluebirdStaticThis.ts, 127, 11))
 >Promise.try : Symbol(Promise.try, Decl(bluebirdStaticThis.ts, 5, 125), Decl(bluebirdStaticThis.ts, 6, 107))
 >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1))
 >try : Symbol(Promise.try, Decl(bluebirdStaticThis.ts, 5, 125), Decl(bluebirdStaticThis.ts, 6, 107))
 >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1))
 
 	return foo;
->foo : Symbol(foo, Decl(bluebirdStaticThis.ts, 126, 3))
+>foo : Symbol(foo, Decl(bluebirdStaticThis.ts, 126, 11))
 
 }, arr);
->arr : Symbol(arr, Decl(bluebirdStaticThis.ts, 125, 3))
+>arr : Symbol(arr, Decl(bluebirdStaticThis.ts, 125, 11))
 
 fooProm = Promise.try(Promise, () => {
->fooProm : Symbol(fooProm, Decl(bluebirdStaticThis.ts, 127, 3))
+>fooProm : Symbol(fooProm, Decl(bluebirdStaticThis.ts, 127, 11))
 >Promise.try : Symbol(Promise.try, Decl(bluebirdStaticThis.ts, 5, 125), Decl(bluebirdStaticThis.ts, 6, 107))
 >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1))
 >try : Symbol(Promise.try, Decl(bluebirdStaticThis.ts, 5, 125), Decl(bluebirdStaticThis.ts, 6, 107))
 >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1))
 
 	return foo;
->foo : Symbol(foo, Decl(bluebirdStaticThis.ts, 126, 3))
+>foo : Symbol(foo, Decl(bluebirdStaticThis.ts, 126, 11))
 
 }, arr, x);
->arr : Symbol(arr, Decl(bluebirdStaticThis.ts, 125, 3))
->x : Symbol(x, Decl(bluebirdStaticThis.ts, 124, 3))
+>arr : Symbol(arr, Decl(bluebirdStaticThis.ts, 125, 11))
+>x : Symbol(x, Decl(bluebirdStaticThis.ts, 124, 11))
 
diff --git a/tests/baselines/reference/bluebirdStaticThis.types b/tests/baselines/reference/bluebirdStaticThis.types
index d544d41396a90..5611a3a4086e7 100644
--- a/tests/baselines/reference/bluebirdStaticThis.types
+++ b/tests/baselines/reference/bluebirdStaticThis.types
@@ -1202,19 +1202,19 @@ interface Foo {
 >b : string
 >  : ^^^^^^
 }
-var x: any;
+declare var x: any;
 >x : any
 >  : ^^^
 
-var arr: any[];
+declare var arr: any[];
 >arr : any[]
 >    : ^^^^^
 
-var foo: Foo;
+declare var foo: Foo;
 >foo : Foo
 >    : ^^^
 
-var fooProm: Promise<Foo>;
+declare var fooProm: Promise<Foo>;
 >fooProm : Promise<Foo>
 >        : ^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/booleanAssignment.errors.txt b/tests/baselines/reference/booleanAssignment.errors.txt
index a24110e7364ea..9d870eb33d857 100644
--- a/tests/baselines/reference/booleanAssignment.errors.txt
+++ b/tests/baselines/reference/booleanAssignment.errors.txt
@@ -24,5 +24,5 @@ booleanAssignment.ts(4,1): error TS2322: Type '{}' is not assignable to type 'Bo
     
     b = true; // OK
     
-    var b2:boolean;
+    declare var b2:boolean;
     b = b2; // OK
\ No newline at end of file
diff --git a/tests/baselines/reference/booleanAssignment.js b/tests/baselines/reference/booleanAssignment.js
index 4f2b0917b0777..727823c4375ce 100644
--- a/tests/baselines/reference/booleanAssignment.js
+++ b/tests/baselines/reference/booleanAssignment.js
@@ -11,7 +11,7 @@ o = b; // OK
 
 b = true; // OK
 
-var b2:boolean;
+declare var b2:boolean;
 b = b2; // OK
 
 //// [booleanAssignment.js]
@@ -22,5 +22,4 @@ b = {}; // Error
 var o = {};
 o = b; // OK
 b = true; // OK
-var b2;
 b = b2; // OK
diff --git a/tests/baselines/reference/booleanAssignment.symbols b/tests/baselines/reference/booleanAssignment.symbols
index 4dbdc3df0fbd4..ae0c80eef8f7c 100644
--- a/tests/baselines/reference/booleanAssignment.symbols
+++ b/tests/baselines/reference/booleanAssignment.symbols
@@ -24,10 +24,10 @@ o = b; // OK
 b = true; // OK
 >b : Symbol(b, Decl(booleanAssignment.ts, 0, 3))
 
-var b2:boolean;
->b2 : Symbol(b2, Decl(booleanAssignment.ts, 10, 3))
+declare var b2:boolean;
+>b2 : Symbol(b2, Decl(booleanAssignment.ts, 10, 11))
 
 b = b2; // OK
 >b : Symbol(b, Decl(booleanAssignment.ts, 0, 3))
->b2 : Symbol(b2, Decl(booleanAssignment.ts, 10, 3))
+>b2 : Symbol(b2, Decl(booleanAssignment.ts, 10, 11))
 
diff --git a/tests/baselines/reference/booleanAssignment.types b/tests/baselines/reference/booleanAssignment.types
index b5bbc571bf2df..f438aa2073f56 100644
--- a/tests/baselines/reference/booleanAssignment.types
+++ b/tests/baselines/reference/booleanAssignment.types
@@ -55,7 +55,7 @@ b = true; // OK
 >true : true
 >     : ^^^^
 
-var b2:boolean;
+declare var b2:boolean;
 >b2 : boolean
 >   : ^^^^^^^
 
diff --git a/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.js b/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.js
index 45a77912690ed..36f1719bd640d 100644
--- a/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.js
+++ b/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.js
@@ -1,6 +1,7 @@
 //// [tests/cases/compiler/booleanLiteralsContextuallyTypedFromUnion.tsx] ////
 
 //// [booleanLiteralsContextuallyTypedFromUnion.tsx]
+/// <reference path="/.lib/react.d.ts" />
 interface A { isIt: true; text: string; }
 interface B { isIt: false; value: number; }
 type C = A | B;
@@ -28,6 +29,7 @@ let Success = () => <Funk {...attrs2} />
 
 //// [booleanLiteralsContextuallyTypedFromUnion.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var isIt = Math.random() > 0.5;
 var c = isIt ? { isIt: isIt, text: 'hey' } : { isIt: isIt, value: 123 };
 var cc = isIt ? { isIt: isIt, text: 'hey' } : { isIt: isIt, value: 123 };
diff --git a/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.symbols b/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.symbols
index 950cefddab7cf..af1ec93e9fced 100644
--- a/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.symbols
+++ b/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.symbols
@@ -1,99 +1,100 @@
 //// [tests/cases/compiler/booleanLiteralsContextuallyTypedFromUnion.tsx] ////
 
 === booleanLiteralsContextuallyTypedFromUnion.tsx ===
+/// <reference path="react.d.ts" />
 interface A { isIt: true; text: string; }
 >A : Symbol(A, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 0, 0))
->isIt : Symbol(A.isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 0, 13))
->text : Symbol(A.text, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 0, 25))
+>isIt : Symbol(A.isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 1, 13))
+>text : Symbol(A.text, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 1, 25))
 
 interface B { isIt: false; value: number; }
->B : Symbol(B, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 0, 41))
->isIt : Symbol(B.isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 1, 13))
->value : Symbol(B.value, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 1, 26))
+>B : Symbol(B, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 1, 41))
+>isIt : Symbol(B.isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 2, 13))
+>value : Symbol(B.value, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 2, 26))
 
 type C = A | B;
->C : Symbol(C, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 1, 43))
+>C : Symbol(C, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 2, 43))
 >A : Symbol(A, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 0, 0))
->B : Symbol(B, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 0, 41))
+>B : Symbol(B, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 1, 41))
 
 const isIt = Math.random() > 0.5;
->isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 3, 5))
+>isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 4, 5))
 >Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
 >Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
 
 const c: C = isIt ? { isIt, text: 'hey' } : { isIt, value: 123 };
->c : Symbol(c, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 4, 5))
->C : Symbol(C, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 1, 43))
->isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 3, 5))
->isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 4, 21))
->text : Symbol(text, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 4, 27))
->isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 4, 45))
->value : Symbol(value, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 4, 51))
+>c : Symbol(c, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 5, 5))
+>C : Symbol(C, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 2, 43))
+>isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 4, 5))
+>isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 5, 21))
+>text : Symbol(text, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 5, 27))
+>isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 5, 45))
+>value : Symbol(value, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 5, 51))
 
 const cc: C = isIt ? { isIt: isIt, text: 'hey' } : { isIt: isIt, value: 123 };
->cc : Symbol(cc, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 5, 5))
->C : Symbol(C, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 1, 43))
->isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 3, 5))
->isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 5, 22))
->isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 3, 5))
->text : Symbol(text, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 5, 34))
->isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 5, 52))
->isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 3, 5))
->value : Symbol(value, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 5, 64))
+>cc : Symbol(cc, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 6, 5))
+>C : Symbol(C, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 2, 43))
+>isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 4, 5))
+>isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 6, 22))
+>isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 4, 5))
+>text : Symbol(text, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 6, 34))
+>isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 6, 52))
+>isIt : Symbol(isIt, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 4, 5))
+>value : Symbol(value, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 6, 64))
 
 type ComponentProps =
->ComponentProps : Symbol(ComponentProps, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 5, 78))
+>ComponentProps : Symbol(ComponentProps, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 6, 78))
 
     | {
         optionalBool: true;
->optionalBool : Symbol(optionalBool, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 8, 7))
+>optionalBool : Symbol(optionalBool, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 9, 7))
 
         mandatoryFn: () => void;
->mandatoryFn : Symbol(mandatoryFn, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 9, 27))
+>mandatoryFn : Symbol(mandatoryFn, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 10, 27))
     }
     | {
         optionalBool: false;
->optionalBool : Symbol(optionalBool, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 12, 7))
+>optionalBool : Symbol(optionalBool, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 13, 7))
 
     };
 
 let Funk = (_props: ComponentProps) => <div>Hello</div>;
->Funk : Symbol(Funk, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 16, 3))
->_props : Symbol(_props, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 16, 12))
->ComponentProps : Symbol(ComponentProps, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 5, 78))
+>Funk : Symbol(Funk, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 17, 3))
+>_props : Symbol(_props, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 17, 12))
+>ComponentProps : Symbol(ComponentProps, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 6, 78))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
 let Fail1 = () => <Funk mandatoryFn={() => { }} optionalBool={true} />
->Fail1 : Symbol(Fail1, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 18, 3))
->Funk : Symbol(Funk, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 16, 3))
->mandatoryFn : Symbol(mandatoryFn, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 18, 23))
->optionalBool : Symbol(optionalBool, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 18, 47))
-
-let Fail2 = () => <Funk mandatoryFn={() => { }} optionalBool={true as true} />
->Fail2 : Symbol(Fail2, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 19, 3))
->Funk : Symbol(Funk, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 16, 3))
+>Fail1 : Symbol(Fail1, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 19, 3))
+>Funk : Symbol(Funk, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 17, 3))
 >mandatoryFn : Symbol(mandatoryFn, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 19, 23))
 >optionalBool : Symbol(optionalBool, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 19, 47))
 
+let Fail2 = () => <Funk mandatoryFn={() => { }} optionalBool={true as true} />
+>Fail2 : Symbol(Fail2, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 20, 3))
+>Funk : Symbol(Funk, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 17, 3))
+>mandatoryFn : Symbol(mandatoryFn, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 20, 23))
+>optionalBool : Symbol(optionalBool, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 20, 47))
+
 let True = true as true;
->True : Symbol(True, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 20, 3))
+>True : Symbol(True, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 21, 3))
 
 let Fail3 = () => <Funk mandatoryFn={() => { }} optionalBool={True} />
->Fail3 : Symbol(Fail3, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 21, 3))
->Funk : Symbol(Funk, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 16, 3))
->mandatoryFn : Symbol(mandatoryFn, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 21, 23))
->optionalBool : Symbol(optionalBool, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 21, 47))
->True : Symbol(True, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 20, 3))
+>Fail3 : Symbol(Fail3, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 22, 3))
+>Funk : Symbol(Funk, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 17, 3))
+>mandatoryFn : Symbol(mandatoryFn, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 22, 23))
+>optionalBool : Symbol(optionalBool, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 22, 47))
+>True : Symbol(True, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 21, 3))
 
 let attrs2 = { optionalBool: true as true, mandatoryFn: () => { } }
->attrs2 : Symbol(attrs2, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 22, 3))
->optionalBool : Symbol(optionalBool, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 22, 14))
->mandatoryFn : Symbol(mandatoryFn, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 22, 42))
+>attrs2 : Symbol(attrs2, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 23, 3))
+>optionalBool : Symbol(optionalBool, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 23, 14))
+>mandatoryFn : Symbol(mandatoryFn, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 23, 42))
 
 let Success = () => <Funk {...attrs2} />
->Success : Symbol(Success, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 23, 3))
->Funk : Symbol(Funk, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 16, 3))
->attrs2 : Symbol(attrs2, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 22, 3))
+>Success : Symbol(Success, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 24, 3))
+>Funk : Symbol(Funk, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 17, 3))
+>attrs2 : Symbol(attrs2, Decl(booleanLiteralsContextuallyTypedFromUnion.tsx, 23, 3))
 
diff --git a/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.types b/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.types
index 087cc757c2f27..9d2cae17a0c11 100644
--- a/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.types
+++ b/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.types
@@ -1,6 +1,7 @@
 //// [tests/cases/compiler/booleanLiteralsContextuallyTypedFromUnion.tsx] ////
 
 === booleanLiteralsContextuallyTypedFromUnion.tsx ===
+/// <reference path="react.d.ts" />
 interface A { isIt: true; text: string; }
 >isIt : true
 >     : ^^^^
diff --git a/tests/baselines/reference/bundledDtsLateExportRenaming.errors.txt b/tests/baselines/reference/bundledDtsLateExportRenaming.errors.txt
new file mode 100644
index 0000000000000..8c444742255a6
--- /dev/null
+++ b/tests/baselines/reference/bundledDtsLateExportRenaming.errors.txt
@@ -0,0 +1,30 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== index.ts (0 errors) ====
+    export * from "./nested";
+    
+==== nested/base.ts (0 errors) ====
+    import { B } from "./shared";
+    
+    export function f() {
+        return new B();
+    }
+    
+==== nested/derived.ts (0 errors) ====
+    import { f } from "./base";
+    
+    export function g() {
+        return f();
+    }
+    
+==== nested/index.ts (0 errors) ====
+    export * from "./base";
+    
+    export * from "./derived";
+    export * from "./shared";
+    
+==== nested/shared.ts (0 errors) ====
+    export class B {}
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/bundledDtsLateExportRenaming.js b/tests/baselines/reference/bundledDtsLateExportRenaming.js
index 4e7483a20d845..52b642b655e1f 100644
--- a/tests/baselines/reference/bundledDtsLateExportRenaming.js
+++ b/tests/baselines/reference/bundledDtsLateExportRenaming.js
@@ -49,34 +49,3 @@ declare module "nested/index" {
 declare module "index" {
     export * from "nested/index";
 }
-
-
-//// [DtsFileErrors]
-
-
-dist/out.d.ts(10,33): error TS2307: Cannot find module 'nested' or its corresponding type declarations.
-
-
-==== dist/out.d.ts (1 errors) ====
-    declare module "nested/shared" {
-        export class B {
-        }
-    }
-    declare module "nested/base" {
-        import { B } from "nested/shared";
-        export function f(): B;
-    }
-    declare module "nested/derived" {
-        export function g(): import("nested").B;
-                                    ~~~~~~~~
-!!! error TS2307: Cannot find module 'nested' or its corresponding type declarations.
-    }
-    declare module "nested/index" {
-        export * from "nested/base";
-        export * from "nested/derived";
-        export * from "nested/shared";
-    }
-    declare module "index" {
-        export * from "nested/index";
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/callConstructAssignment.errors.txt b/tests/baselines/reference/callConstructAssignment.errors.txt
index b978e24c258ca..0f6742f6ace7f 100644
--- a/tests/baselines/reference/callConstructAssignment.errors.txt
+++ b/tests/baselines/reference/callConstructAssignment.errors.txt
@@ -5,9 +5,9 @@ callConstructAssignment.ts(6,1): error TS2322: Type '() => void' is not assignab
 
 
 ==== callConstructAssignment.ts (2 errors) ====
-    var foo:{ ( ):void; }
+    declare var foo:{ ( ):void; }
     
-    var bar:{ new ( ):any; }
+    declare var bar:{ new ( ):any; }
     
     foo = bar; // error
     ~~~
diff --git a/tests/baselines/reference/callConstructAssignment.js b/tests/baselines/reference/callConstructAssignment.js
index 1ecd7e794f085..2ecc4ef183923 100644
--- a/tests/baselines/reference/callConstructAssignment.js
+++ b/tests/baselines/reference/callConstructAssignment.js
@@ -1,15 +1,13 @@
 //// [tests/cases/compiler/callConstructAssignment.ts] ////
 
 //// [callConstructAssignment.ts]
-var foo:{ ( ):void; }
+declare var foo:{ ( ):void; }
 
-var bar:{ new ( ):any; }
+declare var bar:{ new ( ):any; }
 
 foo = bar; // error
 bar = foo; // error
 
 //// [callConstructAssignment.js]
-var foo;
-var bar;
 foo = bar; // error
 bar = foo; // error
diff --git a/tests/baselines/reference/callConstructAssignment.symbols b/tests/baselines/reference/callConstructAssignment.symbols
index 8a851cde75d1c..6020819f4058f 100644
--- a/tests/baselines/reference/callConstructAssignment.symbols
+++ b/tests/baselines/reference/callConstructAssignment.symbols
@@ -1,17 +1,17 @@
 //// [tests/cases/compiler/callConstructAssignment.ts] ////
 
 === callConstructAssignment.ts ===
-var foo:{ ( ):void; }
->foo : Symbol(foo, Decl(callConstructAssignment.ts, 0, 3))
+declare var foo:{ ( ):void; }
+>foo : Symbol(foo, Decl(callConstructAssignment.ts, 0, 11))
 
-var bar:{ new ( ):any; }
->bar : Symbol(bar, Decl(callConstructAssignment.ts, 2, 3))
+declare var bar:{ new ( ):any; }
+>bar : Symbol(bar, Decl(callConstructAssignment.ts, 2, 11))
 
 foo = bar; // error
->foo : Symbol(foo, Decl(callConstructAssignment.ts, 0, 3))
->bar : Symbol(bar, Decl(callConstructAssignment.ts, 2, 3))
+>foo : Symbol(foo, Decl(callConstructAssignment.ts, 0, 11))
+>bar : Symbol(bar, Decl(callConstructAssignment.ts, 2, 11))
 
 bar = foo; // error
->bar : Symbol(bar, Decl(callConstructAssignment.ts, 2, 3))
->foo : Symbol(foo, Decl(callConstructAssignment.ts, 0, 3))
+>bar : Symbol(bar, Decl(callConstructAssignment.ts, 2, 11))
+>foo : Symbol(foo, Decl(callConstructAssignment.ts, 0, 11))
 
diff --git a/tests/baselines/reference/callConstructAssignment.types b/tests/baselines/reference/callConstructAssignment.types
index f6c70e5598efa..25e78d77ff5ea 100644
--- a/tests/baselines/reference/callConstructAssignment.types
+++ b/tests/baselines/reference/callConstructAssignment.types
@@ -1,11 +1,11 @@
 //// [tests/cases/compiler/callConstructAssignment.ts] ////
 
 === callConstructAssignment.ts ===
-var foo:{ ( ):void; }
+declare var foo:{ ( ):void; }
 >foo : () => void
 >    : ^^^^^^    
 
-var bar:{ new ( ):any; }
+declare var bar:{ new ( ):any; }
 >bar : new () => any
 >    : ^^^^^^^^^^   
 
diff --git a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.errors.txt b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.errors.txt
index 19ef7aa63ac19..14d0e666de94e 100644
--- a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.errors.txt
+++ b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.errors.txt
@@ -34,7 +34,7 @@ callGenericFunctionWithIncorrectNumberOfTypeArguments.ts(44,16): error TS2558: E
                  ~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2558: Expected 2 type arguments, but got 3.
     
-    var f3: { <T, U>(x: T, y: U): T; }
+    declare var f3: { <T, U>(x: T, y: U): T; };
     var r3 = f3<number>(1, '');
                 ~~~~~~
 !!! error TS2558: Expected 2 type arguments, but got 1.
@@ -57,7 +57,7 @@ callGenericFunctionWithIncorrectNumberOfTypeArguments.ts(44,16): error TS2558: E
     interface I {
         f<T, U>(x: T, y: U): T;
     }
-    var i: I;
+    declare var i: I;
     var r5 = i.f<number>(1, '');
                  ~~~~~~
 !!! error TS2558: Expected 2 type arguments, but got 1.
@@ -80,7 +80,7 @@ callGenericFunctionWithIncorrectNumberOfTypeArguments.ts(44,16): error TS2558: E
     interface I2<T, U> {
         f(x: T, y: U): T;
     }
-    var i2: I2<number, string>;
+    declare var i2: I2<number, string>;
     var r7 = i2.f<number>(1, '');
                   ~~~~~~
 !!! error TS2558: Expected 0 type arguments, but got 1.
diff --git a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js
index 686a578a9298e..956611581c8d2 100644
--- a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js
+++ b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js
@@ -12,7 +12,7 @@ var f2 = <T, U>(x: T, y: U): T => { return null; }
 var r2 = f2<number>(1, '');
 var r2b = f2<number, string, number>(1, '');
 
-var f3: { <T, U>(x: T, y: U): T; }
+declare var f3: { <T, U>(x: T, y: U): T; };
 var r3 = f3<number>(1, '');
 var r3b = f3<number, string, number>(1, '');
 
@@ -27,7 +27,7 @@ var r4b = (new C()).f<number, string, number>(1, '');
 interface I {
     f<T, U>(x: T, y: U): T;
 }
-var i: I;
+declare var i: I;
 var r5 = i.f<number>(1, '');
 var r5b = i.f<number, string, number>(1, '');
 
@@ -42,7 +42,7 @@ var r6b = (new C2()).f<number, string, number>(1, '');
 interface I2<T, U> {
     f(x: T, y: U): T;
 }
-var i2: I2<number, string>;
+declare var i2: I2<number, string>;
 var r7 = i2.f<number>(1, '');
 var r7b = i2.f<number, string, number>(1, '');
 
@@ -55,7 +55,6 @@ var r1b = f(1, '');
 var f2 = function (x, y) { return null; };
 var r2 = f2(1, '');
 var r2b = f2(1, '');
-var f3;
 var r3 = f3(1, '');
 var r3b = f3(1, '');
 var C = /** @class */ (function () {
@@ -68,7 +67,6 @@ var C = /** @class */ (function () {
 }());
 var r4 = (new C()).f(1, '');
 var r4b = (new C()).f(1, '');
-var i;
 var r5 = i.f(1, '');
 var r5b = i.f(1, '');
 var C2 = /** @class */ (function () {
@@ -81,6 +79,5 @@ var C2 = /** @class */ (function () {
 }());
 var r6 = (new C2()).f(1, '');
 var r6b = (new C2()).f(1, '');
-var i2;
 var r7 = i2.f(1, '');
 var r7b = i2.f(1, '');
diff --git a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.symbols b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.symbols
index 7eec1bcb37164..9a0c83e7fd467 100644
--- a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.symbols
+++ b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.symbols
@@ -40,23 +40,23 @@ var r2b = f2<number, string, number>(1, '');
 >r2b : Symbol(r2b, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 9, 3))
 >f2 : Symbol(f2, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 7, 3))
 
-var f3: { <T, U>(x: T, y: U): T; }
->f3 : Symbol(f3, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 3))
->T : Symbol(T, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 11))
->U : Symbol(U, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 13))
->x : Symbol(x, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 17))
->T : Symbol(T, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 11))
->y : Symbol(y, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 22))
->U : Symbol(U, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 13))
->T : Symbol(T, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 11))
+declare var f3: { <T, U>(x: T, y: U): T; };
+>f3 : Symbol(f3, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 11))
+>T : Symbol(T, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 19))
+>U : Symbol(U, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 21))
+>x : Symbol(x, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 25))
+>T : Symbol(T, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 19))
+>y : Symbol(y, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 30))
+>U : Symbol(U, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 21))
+>T : Symbol(T, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 19))
 
 var r3 = f3<number>(1, '');
 >r3 : Symbol(r3, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 12, 3))
->f3 : Symbol(f3, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 3))
+>f3 : Symbol(f3, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 11))
 
 var r3b = f3<number, string, number>(1, '');
 >r3b : Symbol(r3b, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 13, 3))
->f3 : Symbol(f3, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 3))
+>f3 : Symbol(f3, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 11, 11))
 
 class C {
 >C : Symbol(C, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 13, 44))
@@ -99,20 +99,20 @@ interface I {
 >U : Symbol(U, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 24, 8))
 >T : Symbol(T, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 24, 6))
 }
-var i: I;
->i : Symbol(i, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 26, 3))
+declare var i: I;
+>i : Symbol(i, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 26, 11))
 >I : Symbol(I, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 21, 53))
 
 var r5 = i.f<number>(1, '');
 >r5 : Symbol(r5, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 27, 3))
 >i.f : Symbol(I.f, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 23, 13))
->i : Symbol(i, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 26, 3))
+>i : Symbol(i, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 26, 11))
 >f : Symbol(I.f, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 23, 13))
 
 var r5b = i.f<number, string, number>(1, '');
 >r5b : Symbol(r5b, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 28, 3))
 >i.f : Symbol(I.f, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 23, 13))
->i : Symbol(i, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 26, 3))
+>i : Symbol(i, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 26, 11))
 >f : Symbol(I.f, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 23, 13))
 
 class C2<T, U> {
@@ -156,19 +156,19 @@ interface I2<T, U> {
 >U : Symbol(U, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 38, 15))
 >T : Symbol(T, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 38, 13))
 }
-var i2: I2<number, string>;
->i2 : Symbol(i2, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 41, 3))
+declare var i2: I2<number, string>;
+>i2 : Symbol(i2, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 41, 11))
 >I2 : Symbol(I2, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 36, 54))
 
 var r7 = i2.f<number>(1, '');
 >r7 : Symbol(r7, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 42, 3))
 >i2.f : Symbol(I2.f, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 38, 20))
->i2 : Symbol(i2, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 41, 3))
+>i2 : Symbol(i2, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 41, 11))
 >f : Symbol(I2.f, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 38, 20))
 
 var r7b = i2.f<number, string, number>(1, '');
 >r7b : Symbol(r7b, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 43, 3))
 >i2.f : Symbol(I2.f, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 38, 20))
->i2 : Symbol(i2, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 41, 3))
+>i2 : Symbol(i2, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 41, 11))
 >f : Symbol(I2.f, Decl(callGenericFunctionWithIncorrectNumberOfTypeArguments.ts, 38, 20))
 
diff --git a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.types b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.types
index d142977e5f21c..5fcca149b8cc1 100644
--- a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.types
+++ b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.types
@@ -70,7 +70,7 @@ var r2b = f2<number, string, number>(1, '');
 >'' : ""
 >   : ^^
 
-var f3: { <T, U>(x: T, y: U): T; }
+declare var f3: { <T, U>(x: T, y: U): T; };
 >f3 : <T, U>(x: T, y: U) => T
 >   : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
 >x : T
@@ -166,7 +166,7 @@ interface I {
 >y : U
 >  : ^
 }
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
@@ -266,7 +266,7 @@ interface I2<T, U> {
 >y : U
 >  : ^
 }
-var i2: I2<number, string>;
+declare var i2: I2<number, string>;
 >i2 : I2<number, string>
 >   : ^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.errors.txt b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.errors.txt
index 478826f64c788..e4792a3a8e28d 100644
--- a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.errors.txt
+++ b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.errors.txt
@@ -23,7 +23,7 @@ callNonGenericFunctionWithTypeArguments.ts(43,10): error TS2347: Untyped functio
                 ~~~~~~
 !!! error TS2558: Expected 0 type arguments, but got 1.
     
-    var f3: { (x: number): any; }
+    declare var f3: { (x: number): any; }
     var r3 = f3<string>(1);
                 ~~~~~~
 !!! error TS2558: Expected 0 type arguments, but got 1.
@@ -40,7 +40,7 @@ callNonGenericFunctionWithTypeArguments.ts(43,10): error TS2347: Untyped functio
     interface I {
         f(x: number): any;
     }
-    var i: I;
+    declare var i: I;
     var r5 = i.f<string>(1);
                  ~~~~~~
 !!! error TS2558: Expected 0 type arguments, but got 1.
@@ -57,17 +57,17 @@ callNonGenericFunctionWithTypeArguments.ts(43,10): error TS2347: Untyped functio
     interface I2 {
         f(x: number);
     }
-    var i2: I2;
+    declare var i2: I2;
     var r7 = i2.f<string>(1);
                   ~~~~~~
 !!! error TS2558: Expected 0 type arguments, but got 1.
     
-    var a;
+    declare var a;
     var r8 = a<number>();
              ~~~~~~~~~~~
 !!! error TS2347: Untyped function calls may not accept type arguments.
     
-    var a2: any;
+    declare var a2: any;
     var r8 = a2<number>();
              ~~~~~~~~~~~~
 !!! error TS2347: Untyped function calls may not accept type arguments.
\ No newline at end of file
diff --git a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js
index 8bd2c373030cb..3ed8d92d72537 100644
--- a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js
+++ b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js
@@ -10,7 +10,7 @@ var r = f<string>(1);
 var f2 = (x: number) => { return null; }
 var r2 = f2<string>(1);
 
-var f3: { (x: number): any; }
+declare var f3: { (x: number): any; }
 var r3 = f3<string>(1);
 
 class C {
@@ -23,7 +23,7 @@ var r4 = (new C()).f<string>(1);
 interface I {
     f(x: number): any;
 }
-var i: I;
+declare var i: I;
 var r5 = i.f<string>(1);
 
 class C2 {
@@ -36,13 +36,13 @@ var r6 = (new C2()).f<string>(1);
 interface I2 {
     f(x: number);
 }
-var i2: I2;
+declare var i2: I2;
 var r7 = i2.f<string>(1);
 
-var a;
+declare var a;
 var r8 = a<number>();
 
-var a2: any;
+declare var a2: any;
 var r8 = a2<number>();
 
 //// [callNonGenericFunctionWithTypeArguments.js]
@@ -52,7 +52,6 @@ function f(x) { return null; }
 var r = f(1);
 var f2 = function (x) { return null; };
 var r2 = f2(1);
-var f3;
 var r3 = f3(1);
 var C = /** @class */ (function () {
     function C() {
@@ -63,7 +62,6 @@ var C = /** @class */ (function () {
     return C;
 }());
 var r4 = (new C()).f(1);
-var i;
 var r5 = i.f(1);
 var C2 = /** @class */ (function () {
     function C2() {
@@ -74,9 +72,6 @@ var C2 = /** @class */ (function () {
     return C2;
 }());
 var r6 = (new C2()).f(1);
-var i2;
 var r7 = i2.f(1);
-var a;
 var r8 = a();
-var a2;
 var r8 = a2();
diff --git a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.symbols b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.symbols
index 41d2d82216945..c22ba99044b35 100644
--- a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.symbols
+++ b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.symbols
@@ -20,13 +20,13 @@ var r2 = f2<string>(1);
 >r2 : Symbol(r2, Decl(callNonGenericFunctionWithTypeArguments.ts, 7, 3))
 >f2 : Symbol(f2, Decl(callNonGenericFunctionWithTypeArguments.ts, 6, 3))
 
-var f3: { (x: number): any; }
->f3 : Symbol(f3, Decl(callNonGenericFunctionWithTypeArguments.ts, 9, 3))
->x : Symbol(x, Decl(callNonGenericFunctionWithTypeArguments.ts, 9, 11))
+declare var f3: { (x: number): any; }
+>f3 : Symbol(f3, Decl(callNonGenericFunctionWithTypeArguments.ts, 9, 11))
+>x : Symbol(x, Decl(callNonGenericFunctionWithTypeArguments.ts, 9, 19))
 
 var r3 = f3<string>(1);
 >r3 : Symbol(r3, Decl(callNonGenericFunctionWithTypeArguments.ts, 10, 3))
->f3 : Symbol(f3, Decl(callNonGenericFunctionWithTypeArguments.ts, 9, 3))
+>f3 : Symbol(f3, Decl(callNonGenericFunctionWithTypeArguments.ts, 9, 11))
 
 class C {
 >C : Symbol(C, Decl(callNonGenericFunctionWithTypeArguments.ts, 10, 23))
@@ -51,14 +51,14 @@ interface I {
 >f : Symbol(I.f, Decl(callNonGenericFunctionWithTypeArguments.ts, 19, 13))
 >x : Symbol(x, Decl(callNonGenericFunctionWithTypeArguments.ts, 20, 6))
 }
-var i: I;
->i : Symbol(i, Decl(callNonGenericFunctionWithTypeArguments.ts, 22, 3))
+declare var i: I;
+>i : Symbol(i, Decl(callNonGenericFunctionWithTypeArguments.ts, 22, 11))
 >I : Symbol(I, Decl(callNonGenericFunctionWithTypeArguments.ts, 17, 32))
 
 var r5 = i.f<string>(1);
 >r5 : Symbol(r5, Decl(callNonGenericFunctionWithTypeArguments.ts, 23, 3))
 >i.f : Symbol(I.f, Decl(callNonGenericFunctionWithTypeArguments.ts, 19, 13))
->i : Symbol(i, Decl(callNonGenericFunctionWithTypeArguments.ts, 22, 3))
+>i : Symbol(i, Decl(callNonGenericFunctionWithTypeArguments.ts, 22, 11))
 >f : Symbol(I.f, Decl(callNonGenericFunctionWithTypeArguments.ts, 19, 13))
 
 class C2 {
@@ -84,27 +84,27 @@ interface I2 {
 >f : Symbol(I2.f, Decl(callNonGenericFunctionWithTypeArguments.ts, 32, 14))
 >x : Symbol(x, Decl(callNonGenericFunctionWithTypeArguments.ts, 33, 6))
 }
-var i2: I2;
->i2 : Symbol(i2, Decl(callNonGenericFunctionWithTypeArguments.ts, 35, 3))
+declare var i2: I2;
+>i2 : Symbol(i2, Decl(callNonGenericFunctionWithTypeArguments.ts, 35, 11))
 >I2 : Symbol(I2, Decl(callNonGenericFunctionWithTypeArguments.ts, 30, 33))
 
 var r7 = i2.f<string>(1);
 >r7 : Symbol(r7, Decl(callNonGenericFunctionWithTypeArguments.ts, 36, 3))
 >i2.f : Symbol(I2.f, Decl(callNonGenericFunctionWithTypeArguments.ts, 32, 14))
->i2 : Symbol(i2, Decl(callNonGenericFunctionWithTypeArguments.ts, 35, 3))
+>i2 : Symbol(i2, Decl(callNonGenericFunctionWithTypeArguments.ts, 35, 11))
 >f : Symbol(I2.f, Decl(callNonGenericFunctionWithTypeArguments.ts, 32, 14))
 
-var a;
->a : Symbol(a, Decl(callNonGenericFunctionWithTypeArguments.ts, 38, 3))
+declare var a;
+>a : Symbol(a, Decl(callNonGenericFunctionWithTypeArguments.ts, 38, 11))
 
 var r8 = a<number>();
 >r8 : Symbol(r8, Decl(callNonGenericFunctionWithTypeArguments.ts, 39, 3), Decl(callNonGenericFunctionWithTypeArguments.ts, 42, 3))
->a : Symbol(a, Decl(callNonGenericFunctionWithTypeArguments.ts, 38, 3))
+>a : Symbol(a, Decl(callNonGenericFunctionWithTypeArguments.ts, 38, 11))
 
-var a2: any;
->a2 : Symbol(a2, Decl(callNonGenericFunctionWithTypeArguments.ts, 41, 3))
+declare var a2: any;
+>a2 : Symbol(a2, Decl(callNonGenericFunctionWithTypeArguments.ts, 41, 11))
 
 var r8 = a2<number>();
 >r8 : Symbol(r8, Decl(callNonGenericFunctionWithTypeArguments.ts, 39, 3), Decl(callNonGenericFunctionWithTypeArguments.ts, 42, 3))
->a2 : Symbol(a2, Decl(callNonGenericFunctionWithTypeArguments.ts, 41, 3))
+>a2 : Symbol(a2, Decl(callNonGenericFunctionWithTypeArguments.ts, 41, 11))
 
diff --git a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.types b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.types
index b5bfc3d90ccee..85e56fbe6a212 100644
--- a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.types
+++ b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.types
@@ -38,7 +38,7 @@ var r2 = f2<string>(1);
 >1 : 1
 >  : ^
 
-var f3: { (x: number): any; }
+declare var f3: { (x: number): any; }
 >f3 : (x: number) => any
 >   : ^ ^^      ^^^^^   
 >x : number
@@ -92,7 +92,7 @@ interface I {
 >x : number
 >  : ^^^^^^
 }
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
@@ -148,7 +148,7 @@ interface I2 {
 >x : number
 >  : ^^^^^^
 }
-var i2: I2;
+declare var i2: I2;
 >i2 : I2
 >   : ^^
 
@@ -166,7 +166,7 @@ var r7 = i2.f<string>(1);
 >1 : 1
 >  : ^
 
-var a;
+declare var a;
 >a : any
 >  : ^^^
 
@@ -178,7 +178,7 @@ var r8 = a<number>();
 >a : any
 >  : ^^^
 
-var a2: any;
+declare var a2: any;
 >a2 : any
 >   : ^^^
 
diff --git a/tests/baselines/reference/callOverload.errors.txt b/tests/baselines/reference/callOverload.errors.txt
index e10608b023b7d..2dbf56fc3daba 100644
--- a/tests/baselines/reference/callOverload.errors.txt
+++ b/tests/baselines/reference/callOverload.errors.txt
@@ -8,7 +8,7 @@ callOverload.ts(11,10): error TS2556: A spread argument must either have a tuple
     declare function fn(x: any): void;
     declare function takeTwo(x: any, y: any): void;
     declare function withRest(a: any, ...args: Array<any>): void;
-    var n: number[];
+    declare var n: number[];
     
     fn(1) // no error
     fn(1, 2, 3, 4)
diff --git a/tests/baselines/reference/callOverload.js b/tests/baselines/reference/callOverload.js
index a5cb85289d81b..e1e4377119ca8 100644
--- a/tests/baselines/reference/callOverload.js
+++ b/tests/baselines/reference/callOverload.js
@@ -4,7 +4,7 @@
 declare function fn(x: any): void;
 declare function takeTwo(x: any, y: any): void;
 declare function withRest(a: any, ...args: Array<any>): void;
-var n: number[];
+declare var n: number[];
 
 fn(1) // no error
 fn(1, 2, 3, 4)
@@ -23,7 +23,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-var n;
 fn(1); // no error
 fn(1, 2, 3, 4);
 takeTwo(1, 2, 3, 4);
diff --git a/tests/baselines/reference/callOverload.symbols b/tests/baselines/reference/callOverload.symbols
index 0dade2079092c..f29ef818a2325 100644
--- a/tests/baselines/reference/callOverload.symbols
+++ b/tests/baselines/reference/callOverload.symbols
@@ -16,8 +16,8 @@ declare function withRest(a: any, ...args: Array<any>): void;
 >args : Symbol(args, Decl(callOverload.ts, 2, 33))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
-var n: number[];
->n : Symbol(n, Decl(callOverload.ts, 3, 3))
+declare var n: number[];
+>n : Symbol(n, Decl(callOverload.ts, 3, 11))
 
 fn(1) // no error
 >fn : Symbol(fn, Decl(callOverload.ts, 0, 0))
@@ -30,12 +30,12 @@ takeTwo(1, 2, 3, 4)
 
 withRest('a', ...n); // no error
 >withRest : Symbol(withRest, Decl(callOverload.ts, 1, 47))
->n : Symbol(n, Decl(callOverload.ts, 3, 3))
+>n : Symbol(n, Decl(callOverload.ts, 3, 11))
 
 withRest();
 >withRest : Symbol(withRest, Decl(callOverload.ts, 1, 47))
 
 withRest(...n); 
 >withRest : Symbol(withRest, Decl(callOverload.ts, 1, 47))
->n : Symbol(n, Decl(callOverload.ts, 3, 3))
+>n : Symbol(n, Decl(callOverload.ts, 3, 11))
 
diff --git a/tests/baselines/reference/callOverload.types b/tests/baselines/reference/callOverload.types
index 3cfc7e27afd1d..c7434310c9316 100644
--- a/tests/baselines/reference/callOverload.types
+++ b/tests/baselines/reference/callOverload.types
@@ -23,7 +23,7 @@ declare function withRest(a: any, ...args: Array<any>): void;
 >args : any[]
 >     : ^^^^^
 
-var n: number[];
+declare var n: number[];
 >n : number[]
 >  : ^^^^^^^^
 
diff --git a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.errors.txt b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.errors.txt
index 8b318bfd1d482..21ef72bcac439 100644
--- a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.errors.txt
+++ b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.errors.txt
@@ -42,7 +42,7 @@ callSignatureWithOptionalParameterAndInitializer.ts(46,9): error TS1015: Paramet
 !!! error TS1015: Parameter cannot have question mark and initializer.
     }
     
-    var c: C;
+    declare var c: C;
     c.foo();
     c.foo(1);
     
@@ -59,13 +59,13 @@ callSignatureWithOptionalParameterAndInitializer.ts(46,9): error TS1015: Paramet
 !!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
     }
     
-    var i: I;
+    declare var i: I;
     i();
     i(1);
     i.foo(1);
     i.foo(1, 2);
     
-    var a: {
+    declare var a: {
         (x?: number = 1);
          ~
 !!! error TS1015: Parameter cannot have question mark and initializer.
diff --git a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.js b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.js
index 25cd2f5f1460c..e64df78dfad5f 100644
--- a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.js
+++ b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.js
@@ -18,7 +18,7 @@ class C {
     foo(x?: number = 1) { }
 }
 
-var c: C;
+declare var c: C;
 c.foo();
 c.foo(1);
 
@@ -27,13 +27,13 @@ interface I {
     foo(x: number, y?: number = 1);
 }
 
-var i: I;
+declare var i: I;
 i();
 i(1);
 i.foo(1);
 i.foo(1, 2);
 
-var a: {
+declare var a: {
     (x?: number = 1);
     foo(x? = 1);
 }
@@ -82,15 +82,12 @@ var C = /** @class */ (function () {
     };
     return C;
 }());
-var c;
 c.foo();
 c.foo(1);
-var i;
 i();
 i(1);
 i.foo(1);
 i.foo(1, 2);
-var a;
 a();
 a(1);
 a.foo();
diff --git a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.symbols b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.symbols
index eb1cbf79525a0..b4e2a839fd560 100644
--- a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.symbols
+++ b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.symbols
@@ -43,18 +43,18 @@ class C {
 >x : Symbol(x, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 14, 8))
 }
 
-var c: C;
->c : Symbol(c, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 17, 3))
+declare var c: C;
+>c : Symbol(c, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 17, 11))
 >C : Symbol(C, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 11, 9))
 
 c.foo();
 >c.foo : Symbol(C.foo, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 13, 9))
->c : Symbol(c, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 17, 3))
+>c : Symbol(c, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 17, 11))
 >foo : Symbol(C.foo, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 13, 9))
 
 c.foo(1);
 >c.foo : Symbol(C.foo, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 13, 9))
->c : Symbol(c, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 17, 3))
+>c : Symbol(c, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 17, 11))
 >foo : Symbol(C.foo, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 13, 9))
 
 interface I {
@@ -69,28 +69,28 @@ interface I {
 >y : Symbol(y, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 23, 18))
 }
 
-var i: I;
->i : Symbol(i, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 26, 3))
+declare var i: I;
+>i : Symbol(i, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 26, 11))
 >I : Symbol(I, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 19, 9))
 
 i();
->i : Symbol(i, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 26, 3))
+>i : Symbol(i, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 26, 11))
 
 i(1);
->i : Symbol(i, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 26, 3))
+>i : Symbol(i, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 26, 11))
 
 i.foo(1);
 >i.foo : Symbol(I.foo, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 22, 13))
->i : Symbol(i, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 26, 3))
+>i : Symbol(i, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 26, 11))
 >foo : Symbol(I.foo, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 22, 13))
 
 i.foo(1, 2);
 >i.foo : Symbol(I.foo, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 22, 13))
->i : Symbol(i, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 26, 3))
+>i : Symbol(i, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 26, 11))
 >foo : Symbol(I.foo, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 22, 13))
 
-var a: {
->a : Symbol(a, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 32, 3))
+declare var a: {
+>a : Symbol(a, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 32, 11))
 
     (x?: number = 1);
 >x : Symbol(x, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 33, 5))
@@ -101,19 +101,19 @@ var a: {
 }
 
 a();
->a : Symbol(a, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 32, 3))
+>a : Symbol(a, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 32, 11))
 
 a(1);
->a : Symbol(a, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 32, 3))
+>a : Symbol(a, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 32, 11))
 
 a.foo();
 >a.foo : Symbol(foo, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 33, 21))
->a : Symbol(a, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 32, 3))
+>a : Symbol(a, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 32, 11))
 >foo : Symbol(foo, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 33, 21))
 
 a.foo(1);
 >a.foo : Symbol(foo, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 33, 21))
->a : Symbol(a, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 32, 3))
+>a : Symbol(a, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 32, 11))
 >foo : Symbol(foo, Decl(callSignatureWithOptionalParameterAndInitializer.ts, 33, 21))
 
 var b = {
diff --git a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.types b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.types
index ccb78e2afb728..c936953039838 100644
--- a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.types
+++ b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.types
@@ -94,7 +94,7 @@ class C {
 >  : ^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
@@ -138,7 +138,7 @@ interface I {
 >  : ^
 }
 
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
@@ -182,7 +182,7 @@ i.foo(1, 2);
 >2 : 2
 >  : ^
 
-var a: {
+declare var a: {
 >a : { (x?: number): any; foo(x?: number): any; }
 >  : ^^^ ^^^      ^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.errors.txt b/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.errors.txt
index f4ecb661941a8..4ff3d589b4292 100644
--- a/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.errors.txt
+++ b/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.errors.txt
@@ -8,7 +8,7 @@ callSignaturesShouldBeResolvedBeforeSpecialization.ts(9,10): error TS2345: Argum
     }
     
     function foo() {
-        var test: I1<string>;
+        var test!: I1<string>;
         test("expects boolean instead of string"); // should not error - "test" should not expect a boolean
         test(true); // should error - string expected
              ~~~~
diff --git a/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.js b/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.js
index 8171e03e1d044..fa6b73519fe50 100644
--- a/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.js
+++ b/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.js
@@ -7,7 +7,7 @@ interface I1<T> {
 }
 
 function foo() {
-    var test: I1<string>;
+    var test!: I1<string>;
     test("expects boolean instead of string"); // should not error - "test" should not expect a boolean
     test(true); // should error - string expected
 }
diff --git a/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.symbols b/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.symbols
index 197ab73a63171..dbf93044fb7ef 100644
--- a/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.symbols
+++ b/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.symbols
@@ -17,7 +17,7 @@ interface I1<T> {
 function foo() {
 >foo : Symbol(foo, Decl(callSignaturesShouldBeResolvedBeforeSpecialization.ts, 3, 1))
 
-    var test: I1<string>;
+    var test!: I1<string>;
 >test : Symbol(test, Decl(callSignaturesShouldBeResolvedBeforeSpecialization.ts, 6, 7))
 >I1 : Symbol(I1, Decl(callSignaturesShouldBeResolvedBeforeSpecialization.ts, 0, 0))
 
diff --git a/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.types b/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.types
index 383eb966f6b7b..f0a4acf4768dc 100644
--- a/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.types
+++ b/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.types
@@ -15,7 +15,7 @@ function foo() {
 >foo : () => void
 >    : ^^^^^^^^^^
 
-    var test: I1<string>;
+    var test!: I1<string>;
 >test : I1<string>
 >     : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.errors.txt b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.errors.txt
index 9031c99a4af12..01b2d24b55191 100644
--- a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.errors.txt
+++ b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.errors.txt
@@ -16,7 +16,7 @@ callSignaturesThatDifferOnlyByReturnType2.ts(13,16): error TS2345: Argument of t
 !!! error TS2320: Interface 'A' cannot simultaneously extend types 'I<number>' and 'I<string>'.
 !!! error TS2320:   Named property 'foo' of types 'I<number>' and 'I<string>' are not identical.
     
-    var x: A;
+    declare var x: A;
     // BUG 822524
     var r = x.foo(1); // no error
     var r2 = x.foo(''); // error
diff --git a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.js b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.js
index 28a60d2e658fb..13da70445befb 100644
--- a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.js
+++ b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.js
@@ -10,7 +10,7 @@ interface I<T> {
 
 interface A extends I<number>, I<string> { }
 
-var x: A;
+declare var x: A;
 // BUG 822524
 var r = x.foo(1); // no error
 var r2 = x.foo(''); // error
@@ -19,7 +19,6 @@ var r2 = x.foo(''); // error
 //// [callSignaturesThatDifferOnlyByReturnType2.js]
 // Normally it is an error to have multiple overloads which differ only by return type in a single type declaration.
 // Here the multiple overloads come from multiple bases.
-var x;
 // BUG 822524
 var r = x.foo(1); // no error
 var r2 = x.foo(''); // error
diff --git a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.symbols b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.symbols
index 7d838fd71bb83..356aaa7830827 100644
--- a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.symbols
+++ b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.symbols
@@ -19,20 +19,20 @@ interface A extends I<number>, I<string> { }
 >I : Symbol(I, Decl(callSignaturesThatDifferOnlyByReturnType2.ts, 0, 0))
 >I : Symbol(I, Decl(callSignaturesThatDifferOnlyByReturnType2.ts, 0, 0))
 
-var x: A;
->x : Symbol(x, Decl(callSignaturesThatDifferOnlyByReturnType2.ts, 9, 3))
+declare var x: A;
+>x : Symbol(x, Decl(callSignaturesThatDifferOnlyByReturnType2.ts, 9, 11))
 >A : Symbol(A, Decl(callSignaturesThatDifferOnlyByReturnType2.ts, 5, 1))
 
 // BUG 822524
 var r = x.foo(1); // no error
 >r : Symbol(r, Decl(callSignaturesThatDifferOnlyByReturnType2.ts, 11, 3))
 >x.foo : Symbol(I.foo, Decl(callSignaturesThatDifferOnlyByReturnType2.ts, 3, 16))
->x : Symbol(x, Decl(callSignaturesThatDifferOnlyByReturnType2.ts, 9, 3))
+>x : Symbol(x, Decl(callSignaturesThatDifferOnlyByReturnType2.ts, 9, 11))
 >foo : Symbol(I.foo, Decl(callSignaturesThatDifferOnlyByReturnType2.ts, 3, 16))
 
 var r2 = x.foo(''); // error
 >r2 : Symbol(r2, Decl(callSignaturesThatDifferOnlyByReturnType2.ts, 12, 3))
 >x.foo : Symbol(I.foo, Decl(callSignaturesThatDifferOnlyByReturnType2.ts, 3, 16))
->x : Symbol(x, Decl(callSignaturesThatDifferOnlyByReturnType2.ts, 9, 3))
+>x : Symbol(x, Decl(callSignaturesThatDifferOnlyByReturnType2.ts, 9, 11))
 >foo : Symbol(I.foo, Decl(callSignaturesThatDifferOnlyByReturnType2.ts, 3, 16))
 
diff --git a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.types b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.types
index 3dc65a28feda9..6014ab0a82eea 100644
--- a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.types
+++ b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.types
@@ -14,7 +14,7 @@ interface I<T> {
 
 interface A extends I<number>, I<string> { }
 
-var x: A;
+declare var x: A;
 >x : A
 >  : ^
 
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers.errors.txt b/tests/baselines/reference/callSignaturesWithParameterInitializers.errors.txt
index a14b0cf78e4a7..0538df9970e48 100644
--- a/tests/baselines/reference/callSignaturesWithParameterInitializers.errors.txt
+++ b/tests/baselines/reference/callSignaturesWithParameterInitializers.errors.txt
@@ -22,7 +22,7 @@ callSignaturesWithParameterInitializers.ts(37,9): error TS2371: A parameter init
         foo(x = 1) { }
     }
     
-    var c: C;
+    declare var c: C;
     c.foo();
     c.foo(1);
     
@@ -36,14 +36,14 @@ callSignaturesWithParameterInitializers.ts(37,9): error TS2371: A parameter init
 !!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
     }
     
-    var i: I;
+    declare var i: I;
     i();
     i(1);
     i.foo(1);
     i.foo(1, 2);
     
     // these are errors
-    var a: {
+    declare var a: {
         (x = 1);
          ~~~~~
 !!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers.js b/tests/baselines/reference/callSignaturesWithParameterInitializers.js
index cfc9337ee7b5b..faf3182173d53 100644
--- a/tests/baselines/reference/callSignaturesWithParameterInitializers.js
+++ b/tests/baselines/reference/callSignaturesWithParameterInitializers.js
@@ -18,7 +18,7 @@ class C {
     foo(x = 1) { }
 }
 
-var c: C;
+declare var c: C;
 c.foo();
 c.foo(1);
 
@@ -28,14 +28,14 @@ interface I {
     foo(x: number, y = 1);
 }
 
-var i: I;
+declare var i: I;
 i();
 i(1);
 i.foo(1);
 i.foo(1, 2);
 
 // these are errors
-var a: {
+declare var a: {
     (x = 1);
     foo(x = 1);
 }
@@ -84,16 +84,12 @@ var C = /** @class */ (function () {
     };
     return C;
 }());
-var c;
 c.foo();
 c.foo(1);
-var i;
 i();
 i(1);
 i.foo(1);
 i.foo(1, 2);
-// these are errors
-var a;
 a();
 a(1);
 a.foo();
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers.symbols b/tests/baselines/reference/callSignaturesWithParameterInitializers.symbols
index c806062aac81d..8bfb184c7fd9f 100644
--- a/tests/baselines/reference/callSignaturesWithParameterInitializers.symbols
+++ b/tests/baselines/reference/callSignaturesWithParameterInitializers.symbols
@@ -43,18 +43,18 @@ class C {
 >x : Symbol(x, Decl(callSignaturesWithParameterInitializers.ts, 14, 8))
 }
 
-var c: C;
->c : Symbol(c, Decl(callSignaturesWithParameterInitializers.ts, 17, 3))
+declare var c: C;
+>c : Symbol(c, Decl(callSignaturesWithParameterInitializers.ts, 17, 11))
 >C : Symbol(C, Decl(callSignaturesWithParameterInitializers.ts, 11, 9))
 
 c.foo();
 >c.foo : Symbol(C.foo, Decl(callSignaturesWithParameterInitializers.ts, 13, 9))
->c : Symbol(c, Decl(callSignaturesWithParameterInitializers.ts, 17, 3))
+>c : Symbol(c, Decl(callSignaturesWithParameterInitializers.ts, 17, 11))
 >foo : Symbol(C.foo, Decl(callSignaturesWithParameterInitializers.ts, 13, 9))
 
 c.foo(1);
 >c.foo : Symbol(C.foo, Decl(callSignaturesWithParameterInitializers.ts, 13, 9))
->c : Symbol(c, Decl(callSignaturesWithParameterInitializers.ts, 17, 3))
+>c : Symbol(c, Decl(callSignaturesWithParameterInitializers.ts, 17, 11))
 >foo : Symbol(C.foo, Decl(callSignaturesWithParameterInitializers.ts, 13, 9))
 
 // these are errors
@@ -70,29 +70,29 @@ interface I {
 >y : Symbol(y, Decl(callSignaturesWithParameterInitializers.ts, 24, 18))
 }
 
-var i: I;
->i : Symbol(i, Decl(callSignaturesWithParameterInitializers.ts, 27, 3))
+declare var i: I;
+>i : Symbol(i, Decl(callSignaturesWithParameterInitializers.ts, 27, 11))
 >I : Symbol(I, Decl(callSignaturesWithParameterInitializers.ts, 19, 9))
 
 i();
->i : Symbol(i, Decl(callSignaturesWithParameterInitializers.ts, 27, 3))
+>i : Symbol(i, Decl(callSignaturesWithParameterInitializers.ts, 27, 11))
 
 i(1);
->i : Symbol(i, Decl(callSignaturesWithParameterInitializers.ts, 27, 3))
+>i : Symbol(i, Decl(callSignaturesWithParameterInitializers.ts, 27, 11))
 
 i.foo(1);
 >i.foo : Symbol(I.foo, Decl(callSignaturesWithParameterInitializers.ts, 23, 12))
->i : Symbol(i, Decl(callSignaturesWithParameterInitializers.ts, 27, 3))
+>i : Symbol(i, Decl(callSignaturesWithParameterInitializers.ts, 27, 11))
 >foo : Symbol(I.foo, Decl(callSignaturesWithParameterInitializers.ts, 23, 12))
 
 i.foo(1, 2);
 >i.foo : Symbol(I.foo, Decl(callSignaturesWithParameterInitializers.ts, 23, 12))
->i : Symbol(i, Decl(callSignaturesWithParameterInitializers.ts, 27, 3))
+>i : Symbol(i, Decl(callSignaturesWithParameterInitializers.ts, 27, 11))
 >foo : Symbol(I.foo, Decl(callSignaturesWithParameterInitializers.ts, 23, 12))
 
 // these are errors
-var a: {
->a : Symbol(a, Decl(callSignaturesWithParameterInitializers.ts, 34, 3))
+declare var a: {
+>a : Symbol(a, Decl(callSignaturesWithParameterInitializers.ts, 34, 11))
 
     (x = 1);
 >x : Symbol(x, Decl(callSignaturesWithParameterInitializers.ts, 35, 5))
@@ -103,19 +103,19 @@ var a: {
 }
 
 a();
->a : Symbol(a, Decl(callSignaturesWithParameterInitializers.ts, 34, 3))
+>a : Symbol(a, Decl(callSignaturesWithParameterInitializers.ts, 34, 11))
 
 a(1);
->a : Symbol(a, Decl(callSignaturesWithParameterInitializers.ts, 34, 3))
+>a : Symbol(a, Decl(callSignaturesWithParameterInitializers.ts, 34, 11))
 
 a.foo();
 >a.foo : Symbol(foo, Decl(callSignaturesWithParameterInitializers.ts, 35, 12))
->a : Symbol(a, Decl(callSignaturesWithParameterInitializers.ts, 34, 3))
+>a : Symbol(a, Decl(callSignaturesWithParameterInitializers.ts, 34, 11))
 >foo : Symbol(foo, Decl(callSignaturesWithParameterInitializers.ts, 35, 12))
 
 a.foo(1);
 >a.foo : Symbol(foo, Decl(callSignaturesWithParameterInitializers.ts, 35, 12))
->a : Symbol(a, Decl(callSignaturesWithParameterInitializers.ts, 34, 3))
+>a : Symbol(a, Decl(callSignaturesWithParameterInitializers.ts, 34, 11))
 >foo : Symbol(foo, Decl(callSignaturesWithParameterInitializers.ts, 35, 12))
 
 var b = {
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers.types b/tests/baselines/reference/callSignaturesWithParameterInitializers.types
index 2c5664d42aa10..add87f041420b 100644
--- a/tests/baselines/reference/callSignaturesWithParameterInitializers.types
+++ b/tests/baselines/reference/callSignaturesWithParameterInitializers.types
@@ -94,7 +94,7 @@ class C {
 >  : ^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
@@ -139,7 +139,7 @@ interface I {
 >  : ^
 }
 
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
@@ -184,7 +184,7 @@ i.foo(1, 2);
 >  : ^
 
 // these are errors
-var a: {
+declare var a: {
 >a : { (x?: number): any; foo(x?: number): any; }
 >  : ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers2.errors.txt b/tests/baselines/reference/callSignaturesWithParameterInitializers2.errors.txt
index 445717bf478c4..26bb1a183e1dc 100644
--- a/tests/baselines/reference/callSignaturesWithParameterInitializers2.errors.txt
+++ b/tests/baselines/reference/callSignaturesWithParameterInitializers2.errors.txt
@@ -23,7 +23,7 @@ callSignaturesWithParameterInitializers2.ts(20,15): error TS1005: '{' expected.
         foo(x = 1) { }
     }
     
-    var c: C;
+    declare var c: C;
     c.foo();
     c.foo(1);
     
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers2.js b/tests/baselines/reference/callSignaturesWithParameterInitializers2.js
index b792b96dec634..0818e4b97e0e0 100644
--- a/tests/baselines/reference/callSignaturesWithParameterInitializers2.js
+++ b/tests/baselines/reference/callSignaturesWithParameterInitializers2.js
@@ -15,7 +15,7 @@ class C {
     foo(x = 1) { }
 }
 
-var c: C;
+declare var c: C;
 c.foo();
 c.foo(1);
 
@@ -43,7 +43,6 @@ var C = /** @class */ (function () {
     };
     return C;
 }());
-var c;
 c.foo();
 c.foo(1);
 var b = {
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers2.symbols b/tests/baselines/reference/callSignaturesWithParameterInitializers2.symbols
index 019382c597f42..4d50155c0331f 100644
--- a/tests/baselines/reference/callSignaturesWithParameterInitializers2.symbols
+++ b/tests/baselines/reference/callSignaturesWithParameterInitializers2.symbols
@@ -30,18 +30,18 @@ class C {
 >x : Symbol(x, Decl(callSignaturesWithParameterInitializers2.ts, 11, 8))
 }
 
-var c: C;
->c : Symbol(c, Decl(callSignaturesWithParameterInitializers2.ts, 14, 3))
+declare var c: C;
+>c : Symbol(c, Decl(callSignaturesWithParameterInitializers2.ts, 14, 11))
 >C : Symbol(C, Decl(callSignaturesWithParameterInitializers2.ts, 7, 6))
 
 c.foo();
 >c.foo : Symbol(C.foo, Decl(callSignaturesWithParameterInitializers2.ts, 9, 9), Decl(callSignaturesWithParameterInitializers2.ts, 10, 15))
->c : Symbol(c, Decl(callSignaturesWithParameterInitializers2.ts, 14, 3))
+>c : Symbol(c, Decl(callSignaturesWithParameterInitializers2.ts, 14, 11))
 >foo : Symbol(C.foo, Decl(callSignaturesWithParameterInitializers2.ts, 9, 9), Decl(callSignaturesWithParameterInitializers2.ts, 10, 15))
 
 c.foo(1);
 >c.foo : Symbol(C.foo, Decl(callSignaturesWithParameterInitializers2.ts, 9, 9), Decl(callSignaturesWithParameterInitializers2.ts, 10, 15))
->c : Symbol(c, Decl(callSignaturesWithParameterInitializers2.ts, 14, 3))
+>c : Symbol(c, Decl(callSignaturesWithParameterInitializers2.ts, 14, 11))
 >foo : Symbol(C.foo, Decl(callSignaturesWithParameterInitializers2.ts, 9, 9), Decl(callSignaturesWithParameterInitializers2.ts, 10, 15))
 
 var b = {
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers2.types b/tests/baselines/reference/callSignaturesWithParameterInitializers2.types
index ae95c38495dc4..29f0b384891ee 100644
--- a/tests/baselines/reference/callSignaturesWithParameterInitializers2.types
+++ b/tests/baselines/reference/callSignaturesWithParameterInitializers2.types
@@ -55,7 +55,7 @@ class C {
 >  : ^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
diff --git a/tests/baselines/reference/callsOnComplexSignatures.js b/tests/baselines/reference/callsOnComplexSignatures.js
index 4c40a8bfcccb5..25feef129359c 100644
--- a/tests/baselines/reference/callsOnComplexSignatures.js
+++ b/tests/baselines/reference/callsOnComplexSignatures.js
@@ -112,7 +112,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var react_1 = __importDefault(require("react"));
 // Simple calls from real usecases
 function test1() {
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.errors.txt b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.errors.txt
index 321b5a897632b..8fa5634454561 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.errors.txt
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.errors.txt
@@ -11,8 +11,8 @@ chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts(37,9): error TS
     class Chain<T> {
         constructor(public value: T) { }
         then<S extends T>(cb: (x: T) => S): Chain<S> {
-            var t: T;
-            var s: S;
+            var t!: T;
+            var s!: S;
             // Ok to go down the chain, but error to climb up the chain
             (new Chain(t)).then(tt => s).then(ss => t);
                                                     ~
@@ -44,9 +44,9 @@ chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts(37,9): error TS
     class Chain2<T extends I> {
         constructor(public value: T) { }
         then<S extends T>(cb: (x: T) => S): Chain2<S> {
-            var i: I;
-            var t: T;
-            var s: S;
+            var i!: I;
+            var t!: T;
+            var s!: S;
             // Ok to go down the chain, check the constraint at the end.
             // Should get an error that we are assigning a string to a number
             (new Chain2(i)).then(ii => t).then(tt => s).value.x = "";
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.js b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.js
index a4019d31a3754..ba4ad714336d8 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.js
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.js
@@ -4,8 +4,8 @@
 class Chain<T> {
     constructor(public value: T) { }
     then<S extends T>(cb: (x: T) => S): Chain<S> {
-        var t: T;
-        var s: S;
+        var t!: T;
+        var s!: S;
         // Ok to go down the chain, but error to climb up the chain
         (new Chain(t)).then(tt => s).then(ss => t);
 
@@ -27,9 +27,9 @@ interface I {
 class Chain2<T extends I> {
     constructor(public value: T) { }
     then<S extends T>(cb: (x: T) => S): Chain2<S> {
-        var i: I;
-        var t: T;
-        var s: S;
+        var i!: I;
+        var t!: T;
+        var s!: S;
         // Ok to go down the chain, check the constraint at the end.
         // Should get an error that we are assigning a string to a number
         (new Chain2(i)).then(ii => t).then(tt => s).value.x = "";
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.symbols b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.symbols
index 471634c5f6fe5..694f5b1d6e6ca 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.symbols
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.symbols
@@ -20,11 +20,11 @@ class Chain<T> {
 >Chain : Symbol(Chain, Decl(chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts, 0, 0))
 >S : Symbol(S, Decl(chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts, 2, 9))
 
-        var t: T;
+        var t!: T;
 >t : Symbol(t, Decl(chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts, 3, 11))
 >T : Symbol(T, Decl(chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts, 0, 12))
 
-        var s: S;
+        var s!: S;
 >s : Symbol(s, Decl(chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts, 4, 11))
 >S : Symbol(S, Decl(chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts, 2, 9))
 
@@ -114,15 +114,15 @@ class Chain2<T extends I> {
 >Chain2 : Symbol(Chain2, Decl(chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts, 22, 1))
 >S : Symbol(S, Decl(chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts, 25, 9))
 
-        var i: I;
+        var i!: I;
 >i : Symbol(i, Decl(chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts, 26, 11))
 >I : Symbol(I, Decl(chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts, 17, 1))
 
-        var t: T;
+        var t!: T;
 >t : Symbol(t, Decl(chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts, 27, 11))
 >T : Symbol(T, Decl(chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts, 23, 13))
 
-        var s: S;
+        var s!: S;
 >s : Symbol(s, Decl(chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts, 28, 11))
 >S : Symbol(S, Decl(chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts, 25, 9))
 
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types
index 3408e1ee7be5e..44b969aaed74a 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types
@@ -17,11 +17,11 @@ class Chain<T> {
 >x : T
 >  : ^
 
-        var t: T;
+        var t!: T;
 >t : T
 >  : ^
 
-        var s: S;
+        var s!: S;
 >s : S
 >  : ^
 
@@ -202,15 +202,15 @@ class Chain2<T extends I> {
 >x : T
 >  : ^
 
-        var i: I;
+        var i!: I;
 >i : I
 >  : ^
 
-        var t: T;
+        var t!: T;
 >t : T
 >  : ^
 
-        var s: S;
+        var s!: S;
 >s : S
 >  : ^
 
diff --git a/tests/baselines/reference/checkIndexConstraintOfJavascriptClassExpression.errors.txt b/tests/baselines/reference/checkIndexConstraintOfJavascriptClassExpression.errors.txt
index fa22beceb33e2..462e4957a6427 100644
--- a/tests/baselines/reference/checkIndexConstraintOfJavascriptClassExpression.errors.txt
+++ b/tests/baselines/reference/checkIndexConstraintOfJavascriptClassExpression.errors.txt
@@ -1,8 +1,10 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 weird.js(1,1): error TS2552: Cannot find name 'someFunction'. Did you mean 'Function'?
 weird.js(1,23): error TS7006: Parameter 'BaseClass' implicitly has an 'any' type.
 weird.js(9,17): error TS7006: Parameter 'error' implicitly has an 'any' type.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== weird.js (3 errors) ====
     someFunction(function(BaseClass) {
     ~~~~~~~~~~~~
diff --git a/tests/baselines/reference/checkJsdocOnEndOfFile.errors.txt b/tests/baselines/reference/checkJsdocOnEndOfFile.errors.txt
index 19e950b028c0a..c02276f9a5bba 100644
--- a/tests/baselines/reference/checkJsdocOnEndOfFile.errors.txt
+++ b/tests/baselines/reference/checkJsdocOnEndOfFile.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 eof.js(2,20): error TS2304: Cannot find name 'bad'.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== eof.js (1 errors) ====
     /**
      * @typedef {Array<bad>} Should have error here
diff --git a/tests/baselines/reference/checkJsdocReturnTag1.errors.txt b/tests/baselines/reference/checkJsdocReturnTag1.errors.txt
index 47f1a3209dede..978047ca196a9 100644
--- a/tests/baselines/reference/checkJsdocReturnTag1.errors.txt
+++ b/tests/baselines/reference/checkJsdocReturnTag1.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 returns.js(20,12): error TS2872: This kind of expression is always truthy.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== returns.js (1 errors) ====
     // @ts-check
     /**
diff --git a/tests/baselines/reference/checkJsdocReturnTag2.errors.txt b/tests/baselines/reference/checkJsdocReturnTag2.errors.txt
index c5ab204ed8438..f1a0fab470ea6 100644
--- a/tests/baselines/reference/checkJsdocReturnTag2.errors.txt
+++ b/tests/baselines/reference/checkJsdocReturnTag2.errors.txt
@@ -1,9 +1,11 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 returns.js(6,5): error TS2322: Type 'number' is not assignable to type 'string'.
 returns.js(13,5): error TS2322: Type 'number | boolean' is not assignable to type 'string | number'.
   Type 'boolean' is not assignable to type 'string | number'.
 returns.js(13,12): error TS2872: This kind of expression is always truthy.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== returns.js (3 errors) ====
     // @ts-check
     /**
diff --git a/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js b/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js
index e39ef89f279b1..1294b6c45080f 100644
--- a/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js
+++ b/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js
@@ -25,7 +25,7 @@ const testErr = <ResizablePanel>
 
 //// [checkJsxChildrenCanBeTupleType.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/checkJsxChildrenProperty1.js b/tests/baselines/reference/checkJsxChildrenProperty1.js
index 90e72ea120cf6..ff4d1a8084bc1 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty1.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty1.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty1.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Prop {
@@ -26,6 +28,7 @@ let k2 =
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 function Comp(p) {
diff --git a/tests/baselines/reference/checkJsxChildrenProperty1.symbols b/tests/baselines/reference/checkJsxChildrenProperty1.symbols
index 03f6c72ee088f..fc860bb9ea9cd 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty1.symbols
+++ b/tests/baselines/reference/checkJsxChildrenProperty1.symbols
@@ -1,69 +1,71 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     a: number,
->a : Symbol(Prop.a, Decl(file.tsx, 2, 16))
+>a : Symbol(Prop.a, Decl(file.tsx, 4, 16))
 
     b: string,
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 
     children: string | JSX.Element
->children : Symbol(Prop.children, Decl(file.tsx, 4, 14))
+>children : Symbol(Prop.children, Decl(file.tsx, 6, 14))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 }
 
 function Comp(p: Prop) {
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
->p : Symbol(p, Decl(file.tsx, 8, 14))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
+>p : Symbol(p, Decl(file.tsx, 10, 14))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     return <div>{p.b}</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->p.b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
->p : Symbol(p, Decl(file.tsx, 8, 14))
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>p.b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
+>p : Symbol(p, Decl(file.tsx, 10, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 }
 
 // OK
 let k = <Comp a={10} b="hi" children ="lol" />;
->k : Symbol(k, Decl(file.tsx, 13, 3))
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
->a : Symbol(a, Decl(file.tsx, 13, 13))
->b : Symbol(b, Decl(file.tsx, 13, 20))
->children : Symbol(children, Decl(file.tsx, 13, 27))
+>k : Symbol(k, Decl(file.tsx, 15, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
+>a : Symbol(a, Decl(file.tsx, 15, 13))
+>b : Symbol(b, Decl(file.tsx, 15, 20))
+>children : Symbol(children, Decl(file.tsx, 15, 27))
 
 let k1 =
->k1 : Symbol(k1, Decl(file.tsx, 14, 3))
+>k1 : Symbol(k1, Decl(file.tsx, 16, 3))
 
     <Comp a={10} b="hi">
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
->a : Symbol(a, Decl(file.tsx, 15, 9))
->b : Symbol(b, Decl(file.tsx, 15, 16))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
+>a : Symbol(a, Decl(file.tsx, 17, 9))
+>b : Symbol(b, Decl(file.tsx, 17, 16))
 
         hi hi hi!
     </Comp>;
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
 
 let k2 =
->k2 : Symbol(k2, Decl(file.tsx, 18, 3))
+>k2 : Symbol(k2, Decl(file.tsx, 20, 3))
 
     <Comp a={10} b="hi">
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
->a : Symbol(a, Decl(file.tsx, 19, 9))
->b : Symbol(b, Decl(file.tsx, 19, 16))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
+>a : Symbol(a, Decl(file.tsx, 21, 9))
+>b : Symbol(b, Decl(file.tsx, 21, 16))
 
         <div>hi hi hi!</div>
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
     </Comp>;
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty1.types b/tests/baselines/reference/checkJsxChildrenProperty1.types
index 42eef8075c495..2db988928b72c 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty1.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty1.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/checkJsxChildrenProperty12.js b/tests/baselines/reference/checkJsxChildrenProperty12.js
index 5288eddbe8b90..eb3bfc8c63eef 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty12.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty12.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty12.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface ButtonProp {
@@ -36,6 +38,7 @@ class InnerButton extends React.Component<InnerButtonProp, any> {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/checkJsxChildrenProperty12.symbols b/tests/baselines/reference/checkJsxChildrenProperty12.symbols
index 6d3f833fe7024..1128c1817872a 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty12.symbols
+++ b/tests/baselines/reference/checkJsxChildrenProperty12.symbols
@@ -1,50 +1,52 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty12.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface ButtonProp {
->ButtonProp : Symbol(ButtonProp, Decl(file.tsx, 0, 32))
+>ButtonProp : Symbol(ButtonProp, Decl(file.tsx, 2, 32))
 
     a: number,
->a : Symbol(ButtonProp.a, Decl(file.tsx, 2, 22))
+>a : Symbol(ButtonProp.a, Decl(file.tsx, 4, 22))
 
     b: string,
->b : Symbol(ButtonProp.b, Decl(file.tsx, 3, 14))
+>b : Symbol(ButtonProp.b, Decl(file.tsx, 5, 14))
 
     children: Button;
->children : Symbol(ButtonProp.children, Decl(file.tsx, 4, 14))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>children : Symbol(ButtonProp.children, Decl(file.tsx, 6, 14))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 }
 
 class Button extends React.Component<ButtonProp, any> {
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->ButtonProp : Symbol(ButtonProp, Decl(file.tsx, 0, 32))
+>ButtonProp : Symbol(ButtonProp, Decl(file.tsx, 2, 32))
 
     render() {
->render : Symbol(Button.render, Decl(file.tsx, 8, 55))
+>render : Symbol(Button.render, Decl(file.tsx, 10, 55))
 
 		let condition: boolean;
->condition : Symbol(condition, Decl(file.tsx, 10, 5))
+>condition : Symbol(condition, Decl(file.tsx, 12, 5))
 
 		if (condition) {
->condition : Symbol(condition, Decl(file.tsx, 10, 5))
+>condition : Symbol(condition, Decl(file.tsx, 12, 5))
 
         	return <InnerButton {...this.props} />
->InnerButton : Symbol(InnerButton, Decl(file.tsx, 24, 1))
+>InnerButton : Symbol(InnerButton, Decl(file.tsx, 26, 1))
 >this.props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
->this : Symbol(Button, Decl(file.tsx, 6, 1))
+>this : Symbol(Button, Decl(file.tsx, 8, 1))
 >props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
 		}
 		else {
 			return (<InnerButton {...this.props} >
->InnerButton : Symbol(InnerButton, Decl(file.tsx, 24, 1))
+>InnerButton : Symbol(InnerButton, Decl(file.tsx, 26, 1))
 >this.props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
->this : Symbol(Button, Decl(file.tsx, 6, 1))
+>this : Symbol(Button, Decl(file.tsx, 8, 1))
 >props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
 
 				<div>Hello World</div>
@@ -52,27 +54,27 @@ class Button extends React.Component<ButtonProp, any> {
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
 				</InnerButton>);
->InnerButton : Symbol(InnerButton, Decl(file.tsx, 24, 1))
+>InnerButton : Symbol(InnerButton, Decl(file.tsx, 26, 1))
 		}
     }
 }
 
 interface InnerButtonProp {
->InnerButtonProp : Symbol(InnerButtonProp, Decl(file.tsx, 20, 1))
+>InnerButtonProp : Symbol(InnerButtonProp, Decl(file.tsx, 22, 1))
 
 	a: number
->a : Symbol(InnerButtonProp.a, Decl(file.tsx, 22, 27))
+>a : Symbol(InnerButtonProp.a, Decl(file.tsx, 24, 27))
 }
 
 class InnerButton extends React.Component<InnerButtonProp, any> {
->InnerButton : Symbol(InnerButton, Decl(file.tsx, 24, 1))
+>InnerButton : Symbol(InnerButton, Decl(file.tsx, 26, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->InnerButtonProp : Symbol(InnerButtonProp, Decl(file.tsx, 20, 1))
+>InnerButtonProp : Symbol(InnerButtonProp, Decl(file.tsx, 22, 1))
 
 	render() {
->render : Symbol(InnerButton.render, Decl(file.tsx, 26, 65))
+>render : Symbol(InnerButton.render, Decl(file.tsx, 28, 65))
 
 		return (<button>Hello</button>);
 >button : Symbol(JSX.IntrinsicElements.button, Decl(react.d.ts, 2386, 43))
diff --git a/tests/baselines/reference/checkJsxChildrenProperty12.types b/tests/baselines/reference/checkJsxChildrenProperty12.types
index 82e70de465e81..08810e4f2782a 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty12.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty12.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty12.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/checkJsxChildrenProperty13.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty13.errors.txt
index 3f1b4539a58d9..98121746a734e 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty13.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty13.errors.txt
@@ -1,7 +1,9 @@
-file.tsx(12,30): error TS2710: 'children' are specified twice. The attribute named 'children' will be overwritten.
+file.tsx(14,30): error TS2710: 'children' are specified twice. The attribute named 'children' will be overwritten.
 
 
 ==== file.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface ButtonProp {
diff --git a/tests/baselines/reference/checkJsxChildrenProperty13.js b/tests/baselines/reference/checkJsxChildrenProperty13.js
index 304266b096d0c..477461b0a55ac 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty13.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty13.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty13.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface ButtonProp {
@@ -31,6 +33,7 @@ class InnerButton extends React.Component<InnerButtonProp, any> {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/checkJsxChildrenProperty13.symbols b/tests/baselines/reference/checkJsxChildrenProperty13.symbols
index d79d9df5d7ccc..c073534e9d47f 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty13.symbols
+++ b/tests/baselines/reference/checkJsxChildrenProperty13.symbols
@@ -1,66 +1,68 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty13.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface ButtonProp {
->ButtonProp : Symbol(ButtonProp, Decl(file.tsx, 0, 32))
+>ButtonProp : Symbol(ButtonProp, Decl(file.tsx, 2, 32))
 
     a: number,
->a : Symbol(ButtonProp.a, Decl(file.tsx, 2, 22))
+>a : Symbol(ButtonProp.a, Decl(file.tsx, 4, 22))
 
     b: string,
->b : Symbol(ButtonProp.b, Decl(file.tsx, 3, 14))
+>b : Symbol(ButtonProp.b, Decl(file.tsx, 5, 14))
 
     children: Button;
->children : Symbol(ButtonProp.children, Decl(file.tsx, 4, 14))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>children : Symbol(ButtonProp.children, Decl(file.tsx, 6, 14))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 }
 
 class Button extends React.Component<ButtonProp, any> {
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->ButtonProp : Symbol(ButtonProp, Decl(file.tsx, 0, 32))
+>ButtonProp : Symbol(ButtonProp, Decl(file.tsx, 2, 32))
 
     render() {
->render : Symbol(Button.render, Decl(file.tsx, 8, 55))
+>render : Symbol(Button.render, Decl(file.tsx, 10, 55))
 
         // Error children are specified twice
         return (<InnerButton {...this.props} children="hi">
->InnerButton : Symbol(InnerButton, Decl(file.tsx, 19, 1))
+>InnerButton : Symbol(InnerButton, Decl(file.tsx, 21, 1))
 >this.props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
->this : Symbol(Button, Decl(file.tsx, 6, 1))
+>this : Symbol(Button, Decl(file.tsx, 8, 1))
 >props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
->children : Symbol(children, Decl(file.tsx, 11, 44))
+>children : Symbol(children, Decl(file.tsx, 13, 44))
 
             <div>Hello World</div>
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
             </InnerButton>);
->InnerButton : Symbol(InnerButton, Decl(file.tsx, 19, 1))
+>InnerButton : Symbol(InnerButton, Decl(file.tsx, 21, 1))
     }
 }
 
 interface InnerButtonProp {
->InnerButtonProp : Symbol(InnerButtonProp, Decl(file.tsx, 15, 1))
+>InnerButtonProp : Symbol(InnerButtonProp, Decl(file.tsx, 17, 1))
 
 	a: number
->a : Symbol(InnerButtonProp.a, Decl(file.tsx, 17, 27))
+>a : Symbol(InnerButtonProp.a, Decl(file.tsx, 19, 27))
 }
 
 class InnerButton extends React.Component<InnerButtonProp, any> {
->InnerButton : Symbol(InnerButton, Decl(file.tsx, 19, 1))
+>InnerButton : Symbol(InnerButton, Decl(file.tsx, 21, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->InnerButtonProp : Symbol(InnerButtonProp, Decl(file.tsx, 15, 1))
+>InnerButtonProp : Symbol(InnerButtonProp, Decl(file.tsx, 17, 1))
 
 	render() {
->render : Symbol(InnerButton.render, Decl(file.tsx, 21, 65))
+>render : Symbol(InnerButton.render, Decl(file.tsx, 23, 65))
 
 		return (<button>Hello</button>);
 >button : Symbol(JSX.IntrinsicElements.button, Decl(react.d.ts, 2386, 43))
diff --git a/tests/baselines/reference/checkJsxChildrenProperty13.types b/tests/baselines/reference/checkJsxChildrenProperty13.types
index 5a28219181e49..01a48cd8bb23a 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty13.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty13.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty13.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/checkJsxChildrenProperty14.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty14.errors.txt
index 0fefce4922a9f..f96e6ff95d086 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty14.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty14.errors.txt
@@ -1,7 +1,9 @@
-file.tsx(42,11): error TS2746: This JSX tag's 'children' prop expects a single child of type 'Element', but multiple children were provided.
+file.tsx(44,11): error TS2746: This JSX tag's 'children' prop expects a single child of type 'Element', but multiple children were provided.
 
 
 ==== file.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface Prop {
diff --git a/tests/baselines/reference/checkJsxChildrenProperty14.js b/tests/baselines/reference/checkJsxChildrenProperty14.js
index ea803d1134c64..d02609fbaf266 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty14.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty14.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty14.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Prop {
@@ -46,6 +48,7 @@ let k5 = <SingleChildComp a={10} b="hi"><></><Button /><AnotherButton /></Single
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/checkJsxChildrenProperty14.symbols b/tests/baselines/reference/checkJsxChildrenProperty14.symbols
index b9990ebaadeb4..4f949d07e00f5 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty14.symbols
+++ b/tests/baselines/reference/checkJsxChildrenProperty14.symbols
@@ -1,20 +1,22 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty14.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     a: number,
->a : Symbol(Prop.a, Decl(file.tsx, 2, 16))
+>a : Symbol(Prop.a, Decl(file.tsx, 4, 16))
 
     b: string,
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 
     children: JSX.Element | JSX.Element[];
->children : Symbol(Prop.children, Decl(file.tsx, 4, 14))
+>children : Symbol(Prop.children, Decl(file.tsx, 6, 14))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
@@ -22,13 +24,13 @@ interface Prop {
 }
 
 class Button extends React.Component<any, any> {
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 
     render() {
->render : Symbol(Button.render, Decl(file.tsx, 8, 48))
+>render : Symbol(Button.render, Decl(file.tsx, 10, 48))
 
         return (<div>My Button</div>)
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -37,8 +39,8 @@ class Button extends React.Component<any, any> {
 }
 
 function AnotherButton(p: any) {
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
->p : Symbol(p, Decl(file.tsx, 14, 23))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
+>p : Symbol(p, Decl(file.tsx, 16, 23))
 
     return <h1>Just Another Button</h1>;
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
@@ -46,91 +48,91 @@ function AnotherButton(p: any) {
 }
 
 function Comp(p: Prop) {
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->p : Symbol(p, Decl(file.tsx, 18, 14))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>p : Symbol(p, Decl(file.tsx, 20, 14))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     return <div>{p.b}</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->p.b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
->p : Symbol(p, Decl(file.tsx, 18, 14))
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>p.b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
+>p : Symbol(p, Decl(file.tsx, 20, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 }
 
 // OK
 let k1 = <Comp a={10} b="hi"><></><Button /><AnotherButton /></Comp>;
->k1 : Symbol(k1, Decl(file.tsx, 23, 3))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->a : Symbol(a, Decl(file.tsx, 23, 14))
->b : Symbol(b, Decl(file.tsx, 23, 21))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
+>k1 : Symbol(k1, Decl(file.tsx, 25, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>a : Symbol(a, Decl(file.tsx, 25, 14))
+>b : Symbol(b, Decl(file.tsx, 25, 21))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
 
 let k2 = <Comp a={10} b="hi"><><Button /></><AnotherButton /></Comp>;
->k2 : Symbol(k2, Decl(file.tsx, 24, 3))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->a : Symbol(a, Decl(file.tsx, 24, 14))
->b : Symbol(b, Decl(file.tsx, 24, 21))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
+>k2 : Symbol(k2, Decl(file.tsx, 26, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>a : Symbol(a, Decl(file.tsx, 26, 14))
+>b : Symbol(b, Decl(file.tsx, 26, 21))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
 
 let k3 = <Comp a={10} b="hi"><><Button /><AnotherButton /></></Comp>;
->k3 : Symbol(k3, Decl(file.tsx, 25, 3))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->a : Symbol(a, Decl(file.tsx, 25, 14))
->b : Symbol(b, Decl(file.tsx, 25, 21))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
+>k3 : Symbol(k3, Decl(file.tsx, 27, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>a : Symbol(a, Decl(file.tsx, 27, 14))
+>b : Symbol(b, Decl(file.tsx, 27, 21))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
 
 interface SingleChildProp {
->SingleChildProp : Symbol(SingleChildProp, Decl(file.tsx, 25, 69))
+>SingleChildProp : Symbol(SingleChildProp, Decl(file.tsx, 27, 69))
 
     a: number,
->a : Symbol(SingleChildProp.a, Decl(file.tsx, 27, 27))
+>a : Symbol(SingleChildProp.a, Decl(file.tsx, 29, 27))
 
     b: string,
->b : Symbol(SingleChildProp.b, Decl(file.tsx, 28, 14))
+>b : Symbol(SingleChildProp.b, Decl(file.tsx, 30, 14))
 
     children: JSX.Element;
->children : Symbol(SingleChildProp.children, Decl(file.tsx, 29, 14))
+>children : Symbol(SingleChildProp.children, Decl(file.tsx, 31, 14))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 }
 
 function SingleChildComp(p: SingleChildProp) {
->SingleChildComp : Symbol(SingleChildComp, Decl(file.tsx, 31, 1))
->p : Symbol(p, Decl(file.tsx, 33, 25))
->SingleChildProp : Symbol(SingleChildProp, Decl(file.tsx, 25, 69))
+>SingleChildComp : Symbol(SingleChildComp, Decl(file.tsx, 33, 1))
+>p : Symbol(p, Decl(file.tsx, 35, 25))
+>SingleChildProp : Symbol(SingleChildProp, Decl(file.tsx, 27, 69))
 
     return <div>{p.b}</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->p.b : Symbol(SingleChildProp.b, Decl(file.tsx, 28, 14))
->p : Symbol(p, Decl(file.tsx, 33, 25))
->b : Symbol(SingleChildProp.b, Decl(file.tsx, 28, 14))
+>p.b : Symbol(SingleChildProp.b, Decl(file.tsx, 30, 14))
+>p : Symbol(p, Decl(file.tsx, 35, 25))
+>b : Symbol(SingleChildProp.b, Decl(file.tsx, 30, 14))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 }
 
 // OK
 let k4 = <SingleChildComp a={10} b="hi"><><Button /><AnotherButton /></></SingleChildComp>;
->k4 : Symbol(k4, Decl(file.tsx, 38, 3))
->SingleChildComp : Symbol(SingleChildComp, Decl(file.tsx, 31, 1))
->a : Symbol(a, Decl(file.tsx, 38, 25))
->b : Symbol(b, Decl(file.tsx, 38, 32))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
->SingleChildComp : Symbol(SingleChildComp, Decl(file.tsx, 31, 1))
+>k4 : Symbol(k4, Decl(file.tsx, 40, 3))
+>SingleChildComp : Symbol(SingleChildComp, Decl(file.tsx, 33, 1))
+>a : Symbol(a, Decl(file.tsx, 40, 25))
+>b : Symbol(b, Decl(file.tsx, 40, 32))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
+>SingleChildComp : Symbol(SingleChildComp, Decl(file.tsx, 33, 1))
 
 // Error
 let k5 = <SingleChildComp a={10} b="hi"><></><Button /><AnotherButton /></SingleChildComp>;
->k5 : Symbol(k5, Decl(file.tsx, 41, 3))
->SingleChildComp : Symbol(SingleChildComp, Decl(file.tsx, 31, 1))
->a : Symbol(a, Decl(file.tsx, 41, 25))
->b : Symbol(b, Decl(file.tsx, 41, 32))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
->SingleChildComp : Symbol(SingleChildComp, Decl(file.tsx, 31, 1))
+>k5 : Symbol(k5, Decl(file.tsx, 43, 3))
+>SingleChildComp : Symbol(SingleChildComp, Decl(file.tsx, 33, 1))
+>a : Symbol(a, Decl(file.tsx, 43, 25))
+>b : Symbol(b, Decl(file.tsx, 43, 32))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
+>SingleChildComp : Symbol(SingleChildComp, Decl(file.tsx, 33, 1))
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty14.types b/tests/baselines/reference/checkJsxChildrenProperty14.types
index 462991d4777c3..630c5c5ca489d 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty14.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty14.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty14.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/checkJsxChildrenProperty15.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty15.errors.txt
index bd58dea1368da..9e1d81deb5624 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty15.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty15.errors.txt
@@ -1,12 +1,14 @@
-file.tsx(10,17): error TS2322: Type '{ children: Element; }' is not assignable to type 'IntrinsicAttributes'.
+file.tsx(12,17): error TS2322: Type '{ children: Element; }' is not assignable to type 'IntrinsicAttributes'.
   Property 'children' does not exist on type 'IntrinsicAttributes'.
-file.tsx(11,13): error TS2322: Type '{ children: Element; key: string; }' is not assignable to type 'IntrinsicAttributes'.
+file.tsx(13,13): error TS2322: Type '{ children: Element; key: string; }' is not assignable to type 'IntrinsicAttributes'.
   Property 'children' does not exist on type 'IntrinsicAttributes'.
-file.tsx(12,13): error TS2322: Type '{ children: Element[]; key: string; }' is not assignable to type 'IntrinsicAttributes'.
+file.tsx(14,13): error TS2322: Type '{ children: Element[]; key: string; }' is not assignable to type 'IntrinsicAttributes'.
   Property 'children' does not exist on type 'IntrinsicAttributes'.
 
 
 ==== file.tsx (3 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     const Tag = (x: {}) => <div></div>;
diff --git a/tests/baselines/reference/checkJsxChildrenProperty15.js b/tests/baselines/reference/checkJsxChildrenProperty15.js
index 69798d43b296e..d5c2fe11fcdc5 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty15.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty15.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty15.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 const Tag = (x: {}) => <div></div>;
@@ -17,6 +19,7 @@ const k5 = <Tag key="1"><div></div><div></div></Tag>;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 var Tag = function (x) { return <div></div>; };
diff --git a/tests/baselines/reference/checkJsxChildrenProperty15.symbols b/tests/baselines/reference/checkJsxChildrenProperty15.symbols
index 771d3d7eff87c..0c3de71e88b76 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty15.symbols
+++ b/tests/baselines/reference/checkJsxChildrenProperty15.symbols
@@ -1,48 +1,50 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty15.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 const Tag = (x: {}) => <div></div>;
->Tag : Symbol(Tag, Decl(file.tsx, 2, 5))
->x : Symbol(x, Decl(file.tsx, 2, 13))
+>Tag : Symbol(Tag, Decl(file.tsx, 4, 5))
+>x : Symbol(x, Decl(file.tsx, 4, 13))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
 // OK
 const k1 = <Tag />;
->k1 : Symbol(k1, Decl(file.tsx, 5, 5))
->Tag : Symbol(Tag, Decl(file.tsx, 2, 5))
+>k1 : Symbol(k1, Decl(file.tsx, 7, 5))
+>Tag : Symbol(Tag, Decl(file.tsx, 4, 5))
 
 const k2 = <Tag></Tag>;
->k2 : Symbol(k2, Decl(file.tsx, 6, 5))
->Tag : Symbol(Tag, Decl(file.tsx, 2, 5))
->Tag : Symbol(Tag, Decl(file.tsx, 2, 5))
+>k2 : Symbol(k2, Decl(file.tsx, 8, 5))
+>Tag : Symbol(Tag, Decl(file.tsx, 4, 5))
+>Tag : Symbol(Tag, Decl(file.tsx, 4, 5))
 
 // Not OK (excess children)
 const k3 = <Tag children={<div></div>} />;
->k3 : Symbol(k3, Decl(file.tsx, 9, 5))
->Tag : Symbol(Tag, Decl(file.tsx, 2, 5))
->children : Symbol(children, Decl(file.tsx, 9, 15))
+>k3 : Symbol(k3, Decl(file.tsx, 11, 5))
+>Tag : Symbol(Tag, Decl(file.tsx, 4, 5))
+>children : Symbol(children, Decl(file.tsx, 11, 15))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
 const k4 = <Tag key="1"><div></div></Tag>;
->k4 : Symbol(k4, Decl(file.tsx, 10, 5))
->Tag : Symbol(Tag, Decl(file.tsx, 2, 5))
->key : Symbol(key, Decl(file.tsx, 10, 15))
+>k4 : Symbol(k4, Decl(file.tsx, 12, 5))
+>Tag : Symbol(Tag, Decl(file.tsx, 4, 5))
+>key : Symbol(key, Decl(file.tsx, 12, 15))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->Tag : Symbol(Tag, Decl(file.tsx, 2, 5))
+>Tag : Symbol(Tag, Decl(file.tsx, 4, 5))
 
 const k5 = <Tag key="1"><div></div><div></div></Tag>;
->k5 : Symbol(k5, Decl(file.tsx, 11, 5))
->Tag : Symbol(Tag, Decl(file.tsx, 2, 5))
->key : Symbol(key, Decl(file.tsx, 11, 15))
+>k5 : Symbol(k5, Decl(file.tsx, 13, 5))
+>Tag : Symbol(Tag, Decl(file.tsx, 4, 5))
+>key : Symbol(key, Decl(file.tsx, 13, 15))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->Tag : Symbol(Tag, Decl(file.tsx, 2, 5))
+>Tag : Symbol(Tag, Decl(file.tsx, 4, 5))
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty15.types b/tests/baselines/reference/checkJsxChildrenProperty15.types
index 1e61ac589ba7d..28236d79b0292 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty15.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty15.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty15.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt
index 51b0362c90e27..906e96320a1bd 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty2.errors.txt
@@ -1,12 +1,14 @@
-file.tsx(14,10): error TS2741: Property 'children' is missing in type '{ a: number; b: string; }' but required in type 'Prop'.
-file.tsx(17,11): error TS2710: 'children' are specified twice. The attribute named 'children' will be overwritten.
-file.tsx(31,6): error TS2746: This JSX tag's 'children' prop expects a single child of type 'string | Element', but multiple children were provided.
-file.tsx(37,6): error TS2746: This JSX tag's 'children' prop expects a single child of type 'string | Element', but multiple children were provided.
-file.tsx(43,6): error TS2746: This JSX tag's 'children' prop expects a single child of type 'string | Element', but multiple children were provided.
-file.tsx(49,6): error TS2746: This JSX tag's 'children' prop expects a single child of type 'string | Element', but multiple children were provided.
+file.tsx(16,10): error TS2741: Property 'children' is missing in type '{ a: number; b: string; }' but required in type 'Prop'.
+file.tsx(19,11): error TS2710: 'children' are specified twice. The attribute named 'children' will be overwritten.
+file.tsx(33,6): error TS2746: This JSX tag's 'children' prop expects a single child of type 'string | Element', but multiple children were provided.
+file.tsx(39,6): error TS2746: This JSX tag's 'children' prop expects a single child of type 'string | Element', but multiple children were provided.
+file.tsx(45,6): error TS2746: This JSX tag's 'children' prop expects a single child of type 'string | Element', but multiple children were provided.
+file.tsx(51,6): error TS2746: This JSX tag's 'children' prop expects a single child of type 'string | Element', but multiple children were provided.
 
 
 ==== file.tsx (6 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface Prop {
@@ -23,7 +25,7 @@ file.tsx(49,6): error TS2746: This JSX tag's 'children' prop expects a single ch
     let k = <Comp a={10} b="hi" />;
              ~~~~
 !!! error TS2741: Property 'children' is missing in type '{ a: number; b: string; }' but required in type 'Prop'.
-!!! related TS2728 file.tsx:6:5: 'children' is declared here.
+!!! related TS2728 file.tsx:8:5: 'children' is declared here.
     
     let k0 =
         <Comp a={10} b="hi" children="Random" >
diff --git a/tests/baselines/reference/checkJsxChildrenProperty2.js b/tests/baselines/reference/checkJsxChildrenProperty2.js
index b609be2a5cc68..83942d3600ed7 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty2.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty2.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty2.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Prop {
@@ -57,6 +59,7 @@ let k5 =
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 function Comp(p) {
diff --git a/tests/baselines/reference/checkJsxChildrenProperty2.symbols b/tests/baselines/reference/checkJsxChildrenProperty2.symbols
index 5a97da007b5eb..e3f1f34fa62e2 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty2.symbols
+++ b/tests/baselines/reference/checkJsxChildrenProperty2.symbols
@@ -1,105 +1,107 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     a: number,
->a : Symbol(Prop.a, Decl(file.tsx, 2, 16))
+>a : Symbol(Prop.a, Decl(file.tsx, 4, 16))
 
     b: string,
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 
     children: string | JSX.Element
->children : Symbol(Prop.children, Decl(file.tsx, 4, 14))
+>children : Symbol(Prop.children, Decl(file.tsx, 6, 14))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 }
 
 function Comp(p: Prop) {
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
->p : Symbol(p, Decl(file.tsx, 8, 14))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
+>p : Symbol(p, Decl(file.tsx, 10, 14))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     return <div>{p.b}</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->p.b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
->p : Symbol(p, Decl(file.tsx, 8, 14))
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>p.b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
+>p : Symbol(p, Decl(file.tsx, 10, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 }
 
 // Error: missing children
 let k = <Comp a={10} b="hi" />;
->k : Symbol(k, Decl(file.tsx, 13, 3))
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
->a : Symbol(a, Decl(file.tsx, 13, 13))
->b : Symbol(b, Decl(file.tsx, 13, 20))
+>k : Symbol(k, Decl(file.tsx, 15, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
+>a : Symbol(a, Decl(file.tsx, 15, 13))
+>b : Symbol(b, Decl(file.tsx, 15, 20))
 
 let k0 =
->k0 : Symbol(k0, Decl(file.tsx, 15, 3))
+>k0 : Symbol(k0, Decl(file.tsx, 17, 3))
 
     <Comp a={10} b="hi" children="Random" >
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
->a : Symbol(a, Decl(file.tsx, 16, 9))
->b : Symbol(b, Decl(file.tsx, 16, 16))
->children : Symbol(children, Decl(file.tsx, 16, 23))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
+>a : Symbol(a, Decl(file.tsx, 18, 9))
+>b : Symbol(b, Decl(file.tsx, 18, 16))
+>children : Symbol(children, Decl(file.tsx, 18, 23))
 
         hi hi hi!
     </Comp>;
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
 
 let o = {
->o : Symbol(o, Decl(file.tsx, 20, 3))
+>o : Symbol(o, Decl(file.tsx, 22, 3))
 
      children:"Random"
->children : Symbol(children, Decl(file.tsx, 20, 9))
+>children : Symbol(children, Decl(file.tsx, 22, 9))
 }
 let k1 =
->k1 : Symbol(k1, Decl(file.tsx, 23, 3))
+>k1 : Symbol(k1, Decl(file.tsx, 25, 3))
 
     <Comp a={10} b="hi" {...o} >
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
->a : Symbol(a, Decl(file.tsx, 24, 9))
->b : Symbol(b, Decl(file.tsx, 24, 16))
->o : Symbol(o, Decl(file.tsx, 20, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
+>a : Symbol(a, Decl(file.tsx, 26, 9))
+>b : Symbol(b, Decl(file.tsx, 26, 16))
+>o : Symbol(o, Decl(file.tsx, 22, 3))
 
         hi hi hi!
     </Comp>;
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
 
 // Error: incorrect type
 let k2 =
->k2 : Symbol(k2, Decl(file.tsx, 29, 3))
+>k2 : Symbol(k2, Decl(file.tsx, 31, 3))
 
     <Comp a={10} b="hi">
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
->a : Symbol(a, Decl(file.tsx, 30, 9))
->b : Symbol(b, Decl(file.tsx, 30, 16))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
+>a : Symbol(a, Decl(file.tsx, 32, 9))
+>b : Symbol(b, Decl(file.tsx, 32, 16))
 
         <div> My Div </div>
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
         {(name: string) => <div> My name {name} </div>}
->name : Symbol(name, Decl(file.tsx, 32, 10))
+>name : Symbol(name, Decl(file.tsx, 34, 10))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->name : Symbol(name, Decl(file.tsx, 32, 10))
+>name : Symbol(name, Decl(file.tsx, 34, 10))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
     </Comp>;
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
 
 let k3 =
->k3 : Symbol(k3, Decl(file.tsx, 35, 3))
+>k3 : Symbol(k3, Decl(file.tsx, 37, 3))
 
     <Comp a={10} b="hi">
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
->a : Symbol(a, Decl(file.tsx, 36, 9))
->b : Symbol(b, Decl(file.tsx, 36, 16))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
+>a : Symbol(a, Decl(file.tsx, 38, 9))
+>b : Symbol(b, Decl(file.tsx, 38, 16))
 
         <div> My Div </div>
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -107,15 +109,15 @@ let k3 =
 
         {1000000}
     </Comp>;
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
 
 let k4 =
->k4 : Symbol(k4, Decl(file.tsx, 41, 3))
+>k4 : Symbol(k4, Decl(file.tsx, 43, 3))
 
     <Comp a={10} b="hi" >
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
->a : Symbol(a, Decl(file.tsx, 42, 9))
->b : Symbol(b, Decl(file.tsx, 42, 16))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
+>a : Symbol(a, Decl(file.tsx, 44, 9))
+>b : Symbol(b, Decl(file.tsx, 44, 16))
 
         <div> My Div </div>
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -123,15 +125,15 @@ let k4 =
 
         hi hi hi!
     </Comp>;
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
 
 let k5 =
->k5 : Symbol(k5, Decl(file.tsx, 47, 3))
+>k5 : Symbol(k5, Decl(file.tsx, 49, 3))
 
     <Comp a={10} b="hi" >
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
->a : Symbol(a, Decl(file.tsx, 48, 9))
->b : Symbol(b, Decl(file.tsx, 48, 16))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
+>a : Symbol(a, Decl(file.tsx, 50, 9))
+>b : Symbol(b, Decl(file.tsx, 50, 16))
 
         <div> My Div </div>
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -142,5 +144,5 @@ let k5 =
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
     </Comp>;
->Comp : Symbol(Comp, Decl(file.tsx, 6, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 8, 1))
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty2.types b/tests/baselines/reference/checkJsxChildrenProperty2.types
index 2107c6d54cb31..a9c682366ff57 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty2.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty2.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/checkJsxChildrenProperty3.js b/tests/baselines/reference/checkJsxChildrenProperty3.js
index 6e5d5407baa78..01755367185b6 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty3.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty3.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty3.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface IUser {
@@ -43,6 +45,7 @@ function UserName1() {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/checkJsxChildrenProperty3.symbols b/tests/baselines/reference/checkJsxChildrenProperty3.symbols
index 3c5afc6327db6..8b91733f8cb85 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty3.symbols
+++ b/tests/baselines/reference/checkJsxChildrenProperty3.symbols
@@ -1,50 +1,52 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface IUser {
->IUser : Symbol(IUser, Decl(file.tsx, 0, 32))
+>IUser : Symbol(IUser, Decl(file.tsx, 2, 32))
 
     Name: string;
->Name : Symbol(IUser.Name, Decl(file.tsx, 2, 17))
+>Name : Symbol(IUser.Name, Decl(file.tsx, 4, 17))
 }
 
 interface IFetchUserProps {
->IFetchUserProps : Symbol(IFetchUserProps, Decl(file.tsx, 4, 1))
+>IFetchUserProps : Symbol(IFetchUserProps, Decl(file.tsx, 6, 1))
 
     children: (user: IUser) => JSX.Element;
->children : Symbol(IFetchUserProps.children, Decl(file.tsx, 6, 27))
->user : Symbol(user, Decl(file.tsx, 7, 15))
->IUser : Symbol(IUser, Decl(file.tsx, 0, 32))
+>children : Symbol(IFetchUserProps.children, Decl(file.tsx, 8, 27))
+>user : Symbol(user, Decl(file.tsx, 9, 15))
+>IUser : Symbol(IUser, Decl(file.tsx, 2, 32))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 }
 
 class FetchUser extends React.Component<IFetchUserProps, any> {
->FetchUser : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>FetchUser : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->IFetchUserProps : Symbol(IFetchUserProps, Decl(file.tsx, 4, 1))
+>IFetchUserProps : Symbol(IFetchUserProps, Decl(file.tsx, 6, 1))
 
     render() {
->render : Symbol(FetchUser.render, Decl(file.tsx, 10, 63))
+>render : Symbol(FetchUser.render, Decl(file.tsx, 12, 63))
 
         return this.state
 >this.state : Symbol(React.Component.state, Decl(react.d.ts, 174, 44))
->this : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>this : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 >state : Symbol(React.Component.state, Decl(react.d.ts, 174, 44))
 
             ? this.props.children(this.state.result)
->this.props.children : Symbol(children, Decl(file.tsx, 6, 27), Decl(react.d.ts, 174, 20))
+>this.props.children : Symbol(children, Decl(file.tsx, 8, 27), Decl(react.d.ts, 174, 20))
 >this.props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
->this : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>this : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 >props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
->children : Symbol(children, Decl(file.tsx, 6, 27), Decl(react.d.ts, 174, 20))
+>children : Symbol(children, Decl(file.tsx, 8, 27), Decl(react.d.ts, 174, 20))
 >this.state : Symbol(React.Component.state, Decl(react.d.ts, 174, 44))
->this : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>this : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 >state : Symbol(React.Component.state, Decl(react.d.ts, 174, 44))
 
             : null;
@@ -53,49 +55,49 @@ class FetchUser extends React.Component<IFetchUserProps, any> {
 
 // Ok
 function UserName0() {
->UserName0 : Symbol(UserName0, Decl(file.tsx, 16, 1))
+>UserName0 : Symbol(UserName0, Decl(file.tsx, 18, 1))
 
     return (
         <FetchUser>
->FetchUser : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>FetchUser : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 
             { user => (
->user : Symbol(user, Decl(file.tsx, 22, 13))
+>user : Symbol(user, Decl(file.tsx, 24, 13))
 
                 <h1>{ user.Name }</h1>
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
->user.Name : Symbol(IUser.Name, Decl(file.tsx, 2, 17))
->user : Symbol(user, Decl(file.tsx, 22, 13))
->Name : Symbol(IUser.Name, Decl(file.tsx, 2, 17))
+>user.Name : Symbol(IUser.Name, Decl(file.tsx, 4, 17))
+>user : Symbol(user, Decl(file.tsx, 24, 13))
+>Name : Symbol(IUser.Name, Decl(file.tsx, 4, 17))
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
 
             ) }
         </FetchUser>
->FetchUser : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>FetchUser : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 
     );
 }
 
 function UserName1() {
->UserName1 : Symbol(UserName1, Decl(file.tsx, 27, 1))
+>UserName1 : Symbol(UserName1, Decl(file.tsx, 29, 1))
 
     return (
         <FetchUser>
->FetchUser : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>FetchUser : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 
             { user => (
->user : Symbol(user, Decl(file.tsx, 33, 13))
+>user : Symbol(user, Decl(file.tsx, 35, 13))
 
                 <h1>{ user.Name }</h1>
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
->user.Name : Symbol(IUser.Name, Decl(file.tsx, 2, 17))
->user : Symbol(user, Decl(file.tsx, 33, 13))
->Name : Symbol(IUser.Name, Decl(file.tsx, 2, 17))
+>user.Name : Symbol(IUser.Name, Decl(file.tsx, 4, 17))
+>user : Symbol(user, Decl(file.tsx, 35, 13))
+>Name : Symbol(IUser.Name, Decl(file.tsx, 4, 17))
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
 
             ) }
         </FetchUser>
->FetchUser : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>FetchUser : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 
     );
 }
diff --git a/tests/baselines/reference/checkJsxChildrenProperty3.types b/tests/baselines/reference/checkJsxChildrenProperty3.types
index 687c31920d34c..ec5fac460425d 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty3.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty3.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/checkJsxChildrenProperty4.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty4.errors.txt
index 523bfb49a270b..c258e4319f669 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty4.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty4.errors.txt
@@ -1,9 +1,11 @@
-file.tsx(24,28): error TS2551: Property 'NAme' does not exist on type 'IUser'. Did you mean 'Name'?
-file.tsx(36,15): error TS2322: Type '(user: IUser) => Element' is not assignable to type 'boolean | any[] | ReactChild'.
-file.tsx(39,15): error TS2322: Type '(user: IUser) => Element' is not assignable to type 'boolean | any[] | ReactChild'.
+file.tsx(26,28): error TS2551: Property 'NAme' does not exist on type 'IUser'. Did you mean 'Name'?
+file.tsx(38,15): error TS2322: Type '(user: IUser) => Element' is not assignable to type 'boolean | any[] | ReactChild'.
+file.tsx(41,15): error TS2322: Type '(user: IUser) => Element' is not assignable to type 'boolean | any[] | ReactChild'.
 
 
 ==== file.tsx (3 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface IUser {
@@ -30,7 +32,7 @@ file.tsx(39,15): error TS2322: Type '(user: IUser) => Element' is not assignable
                     <h1>{ user.NAme }</h1>
                                ~~~~
 !!! error TS2551: Property 'NAme' does not exist on type 'IUser'. Did you mean 'Name'?
-!!! related TS2728 file.tsx:4:5: 'Name' is declared here.
+!!! related TS2728 file.tsx:6:5: 'Name' is declared here.
                 ) }
             </FetchUser>
         );
@@ -49,7 +51,7 @@ file.tsx(39,15): error TS2322: Type '(user: IUser) => Element' is not assignable
                 ) }
     ~~~~~~~~~~~~~
 !!! error TS2322: Type '(user: IUser) => Element' is not assignable to type 'boolean | any[] | ReactChild'.
-!!! related TS6212 file.tsx:36:15: Did you mean to call this expression?
+!!! related TS6212 file.tsx:38:15: Did you mean to call this expression?
                 { user => (
                   ~~~~~~~~~
                     <h1>{ user.Name }</h1>
@@ -57,7 +59,7 @@ file.tsx(39,15): error TS2322: Type '(user: IUser) => Element' is not assignable
                 ) }
     ~~~~~~~~~~~~~
 !!! error TS2322: Type '(user: IUser) => Element' is not assignable to type 'boolean | any[] | ReactChild'.
-!!! related TS6212 file.tsx:39:15: Did you mean to call this expression?
+!!! related TS6212 file.tsx:41:15: Did you mean to call this expression?
             </FetchUser>
         );
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/checkJsxChildrenProperty4.js b/tests/baselines/reference/checkJsxChildrenProperty4.js
index 1c11fbdb15b27..2291cfaac562b 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty4.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty4.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty4.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface IUser {
@@ -48,6 +50,7 @@ function UserName1() {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/checkJsxChildrenProperty4.symbols b/tests/baselines/reference/checkJsxChildrenProperty4.symbols
index 271b41b652e27..8da8d9b79a94f 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty4.symbols
+++ b/tests/baselines/reference/checkJsxChildrenProperty4.symbols
@@ -1,50 +1,52 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty4.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface IUser {
->IUser : Symbol(IUser, Decl(file.tsx, 0, 32))
+>IUser : Symbol(IUser, Decl(file.tsx, 2, 32))
 
     Name: string;
->Name : Symbol(IUser.Name, Decl(file.tsx, 2, 17))
+>Name : Symbol(IUser.Name, Decl(file.tsx, 4, 17))
 }
 
 interface IFetchUserProps {
->IFetchUserProps : Symbol(IFetchUserProps, Decl(file.tsx, 4, 1))
+>IFetchUserProps : Symbol(IFetchUserProps, Decl(file.tsx, 6, 1))
 
     children: (user: IUser) => JSX.Element;
->children : Symbol(IFetchUserProps.children, Decl(file.tsx, 6, 27))
->user : Symbol(user, Decl(file.tsx, 7, 15))
->IUser : Symbol(IUser, Decl(file.tsx, 0, 32))
+>children : Symbol(IFetchUserProps.children, Decl(file.tsx, 8, 27))
+>user : Symbol(user, Decl(file.tsx, 9, 15))
+>IUser : Symbol(IUser, Decl(file.tsx, 2, 32))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 }
 
 class FetchUser extends React.Component<IFetchUserProps, any> {
->FetchUser : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>FetchUser : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->IFetchUserProps : Symbol(IFetchUserProps, Decl(file.tsx, 4, 1))
+>IFetchUserProps : Symbol(IFetchUserProps, Decl(file.tsx, 6, 1))
 
     render() {
->render : Symbol(FetchUser.render, Decl(file.tsx, 10, 63))
+>render : Symbol(FetchUser.render, Decl(file.tsx, 12, 63))
 
         return this.state
 >this.state : Symbol(React.Component.state, Decl(react.d.ts, 174, 44))
->this : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>this : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 >state : Symbol(React.Component.state, Decl(react.d.ts, 174, 44))
 
             ? this.props.children(this.state.result)
->this.props.children : Symbol(children, Decl(file.tsx, 6, 27), Decl(react.d.ts, 174, 20))
+>this.props.children : Symbol(children, Decl(file.tsx, 8, 27), Decl(react.d.ts, 174, 20))
 >this.props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
->this : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>this : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 >props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
->children : Symbol(children, Decl(file.tsx, 6, 27), Decl(react.d.ts, 174, 20))
+>children : Symbol(children, Decl(file.tsx, 8, 27), Decl(react.d.ts, 174, 20))
 >this.state : Symbol(React.Component.state, Decl(react.d.ts, 174, 44))
->this : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>this : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 >state : Symbol(React.Component.state, Decl(react.d.ts, 174, 44))
 
             : null;
@@ -53,60 +55,60 @@ class FetchUser extends React.Component<IFetchUserProps, any> {
 
 // Error
 function UserName() {
->UserName : Symbol(UserName, Decl(file.tsx, 16, 1))
+>UserName : Symbol(UserName, Decl(file.tsx, 18, 1))
 
     return (
         <FetchUser>
->FetchUser : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>FetchUser : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 
             { user => (
->user : Symbol(user, Decl(file.tsx, 22, 13))
+>user : Symbol(user, Decl(file.tsx, 24, 13))
 
                 <h1>{ user.NAme }</h1>
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
->user : Symbol(user, Decl(file.tsx, 22, 13))
+>user : Symbol(user, Decl(file.tsx, 24, 13))
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
 
             ) }
         </FetchUser>
->FetchUser : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>FetchUser : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 
     );
 }
 
 function UserName1() {
->UserName1 : Symbol(UserName1, Decl(file.tsx, 27, 1))
+>UserName1 : Symbol(UserName1, Decl(file.tsx, 29, 1))
 
     return (
         <FetchUser>
->FetchUser : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>FetchUser : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 
 
             
             { user => (
->user : Symbol(user, Decl(file.tsx, 35, 13))
+>user : Symbol(user, Decl(file.tsx, 37, 13))
 
                 <h1>{ user.Name }</h1>
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
->user.Name : Symbol(IUser.Name, Decl(file.tsx, 2, 17))
->user : Symbol(user, Decl(file.tsx, 35, 13))
->Name : Symbol(IUser.Name, Decl(file.tsx, 2, 17))
+>user.Name : Symbol(IUser.Name, Decl(file.tsx, 4, 17))
+>user : Symbol(user, Decl(file.tsx, 37, 13))
+>Name : Symbol(IUser.Name, Decl(file.tsx, 4, 17))
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
 
             ) }
             { user => (
->user : Symbol(user, Decl(file.tsx, 38, 13))
+>user : Symbol(user, Decl(file.tsx, 40, 13))
 
                 <h1>{ user.Name }</h1>
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
->user.Name : Symbol(IUser.Name, Decl(file.tsx, 2, 17))
->user : Symbol(user, Decl(file.tsx, 38, 13))
->Name : Symbol(IUser.Name, Decl(file.tsx, 2, 17))
+>user.Name : Symbol(IUser.Name, Decl(file.tsx, 4, 17))
+>user : Symbol(user, Decl(file.tsx, 40, 13))
+>Name : Symbol(IUser.Name, Decl(file.tsx, 4, 17))
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
 
             ) }
         </FetchUser>
->FetchUser : Symbol(FetchUser, Decl(file.tsx, 8, 1))
+>FetchUser : Symbol(FetchUser, Decl(file.tsx, 10, 1))
 
     );
 }
diff --git a/tests/baselines/reference/checkJsxChildrenProperty4.types b/tests/baselines/reference/checkJsxChildrenProperty4.types
index d08a39c798765..2881a1a0d6712 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty4.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty4.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty4.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt
index a33a925ab34e8..de66a879fd698 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.errors.txt
@@ -1,9 +1,11 @@
-file.tsx(20,10): error TS2741: Property 'children' is missing in type '{ a: number; b: string; }' but required in type 'Prop'.
-file.tsx(25,9): error TS2740: Type 'ReactElement<any>' is missing the following properties from type 'Button': render, setState, forceUpdate, state, and 2 more.
-file.tsx(29,10): error TS2740: Type 'typeof Button' is missing the following properties from type 'Button': render, setState, forceUpdate, props, and 3 more.
+file.tsx(22,10): error TS2741: Property 'children' is missing in type '{ a: number; b: string; }' but required in type 'Prop'.
+file.tsx(27,9): error TS2740: Type 'ReactElement<any>' is missing the following properties from type 'Button': render, setState, forceUpdate, state, and 2 more.
+file.tsx(31,10): error TS2740: Type 'typeof Button' is missing the following properties from type 'Button': render, setState, forceUpdate, props, and 3 more.
 
 
 ==== file.tsx (3 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface Prop {
@@ -26,7 +28,7 @@ file.tsx(29,10): error TS2740: Type 'typeof Button' is missing the following pro
     let k = <Comp a={10} b="hi" />;
              ~~~~
 !!! error TS2741: Property 'children' is missing in type '{ a: number; b: string; }' but required in type 'Prop'.
-!!! related TS2728 file.tsx:6:5: 'children' is declared here.
+!!! related TS2728 file.tsx:8:5: 'children' is declared here.
     
     // Error: JSX.element is not the same as JSX.ElementClass
     let k1 =
@@ -34,12 +36,12 @@ file.tsx(29,10): error TS2740: Type 'typeof Button' is missing the following pro
             <Button />
             ~~~~~~~~~~
 !!! error TS2740: Type 'ReactElement<any>' is missing the following properties from type 'Button': render, setState, forceUpdate, state, and 2 more.
-!!! related TS6500 file.tsx:6:5: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & Prop'
+!!! related TS6500 file.tsx:8:5: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & Prop'
         </Comp>;
     let k2 =
         <Comp a={10} b="hi">
             {Button}
              ~~~~~~
 !!! error TS2740: Type 'typeof Button' is missing the following properties from type 'Button': render, setState, forceUpdate, props, and 3 more.
-!!! related TS6213 file.tsx:29:10: Did you mean to use 'new' with this expression?
+!!! related TS6213 file.tsx:31:10: Did you mean to use 'new' with this expression?
         </Comp>;
\ No newline at end of file
diff --git a/tests/baselines/reference/checkJsxChildrenProperty5.js b/tests/baselines/reference/checkJsxChildrenProperty5.js
index ab267092251f2..ec7e361699748 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty5.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Prop {
@@ -34,6 +36,7 @@ let k2 =
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/checkJsxChildrenProperty5.symbols b/tests/baselines/reference/checkJsxChildrenProperty5.symbols
index fcfbb7bdcf21c..3e02396998f0c 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.symbols
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.symbols
@@ -1,31 +1,33 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty5.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     a: number,
->a : Symbol(Prop.a, Decl(file.tsx, 2, 16))
+>a : Symbol(Prop.a, Decl(file.tsx, 4, 16))
 
     b: string,
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 
     children: Button;
->children : Symbol(Prop.children, Decl(file.tsx, 4, 14))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>children : Symbol(Prop.children, Decl(file.tsx, 6, 14))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 }
 
 class Button extends React.Component<any, any> {
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 
     render() {
->render : Symbol(Button.render, Decl(file.tsx, 8, 48))
+>render : Symbol(Button.render, Decl(file.tsx, 10, 48))
 
         return (<div>My Button</div>)
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -34,51 +36,51 @@ class Button extends React.Component<any, any> {
 }
 
 function Comp(p: Prop) {
->Comp : Symbol(Comp, Decl(file.tsx, 12, 1))
->p : Symbol(p, Decl(file.tsx, 14, 14))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Comp : Symbol(Comp, Decl(file.tsx, 14, 1))
+>p : Symbol(p, Decl(file.tsx, 16, 14))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     return <div>{p.b}</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->p.b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
->p : Symbol(p, Decl(file.tsx, 14, 14))
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>p.b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
+>p : Symbol(p, Decl(file.tsx, 16, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 }
 
 // Error: no children specified
 let k = <Comp a={10} b="hi" />;
->k : Symbol(k, Decl(file.tsx, 19, 3))
->Comp : Symbol(Comp, Decl(file.tsx, 12, 1))
->a : Symbol(a, Decl(file.tsx, 19, 13))
->b : Symbol(b, Decl(file.tsx, 19, 20))
+>k : Symbol(k, Decl(file.tsx, 21, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 14, 1))
+>a : Symbol(a, Decl(file.tsx, 21, 13))
+>b : Symbol(b, Decl(file.tsx, 21, 20))
 
 // Error: JSX.element is not the same as JSX.ElementClass
 let k1 =
->k1 : Symbol(k1, Decl(file.tsx, 22, 3))
+>k1 : Symbol(k1, Decl(file.tsx, 24, 3))
 
     <Comp a={10} b="hi">
->Comp : Symbol(Comp, Decl(file.tsx, 12, 1))
->a : Symbol(a, Decl(file.tsx, 23, 9))
->b : Symbol(b, Decl(file.tsx, 23, 16))
+>Comp : Symbol(Comp, Decl(file.tsx, 14, 1))
+>a : Symbol(a, Decl(file.tsx, 25, 9))
+>b : Symbol(b, Decl(file.tsx, 25, 16))
 
         <Button />
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 
     </Comp>;
->Comp : Symbol(Comp, Decl(file.tsx, 12, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 14, 1))
 
 let k2 =
->k2 : Symbol(k2, Decl(file.tsx, 26, 3))
+>k2 : Symbol(k2, Decl(file.tsx, 28, 3))
 
     <Comp a={10} b="hi">
->Comp : Symbol(Comp, Decl(file.tsx, 12, 1))
->a : Symbol(a, Decl(file.tsx, 27, 9))
->b : Symbol(b, Decl(file.tsx, 27, 16))
+>Comp : Symbol(Comp, Decl(file.tsx, 14, 1))
+>a : Symbol(a, Decl(file.tsx, 29, 9))
+>b : Symbol(b, Decl(file.tsx, 29, 16))
 
         {Button}
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 
     </Comp>;
->Comp : Symbol(Comp, Decl(file.tsx, 12, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 14, 1))
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty5.types b/tests/baselines/reference/checkJsxChildrenProperty5.types
index e6548450acaf4..37eb5aed18409 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty5.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/checkJsxChildrenProperty6.js b/tests/baselines/reference/checkJsxChildrenProperty6.js
index 2acd307d3ec36..b1f6ca6320aaa 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty6.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty6.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty6.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Prop {
@@ -47,6 +49,7 @@ let k4 = <Comp a={10} b="hi"><Button /></Comp>;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/checkJsxChildrenProperty6.symbols b/tests/baselines/reference/checkJsxChildrenProperty6.symbols
index 61d2c033b781a..ea50abb1a721c 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty6.symbols
+++ b/tests/baselines/reference/checkJsxChildrenProperty6.symbols
@@ -1,20 +1,22 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty6.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     a: number,
->a : Symbol(Prop.a, Decl(file.tsx, 2, 16))
+>a : Symbol(Prop.a, Decl(file.tsx, 4, 16))
 
     b: string,
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 
     children: JSX.Element | JSX.Element[];
->children : Symbol(Prop.children, Decl(file.tsx, 4, 14))
+>children : Symbol(Prop.children, Decl(file.tsx, 6, 14))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
@@ -22,13 +24,13 @@ interface Prop {
 }
 
 class Button extends React.Component<any, any> {
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 
     render() {
->render : Symbol(Button.render, Decl(file.tsx, 8, 48))
+>render : Symbol(Button.render, Decl(file.tsx, 10, 48))
 
         return (<div>My Button</div>)
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -37,8 +39,8 @@ class Button extends React.Component<any, any> {
 }
 
 function AnotherButton(p: any) {
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
->p : Symbol(p, Decl(file.tsx, 14, 23))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
+>p : Symbol(p, Decl(file.tsx, 16, 23))
 
     return <h1>Just Another Button</h1>;
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
@@ -46,73 +48,73 @@ function AnotherButton(p: any) {
 }
 
 function Comp(p: Prop) {
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->p : Symbol(p, Decl(file.tsx, 18, 14))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>p : Symbol(p, Decl(file.tsx, 20, 14))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     return <div>{p.b}</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->p.b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
->p : Symbol(p, Decl(file.tsx, 18, 14))
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>p.b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
+>p : Symbol(p, Decl(file.tsx, 20, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 }
 
 // Ok
 let k1 =
->k1 : Symbol(k1, Decl(file.tsx, 23, 3))
+>k1 : Symbol(k1, Decl(file.tsx, 25, 3))
 
     <Comp a={10} b="hi">
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->a : Symbol(a, Decl(file.tsx, 24, 9))
->b : Symbol(b, Decl(file.tsx, 24, 16))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>a : Symbol(a, Decl(file.tsx, 26, 9))
+>b : Symbol(b, Decl(file.tsx, 26, 16))
 
         <Button />
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 
         <AnotherButton />
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
 
     </Comp>;
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
 
 let k2 =
->k2 : Symbol(k2, Decl(file.tsx, 29, 3))
+>k2 : Symbol(k2, Decl(file.tsx, 31, 3))
 
     <Comp a={10} b="hi">
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->a : Symbol(a, Decl(file.tsx, 30, 9))
->b : Symbol(b, Decl(file.tsx, 30, 16))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>a : Symbol(a, Decl(file.tsx, 32, 9))
+>b : Symbol(b, Decl(file.tsx, 32, 16))
      
     
     
         <Button />
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 
         <AnotherButton />
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
 
     </Comp>;
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
 
 let k3 = <Comp a={10} b="hi"><Button />  
->k3 : Symbol(k3, Decl(file.tsx, 38, 3))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->a : Symbol(a, Decl(file.tsx, 38, 14))
->b : Symbol(b, Decl(file.tsx, 38, 21))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>k3 : Symbol(k3, Decl(file.tsx, 40, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>a : Symbol(a, Decl(file.tsx, 40, 14))
+>b : Symbol(b, Decl(file.tsx, 40, 21))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 
 <AnotherButton />
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
 
 </Comp>;
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
 
 let k4 = <Comp a={10} b="hi"><Button /></Comp>;
->k4 : Symbol(k4, Decl(file.tsx, 42, 3))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->a : Symbol(a, Decl(file.tsx, 42, 14))
->b : Symbol(b, Decl(file.tsx, 42, 21))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
+>k4 : Symbol(k4, Decl(file.tsx, 44, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>a : Symbol(a, Decl(file.tsx, 44, 14))
+>b : Symbol(b, Decl(file.tsx, 44, 21))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty6.types b/tests/baselines/reference/checkJsxChildrenProperty6.types
index ce5c43d4bdc95..2be18c9fc2072 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty6.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty6.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty6.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/checkJsxChildrenProperty7.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty7.errors.txt
index c593701198647..93ff80855c869 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty7.errors.txt
+++ b/tests/baselines/reference/checkJsxChildrenProperty7.errors.txt
@@ -1,9 +1,11 @@
-file.tsx(24,40): error TS2747: 'Comp' components don't accept text as child elements. Text in JSX has the type 'string', but the expected type of 'children' is 'Element | Element[]'.
-file.tsx(26,22): error TS2747: 'Comp' components don't accept text as child elements. Text in JSX has the type 'string', but the expected type of 'children' is 'Element | Element[]'.
-file.tsx(27,30): error TS2747: 'Comp' components don't accept text as child elements. Text in JSX has the type 'string', but the expected type of 'children' is 'Element | Element[]'.
+file.tsx(26,40): error TS2747: 'Comp' components don't accept text as child elements. Text in JSX has the type 'string', but the expected type of 'children' is 'Element | Element[]'.
+file.tsx(28,22): error TS2747: 'Comp' components don't accept text as child elements. Text in JSX has the type 'string', but the expected type of 'children' is 'Element | Element[]'.
+file.tsx(29,30): error TS2747: 'Comp' components don't accept text as child elements. Text in JSX has the type 'string', but the expected type of 'children' is 'Element | Element[]'.
 
 
 ==== file.tsx (3 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface Prop {
diff --git a/tests/baselines/reference/checkJsxChildrenProperty7.js b/tests/baselines/reference/checkJsxChildrenProperty7.js
index ffecaeb8e9e19..7f8913f3a4490 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty7.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty7.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty7.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Prop {
@@ -32,6 +34,7 @@ let k3 = <Comp a={10} b="hi">    <Button />
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/checkJsxChildrenProperty7.symbols b/tests/baselines/reference/checkJsxChildrenProperty7.symbols
index cb4ddac3fd8fd..aa6654eacb232 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty7.symbols
+++ b/tests/baselines/reference/checkJsxChildrenProperty7.symbols
@@ -1,20 +1,22 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty7.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     a: number,
->a : Symbol(Prop.a, Decl(file.tsx, 2, 16))
+>a : Symbol(Prop.a, Decl(file.tsx, 4, 16))
 
     b: string,
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 
     children: JSX.Element | JSX.Element[];
->children : Symbol(Prop.children, Decl(file.tsx, 4, 14))
+>children : Symbol(Prop.children, Decl(file.tsx, 6, 14))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
@@ -22,13 +24,13 @@ interface Prop {
 }
 
 class Button extends React.Component<any, any> {
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 
     render() {
->render : Symbol(Button.render, Decl(file.tsx, 8, 48))
+>render : Symbol(Button.render, Decl(file.tsx, 10, 48))
 
         return (<div>My Button</div>)
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -37,8 +39,8 @@ class Button extends React.Component<any, any> {
 }
 
 function AnotherButton(p: any) {
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
->p : Symbol(p, Decl(file.tsx, 14, 23))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
+>p : Symbol(p, Decl(file.tsx, 16, 23))
 
     return <h1>Just Another Button</h1>;
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
@@ -46,47 +48,47 @@ function AnotherButton(p: any) {
 }
 
 function Comp(p: Prop) {
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->p : Symbol(p, Decl(file.tsx, 18, 14))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>p : Symbol(p, Decl(file.tsx, 20, 14))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     return <div>{p.b}</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->p.b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
->p : Symbol(p, Decl(file.tsx, 18, 14))
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>p.b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
+>p : Symbol(p, Decl(file.tsx, 20, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 }
 
 // Error: whitespaces matters
 let k1 = <Comp a={10} b="hi"><Button />  <AnotherButton /></Comp>;
->k1 : Symbol(k1, Decl(file.tsx, 23, 3))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->a : Symbol(a, Decl(file.tsx, 23, 14))
->b : Symbol(b, Decl(file.tsx, 23, 21))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
+>k1 : Symbol(k1, Decl(file.tsx, 25, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>a : Symbol(a, Decl(file.tsx, 25, 14))
+>b : Symbol(b, Decl(file.tsx, 25, 21))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
 
 let k2 = <Comp a={10} b="hi"><Button />
->k2 : Symbol(k2, Decl(file.tsx, 24, 3))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->a : Symbol(a, Decl(file.tsx, 24, 14))
->b : Symbol(b, Decl(file.tsx, 24, 21))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>k2 : Symbol(k2, Decl(file.tsx, 26, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>a : Symbol(a, Decl(file.tsx, 26, 14))
+>b : Symbol(b, Decl(file.tsx, 26, 21))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 
     <AnotherButton />  </Comp>;
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
 
 let k3 = <Comp a={10} b="hi">    <Button />
->k3 : Symbol(k3, Decl(file.tsx, 26, 3))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->a : Symbol(a, Decl(file.tsx, 26, 14))
->b : Symbol(b, Decl(file.tsx, 26, 21))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>k3 : Symbol(k3, Decl(file.tsx, 28, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>a : Symbol(a, Decl(file.tsx, 28, 14))
+>b : Symbol(b, Decl(file.tsx, 28, 21))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 
     <AnotherButton /></Comp>;
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty7.types b/tests/baselines/reference/checkJsxChildrenProperty7.types
index fed71f80cf95c..565d8513fb066 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty7.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty7.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty7.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/checkJsxChildrenProperty8.js b/tests/baselines/reference/checkJsxChildrenProperty8.js
index 9241afeba1eb4..a66deaa7bfc90 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty8.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty8.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty8.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Prop {
@@ -33,6 +35,7 @@ let k4 = <Comp a={10} b="hi"><Button />  </Comp>;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/checkJsxChildrenProperty8.symbols b/tests/baselines/reference/checkJsxChildrenProperty8.symbols
index f0296b3c06bd6..4bb208727db69 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty8.symbols
+++ b/tests/baselines/reference/checkJsxChildrenProperty8.symbols
@@ -1,20 +1,22 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty8.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     a: number,
->a : Symbol(Prop.a, Decl(file.tsx, 2, 16))
+>a : Symbol(Prop.a, Decl(file.tsx, 4, 16))
 
     b: string,
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 
     children: string | JSX.Element | (string | JSX.Element)[];
->children : Symbol(Prop.children, Decl(file.tsx, 4, 14))
+>children : Symbol(Prop.children, Decl(file.tsx, 6, 14))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
@@ -22,13 +24,13 @@ interface Prop {
 }
 
 class Button extends React.Component<any, any> {
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 
     render() {
->render : Symbol(Button.render, Decl(file.tsx, 8, 48))
+>render : Symbol(Button.render, Decl(file.tsx, 10, 48))
 
         return (<div>My Button</div>)
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -37,8 +39,8 @@ class Button extends React.Component<any, any> {
 }
 
 function AnotherButton(p: any) {
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
->p : Symbol(p, Decl(file.tsx, 14, 23))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
+>p : Symbol(p, Decl(file.tsx, 16, 23))
 
     return <h1>Just Another Button</h1>;
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
@@ -46,55 +48,55 @@ function AnotherButton(p: any) {
 }
 
 function Comp(p: Prop) {
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->p : Symbol(p, Decl(file.tsx, 18, 14))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>p : Symbol(p, Decl(file.tsx, 20, 14))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     return <div>{p.b}</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->p.b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
->p : Symbol(p, Decl(file.tsx, 18, 14))
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>p.b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
+>p : Symbol(p, Decl(file.tsx, 20, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 }
 
 // OK
 let k1 = <Comp a={10} b="hi"><Button />  <AnotherButton /></Comp>;
->k1 : Symbol(k1, Decl(file.tsx, 23, 3))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->a : Symbol(a, Decl(file.tsx, 23, 14))
->b : Symbol(b, Decl(file.tsx, 23, 21))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
+>k1 : Symbol(k1, Decl(file.tsx, 25, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>a : Symbol(a, Decl(file.tsx, 25, 14))
+>b : Symbol(b, Decl(file.tsx, 25, 21))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
 
 let k2 = <Comp a={10} b="hi"><Button />
->k2 : Symbol(k2, Decl(file.tsx, 24, 3))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->a : Symbol(a, Decl(file.tsx, 24, 14))
->b : Symbol(b, Decl(file.tsx, 24, 21))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>k2 : Symbol(k2, Decl(file.tsx, 26, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>a : Symbol(a, Decl(file.tsx, 26, 14))
+>b : Symbol(b, Decl(file.tsx, 26, 21))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 
     <AnotherButton />  </Comp>;
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
 
 let k3 = <Comp a={10} b="hi">    <Button />
->k3 : Symbol(k3, Decl(file.tsx, 26, 3))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->a : Symbol(a, Decl(file.tsx, 26, 14))
->b : Symbol(b, Decl(file.tsx, 26, 21))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
+>k3 : Symbol(k3, Decl(file.tsx, 28, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>a : Symbol(a, Decl(file.tsx, 28, 14))
+>b : Symbol(b, Decl(file.tsx, 28, 21))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
 
     <AnotherButton /></Comp>;
->AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 12, 1))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
+>AnotherButton : Symbol(AnotherButton, Decl(file.tsx, 14, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
 
 let k4 = <Comp a={10} b="hi"><Button />  </Comp>;
->k4 : Symbol(k4, Decl(file.tsx, 28, 3))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
->a : Symbol(a, Decl(file.tsx, 28, 14))
->b : Symbol(b, Decl(file.tsx, 28, 21))
->Button : Symbol(Button, Decl(file.tsx, 6, 1))
->Comp : Symbol(Comp, Decl(file.tsx, 16, 1))
+>k4 : Symbol(k4, Decl(file.tsx, 30, 3))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
+>a : Symbol(a, Decl(file.tsx, 30, 14))
+>b : Symbol(b, Decl(file.tsx, 30, 21))
+>Button : Symbol(Button, Decl(file.tsx, 8, 1))
+>Comp : Symbol(Comp, Decl(file.tsx, 18, 1))
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty8.types b/tests/baselines/reference/checkJsxChildrenProperty8.types
index a0ad4905882ab..80b6bfad4e568 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty8.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty8.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty8.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/checkJsxChildrenProperty9.js b/tests/baselines/reference/checkJsxChildrenProperty9.js
index 6753b2c47b67b..d05f2f3df20cf 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty9.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty9.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty9.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 // OK
@@ -10,6 +12,7 @@ let k3 = <div> {1} {"That is a number"} </div>;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 // OK
diff --git a/tests/baselines/reference/checkJsxChildrenProperty9.symbols b/tests/baselines/reference/checkJsxChildrenProperty9.symbols
index bcdb7b70c1aea..c6c8e9eeac928 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty9.symbols
+++ b/tests/baselines/reference/checkJsxChildrenProperty9.symbols
@@ -1,12 +1,14 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty9.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 // OK
 let k1 = <div> <h2> Hello </h2> <h1> world </h1></div>;
->k1 : Symbol(k1, Decl(file.tsx, 3, 3))
+>k1 : Symbol(k1, Decl(file.tsx, 5, 3))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >h2 : Symbol(JSX.IntrinsicElements.h2, Decl(react.d.ts, 2411, 48))
 >h2 : Symbol(JSX.IntrinsicElements.h2, Decl(react.d.ts, 2411, 48))
@@ -15,18 +17,18 @@ let k1 = <div> <h2> Hello </h2> <h1> world </h1></div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
 let k2 = <div> <h2> Hello </h2> {(user: any) => <h2>{user.name}</h2>}</div>;
->k2 : Symbol(k2, Decl(file.tsx, 4, 3))
+>k2 : Symbol(k2, Decl(file.tsx, 6, 3))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >h2 : Symbol(JSX.IntrinsicElements.h2, Decl(react.d.ts, 2411, 48))
 >h2 : Symbol(JSX.IntrinsicElements.h2, Decl(react.d.ts, 2411, 48))
->user : Symbol(user, Decl(file.tsx, 4, 34))
+>user : Symbol(user, Decl(file.tsx, 6, 34))
 >h2 : Symbol(JSX.IntrinsicElements.h2, Decl(react.d.ts, 2411, 48))
->user : Symbol(user, Decl(file.tsx, 4, 34))
+>user : Symbol(user, Decl(file.tsx, 6, 34))
 >h2 : Symbol(JSX.IntrinsicElements.h2, Decl(react.d.ts, 2411, 48))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
 let k3 = <div> {1} {"That is a number"} </div>;
->k3 : Symbol(k3, Decl(file.tsx, 5, 3))
+>k3 : Symbol(k3, Decl(file.tsx, 7, 3))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty9.types b/tests/baselines/reference/checkJsxChildrenProperty9.types
index c82cb04bf2341..85c297d0e666d 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty9.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty9.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/checkJsxChildrenProperty9.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.errors.txt b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.errors.txt
index 52b519f32939a..7b7808b7d2291 100644
--- a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.errors.txt
+++ b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.errors.txt
@@ -1,9 +1,10 @@
-file.tsx(13,54): error TS2322: Type '(a: { x: string; }) => string' is not assignable to type '((a: { x: string; }) => string) & ((cur: { x: string; }) => { x: string; })'.
+file.tsx(14,54): error TS2322: Type '(a: { x: string; }) => string' is not assignable to type '((a: { x: string; }) => string) & ((cur: { x: string; }) => { x: string; })'.
   Type '(a: { x: string; }) => string' is not assignable to type '(cur: { x: string; }) => { x: string; }'.
     Type 'string' is not assignable to type '{ x: string; }'.
 
 
 ==== file.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
     import * as React from "react";
     interface BaseProps<T> {
       initialValues: T;
@@ -21,4 +22,4 @@ file.tsx(13,54): error TS2322: Type '(a: { x: string; }) => string' is not assig
 !!! error TS2322: Type '(a: { x: string; }) => string' is not assignable to type '((a: { x: string; }) => string) & ((cur: { x: string; }) => { x: string; })'.
 !!! error TS2322:   Type '(a: { x: string; }) => string' is not assignable to type '(cur: { x: string; }) => { x: string; }'.
 !!! error TS2322:     Type 'string' is not assignable to type '{ x: string; }'.
-!!! related TS6500 file.tsx:13:54: The expected type comes from property 'nextValues' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<GenericComponent<{ initialValues: { x: string; }; nextValues: (a: { x: string; }) => string; }, { x: string; }>> & { initialValues: { x: string; }; nextValues: (a: { x: string; }) => string; } & BaseProps<{ x: string; }> & { children?: ReactNode; }'
\ No newline at end of file
+!!! related TS6500 file.tsx:14:54: The expected type comes from property 'nextValues' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<GenericComponent<{ initialValues: { x: string; }; nextValues: (a: { x: string; }) => string; }, { x: string; }>> & { initialValues: { x: string; }; nextValues: (a: { x: string; }) => string; } & BaseProps<{ x: string; }> & { children?: ReactNode; }'
\ No newline at end of file
diff --git a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.js b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.js
index e6bbf28d39b9d..56445009fa2ef 100644
--- a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.js
+++ b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.js
@@ -1,6 +1,7 @@
 //// [tests/cases/conformance/jsx/checkJsxGenericTagHasCorrectInferences.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
 import * as React from "react";
 interface BaseProps<T> {
   initialValues: T;
@@ -51,6 +52,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+/// <reference path="/.lib/react.d.ts" />
 var React = __importStar(require("react"));
 var a = <GenericComponent initialValues={{ x: "y" }} nextValues={function (a) { return a; }}/>; // No error
 var b = <GenericComponent initialValues={12} nextValues={function (a) { return a; }}/>; // No error - Values should be reinstantiated with `number` (since `object` is a default, not a constraint)
diff --git a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.symbols b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.symbols
index 86f1b99ea6d4e..39cd745009d0f 100644
--- a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.symbols
+++ b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.symbols
@@ -1,76 +1,77 @@
 //// [tests/cases/conformance/jsx/checkJsxGenericTagHasCorrectInferences.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
 import * as React from "react";
->React : Symbol(React, Decl(file.tsx, 0, 6))
+>React : Symbol(React, Decl(file.tsx, 1, 6))
 
 interface BaseProps<T> {
->BaseProps : Symbol(BaseProps, Decl(file.tsx, 0, 31))
->T : Symbol(T, Decl(file.tsx, 1, 20))
+>BaseProps : Symbol(BaseProps, Decl(file.tsx, 1, 31))
+>T : Symbol(T, Decl(file.tsx, 2, 20))
 
   initialValues: T;
->initialValues : Symbol(BaseProps.initialValues, Decl(file.tsx, 1, 24))
->T : Symbol(T, Decl(file.tsx, 1, 20))
+>initialValues : Symbol(BaseProps.initialValues, Decl(file.tsx, 2, 24))
+>T : Symbol(T, Decl(file.tsx, 2, 20))
 
   nextValues: (cur: T) => T;
->nextValues : Symbol(BaseProps.nextValues, Decl(file.tsx, 2, 19))
->cur : Symbol(cur, Decl(file.tsx, 3, 15))
->T : Symbol(T, Decl(file.tsx, 1, 20))
->T : Symbol(T, Decl(file.tsx, 1, 20))
+>nextValues : Symbol(BaseProps.nextValues, Decl(file.tsx, 3, 19))
+>cur : Symbol(cur, Decl(file.tsx, 4, 15))
+>T : Symbol(T, Decl(file.tsx, 2, 20))
+>T : Symbol(T, Decl(file.tsx, 2, 20))
 }
 declare class GenericComponent<Props = {}, Values = object> extends React.Component<Props & BaseProps<Values>, {}> {
->GenericComponent : Symbol(GenericComponent, Decl(file.tsx, 4, 1))
->Props : Symbol(Props, Decl(file.tsx, 5, 31))
->Values : Symbol(Values, Decl(file.tsx, 5, 42))
+>GenericComponent : Symbol(GenericComponent, Decl(file.tsx, 5, 1))
+>Props : Symbol(Props, Decl(file.tsx, 6, 31))
+>Values : Symbol(Values, Decl(file.tsx, 6, 42))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->React : Symbol(React, Decl(file.tsx, 0, 6))
+>React : Symbol(React, Decl(file.tsx, 1, 6))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->Props : Symbol(Props, Decl(file.tsx, 5, 31))
->BaseProps : Symbol(BaseProps, Decl(file.tsx, 0, 31))
->Values : Symbol(Values, Decl(file.tsx, 5, 42))
+>Props : Symbol(Props, Decl(file.tsx, 6, 31))
+>BaseProps : Symbol(BaseProps, Decl(file.tsx, 1, 31))
+>Values : Symbol(Values, Decl(file.tsx, 6, 42))
 
   iv: Values;
->iv : Symbol(GenericComponent.iv, Decl(file.tsx, 5, 116))
->Values : Symbol(Values, Decl(file.tsx, 5, 42))
+>iv : Symbol(GenericComponent.iv, Decl(file.tsx, 6, 116))
+>Values : Symbol(Values, Decl(file.tsx, 6, 42))
 }
 
 let a = <GenericComponent initialValues={{ x: "y" }} nextValues={a => a} />; // No error
->a : Symbol(a, Decl(file.tsx, 9, 3))
->GenericComponent : Symbol(GenericComponent, Decl(file.tsx, 4, 1))
->initialValues : Symbol(initialValues, Decl(file.tsx, 9, 25))
->x : Symbol(x, Decl(file.tsx, 9, 42))
->nextValues : Symbol(nextValues, Decl(file.tsx, 9, 52))
->a : Symbol(a, Decl(file.tsx, 9, 65))
->a : Symbol(a, Decl(file.tsx, 9, 65))
-
-let b = <GenericComponent initialValues={12} nextValues={a => a} />; // No error - Values should be reinstantiated with `number` (since `object` is a default, not a constraint)
->b : Symbol(b, Decl(file.tsx, 10, 3))
->GenericComponent : Symbol(GenericComponent, Decl(file.tsx, 4, 1))
+>a : Symbol(a, Decl(file.tsx, 10, 3))
+>GenericComponent : Symbol(GenericComponent, Decl(file.tsx, 5, 1))
 >initialValues : Symbol(initialValues, Decl(file.tsx, 10, 25))
->nextValues : Symbol(nextValues, Decl(file.tsx, 10, 44))
->a : Symbol(a, Decl(file.tsx, 10, 57))
->a : Symbol(a, Decl(file.tsx, 10, 57))
+>x : Symbol(x, Decl(file.tsx, 10, 42))
+>nextValues : Symbol(nextValues, Decl(file.tsx, 10, 52))
+>a : Symbol(a, Decl(file.tsx, 10, 65))
+>a : Symbol(a, Decl(file.tsx, 10, 65))
 
-let c = <GenericComponent initialValues={{ x: "y" }} nextValues={a => ({ x: a.x })} />; // No Error
->c : Symbol(c, Decl(file.tsx, 11, 3))
->GenericComponent : Symbol(GenericComponent, Decl(file.tsx, 4, 1))
+let b = <GenericComponent initialValues={12} nextValues={a => a} />; // No error - Values should be reinstantiated with `number` (since `object` is a default, not a constraint)
+>b : Symbol(b, Decl(file.tsx, 11, 3))
+>GenericComponent : Symbol(GenericComponent, Decl(file.tsx, 5, 1))
 >initialValues : Symbol(initialValues, Decl(file.tsx, 11, 25))
->x : Symbol(x, Decl(file.tsx, 11, 42))
->nextValues : Symbol(nextValues, Decl(file.tsx, 11, 52))
->a : Symbol(a, Decl(file.tsx, 11, 65))
->x : Symbol(x, Decl(file.tsx, 11, 72))
->a.x : Symbol(x, Decl(file.tsx, 11, 42))
->a : Symbol(a, Decl(file.tsx, 11, 65))
->x : Symbol(x, Decl(file.tsx, 11, 42))
+>nextValues : Symbol(nextValues, Decl(file.tsx, 11, 44))
+>a : Symbol(a, Decl(file.tsx, 11, 57))
+>a : Symbol(a, Decl(file.tsx, 11, 57))
 
-let d = <GenericComponent initialValues={{ x: "y" }} nextValues={a => a.x} />; // Error - `string` is not assignable to `{x: string}`
->d : Symbol(d, Decl(file.tsx, 12, 3))
->GenericComponent : Symbol(GenericComponent, Decl(file.tsx, 4, 1))
+let c = <GenericComponent initialValues={{ x: "y" }} nextValues={a => ({ x: a.x })} />; // No Error
+>c : Symbol(c, Decl(file.tsx, 12, 3))
+>GenericComponent : Symbol(GenericComponent, Decl(file.tsx, 5, 1))
 >initialValues : Symbol(initialValues, Decl(file.tsx, 12, 25))
 >x : Symbol(x, Decl(file.tsx, 12, 42))
 >nextValues : Symbol(nextValues, Decl(file.tsx, 12, 52))
 >a : Symbol(a, Decl(file.tsx, 12, 65))
+>x : Symbol(x, Decl(file.tsx, 12, 72))
 >a.x : Symbol(x, Decl(file.tsx, 12, 42))
 >a : Symbol(a, Decl(file.tsx, 12, 65))
 >x : Symbol(x, Decl(file.tsx, 12, 42))
 
+let d = <GenericComponent initialValues={{ x: "y" }} nextValues={a => a.x} />; // Error - `string` is not assignable to `{x: string}`
+>d : Symbol(d, Decl(file.tsx, 13, 3))
+>GenericComponent : Symbol(GenericComponent, Decl(file.tsx, 5, 1))
+>initialValues : Symbol(initialValues, Decl(file.tsx, 13, 25))
+>x : Symbol(x, Decl(file.tsx, 13, 42))
+>nextValues : Symbol(nextValues, Decl(file.tsx, 13, 52))
+>a : Symbol(a, Decl(file.tsx, 13, 65))
+>a.x : Symbol(x, Decl(file.tsx, 13, 42))
+>a : Symbol(a, Decl(file.tsx, 13, 65))
+>x : Symbol(x, Decl(file.tsx, 13, 42))
+
diff --git a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.types b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.types
index 519b58df460c1..332aff90081a5 100644
--- a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.types
+++ b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.types
@@ -1,6 +1,7 @@
 //// [tests/cases/conformance/jsx/checkJsxGenericTagHasCorrectInferences.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
 import * as React from "react";
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
index 199e837626264..95ba9a1fa889a 100644
--- a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
+++ b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
@@ -113,7 +113,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var React = __importStar(require("react"));
 var AsyncLoader = /** @class */ (function (_super) {
     __extends(AsyncLoader, _super);
diff --git a/tests/baselines/reference/checkJsxUnionSFXContextualTypeInferredCorrectly.js b/tests/baselines/reference/checkJsxUnionSFXContextualTypeInferredCorrectly.js
index c8d4ceef37710..0524fd07609a9 100644
--- a/tests/baselines/reference/checkJsxUnionSFXContextualTypeInferredCorrectly.js
+++ b/tests/baselines/reference/checkJsxUnionSFXContextualTypeInferredCorrectly.js
@@ -42,7 +42,7 @@ ComponentWithUnion({
 
 //// [checkJsxUnionSFXContextualTypeInferredCorrectly.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt
index 5265aceb7d291..b1cd4dd330c33 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt
@@ -4,7 +4,7 @@ checkSuperCallBeforeThisAccessing5.ts(5,15): error TS17009: 'super' must be call
 ==== checkSuperCallBeforeThisAccessing5.ts (1 errors) ====
     class Based { constructor(...arg) { } }
     class Derived extends Based {
-        public x: number;
+        public x!: number;
         constructor() {
             super(this.x);
                   ~~~~
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
index 1a4e7012a0400..13d03e893457c 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
@@ -3,7 +3,7 @@
 //// [checkSuperCallBeforeThisAccessing5.ts]
 class Based { constructor(...arg) { } }
 class Derived extends Based {
-    public x: number;
+    public x!: number;
     constructor() {
         super(this.x);
     }
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.symbols b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.symbols
index cc343b2300035..98fa674e690a1 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.symbols
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.symbols
@@ -9,7 +9,7 @@ class Derived extends Based {
 >Derived : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing5.ts, 0, 39))
 >Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing5.ts, 0, 0))
 
-    public x: number;
+    public x!: number;
 >x : Symbol(Derived.x, Decl(checkSuperCallBeforeThisAccessing5.ts, 1, 29))
 
     constructor() {
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.types
index 21ac1b801f701..c6e56764b4300 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.types
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.types
@@ -13,7 +13,7 @@ class Derived extends Based {
 >Based : Based
 >      : ^^^^^
 
-    public x: number;
+    public x!: number;
 >x : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/classAbstractClinterfaceAssignability.errors.txt b/tests/baselines/reference/classAbstractClinterfaceAssignability.errors.txt
index 35bf69b021206..1e20f9c1d95d1 100644
--- a/tests/baselines/reference/classAbstractClinterfaceAssignability.errors.txt
+++ b/tests/baselines/reference/classAbstractClinterfaceAssignability.errors.txt
@@ -14,17 +14,17 @@ classAbstractClinterfaceAssignability.ts(23,1): error TS2322: Type 'typeof A' is
         prototype: I;
     }
     
-    var I: IConstructor;
+    declare var I: IConstructor;
     
     abstract class A {
         x: number;
         static y: number;
     }
     
-    var AA: typeof A;
+    declare var AA: typeof A;
     AA = I;
     
-    var AAA: typeof I;
+    declare var AAA: typeof I;
     AAA = A;
     ~~~
 !!! error TS2322: Type 'typeof A' is not assignable to type 'IConstructor'.
diff --git a/tests/baselines/reference/classAbstractClinterfaceAssignability.js b/tests/baselines/reference/classAbstractClinterfaceAssignability.js
index 864dfb47fc636..bb912dba49016 100644
--- a/tests/baselines/reference/classAbstractClinterfaceAssignability.js
+++ b/tests/baselines/reference/classAbstractClinterfaceAssignability.js
@@ -12,27 +12,24 @@ interface IConstructor {
     prototype: I;
 }
 
-var I: IConstructor;
+declare var I: IConstructor;
 
 abstract class A {
     x: number;
     static y: number;
 }
 
-var AA: typeof A;
+declare var AA: typeof A;
 AA = I;
 
-var AAA: typeof I;
+declare var AAA: typeof I;
 AAA = A;
 
 //// [classAbstractClinterfaceAssignability.js]
-var I;
 var A = /** @class */ (function () {
     function A() {
     }
     return A;
 }());
-var AA;
 AA = I;
-var AAA;
 AAA = A;
diff --git a/tests/baselines/reference/classAbstractClinterfaceAssignability.symbols b/tests/baselines/reference/classAbstractClinterfaceAssignability.symbols
index 2b9bc29f4d59e..2ab01c870c2e5 100644
--- a/tests/baselines/reference/classAbstractClinterfaceAssignability.symbols
+++ b/tests/baselines/reference/classAbstractClinterfaceAssignability.symbols
@@ -2,7 +2,7 @@
 
 === classAbstractClinterfaceAssignability.ts ===
 interface I {
->I : Symbol(I, Decl(classAbstractClinterfaceAssignability.ts, 0, 0), Decl(classAbstractClinterfaceAssignability.ts, 11, 3))
+>I : Symbol(I, Decl(classAbstractClinterfaceAssignability.ts, 0, 0), Decl(classAbstractClinterfaceAssignability.ts, 11, 11))
 
     x: number;
 >x : Symbol(I.x, Decl(classAbstractClinterfaceAssignability.ts, 0, 13))
@@ -12,22 +12,22 @@ interface IConstructor {
 >IConstructor : Symbol(IConstructor, Decl(classAbstractClinterfaceAssignability.ts, 2, 1))
 
     new (): I;
->I : Symbol(I, Decl(classAbstractClinterfaceAssignability.ts, 0, 0), Decl(classAbstractClinterfaceAssignability.ts, 11, 3))
+>I : Symbol(I, Decl(classAbstractClinterfaceAssignability.ts, 0, 0), Decl(classAbstractClinterfaceAssignability.ts, 11, 11))
     
     y: number;
 >y : Symbol(IConstructor.y, Decl(classAbstractClinterfaceAssignability.ts, 5, 14))
 
     prototype: I;
 >prototype : Symbol(IConstructor.prototype, Decl(classAbstractClinterfaceAssignability.ts, 7, 14))
->I : Symbol(I, Decl(classAbstractClinterfaceAssignability.ts, 0, 0), Decl(classAbstractClinterfaceAssignability.ts, 11, 3))
+>I : Symbol(I, Decl(classAbstractClinterfaceAssignability.ts, 0, 0), Decl(classAbstractClinterfaceAssignability.ts, 11, 11))
 }
 
-var I: IConstructor;
->I : Symbol(I, Decl(classAbstractClinterfaceAssignability.ts, 0, 0), Decl(classAbstractClinterfaceAssignability.ts, 11, 3))
+declare var I: IConstructor;
+>I : Symbol(I, Decl(classAbstractClinterfaceAssignability.ts, 0, 0), Decl(classAbstractClinterfaceAssignability.ts, 11, 11))
 >IConstructor : Symbol(IConstructor, Decl(classAbstractClinterfaceAssignability.ts, 2, 1))
 
 abstract class A {
->A : Symbol(A, Decl(classAbstractClinterfaceAssignability.ts, 11, 20))
+>A : Symbol(A, Decl(classAbstractClinterfaceAssignability.ts, 11, 28))
 
     x: number;
 >x : Symbol(A.x, Decl(classAbstractClinterfaceAssignability.ts, 13, 18))
@@ -36,19 +36,19 @@ abstract class A {
 >y : Symbol(A.y, Decl(classAbstractClinterfaceAssignability.ts, 14, 14))
 }
 
-var AA: typeof A;
->AA : Symbol(AA, Decl(classAbstractClinterfaceAssignability.ts, 18, 3))
->A : Symbol(A, Decl(classAbstractClinterfaceAssignability.ts, 11, 20))
+declare var AA: typeof A;
+>AA : Symbol(AA, Decl(classAbstractClinterfaceAssignability.ts, 18, 11))
+>A : Symbol(A, Decl(classAbstractClinterfaceAssignability.ts, 11, 28))
 
 AA = I;
->AA : Symbol(AA, Decl(classAbstractClinterfaceAssignability.ts, 18, 3))
->I : Symbol(I, Decl(classAbstractClinterfaceAssignability.ts, 0, 0), Decl(classAbstractClinterfaceAssignability.ts, 11, 3))
+>AA : Symbol(AA, Decl(classAbstractClinterfaceAssignability.ts, 18, 11))
+>I : Symbol(I, Decl(classAbstractClinterfaceAssignability.ts, 0, 0), Decl(classAbstractClinterfaceAssignability.ts, 11, 11))
 
-var AAA: typeof I;
->AAA : Symbol(AAA, Decl(classAbstractClinterfaceAssignability.ts, 21, 3))
->I : Symbol(I, Decl(classAbstractClinterfaceAssignability.ts, 0, 0), Decl(classAbstractClinterfaceAssignability.ts, 11, 3))
+declare var AAA: typeof I;
+>AAA : Symbol(AAA, Decl(classAbstractClinterfaceAssignability.ts, 21, 11))
+>I : Symbol(I, Decl(classAbstractClinterfaceAssignability.ts, 0, 0), Decl(classAbstractClinterfaceAssignability.ts, 11, 11))
 
 AAA = A;
->AAA : Symbol(AAA, Decl(classAbstractClinterfaceAssignability.ts, 21, 3))
->A : Symbol(A, Decl(classAbstractClinterfaceAssignability.ts, 11, 20))
+>AAA : Symbol(AAA, Decl(classAbstractClinterfaceAssignability.ts, 21, 11))
+>A : Symbol(A, Decl(classAbstractClinterfaceAssignability.ts, 11, 28))
 
diff --git a/tests/baselines/reference/classAbstractClinterfaceAssignability.types b/tests/baselines/reference/classAbstractClinterfaceAssignability.types
index c14591cc734cb..dc44f307185b3 100644
--- a/tests/baselines/reference/classAbstractClinterfaceAssignability.types
+++ b/tests/baselines/reference/classAbstractClinterfaceAssignability.types
@@ -19,7 +19,7 @@ interface IConstructor {
 >          : ^
 }
 
-var I: IConstructor;
+declare var I: IConstructor;
 >I : IConstructor
 >  : ^^^^^^^^^^^^
 
@@ -36,7 +36,7 @@ abstract class A {
 >  : ^^^^^^
 }
 
-var AA: typeof A;
+declare var AA: typeof A;
 >AA : typeof A
 >   : ^^^^^^^^
 >A : typeof A
@@ -50,7 +50,7 @@ AA = I;
 >I : IConstructor
 >  : ^^^^^^^^^^^^
 
-var AAA: typeof I;
+declare var AAA: typeof I;
 >AAA : IConstructor
 >    : ^^^^^^^^^^^^
 >I : IConstructor
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility.errors.txt b/tests/baselines/reference/classConstructorParametersAccessibility.errors.txt
index a0072427f16b4..8ac6be4db3a9d 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility.errors.txt
+++ b/tests/baselines/reference/classConstructorParametersAccessibility.errors.txt
@@ -6,14 +6,14 @@ classConstructorParametersAccessibility.ts(19,4): error TS2445: Property 'p' is
     class C1 {
         constructor(public x: number) { }
     }
-    var c1: C1;
+    declare var c1: C1;
     c1.x // OK
     
     
     class C2 {
         constructor(private p: number) { }
     }
-    var c2: C2;
+    declare var c2: C2;
     c2.p // private, error
        ~
 !!! error TS2341: Property 'p' is private and only accessible within class 'C2'.
@@ -22,7 +22,7 @@ classConstructorParametersAccessibility.ts(19,4): error TS2445: Property 'p' is
     class C3 {
         constructor(protected p: number) { }
     }
-    var c3: C3;
+    declare var c3: C3;
     c3.p // protected, error
        ~
 !!! error TS2445: Property 'p' is protected and only accessible within class 'C3' and its subclasses.
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility.js b/tests/baselines/reference/classConstructorParametersAccessibility.js
index 886607eb45d90..a3508edaa72f6 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility.js
@@ -4,21 +4,21 @@
 class C1 {
     constructor(public x: number) { }
 }
-var c1: C1;
+declare var c1: C1;
 c1.x // OK
 
 
 class C2 {
     constructor(private p: number) { }
 }
-var c2: C2;
+declare var c2: C2;
 c2.p // private, error
 
 
 class C3 {
     constructor(protected p: number) { }
 }
-var c3: C3;
+declare var c3: C3;
 c3.p // protected, error
 class Derived extends C3 {
     constructor(p: number) {
@@ -50,7 +50,6 @@ var C1 = /** @class */ (function () {
     }
     return C1;
 }());
-var c1;
 c1.x; // OK
 var C2 = /** @class */ (function () {
     function C2(p) {
@@ -58,7 +57,6 @@ var C2 = /** @class */ (function () {
     }
     return C2;
 }());
-var c2;
 c2.p; // private, error
 var C3 = /** @class */ (function () {
     function C3(p) {
@@ -66,7 +64,6 @@ var C3 = /** @class */ (function () {
     }
     return C3;
 }());
-var c3;
 c3.p; // protected, error
 var Derived = /** @class */ (function (_super) {
     __extends(Derived, _super);
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility.symbols b/tests/baselines/reference/classConstructorParametersAccessibility.symbols
index c0628f929fa5c..98ecf6c942b3d 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility.symbols
+++ b/tests/baselines/reference/classConstructorParametersAccessibility.symbols
@@ -7,13 +7,13 @@ class C1 {
     constructor(public x: number) { }
 >x : Symbol(C1.x, Decl(classConstructorParametersAccessibility.ts, 1, 16))
 }
-var c1: C1;
->c1 : Symbol(c1, Decl(classConstructorParametersAccessibility.ts, 3, 3))
+declare var c1: C1;
+>c1 : Symbol(c1, Decl(classConstructorParametersAccessibility.ts, 3, 11))
 >C1 : Symbol(C1, Decl(classConstructorParametersAccessibility.ts, 0, 0))
 
 c1.x // OK
 >c1.x : Symbol(C1.x, Decl(classConstructorParametersAccessibility.ts, 1, 16))
->c1 : Symbol(c1, Decl(classConstructorParametersAccessibility.ts, 3, 3))
+>c1 : Symbol(c1, Decl(classConstructorParametersAccessibility.ts, 3, 11))
 >x : Symbol(C1.x, Decl(classConstructorParametersAccessibility.ts, 1, 16))
 
 
@@ -23,13 +23,13 @@ class C2 {
     constructor(private p: number) { }
 >p : Symbol(C2.p, Decl(classConstructorParametersAccessibility.ts, 8, 16))
 }
-var c2: C2;
->c2 : Symbol(c2, Decl(classConstructorParametersAccessibility.ts, 10, 3))
+declare var c2: C2;
+>c2 : Symbol(c2, Decl(classConstructorParametersAccessibility.ts, 10, 11))
 >C2 : Symbol(C2, Decl(classConstructorParametersAccessibility.ts, 4, 4))
 
 c2.p // private, error
 >c2.p : Symbol(C2.p, Decl(classConstructorParametersAccessibility.ts, 8, 16))
->c2 : Symbol(c2, Decl(classConstructorParametersAccessibility.ts, 10, 3))
+>c2 : Symbol(c2, Decl(classConstructorParametersAccessibility.ts, 10, 11))
 >p : Symbol(C2.p, Decl(classConstructorParametersAccessibility.ts, 8, 16))
 
 
@@ -39,13 +39,13 @@ class C3 {
     constructor(protected p: number) { }
 >p : Symbol(C3.p, Decl(classConstructorParametersAccessibility.ts, 15, 16))
 }
-var c3: C3;
->c3 : Symbol(c3, Decl(classConstructorParametersAccessibility.ts, 17, 3))
+declare var c3: C3;
+>c3 : Symbol(c3, Decl(classConstructorParametersAccessibility.ts, 17, 11))
 >C3 : Symbol(C3, Decl(classConstructorParametersAccessibility.ts, 11, 4))
 
 c3.p // protected, error
 >c3.p : Symbol(C3.p, Decl(classConstructorParametersAccessibility.ts, 15, 16))
->c3 : Symbol(c3, Decl(classConstructorParametersAccessibility.ts, 17, 3))
+>c3 : Symbol(c3, Decl(classConstructorParametersAccessibility.ts, 17, 11))
 >p : Symbol(C3.p, Decl(classConstructorParametersAccessibility.ts, 15, 16))
 
 class Derived extends C3 {
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility.types b/tests/baselines/reference/classConstructorParametersAccessibility.types
index 4530948353e8a..d7388895761f9 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility.types
+++ b/tests/baselines/reference/classConstructorParametersAccessibility.types
@@ -9,7 +9,7 @@ class C1 {
 >x : number
 >  : ^^^^^^
 }
-var c1: C1;
+declare var c1: C1;
 >c1 : C1
 >   : ^^
 
@@ -30,7 +30,7 @@ class C2 {
 >p : number
 >  : ^^^^^^
 }
-var c2: C2;
+declare var c2: C2;
 >c2 : C2
 >   : ^^
 
@@ -51,7 +51,7 @@ class C3 {
 >p : number
 >  : ^^^^^^
 }
-var c3: C3;
+declare var c3: C3;
 >c3 : C3
 >   : ^^
 
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility2.errors.txt b/tests/baselines/reference/classConstructorParametersAccessibility2.errors.txt
index 8e73a9fdade93..813c9ea6e2b33 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility2.errors.txt
+++ b/tests/baselines/reference/classConstructorParametersAccessibility2.errors.txt
@@ -6,14 +6,14 @@ classConstructorParametersAccessibility2.ts(19,4): error TS2445: Property 'p' is
     class C1 {
         constructor(public x?: number) { }
     }
-    var c1: C1;
+    declare var c1: C1;
     c1.x // OK
     
     
     class C2 {
         constructor(private p?: number) { }
     }
-    var c2: C2;
+    declare var c2: C2;
     c2.p // private, error
        ~
 !!! error TS2341: Property 'p' is private and only accessible within class 'C2'.
@@ -22,7 +22,7 @@ classConstructorParametersAccessibility2.ts(19,4): error TS2445: Property 'p' is
     class C3 {
         constructor(protected p?: number) { }
     }
-    var c3: C3;
+    declare var c3: C3;
     c3.p // protected, error
        ~
 !!! error TS2445: Property 'p' is protected and only accessible within class 'C3' and its subclasses.
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility2.js b/tests/baselines/reference/classConstructorParametersAccessibility2.js
index 466cba7785667..705364412cd77 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility2.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility2.js
@@ -4,21 +4,21 @@
 class C1 {
     constructor(public x?: number) { }
 }
-var c1: C1;
+declare var c1: C1;
 c1.x // OK
 
 
 class C2 {
     constructor(private p?: number) { }
 }
-var c2: C2;
+declare var c2: C2;
 c2.p // private, error
 
 
 class C3 {
     constructor(protected p?: number) { }
 }
-var c3: C3;
+declare var c3: C3;
 c3.p // protected, error
 class Derived extends C3 {
     constructor(p: number) {
@@ -50,7 +50,6 @@ var C1 = /** @class */ (function () {
     }
     return C1;
 }());
-var c1;
 c1.x; // OK
 var C2 = /** @class */ (function () {
     function C2(p) {
@@ -58,7 +57,6 @@ var C2 = /** @class */ (function () {
     }
     return C2;
 }());
-var c2;
 c2.p; // private, error
 var C3 = /** @class */ (function () {
     function C3(p) {
@@ -66,7 +64,6 @@ var C3 = /** @class */ (function () {
     }
     return C3;
 }());
-var c3;
 c3.p; // protected, error
 var Derived = /** @class */ (function (_super) {
     __extends(Derived, _super);
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility2.symbols b/tests/baselines/reference/classConstructorParametersAccessibility2.symbols
index 6d715827159b2..a236a94585305 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility2.symbols
+++ b/tests/baselines/reference/classConstructorParametersAccessibility2.symbols
@@ -7,13 +7,13 @@ class C1 {
     constructor(public x?: number) { }
 >x : Symbol(C1.x, Decl(classConstructorParametersAccessibility2.ts, 1, 16))
 }
-var c1: C1;
->c1 : Symbol(c1, Decl(classConstructorParametersAccessibility2.ts, 3, 3))
+declare var c1: C1;
+>c1 : Symbol(c1, Decl(classConstructorParametersAccessibility2.ts, 3, 11))
 >C1 : Symbol(C1, Decl(classConstructorParametersAccessibility2.ts, 0, 0))
 
 c1.x // OK
 >c1.x : Symbol(C1.x, Decl(classConstructorParametersAccessibility2.ts, 1, 16))
->c1 : Symbol(c1, Decl(classConstructorParametersAccessibility2.ts, 3, 3))
+>c1 : Symbol(c1, Decl(classConstructorParametersAccessibility2.ts, 3, 11))
 >x : Symbol(C1.x, Decl(classConstructorParametersAccessibility2.ts, 1, 16))
 
 
@@ -23,13 +23,13 @@ class C2 {
     constructor(private p?: number) { }
 >p : Symbol(C2.p, Decl(classConstructorParametersAccessibility2.ts, 8, 16))
 }
-var c2: C2;
->c2 : Symbol(c2, Decl(classConstructorParametersAccessibility2.ts, 10, 3))
+declare var c2: C2;
+>c2 : Symbol(c2, Decl(classConstructorParametersAccessibility2.ts, 10, 11))
 >C2 : Symbol(C2, Decl(classConstructorParametersAccessibility2.ts, 4, 4))
 
 c2.p // private, error
 >c2.p : Symbol(C2.p, Decl(classConstructorParametersAccessibility2.ts, 8, 16))
->c2 : Symbol(c2, Decl(classConstructorParametersAccessibility2.ts, 10, 3))
+>c2 : Symbol(c2, Decl(classConstructorParametersAccessibility2.ts, 10, 11))
 >p : Symbol(C2.p, Decl(classConstructorParametersAccessibility2.ts, 8, 16))
 
 
@@ -39,13 +39,13 @@ class C3 {
     constructor(protected p?: number) { }
 >p : Symbol(C3.p, Decl(classConstructorParametersAccessibility2.ts, 15, 16))
 }
-var c3: C3;
->c3 : Symbol(c3, Decl(classConstructorParametersAccessibility2.ts, 17, 3))
+declare var c3: C3;
+>c3 : Symbol(c3, Decl(classConstructorParametersAccessibility2.ts, 17, 11))
 >C3 : Symbol(C3, Decl(classConstructorParametersAccessibility2.ts, 11, 4))
 
 c3.p // protected, error
 >c3.p : Symbol(C3.p, Decl(classConstructorParametersAccessibility2.ts, 15, 16))
->c3 : Symbol(c3, Decl(classConstructorParametersAccessibility2.ts, 17, 3))
+>c3 : Symbol(c3, Decl(classConstructorParametersAccessibility2.ts, 17, 11))
 >p : Symbol(C3.p, Decl(classConstructorParametersAccessibility2.ts, 15, 16))
 
 class Derived extends C3 {
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility2.types b/tests/baselines/reference/classConstructorParametersAccessibility2.types
index 6189d536db030..88f388992d967 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility2.types
+++ b/tests/baselines/reference/classConstructorParametersAccessibility2.types
@@ -9,7 +9,7 @@ class C1 {
 >x : number
 >  : ^^^^^^
 }
-var c1: C1;
+declare var c1: C1;
 >c1 : C1
 >   : ^^
 
@@ -30,7 +30,7 @@ class C2 {
 >p : number
 >  : ^^^^^^
 }
-var c2: C2;
+declare var c2: C2;
 >c2 : C2
 >   : ^^
 
@@ -51,7 +51,7 @@ class C3 {
 >p : number
 >  : ^^^^^^
 }
-var c3: C3;
+declare var c3: C3;
 >c3 : C3
 >   : ^^
 
diff --git a/tests/baselines/reference/classExtendsEveryObjectType.errors.txt b/tests/baselines/reference/classExtendsEveryObjectType.errors.txt
index 060ad3b74a36c..f983e46d8d66d 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType.errors.txt
+++ b/tests/baselines/reference/classExtendsEveryObjectType.errors.txt
@@ -23,7 +23,7 @@ classExtendsEveryObjectType.ts(16,18): error TS2507: Type 'undefined[]' is not a
 !!! error TS2693: 'string' only refers to a type, but is being used as a value here.
                                   ~
 !!! error TS1005: ',' expected.
-    var x: { foo: string; }
+    declare var x: { foo: string; }
     class C3 extends x { } // error
                      ~
 !!! error TS2507: Type '{ foo: string; }' is not a constructor function type.
diff --git a/tests/baselines/reference/classExtendsEveryObjectType.js b/tests/baselines/reference/classExtendsEveryObjectType.js
index 7f76b3afc4f39..8db327f2f3fe4 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType.js
+++ b/tests/baselines/reference/classExtendsEveryObjectType.js
@@ -7,7 +7,7 @@ interface I {
 class C extends I { } // error
 
 class C2 extends { foo: string; } { } // error
-var x: { foo: string; }
+declare var x: { foo: string; }
 class C3 extends x { } // error
 
 namespace M { export var x = 1; }
@@ -48,7 +48,6 @@ var C2 = /** @class */ (function (_super) {
     }
     return C2;
 }({ foo: string })); // error
-var x;
 var C3 = /** @class */ (function (_super) {
     __extends(C3, _super);
     function C3() {
diff --git a/tests/baselines/reference/classExtendsEveryObjectType.symbols b/tests/baselines/reference/classExtendsEveryObjectType.symbols
index 09ee8629e16e3..b913d9e475580 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType.symbols
+++ b/tests/baselines/reference/classExtendsEveryObjectType.symbols
@@ -14,13 +14,13 @@ class C2 extends { foo: string; } { } // error
 >C2 : Symbol(C2, Decl(classExtendsEveryObjectType.ts, 3, 21))
 >foo : Symbol(foo, Decl(classExtendsEveryObjectType.ts, 5, 18))
 
-var x: { foo: string; }
->x : Symbol(x, Decl(classExtendsEveryObjectType.ts, 6, 3))
->foo : Symbol(foo, Decl(classExtendsEveryObjectType.ts, 6, 8))
+declare var x: { foo: string; }
+>x : Symbol(x, Decl(classExtendsEveryObjectType.ts, 6, 11))
+>foo : Symbol(foo, Decl(classExtendsEveryObjectType.ts, 6, 16))
 
 class C3 extends x { } // error
->C3 : Symbol(C3, Decl(classExtendsEveryObjectType.ts, 6, 23))
->x : Symbol(x, Decl(classExtendsEveryObjectType.ts, 6, 3))
+>C3 : Symbol(C3, Decl(classExtendsEveryObjectType.ts, 6, 31))
+>x : Symbol(x, Decl(classExtendsEveryObjectType.ts, 6, 11))
 
 namespace M { export var x = 1; }
 >M : Symbol(M, Decl(classExtendsEveryObjectType.ts, 7, 22))
diff --git a/tests/baselines/reference/classExtendsEveryObjectType.types b/tests/baselines/reference/classExtendsEveryObjectType.types
index 8c85bcab25a01..9c5622ab92741 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType.types
+++ b/tests/baselines/reference/classExtendsEveryObjectType.types
@@ -22,7 +22,7 @@ class C2 extends { foo: string; } { } // error
 >string : any
 >       : ^^^
 
-var x: { foo: string; }
+declare var x: { foo: string; }
 >x : { foo: string; }
 >  : ^^^^^^^      ^^^
 >foo : string
diff --git a/tests/baselines/reference/classImplementsClass2.errors.txt b/tests/baselines/reference/classImplementsClass2.errors.txt
index 7684b9b5f3d51..9f525ce6cf238 100644
--- a/tests/baselines/reference/classImplementsClass2.errors.txt
+++ b/tests/baselines/reference/classImplementsClass2.errors.txt
@@ -17,8 +17,8 @@ classImplementsClass2.ts(13,1): error TS2741: Property 'foo' is missing in type
         }
     }
     
-    var c: C;
-    var c2: C2;
+    declare var c: C;
+    declare var c2: C2;
     c = c2;
     c2 = c;
     ~~
diff --git a/tests/baselines/reference/classImplementsClass2.js b/tests/baselines/reference/classImplementsClass2.js
index 508fe307a34d2..442e986d42629 100644
--- a/tests/baselines/reference/classImplementsClass2.js
+++ b/tests/baselines/reference/classImplementsClass2.js
@@ -10,8 +10,8 @@ class C2 extends A {
     }
 }
 
-var c: C;
-var c2: C2;
+declare var c: C;
+declare var c2: C2;
 c = c2;
 c2 = c;
 
@@ -52,7 +52,5 @@ var C2 = /** @class */ (function (_super) {
     };
     return C2;
 }(A));
-var c;
-var c2;
 c = c2;
 c2 = c;
diff --git a/tests/baselines/reference/classImplementsClass2.symbols b/tests/baselines/reference/classImplementsClass2.symbols
index 787ddcb26ae12..534d721eac786 100644
--- a/tests/baselines/reference/classImplementsClass2.symbols
+++ b/tests/baselines/reference/classImplementsClass2.symbols
@@ -20,19 +20,19 @@ class C2 extends A {
     }
 }
 
-var c: C;
->c : Symbol(c, Decl(classImplementsClass2.ts, 9, 3))
+declare var c: C;
+>c : Symbol(c, Decl(classImplementsClass2.ts, 9, 11))
 >C : Symbol(C, Decl(classImplementsClass2.ts, 0, 39))
 
-var c2: C2;
->c2 : Symbol(c2, Decl(classImplementsClass2.ts, 10, 3))
+declare var c2: C2;
+>c2 : Symbol(c2, Decl(classImplementsClass2.ts, 10, 11))
 >C2 : Symbol(C2, Decl(classImplementsClass2.ts, 1, 23))
 
 c = c2;
->c : Symbol(c, Decl(classImplementsClass2.ts, 9, 3))
->c2 : Symbol(c2, Decl(classImplementsClass2.ts, 10, 3))
+>c : Symbol(c, Decl(classImplementsClass2.ts, 9, 11))
+>c2 : Symbol(c2, Decl(classImplementsClass2.ts, 10, 11))
 
 c2 = c;
->c2 : Symbol(c2, Decl(classImplementsClass2.ts, 10, 3))
->c : Symbol(c, Decl(classImplementsClass2.ts, 9, 3))
+>c2 : Symbol(c2, Decl(classImplementsClass2.ts, 10, 11))
+>c : Symbol(c, Decl(classImplementsClass2.ts, 9, 11))
 
diff --git a/tests/baselines/reference/classImplementsClass2.types b/tests/baselines/reference/classImplementsClass2.types
index 1652941bea05a..2c02e9316eb89 100644
--- a/tests/baselines/reference/classImplementsClass2.types
+++ b/tests/baselines/reference/classImplementsClass2.types
@@ -29,11 +29,11 @@ class C2 extends A {
     }
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
-var c2: C2;
+declare var c2: C2;
 >c2 : C2
 >   : ^^
 
diff --git a/tests/baselines/reference/classImplementsClass4.errors.txt b/tests/baselines/reference/classImplementsClass4.errors.txt
index f53d3dc8835e8..ca6cc78bd1539 100644
--- a/tests/baselines/reference/classImplementsClass4.errors.txt
+++ b/tests/baselines/reference/classImplementsClass4.errors.txt
@@ -20,8 +20,8 @@ classImplementsClass4.ts(16,1): error TS2741: Property 'x' is missing in type 'C
     
     class C2 extends A {}
     
-    var c: C;
-    var c2: C2;
+    declare var c: C;
+    declare var c2: C2;
     c = c2;
     c2 = c;
     ~~
diff --git a/tests/baselines/reference/classImplementsClass4.js b/tests/baselines/reference/classImplementsClass4.js
index 31b9029a1ad58..2df2a438d0632 100644
--- a/tests/baselines/reference/classImplementsClass4.js
+++ b/tests/baselines/reference/classImplementsClass4.js
@@ -13,8 +13,8 @@ class C implements A {
 
 class C2 extends A {}
 
-var c: C;
-var c2: C2;
+declare var c: C;
+declare var c2: C2;
 c = c2;
 c2 = c;
 
@@ -56,7 +56,5 @@ var C2 = /** @class */ (function (_super) {
     }
     return C2;
 }(A));
-var c;
-var c2;
 c = c2;
 c2 = c;
diff --git a/tests/baselines/reference/classImplementsClass4.symbols b/tests/baselines/reference/classImplementsClass4.symbols
index 4abd841f1e268..66386fc99fda6 100644
--- a/tests/baselines/reference/classImplementsClass4.symbols
+++ b/tests/baselines/reference/classImplementsClass4.symbols
@@ -25,19 +25,19 @@ class C2 extends A {}
 >C2 : Symbol(C2, Decl(classImplementsClass4.ts, 8, 1))
 >A : Symbol(A, Decl(classImplementsClass4.ts, 0, 0))
 
-var c: C;
->c : Symbol(c, Decl(classImplementsClass4.ts, 12, 3))
+declare var c: C;
+>c : Symbol(c, Decl(classImplementsClass4.ts, 12, 11))
 >C : Symbol(C, Decl(classImplementsClass4.ts, 3, 1))
 
-var c2: C2;
->c2 : Symbol(c2, Decl(classImplementsClass4.ts, 13, 3))
+declare var c2: C2;
+>c2 : Symbol(c2, Decl(classImplementsClass4.ts, 13, 11))
 >C2 : Symbol(C2, Decl(classImplementsClass4.ts, 8, 1))
 
 c = c2;
->c : Symbol(c, Decl(classImplementsClass4.ts, 12, 3))
->c2 : Symbol(c2, Decl(classImplementsClass4.ts, 13, 3))
+>c : Symbol(c, Decl(classImplementsClass4.ts, 12, 11))
+>c2 : Symbol(c2, Decl(classImplementsClass4.ts, 13, 11))
 
 c2 = c;
->c2 : Symbol(c2, Decl(classImplementsClass4.ts, 13, 3))
->c : Symbol(c, Decl(classImplementsClass4.ts, 12, 3))
+>c2 : Symbol(c2, Decl(classImplementsClass4.ts, 13, 11))
+>c : Symbol(c, Decl(classImplementsClass4.ts, 12, 11))
 
diff --git a/tests/baselines/reference/classImplementsClass4.types b/tests/baselines/reference/classImplementsClass4.types
index 7e12aac17ac05..dae7fe6c83615 100644
--- a/tests/baselines/reference/classImplementsClass4.types
+++ b/tests/baselines/reference/classImplementsClass4.types
@@ -37,11 +37,11 @@ class C2 extends A {}
 >A : A
 >  : ^
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
-var c2: C2;
+declare var c2: C2;
 >c2 : C2
 >   : ^^
 
diff --git a/tests/baselines/reference/classImplementsClass5.errors.txt b/tests/baselines/reference/classImplementsClass5.errors.txt
index e177c13d75509..ffd66b8c111c7 100644
--- a/tests/baselines/reference/classImplementsClass5.errors.txt
+++ b/tests/baselines/reference/classImplementsClass5.errors.txt
@@ -23,8 +23,8 @@ classImplementsClass5.ts(17,1): error TS2322: Type 'C' is not assignable to type
     
     class C2 extends A {}
     
-    var c: C;
-    var c2: C2;
+    declare var c: C;
+    declare var c2: C2;
     c = c2;
     ~
 !!! error TS2322: Type 'C2' is not assignable to type 'C'.
diff --git a/tests/baselines/reference/classImplementsClass5.js b/tests/baselines/reference/classImplementsClass5.js
index b50df57dfd866..e7c35a3f2dbd2 100644
--- a/tests/baselines/reference/classImplementsClass5.js
+++ b/tests/baselines/reference/classImplementsClass5.js
@@ -14,8 +14,8 @@ class C implements A {
 
 class C2 extends A {}
 
-var c: C;
-var c2: C2;
+declare var c: C;
+declare var c2: C2;
 c = c2;
 c2 = c;
 
@@ -58,7 +58,5 @@ var C2 = /** @class */ (function (_super) {
     }
     return C2;
 }(A));
-var c;
-var c2;
 c = c2;
 c2 = c;
diff --git a/tests/baselines/reference/classImplementsClass5.symbols b/tests/baselines/reference/classImplementsClass5.symbols
index 1e7d4421d33e9..1804211608dbf 100644
--- a/tests/baselines/reference/classImplementsClass5.symbols
+++ b/tests/baselines/reference/classImplementsClass5.symbols
@@ -28,19 +28,19 @@ class C2 extends A {}
 >C2 : Symbol(C2, Decl(classImplementsClass5.ts, 9, 1))
 >A : Symbol(A, Decl(classImplementsClass5.ts, 0, 0))
 
-var c: C;
->c : Symbol(c, Decl(classImplementsClass5.ts, 13, 3))
+declare var c: C;
+>c : Symbol(c, Decl(classImplementsClass5.ts, 13, 11))
 >C : Symbol(C, Decl(classImplementsClass5.ts, 3, 1))
 
-var c2: C2;
->c2 : Symbol(c2, Decl(classImplementsClass5.ts, 14, 3))
+declare var c2: C2;
+>c2 : Symbol(c2, Decl(classImplementsClass5.ts, 14, 11))
 >C2 : Symbol(C2, Decl(classImplementsClass5.ts, 9, 1))
 
 c = c2;
->c : Symbol(c, Decl(classImplementsClass5.ts, 13, 3))
->c2 : Symbol(c2, Decl(classImplementsClass5.ts, 14, 3))
+>c : Symbol(c, Decl(classImplementsClass5.ts, 13, 11))
+>c2 : Symbol(c2, Decl(classImplementsClass5.ts, 14, 11))
 
 c2 = c;
->c2 : Symbol(c2, Decl(classImplementsClass5.ts, 14, 3))
->c : Symbol(c, Decl(classImplementsClass5.ts, 13, 3))
+>c2 : Symbol(c2, Decl(classImplementsClass5.ts, 14, 11))
+>c : Symbol(c, Decl(classImplementsClass5.ts, 13, 11))
 
diff --git a/tests/baselines/reference/classImplementsClass5.types b/tests/baselines/reference/classImplementsClass5.types
index 43990431980ae..c40597b61de8e 100644
--- a/tests/baselines/reference/classImplementsClass5.types
+++ b/tests/baselines/reference/classImplementsClass5.types
@@ -43,11 +43,11 @@ class C2 extends A {}
 >A : A
 >  : ^
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
-var c2: C2;
+declare var c2: C2;
 >c2 : C2
 >   : ^^
 
diff --git a/tests/baselines/reference/classImplementsClass6.errors.txt b/tests/baselines/reference/classImplementsClass6.errors.txt
index a4fb28355a8d8..e251dbd75adfe 100644
--- a/tests/baselines/reference/classImplementsClass6.errors.txt
+++ b/tests/baselines/reference/classImplementsClass6.errors.txt
@@ -18,8 +18,8 @@ classImplementsClass6.ts(21,4): error TS2576: Property 'bar' does not exist on t
     
     class C2 extends A {}
     
-    var c: C;
-    var c2: C2;
+    declare var c: C;
+    declare var c2: C2;
     c = c2;
     c2 = c;
     c.bar(); // error
diff --git a/tests/baselines/reference/classImplementsClass6.js b/tests/baselines/reference/classImplementsClass6.js
index 56783140c6218..91e93e2e1c141 100644
--- a/tests/baselines/reference/classImplementsClass6.js
+++ b/tests/baselines/reference/classImplementsClass6.js
@@ -16,8 +16,8 @@ class C implements A {
 
 class C2 extends A {}
 
-var c: C;
-var c2: C2;
+declare var c: C;
+declare var c2: C2;
 c = c2;
 c2 = c;
 c.bar(); // error
@@ -63,8 +63,6 @@ var C2 = /** @class */ (function (_super) {
     }
     return C2;
 }(A));
-var c;
-var c2;
 c = c2;
 c2 = c;
 c.bar(); // error
diff --git a/tests/baselines/reference/classImplementsClass6.symbols b/tests/baselines/reference/classImplementsClass6.symbols
index 0e50315fe258b..ad2fd693df44c 100644
--- a/tests/baselines/reference/classImplementsClass6.symbols
+++ b/tests/baselines/reference/classImplementsClass6.symbols
@@ -27,25 +27,25 @@ class C2 extends A {}
 >C2 : Symbol(C2, Decl(classImplementsClass6.ts, 11, 1))
 >A : Symbol(A, Decl(classImplementsClass6.ts, 0, 0))
 
-var c: C;
->c : Symbol(c, Decl(classImplementsClass6.ts, 15, 3))
+declare var c: C;
+>c : Symbol(c, Decl(classImplementsClass6.ts, 15, 11))
 >C : Symbol(C, Decl(classImplementsClass6.ts, 5, 1))
 
-var c2: C2;
->c2 : Symbol(c2, Decl(classImplementsClass6.ts, 16, 3))
+declare var c2: C2;
+>c2 : Symbol(c2, Decl(classImplementsClass6.ts, 16, 11))
 >C2 : Symbol(C2, Decl(classImplementsClass6.ts, 11, 1))
 
 c = c2;
->c : Symbol(c, Decl(classImplementsClass6.ts, 15, 3))
->c2 : Symbol(c2, Decl(classImplementsClass6.ts, 16, 3))
+>c : Symbol(c, Decl(classImplementsClass6.ts, 15, 11))
+>c2 : Symbol(c2, Decl(classImplementsClass6.ts, 16, 11))
 
 c2 = c;
->c2 : Symbol(c2, Decl(classImplementsClass6.ts, 16, 3))
->c : Symbol(c, Decl(classImplementsClass6.ts, 15, 3))
+>c2 : Symbol(c2, Decl(classImplementsClass6.ts, 16, 11))
+>c : Symbol(c, Decl(classImplementsClass6.ts, 15, 11))
 
 c.bar(); // error
->c : Symbol(c, Decl(classImplementsClass6.ts, 15, 3))
+>c : Symbol(c, Decl(classImplementsClass6.ts, 15, 11))
 
 c2.bar(); // should error
->c2 : Symbol(c2, Decl(classImplementsClass6.ts, 16, 3))
+>c2 : Symbol(c2, Decl(classImplementsClass6.ts, 16, 11))
 
diff --git a/tests/baselines/reference/classImplementsClass6.types b/tests/baselines/reference/classImplementsClass6.types
index 3d01e91a477a0..f02250ff5e4de 100644
--- a/tests/baselines/reference/classImplementsClass6.types
+++ b/tests/baselines/reference/classImplementsClass6.types
@@ -39,11 +39,11 @@ class C2 extends A {}
 >A : A
 >  : ^
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
-var c2: C2;
+declare var c2: C2;
 >c2 : C2
 >   : ^^
 
diff --git a/tests/baselines/reference/classPropertyAsPrivate.errors.txt b/tests/baselines/reference/classPropertyAsPrivate.errors.txt
index dafef95cc0590..fc9bbd6f05a8f 100644
--- a/tests/baselines/reference/classPropertyAsPrivate.errors.txt
+++ b/tests/baselines/reference/classPropertyAsPrivate.errors.txt
@@ -21,7 +21,7 @@ classPropertyAsPrivate.ts(23,3): error TS2341: Property 'foo' is private and onl
         private static foo() { }
     }
     
-    var c: C;
+    declare var c: C;
     // all errors
     c.x;
       ~
diff --git a/tests/baselines/reference/classPropertyAsPrivate.js b/tests/baselines/reference/classPropertyAsPrivate.js
index f21fcd07ba219..530ab59bc19bb 100644
--- a/tests/baselines/reference/classPropertyAsPrivate.js
+++ b/tests/baselines/reference/classPropertyAsPrivate.js
@@ -13,7 +13,7 @@ class C {
     private static foo() { }
 }
 
-var c: C;
+declare var c: C;
 // all errors
 c.x;
 c.y;
@@ -45,7 +45,6 @@ var C = /** @class */ (function () {
     C.foo = function () { };
     return C;
 }());
-var c;
 // all errors
 c.x;
 c.y;
diff --git a/tests/baselines/reference/classPropertyAsPrivate.symbols b/tests/baselines/reference/classPropertyAsPrivate.symbols
index 6d9852f9d318b..d6144651bbe9c 100644
--- a/tests/baselines/reference/classPropertyAsPrivate.symbols
+++ b/tests/baselines/reference/classPropertyAsPrivate.symbols
@@ -31,29 +31,29 @@ class C {
 >foo : Symbol(C.foo, Decl(classPropertyAsPrivate.ts, 8, 31))
 }
 
-var c: C;
->c : Symbol(c, Decl(classPropertyAsPrivate.ts, 12, 3))
+declare var c: C;
+>c : Symbol(c, Decl(classPropertyAsPrivate.ts, 12, 11))
 >C : Symbol(C, Decl(classPropertyAsPrivate.ts, 0, 0))
 
 // all errors
 c.x;
 >c.x : Symbol(C.x, Decl(classPropertyAsPrivate.ts, 0, 9))
->c : Symbol(c, Decl(classPropertyAsPrivate.ts, 12, 3))
+>c : Symbol(c, Decl(classPropertyAsPrivate.ts, 12, 11))
 >x : Symbol(C.x, Decl(classPropertyAsPrivate.ts, 0, 9))
 
 c.y;
 >c.y : Symbol(C.y, Decl(classPropertyAsPrivate.ts, 1, 22), Decl(classPropertyAsPrivate.ts, 2, 36))
->c : Symbol(c, Decl(classPropertyAsPrivate.ts, 12, 3))
+>c : Symbol(c, Decl(classPropertyAsPrivate.ts, 12, 11))
 >y : Symbol(C.y, Decl(classPropertyAsPrivate.ts, 1, 22), Decl(classPropertyAsPrivate.ts, 2, 36))
 
 c.y = 1;
 >c.y : Symbol(C.y, Decl(classPropertyAsPrivate.ts, 1, 22), Decl(classPropertyAsPrivate.ts, 2, 36))
->c : Symbol(c, Decl(classPropertyAsPrivate.ts, 12, 3))
+>c : Symbol(c, Decl(classPropertyAsPrivate.ts, 12, 11))
 >y : Symbol(C.y, Decl(classPropertyAsPrivate.ts, 1, 22), Decl(classPropertyAsPrivate.ts, 2, 36))
 
 c.foo();
 >c.foo : Symbol(C.foo, Decl(classPropertyAsPrivate.ts, 3, 24))
->c : Symbol(c, Decl(classPropertyAsPrivate.ts, 12, 3))
+>c : Symbol(c, Decl(classPropertyAsPrivate.ts, 12, 11))
 >foo : Symbol(C.foo, Decl(classPropertyAsPrivate.ts, 3, 24))
 
 C.a;
diff --git a/tests/baselines/reference/classPropertyAsPrivate.types b/tests/baselines/reference/classPropertyAsPrivate.types
index 79302076e6b82..608b76dfef312 100644
--- a/tests/baselines/reference/classPropertyAsPrivate.types
+++ b/tests/baselines/reference/classPropertyAsPrivate.types
@@ -42,7 +42,7 @@ class C {
 >    : ^^^^^^^^^^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
diff --git a/tests/baselines/reference/classPropertyAsProtected.errors.txt b/tests/baselines/reference/classPropertyAsProtected.errors.txt
index e37070f4eb407..766e8af1b39f4 100644
--- a/tests/baselines/reference/classPropertyAsProtected.errors.txt
+++ b/tests/baselines/reference/classPropertyAsProtected.errors.txt
@@ -21,7 +21,7 @@ classPropertyAsProtected.ts(23,3): error TS2445: Property 'foo' is protected and
         protected static foo() { }
     }
     
-    var c: C;
+    declare var c: C;
     // all errors
     c.x;
       ~
diff --git a/tests/baselines/reference/classPropertyAsProtected.js b/tests/baselines/reference/classPropertyAsProtected.js
index 6d6b47da58255..81750e1e43034 100644
--- a/tests/baselines/reference/classPropertyAsProtected.js
+++ b/tests/baselines/reference/classPropertyAsProtected.js
@@ -13,7 +13,7 @@ class C {
     protected static foo() { }
 }
 
-var c: C;
+declare var c: C;
 // all errors
 c.x;
 c.y;
@@ -45,7 +45,6 @@ var C = /** @class */ (function () {
     C.foo = function () { };
     return C;
 }());
-var c;
 // all errors
 c.x;
 c.y;
diff --git a/tests/baselines/reference/classPropertyAsProtected.symbols b/tests/baselines/reference/classPropertyAsProtected.symbols
index e37f5318b5638..386541fd463a8 100644
--- a/tests/baselines/reference/classPropertyAsProtected.symbols
+++ b/tests/baselines/reference/classPropertyAsProtected.symbols
@@ -31,29 +31,29 @@ class C {
 >foo : Symbol(C.foo, Decl(classPropertyAsProtected.ts, 8, 33))
 }
 
-var c: C;
->c : Symbol(c, Decl(classPropertyAsProtected.ts, 12, 3))
+declare var c: C;
+>c : Symbol(c, Decl(classPropertyAsProtected.ts, 12, 11))
 >C : Symbol(C, Decl(classPropertyAsProtected.ts, 0, 0))
 
 // all errors
 c.x;
 >c.x : Symbol(C.x, Decl(classPropertyAsProtected.ts, 0, 9))
->c : Symbol(c, Decl(classPropertyAsProtected.ts, 12, 3))
+>c : Symbol(c, Decl(classPropertyAsProtected.ts, 12, 11))
 >x : Symbol(C.x, Decl(classPropertyAsProtected.ts, 0, 9))
 
 c.y;
 >c.y : Symbol(C.y, Decl(classPropertyAsProtected.ts, 1, 24), Decl(classPropertyAsProtected.ts, 2, 38))
->c : Symbol(c, Decl(classPropertyAsProtected.ts, 12, 3))
+>c : Symbol(c, Decl(classPropertyAsProtected.ts, 12, 11))
 >y : Symbol(C.y, Decl(classPropertyAsProtected.ts, 1, 24), Decl(classPropertyAsProtected.ts, 2, 38))
 
 c.y = 1;
 >c.y : Symbol(C.y, Decl(classPropertyAsProtected.ts, 1, 24), Decl(classPropertyAsProtected.ts, 2, 38))
->c : Symbol(c, Decl(classPropertyAsProtected.ts, 12, 3))
+>c : Symbol(c, Decl(classPropertyAsProtected.ts, 12, 11))
 >y : Symbol(C.y, Decl(classPropertyAsProtected.ts, 1, 24), Decl(classPropertyAsProtected.ts, 2, 38))
 
 c.foo();
 >c.foo : Symbol(C.foo, Decl(classPropertyAsProtected.ts, 3, 26))
->c : Symbol(c, Decl(classPropertyAsProtected.ts, 12, 3))
+>c : Symbol(c, Decl(classPropertyAsProtected.ts, 12, 11))
 >foo : Symbol(C.foo, Decl(classPropertyAsProtected.ts, 3, 26))
 
 C.a;
diff --git a/tests/baselines/reference/classPropertyAsProtected.types b/tests/baselines/reference/classPropertyAsProtected.types
index bb4418b9af552..c2159d97da73d 100644
--- a/tests/baselines/reference/classPropertyAsProtected.types
+++ b/tests/baselines/reference/classPropertyAsProtected.types
@@ -42,7 +42,7 @@ class C {
 >    : ^^^^^^^^^^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
diff --git a/tests/baselines/reference/classSideInheritance1.errors.txt b/tests/baselines/reference/classSideInheritance1.errors.txt
index 9958d9b48601f..d27b5c6275a01 100644
--- a/tests/baselines/reference/classSideInheritance1.errors.txt
+++ b/tests/baselines/reference/classSideInheritance1.errors.txt
@@ -12,8 +12,8 @@ classSideInheritance1.ts(13,3): error TS2576: Property 'bar' does not exist on t
      
     class C2 extends A {}
     
-    var a: A;
-    var c: C2;
+    declare var a: A;
+    declare var c: C2;
     a.bar(); // static off an instance - should be an error
       ~~~
 !!! error TS2576: Property 'bar' does not exist on type 'A'. Did you mean to access the static member 'A.bar' instead?
diff --git a/tests/baselines/reference/classSideInheritance1.js b/tests/baselines/reference/classSideInheritance1.js
index dd70b044e1849..97f0be7ac6eb4 100644
--- a/tests/baselines/reference/classSideInheritance1.js
+++ b/tests/baselines/reference/classSideInheritance1.js
@@ -10,8 +10,8 @@ class A {
  
 class C2 extends A {}
 
-var a: A;
-var c: C2;
+declare var a: A;
+declare var c: C2;
 a.bar(); // static off an instance - should be an error
 c.bar(); // static off an instance - should be an error
 A.bar(); // valid
@@ -49,8 +49,6 @@ var C2 = /** @class */ (function (_super) {
     }
     return C2;
 }(A));
-var a;
-var c;
 a.bar(); // static off an instance - should be an error
 c.bar(); // static off an instance - should be an error
 A.bar(); // valid
diff --git a/tests/baselines/reference/classSideInheritance1.symbols b/tests/baselines/reference/classSideInheritance1.symbols
index 51b485d6a4be8..803054d2c936b 100644
--- a/tests/baselines/reference/classSideInheritance1.symbols
+++ b/tests/baselines/reference/classSideInheritance1.symbols
@@ -17,19 +17,19 @@ class C2 extends A {}
 >C2 : Symbol(C2, Decl(classSideInheritance1.ts, 5, 1))
 >A : Symbol(A, Decl(classSideInheritance1.ts, 0, 0))
 
-var a: A;
->a : Symbol(a, Decl(classSideInheritance1.ts, 9, 3))
+declare var a: A;
+>a : Symbol(a, Decl(classSideInheritance1.ts, 9, 11))
 >A : Symbol(A, Decl(classSideInheritance1.ts, 0, 0))
 
-var c: C2;
->c : Symbol(c, Decl(classSideInheritance1.ts, 10, 3))
+declare var c: C2;
+>c : Symbol(c, Decl(classSideInheritance1.ts, 10, 11))
 >C2 : Symbol(C2, Decl(classSideInheritance1.ts, 5, 1))
 
 a.bar(); // static off an instance - should be an error
->a : Symbol(a, Decl(classSideInheritance1.ts, 9, 3))
+>a : Symbol(a, Decl(classSideInheritance1.ts, 9, 11))
 
 c.bar(); // static off an instance - should be an error
->c : Symbol(c, Decl(classSideInheritance1.ts, 10, 3))
+>c : Symbol(c, Decl(classSideInheritance1.ts, 10, 11))
 
 A.bar(); // valid
 >A.bar : Symbol(A.bar, Decl(classSideInheritance1.ts, 0, 9))
diff --git a/tests/baselines/reference/classSideInheritance1.types b/tests/baselines/reference/classSideInheritance1.types
index 4366adf8ec96e..6cf415f1acc16 100644
--- a/tests/baselines/reference/classSideInheritance1.types
+++ b/tests/baselines/reference/classSideInheritance1.types
@@ -26,11 +26,11 @@ class C2 extends A {}
 >A : A
 >  : ^
 
-var a: A;
+declare var a: A;
 >a : A
 >  : ^
 
-var c: C2;
+declare var c: C2;
 >c : C2
 >  : ^^
 
diff --git a/tests/baselines/reference/commaOperatorInvalidAssignmentType.errors.txt b/tests/baselines/reference/commaOperatorInvalidAssignmentType.errors.txt
index cb73286f8e83e..1ffe6ab9dfafa 100644
--- a/tests/baselines/reference/commaOperatorInvalidAssignmentType.errors.txt
+++ b/tests/baselines/reference/commaOperatorInvalidAssignmentType.errors.txt
@@ -7,13 +7,13 @@ commaOperatorInvalidAssignmentType.ts(17,1): error TS2322: Type 'number' is not
 
 
 ==== commaOperatorInvalidAssignmentType.ts (6 errors) ====
-    var BOOLEAN: boolean;
-    var NUMBER: number;
-    var STRING: string;
+    declare var BOOLEAN: boolean;
+    declare var NUMBER: number;
+    declare var STRING: string;
     
-    var resultIsBoolean: boolean
-    var resultIsNumber: number
-    var resultIsString: string
+    declare var resultIsBoolean: boolean
+    declare var resultIsNumber: number
+    declare var resultIsString: string
     
     //Expect errors when the results type is different form the second operand
     resultIsBoolean = (BOOLEAN, STRING);
diff --git a/tests/baselines/reference/commaOperatorInvalidAssignmentType.js b/tests/baselines/reference/commaOperatorInvalidAssignmentType.js
index bdb01cae1038a..c89be5e429951 100644
--- a/tests/baselines/reference/commaOperatorInvalidAssignmentType.js
+++ b/tests/baselines/reference/commaOperatorInvalidAssignmentType.js
@@ -1,13 +1,13 @@
 //// [tests/cases/conformance/expressions/commaOperator/commaOperatorInvalidAssignmentType.ts] ////
 
 //// [commaOperatorInvalidAssignmentType.ts]
-var BOOLEAN: boolean;
-var NUMBER: number;
-var STRING: string;
+declare var BOOLEAN: boolean;
+declare var NUMBER: number;
+declare var STRING: string;
 
-var resultIsBoolean: boolean
-var resultIsNumber: number
-var resultIsString: string
+declare var resultIsBoolean: boolean
+declare var resultIsNumber: number
+declare var resultIsString: string
 
 //Expect errors when the results type is different form the second operand
 resultIsBoolean = (BOOLEAN, STRING);
@@ -21,12 +21,6 @@ resultIsString = (STRING, NUMBER);
 
 
 //// [commaOperatorInvalidAssignmentType.js]
-var BOOLEAN;
-var NUMBER;
-var STRING;
-var resultIsBoolean;
-var resultIsNumber;
-var resultIsString;
 //Expect errors when the results type is different form the second operand
 resultIsBoolean = (BOOLEAN, STRING);
 resultIsBoolean = (BOOLEAN, NUMBER);
diff --git a/tests/baselines/reference/commaOperatorInvalidAssignmentType.symbols b/tests/baselines/reference/commaOperatorInvalidAssignmentType.symbols
index 888827cce3496..0d6cfdacc99a1 100644
--- a/tests/baselines/reference/commaOperatorInvalidAssignmentType.symbols
+++ b/tests/baselines/reference/commaOperatorInvalidAssignmentType.symbols
@@ -1,52 +1,52 @@
 //// [tests/cases/conformance/expressions/commaOperator/commaOperatorInvalidAssignmentType.ts] ////
 
 === commaOperatorInvalidAssignmentType.ts ===
-var BOOLEAN: boolean;
->BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorInvalidAssignmentType.ts, 0, 3))
+declare var BOOLEAN: boolean;
+>BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorInvalidAssignmentType.ts, 0, 11))
 
-var NUMBER: number;
->NUMBER : Symbol(NUMBER, Decl(commaOperatorInvalidAssignmentType.ts, 1, 3))
+declare var NUMBER: number;
+>NUMBER : Symbol(NUMBER, Decl(commaOperatorInvalidAssignmentType.ts, 1, 11))
 
-var STRING: string;
->STRING : Symbol(STRING, Decl(commaOperatorInvalidAssignmentType.ts, 2, 3))
+declare var STRING: string;
+>STRING : Symbol(STRING, Decl(commaOperatorInvalidAssignmentType.ts, 2, 11))
 
-var resultIsBoolean: boolean
->resultIsBoolean : Symbol(resultIsBoolean, Decl(commaOperatorInvalidAssignmentType.ts, 4, 3))
+declare var resultIsBoolean: boolean
+>resultIsBoolean : Symbol(resultIsBoolean, Decl(commaOperatorInvalidAssignmentType.ts, 4, 11))
 
-var resultIsNumber: number
->resultIsNumber : Symbol(resultIsNumber, Decl(commaOperatorInvalidAssignmentType.ts, 5, 3))
+declare var resultIsNumber: number
+>resultIsNumber : Symbol(resultIsNumber, Decl(commaOperatorInvalidAssignmentType.ts, 5, 11))
 
-var resultIsString: string
->resultIsString : Symbol(resultIsString, Decl(commaOperatorInvalidAssignmentType.ts, 6, 3))
+declare var resultIsString: string
+>resultIsString : Symbol(resultIsString, Decl(commaOperatorInvalidAssignmentType.ts, 6, 11))
 
 //Expect errors when the results type is different form the second operand
 resultIsBoolean = (BOOLEAN, STRING);
->resultIsBoolean : Symbol(resultIsBoolean, Decl(commaOperatorInvalidAssignmentType.ts, 4, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorInvalidAssignmentType.ts, 0, 3))
->STRING : Symbol(STRING, Decl(commaOperatorInvalidAssignmentType.ts, 2, 3))
+>resultIsBoolean : Symbol(resultIsBoolean, Decl(commaOperatorInvalidAssignmentType.ts, 4, 11))
+>BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorInvalidAssignmentType.ts, 0, 11))
+>STRING : Symbol(STRING, Decl(commaOperatorInvalidAssignmentType.ts, 2, 11))
 
 resultIsBoolean = (BOOLEAN, NUMBER);
->resultIsBoolean : Symbol(resultIsBoolean, Decl(commaOperatorInvalidAssignmentType.ts, 4, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorInvalidAssignmentType.ts, 0, 3))
->NUMBER : Symbol(NUMBER, Decl(commaOperatorInvalidAssignmentType.ts, 1, 3))
+>resultIsBoolean : Symbol(resultIsBoolean, Decl(commaOperatorInvalidAssignmentType.ts, 4, 11))
+>BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorInvalidAssignmentType.ts, 0, 11))
+>NUMBER : Symbol(NUMBER, Decl(commaOperatorInvalidAssignmentType.ts, 1, 11))
 
 resultIsNumber = (NUMBER, BOOLEAN);
->resultIsNumber : Symbol(resultIsNumber, Decl(commaOperatorInvalidAssignmentType.ts, 5, 3))
->NUMBER : Symbol(NUMBER, Decl(commaOperatorInvalidAssignmentType.ts, 1, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorInvalidAssignmentType.ts, 0, 3))
+>resultIsNumber : Symbol(resultIsNumber, Decl(commaOperatorInvalidAssignmentType.ts, 5, 11))
+>NUMBER : Symbol(NUMBER, Decl(commaOperatorInvalidAssignmentType.ts, 1, 11))
+>BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorInvalidAssignmentType.ts, 0, 11))
 
 resultIsNumber = (NUMBER, STRING);
->resultIsNumber : Symbol(resultIsNumber, Decl(commaOperatorInvalidAssignmentType.ts, 5, 3))
->NUMBER : Symbol(NUMBER, Decl(commaOperatorInvalidAssignmentType.ts, 1, 3))
->STRING : Symbol(STRING, Decl(commaOperatorInvalidAssignmentType.ts, 2, 3))
+>resultIsNumber : Symbol(resultIsNumber, Decl(commaOperatorInvalidAssignmentType.ts, 5, 11))
+>NUMBER : Symbol(NUMBER, Decl(commaOperatorInvalidAssignmentType.ts, 1, 11))
+>STRING : Symbol(STRING, Decl(commaOperatorInvalidAssignmentType.ts, 2, 11))
 
 resultIsString = (STRING, BOOLEAN);
->resultIsString : Symbol(resultIsString, Decl(commaOperatorInvalidAssignmentType.ts, 6, 3))
->STRING : Symbol(STRING, Decl(commaOperatorInvalidAssignmentType.ts, 2, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorInvalidAssignmentType.ts, 0, 3))
+>resultIsString : Symbol(resultIsString, Decl(commaOperatorInvalidAssignmentType.ts, 6, 11))
+>STRING : Symbol(STRING, Decl(commaOperatorInvalidAssignmentType.ts, 2, 11))
+>BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorInvalidAssignmentType.ts, 0, 11))
 
 resultIsString = (STRING, NUMBER);
->resultIsString : Symbol(resultIsString, Decl(commaOperatorInvalidAssignmentType.ts, 6, 3))
->STRING : Symbol(STRING, Decl(commaOperatorInvalidAssignmentType.ts, 2, 3))
->NUMBER : Symbol(NUMBER, Decl(commaOperatorInvalidAssignmentType.ts, 1, 3))
+>resultIsString : Symbol(resultIsString, Decl(commaOperatorInvalidAssignmentType.ts, 6, 11))
+>STRING : Symbol(STRING, Decl(commaOperatorInvalidAssignmentType.ts, 2, 11))
+>NUMBER : Symbol(NUMBER, Decl(commaOperatorInvalidAssignmentType.ts, 1, 11))
 
diff --git a/tests/baselines/reference/commaOperatorInvalidAssignmentType.types b/tests/baselines/reference/commaOperatorInvalidAssignmentType.types
index 3bae8bc3e6154..9c2eff9fca89a 100644
--- a/tests/baselines/reference/commaOperatorInvalidAssignmentType.types
+++ b/tests/baselines/reference/commaOperatorInvalidAssignmentType.types
@@ -1,27 +1,27 @@
 //// [tests/cases/conformance/expressions/commaOperator/commaOperatorInvalidAssignmentType.ts] ////
 
 === commaOperatorInvalidAssignmentType.ts ===
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 >BOOLEAN : boolean
 >        : ^^^^^^^
 
-var NUMBER: number;
+declare var NUMBER: number;
 >NUMBER : number
 >       : ^^^^^^
 
-var STRING: string;
+declare var STRING: string;
 >STRING : string
 >       : ^^^^^^
 
-var resultIsBoolean: boolean
+declare var resultIsBoolean: boolean
 >resultIsBoolean : boolean
 >                : ^^^^^^^
 
-var resultIsNumber: number
+declare var resultIsNumber: number
 >resultIsNumber : number
 >               : ^^^^^^
 
-var resultIsString: string
+declare var resultIsString: string
 >resultIsString : string
 >               : ^^^^^^
 
diff --git a/tests/baselines/reference/commaOperatorWithoutOperand.errors.txt b/tests/baselines/reference/commaOperatorWithoutOperand.errors.txt
index ca9992c160b49..73de55ba333cf 100644
--- a/tests/baselines/reference/commaOperatorWithoutOperand.errors.txt
+++ b/tests/baselines/reference/commaOperatorWithoutOperand.errors.txt
@@ -24,11 +24,11 @@ commaOperatorWithoutOperand.ts(23,5): error TS1109: Expression expected.
 
 
 ==== commaOperatorWithoutOperand.ts (23 errors) ====
-    var ANY: any;
-    var BOOLEAN: boolean;
-    var NUMBER: number;
-    var STRING: string;
-    var OBJECT: Object;
+    declare var ANY: any;
+    declare var BOOLEAN: boolean;
+    declare var NUMBER: number;
+    declare var STRING: string;
+    declare var OBJECT: Object;
     
     // Expect to have compiler errors
     // Missing the second operand
diff --git a/tests/baselines/reference/commaOperatorWithoutOperand.js b/tests/baselines/reference/commaOperatorWithoutOperand.js
index 84c06d5d2ed15..a90217ff2a70c 100644
--- a/tests/baselines/reference/commaOperatorWithoutOperand.js
+++ b/tests/baselines/reference/commaOperatorWithoutOperand.js
@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/expressions/commaOperator/commaOperatorWithoutOperand.ts] ////
 
 //// [commaOperatorWithoutOperand.ts]
-var ANY: any;
-var BOOLEAN: boolean;
-var NUMBER: number;
-var STRING: string;
-var OBJECT: Object;
+declare var ANY: any;
+declare var BOOLEAN: boolean;
+declare var NUMBER: number;
+declare var STRING: string;
+declare var OBJECT: Object;
 
 // Expect to have compiler errors
 // Missing the second operand
@@ -26,11 +26,6 @@ var OBJECT: Object;
 ( , );
 
 //// [commaOperatorWithoutOperand.js]
-var ANY;
-var BOOLEAN;
-var NUMBER;
-var STRING;
-var OBJECT;
 // Expect to have compiler errors
 // Missing the second operand
 (ANY, );
diff --git a/tests/baselines/reference/commaOperatorWithoutOperand.symbols b/tests/baselines/reference/commaOperatorWithoutOperand.symbols
index 2a9483d5e1353..f2fa92ca7ba9d 100644
--- a/tests/baselines/reference/commaOperatorWithoutOperand.symbols
+++ b/tests/baselines/reference/commaOperatorWithoutOperand.symbols
@@ -1,54 +1,54 @@
 //// [tests/cases/conformance/expressions/commaOperator/commaOperatorWithoutOperand.ts] ////
 
 === commaOperatorWithoutOperand.ts ===
-var ANY: any;
->ANY : Symbol(ANY, Decl(commaOperatorWithoutOperand.ts, 0, 3))
+declare var ANY: any;
+>ANY : Symbol(ANY, Decl(commaOperatorWithoutOperand.ts, 0, 11))
 
-var BOOLEAN: boolean;
->BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorWithoutOperand.ts, 1, 3))
+declare var BOOLEAN: boolean;
+>BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorWithoutOperand.ts, 1, 11))
 
-var NUMBER: number;
->NUMBER : Symbol(NUMBER, Decl(commaOperatorWithoutOperand.ts, 2, 3))
+declare var NUMBER: number;
+>NUMBER : Symbol(NUMBER, Decl(commaOperatorWithoutOperand.ts, 2, 11))
 
-var STRING: string;
->STRING : Symbol(STRING, Decl(commaOperatorWithoutOperand.ts, 3, 3))
+declare var STRING: string;
+>STRING : Symbol(STRING, Decl(commaOperatorWithoutOperand.ts, 3, 11))
 
-var OBJECT: Object;
->OBJECT : Symbol(OBJECT, Decl(commaOperatorWithoutOperand.ts, 4, 3))
+declare var OBJECT: Object;
+>OBJECT : Symbol(OBJECT, Decl(commaOperatorWithoutOperand.ts, 4, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 // Expect to have compiler errors
 // Missing the second operand
 (ANY, );
->ANY : Symbol(ANY, Decl(commaOperatorWithoutOperand.ts, 0, 3))
+>ANY : Symbol(ANY, Decl(commaOperatorWithoutOperand.ts, 0, 11))
 
 (BOOLEAN, );
->BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorWithoutOperand.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorWithoutOperand.ts, 1, 11))
 
 (NUMBER, );
->NUMBER : Symbol(NUMBER, Decl(commaOperatorWithoutOperand.ts, 2, 3))
+>NUMBER : Symbol(NUMBER, Decl(commaOperatorWithoutOperand.ts, 2, 11))
 
 (STRING, );
->STRING : Symbol(STRING, Decl(commaOperatorWithoutOperand.ts, 3, 3))
+>STRING : Symbol(STRING, Decl(commaOperatorWithoutOperand.ts, 3, 11))
 
 (OBJECT, );
->OBJECT : Symbol(OBJECT, Decl(commaOperatorWithoutOperand.ts, 4, 3))
+>OBJECT : Symbol(OBJECT, Decl(commaOperatorWithoutOperand.ts, 4, 11))
 
 // Missing the first operand
 (, ANY);
->ANY : Symbol(ANY, Decl(commaOperatorWithoutOperand.ts, 0, 3))
+>ANY : Symbol(ANY, Decl(commaOperatorWithoutOperand.ts, 0, 11))
 
 (, BOOLEAN);
->BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorWithoutOperand.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorWithoutOperand.ts, 1, 11))
 
 (, NUMBER);
->NUMBER : Symbol(NUMBER, Decl(commaOperatorWithoutOperand.ts, 2, 3))
+>NUMBER : Symbol(NUMBER, Decl(commaOperatorWithoutOperand.ts, 2, 11))
 
 (, STRING);
->STRING : Symbol(STRING, Decl(commaOperatorWithoutOperand.ts, 3, 3))
+>STRING : Symbol(STRING, Decl(commaOperatorWithoutOperand.ts, 3, 11))
 
 (, OBJECT);
->OBJECT : Symbol(OBJECT, Decl(commaOperatorWithoutOperand.ts, 4, 3))
+>OBJECT : Symbol(OBJECT, Decl(commaOperatorWithoutOperand.ts, 4, 11))
 
 // Missing all operands
 ( , );
diff --git a/tests/baselines/reference/commaOperatorWithoutOperand.types b/tests/baselines/reference/commaOperatorWithoutOperand.types
index 36a10cc936174..c191b69851207 100644
--- a/tests/baselines/reference/commaOperatorWithoutOperand.types
+++ b/tests/baselines/reference/commaOperatorWithoutOperand.types
@@ -1,23 +1,23 @@
 //// [tests/cases/conformance/expressions/commaOperator/commaOperatorWithoutOperand.ts] ////
 
 === commaOperatorWithoutOperand.ts ===
-var ANY: any;
+declare var ANY: any;
 >ANY : any
 >    : ^^^
 
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 >BOOLEAN : boolean
 >        : ^^^^^^^
 
-var NUMBER: number;
+declare var NUMBER: number;
 >NUMBER : number
 >       : ^^^^^^
 
-var STRING: string;
+declare var STRING: string;
 >STRING : string
 >       : ^^^^^^
 
-var OBJECT: Object;
+declare var OBJECT: Object;
 >OBJECT : Object
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/commentEmittingInPreserveJsx1.js b/tests/baselines/reference/commentEmittingInPreserveJsx1.js
index 70b9f00eb3f8f..51d19427646a2 100644
--- a/tests/baselines/reference/commentEmittingInPreserveJsx1.js
+++ b/tests/baselines/reference/commentEmittingInPreserveJsx1.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/commentEmittingInPreserveJsx1.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 <div>
@@ -34,6 +36,7 @@ import React = require('react');
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 <div>
diff --git a/tests/baselines/reference/commentEmittingInPreserveJsx1.symbols b/tests/baselines/reference/commentEmittingInPreserveJsx1.symbols
index 403c1fa4b893e..95b9f32fdbed6 100644
--- a/tests/baselines/reference/commentEmittingInPreserveJsx1.symbols
+++ b/tests/baselines/reference/commentEmittingInPreserveJsx1.symbols
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/commentEmittingInPreserveJsx1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
diff --git a/tests/baselines/reference/commentEmittingInPreserveJsx1.types b/tests/baselines/reference/commentEmittingInPreserveJsx1.types
index b993270d54d38..d4f2698eb24ab 100644
--- a/tests/baselines/reference/commentEmittingInPreserveJsx1.types
+++ b/tests/baselines/reference/commentEmittingInPreserveJsx1.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/commentEmittingInPreserveJsx1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/commonSourceDir5.errors.txt b/tests/baselines/reference/commonSourceDir5.errors.txt
index 33dc2ec159f5f..fc7c14e7b5edc 100644
--- a/tests/baselines/reference/commonSourceDir5.errors.txt
+++ b/tests/baselines/reference/commonSourceDir5.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== A:/bar.ts (0 errors) ====
     import {z} from "./foo";
diff --git a/tests/baselines/reference/commonSourceDir6.errors.txt b/tests/baselines/reference/commonSourceDir6.errors.txt
index fe46c907271ff..870d7038f8575 100644
--- a/tests/baselines/reference/commonSourceDir6.errors.txt
+++ b/tests/baselines/reference/commonSourceDir6.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a/bar.ts (0 errors) ====
     import {z} from "./foo";
diff --git a/tests/baselines/reference/commonSourceDirectory.js b/tests/baselines/reference/commonSourceDirectory.js
index 126ffe0183d1f..a07a563aae8af 100644
--- a/tests/baselines/reference/commonSourceDirectory.js
+++ b/tests/baselines/reference/commonSourceDirectory.js
@@ -27,3 +27,36 @@ foo_1.x + bar_1.y;
 //// [/app/bin/index.d.ts]
 /// <reference path="../../types/bar.d.ts" preserve="true" />
 export {};
+
+
+//// [DtsFileErrors]
+
+
+/app/tsconfig.json(3,9): error TS5011: The common source directory of 'tsconfig.json' is '../.src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+
+==== /app/tsconfig.json (1 errors) ====
+    {
+        "compilerOptions": {
+            "outDir": "bin",
+            ~~~~~~~~
+!!! error TS5011: The common source directory of 'tsconfig.json' is '../.src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+!!! error TS5011:   Visit https://aka.ms/ts6 for migration information.
+            "typeRoots": ["../types"],
+            "sourceMap": true,
+            "mapRoot": "myMapRoot",
+            "sourceRoot": "mySourceRoot",
+            "declaration": true
+        }
+    }
+    
+==== /app/bin/index.d.ts (0 errors) ====
+    /// <reference path="../../types/bar.d.ts" preserve="true" />
+    export {};
+    
+==== /types/bar.d.ts (0 errors) ====
+    declare module "bar" {
+        export const y = 0;
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.errors.txt b/tests/baselines/reference/commonSourceDirectory_dts.errors.txt
new file mode 100644
index 0000000000000..39317702628a7
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDirectory_dts.errors.txt
@@ -0,0 +1,25 @@
+/app/tsconfig.json(3,9): error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+
+==== /app/tsconfig.json (1 errors) ====
+    {
+        "compilerOptions": {
+            "outDir": "bin",
+            ~~~~~~~~
+!!! error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+!!! error TS5011:   Visit https://aka.ms/ts6 for migration information.
+            "sourceMap": true,
+            "mapRoot": "myMapRoot",
+            "sourceRoot": "mySourceRoot",
+            "declaration": true
+        }
+    }
+    
+==== /app/lib/bar.d.ts (0 errors) ====
+    declare const y: number;
+    
+==== /app/src/index.ts (0 errors) ====
+    /// <reference path="../lib/bar.d.ts" preserve="true" />
+    export const x = y;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js b/tests/baselines/reference/commonSourceDirectory_dts.js
index 6d3ac4c81d316..e4b36a2cdc05b 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.js
+++ b/tests/baselines/reference/commonSourceDirectory_dts.js
@@ -8,14 +8,14 @@ declare const y: number;
 export const x = y;
 
 
-//// [/app/bin/index.js]
+//// [/app/bin/src/index.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = void 0;
 /// <reference path="../lib/bar.d.ts" preserve="true" />
 exports.x = y;
-//# sourceMappingURL=../src/myMapRoot/index.js.map
+//# sourceMappingURL=../../myMapRoot/src/index.js.map
 
-//// [/app/bin/index.d.ts]
-/// <reference path="../lib/bar.d.ts" preserve="true" />
+//// [/app/bin/src/index.d.ts]
+/// <reference path="../../lib/bar.d.ts" preserve="true" />
 export declare const x: number;
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js.map b/tests/baselines/reference/commonSourceDirectory_dts.js.map
index 8cf42ea16e701..ee62005ba3b07 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.js.map
+++ b/tests/baselines/reference/commonSourceDirectory_dts.js.map
@@ -1,3 +1,3 @@
-//// [/app/bin/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";;;AAAA,wDAAwD;AAC3C,QAAA,CAAC,GAAG,CAAC,CAAC"}
-//// https://sokra.github.io/source-map-visualization#base64,InVzZSBzdHJpY3QiOw0KT2JqZWN0LmRlZmluZVByb3BlcnR5KGV4cG9ydHMsICJfX2VzTW9kdWxlIiwgeyB2YWx1ZTogdHJ1ZSB9KTsNCmV4cG9ydHMueCA9IHZvaWQgMDsNCi8vLyA8cmVmZXJlbmNlIHBhdGg9Ii4uL2xpYi9iYXIuZC50cyIgcHJlc2VydmU9InRydWUiIC8+DQpleHBvcnRzLnggPSB5Ow0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9Li4vc3JjL215TWFwUm9vdC9pbmRleC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoibXlTb3VyY2VSb290LyIsInNvdXJjZXMiOlsiaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsd0RBQXdEO0FBQzNDLFFBQUEsQ0FBQyxHQUFHLENBQUMsQ0FBQyJ9,Ly8vIDxyZWZlcmVuY2UgcGF0aD0iLi4vbGliL2Jhci5kLnRzIiBwcmVzZXJ2ZT0idHJ1ZSIgLz4KZXhwb3J0IGNvbnN0IHggPSB5Owo=
+//// [/app/bin/src/index.js.map]
+{"version":3,"file":"index.js","sourceRoot":"mySourceRoot/","sources":["src/index.ts"],"names":[],"mappings":";;;AAAA,wDAAwD;AAC3C,QAAA,CAAC,GAAG,CAAC,CAAC"}
+//// https://sokra.github.io/source-map-visualization#base64,InVzZSBzdHJpY3QiOw0KT2JqZWN0LmRlZmluZVByb3BlcnR5KGV4cG9ydHMsICJfX2VzTW9kdWxlIiwgeyB2YWx1ZTogdHJ1ZSB9KTsNCmV4cG9ydHMueCA9IHZvaWQgMDsNCi8vLyA8cmVmZXJlbmNlIHBhdGg9Ii4uL2xpYi9iYXIuZC50cyIgcHJlc2VydmU9InRydWUiIC8+DQpleHBvcnRzLnggPSB5Ow0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9Li4vLi4vbXlNYXBSb290L3NyYy9pbmRleC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoibXlTb3VyY2VSb290LyIsInNvdXJjZXMiOlsic3JjL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHdEQUF3RDtBQUMzQyxRQUFBLENBQUMsR0FBRyxDQUFDLENBQUMifQ==,Ly8vIDxyZWZlcmVuY2UgcGF0aD0iLi4vbGliL2Jhci5kLnRzIiBwcmVzZXJ2ZT0idHJ1ZSIgLz4KZXhwb3J0IGNvbnN0IHggPSB5Owo=
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
index c98d6a26d67bc..24036677d75db 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
+++ b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
@@ -1,12 +1,12 @@
 ===================================================================
 JsFile: index.js
-mapUrl: ../src/myMapRoot/index.js.map
+mapUrl: ../../myMapRoot/src/index.js.map
 sourceRoot: mySourceRoot/
-sources: index.ts
+sources: src/index.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:/app/bin/index.js
-sourceFile:index.ts
+emittedFile:/app/bin/src/index.js
+sourceFile:src/index.ts
 -------------------------------------------------------------------
 >>>"use strict";
 >>>Object.defineProperty(exports, "__esModule", { value: true });
@@ -26,7 +26,7 @@ sourceFile:index.ts
 4 >         ^^^
 5 >            ^
 6 >             ^
-7 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+7 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >export const 
 2 >
@@ -41,4 +41,4 @@ sourceFile:index.ts
 5 >Emitted(5, 14) Source(2, 19) + SourceIndex(0)
 6 >Emitted(5, 15) Source(2, 20) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=../src/myMapRoot/index.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=../../myMapRoot/src/index.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.errors.txt b/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.errors.txt
index b35444962ebcd..46e42062bbdd2 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.errors.txt
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.errors.txt
@@ -19,11 +19,11 @@ comparisonOperatorWithIdenticalPrimitiveType.ts(43,24): error TS18050: The value
 ==== comparisonOperatorWithIdenticalPrimitiveType.ts (16 errors) ====
     enum E { a, b, c }
     
-    var a: number;
-    var b: boolean;
-    var c: string;
-    var d: void;
-    var e: E;
+    declare var a: number;
+    declare var b: boolean;
+    declare var c: string;
+    declare var d: void;
+    declare var e: E;
     
     // operator <
     var ra1 = a < a;
diff --git a/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.js b/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.js
index 1a5c69bf2c444..52bf9ad1d3246 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.js
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.js
@@ -3,11 +3,11 @@
 //// [comparisonOperatorWithIdenticalPrimitiveType.ts]
 enum E { a, b, c }
 
-var a: number;
-var b: boolean;
-var c: string;
-var d: void;
-var e: E;
+declare var a: number;
+declare var b: boolean;
+declare var c: string;
+declare var d: void;
+declare var e: E;
 
 // operator <
 var ra1 = a < a;
@@ -88,11 +88,6 @@ var E;
     E[E["b"] = 1] = "b";
     E[E["c"] = 2] = "c";
 })(E || (E = {}));
-var a;
-var b;
-var c;
-var d;
-var e;
 // operator <
 var ra1 = a < a;
 var ra2 = b < b;
diff --git a/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.symbols b/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.symbols
index 6b27681f7a296..41a9c54f55856 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.symbols
@@ -7,47 +7,47 @@ enum E { a, b, c }
 >b : Symbol(E.b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 0, 11))
 >c : Symbol(E.c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 0, 14))
 
-var a: number;
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
+declare var a: number;
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
 
-var b: boolean;
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
+declare var b: boolean;
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
 
-var c: string;
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
+declare var c: string;
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
 
-var d: void;
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
+declare var d: void;
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
 
-var e: E;
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
+declare var e: E;
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
 >E : Symbol(E, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 0, 0))
 
 // operator <
 var ra1 = a < a;
 >ra1 : Symbol(ra1, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 9, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
 
 var ra2 = b < b;
 >ra2 : Symbol(ra2, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 10, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
 
 var ra3 = c < c;
 >ra3 : Symbol(ra3, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 11, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
 
 var ra4 = d < d;
 >ra4 : Symbol(ra4, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 12, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
 
 var ra5 = e < e;
 >ra5 : Symbol(ra5, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 13, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
 
 var ra6 = null < null;
 >ra6 : Symbol(ra6, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 14, 3))
@@ -60,28 +60,28 @@ var ra7 = undefined < undefined;
 // operator >
 var rb1 = a > a;
 >rb1 : Symbol(rb1, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 18, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
 
 var rb2 = b > b;
 >rb2 : Symbol(rb2, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 19, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
 
 var rb3 = c > c;
 >rb3 : Symbol(rb3, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 20, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
 
 var rb4 = d > d;
 >rb4 : Symbol(rb4, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 21, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
 
 var rb5 = e > e;
 >rb5 : Symbol(rb5, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 22, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
 
 var rb6 = null > null;
 >rb6 : Symbol(rb6, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 23, 3))
@@ -94,28 +94,28 @@ var rb7 = undefined > undefined;
 // operator <=
 var rc1 = a <= a;
 >rc1 : Symbol(rc1, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 27, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
 
 var rc2 = b <= b;
 >rc2 : Symbol(rc2, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 28, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
 
 var rc3 = c <= c;
 >rc3 : Symbol(rc3, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 29, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
 
 var rc4 = d <= d;
 >rc4 : Symbol(rc4, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 30, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
 
 var rc5 = e <= e;
 >rc5 : Symbol(rc5, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 31, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
 
 var rc6 = null <= null;
 >rc6 : Symbol(rc6, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 32, 3))
@@ -128,28 +128,28 @@ var rc7 = undefined <= undefined;
 // operator >=
 var rd1 = a >= a;
 >rd1 : Symbol(rd1, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 36, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
 
 var rd2 = b >= b;
 >rd2 : Symbol(rd2, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 37, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
 
 var rd3 = c >= c;
 >rd3 : Symbol(rd3, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 38, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
 
 var rd4 = d >= d;
 >rd4 : Symbol(rd4, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 39, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
 
 var rd5 = e >= e;
 >rd5 : Symbol(rd5, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 40, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
 
 var rd6 = null >= null;
 >rd6 : Symbol(rd6, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 41, 3))
@@ -162,28 +162,28 @@ var rd7 = undefined >= undefined;
 // operator ==
 var re1 = a == a;
 >re1 : Symbol(re1, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 45, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
 
 var re2 = b == b;
 >re2 : Symbol(re2, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 46, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
 
 var re3 = c == c;
 >re3 : Symbol(re3, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 47, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
 
 var re4 = d == d;
 >re4 : Symbol(re4, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 48, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
 
 var re5 = e == e;
 >re5 : Symbol(re5, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 49, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
 
 var re6 = null == null;
 >re6 : Symbol(re6, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 50, 3))
@@ -196,28 +196,28 @@ var re7 = undefined == undefined;
 // operator !=
 var rf1 = a != a;
 >rf1 : Symbol(rf1, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 54, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
 
 var rf2 = b != b;
 >rf2 : Symbol(rf2, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 55, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
 
 var rf3 = c != c;
 >rf3 : Symbol(rf3, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 56, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
 
 var rf4 = d != d;
 >rf4 : Symbol(rf4, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 57, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
 
 var rf5 = e != e;
 >rf5 : Symbol(rf5, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 58, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
 
 var rf6 = null != null;
 >rf6 : Symbol(rf6, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 59, 3))
@@ -230,28 +230,28 @@ var rf7 = undefined != undefined;
 // operator ===
 var rg1 = a === a;
 >rg1 : Symbol(rg1, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 63, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
 
 var rg2 = b === b;
 >rg2 : Symbol(rg2, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 64, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
 
 var rg3 = c === c;
 >rg3 : Symbol(rg3, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 65, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
 
 var rg4 = d === d;
 >rg4 : Symbol(rg4, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 66, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
 
 var rg5 = e === e;
 >rg5 : Symbol(rg5, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 67, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
 
 var rg6 = null === null;
 >rg6 : Symbol(rg6, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 68, 3))
@@ -264,28 +264,28 @@ var rg7 = undefined === undefined;
 // operator !==
 var rh1 = a !== a;
 >rh1 : Symbol(rh1, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 72, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 2, 11))
 
 var rh2 = b !== b;
 >rh2 : Symbol(rh2, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 73, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 3, 11))
 
 var rh3 = c !== c;
 >rh3 : Symbol(rh3, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 74, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 4, 11))
 
 var rh4 = d !== d;
 >rh4 : Symbol(rh4, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 75, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 5, 11))
 
 var rh5 = e !== e;
 >rh5 : Symbol(rh5, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 76, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 6, 11))
 
 var rh6 = null !== null;
 >rh6 : Symbol(rh6, Decl(comparisonOperatorWithIdenticalPrimitiveType.ts, 77, 3))
diff --git a/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.types b/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.types
index e5be9f3a34bd4..32fe0af5f34c2 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.types
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.types
@@ -11,23 +11,23 @@ enum E { a, b, c }
 >c : E.c
 >  : ^^^
 
-var a: number;
+declare var a: number;
 >a : number
 >  : ^^^^^^
 
-var b: boolean;
+declare var b: boolean;
 >b : boolean
 >  : ^^^^^^^
 
-var c: string;
+declare var c: string;
 >c : string
 >  : ^^^^^^
 
-var d: void;
+declare var d: void;
 >d : void
 >  : ^^^^
 
-var e: E;
+declare var e: E;
 >e : E
 >  : ^
 
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.errors.txt b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.errors.txt
index 2ae865e44e663..9272b7b0c4479 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.errors.txt
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.errors.txt
@@ -109,26 +109,26 @@ comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts(167,12): error TS2
         public c: string;
     }
     
-    var a1: { fn(): Base };
-    var b1: { new (): Base };
+    declare var a1: { fn(): Base };
+    declare var b1: { new (): Base };
     
-    var a2: { fn(a: number, b: string): void };
-    var b2: { fn(a: string): void };
+    declare var a2: { fn(a: number, b: string): void };
+    declare var b2: { fn(a: string): void };
     
-    var a3: { fn(a: Base, b: string): void };
-    var b3: { fn(a: Derived, b: Base): void };
+    declare var a3: { fn(a: Base, b: string): void };
+    declare var b3: { fn(a: Derived, b: Base): void };
     
-    var a4: { fn(): Base };
-    var b4: { fn(): C };
+    declare var a4: { fn(): Base };
+    declare var b4: { fn(): C };
     
-    var a5: { fn(a?: Base): void };
-    var b5: { fn(a?: C): void };
+    declare var a5: { fn(a?: Base): void };
+    declare var b5: { fn(a?: C): void };
     
-    var a6: { fn(...a: Base[]): void };
-    var b6: { fn(...a: C[]): void };
+    declare var a6: { fn(...a: Base[]): void };
+    declare var b6: { fn(...a: C[]): void };
     
-    var a7: { fn<T>(t: T): T };
-    var b7: { fn<T>(t: T[]): T };
+    declare var a7: { fn<T>(t: T): T };
+    declare var b7: { fn<T>(t: T[]): T };
     
     // operator <
     var r1a1 = a1 < b1;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
index c7cdb12670cb7..d762a210b3e38 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
@@ -13,26 +13,26 @@ class C {
     public c: string;
 }
 
-var a1: { fn(): Base };
-var b1: { new (): Base };
+declare var a1: { fn(): Base };
+declare var b1: { new (): Base };
 
-var a2: { fn(a: number, b: string): void };
-var b2: { fn(a: string): void };
+declare var a2: { fn(a: number, b: string): void };
+declare var b2: { fn(a: string): void };
 
-var a3: { fn(a: Base, b: string): void };
-var b3: { fn(a: Derived, b: Base): void };
+declare var a3: { fn(a: Base, b: string): void };
+declare var b3: { fn(a: Derived, b: Base): void };
 
-var a4: { fn(): Base };
-var b4: { fn(): C };
+declare var a4: { fn(): Base };
+declare var b4: { fn(): C };
 
-var a5: { fn(a?: Base): void };
-var b5: { fn(a?: C): void };
+declare var a5: { fn(a?: Base): void };
+declare var b5: { fn(a?: C): void };
 
-var a6: { fn(...a: Base[]): void };
-var b6: { fn(...a: C[]): void };
+declare var a6: { fn(...a: Base[]): void };
+declare var b6: { fn(...a: C[]): void };
 
-var a7: { fn<T>(t: T): T };
-var b7: { fn<T>(t: T[]): T };
+declare var a7: { fn<T>(t: T): T };
+declare var b7: { fn<T>(t: T[]): T };
 
 // operator <
 var r1a1 = a1 < b1;
@@ -203,20 +203,6 @@ var C = /** @class */ (function () {
     }
     return C;
 }());
-var a1;
-var b1;
-var a2;
-var b2;
-var a3;
-var b3;
-var a4;
-var b4;
-var a5;
-var b5;
-var a6;
-var b6;
-var a7;
-var b7;
 // operator <
 var r1a1 = a1 < b1;
 var r1a2 = a2 < b2;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.symbols b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.symbols
index 32fc3abaef171..82a466aab04be 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.symbols
@@ -23,656 +23,656 @@ class C {
 >c : Symbol(C.c, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 8, 9))
 }
 
-var a1: { fn(): Base };
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
->fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 9))
+declare var a1: { fn(): Base };
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
+>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 17))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 0, 0))
 
-var b1: { new (): Base };
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
+declare var b1: { new (): Base };
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 0, 0))
 
-var a2: { fn(a: number, b: string): void };
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
->fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 9))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 13))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 23))
-
-var b2: { fn(a: string): void };
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
->fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 9))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 13))
-
-var a3: { fn(a: Base, b: string): void };
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
->fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 9))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 13))
+declare var a2: { fn(a: number, b: string): void };
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
+>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 17))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 21))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 31))
+
+declare var b2: { fn(a: string): void };
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
+>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 17))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 21))
+
+declare var a3: { fn(a: Base, b: string): void };
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
+>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 17))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 21))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 0, 0))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 21))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 29))
 
-var b3: { fn(a: Derived, b: Base): void };
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
->fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 9))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 13))
+declare var b3: { fn(a: Derived, b: Base): void };
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
+>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 17))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 21))
 >Derived : Symbol(Derived, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 2, 1))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 24))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 32))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 0, 0))
 
-var a4: { fn(): Base };
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
->fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 9))
+declare var a4: { fn(): Base };
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
+>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 17))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 0, 0))
 
-var b4: { fn(): C };
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
->fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 9))
+declare var b4: { fn(): C };
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
+>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 17))
 >C : Symbol(C, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 6, 1))
 
-var a5: { fn(a?: Base): void };
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
->fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 9))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 13))
+declare var a5: { fn(a?: Base): void };
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
+>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 17))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 21))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 0, 0))
 
-var b5: { fn(a?: C): void };
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
->fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 9))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 13))
+declare var b5: { fn(a?: C): void };
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
+>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 17))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 21))
 >C : Symbol(C, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 6, 1))
 
-var a6: { fn(...a: Base[]): void };
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
->fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 9))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 13))
+declare var a6: { fn(...a: Base[]): void };
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
+>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 17))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 21))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 0, 0))
 
-var b6: { fn(...a: C[]): void };
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
->fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 9))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 13))
+declare var b6: { fn(...a: C[]): void };
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
+>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 17))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 21))
 >C : Symbol(C, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 6, 1))
 
-var a7: { fn<T>(t: T): T };
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
->fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 9))
->T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 13))
->t : Symbol(t, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 16))
->T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 13))
->T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 13))
-
-var b7: { fn<T>(t: T[]): T };
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
->fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 9))
->T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 13))
->t : Symbol(t, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 16))
->T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 13))
->T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 13))
+declare var a7: { fn<T>(t: T): T };
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
+>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 17))
+>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 21))
+>t : Symbol(t, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 24))
+>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 21))
+>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 21))
+
+declare var b7: { fn<T>(t: T[]): T };
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
+>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 17))
+>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 21))
+>t : Symbol(t, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 24))
+>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 21))
+>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 21))
 
 // operator <
 var r1a1 = a1 < b1;
 >r1a1 : Symbol(r1a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 34, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
 
 var r1a2 = a2 < b2;
 >r1a2 : Symbol(r1a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 35, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
 
 var r1a3 = a3 < b3;
 >r1a3 : Symbol(r1a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 36, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
 
 var r1a4 = a4 < b4;
 >r1a4 : Symbol(r1a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 37, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
 
 var r1a5 = a5 < b5;
 >r1a5 : Symbol(r1a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 38, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
 
 var r1a6 = a6 < b6;
 >r1a6 : Symbol(r1a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 39, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
 
 var r1a7 = a7 < b7;
 >r1a7 : Symbol(r1a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 40, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
 
 var r1b1 = b1 < a1;
 >r1b1 : Symbol(r1b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 42, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
 
 var r1b2 = b2 < a2;
 >r1b2 : Symbol(r1b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 43, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
 
 var r1b3 = b3 < a3;
 >r1b3 : Symbol(r1b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 44, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
 
 var r1b4 = b4 < a4;
 >r1b4 : Symbol(r1b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 45, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
 
 var r1b5 = b5 < a5;
 >r1b5 : Symbol(r1b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 46, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
 
 var r1b6 = b6 < a6;
 >r1b6 : Symbol(r1b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 47, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
 
 var r1b7 = b7 < a7;
 >r1b7 : Symbol(r1b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 48, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
 
 // operator >
 var r2a1 = a1 > b1;
 >r2a1 : Symbol(r2a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 51, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
 
 var r2a2 = a2 > b2;
 >r2a2 : Symbol(r2a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 52, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
 
 var r2a3 = a3 > b3;
 >r2a3 : Symbol(r2a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 53, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
 
 var r2a4 = a4 > b4;
 >r2a4 : Symbol(r2a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 54, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
 
 var r2a5 = a5 > b5;
 >r2a5 : Symbol(r2a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 55, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
 
 var r2a6 = a6 > b6;
 >r2a6 : Symbol(r2a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 56, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
 
 var r2a7 = a7 > b7;
 >r2a7 : Symbol(r2a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 57, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
 
 var r2b1 = b1 > a1;
 >r2b1 : Symbol(r2b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 59, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
 
 var r2b2 = b2 > a2;
 >r2b2 : Symbol(r2b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 60, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
 
 var r2b3 = b3 > a3;
 >r2b3 : Symbol(r2b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 61, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
 
 var r2b4 = b4 > a4;
 >r2b4 : Symbol(r2b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 62, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
 
 var r2b5 = b5 > a5;
 >r2b5 : Symbol(r2b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 63, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
 
 var r2b6 = b6 > a6;
 >r2b6 : Symbol(r2b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 64, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
 
 var r2b7 = b7 > a7;
 >r2b7 : Symbol(r2b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 65, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
 
 // operator <=
 var r3a1 = a1 <= b1;
 >r3a1 : Symbol(r3a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 68, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
 
 var r3a2 = a2 <= b2;
 >r3a2 : Symbol(r3a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 69, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
 
 var r3a3 = a3 <= b3;
 >r3a3 : Symbol(r3a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 70, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
 
 var r3a4 = a4 <= b4;
 >r3a4 : Symbol(r3a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 71, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
 
 var r3a5 = a5 <= b5;
 >r3a5 : Symbol(r3a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 72, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
 
 var r3a6 = a6 <= b6;
 >r3a6 : Symbol(r3a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 73, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
 
 var r3a7 = a7 <= b7;
 >r3a7 : Symbol(r3a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 74, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
 
 var r3b1 = b1 <= a1;
 >r3b1 : Symbol(r3b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 76, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
 
 var r3b2 = b2 <= a2;
 >r3b2 : Symbol(r3b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 77, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
 
 var r3b3 = b3 <= a3;
 >r3b3 : Symbol(r3b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 78, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
 
 var r3b4 = b4 <= a4;
 >r3b4 : Symbol(r3b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 79, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
 
 var r3b5 = b5 <= a5;
 >r3b5 : Symbol(r3b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 80, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
 
 var r3b6 = b6 <= a6;
 >r3b6 : Symbol(r3b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 81, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
 
 var r3b7 = b7 <= a7;
 >r3b7 : Symbol(r3b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 82, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
 
 // operator >=
 var r4a1 = a1 >= b1;
 >r4a1 : Symbol(r4a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 85, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
 
 var r4a2 = a2 >= b2;
 >r4a2 : Symbol(r4a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 86, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
 
 var r4a3 = a3 >= b3;
 >r4a3 : Symbol(r4a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 87, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
 
 var r4a4 = a4 >= b4;
 >r4a4 : Symbol(r4a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 88, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
 
 var r4a5 = a5 >= b5;
 >r4a5 : Symbol(r4a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 89, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
 
 var r4a6 = a6 >= b6;
 >r4a6 : Symbol(r4a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 90, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
 
 var r4a7 = a7 >= b7;
 >r4a7 : Symbol(r4a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 91, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
 
 var r4b1 = b1 >= a1;
 >r4b1 : Symbol(r4b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 93, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
 
 var r4b2 = b2 >= a2;
 >r4b2 : Symbol(r4b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 94, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
 
 var r4b3 = b3 >= a3;
 >r4b3 : Symbol(r4b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 95, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
 
 var r4b4 = b4 >= a4;
 >r4b4 : Symbol(r4b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 96, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
 
 var r4b5 = b5 >= a5;
 >r4b5 : Symbol(r4b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 97, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
 
 var r4b6 = b6 >= a6;
 >r4b6 : Symbol(r4b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 98, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
 
 var r4b7 = b7 >= a7;
 >r4b7 : Symbol(r4b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 99, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
 
 // operator ==
 var r5a1 = a1 == b1;
 >r5a1 : Symbol(r5a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 102, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
 
 var r5a2 = a2 == b2;
 >r5a2 : Symbol(r5a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 103, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
 
 var r5a3 = a3 == b3;
 >r5a3 : Symbol(r5a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 104, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
 
 var r5a4 = a4 == b4;
 >r5a4 : Symbol(r5a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 105, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
 
 var r5a5 = a5 == b5;
 >r5a5 : Symbol(r5a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 106, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
 
 var r5a6 = a6 == b6;
 >r5a6 : Symbol(r5a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 107, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
 
 var r5a7 = a7 == b7;
 >r5a7 : Symbol(r5a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 108, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
 
 var r5b1 = b1 == a1;
 >r5b1 : Symbol(r5b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 110, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
 
 var r5b2 = b2 == a2;
 >r5b2 : Symbol(r5b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 111, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
 
 var r5b3 = b3 == a3;
 >r5b3 : Symbol(r5b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 112, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
 
 var r5b4 = b4 == a4;
 >r5b4 : Symbol(r5b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 113, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
 
 var r5b5 = b5 == a5;
 >r5b5 : Symbol(r5b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 114, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
 
 var r5b6 = b6 == a6;
 >r5b6 : Symbol(r5b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 115, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
 
 var r5b7 = b7 == a7;
 >r5b7 : Symbol(r5b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 116, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
 
 // operator !=
 var r6a1 = a1 != b1;
 >r6a1 : Symbol(r6a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 119, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
 
 var r6a2 = a2 != b2;
 >r6a2 : Symbol(r6a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 120, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
 
 var r6a3 = a3 != b3;
 >r6a3 : Symbol(r6a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 121, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
 
 var r6a4 = a4 != b4;
 >r6a4 : Symbol(r6a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 122, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
 
 var r6a5 = a5 != b5;
 >r6a5 : Symbol(r6a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 123, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
 
 var r6a6 = a6 != b6;
 >r6a6 : Symbol(r6a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 124, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
 
 var r6a7 = a7 != b7;
 >r6a7 : Symbol(r6a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 125, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
 
 var r6b1 = b1 != a1;
 >r6b1 : Symbol(r6b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 127, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
 
 var r6b2 = b2 != a2;
 >r6b2 : Symbol(r6b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 128, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
 
 var r6b3 = b3 != a3;
 >r6b3 : Symbol(r6b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 129, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
 
 var r6b4 = b4 != a4;
 >r6b4 : Symbol(r6b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 130, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
 
 var r6b5 = b5 != a5;
 >r6b5 : Symbol(r6b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 131, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
 
 var r6b6 = b6 != a6;
 >r6b6 : Symbol(r6b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 132, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
 
 var r6b7 = b7 != a7;
 >r6b7 : Symbol(r6b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 133, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
 
 // operator ===
 var r7a1 = a1 === b1;
 >r7a1 : Symbol(r7a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 136, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
 
 var r7a2 = a2 === b2;
 >r7a2 : Symbol(r7a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 137, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
 
 var r7a3 = a3 === b3;
 >r7a3 : Symbol(r7a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 138, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
 
 var r7a4 = a4 === b4;
 >r7a4 : Symbol(r7a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 139, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
 
 var r7a5 = a5 === b5;
 >r7a5 : Symbol(r7a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 140, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
 
 var r7a6 = a6 === b6;
 >r7a6 : Symbol(r7a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 141, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
 
 var r7a7 = a7 === b7;
 >r7a7 : Symbol(r7a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 142, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
 
 var r7b1 = b1 === a1;
 >r7b1 : Symbol(r7b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 144, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
 
 var r7b2 = b2 === a2;
 >r7b2 : Symbol(r7b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 145, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
 
 var r7b3 = b3 === a3;
 >r7b3 : Symbol(r7b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 146, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
 
 var r7b4 = b4 === a4;
 >r7b4 : Symbol(r7b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 147, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
 
 var r7b5 = b5 === a5;
 >r7b5 : Symbol(r7b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 148, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
 
 var r7b6 = b6 === a6;
 >r7b6 : Symbol(r7b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 149, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
 
 var r7b7 = b7 === a7;
 >r7b7 : Symbol(r7b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 150, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
 
 // operator !==
 var r8a1 = a1 !== b1;
 >r8a1 : Symbol(r8a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 153, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
 
 var r8a2 = a2 !== b2;
 >r8a2 : Symbol(r8a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 154, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
 
 var r8a3 = a3 !== b3;
 >r8a3 : Symbol(r8a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 155, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
 
 var r8a4 = a4 !== b4;
 >r8a4 : Symbol(r8a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 156, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
 
 var r8a5 = a5 !== b5;
 >r8a5 : Symbol(r8a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 157, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
 
 var r8a6 = a6 !== b6;
 >r8a6 : Symbol(r8a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 158, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
 
 var r8a7 = a7 !== b7;
 >r8a7 : Symbol(r8a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 159, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
 
 var r8b1 = b1 !== a1;
 >r8b1 : Symbol(r8b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 161, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 12, 11))
 
 var r8b2 = b2 !== a2;
 >r8b2 : Symbol(r8b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 162, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 15, 11))
 
 var r8b3 = b3 !== a3;
 >r8b3 : Symbol(r8b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 163, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 18, 11))
 
 var r8b4 = b4 !== a4;
 >r8b4 : Symbol(r8b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 164, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 21, 11))
 
 var r8b5 = b5 !== a5;
 >r8b5 : Symbol(r8b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 165, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 24, 11))
 
 var r8b6 = b6 !== a6;
 >r8b6 : Symbol(r8b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 166, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 27, 11))
 
 var r8b7 = b7 !== a7;
 >r8b7 : Symbol(r8b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 167, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts, 30, 11))
 
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.types
index e67a171f1a013..1832aa944e855 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.types
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.types
@@ -30,17 +30,17 @@ class C {
 >  : ^^^^^^
 }
 
-var a1: { fn(): Base };
+declare var a1: { fn(): Base };
 >a1 : { fn(): Base; }
 >   : ^^^^^^^^    ^^^
 >fn : () => Base
 >   : ^^^^^^    
 
-var b1: { new (): Base };
+declare var b1: { new (): Base };
 >b1 : new () => Base
 >   : ^^^^^^^^^^    
 
-var a2: { fn(a: number, b: string): void };
+declare var a2: { fn(a: number, b: string): void };
 >a2 : { fn(a: number, b: string): void; }
 >   : ^^^^^ ^^      ^^ ^^      ^^^    ^^^
 >fn : (a: number, b: string) => void
@@ -50,7 +50,7 @@ var a2: { fn(a: number, b: string): void };
 >b : string
 >  : ^^^^^^
 
-var b2: { fn(a: string): void };
+declare var b2: { fn(a: string): void };
 >b2 : { fn(a: string): void; }
 >   : ^^^^^ ^^      ^^^    ^^^
 >fn : (a: string) => void
@@ -58,7 +58,7 @@ var b2: { fn(a: string): void };
 >a : string
 >  : ^^^^^^
 
-var a3: { fn(a: Base, b: string): void };
+declare var a3: { fn(a: Base, b: string): void };
 >a3 : { fn(a: Base, b: string): void; }
 >   : ^^^^^ ^^    ^^ ^^      ^^^    ^^^
 >fn : (a: Base, b: string) => void
@@ -68,7 +68,7 @@ var a3: { fn(a: Base, b: string): void };
 >b : string
 >  : ^^^^^^
 
-var b3: { fn(a: Derived, b: Base): void };
+declare var b3: { fn(a: Derived, b: Base): void };
 >b3 : { fn(a: Derived, b: Base): void; }
 >   : ^^^^^ ^^       ^^ ^^    ^^^    ^^^
 >fn : (a: Derived, b: Base) => void
@@ -78,19 +78,19 @@ var b3: { fn(a: Derived, b: Base): void };
 >b : Base
 >  : ^^^^
 
-var a4: { fn(): Base };
+declare var a4: { fn(): Base };
 >a4 : { fn(): Base; }
 >   : ^^^^^^^^    ^^^
 >fn : () => Base
 >   : ^^^^^^    
 
-var b4: { fn(): C };
+declare var b4: { fn(): C };
 >b4 : { fn(): C; }
 >   : ^^^^^^^^ ^^^
 >fn : () => C
 >   : ^^^^^^ 
 
-var a5: { fn(a?: Base): void };
+declare var a5: { fn(a?: Base): void };
 >a5 : { fn(a?: Base): void; }
 >   : ^^^^^ ^^^    ^^^    ^^^
 >fn : (a?: Base) => void
@@ -98,7 +98,7 @@ var a5: { fn(a?: Base): void };
 >a : Base
 >  : ^^^^
 
-var b5: { fn(a?: C): void };
+declare var b5: { fn(a?: C): void };
 >b5 : { fn(a?: C): void; }
 >   : ^^^^^ ^^^ ^^^    ^^^
 >fn : (a?: C) => void
@@ -106,7 +106,7 @@ var b5: { fn(a?: C): void };
 >a : C
 >  : ^
 
-var a6: { fn(...a: Base[]): void };
+declare var a6: { fn(...a: Base[]): void };
 >a6 : { fn(...a: Base[]): void; }
 >   : ^^^^^^^^ ^^      ^^^    ^^^
 >fn : (...a: Base[]) => void
@@ -114,7 +114,7 @@ var a6: { fn(...a: Base[]): void };
 >a : Base[]
 >  : ^^^^^^
 
-var b6: { fn(...a: C[]): void };
+declare var b6: { fn(...a: C[]): void };
 >b6 : { fn(...a: C[]): void; }
 >   : ^^^^^^^^ ^^   ^^^    ^^^
 >fn : (...a: C[]) => void
@@ -122,7 +122,7 @@ var b6: { fn(...a: C[]): void };
 >a : C[]
 >  : ^^^
 
-var a7: { fn<T>(t: T): T };
+declare var a7: { fn<T>(t: T): T };
 >a7 : { fn<T>(t: T): T; }
 >   : ^^^^^ ^^ ^^ ^^^ ^^^
 >fn : <T>(t: T) => T
@@ -130,7 +130,7 @@ var a7: { fn<T>(t: T): T };
 >t : T
 >  : ^
 
-var b7: { fn<T>(t: T[]): T };
+declare var b7: { fn<T>(t: T[]): T };
 >b7 : { fn<T>(t: T[]): T; }
 >   : ^^^^^ ^^ ^^   ^^^ ^^^
 >fn : <T>(t: T[]) => T
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.errors.txt b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.errors.txt
index 0d6521637159c..36ec7d62a7303 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.errors.txt
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.errors.txt
@@ -109,26 +109,26 @@ comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts(167,12): er
         public c: string;
     }
     
-    var a1: { fn(): Base };
-    var b1: { new (): Base };
+    declare var a1: { fn(): Base };
+    declare var b1: { new (): Base };
     
-    var a2: { new (a: number, b: string): Base };
-    var b2: { new (a: string): Base };
+    declare var a2: { new (a: number, b: string): Base };
+    declare var b2: { new (a: string): Base };
     
-    var a3: { new (a: Base, b: string): Base };
-    var b3: { new (a: Derived, b: Base): Base };
+    declare var a3: { new (a: Base, b: string): Base };
+    declare var b3: { new (a: Derived, b: Base): Base };
     
-    var a4: { new (): Base };
-    var b4: { new (): C };
+    declare var a4: { new (): Base };
+    declare var b4: { new (): C };
     
-    var a5: { new (a?: Base): Base };
-    var b5: { new (a?: C): Base };
+    declare var a5: { new (a?: Base): Base };
+    declare var b5: { new (a?: C): Base };
     
-    var a6: { new (...a: Base[]): Base };
-    var b6: { new (...a: C[]): Base };
+    declare var a6: { new (...a: Base[]): Base };
+    declare var b6: { new (...a: C[]): Base };
     
-    var a7: { new <T>(t: T): T };
-    var b7: { new <T>(t: T[]): T };
+    declare var a7: { new <T>(t: T): T };
+    declare var b7: { new <T>(t: T[]): T };
     
     // operator <
     var r1a1 = a1 < b1;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
index 26e89ce584d01..3fab5be8010d6 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
@@ -13,26 +13,26 @@ class C {
     public c: string;
 }
 
-var a1: { fn(): Base };
-var b1: { new (): Base };
+declare var a1: { fn(): Base };
+declare var b1: { new (): Base };
 
-var a2: { new (a: number, b: string): Base };
-var b2: { new (a: string): Base };
+declare var a2: { new (a: number, b: string): Base };
+declare var b2: { new (a: string): Base };
 
-var a3: { new (a: Base, b: string): Base };
-var b3: { new (a: Derived, b: Base): Base };
+declare var a3: { new (a: Base, b: string): Base };
+declare var b3: { new (a: Derived, b: Base): Base };
 
-var a4: { new (): Base };
-var b4: { new (): C };
+declare var a4: { new (): Base };
+declare var b4: { new (): C };
 
-var a5: { new (a?: Base): Base };
-var b5: { new (a?: C): Base };
+declare var a5: { new (a?: Base): Base };
+declare var b5: { new (a?: C): Base };
 
-var a6: { new (...a: Base[]): Base };
-var b6: { new (...a: C[]): Base };
+declare var a6: { new (...a: Base[]): Base };
+declare var b6: { new (...a: C[]): Base };
 
-var a7: { new <T>(t: T): T };
-var b7: { new <T>(t: T[]): T };
+declare var a7: { new <T>(t: T): T };
+declare var b7: { new <T>(t: T[]): T };
 
 // operator <
 var r1a1 = a1 < b1;
@@ -203,20 +203,6 @@ var C = /** @class */ (function () {
     }
     return C;
 }());
-var a1;
-var b1;
-var a2;
-var b2;
-var a3;
-var b3;
-var a4;
-var b4;
-var a5;
-var b5;
-var a6;
-var b6;
-var a7;
-var b7;
 // operator <
 var r1a1 = a1 < b1;
 var r1a2 = a2 < b2;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.symbols b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.symbols
index 430fc33ec7259..99bdb54619b5e 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.symbols
@@ -23,652 +23,652 @@ class C {
 >c : Symbol(C.c, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 8, 9))
 }
 
-var a1: { fn(): Base };
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
->fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 9))
+declare var a1: { fn(): Base };
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
+>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 17))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 0, 0))
 
-var b1: { new (): Base };
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
+declare var b1: { new (): Base };
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 0, 0))
 
-var a2: { new (a: number, b: string): Base };
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 15))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 25))
+declare var a2: { new (a: number, b: string): Base };
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 23))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 33))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 0, 0))
 
-var b2: { new (a: string): Base };
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 15))
+declare var b2: { new (a: string): Base };
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 23))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 0, 0))
 
-var a3: { new (a: Base, b: string): Base };
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 15))
+declare var a3: { new (a: Base, b: string): Base };
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 23))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 0, 0))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 23))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 31))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 0, 0))
 
-var b3: { new (a: Derived, b: Base): Base };
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 15))
+declare var b3: { new (a: Derived, b: Base): Base };
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 23))
 >Derived : Symbol(Derived, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 2, 1))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 26))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 34))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 0, 0))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 0, 0))
 
-var a4: { new (): Base };
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
+declare var a4: { new (): Base };
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 0, 0))
 
-var b4: { new (): C };
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
+declare var b4: { new (): C };
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
 >C : Symbol(C, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 6, 1))
 
-var a5: { new (a?: Base): Base };
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 15))
+declare var a5: { new (a?: Base): Base };
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 23))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 0, 0))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 0, 0))
 
-var b5: { new (a?: C): Base };
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 15))
+declare var b5: { new (a?: C): Base };
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 23))
 >C : Symbol(C, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 6, 1))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 0, 0))
 
-var a6: { new (...a: Base[]): Base };
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 15))
+declare var a6: { new (...a: Base[]): Base };
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 23))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 0, 0))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 0, 0))
 
-var b6: { new (...a: C[]): Base };
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 15))
+declare var b6: { new (...a: C[]): Base };
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 23))
 >C : Symbol(C, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 6, 1))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 0, 0))
 
-var a7: { new <T>(t: T): T };
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
->T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 15))
->t : Symbol(t, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 18))
->T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 15))
->T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 15))
+declare var a7: { new <T>(t: T): T };
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
+>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 23))
+>t : Symbol(t, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 26))
+>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 23))
+>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 23))
 
-var b7: { new <T>(t: T[]): T };
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
->T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 15))
->t : Symbol(t, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 18))
->T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 15))
->T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 15))
+declare var b7: { new <T>(t: T[]): T };
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
+>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 23))
+>t : Symbol(t, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 26))
+>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 23))
+>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 23))
 
 // operator <
 var r1a1 = a1 < b1;
 >r1a1 : Symbol(r1a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 34, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
 
 var r1a2 = a2 < b2;
 >r1a2 : Symbol(r1a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 35, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
 
 var r1a3 = a3 < b3;
 >r1a3 : Symbol(r1a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 36, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
 
 var r1a4 = a4 < b4;
 >r1a4 : Symbol(r1a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 37, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
 
 var r1a5 = a5 < b5;
 >r1a5 : Symbol(r1a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 38, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
 
 var r1a6 = a6 < b6;
 >r1a6 : Symbol(r1a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 39, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
 
 var r1a7 = a7 < b7;
 >r1a7 : Symbol(r1a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 40, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
 
 var r1b1 = b1 < a1;
 >r1b1 : Symbol(r1b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 42, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
 
 var r1b2 = b2 < a2;
 >r1b2 : Symbol(r1b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 43, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
 
 var r1b3 = b3 < a3;
 >r1b3 : Symbol(r1b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 44, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
 
 var r1b4 = b4 < a4;
 >r1b4 : Symbol(r1b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 45, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
 
 var r1b5 = b5 < a5;
 >r1b5 : Symbol(r1b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 46, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
 
 var r1b6 = b6 < a6;
 >r1b6 : Symbol(r1b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 47, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
 
 var r1b7 = b7 < a7;
 >r1b7 : Symbol(r1b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 48, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
 
 // operator >
 var r2a1 = a1 > b1;
 >r2a1 : Symbol(r2a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 51, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
 
 var r2a2 = a2 > b2;
 >r2a2 : Symbol(r2a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 52, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
 
 var r2a3 = a3 > b3;
 >r2a3 : Symbol(r2a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 53, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
 
 var r2a4 = a4 > b4;
 >r2a4 : Symbol(r2a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 54, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
 
 var r2a5 = a5 > b5;
 >r2a5 : Symbol(r2a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 55, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
 
 var r2a6 = a6 > b6;
 >r2a6 : Symbol(r2a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 56, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
 
 var r2a7 = a7 > b7;
 >r2a7 : Symbol(r2a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 57, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
 
 var r2b1 = b1 > a1;
 >r2b1 : Symbol(r2b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 59, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
 
 var r2b2 = b2 > a2;
 >r2b2 : Symbol(r2b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 60, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
 
 var r2b3 = b3 > a3;
 >r2b3 : Symbol(r2b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 61, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
 
 var r2b4 = b4 > a4;
 >r2b4 : Symbol(r2b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 62, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
 
 var r2b5 = b5 > a5;
 >r2b5 : Symbol(r2b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 63, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
 
 var r2b6 = b6 > a6;
 >r2b6 : Symbol(r2b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 64, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
 
 var r2b7 = b7 > a7;
 >r2b7 : Symbol(r2b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 65, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
 
 // operator <=
 var r3a1 = a1 <= b1;
 >r3a1 : Symbol(r3a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 68, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
 
 var r3a2 = a2 <= b2;
 >r3a2 : Symbol(r3a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 69, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
 
 var r3a3 = a3 <= b3;
 >r3a3 : Symbol(r3a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 70, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
 
 var r3a4 = a4 <= b4;
 >r3a4 : Symbol(r3a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 71, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
 
 var r3a5 = a5 <= b5;
 >r3a5 : Symbol(r3a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 72, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
 
 var r3a6 = a6 <= b6;
 >r3a6 : Symbol(r3a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 73, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
 
 var r3a7 = a7 <= b7;
 >r3a7 : Symbol(r3a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 74, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
 
 var r3b1 = b1 <= a1;
 >r3b1 : Symbol(r3b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 76, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
 
 var r3b2 = b2 <= a2;
 >r3b2 : Symbol(r3b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 77, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
 
 var r3b3 = b3 <= a3;
 >r3b3 : Symbol(r3b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 78, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
 
 var r3b4 = b4 <= a4;
 >r3b4 : Symbol(r3b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 79, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
 
 var r3b5 = b5 <= a5;
 >r3b5 : Symbol(r3b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 80, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
 
 var r3b6 = b6 <= a6;
 >r3b6 : Symbol(r3b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 81, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
 
 var r3b7 = b7 <= a7;
 >r3b7 : Symbol(r3b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 82, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
 
 // operator >=
 var r4a1 = a1 >= b1;
 >r4a1 : Symbol(r4a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 85, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
 
 var r4a2 = a2 >= b2;
 >r4a2 : Symbol(r4a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 86, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
 
 var r4a3 = a3 >= b3;
 >r4a3 : Symbol(r4a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 87, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
 
 var r4a4 = a4 >= b4;
 >r4a4 : Symbol(r4a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 88, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
 
 var r4a5 = a5 >= b5;
 >r4a5 : Symbol(r4a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 89, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
 
 var r4a6 = a6 >= b6;
 >r4a6 : Symbol(r4a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 90, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
 
 var r4a7 = a7 >= b7;
 >r4a7 : Symbol(r4a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 91, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
 
 var r4b1 = b1 >= a1;
 >r4b1 : Symbol(r4b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 93, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
 
 var r4b2 = b2 >= a2;
 >r4b2 : Symbol(r4b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 94, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
 
 var r4b3 = b3 >= a3;
 >r4b3 : Symbol(r4b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 95, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
 
 var r4b4 = b4 >= a4;
 >r4b4 : Symbol(r4b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 96, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
 
 var r4b5 = b5 >= a5;
 >r4b5 : Symbol(r4b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 97, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
 
 var r4b6 = b6 >= a6;
 >r4b6 : Symbol(r4b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 98, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
 
 var r4b7 = b7 >= a7;
 >r4b7 : Symbol(r4b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 99, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
 
 // operator ==
 var r5a1 = a1 == b1;
 >r5a1 : Symbol(r5a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 102, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
 
 var r5a2 = a2 == b2;
 >r5a2 : Symbol(r5a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 103, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
 
 var r5a3 = a3 == b3;
 >r5a3 : Symbol(r5a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 104, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
 
 var r5a4 = a4 == b4;
 >r5a4 : Symbol(r5a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 105, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
 
 var r5a5 = a5 == b5;
 >r5a5 : Symbol(r5a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 106, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
 
 var r5a6 = a6 == b6;
 >r5a6 : Symbol(r5a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 107, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
 
 var r5a7 = a7 == b7;
 >r5a7 : Symbol(r5a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 108, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
 
 var r5b1 = b1 == a1;
 >r5b1 : Symbol(r5b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 110, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
 
 var r5b2 = b2 == a2;
 >r5b2 : Symbol(r5b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 111, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
 
 var r5b3 = b3 == a3;
 >r5b3 : Symbol(r5b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 112, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
 
 var r5b4 = b4 == a4;
 >r5b4 : Symbol(r5b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 113, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
 
 var r5b5 = b5 == a5;
 >r5b5 : Symbol(r5b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 114, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
 
 var r5b6 = b6 == a6;
 >r5b6 : Symbol(r5b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 115, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
 
 var r5b7 = b7 == a7;
 >r5b7 : Symbol(r5b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 116, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
 
 // operator !=
 var r6a1 = a1 != b1;
 >r6a1 : Symbol(r6a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 119, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
 
 var r6a2 = a2 != b2;
 >r6a2 : Symbol(r6a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 120, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
 
 var r6a3 = a3 != b3;
 >r6a3 : Symbol(r6a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 121, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
 
 var r6a4 = a4 != b4;
 >r6a4 : Symbol(r6a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 122, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
 
 var r6a5 = a5 != b5;
 >r6a5 : Symbol(r6a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 123, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
 
 var r6a6 = a6 != b6;
 >r6a6 : Symbol(r6a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 124, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
 
 var r6a7 = a7 != b7;
 >r6a7 : Symbol(r6a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 125, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
 
 var r6b1 = b1 != a1;
 >r6b1 : Symbol(r6b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 127, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
 
 var r6b2 = b2 != a2;
 >r6b2 : Symbol(r6b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 128, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
 
 var r6b3 = b3 != a3;
 >r6b3 : Symbol(r6b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 129, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
 
 var r6b4 = b4 != a4;
 >r6b4 : Symbol(r6b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 130, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
 
 var r6b5 = b5 != a5;
 >r6b5 : Symbol(r6b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 131, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
 
 var r6b6 = b6 != a6;
 >r6b6 : Symbol(r6b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 132, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
 
 var r6b7 = b7 != a7;
 >r6b7 : Symbol(r6b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 133, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
 
 // operator ===
 var r7a1 = a1 === b1;
 >r7a1 : Symbol(r7a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 136, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
 
 var r7a2 = a2 === b2;
 >r7a2 : Symbol(r7a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 137, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
 
 var r7a3 = a3 === b3;
 >r7a3 : Symbol(r7a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 138, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
 
 var r7a4 = a4 === b4;
 >r7a4 : Symbol(r7a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 139, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
 
 var r7a5 = a5 === b5;
 >r7a5 : Symbol(r7a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 140, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
 
 var r7a6 = a6 === b6;
 >r7a6 : Symbol(r7a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 141, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
 
 var r7a7 = a7 === b7;
 >r7a7 : Symbol(r7a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 142, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
 
 var r7b1 = b1 === a1;
 >r7b1 : Symbol(r7b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 144, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
 
 var r7b2 = b2 === a2;
 >r7b2 : Symbol(r7b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 145, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
 
 var r7b3 = b3 === a3;
 >r7b3 : Symbol(r7b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 146, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
 
 var r7b4 = b4 === a4;
 >r7b4 : Symbol(r7b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 147, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
 
 var r7b5 = b5 === a5;
 >r7b5 : Symbol(r7b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 148, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
 
 var r7b6 = b6 === a6;
 >r7b6 : Symbol(r7b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 149, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
 
 var r7b7 = b7 === a7;
 >r7b7 : Symbol(r7b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 150, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
 
 // operator !==
 var r8a1 = a1 !== b1;
 >r8a1 : Symbol(r8a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 153, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
 
 var r8a2 = a2 !== b2;
 >r8a2 : Symbol(r8a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 154, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
 
 var r8a3 = a3 !== b3;
 >r8a3 : Symbol(r8a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 155, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
 
 var r8a4 = a4 !== b4;
 >r8a4 : Symbol(r8a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 156, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
 
 var r8a5 = a5 !== b5;
 >r8a5 : Symbol(r8a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 157, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
 
 var r8a6 = a6 !== b6;
 >r8a6 : Symbol(r8a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 158, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
 
 var r8a7 = a7 !== b7;
 >r8a7 : Symbol(r8a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 159, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
 
 var r8b1 = b1 !== a1;
 >r8b1 : Symbol(r8b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 161, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 12, 11))
 
 var r8b2 = b2 !== a2;
 >r8b2 : Symbol(r8b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 162, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 15, 11))
 
 var r8b3 = b3 !== a3;
 >r8b3 : Symbol(r8b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 163, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 18, 11))
 
 var r8b4 = b4 !== a4;
 >r8b4 : Symbol(r8b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 164, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 21, 11))
 
 var r8b5 = b5 !== a5;
 >r8b5 : Symbol(r8b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 165, 3))
->b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 3))
->a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 3))
+>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 25, 11))
+>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 24, 11))
 
 var r8b6 = b6 !== a6;
 >r8b6 : Symbol(r8b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 166, 3))
->b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 3))
->a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 3))
+>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 28, 11))
+>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 27, 11))
 
 var r8b7 = b7 !== a7;
 >r8b7 : Symbol(r8b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 167, 3))
->b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 3))
->a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 3))
+>b7 : Symbol(b7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 31, 11))
+>a7 : Symbol(a7, Decl(comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts, 30, 11))
 
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.types
index b35a0ae8a9cd2..23d4b6486291a 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.types
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.types
@@ -30,17 +30,17 @@ class C {
 >  : ^^^^^^
 }
 
-var a1: { fn(): Base };
+declare var a1: { fn(): Base };
 >a1 : { fn(): Base; }
 >   : ^^^^^^^^    ^^^
 >fn : () => Base
 >   : ^^^^^^    
 
-var b1: { new (): Base };
+declare var b1: { new (): Base };
 >b1 : new () => Base
 >   : ^^^^^^^^^^    
 
-var a2: { new (a: number, b: string): Base };
+declare var a2: { new (a: number, b: string): Base };
 >a2 : new (a: number, b: string) => Base
 >   : ^^^^^ ^^      ^^ ^^      ^^^^^    
 >a : number
@@ -48,13 +48,13 @@ var a2: { new (a: number, b: string): Base };
 >b : string
 >  : ^^^^^^
 
-var b2: { new (a: string): Base };
+declare var b2: { new (a: string): Base };
 >b2 : new (a: string) => Base
 >   : ^^^^^ ^^      ^^^^^    
 >a : string
 >  : ^^^^^^
 
-var a3: { new (a: Base, b: string): Base };
+declare var a3: { new (a: Base, b: string): Base };
 >a3 : new (a: Base, b: string) => Base
 >   : ^^^^^ ^^    ^^ ^^      ^^^^^    
 >a : Base
@@ -62,7 +62,7 @@ var a3: { new (a: Base, b: string): Base };
 >b : string
 >  : ^^^^^^
 
-var b3: { new (a: Derived, b: Base): Base };
+declare var b3: { new (a: Derived, b: Base): Base };
 >b3 : new (a: Derived, b: Base) => Base
 >   : ^^^^^ ^^       ^^ ^^    ^^^^^    
 >a : Derived
@@ -70,45 +70,45 @@ var b3: { new (a: Derived, b: Base): Base };
 >b : Base
 >  : ^^^^
 
-var a4: { new (): Base };
+declare var a4: { new (): Base };
 >a4 : new () => Base
 >   : ^^^^^^^^^^    
 
-var b4: { new (): C };
+declare var b4: { new (): C };
 >b4 : new () => C
 >   : ^^^^^^^^^^ 
 
-var a5: { new (a?: Base): Base };
+declare var a5: { new (a?: Base): Base };
 >a5 : new (a?: Base) => Base
 >   : ^^^^^ ^^^    ^^^^^    
 >a : Base
 >  : ^^^^
 
-var b5: { new (a?: C): Base };
+declare var b5: { new (a?: C): Base };
 >b5 : new (a?: C) => Base
 >   : ^^^^^ ^^^ ^^^^^    
 >a : C
 >  : ^
 
-var a6: { new (...a: Base[]): Base };
+declare var a6: { new (...a: Base[]): Base };
 >a6 : new (...a: Base[]) => Base
 >   : ^^^^^^^^ ^^      ^^^^^    
 >a : Base[]
 >  : ^^^^^^
 
-var b6: { new (...a: C[]): Base };
+declare var b6: { new (...a: C[]): Base };
 >b6 : new (...a: C[]) => Base
 >   : ^^^^^^^^ ^^   ^^^^^    
 >a : C[]
 >  : ^^^
 
-var a7: { new <T>(t: T): T };
+declare var a7: { new <T>(t: T): T };
 >a7 : new <T>(t: T) => T
 >   : ^^^^^ ^^ ^^ ^^^^^ 
 >t : T
 >  : ^
 
-var b7: { new <T>(t: T[]): T };
+declare var b7: { new <T>(t: T[]): T };
 >b7 : new <T>(t: T[]) => T
 >   : ^^^^^ ^^ ^^   ^^^^^ 
 >t : T[]
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.errors.txt b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.errors.txt
index 7f8cea13aca43..a55feb832c171 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.errors.txt
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.errors.txt
@@ -61,17 +61,17 @@ comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(110,12): error TS
         public c: string;
     }
     
-    var a1: { [a: string]: string };
-    var b1: { [b: string]: number };
+    declare var a1: { [a: string]: string };
+    declare var b1: { [b: string]: number };
     
-    var a2: { [index: string]: Base };
-    var b2: { [index: string]: C };
+    declare var a2: { [index: string]: Base };
+    declare var b2: { [index: string]: C };
     
-    var a3: { [index: number]: Base };
-    var b3: { [index: number]: C };
+    declare var a3: { [index: number]: Base };
+    declare var b3: { [index: number]: C };
     
-    var a4: { [index: number]: Derived };
-    var b4: { [index: string]: Base };
+    declare var a4: { [index: number]: Derived };
+    declare var b4: { [index: string]: Base };
     
     // operator <
     var r1a1 = a1 < b1;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
index b4f3679bc2230..6ca70c1dd443b 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
@@ -13,17 +13,17 @@ class C {
     public c: string;
 }
 
-var a1: { [a: string]: string };
-var b1: { [b: string]: number };
+declare var a1: { [a: string]: string };
+declare var b1: { [b: string]: number };
 
-var a2: { [index: string]: Base };
-var b2: { [index: string]: C };
+declare var a2: { [index: string]: Base };
+declare var b2: { [index: string]: C };
 
-var a3: { [index: number]: Base };
-var b3: { [index: number]: C };
+declare var a3: { [index: number]: Base };
+declare var b3: { [index: number]: C };
 
-var a4: { [index: number]: Derived };
-var b4: { [index: string]: Base };
+declare var a4: { [index: number]: Derived };
+declare var b4: { [index: string]: Base };
 
 // operator <
 var r1a1 = a1 < b1;
@@ -146,14 +146,6 @@ var C = /** @class */ (function () {
     }
     return C;
 }());
-var a1;
-var b1;
-var a2;
-var b2;
-var a3;
-var b3;
-var a4;
-var b4;
 // operator <
 var r1a1 = a1 < b1;
 var r1a2 = a2 < b2;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.symbols b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.symbols
index e05bd3eb74015..faa71eeb8ef29 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.symbols
@@ -23,369 +23,369 @@ class C {
 >c : Symbol(C.c, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 8, 9))
 }
 
-var a1: { [a: string]: string };
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
+declare var a1: { [a: string]: string };
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 19))
 
-var b1: { [b: string]: number };
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
+declare var b1: { [b: string]: number };
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 19))
 
-var a2: { [index: string]: Base };
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
->index : Symbol(index, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
+declare var a2: { [index: string]: Base };
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
+>index : Symbol(index, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 19))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 0, 0))
 
-var b2: { [index: string]: C };
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
->index : Symbol(index, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
+declare var b2: { [index: string]: C };
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
+>index : Symbol(index, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 19))
 >C : Symbol(C, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 6, 1))
 
-var a3: { [index: number]: Base };
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
->index : Symbol(index, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
+declare var a3: { [index: number]: Base };
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
+>index : Symbol(index, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 19))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 0, 0))
 
-var b3: { [index: number]: C };
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
->index : Symbol(index, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
+declare var b3: { [index: number]: C };
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
+>index : Symbol(index, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 19))
 >C : Symbol(C, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 6, 1))
 
-var a4: { [index: number]: Derived };
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
->index : Symbol(index, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
+declare var a4: { [index: number]: Derived };
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
+>index : Symbol(index, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 19))
 >Derived : Symbol(Derived, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 2, 1))
 
-var b4: { [index: string]: Base };
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
->index : Symbol(index, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
+declare var b4: { [index: string]: Base };
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
+>index : Symbol(index, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 19))
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 0, 0))
 
 // operator <
 var r1a1 = a1 < b1;
 >r1a1 : Symbol(r1a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 25, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
 
 var r1a2 = a2 < b2;
 >r1a2 : Symbol(r1a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 26, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
 
 var r1a3 = a3 < b3;
 >r1a3 : Symbol(r1a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 27, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
 
 var r1a4 = a4 < b4;
 >r1a4 : Symbol(r1a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 28, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
 
 var r1b1 = b1 < a1;
 >r1b1 : Symbol(r1b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 30, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
 
 var r1b2 = b2 < a2;
 >r1b2 : Symbol(r1b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 31, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
 
 var r1b3 = b3 < a3;
 >r1b3 : Symbol(r1b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 32, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
 
 var r1b4 = b4 < a4;
 >r1b4 : Symbol(r1b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 33, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
 
 // operator >
 var r2a1 = a1 > b1;
 >r2a1 : Symbol(r2a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 36, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
 
 var r2a2 = a2 > b2;
 >r2a2 : Symbol(r2a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 37, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
 
 var r2a3 = a3 > b3;
 >r2a3 : Symbol(r2a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 38, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
 
 var r2a4 = a4 > b4;
 >r2a4 : Symbol(r2a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 39, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
 
 var r2b1 = b1 > a1;
 >r2b1 : Symbol(r2b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 41, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
 
 var r2b2 = b2 > a2;
 >r2b2 : Symbol(r2b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 42, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
 
 var r2b3 = b3 > a3;
 >r2b3 : Symbol(r2b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 43, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
 
 var r2b4 = b4 > a4;
 >r2b4 : Symbol(r2b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 44, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
 
 // operator <=
 var r3a1 = a1 <= b1;
 >r3a1 : Symbol(r3a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 47, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
 
 var r3a2 = a2 <= b2;
 >r3a2 : Symbol(r3a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 48, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
 
 var r3a3 = a3 <= b3;
 >r3a3 : Symbol(r3a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 49, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
 
 var r3a4 = a4 <= b4;
 >r3a4 : Symbol(r3a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 50, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
 
 var r3b1 = b1 <= a1;
 >r3b1 : Symbol(r3b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 52, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
 
 var r3b2 = b2 <= a2;
 >r3b2 : Symbol(r3b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 53, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
 
 var r3b3 = b3 <= a3;
 >r3b3 : Symbol(r3b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 54, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
 
 var r3b4 = b4 <= a4;
 >r3b4 : Symbol(r3b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 55, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
 
 // operator >=
 var r4a1 = a1 >= b1;
 >r4a1 : Symbol(r4a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 58, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
 
 var r4a2 = a2 >= b2;
 >r4a2 : Symbol(r4a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 59, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
 
 var r4a3 = a3 >= b3;
 >r4a3 : Symbol(r4a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 60, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
 
 var r4a4 = a4 >= b4;
 >r4a4 : Symbol(r4a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 61, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
 
 var r4b1 = b1 >= a1;
 >r4b1 : Symbol(r4b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 63, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
 
 var r4b2 = b2 >= a2;
 >r4b2 : Symbol(r4b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 64, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
 
 var r4b3 = b3 >= a3;
 >r4b3 : Symbol(r4b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 65, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
 
 var r4b4 = b4 >= a4;
 >r4b4 : Symbol(r4b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 66, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
 
 // operator ==
 var r5a1 = a1 == b1;
 >r5a1 : Symbol(r5a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 69, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
 
 var r5a2 = a2 == b2;
 >r5a2 : Symbol(r5a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 70, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
 
 var r5a3 = a3 == b3;
 >r5a3 : Symbol(r5a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 71, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
 
 var r5a4 = a4 == b4;
 >r5a4 : Symbol(r5a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 72, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
 
 var r5b1 = b1 == a1;
 >r5b1 : Symbol(r5b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 74, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
 
 var r5b2 = b2 == a2;
 >r5b2 : Symbol(r5b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 75, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
 
 var r5b3 = b3 == a3;
 >r5b3 : Symbol(r5b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 76, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
 
 var r5b4 = b4 == a4;
 >r5b4 : Symbol(r5b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 77, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
 
 // operator !=
 var r6a1 = a1 != b1;
 >r6a1 : Symbol(r6a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 80, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
 
 var r6a2 = a2 != b2;
 >r6a2 : Symbol(r6a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 81, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
 
 var r6a3 = a3 != b3;
 >r6a3 : Symbol(r6a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 82, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
 
 var r6a4 = a4 != b4;
 >r6a4 : Symbol(r6a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 83, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
 
 var r6b1 = b1 != a1;
 >r6b1 : Symbol(r6b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 85, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
 
 var r6b2 = b2 != a2;
 >r6b2 : Symbol(r6b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 86, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
 
 var r6b3 = b3 != a3;
 >r6b3 : Symbol(r6b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 87, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
 
 var r6b4 = b4 != a4;
 >r6b4 : Symbol(r6b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 88, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
 
 // operator ===
 var r7a1 = a1 === b1;
 >r7a1 : Symbol(r7a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 91, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
 
 var r7a2 = a2 === b2;
 >r7a2 : Symbol(r7a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 92, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
 
 var r7a3 = a3 === b3;
 >r7a3 : Symbol(r7a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 93, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
 
 var r7a4 = a4 === b4;
 >r7a4 : Symbol(r7a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 94, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
 
 var r7b1 = b1 === a1;
 >r7b1 : Symbol(r7b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 96, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
 
 var r7b2 = b2 === a2;
 >r7b2 : Symbol(r7b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 97, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
 
 var r7b3 = b3 === a3;
 >r7b3 : Symbol(r7b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 98, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
 
 var r7b4 = b4 === a4;
 >r7b4 : Symbol(r7b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 99, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
 
 // operator !==
 var r8a1 = a1 !== b1;
 >r8a1 : Symbol(r8a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 102, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
 
 var r8a2 = a2 !== b2;
 >r8a2 : Symbol(r8a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 103, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
 
 var r8a3 = a3 !== b3;
 >r8a3 : Symbol(r8a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 104, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
 
 var r8a4 = a4 !== b4;
 >r8a4 : Symbol(r8a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 105, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
 
 var r8b1 = b1 !== a1;
 >r8b1 : Symbol(r8b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 107, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 13, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 12, 11))
 
 var r8b2 = b2 !== a2;
 >r8b2 : Symbol(r8b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 108, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 16, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 15, 11))
 
 var r8b3 = b3 !== a3;
 >r8b3 : Symbol(r8b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 109, 3))
->b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 3))
->a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 3))
+>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 19, 11))
+>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 18, 11))
 
 var r8b4 = b4 !== a4;
 >r8b4 : Symbol(r8b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 110, 3))
->b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 3))
->a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 3))
+>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 22, 11))
+>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts, 21, 11))
 
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.types
index be028cdce328a..e092c708aee6b 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.types
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.types
@@ -30,49 +30,49 @@ class C {
 >  : ^^^^^^
 }
 
-var a1: { [a: string]: string };
+declare var a1: { [a: string]: string };
 >a1 : { [a: string]: string; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^
 >a : string
 >  : ^^^^^^
 
-var b1: { [b: string]: number };
+declare var b1: { [b: string]: number };
 >b1 : { [b: string]: number; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^
 >b : string
 >  : ^^^^^^
 
-var a2: { [index: string]: Base };
+declare var a2: { [index: string]: Base };
 >a2 : { [index: string]: Base; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >index : string
 >      : ^^^^^^
 
-var b2: { [index: string]: C };
+declare var b2: { [index: string]: C };
 >b2 : { [index: string]: C; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^
 >index : string
 >      : ^^^^^^
 
-var a3: { [index: number]: Base };
+declare var a3: { [index: number]: Base };
 >a3 : { [index: number]: Base; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >index : number
 >      : ^^^^^^
 
-var b3: { [index: number]: C };
+declare var b3: { [index: number]: C };
 >b3 : { [index: number]: C; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^
 >index : number
 >      : ^^^^^^
 
-var a4: { [index: number]: Derived };
+declare var a4: { [index: number]: Derived };
 >a4 : { [index: number]: Derived; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >index : number
 >      : ^^^^^^
 
-var b4: { [index: string]: Base };
+declare var b4: { [index: string]: Base };
 >b4 : { [index: string]: Base; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >index : string
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.errors.txt b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.errors.txt
index 79717fe17c42c..00be665a576ec 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.errors.txt
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.errors.txt
@@ -25,8 +25,8 @@ comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts(42,11): error T
         b?: string;
     }
     
-    var a: A1;
-    var b: B1;
+    declare var a: A1;
+    declare var b: B1;
     
     // operator <
     var ra1 = a < b;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.js
index 2145c296fb317..da3905dd60007 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.js
@@ -9,8 +9,8 @@ interface B1 {
     b?: string;
 }
 
-var a: A1;
-var b: B1;
+declare var a: A1;
+declare var b: B1;
 
 // operator <
 var ra1 = a < b;
@@ -45,8 +45,6 @@ var rh1 = a !== b;
 var rh2 = b !== a;
 
 //// [comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.js]
-var a;
-var b;
 // operator <
 var ra1 = a < b;
 var ra2 = b < a;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.symbols b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.symbols
index 5f23a3d6f76f1..dbfc0ad03ff00 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.symbols
@@ -15,99 +15,99 @@ interface B1 {
 >b : Symbol(B1.b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 4, 14))
 }
 
-var a: A1;
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
+declare var a: A1;
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
 >A1 : Symbol(A1, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 0, 0))
 
-var b: B1;
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
+declare var b: B1;
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
 >B1 : Symbol(B1, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 2, 1))
 
 // operator <
 var ra1 = a < b;
 >ra1 : Symbol(ra1, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 12, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
 
 var ra2 = b < a;
 >ra2 : Symbol(ra2, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 13, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
 
 // operator >
 var rb1 = a > b;
 >rb1 : Symbol(rb1, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 16, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
 
 var rb2 = b > a;
 >rb2 : Symbol(rb2, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 17, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
 
 // operator <=
 var rc1 = a <= b;
 >rc1 : Symbol(rc1, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 20, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
 
 var rc2 = b <= a;
 >rc2 : Symbol(rc2, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 21, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
 
 // operator >=
 var rd1 = a >= b;
 >rd1 : Symbol(rd1, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 24, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
 
 var rd2 = b >= a;
 >rd2 : Symbol(rd2, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 25, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
 
 // operator ==
 var re1 = a == b;
 >re1 : Symbol(re1, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 28, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
 
 var re2 = b == a;
 >re2 : Symbol(re2, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 29, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
 
 // operator !=
 var rf1 = a != b;
 >rf1 : Symbol(rf1, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 32, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
 
 var rf2 = b != a;
 >rf2 : Symbol(rf2, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 33, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
 
 // operator ===
 var rg1 = a === b;
 >rg1 : Symbol(rg1, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 36, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
 
 var rg2 = b === a;
 >rg2 : Symbol(rg2, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 37, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
 
 // operator !==
 var rh1 = a !== b;
 >rh1 : Symbol(rh1, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 40, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
 
 var rh2 = b !== a;
 >rh2 : Symbol(rh2, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 41, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 9, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts, 8, 11))
 
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.types
index 3627c761c1c7b..3949c55076f07 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.types
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.types
@@ -13,11 +13,11 @@ interface B1 {
 >  : ^^^^^^
 }
 
-var a: A1;
+declare var a: A1;
 >a : A1
 >  : ^^
 
-var b: B1;
+declare var b: B1;
 >b : B1
 >  : ^^
 
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.errors.txt b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.errors.txt
index 7e4cfa71ce8f1..82527c181aabf 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.errors.txt
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.errors.txt
@@ -49,10 +49,10 @@ comparisonOperatorWithNoRelationshipObjectsOnProperty.ts(76,12): error TS2367: T
         private a: string;
     }
     
-    var a1: A1;
-    var b1: B1;
-    var a2: A2;
-    var b2: B2;
+    declare var a1: A1;
+    declare var b1: B1;
+    declare var a2: A2;
+    declare var b2: B2;
     
     // operator <
     var r1a1 = a1 < b1;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.js
index e8a50d849c4d6..663c06d6a6ec3 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.js
@@ -17,10 +17,10 @@ class B2 {
     private a: string;
 }
 
-var a1: A1;
-var b1: B1;
-var a2: A2;
-var b2: B2;
+declare var a1: A1;
+declare var b1: B1;
+declare var a2: A2;
+declare var b2: B2;
 
 // operator <
 var r1a1 = a1 < b1;
@@ -99,10 +99,6 @@ var B2 = /** @class */ (function () {
     }
     return B2;
 }());
-var a1;
-var b1;
-var a2;
-var b2;
 // operator <
 var r1a1 = a1 < b1;
 var r1a2 = a2 < b2;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.symbols b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.symbols
index 0c4eb50be9d5f..b909757fa508c 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.symbols
@@ -29,187 +29,187 @@ class B2 {
 >a : Symbol(B2.a, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 12, 10))
 }
 
-var a1: A1;
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
+declare var a1: A1;
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
 >A1 : Symbol(A1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 0, 0))
 
-var b1: B1;
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
+declare var b1: B1;
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
 >B1 : Symbol(B1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 2, 1))
 
-var a2: A2;
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
+declare var a2: A2;
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
 >A2 : Symbol(A2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 6, 1))
 
-var b2: B2;
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
+declare var b2: B2;
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
 >B2 : Symbol(B2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 10, 1))
 
 // operator <
 var r1a1 = a1 < b1;
 >r1a1 : Symbol(r1a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 22, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
 
 var r1a2 = a2 < b2;
 >r1a2 : Symbol(r1a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 23, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
 
 var r1b1 = b1 < a1;
 >r1b1 : Symbol(r1b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 25, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
 
 var r1b2 = b2 < a2;
 >r1b2 : Symbol(r1b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 26, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
 
 // operator >
 var r2a1 = a1 > b1;
 >r2a1 : Symbol(r2a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 29, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
 
 var r2a2 = a2 > b2;
 >r2a2 : Symbol(r2a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 30, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
 
 var r2b1 = b1 > a1;
 >r2b1 : Symbol(r2b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 32, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
 
 var r2b2 = b2 > a2;
 >r2b2 : Symbol(r2b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 33, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
 
 // operator <=
 var r3a1 = a1 <= b1;
 >r3a1 : Symbol(r3a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 36, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
 
 var r3a2 = a2 <= b2;
 >r3a2 : Symbol(r3a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 37, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
 
 var r3b1 = b1 <= a1;
 >r3b1 : Symbol(r3b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 39, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
 
 var r3b2 = b2 <= a2;
 >r3b2 : Symbol(r3b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 40, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
 
 // operator >=
 var r4a1 = a1 >= b1;
 >r4a1 : Symbol(r4a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 43, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
 
 var r4a2 = a2 >= b2;
 >r4a2 : Symbol(r4a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 44, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
 
 var r4b1 = b1 >= a1;
 >r4b1 : Symbol(r4b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 46, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
 
 var r4b2 = b2 >= a2;
 >r4b2 : Symbol(r4b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 47, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
 
 // operator ==
 var r5a1 = a1 == b1;
 >r5a1 : Symbol(r5a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 50, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
 
 var r5a2 = a2 == b2;
 >r5a2 : Symbol(r5a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 51, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
 
 var r5b1 = b1 == a1;
 >r5b1 : Symbol(r5b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 53, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
 
 var r5b2 = b2 == a2;
 >r5b2 : Symbol(r5b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 54, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
 
 // operator !=
 var r6a1 = a1 != b1;
 >r6a1 : Symbol(r6a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 57, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
 
 var r6a2 = a2 != b2;
 >r6a2 : Symbol(r6a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 58, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
 
 var r6b1 = b1 != a1;
 >r6b1 : Symbol(r6b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 60, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
 
 var r6b2 = b2 != a2;
 >r6b2 : Symbol(r6b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 61, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
 
 // operator ===
 var r7a1 = a1 === b1;
 >r7a1 : Symbol(r7a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 64, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
 
 var r7a2 = a2 === b2;
 >r7a2 : Symbol(r7a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 65, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
 
 var r7b1 = b1 === a1;
 >r7b1 : Symbol(r7b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 67, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
 
 var r7b2 = b2 === a2;
 >r7b2 : Symbol(r7b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 68, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
 
 // operator !==
 var r8a1 = a1 !== b1;
 >r8a1 : Symbol(r8a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 71, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
 
 var r8a2 = a2 !== b2;
 >r8a2 : Symbol(r8a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 72, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
 
 var r8b1 = b1 !== a1;
 >r8b1 : Symbol(r8b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 74, 3))
->b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 3))
->a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 3))
+>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 17, 11))
+>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 16, 11))
 
 var r8b2 = b2 !== a2;
 >r8b2 : Symbol(r8b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 75, 3))
->b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 3))
->a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 3))
+>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 19, 11))
+>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnProperty.ts, 18, 11))
 
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.types
index ae7f3019d61ac..8e69be17248df 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.types
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.types
@@ -37,19 +37,19 @@ class B2 {
 >  : ^^^^^^
 }
 
-var a1: A1;
+declare var a1: A1;
 >a1 : A1
 >   : ^^
 
-var b1: B1;
+declare var b1: B1;
 >b1 : B1
 >   : ^^
 
-var a2: A2;
+declare var a2: A2;
 >a2 : A2
 >   : ^^
 
-var b2: B2;
+declare var b2: B2;
 >b2 : B2
 >   : ^^
 
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.errors.txt b/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.errors.txt
index 3b237f17327ec..72a901c841157 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.errors.txt
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.errors.txt
@@ -147,11 +147,11 @@ comparisonOperatorWithNoRelationshipPrimitiveType.ts(215,12): error TS2367: This
 ==== comparisonOperatorWithNoRelationshipPrimitiveType.ts (144 errors) ====
     enum E { a, b, c }
     
-    var a: number;
-    var b: boolean;
-    var c: string;
-    var d: void;
-    var e: E;
+    declare var a: number;
+    declare var b: boolean;
+    declare var c: string;
+    declare var d: void;
+    declare var e: E;
     
     // operator <
     var r1a1 = a < b;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.js
index 68cc3b9fa9ce0..75660f874eb49 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.js
@@ -3,11 +3,11 @@
 //// [comparisonOperatorWithNoRelationshipPrimitiveType.ts]
 enum E { a, b, c }
 
-var a: number;
-var b: boolean;
-var c: string;
-var d: void;
-var e: E;
+declare var a: number;
+declare var b: boolean;
+declare var c: string;
+declare var d: void;
+declare var e: E;
 
 // operator <
 var r1a1 = a < b;
@@ -224,11 +224,6 @@ var E;
     E[E["b"] = 1] = "b";
     E[E["c"] = 2] = "c";
 })(E || (E = {}));
-var a;
-var b;
-var c;
-var d;
-var e;
 // operator <
 var r1a1 = a < b;
 var r1a1 = a < c;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.symbols b/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.symbols
index 4734c00e42045..04d09886202c4 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.symbols
@@ -7,827 +7,827 @@ enum E { a, b, c }
 >b : Symbol(E.b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 0, 11))
 >c : Symbol(E.c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 0, 14))
 
-var a: number;
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+declare var a: number;
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
-var b: boolean;
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+declare var b: boolean;
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
-var c: string;
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+declare var c: string;
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
-var d: void;
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+declare var d: void;
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
-var e: E;
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+declare var e: E;
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 >E : Symbol(E, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 0, 0))
 
 // operator <
 var r1a1 = a < b;
 >r1a1 : Symbol(r1a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 9, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 10, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 11, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 12, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r1a1 = a < c;
 >r1a1 : Symbol(r1a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 9, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 10, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 11, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 12, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r1a1 = a < d;
 >r1a1 : Symbol(r1a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 9, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 10, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 11, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 12, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r1a1 = a < e; // no error, expected
 >r1a1 : Symbol(r1a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 9, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 10, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 11, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 12, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r1b1 = b < a;
 >r1b1 : Symbol(r1b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 14, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 15, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 16, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 17, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r1b1 = b < c;
 >r1b1 : Symbol(r1b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 14, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 15, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 16, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 17, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r1b1 = b < d;
 >r1b1 : Symbol(r1b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 14, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 15, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 16, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 17, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r1b1 = b < e;
 >r1b1 : Symbol(r1b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 14, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 15, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 16, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 17, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r1c1 = c < a;
 >r1c1 : Symbol(r1c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 19, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 20, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 21, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 22, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r1c1 = c < b;
 >r1c1 : Symbol(r1c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 19, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 20, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 21, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 22, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r1c1 = c < d;
 >r1c1 : Symbol(r1c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 19, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 20, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 21, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 22, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r1c1 = c < e;
 >r1c1 : Symbol(r1c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 19, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 20, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 21, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 22, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r1d1 = d < a;
 >r1d1 : Symbol(r1d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 24, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 25, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 26, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 27, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r1d1 = d < b;
 >r1d1 : Symbol(r1d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 24, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 25, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 26, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 27, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r1d1 = d < c;
 >r1d1 : Symbol(r1d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 24, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 25, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 26, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 27, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r1d1 = d < e;
 >r1d1 : Symbol(r1d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 24, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 25, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 26, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 27, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r1e1 = e < a; // no error, expected
 >r1e1 : Symbol(r1e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 29, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 30, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 31, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 32, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r1e1 = e < b;
 >r1e1 : Symbol(r1e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 29, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 30, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 31, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 32, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r1e1 = e < c;
 >r1e1 : Symbol(r1e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 29, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 30, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 31, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 32, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r1e1 = e < d;
 >r1e1 : Symbol(r1e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 29, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 30, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 31, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 32, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 // operator >
 var r2a1 = a > b;
 >r2a1 : Symbol(r2a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 35, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 36, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 37, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 38, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r2a1 = a > c;
 >r2a1 : Symbol(r2a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 35, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 36, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 37, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 38, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r2a1 = a > d;
 >r2a1 : Symbol(r2a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 35, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 36, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 37, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 38, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r2a1 = a > e; // no error, expected
 >r2a1 : Symbol(r2a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 35, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 36, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 37, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 38, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r2b1 = b > a;
 >r2b1 : Symbol(r2b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 40, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 41, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 42, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 43, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r2b1 = b > c;
 >r2b1 : Symbol(r2b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 40, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 41, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 42, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 43, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r2b1 = b > d;
 >r2b1 : Symbol(r2b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 40, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 41, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 42, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 43, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r2b1 = b > e;
 >r2b1 : Symbol(r2b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 40, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 41, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 42, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 43, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r2c1 = c > a;
 >r2c1 : Symbol(r2c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 45, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 46, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 47, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 48, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r2c1 = c > b;
 >r2c1 : Symbol(r2c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 45, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 46, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 47, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 48, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r2c1 = c > d;
 >r2c1 : Symbol(r2c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 45, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 46, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 47, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 48, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r2c1 = c > e;
 >r2c1 : Symbol(r2c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 45, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 46, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 47, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 48, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r2d1 = d > a;
 >r2d1 : Symbol(r2d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 50, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 51, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 52, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 53, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r2d1 = d > b;
 >r2d1 : Symbol(r2d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 50, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 51, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 52, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 53, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r2d1 = d > c;
 >r2d1 : Symbol(r2d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 50, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 51, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 52, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 53, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r2d1 = d > e;
 >r2d1 : Symbol(r2d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 50, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 51, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 52, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 53, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r2e1 = e > a; // no error, expected
 >r2e1 : Symbol(r2e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 55, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 56, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 57, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 58, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r2e1 = e > b;
 >r2e1 : Symbol(r2e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 55, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 56, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 57, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 58, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r2e1 = e > c;
 >r2e1 : Symbol(r2e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 55, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 56, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 57, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 58, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r2e1 = e > d;
 >r2e1 : Symbol(r2e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 55, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 56, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 57, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 58, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 // operator <=
 var r3a1 = a <= b;
 >r3a1 : Symbol(r3a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 61, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 62, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 63, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 64, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r3a1 = a <= c;
 >r3a1 : Symbol(r3a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 61, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 62, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 63, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 64, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r3a1 = a <= d;
 >r3a1 : Symbol(r3a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 61, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 62, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 63, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 64, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r3a1 = a <= e; // no error, expected
 >r3a1 : Symbol(r3a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 61, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 62, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 63, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 64, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r3b1 = b <= a;
 >r3b1 : Symbol(r3b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 66, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 67, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 68, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 69, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r3b1 = b <= c;
 >r3b1 : Symbol(r3b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 66, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 67, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 68, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 69, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r3b1 = b <= d;
 >r3b1 : Symbol(r3b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 66, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 67, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 68, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 69, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r3b1 = b <= e;
 >r3b1 : Symbol(r3b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 66, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 67, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 68, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 69, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r3c1 = c <= a;
 >r3c1 : Symbol(r3c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 71, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 72, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 73, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 74, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r3c1 = c <= b;
 >r3c1 : Symbol(r3c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 71, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 72, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 73, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 74, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r3c1 = c <= d;
 >r3c1 : Symbol(r3c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 71, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 72, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 73, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 74, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r3c1 = c <= e;
 >r3c1 : Symbol(r3c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 71, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 72, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 73, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 74, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r3d1 = d <= a;
 >r3d1 : Symbol(r3d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 76, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 77, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 78, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 79, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r3d1 = d <= b;
 >r3d1 : Symbol(r3d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 76, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 77, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 78, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 79, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r3d1 = d <= c;
 >r3d1 : Symbol(r3d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 76, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 77, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 78, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 79, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r3d1 = d <= e;
 >r3d1 : Symbol(r3d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 76, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 77, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 78, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 79, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r3e1 = e <= a; // no error, expected
 >r3e1 : Symbol(r3e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 81, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 82, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 83, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 84, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r3e1 = e <= b;
 >r3e1 : Symbol(r3e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 81, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 82, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 83, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 84, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r3e1 = e <= c;
 >r3e1 : Symbol(r3e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 81, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 82, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 83, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 84, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r3e1 = e <= d;
 >r3e1 : Symbol(r3e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 81, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 82, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 83, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 84, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 // operator >=
 var r4a1 = a >= b;
 >r4a1 : Symbol(r4a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 87, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 88, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 89, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 90, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r4a1 = a >= c;
 >r4a1 : Symbol(r4a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 87, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 88, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 89, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 90, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r4a1 = a >= d;
 >r4a1 : Symbol(r4a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 87, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 88, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 89, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 90, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r4a1 = a >= e; // no error, expected
 >r4a1 : Symbol(r4a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 87, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 88, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 89, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 90, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r4b1 = b >= a;
 >r4b1 : Symbol(r4b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 92, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 93, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 94, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 95, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r4b1 = b >= c;
 >r4b1 : Symbol(r4b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 92, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 93, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 94, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 95, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r4b1 = b >= d;
 >r4b1 : Symbol(r4b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 92, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 93, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 94, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 95, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r4b1 = b >= e;
 >r4b1 : Symbol(r4b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 92, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 93, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 94, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 95, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r4c1 = c >= a;
 >r4c1 : Symbol(r4c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 97, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 98, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 99, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 100, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r4c1 = c >= b;
 >r4c1 : Symbol(r4c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 97, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 98, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 99, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 100, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r4c1 = c >= d;
 >r4c1 : Symbol(r4c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 97, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 98, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 99, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 100, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r4c1 = c >= e;
 >r4c1 : Symbol(r4c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 97, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 98, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 99, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 100, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r4d1 = d >= a;
 >r4d1 : Symbol(r4d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 102, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 103, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 104, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 105, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r4d1 = d >= b;
 >r4d1 : Symbol(r4d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 102, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 103, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 104, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 105, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r4d1 = d >= c;
 >r4d1 : Symbol(r4d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 102, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 103, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 104, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 105, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r4d1 = d >= e;
 >r4d1 : Symbol(r4d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 102, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 103, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 104, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 105, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r4e1 = e >= a; // no error, expected
 >r4e1 : Symbol(r4e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 107, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 108, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 109, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 110, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r4e1 = e >= b;
 >r4e1 : Symbol(r4e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 107, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 108, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 109, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 110, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r4e1 = e >= c;
 >r4e1 : Symbol(r4e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 107, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 108, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 109, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 110, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r4e1 = e >= d;
 >r4e1 : Symbol(r4e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 107, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 108, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 109, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 110, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 // operator ==
 var r5a1 = a == b;
 >r5a1 : Symbol(r5a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 113, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 114, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 115, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 116, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r5a1 = a == c;
 >r5a1 : Symbol(r5a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 113, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 114, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 115, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 116, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r5a1 = a == d;
 >r5a1 : Symbol(r5a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 113, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 114, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 115, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 116, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r5a1 = a == e; // no error, expected
 >r5a1 : Symbol(r5a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 113, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 114, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 115, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 116, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r5b1 = b == a;
 >r5b1 : Symbol(r5b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 118, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 119, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 120, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 121, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r5b1 = b == c;
 >r5b1 : Symbol(r5b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 118, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 119, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 120, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 121, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r5b1 = b == d;
 >r5b1 : Symbol(r5b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 118, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 119, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 120, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 121, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r5b1 = b == e;
 >r5b1 : Symbol(r5b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 118, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 119, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 120, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 121, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r5c1 = c == a;
 >r5c1 : Symbol(r5c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 123, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 124, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 125, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 126, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r5c1 = c == b;
 >r5c1 : Symbol(r5c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 123, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 124, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 125, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 126, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r5c1 = c == d;
 >r5c1 : Symbol(r5c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 123, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 124, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 125, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 126, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r5c1 = c == e;
 >r5c1 : Symbol(r5c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 123, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 124, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 125, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 126, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r5d1 = d == a;
 >r5d1 : Symbol(r5d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 128, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 129, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 130, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 131, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r5d1 = d == b;
 >r5d1 : Symbol(r5d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 128, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 129, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 130, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 131, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r5d1 = d == c;
 >r5d1 : Symbol(r5d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 128, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 129, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 130, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 131, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r5d1 = d == e;
 >r5d1 : Symbol(r5d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 128, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 129, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 130, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 131, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r5e1 = e == a; // no error, expected
 >r5e1 : Symbol(r5e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 133, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 134, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 135, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 136, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r5e1 = e == b;
 >r5e1 : Symbol(r5e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 133, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 134, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 135, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 136, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r5e1 = e == c;
 >r5e1 : Symbol(r5e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 133, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 134, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 135, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 136, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r5e1 = e == d;
 >r5e1 : Symbol(r5e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 133, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 134, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 135, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 136, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 // operator !=
 var r6a1 = a != b;
 >r6a1 : Symbol(r6a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 139, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 140, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 141, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 142, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r6a1 = a != c;
 >r6a1 : Symbol(r6a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 139, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 140, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 141, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 142, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r6a1 = a != d;
 >r6a1 : Symbol(r6a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 139, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 140, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 141, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 142, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r6a1 = a != e; // no error, expected
 >r6a1 : Symbol(r6a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 139, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 140, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 141, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 142, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r6b1 = b != a;
 >r6b1 : Symbol(r6b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 144, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 145, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 146, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 147, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r6b1 = b != c;
 >r6b1 : Symbol(r6b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 144, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 145, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 146, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 147, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r6b1 = b != d;
 >r6b1 : Symbol(r6b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 144, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 145, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 146, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 147, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r6b1 = b != e;
 >r6b1 : Symbol(r6b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 144, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 145, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 146, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 147, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r6c1 = c != a;
 >r6c1 : Symbol(r6c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 149, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 150, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 151, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 152, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r6c1 = c != b;
 >r6c1 : Symbol(r6c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 149, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 150, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 151, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 152, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r6c1 = c != d;
 >r6c1 : Symbol(r6c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 149, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 150, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 151, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 152, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r6c1 = c != e;
 >r6c1 : Symbol(r6c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 149, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 150, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 151, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 152, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r6d1 = d != a;
 >r6d1 : Symbol(r6d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 154, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 155, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 156, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 157, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r6d1 = d != b;
 >r6d1 : Symbol(r6d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 154, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 155, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 156, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 157, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r6d1 = d != c;
 >r6d1 : Symbol(r6d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 154, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 155, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 156, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 157, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r6d1 = d != e;
 >r6d1 : Symbol(r6d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 154, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 155, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 156, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 157, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r6e1 = e != a; // no error, expected
 >r6e1 : Symbol(r6e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 159, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 160, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 161, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 162, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r6e1 = e != b;
 >r6e1 : Symbol(r6e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 159, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 160, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 161, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 162, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r6e1 = e != c;
 >r6e1 : Symbol(r6e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 159, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 160, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 161, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 162, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r6e1 = e != d;
 >r6e1 : Symbol(r6e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 159, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 160, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 161, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 162, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 // operator ===
 var r7a1 = a === b;
 >r7a1 : Symbol(r7a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 165, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 166, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 167, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 168, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r7a1 = a === c;
 >r7a1 : Symbol(r7a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 165, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 166, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 167, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 168, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r7a1 = a === d;
 >r7a1 : Symbol(r7a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 165, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 166, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 167, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 168, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r7a1 = a === e; // no error, expected
 >r7a1 : Symbol(r7a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 165, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 166, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 167, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 168, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r7b1 = b === a;
 >r7b1 : Symbol(r7b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 170, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 171, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 172, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 173, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r7b1 = b === c;
 >r7b1 : Symbol(r7b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 170, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 171, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 172, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 173, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r7b1 = b === d;
 >r7b1 : Symbol(r7b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 170, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 171, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 172, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 173, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r7b1 = b === e;
 >r7b1 : Symbol(r7b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 170, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 171, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 172, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 173, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r7c1 = c === a;
 >r7c1 : Symbol(r7c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 175, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 176, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 177, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 178, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r7c1 = c === b;
 >r7c1 : Symbol(r7c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 175, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 176, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 177, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 178, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r7c1 = c === d;
 >r7c1 : Symbol(r7c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 175, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 176, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 177, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 178, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r7c1 = c === e;
 >r7c1 : Symbol(r7c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 175, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 176, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 177, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 178, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r7d1 = d === a;
 >r7d1 : Symbol(r7d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 180, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 181, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 182, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 183, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r7d1 = d === b;
 >r7d1 : Symbol(r7d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 180, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 181, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 182, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 183, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r7d1 = d === c;
 >r7d1 : Symbol(r7d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 180, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 181, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 182, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 183, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r7d1 = d === e;
 >r7d1 : Symbol(r7d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 180, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 181, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 182, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 183, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r7e1 = e === a; // no error, expected
 >r7e1 : Symbol(r7e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 185, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 186, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 187, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 188, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r7e1 = e === b;
 >r7e1 : Symbol(r7e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 185, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 186, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 187, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 188, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r7e1 = e === c;
 >r7e1 : Symbol(r7e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 185, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 186, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 187, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 188, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r7e1 = e === d;
 >r7e1 : Symbol(r7e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 185, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 186, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 187, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 188, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 // operator !==
 var r8a1 = a !== b;
 >r8a1 : Symbol(r8a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 191, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 192, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 193, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 194, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r8a1 = a !== c;
 >r8a1 : Symbol(r8a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 191, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 192, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 193, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 194, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r8a1 = a !== d;
 >r8a1 : Symbol(r8a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 191, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 192, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 193, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 194, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r8a1 = a !== e; // no error, expected
 >r8a1 : Symbol(r8a1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 191, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 192, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 193, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 194, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r8b1 = b !== a;
 >r8b1 : Symbol(r8b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 196, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 197, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 198, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 199, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r8b1 = b !== c;
 >r8b1 : Symbol(r8b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 196, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 197, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 198, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 199, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r8b1 = b !== d;
 >r8b1 : Symbol(r8b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 196, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 197, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 198, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 199, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r8b1 = b !== e;
 >r8b1 : Symbol(r8b1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 196, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 197, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 198, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 199, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r8c1 = c !== a;
 >r8c1 : Symbol(r8c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 201, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 202, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 203, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 204, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r8c1 = c !== b;
 >r8c1 : Symbol(r8c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 201, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 202, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 203, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 204, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r8c1 = c !== d;
 >r8c1 : Symbol(r8c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 201, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 202, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 203, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 204, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
 var r8c1 = c !== e;
 >r8c1 : Symbol(r8c1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 201, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 202, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 203, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 204, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r8d1 = d !== a;
 >r8d1 : Symbol(r8d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 206, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 207, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 208, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 209, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r8d1 = d !== b;
 >r8d1 : Symbol(r8d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 206, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 207, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 208, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 209, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r8d1 = d !== c;
 >r8d1 : Symbol(r8d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 206, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 207, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 208, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 209, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r8d1 = d !== e;
 >r8d1 : Symbol(r8d1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 206, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 207, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 208, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 209, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
 
 var r8e1 = e !== a; // no error, expected
 >r8e1 : Symbol(r8e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 211, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 212, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 213, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 214, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 2, 11))
 
 var r8e1 = e !== b;
 >r8e1 : Symbol(r8e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 211, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 212, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 213, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 214, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 3, 11))
 
 var r8e1 = e !== c;
 >r8e1 : Symbol(r8e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 211, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 212, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 213, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 214, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 4, 11))
 
 var r8e1 = e !== d;
 >r8e1 : Symbol(r8e1, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 211, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 212, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 213, 3), Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 214, 3))
->e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 3))
->d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 6, 11))
+>d : Symbol(d, Decl(comparisonOperatorWithNoRelationshipPrimitiveType.ts, 5, 11))
 
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.types
index f6221230ef2b7..6bc8f9c8f34aa 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.types
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.types
@@ -11,23 +11,23 @@ enum E { a, b, c }
 >c : E.c
 >  : ^^^
 
-var a: number;
+declare var a: number;
 >a : number
 >  : ^^^^^^
 
-var b: boolean;
+declare var b: boolean;
 >b : boolean
 >  : ^^^^^^^
 
-var c: string;
+declare var c: string;
 >c : string
 >  : ^^^^^^
 
-var d: void;
+declare var d: void;
 >d : void
 >  : ^^^^
 
-var e: E;
+declare var e: E;
 >e : E
 >  : ^
 
diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.errors.txt b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.errors.txt
index 41744a63d80c4..722c8cb357405 100644
--- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.errors.txt
+++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.errors.txt
@@ -103,13 +103,13 @@ comparisonOperatorWithOneOperandIsNull.ts(97,17): error TS18050: The value 'null
         var foo_r8 = null !== t;
     }
     
-    var a: boolean;
-    var b: number;
-    var c: string;
-    var d: void;
-    var e: E;
-    var f: {};
-    var g: string[];
+    declare var a: boolean;
+    declare var b: number;
+    declare var c: string;
+    declare var d: void;
+    declare var e: E;
+    declare var f: {};
+    declare var g: string[];
     
     // operator <
     var r1a1 = null < a;
diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.js b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.js
index 090a93d43fea3..7ca172c4cd1eb 100644
--- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.js
+++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.js
@@ -23,13 +23,13 @@ function foo<T>(t: T) {
     var foo_r8 = null !== t;
 }
 
-var a: boolean;
-var b: number;
-var c: string;
-var d: void;
-var e: E;
-var f: {};
-var g: string[];
+declare var a: boolean;
+declare var b: number;
+declare var c: string;
+declare var d: void;
+declare var e: E;
+declare var f: {};
+declare var g: string[];
 
 // operator <
 var r1a1 = null < a;
@@ -192,13 +192,6 @@ function foo(t) {
     var foo_r7 = null === t;
     var foo_r8 = null !== t;
 }
-var a;
-var b;
-var c;
-var d;
-var e;
-var f;
-var g;
 // operator <
 var r1a1 = null < a;
 var r1a2 = null < b;
diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.symbols b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.symbols
index 26a00173a28e3..da7901474d2dc 100644
--- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.symbols
@@ -78,481 +78,481 @@ function foo<T>(t: T) {
 >t : Symbol(t, Decl(comparisonOperatorWithOneOperandIsNull.ts, 2, 16))
 }
 
-var a: boolean;
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+declare var a: boolean;
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
-var b: number;
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+declare var b: number;
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
-var c: string;
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+declare var c: string;
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
-var d: void;
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+declare var d: void;
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
-var e: E;
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+declare var e: E;
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 >E : Symbol(E, Decl(comparisonOperatorWithOneOperandIsNull.ts, 0, 0))
 
-var f: {};
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+declare var f: {};
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
-var g: string[];
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+declare var g: string[];
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 // operator <
 var r1a1 = null < a;
 >r1a1 : Symbol(r1a1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 31, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r1a2 = null < b;
 >r1a2 : Symbol(r1a2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 32, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r1a3 = null < c;
 >r1a3 : Symbol(r1a3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 33, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r1a4 = null < d;
 >r1a4 : Symbol(r1a4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 34, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r1a5 = null < e;
 >r1a5 : Symbol(r1a5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 35, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r1a6 = null < f;
 >r1a6 : Symbol(r1a6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 36, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r1a7 = null < g;
 >r1a7 : Symbol(r1a7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 37, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 var r1b1 = a < null;
 >r1b1 : Symbol(r1b1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 39, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r1b2 = b < null;
 >r1b2 : Symbol(r1b2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 40, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r1b3 = c < null;
 >r1b3 : Symbol(r1b3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 41, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r1b4 = d < null;
 >r1b4 : Symbol(r1b4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 42, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r1b5 = e < null;
 >r1b5 : Symbol(r1b5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 43, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r1b6 = f < null;
 >r1b6 : Symbol(r1b6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 44, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r1b7 = g < null;
 >r1b7 : Symbol(r1b7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 45, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 // operator >
 var r2a1 = null > a;
 >r2a1 : Symbol(r2a1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 48, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r2a2 = null > b;
 >r2a2 : Symbol(r2a2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 49, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r2a3 = null > c;
 >r2a3 : Symbol(r2a3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 50, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r2a4 = null > d;
 >r2a4 : Symbol(r2a4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 51, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r2a5 = null > e;
 >r2a5 : Symbol(r2a5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 52, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r2a6 = null > f;
 >r2a6 : Symbol(r2a6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 53, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r2a7 = null > g;
 >r2a7 : Symbol(r2a7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 54, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 var r2b1 = a > null;
 >r2b1 : Symbol(r2b1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 56, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r2b2 = b > null;
 >r2b2 : Symbol(r2b2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 57, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r2b3 = c > null;
 >r2b3 : Symbol(r2b3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 58, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r2b4 = d > null;
 >r2b4 : Symbol(r2b4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 59, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r2b5 = e > null;
 >r2b5 : Symbol(r2b5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 60, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r2b6 = f > null;
 >r2b6 : Symbol(r2b6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 61, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r2b7 = g > null;
 >r2b7 : Symbol(r2b7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 62, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 // operator <=
 var r3a1 = null <= a;
 >r3a1 : Symbol(r3a1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 65, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r3a2 = null <= b;
 >r3a2 : Symbol(r3a2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 66, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r3a3 = null <= c;
 >r3a3 : Symbol(r3a3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 67, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r3a4 = null <= d;
 >r3a4 : Symbol(r3a4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 68, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r3a5 = null <= e;
 >r3a5 : Symbol(r3a5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 69, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r3a6 = null <= f;
 >r3a6 : Symbol(r3a6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 70, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r3a7 = null <= g;
 >r3a7 : Symbol(r3a7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 71, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 var r3b1 = a <= null;
 >r3b1 : Symbol(r3b1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 73, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r3b2 = b <= null;
 >r3b2 : Symbol(r3b2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 74, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r3b3 = c <= null;
 >r3b3 : Symbol(r3b3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 75, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r3b4 = d <= null;
 >r3b4 : Symbol(r3b4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 76, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r3b5 = e <= null;
 >r3b5 : Symbol(r3b5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 77, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r3b6 = f <= null;
 >r3b6 : Symbol(r3b6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 78, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r3b7 = g <= null;
 >r3b7 : Symbol(r3b7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 79, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 // operator >=
 var r4a1 = null >= a;
 >r4a1 : Symbol(r4a1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 82, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r4a2 = null >= b;
 >r4a2 : Symbol(r4a2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 83, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r4a3 = null >= c;
 >r4a3 : Symbol(r4a3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 84, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r4a4 = null >= d;
 >r4a4 : Symbol(r4a4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 85, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r4a5 = null >= e;
 >r4a5 : Symbol(r4a5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 86, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r4a6 = null >= f;
 >r4a6 : Symbol(r4a6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 87, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r4a7 = null >= g;
 >r4a7 : Symbol(r4a7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 88, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 var r4b1 = a >= null;
 >r4b1 : Symbol(r4b1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 90, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r4b2 = b >= null;
 >r4b2 : Symbol(r4b2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 91, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r4b3 = c >= null;
 >r4b3 : Symbol(r4b3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 92, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r4b4 = d >= null;
 >r4b4 : Symbol(r4b4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 93, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r4b5 = e >= null;
 >r4b5 : Symbol(r4b5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 94, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r4b6 = f >= null;
 >r4b6 : Symbol(r4b6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 95, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r4b7 = g >= null;
 >r4b7 : Symbol(r4b7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 96, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 // operator ==
 var r5a1 = null == a;
 >r5a1 : Symbol(r5a1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 99, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r5a2 = null == b;
 >r5a2 : Symbol(r5a2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 100, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r5a3 = null == c;
 >r5a3 : Symbol(r5a3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 101, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r5a4 = null == d;
 >r5a4 : Symbol(r5a4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 102, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r5a5 = null == e;
 >r5a5 : Symbol(r5a5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 103, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r5a6 = null == f;
 >r5a6 : Symbol(r5a6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 104, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r5a7 = null == g;
 >r5a7 : Symbol(r5a7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 105, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 var r5b1 = a == null;
 >r5b1 : Symbol(r5b1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 107, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r5b2 = b == null;
 >r5b2 : Symbol(r5b2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 108, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r5b3 = c == null;
 >r5b3 : Symbol(r5b3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 109, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r5b4 = d == null;
 >r5b4 : Symbol(r5b4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 110, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r5b5 = e == null;
 >r5b5 : Symbol(r5b5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 111, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r5b6 = f == null;
 >r5b6 : Symbol(r5b6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 112, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r5b7 = g == null;
 >r5b7 : Symbol(r5b7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 113, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 // operator !=
 var r6a1 = null != a;
 >r6a1 : Symbol(r6a1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 116, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r6a2 = null != b;
 >r6a2 : Symbol(r6a2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 117, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r6a3 = null != c;
 >r6a3 : Symbol(r6a3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 118, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r6a4 = null != d;
 >r6a4 : Symbol(r6a4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 119, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r6a5 = null != e;
 >r6a5 : Symbol(r6a5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 120, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r6a6 = null != f;
 >r6a6 : Symbol(r6a6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 121, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r6a7 = null != g;
 >r6a7 : Symbol(r6a7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 122, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 var r6b1 = a != null;
 >r6b1 : Symbol(r6b1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 124, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r6b2 = b != null;
 >r6b2 : Symbol(r6b2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 125, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r6b3 = c != null;
 >r6b3 : Symbol(r6b3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 126, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r6b4 = d != null;
 >r6b4 : Symbol(r6b4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 127, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r6b5 = e != null;
 >r6b5 : Symbol(r6b5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 128, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r6b6 = f != null;
 >r6b6 : Symbol(r6b6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 129, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r6b7 = g != null;
 >r6b7 : Symbol(r6b7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 130, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 // operator ===
 var r7a1 = null === a;
 >r7a1 : Symbol(r7a1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 133, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r7a2 = null === b;
 >r7a2 : Symbol(r7a2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 134, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r7a3 = null === c;
 >r7a3 : Symbol(r7a3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 135, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r7a4 = null === d;
 >r7a4 : Symbol(r7a4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 136, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r7a5 = null === e;
 >r7a5 : Symbol(r7a5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 137, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r7a6 = null === f;
 >r7a6 : Symbol(r7a6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 138, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r7a7 = null === g;
 >r7a7 : Symbol(r7a7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 139, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 var r7b1 = a === null;
 >r7b1 : Symbol(r7b1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 141, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r7b2 = b === null;
 >r7b2 : Symbol(r7b2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 142, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r7b3 = c === null;
 >r7b3 : Symbol(r7b3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 143, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r7b4 = d === null;
 >r7b4 : Symbol(r7b4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 144, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r7b5 = e === null;
 >r7b5 : Symbol(r7b5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 145, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r7b6 = f === null;
 >r7b6 : Symbol(r7b6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 146, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r7b7 = g === null;
 >r7b7 : Symbol(r7b7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 147, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 // operator !==
 var r8a1 = null !== a;
 >r8a1 : Symbol(r8a1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 150, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r8a2 = null !== b;
 >r8a2 : Symbol(r8a2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 151, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r8a3 = null !== c;
 >r8a3 : Symbol(r8a3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 152, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r8a4 = null !== d;
 >r8a4 : Symbol(r8a4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 153, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r8a5 = null !== e;
 >r8a5 : Symbol(r8a5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 154, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r8a6 = null !== f;
 >r8a6 : Symbol(r8a6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 155, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r8a7 = null !== g;
 >r8a7 : Symbol(r8a7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 156, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
 var r8b1 = a !== null;
 >r8b1 : Symbol(r8b1, Decl(comparisonOperatorWithOneOperandIsNull.ts, 158, 3))
->a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 3))
+>a : Symbol(a, Decl(comparisonOperatorWithOneOperandIsNull.ts, 22, 11))
 
 var r8b2 = b !== null;
 >r8b2 : Symbol(r8b2, Decl(comparisonOperatorWithOneOperandIsNull.ts, 159, 3))
->b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 3))
+>b : Symbol(b, Decl(comparisonOperatorWithOneOperandIsNull.ts, 23, 11))
 
 var r8b3 = c !== null;
 >r8b3 : Symbol(r8b3, Decl(comparisonOperatorWithOneOperandIsNull.ts, 160, 3))
->c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 3))
+>c : Symbol(c, Decl(comparisonOperatorWithOneOperandIsNull.ts, 24, 11))
 
 var r8b4 = d !== null;
 >r8b4 : Symbol(r8b4, Decl(comparisonOperatorWithOneOperandIsNull.ts, 161, 3))
->d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 3))
+>d : Symbol(d, Decl(comparisonOperatorWithOneOperandIsNull.ts, 25, 11))
 
 var r8b5 = e !== null;
 >r8b5 : Symbol(r8b5, Decl(comparisonOperatorWithOneOperandIsNull.ts, 162, 3))
->e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 3))
+>e : Symbol(e, Decl(comparisonOperatorWithOneOperandIsNull.ts, 26, 11))
 
 var r8b6 = f !== null;
 >r8b6 : Symbol(r8b6, Decl(comparisonOperatorWithOneOperandIsNull.ts, 163, 3))
->f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 3))
+>f : Symbol(f, Decl(comparisonOperatorWithOneOperandIsNull.ts, 27, 11))
 
 var r8b7 = g !== null;
 >r8b7 : Symbol(r8b7, Decl(comparisonOperatorWithOneOperandIsNull.ts, 164, 3))
->g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 3))
+>g : Symbol(g, Decl(comparisonOperatorWithOneOperandIsNull.ts, 28, 11))
 
diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types
index 64f1f9d69b7cc..530262ffbf081 100644
--- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types
+++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types
@@ -146,31 +146,31 @@ function foo<T>(t: T) {
 >  : ^
 }
 
-var a: boolean;
+declare var a: boolean;
 >a : boolean
 >  : ^^^^^^^
 
-var b: number;
+declare var b: number;
 >b : number
 >  : ^^^^^^
 
-var c: string;
+declare var c: string;
 >c : string
 >  : ^^^^^^
 
-var d: void;
+declare var d: void;
 >d : void
 >  : ^^^^
 
-var e: E;
+declare var e: E;
 >e : E
 >  : ^
 
-var f: {};
+declare var f: {};
 >f : {}
 >  : ^^
 
-var g: string[];
+declare var g: string[];
 >g : string[]
 >  : ^^^^^^^^
 
diff --git a/tests/baselines/reference/compilerOptionsOutAndNoEmit.errors.txt b/tests/baselines/reference/compilerOptionsOutAndNoEmit.errors.txt
new file mode 100644
index 0000000000000..0330a2f1a2816
--- /dev/null
+++ b/tests/baselines/reference/compilerOptionsOutAndNoEmit.errors.txt
@@ -0,0 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.ts (0 errors) ====
+    class c {
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/compilerOptionsOutFileAndNoEmit.errors.txt b/tests/baselines/reference/compilerOptionsOutFileAndNoEmit.errors.txt
new file mode 100644
index 0000000000000..0330a2f1a2816
--- /dev/null
+++ b/tests/baselines/reference/compilerOptionsOutFileAndNoEmit.errors.txt
@@ -0,0 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.ts (0 errors) ====
+    class c {
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/completionsStringMethods.baseline b/tests/baselines/reference/completionsStringMethods.baseline
index bf00835b43760..3935df481ea3b 100644
--- a/tests/baselines/reference/completionsStringMethods.baseline
+++ b/tests/baselines/reference/completionsStringMethods.baseline
@@ -1120,7 +1120,7 @@
                   "text": "searchValue",
                   "kind": "linkName",
                   "target": {
-                    "fileName": "lib.d.ts",
+                    "fileName": "/home/src/tslibs/TS/Lib/lib.es5.d.ts",
                     "textSpan": {
                       "start": "--",
                       "length": "--"
@@ -1143,7 +1143,7 @@
                   "text": "searchValue",
                   "kind": "linkName",
                   "target": {
-                    "fileName": "lib.d.ts",
+                    "fileName": "/home/src/tslibs/TS/Lib/lib.es5.d.ts",
                     "textSpan": {
                       "start": "--",
                       "length": "--"
diff --git a/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.errors.txt b/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.errors.txt
index 88fc3332812ff..38ebd30e53539 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.errors.txt
+++ b/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.errors.txt
@@ -7,10 +7,10 @@ compoundAdditionAssignmentLHSCanBeAssigned.ts(40,1): error TS2365: Operator '+='
 ==== compoundAdditionAssignmentLHSCanBeAssigned.ts (4 errors) ====
     enum E { a, b }
     
-    var a: any;
-    var b: void;
+    declare var a: any;
+    declare var b: void;
     
-    var x1: any;
+    declare var x1: any;
     x1 += a;
     x1 += b;
     x1 += true;
@@ -21,7 +21,7 @@ compoundAdditionAssignmentLHSCanBeAssigned.ts(40,1): error TS2365: Operator '+='
     x1 += null;
     x1 += undefined;
     
-    var x2: string;
+    declare var x2: string;
     x2 += a;
     x2 += b;
     x2 += true;
@@ -32,7 +32,7 @@ compoundAdditionAssignmentLHSCanBeAssigned.ts(40,1): error TS2365: Operator '+='
     x2 += null;
     x2 += undefined;
     
-    var x3: number;
+    declare var x3: number;
     x3 += a;
     x3 += 0;
     x3 += E.a;
@@ -43,7 +43,7 @@ compoundAdditionAssignmentLHSCanBeAssigned.ts(40,1): error TS2365: Operator '+='
     ~~~~~~~~~~~~~~~
 !!! error TS2365: Operator '+=' cannot be applied to types 'number' and 'undefined'.
     
-    var x4: E;
+    declare var x4: E;
     x4 += a;
     x4 += 0;
     x4 += E.a;
@@ -54,12 +54,12 @@ compoundAdditionAssignmentLHSCanBeAssigned.ts(40,1): error TS2365: Operator '+='
     ~~~~~~~~~~~~~~~
 !!! error TS2365: Operator '+=' cannot be applied to types 'E' and 'undefined'.
     
-    var x5: boolean;
+    declare var x5: boolean;
     x5 += a;
     
-    var x6: {};
+    declare var x6: {};
     x6 += a;
     x6 += '';
     
-    var x7: void;
+    declare var x7: void;
     x7 += a;
\ No newline at end of file
diff --git a/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.js b/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.js
index c9364268cd5f1..6e1cdb2348145 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.js
+++ b/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.js
@@ -3,10 +3,10 @@
 //// [compoundAdditionAssignmentLHSCanBeAssigned.ts]
 enum E { a, b }
 
-var a: any;
-var b: void;
+declare var a: any;
+declare var b: void;
 
-var x1: any;
+declare var x1: any;
 x1 += a;
 x1 += b;
 x1 += true;
@@ -17,7 +17,7 @@ x1 += {};
 x1 += null;
 x1 += undefined;
 
-var x2: string;
+declare var x2: string;
 x2 += a;
 x2 += b;
 x2 += true;
@@ -28,28 +28,28 @@ x2 += {};
 x2 += null;
 x2 += undefined;
 
-var x3: number;
+declare var x3: number;
 x3 += a;
 x3 += 0;
 x3 += E.a;
 x3 += null;
 x3 += undefined;
 
-var x4: E;
+declare var x4: E;
 x4 += a;
 x4 += 0;
 x4 += E.a;
 x4 += null;
 x4 += undefined;
 
-var x5: boolean;
+declare var x5: boolean;
 x5 += a;
 
-var x6: {};
+declare var x6: {};
 x6 += a;
 x6 += '';
 
-var x7: void;
+declare var x7: void;
 x7 += a;
 
 //// [compoundAdditionAssignmentLHSCanBeAssigned.js]
@@ -58,9 +58,6 @@ var E;
     E[E["a"] = 0] = "a";
     E[E["b"] = 1] = "b";
 })(E || (E = {}));
-var a;
-var b;
-var x1;
 x1 += a;
 x1 += b;
 x1 += true;
@@ -70,7 +67,6 @@ x1 += E.a;
 x1 += {};
 x1 += null;
 x1 += undefined;
-var x2;
 x2 += a;
 x2 += b;
 x2 += true;
@@ -80,22 +76,17 @@ x2 += E.a;
 x2 += {};
 x2 += null;
 x2 += undefined;
-var x3;
 x3 += a;
 x3 += 0;
 x3 += E.a;
 x3 += null;
 x3 += undefined;
-var x4;
 x4 += a;
 x4 += 0;
 x4 += E.a;
 x4 += null;
 x4 += undefined;
-var x5;
 x5 += a;
-var x6;
 x6 += a;
 x6 += '';
-var x7;
 x7 += a;
diff --git a/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.symbols b/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.symbols
index 340c20b0b6a58..686f8072cdfbd 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.symbols
+++ b/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.symbols
@@ -6,152 +6,152 @@ enum E { a, b }
 >a : Symbol(E.a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 0, 8))
 >b : Symbol(E.b, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 0, 11))
 
-var a: any;
->a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 3))
+declare var a: any;
+>a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 11))
 
-var b: void;
->b : Symbol(b, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 3, 3))
+declare var b: void;
+>b : Symbol(b, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 3, 11))
 
-var x1: any;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 3))
+declare var x1: any;
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 11))
 
 x1 += a;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 3))
->a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 11))
+>a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 11))
 
 x1 += b;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 3))
->b : Symbol(b, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 3, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 11))
+>b : Symbol(b, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 3, 11))
 
 x1 += true;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 11))
 
 x1 += 0;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 11))
 
 x1 += '';
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 11))
 
 x1 += E.a;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 11))
 >E.a : Symbol(E.a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 0, 8))
 >E : Symbol(E, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 0, 0))
 >a : Symbol(E.a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 0, 8))
 
 x1 += {};
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 11))
 
 x1 += null;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 11))
 
 x1 += undefined;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 5, 11))
 >undefined : Symbol(undefined)
 
-var x2: string;
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 3))
+declare var x2: string;
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 11))
 
 x2 += a;
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 3))
->a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 11))
+>a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 11))
 
 x2 += b;
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 3))
->b : Symbol(b, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 3, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 11))
+>b : Symbol(b, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 3, 11))
 
 x2 += true;
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 11))
 
 x2 += 0;
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 11))
 
 x2 += '';
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 11))
 
 x2 += E.a;
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 11))
 >E.a : Symbol(E.a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 0, 8))
 >E : Symbol(E, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 0, 0))
 >a : Symbol(E.a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 0, 8))
 
 x2 += {};
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 11))
 
 x2 += null;
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 11))
 
 x2 += undefined;
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 16, 11))
 >undefined : Symbol(undefined)
 
-var x3: number;
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 27, 3))
+declare var x3: number;
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 27, 11))
 
 x3 += a;
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 27, 3))
->a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 3))
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 27, 11))
+>a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 11))
 
 x3 += 0;
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 27, 11))
 
 x3 += E.a;
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 27, 11))
 >E.a : Symbol(E.a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 0, 8))
 >E : Symbol(E, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 0, 0))
 >a : Symbol(E.a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 0, 8))
 
 x3 += null;
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 27, 11))
 
 x3 += undefined;
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 27, 11))
 >undefined : Symbol(undefined)
 
-var x4: E;
->x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 34, 3))
+declare var x4: E;
+>x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 34, 11))
 >E : Symbol(E, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 0, 0))
 
 x4 += a;
->x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 34, 3))
->a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 3))
+>x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 34, 11))
+>a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 11))
 
 x4 += 0;
->x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 34, 3))
+>x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 34, 11))
 
 x4 += E.a;
->x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 34, 3))
+>x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 34, 11))
 >E.a : Symbol(E.a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 0, 8))
 >E : Symbol(E, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 0, 0))
 >a : Symbol(E.a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 0, 8))
 
 x4 += null;
->x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 34, 3))
+>x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 34, 11))
 
 x4 += undefined;
->x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 34, 3))
+>x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 34, 11))
 >undefined : Symbol(undefined)
 
-var x5: boolean;
->x5 : Symbol(x5, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 41, 3))
+declare var x5: boolean;
+>x5 : Symbol(x5, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 41, 11))
 
 x5 += a;
->x5 : Symbol(x5, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 41, 3))
->a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 3))
+>x5 : Symbol(x5, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 41, 11))
+>a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 11))
 
-var x6: {};
->x6 : Symbol(x6, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 44, 3))
+declare var x6: {};
+>x6 : Symbol(x6, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 44, 11))
 
 x6 += a;
->x6 : Symbol(x6, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 44, 3))
->a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 3))
+>x6 : Symbol(x6, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 44, 11))
+>a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 11))
 
 x6 += '';
->x6 : Symbol(x6, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 44, 3))
+>x6 : Symbol(x6, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 44, 11))
 
-var x7: void;
->x7 : Symbol(x7, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 48, 3))
+declare var x7: void;
+>x7 : Symbol(x7, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 48, 11))
 
 x7 += a;
->x7 : Symbol(x7, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 48, 3))
->a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 3))
+>x7 : Symbol(x7, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 48, 11))
+>a : Symbol(a, Decl(compoundAdditionAssignmentLHSCanBeAssigned.ts, 2, 11))
 
diff --git a/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.types b/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.types
index 78b248167deb5..9d3be502a2c52 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.types
+++ b/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.types
@@ -9,15 +9,15 @@ enum E { a, b }
 >b : E.b
 >  : ^^^
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
-var b: void;
+declare var b: void;
 >b : void
 >  : ^^^^
 
-var x1: any;
+declare var x1: any;
 >x1 : any
 >   : ^^^
 
@@ -95,7 +95,7 @@ x1 += undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x2: string;
+declare var x2: string;
 >x2 : string
 >   : ^^^^^^
 
@@ -173,7 +173,7 @@ x2 += undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x3: number;
+declare var x3: number;
 >x3 : number
 >   : ^^^^^^
 
@@ -219,7 +219,7 @@ x3 += undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x4: E;
+declare var x4: E;
 >x4 : E
 >   : ^
 
@@ -265,7 +265,7 @@ x4 += undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x5: boolean;
+declare var x5: boolean;
 >x5 : boolean
 >   : ^^^^^^^
 
@@ -277,7 +277,7 @@ x5 += a;
 >a : any
 >  : ^^^
 
-var x6: {};
+declare var x6: {};
 >x6 : {}
 >   : ^^
 
@@ -297,7 +297,7 @@ x6 += '';
 >'' : ""
 >   : ^^
 
-var x7: void;
+declare var x7: void;
 >x7 : void
 >   : ^^^^
 
diff --git a/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.errors.txt b/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.errors.txt
index 98d788843874c..232100cc49eb6 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.errors.txt
+++ b/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.errors.txt
@@ -9,27 +9,27 @@ compoundAdditionAssignmentLHSCannotBeAssigned.ts(17,1): error TS2322: Type 'stri
     // string can add every type, and result string cannot be assigned to below types
     enum E { a, b, c }
     
-    var x1: boolean;
+    declare var x1: boolean;
     x1 += '';
     ~~
 !!! error TS2322: Type 'string' is not assignable to type 'boolean'.
     
-    var x2: number;
+    declare var x2: number;
     x2 += '';
     ~~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
     
-    var x3: E;
+    declare var x3: E;
     x3 += '';
     ~~
 !!! error TS2322: Type 'string' is not assignable to type 'E'.
     
-    var x4: {a: string};
+    declare var x4: {a: string};
     x4 += '';
     ~~
 !!! error TS2322: Type 'string' is not assignable to type '{ a: string; }'.
     
-    var x5: void;
+    declare var x5: void;
     x5 += '';
     ~~
 !!! error TS2322: Type 'string' is not assignable to type 'void'.
\ No newline at end of file
diff --git a/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.js b/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.js
index 9b6aa2d2afb53..4cb2a4fd99579 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.js
+++ b/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.js
@@ -4,19 +4,19 @@
 // string can add every type, and result string cannot be assigned to below types
 enum E { a, b, c }
 
-var x1: boolean;
+declare var x1: boolean;
 x1 += '';
 
-var x2: number;
+declare var x2: number;
 x2 += '';
 
-var x3: E;
+declare var x3: E;
 x3 += '';
 
-var x4: {a: string};
+declare var x4: {a: string};
 x4 += '';
 
-var x5: void;
+declare var x5: void;
 x5 += '';
 
 //// [compoundAdditionAssignmentLHSCannotBeAssigned.js]
@@ -27,13 +27,8 @@ var E;
     E[E["b"] = 1] = "b";
     E[E["c"] = 2] = "c";
 })(E || (E = {}));
-var x1;
 x1 += '';
-var x2;
 x2 += '';
-var x3;
 x3 += '';
-var x4;
 x4 += '';
-var x5;
 x5 += '';
diff --git a/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.symbols b/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.symbols
index 4960f57d8ddbe..7815ca6986da0 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.symbols
+++ b/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.symbols
@@ -8,35 +8,35 @@ enum E { a, b, c }
 >b : Symbol(E.b, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 1, 11))
 >c : Symbol(E.c, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 1, 14))
 
-var x1: boolean;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 3, 3))
+declare var x1: boolean;
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 3, 11))
 
 x1 += '';
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 3, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 3, 11))
 
-var x2: number;
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 6, 3))
+declare var x2: number;
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 6, 11))
 
 x2 += '';
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 6, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 6, 11))
 
-var x3: E;
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 9, 3))
+declare var x3: E;
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 9, 11))
 >E : Symbol(E, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 0, 0))
 
 x3 += '';
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 9, 3))
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 9, 11))
 
-var x4: {a: string};
->x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 12, 3))
->a : Symbol(a, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 12, 9))
+declare var x4: {a: string};
+>x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 12, 11))
+>a : Symbol(a, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 12, 17))
 
 x4 += '';
->x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 12, 3))
+>x4 : Symbol(x4, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 12, 11))
 
-var x5: void;
->x5 : Symbol(x5, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 15, 3))
+declare var x5: void;
+>x5 : Symbol(x5, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 15, 11))
 
 x5 += '';
->x5 : Symbol(x5, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 15, 3))
+>x5 : Symbol(x5, Decl(compoundAdditionAssignmentLHSCannotBeAssigned.ts, 15, 11))
 
diff --git a/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.types b/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.types
index 75206941990c4..cc538c9c64cc2 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.types
+++ b/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.types
@@ -12,7 +12,7 @@ enum E { a, b, c }
 >c : E.c
 >  : ^^^
 
-var x1: boolean;
+declare var x1: boolean;
 >x1 : boolean
 >   : ^^^^^^^
 
@@ -24,7 +24,7 @@ x1 += '';
 >'' : ""
 >   : ^^
 
-var x2: number;
+declare var x2: number;
 >x2 : number
 >   : ^^^^^^
 
@@ -36,7 +36,7 @@ x2 += '';
 >'' : ""
 >   : ^^
 
-var x3: E;
+declare var x3: E;
 >x3 : E
 >   : ^
 
@@ -48,7 +48,7 @@ x3 += '';
 >'' : ""
 >   : ^^
 
-var x4: {a: string};
+declare var x4: {a: string};
 >x4 : { a: string; }
 >   : ^^^^^      ^^^
 >a : string
@@ -62,7 +62,7 @@ x4 += '';
 >'' : ""
 >   : ^^
 
-var x5: void;
+declare var x5: void;
 >x5 : void
 >   : ^^^^
 
diff --git a/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.errors.txt b/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.errors.txt
index b7251a5563792..50ca18d2c1184 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.errors.txt
+++ b/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.errors.txt
@@ -30,9 +30,9 @@ compoundAdditionAssignmentWithInvalidOperands.ts(40,1): error TS2365: Operator '
 ==== compoundAdditionAssignmentWithInvalidOperands.ts (27 errors) ====
     enum E { a, b }
     
-    var a: void;
+    declare var a: void;
     
-    var x1: boolean;
+    declare var x1: boolean;
     x1 += a;
     ~~~~~~~
 !!! error TS2365: Operator '+=' cannot be applied to types 'boolean' and 'void'.
@@ -55,7 +55,7 @@ compoundAdditionAssignmentWithInvalidOperands.ts(40,1): error TS2365: Operator '
     ~~~~~~~~~~~~~~~
 !!! error TS2365: Operator '+=' cannot be applied to types 'boolean' and 'undefined'.
     
-    var x2: {};
+    declare var x2: {};
     x2 += a;
     ~~~~~~~
 !!! error TS2365: Operator '+=' cannot be applied to types '{}' and 'void'.
@@ -78,7 +78,7 @@ compoundAdditionAssignmentWithInvalidOperands.ts(40,1): error TS2365: Operator '
     ~~~~~~~~~~~~~~~
 !!! error TS2365: Operator '+=' cannot be applied to types '{}' and 'undefined'.
     
-    var x3: void;
+    declare var x3: void;
     x3 += a;
     ~~~~~~~
 !!! error TS2365: Operator '+=' cannot be applied to types 'void' and 'void'.
@@ -101,7 +101,7 @@ compoundAdditionAssignmentWithInvalidOperands.ts(40,1): error TS2365: Operator '
     ~~~~~~~~~~~~~~~
 !!! error TS2365: Operator '+=' cannot be applied to types 'void' and 'undefined'.
     
-    var x4: number;
+    declare var x4: number;
     x4 += a;
     ~~~~~~~
 !!! error TS2365: Operator '+=' cannot be applied to types 'number' and 'void'.
@@ -112,7 +112,7 @@ compoundAdditionAssignmentWithInvalidOperands.ts(40,1): error TS2365: Operator '
     ~~~~~~~~
 !!! error TS2365: Operator '+=' cannot be applied to types 'number' and '{}'.
     
-    var x5: E;
+    declare var x5: E;
     x5 += a;
     ~~~~~~~
 !!! error TS2365: Operator '+=' cannot be applied to types 'E' and 'void'.
diff --git a/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.js b/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.js
index 018505f533d33..4227fc1bd64f3 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.js
+++ b/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.js
@@ -3,9 +3,9 @@
 //// [compoundAdditionAssignmentWithInvalidOperands.ts]
 enum E { a, b }
 
-var a: void;
+declare var a: void;
 
-var x1: boolean;
+declare var x1: boolean;
 x1 += a;
 x1 += true;
 x1 += 0;
@@ -14,7 +14,7 @@ x1 += {};
 x1 += null;
 x1 += undefined;
 
-var x2: {};
+declare var x2: {};
 x2 += a;
 x2 += true;
 x2 += 0;
@@ -23,7 +23,7 @@ x2 += {};
 x2 += null;
 x2 += undefined;
 
-var x3: void;
+declare var x3: void;
 x3 += a;
 x3 += true;
 x3 += 0;
@@ -32,12 +32,12 @@ x3 += {};
 x3 += null;
 x3 += undefined;
 
-var x4: number;
+declare var x4: number;
 x4 += a;
 x4 += true;
 x4 += {};
 
-var x5: E;
+declare var x5: E;
 x5 += a;
 x5 += true;
 x5 += {};
@@ -48,8 +48,6 @@ var E;
     E[E["a"] = 0] = "a";
     E[E["b"] = 1] = "b";
 })(E || (E = {}));
-var a;
-var x1;
 x1 += a;
 x1 += true;
 x1 += 0;
@@ -57,7 +55,6 @@ x1 += E.a;
 x1 += {};
 x1 += null;
 x1 += undefined;
-var x2;
 x2 += a;
 x2 += true;
 x2 += 0;
@@ -65,7 +62,6 @@ x2 += E.a;
 x2 += {};
 x2 += null;
 x2 += undefined;
-var x3;
 x3 += a;
 x3 += true;
 x3 += 0;
@@ -73,11 +69,9 @@ x3 += E.a;
 x3 += {};
 x3 += null;
 x3 += undefined;
-var x4;
 x4 += a;
 x4 += true;
 x4 += {};
-var x5;
 x5 += a;
 x5 += true;
 x5 += {};
diff --git a/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.symbols b/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.symbols
index 7e5e40b805566..4f1f05c368e39 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.symbols
+++ b/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.symbols
@@ -6,120 +6,120 @@ enum E { a, b }
 >a : Symbol(E.a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 0, 8))
 >b : Symbol(E.b, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 0, 11))
 
-var a: void;
->a : Symbol(a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 2, 3))
+declare var a: void;
+>a : Symbol(a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 2, 11))
 
-var x1: boolean;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 3))
+declare var x1: boolean;
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 11))
 
 x1 += a;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 3))
->a : Symbol(a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 2, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 11))
+>a : Symbol(a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 2, 11))
 
 x1 += true;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 11))
 
 x1 += 0;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 11))
 
 x1 += E.a;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 11))
 >E.a : Symbol(E.a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 0, 8))
 >E : Symbol(E, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 0, 8))
 
 x1 += {};
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 11))
 
 x1 += null;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 11))
 
 x1 += undefined;
->x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 3))
+>x1 : Symbol(x1, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 4, 11))
 >undefined : Symbol(undefined)
 
-var x2: {};
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 3))
+declare var x2: {};
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 11))
 
 x2 += a;
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 3))
->a : Symbol(a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 2, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 11))
+>a : Symbol(a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 2, 11))
 
 x2 += true;
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 11))
 
 x2 += 0;
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 11))
 
 x2 += E.a;
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 11))
 >E.a : Symbol(E.a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 0, 8))
 >E : Symbol(E, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 0, 8))
 
 x2 += {};
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 11))
 
 x2 += null;
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 11))
 
 x2 += undefined;
->x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 3))
+>x2 : Symbol(x2, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 13, 11))
 >undefined : Symbol(undefined)
 
-var x3: void;
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 3))
+declare var x3: void;
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 11))
 
 x3 += a;
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 3))
->a : Symbol(a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 2, 3))
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 11))
+>a : Symbol(a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 2, 11))
 
 x3 += true;
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 3))
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 11))
 
 x3 += 0;
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 3))
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 11))
 
 x3 += E.a;
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 3))
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 11))
 >E.a : Symbol(E.a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 0, 8))
 >E : Symbol(E, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 0, 8))
 
 x3 += {};
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 3))
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 11))
 
 x3 += null;
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 3))
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 11))
 
 x3 += undefined;
->x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 3))
+>x3 : Symbol(x3, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 22, 11))
 >undefined : Symbol(undefined)
 
-var x4: number;
->x4 : Symbol(x4, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 31, 3))
+declare var x4: number;
+>x4 : Symbol(x4, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 31, 11))
 
 x4 += a;
->x4 : Symbol(x4, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 31, 3))
->a : Symbol(a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 2, 3))
+>x4 : Symbol(x4, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 31, 11))
+>a : Symbol(a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 2, 11))
 
 x4 += true;
->x4 : Symbol(x4, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 31, 3))
+>x4 : Symbol(x4, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 31, 11))
 
 x4 += {};
->x4 : Symbol(x4, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 31, 3))
+>x4 : Symbol(x4, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 31, 11))
 
-var x5: E;
->x5 : Symbol(x5, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 36, 3))
+declare var x5: E;
+>x5 : Symbol(x5, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 36, 11))
 >E : Symbol(E, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 0, 0))
 
 x5 += a;
->x5 : Symbol(x5, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 36, 3))
->a : Symbol(a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 2, 3))
+>x5 : Symbol(x5, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 36, 11))
+>a : Symbol(a, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 2, 11))
 
 x5 += true;
->x5 : Symbol(x5, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 36, 3))
+>x5 : Symbol(x5, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 36, 11))
 
 x5 += {};
->x5 : Symbol(x5, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 36, 3))
+>x5 : Symbol(x5, Decl(compoundAdditionAssignmentWithInvalidOperands.ts, 36, 11))
 
diff --git a/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.types b/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.types
index dc8d0de5b7d6c..6a24495e697e1 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.types
+++ b/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.types
@@ -9,11 +9,11 @@ enum E { a, b }
 >b : E.b
 >  : ^^^
 
-var a: void;
+declare var a: void;
 >a : void
 >  : ^^^^
 
-var x1: boolean;
+declare var x1: boolean;
 >x1 : boolean
 >   : ^^^^^^^
 
@@ -75,7 +75,7 @@ x1 += undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x2: {};
+declare var x2: {};
 >x2 : {}
 >   : ^^
 
@@ -137,7 +137,7 @@ x2 += undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x3: void;
+declare var x3: void;
 >x3 : void
 >   : ^^^^
 
@@ -199,7 +199,7 @@ x3 += undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x4: number;
+declare var x4: number;
 >x4 : number
 >   : ^^^^^^
 
@@ -227,7 +227,7 @@ x4 += {};
 >{} : {}
 >   : ^^
 
-var x5: E;
+declare var x5: E;
 >x5 : E
 >   : ^
 
diff --git a/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.errors.txt b/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.errors.txt
index 9fd7e4521d14f..95560b14d1572 100644
--- a/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.errors.txt
+++ b/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.errors.txt
@@ -9,11 +9,11 @@ compoundArithmeticAssignmentLHSCanBeAssigned.ts(26,7): error TS18050: The value
 ==== compoundArithmeticAssignmentLHSCanBeAssigned.ts (6 errors) ====
     enum E { a, b, c }
     
-    var a: any;
-    var b: number;
-    var c: E;
+    declare var a: any;
+    declare var b: number;
+    declare var c: E;
     
-    var x1: any;
+    declare var x1: any;
     x1 *= a;
     x1 *= b;
     x1 *= c;
@@ -24,7 +24,7 @@ compoundArithmeticAssignmentLHSCanBeAssigned.ts(26,7): error TS18050: The value
           ~~~~~~~~~
 !!! error TS18050: The value 'undefined' cannot be used here.
     
-    var x2: number;
+    declare var x2: number;
     x2 *= a;
     x2 *= b;
     x2 *= c;
@@ -35,7 +35,7 @@ compoundArithmeticAssignmentLHSCanBeAssigned.ts(26,7): error TS18050: The value
           ~~~~~~~~~
 !!! error TS18050: The value 'undefined' cannot be used here.
     
-    var x3: E;
+    declare var x3: E;
     x3 *= a;
     x3 *= b;
     x3 *= c;
diff --git a/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.js b/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.js
index c452637cbad4d..0d234db3d1166 100644
--- a/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.js
+++ b/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.js
@@ -3,25 +3,25 @@
 //// [compoundArithmeticAssignmentLHSCanBeAssigned.ts]
 enum E { a, b, c }
 
-var a: any;
-var b: number;
-var c: E;
+declare var a: any;
+declare var b: number;
+declare var c: E;
 
-var x1: any;
+declare var x1: any;
 x1 *= a;
 x1 *= b;
 x1 *= c;
 x1 *= null;
 x1 *= undefined;
 
-var x2: number;
+declare var x2: number;
 x2 *= a;
 x2 *= b;
 x2 *= c;
 x2 *= null;
 x2 *= undefined;
 
-var x3: E;
+declare var x3: E;
 x3 *= a;
 x3 *= b;
 x3 *= c;
@@ -35,22 +35,16 @@ var E;
     E[E["b"] = 1] = "b";
     E[E["c"] = 2] = "c";
 })(E || (E = {}));
-var a;
-var b;
-var c;
-var x1;
 x1 *= a;
 x1 *= b;
 x1 *= c;
 x1 *= null;
 x1 *= undefined;
-var x2;
 x2 *= a;
 x2 *= b;
 x2 *= c;
 x2 *= null;
 x2 *= undefined;
-var x3;
 x3 *= a;
 x3 *= b;
 x3 *= c;
diff --git a/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.symbols b/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.symbols
index a873cdd3c5a3a..990a63e7b928e 100644
--- a/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.symbols
+++ b/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.symbols
@@ -7,80 +7,80 @@ enum E { a, b, c }
 >b : Symbol(E.b, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 0, 11))
 >c : Symbol(E.c, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 0, 14))
 
-var a: any;
->a : Symbol(a, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 2, 3))
+declare var a: any;
+>a : Symbol(a, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 2, 11))
 
-var b: number;
->b : Symbol(b, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 3, 3))
+declare var b: number;
+>b : Symbol(b, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 3, 11))
 
-var c: E;
->c : Symbol(c, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 4, 3))
+declare var c: E;
+>c : Symbol(c, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 4, 11))
 >E : Symbol(E, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 0, 0))
 
-var x1: any;
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 6, 3))
+declare var x1: any;
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 6, 11))
 
 x1 *= a;
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 6, 3))
->a : Symbol(a, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 2, 3))
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 6, 11))
+>a : Symbol(a, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 2, 11))
 
 x1 *= b;
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 6, 3))
->b : Symbol(b, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 3, 3))
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 6, 11))
+>b : Symbol(b, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 3, 11))
 
 x1 *= c;
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 6, 3))
->c : Symbol(c, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 4, 3))
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 6, 11))
+>c : Symbol(c, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 4, 11))
 
 x1 *= null;
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 6, 3))
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 6, 11))
 
 x1 *= undefined;
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 6, 3))
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 6, 11))
 >undefined : Symbol(undefined)
 
-var x2: number;
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 13, 3))
+declare var x2: number;
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 13, 11))
 
 x2 *= a;
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 13, 3))
->a : Symbol(a, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 2, 3))
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 13, 11))
+>a : Symbol(a, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 2, 11))
 
 x2 *= b;
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 13, 3))
->b : Symbol(b, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 3, 3))
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 13, 11))
+>b : Symbol(b, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 3, 11))
 
 x2 *= c;
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 13, 3))
->c : Symbol(c, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 4, 3))
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 13, 11))
+>c : Symbol(c, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 4, 11))
 
 x2 *= null;
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 13, 3))
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 13, 11))
 
 x2 *= undefined;
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 13, 3))
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 13, 11))
 >undefined : Symbol(undefined)
 
-var x3: E;
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 20, 3))
+declare var x3: E;
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 20, 11))
 >E : Symbol(E, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 0, 0))
 
 x3 *= a;
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 20, 3))
->a : Symbol(a, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 2, 3))
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 20, 11))
+>a : Symbol(a, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 2, 11))
 
 x3 *= b;
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 20, 3))
->b : Symbol(b, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 3, 3))
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 20, 11))
+>b : Symbol(b, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 3, 11))
 
 x3 *= c;
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 20, 3))
->c : Symbol(c, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 4, 3))
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 20, 11))
+>c : Symbol(c, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 4, 11))
 
 x3 *= null;
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 20, 3))
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 20, 11))
 
 x3 *= undefined;
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 20, 3))
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentLHSCanBeAssigned.ts, 20, 11))
 >undefined : Symbol(undefined)
 
diff --git a/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.types b/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.types
index f15df72fc1a44..f5065f5b4a52c 100644
--- a/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.types
+++ b/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.types
@@ -11,19 +11,19 @@ enum E { a, b, c }
 >c : E.c
 >  : ^^^
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
-var b: number;
+declare var b: number;
 >b : number
 >  : ^^^^^^
 
-var c: E;
+declare var c: E;
 >c : E
 >  : ^
 
-var x1: any;
+declare var x1: any;
 >x1 : any
 >   : ^^^
 
@@ -65,7 +65,7 @@ x1 *= undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x2: number;
+declare var x2: number;
 >x2 : number
 >   : ^^^^^^
 
@@ -107,7 +107,7 @@ x2 *= undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x3: E;
+declare var x3: E;
 >x3 : E
 >   : ^
 
diff --git a/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.errors.txt b/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.errors.txt
index f62aacce5461e..8c4943586beb5 100644
--- a/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.errors.txt
+++ b/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.errors.txt
@@ -71,10 +71,10 @@ compoundArithmeticAssignmentWithInvalidOperands.ts(60,7): error TS2363: The righ
 ==== compoundArithmeticAssignmentWithInvalidOperands.ts (68 errors) ====
     enum E { a, b }
     
-    var a: any;
-    var b: void;
+    declare var a: any;
+    declare var b: void;
     
-    var x1: boolean;
+    declare var x1: boolean;
     x1 *= a;
     ~~
 !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
@@ -115,7 +115,7 @@ compoundArithmeticAssignmentWithInvalidOperands.ts(60,7): error TS2363: The righ
           ~~~~~~~~~
 !!! error TS18050: The value 'undefined' cannot be used here.
     
-    var x2: string;
+    declare var x2: string;
     x2 *= a;
     ~~
 !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
@@ -156,7 +156,7 @@ compoundArithmeticAssignmentWithInvalidOperands.ts(60,7): error TS2363: The righ
           ~~~~~~~~~
 !!! error TS18050: The value 'undefined' cannot be used here.
     
-    var x3: {};
+    declare var x3: {};
     x3 *= a;
     ~~
 !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
@@ -197,7 +197,7 @@ compoundArithmeticAssignmentWithInvalidOperands.ts(60,7): error TS2363: The righ
           ~~~~~~~~~
 !!! error TS18050: The value 'undefined' cannot be used here.
     
-    var x4: void;
+    declare var x4: void;
     x4 *= a;
     ~~
 !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
@@ -238,7 +238,7 @@ compoundArithmeticAssignmentWithInvalidOperands.ts(60,7): error TS2363: The righ
           ~~~~~~~~~
 !!! error TS18050: The value 'undefined' cannot be used here.
     
-    var x5: number;
+    declare var x5: number;
     x5 *= b;
           ~
 !!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
@@ -252,7 +252,7 @@ compoundArithmeticAssignmentWithInvalidOperands.ts(60,7): error TS2363: The righ
           ~~
 !!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
     
-    var x6: E;
+    declare var x6: E;
     x6 *= b;
           ~
 !!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
diff --git a/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.js b/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.js
index 3246df78f5c7e..f63a4ecd520f4 100644
--- a/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.js
+++ b/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.js
@@ -3,10 +3,10 @@
 //// [compoundArithmeticAssignmentWithInvalidOperands.ts]
 enum E { a, b }
 
-var a: any;
-var b: void;
+declare var a: any;
+declare var b: void;
 
-var x1: boolean;
+declare var x1: boolean;
 x1 *= a;
 x1 *= b;
 x1 *= true;
@@ -17,7 +17,7 @@ x1 *= {};
 x1 *= null;
 x1 *= undefined;
 
-var x2: string;
+declare var x2: string;
 x2 *= a;
 x2 *= b;
 x2 *= true;
@@ -28,7 +28,7 @@ x2 *= {};
 x2 *= null;
 x2 *= undefined;
 
-var x3: {};
+declare var x3: {};
 x3 *= a;
 x3 *= b;
 x3 *= true;
@@ -39,7 +39,7 @@ x3 *= {};
 x3 *= null;
 x3 *= undefined;
 
-var x4: void;
+declare var x4: void;
 x4 *= a;
 x4 *= b;
 x4 *= true;
@@ -50,13 +50,13 @@ x4 *= {};
 x4 *= null;
 x4 *= undefined;
 
-var x5: number;
+declare var x5: number;
 x5 *= b;
 x5 *= true;
 x5 *= ''
 x5 *= {};
 
-var x6: E;
+declare var x6: E;
 x6 *= b;
 x6 *= true;
 x6 *= ''
@@ -68,9 +68,6 @@ var E;
     E[E["a"] = 0] = "a";
     E[E["b"] = 1] = "b";
 })(E || (E = {}));
-var a;
-var b;
-var x1;
 x1 *= a;
 x1 *= b;
 x1 *= true;
@@ -80,7 +77,6 @@ x1 *= E.a;
 x1 *= {};
 x1 *= null;
 x1 *= undefined;
-var x2;
 x2 *= a;
 x2 *= b;
 x2 *= true;
@@ -90,7 +86,6 @@ x2 *= E.a;
 x2 *= {};
 x2 *= null;
 x2 *= undefined;
-var x3;
 x3 *= a;
 x3 *= b;
 x3 *= true;
@@ -100,7 +95,6 @@ x3 *= E.a;
 x3 *= {};
 x3 *= null;
 x3 *= undefined;
-var x4;
 x4 *= a;
 x4 *= b;
 x4 *= true;
@@ -110,12 +104,10 @@ x4 *= E.a;
 x4 *= {};
 x4 *= null;
 x4 *= undefined;
-var x5;
 x5 *= b;
 x5 *= true;
 x5 *= '';
 x5 *= {};
-var x6;
 x6 *= b;
 x6 *= true;
 x6 *= '';
diff --git a/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.symbols b/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.symbols
index 11ef0d0eb31c2..bc303ca1056b7 100644
--- a/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.symbols
+++ b/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.symbols
@@ -6,186 +6,186 @@ enum E { a, b }
 >a : Symbol(E.a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 0, 8))
 >b : Symbol(E.b, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 0, 11))
 
-var a: any;
->a : Symbol(a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 2, 3))
+declare var a: any;
+>a : Symbol(a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 2, 11))
 
-var b: void;
->b : Symbol(b, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 3, 3))
+declare var b: void;
+>b : Symbol(b, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 3, 11))
 
-var x1: boolean;
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 3))
+declare var x1: boolean;
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 11))
 
 x1 *= a;
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 3))
->a : Symbol(a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 2, 3))
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 11))
+>a : Symbol(a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 2, 11))
 
 x1 *= b;
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 3))
->b : Symbol(b, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 3, 3))
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 11))
+>b : Symbol(b, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 3, 11))
 
 x1 *= true;
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 11))
 
 x1 *= 0;
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 11))
 
 x1 *= ''
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 11))
 
 x1 *= E.a;
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 11))
 >E.a : Symbol(E.a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 0, 8))
 >E : Symbol(E, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 0, 8))
 
 x1 *= {};
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 11))
 
 x1 *= null;
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 11))
 
 x1 *= undefined;
->x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 5, 11))
 >undefined : Symbol(undefined)
 
-var x2: string;
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 3))
+declare var x2: string;
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 11))
 
 x2 *= a;
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 3))
->a : Symbol(a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 2, 3))
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 11))
+>a : Symbol(a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 2, 11))
 
 x2 *= b;
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 3))
->b : Symbol(b, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 3, 3))
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 11))
+>b : Symbol(b, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 3, 11))
 
 x2 *= true;
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 11))
 
 x2 *= 0;
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 11))
 
 x2 *= ''
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 11))
 
 x2 *= E.a;
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 11))
 >E.a : Symbol(E.a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 0, 8))
 >E : Symbol(E, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 0, 8))
 
 x2 *= {};
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 11))
 
 x2 *= null;
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 11))
 
 x2 *= undefined;
->x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 16, 11))
 >undefined : Symbol(undefined)
 
-var x3: {};
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 3))
+declare var x3: {};
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 11))
 
 x3 *= a;
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 3))
->a : Symbol(a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 2, 3))
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 11))
+>a : Symbol(a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 2, 11))
 
 x3 *= b;
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 3))
->b : Symbol(b, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 3, 3))
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 11))
+>b : Symbol(b, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 3, 11))
 
 x3 *= true;
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 11))
 
 x3 *= 0;
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 11))
 
 x3 *= ''
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 11))
 
 x3 *= E.a;
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 11))
 >E.a : Symbol(E.a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 0, 8))
 >E : Symbol(E, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 0, 8))
 
 x3 *= {};
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 11))
 
 x3 *= null;
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 11))
 
 x3 *= undefined;
->x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 27, 11))
 >undefined : Symbol(undefined)
 
-var x4: void;
->x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 3))
+declare var x4: void;
+>x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 11))
 
 x4 *= a;
->x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 3))
->a : Symbol(a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 2, 3))
+>x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 11))
+>a : Symbol(a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 2, 11))
 
 x4 *= b;
->x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 3))
->b : Symbol(b, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 3, 3))
+>x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 11))
+>b : Symbol(b, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 3, 11))
 
 x4 *= true;
->x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 3))
+>x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 11))
 
 x4 *= 0;
->x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 3))
+>x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 11))
 
 x4 *= ''
->x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 3))
+>x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 11))
 
 x4 *= E.a;
->x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 3))
+>x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 11))
 >E.a : Symbol(E.a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 0, 8))
 >E : Symbol(E, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 0, 8))
 
 x4 *= {};
->x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 3))
+>x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 11))
 
 x4 *= null;
->x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 3))
+>x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 11))
 
 x4 *= undefined;
->x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 3))
+>x4 : Symbol(x4, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 38, 11))
 >undefined : Symbol(undefined)
 
-var x5: number;
->x5 : Symbol(x5, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 49, 3))
+declare var x5: number;
+>x5 : Symbol(x5, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 49, 11))
 
 x5 *= b;
->x5 : Symbol(x5, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 49, 3))
->b : Symbol(b, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 3, 3))
+>x5 : Symbol(x5, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 49, 11))
+>b : Symbol(b, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 3, 11))
 
 x5 *= true;
->x5 : Symbol(x5, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 49, 3))
+>x5 : Symbol(x5, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 49, 11))
 
 x5 *= ''
->x5 : Symbol(x5, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 49, 3))
+>x5 : Symbol(x5, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 49, 11))
 
 x5 *= {};
->x5 : Symbol(x5, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 49, 3))
+>x5 : Symbol(x5, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 49, 11))
 
-var x6: E;
->x6 : Symbol(x6, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 55, 3))
+declare var x6: E;
+>x6 : Symbol(x6, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 55, 11))
 >E : Symbol(E, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 0, 0))
 
 x6 *= b;
->x6 : Symbol(x6, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 55, 3))
->b : Symbol(b, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 3, 3))
+>x6 : Symbol(x6, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 55, 11))
+>b : Symbol(b, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 3, 11))
 
 x6 *= true;
->x6 : Symbol(x6, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 55, 3))
+>x6 : Symbol(x6, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 55, 11))
 
 x6 *= ''
->x6 : Symbol(x6, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 55, 3))
+>x6 : Symbol(x6, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 55, 11))
 
 x6 *= {};
->x6 : Symbol(x6, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 55, 3))
+>x6 : Symbol(x6, Decl(compoundArithmeticAssignmentWithInvalidOperands.ts, 55, 11))
 
diff --git a/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.types b/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.types
index 07cd4d9055482..359f7acb7b9c1 100644
--- a/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.types
+++ b/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.types
@@ -9,15 +9,15 @@ enum E { a, b }
 >b : E.b
 >  : ^^^
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
-var b: void;
+declare var b: void;
 >b : void
 >  : ^^^^
 
-var x1: boolean;
+declare var x1: boolean;
 >x1 : boolean
 >   : ^^^^^^^
 
@@ -95,7 +95,7 @@ x1 *= undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x2: string;
+declare var x2: string;
 >x2 : string
 >   : ^^^^^^
 
@@ -173,7 +173,7 @@ x2 *= undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x3: {};
+declare var x3: {};
 >x3 : {}
 >   : ^^
 
@@ -251,7 +251,7 @@ x3 *= undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x4: void;
+declare var x4: void;
 >x4 : void
 >   : ^^^^
 
@@ -329,7 +329,7 @@ x4 *= undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x5: number;
+declare var x5: number;
 >x5 : number
 >   : ^^^^^^
 
@@ -365,7 +365,7 @@ x5 *= {};
 >{} : {}
 >   : ^^
 
-var x6: E;
+declare var x6: E;
 >x6 : E
 >   : ^
 
diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.errors.txt b/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.errors.txt
index 9d99d92a9081c..ff6f94f8f0138 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.errors.txt
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.errors.txt
@@ -9,11 +9,11 @@ compoundExponentiationAssignmentLHSCanBeAssigned1.ts(26,8): error TS18050: The v
 ==== compoundExponentiationAssignmentLHSCanBeAssigned1.ts (6 errors) ====
     enum E { a, b, c }
     
-    var a: any;
-    var b: number;
-    var c: E;
+    declare var a: any;
+    declare var b: number;
+    declare var c: E;
     
-    var x1: any;
+    declare var x1: any;
     x1 **= a;
     x1 **= b;
     x1 **= c;
@@ -24,7 +24,7 @@ compoundExponentiationAssignmentLHSCanBeAssigned1.ts(26,8): error TS18050: The v
            ~~~~~~~~~
 !!! error TS18050: The value 'undefined' cannot be used here.
     
-    var x2: number;
+    declare var x2: number;
     x2 **= a;
     x2 **= b;
     x2 **= c;
@@ -35,7 +35,7 @@ compoundExponentiationAssignmentLHSCanBeAssigned1.ts(26,8): error TS18050: The v
            ~~~~~~~~~
 !!! error TS18050: The value 'undefined' cannot be used here.
     
-    var x3: E;
+    declare var x3: E;
     x3 **= a;
     x3 **= b;
     x3 **= c;
diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.js b/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.js
index 1de8afa2947e2..aacdc430b452d 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.js
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.js
@@ -3,25 +3,25 @@
 //// [compoundExponentiationAssignmentLHSCanBeAssigned1.ts]
 enum E { a, b, c }
 
-var a: any;
-var b: number;
-var c: E;
+declare var a: any;
+declare var b: number;
+declare var c: E;
 
-var x1: any;
+declare var x1: any;
 x1 **= a;
 x1 **= b;
 x1 **= c;
 x1 **= null;
 x1 **= undefined;
 
-var x2: number;
+declare var x2: number;
 x2 **= a;
 x2 **= b;
 x2 **= c;
 x2 **= null;
 x2 **= undefined;
 
-var x3: E;
+declare var x3: E;
 x3 **= a;
 x3 **= b;
 x3 **= c;
@@ -35,22 +35,16 @@ var E;
     E[E["b"] = 1] = "b";
     E[E["c"] = 2] = "c";
 })(E || (E = {}));
-var a;
-var b;
-var c;
-var x1;
 x1 = Math.pow(x1, a);
 x1 = Math.pow(x1, b);
 x1 = Math.pow(x1, c);
 x1 = Math.pow(x1, null);
 x1 = Math.pow(x1, undefined);
-var x2;
 x2 = Math.pow(x2, a);
 x2 = Math.pow(x2, b);
 x2 = Math.pow(x2, c);
 x2 = Math.pow(x2, null);
 x2 = Math.pow(x2, undefined);
-var x3;
 x3 = Math.pow(x3, a);
 x3 = Math.pow(x3, b);
 x3 = Math.pow(x3, c);
diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.symbols b/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.symbols
index 40429b761e5aa..f5069a7b238f2 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.symbols
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.symbols
@@ -7,80 +7,80 @@ enum E { a, b, c }
 >b : Symbol(E.b, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 0, 11))
 >c : Symbol(E.c, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 0, 14))
 
-var a: any;
->a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 2, 3))
+declare var a: any;
+>a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 2, 11))
 
-var b: number;
->b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 3, 3))
+declare var b: number;
+>b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 3, 11))
 
-var c: E;
->c : Symbol(c, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 4, 3))
+declare var c: E;
+>c : Symbol(c, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 4, 11))
 >E : Symbol(E, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 0, 0))
 
-var x1: any;
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 6, 3))
+declare var x1: any;
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 6, 11))
 
 x1 **= a;
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 6, 3))
->a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 2, 3))
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 6, 11))
+>a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 2, 11))
 
 x1 **= b;
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 6, 3))
->b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 3, 3))
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 6, 11))
+>b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 3, 11))
 
 x1 **= c;
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 6, 3))
->c : Symbol(c, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 4, 3))
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 6, 11))
+>c : Symbol(c, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 4, 11))
 
 x1 **= null;
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 6, 3))
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 6, 11))
 
 x1 **= undefined;
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 6, 3))
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 6, 11))
 >undefined : Symbol(undefined)
 
-var x2: number;
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 13, 3))
+declare var x2: number;
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 13, 11))
 
 x2 **= a;
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 13, 3))
->a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 2, 3))
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 13, 11))
+>a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 2, 11))
 
 x2 **= b;
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 13, 3))
->b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 3, 3))
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 13, 11))
+>b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 3, 11))
 
 x2 **= c;
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 13, 3))
->c : Symbol(c, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 4, 3))
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 13, 11))
+>c : Symbol(c, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 4, 11))
 
 x2 **= null;
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 13, 3))
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 13, 11))
 
 x2 **= undefined;
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 13, 3))
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 13, 11))
 >undefined : Symbol(undefined)
 
-var x3: E;
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 20, 3))
+declare var x3: E;
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 20, 11))
 >E : Symbol(E, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 0, 0))
 
 x3 **= a;
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 20, 3))
->a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 2, 3))
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 20, 11))
+>a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 2, 11))
 
 x3 **= b;
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 20, 3))
->b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 3, 3))
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 20, 11))
+>b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 3, 11))
 
 x3 **= c;
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 20, 3))
->c : Symbol(c, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 4, 3))
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 20, 11))
+>c : Symbol(c, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 4, 11))
 
 x3 **= null;
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 20, 3))
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 20, 11))
 
 x3 **= undefined;
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 20, 3))
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCanBeAssigned1.ts, 20, 11))
 >undefined : Symbol(undefined)
 
diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.types b/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.types
index 4de2b2866f211..d5d63c97a2d79 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.types
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.types
@@ -11,19 +11,19 @@ enum E { a, b, c }
 >c : E.c
 >  : ^^^
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
-var b: number;
+declare var b: number;
 >b : number
 >  : ^^^^^^
 
-var c: E;
+declare var c: E;
 >c : E
 >  : ^
 
-var x1: any;
+declare var x1: any;
 >x1 : any
 >   : ^^^
 
@@ -65,7 +65,7 @@ x1 **= undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x2: number;
+declare var x2: number;
 >x2 : number
 >   : ^^^^^^
 
@@ -107,7 +107,7 @@ x2 **= undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x3: E;
+declare var x3: E;
 >x3 : E
 >   : ^
 
diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.errors.txt b/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.errors.txt
index 6d4c601967ae9..b67dc8f5f525a 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.errors.txt
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.errors.txt
@@ -71,10 +71,10 @@ compoundExponentiationAssignmentLHSCannotBeAssigned.ts(60,8): error TS2363: The
 ==== compoundExponentiationAssignmentLHSCannotBeAssigned.ts (68 errors) ====
     enum E { a, b }
     
-    var a: any;
-    var b: void;
+    declare var a: any;
+    declare var b: void;
     
-    var x1: boolean;
+    declare var x1: boolean;
     x1 **= a;
     ~~
 !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
@@ -115,7 +115,7 @@ compoundExponentiationAssignmentLHSCannotBeAssigned.ts(60,8): error TS2363: The
            ~~~~~~~~~
 !!! error TS18050: The value 'undefined' cannot be used here.
     
-    var x2: string;
+    declare var x2: string;
     x2 **= a;
     ~~
 !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
@@ -156,7 +156,7 @@ compoundExponentiationAssignmentLHSCannotBeAssigned.ts(60,8): error TS2363: The
            ~~~~~~~~~
 !!! error TS18050: The value 'undefined' cannot be used here.
     
-    var x3: {};
+    declare var x3: {};
     x3 **= a;
     ~~
 !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
@@ -197,7 +197,7 @@ compoundExponentiationAssignmentLHSCannotBeAssigned.ts(60,8): error TS2363: The
            ~~~~~~~~~
 !!! error TS18050: The value 'undefined' cannot be used here.
     
-    var x4: void;
+    declare var x4: void;
     x4 **= a;
     ~~
 !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
@@ -238,7 +238,7 @@ compoundExponentiationAssignmentLHSCannotBeAssigned.ts(60,8): error TS2363: The
            ~~~~~~~~~
 !!! error TS18050: The value 'undefined' cannot be used here.
     
-    var x5: number;
+    declare var x5: number;
     x5 **= b;
            ~
 !!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
@@ -252,7 +252,7 @@ compoundExponentiationAssignmentLHSCannotBeAssigned.ts(60,8): error TS2363: The
            ~~
 !!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
     
-    var x6: E;
+    declare var x6: E;
     x6 **= b;
            ~
 !!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.js b/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.js
index 4b17ee7684f79..ffbe6ed056dc3 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.js
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.js
@@ -3,10 +3,10 @@
 //// [compoundExponentiationAssignmentLHSCannotBeAssigned.ts]
 enum E { a, b }
 
-var a: any;
-var b: void;
+declare var a: any;
+declare var b: void;
 
-var x1: boolean;
+declare var x1: boolean;
 x1 **= a;
 x1 **= b;
 x1 **= true;
@@ -17,7 +17,7 @@ x1 **= {};
 x1 **= null;
 x1 **= undefined;
 
-var x2: string;
+declare var x2: string;
 x2 **= a;
 x2 **= b;
 x2 **= true;
@@ -28,7 +28,7 @@ x2 **= {};
 x2 **= null;
 x2 **= undefined;
 
-var x3: {};
+declare var x3: {};
 x3 **= a;
 x3 **= b;
 x3 **= true;
@@ -39,7 +39,7 @@ x3 **= {};
 x3 **= null;
 x3 **= undefined;
 
-var x4: void;
+declare var x4: void;
 x4 **= a;
 x4 **= b;
 x4 **= true;
@@ -50,13 +50,13 @@ x4 **= {};
 x4 **= null;
 x4 **= undefined;
 
-var x5: number;
+declare var x5: number;
 x5 **= b;
 x5 **= true;
 x5 **= ''
 x5 **= {};
 
-var x6: E;
+declare var x6: E;
 x6 **= b;
 x6 **= true;
 x6 **= ''
@@ -68,9 +68,6 @@ var E;
     E[E["a"] = 0] = "a";
     E[E["b"] = 1] = "b";
 })(E || (E = {}));
-var a;
-var b;
-var x1;
 x1 = Math.pow(x1, a);
 x1 = Math.pow(x1, b);
 x1 = Math.pow(x1, true);
@@ -80,7 +77,6 @@ x1 = Math.pow(x1, E.a);
 x1 = Math.pow(x1, {});
 x1 = Math.pow(x1, null);
 x1 = Math.pow(x1, undefined);
-var x2;
 x2 = Math.pow(x2, a);
 x2 = Math.pow(x2, b);
 x2 = Math.pow(x2, true);
@@ -90,7 +86,6 @@ x2 = Math.pow(x2, E.a);
 x2 = Math.pow(x2, {});
 x2 = Math.pow(x2, null);
 x2 = Math.pow(x2, undefined);
-var x3;
 x3 = Math.pow(x3, a);
 x3 = Math.pow(x3, b);
 x3 = Math.pow(x3, true);
@@ -100,7 +95,6 @@ x3 = Math.pow(x3, E.a);
 x3 = Math.pow(x3, {});
 x3 = Math.pow(x3, null);
 x3 = Math.pow(x3, undefined);
-var x4;
 x4 = Math.pow(x4, a);
 x4 = Math.pow(x4, b);
 x4 = Math.pow(x4, true);
@@ -110,12 +104,10 @@ x4 = Math.pow(x4, E.a);
 x4 = Math.pow(x4, {});
 x4 = Math.pow(x4, null);
 x4 = Math.pow(x4, undefined);
-var x5;
 x5 = Math.pow(x5, b);
 x5 = Math.pow(x5, true);
 x5 = Math.pow(x5, '');
 x5 = Math.pow(x5, {});
-var x6;
 x6 = Math.pow(x6, b);
 x6 = Math.pow(x6, true);
 x6 = Math.pow(x6, '');
diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.symbols b/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.symbols
index 49b726673c7f1..992e2b90bab6a 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.symbols
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.symbols
@@ -6,186 +6,186 @@ enum E { a, b }
 >a : Symbol(E.a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 0, 8))
 >b : Symbol(E.b, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 0, 11))
 
-var a: any;
->a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 2, 3))
+declare var a: any;
+>a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 2, 11))
 
-var b: void;
->b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 3, 3))
+declare var b: void;
+>b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 3, 11))
 
-var x1: boolean;
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 3))
+declare var x1: boolean;
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 11))
 
 x1 **= a;
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 3))
->a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 2, 3))
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 11))
+>a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 2, 11))
 
 x1 **= b;
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 3))
->b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 3, 3))
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 11))
+>b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 3, 11))
 
 x1 **= true;
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 11))
 
 x1 **= 0;
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 11))
 
 x1 **= ''
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 11))
 
 x1 **= E.a;
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 11))
 >E.a : Symbol(E.a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 0, 8))
 >E : Symbol(E, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 0, 0))
 >a : Symbol(E.a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 0, 8))
 
 x1 **= {};
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 11))
 
 x1 **= null;
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 11))
 
 x1 **= undefined;
->x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 3))
+>x1 : Symbol(x1, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 5, 11))
 >undefined : Symbol(undefined)
 
-var x2: string;
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 3))
+declare var x2: string;
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 11))
 
 x2 **= a;
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 3))
->a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 2, 3))
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 11))
+>a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 2, 11))
 
 x2 **= b;
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 3))
->b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 3, 3))
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 11))
+>b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 3, 11))
 
 x2 **= true;
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 11))
 
 x2 **= 0;
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 11))
 
 x2 **= ''
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 11))
 
 x2 **= E.a;
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 11))
 >E.a : Symbol(E.a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 0, 8))
 >E : Symbol(E, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 0, 0))
 >a : Symbol(E.a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 0, 8))
 
 x2 **= {};
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 11))
 
 x2 **= null;
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 11))
 
 x2 **= undefined;
->x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 3))
+>x2 : Symbol(x2, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 16, 11))
 >undefined : Symbol(undefined)
 
-var x3: {};
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 3))
+declare var x3: {};
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 11))
 
 x3 **= a;
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 3))
->a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 2, 3))
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 11))
+>a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 2, 11))
 
 x3 **= b;
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 3))
->b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 3, 3))
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 11))
+>b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 3, 11))
 
 x3 **= true;
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 11))
 
 x3 **= 0;
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 11))
 
 x3 **= ''
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 11))
 
 x3 **= E.a;
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 11))
 >E.a : Symbol(E.a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 0, 8))
 >E : Symbol(E, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 0, 0))
 >a : Symbol(E.a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 0, 8))
 
 x3 **= {};
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 11))
 
 x3 **= null;
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 11))
 
 x3 **= undefined;
->x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 3))
+>x3 : Symbol(x3, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 27, 11))
 >undefined : Symbol(undefined)
 
-var x4: void;
->x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 3))
+declare var x4: void;
+>x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 11))
 
 x4 **= a;
->x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 3))
->a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 2, 3))
+>x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 11))
+>a : Symbol(a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 2, 11))
 
 x4 **= b;
->x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 3))
->b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 3, 3))
+>x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 11))
+>b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 3, 11))
 
 x4 **= true;
->x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 3))
+>x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 11))
 
 x4 **= 0;
->x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 3))
+>x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 11))
 
 x4 **= ''
->x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 3))
+>x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 11))
 
 x4 **= E.a;
->x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 3))
+>x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 11))
 >E.a : Symbol(E.a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 0, 8))
 >E : Symbol(E, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 0, 0))
 >a : Symbol(E.a, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 0, 8))
 
 x4 **= {};
->x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 3))
+>x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 11))
 
 x4 **= null;
->x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 3))
+>x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 11))
 
 x4 **= undefined;
->x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 3))
+>x4 : Symbol(x4, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 38, 11))
 >undefined : Symbol(undefined)
 
-var x5: number;
->x5 : Symbol(x5, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 49, 3))
+declare var x5: number;
+>x5 : Symbol(x5, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 49, 11))
 
 x5 **= b;
->x5 : Symbol(x5, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 49, 3))
->b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 3, 3))
+>x5 : Symbol(x5, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 49, 11))
+>b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 3, 11))
 
 x5 **= true;
->x5 : Symbol(x5, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 49, 3))
+>x5 : Symbol(x5, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 49, 11))
 
 x5 **= ''
->x5 : Symbol(x5, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 49, 3))
+>x5 : Symbol(x5, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 49, 11))
 
 x5 **= {};
->x5 : Symbol(x5, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 49, 3))
+>x5 : Symbol(x5, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 49, 11))
 
-var x6: E;
->x6 : Symbol(x6, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 55, 3))
+declare var x6: E;
+>x6 : Symbol(x6, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 55, 11))
 >E : Symbol(E, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 0, 0))
 
 x6 **= b;
->x6 : Symbol(x6, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 55, 3))
->b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 3, 3))
+>x6 : Symbol(x6, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 55, 11))
+>b : Symbol(b, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 3, 11))
 
 x6 **= true;
->x6 : Symbol(x6, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 55, 3))
+>x6 : Symbol(x6, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 55, 11))
 
 x6 **= ''
->x6 : Symbol(x6, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 55, 3))
+>x6 : Symbol(x6, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 55, 11))
 
 x6 **= {};
->x6 : Symbol(x6, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 55, 3))
+>x6 : Symbol(x6, Decl(compoundExponentiationAssignmentLHSCannotBeAssigned.ts, 55, 11))
 
diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.types b/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.types
index 83afe08a63f95..c09de0f22bc52 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.types
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.types
@@ -9,15 +9,15 @@ enum E { a, b }
 >b : E.b
 >  : ^^^
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
-var b: void;
+declare var b: void;
 >b : void
 >  : ^^^^
 
-var x1: boolean;
+declare var x1: boolean;
 >x1 : boolean
 >   : ^^^^^^^
 
@@ -95,7 +95,7 @@ x1 **= undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x2: string;
+declare var x2: string;
 >x2 : string
 >   : ^^^^^^
 
@@ -173,7 +173,7 @@ x2 **= undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x3: {};
+declare var x3: {};
 >x3 : {}
 >   : ^^
 
@@ -251,7 +251,7 @@ x3 **= undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x4: void;
+declare var x4: void;
 >x4 : void
 >   : ^^^^
 
@@ -329,7 +329,7 @@ x4 **= undefined;
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var x5: number;
+declare var x5: number;
 >x5 : number
 >   : ^^^^^^
 
@@ -365,7 +365,7 @@ x5 **= {};
 >{} : {}
 >   : ^^
 
-var x6: E;
+declare var x6: E;
 >x6 : E
 >   : ^
 
diff --git a/tests/baselines/reference/computedPropertyNames51_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames51_ES5.errors.txt
index 7cd91e44469a4..c85b1d2d0ee48 100644
--- a/tests/baselines/reference/computedPropertyNames51_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames51_ES5.errors.txt
@@ -3,8 +3,8 @@ computedPropertyNames51_ES5.ts(5,9): error TS2464: A computed property name must
 
 ==== computedPropertyNames51_ES5.ts (1 errors) ====
     function f<T, K extends keyof T>() {
-        var t: T;
-        var k: K;
+        var t!: T;
+        var k!: K;
         var v = {
             [t]: 0,
             ~~~
diff --git a/tests/baselines/reference/computedPropertyNames51_ES5.js b/tests/baselines/reference/computedPropertyNames51_ES5.js
index 8f59e10ace2cc..d784efd2e3fb5 100644
--- a/tests/baselines/reference/computedPropertyNames51_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames51_ES5.js
@@ -2,8 +2,8 @@
 
 //// [computedPropertyNames51_ES5.ts]
 function f<T, K extends keyof T>() {
-    var t: T;
-    var k: K;
+    var t!: T;
+    var k!: K;
     var v = {
         [t]: 0,
         [k]: 1
diff --git a/tests/baselines/reference/computedPropertyNames51_ES5.symbols b/tests/baselines/reference/computedPropertyNames51_ES5.symbols
index 8b030fb190d5d..3b1c0d19fc611 100644
--- a/tests/baselines/reference/computedPropertyNames51_ES5.symbols
+++ b/tests/baselines/reference/computedPropertyNames51_ES5.symbols
@@ -7,11 +7,11 @@ function f<T, K extends keyof T>() {
 >K : Symbol(K, Decl(computedPropertyNames51_ES5.ts, 0, 13))
 >T : Symbol(T, Decl(computedPropertyNames51_ES5.ts, 0, 11))
 
-    var t: T;
+    var t!: T;
 >t : Symbol(t, Decl(computedPropertyNames51_ES5.ts, 1, 7))
 >T : Symbol(T, Decl(computedPropertyNames51_ES5.ts, 0, 11))
 
-    var k: K;
+    var k!: K;
 >k : Symbol(k, Decl(computedPropertyNames51_ES5.ts, 2, 7))
 >K : Symbol(K, Decl(computedPropertyNames51_ES5.ts, 0, 13))
 
diff --git a/tests/baselines/reference/computedPropertyNames51_ES5.types b/tests/baselines/reference/computedPropertyNames51_ES5.types
index c139cf77343d1..33190f25460c5 100644
--- a/tests/baselines/reference/computedPropertyNames51_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames51_ES5.types
@@ -5,11 +5,11 @@ function f<T, K extends keyof T>() {
 >f : <T, K extends keyof T>() => void
 >  : ^ ^^ ^^^^^^^^^       ^^^^^^^^^^^
 
-    var t: T;
+    var t!: T;
 >t : T
 >  : ^
 
-    var k: K;
+    var k!: K;
 >k : K
 >  : ^
 
diff --git a/tests/baselines/reference/computedPropertyNames51_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames51_ES6.errors.txt
index 0a54117c6982f..9b0eccf13da0a 100644
--- a/tests/baselines/reference/computedPropertyNames51_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames51_ES6.errors.txt
@@ -3,8 +3,8 @@ computedPropertyNames51_ES6.ts(5,9): error TS2464: A computed property name must
 
 ==== computedPropertyNames51_ES6.ts (1 errors) ====
     function f<T, K extends keyof T>() {
-        var t: T;
-        var k: K;
+        var t!: T;
+        var k!: K;
         var v = {
             [t]: 0,
             ~~~
diff --git a/tests/baselines/reference/computedPropertyNames51_ES6.js b/tests/baselines/reference/computedPropertyNames51_ES6.js
index 1473964dfcbd2..c01180775aadb 100644
--- a/tests/baselines/reference/computedPropertyNames51_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames51_ES6.js
@@ -2,8 +2,8 @@
 
 //// [computedPropertyNames51_ES6.ts]
 function f<T, K extends keyof T>() {
-    var t: T;
-    var k: K;
+    var t!: T;
+    var k!: K;
     var v = {
         [t]: 0,
         [k]: 1
diff --git a/tests/baselines/reference/computedPropertyNames51_ES6.symbols b/tests/baselines/reference/computedPropertyNames51_ES6.symbols
index 612941b024d25..eea607c932177 100644
--- a/tests/baselines/reference/computedPropertyNames51_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNames51_ES6.symbols
@@ -7,11 +7,11 @@ function f<T, K extends keyof T>() {
 >K : Symbol(K, Decl(computedPropertyNames51_ES6.ts, 0, 13))
 >T : Symbol(T, Decl(computedPropertyNames51_ES6.ts, 0, 11))
 
-    var t: T;
+    var t!: T;
 >t : Symbol(t, Decl(computedPropertyNames51_ES6.ts, 1, 7))
 >T : Symbol(T, Decl(computedPropertyNames51_ES6.ts, 0, 11))
 
-    var k: K;
+    var k!: K;
 >k : Symbol(k, Decl(computedPropertyNames51_ES6.ts, 2, 7))
 >K : Symbol(K, Decl(computedPropertyNames51_ES6.ts, 0, 13))
 
diff --git a/tests/baselines/reference/computedPropertyNames51_ES6.types b/tests/baselines/reference/computedPropertyNames51_ES6.types
index 3b4865b6608fe..e618baebe4678 100644
--- a/tests/baselines/reference/computedPropertyNames51_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames51_ES6.types
@@ -5,11 +5,11 @@ function f<T, K extends keyof T>() {
 >f : <T, K extends keyof T>() => void
 >  : ^ ^^ ^^^^^^^^^       ^^^^^^^^^^^
 
-    var t: T;
+    var t!: T;
 >t : T
 >  : ^
 
-    var k: K;
+    var k!: K;
 >k : K
 >  : ^
 
diff --git a/tests/baselines/reference/computedPropertyNames52(target=es2015).errors.txt b/tests/baselines/reference/computedPropertyNames52(target=es2015).errors.txt
new file mode 100644
index 0000000000000..1e229b0db8f79
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames52(target=es2015).errors.txt
@@ -0,0 +1,13 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== computedPropertyNames52.js (0 errors) ====
+    const array = [];
+    for (let i = 0; i < 10; ++i) {
+        array.push(class C {
+            [i] = () => C;
+            static [i] = 100;
+        })
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames52(target=es5).errors.txt b/tests/baselines/reference/computedPropertyNames52(target=es5).errors.txt
new file mode 100644
index 0000000000000..1e229b0db8f79
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames52(target=es5).errors.txt
@@ -0,0 +1,13 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== computedPropertyNames52.js (0 errors) ====
+    const array = [];
+    for (let i = 0; i < 10; ++i) {
+        array.push(class C {
+            [i] = () => C;
+            static [i] = 100;
+        })
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames5_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames5_ES5.errors.txt
index 8f88e3427af05..ea3d175e86770 100644
--- a/tests/baselines/reference/computedPropertyNames5_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames5_ES5.errors.txt
@@ -7,7 +7,7 @@ computedPropertyNames5_ES5.ts(8,5): error TS2464: A computed property name must
 
 
 ==== computedPropertyNames5_ES5.ts (6 errors) ====
-    var b: boolean;
+    declare var b: boolean;
     var v = {
         [b]: 0,
         ~~~
diff --git a/tests/baselines/reference/computedPropertyNames5_ES5.js b/tests/baselines/reference/computedPropertyNames5_ES5.js
index 5822708c34745..c39dc301a05eb 100644
--- a/tests/baselines/reference/computedPropertyNames5_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames5_ES5.js
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES5.ts] ////
 
 //// [computedPropertyNames5_ES5.ts]
-var b: boolean;
+declare var b: boolean;
 var v = {
     [b]: 0,
     [true]: 1,
@@ -13,7 +13,6 @@ var v = {
 
 //// [computedPropertyNames5_ES5.js]
 var _a;
-var b;
 var v = (_a = {},
     _a[b] = 0,
     _a[true] = 1,
diff --git a/tests/baselines/reference/computedPropertyNames5_ES5.symbols b/tests/baselines/reference/computedPropertyNames5_ES5.symbols
index da2984c837a5c..b8ba63d6a8b26 100644
--- a/tests/baselines/reference/computedPropertyNames5_ES5.symbols
+++ b/tests/baselines/reference/computedPropertyNames5_ES5.symbols
@@ -1,15 +1,15 @@
 //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES5.ts] ////
 
 === computedPropertyNames5_ES5.ts ===
-var b: boolean;
->b : Symbol(b, Decl(computedPropertyNames5_ES5.ts, 0, 3))
+declare var b: boolean;
+>b : Symbol(b, Decl(computedPropertyNames5_ES5.ts, 0, 11))
 
 var v = {
 >v : Symbol(v, Decl(computedPropertyNames5_ES5.ts, 1, 3))
 
     [b]: 0,
 >[b] : Symbol([b], Decl(computedPropertyNames5_ES5.ts, 1, 9))
->b : Symbol(b, Decl(computedPropertyNames5_ES5.ts, 0, 3))
+>b : Symbol(b, Decl(computedPropertyNames5_ES5.ts, 0, 11))
 
     [true]: 1,
 >[true] : Symbol([true], Decl(computedPropertyNames5_ES5.ts, 2, 11))
diff --git a/tests/baselines/reference/computedPropertyNames5_ES5.types b/tests/baselines/reference/computedPropertyNames5_ES5.types
index d1648117a130a..d6f17696be667 100644
--- a/tests/baselines/reference/computedPropertyNames5_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames5_ES5.types
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES5.ts] ////
 
 === computedPropertyNames5_ES5.ts ===
-var b: boolean;
+declare var b: boolean;
 >b : boolean
 >  : ^^^^^^^
 
diff --git a/tests/baselines/reference/computedPropertyNames5_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames5_ES6.errors.txt
index 51cd1a410ca5f..7ab817a414c17 100644
--- a/tests/baselines/reference/computedPropertyNames5_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames5_ES6.errors.txt
@@ -7,7 +7,7 @@ computedPropertyNames5_ES6.ts(8,5): error TS2464: A computed property name must
 
 
 ==== computedPropertyNames5_ES6.ts (6 errors) ====
-    var b: boolean;
+    declare var b: boolean;
     var v = {
         [b]: 0,
         ~~~
diff --git a/tests/baselines/reference/computedPropertyNames5_ES6.js b/tests/baselines/reference/computedPropertyNames5_ES6.js
index 3a82d263c8bb4..97b0076dc43cd 100644
--- a/tests/baselines/reference/computedPropertyNames5_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames5_ES6.js
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES6.ts] ////
 
 //// [computedPropertyNames5_ES6.ts]
-var b: boolean;
+declare var b: boolean;
 var v = {
     [b]: 0,
     [true]: 1,
@@ -12,7 +12,6 @@ var v = {
 }
 
 //// [computedPropertyNames5_ES6.js]
-var b;
 var v = {
     [b]: 0,
     [true]: 1,
diff --git a/tests/baselines/reference/computedPropertyNames5_ES6.symbols b/tests/baselines/reference/computedPropertyNames5_ES6.symbols
index e90793d047ba1..f3d7b67c42821 100644
--- a/tests/baselines/reference/computedPropertyNames5_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNames5_ES6.symbols
@@ -1,15 +1,15 @@
 //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES6.ts] ////
 
 === computedPropertyNames5_ES6.ts ===
-var b: boolean;
->b : Symbol(b, Decl(computedPropertyNames5_ES6.ts, 0, 3))
+declare var b: boolean;
+>b : Symbol(b, Decl(computedPropertyNames5_ES6.ts, 0, 11))
 
 var v = {
 >v : Symbol(v, Decl(computedPropertyNames5_ES6.ts, 1, 3))
 
     [b]: 0,
 >[b] : Symbol([b], Decl(computedPropertyNames5_ES6.ts, 1, 9))
->b : Symbol(b, Decl(computedPropertyNames5_ES6.ts, 0, 3))
+>b : Symbol(b, Decl(computedPropertyNames5_ES6.ts, 0, 11))
 
     [true]: 1,
 >[true] : Symbol([true], Decl(computedPropertyNames5_ES6.ts, 2, 11))
diff --git a/tests/baselines/reference/computedPropertyNames5_ES6.types b/tests/baselines/reference/computedPropertyNames5_ES6.types
index d70b053884281..376bf09d67578 100644
--- a/tests/baselines/reference/computedPropertyNames5_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames5_ES6.types
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES6.ts] ////
 
 === computedPropertyNames5_ES6.ts ===
-var b: boolean;
+declare var b: boolean;
 >b : boolean
 >  : ^^^^^^^
 
diff --git a/tests/baselines/reference/computedPropertyNames6_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames6_ES5.errors.txt
index 2ea2bcb35de38..3cea957bee81d 100644
--- a/tests/baselines/reference/computedPropertyNames6_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames6_ES5.errors.txt
@@ -3,9 +3,9 @@ computedPropertyNames6_ES5.ts(7,5): error TS2464: A computed property name must
 
 
 ==== computedPropertyNames6_ES5.ts (2 errors) ====
-    var p1: number | string;
-    var p2: number | number[];
-    var p3: string | boolean;
+    declare var p1: number | string;
+    declare var p2: number | number[];
+    declare var p3: string | boolean;
     var v = {
         [p1]: 0,
         [p2]: 1,
diff --git a/tests/baselines/reference/computedPropertyNames6_ES5.js b/tests/baselines/reference/computedPropertyNames6_ES5.js
index fc1abd17f9b88..63193cbe7fe00 100644
--- a/tests/baselines/reference/computedPropertyNames6_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames6_ES5.js
@@ -1,9 +1,9 @@
 //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES5.ts] ////
 
 //// [computedPropertyNames6_ES5.ts]
-var p1: number | string;
-var p2: number | number[];
-var p3: string | boolean;
+declare var p1: number | string;
+declare var p2: number | number[];
+declare var p3: string | boolean;
 var v = {
     [p1]: 0,
     [p2]: 1,
@@ -12,9 +12,6 @@ var v = {
 
 //// [computedPropertyNames6_ES5.js]
 var _a;
-var p1;
-var p2;
-var p3;
 var v = (_a = {},
     _a[p1] = 0,
     _a[p2] = 1,
diff --git a/tests/baselines/reference/computedPropertyNames6_ES5.symbols b/tests/baselines/reference/computedPropertyNames6_ES5.symbols
index 8d910158e3061..0293bec66339b 100644
--- a/tests/baselines/reference/computedPropertyNames6_ES5.symbols
+++ b/tests/baselines/reference/computedPropertyNames6_ES5.symbols
@@ -1,27 +1,27 @@
 //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES5.ts] ////
 
 === computedPropertyNames6_ES5.ts ===
-var p1: number | string;
->p1 : Symbol(p1, Decl(computedPropertyNames6_ES5.ts, 0, 3))
+declare var p1: number | string;
+>p1 : Symbol(p1, Decl(computedPropertyNames6_ES5.ts, 0, 11))
 
-var p2: number | number[];
->p2 : Symbol(p2, Decl(computedPropertyNames6_ES5.ts, 1, 3))
+declare var p2: number | number[];
+>p2 : Symbol(p2, Decl(computedPropertyNames6_ES5.ts, 1, 11))
 
-var p3: string | boolean;
->p3 : Symbol(p3, Decl(computedPropertyNames6_ES5.ts, 2, 3))
+declare var p3: string | boolean;
+>p3 : Symbol(p3, Decl(computedPropertyNames6_ES5.ts, 2, 11))
 
 var v = {
 >v : Symbol(v, Decl(computedPropertyNames6_ES5.ts, 3, 3))
 
     [p1]: 0,
 >[p1] : Symbol([p1], Decl(computedPropertyNames6_ES5.ts, 3, 9))
->p1 : Symbol(p1, Decl(computedPropertyNames6_ES5.ts, 0, 3))
+>p1 : Symbol(p1, Decl(computedPropertyNames6_ES5.ts, 0, 11))
 
     [p2]: 1,
 >[p2] : Symbol([p2], Decl(computedPropertyNames6_ES5.ts, 4, 12))
->p2 : Symbol(p2, Decl(computedPropertyNames6_ES5.ts, 1, 3))
+>p2 : Symbol(p2, Decl(computedPropertyNames6_ES5.ts, 1, 11))
 
     [p3]: 2
 >[p3] : Symbol([p3], Decl(computedPropertyNames6_ES5.ts, 5, 12))
->p3 : Symbol(p3, Decl(computedPropertyNames6_ES5.ts, 2, 3))
+>p3 : Symbol(p3, Decl(computedPropertyNames6_ES5.ts, 2, 11))
 }
diff --git a/tests/baselines/reference/computedPropertyNames6_ES5.types b/tests/baselines/reference/computedPropertyNames6_ES5.types
index 9008b073a471a..b99f392cb9054 100644
--- a/tests/baselines/reference/computedPropertyNames6_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames6_ES5.types
@@ -1,15 +1,15 @@
 //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES5.ts] ////
 
 === computedPropertyNames6_ES5.ts ===
-var p1: number | string;
+declare var p1: number | string;
 >p1 : string | number
 >   : ^^^^^^^^^^^^^^^
 
-var p2: number | number[];
+declare var p2: number | number[];
 >p2 : number | number[]
 >   : ^^^^^^^^^^^^^^^^^
 
-var p3: string | boolean;
+declare var p3: string | boolean;
 >p3 : string | boolean
 >   : ^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/computedPropertyNames6_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames6_ES6.errors.txt
index 5034f36388d2d..88fcaf53dd522 100644
--- a/tests/baselines/reference/computedPropertyNames6_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames6_ES6.errors.txt
@@ -3,9 +3,9 @@ computedPropertyNames6_ES6.ts(7,5): error TS2464: A computed property name must
 
 
 ==== computedPropertyNames6_ES6.ts (2 errors) ====
-    var p1: number | string;
-    var p2: number | number[];
-    var p3: string | boolean;
+    declare var p1: number | string;
+    declare var p2: number | number[];
+    declare var p3: string | boolean;
     var v = {
         [p1]: 0,
         [p2]: 1,
diff --git a/tests/baselines/reference/computedPropertyNames6_ES6.js b/tests/baselines/reference/computedPropertyNames6_ES6.js
index 6cb8298def46c..74c13b0c5eeaa 100644
--- a/tests/baselines/reference/computedPropertyNames6_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames6_ES6.js
@@ -1,9 +1,9 @@
 //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES6.ts] ////
 
 //// [computedPropertyNames6_ES6.ts]
-var p1: number | string;
-var p2: number | number[];
-var p3: string | boolean;
+declare var p1: number | string;
+declare var p2: number | number[];
+declare var p3: string | boolean;
 var v = {
     [p1]: 0,
     [p2]: 1,
@@ -11,9 +11,6 @@ var v = {
 }
 
 //// [computedPropertyNames6_ES6.js]
-var p1;
-var p2;
-var p3;
 var v = {
     [p1]: 0,
     [p2]: 1,
diff --git a/tests/baselines/reference/computedPropertyNames6_ES6.symbols b/tests/baselines/reference/computedPropertyNames6_ES6.symbols
index f40cc75dd979e..414c5829a6636 100644
--- a/tests/baselines/reference/computedPropertyNames6_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNames6_ES6.symbols
@@ -1,27 +1,27 @@
 //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES6.ts] ////
 
 === computedPropertyNames6_ES6.ts ===
-var p1: number | string;
->p1 : Symbol(p1, Decl(computedPropertyNames6_ES6.ts, 0, 3))
+declare var p1: number | string;
+>p1 : Symbol(p1, Decl(computedPropertyNames6_ES6.ts, 0, 11))
 
-var p2: number | number[];
->p2 : Symbol(p2, Decl(computedPropertyNames6_ES6.ts, 1, 3))
+declare var p2: number | number[];
+>p2 : Symbol(p2, Decl(computedPropertyNames6_ES6.ts, 1, 11))
 
-var p3: string | boolean;
->p3 : Symbol(p3, Decl(computedPropertyNames6_ES6.ts, 2, 3))
+declare var p3: string | boolean;
+>p3 : Symbol(p3, Decl(computedPropertyNames6_ES6.ts, 2, 11))
 
 var v = {
 >v : Symbol(v, Decl(computedPropertyNames6_ES6.ts, 3, 3))
 
     [p1]: 0,
 >[p1] : Symbol([p1], Decl(computedPropertyNames6_ES6.ts, 3, 9))
->p1 : Symbol(p1, Decl(computedPropertyNames6_ES6.ts, 0, 3))
+>p1 : Symbol(p1, Decl(computedPropertyNames6_ES6.ts, 0, 11))
 
     [p2]: 1,
 >[p2] : Symbol([p2], Decl(computedPropertyNames6_ES6.ts, 4, 12))
->p2 : Symbol(p2, Decl(computedPropertyNames6_ES6.ts, 1, 3))
+>p2 : Symbol(p2, Decl(computedPropertyNames6_ES6.ts, 1, 11))
 
     [p3]: 2
 >[p3] : Symbol([p3], Decl(computedPropertyNames6_ES6.ts, 5, 12))
->p3 : Symbol(p3, Decl(computedPropertyNames6_ES6.ts, 2, 3))
+>p3 : Symbol(p3, Decl(computedPropertyNames6_ES6.ts, 2, 11))
 }
diff --git a/tests/baselines/reference/computedPropertyNames6_ES6.types b/tests/baselines/reference/computedPropertyNames6_ES6.types
index aaf0013097b9e..a6c89473ba6d7 100644
--- a/tests/baselines/reference/computedPropertyNames6_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames6_ES6.types
@@ -1,15 +1,15 @@
 //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES6.ts] ////
 
 === computedPropertyNames6_ES6.ts ===
-var p1: number | string;
+declare var p1: number | string;
 >p1 : string | number
 >   : ^^^^^^^^^^^^^^^
 
-var p2: number | number[];
+declare var p2: number | number[];
 >p2 : number | number[]
 >   : ^^^^^^^^^^^^^^^^^
 
-var p3: string | boolean;
+declare var p3: string | boolean;
 >p3 : string | boolean
 >   : ^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/computedPropertyNames8_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames8_ES5.errors.txt
index 2a7c1dde2d8d0..a0e2cb036051a 100644
--- a/tests/baselines/reference/computedPropertyNames8_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames8_ES5.errors.txt
@@ -3,8 +3,8 @@ computedPropertyNames8_ES5.ts(5,9): error TS2464: A computed property name must
 
 ==== computedPropertyNames8_ES5.ts (1 errors) ====
     function f<T, U extends string>() {
-        var t: T;
-        var u: U;
+        var t!: T;
+        var u!: U;
         var v = {
             [t]: 0,
             ~~~
diff --git a/tests/baselines/reference/computedPropertyNames8_ES5.js b/tests/baselines/reference/computedPropertyNames8_ES5.js
index 8ce287735e590..cb9359fba6d28 100644
--- a/tests/baselines/reference/computedPropertyNames8_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames8_ES5.js
@@ -2,8 +2,8 @@
 
 //// [computedPropertyNames8_ES5.ts]
 function f<T, U extends string>() {
-    var t: T;
-    var u: U;
+    var t!: T;
+    var u!: U;
     var v = {
         [t]: 0,
         [u]: 1
diff --git a/tests/baselines/reference/computedPropertyNames8_ES5.symbols b/tests/baselines/reference/computedPropertyNames8_ES5.symbols
index 5cd2b32bf90d8..ebe17ea9a5801 100644
--- a/tests/baselines/reference/computedPropertyNames8_ES5.symbols
+++ b/tests/baselines/reference/computedPropertyNames8_ES5.symbols
@@ -6,11 +6,11 @@ function f<T, U extends string>() {
 >T : Symbol(T, Decl(computedPropertyNames8_ES5.ts, 0, 11))
 >U : Symbol(U, Decl(computedPropertyNames8_ES5.ts, 0, 13))
 
-    var t: T;
+    var t!: T;
 >t : Symbol(t, Decl(computedPropertyNames8_ES5.ts, 1, 7))
 >T : Symbol(T, Decl(computedPropertyNames8_ES5.ts, 0, 11))
 
-    var u: U;
+    var u!: U;
 >u : Symbol(u, Decl(computedPropertyNames8_ES5.ts, 2, 7))
 >U : Symbol(U, Decl(computedPropertyNames8_ES5.ts, 0, 13))
 
diff --git a/tests/baselines/reference/computedPropertyNames8_ES5.types b/tests/baselines/reference/computedPropertyNames8_ES5.types
index 7cdc03cf6167d..3ed0395ef2657 100644
--- a/tests/baselines/reference/computedPropertyNames8_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames8_ES5.types
@@ -5,11 +5,11 @@ function f<T, U extends string>() {
 >f : <T, U extends string>() => void
 >  : ^ ^^ ^^^^^^^^^      ^^^^^^^^^^^
 
-    var t: T;
+    var t!: T;
 >t : T
 >  : ^
 
-    var u: U;
+    var u!: U;
 >u : U
 >  : ^
 
diff --git a/tests/baselines/reference/computedPropertyNames8_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames8_ES6.errors.txt
index d35c2c9c9abab..2a59b61d7bba0 100644
--- a/tests/baselines/reference/computedPropertyNames8_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames8_ES6.errors.txt
@@ -3,8 +3,8 @@ computedPropertyNames8_ES6.ts(5,9): error TS2464: A computed property name must
 
 ==== computedPropertyNames8_ES6.ts (1 errors) ====
     function f<T, U extends string>() {
-        var t: T;
-        var u: U;
+        var t!: T;
+        var u!: U;
         var v = {
             [t]: 0,
             ~~~
diff --git a/tests/baselines/reference/computedPropertyNames8_ES6.js b/tests/baselines/reference/computedPropertyNames8_ES6.js
index bce786005134c..02c894eedf2e7 100644
--- a/tests/baselines/reference/computedPropertyNames8_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames8_ES6.js
@@ -2,8 +2,8 @@
 
 //// [computedPropertyNames8_ES6.ts]
 function f<T, U extends string>() {
-    var t: T;
-    var u: U;
+    var t!: T;
+    var u!: U;
     var v = {
         [t]: 0,
         [u]: 1
diff --git a/tests/baselines/reference/computedPropertyNames8_ES6.symbols b/tests/baselines/reference/computedPropertyNames8_ES6.symbols
index 327a6eac8bed8..cdca55a3021d8 100644
--- a/tests/baselines/reference/computedPropertyNames8_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNames8_ES6.symbols
@@ -6,11 +6,11 @@ function f<T, U extends string>() {
 >T : Symbol(T, Decl(computedPropertyNames8_ES6.ts, 0, 11))
 >U : Symbol(U, Decl(computedPropertyNames8_ES6.ts, 0, 13))
 
-    var t: T;
+    var t!: T;
 >t : Symbol(t, Decl(computedPropertyNames8_ES6.ts, 1, 7))
 >T : Symbol(T, Decl(computedPropertyNames8_ES6.ts, 0, 11))
 
-    var u: U;
+    var u!: U;
 >u : Symbol(u, Decl(computedPropertyNames8_ES6.ts, 2, 7))
 >U : Symbol(U, Decl(computedPropertyNames8_ES6.ts, 0, 13))
 
diff --git a/tests/baselines/reference/computedPropertyNames8_ES6.types b/tests/baselines/reference/computedPropertyNames8_ES6.types
index 11427d48dd2ee..6f20bdb427d9d 100644
--- a/tests/baselines/reference/computedPropertyNames8_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames8_ES6.types
@@ -5,11 +5,11 @@ function f<T, U extends string>() {
 >f : <T, U extends string>() => void
 >  : ^ ^^ ^^^^^^^^^      ^^^^^^^^^^^
 
-    var t: T;
+    var t!: T;
 >t : T
 >  : ^
 
-    var u: U;
+    var u!: U;
 >u : U
 >  : ^
 
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.errors.txt b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.errors.txt
index dfc26d8324850..8d09a80a995e5 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.errors.txt
+++ b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.errors.txt
@@ -8,19 +8,19 @@ conditionalOperatorConditionIsNumberType.ts(56,32): error TS2872: This kind of e
 
 ==== conditionalOperatorConditionIsNumberType.ts (6 errors) ====
     //Cond ? Expr1 : Expr2,  Cond is of number type, Expr1 and Expr2 have the same type
-    var condNumber: number;
+    declare var condNumber: number;
     
-    var exprAny1: any;
-    var exprBoolean1: boolean;
-    var exprNumber1: number;
-    var exprString1: string;
-    var exprIsObject1: Object;
+    declare var exprAny1: any;
+    declare var exprBoolean1: boolean;
+    declare var exprNumber1: number;
+    declare var exprString1: string;
+    declare var exprIsObject1: Object;
     
-    var exprAny2: any;
-    var exprBoolean2: boolean;
-    var exprNumber2: number;
-    var exprString2: string;
-    var exprIsObject2: Object;
+    declare var exprAny2: any;
+    declare var exprBoolean2: boolean;
+    declare var exprNumber2: number;
+    declare var exprString2: string;
+    declare var exprIsObject2: Object;
     
     //Cond is a number type variable
     condNumber ? exprAny1 : exprAny2;
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.js b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.js
index 0a529636d63c8..49d2a4d2b3975 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.js
+++ b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.js
@@ -2,19 +2,19 @@
 
 //// [conditionalOperatorConditionIsNumberType.ts]
 //Cond ? Expr1 : Expr2,  Cond is of number type, Expr1 and Expr2 have the same type
-var condNumber: number;
+declare var condNumber: number;
 
-var exprAny1: any;
-var exprBoolean1: boolean;
-var exprNumber1: number;
-var exprString1: string;
-var exprIsObject1: Object;
+declare var exprAny1: any;
+declare var exprBoolean1: boolean;
+declare var exprNumber1: number;
+declare var exprString1: string;
+declare var exprIsObject1: Object;
 
-var exprAny2: any;
-var exprBoolean2: boolean;
-var exprNumber2: number;
-var exprString2: string;
-var exprIsObject2: Object;
+declare var exprAny2: any;
+declare var exprBoolean2: boolean;
+declare var exprNumber2: number;
+declare var exprString2: string;
+declare var exprIsObject2: Object;
 
 //Cond is a number type variable
 condNumber ? exprAny1 : exprAny2;
@@ -66,18 +66,6 @@ var resultIsObject3 = foo() / array[1] ? exprIsObject1 : exprIsObject2;
 var resultIsStringOrBoolean3 = foo() / array[1] ? exprString1 : exprBoolean1; // Union
 
 //// [conditionalOperatorConditionIsNumberType.js]
-//Cond ? Expr1 : Expr2,  Cond is of number type, Expr1 and Expr2 have the same type
-var condNumber;
-var exprAny1;
-var exprBoolean1;
-var exprNumber1;
-var exprString1;
-var exprIsObject1;
-var exprAny2;
-var exprBoolean2;
-var exprNumber2;
-var exprString2;
-var exprIsObject2;
 //Cond is a number type variable
 condNumber ? exprAny1 : exprAny2;
 condNumber ? exprBoolean1 : exprBoolean2;
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.symbols b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.symbols
index f7414e85595e5..54fe3d4cf5c4c 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.symbols
+++ b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.symbols
@@ -2,96 +2,96 @@
 
 === conditionalOperatorConditionIsNumberType.ts ===
 //Cond ? Expr1 : Expr2,  Cond is of number type, Expr1 and Expr2 have the same type
-var condNumber: number;
->condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 3))
+declare var condNumber: number;
+>condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 11))
 
-var exprAny1: any;
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 3, 3))
+declare var exprAny1: any;
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 3, 11))
 
-var exprBoolean1: boolean;
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 3))
+declare var exprBoolean1: boolean;
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 11))
 
-var exprNumber1: number;
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsNumberType.ts, 5, 3))
+declare var exprNumber1: number;
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsNumberType.ts, 5, 11))
 
-var exprString1: string;
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 3))
+declare var exprString1: string;
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 11))
 
-var exprIsObject1: Object;
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsNumberType.ts, 7, 3))
+declare var exprIsObject1: Object;
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsNumberType.ts, 7, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
-var exprAny2: any;
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsNumberType.ts, 9, 3))
+declare var exprAny2: any;
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsNumberType.ts, 9, 11))
 
-var exprBoolean2: boolean;
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 10, 3))
+declare var exprBoolean2: boolean;
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 10, 11))
 
-var exprNumber2: number;
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsNumberType.ts, 11, 3))
+declare var exprNumber2: number;
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsNumberType.ts, 11, 11))
 
-var exprString2: string;
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsNumberType.ts, 12, 3))
+declare var exprString2: string;
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsNumberType.ts, 12, 11))
 
-var exprIsObject2: Object;
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsNumberType.ts, 13, 3))
+declare var exprIsObject2: Object;
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsNumberType.ts, 13, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 //Cond is a number type variable
 condNumber ? exprAny1 : exprAny2;
->condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsNumberType.ts, 9, 3))
+>condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 11))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsNumberType.ts, 9, 11))
 
 condNumber ? exprBoolean1 : exprBoolean2;
->condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 10, 3))
+>condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 10, 11))
 
 condNumber ? exprNumber1 : exprNumber2;
->condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 3))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsNumberType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsNumberType.ts, 11, 3))
+>condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 11))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsNumberType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsNumberType.ts, 11, 11))
 
 condNumber ? exprString1 : exprString2;
->condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsNumberType.ts, 12, 3))
+>condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsNumberType.ts, 12, 11))
 
 condNumber ? exprIsObject1 : exprIsObject2;
->condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsNumberType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsNumberType.ts, 13, 3))
+>condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 11))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsNumberType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsNumberType.ts, 13, 11))
 
 condNumber ? exprString1 : exprBoolean1; // Union
->condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 3))
+>condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 11))
 
 //Cond is a number type literal
 1 ? exprAny1 : exprAny2;
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsNumberType.ts, 9, 3))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsNumberType.ts, 9, 11))
 
 0 ? exprBoolean1 : exprBoolean2;
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 10, 3))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 10, 11))
 
 0.123456789 ? exprNumber1 : exprNumber2;
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsNumberType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsNumberType.ts, 11, 3))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsNumberType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsNumberType.ts, 11, 11))
 
 - 10000000000000 ? exprString1 : exprString2;
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsNumberType.ts, 12, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsNumberType.ts, 12, 11))
 
 1000000000000 ? exprIsObject1 : exprIsObject2;
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsNumberType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsNumberType.ts, 13, 3))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsNumberType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsNumberType.ts, 13, 11))
 
 10000 ? exprString1 : exprBoolean1; // Union
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 11))
 
 //Cond is a number type expression
 function foo() { return 1 };
@@ -101,136 +101,136 @@ var array = [1, 2, 3];
 >array : Symbol(array, Decl(conditionalOperatorConditionIsNumberType.ts, 33, 3))
 
 1 * 0 ? exprAny1 : exprAny2;
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsNumberType.ts, 9, 3))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsNumberType.ts, 9, 11))
 
 1 + 1 ? exprBoolean1 : exprBoolean2;
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 10, 3))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 10, 11))
 
 "string".length ? exprNumber1 : exprNumber2;
 >"string".length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsNumberType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsNumberType.ts, 11, 3))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsNumberType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsNumberType.ts, 11, 11))
 
 foo() ? exprString1 : exprString2;
 >foo : Symbol(foo, Decl(conditionalOperatorConditionIsNumberType.ts, 29, 35))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsNumberType.ts, 12, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsNumberType.ts, 12, 11))
 
 foo() / array[1] ? exprIsObject1 : exprIsObject2;
 >foo : Symbol(foo, Decl(conditionalOperatorConditionIsNumberType.ts, 29, 35))
 >array : Symbol(array, Decl(conditionalOperatorConditionIsNumberType.ts, 33, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsNumberType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsNumberType.ts, 13, 3))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsNumberType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsNumberType.ts, 13, 11))
 
 foo() ? exprString1 : exprBoolean1; // Union
 >foo : Symbol(foo, Decl(conditionalOperatorConditionIsNumberType.ts, 29, 35))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 11))
 
 //Results shoud be same as Expr1 and Expr2
 var resultIsAny1 = condNumber ? exprAny1 : exprAny2;
 >resultIsAny1 : Symbol(resultIsAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 43, 3))
->condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsNumberType.ts, 9, 3))
+>condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 11))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsNumberType.ts, 9, 11))
 
 var resultIsBoolean1 = condNumber ? exprBoolean1 : exprBoolean2;
 >resultIsBoolean1 : Symbol(resultIsBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 44, 3))
->condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 10, 3))
+>condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 10, 11))
 
 var resultIsNumber1 = condNumber ? exprNumber1 : exprNumber2;
 >resultIsNumber1 : Symbol(resultIsNumber1, Decl(conditionalOperatorConditionIsNumberType.ts, 45, 3))
->condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 3))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsNumberType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsNumberType.ts, 11, 3))
+>condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 11))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsNumberType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsNumberType.ts, 11, 11))
 
 var resultIsString1 = condNumber ? exprString1 : exprString2;
 >resultIsString1 : Symbol(resultIsString1, Decl(conditionalOperatorConditionIsNumberType.ts, 46, 3))
->condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsNumberType.ts, 12, 3))
+>condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsNumberType.ts, 12, 11))
 
 var resultIsObject1 = condNumber ? exprIsObject1 : exprIsObject2;
 >resultIsObject1 : Symbol(resultIsObject1, Decl(conditionalOperatorConditionIsNumberType.ts, 47, 3))
->condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsNumberType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsNumberType.ts, 13, 3))
+>condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 11))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsNumberType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsNumberType.ts, 13, 11))
 
 var resultIsStringOrBoolean1 = condNumber ? exprString1 : exprBoolean1; // Union
 >resultIsStringOrBoolean1 : Symbol(resultIsStringOrBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 48, 3))
->condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 3))
+>condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 11))
 
 var resultIsAny2 = 1 ? exprAny1 : exprAny2;
 >resultIsAny2 : Symbol(resultIsAny2, Decl(conditionalOperatorConditionIsNumberType.ts, 50, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsNumberType.ts, 9, 3))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsNumberType.ts, 9, 11))
 
 var resultIsBoolean2 = 0 ? exprBoolean1 : exprBoolean2;
 >resultIsBoolean2 : Symbol(resultIsBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 51, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 10, 3))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 10, 11))
 
 var resultIsNumber2 = 0.123456789 ? exprNumber1 : exprNumber2;
 >resultIsNumber2 : Symbol(resultIsNumber2, Decl(conditionalOperatorConditionIsNumberType.ts, 52, 3))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsNumberType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsNumberType.ts, 11, 3))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsNumberType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsNumberType.ts, 11, 11))
 
 var resultIsString2 = - 10000000000000 ? exprString1 : exprString2;
 >resultIsString2 : Symbol(resultIsString2, Decl(conditionalOperatorConditionIsNumberType.ts, 53, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsNumberType.ts, 12, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsNumberType.ts, 12, 11))
 
 var resultIsObject2 = 1000000000000 ? exprIsObject1 : exprIsObject2;
 >resultIsObject2 : Symbol(resultIsObject2, Decl(conditionalOperatorConditionIsNumberType.ts, 54, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsNumberType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsNumberType.ts, 13, 3))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsNumberType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsNumberType.ts, 13, 11))
 
 var resultIsStringOrBoolean2 = 10000 ? exprString1 : exprBoolean1; // Union
 >resultIsStringOrBoolean2 : Symbol(resultIsStringOrBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 55, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 11))
 
 var resultIsAny3 = 1 * 0 ? exprAny1 : exprAny2;
 >resultIsAny3 : Symbol(resultIsAny3, Decl(conditionalOperatorConditionIsNumberType.ts, 57, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsNumberType.ts, 9, 3))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsNumberType.ts, 9, 11))
 
 var resultIsBoolean3 = 1 + 1 ? exprBoolean1 : exprBoolean2;
 >resultIsBoolean3 : Symbol(resultIsBoolean3, Decl(conditionalOperatorConditionIsNumberType.ts, 58, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 10, 3))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsNumberType.ts, 10, 11))
 
 var resultIsNumber3 = "string".length ? exprNumber1 : exprNumber2;
 >resultIsNumber3 : Symbol(resultIsNumber3, Decl(conditionalOperatorConditionIsNumberType.ts, 59, 3))
 >"string".length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsNumberType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsNumberType.ts, 11, 3))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsNumberType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsNumberType.ts, 11, 11))
 
 var resultIsString3 = foo() ? exprString1 : exprString2;
 >resultIsString3 : Symbol(resultIsString3, Decl(conditionalOperatorConditionIsNumberType.ts, 60, 3))
 >foo : Symbol(foo, Decl(conditionalOperatorConditionIsNumberType.ts, 29, 35))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsNumberType.ts, 12, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsNumberType.ts, 12, 11))
 
 var resultIsObject3 = foo() / array[1] ? exprIsObject1 : exprIsObject2;
 >resultIsObject3 : Symbol(resultIsObject3, Decl(conditionalOperatorConditionIsNumberType.ts, 61, 3))
 >foo : Symbol(foo, Decl(conditionalOperatorConditionIsNumberType.ts, 29, 35))
 >array : Symbol(array, Decl(conditionalOperatorConditionIsNumberType.ts, 33, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsNumberType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsNumberType.ts, 13, 3))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsNumberType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsNumberType.ts, 13, 11))
 
 var resultIsStringOrBoolean3 = foo() / array[1] ? exprString1 : exprBoolean1; // Union
 >resultIsStringOrBoolean3 : Symbol(resultIsStringOrBoolean3, Decl(conditionalOperatorConditionIsNumberType.ts, 62, 3))
 >foo : Symbol(foo, Decl(conditionalOperatorConditionIsNumberType.ts, 29, 35))
 >array : Symbol(array, Decl(conditionalOperatorConditionIsNumberType.ts, 33, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 11))
 
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types
index 86fcebd2a4e87..96abc8f7047ff 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types
+++ b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types
@@ -2,47 +2,47 @@
 
 === conditionalOperatorConditionIsNumberType.ts ===
 //Cond ? Expr1 : Expr2,  Cond is of number type, Expr1 and Expr2 have the same type
-var condNumber: number;
+declare var condNumber: number;
 >condNumber : number
 >           : ^^^^^^
 
-var exprAny1: any;
+declare var exprAny1: any;
 >exprAny1 : any
 >         : ^^^
 
-var exprBoolean1: boolean;
+declare var exprBoolean1: boolean;
 >exprBoolean1 : boolean
 >             : ^^^^^^^
 
-var exprNumber1: number;
+declare var exprNumber1: number;
 >exprNumber1 : number
 >            : ^^^^^^
 
-var exprString1: string;
+declare var exprString1: string;
 >exprString1 : string
 >            : ^^^^^^
 
-var exprIsObject1: Object;
+declare var exprIsObject1: Object;
 >exprIsObject1 : Object
 >              : ^^^^^^
 
-var exprAny2: any;
+declare var exprAny2: any;
 >exprAny2 : any
 >         : ^^^
 
-var exprBoolean2: boolean;
+declare var exprBoolean2: boolean;
 >exprBoolean2 : boolean
 >             : ^^^^^^^
 
-var exprNumber2: number;
+declare var exprNumber2: number;
 >exprNumber2 : number
 >            : ^^^^^^
 
-var exprString2: string;
+declare var exprString2: string;
 >exprString2 : string
 >            : ^^^^^^
 
-var exprIsObject2: Object;
+declare var exprIsObject2: Object;
 >exprIsObject2 : Object
 >              : ^^^^^^
 
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.errors.txt b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.errors.txt
index d5388838074c9..df84078324dc3 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.errors.txt
+++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.errors.txt
@@ -19,19 +19,19 @@ conditionalOperatorConditionIsObjectType.ts(63,32): error TS1345: An expression
 
 ==== conditionalOperatorConditionIsObjectType.ts (17 errors) ====
     //Cond ? Expr1 : Expr2,  Cond is of object type, Expr1 and Expr2 have the same type
-    var condObject: Object;
+    declare var condObject: Object;
     
-    var exprAny1: any;
-    var exprBoolean1: boolean;
-    var exprNumber1: number;
-    var exprString1: string;
-    var exprIsObject1: Object;
+    declare var exprAny1: any;
+    declare var exprBoolean1: boolean;
+    declare var exprNumber1: number;
+    declare var exprString1: string;
+    declare var exprIsObject1: Object;
     
-    var exprAny2: any;
-    var exprBoolean2: boolean;
-    var exprNumber2: number;
-    var exprString2: string;
-    var exprIsObject2: Object;
+    declare var exprAny2: any;
+    declare var exprBoolean2: boolean;
+    declare var exprNumber2: number;
+    declare var exprString2: string;
+    declare var exprIsObject2: Object;
     
     function foo() { };
     class C { static doIt: () => void };
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js
index e9f5eee2e5538..dd8a5c26dc179 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js
+++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js
@@ -2,19 +2,19 @@
 
 //// [conditionalOperatorConditionIsObjectType.ts]
 //Cond ? Expr1 : Expr2,  Cond is of object type, Expr1 and Expr2 have the same type
-var condObject: Object;
+declare var condObject: Object;
 
-var exprAny1: any;
-var exprBoolean1: boolean;
-var exprNumber1: number;
-var exprString1: string;
-var exprIsObject1: Object;
+declare var exprAny1: any;
+declare var exprBoolean1: boolean;
+declare var exprNumber1: number;
+declare var exprString1: string;
+declare var exprIsObject1: Object;
 
-var exprAny2: any;
-var exprBoolean2: boolean;
-var exprNumber2: number;
-var exprString2: string;
-var exprIsObject2: Object;
+declare var exprAny2: any;
+declare var exprBoolean2: boolean;
+declare var exprNumber2: number;
+declare var exprString2: string;
+declare var exprIsObject2: Object;
 
 function foo() { };
 class C { static doIt: () => void };
@@ -67,18 +67,6 @@ var resultIsStringOrBoolean3 = C.doIt() ? exprString1 : exprBoolean1; // union
 
 
 //// [conditionalOperatorConditionIsObjectType.js]
-//Cond ? Expr1 : Expr2,  Cond is of object type, Expr1 and Expr2 have the same type
-var condObject;
-var exprAny1;
-var exprBoolean1;
-var exprNumber1;
-var exprString1;
-var exprIsObject1;
-var exprAny2;
-var exprBoolean2;
-var exprNumber2;
-var exprString2;
-var exprIsObject2;
 function foo() { }
 ;
 var C = /** @class */ (function () {
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.symbols b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.symbols
index e38d04e2f8596..50085adc0c151 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.symbols
+++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.symbols
@@ -2,44 +2,44 @@
 
 === conditionalOperatorConditionIsObjectType.ts ===
 //Cond ? Expr1 : Expr2,  Cond is of object type, Expr1 and Expr2 have the same type
-var condObject: Object;
->condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 3))
+declare var condObject: Object;
+>condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
-var exprAny1: any;
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 3, 3))
+declare var exprAny1: any;
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 3, 11))
 
-var exprBoolean1: boolean;
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
+declare var exprBoolean1: boolean;
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 11))
 
-var exprNumber1: number;
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsObjectType.ts, 5, 3))
+declare var exprNumber1: number;
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsObjectType.ts, 5, 11))
 
-var exprString1: string;
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 3))
+declare var exprString1: string;
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 11))
 
-var exprIsObject1: Object;
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsObjectType.ts, 7, 3))
+declare var exprIsObject1: Object;
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsObjectType.ts, 7, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
-var exprAny2: any;
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 9, 3))
+declare var exprAny2: any;
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 9, 11))
 
-var exprBoolean2: boolean;
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 3))
+declare var exprBoolean2: boolean;
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 11))
 
-var exprNumber2: number;
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsObjectType.ts, 11, 3))
+declare var exprNumber2: number;
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsObjectType.ts, 11, 11))
 
-var exprString2: string;
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsObjectType.ts, 12, 3))
+declare var exprString2: string;
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsObjectType.ts, 12, 11))
 
-var exprIsObject2: Object;
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 3))
+declare var exprIsObject2: Object;
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 function foo() { };
->foo : Symbol(foo, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 26))
+>foo : Symbol(foo, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 34))
 
 class C { static doIt: () => void };
 >C : Symbol(C, Decl(conditionalOperatorConditionIsObjectType.ts, 15, 19))
@@ -47,34 +47,34 @@ class C { static doIt: () => void };
 
 //Cond is an object type variable
 condObject ? exprAny1 : exprAny2;
->condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 9, 3))
+>condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 9, 11))
 
 condObject ? exprBoolean1 : exprBoolean2;
->condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 3))
+>condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 11))
 
 condObject ? exprNumber1 : exprNumber2;
->condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 3))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsObjectType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsObjectType.ts, 11, 3))
+>condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsObjectType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsObjectType.ts, 11, 11))
 
 condObject ? exprString1 : exprString2;
->condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsObjectType.ts, 12, 3))
+>condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsObjectType.ts, 12, 11))
 
 condObject ? exprIsObject1 : exprIsObject2;
->condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsObjectType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 3))
+>condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsObjectType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 11))
 
 condObject ? exprString1 : exprBoolean1; // union
->condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
+>condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 11))
 
 //Cond is an object type literal
 ((a: string) => a.length) ? exprAny1 : exprAny2;
@@ -82,110 +82,110 @@ condObject ? exprString1 : exprBoolean1; // union
 >a.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >a : Symbol(a, Decl(conditionalOperatorConditionIsObjectType.ts, 27, 2))
 >length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 9, 3))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 9, 11))
 
 ((a: string) => a.length) ? exprBoolean1 : exprBoolean2;
 >a : Symbol(a, Decl(conditionalOperatorConditionIsObjectType.ts, 28, 2))
 >a.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >a : Symbol(a, Decl(conditionalOperatorConditionIsObjectType.ts, 28, 2))
 >length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 3))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 11))
 
 ({}) ? exprNumber1 : exprNumber2;
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsObjectType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsObjectType.ts, 11, 3))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsObjectType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsObjectType.ts, 11, 11))
 
 ({ a: 1, b: "s" }) ? exprString1 : exprString2;
 >a : Symbol(a, Decl(conditionalOperatorConditionIsObjectType.ts, 30, 2))
 >b : Symbol(b, Decl(conditionalOperatorConditionIsObjectType.ts, 30, 8))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsObjectType.ts, 12, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsObjectType.ts, 12, 11))
 
 ({ a: 1, b: "s" }) ? exprIsObject1 : exprIsObject2;
 >a : Symbol(a, Decl(conditionalOperatorConditionIsObjectType.ts, 31, 2))
 >b : Symbol(b, Decl(conditionalOperatorConditionIsObjectType.ts, 31, 8))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsObjectType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 3))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsObjectType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 11))
 
 ({ a: 1, b: "s" }) ? exprString1: exprBoolean1; // union
 >a : Symbol(a, Decl(conditionalOperatorConditionIsObjectType.ts, 32, 2))
 >b : Symbol(b, Decl(conditionalOperatorConditionIsObjectType.ts, 32, 8))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 11))
 
 //Cond is an object type expression
 foo() ? exprAny1 : exprAny2;
->foo : Symbol(foo, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 26))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 9, 3))
+>foo : Symbol(foo, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 34))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 9, 11))
 
 new Date() ? exprBoolean1 : exprBoolean2;
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 3))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 11))
 
 new C() ? exprNumber1 : exprNumber2;
 >C : Symbol(C, Decl(conditionalOperatorConditionIsObjectType.ts, 15, 19))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsObjectType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsObjectType.ts, 11, 3))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsObjectType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsObjectType.ts, 11, 11))
 
 C.doIt() ? exprString1 : exprString2;
 >C.doIt : Symbol(C.doIt, Decl(conditionalOperatorConditionIsObjectType.ts, 16, 9))
 >C : Symbol(C, Decl(conditionalOperatorConditionIsObjectType.ts, 15, 19))
 >doIt : Symbol(C.doIt, Decl(conditionalOperatorConditionIsObjectType.ts, 16, 9))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsObjectType.ts, 12, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsObjectType.ts, 12, 11))
 
 condObject.valueOf() ? exprIsObject1 : exprIsObject2;
 >condObject.valueOf : Symbol(Object.valueOf, Decl(lib.es5.d.ts, --, --))
->condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 3))
+>condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11))
 >valueOf : Symbol(Object.valueOf, Decl(lib.es5.d.ts, --, --))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsObjectType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 3))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsObjectType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 11))
 
 new Date() ? exprString1 : exprBoolean1; // union
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 11))
 
 //Results shoud be same as Expr1 and Expr2
 var resultIsAny1 = condObject ? exprAny1 : exprAny2;
 >resultIsAny1 : Symbol(resultIsAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 43, 3))
->condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 9, 3))
+>condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 9, 11))
 
 var resultIsBoolean1 = condObject ? exprBoolean1 : exprBoolean2;
 >resultIsBoolean1 : Symbol(resultIsBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 44, 3))
->condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 3))
+>condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 11))
 
 var resultIsNumber1 = condObject ? exprNumber1 : exprNumber2;
 >resultIsNumber1 : Symbol(resultIsNumber1, Decl(conditionalOperatorConditionIsObjectType.ts, 45, 3))
->condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 3))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsObjectType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsObjectType.ts, 11, 3))
+>condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsObjectType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsObjectType.ts, 11, 11))
 
 var resultIsString1 = condObject ? exprString1 : exprString2;
 >resultIsString1 : Symbol(resultIsString1, Decl(conditionalOperatorConditionIsObjectType.ts, 46, 3))
->condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsObjectType.ts, 12, 3))
+>condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsObjectType.ts, 12, 11))
 
 var resultIsObject1 = condObject ? exprIsObject1 : exprIsObject2;
 >resultIsObject1 : Symbol(resultIsObject1, Decl(conditionalOperatorConditionIsObjectType.ts, 47, 3))
->condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsObjectType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 3))
+>condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsObjectType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 11))
 
 var resultIsStringOrBoolean1 = condObject ? exprString1 : exprBoolean1; // union
 >resultIsStringOrBoolean1 : Symbol(resultIsStringOrBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 48, 3))
->condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
+>condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 11))
 
 var resultIsAny2 = ((a: string) => a.length) ? exprAny1 : exprAny2;
 >resultIsAny2 : Symbol(resultIsAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 50, 3))
@@ -193,8 +193,8 @@ var resultIsAny2 = ((a: string) => a.length) ? exprAny1 : exprAny2;
 >a.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >a : Symbol(a, Decl(conditionalOperatorConditionIsObjectType.ts, 50, 21))
 >length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 9, 3))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 9, 11))
 
 var resultIsBoolean2 = ((a: string) => a.length) ? exprBoolean1 : exprBoolean2;
 >resultIsBoolean2 : Symbol(resultIsBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 51, 3))
@@ -202,74 +202,74 @@ var resultIsBoolean2 = ((a: string) => a.length) ? exprBoolean1 : exprBoolean2;
 >a.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >a : Symbol(a, Decl(conditionalOperatorConditionIsObjectType.ts, 51, 25))
 >length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 3))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 11))
 
 var resultIsNumber2 = ({}) ? exprNumber1 : exprNumber2;
 >resultIsNumber2 : Symbol(resultIsNumber2, Decl(conditionalOperatorConditionIsObjectType.ts, 52, 3))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsObjectType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsObjectType.ts, 11, 3))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsObjectType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsObjectType.ts, 11, 11))
 
 var resultIsString2 = ({ a: 1, b: "s" }) ? exprString1 : exprString2;
 >resultIsString2 : Symbol(resultIsString2, Decl(conditionalOperatorConditionIsObjectType.ts, 53, 3))
 >a : Symbol(a, Decl(conditionalOperatorConditionIsObjectType.ts, 53, 24))
 >b : Symbol(b, Decl(conditionalOperatorConditionIsObjectType.ts, 53, 30))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsObjectType.ts, 12, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsObjectType.ts, 12, 11))
 
 var resultIsObject2 = ({ a: 1, b: "s" }) ? exprIsObject1 : exprIsObject2;
 >resultIsObject2 : Symbol(resultIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 54, 3))
 >a : Symbol(a, Decl(conditionalOperatorConditionIsObjectType.ts, 54, 24))
 >b : Symbol(b, Decl(conditionalOperatorConditionIsObjectType.ts, 54, 30))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsObjectType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 3))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsObjectType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 11))
 
 var resultIsStringOrBoolean2 = ({ a: 1, b: "s" }) ? exprString1 : exprBoolean1; // union
 >resultIsStringOrBoolean2 : Symbol(resultIsStringOrBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 55, 3))
 >a : Symbol(a, Decl(conditionalOperatorConditionIsObjectType.ts, 55, 33))
 >b : Symbol(b, Decl(conditionalOperatorConditionIsObjectType.ts, 55, 39))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 11))
 
 var resultIsAny3 = foo() ? exprAny1 : exprAny2;
 >resultIsAny3 : Symbol(resultIsAny3, Decl(conditionalOperatorConditionIsObjectType.ts, 57, 3))
->foo : Symbol(foo, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 26))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 9, 3))
+>foo : Symbol(foo, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 34))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 9, 11))
 
 var resultIsBoolean3 = new Date() ? exprBoolean1 : exprBoolean2;
 >resultIsBoolean3 : Symbol(resultIsBoolean3, Decl(conditionalOperatorConditionIsObjectType.ts, 58, 3))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 3))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 11))
 
 var resultIsNumber3 = new C() ? exprNumber1 : exprNumber2;
 >resultIsNumber3 : Symbol(resultIsNumber3, Decl(conditionalOperatorConditionIsObjectType.ts, 59, 3))
 >C : Symbol(C, Decl(conditionalOperatorConditionIsObjectType.ts, 15, 19))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsObjectType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsObjectType.ts, 11, 3))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditionIsObjectType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditionIsObjectType.ts, 11, 11))
 
 var resultIsString3 = C.doIt() ? exprString1 : exprString2;
 >resultIsString3 : Symbol(resultIsString3, Decl(conditionalOperatorConditionIsObjectType.ts, 60, 3))
 >C.doIt : Symbol(C.doIt, Decl(conditionalOperatorConditionIsObjectType.ts, 16, 9))
 >C : Symbol(C, Decl(conditionalOperatorConditionIsObjectType.ts, 15, 19))
 >doIt : Symbol(C.doIt, Decl(conditionalOperatorConditionIsObjectType.ts, 16, 9))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsObjectType.ts, 12, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditionIsObjectType.ts, 12, 11))
 
 var resultIsObject3 = condObject.valueOf() ? exprIsObject1 : exprIsObject2;
 >resultIsObject3 : Symbol(resultIsObject3, Decl(conditionalOperatorConditionIsObjectType.ts, 61, 3))
 >condObject.valueOf : Symbol(Object.valueOf, Decl(lib.es5.d.ts, --, --))
->condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 3))
+>condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11))
 >valueOf : Symbol(Object.valueOf, Decl(lib.es5.d.ts, --, --))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsObjectType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 3))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditionIsObjectType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 11))
 
 var resultIsStringOrBoolean3 = C.doIt() ? exprString1 : exprBoolean1; // union
 >resultIsStringOrBoolean3 : Symbol(resultIsStringOrBoolean3, Decl(conditionalOperatorConditionIsObjectType.ts, 62, 3))
 >C.doIt : Symbol(C.doIt, Decl(conditionalOperatorConditionIsObjectType.ts, 16, 9))
 >C : Symbol(C, Decl(conditionalOperatorConditionIsObjectType.ts, 15, 19))
 >doIt : Symbol(C.doIt, Decl(conditionalOperatorConditionIsObjectType.ts, 16, 9))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 11))
 
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
index 74c0f7412c6ed..f801ed9ac81fe 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
+++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
@@ -2,47 +2,47 @@
 
 === conditionalOperatorConditionIsObjectType.ts ===
 //Cond ? Expr1 : Expr2,  Cond is of object type, Expr1 and Expr2 have the same type
-var condObject: Object;
+declare var condObject: Object;
 >condObject : Object
 >           : ^^^^^^
 
-var exprAny1: any;
+declare var exprAny1: any;
 >exprAny1 : any
 >         : ^^^
 
-var exprBoolean1: boolean;
+declare var exprBoolean1: boolean;
 >exprBoolean1 : boolean
 >             : ^^^^^^^
 
-var exprNumber1: number;
+declare var exprNumber1: number;
 >exprNumber1 : number
 >            : ^^^^^^
 
-var exprString1: string;
+declare var exprString1: string;
 >exprString1 : string
 >            : ^^^^^^
 
-var exprIsObject1: Object;
+declare var exprIsObject1: Object;
 >exprIsObject1 : Object
 >              : ^^^^^^
 
-var exprAny2: any;
+declare var exprAny2: any;
 >exprAny2 : any
 >         : ^^^
 
-var exprBoolean2: boolean;
+declare var exprBoolean2: boolean;
 >exprBoolean2 : boolean
 >             : ^^^^^^^
 
-var exprNumber2: number;
+declare var exprNumber2: number;
 >exprNumber2 : number
 >            : ^^^^^^
 
-var exprString2: string;
+declare var exprString2: string;
 >exprString2 : string
 >            : ^^^^^^
 
-var exprIsObject2: Object;
+declare var exprIsObject2: Object;
 >exprIsObject2 : Object
 >              : ^^^^^^
 
diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.errors.txt b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.errors.txt
index bd7989896dfb1..5d2a019dabfa3 100644
--- a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.errors.txt
+++ b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.errors.txt
@@ -16,20 +16,20 @@ conditionalOperatorConditoinIsAnyType.ts(56,32): error TS2872: This kind of expr
 
 ==== conditionalOperatorConditoinIsAnyType.ts (14 errors) ====
     //Cond ? Expr1 : Expr2,  Cond is of any type, Expr1 and Expr2 have the same type
-    var condAny: any;
-    var x: any;
+    declare var condAny: any;
+    declare var x: any;
     
-    var exprAny1: any;
-    var exprBoolean1: boolean;
-    var exprNumber1: number;
-    var exprString1: string;
-    var exprIsObject1: Object;
+    declare var exprAny1: any;
+    declare var exprBoolean1: boolean;
+    declare var exprNumber1: number;
+    declare var exprString1: string;
+    declare var exprIsObject1: Object;
     
-    var exprAny2: any;
-    var exprBoolean2: boolean;
-    var exprNumber2: number;
-    var exprString2: string;
-    var exprIsObject2: Object;
+    declare var exprAny2: any;
+    declare var exprBoolean2: boolean;
+    declare var exprNumber2: number;
+    declare var exprString2: string;
+    declare var exprIsObject2: Object;
     
     //Cond is an any type variable
     condAny ? exprAny1 : exprAny2;
diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.js b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.js
index 5b11e5af3a60e..767338af18bd2 100644
--- a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.js
+++ b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.js
@@ -2,20 +2,20 @@
 
 //// [conditionalOperatorConditoinIsAnyType.ts]
 //Cond ? Expr1 : Expr2,  Cond is of any type, Expr1 and Expr2 have the same type
-var condAny: any;
-var x: any;
+declare var condAny: any;
+declare var x: any;
 
-var exprAny1: any;
-var exprBoolean1: boolean;
-var exprNumber1: number;
-var exprString1: string;
-var exprIsObject1: Object;
+declare var exprAny1: any;
+declare var exprBoolean1: boolean;
+declare var exprNumber1: number;
+declare var exprString1: string;
+declare var exprIsObject1: Object;
 
-var exprAny2: any;
-var exprBoolean2: boolean;
-var exprNumber2: number;
-var exprString2: string;
-var exprIsObject2: Object;
+declare var exprAny2: any;
+declare var exprBoolean2: boolean;
+declare var exprNumber2: number;
+declare var exprString2: string;
+declare var exprIsObject2: Object;
 
 //Cond is an any type variable
 condAny ? exprAny1 : exprAny2;
@@ -66,19 +66,6 @@ var resultIsObject3 = x.doSomeThing() ? exprIsObject1 : exprIsObject2;
 var resultIsStringOrBoolean5 = x.doSomeThing() ? exprString1 : exprBoolean1; // union
 
 //// [conditionalOperatorConditoinIsAnyType.js]
-//Cond ? Expr1 : Expr2,  Cond is of any type, Expr1 and Expr2 have the same type
-var condAny;
-var x;
-var exprAny1;
-var exprBoolean1;
-var exprNumber1;
-var exprString1;
-var exprIsObject1;
-var exprAny2;
-var exprBoolean2;
-var exprNumber2;
-var exprString2;
-var exprIsObject2;
 //Cond is an any type variable
 condAny ? exprAny1 : exprAny2;
 condAny ? exprBoolean1 : exprBoolean2;
diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.symbols b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.symbols
index 8e27ca540e86a..97503b778ed31 100644
--- a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.symbols
+++ b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.symbols
@@ -2,252 +2,252 @@
 
 === conditionalOperatorConditoinIsAnyType.ts ===
 //Cond ? Expr1 : Expr2,  Cond is of any type, Expr1 and Expr2 have the same type
-var condAny: any;
->condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 3))
+declare var condAny: any;
+>condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 11))
 
-var x: any;
->x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 3))
+declare var x: any;
+>x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 11))
 
-var exprAny1: any;
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 4, 3))
+declare var exprAny1: any;
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 4, 11))
 
-var exprBoolean1: boolean;
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 3))
+declare var exprBoolean1: boolean;
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11))
 
-var exprNumber1: number;
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsAnyType.ts, 6, 3))
+declare var exprNumber1: number;
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsAnyType.ts, 6, 11))
 
-var exprString1: string;
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 3))
+declare var exprString1: string;
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11))
 
-var exprIsObject1: Object;
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsAnyType.ts, 8, 3))
+declare var exprIsObject1: Object;
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsAnyType.ts, 8, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
-var exprAny2: any;
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsAnyType.ts, 10, 3))
+declare var exprAny2: any;
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsAnyType.ts, 10, 11))
 
-var exprBoolean2: boolean;
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 11, 3))
+declare var exprBoolean2: boolean;
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 11, 11))
 
-var exprNumber2: number;
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsAnyType.ts, 12, 3))
+declare var exprNumber2: number;
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsAnyType.ts, 12, 11))
 
-var exprString2: string;
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsAnyType.ts, 13, 3))
+declare var exprString2: string;
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsAnyType.ts, 13, 11))
 
-var exprIsObject2: Object;
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsAnyType.ts, 14, 3))
+declare var exprIsObject2: Object;
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsAnyType.ts, 14, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 //Cond is an any type variable
 condAny ? exprAny1 : exprAny2;
->condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 4, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsAnyType.ts, 10, 3))
+>condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 11))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 4, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsAnyType.ts, 10, 11))
 
 condAny ? exprBoolean1 : exprBoolean2;
->condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 11, 3))
+>condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 11, 11))
 
 condAny ? exprNumber1 : exprNumber2;
->condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 3))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsAnyType.ts, 6, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsAnyType.ts, 12, 3))
+>condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 11))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsAnyType.ts, 6, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsAnyType.ts, 12, 11))
 
 condAny ? exprString1 : exprString2;
->condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsAnyType.ts, 13, 3))
+>condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsAnyType.ts, 13, 11))
 
 condAny ? exprIsObject1 : exprIsObject2;
->condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsAnyType.ts, 8, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsAnyType.ts, 14, 3))
+>condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 11))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsAnyType.ts, 8, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsAnyType.ts, 14, 11))
 
 condAny ? exprString1 : exprBoolean1; // union
->condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 3))
+>condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11))
 
 //Cond is an any type literal
 null ? exprAny1 : exprAny2;
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 4, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsAnyType.ts, 10, 3))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 4, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsAnyType.ts, 10, 11))
 
 null ? exprBoolean1 : exprBoolean2;
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 11, 3))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 11, 11))
 
 undefined ? exprNumber1 : exprNumber2;
 >undefined : Symbol(undefined)
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsAnyType.ts, 6, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsAnyType.ts, 12, 3))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsAnyType.ts, 6, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsAnyType.ts, 12, 11))
 
 [null, undefined] ? exprString1 : exprString2;
 >undefined : Symbol(undefined)
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsAnyType.ts, 13, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsAnyType.ts, 13, 11))
 
 [null, undefined] ? exprIsObject1 : exprIsObject2;
 >undefined : Symbol(undefined)
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsAnyType.ts, 8, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsAnyType.ts, 14, 3))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsAnyType.ts, 8, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsAnyType.ts, 14, 11))
 
 undefined ? exprString1 : exprBoolean1; // union
 >undefined : Symbol(undefined)
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11))
 
 //Cond is an any type expression
 x.doSomeThing() ? exprAny1 : exprAny2;
->x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 4, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsAnyType.ts, 10, 3))
+>x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 11))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 4, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsAnyType.ts, 10, 11))
 
 x("x") ? exprBoolean1 : exprBoolean2;
->x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 11, 3))
+>x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 11, 11))
 
 x(x) ? exprNumber1 : exprNumber2;
->x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 3))
->x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 3))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsAnyType.ts, 6, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsAnyType.ts, 12, 3))
+>x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 11))
+>x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 11))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsAnyType.ts, 6, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsAnyType.ts, 12, 11))
 
 x("x") ? exprString1 : exprString2;
->x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsAnyType.ts, 13, 3))
+>x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsAnyType.ts, 13, 11))
 
 x.doSomeThing() ? exprIsObject1 : exprIsObject2;
->x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsAnyType.ts, 8, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsAnyType.ts, 14, 3))
+>x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 11))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsAnyType.ts, 8, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsAnyType.ts, 14, 11))
 
 x.doSomeThing() ? exprString1 : exprBoolean1; // union
->x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 3))
+>x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11))
 
 //Results shoud be same as Expr1 and Expr2
 var resultIsAny1 = condAny ? exprAny1 : exprAny2;
 >resultIsAny1 : Symbol(resultIsAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 41, 3))
->condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 4, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsAnyType.ts, 10, 3))
+>condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 11))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 4, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsAnyType.ts, 10, 11))
 
 var resultIsBoolean1 = condAny ? exprBoolean1 : exprBoolean2;
 >resultIsBoolean1 : Symbol(resultIsBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 42, 3))
->condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 11, 3))
+>condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 11, 11))
 
 var resultIsNumber1 = condAny ? exprNumber1 : exprNumber2;
 >resultIsNumber1 : Symbol(resultIsNumber1, Decl(conditionalOperatorConditoinIsAnyType.ts, 43, 3))
->condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 3))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsAnyType.ts, 6, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsAnyType.ts, 12, 3))
+>condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 11))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsAnyType.ts, 6, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsAnyType.ts, 12, 11))
 
 var resultIsString1 = condAny ? exprString1 : exprString2;
 >resultIsString1 : Symbol(resultIsString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 44, 3))
->condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsAnyType.ts, 13, 3))
+>condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsAnyType.ts, 13, 11))
 
 var resultIsObject1 = condAny ? exprIsObject1 : exprIsObject2;
 >resultIsObject1 : Symbol(resultIsObject1, Decl(conditionalOperatorConditoinIsAnyType.ts, 45, 3))
->condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsAnyType.ts, 8, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsAnyType.ts, 14, 3))
+>condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 11))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsAnyType.ts, 8, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsAnyType.ts, 14, 11))
 
 var resultIsStringOrBoolean1 = condAny ? exprString1 : exprBoolean1; // union
 >resultIsStringOrBoolean1 : Symbol(resultIsStringOrBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 46, 3))
->condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 3))
+>condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11))
 
 var resultIsAny2 = null ? exprAny1 : exprAny2;
 >resultIsAny2 : Symbol(resultIsAny2, Decl(conditionalOperatorConditoinIsAnyType.ts, 48, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 4, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsAnyType.ts, 10, 3))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 4, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsAnyType.ts, 10, 11))
 
 var resultIsBoolean2 = null ? exprBoolean1 : exprBoolean2;
 >resultIsBoolean2 : Symbol(resultIsBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 49, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 11, 3))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 11, 11))
 
 var resultIsNumber2 = undefined ? exprNumber1 : exprNumber2;
 >resultIsNumber2 : Symbol(resultIsNumber2, Decl(conditionalOperatorConditoinIsAnyType.ts, 50, 3))
 >undefined : Symbol(undefined)
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsAnyType.ts, 6, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsAnyType.ts, 12, 3))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsAnyType.ts, 6, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsAnyType.ts, 12, 11))
 
 var resultIsString2 = [null, undefined] ? exprString1 : exprString2;
 >resultIsString2 : Symbol(resultIsString2, Decl(conditionalOperatorConditoinIsAnyType.ts, 51, 3))
 >undefined : Symbol(undefined)
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsAnyType.ts, 13, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsAnyType.ts, 13, 11))
 
 var resultIsObject2 = [null, undefined] ? exprIsObject1 : exprIsObject2;
 >resultIsObject2 : Symbol(resultIsObject2, Decl(conditionalOperatorConditoinIsAnyType.ts, 52, 3))
 >undefined : Symbol(undefined)
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsAnyType.ts, 8, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsAnyType.ts, 14, 3))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsAnyType.ts, 8, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsAnyType.ts, 14, 11))
 
 var resultIsStringOrBoolean2 = null ? exprString1 : exprBoolean1; // union
 >resultIsStringOrBoolean2 : Symbol(resultIsStringOrBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 53, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11))
 
 var resultIsStringOrBoolean3 = undefined ? exprString1 : exprBoolean1; // union
 >resultIsStringOrBoolean3 : Symbol(resultIsStringOrBoolean3, Decl(conditionalOperatorConditoinIsAnyType.ts, 54, 3))
 >undefined : Symbol(undefined)
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11))
 
 var resultIsStringOrBoolean4 = [null, undefined] ? exprString1 : exprBoolean1; // union
 >resultIsStringOrBoolean4 : Symbol(resultIsStringOrBoolean4, Decl(conditionalOperatorConditoinIsAnyType.ts, 55, 3))
 >undefined : Symbol(undefined)
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11))
 
 var resultIsAny3 = x.doSomeThing() ? exprAny1 : exprAny2;
 >resultIsAny3 : Symbol(resultIsAny3, Decl(conditionalOperatorConditoinIsAnyType.ts, 57, 3))
->x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 4, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsAnyType.ts, 10, 3))
+>x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 11))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 4, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsAnyType.ts, 10, 11))
 
 var resultIsBoolean3 = x("x") ? exprBoolean1 : exprBoolean2;
 >resultIsBoolean3 : Symbol(resultIsBoolean3, Decl(conditionalOperatorConditoinIsAnyType.ts, 58, 3))
->x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 11, 3))
+>x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsAnyType.ts, 11, 11))
 
 var resultIsNumber3 = x(x) ? exprNumber1 : exprNumber2;
 >resultIsNumber3 : Symbol(resultIsNumber3, Decl(conditionalOperatorConditoinIsAnyType.ts, 59, 3))
->x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 3))
->x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 3))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsAnyType.ts, 6, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsAnyType.ts, 12, 3))
+>x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 11))
+>x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 11))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsAnyType.ts, 6, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsAnyType.ts, 12, 11))
 
 var resultIsString3 = x("x") ? exprString1 : exprString2;
 >resultIsString3 : Symbol(resultIsString3, Decl(conditionalOperatorConditoinIsAnyType.ts, 60, 3))
->x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsAnyType.ts, 13, 3))
+>x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsAnyType.ts, 13, 11))
 
 var resultIsObject3 = x.doSomeThing() ? exprIsObject1 : exprIsObject2;
 >resultIsObject3 : Symbol(resultIsObject3, Decl(conditionalOperatorConditoinIsAnyType.ts, 61, 3))
->x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsAnyType.ts, 8, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsAnyType.ts, 14, 3))
+>x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 11))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsAnyType.ts, 8, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsAnyType.ts, 14, 11))
 
 var resultIsStringOrBoolean5 = x.doSomeThing() ? exprString1 : exprBoolean1; // union
 >resultIsStringOrBoolean5 : Symbol(resultIsStringOrBoolean5, Decl(conditionalOperatorConditoinIsAnyType.ts, 62, 3))
->x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 3))
+>x : Symbol(x, Decl(conditionalOperatorConditoinIsAnyType.ts, 2, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11))
 
diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.types b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.types
index d26cb2b476158..29030999e606a 100644
--- a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.types
+++ b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.types
@@ -2,51 +2,51 @@
 
 === conditionalOperatorConditoinIsAnyType.ts ===
 //Cond ? Expr1 : Expr2,  Cond is of any type, Expr1 and Expr2 have the same type
-var condAny: any;
+declare var condAny: any;
 >condAny : any
 >        : ^^^
 
-var x: any;
+declare var x: any;
 >x : any
 >  : ^^^
 
-var exprAny1: any;
+declare var exprAny1: any;
 >exprAny1 : any
 >         : ^^^
 
-var exprBoolean1: boolean;
+declare var exprBoolean1: boolean;
 >exprBoolean1 : boolean
 >             : ^^^^^^^
 
-var exprNumber1: number;
+declare var exprNumber1: number;
 >exprNumber1 : number
 >            : ^^^^^^
 
-var exprString1: string;
+declare var exprString1: string;
 >exprString1 : string
 >            : ^^^^^^
 
-var exprIsObject1: Object;
+declare var exprIsObject1: Object;
 >exprIsObject1 : Object
 >              : ^^^^^^
 
-var exprAny2: any;
+declare var exprAny2: any;
 >exprAny2 : any
 >         : ^^^
 
-var exprBoolean2: boolean;
+declare var exprBoolean2: boolean;
 >exprBoolean2 : boolean
 >             : ^^^^^^^
 
-var exprNumber2: number;
+declare var exprNumber2: number;
 >exprNumber2 : number
 >            : ^^^^^^
 
-var exprString2: string;
+declare var exprString2: string;
 >exprString2 : string
 >            : ^^^^^^
 
-var exprIsObject2: Object;
+declare var exprIsObject2: Object;
 >exprIsObject2 : Object
 >              : ^^^^^^
 
diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.errors.txt b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.errors.txt
index efccbc8e2d291..a57557d34395b 100644
--- a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.errors.txt
+++ b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.errors.txt
@@ -14,19 +14,19 @@ conditionalOperatorConditoinIsStringType.ts(56,32): error TS2872: This kind of e
 
 ==== conditionalOperatorConditoinIsStringType.ts (12 errors) ====
     //Cond ? Expr1 : Expr2,  Cond is of string type, Expr1 and Expr2 have the same type
-    var condString: string;
+    declare var condString: string;
     
-    var exprAny1: any;
-    var exprBoolean1: boolean;
-    var exprNumber1: number;
-    var exprString1: string;
-    var exprIsObject1: Object;
+    declare var exprAny1: any;
+    declare var exprBoolean1: boolean;
+    declare var exprNumber1: number;
+    declare var exprString1: string;
+    declare var exprIsObject1: Object;
     
-    var exprAny2: any;
-    var exprBoolean2: boolean;
-    var exprNumber2: number;
-    var exprString2: string;
-    var exprIsObject2: Object;
+    declare var exprAny2: any;
+    declare var exprBoolean2: boolean;
+    declare var exprNumber2: number;
+    declare var exprString2: string;
+    declare var exprIsObject2: Object;
     
     //Cond is a string type variable
     condString ? exprAny1 : exprAny2;
diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.js b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.js
index 9d724d6cc5a14..6d4c04abf537d 100644
--- a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.js
+++ b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.js
@@ -2,19 +2,19 @@
 
 //// [conditionalOperatorConditoinIsStringType.ts]
 //Cond ? Expr1 : Expr2,  Cond is of string type, Expr1 and Expr2 have the same type
-var condString: string;
+declare var condString: string;
 
-var exprAny1: any;
-var exprBoolean1: boolean;
-var exprNumber1: number;
-var exprString1: string;
-var exprIsObject1: Object;
+declare var exprAny1: any;
+declare var exprBoolean1: boolean;
+declare var exprNumber1: number;
+declare var exprString1: string;
+declare var exprIsObject1: Object;
 
-var exprAny2: any;
-var exprBoolean2: boolean;
-var exprNumber2: number;
-var exprString2: string;
-var exprIsObject2: Object;
+declare var exprAny2: any;
+declare var exprBoolean2: boolean;
+declare var exprNumber2: number;
+declare var exprString2: string;
+declare var exprIsObject2: Object;
 
 //Cond is a string type variable
 condString ? exprAny1 : exprAny2;
@@ -67,18 +67,6 @@ var resultIsStringOrBoolean3 = typeof condString ? exprString1 : exprBoolean1; /
 var resultIsStringOrBoolean4 = condString.toUpperCase ? exprString1 : exprBoolean1; // union
 
 //// [conditionalOperatorConditoinIsStringType.js]
-//Cond ? Expr1 : Expr2,  Cond is of string type, Expr1 and Expr2 have the same type
-var condString;
-var exprAny1;
-var exprBoolean1;
-var exprNumber1;
-var exprString1;
-var exprIsObject1;
-var exprAny2;
-var exprBoolean2;
-var exprNumber2;
-var exprString2;
-var exprIsObject2;
 //Cond is a string type variable
 condString ? exprAny1 : exprAny2;
 condString ? exprBoolean1 : exprBoolean2;
diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.symbols b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.symbols
index 5eccab3d7f57f..dd18ada4b14d1 100644
--- a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.symbols
+++ b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.symbols
@@ -2,96 +2,96 @@
 
 === conditionalOperatorConditoinIsStringType.ts ===
 //Cond ? Expr1 : Expr2,  Cond is of string type, Expr1 and Expr2 have the same type
-var condString: string;
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
+declare var condString: string;
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
 
-var exprAny1: any;
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 3, 3))
+declare var exprAny1: any;
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 3, 11))
 
-var exprBoolean1: boolean;
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 3))
+declare var exprBoolean1: boolean;
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 11))
 
-var exprNumber1: number;
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsStringType.ts, 5, 3))
+declare var exprNumber1: number;
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsStringType.ts, 5, 11))
 
-var exprString1: string;
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 3))
+declare var exprString1: string;
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 11))
 
-var exprIsObject1: Object;
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsStringType.ts, 7, 3))
+declare var exprIsObject1: Object;
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsStringType.ts, 7, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
-var exprAny2: any;
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsStringType.ts, 9, 3))
+declare var exprAny2: any;
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsStringType.ts, 9, 11))
 
-var exprBoolean2: boolean;
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 10, 3))
+declare var exprBoolean2: boolean;
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 10, 11))
 
-var exprNumber2: number;
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsStringType.ts, 11, 3))
+declare var exprNumber2: number;
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsStringType.ts, 11, 11))
 
-var exprString2: string;
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsStringType.ts, 12, 3))
+declare var exprString2: string;
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsStringType.ts, 12, 11))
 
-var exprIsObject2: Object;
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsStringType.ts, 13, 3))
+declare var exprIsObject2: Object;
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsStringType.ts, 13, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 //Cond is a string type variable
 condString ? exprAny1 : exprAny2;
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsStringType.ts, 9, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsStringType.ts, 9, 11))
 
 condString ? exprBoolean1 : exprBoolean2;
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 10, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 10, 11))
 
 condString ? exprNumber1 : exprNumber2;
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsStringType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsStringType.ts, 11, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsStringType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsStringType.ts, 11, 11))
 
 condString ? exprString1 : exprString2;
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsStringType.ts, 12, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsStringType.ts, 12, 11))
 
 condString ? exprIsObject1 : exprIsObject2;
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsStringType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsStringType.ts, 13, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsStringType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsStringType.ts, 13, 11))
 
 condString ? exprString1 : exprBoolean1; // union
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 11))
 
 //Cond is a string type literal
 "" ? exprAny1 : exprAny2;
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsStringType.ts, 9, 3))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsStringType.ts, 9, 11))
 
 "string" ? exprBoolean1 : exprBoolean2;
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 10, 3))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 10, 11))
 
 'c' ? exprNumber1 : exprNumber2;
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsStringType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsStringType.ts, 11, 3))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsStringType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsStringType.ts, 11, 11))
 
 'string' ? exprString1 : exprString2;
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsStringType.ts, 12, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsStringType.ts, 12, 11))
 
 "  " ? exprIsObject1 : exprIsObject2;
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsStringType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsStringType.ts, 13, 3))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsStringType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsStringType.ts, 13, 11))
 
 "hello " ? exprString1 : exprBoolean1; // union
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 11))
 
 //Cond is a string type expression
 function foo() { return "string" };
@@ -101,147 +101,147 @@ var array = ["1", "2", "3"];
 >array : Symbol(array, Decl(conditionalOperatorConditoinIsStringType.ts, 33, 3))
 
 typeof condString ? exprAny1 : exprAny2;
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsStringType.ts, 9, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsStringType.ts, 9, 11))
 
 condString.toUpperCase ? exprBoolean1 : exprBoolean2;
 >condString.toUpperCase : Symbol(String.toUpperCase, Decl(lib.es5.d.ts, --, --))
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
 >toUpperCase : Symbol(String.toUpperCase, Decl(lib.es5.d.ts, --, --))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 10, 3))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 10, 11))
 
 condString + "string" ? exprNumber1 : exprNumber2;
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsStringType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsStringType.ts, 11, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsStringType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsStringType.ts, 11, 11))
 
 foo() ? exprString1 : exprString2;
 >foo : Symbol(foo, Decl(conditionalOperatorConditoinIsStringType.ts, 29, 38))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsStringType.ts, 12, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsStringType.ts, 12, 11))
 
 array[1] ? exprIsObject1 : exprIsObject2;
 >array : Symbol(array, Decl(conditionalOperatorConditoinIsStringType.ts, 33, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsStringType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsStringType.ts, 13, 3))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsStringType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsStringType.ts, 13, 11))
 
 foo() ? exprString1 : exprBoolean1; // union
 >foo : Symbol(foo, Decl(conditionalOperatorConditoinIsStringType.ts, 29, 38))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 11))
 
 //Results shoud be same as Expr1 and Expr2
 var resultIsAny1 = condString ? exprAny1 : exprAny2;
 >resultIsAny1 : Symbol(resultIsAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 43, 3))
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsStringType.ts, 9, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsStringType.ts, 9, 11))
 
 var resultIsBoolean1 = condString ? exprBoolean1 : exprBoolean2;
 >resultIsBoolean1 : Symbol(resultIsBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 44, 3))
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 10, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 10, 11))
 
 var resultIsNumber1 = condString ? exprNumber1 : exprNumber2;
 >resultIsNumber1 : Symbol(resultIsNumber1, Decl(conditionalOperatorConditoinIsStringType.ts, 45, 3))
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsStringType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsStringType.ts, 11, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsStringType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsStringType.ts, 11, 11))
 
 var resultIsString1 = condString ? exprString1 : exprString2;
 >resultIsString1 : Symbol(resultIsString1, Decl(conditionalOperatorConditoinIsStringType.ts, 46, 3))
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsStringType.ts, 12, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsStringType.ts, 12, 11))
 
 var resultIsObject1 = condString ? exprIsObject1 : exprIsObject2;
 >resultIsObject1 : Symbol(resultIsObject1, Decl(conditionalOperatorConditoinIsStringType.ts, 47, 3))
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsStringType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsStringType.ts, 13, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsStringType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsStringType.ts, 13, 11))
 
 var resultIsStringOrBoolean1 = condString ? exprString1 : exprBoolean1; // union
 >resultIsStringOrBoolean1 : Symbol(resultIsStringOrBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 48, 3))
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 11))
 
 var resultIsAny2 = "" ? exprAny1 : exprAny2;
 >resultIsAny2 : Symbol(resultIsAny2, Decl(conditionalOperatorConditoinIsStringType.ts, 50, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsStringType.ts, 9, 3))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsStringType.ts, 9, 11))
 
 var resultIsBoolean2 = "string" ? exprBoolean1 : exprBoolean2;
 >resultIsBoolean2 : Symbol(resultIsBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 51, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 10, 3))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 10, 11))
 
 var resultIsNumber2 = 'c' ? exprNumber1 : exprNumber2;
 >resultIsNumber2 : Symbol(resultIsNumber2, Decl(conditionalOperatorConditoinIsStringType.ts, 52, 3))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsStringType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsStringType.ts, 11, 3))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsStringType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsStringType.ts, 11, 11))
 
 var resultIsString2 = 'string' ? exprString1 : exprString2;
 >resultIsString2 : Symbol(resultIsString2, Decl(conditionalOperatorConditoinIsStringType.ts, 53, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsStringType.ts, 12, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsStringType.ts, 12, 11))
 
 var resultIsObject2 = "  " ? exprIsObject1 : exprIsObject2;
 >resultIsObject2 : Symbol(resultIsObject2, Decl(conditionalOperatorConditoinIsStringType.ts, 54, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsStringType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsStringType.ts, 13, 3))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsStringType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsStringType.ts, 13, 11))
 
 var resultIsStringOrBoolean2 = "hello" ? exprString1 : exprBoolean1; // union
 >resultIsStringOrBoolean2 : Symbol(resultIsStringOrBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 55, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 11))
 
 var resultIsAny3 = typeof condString ? exprAny1 : exprAny2;
 >resultIsAny3 : Symbol(resultIsAny3, Decl(conditionalOperatorConditoinIsStringType.ts, 57, 3))
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 3, 3))
->exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsStringType.ts, 9, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprAny1 : Symbol(exprAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 3, 11))
+>exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditoinIsStringType.ts, 9, 11))
 
 var resultIsBoolean3 = condString.toUpperCase ? exprBoolean1 : exprBoolean2;
 >resultIsBoolean3 : Symbol(resultIsBoolean3, Decl(conditionalOperatorConditoinIsStringType.ts, 58, 3))
 >condString.toUpperCase : Symbol(String.toUpperCase, Decl(lib.es5.d.ts, --, --))
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
 >toUpperCase : Symbol(String.toUpperCase, Decl(lib.es5.d.ts, --, --))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 3))
->exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 10, 3))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 11))
+>exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditoinIsStringType.ts, 10, 11))
 
 var resultIsNumber3 = condString + "string" ? exprNumber1 : exprNumber2;
 >resultIsNumber3 : Symbol(resultIsNumber3, Decl(conditionalOperatorConditoinIsStringType.ts, 59, 3))
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsStringType.ts, 5, 3))
->exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsStringType.ts, 11, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprNumber1 : Symbol(exprNumber1, Decl(conditionalOperatorConditoinIsStringType.ts, 5, 11))
+>exprNumber2 : Symbol(exprNumber2, Decl(conditionalOperatorConditoinIsStringType.ts, 11, 11))
 
 var resultIsString3 = foo() ? exprString1 : exprString2;
 >resultIsString3 : Symbol(resultIsString3, Decl(conditionalOperatorConditoinIsStringType.ts, 60, 3))
 >foo : Symbol(foo, Decl(conditionalOperatorConditoinIsStringType.ts, 29, 38))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 3))
->exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsStringType.ts, 12, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 11))
+>exprString2 : Symbol(exprString2, Decl(conditionalOperatorConditoinIsStringType.ts, 12, 11))
 
 var resultIsObject3 = array[1] ? exprIsObject1 : exprIsObject2;
 >resultIsObject3 : Symbol(resultIsObject3, Decl(conditionalOperatorConditoinIsStringType.ts, 61, 3))
 >array : Symbol(array, Decl(conditionalOperatorConditoinIsStringType.ts, 33, 3))
->exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsStringType.ts, 7, 3))
->exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsStringType.ts, 13, 3))
+>exprIsObject1 : Symbol(exprIsObject1, Decl(conditionalOperatorConditoinIsStringType.ts, 7, 11))
+>exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditoinIsStringType.ts, 13, 11))
 
 var resultIsStringOrBoolean3 = typeof condString ? exprString1 : exprBoolean1; // union
 >resultIsStringOrBoolean3 : Symbol(resultIsStringOrBoolean3, Decl(conditionalOperatorConditoinIsStringType.ts, 62, 3))
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 11))
 
 var resultIsStringOrBoolean4 = condString.toUpperCase ? exprString1 : exprBoolean1; // union
 >resultIsStringOrBoolean4 : Symbol(resultIsStringOrBoolean4, Decl(conditionalOperatorConditoinIsStringType.ts, 63, 3))
 >condString.toUpperCase : Symbol(String.toUpperCase, Decl(lib.es5.d.ts, --, --))
->condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 3))
+>condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11))
 >toUpperCase : Symbol(String.toUpperCase, Decl(lib.es5.d.ts, --, --))
->exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 3))
->exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 3))
+>exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 11))
+>exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 11))
 
diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types
index b3f211f4e959e..cd21e822bb8bd 100644
--- a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types
+++ b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types
@@ -2,47 +2,47 @@
 
 === conditionalOperatorConditoinIsStringType.ts ===
 //Cond ? Expr1 : Expr2,  Cond is of string type, Expr1 and Expr2 have the same type
-var condString: string;
+declare var condString: string;
 >condString : string
 >           : ^^^^^^
 
-var exprAny1: any;
+declare var exprAny1: any;
 >exprAny1 : any
 >         : ^^^
 
-var exprBoolean1: boolean;
+declare var exprBoolean1: boolean;
 >exprBoolean1 : boolean
 >             : ^^^^^^^
 
-var exprNumber1: number;
+declare var exprNumber1: number;
 >exprNumber1 : number
 >            : ^^^^^^
 
-var exprString1: string;
+declare var exprString1: string;
 >exprString1 : string
 >            : ^^^^^^
 
-var exprIsObject1: Object;
+declare var exprIsObject1: Object;
 >exprIsObject1 : Object
 >              : ^^^^^^
 
-var exprAny2: any;
+declare var exprAny2: any;
 >exprAny2 : any
 >         : ^^^
 
-var exprBoolean2: boolean;
+declare var exprBoolean2: boolean;
 >exprBoolean2 : boolean
 >             : ^^^^^^^
 
-var exprNumber2: number;
+declare var exprNumber2: number;
 >exprNumber2 : number
 >            : ^^^^^^
 
-var exprString2: string;
+declare var exprString2: string;
 >exprString2 : string
 >            : ^^^^^^
 
-var exprIsObject2: Object;
+declare var exprIsObject2: Object;
 >exprIsObject2 : Object
 >              : ^^^^^^
 
diff --git a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt
index 07951773c545f..2aa9526ecc629 100644
--- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt
+++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.errors.txt
@@ -19,9 +19,9 @@ conditionalOperatorWithoutIdenticalBCT.ts(21,5): error TS2322: Type '((m: X) =>
     class A extends X { propertyA: number };
     class B extends X { propertyB: string };
     
-    var x: X;
-    var a: A;
-    var b: B;
+    declare var x: X;
+    declare var a: A;
+    declare var b: B;
     
     // No errors anymore, uses union types
     true ? a : b;
diff --git a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
index 4f4e4a0795f9f..156102b6673fd 100644
--- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
+++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
@@ -6,9 +6,9 @@ class X { propertyX: any; propertyX1: number; propertyX2: string };
 class A extends X { propertyA: number };
 class B extends X { propertyB: string };
 
-var x: X;
-var a: A;
-var b: B;
+declare var x: X;
+declare var a: A;
+declare var b: B;
 
 // No errors anymore, uses union types
 true ? a : b;
@@ -64,9 +64,6 @@ var B = /** @class */ (function (_super) {
     return B;
 }(X));
 ;
-var x;
-var a;
-var b;
 // No errors anymore, uses union types
 true ? a : b;
 var result1 = true ? a : b;
diff --git a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.symbols b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.symbols
index 78ce6f0b66240..0676698cb8344 100644
--- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.symbols
+++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.symbols
@@ -18,47 +18,47 @@ class B extends X { propertyB: string };
 >X : Symbol(X, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 0, 0))
 >propertyB : Symbol(B.propertyB, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 3, 19))
 
-var x: X;
->x : Symbol(x, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 5, 3))
+declare var x: X;
+>x : Symbol(x, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 5, 11))
 >X : Symbol(X, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 0, 0))
 
-var a: A;
->a : Symbol(a, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 6, 3))
+declare var a: A;
+>a : Symbol(a, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 6, 11))
 >A : Symbol(A, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 1, 67))
 
-var b: B;
->b : Symbol(b, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 7, 3))
+declare var b: B;
+>b : Symbol(b, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 7, 11))
 >B : Symbol(B, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 2, 40))
 
 // No errors anymore, uses union types
 true ? a : b;
->a : Symbol(a, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 6, 3))
->b : Symbol(b, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 7, 3))
+>a : Symbol(a, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 6, 11))
+>b : Symbol(b, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 7, 11))
 
 var result1 = true ? a : b;
 >result1 : Symbol(result1, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 11, 3))
->a : Symbol(a, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 6, 3))
->b : Symbol(b, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 7, 3))
+>a : Symbol(a, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 6, 11))
+>b : Symbol(b, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 7, 11))
 
 //Be contextually typed and and bct is not identical, results in errors that union type is not assignable to target
 var result2: A = true ? a : b;
 >result2 : Symbol(result2, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 14, 3))
 >A : Symbol(A, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 1, 67))
->a : Symbol(a, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 6, 3))
->b : Symbol(b, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 7, 3))
+>a : Symbol(a, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 6, 11))
+>b : Symbol(b, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 7, 11))
 
 var result3: B = true ? a : b;
 >result3 : Symbol(result3, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 15, 3))
 >B : Symbol(B, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 2, 40))
->a : Symbol(a, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 6, 3))
->b : Symbol(b, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 7, 3))
+>a : Symbol(a, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 6, 11))
+>b : Symbol(b, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 7, 11))
 
 var result31: A | B = true ? a : b;
 >result31 : Symbol(result31, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 16, 3))
 >A : Symbol(A, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 1, 67))
 >B : Symbol(B, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 2, 40))
->a : Symbol(a, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 6, 3))
->b : Symbol(b, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 7, 3))
+>a : Symbol(a, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 6, 11))
+>b : Symbol(b, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 7, 11))
 
 var result4: (t: X) => number = true ? (m) => m.propertyX1 : (n) => n.propertyX2;
 >result4 : Symbol(result4, Decl(conditionalOperatorWithoutIdenticalBCT.ts, 18, 3))
diff --git a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.types b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.types
index 66db969c09e64..a3c497d771ae9 100644
--- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.types
+++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.types
@@ -28,15 +28,15 @@ class B extends X { propertyB: string };
 >propertyB : string
 >          : ^^^^^^
 
-var x: X;
+declare var x: X;
 >x : X
 >  : ^
 
-var a: A;
+declare var a: A;
 >a : A
 >  : ^
 
-var b: B;
+declare var b: B;
 >b : B
 >  : ^
 
diff --git a/tests/baselines/reference/conditionalTypeVarianceBigArrayConstraintsPerformance.js b/tests/baselines/reference/conditionalTypeVarianceBigArrayConstraintsPerformance.js
index 6b9288577efdf..24c6d879b8fc5 100644
--- a/tests/baselines/reference/conditionalTypeVarianceBigArrayConstraintsPerformance.js
+++ b/tests/baselines/reference/conditionalTypeVarianceBigArrayConstraintsPerformance.js
@@ -13,7 +13,7 @@ function F<T, U>(p1: Stuff<T>, p2: Stuff<U>) {
 }
 
 //// [conditionalTypeVarianceBigArrayConstraintsPerformance.js]
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 function F(p1, p2) {
     p1 = p2; // Error
 }
diff --git a/tests/baselines/reference/constDeclarations-useBeforeDefinition2.errors.txt b/tests/baselines/reference/constDeclarations-useBeforeDefinition2.errors.txt
index f3d7cc7f4c0f8..ec301084dfe92 100644
--- a/tests/baselines/reference/constDeclarations-useBeforeDefinition2.errors.txt
+++ b/tests/baselines/reference/constDeclarations-useBeforeDefinition2.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 file1.ts(1,1): error TS2448: Block-scoped variable 'c' used before its declaration.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file1.ts (1 errors) ====
     c;
     ~
diff --git a/tests/baselines/reference/constraints0.errors.txt b/tests/baselines/reference/constraints0.errors.txt
index 788aa95e62066..a06cc6494351f 100644
--- a/tests/baselines/reference/constraints0.errors.txt
+++ b/tests/baselines/reference/constraints0.errors.txt
@@ -1,4 +1,4 @@
-constraints0.ts(14,11): error TS2344: Type 'B' does not satisfy the constraint 'A'.
+constraints0.ts(14,19): error TS2344: Type 'B' does not satisfy the constraint 'A'.
   Property 'a' is missing in type 'B' but required in type 'A'.
 
 
@@ -15,9 +15,9 @@ constraints0.ts(14,11): error TS2344: Type 'B' does not satisfy the constraint '
         x: T;
     }
     
-    var v1: C<A>; // should work
-    var v2: C<B>; // should not work
-              ~
+    declare var v1: C<A>; // should work
+    declare var v2: C<B>; // should not work
+                      ~
 !!! error TS2344: Type 'B' does not satisfy the constraint 'A'.
 !!! error TS2344:   Property 'a' is missing in type 'B' but required in type 'A'.
 !!! related TS2728 constraints0.ts:2:2: 'a' is declared here.
diff --git a/tests/baselines/reference/constraints0.js b/tests/baselines/reference/constraints0.js
index 7eeb867fc5603..be31d52823fd3 100644
--- a/tests/baselines/reference/constraints0.js
+++ b/tests/baselines/reference/constraints0.js
@@ -13,12 +13,10 @@ interface C<T extends A> {
     x: T;
 }
 
-var v1: C<A>; // should work
-var v2: C<B>; // should not work
+declare var v1: C<A>; // should work
+declare var v2: C<B>; // should not work
 
 var y = v1.x.a; // 'a' should be of type 'number'
 
 //// [constraints0.js]
-var v1; // should work
-var v2; // should not work
 var y = v1.x.a; // 'a' should be of type 'number'
diff --git a/tests/baselines/reference/constraints0.symbols b/tests/baselines/reference/constraints0.symbols
index 66c4ff86f78b0..596d6b2041244 100644
--- a/tests/baselines/reference/constraints0.symbols
+++ b/tests/baselines/reference/constraints0.symbols
@@ -25,13 +25,13 @@ interface C<T extends A> {
 >T : Symbol(T, Decl(constraints0.ts, 8, 12))
 }
 
-var v1: C<A>; // should work
->v1 : Symbol(v1, Decl(constraints0.ts, 12, 3))
+declare var v1: C<A>; // should work
+>v1 : Symbol(v1, Decl(constraints0.ts, 12, 11))
 >C : Symbol(C, Decl(constraints0.ts, 6, 1))
 >A : Symbol(A, Decl(constraints0.ts, 0, 0))
 
-var v2: C<B>; // should not work
->v2 : Symbol(v2, Decl(constraints0.ts, 13, 3))
+declare var v2: C<B>; // should not work
+>v2 : Symbol(v2, Decl(constraints0.ts, 13, 11))
 >C : Symbol(C, Decl(constraints0.ts, 6, 1))
 >B : Symbol(B, Decl(constraints0.ts, 2, 1))
 
@@ -39,7 +39,7 @@ var y = v1.x.a; // 'a' should be of type 'number'
 >y : Symbol(y, Decl(constraints0.ts, 15, 3))
 >v1.x.a : Symbol(A.a, Decl(constraints0.ts, 0, 13))
 >v1.x : Symbol(C.x, Decl(constraints0.ts, 8, 26))
->v1 : Symbol(v1, Decl(constraints0.ts, 12, 3))
+>v1 : Symbol(v1, Decl(constraints0.ts, 12, 11))
 >x : Symbol(C.x, Decl(constraints0.ts, 8, 26))
 >a : Symbol(A.a, Decl(constraints0.ts, 0, 13))
 
diff --git a/tests/baselines/reference/constraints0.types b/tests/baselines/reference/constraints0.types
index b96409ad5a612..7df5a9ebc4c4c 100644
--- a/tests/baselines/reference/constraints0.types
+++ b/tests/baselines/reference/constraints0.types
@@ -19,11 +19,11 @@ interface C<T extends A> {
 >  : ^
 }
 
-var v1: C<A>; // should work
+declare var v1: C<A>; // should work
 >v1 : C<A>
 >   : ^^^^
 
-var v2: C<B>; // should not work
+declare var v2: C<B>; // should not work
 >v2 : C<B>
 >   : ^^^^
 
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.errors.txt b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.errors.txt
index 929adc55baac9..02b64db999322 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.errors.txt
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.errors.txt
@@ -50,7 +50,7 @@ constructSignatureAssignabilityInInheritance.ts(67,15): error TS2430: Interface
             a3: new <T>(x: T) => void;
         }
     
-        var b: Base;
+        declare var b: Base;
         var r = new b.a(1);
     
         // S's
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.js
index eb4f2ab2aab45..47dfc0185f722 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.js
@@ -43,7 +43,7 @@ namespace MemberWithConstructSignature {
         a3: new <T>(x: T) => void;
     }
 
-    var b: Base;
+    declare var b: Base;
     var r = new b.a(1);
 
     // S's
@@ -77,6 +77,5 @@ namespace MemberWithConstructSignature {
 // Checking basic subtype relations with construct signatures
 var MemberWithConstructSignature;
 (function (MemberWithConstructSignature) {
-    var b;
     var r = new b.a(1);
 })(MemberWithConstructSignature || (MemberWithConstructSignature = {}));
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.symbols b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.symbols
index 6776bdb83484f..05f32b5f94c1e 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.symbols
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.symbols
@@ -86,14 +86,14 @@ namespace MemberWithConstructSignature {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance.ts, 39, 17))
     }
 
-    var b: Base;
->b : Symbol(b, Decl(constructSignatureAssignabilityInInheritance.ts, 42, 7))
+    declare var b: Base;
+>b : Symbol(b, Decl(constructSignatureAssignabilityInInheritance.ts, 42, 15))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance.ts, 34, 40))
 
     var r = new b.a(1);
 >r : Symbol(r, Decl(constructSignatureAssignabilityInInheritance.ts, 43, 7))
 >b.a : Symbol(Base.a, Decl(constructSignatureAssignabilityInInheritance.ts, 35, 20))
->b : Symbol(b, Decl(constructSignatureAssignabilityInInheritance.ts, 42, 7))
+>b : Symbol(b, Decl(constructSignatureAssignabilityInInheritance.ts, 42, 15))
 >a : Symbol(Base.a, Decl(constructSignatureAssignabilityInInheritance.ts, 35, 20))
 
     // S's
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types
index 9406d70954a36..5961ee7a5b9ae 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types
@@ -82,7 +82,7 @@ namespace MemberWithConstructSignature {
 >  : ^
     }
 
-    var b: Base;
+    declare var b: Base;
 >b : Base
 >  : ^^^^
 
diff --git a/tests/baselines/reference/constructSignaturesWithOverloads2.errors.txt b/tests/baselines/reference/constructSignaturesWithOverloads2.errors.txt
index e53b92bb3a79a..ff4230bda1100 100644
--- a/tests/baselines/reference/constructSignaturesWithOverloads2.errors.txt
+++ b/tests/baselines/reference/constructSignaturesWithOverloads2.errors.txt
@@ -43,6 +43,6 @@ constructSignaturesWithOverloads2.ts(32,11): error TS2428: All declarations of '
         new (x: T, y: number): C2<T>;
     }
     
-    var i2: I<number>;
+    declare var i2: I<number>;
     var r4 = new i2(1, '');
     var r5 = new i2(1, 1);
\ No newline at end of file
diff --git a/tests/baselines/reference/constructSignaturesWithOverloads2.js b/tests/baselines/reference/constructSignaturesWithOverloads2.js
index df1db0bea05d3..ed925a093c131 100644
--- a/tests/baselines/reference/constructSignaturesWithOverloads2.js
+++ b/tests/baselines/reference/constructSignaturesWithOverloads2.js
@@ -37,7 +37,7 @@ interface I<T> {
     new (x: T, y: number): C2<T>;
 }
 
-var i2: I<number>;
+declare var i2: I<number>;
 var r4 = new i2(1, '');
 var r5 = new i2(1, 1);
 
@@ -62,6 +62,5 @@ var C2 = /** @class */ (function () {
     C2.x = 1;
 })(C2 || (C2 = {}));
 var r2 = new C2(1, '');
-var i2;
 var r4 = new i2(1, '');
 var r5 = new i2(1, 1);
diff --git a/tests/baselines/reference/constructSignaturesWithOverloads2.symbols b/tests/baselines/reference/constructSignaturesWithOverloads2.symbols
index a2f7de61c93c9..5b25c97b8fd12 100644
--- a/tests/baselines/reference/constructSignaturesWithOverloads2.symbols
+++ b/tests/baselines/reference/constructSignaturesWithOverloads2.symbols
@@ -92,15 +92,15 @@ interface I<T> {
 >T : Symbol(T, Decl(constructSignaturesWithOverloads2.ts, 31, 12))
 }
 
-var i2: I<number>;
->i2 : Symbol(i2, Decl(constructSignaturesWithOverloads2.ts, 36, 3))
+declare var i2: I<number>;
+>i2 : Symbol(i2, Decl(constructSignaturesWithOverloads2.ts, 36, 11))
 >I : Symbol(I, Decl(constructSignaturesWithOverloads2.ts, 23, 23), Decl(constructSignaturesWithOverloads2.ts, 29, 1))
 
 var r4 = new i2(1, '');
 >r4 : Symbol(r4, Decl(constructSignaturesWithOverloads2.ts, 37, 3))
->i2 : Symbol(i2, Decl(constructSignaturesWithOverloads2.ts, 36, 3))
+>i2 : Symbol(i2, Decl(constructSignaturesWithOverloads2.ts, 36, 11))
 
 var r5 = new i2(1, 1);
 >r5 : Symbol(r5, Decl(constructSignaturesWithOverloads2.ts, 38, 3))
->i2 : Symbol(i2, Decl(constructSignaturesWithOverloads2.ts, 36, 3))
+>i2 : Symbol(i2, Decl(constructSignaturesWithOverloads2.ts, 36, 11))
 
diff --git a/tests/baselines/reference/constructSignaturesWithOverloads2.types b/tests/baselines/reference/constructSignaturesWithOverloads2.types
index 2bbd9aae8b858..d576846093f79 100644
--- a/tests/baselines/reference/constructSignaturesWithOverloads2.types
+++ b/tests/baselines/reference/constructSignaturesWithOverloads2.types
@@ -119,7 +119,7 @@ interface I<T> {
 >  : ^^^^^^
 }
 
-var i2: I<number>;
+declare var i2: I<number>;
 >i2 : I<number>
 >   : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/constructorAsType.errors.txt b/tests/baselines/reference/constructorAsType.errors.txt
index f48fa929cb2f2..12a7ac765976c 100644
--- a/tests/baselines/reference/constructorAsType.errors.txt
+++ b/tests/baselines/reference/constructorAsType.errors.txt
@@ -8,6 +8,6 @@ constructorAsType.ts(1,5): error TS2322: Type '() => { name: string; }' is not a
 !!! error TS2322: Type '() => { name: string; }' is not assignable to type 'new () => { name: string; }'.
 !!! error TS2322:   Type '() => { name: string; }' provides no match for the signature 'new (): { name: string; }'.
     
-    var Person2:{new() : {name:string;};};
+    declare var Person2:{new() : {name:string;};};
     
     Person = Person2;
\ No newline at end of file
diff --git a/tests/baselines/reference/constructorAsType.js b/tests/baselines/reference/constructorAsType.js
index 92ebd0a938395..d512a58c24fab 100644
--- a/tests/baselines/reference/constructorAsType.js
+++ b/tests/baselines/reference/constructorAsType.js
@@ -3,11 +3,10 @@
 //// [constructorAsType.ts]
 var Person:new () => {name: string;} = function () {return {name:"joe"};};
 
-var Person2:{new() : {name:string;};};
+declare var Person2:{new() : {name:string;};};
 
 Person = Person2;
 
 //// [constructorAsType.js]
 var Person = function () { return { name: "joe" }; };
-var Person2;
 Person = Person2;
diff --git a/tests/baselines/reference/constructorAsType.symbols b/tests/baselines/reference/constructorAsType.symbols
index 8681831bb4dce..3867c1ccd616a 100644
--- a/tests/baselines/reference/constructorAsType.symbols
+++ b/tests/baselines/reference/constructorAsType.symbols
@@ -6,11 +6,11 @@ var Person:new () => {name: string;} = function () {return {name:"joe"};};
 >name : Symbol(name, Decl(constructorAsType.ts, 0, 22))
 >name : Symbol(name, Decl(constructorAsType.ts, 0, 60))
 
-var Person2:{new() : {name:string;};};
->Person2 : Symbol(Person2, Decl(constructorAsType.ts, 2, 3))
->name : Symbol(name, Decl(constructorAsType.ts, 2, 22))
+declare var Person2:{new() : {name:string;};};
+>Person2 : Symbol(Person2, Decl(constructorAsType.ts, 2, 11))
+>name : Symbol(name, Decl(constructorAsType.ts, 2, 30))
 
 Person = Person2;
 >Person : Symbol(Person, Decl(constructorAsType.ts, 0, 3))
->Person2 : Symbol(Person2, Decl(constructorAsType.ts, 2, 3))
+>Person2 : Symbol(Person2, Decl(constructorAsType.ts, 2, 11))
 
diff --git a/tests/baselines/reference/constructorAsType.types b/tests/baselines/reference/constructorAsType.types
index 878f3266b0ece..38c825db0442b 100644
--- a/tests/baselines/reference/constructorAsType.types
+++ b/tests/baselines/reference/constructorAsType.types
@@ -15,7 +15,7 @@ var Person:new () => {name: string;} = function () {return {name:"joe"};};
 >"joe" : "joe"
 >      : ^^^^^
 
-var Person2:{new() : {name:string;};};
+declare var Person2:{new() : {name:string;};};
 >Person2 : new () => { name: string; }
 >        : ^^^^^^^^^^                 
 >name : string
diff --git a/tests/baselines/reference/constructorParameterProperties.errors.txt b/tests/baselines/reference/constructorParameterProperties.errors.txt
index 37a842b4df3c3..b76eb9c6988c6 100644
--- a/tests/baselines/reference/constructorParameterProperties.errors.txt
+++ b/tests/baselines/reference/constructorParameterProperties.errors.txt
@@ -11,7 +11,7 @@ constructorParameterProperties.ts(20,12): error TS2445: Property 'z' is protecte
         constructor(private x: string, protected z: string) { }
     }
     
-    var c: C;
+    declare var c: C;
     var r = c.y;
     var r2 = c.x; // error
                ~
@@ -25,7 +25,7 @@ constructorParameterProperties.ts(20,12): error TS2445: Property 'z' is protecte
         constructor(a: T, private x: T, protected z: T) { }
     }
     
-    var d: D<string>;
+    declare var d: D<string>;
     var r = d.y;
     var r2 = d.x; // error
                ~
diff --git a/tests/baselines/reference/constructorParameterProperties.js b/tests/baselines/reference/constructorParameterProperties.js
index e5ea759e975eb..a15933052ad84 100644
--- a/tests/baselines/reference/constructorParameterProperties.js
+++ b/tests/baselines/reference/constructorParameterProperties.js
@@ -6,7 +6,7 @@ class C {
     constructor(private x: string, protected z: string) { }
 }
 
-var c: C;
+declare var c: C;
 var r = c.y;
 var r2 = c.x; // error
 var r3 = c.z; // error
@@ -16,7 +16,7 @@ class D<T> {
     constructor(a: T, private x: T, protected z: T) { }
 }
 
-var d: D<string>;
+declare var d: D<string>;
 var r = d.y;
 var r2 = d.x; // error
 var r3 = d.a; // error
@@ -31,7 +31,6 @@ var C = /** @class */ (function () {
     }
     return C;
 }());
-var c;
 var r = c.y;
 var r2 = c.x; // error
 var r3 = c.z; // error
@@ -42,7 +41,6 @@ var D = /** @class */ (function () {
     }
     return D;
 }());
-var d;
 var r = d.y;
 var r2 = d.x; // error
 var r3 = d.a; // error
diff --git a/tests/baselines/reference/constructorParameterProperties.symbols b/tests/baselines/reference/constructorParameterProperties.symbols
index faa0af35fd850..ab2d5b10f333a 100644
--- a/tests/baselines/reference/constructorParameterProperties.symbols
+++ b/tests/baselines/reference/constructorParameterProperties.symbols
@@ -12,26 +12,26 @@ class C {
 >z : Symbol(C.z, Decl(constructorParameterProperties.ts, 2, 34))
 }
 
-var c: C;
->c : Symbol(c, Decl(constructorParameterProperties.ts, 5, 3))
+declare var c: C;
+>c : Symbol(c, Decl(constructorParameterProperties.ts, 5, 11))
 >C : Symbol(C, Decl(constructorParameterProperties.ts, 0, 0))
 
 var r = c.y;
 >r : Symbol(r, Decl(constructorParameterProperties.ts, 6, 3), Decl(constructorParameterProperties.ts, 16, 3))
 >c.y : Symbol(C.y, Decl(constructorParameterProperties.ts, 0, 9))
->c : Symbol(c, Decl(constructorParameterProperties.ts, 5, 3))
+>c : Symbol(c, Decl(constructorParameterProperties.ts, 5, 11))
 >y : Symbol(C.y, Decl(constructorParameterProperties.ts, 0, 9))
 
 var r2 = c.x; // error
 >r2 : Symbol(r2, Decl(constructorParameterProperties.ts, 7, 3), Decl(constructorParameterProperties.ts, 17, 3))
 >c.x : Symbol(C.x, Decl(constructorParameterProperties.ts, 2, 16))
->c : Symbol(c, Decl(constructorParameterProperties.ts, 5, 3))
+>c : Symbol(c, Decl(constructorParameterProperties.ts, 5, 11))
 >x : Symbol(C.x, Decl(constructorParameterProperties.ts, 2, 16))
 
 var r3 = c.z; // error
 >r3 : Symbol(r3, Decl(constructorParameterProperties.ts, 8, 3), Decl(constructorParameterProperties.ts, 18, 3))
 >c.z : Symbol(C.z, Decl(constructorParameterProperties.ts, 2, 34))
->c : Symbol(c, Decl(constructorParameterProperties.ts, 5, 3))
+>c : Symbol(c, Decl(constructorParameterProperties.ts, 5, 11))
 >z : Symbol(C.z, Decl(constructorParameterProperties.ts, 2, 34))
 
 class D<T> {
@@ -51,29 +51,29 @@ class D<T> {
 >T : Symbol(T, Decl(constructorParameterProperties.ts, 10, 8))
 }
 
-var d: D<string>;
->d : Symbol(d, Decl(constructorParameterProperties.ts, 15, 3))
+declare var d: D<string>;
+>d : Symbol(d, Decl(constructorParameterProperties.ts, 15, 11))
 >D : Symbol(D, Decl(constructorParameterProperties.ts, 8, 13))
 
 var r = d.y;
 >r : Symbol(r, Decl(constructorParameterProperties.ts, 6, 3), Decl(constructorParameterProperties.ts, 16, 3))
 >d.y : Symbol(D.y, Decl(constructorParameterProperties.ts, 10, 12))
->d : Symbol(d, Decl(constructorParameterProperties.ts, 15, 3))
+>d : Symbol(d, Decl(constructorParameterProperties.ts, 15, 11))
 >y : Symbol(D.y, Decl(constructorParameterProperties.ts, 10, 12))
 
 var r2 = d.x; // error
 >r2 : Symbol(r2, Decl(constructorParameterProperties.ts, 7, 3), Decl(constructorParameterProperties.ts, 17, 3))
 >d.x : Symbol(D.x, Decl(constructorParameterProperties.ts, 12, 21))
->d : Symbol(d, Decl(constructorParameterProperties.ts, 15, 3))
+>d : Symbol(d, Decl(constructorParameterProperties.ts, 15, 11))
 >x : Symbol(D.x, Decl(constructorParameterProperties.ts, 12, 21))
 
 var r3 = d.a; // error
 >r3 : Symbol(r3, Decl(constructorParameterProperties.ts, 8, 3), Decl(constructorParameterProperties.ts, 18, 3))
->d : Symbol(d, Decl(constructorParameterProperties.ts, 15, 3))
+>d : Symbol(d, Decl(constructorParameterProperties.ts, 15, 11))
 
 var r4 = d.z; // error
 >r4 : Symbol(r4, Decl(constructorParameterProperties.ts, 19, 3))
 >d.z : Symbol(D.z, Decl(constructorParameterProperties.ts, 12, 35))
->d : Symbol(d, Decl(constructorParameterProperties.ts, 15, 3))
+>d : Symbol(d, Decl(constructorParameterProperties.ts, 15, 11))
 >z : Symbol(D.z, Decl(constructorParameterProperties.ts, 12, 35))
 
diff --git a/tests/baselines/reference/constructorParameterProperties.types b/tests/baselines/reference/constructorParameterProperties.types
index 82d71c5d4c8d8..8473a961cad0a 100644
--- a/tests/baselines/reference/constructorParameterProperties.types
+++ b/tests/baselines/reference/constructorParameterProperties.types
@@ -16,7 +16,7 @@ class C {
 >  : ^^^^^^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
@@ -67,7 +67,7 @@ class D<T> {
 >  : ^
 }
 
-var d: D<string>;
+declare var d: D<string>;
 >d : D<string>
 >  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/constructorParameterProperties2.errors.txt b/tests/baselines/reference/constructorParameterProperties2.errors.txt
index 36cc1942b95d2..91c54823d681b 100644
--- a/tests/baselines/reference/constructorParameterProperties2.errors.txt
+++ b/tests/baselines/reference/constructorParameterProperties2.errors.txt
@@ -13,7 +13,7 @@ constructorParameterProperties2.ts(27,27): error TS2687: All declarations of 'y'
         constructor(y: number) { } // ok
     }
     
-    var c: C;
+    declare var c: C;
     var r = c.y;
     
     class D {
@@ -23,7 +23,7 @@ constructorParameterProperties2.ts(27,27): error TS2687: All declarations of 'y'
 !!! error TS2300: Duplicate identifier 'y'.
     }
     
-    var d: D;
+    declare var d: D;
     var r2 = d.y;
     
     class E {
@@ -37,7 +37,7 @@ constructorParameterProperties2.ts(27,27): error TS2687: All declarations of 'y'
 !!! error TS2687: All declarations of 'y' must have identical modifiers.
     }
     
-    var e: E;
+    declare var e: E;
     var r3 = e.y; // error
     
     class F {
@@ -51,6 +51,6 @@ constructorParameterProperties2.ts(27,27): error TS2687: All declarations of 'y'
 !!! error TS2687: All declarations of 'y' must have identical modifiers.
     }
     
-    var f: F;
+    declare var f: F;
     var r4 = f.y; // error
     
\ No newline at end of file
diff --git a/tests/baselines/reference/constructorParameterProperties2.js b/tests/baselines/reference/constructorParameterProperties2.js
index 04ef2d354cada..bc5333cc91368 100644
--- a/tests/baselines/reference/constructorParameterProperties2.js
+++ b/tests/baselines/reference/constructorParameterProperties2.js
@@ -6,7 +6,7 @@ class C {
     constructor(y: number) { } // ok
 }
 
-var c: C;
+declare var c: C;
 var r = c.y;
 
 class D {
@@ -14,7 +14,7 @@ class D {
     constructor(public y: number) { } // error
 }
 
-var d: D;
+declare var d: D;
 var r2 = d.y;
 
 class E {
@@ -22,7 +22,7 @@ class E {
     constructor(private y: number) { } // error
 }
 
-var e: E;
+declare var e: E;
 var r3 = e.y; // error
 
 class F {
@@ -30,7 +30,7 @@ class F {
     constructor(protected y: number) { } // error
 }
 
-var f: F;
+declare var f: F;
 var r4 = f.y; // error
 
 
@@ -40,7 +40,6 @@ var C = /** @class */ (function () {
     } // ok
     return C;
 }());
-var c;
 var r = c.y;
 var D = /** @class */ (function () {
     function D(y) {
@@ -48,7 +47,6 @@ var D = /** @class */ (function () {
     } // error
     return D;
 }());
-var d;
 var r2 = d.y;
 var E = /** @class */ (function () {
     function E(y) {
@@ -56,7 +54,6 @@ var E = /** @class */ (function () {
     } // error
     return E;
 }());
-var e;
 var r3 = e.y; // error
 var F = /** @class */ (function () {
     function F(y) {
@@ -64,5 +61,4 @@ var F = /** @class */ (function () {
     } // error
     return F;
 }());
-var f;
 var r4 = f.y; // error
diff --git a/tests/baselines/reference/constructorParameterProperties2.symbols b/tests/baselines/reference/constructorParameterProperties2.symbols
index b066029f6db8e..4cb517cf14ee4 100644
--- a/tests/baselines/reference/constructorParameterProperties2.symbols
+++ b/tests/baselines/reference/constructorParameterProperties2.symbols
@@ -11,14 +11,14 @@ class C {
 >y : Symbol(y, Decl(constructorParameterProperties2.ts, 2, 16))
 }
 
-var c: C;
->c : Symbol(c, Decl(constructorParameterProperties2.ts, 5, 3))
+declare var c: C;
+>c : Symbol(c, Decl(constructorParameterProperties2.ts, 5, 11))
 >C : Symbol(C, Decl(constructorParameterProperties2.ts, 0, 0))
 
 var r = c.y;
 >r : Symbol(r, Decl(constructorParameterProperties2.ts, 6, 3))
 >c.y : Symbol(C.y, Decl(constructorParameterProperties2.ts, 0, 9))
->c : Symbol(c, Decl(constructorParameterProperties2.ts, 5, 3))
+>c : Symbol(c, Decl(constructorParameterProperties2.ts, 5, 11))
 >y : Symbol(C.y, Decl(constructorParameterProperties2.ts, 0, 9))
 
 class D {
@@ -31,14 +31,14 @@ class D {
 >y : Symbol(D.y, Decl(constructorParameterProperties2.ts, 8, 9), Decl(constructorParameterProperties2.ts, 10, 16))
 }
 
-var d: D;
->d : Symbol(d, Decl(constructorParameterProperties2.ts, 13, 3))
+declare var d: D;
+>d : Symbol(d, Decl(constructorParameterProperties2.ts, 13, 11))
 >D : Symbol(D, Decl(constructorParameterProperties2.ts, 6, 12))
 
 var r2 = d.y;
 >r2 : Symbol(r2, Decl(constructorParameterProperties2.ts, 14, 3))
 >d.y : Symbol(D.y, Decl(constructorParameterProperties2.ts, 8, 9), Decl(constructorParameterProperties2.ts, 10, 16))
->d : Symbol(d, Decl(constructorParameterProperties2.ts, 13, 3))
+>d : Symbol(d, Decl(constructorParameterProperties2.ts, 13, 11))
 >y : Symbol(D.y, Decl(constructorParameterProperties2.ts, 8, 9), Decl(constructorParameterProperties2.ts, 10, 16))
 
 class E {
@@ -51,14 +51,14 @@ class E {
 >y : Symbol(E.y, Decl(constructorParameterProperties2.ts, 16, 9), Decl(constructorParameterProperties2.ts, 18, 16))
 }
 
-var e: E;
->e : Symbol(e, Decl(constructorParameterProperties2.ts, 21, 3))
+declare var e: E;
+>e : Symbol(e, Decl(constructorParameterProperties2.ts, 21, 11))
 >E : Symbol(E, Decl(constructorParameterProperties2.ts, 14, 13))
 
 var r3 = e.y; // error
 >r3 : Symbol(r3, Decl(constructorParameterProperties2.ts, 22, 3))
 >e.y : Symbol(E.y, Decl(constructorParameterProperties2.ts, 16, 9), Decl(constructorParameterProperties2.ts, 18, 16))
->e : Symbol(e, Decl(constructorParameterProperties2.ts, 21, 3))
+>e : Symbol(e, Decl(constructorParameterProperties2.ts, 21, 11))
 >y : Symbol(E.y, Decl(constructorParameterProperties2.ts, 16, 9), Decl(constructorParameterProperties2.ts, 18, 16))
 
 class F {
@@ -71,13 +71,13 @@ class F {
 >y : Symbol(F.y, Decl(constructorParameterProperties2.ts, 24, 9), Decl(constructorParameterProperties2.ts, 26, 16))
 }
 
-var f: F;
->f : Symbol(f, Decl(constructorParameterProperties2.ts, 29, 3))
+declare var f: F;
+>f : Symbol(f, Decl(constructorParameterProperties2.ts, 29, 11))
 >F : Symbol(F, Decl(constructorParameterProperties2.ts, 22, 13))
 
 var r4 = f.y; // error
 >r4 : Symbol(r4, Decl(constructorParameterProperties2.ts, 30, 3))
 >f.y : Symbol(F.y, Decl(constructorParameterProperties2.ts, 24, 9), Decl(constructorParameterProperties2.ts, 26, 16))
->f : Symbol(f, Decl(constructorParameterProperties2.ts, 29, 3))
+>f : Symbol(f, Decl(constructorParameterProperties2.ts, 29, 11))
 >y : Symbol(F.y, Decl(constructorParameterProperties2.ts, 24, 9), Decl(constructorParameterProperties2.ts, 26, 16))
 
diff --git a/tests/baselines/reference/constructorParameterProperties2.types b/tests/baselines/reference/constructorParameterProperties2.types
index d33d78bda9ce9..1200f75bc07a9 100644
--- a/tests/baselines/reference/constructorParameterProperties2.types
+++ b/tests/baselines/reference/constructorParameterProperties2.types
@@ -14,7 +14,7 @@ class C {
 >  : ^^^^^^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
@@ -41,7 +41,7 @@ class D {
 >  : ^^^^^^
 }
 
-var d: D;
+declare var d: D;
 >d : D
 >  : ^
 
@@ -68,7 +68,7 @@ class E {
 >  : ^^^^^^
 }
 
-var e: E;
+declare var e: E;
 >e : E
 >  : ^
 
@@ -95,7 +95,7 @@ class F {
 >  : ^^^^^^
 }
 
-var f: F;
+declare var f: F;
 >f : F
 >  : ^
 
diff --git a/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt b/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt
index de50337a73ec5..6e49ea2bad965 100644
--- a/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt
+++ b/tests/baselines/reference/contextualSignatureInstatiationContravariance.errors.txt
@@ -8,9 +8,9 @@ contextualSignatureInstatiationContravariance.ts(8,1): error TS2322: Type '<T ex
     interface Giraffe extends Animal { y }
     interface Elephant extends Animal { y2 }
     
-    var f2: <T extends Animal>(x: T, y: T) => void;
+    declare var f2: <T extends Animal>(x: T, y: T) => void;
     
-    var g2: (g: Giraffe, e: Elephant) => void;
+    declare var g2: (g: Giraffe, e: Elephant) => void;
     g2 = f2; // error because Giraffe and Elephant are disjoint types
     ~~
 !!! error TS2322: Type '<T extends Animal>(x: T, y: T) => void' is not assignable to type '(g: Giraffe, e: Elephant) => void'.
@@ -18,5 +18,5 @@ contextualSignatureInstatiationContravariance.ts(8,1): error TS2322: Type '<T ex
 !!! error TS2322:     Property 'y' is missing in type 'Elephant' but required in type 'Giraffe'.
 !!! related TS2728 contextualSignatureInstatiationContravariance.ts:2:36: 'y' is declared here.
     
-    var h2: (g1: Giraffe, g2: Giraffe) => void;
+    declare var h2: (g1: Giraffe, g2: Giraffe) => void;
     h2 = f2; // valid because Giraffe satisfies the constraint. It is safe in the traditional contravariant fashion.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualSignatureInstatiationContravariance.js b/tests/baselines/reference/contextualSignatureInstatiationContravariance.js
index 17969fc9cd531..271c9c7aaa79d 100644
--- a/tests/baselines/reference/contextualSignatureInstatiationContravariance.js
+++ b/tests/baselines/reference/contextualSignatureInstatiationContravariance.js
@@ -5,17 +5,14 @@ interface Animal { x }
 interface Giraffe extends Animal { y }
 interface Elephant extends Animal { y2 }
 
-var f2: <T extends Animal>(x: T, y: T) => void;
+declare var f2: <T extends Animal>(x: T, y: T) => void;
 
-var g2: (g: Giraffe, e: Elephant) => void;
+declare var g2: (g: Giraffe, e: Elephant) => void;
 g2 = f2; // error because Giraffe and Elephant are disjoint types
 
-var h2: (g1: Giraffe, g2: Giraffe) => void;
+declare var h2: (g1: Giraffe, g2: Giraffe) => void;
 h2 = f2; // valid because Giraffe satisfies the constraint. It is safe in the traditional contravariant fashion.
 
 //// [contextualSignatureInstatiationContravariance.js]
-var f2;
-var g2;
 g2 = f2; // error because Giraffe and Elephant are disjoint types
-var h2;
 h2 = f2; // valid because Giraffe satisfies the constraint. It is safe in the traditional contravariant fashion.
diff --git a/tests/baselines/reference/contextualSignatureInstatiationContravariance.symbols b/tests/baselines/reference/contextualSignatureInstatiationContravariance.symbols
index 823ae90b6a5d2..a836c3fd6532b 100644
--- a/tests/baselines/reference/contextualSignatureInstatiationContravariance.symbols
+++ b/tests/baselines/reference/contextualSignatureInstatiationContravariance.symbols
@@ -15,34 +15,34 @@ interface Elephant extends Animal { y2 }
 >Animal : Symbol(Animal, Decl(contextualSignatureInstatiationContravariance.ts, 0, 0))
 >y2 : Symbol(Elephant.y2, Decl(contextualSignatureInstatiationContravariance.ts, 2, 35))
 
-var f2: <T extends Animal>(x: T, y: T) => void;
->f2 : Symbol(f2, Decl(contextualSignatureInstatiationContravariance.ts, 4, 3))
->T : Symbol(T, Decl(contextualSignatureInstatiationContravariance.ts, 4, 9))
+declare var f2: <T extends Animal>(x: T, y: T) => void;
+>f2 : Symbol(f2, Decl(contextualSignatureInstatiationContravariance.ts, 4, 11))
+>T : Symbol(T, Decl(contextualSignatureInstatiationContravariance.ts, 4, 17))
 >Animal : Symbol(Animal, Decl(contextualSignatureInstatiationContravariance.ts, 0, 0))
->x : Symbol(x, Decl(contextualSignatureInstatiationContravariance.ts, 4, 27))
->T : Symbol(T, Decl(contextualSignatureInstatiationContravariance.ts, 4, 9))
->y : Symbol(y, Decl(contextualSignatureInstatiationContravariance.ts, 4, 32))
->T : Symbol(T, Decl(contextualSignatureInstatiationContravariance.ts, 4, 9))
-
-var g2: (g: Giraffe, e: Elephant) => void;
->g2 : Symbol(g2, Decl(contextualSignatureInstatiationContravariance.ts, 6, 3))
->g : Symbol(g, Decl(contextualSignatureInstatiationContravariance.ts, 6, 9))
+>x : Symbol(x, Decl(contextualSignatureInstatiationContravariance.ts, 4, 35))
+>T : Symbol(T, Decl(contextualSignatureInstatiationContravariance.ts, 4, 17))
+>y : Symbol(y, Decl(contextualSignatureInstatiationContravariance.ts, 4, 40))
+>T : Symbol(T, Decl(contextualSignatureInstatiationContravariance.ts, 4, 17))
+
+declare var g2: (g: Giraffe, e: Elephant) => void;
+>g2 : Symbol(g2, Decl(contextualSignatureInstatiationContravariance.ts, 6, 11))
+>g : Symbol(g, Decl(contextualSignatureInstatiationContravariance.ts, 6, 17))
 >Giraffe : Symbol(Giraffe, Decl(contextualSignatureInstatiationContravariance.ts, 0, 22))
->e : Symbol(e, Decl(contextualSignatureInstatiationContravariance.ts, 6, 20))
+>e : Symbol(e, Decl(contextualSignatureInstatiationContravariance.ts, 6, 28))
 >Elephant : Symbol(Elephant, Decl(contextualSignatureInstatiationContravariance.ts, 1, 38))
 
 g2 = f2; // error because Giraffe and Elephant are disjoint types
->g2 : Symbol(g2, Decl(contextualSignatureInstatiationContravariance.ts, 6, 3))
->f2 : Symbol(f2, Decl(contextualSignatureInstatiationContravariance.ts, 4, 3))
+>g2 : Symbol(g2, Decl(contextualSignatureInstatiationContravariance.ts, 6, 11))
+>f2 : Symbol(f2, Decl(contextualSignatureInstatiationContravariance.ts, 4, 11))
 
-var h2: (g1: Giraffe, g2: Giraffe) => void;
->h2 : Symbol(h2, Decl(contextualSignatureInstatiationContravariance.ts, 9, 3))
->g1 : Symbol(g1, Decl(contextualSignatureInstatiationContravariance.ts, 9, 9))
+declare var h2: (g1: Giraffe, g2: Giraffe) => void;
+>h2 : Symbol(h2, Decl(contextualSignatureInstatiationContravariance.ts, 9, 11))
+>g1 : Symbol(g1, Decl(contextualSignatureInstatiationContravariance.ts, 9, 17))
 >Giraffe : Symbol(Giraffe, Decl(contextualSignatureInstatiationContravariance.ts, 0, 22))
->g2 : Symbol(g2, Decl(contextualSignatureInstatiationContravariance.ts, 9, 21))
+>g2 : Symbol(g2, Decl(contextualSignatureInstatiationContravariance.ts, 9, 29))
 >Giraffe : Symbol(Giraffe, Decl(contextualSignatureInstatiationContravariance.ts, 0, 22))
 
 h2 = f2; // valid because Giraffe satisfies the constraint. It is safe in the traditional contravariant fashion.
->h2 : Symbol(h2, Decl(contextualSignatureInstatiationContravariance.ts, 9, 3))
->f2 : Symbol(f2, Decl(contextualSignatureInstatiationContravariance.ts, 4, 3))
+>h2 : Symbol(h2, Decl(contextualSignatureInstatiationContravariance.ts, 9, 11))
+>f2 : Symbol(f2, Decl(contextualSignatureInstatiationContravariance.ts, 4, 11))
 
diff --git a/tests/baselines/reference/contextualSignatureInstatiationContravariance.types b/tests/baselines/reference/contextualSignatureInstatiationContravariance.types
index b8639428a0a55..0da33fed2f294 100644
--- a/tests/baselines/reference/contextualSignatureInstatiationContravariance.types
+++ b/tests/baselines/reference/contextualSignatureInstatiationContravariance.types
@@ -13,7 +13,7 @@ interface Elephant extends Animal { y2 }
 >y2 : any
 >   : ^^^
 
-var f2: <T extends Animal>(x: T, y: T) => void;
+declare var f2: <T extends Animal>(x: T, y: T) => void;
 >f2 : <T extends Animal>(x: T, y: T) => void
 >   : ^ ^^^^^^^^^      ^^ ^^ ^^ ^^ ^^^^^    
 >x : T
@@ -21,7 +21,7 @@ var f2: <T extends Animal>(x: T, y: T) => void;
 >y : T
 >  : ^
 
-var g2: (g: Giraffe, e: Elephant) => void;
+declare var g2: (g: Giraffe, e: Elephant) => void;
 >g2 : (g: Giraffe, e: Elephant) => void
 >   : ^ ^^       ^^ ^^        ^^^^^    
 >g : Giraffe
@@ -37,7 +37,7 @@ g2 = f2; // error because Giraffe and Elephant are disjoint types
 >f2 : <T extends Animal>(x: T, y: T) => void
 >   : ^ ^^^^^^^^^      ^^ ^^ ^^ ^^ ^^^^^    
 
-var h2: (g1: Giraffe, g2: Giraffe) => void;
+declare var h2: (g1: Giraffe, g2: Giraffe) => void;
 >h2 : (g1: Giraffe, g2: Giraffe) => void
 >   : ^  ^^       ^^  ^^       ^^^^^    
 >g1 : Giraffe
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt
index 7d5047598b56a..da5529ef91a81 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt
@@ -30,11 +30,11 @@ contextualTypeWithUnionTypeObjectLiteral.ts(58,5): error TS2322: Type '(a: strin
 
 
 ==== contextualTypeWithUnionTypeObjectLiteral.ts (6 errors) ====
-    var str: string;
-    var num: number;
+    declare var str: string;
+    declare var num: number;
     var strOrNumber: string | number = str || num;
-    var objStr: { prop: string };
-    var objNum: { prop: number };
+    declare var objStr: { prop: string };
+    declare var objNum: { prop: number };
     var objStrOrNum1: { prop: string } | { prop: number } = objStr || objNum;
     var objStrOrNum2: { prop: string | number } = objStr || objNum;
     // Below is error because :
@@ -99,8 +99,8 @@ contextualTypeWithUnionTypeObjectLiteral.ts(58,5): error TS2322: Type '(a: strin
     interface I21 {
         commonMethodDifferentReturnType(a: string, b: number): number;
     }
-    var i11: I11;
-    var i21: I21;
+    declare var i11: I11;
+    declare var i21: I21;
     var i11Ori21: I11 | I21 = i11;
     var i11Ori21: I11 | I21 = i21;
     var i11Ori21: I11 | I21 = { // Like i1
@@ -115,7 +115,7 @@ contextualTypeWithUnionTypeObjectLiteral.ts(58,5): error TS2322: Type '(a: strin
             return z;
         },
     };
-    var strOrNumber: string | number;
+    declare var strOrNumber: string | number;
     var i11Ori21: I11 | I21 = { // Like i1 and i2 both
         commonMethodDifferentReturnType: (a, b) => strOrNumber,
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.js b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.js
index d09b362186d58..ed07f67f5b79d 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.js
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.js
@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts] ////
 
 //// [contextualTypeWithUnionTypeObjectLiteral.ts]
-var str: string;
-var num: number;
+declare var str: string;
+declare var num: number;
 var strOrNumber: string | number = str || num;
-var objStr: { prop: string };
-var objNum: { prop: number };
+declare var objStr: { prop: string };
+declare var objNum: { prop: number };
 var objStrOrNum1: { prop: string } | { prop: number } = objStr || objNum;
 var objStrOrNum2: { prop: string | number } = objStr || objNum;
 // Below is error because :
@@ -40,8 +40,8 @@ interface I11 {
 interface I21 {
     commonMethodDifferentReturnType(a: string, b: number): number;
 }
-var i11: I11;
-var i21: I21;
+declare var i11: I11;
+declare var i21: I21;
 var i11Ori21: I11 | I21 = i11;
 var i11Ori21: I11 | I21 = i21;
 var i11Ori21: I11 | I21 = { // Like i1
@@ -56,17 +56,13 @@ var i11Ori21: I11 | I21 = { // Like i2
         return z;
     },
 };
-var strOrNumber: string | number;
+declare var strOrNumber: string | number;
 var i11Ori21: I11 | I21 = { // Like i1 and i2 both
     commonMethodDifferentReturnType: (a, b) => strOrNumber,
 };
 
 //// [contextualTypeWithUnionTypeObjectLiteral.js]
-var str;
-var num;
 var strOrNumber = str || num;
-var objStr;
-var objNum;
 var objStrOrNum1 = objStr || objNum;
 var objStrOrNum2 = objStr || objNum;
 // Below is error because :
@@ -95,8 +91,6 @@ var objStrOrNum8 = {
     anotherP: str,
     anotherP1: num
 };
-var i11;
-var i21;
 var i11Ori21 = i11;
 var i11Ori21 = i21;
 var i11Ori21 = {
@@ -111,7 +105,6 @@ var i11Ori21 = {
         return z;
     },
 };
-var strOrNumber;
 var i11Ori21 = {
     commonMethodDifferentReturnType: function (a, b) { return strOrNumber; },
 };
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.symbols b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.symbols
index 8a4484ebb3607..6991c3f9afc71 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.symbols
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.symbols
@@ -1,37 +1,37 @@
 //// [tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts] ////
 
 === contextualTypeWithUnionTypeObjectLiteral.ts ===
-var str: string;
->str : Symbol(str, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 0, 3))
+declare var str: string;
+>str : Symbol(str, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 0, 11))
 
-var num: number;
->num : Symbol(num, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 1, 3))
+declare var num: number;
+>num : Symbol(num, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 1, 11))
 
 var strOrNumber: string | number = str || num;
->strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 3))
->str : Symbol(str, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 0, 3))
->num : Symbol(num, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 1, 3))
+>strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 11))
+>str : Symbol(str, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 0, 11))
+>num : Symbol(num, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 1, 11))
 
-var objStr: { prop: string };
->objStr : Symbol(objStr, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 3, 3))
->prop : Symbol(prop, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 3, 13))
+declare var objStr: { prop: string };
+>objStr : Symbol(objStr, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 3, 11))
+>prop : Symbol(prop, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 3, 21))
 
-var objNum: { prop: number };
->objNum : Symbol(objNum, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 4, 3))
->prop : Symbol(prop, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 4, 13))
+declare var objNum: { prop: number };
+>objNum : Symbol(objNum, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 4, 11))
+>prop : Symbol(prop, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 4, 21))
 
 var objStrOrNum1: { prop: string } | { prop: number } = objStr || objNum;
 >objStrOrNum1 : Symbol(objStrOrNum1, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 5, 3))
 >prop : Symbol(prop, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 5, 19))
 >prop : Symbol(prop, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 5, 38))
->objStr : Symbol(objStr, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 3, 3))
->objNum : Symbol(objNum, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 4, 3))
+>objStr : Symbol(objStr, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 3, 11))
+>objNum : Symbol(objNum, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 4, 11))
 
 var objStrOrNum2: { prop: string | number } = objStr || objNum;
 >objStrOrNum2 : Symbol(objStrOrNum2, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 6, 3))
 >prop : Symbol(prop, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 6, 19))
->objStr : Symbol(objStr, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 3, 3))
->objNum : Symbol(objNum, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 4, 3))
+>objStr : Symbol(objStr, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 3, 11))
+>objNum : Symbol(objNum, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 4, 11))
 
 // Below is error because :
 // Spec says:
@@ -46,7 +46,7 @@ var objStrOrNum3: { prop: string } | { prop: number } = {
 
     prop: strOrNumber
 >prop : Symbol(prop, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 13, 57))
->strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 3))
+>strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 11))
 
 };
 var objStrOrNum4: { prop: string | number } = {
@@ -55,7 +55,7 @@ var objStrOrNum4: { prop: string | number } = {
 
     prop: strOrNumber
 >prop : Symbol(prop, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 16, 47))
->strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 3))
+>strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 11))
 
 };
 var objStrOrNum5: { prop: string; anotherP: string; } | { prop: number } = { prop: strOrNumber };
@@ -64,7 +64,7 @@ var objStrOrNum5: { prop: string; anotherP: string; } | { prop: number } = { pro
 >anotherP : Symbol(anotherP, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 19, 33))
 >prop : Symbol(prop, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 19, 57))
 >prop : Symbol(prop, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 19, 76))
->strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 3))
+>strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 11))
 
 var objStrOrNum6: { prop: string; anotherP: string; } | { prop: number } = {
 >objStrOrNum6 : Symbol(objStrOrNum6, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 20, 3))
@@ -74,11 +74,11 @@ var objStrOrNum6: { prop: string; anotherP: string; } | { prop: number } = {
 
     prop: strOrNumber,
 >prop : Symbol(prop, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 20, 76))
->strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 3))
+>strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 11))
 
     anotherP: str
 >anotherP : Symbol(anotherP, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 21, 22))
->str : Symbol(str, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 0, 3))
+>str : Symbol(str, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 0, 11))
 
 };
 var objStrOrNum7: { prop: string; anotherP: string; } | { prop: number; anotherP1: number } = {
@@ -90,11 +90,11 @@ var objStrOrNum7: { prop: string; anotherP: string; } | { prop: number; anotherP
 
     prop: strOrNumber,
 >prop : Symbol(prop, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 24, 95))
->strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 3))
+>strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 11))
 
     anotherP: str
 >anotherP : Symbol(anotherP, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 25, 22))
->str : Symbol(str, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 0, 3))
+>str : Symbol(str, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 0, 11))
 
 };
 var objStrOrNum8: { prop: string; anotherP: string; } | { prop: number; anotherP1: number } = {
@@ -106,15 +106,15 @@ var objStrOrNum8: { prop: string; anotherP: string; } | { prop: number; anotherP
 
     prop: strOrNumber,
 >prop : Symbol(prop, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 28, 95))
->strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 3))
+>strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 11))
 
     anotherP: str,
 >anotherP : Symbol(anotherP, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 29, 22))
->str : Symbol(str, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 0, 3))
+>str : Symbol(str, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 0, 11))
 
     anotherP1: num
 >anotherP1 : Symbol(anotherP1, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 30, 18))
->num : Symbol(num, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 1, 3))
+>num : Symbol(num, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 1, 11))
 
 };
 interface I11 {
@@ -133,25 +133,25 @@ interface I21 {
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 37, 36))
 >b : Symbol(b, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 37, 46))
 }
-var i11: I11;
->i11 : Symbol(i11, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 39, 3))
+declare var i11: I11;
+>i11 : Symbol(i11, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 39, 11))
 >I11 : Symbol(I11, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 32, 2))
 
-var i21: I21;
->i21 : Symbol(i21, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 40, 3))
+declare var i21: I21;
+>i21 : Symbol(i21, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 40, 11))
 >I21 : Symbol(I21, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 35, 1))
 
 var i11Ori21: I11 | I21 = i11;
 >i11Ori21 : Symbol(i11Ori21, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 41, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 42, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 43, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 49, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 56, 3))
 >I11 : Symbol(I11, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 32, 2))
 >I21 : Symbol(I21, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 35, 1))
->i11 : Symbol(i11, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 39, 3))
+>i11 : Symbol(i11, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 39, 11))
 
 var i11Ori21: I11 | I21 = i21;
 >i11Ori21 : Symbol(i11Ori21, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 41, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 42, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 43, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 49, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 56, 3))
 >I11 : Symbol(I11, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 32, 2))
 >I21 : Symbol(I21, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 35, 1))
->i21 : Symbol(i21, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 40, 3))
+>i21 : Symbol(i21, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 40, 11))
 
 var i11Ori21: I11 | I21 = { // Like i1
 >i11Ori21 : Symbol(i11Ori21, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 41, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 42, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 43, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 49, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 56, 3))
@@ -197,8 +197,8 @@ var i11Ori21: I11 | I21 = { // Like i2
 
     },
 };
-var strOrNumber: string | number;
->strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 3))
+declare var strOrNumber: string | number;
+>strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 11))
 
 var i11Ori21: I11 | I21 = { // Like i1 and i2 both
 >i11Ori21 : Symbol(i11Ori21, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 41, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 42, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 43, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 49, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 56, 3))
@@ -209,6 +209,6 @@ var i11Ori21: I11 | I21 = { // Like i1 and i2 both
 >commonMethodDifferentReturnType : Symbol(commonMethodDifferentReturnType, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 56, 27))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 57, 38))
 >b : Symbol(b, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 57, 40))
->strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 3))
+>strOrNumber : Symbol(strOrNumber, Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 2, 3), Decl(contextualTypeWithUnionTypeObjectLiteral.ts, 55, 11))
 
 };
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.types b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.types
index e0b7462a267d4..2079eaad23453 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.types
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.types
@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts] ////
 
 === contextualTypeWithUnionTypeObjectLiteral.ts ===
-var str: string;
+declare var str: string;
 >str : string
 >    : ^^^^^^
 
-var num: number;
+declare var num: number;
 >num : number
 >    : ^^^^^^
 
@@ -19,13 +19,13 @@ var strOrNumber: string | number = str || num;
 >num : number
 >    : ^^^^^^
 
-var objStr: { prop: string };
+declare var objStr: { prop: string };
 >objStr : { prop: string; }
 >       : ^^^^^^^^      ^^^
 >prop : string
 >     : ^^^^^^
 
-var objNum: { prop: number };
+declare var objNum: { prop: number };
 >objNum : { prop: number; }
 >       : ^^^^^^^^      ^^^
 >prop : number
@@ -214,11 +214,11 @@ interface I21 {
 >b : number
 >  : ^^^^^^
 }
-var i11: I11;
+declare var i11: I11;
 >i11 : I11
 >    : ^^^
 
-var i21: I21;
+declare var i21: I21;
 >i21 : I21
 >    : ^^^
 
@@ -306,7 +306,7 @@ var i11Ori21: I11 | I21 = { // Like i2
 
     },
 };
-var strOrNumber: string | number;
+declare var strOrNumber: string | number;
 >strOrNumber : string | number
 >            : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/contextualTyping.errors.txt b/tests/baselines/reference/contextualTyping.errors.txt
index 664d9780d6393..a973e3b6d3f73 100644
--- a/tests/baselines/reference/contextualTyping.errors.txt
+++ b/tests/baselines/reference/contextualTyping.errors.txt
@@ -22,7 +22,7 @@ contextualTyping.ts(223,5): error TS2741: Property 'x' is missing in type '{}' b
         }
     }
     
-    // CONTEXT: Module property declaration
+    // CONTEXT: Namespace property declaration
     namespace C2T5 {
         export var foo: (i: number, s: string) => number = function(i) {
             return i;
@@ -67,7 +67,7 @@ contextualTyping.ts(223,5): error TS2741: Property 'x' is missing in type '{}' b
         }
     }
     
-    // CONTEXT: Module property assignment
+    // CONTEXT: Namespace property assignment
     namespace C5T5 {
         export var foo: (i: number, s: string) => string;
         foo = function(i, s) {
@@ -80,7 +80,7 @@ contextualTyping.ts(223,5): error TS2741: Property 'x' is missing in type '{}' b
     c6t5 = <(n: number) => IFoo>function(n) { return <IFoo>({}) };
     
     // CONTEXT: Array index assignment
-    var c7t2: IFoo[];
+    var c7t2: IFoo[] = [];
     c7t2[0] = <IFoo>({n: 1});
     
     // CONTEXT: Object property assignment
diff --git a/tests/baselines/reference/contextualTyping.js b/tests/baselines/reference/contextualTyping.js
index 78fe56d48446b..a19268d4576e7 100644
--- a/tests/baselines/reference/contextualTyping.js
+++ b/tests/baselines/reference/contextualTyping.js
@@ -20,7 +20,7 @@ class C1T5 {
     }
 }
 
-// CONTEXT: Module property declaration
+// CONTEXT: Namespace property declaration
 namespace C2T5 {
     export var foo: (i: number, s: string) => number = function(i) {
         return i;
@@ -65,7 +65,7 @@ class C4T5 {
     }
 }
 
-// CONTEXT: Module property assignment
+// CONTEXT: Namespace property assignment
 namespace C5T5 {
     export var foo: (i: number, s: string) => string;
     foo = function(i, s) {
@@ -78,7 +78,7 @@ var c6t5: (n: number) => IFoo;
 c6t5 = <(n: number) => IFoo>function(n) { return <IFoo>({}) };
 
 // CONTEXT: Array index assignment
-var c7t2: IFoo[];
+var c7t2: IFoo[] = [];
 c7t2[0] = <IFoo>({n: 1});
 
 // CONTEXT: Object property assignment
@@ -236,7 +236,7 @@ var C1T5 = /** @class */ (function () {
     }
     return C1T5;
 }());
-// CONTEXT: Module property declaration
+// CONTEXT: Namespace property declaration
 var C2T5;
 (function (C2T5) {
     C2T5.foo = function (i) {
@@ -275,7 +275,7 @@ var C4T5 = /** @class */ (function () {
     }
     return C4T5;
 }());
-// CONTEXT: Module property assignment
+// CONTEXT: Namespace property assignment
 var C5T5;
 (function (C5T5) {
     C5T5.foo = function (i, s) {
@@ -286,7 +286,7 @@ var C5T5;
 var c6t5;
 c6t5 = function (n) { return ({}); };
 // CONTEXT: Array index assignment
-var c7t2;
+var c7t2 = [];
 c7t2[0] = ({ n: 1 });
 var objc8 = ({});
 objc8.t1 = (function (s) { return s; });
diff --git a/tests/baselines/reference/contextualTyping.js.map b/tests/baselines/reference/contextualTyping.js.map
index 3f5b41d1da3e8..be9a7dbcd3b5a 100644
--- a/tests/baselines/reference/contextualTyping.js.map
+++ b/tests/baselines/reference/contextualTyping.js.map
@@ -1,3 +1,3 @@
 //// [contextualTyping.js.map]
-{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":[],"mappings":"AAYA,sCAAsC;AACtC;IAAA;QACI,QAAG,GAAqC,UAAS,CAAC;YAC9C,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IAAD,WAAC;AAAD,CAAC,AAJD,IAIC;AAED,uCAAuC;AACvC,IAAU,IAAI,CAIb;AAJD,WAAU,IAAI;IACC,QAAG,GAAqC,UAAS,CAAC;QACzD,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EAJS,IAAI,KAAJ,IAAI,QAIb;AAED,gCAAgC;AAChC,IAAI,IAAI,GAA0B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,qCAAqC;AACrC;IAEI;QACI,IAAI,CAAC,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;YACpB,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IACL,WAAC;AAAD,CAAC,AAPD,IAOC;AAED,sCAAsC;AACtC,IAAU,IAAI,CAKb;AALD,WAAU,IAAI;IAEV,KAAA,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;QACf,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EALS,IAAI,KAAJ,IAAI,QAKb;AAED,+BAA+B;AAC/B,IAAI,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAE9D,kCAAkC;AAClC,IAAI,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AACF,yBAAyB;AACzB,SAAS,IAAI,CAAC,CAAsB,IAAG,CAAC;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,OAAa,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,4BAA4B;AAC5B,IAAI,KAAK,GAA8B,cAAa,OAAO,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE/F,0BAA0B;AAC1B;IAAc,eAAY,CAAsB;IAAI,CAAC;IAAC,YAAC;AAAD,CAAC,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAErD,qCAAqC;AACrC,IAAI,KAAK,GAA2B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,SAAS,GAAG,CAAC,CAAC,EAAC,CAAC,IAAI,OAAO,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"}
-//// https://sokra.github.io/source-map-visualization#base64,Ly8gQ09OVEVYVDogQ2xhc3MgcHJvcGVydHkgZGVjbGFyYXRpb24NCnZhciBDMVQ1ID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIEMxVDUoKSB7DQogICAgICAgIHRoaXMuZm9vID0gZnVuY3Rpb24gKGkpIHsNCiAgICAgICAgICAgIHJldHVybiBpOw0KICAgICAgICB9Ow0KICAgIH0NCiAgICByZXR1cm4gQzFUNTsNCn0oKSk7DQovLyBDT05URVhUOiBNb2R1bGUgcHJvcGVydHkgZGVjbGFyYXRpb24NCnZhciBDMlQ1Ow0KKGZ1bmN0aW9uIChDMlQ1KSB7DQogICAgQzJUNS5mb28gPSBmdW5jdGlvbiAoaSkgew0KICAgICAgICByZXR1cm4gaTsNCiAgICB9Ow0KfSkoQzJUNSB8fCAoQzJUNSA9IHt9KSk7DQovLyBDT05URVhUOiBWYXJpYWJsZSBkZWNsYXJhdGlvbg0KdmFyIGMzdDEgPSAoZnVuY3Rpb24gKHMpIHsgcmV0dXJuIHM7IH0pOw0KdmFyIGMzdDIgPSAoew0KICAgIG46IDENCn0pOw0KdmFyIGMzdDMgPSBbXTsNCnZhciBjM3Q0ID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gKHt9KTsgfTsNCnZhciBjM3Q1ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuICh7fSk7IH07DQp2YXIgYzN0NiA9IGZ1bmN0aW9uIChuLCBzKSB7IHJldHVybiAoe30pOyB9Ow0KdmFyIGMzdDcgPSBmdW5jdGlvbiAobikgeyByZXR1cm4gbjsgfTsNCnZhciBjM3Q4ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuIG47IH07DQp2YXIgYzN0OSA9IFtbXSwgW11dOw0KdmFyIGMzdDEwID0gWyh7fSksICh7fSldOw0KdmFyIGMzdDExID0gW2Z1bmN0aW9uIChuLCBzKSB7IHJldHVybiBzOyB9XTsNCnZhciBjM3QxMiA9IHsNCiAgICBmb286ICh7fSkNCn07DQp2YXIgYzN0MTMgPSAoew0KICAgIGY6IGZ1bmN0aW9uIChpLCBzKSB7IHJldHVybiBzOyB9DQp9KTsNCnZhciBjM3QxNCA9ICh7DQogICAgYTogW10NCn0pOw0KLy8gQ09OVEVYVDogQ2xhc3MgcHJvcGVydHkgYXNzaWdubWVudA0KdmFyIEM0VDUgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgZnVuY3Rpb24gQzRUNSgpIHsNCiAgICAgICAgdGhpcy5mb28gPSBmdW5jdGlvbiAoaSwgcykgew0KICAgICAgICAgICAgcmV0dXJuIHM7DQogICAgICAgIH07DQogICAgfQ0KICAgIHJldHVybiBDNFQ1Ow0KfSgpKTsNCi8vIENPTlRFWFQ6IE1vZHVsZSBwcm9wZXJ0eSBhc3NpZ25tZW50DQp2YXIgQzVUNTsNCihmdW5jdGlvbiAoQzVUNSkgew0KICAgIEM1VDUuZm9vID0gZnVuY3Rpb24gKGksIHMpIHsNCiAgICAgICAgcmV0dXJuIHM7DQogICAgfTsNCn0pKEM1VDUgfHwgKEM1VDUgPSB7fSkpOw0KLy8gQ09OVEVYVDogVmFyaWFibGUgYXNzaWdubWVudA0KdmFyIGM2dDU7DQpjNnQ1ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuICh7fSk7IH07DQovLyBDT05URVhUOiBBcnJheSBpbmRleCBhc3NpZ25tZW50DQp2YXIgYzd0MjsNCmM3dDJbMF0gPSAoeyBuOiAxIH0pOw0KdmFyIG9iamM4ID0gKHt9KTsNCm9iamM4LnQxID0gKGZ1bmN0aW9uIChzKSB7IHJldHVybiBzOyB9KTsNCm9iamM4LnQyID0gKHsNCiAgICBuOiAxDQp9KTsNCm9iamM4LnQzID0gW107DQpvYmpjOC50NCA9IGZ1bmN0aW9uICgpIHsgcmV0dXJuICh7fSk7IH07DQpvYmpjOC50NSA9IGZ1bmN0aW9uIChuKSB7IHJldHVybiAoe30pOyB9Ow0Kb2JqYzgudDYgPSBmdW5jdGlvbiAobiwgcykgeyByZXR1cm4gKHt9KTsgfTsNCm9iamM4LnQ3ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuIG47IH07DQpvYmpjOC50OCA9IGZ1bmN0aW9uIChuKSB7IHJldHVybiBuOyB9Ow0Kb2JqYzgudDkgPSBbW10sIFtdXTsNCm9iamM4LnQxMCA9IFsoe30pLCAoe30pXTsNCm9iamM4LnQxMSA9IFtmdW5jdGlvbiAobiwgcykgeyByZXR1cm4gczsgfV07DQpvYmpjOC50MTIgPSB7DQogICAgZm9vOiAoe30pDQp9Ow0Kb2JqYzgudDEzID0gKHsNCiAgICBmOiBmdW5jdGlvbiAoaSwgcykgeyByZXR1cm4gczsgfQ0KfSk7DQpvYmpjOC50MTQgPSAoew0KICAgIGE6IFtdDQp9KTsNCi8vIENPTlRFWFQ6IEZ1bmN0aW9uIGNhbGwNCmZ1bmN0aW9uIGM5dDUoZikgeyB9DQo7DQpjOXQ1KGZ1bmN0aW9uIChuKSB7DQogICAgcmV0dXJuICh7fSk7DQp9KTsNCi8vIENPTlRFWFQ6IFJldHVybiBzdGF0ZW1lbnQNCnZhciBjMTB0NSA9IGZ1bmN0aW9uICgpIHsgcmV0dXJuIGZ1bmN0aW9uIChuKSB7IHJldHVybiAoe30pOyB9OyB9Ow0KLy8gQ09OVEVYVDogTmV3aW5nIGEgY2xhc3MNCnZhciBDMTF0NSA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICBmdW5jdGlvbiBDMTF0NShmKSB7DQogICAgfQ0KICAgIHJldHVybiBDMTF0NTsNCn0oKSk7DQo7DQp2YXIgaSA9IG5ldyBDMTF0NShmdW5jdGlvbiAobikgeyByZXR1cm4gKHt9KTsgfSk7DQovLyBDT05URVhUOiBUeXBlIGFubm90YXRlZCBleHByZXNzaW9uDQp2YXIgYzEydDEgPSAoZnVuY3Rpb24gKHMpIHsgcmV0dXJuIHM7IH0pOw0KdmFyIGMxMnQyID0gKHsNCiAgICBuOiAxDQp9KTsNCnZhciBjMTJ0MyA9IFtdOw0KdmFyIGMxMnQ0ID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gKHt9KTsgfTsNCnZhciBjMTJ0NSA9IGZ1bmN0aW9uIChuKSB7IHJldHVybiAoe30pOyB9Ow0KdmFyIGMxMnQ2ID0gZnVuY3Rpb24gKG4sIHMpIHsgcmV0dXJuICh7fSk7IH07DQp2YXIgYzEydDcgPSBmdW5jdGlvbiAobikgeyByZXR1cm4gbjsgfTsNCnZhciBjMTJ0OCA9IGZ1bmN0aW9uIChuKSB7IHJldHVybiBuOyB9Ow0KdmFyIGMxMnQ5ID0gW1tdLCBbXV07DQp2YXIgYzEydDEwID0gWyh7fSksICh7fSldOw0KdmFyIGMxMnQxMSA9IFtmdW5jdGlvbiAobiwgcykgeyByZXR1cm4gczsgfV07DQp2YXIgYzEydDEyID0gew0KICAgIGZvbzogKHt9KQ0KfTsNCnZhciBjMTJ0MTMgPSAoew0KICAgIGY6IGZ1bmN0aW9uIChpLCBzKSB7IHJldHVybiBzOyB9DQp9KTsNCnZhciBjMTJ0MTQgPSAoew0KICAgIGE6IFtdDQp9KTsNCmZ1bmN0aW9uIEVGMShhLCBiKSB7IHJldHVybiBhICsgYjsgfQ0KdmFyIGVmdiA9IEVGMSgxLCAyKTsNClBvaW50Lm9yaWdpbiA9IG5ldyBQb2ludCgwLCAwKTsNClBvaW50LnByb3RvdHlwZS5hZGQgPSBmdW5jdGlvbiAoZHgsIGR5KSB7DQogICAgcmV0dXJuIG5ldyBQb2ludCh0aGlzLnggKyBkeCwgdGhpcy55ICsgZHkpOw0KfTsNClBvaW50LnByb3RvdHlwZSA9IHsNCiAgICB4OiAwLA0KICAgIHk6IDAsDQogICAgYWRkOiBmdW5jdGlvbiAoZHgsIGR5KSB7DQogICAgICAgIHJldHVybiBuZXcgUG9pbnQodGhpcy54ICsgZHgsIHRoaXMueSArIGR5KTsNCiAgICB9DQp9Ow0KdmFyIHggPSB7fTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPWNvbnRleHR1YWxUeXBpbmcuanMubWFw,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dHVhbFR5cGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbnRleHR1YWxUeXBpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBWUEsc0NBQXNDO0FBQ3RDO0lBQUE7UUFDSSxRQUFHLEdBQXFDLFVBQVMsQ0FBQztZQUM5QyxPQUFPLENBQUMsQ0FBQztRQUNiLENBQUMsQ0FBQTtJQUNMLENBQUM7SUFBRCxXQUFDO0FBQUQsQ0FBQyxBQUpELElBSUM7QUFFRCx1Q0FBdUM7QUFDdkMsSUFBVSxJQUFJLENBSWI7QUFKRCxXQUFVLElBQUk7SUFDQyxRQUFHLEdBQXFDLFVBQVMsQ0FBQztRQUN6RCxPQUFPLENBQUMsQ0FBQztJQUNiLENBQUMsQ0FBQTtBQUNMLENBQUMsRUFKUyxJQUFJLEtBQUosSUFBSSxRQUliO0FBRUQsZ0NBQWdDO0FBQ2hDLElBQUksSUFBSSxHQUEwQixDQUFDLFVBQVMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDN0QsSUFBSSxJQUFJLEdBQVMsQ0FBQztJQUNkLENBQUMsRUFBRSxDQUFDO0NBQ1AsQ0FBQyxDQUFBO0FBQ0YsSUFBSSxJQUFJLEdBQWEsRUFBRSxDQUFDO0FBQ3hCLElBQUksSUFBSSxHQUFlLGNBQWEsT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQ3hELElBQUksSUFBSSxHQUF3QixVQUFTLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUM7QUFDbEUsSUFBSSxJQUFJLEdBQW1DLFVBQVMsQ0FBQyxFQUFFLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUM7QUFDaEYsSUFBSSxJQUFJLEdBR0osVUFBUyxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFOUIsSUFBSSxJQUFJLEdBQXFDLFVBQVMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3ZFLElBQUksSUFBSSxHQUFlLENBQUMsRUFBRSxFQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQy9CLElBQUksS0FBSyxHQUFXLENBQU8sQ0FBQyxFQUFFLENBQUMsRUFBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDNUMsSUFBSSxLQUFLLEdBQXdDLENBQUMsVUFBUyxDQUFDLEVBQUUsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDaEYsSUFBSSxLQUFLLEdBQVM7SUFDZCxHQUFHLEVBQVEsQ0FBQyxFQUFFLENBQUM7Q0FDbEIsQ0FBQTtBQUNELElBQUksS0FBSyxHQUFTLENBQUM7SUFDZixDQUFDLEVBQUUsVUFBUyxDQUFDLEVBQUUsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztDQUNsQyxDQUFDLENBQUE7QUFDRixJQUFJLEtBQUssR0FBUyxDQUFDO0lBQ2YsQ0FBQyxFQUFFLEVBQUU7Q0FDUixDQUFDLENBQUE7QUFFRixxQ0FBcUM7QUFDckM7SUFFSTtRQUNJLElBQUksQ0FBQyxHQUFHLEdBQUcsVUFBUyxDQUFDLEVBQUUsQ0FBQztZQUNwQixPQUFPLENBQUMsQ0FBQztRQUNiLENBQUMsQ0FBQTtJQUNMLENBQUM7SUFDTCxXQUFDO0FBQUQsQ0FBQyxBQVBELElBT0M7QUFFRCxzQ0FBc0M7QUFDdEMsSUFBVSxJQUFJLENBS2I7QUFMRCxXQUFVLElBQUk7SUFFVixLQUFBLEdBQUcsR0FBRyxVQUFTLENBQUMsRUFBRSxDQUFDO1FBQ2YsT0FBTyxDQUFDLENBQUM7SUFDYixDQUFDLENBQUE7QUFDTCxDQUFDLEVBTFMsSUFBSSxLQUFKLElBQUksUUFLYjtBQUVELCtCQUErQjtBQUMvQixJQUFJLElBQXlCLENBQUM7QUFDOUIsSUFBSSxHQUF3QixVQUFTLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUM7QUFFOUQsa0NBQWtDO0FBQ2xDLElBQUksSUFBWSxDQUFDO0FBQ2pCLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBUyxDQUFDLEVBQUMsQ0FBQyxFQUFFLENBQUMsRUFBQyxDQUFDLENBQUM7QUF1QnpCLElBQUksS0FBSyxHQWtCUyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBRXZCLEtBQUssQ0FBQyxFQUFFLEdBQUcsQ0FBQyxVQUFTLENBQUMsSUFBSSxPQUFPLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3RDLEtBQUssQ0FBQyxFQUFFLEdBQVMsQ0FBQztJQUNkLENBQUMsRUFBRSxDQUFDO0NBQ1AsQ0FBQyxDQUFDO0FBQ0gsS0FBSyxDQUFDLEVBQUUsR0FBRyxFQUFFLENBQUM7QUFDZCxLQUFLLENBQUMsRUFBRSxHQUFHLGNBQWEsT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQzVDLEtBQUssQ0FBQyxFQUFFLEdBQUcsVUFBUyxDQUFDLElBQUksT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQzdDLEtBQUssQ0FBQyxFQUFFLEdBQUcsVUFBUyxDQUFDLEVBQUUsQ0FBQyxJQUFJLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQztBQUNoRCxLQUFLLENBQUMsRUFBRSxHQUFHLFVBQVMsQ0FBUyxJQUFJLE9BQU8sQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBRTVDLEtBQUssQ0FBQyxFQUFFLEdBQUcsVUFBUyxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDckMsS0FBSyxDQUFDLEVBQUUsR0FBRyxDQUFDLEVBQUUsRUFBQyxFQUFFLENBQUMsQ0FBQztBQUNuQixLQUFLLENBQUMsR0FBRyxHQUFHLENBQU8sQ0FBQyxFQUFFLENBQUMsRUFBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDcEMsS0FBSyxDQUFDLEdBQUcsR0FBRyxDQUFDLFVBQVMsQ0FBQyxFQUFFLENBQUMsSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQzNDLEtBQUssQ0FBQyxHQUFHLEdBQUc7SUFDUixHQUFHLEVBQVEsQ0FBQyxFQUFFLENBQUM7Q0FDbEIsQ0FBQTtBQUNELEtBQUssQ0FBQyxHQUFHLEdBQVMsQ0FBQztJQUNmLENBQUMsRUFBRSxVQUFTLENBQUMsRUFBRSxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQ2xDLENBQUMsQ0FBQTtBQUNGLEtBQUssQ0FBQyxHQUFHLEdBQVMsQ0FBQztJQUNmLENBQUMsRUFBRSxFQUFFO0NBQ1IsQ0FBQyxDQUFBO0FBQ0YseUJBQXlCO0FBQ3pCLFNBQVMsSUFBSSxDQUFDLENBQXNCLElBQUcsQ0FBQztBQUFBLENBQUM7QUFDekMsSUFBSSxDQUFDLFVBQVMsQ0FBQztJQUNYLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQztBQUN0QixDQUFDLENBQUMsQ0FBQztBQUVILDRCQUE0QjtBQUM1QixJQUFJLEtBQUssR0FBOEIsY0FBYSxPQUFPLFVBQVMsQ0FBQyxJQUFJLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQztBQUUvRiwwQkFBMEI7QUFDMUI7SUFBYyxlQUFZLENBQXNCO0lBQUksQ0FBQztJQUFDLFlBQUM7QUFBRCxDQUFDLEFBQXZELElBQXVEO0FBQUEsQ0FBQztBQUN4RCxJQUFJLENBQUMsR0FBRyxJQUFJLEtBQUssQ0FBQyxVQUFTLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUVyRCxxQ0FBcUM7QUFDckMsSUFBSSxLQUFLLEdBQTJCLENBQUMsVUFBUyxDQUFDLElBQUksT0FBTyxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUMvRCxJQUFJLEtBQUssR0FBVSxDQUFDO0lBQ2hCLENBQUMsRUFBRSxDQUFDO0NBQ1AsQ0FBQyxDQUFDO0FBQ0gsSUFBSSxLQUFLLEdBQWMsRUFBRSxDQUFDO0FBQzFCLElBQUksS0FBSyxHQUFnQixjQUFhLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQztBQUMxRCxJQUFJLEtBQUssR0FBeUIsVUFBUyxDQUFDLElBQUksT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQ3BFLElBQUksS0FBSyxHQUFvQyxVQUFTLENBQUMsRUFBRSxDQUFDLElBQUksT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQ2xGLElBQUksS0FBSyxHQUdOLFVBQVMsQ0FBUSxJQUFJLE9BQU8sQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBRW5DLElBQUksS0FBSyxHQUFzQyxVQUFTLENBQUMsSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUN6RSxJQUFJLEtBQUssR0FBZ0IsQ0FBQyxFQUFFLEVBQUMsRUFBRSxDQUFDLENBQUM7QUFDakMsSUFBSSxNQUFNLEdBQVksQ0FBTyxDQUFDLEVBQUUsQ0FBQyxFQUFPLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztBQUM5QyxJQUFJLE1BQU0sR0FBeUMsQ0FBQyxVQUFTLENBQUMsRUFBRSxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNsRixJQUFJLE1BQU0sR0FBVTtJQUNoQixHQUFHLEVBQVEsQ0FBQyxFQUFFLENBQUM7Q0FDbEIsQ0FBQTtBQUNELElBQUksTUFBTSxHQUFVLENBQUM7SUFDakIsQ0FBQyxFQUFFLFVBQVMsQ0FBQyxFQUFFLENBQUMsSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7Q0FDbEMsQ0FBQyxDQUFBO0FBQ0YsSUFBSSxNQUFNLEdBQVUsQ0FBQztJQUNqQixDQUFDLEVBQUUsRUFBRTtDQUNSLENBQUMsQ0FBQTtBQU9GLFNBQVMsR0FBRyxDQUFDLENBQUMsRUFBQyxDQUFDLElBQUksT0FBTyxDQUFDLEdBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUVqQyxJQUFJLEdBQUcsR0FBRyxHQUFHLENBQUMsQ0FBQyxFQUFDLENBQUMsQ0FBQyxDQUFDO0FBY25CLEtBQUssQ0FBQyxNQUFNLEdBQUcsSUFBSSxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBRS9CLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxHQUFHLFVBQVMsRUFBRSxFQUFFLEVBQUU7SUFDakMsT0FBTyxJQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO0FBQy9DLENBQUMsQ0FBQztBQUVGLEtBQUssQ0FBQyxTQUFTLEdBQUc7SUFDZCxDQUFDLEVBQUUsQ0FBQztJQUNKLENBQUMsRUFBRSxDQUFDO0lBQ0osR0FBRyxFQUFFLFVBQVMsRUFBRSxFQUFFLEVBQUU7UUFDaEIsT0FBTyxJQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO0lBQy9DLENBQUM7Q0FDSixDQUFDO0FBSUYsSUFBSSxDQUFDLEdBQU0sRUFBRyxDQUFDIn0=,Ly8gREVGQVVMVCBJTlRFUkZBQ0VTCmludGVyZmFjZSBJRm9vIHsKICAgIG46IG51bWJlcjsKICAgIHM6IHN0cmluZzsKICAgIGYoaTogbnVtYmVyLCBzOiBzdHJpbmcpOiBzdHJpbmc7CiAgICBhOiBudW1iZXJbXTsKfQoKaW50ZXJmYWNlIElCYXIgewogICAgZm9vOiBJRm9vOwp9CgovLyBDT05URVhUOiBDbGFzcyBwcm9wZXJ0eSBkZWNsYXJhdGlvbgpjbGFzcyBDMVQ1IHsKICAgIGZvbzogKGk6IG51bWJlciwgczogc3RyaW5nKSA9PiBudW1iZXIgPSBmdW5jdGlvbihpKSB7CiAgICAgICAgcmV0dXJuIGk7CiAgICB9Cn0KCi8vIENPTlRFWFQ6IE1vZHVsZSBwcm9wZXJ0eSBkZWNsYXJhdGlvbgpuYW1lc3BhY2UgQzJUNSB7CiAgICBleHBvcnQgdmFyIGZvbzogKGk6IG51bWJlciwgczogc3RyaW5nKSA9PiBudW1iZXIgPSBmdW5jdGlvbihpKSB7CiAgICAgICAgcmV0dXJuIGk7CiAgICB9Cn0KCi8vIENPTlRFWFQ6IFZhcmlhYmxlIGRlY2xhcmF0aW9uCnZhciBjM3QxOiAoczogc3RyaW5nKSA9PiBzdHJpbmcgPSAoZnVuY3Rpb24ocykgeyByZXR1cm4gcyB9KTsKdmFyIGMzdDIgPSA8SUZvbz4oewogICAgbjogMQp9KQp2YXIgYzN0MzogbnVtYmVyW10gPSBbXTsKdmFyIGMzdDQ6ICgpID0+IElGb28gPSBmdW5jdGlvbigpIHsgcmV0dXJuIDxJRm9vPih7fSkgfTsKdmFyIGMzdDU6IChuOiBudW1iZXIpID0+IElGb28gPSBmdW5jdGlvbihuKSB7IHJldHVybiA8SUZvbz4oe30pIH07CnZhciBjM3Q2OiAobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IElGb28gPSBmdW5jdGlvbihuLCBzKSB7IHJldHVybiA8SUZvbz4oe30pIH07CnZhciBjM3Q3OiB7CiAgICAobjogbnVtYmVyKTogbnVtYmVyOyAgICAKICAgIChzMTogc3RyaW5nKTogbnVtYmVyOwp9ID0gZnVuY3Rpb24obikgeyByZXR1cm4gbjsgfTsKCnZhciBjM3Q4OiAobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IG51bWJlciA9IGZ1bmN0aW9uKG4pIHsgcmV0dXJuIG47IH07CnZhciBjM3Q5OiBudW1iZXJbXVtdID0gW1tdLFtdXTsKdmFyIGMzdDEwOiBJRm9vW10gPSBbPElGb28+KHt9KSw8SUZvbz4oe30pXTsKdmFyIGMzdDExOiB7KG46IG51bWJlciwgczogc3RyaW5nKTogc3RyaW5nO31bXSA9IFtmdW5jdGlvbihuLCBzKSB7IHJldHVybiBzOyB9XTsKdmFyIGMzdDEyOiBJQmFyID0gewogICAgZm9vOiA8SUZvbz4oe30pCn0KdmFyIGMzdDEzID0gPElGb28+KHsKICAgIGY6IGZ1bmN0aW9uKGksIHMpIHsgcmV0dXJuIHM7IH0KfSkKdmFyIGMzdDE0ID0gPElGb28+KHsKICAgIGE6IFtdCn0pCgovLyBDT05URVhUOiBDbGFzcyBwcm9wZXJ0eSBhc3NpZ25tZW50CmNsYXNzIEM0VDUgewogICAgZm9vOiAoaTogbnVtYmVyLCBzOiBzdHJpbmcpID0+IHN0cmluZzsKICAgIGNvbnN0cnVjdG9yKCkgewogICAgICAgIHRoaXMuZm9vID0gZnVuY3Rpb24oaSwgcykgewogICAgICAgICAgICByZXR1cm4gczsKICAgICAgICB9CiAgICB9Cn0KCi8vIENPTlRFWFQ6IE1vZHVsZSBwcm9wZXJ0eSBhc3NpZ25tZW50Cm5hbWVzcGFjZSBDNVQ1IHsKICAgIGV4cG9ydCB2YXIgZm9vOiAoaTogbnVtYmVyLCBzOiBzdHJpbmcpID0+IHN0cmluZzsKICAgIGZvbyA9IGZ1bmN0aW9uKGksIHMpIHsKICAgICAgICByZXR1cm4gczsKICAgIH0KfQoKLy8gQ09OVEVYVDogVmFyaWFibGUgYXNzaWdubWVudAp2YXIgYzZ0NTogKG46IG51bWJlcikgPT4gSUZvbzsKYzZ0NSA9IDwobjogbnVtYmVyKSA9PiBJRm9vPmZ1bmN0aW9uKG4pIHsgcmV0dXJuIDxJRm9vPih7fSkgfTsKCi8vIENPTlRFWFQ6IEFycmF5IGluZGV4IGFzc2lnbm1lbnQKdmFyIGM3dDI6IElGb29bXTsKYzd0MlswXSA9IDxJRm9vPih7bjogMX0pOwoKLy8gQ09OVEVYVDogT2JqZWN0IHByb3BlcnR5IGFzc2lnbm1lbnQKaW50ZXJmYWNlIElQbGFjZUhvbGRlciB7CiAgICB0MTogKHM6IHN0cmluZykgPT4gc3RyaW5nOwogICAgdDI6IElGb287CiAgICB0MzogbnVtYmVyW107CiAgICB0NDogKCkgPT4gSUZvbzsKICAgIHQ1OiAobjogbnVtYmVyKSA9PiBJRm9vOwogICAgdDY6IChuOiBudW1iZXIsIHM6IHN0cmluZykgPT4gSUZvbzsKICAgIHQ3OiB7CiAgICAgICAgICAgIChuOiBudW1iZXIsIHM6IHN0cmluZyk6IG51bWJlcjsgICAgCiAgICAgICAgICAgIC8vKHMxOiBzdHJpbmcsIHMyOiBzdHJpbmcpOiBudW1iZXI7CiAgICAgICAgfTsKICAgIHQ4OiAobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IG51bWJlcjsKICAgIHQ5OiBudW1iZXJbXVtdOwogICAgdDEwOiBJRm9vW107CiAgICB0MTE6IHsobjogbnVtYmVyLCBzOiBzdHJpbmcpOiBzdHJpbmc7fVtdOwogICAgdDEyOiBJQmFyOwogICAgdDEzOiBJRm9vOwogICAgdDE0OiBJRm9vOwogICAgfQoKdmFyIG9iamM4OiB7CiAgICB0MTogKHM6IHN0cmluZykgPT4gc3RyaW5nOwogICAgdDI6IElGb287CiAgICB0MzogbnVtYmVyW107CiAgICB0NDogKCkgPT4gSUZvbzsKICAgIHQ1OiAobjogbnVtYmVyKSA9PiBJRm9vOwogICAgdDY6IChuOiBudW1iZXIsIHM6IHN0cmluZykgPT4gSUZvbzsKICAgIHQ3OiB7CiAgICAgICAgICAgIChuOiBudW1iZXIsIHM6IHN0cmluZyk6IG51bWJlcjsgICAgCiAgICAgICAgICAgIC8vKHMxOiBzdHJpbmcsIHMyOiBzdHJpbmcpOiBudW1iZXI7CiAgICAgICAgfTsKICAgIHQ4OiAobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IG51bWJlcjsKICAgIHQ5OiBudW1iZXJbXVtdOwogICAgdDEwOiBJRm9vW107CiAgICB0MTE6IHsobjogbnVtYmVyLCBzOiBzdHJpbmcpOiBzdHJpbmc7fVtdOwogICAgdDEyOiBJQmFyOwogICAgdDEzOiBJRm9vOwogICAgdDE0OiBJRm9vOwp9ID0gPElQbGFjZUhvbGRlcj4oe30pOwoKb2JqYzgudDEgPSAoZnVuY3Rpb24ocykgeyByZXR1cm4gcyB9KTsKb2JqYzgudDIgPSA8SUZvbz4oewogICAgbjogMQp9KTsKb2JqYzgudDMgPSBbXTsKb2JqYzgudDQgPSBmdW5jdGlvbigpIHsgcmV0dXJuIDxJRm9vPih7fSkgfTsKb2JqYzgudDUgPSBmdW5jdGlvbihuKSB7IHJldHVybiA8SUZvbz4oe30pIH07Cm9iamM4LnQ2ID0gZnVuY3Rpb24obiwgcykgeyByZXR1cm4gPElGb28+KHt9KSB9OwpvYmpjOC50NyA9IGZ1bmN0aW9uKG46IG51bWJlcikgeyByZXR1cm4gbiB9OwoKb2JqYzgudDggPSBmdW5jdGlvbihuKSB7IHJldHVybiBuOyB9OwpvYmpjOC50OSA9IFtbXSxbXV07Cm9iamM4LnQxMCA9IFs8SUZvbz4oe30pLDxJRm9vPih7fSldOwpvYmpjOC50MTEgPSBbZnVuY3Rpb24obiwgcykgeyByZXR1cm4gczsgfV07Cm9iamM4LnQxMiA9IHsKICAgIGZvbzogPElGb28+KHt9KQp9Cm9iamM4LnQxMyA9IDxJRm9vPih7CiAgICBmOiBmdW5jdGlvbihpLCBzKSB7IHJldHVybiBzOyB9Cn0pCm9iamM4LnQxNCA9IDxJRm9vPih7CiAgICBhOiBbXQp9KQovLyBDT05URVhUOiBGdW5jdGlvbiBjYWxsCmZ1bmN0aW9uIGM5dDUoZjogKG46IG51bWJlcikgPT4gSUZvbykge307CmM5dDUoZnVuY3Rpb24obikgewogICAgcmV0dXJuIDxJRm9vPih7fSk7Cn0pOwoKLy8gQ09OVEVYVDogUmV0dXJuIHN0YXRlbWVudAp2YXIgYzEwdDU6ICgpID0+IChuOiBudW1iZXIpID0+IElGb28gPSBmdW5jdGlvbigpIHsgcmV0dXJuIGZ1bmN0aW9uKG4pIHsgcmV0dXJuIDxJRm9vPih7fSkgfSB9OwoKLy8gQ09OVEVYVDogTmV3aW5nIGEgY2xhc3MKY2xhc3MgQzExdDUgeyBjb25zdHJ1Y3RvcihmOiAobjogbnVtYmVyKSA9PiBJRm9vKSB7IH0gfTsKdmFyIGkgPSBuZXcgQzExdDUoZnVuY3Rpb24obikgeyByZXR1cm4gPElGb28+KHt9KSB9KTsKCi8vIENPTlRFWFQ6IFR5cGUgYW5ub3RhdGVkIGV4cHJlc3Npb24KdmFyIGMxMnQxID0gPChzOiBzdHJpbmcpID0+IHN0cmluZz4gKGZ1bmN0aW9uKHMpIHsgcmV0dXJuIHMgfSk7CnZhciBjMTJ0MiA9IDxJRm9vPiAoewogICAgbjogMQp9KTsKdmFyIGMxMnQzID0gPG51bWJlcltdPiBbXTsKdmFyIGMxMnQ0ID0gPCgpID0+IElGb28+IGZ1bmN0aW9uKCkgeyByZXR1cm4gPElGb28+KHt9KSB9Owp2YXIgYzEydDUgPSA8KG46IG51bWJlcikgPT4gSUZvbz4gZnVuY3Rpb24obikgeyByZXR1cm4gPElGb28+KHt9KSB9Owp2YXIgYzEydDYgPSA8KG46IG51bWJlciwgczogc3RyaW5nKSA9PiBJRm9vPiBmdW5jdGlvbihuLCBzKSB7IHJldHVybiA8SUZvbz4oe30pIH07CnZhciBjMTJ0NyA9IDx7CiAgICAobjogbnVtYmVyLCBzOiBzdHJpbmcpOiBudW1iZXI7ICAgIAogICAgLy8oczE6IHN0cmluZywgczI6IHN0cmluZyk6IG51bWJlcjsKfT4gZnVuY3Rpb24objpudW1iZXIpIHsgcmV0dXJuIG4gfTsKCnZhciBjMTJ0OCA9IDwobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IG51bWJlcj4gZnVuY3Rpb24obikgeyByZXR1cm4gbjsgfTsKdmFyIGMxMnQ5ID0gPG51bWJlcltdW10+IFtbXSxbXV07CnZhciBjMTJ0MTAgPSA8SUZvb1tdPiBbPElGb28+KHt9KSw8SUZvbz4oe30pXTsKdmFyIGMxMnQxMSA9IDx7KG46IG51bWJlciwgczogc3RyaW5nKTogc3RyaW5nO31bXT4gW2Z1bmN0aW9uKG4sIHMpIHsgcmV0dXJuIHM7IH1dOwp2YXIgYzEydDEyID0gPElCYXI+IHsKICAgIGZvbzogPElGb28+KHt9KQp9CnZhciBjMTJ0MTMgPSA8SUZvbz4gKHsKICAgIGY6IGZ1bmN0aW9uKGksIHMpIHsgcmV0dXJuIHM7IH0KfSkKdmFyIGMxMnQxNCA9IDxJRm9vPiAoewogICAgYTogW10KfSkKCi8vIENPTlRFWFQ6IENvbnRleHR1YWwgdHlwaW5nIGRlY2xhcmF0aW9ucwoKLy8gY29udGV4dHVhbGx5IHR5cGluZyBmdW5jdGlvbiBkZWNsYXJhdGlvbnMKZGVjbGFyZSBmdW5jdGlvbiBFRjEoYTpudW1iZXIsIGI6bnVtYmVyKTpudW1iZXI7CgpmdW5jdGlvbiBFRjEoYSxiKSB7IHJldHVybiBhK2I7IH0KCnZhciBlZnYgPSBFRjEoMSwyKTsKCgovLyBjb250ZXh0dWFsbHkgdHlwaW5nIGZyb20gYW1iaWVudCBjbGFzcyBkZWNsYXJhdGlvbnMKZGVjbGFyZSBjbGFzcyBQb2ludAp7CiAgICAgIGNvbnN0cnVjdG9yKHg6IG51bWJlciwgeTogbnVtYmVyKTsKICAgICAgeDogbnVtYmVyOwogICAgICB5OiBudW1iZXI7CiAgICAgIGFkZChkeDogbnVtYmVyLCBkeTogbnVtYmVyKTogUG9pbnQ7CiAgICAgIHN0YXRpYyBvcmlnaW46IFBvaW50OwoKfQoKUG9pbnQub3JpZ2luID0gbmV3IFBvaW50KDAsIDApOwoKUG9pbnQucHJvdG90eXBlLmFkZCA9IGZ1bmN0aW9uKGR4LCBkeSkgewogICAgcmV0dXJuIG5ldyBQb2ludCh0aGlzLnggKyBkeCwgdGhpcy55ICsgZHkpOwp9OwoKUG9pbnQucHJvdG90eXBlID0gewogICAgeDogMCwKICAgIHk6IDAsCiAgICBhZGQ6IGZ1bmN0aW9uKGR4LCBkeSkgewogICAgICAgIHJldHVybiBuZXcgUG9pbnQodGhpcy54ICsgZHgsIHRoaXMueSArIGR5KTsKICAgIH0KfTsKCmludGVyZmFjZSBBIHsgeDogc3RyaW5nOyB9CmludGVyZmFjZSBCIGV4dGVuZHMgQSB7IH0KdmFyIHg6IEIgPSB7IH07Cg==
+{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":[],"mappings":"AAYA,sCAAsC;AACtC;IAAA;QACI,QAAG,GAAqC,UAAS,CAAC;YAC9C,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IAAD,WAAC;AAAD,CAAC,AAJD,IAIC;AAED,0CAA0C;AAC1C,IAAU,IAAI,CAIb;AAJD,WAAU,IAAI;IACC,QAAG,GAAqC,UAAS,CAAC;QACzD,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EAJS,IAAI,KAAJ,IAAI,QAIb;AAED,gCAAgC;AAChC,IAAI,IAAI,GAA0B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,qCAAqC;AACrC;IAEI;QACI,IAAI,CAAC,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;YACpB,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IACL,WAAC;AAAD,CAAC,AAPD,IAOC;AAED,yCAAyC;AACzC,IAAU,IAAI,CAKb;AALD,WAAU,IAAI;IAEV,KAAA,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;QACf,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EALS,IAAI,KAAJ,IAAI,QAKb;AAED,+BAA+B;AAC/B,IAAI,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAE9D,kCAAkC;AAClC,IAAI,IAAI,GAAW,EAAE,CAAC;AACtB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AACF,yBAAyB;AACzB,SAAS,IAAI,CAAC,CAAsB,IAAG,CAAC;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,OAAa,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,4BAA4B;AAC5B,IAAI,KAAK,GAA8B,cAAa,OAAO,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE/F,0BAA0B;AAC1B;IAAc,eAAY,CAAsB;IAAI,CAAC;IAAC,YAAC;AAAD,CAAC,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAErD,qCAAqC;AACrC,IAAI,KAAK,GAA2B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,SAAS,GAAG,CAAC,CAAC,EAAC,CAAC,IAAI,OAAO,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"}
+//// https://sokra.github.io/source-map-visualization#base64,Ly8gQ09OVEVYVDogQ2xhc3MgcHJvcGVydHkgZGVjbGFyYXRpb24NCnZhciBDMVQ1ID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIEMxVDUoKSB7DQogICAgICAgIHRoaXMuZm9vID0gZnVuY3Rpb24gKGkpIHsNCiAgICAgICAgICAgIHJldHVybiBpOw0KICAgICAgICB9Ow0KICAgIH0NCiAgICByZXR1cm4gQzFUNTsNCn0oKSk7DQovLyBDT05URVhUOiBOYW1lc3BhY2UgcHJvcGVydHkgZGVjbGFyYXRpb24NCnZhciBDMlQ1Ow0KKGZ1bmN0aW9uIChDMlQ1KSB7DQogICAgQzJUNS5mb28gPSBmdW5jdGlvbiAoaSkgew0KICAgICAgICByZXR1cm4gaTsNCiAgICB9Ow0KfSkoQzJUNSB8fCAoQzJUNSA9IHt9KSk7DQovLyBDT05URVhUOiBWYXJpYWJsZSBkZWNsYXJhdGlvbg0KdmFyIGMzdDEgPSAoZnVuY3Rpb24gKHMpIHsgcmV0dXJuIHM7IH0pOw0KdmFyIGMzdDIgPSAoew0KICAgIG46IDENCn0pOw0KdmFyIGMzdDMgPSBbXTsNCnZhciBjM3Q0ID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gKHt9KTsgfTsNCnZhciBjM3Q1ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuICh7fSk7IH07DQp2YXIgYzN0NiA9IGZ1bmN0aW9uIChuLCBzKSB7IHJldHVybiAoe30pOyB9Ow0KdmFyIGMzdDcgPSBmdW5jdGlvbiAobikgeyByZXR1cm4gbjsgfTsNCnZhciBjM3Q4ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuIG47IH07DQp2YXIgYzN0OSA9IFtbXSwgW11dOw0KdmFyIGMzdDEwID0gWyh7fSksICh7fSldOw0KdmFyIGMzdDExID0gW2Z1bmN0aW9uIChuLCBzKSB7IHJldHVybiBzOyB9XTsNCnZhciBjM3QxMiA9IHsNCiAgICBmb286ICh7fSkNCn07DQp2YXIgYzN0MTMgPSAoew0KICAgIGY6IGZ1bmN0aW9uIChpLCBzKSB7IHJldHVybiBzOyB9DQp9KTsNCnZhciBjM3QxNCA9ICh7DQogICAgYTogW10NCn0pOw0KLy8gQ09OVEVYVDogQ2xhc3MgcHJvcGVydHkgYXNzaWdubWVudA0KdmFyIEM0VDUgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgZnVuY3Rpb24gQzRUNSgpIHsNCiAgICAgICAgdGhpcy5mb28gPSBmdW5jdGlvbiAoaSwgcykgew0KICAgICAgICAgICAgcmV0dXJuIHM7DQogICAgICAgIH07DQogICAgfQ0KICAgIHJldHVybiBDNFQ1Ow0KfSgpKTsNCi8vIENPTlRFWFQ6IE5hbWVzcGFjZSBwcm9wZXJ0eSBhc3NpZ25tZW50DQp2YXIgQzVUNTsNCihmdW5jdGlvbiAoQzVUNSkgew0KICAgIEM1VDUuZm9vID0gZnVuY3Rpb24gKGksIHMpIHsNCiAgICAgICAgcmV0dXJuIHM7DQogICAgfTsNCn0pKEM1VDUgfHwgKEM1VDUgPSB7fSkpOw0KLy8gQ09OVEVYVDogVmFyaWFibGUgYXNzaWdubWVudA0KdmFyIGM2dDU7DQpjNnQ1ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuICh7fSk7IH07DQovLyBDT05URVhUOiBBcnJheSBpbmRleCBhc3NpZ25tZW50DQp2YXIgYzd0MiA9IFtdOw0KYzd0MlswXSA9ICh7IG46IDEgfSk7DQp2YXIgb2JqYzggPSAoe30pOw0Kb2JqYzgudDEgPSAoZnVuY3Rpb24gKHMpIHsgcmV0dXJuIHM7IH0pOw0Kb2JqYzgudDIgPSAoew0KICAgIG46IDENCn0pOw0Kb2JqYzgudDMgPSBbXTsNCm9iamM4LnQ0ID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gKHt9KTsgfTsNCm9iamM4LnQ1ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuICh7fSk7IH07DQpvYmpjOC50NiA9IGZ1bmN0aW9uIChuLCBzKSB7IHJldHVybiAoe30pOyB9Ow0Kb2JqYzgudDcgPSBmdW5jdGlvbiAobikgeyByZXR1cm4gbjsgfTsNCm9iamM4LnQ4ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuIG47IH07DQpvYmpjOC50OSA9IFtbXSwgW11dOw0Kb2JqYzgudDEwID0gWyh7fSksICh7fSldOw0Kb2JqYzgudDExID0gW2Z1bmN0aW9uIChuLCBzKSB7IHJldHVybiBzOyB9XTsNCm9iamM4LnQxMiA9IHsNCiAgICBmb286ICh7fSkNCn07DQpvYmpjOC50MTMgPSAoew0KICAgIGY6IGZ1bmN0aW9uIChpLCBzKSB7IHJldHVybiBzOyB9DQp9KTsNCm9iamM4LnQxNCA9ICh7DQogICAgYTogW10NCn0pOw0KLy8gQ09OVEVYVDogRnVuY3Rpb24gY2FsbA0KZnVuY3Rpb24gYzl0NShmKSB7IH0NCjsNCmM5dDUoZnVuY3Rpb24gKG4pIHsNCiAgICByZXR1cm4gKHt9KTsNCn0pOw0KLy8gQ09OVEVYVDogUmV0dXJuIHN0YXRlbWVudA0KdmFyIGMxMHQ1ID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gZnVuY3Rpb24gKG4pIHsgcmV0dXJuICh7fSk7IH07IH07DQovLyBDT05URVhUOiBOZXdpbmcgYSBjbGFzcw0KdmFyIEMxMXQ1ID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIEMxMXQ1KGYpIHsNCiAgICB9DQogICAgcmV0dXJuIEMxMXQ1Ow0KfSgpKTsNCjsNCnZhciBpID0gbmV3IEMxMXQ1KGZ1bmN0aW9uIChuKSB7IHJldHVybiAoe30pOyB9KTsNCi8vIENPTlRFWFQ6IFR5cGUgYW5ub3RhdGVkIGV4cHJlc3Npb24NCnZhciBjMTJ0MSA9IChmdW5jdGlvbiAocykgeyByZXR1cm4gczsgfSk7DQp2YXIgYzEydDIgPSAoew0KICAgIG46IDENCn0pOw0KdmFyIGMxMnQzID0gW107DQp2YXIgYzEydDQgPSBmdW5jdGlvbiAoKSB7IHJldHVybiAoe30pOyB9Ow0KdmFyIGMxMnQ1ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuICh7fSk7IH07DQp2YXIgYzEydDYgPSBmdW5jdGlvbiAobiwgcykgeyByZXR1cm4gKHt9KTsgfTsNCnZhciBjMTJ0NyA9IGZ1bmN0aW9uIChuKSB7IHJldHVybiBuOyB9Ow0KdmFyIGMxMnQ4ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuIG47IH07DQp2YXIgYzEydDkgPSBbW10sIFtdXTsNCnZhciBjMTJ0MTAgPSBbKHt9KSwgKHt9KV07DQp2YXIgYzEydDExID0gW2Z1bmN0aW9uIChuLCBzKSB7IHJldHVybiBzOyB9XTsNCnZhciBjMTJ0MTIgPSB7DQogICAgZm9vOiAoe30pDQp9Ow0KdmFyIGMxMnQxMyA9ICh7DQogICAgZjogZnVuY3Rpb24gKGksIHMpIHsgcmV0dXJuIHM7IH0NCn0pOw0KdmFyIGMxMnQxNCA9ICh7DQogICAgYTogW10NCn0pOw0KZnVuY3Rpb24gRUYxKGEsIGIpIHsgcmV0dXJuIGEgKyBiOyB9DQp2YXIgZWZ2ID0gRUYxKDEsIDIpOw0KUG9pbnQub3JpZ2luID0gbmV3IFBvaW50KDAsIDApOw0KUG9pbnQucHJvdG90eXBlLmFkZCA9IGZ1bmN0aW9uIChkeCwgZHkpIHsNCiAgICByZXR1cm4gbmV3IFBvaW50KHRoaXMueCArIGR4LCB0aGlzLnkgKyBkeSk7DQp9Ow0KUG9pbnQucHJvdG90eXBlID0gew0KICAgIHg6IDAsDQogICAgeTogMCwNCiAgICBhZGQ6IGZ1bmN0aW9uIChkeCwgZHkpIHsNCiAgICAgICAgcmV0dXJuIG5ldyBQb2ludCh0aGlzLnggKyBkeCwgdGhpcy55ICsgZHkpOw0KICAgIH0NCn07DQp2YXIgeCA9IHt9Ow0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9Y29udGV4dHVhbFR5cGluZy5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dHVhbFR5cGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbnRleHR1YWxUeXBpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBWUEsc0NBQXNDO0FBQ3RDO0lBQUE7UUFDSSxRQUFHLEdBQXFDLFVBQVMsQ0FBQztZQUM5QyxPQUFPLENBQUMsQ0FBQztRQUNiLENBQUMsQ0FBQTtJQUNMLENBQUM7SUFBRCxXQUFDO0FBQUQsQ0FBQyxBQUpELElBSUM7QUFFRCwwQ0FBMEM7QUFDMUMsSUFBVSxJQUFJLENBSWI7QUFKRCxXQUFVLElBQUk7SUFDQyxRQUFHLEdBQXFDLFVBQVMsQ0FBQztRQUN6RCxPQUFPLENBQUMsQ0FBQztJQUNiLENBQUMsQ0FBQTtBQUNMLENBQUMsRUFKUyxJQUFJLEtBQUosSUFBSSxRQUliO0FBRUQsZ0NBQWdDO0FBQ2hDLElBQUksSUFBSSxHQUEwQixDQUFDLFVBQVMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDN0QsSUFBSSxJQUFJLEdBQVMsQ0FBQztJQUNkLENBQUMsRUFBRSxDQUFDO0NBQ1AsQ0FBQyxDQUFBO0FBQ0YsSUFBSSxJQUFJLEdBQWEsRUFBRSxDQUFDO0FBQ3hCLElBQUksSUFBSSxHQUFlLGNBQWEsT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQ3hELElBQUksSUFBSSxHQUF3QixVQUFTLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUM7QUFDbEUsSUFBSSxJQUFJLEdBQW1DLFVBQVMsQ0FBQyxFQUFFLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUM7QUFDaEYsSUFBSSxJQUFJLEdBR0osVUFBUyxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFOUIsSUFBSSxJQUFJLEdBQXFDLFVBQVMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3ZFLElBQUksSUFBSSxHQUFlLENBQUMsRUFBRSxFQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQy9CLElBQUksS0FBSyxHQUFXLENBQU8sQ0FBQyxFQUFFLENBQUMsRUFBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDNUMsSUFBSSxLQUFLLEdBQXdDLENBQUMsVUFBUyxDQUFDLEVBQUUsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDaEYsSUFBSSxLQUFLLEdBQVM7SUFDZCxHQUFHLEVBQVEsQ0FBQyxFQUFFLENBQUM7Q0FDbEIsQ0FBQTtBQUNELElBQUksS0FBSyxHQUFTLENBQUM7SUFDZixDQUFDLEVBQUUsVUFBUyxDQUFDLEVBQUUsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztDQUNsQyxDQUFDLENBQUE7QUFDRixJQUFJLEtBQUssR0FBUyxDQUFDO0lBQ2YsQ0FBQyxFQUFFLEVBQUU7Q0FDUixDQUFDLENBQUE7QUFFRixxQ0FBcUM7QUFDckM7SUFFSTtRQUNJLElBQUksQ0FBQyxHQUFHLEdBQUcsVUFBUyxDQUFDLEVBQUUsQ0FBQztZQUNwQixPQUFPLENBQUMsQ0FBQztRQUNiLENBQUMsQ0FBQTtJQUNMLENBQUM7SUFDTCxXQUFDO0FBQUQsQ0FBQyxBQVBELElBT0M7QUFFRCx5Q0FBeUM7QUFDekMsSUFBVSxJQUFJLENBS2I7QUFMRCxXQUFVLElBQUk7SUFFVixLQUFBLEdBQUcsR0FBRyxVQUFTLENBQUMsRUFBRSxDQUFDO1FBQ2YsT0FBTyxDQUFDLENBQUM7SUFDYixDQUFDLENBQUE7QUFDTCxDQUFDLEVBTFMsSUFBSSxLQUFKLElBQUksUUFLYjtBQUVELCtCQUErQjtBQUMvQixJQUFJLElBQXlCLENBQUM7QUFDOUIsSUFBSSxHQUF3QixVQUFTLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUM7QUFFOUQsa0NBQWtDO0FBQ2xDLElBQUksSUFBSSxHQUFXLEVBQUUsQ0FBQztBQUN0QixJQUFJLENBQUMsQ0FBQyxDQUFDLEdBQVMsQ0FBQyxFQUFDLENBQUMsRUFBRSxDQUFDLEVBQUMsQ0FBQyxDQUFDO0FBdUJ6QixJQUFJLEtBQUssR0FrQlMsQ0FBQyxFQUFFLENBQUMsQ0FBQztBQUV2QixLQUFLLENBQUMsRUFBRSxHQUFHLENBQUMsVUFBUyxDQUFDLElBQUksT0FBTyxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUN0QyxLQUFLLENBQUMsRUFBRSxHQUFTLENBQUM7SUFDZCxDQUFDLEVBQUUsQ0FBQztDQUNQLENBQUMsQ0FBQztBQUNILEtBQUssQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO0FBQ2QsS0FBSyxDQUFDLEVBQUUsR0FBRyxjQUFhLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQztBQUM1QyxLQUFLLENBQUMsRUFBRSxHQUFHLFVBQVMsQ0FBQyxJQUFJLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQztBQUM3QyxLQUFLLENBQUMsRUFBRSxHQUFHLFVBQVMsQ0FBQyxFQUFFLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUM7QUFDaEQsS0FBSyxDQUFDLEVBQUUsR0FBRyxVQUFTLENBQVMsSUFBSSxPQUFPLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQztBQUU1QyxLQUFLLENBQUMsRUFBRSxHQUFHLFVBQVMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3JDLEtBQUssQ0FBQyxFQUFFLEdBQUcsQ0FBQyxFQUFFLEVBQUMsRUFBRSxDQUFDLENBQUM7QUFDbkIsS0FBSyxDQUFDLEdBQUcsR0FBRyxDQUFPLENBQUMsRUFBRSxDQUFDLEVBQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBQ3BDLEtBQUssQ0FBQyxHQUFHLEdBQUcsQ0FBQyxVQUFTLENBQUMsRUFBRSxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUMzQyxLQUFLLENBQUMsR0FBRyxHQUFHO0lBQ1IsR0FBRyxFQUFRLENBQUMsRUFBRSxDQUFDO0NBQ2xCLENBQUE7QUFDRCxLQUFLLENBQUMsR0FBRyxHQUFTLENBQUM7SUFDZixDQUFDLEVBQUUsVUFBUyxDQUFDLEVBQUUsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztDQUNsQyxDQUFDLENBQUE7QUFDRixLQUFLLENBQUMsR0FBRyxHQUFTLENBQUM7SUFDZixDQUFDLEVBQUUsRUFBRTtDQUNSLENBQUMsQ0FBQTtBQUNGLHlCQUF5QjtBQUN6QixTQUFTLElBQUksQ0FBQyxDQUFzQixJQUFHLENBQUM7QUFBQSxDQUFDO0FBQ3pDLElBQUksQ0FBQyxVQUFTLENBQUM7SUFDWCxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUM7QUFDdEIsQ0FBQyxDQUFDLENBQUM7QUFFSCw0QkFBNEI7QUFDNUIsSUFBSSxLQUFLLEdBQThCLGNBQWEsT0FBTyxVQUFTLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUM7QUFFL0YsMEJBQTBCO0FBQzFCO0lBQWMsZUFBWSxDQUFzQjtJQUFJLENBQUM7SUFBQyxZQUFDO0FBQUQsQ0FBQyxBQUF2RCxJQUF1RDtBQUFBLENBQUM7QUFDeEQsSUFBSSxDQUFDLEdBQUcsSUFBSSxLQUFLLENBQUMsVUFBUyxDQUFDLElBQUksT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFckQscUNBQXFDO0FBQ3JDLElBQUksS0FBSyxHQUEyQixDQUFDLFVBQVMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDL0QsSUFBSSxLQUFLLEdBQVUsQ0FBQztJQUNoQixDQUFDLEVBQUUsQ0FBQztDQUNQLENBQUMsQ0FBQztBQUNILElBQUksS0FBSyxHQUFjLEVBQUUsQ0FBQztBQUMxQixJQUFJLEtBQUssR0FBZ0IsY0FBYSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUM7QUFDMUQsSUFBSSxLQUFLLEdBQXlCLFVBQVMsQ0FBQyxJQUFJLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQztBQUNwRSxJQUFJLEtBQUssR0FBb0MsVUFBUyxDQUFDLEVBQUUsQ0FBQyxJQUFJLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQztBQUNsRixJQUFJLEtBQUssR0FHTixVQUFTLENBQVEsSUFBSSxPQUFPLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQztBQUVuQyxJQUFJLEtBQUssR0FBc0MsVUFBUyxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDekUsSUFBSSxLQUFLLEdBQWdCLENBQUMsRUFBRSxFQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQ2pDLElBQUksTUFBTSxHQUFZLENBQU8sQ0FBQyxFQUFFLENBQUMsRUFBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDOUMsSUFBSSxNQUFNLEdBQXlDLENBQUMsVUFBUyxDQUFDLEVBQUUsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDbEYsSUFBSSxNQUFNLEdBQVU7SUFDaEIsR0FBRyxFQUFRLENBQUMsRUFBRSxDQUFDO0NBQ2xCLENBQUE7QUFDRCxJQUFJLE1BQU0sR0FBVSxDQUFDO0lBQ2pCLENBQUMsRUFBRSxVQUFTLENBQUMsRUFBRSxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQ2xDLENBQUMsQ0FBQTtBQUNGLElBQUksTUFBTSxHQUFVLENBQUM7SUFDakIsQ0FBQyxFQUFFLEVBQUU7Q0FDUixDQUFDLENBQUE7QUFPRixTQUFTLEdBQUcsQ0FBQyxDQUFDLEVBQUMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxHQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFakMsSUFBSSxHQUFHLEdBQUcsR0FBRyxDQUFDLENBQUMsRUFBQyxDQUFDLENBQUMsQ0FBQztBQWNuQixLQUFLLENBQUMsTUFBTSxHQUFHLElBQUksS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztBQUUvQixLQUFLLENBQUMsU0FBUyxDQUFDLEdBQUcsR0FBRyxVQUFTLEVBQUUsRUFBRSxFQUFFO0lBQ2pDLE9BQU8sSUFBSSxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsSUFBSSxDQUFDLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQztBQUMvQyxDQUFDLENBQUM7QUFFRixLQUFLLENBQUMsU0FBUyxHQUFHO0lBQ2QsQ0FBQyxFQUFFLENBQUM7SUFDSixDQUFDLEVBQUUsQ0FBQztJQUNKLEdBQUcsRUFBRSxVQUFTLEVBQUUsRUFBRSxFQUFFO1FBQ2hCLE9BQU8sSUFBSSxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsSUFBSSxDQUFDLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQztJQUMvQyxDQUFDO0NBQ0osQ0FBQztBQUlGLElBQUksQ0FBQyxHQUFNLEVBQUcsQ0FBQyJ9,Ly8gREVGQVVMVCBJTlRFUkZBQ0VTCmludGVyZmFjZSBJRm9vIHsKICAgIG46IG51bWJlcjsKICAgIHM6IHN0cmluZzsKICAgIGYoaTogbnVtYmVyLCBzOiBzdHJpbmcpOiBzdHJpbmc7CiAgICBhOiBudW1iZXJbXTsKfQoKaW50ZXJmYWNlIElCYXIgewogICAgZm9vOiBJRm9vOwp9CgovLyBDT05URVhUOiBDbGFzcyBwcm9wZXJ0eSBkZWNsYXJhdGlvbgpjbGFzcyBDMVQ1IHsKICAgIGZvbzogKGk6IG51bWJlciwgczogc3RyaW5nKSA9PiBudW1iZXIgPSBmdW5jdGlvbihpKSB7CiAgICAgICAgcmV0dXJuIGk7CiAgICB9Cn0KCi8vIENPTlRFWFQ6IE5hbWVzcGFjZSBwcm9wZXJ0eSBkZWNsYXJhdGlvbgpuYW1lc3BhY2UgQzJUNSB7CiAgICBleHBvcnQgdmFyIGZvbzogKGk6IG51bWJlciwgczogc3RyaW5nKSA9PiBudW1iZXIgPSBmdW5jdGlvbihpKSB7CiAgICAgICAgcmV0dXJuIGk7CiAgICB9Cn0KCi8vIENPTlRFWFQ6IFZhcmlhYmxlIGRlY2xhcmF0aW9uCnZhciBjM3QxOiAoczogc3RyaW5nKSA9PiBzdHJpbmcgPSAoZnVuY3Rpb24ocykgeyByZXR1cm4gcyB9KTsKdmFyIGMzdDIgPSA8SUZvbz4oewogICAgbjogMQp9KQp2YXIgYzN0MzogbnVtYmVyW10gPSBbXTsKdmFyIGMzdDQ6ICgpID0+IElGb28gPSBmdW5jdGlvbigpIHsgcmV0dXJuIDxJRm9vPih7fSkgfTsKdmFyIGMzdDU6IChuOiBudW1iZXIpID0+IElGb28gPSBmdW5jdGlvbihuKSB7IHJldHVybiA8SUZvbz4oe30pIH07CnZhciBjM3Q2OiAobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IElGb28gPSBmdW5jdGlvbihuLCBzKSB7IHJldHVybiA8SUZvbz4oe30pIH07CnZhciBjM3Q3OiB7CiAgICAobjogbnVtYmVyKTogbnVtYmVyOyAgICAKICAgIChzMTogc3RyaW5nKTogbnVtYmVyOwp9ID0gZnVuY3Rpb24obikgeyByZXR1cm4gbjsgfTsKCnZhciBjM3Q4OiAobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IG51bWJlciA9IGZ1bmN0aW9uKG4pIHsgcmV0dXJuIG47IH07CnZhciBjM3Q5OiBudW1iZXJbXVtdID0gW1tdLFtdXTsKdmFyIGMzdDEwOiBJRm9vW10gPSBbPElGb28+KHt9KSw8SUZvbz4oe30pXTsKdmFyIGMzdDExOiB7KG46IG51bWJlciwgczogc3RyaW5nKTogc3RyaW5nO31bXSA9IFtmdW5jdGlvbihuLCBzKSB7IHJldHVybiBzOyB9XTsKdmFyIGMzdDEyOiBJQmFyID0gewogICAgZm9vOiA8SUZvbz4oe30pCn0KdmFyIGMzdDEzID0gPElGb28+KHsKICAgIGY6IGZ1bmN0aW9uKGksIHMpIHsgcmV0dXJuIHM7IH0KfSkKdmFyIGMzdDE0ID0gPElGb28+KHsKICAgIGE6IFtdCn0pCgovLyBDT05URVhUOiBDbGFzcyBwcm9wZXJ0eSBhc3NpZ25tZW50CmNsYXNzIEM0VDUgewogICAgZm9vOiAoaTogbnVtYmVyLCBzOiBzdHJpbmcpID0+IHN0cmluZzsKICAgIGNvbnN0cnVjdG9yKCkgewogICAgICAgIHRoaXMuZm9vID0gZnVuY3Rpb24oaSwgcykgewogICAgICAgICAgICByZXR1cm4gczsKICAgICAgICB9CiAgICB9Cn0KCi8vIENPTlRFWFQ6IE5hbWVzcGFjZSBwcm9wZXJ0eSBhc3NpZ25tZW50Cm5hbWVzcGFjZSBDNVQ1IHsKICAgIGV4cG9ydCB2YXIgZm9vOiAoaTogbnVtYmVyLCBzOiBzdHJpbmcpID0+IHN0cmluZzsKICAgIGZvbyA9IGZ1bmN0aW9uKGksIHMpIHsKICAgICAgICByZXR1cm4gczsKICAgIH0KfQoKLy8gQ09OVEVYVDogVmFyaWFibGUgYXNzaWdubWVudAp2YXIgYzZ0NTogKG46IG51bWJlcikgPT4gSUZvbzsKYzZ0NSA9IDwobjogbnVtYmVyKSA9PiBJRm9vPmZ1bmN0aW9uKG4pIHsgcmV0dXJuIDxJRm9vPih7fSkgfTsKCi8vIENPTlRFWFQ6IEFycmF5IGluZGV4IGFzc2lnbm1lbnQKdmFyIGM3dDI6IElGb29bXSA9IFtdOwpjN3QyWzBdID0gPElGb28+KHtuOiAxfSk7CgovLyBDT05URVhUOiBPYmplY3QgcHJvcGVydHkgYXNzaWdubWVudAppbnRlcmZhY2UgSVBsYWNlSG9sZGVyIHsKICAgIHQxOiAoczogc3RyaW5nKSA9PiBzdHJpbmc7CiAgICB0MjogSUZvbzsKICAgIHQzOiBudW1iZXJbXTsKICAgIHQ0OiAoKSA9PiBJRm9vOwogICAgdDU6IChuOiBudW1iZXIpID0+IElGb287CiAgICB0NjogKG46IG51bWJlciwgczogc3RyaW5nKSA9PiBJRm9vOwogICAgdDc6IHsKICAgICAgICAgICAgKG46IG51bWJlciwgczogc3RyaW5nKTogbnVtYmVyOyAgICAKICAgICAgICAgICAgLy8oczE6IHN0cmluZywgczI6IHN0cmluZyk6IG51bWJlcjsKICAgICAgICB9OwogICAgdDg6IChuOiBudW1iZXIsIHM6IHN0cmluZykgPT4gbnVtYmVyOwogICAgdDk6IG51bWJlcltdW107CiAgICB0MTA6IElGb29bXTsKICAgIHQxMTogeyhuOiBudW1iZXIsIHM6IHN0cmluZyk6IHN0cmluZzt9W107CiAgICB0MTI6IElCYXI7CiAgICB0MTM6IElGb287CiAgICB0MTQ6IElGb287CiAgICB9Cgp2YXIgb2JqYzg6IHsKICAgIHQxOiAoczogc3RyaW5nKSA9PiBzdHJpbmc7CiAgICB0MjogSUZvbzsKICAgIHQzOiBudW1iZXJbXTsKICAgIHQ0OiAoKSA9PiBJRm9vOwogICAgdDU6IChuOiBudW1iZXIpID0+IElGb287CiAgICB0NjogKG46IG51bWJlciwgczogc3RyaW5nKSA9PiBJRm9vOwogICAgdDc6IHsKICAgICAgICAgICAgKG46IG51bWJlciwgczogc3RyaW5nKTogbnVtYmVyOyAgICAKICAgICAgICAgICAgLy8oczE6IHN0cmluZywgczI6IHN0cmluZyk6IG51bWJlcjsKICAgICAgICB9OwogICAgdDg6IChuOiBudW1iZXIsIHM6IHN0cmluZykgPT4gbnVtYmVyOwogICAgdDk6IG51bWJlcltdW107CiAgICB0MTA6IElGb29bXTsKICAgIHQxMTogeyhuOiBudW1iZXIsIHM6IHN0cmluZyk6IHN0cmluZzt9W107CiAgICB0MTI6IElCYXI7CiAgICB0MTM6IElGb287CiAgICB0MTQ6IElGb287Cn0gPSA8SVBsYWNlSG9sZGVyPih7fSk7CgpvYmpjOC50MSA9IChmdW5jdGlvbihzKSB7IHJldHVybiBzIH0pOwpvYmpjOC50MiA9IDxJRm9vPih7CiAgICBuOiAxCn0pOwpvYmpjOC50MyA9IFtdOwpvYmpjOC50NCA9IGZ1bmN0aW9uKCkgeyByZXR1cm4gPElGb28+KHt9KSB9OwpvYmpjOC50NSA9IGZ1bmN0aW9uKG4pIHsgcmV0dXJuIDxJRm9vPih7fSkgfTsKb2JqYzgudDYgPSBmdW5jdGlvbihuLCBzKSB7IHJldHVybiA8SUZvbz4oe30pIH07Cm9iamM4LnQ3ID0gZnVuY3Rpb24objogbnVtYmVyKSB7IHJldHVybiBuIH07CgpvYmpjOC50OCA9IGZ1bmN0aW9uKG4pIHsgcmV0dXJuIG47IH07Cm9iamM4LnQ5ID0gW1tdLFtdXTsKb2JqYzgudDEwID0gWzxJRm9vPih7fSksPElGb28+KHt9KV07Cm9iamM4LnQxMSA9IFtmdW5jdGlvbihuLCBzKSB7IHJldHVybiBzOyB9XTsKb2JqYzgudDEyID0gewogICAgZm9vOiA8SUZvbz4oe30pCn0Kb2JqYzgudDEzID0gPElGb28+KHsKICAgIGY6IGZ1bmN0aW9uKGksIHMpIHsgcmV0dXJuIHM7IH0KfSkKb2JqYzgudDE0ID0gPElGb28+KHsKICAgIGE6IFtdCn0pCi8vIENPTlRFWFQ6IEZ1bmN0aW9uIGNhbGwKZnVuY3Rpb24gYzl0NShmOiAobjogbnVtYmVyKSA9PiBJRm9vKSB7fTsKYzl0NShmdW5jdGlvbihuKSB7CiAgICByZXR1cm4gPElGb28+KHt9KTsKfSk7CgovLyBDT05URVhUOiBSZXR1cm4gc3RhdGVtZW50CnZhciBjMTB0NTogKCkgPT4gKG46IG51bWJlcikgPT4gSUZvbyA9IGZ1bmN0aW9uKCkgeyByZXR1cm4gZnVuY3Rpb24obikgeyByZXR1cm4gPElGb28+KHt9KSB9IH07CgovLyBDT05URVhUOiBOZXdpbmcgYSBjbGFzcwpjbGFzcyBDMTF0NSB7IGNvbnN0cnVjdG9yKGY6IChuOiBudW1iZXIpID0+IElGb28pIHsgfSB9Owp2YXIgaSA9IG5ldyBDMTF0NShmdW5jdGlvbihuKSB7IHJldHVybiA8SUZvbz4oe30pIH0pOwoKLy8gQ09OVEVYVDogVHlwZSBhbm5vdGF0ZWQgZXhwcmVzc2lvbgp2YXIgYzEydDEgPSA8KHM6IHN0cmluZykgPT4gc3RyaW5nPiAoZnVuY3Rpb24ocykgeyByZXR1cm4gcyB9KTsKdmFyIGMxMnQyID0gPElGb28+ICh7CiAgICBuOiAxCn0pOwp2YXIgYzEydDMgPSA8bnVtYmVyW10+IFtdOwp2YXIgYzEydDQgPSA8KCkgPT4gSUZvbz4gZnVuY3Rpb24oKSB7IHJldHVybiA8SUZvbz4oe30pIH07CnZhciBjMTJ0NSA9IDwobjogbnVtYmVyKSA9PiBJRm9vPiBmdW5jdGlvbihuKSB7IHJldHVybiA8SUZvbz4oe30pIH07CnZhciBjMTJ0NiA9IDwobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IElGb28+IGZ1bmN0aW9uKG4sIHMpIHsgcmV0dXJuIDxJRm9vPih7fSkgfTsKdmFyIGMxMnQ3ID0gPHsKICAgIChuOiBudW1iZXIsIHM6IHN0cmluZyk6IG51bWJlcjsgICAgCiAgICAvLyhzMTogc3RyaW5nLCBzMjogc3RyaW5nKTogbnVtYmVyOwp9PiBmdW5jdGlvbihuOm51bWJlcikgeyByZXR1cm4gbiB9OwoKdmFyIGMxMnQ4ID0gPChuOiBudW1iZXIsIHM6IHN0cmluZykgPT4gbnVtYmVyPiBmdW5jdGlvbihuKSB7IHJldHVybiBuOyB9Owp2YXIgYzEydDkgPSA8bnVtYmVyW11bXT4gW1tdLFtdXTsKdmFyIGMxMnQxMCA9IDxJRm9vW10+IFs8SUZvbz4oe30pLDxJRm9vPih7fSldOwp2YXIgYzEydDExID0gPHsobjogbnVtYmVyLCBzOiBzdHJpbmcpOiBzdHJpbmc7fVtdPiBbZnVuY3Rpb24obiwgcykgeyByZXR1cm4gczsgfV07CnZhciBjMTJ0MTIgPSA8SUJhcj4gewogICAgZm9vOiA8SUZvbz4oe30pCn0KdmFyIGMxMnQxMyA9IDxJRm9vPiAoewogICAgZjogZnVuY3Rpb24oaSwgcykgeyByZXR1cm4gczsgfQp9KQp2YXIgYzEydDE0ID0gPElGb28+ICh7CiAgICBhOiBbXQp9KQoKLy8gQ09OVEVYVDogQ29udGV4dHVhbCB0eXBpbmcgZGVjbGFyYXRpb25zCgovLyBjb250ZXh0dWFsbHkgdHlwaW5nIGZ1bmN0aW9uIGRlY2xhcmF0aW9ucwpkZWNsYXJlIGZ1bmN0aW9uIEVGMShhOm51bWJlciwgYjpudW1iZXIpOm51bWJlcjsKCmZ1bmN0aW9uIEVGMShhLGIpIHsgcmV0dXJuIGErYjsgfQoKdmFyIGVmdiA9IEVGMSgxLDIpOwoKCi8vIGNvbnRleHR1YWxseSB0eXBpbmcgZnJvbSBhbWJpZW50IGNsYXNzIGRlY2xhcmF0aW9ucwpkZWNsYXJlIGNsYXNzIFBvaW50CnsKICAgICAgY29uc3RydWN0b3IoeDogbnVtYmVyLCB5OiBudW1iZXIpOwogICAgICB4OiBudW1iZXI7CiAgICAgIHk6IG51bWJlcjsKICAgICAgYWRkKGR4OiBudW1iZXIsIGR5OiBudW1iZXIpOiBQb2ludDsKICAgICAgc3RhdGljIG9yaWdpbjogUG9pbnQ7Cgp9CgpQb2ludC5vcmlnaW4gPSBuZXcgUG9pbnQoMCwgMCk7CgpQb2ludC5wcm90b3R5cGUuYWRkID0gZnVuY3Rpb24oZHgsIGR5KSB7CiAgICByZXR1cm4gbmV3IFBvaW50KHRoaXMueCArIGR4LCB0aGlzLnkgKyBkeSk7Cn07CgpQb2ludC5wcm90b3R5cGUgPSB7CiAgICB4OiAwLAogICAgeTogMCwKICAgIGFkZDogZnVuY3Rpb24oZHgsIGR5KSB7CiAgICAgICAgcmV0dXJuIG5ldyBQb2ludCh0aGlzLnggKyBkeCwgdGhpcy55ICsgZHkpOwogICAgfQp9OwoKaW50ZXJmYWNlIEEgeyB4OiBzdHJpbmc7IH0KaW50ZXJmYWNlIEIgZXh0ZW5kcyBBIHsgfQp2YXIgeDogQiA9IHsgfTsK
diff --git a/tests/baselines/reference/contextualTyping.sourcemap.txt b/tests/baselines/reference/contextualTyping.sourcemap.txt
index 88a9b9d71668f..c68b3d3394e89 100644
--- a/tests/baselines/reference/contextualTyping.sourcemap.txt
+++ b/tests/baselines/reference/contextualTyping.sourcemap.txt
@@ -110,7 +110,7 @@ sourceFile:contextualTyping.ts
 2 >^
 3 > 
 4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
 2 >}
 3 > 
@@ -124,15 +124,15 @@ sourceFile:contextualTyping.ts
 3 >Emitted(9, 2) Source(14, 1) + SourceIndex(0)
 4 >Emitted(9, 6) Source(18, 2) + SourceIndex(0)
 ---
->>>// CONTEXT: Module property declaration
+>>>// CONTEXT: Namespace property declaration
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
   >
-2 >// CONTEXT: Module property declaration
+2 >// CONTEXT: Namespace property declaration
 1->Emitted(10, 1) Source(20, 1) + SourceIndex(0)
-2 >Emitted(10, 40) Source(20, 40) + SourceIndex(0)
+2 >Emitted(10, 43) Source(20, 43) + SourceIndex(0)
 ---
 >>>var C2T5;
 1 >
@@ -1011,7 +1011,7 @@ sourceFile:contextualTyping.ts
 2 >^
 3 > 
 4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
 2 >}
 3 > 
@@ -1028,15 +1028,15 @@ sourceFile:contextualTyping.ts
 3 >Emitted(48, 2) Source(56, 1) + SourceIndex(0)
 4 >Emitted(48, 6) Source(63, 2) + SourceIndex(0)
 ---
->>>// CONTEXT: Module property assignment
+>>>// CONTEXT: Namespace property assignment
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
   >
-2 >// CONTEXT: Module property assignment
+2 >// CONTEXT: Namespace property assignment
 1->Emitted(49, 1) Source(65, 1) + SourceIndex(0)
-2 >Emitted(49, 39) Source(65, 39) + SourceIndex(0)
+2 >Emitted(49, 42) Source(65, 42) + SourceIndex(0)
 ---
 >>>var C5T5;
 1 >
@@ -1238,21 +1238,27 @@ sourceFile:contextualTyping.ts
 1 >Emitted(59, 1) Source(77, 1) + SourceIndex(0)
 2 >Emitted(59, 35) Source(77, 35) + SourceIndex(0)
 ---
->>>var c7t2;
+>>>var c7t2 = [];
 1 >
 2 >^^^^
 3 >    ^^^^
-4 >        ^
-5 >         ^^^^^^^^^^^^^->
+4 >        ^^^
+5 >           ^^
+6 >             ^
+7 >              ^^^^^^^^->
 1 >
   >
 2 >var 
-3 >    c7t2: IFoo[]
-4 >        ;
+3 >    c7t2
+4 >        : IFoo[] = 
+5 >           []
+6 >             ;
 1 >Emitted(60, 1) Source(78, 1) + SourceIndex(0)
 2 >Emitted(60, 5) Source(78, 5) + SourceIndex(0)
-3 >Emitted(60, 9) Source(78, 17) + SourceIndex(0)
-4 >Emitted(60, 10) Source(78, 18) + SourceIndex(0)
+3 >Emitted(60, 9) Source(78, 9) + SourceIndex(0)
+4 >Emitted(60, 12) Source(78, 20) + SourceIndex(0)
+5 >Emitted(60, 14) Source(78, 22) + SourceIndex(0)
+6 >Emitted(60, 15) Source(78, 23) + SourceIndex(0)
 ---
 >>>c7t2[0] = ({ n: 1 });
 1->
diff --git a/tests/baselines/reference/contextualTyping.symbols b/tests/baselines/reference/contextualTyping.symbols
index 225a450bcd6b7..97b18f5b6a44d 100644
--- a/tests/baselines/reference/contextualTyping.symbols
+++ b/tests/baselines/reference/contextualTyping.symbols
@@ -43,7 +43,7 @@ class C1T5 {
     }
 }
 
-// CONTEXT: Module property declaration
+// CONTEXT: Namespace property declaration
 namespace C2T5 {
 >C2T5 : Symbol(C2T5, Decl(contextualTyping.ts, 17, 1))
 
@@ -185,7 +185,7 @@ class C4T5 {
     }
 }
 
-// CONTEXT: Module property assignment
+// CONTEXT: Namespace property assignment
 namespace C5T5 {
 >C5T5 : Symbol(C5T5, Decl(contextualTyping.ts, 62, 1))
 
@@ -218,7 +218,7 @@ c6t5 = <(n: number) => IFoo>function(n) { return <IFoo>({}) };
 >IFoo : Symbol(IFoo, Decl(contextualTyping.ts, 0, 0))
 
 // CONTEXT: Array index assignment
-var c7t2: IFoo[];
+var c7t2: IFoo[] = [];
 >c7t2 : Symbol(c7t2, Decl(contextualTyping.ts, 77, 3))
 >IFoo : Symbol(IFoo, Decl(contextualTyping.ts, 0, 0))
 
diff --git a/tests/baselines/reference/contextualTyping.types b/tests/baselines/reference/contextualTyping.types
index b3613681d08ad..26446ec8ff75f 100644
--- a/tests/baselines/reference/contextualTyping.types
+++ b/tests/baselines/reference/contextualTyping.types
@@ -53,7 +53,7 @@ class C1T5 {
     }
 }
 
-// CONTEXT: Module property declaration
+// CONTEXT: Namespace property declaration
 namespace C2T5 {
 >C2T5 : typeof C2T5
 >     : ^^^^^^^^^^^
@@ -336,7 +336,7 @@ class C4T5 {
     }
 }
 
-// CONTEXT: Module property assignment
+// CONTEXT: Namespace property assignment
 namespace C5T5 {
 >C5T5 : typeof C5T5
 >     : ^^^^^^^^^^^
@@ -395,9 +395,11 @@ c6t5 = <(n: number) => IFoo>function(n) { return <IFoo>({}) };
 >   : ^^
 
 // CONTEXT: Array index assignment
-var c7t2: IFoo[];
+var c7t2: IFoo[] = [];
 >c7t2 : IFoo[]
 >     : ^^^^^^
+>[] : undefined[]
+>   : ^^^^^^^^^^^
 
 c7t2[0] = <IFoo>({n: 1});
 >c7t2[0] = <IFoo>({n: 1}) : IFoo
diff --git a/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.errors.txt b/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.errors.txt
index 1003ddbdb7678..561aba38135a5 100644
--- a/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.errors.txt
+++ b/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.errors.txt
@@ -15,8 +15,8 @@ contextualTypingOfGenericFunctionTypedArguments1.ts(17,32): error TS2345: Argume
         forEach<T>(c: Collection<T>, f: (x: T) => Date): void;
     }
     
-    var c2: Collection<number>;
-    var _: Combinators;
+    declare var c2: Collection<number>;
+    declare var _: Combinators;
     
     // errors on all 3 lines, bug was that r5 was the only line with errors
     var f = (x: number) => { return x.toFixed() };
diff --git a/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.js b/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.js
index 78f650c512feb..3bca6ffd0e537 100644
--- a/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.js
+++ b/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.js
@@ -11,8 +11,8 @@ interface Combinators {
     forEach<T>(c: Collection<T>, f: (x: T) => Date): void;
 }
 
-var c2: Collection<number>;
-var _: Combinators;
+declare var c2: Collection<number>;
+declare var _: Combinators;
 
 // errors on all 3 lines, bug was that r5 was the only line with errors
 var f = (x: number) => { return x.toFixed() };
@@ -21,8 +21,6 @@ var r6 = _.forEach<number>(c2, (x) => { return x.toFixed() });
 
 
 //// [contextualTypingOfGenericFunctionTypedArguments1.js]
-var c2;
-var _;
 // errors on all 3 lines, bug was that r5 was the only line with errors
 var f = function (x) { return x.toFixed(); };
 var r5 = _.forEach(c2, f);
diff --git a/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.symbols b/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.symbols
index 5045b62e7e260..f9483c7b9d4be 100644
--- a/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.symbols
+++ b/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.symbols
@@ -34,12 +34,12 @@ interface Combinators {
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
 
-var c2: Collection<number>;
->c2 : Symbol(c2, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 10, 3))
+declare var c2: Collection<number>;
+>c2 : Symbol(c2, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 10, 11))
 >Collection : Symbol(Collection, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 0, 0))
 
-var _: Combinators;
->_ : Symbol(_, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 11, 3))
+declare var _: Combinators;
+>_ : Symbol(_, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 11, 11))
 >Combinators : Symbol(Combinators, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 4, 1))
 
 // errors on all 3 lines, bug was that r5 was the only line with errors
@@ -53,17 +53,17 @@ var f = (x: number) => { return x.toFixed() };
 var r5 = _.forEach<number>(c2, f); 
 >r5 : Symbol(r5, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 15, 3))
 >_.forEach : Symbol(Combinators.forEach, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 6, 23))
->_ : Symbol(_, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 11, 3))
+>_ : Symbol(_, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 11, 11))
 >forEach : Symbol(Combinators.forEach, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 6, 23))
->c2 : Symbol(c2, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 10, 3))
+>c2 : Symbol(c2, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 10, 11))
 >f : Symbol(f, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 14, 3))
 
 var r6 = _.forEach<number>(c2, (x) => { return x.toFixed() }); 
 >r6 : Symbol(r6, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 16, 3))
 >_.forEach : Symbol(Combinators.forEach, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 6, 23))
->_ : Symbol(_, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 11, 3))
+>_ : Symbol(_, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 11, 11))
 >forEach : Symbol(Combinators.forEach, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 6, 23))
->c2 : Symbol(c2, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 10, 3))
+>c2 : Symbol(c2, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 10, 11))
 >x : Symbol(x, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 16, 32))
 >x.toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(contextualTypingOfGenericFunctionTypedArguments1.ts, 16, 32))
diff --git a/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.types b/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.types
index 075082acb4cd7..07d73b81a28e0 100644
--- a/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.types
+++ b/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.types
@@ -31,11 +31,11 @@ interface Combinators {
 >  : ^
 }
 
-var c2: Collection<number>;
+declare var c2: Collection<number>;
 >c2 : Collection<number>
 >   : ^^^^^^^^^^^^^^^^^^
 
-var _: Combinators;
+declare var _: Combinators;
 >_ : Combinators
 >  : ^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.errors.txt b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.errors.txt
index 411a6b9079b81..dc2673e1b1175 100644
--- a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.errors.txt
+++ b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.errors.txt
@@ -4,7 +4,7 @@ contextualTypingWithFixedTypeParameters1.ts(3,38): error TS2345: Argument of typ
 
 
 ==== contextualTypingWithFixedTypeParameters1.ts (3 errors) ====
-    var f10: <T>(x: T, b: () => (a: T) => void, y: T) => T;
+    declare var f10: <T>(x: T, b: () => (a: T) => void, y: T) => T;
     f10('', () => a => a.foo, ''); // a is ""
                          ~~~
 !!! error TS2339: Property 'foo' does not exist on type 'string'.
diff --git a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.js b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.js
index c5ed72aa8d02c..d05fd49e73bde 100644
--- a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.js
+++ b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.js
@@ -1,11 +1,10 @@
 //// [tests/cases/compiler/contextualTypingWithFixedTypeParameters1.ts] ////
 
 //// [contextualTypingWithFixedTypeParameters1.ts]
-var f10: <T>(x: T, b: () => (a: T) => void, y: T) => T;
+declare var f10: <T>(x: T, b: () => (a: T) => void, y: T) => T;
 f10('', () => a => a.foo, ''); // a is ""
 var r9 = f10('', () => (a => a.foo), 1); // error
 
 //// [contextualTypingWithFixedTypeParameters1.js]
-var f10;
 f10('', function () { return function (a) { return a.foo; }; }, ''); // a is ""
 var r9 = f10('', function () { return (function (a) { return a.foo; }); }, 1); // error
diff --git a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.symbols b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.symbols
index 1205638262f78..22fcf9cfe7686 100644
--- a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.symbols
+++ b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.symbols
@@ -1,26 +1,26 @@
 //// [tests/cases/compiler/contextualTypingWithFixedTypeParameters1.ts] ////
 
 === contextualTypingWithFixedTypeParameters1.ts ===
-var f10: <T>(x: T, b: () => (a: T) => void, y: T) => T;
->f10 : Symbol(f10, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 3))
->T : Symbol(T, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 10))
->x : Symbol(x, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 13))
->T : Symbol(T, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 10))
->b : Symbol(b, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 18))
->a : Symbol(a, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 29))
->T : Symbol(T, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 10))
->y : Symbol(y, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 43))
->T : Symbol(T, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 10))
->T : Symbol(T, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 10))
+declare var f10: <T>(x: T, b: () => (a: T) => void, y: T) => T;
+>f10 : Symbol(f10, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 11))
+>T : Symbol(T, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 18))
+>x : Symbol(x, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 21))
+>T : Symbol(T, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 18))
+>b : Symbol(b, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 26))
+>a : Symbol(a, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 37))
+>T : Symbol(T, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 18))
+>y : Symbol(y, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 51))
+>T : Symbol(T, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 18))
+>T : Symbol(T, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 18))
 
 f10('', () => a => a.foo, ''); // a is ""
->f10 : Symbol(f10, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 3))
+>f10 : Symbol(f10, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 11))
 >a : Symbol(a, Decl(contextualTypingWithFixedTypeParameters1.ts, 1, 13))
 >a : Symbol(a, Decl(contextualTypingWithFixedTypeParameters1.ts, 1, 13))
 
 var r9 = f10('', () => (a => a.foo), 1); // error
 >r9 : Symbol(r9, Decl(contextualTypingWithFixedTypeParameters1.ts, 2, 3))
->f10 : Symbol(f10, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 3))
+>f10 : Symbol(f10, Decl(contextualTypingWithFixedTypeParameters1.ts, 0, 11))
 >a : Symbol(a, Decl(contextualTypingWithFixedTypeParameters1.ts, 2, 24))
 >a : Symbol(a, Decl(contextualTypingWithFixedTypeParameters1.ts, 2, 24))
 
diff --git a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.types b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.types
index 14075af84d112..8cf50dbe0abb2 100644
--- a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.types
+++ b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/contextualTypingWithFixedTypeParameters1.ts] ////
 
 === contextualTypingWithFixedTypeParameters1.ts ===
-var f10: <T>(x: T, b: () => (a: T) => void, y: T) => T;
+declare var f10: <T>(x: T, b: () => (a: T) => void, y: T) => T;
 >f10 : <T>(x: T, b: () => (a: T) => void, y: T) => T
 >    : ^ ^^ ^^ ^^ ^^                    ^^ ^^ ^^^^^ 
 >x : T
diff --git a/tests/baselines/reference/contextuallyTypedByDiscriminableUnion2.symbols b/tests/baselines/reference/contextuallyTypedByDiscriminableUnion2.symbols
new file mode 100644
index 0000000000000..9f68d9708cdf6
--- /dev/null
+++ b/tests/baselines/reference/contextuallyTypedByDiscriminableUnion2.symbols
@@ -0,0 +1,122 @@
+//// [tests/cases/compiler/contextuallyTypedByDiscriminableUnion2.ts] ////
+
+=== contextuallyTypedByDiscriminableUnion2.ts ===
+// https://github.com/microsoft/TypeScript/issues/62256
+
+type Identifiable = { id: string };
+>Identifiable : Symbol(Identifiable, Decl(contextuallyTypedByDiscriminableUnion2.ts, 0, 0))
+>id : Symbol(id, Decl(contextuallyTypedByDiscriminableUnion2.ts, 2, 21))
+
+interface EnableA {
+>EnableA : Symbol(EnableA, Decl(contextuallyTypedByDiscriminableUnion2.ts, 2, 35))
+
+  readonly enableA: true;
+>enableA : Symbol(EnableA.enableA, Decl(contextuallyTypedByDiscriminableUnion2.ts, 4, 19))
+
+  // this introduces a conflicting property with some of the other members of MyComponentProps
+  // making relevant final union members reduced nevers
+  readonly enableB: true;
+>enableB : Symbol(EnableA.enableB, Decl(contextuallyTypedByDiscriminableUnion2.ts, 5, 25))
+}
+
+interface DisableA {
+>DisableA : Symbol(DisableA, Decl(contextuallyTypedByDiscriminableUnion2.ts, 9, 1))
+
+  readonly enableA?: false;
+>enableA : Symbol(DisableA.enableA, Decl(contextuallyTypedByDiscriminableUnion2.ts, 11, 20))
+}
+
+interface EnableB {
+>EnableB : Symbol(EnableB, Decl(contextuallyTypedByDiscriminableUnion2.ts, 13, 1))
+
+  readonly enableB?: true;
+>enableB : Symbol(EnableB.enableB, Decl(contextuallyTypedByDiscriminableUnion2.ts, 15, 19))
+}
+
+interface DisableB {
+>DisableB : Symbol(DisableB, Decl(contextuallyTypedByDiscriminableUnion2.ts, 17, 1))
+
+  readonly enableB: false;
+>enableB : Symbol(DisableB.enableB, Decl(contextuallyTypedByDiscriminableUnion2.ts, 19, 20))
+}
+
+export interface EnableD<I extends Identifiable> {
+>EnableD : Symbol(EnableD, Decl(contextuallyTypedByDiscriminableUnion2.ts, 21, 1))
+>I : Symbol(I, Decl(contextuallyTypedByDiscriminableUnion2.ts, 23, 25))
+>Identifiable : Symbol(Identifiable, Decl(contextuallyTypedByDiscriminableUnion2.ts, 0, 0))
+
+  readonly enableD: true;
+>enableD : Symbol(EnableD.enableD, Decl(contextuallyTypedByDiscriminableUnion2.ts, 23, 50))
+
+  readonly value: I["id"] | null;
+>value : Symbol(EnableD.value, Decl(contextuallyTypedByDiscriminableUnion2.ts, 24, 25))
+>I : Symbol(I, Decl(contextuallyTypedByDiscriminableUnion2.ts, 23, 25))
+
+  readonly setItem: (item: I | null) => void;
+>setItem : Symbol(EnableD.setItem, Decl(contextuallyTypedByDiscriminableUnion2.ts, 25, 33))
+>item : Symbol(item, Decl(contextuallyTypedByDiscriminableUnion2.ts, 26, 21))
+>I : Symbol(I, Decl(contextuallyTypedByDiscriminableUnion2.ts, 23, 25))
+}
+
+export interface DisableD<I extends Identifiable> {
+>DisableD : Symbol(DisableD, Decl(contextuallyTypedByDiscriminableUnion2.ts, 27, 1))
+>I : Symbol(I, Decl(contextuallyTypedByDiscriminableUnion2.ts, 29, 26))
+>Identifiable : Symbol(Identifiable, Decl(contextuallyTypedByDiscriminableUnion2.ts, 0, 0))
+
+  readonly enableD: false;
+>enableD : Symbol(DisableD.enableD, Decl(contextuallyTypedByDiscriminableUnion2.ts, 29, 51))
+
+  readonly value: I["id"];
+>value : Symbol(DisableD.value, Decl(contextuallyTypedByDiscriminableUnion2.ts, 30, 26))
+>I : Symbol(I, Decl(contextuallyTypedByDiscriminableUnion2.ts, 29, 26))
+
+  readonly setItem: (item: I) => void;
+>setItem : Symbol(DisableD.setItem, Decl(contextuallyTypedByDiscriminableUnion2.ts, 31, 26))
+>item : Symbol(item, Decl(contextuallyTypedByDiscriminableUnion2.ts, 32, 21))
+>I : Symbol(I, Decl(contextuallyTypedByDiscriminableUnion2.ts, 29, 26))
+}
+
+type MyComponentProps<I extends Identifiable> = (EnableA | DisableA) &
+>MyComponentProps : Symbol(MyComponentProps, Decl(contextuallyTypedByDiscriminableUnion2.ts, 33, 1))
+>I : Symbol(I, Decl(contextuallyTypedByDiscriminableUnion2.ts, 35, 22))
+>Identifiable : Symbol(Identifiable, Decl(contextuallyTypedByDiscriminableUnion2.ts, 0, 0))
+>EnableA : Symbol(EnableA, Decl(contextuallyTypedByDiscriminableUnion2.ts, 2, 35))
+>DisableA : Symbol(DisableA, Decl(contextuallyTypedByDiscriminableUnion2.ts, 9, 1))
+
+  (EnableB | DisableB) &
+>EnableB : Symbol(EnableB, Decl(contextuallyTypedByDiscriminableUnion2.ts, 13, 1))
+>DisableB : Symbol(DisableB, Decl(contextuallyTypedByDiscriminableUnion2.ts, 17, 1))
+
+  (DisableD<I> | EnableD<I>);
+>DisableD : Symbol(DisableD, Decl(contextuallyTypedByDiscriminableUnion2.ts, 27, 1))
+>I : Symbol(I, Decl(contextuallyTypedByDiscriminableUnion2.ts, 35, 22))
+>EnableD : Symbol(EnableD, Decl(contextuallyTypedByDiscriminableUnion2.ts, 21, 1))
+>I : Symbol(I, Decl(contextuallyTypedByDiscriminableUnion2.ts, 35, 22))
+
+const MyComponent = <I extends Identifiable>(props: MyComponentProps<I>) => {};
+>MyComponent : Symbol(MyComponent, Decl(contextuallyTypedByDiscriminableUnion2.ts, 39, 5))
+>I : Symbol(I, Decl(contextuallyTypedByDiscriminableUnion2.ts, 39, 21))
+>Identifiable : Symbol(Identifiable, Decl(contextuallyTypedByDiscriminableUnion2.ts, 0, 0))
+>props : Symbol(props, Decl(contextuallyTypedByDiscriminableUnion2.ts, 39, 45))
+>MyComponentProps : Symbol(MyComponentProps, Decl(contextuallyTypedByDiscriminableUnion2.ts, 33, 1))
+>I : Symbol(I, Decl(contextuallyTypedByDiscriminableUnion2.ts, 39, 21))
+
+declare const item: string | null;
+>item : Symbol(item, Decl(contextuallyTypedByDiscriminableUnion2.ts, 41, 13))
+
+MyComponent({
+>MyComponent : Symbol(MyComponent, Decl(contextuallyTypedByDiscriminableUnion2.ts, 39, 5))
+
+  enableD: true,
+>enableD : Symbol(enableD, Decl(contextuallyTypedByDiscriminableUnion2.ts, 43, 13))
+
+  value: item,
+>value : Symbol(value, Decl(contextuallyTypedByDiscriminableUnion2.ts, 44, 16))
+>item : Symbol(item, Decl(contextuallyTypedByDiscriminableUnion2.ts, 41, 13))
+
+  setItem: (item) => {},
+>setItem : Symbol(setItem, Decl(contextuallyTypedByDiscriminableUnion2.ts, 45, 14))
+>item : Symbol(item, Decl(contextuallyTypedByDiscriminableUnion2.ts, 46, 12))
+
+});
+
diff --git a/tests/baselines/reference/contextuallyTypedByDiscriminableUnion2.types b/tests/baselines/reference/contextuallyTypedByDiscriminableUnion2.types
new file mode 100644
index 0000000000000..41b487e1103e5
--- /dev/null
+++ b/tests/baselines/reference/contextuallyTypedByDiscriminableUnion2.types
@@ -0,0 +1,136 @@
+//// [tests/cases/compiler/contextuallyTypedByDiscriminableUnion2.ts] ////
+
+=== contextuallyTypedByDiscriminableUnion2.ts ===
+// https://github.com/microsoft/TypeScript/issues/62256
+
+type Identifiable = { id: string };
+>Identifiable : Identifiable
+>             : ^^^^^^^^^^^^
+>id : string
+>   : ^^^^^^
+
+interface EnableA {
+  readonly enableA: true;
+>enableA : true
+>        : ^^^^
+>true : true
+>     : ^^^^
+
+  // this introduces a conflicting property with some of the other members of MyComponentProps
+  // making relevant final union members reduced nevers
+  readonly enableB: true;
+>enableB : true
+>        : ^^^^
+>true : true
+>     : ^^^^
+}
+
+interface DisableA {
+  readonly enableA?: false;
+>enableA : false | undefined
+>        : ^^^^^^^^^^^^^^^^^
+>false : false
+>      : ^^^^^
+}
+
+interface EnableB {
+  readonly enableB?: true;
+>enableB : true | undefined
+>        : ^^^^^^^^^^^^^^^^
+>true : true
+>     : ^^^^
+}
+
+interface DisableB {
+  readonly enableB: false;
+>enableB : false
+>        : ^^^^^
+>false : false
+>      : ^^^^^
+}
+
+export interface EnableD<I extends Identifiable> {
+  readonly enableD: true;
+>enableD : true
+>        : ^^^^
+>true : true
+>     : ^^^^
+
+  readonly value: I["id"] | null;
+>value : I["id"] | null
+>      : ^^^^^^^^^^^^^^
+
+  readonly setItem: (item: I | null) => void;
+>setItem : (item: I | null) => void
+>        : ^    ^^        ^^^^^    
+>item : I | null
+>     : ^^^^^^^^
+}
+
+export interface DisableD<I extends Identifiable> {
+  readonly enableD: false;
+>enableD : false
+>        : ^^^^^
+>false : false
+>      : ^^^^^
+
+  readonly value: I["id"];
+>value : I["id"]
+>      : ^^^^^^^
+
+  readonly setItem: (item: I) => void;
+>setItem : (item: I) => void
+>        : ^    ^^ ^^^^^    
+>item : I
+>     : ^
+}
+
+type MyComponentProps<I extends Identifiable> = (EnableA | DisableA) &
+>MyComponentProps : (EnableA & EnableB & DisableD<I>) | (EnableA & EnableB & EnableD<I>) | (DisableA & EnableB & DisableD<I>) | (DisableA & EnableB & EnableD<I>) | (DisableA & DisableB & DisableD<I>) | (DisableA & DisableB & EnableD<I>)
+>                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  (EnableB | DisableB) &
+  (DisableD<I> | EnableD<I>);
+
+const MyComponent = <I extends Identifiable>(props: MyComponentProps<I>) => {};
+>MyComponent : <I extends Identifiable>(props: MyComponentProps<I>) => void
+>            : ^ ^^^^^^^^^            ^^     ^^                   ^^^^^^^^^
+><I extends Identifiable>(props: MyComponentProps<I>) => {} : <I extends Identifiable>(props: MyComponentProps<I>) => void
+>                                                           : ^ ^^^^^^^^^            ^^     ^^                   ^^^^^^^^^
+>props : (EnableA & EnableB & DisableD<I>) | (EnableA & EnableB & EnableD<I>) | (DisableA & EnableB & DisableD<I>) | (DisableA & EnableB & EnableD<I>) | (DisableA & DisableB & DisableD<I>) | (DisableA & DisableB & EnableD<I>)
+>      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+declare const item: string | null;
+>item : string | null
+>     : ^^^^^^^^^^^^^
+
+MyComponent({
+>MyComponent({  enableD: true,  value: item,  setItem: (item) => {},}) : void
+>                                                                      : ^^^^
+>MyComponent : <I extends Identifiable>(props: MyComponentProps<I>) => void
+>            : ^ ^^^^^^^^^            ^^     ^^                   ^^^^^^^^^
+>{  enableD: true,  value: item,  setItem: (item) => {},} : { enableD: true; value: string | null; setItem: (item: Identifiable | null) => void; }
+>                                                         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  enableD: true,
+>enableD : true
+>        : ^^^^
+>true : true
+>     : ^^^^
+
+  value: item,
+>value : string | null
+>      : ^^^^^^^^^^^^^
+>item : string | null
+>     : ^^^^^^^^^^^^^
+
+  setItem: (item) => {},
+>setItem : (item: Identifiable | null) => void
+>        : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>(item) => {} : (item: Identifiable | null) => void
+>             : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>item : Identifiable | null
+>     : ^^^^^^^^^^^^^^^^^^^
+
+});
+
diff --git a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt
index 4adb70251deaf..1e772a07b3bc7 100644
--- a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt
+++ b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt
@@ -1,40 +1,44 @@
-file.tsx(27,64): error TS2769: No overload matches this call.
+file.tsx(31,56): error TS2769: No overload matches this call.
   Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error.
     Type '{ extra: true; onClick: (k: "left" | "right") => void; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'.
       Property 'extra' does not exist on type 'IntrinsicAttributes & ButtonProps'.
   Overload 2 of 2, '(linkProps: LinkProps): Element', gave the following error.
     Type '{ extra: true; onClick: (k: "left" | "right") => void; }' is not assignable to type 'IntrinsicAttributes & LinkProps'.
       Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'.
-file.tsx(28,13): error TS2769: No overload matches this call.
+file.tsx(32,13): error TS2769: No overload matches this call.
   Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error.
     Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'.
       Property 'extra' does not exist on type 'IntrinsicAttributes & ButtonProps'.
   Overload 2 of 2, '(linkProps: LinkProps): Element', gave the following error.
     Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'.
       Property 'onClick' does not exist on type 'IntrinsicAttributes & LinkProps'.
-file.tsx(29,43): error TS2769: No overload matches this call.
+file.tsx(33,43): error TS2769: No overload matches this call.
   Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error.
     Type '{ extra: true; goTo: string; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'.
       Property 'extra' does not exist on type 'IntrinsicAttributes & ButtonProps'.
   Overload 2 of 2, '(linkProps: LinkProps): Element', gave the following error.
     Type '{ extra: true; goTo: "home"; }' is not assignable to type 'IntrinsicAttributes & LinkProps'.
       Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'.
-file.tsx(30,13): error TS2769: No overload matches this call.
+file.tsx(34,13): error TS2769: No overload matches this call.
   Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error.
     Type '{ goTo: string; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'.
       Property 'goTo' does not exist on type 'IntrinsicAttributes & ButtonProps'.
   Overload 2 of 2, '(linkProps: LinkProps): Element', gave the following error.
     Type '{ goTo: "home"; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'.
       Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'.
-file.tsx(33,65): error TS2322: Type '{ extra: true; onClick: (k: "left" | "right") => void; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'.
+file.tsx(37,57): error TS2322: Type '{ extra: true; onClick: (k: "left" | "right") => void; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'.
   Property 'extra' does not exist on type 'IntrinsicAttributes & ButtonProps'.
-file.tsx(36,44): error TS2322: Type '{ extra: true; goTo: "home"; }' is not assignable to type 'IntrinsicAttributes & LinkProps'.
+file.tsx(40,44): error TS2322: Type '{ extra: true; goTo: "home"; }' is not assignable to type 'IntrinsicAttributes & LinkProps'.
   Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'.
 
 
 ==== file.tsx (6 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react')
     
+    declare function log(...args: any[]): void;
+    
     export interface ClickableProps {
         children?: string;
         className?: string;
@@ -59,8 +63,8 @@ file.tsx(36,44): error TS2322: Type '{ extra: true; goTo: "home"; }' is not assi
         return this._buildMainButton(props);
     }
     
-    const b0 = <MainButton {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type "left" | "right"
-                                                                   ~~~~~
+    const b0 = <MainButton {...{onClick: (k) => {log(k)}}} extra />;  // k has type "left" | "right"
+                                                           ~~~~~
 !!! error TS2769: No overload matches this call.
 !!! error TS2769:   Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error.
 !!! error TS2769:     Type '{ extra: true; onClick: (k: "left" | "right") => void; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'.
@@ -68,7 +72,7 @@ file.tsx(36,44): error TS2322: Type '{ extra: true; goTo: "home"; }' is not assi
 !!! error TS2769:   Overload 2 of 2, '(linkProps: LinkProps): Element', gave the following error.
 !!! error TS2769:     Type '{ extra: true; onClick: (k: "left" | "right") => void; }' is not assignable to type 'IntrinsicAttributes & LinkProps'.
 !!! error TS2769:       Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'.
-    const b2 = <MainButton onClick={(k)=>{console.log(k)}} extra />;  // k has type "left" | "right"
+    const b2 = <MainButton onClick={(k)=>{log(k)}} extra />;  // k has type "left" | "right"
                 ~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
 !!! error TS2769:   Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error.
@@ -97,8 +101,8 @@ file.tsx(36,44): error TS2322: Type '{ extra: true; goTo: "home"; }' is not assi
 !!! error TS2769:       Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'.
     
     export function NoOverload(buttonProps: ButtonProps): JSX.Element { return undefined }
-    const c1 = <NoOverload  {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type any
-                                                                    ~~~~~
+    const c1 = <NoOverload  {...{onClick: (k) => {log(k)}}} extra />;  // k has type any
+                                                            ~~~~~
 !!! error TS2322: Type '{ extra: true; onClick: (k: "left" | "right") => void; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'.
 !!! error TS2322:   Property 'extra' does not exist on type 'IntrinsicAttributes & ButtonProps'.
     
diff --git a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js
index aa9bfba6e21b7..52d48d8a71e63 100644
--- a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js
+++ b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js
@@ -1,8 +1,12 @@
 //// [tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react')
 
+declare function log(...args: any[]): void;
+
 export interface ClickableProps {
     children?: string;
     className?: string;
@@ -27,13 +31,13 @@ export function MainButton(props: ButtonProps | LinkProps): JSX.Element {
     return this._buildMainButton(props);
 }
 
-const b0 = <MainButton {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type "left" | "right"
-const b2 = <MainButton onClick={(k)=>{console.log(k)}} extra />;  // k has type "left" | "right"
+const b0 = <MainButton {...{onClick: (k) => {log(k)}}} extra />;  // k has type "left" | "right"
+const b2 = <MainButton onClick={(k)=>{log(k)}} extra />;  // k has type "left" | "right"
 const b3 = <MainButton {...{goTo:"home"}} extra />;  // goTo has type"home" | "contact"
 const b4 = <MainButton goTo="home" extra />;  // goTo has type "home" | "contact"
 
 export function NoOverload(buttonProps: ButtonProps): JSX.Element { return undefined }
-const c1 = <NoOverload  {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type any
+const c1 = <NoOverload  {...{onClick: (k) => {log(k)}}} extra />;  // k has type any
 
 export function NoOverload1(linkProps: LinkProps): JSX.Element { return undefined }
 const d1 = <NoOverload1 {...{goTo:"home"}} extra  />;  // goTo has type "home" | "contact"
@@ -41,6 +45,7 @@ const d1 = <NoOverload1 {...{goTo:"home"}} extra  />;  // goTo has type "home" |
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MainButton = MainButton;
 exports.NoOverload = NoOverload;
@@ -53,11 +58,11 @@ function MainButton(props) {
     }
     return this._buildMainButton(props);
 }
-var b0 = <MainButton {...{ onClick: function (k) { console.log(k); } }} extra/>; // k has type "left" | "right"
-var b2 = <MainButton onClick={function (k) { console.log(k); }} extra/>; // k has type "left" | "right"
+var b0 = <MainButton {...{ onClick: function (k) { log(k); } }} extra/>; // k has type "left" | "right"
+var b2 = <MainButton onClick={function (k) { log(k); }} extra/>; // k has type "left" | "right"
 var b3 = <MainButton {...{ goTo: "home" }} extra/>; // goTo has type"home" | "contact"
 var b4 = <MainButton goTo="home" extra/>; // goTo has type "home" | "contact"
 function NoOverload(buttonProps) { return undefined; }
-var c1 = <NoOverload {...{ onClick: function (k) { console.log(k); } }} extra/>; // k has type any
+var c1 = <NoOverload {...{ onClick: function (k) { log(k); } }} extra/>; // k has type any
 function NoOverload1(linkProps) { return undefined; }
 var d1 = <NoOverload1 {...{ goTo: "home" }} extra/>; // goTo has type "home" | "contact"
diff --git a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.symbols b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.symbols
index 207e3bb6815f7..21ec52b71aa29 100644
--- a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.symbols
+++ b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.symbols
@@ -1,140 +1,140 @@
 //// [tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
+declare function log(...args: any[]): void;
+>log : Symbol(log, Decl(file.tsx, 2, 31))
+>args : Symbol(args, Decl(file.tsx, 4, 21))
+
 export interface ClickableProps {
->ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31))
+>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 4, 43))
 
     children?: string;
->children : Symbol(ClickableProps.children, Decl(file.tsx, 2, 33))
+>children : Symbol(ClickableProps.children, Decl(file.tsx, 6, 33))
 
     className?: string;
->className : Symbol(ClickableProps.className, Decl(file.tsx, 3, 22))
+>className : Symbol(ClickableProps.className, Decl(file.tsx, 7, 22))
 }
 
 export interface ButtonProps extends ClickableProps {
->ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1))
->ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31))
+>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 9, 1))
+>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 4, 43))
 
     onClick: (k: "left" | "right") => void;
->onClick : Symbol(ButtonProps.onClick, Decl(file.tsx, 7, 53))
->k : Symbol(k, Decl(file.tsx, 8, 14))
+>onClick : Symbol(ButtonProps.onClick, Decl(file.tsx, 11, 53))
+>k : Symbol(k, Decl(file.tsx, 12, 14))
 }
 
 export interface LinkProps extends ClickableProps {
->LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1))
->ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31))
+>LinkProps : Symbol(LinkProps, Decl(file.tsx, 13, 1))
+>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 4, 43))
 
     goTo: "home" | "contact";
->goTo : Symbol(LinkProps.goTo, Decl(file.tsx, 11, 51))
+>goTo : Symbol(LinkProps.goTo, Decl(file.tsx, 15, 51))
 }
 
 export function MainButton(buttonProps: ButtonProps): JSX.Element;
->MainButton : Symbol(MainButton, Decl(file.tsx, 13, 1), Decl(file.tsx, 15, 66), Decl(file.tsx, 16, 62))
->buttonProps : Symbol(buttonProps, Decl(file.tsx, 15, 27))
->ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 17, 1), Decl(file.tsx, 19, 66), Decl(file.tsx, 20, 62))
+>buttonProps : Symbol(buttonProps, Decl(file.tsx, 19, 27))
+>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 9, 1))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 export function MainButton(linkProps: LinkProps): JSX.Element;
->MainButton : Symbol(MainButton, Decl(file.tsx, 13, 1), Decl(file.tsx, 15, 66), Decl(file.tsx, 16, 62))
->linkProps : Symbol(linkProps, Decl(file.tsx, 16, 27))
->LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 17, 1), Decl(file.tsx, 19, 66), Decl(file.tsx, 20, 62))
+>linkProps : Symbol(linkProps, Decl(file.tsx, 20, 27))
+>LinkProps : Symbol(LinkProps, Decl(file.tsx, 13, 1))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 export function MainButton(props: ButtonProps | LinkProps): JSX.Element {
->MainButton : Symbol(MainButton, Decl(file.tsx, 13, 1), Decl(file.tsx, 15, 66), Decl(file.tsx, 16, 62))
->props : Symbol(props, Decl(file.tsx, 17, 27))
->ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1))
->LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 17, 1), Decl(file.tsx, 19, 66), Decl(file.tsx, 20, 62))
+>props : Symbol(props, Decl(file.tsx, 21, 27))
+>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 9, 1))
+>LinkProps : Symbol(LinkProps, Decl(file.tsx, 13, 1))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
     const linkProps = props as LinkProps;
->linkProps : Symbol(linkProps, Decl(file.tsx, 18, 9))
->props : Symbol(props, Decl(file.tsx, 17, 27))
->LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1))
+>linkProps : Symbol(linkProps, Decl(file.tsx, 22, 9))
+>props : Symbol(props, Decl(file.tsx, 21, 27))
+>LinkProps : Symbol(LinkProps, Decl(file.tsx, 13, 1))
 
     if(linkProps.goTo) {
->linkProps.goTo : Symbol(LinkProps.goTo, Decl(file.tsx, 11, 51))
->linkProps : Symbol(linkProps, Decl(file.tsx, 18, 9))
->goTo : Symbol(LinkProps.goTo, Decl(file.tsx, 11, 51))
+>linkProps.goTo : Symbol(LinkProps.goTo, Decl(file.tsx, 15, 51))
+>linkProps : Symbol(linkProps, Decl(file.tsx, 22, 9))
+>goTo : Symbol(LinkProps.goTo, Decl(file.tsx, 15, 51))
 
         return this._buildMainLink(props);
->props : Symbol(props, Decl(file.tsx, 17, 27))
+>props : Symbol(props, Decl(file.tsx, 21, 27))
     }
 
     return this._buildMainButton(props);
->props : Symbol(props, Decl(file.tsx, 17, 27))
+>props : Symbol(props, Decl(file.tsx, 21, 27))
 }
 
-const b0 = <MainButton {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type "left" | "right"
->b0 : Symbol(b0, Decl(file.tsx, 26, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 13, 1), Decl(file.tsx, 15, 66), Decl(file.tsx, 16, 62))
->onClick : Symbol(onClick, Decl(file.tsx, 26, 28))
->k : Symbol(k, Decl(file.tsx, 26, 38))
->console.log : Symbol(Console.log, Decl(lib.d.ts, --, --))
->console : Symbol(console, Decl(lib.d.ts, --, --))
->log : Symbol(Console.log, Decl(lib.d.ts, --, --))
->k : Symbol(k, Decl(file.tsx, 26, 38))
->extra : Symbol(extra, Decl(file.tsx, 26, 62))
-
-const b2 = <MainButton onClick={(k)=>{console.log(k)}} extra />;  // k has type "left" | "right"
->b2 : Symbol(b2, Decl(file.tsx, 27, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 13, 1), Decl(file.tsx, 15, 66), Decl(file.tsx, 16, 62))
->onClick : Symbol(onClick, Decl(file.tsx, 27, 22))
->k : Symbol(k, Decl(file.tsx, 27, 33))
->console.log : Symbol(Console.log, Decl(lib.d.ts, --, --))
->console : Symbol(console, Decl(lib.d.ts, --, --))
->log : Symbol(Console.log, Decl(lib.d.ts, --, --))
->k : Symbol(k, Decl(file.tsx, 27, 33))
->extra : Symbol(extra, Decl(file.tsx, 27, 54))
+const b0 = <MainButton {...{onClick: (k) => {log(k)}}} extra />;  // k has type "left" | "right"
+>b0 : Symbol(b0, Decl(file.tsx, 30, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 17, 1), Decl(file.tsx, 19, 66), Decl(file.tsx, 20, 62))
+>onClick : Symbol(onClick, Decl(file.tsx, 30, 28))
+>k : Symbol(k, Decl(file.tsx, 30, 38))
+>log : Symbol(log, Decl(file.tsx, 2, 31))
+>k : Symbol(k, Decl(file.tsx, 30, 38))
+>extra : Symbol(extra, Decl(file.tsx, 30, 54))
+
+const b2 = <MainButton onClick={(k)=>{log(k)}} extra />;  // k has type "left" | "right"
+>b2 : Symbol(b2, Decl(file.tsx, 31, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 17, 1), Decl(file.tsx, 19, 66), Decl(file.tsx, 20, 62))
+>onClick : Symbol(onClick, Decl(file.tsx, 31, 22))
+>k : Symbol(k, Decl(file.tsx, 31, 33))
+>log : Symbol(log, Decl(file.tsx, 2, 31))
+>k : Symbol(k, Decl(file.tsx, 31, 33))
+>extra : Symbol(extra, Decl(file.tsx, 31, 46))
 
 const b3 = <MainButton {...{goTo:"home"}} extra />;  // goTo has type"home" | "contact"
->b3 : Symbol(b3, Decl(file.tsx, 28, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 13, 1), Decl(file.tsx, 15, 66), Decl(file.tsx, 16, 62))
->goTo : Symbol(goTo, Decl(file.tsx, 28, 28))
->extra : Symbol(extra, Decl(file.tsx, 28, 41))
+>b3 : Symbol(b3, Decl(file.tsx, 32, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 17, 1), Decl(file.tsx, 19, 66), Decl(file.tsx, 20, 62))
+>goTo : Symbol(goTo, Decl(file.tsx, 32, 28))
+>extra : Symbol(extra, Decl(file.tsx, 32, 41))
 
 const b4 = <MainButton goTo="home" extra />;  // goTo has type "home" | "contact"
->b4 : Symbol(b4, Decl(file.tsx, 29, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 13, 1), Decl(file.tsx, 15, 66), Decl(file.tsx, 16, 62))
->goTo : Symbol(goTo, Decl(file.tsx, 29, 22))
->extra : Symbol(extra, Decl(file.tsx, 29, 34))
+>b4 : Symbol(b4, Decl(file.tsx, 33, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 17, 1), Decl(file.tsx, 19, 66), Decl(file.tsx, 20, 62))
+>goTo : Symbol(goTo, Decl(file.tsx, 33, 22))
+>extra : Symbol(extra, Decl(file.tsx, 33, 34))
 
 export function NoOverload(buttonProps: ButtonProps): JSX.Element { return undefined }
->NoOverload : Symbol(NoOverload, Decl(file.tsx, 29, 44))
->buttonProps : Symbol(buttonProps, Decl(file.tsx, 31, 27))
->ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1))
+>NoOverload : Symbol(NoOverload, Decl(file.tsx, 33, 44))
+>buttonProps : Symbol(buttonProps, Decl(file.tsx, 35, 27))
+>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 9, 1))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 >undefined : Symbol(undefined)
 
-const c1 = <NoOverload  {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type any
->c1 : Symbol(c1, Decl(file.tsx, 32, 5))
->NoOverload : Symbol(NoOverload, Decl(file.tsx, 29, 44))
->onClick : Symbol(onClick, Decl(file.tsx, 32, 29))
->k : Symbol(k, Decl(file.tsx, 32, 39))
->console.log : Symbol(Console.log, Decl(lib.d.ts, --, --))
->console : Symbol(console, Decl(lib.d.ts, --, --))
->log : Symbol(Console.log, Decl(lib.d.ts, --, --))
->k : Symbol(k, Decl(file.tsx, 32, 39))
->extra : Symbol(extra, Decl(file.tsx, 32, 63))
+const c1 = <NoOverload  {...{onClick: (k) => {log(k)}}} extra />;  // k has type any
+>c1 : Symbol(c1, Decl(file.tsx, 36, 5))
+>NoOverload : Symbol(NoOverload, Decl(file.tsx, 33, 44))
+>onClick : Symbol(onClick, Decl(file.tsx, 36, 29))
+>k : Symbol(k, Decl(file.tsx, 36, 39))
+>log : Symbol(log, Decl(file.tsx, 2, 31))
+>k : Symbol(k, Decl(file.tsx, 36, 39))
+>extra : Symbol(extra, Decl(file.tsx, 36, 55))
 
 export function NoOverload1(linkProps: LinkProps): JSX.Element { return undefined }
->NoOverload1 : Symbol(NoOverload1, Decl(file.tsx, 32, 73))
->linkProps : Symbol(linkProps, Decl(file.tsx, 34, 28))
->LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1))
+>NoOverload1 : Symbol(NoOverload1, Decl(file.tsx, 36, 65))
+>linkProps : Symbol(linkProps, Decl(file.tsx, 38, 28))
+>LinkProps : Symbol(LinkProps, Decl(file.tsx, 13, 1))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 >undefined : Symbol(undefined)
 
 const d1 = <NoOverload1 {...{goTo:"home"}} extra  />;  // goTo has type "home" | "contact"
->d1 : Symbol(d1, Decl(file.tsx, 35, 5))
->NoOverload1 : Symbol(NoOverload1, Decl(file.tsx, 32, 73))
->goTo : Symbol(goTo, Decl(file.tsx, 35, 29))
->extra : Symbol(extra, Decl(file.tsx, 35, 42))
+>d1 : Symbol(d1, Decl(file.tsx, 39, 5))
+>NoOverload1 : Symbol(NoOverload1, Decl(file.tsx, 36, 65))
+>goTo : Symbol(goTo, Decl(file.tsx, 39, 29))
+>extra : Symbol(extra, Decl(file.tsx, 39, 42))
 
diff --git a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.types b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.types
index f5b6e20173fcc..82fa667abe5e8 100644
--- a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.types
+++ b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.types
@@ -1,10 +1,18 @@
 //// [tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : typeof React
 >      : ^^^^^^^^^^^^
 
+declare function log(...args: any[]): void;
+>log : (...args: any[]) => void
+>    : ^^^^    ^^     ^^^^^    
+>args : any[]
+>     : ^^^^^
+
 export interface ClickableProps {
     children?: string;
 >children : string
@@ -95,55 +103,47 @@ export function MainButton(props: ButtonProps | LinkProps): JSX.Element {
 >      : ^^^^^^^^^^^^^^^^^^^^^^^
 }
 
-const b0 = <MainButton {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type "left" | "right"
+const b0 = <MainButton {...{onClick: (k) => {log(k)}}} extra />;  // k has type "left" | "right"
 >b0 : JSX.Element
 >   : ^^^^^^^^^^^
-><MainButton {...{onClick: (k) => {console.log(k)}}} extra /> : JSX.Element
->                                                             : ^^^^^^^^^^^
+><MainButton {...{onClick: (k) => {log(k)}}} extra /> : JSX.Element
+>                                                     : ^^^^^^^^^^^
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; }
 >           : ^^^           ^^           ^^^           ^^^         ^^         ^^^           ^^^
->{onClick: (k) => {console.log(k)}} : { onClick: (k: "left" | "right") => void; }
->                                   : ^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>{onClick: (k) => {log(k)}} : { onClick: (k: "left" | "right") => void; }
+>                           : ^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >onClick : (k: "left" | "right") => void
 >        : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->(k) => {console.log(k)} : (k: "left" | "right") => void
->                        : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>(k) => {log(k)} : (k: "left" | "right") => void
+>                : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >k : "left" | "right"
 >  : ^^^^^^^^^^^^^^^^
->console.log(k) : void
->               : ^^^^
->console.log : (message?: any, ...optionalParams: any[]) => void
->            : ^       ^^^   ^^^^^              ^^     ^^^^^    
->console : Console
->        : ^^^^^^^
->log : (message?: any, ...optionalParams: any[]) => void
->    : ^       ^^^   ^^^^^              ^^     ^^^^^    
+>log(k) : void
+>       : ^^^^
+>log : (...args: any[]) => void
+>    : ^^^^    ^^     ^^^^^    
 >k : "left" | "right"
 >  : ^^^^^^^^^^^^^^^^
 >extra : true
 >      : ^^^^
 
-const b2 = <MainButton onClick={(k)=>{console.log(k)}} extra />;  // k has type "left" | "right"
+const b2 = <MainButton onClick={(k)=>{log(k)}} extra />;  // k has type "left" | "right"
 >b2 : JSX.Element
 >   : ^^^^^^^^^^^
-><MainButton onClick={(k)=>{console.log(k)}} extra /> : JSX.Element
->                                                     : ^^^^^^^^^^^
+><MainButton onClick={(k)=>{log(k)}} extra /> : JSX.Element
+>                                             : ^^^^^^^^^^^
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; }
 >           : ^^^           ^^           ^^^           ^^^         ^^         ^^^           ^^^
 >onClick : (k: "left" | "right") => void
 >        : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->(k)=>{console.log(k)} : (k: "left" | "right") => void
->                      : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>(k)=>{log(k)} : (k: "left" | "right") => void
+>              : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >k : "left" | "right"
 >  : ^^^^^^^^^^^^^^^^
->console.log(k) : void
->               : ^^^^
->console.log : (message?: any, ...optionalParams: any[]) => void
->            : ^       ^^^   ^^^^^              ^^     ^^^^^    
->console : Console
->        : ^^^^^^^
->log : (message?: any, ...optionalParams: any[]) => void
->    : ^       ^^^   ^^^^^              ^^     ^^^^^    
+>log(k) : void
+>       : ^^^^
+>log : (...args: any[]) => void
+>    : ^^^^    ^^     ^^^^^    
 >k : "left" | "right"
 >  : ^^^^^^^^^^^^^^^^
 >extra : true
@@ -187,29 +187,25 @@ export function NoOverload(buttonProps: ButtonProps): JSX.Element { return undef
 >undefined : undefined
 >          : ^^^^^^^^^
 
-const c1 = <NoOverload  {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type any
+const c1 = <NoOverload  {...{onClick: (k) => {log(k)}}} extra />;  // k has type any
 >c1 : JSX.Element
 >   : ^^^^^^^^^^^
-><NoOverload  {...{onClick: (k) => {console.log(k)}}} extra /> : JSX.Element
->                                                              : ^^^^^^^^^^^
+><NoOverload  {...{onClick: (k) => {log(k)}}} extra /> : JSX.Element
+>                                                      : ^^^^^^^^^^^
 >NoOverload : (buttonProps: ButtonProps) => JSX.Element
 >           : ^           ^^           ^^^^^           
->{onClick: (k) => {console.log(k)}} : { onClick: (k: "left" | "right") => void; }
->                                   : ^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>{onClick: (k) => {log(k)}} : { onClick: (k: "left" | "right") => void; }
+>                           : ^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >onClick : (k: "left" | "right") => void
 >        : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->(k) => {console.log(k)} : (k: "left" | "right") => void
->                        : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>(k) => {log(k)} : (k: "left" | "right") => void
+>                : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >k : "left" | "right"
 >  : ^^^^^^^^^^^^^^^^
->console.log(k) : void
->               : ^^^^
->console.log : (message?: any, ...optionalParams: any[]) => void
->            : ^       ^^^   ^^^^^              ^^     ^^^^^    
->console : Console
->        : ^^^^^^^
->log : (message?: any, ...optionalParams: any[]) => void
->    : ^       ^^^   ^^^^^              ^^     ^^^^^    
+>log(k) : void
+>       : ^^^^
+>log : (...args: any[]) => void
+>    : ^^^^    ^^     ^^^^^    
 >k : "left" | "right"
 >  : ^^^^^^^^^^^^^^^^
 >extra : true
diff --git a/tests/baselines/reference/controlFlowForStatement.errors.txt b/tests/baselines/reference/controlFlowForStatement.errors.txt
index b45976464a3bd..35f0c92c9b24f 100644
--- a/tests/baselines/reference/controlFlowForStatement.errors.txt
+++ b/tests/baselines/reference/controlFlowForStatement.errors.txt
@@ -3,7 +3,7 @@ controlFlowForStatement.ts(29,50): error TS2873: This kind of expression is alwa
 
 
 ==== controlFlowForStatement.ts (2 errors) ====
-    let cond: boolean;
+    declare let cond: boolean;
     function a() {
         let x: string | number | boolean;
         for (x = ""; cond; x = 5) {
diff --git a/tests/baselines/reference/controlFlowForStatement.js b/tests/baselines/reference/controlFlowForStatement.js
index 18873a6ccea8c..1a8b15b17dd7f 100644
--- a/tests/baselines/reference/controlFlowForStatement.js
+++ b/tests/baselines/reference/controlFlowForStatement.js
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/controlFlow/controlFlowForStatement.ts] ////
 
 //// [controlFlowForStatement.ts]
-let cond: boolean;
+declare let cond: boolean;
 function a() {
     let x: string | number | boolean;
     for (x = ""; cond; x = 5) {
@@ -45,7 +45,6 @@ function f() {
 
 
 //// [controlFlowForStatement.js]
-var cond;
 function a() {
     var x;
     for (x = ""; cond; x = 5) {
diff --git a/tests/baselines/reference/controlFlowForStatement.symbols b/tests/baselines/reference/controlFlowForStatement.symbols
index 1699aa9dda444..cb48704300cce 100644
--- a/tests/baselines/reference/controlFlowForStatement.symbols
+++ b/tests/baselines/reference/controlFlowForStatement.symbols
@@ -1,18 +1,18 @@
 //// [tests/cases/conformance/controlFlow/controlFlowForStatement.ts] ////
 
 === controlFlowForStatement.ts ===
-let cond: boolean;
->cond : Symbol(cond, Decl(controlFlowForStatement.ts, 0, 3))
+declare let cond: boolean;
+>cond : Symbol(cond, Decl(controlFlowForStatement.ts, 0, 11))
 
 function a() {
->a : Symbol(a, Decl(controlFlowForStatement.ts, 0, 18))
+>a : Symbol(a, Decl(controlFlowForStatement.ts, 0, 26))
 
     let x: string | number | boolean;
 >x : Symbol(x, Decl(controlFlowForStatement.ts, 2, 7))
 
     for (x = ""; cond; x = 5) {
 >x : Symbol(x, Decl(controlFlowForStatement.ts, 2, 7))
->cond : Symbol(cond, Decl(controlFlowForStatement.ts, 0, 3))
+>cond : Symbol(cond, Decl(controlFlowForStatement.ts, 0, 11))
 >x : Symbol(x, Decl(controlFlowForStatement.ts, 2, 7))
 
         x; // string | number
@@ -27,7 +27,7 @@ function b() {
 
     for (x = 5; cond; x = x.length) {
 >x : Symbol(x, Decl(controlFlowForStatement.ts, 8, 7))
->cond : Symbol(cond, Decl(controlFlowForStatement.ts, 0, 3))
+>cond : Symbol(cond, Decl(controlFlowForStatement.ts, 0, 11))
 >x : Symbol(x, Decl(controlFlowForStatement.ts, 8, 7))
 >x.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(controlFlowForStatement.ts, 8, 7))
diff --git a/tests/baselines/reference/controlFlowForStatement.types b/tests/baselines/reference/controlFlowForStatement.types
index e7c7ce4f36c71..1bf8358a4a5cd 100644
--- a/tests/baselines/reference/controlFlowForStatement.types
+++ b/tests/baselines/reference/controlFlowForStatement.types
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/controlFlow/controlFlowForStatement.ts] ////
 
 === controlFlowForStatement.ts ===
-let cond: boolean;
+declare let cond: boolean;
 >cond : boolean
 >     : ^^^^^^^
 
diff --git a/tests/baselines/reference/controlFlowInstanceof.symbols b/tests/baselines/reference/controlFlowInstanceof.symbols
index c464fc7cd252c..b19da2dcaf525 100644
--- a/tests/baselines/reference/controlFlowInstanceof.symbols
+++ b/tests/baselines/reference/controlFlowInstanceof.symbols
@@ -111,22 +111,22 @@ function f4(s: Set<string> | Set<number>) {
 
 // More tests
 
-class A { a: string }
+class A { a: string = "" }
 >A : Symbol(A, Decl(controlFlowInstanceof.ts, 41, 1))
 >a : Symbol(A.a, Decl(controlFlowInstanceof.ts, 45, 9))
 
-class B extends A { b: string }
->B : Symbol(B, Decl(controlFlowInstanceof.ts, 45, 21))
+class B extends A { b: string = "" }
+>B : Symbol(B, Decl(controlFlowInstanceof.ts, 45, 26))
 >A : Symbol(A, Decl(controlFlowInstanceof.ts, 41, 1))
 >b : Symbol(B.b, Decl(controlFlowInstanceof.ts, 46, 19))
 
-class C extends A { c: string }
->C : Symbol(C, Decl(controlFlowInstanceof.ts, 46, 31))
+class C extends A { c: string = "" }
+>C : Symbol(C, Decl(controlFlowInstanceof.ts, 46, 36))
 >A : Symbol(A, Decl(controlFlowInstanceof.ts, 41, 1))
 >c : Symbol(C.c, Decl(controlFlowInstanceof.ts, 47, 19))
 
 function foo(x: A | undefined) {
->foo : Symbol(foo, Decl(controlFlowInstanceof.ts, 47, 31))
+>foo : Symbol(foo, Decl(controlFlowInstanceof.ts, 47, 36))
 >x : Symbol(x, Decl(controlFlowInstanceof.ts, 49, 13))
 >A : Symbol(A, Decl(controlFlowInstanceof.ts, 41, 1))
 
@@ -135,9 +135,9 @@ function foo(x: A | undefined) {
 
     if (x instanceof B || x instanceof C) {
 >x : Symbol(x, Decl(controlFlowInstanceof.ts, 49, 13))
->B : Symbol(B, Decl(controlFlowInstanceof.ts, 45, 21))
+>B : Symbol(B, Decl(controlFlowInstanceof.ts, 45, 26))
 >x : Symbol(x, Decl(controlFlowInstanceof.ts, 49, 13))
->C : Symbol(C, Decl(controlFlowInstanceof.ts, 46, 31))
+>C : Symbol(C, Decl(controlFlowInstanceof.ts, 46, 36))
 
         x;  // B | C
 >x : Symbol(x, Decl(controlFlowInstanceof.ts, 49, 13))
@@ -147,9 +147,9 @@ function foo(x: A | undefined) {
 
     if (x instanceof B && x instanceof C) {
 >x : Symbol(x, Decl(controlFlowInstanceof.ts, 49, 13))
->B : Symbol(B, Decl(controlFlowInstanceof.ts, 45, 21))
+>B : Symbol(B, Decl(controlFlowInstanceof.ts, 45, 26))
 >x : Symbol(x, Decl(controlFlowInstanceof.ts, 49, 13))
->C : Symbol(C, Decl(controlFlowInstanceof.ts, 46, 31))
+>C : Symbol(C, Decl(controlFlowInstanceof.ts, 46, 36))
 
         x;  // B & C
 >x : Symbol(x, Decl(controlFlowInstanceof.ts, 49, 13))
@@ -167,14 +167,14 @@ function foo(x: A | undefined) {
 
     if (x instanceof B) {
 >x : Symbol(x, Decl(controlFlowInstanceof.ts, 49, 13))
->B : Symbol(B, Decl(controlFlowInstanceof.ts, 45, 21))
+>B : Symbol(B, Decl(controlFlowInstanceof.ts, 45, 26))
 
         x;  // B
 >x : Symbol(x, Decl(controlFlowInstanceof.ts, 49, 13))
 
         if (x instanceof C) {
 >x : Symbol(x, Decl(controlFlowInstanceof.ts, 49, 13))
->C : Symbol(C, Decl(controlFlowInstanceof.ts, 46, 31))
+>C : Symbol(C, Decl(controlFlowInstanceof.ts, 46, 36))
 
             x;  // B & C
 >x : Symbol(x, Decl(controlFlowInstanceof.ts, 49, 13))
@@ -200,14 +200,14 @@ function foo(x: A | undefined) {
 interface X {
 >X : Symbol(X, Decl(controlFlowInstanceof.ts, 77, 1))
 
-    x?: string;
+    x?: string
 >x : Symbol(X.x, Decl(controlFlowInstanceof.ts, 82, 13))
 }
 
 class Y {
 >Y : Symbol(Y, Decl(controlFlowInstanceof.ts, 84, 1))
 
-    y: string;
+    y: string = "";
 >y : Symbol(Y.y, Decl(controlFlowInstanceof.ts, 86, 9))
 }
 
@@ -251,26 +251,29 @@ if (x instanceof ctor) {
 
 // Repro from #27550 (based on uglify code)
 === uglify.js ===
-/** @constructor */
+/**
+ * @constructor
+ * @param {any} val
+ */
 function AtTop(val) { this.val = val }
 >AtTop : Symbol(AtTop, Decl(uglify.js, 0, 0))
->val : Symbol(val, Decl(uglify.js, 1, 15))
->this.val : Symbol(AtTop.val, Decl(uglify.js, 1, 21))
+>val : Symbol(val, Decl(uglify.js, 4, 15))
+>this.val : Symbol(AtTop.val, Decl(uglify.js, 4, 21))
 >this : Symbol(AtTop, Decl(uglify.js, 0, 0))
->val : Symbol(AtTop.val, Decl(uglify.js, 1, 21))
->val : Symbol(val, Decl(uglify.js, 1, 15))
+>val : Symbol(AtTop.val, Decl(uglify.js, 4, 21))
+>val : Symbol(val, Decl(uglify.js, 4, 15))
 
 /** @type {*} */
 var v = 1;
->v : Symbol(v, Decl(uglify.js, 3, 3))
+>v : Symbol(v, Decl(uglify.js, 6, 3))
 
 if (v instanceof AtTop) {
->v : Symbol(v, Decl(uglify.js, 3, 3))
+>v : Symbol(v, Decl(uglify.js, 6, 3))
 >AtTop : Symbol(AtTop, Decl(uglify.js, 0, 0))
 
     v.val
->v.val : Symbol(AtTop.val, Decl(uglify.js, 1, 21))
->v : Symbol(v, Decl(uglify.js, 3, 3))
->val : Symbol(AtTop.val, Decl(uglify.js, 1, 21))
+>v.val : Symbol(AtTop.val, Decl(uglify.js, 4, 21))
+>v : Symbol(v, Decl(uglify.js, 6, 3))
+>val : Symbol(AtTop.val, Decl(uglify.js, 4, 21))
 }
 
diff --git a/tests/baselines/reference/controlFlowInstanceof.types b/tests/baselines/reference/controlFlowInstanceof.types
index fc2fe6c36b20b..6d2417a6fb839 100644
--- a/tests/baselines/reference/controlFlowInstanceof.types
+++ b/tests/baselines/reference/controlFlowInstanceof.types
@@ -171,27 +171,33 @@ function f4(s: Set<string> | Set<number>) {
 
 // More tests
 
-class A { a: string }
+class A { a: string = "" }
 >A : A
 >  : ^
 >a : string
 >  : ^^^^^^
+>"" : ""
+>   : ^^
 
-class B extends A { b: string }
+class B extends A { b: string = "" }
 >B : B
 >  : ^
 >A : A
 >  : ^
 >b : string
 >  : ^^^^^^
+>"" : ""
+>   : ^^
 
-class C extends A { c: string }
+class C extends A { c: string = "" }
 >C : C
 >  : ^
 >A : A
 >  : ^
 >c : string
 >  : ^^^^^^
+>"" : ""
+>   : ^^
 
 function foo(x: A | undefined) {
 >foo : (x: A | undefined) => void
@@ -310,7 +316,7 @@ function foo(x: A | undefined) {
 // Y is assignable to X, but not a subtype of X
 
 interface X {
-    x?: string;
+    x?: string
 >x : string | undefined
 >  : ^^^^^^^^^^^^^^^^^^
 }
@@ -319,9 +325,11 @@ class Y {
 >Y : Y
 >  : ^
 
-    y: string;
+    y: string = "";
 >y : string
 >  : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 function goo(x: X) {
@@ -382,7 +390,10 @@ if (x instanceof ctor) {
 
 // Repro from #27550 (based on uglify code)
 === uglify.js ===
-/** @constructor */
+/**
+ * @constructor
+ * @param {any} val
+ */
 function AtTop(val) { this.val = val }
 >AtTop : typeof AtTop
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/controlFlowInstanceofWithSymbolHasInstance.symbols b/tests/baselines/reference/controlFlowInstanceofWithSymbolHasInstance.symbols
index 4c19470419e35..a2bfbc3676c8e 100644
--- a/tests/baselines/reference/controlFlowInstanceofWithSymbolHasInstance.symbols
+++ b/tests/baselines/reference/controlFlowInstanceofWithSymbolHasInstance.symbols
@@ -138,11 +138,11 @@ function f4(s: Set<string> | Set<number>) {
 class A {
 >A : Symbol(A, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 47, 1))
 
-    a: string;
+    a: string = "";
 >a : Symbol(A.a, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 51, 9))
 
     static [Symbol.hasInstance]<T>(this: T, value: unknown): value is (
->[Symbol.hasInstance] : Symbol(A[Symbol.hasInstance], Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 52, 14))
+>[Symbol.hasInstance] : Symbol(A[Symbol.hasInstance], Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 52, 19))
 >Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
@@ -173,18 +173,18 @@ class A {
 >value : Symbol(value, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 53, 43))
     }
 }
-class B extends A { b: string }
+class B extends A { b: string = ""; }
 >B : Symbol(B, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 59, 1))
 >A : Symbol(A, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 47, 1))
 >b : Symbol(B.b, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 60, 19))
 
-class C extends A { c: string }
->C : Symbol(C, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 60, 31))
+class C extends A { c: string = ""; }
+>C : Symbol(C, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 60, 37))
 >A : Symbol(A, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 47, 1))
 >c : Symbol(C.c, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 61, 19))
 
 function foo(x: A | undefined) {
->foo : Symbol(foo, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 61, 31))
+>foo : Symbol(foo, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 61, 37))
 >x : Symbol(x, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 63, 13))
 >A : Symbol(A, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 47, 1))
 
@@ -195,7 +195,7 @@ function foo(x: A | undefined) {
 >x : Symbol(x, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 63, 13))
 >B : Symbol(B, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 59, 1))
 >x : Symbol(x, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 63, 13))
->C : Symbol(C, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 60, 31))
+>C : Symbol(C, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 60, 37))
 
         x;  // B | C
 >x : Symbol(x, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 63, 13))
@@ -207,7 +207,7 @@ function foo(x: A | undefined) {
 >x : Symbol(x, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 63, 13))
 >B : Symbol(B, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 59, 1))
 >x : Symbol(x, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 63, 13))
->C : Symbol(C, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 60, 31))
+>C : Symbol(C, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 60, 37))
 
         x;  // B & C
 >x : Symbol(x, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 63, 13))
@@ -232,7 +232,7 @@ function foo(x: A | undefined) {
 
         if (x instanceof C) {
 >x : Symbol(x, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 63, 13))
->C : Symbol(C, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 60, 31))
+>C : Symbol(C, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 60, 37))
 
             x;  // B & C
 >x : Symbol(x, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 63, 13))
@@ -265,7 +265,7 @@ interface X {
 class Y {
 >Y : Symbol(Y, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 98, 1))
 
-    y: string;
+    y: string = "";
 >y : Symbol(Y.y, Decl(controlFlowInstanceofWithSymbolHasInstance.ts, 100, 9))
 }
 
diff --git a/tests/baselines/reference/controlFlowInstanceofWithSymbolHasInstance.types b/tests/baselines/reference/controlFlowInstanceofWithSymbolHasInstance.types
index d980a88e871a9..949d9c5798bed 100644
--- a/tests/baselines/reference/controlFlowInstanceofWithSymbolHasInstance.types
+++ b/tests/baselines/reference/controlFlowInstanceofWithSymbolHasInstance.types
@@ -199,9 +199,11 @@ class A {
 >A : A
 >  : ^
 
-    a: string;
+    a: string = "";
 >a : string
 >  : ^^^^^^
+>"" : ""
+>   : ^^
 
     static [Symbol.hasInstance]<T>(this: T, value: unknown): value is (
 >[Symbol.hasInstance] : <T>(this: T, value: unknown) => value is (T extends (abstract new (...args: any) => infer U) ? U : never)
@@ -248,21 +250,25 @@ class A {
 >      : ^^^^^^^
     }
 }
-class B extends A { b: string }
+class B extends A { b: string = ""; }
 >B : B
 >  : ^
 >A : A
 >  : ^
 >b : string
 >  : ^^^^^^
+>"" : ""
+>   : ^^
 
-class C extends A { c: string }
+class C extends A { c: string = ""; }
 >C : C
 >  : ^
 >A : A
 >  : ^
 >c : string
 >  : ^^^^^^
+>"" : ""
+>   : ^^
 
 function foo(x: A | undefined) {
 >foo : (x: A | undefined) => void
@@ -390,9 +396,11 @@ class Y {
 >Y : Y
 >  : ^
 
-    y: string;
+    y: string = "";
 >y : string
 >  : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 function goo(x: X) {
diff --git a/tests/baselines/reference/controlFlowJavascript.errors.txt b/tests/baselines/reference/controlFlowJavascript.errors.txt
new file mode 100644
index 0000000000000..295f82b4efabc
--- /dev/null
+++ b/tests/baselines/reference/controlFlowJavascript.errors.txt
@@ -0,0 +1,109 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== controlFlowJavascript.js (0 errors) ====
+    let cond = true;
+    
+    // CFA for 'let' and no initializer
+    function f1() {
+        let x;
+        if (cond) {
+            x = 1;
+        }
+        if (cond) {
+            x = "hello";
+        }
+        const y = x;  // string | number | undefined
+    }
+    
+    // CFA for 'let' and 'undefined' initializer
+    function f2() {
+        let x = undefined;
+        if (cond) {
+            x = 1;
+        }
+        if (cond) {
+            x = "hello";
+        }
+        const y = x;  // string | number | undefined
+    }
+    
+    // CFA for 'let' and 'null' initializer
+    function f3() {
+        let x = null;
+        if (cond) {
+            x = 1;
+        }
+        if (cond) {
+            x = "hello";
+        }
+        const y = x;  // string | number | null
+    }
+    
+    // CFA for 'var' with no initializer
+    function f5() {
+        var x;
+        if (cond) {
+            x = 1;
+        }
+        if (cond) {
+            x = "hello";
+        }
+        const y = x;  // string | number | undefined
+    }
+    
+    // CFA for 'var' with 'undefined' initializer
+    function f6() {
+        var x = undefined;
+        if (cond) {
+            x = 1;
+        }
+        if (cond) {
+            x = "hello";
+        }
+        const y = x;  // string | number | undefined
+    }
+    
+    // CFA for 'var' with 'null' initializer
+    function f7() {
+        var x = null;
+        if (cond) {
+            x = 1;
+        }
+        if (cond) {
+            x = "hello";
+        }
+        const y = x;  // string | number | null
+    }
+    
+    // No CFA for captured outer variables
+    function f9() {
+        let x;
+        if (cond) {
+            x = 1;
+        }
+        if (cond) {
+            x = "hello";
+        }
+        const y = x;  // string | number | undefined
+        function f() {
+            const z = x;  // any
+        }
+    }
+    
+    // No CFA for captured outer variables
+    function f10() {
+        let x;
+        if (cond) {
+            x = 1;
+        }
+        if (cond) {
+            x = "hello";
+        }
+        const y = x;  // string | number | undefined
+        const f = () => {
+            const z = x;  // any
+        };
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/controlFlowJavascript.types b/tests/baselines/reference/controlFlowJavascript.types
index f4408c17367fe..9eb2666b73f13 100644
--- a/tests/baselines/reference/controlFlowJavascript.types
+++ b/tests/baselines/reference/controlFlowJavascript.types
@@ -14,6 +14,7 @@ function f1() {
 
     let x;
 >x : any
+>  : ^^^
 
     if (cond) {
 >cond : boolean
@@ -23,6 +24,7 @@ function f1() {
 >x = 1 : 1
 >      : ^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
     }
@@ -34,6 +36,7 @@ function f1() {
 >x = "hello" : "hello"
 >            : ^^^^^^^
 >x : any
+>  : ^^^
 >"hello" : "hello"
 >        : ^^^^^^^
     }
@@ -51,6 +54,7 @@ function f2() {
 
     let x = undefined;
 >x : any
+>  : ^^^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -62,6 +66,7 @@ function f2() {
 >x = 1 : 1
 >      : ^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
     }
@@ -73,6 +78,7 @@ function f2() {
 >x = "hello" : "hello"
 >            : ^^^^^^^
 >x : any
+>  : ^^^
 >"hello" : "hello"
 >        : ^^^^^^^
     }
@@ -90,6 +96,7 @@ function f3() {
 
     let x = null;
 >x : any
+>  : ^^^
 
     if (cond) {
 >cond : boolean
@@ -99,6 +106,7 @@ function f3() {
 >x = 1 : 1
 >      : ^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
     }
@@ -110,6 +118,7 @@ function f3() {
 >x = "hello" : "hello"
 >            : ^^^^^^^
 >x : any
+>  : ^^^
 >"hello" : "hello"
 >        : ^^^^^^^
     }
@@ -127,6 +136,7 @@ function f5() {
 
     var x;
 >x : any
+>  : ^^^
 
     if (cond) {
 >cond : boolean
@@ -136,6 +146,7 @@ function f5() {
 >x = 1 : 1
 >      : ^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
     }
@@ -147,6 +158,7 @@ function f5() {
 >x = "hello" : "hello"
 >            : ^^^^^^^
 >x : any
+>  : ^^^
 >"hello" : "hello"
 >        : ^^^^^^^
     }
@@ -164,6 +176,7 @@ function f6() {
 
     var x = undefined;
 >x : any
+>  : ^^^
 >undefined : undefined
 >          : ^^^^^^^^^
 
@@ -175,6 +188,7 @@ function f6() {
 >x = 1 : 1
 >      : ^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
     }
@@ -186,6 +200,7 @@ function f6() {
 >x = "hello" : "hello"
 >            : ^^^^^^^
 >x : any
+>  : ^^^
 >"hello" : "hello"
 >        : ^^^^^^^
     }
@@ -203,6 +218,7 @@ function f7() {
 
     var x = null;
 >x : any
+>  : ^^^
 
     if (cond) {
 >cond : boolean
@@ -212,6 +228,7 @@ function f7() {
 >x = 1 : 1
 >      : ^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
     }
@@ -223,6 +240,7 @@ function f7() {
 >x = "hello" : "hello"
 >            : ^^^^^^^
 >x : any
+>  : ^^^
 >"hello" : "hello"
 >        : ^^^^^^^
     }
@@ -240,6 +258,7 @@ function f9() {
 
     let x;
 >x : any
+>  : ^^^
 
     if (cond) {
 >cond : boolean
@@ -249,6 +268,7 @@ function f9() {
 >x = 1 : 1
 >      : ^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
     }
@@ -260,6 +280,7 @@ function f9() {
 >x = "hello" : "hello"
 >            : ^^^^^^^
 >x : any
+>  : ^^^
 >"hello" : "hello"
 >        : ^^^^^^^
     }
@@ -275,7 +296,9 @@ function f9() {
 
         const z = x;  // any
 >z : any
+>  : ^^^
 >x : any
+>  : ^^^
     }
 }
 
@@ -286,6 +309,7 @@ function f10() {
 
     let x;
 >x : any
+>  : ^^^
 
     if (cond) {
 >cond : boolean
@@ -295,6 +319,7 @@ function f10() {
 >x = 1 : 1
 >      : ^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
     }
@@ -306,6 +331,7 @@ function f10() {
 >x = "hello" : "hello"
 >            : ^^^^^^^
 >x : any
+>  : ^^^
 >"hello" : "hello"
 >        : ^^^^^^^
     }
@@ -323,7 +349,9 @@ function f10() {
 
         const z = x;  // any
 >z : any
+>  : ^^^
 >x : any
+>  : ^^^
 
     };
 }
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences1.js b/tests/baselines/reference/correctlyMarkAliasAsReferences1.js
index 7816881f4a2ae..51c7058201f97 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences1.js
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences1.js
@@ -4,6 +4,7 @@
 declare module "classnames";
 
 //// [0.tsx]
+/// <reference path="/.lib/react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 import * as React from "react";
@@ -15,6 +16,7 @@ let k = <button {...buttonProps}>
 
 
 //// [0.js]
+/// <reference path="/.lib/react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 import * as React from "react";
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences1.symbols b/tests/baselines/reference/correctlyMarkAliasAsReferences1.symbols
index b709736f12eeb..6ac4eba237188 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences1.symbols
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences1.symbols
@@ -1,26 +1,27 @@
 //// [tests/cases/conformance/jsx/correctlyMarkAliasAsReferences1.tsx] ////
 
 === 0.tsx ===
+/// <reference path="react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
->cx : Symbol(cx, Decl(0.tsx, 1, 6))
+>cx : Symbol(cx, Decl(0.tsx, 2, 6))
 
 import * as React from "react";
->React : Symbol(React, Decl(0.tsx, 2, 6))
+>React : Symbol(React, Decl(0.tsx, 3, 6))
 
 let buttonProps; // any
->buttonProps : Symbol(buttonProps, Decl(0.tsx, 4, 3))
+>buttonProps : Symbol(buttonProps, Decl(0.tsx, 5, 3))
 
 let k = <button {...buttonProps}>
->k : Symbol(k, Decl(0.tsx, 5, 3))
+>k : Symbol(k, Decl(0.tsx, 6, 3))
 >button : Symbol(JSX.IntrinsicElements.button, Decl(react.d.ts, 2386, 43))
->buttonProps : Symbol(buttonProps, Decl(0.tsx, 4, 3))
+>buttonProps : Symbol(buttonProps, Decl(0.tsx, 5, 3))
 
             <span className={cx('class1', { class2: true })} />
 >span : Symbol(JSX.IntrinsicElements.span, Decl(react.d.ts, 2461, 51))
->className : Symbol(className, Decl(0.tsx, 6, 17))
->cx : Symbol(cx, Decl(0.tsx, 1, 6))
->class2 : Symbol(class2, Decl(0.tsx, 6, 43))
+>className : Symbol(className, Decl(0.tsx, 7, 17))
+>cx : Symbol(cx, Decl(0.tsx, 2, 6))
+>class2 : Symbol(class2, Decl(0.tsx, 7, 43))
 
         </button>;
 >button : Symbol(JSX.IntrinsicElements.button, Decl(react.d.ts, 2386, 43))
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences1.types b/tests/baselines/reference/correctlyMarkAliasAsReferences1.types
index e21077fcfc11f..fff6b6515427f 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences1.types
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences1.types
@@ -1,6 +1,7 @@
 //// [tests/cases/conformance/jsx/correctlyMarkAliasAsReferences1.tsx] ////
 
 === 0.tsx ===
+/// <reference path="react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 >cx : any
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences2.js b/tests/baselines/reference/correctlyMarkAliasAsReferences2.js
index 7af59b017a8ee..8124cf26d8984 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences2.js
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences2.js
@@ -4,6 +4,7 @@
 declare module "classnames";
 
 //// [0.tsx]
+/// <reference path="/.lib/react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 import * as React from "react";
@@ -15,6 +16,7 @@ let k = <button {...buttonProps}>
 
 
 //// [0.js]
+/// <reference path="/.lib/react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 import * as React from "react";
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences2.symbols b/tests/baselines/reference/correctlyMarkAliasAsReferences2.symbols
index 24850513fcdc2..ad9ac37f42141 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences2.symbols
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences2.symbols
@@ -1,27 +1,28 @@
 //// [tests/cases/conformance/jsx/correctlyMarkAliasAsReferences2.tsx] ////
 
 === 0.tsx ===
+/// <reference path="react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
->cx : Symbol(cx, Decl(0.tsx, 1, 6))
+>cx : Symbol(cx, Decl(0.tsx, 2, 6))
 
 import * as React from "react";
->React : Symbol(React, Decl(0.tsx, 2, 6))
+>React : Symbol(React, Decl(0.tsx, 3, 6))
 
 let buttonProps : {[attributeName: string]: ''}
->buttonProps : Symbol(buttonProps, Decl(0.tsx, 4, 3))
->attributeName : Symbol(attributeName, Decl(0.tsx, 4, 20))
+>buttonProps : Symbol(buttonProps, Decl(0.tsx, 5, 3))
+>attributeName : Symbol(attributeName, Decl(0.tsx, 5, 20))
 
 let k = <button {...buttonProps}>
->k : Symbol(k, Decl(0.tsx, 5, 3))
+>k : Symbol(k, Decl(0.tsx, 6, 3))
 >button : Symbol(JSX.IntrinsicElements.button, Decl(react.d.ts, 2386, 43))
->buttonProps : Symbol(buttonProps, Decl(0.tsx, 4, 3))
+>buttonProps : Symbol(buttonProps, Decl(0.tsx, 5, 3))
 
             <span className={cx('class1', { class2: true })} />
 >span : Symbol(JSX.IntrinsicElements.span, Decl(react.d.ts, 2461, 51))
->className : Symbol(className, Decl(0.tsx, 6, 17))
->cx : Symbol(cx, Decl(0.tsx, 1, 6))
->class2 : Symbol(class2, Decl(0.tsx, 6, 43))
+>className : Symbol(className, Decl(0.tsx, 7, 17))
+>cx : Symbol(cx, Decl(0.tsx, 2, 6))
+>class2 : Symbol(class2, Decl(0.tsx, 7, 43))
 
         </button>;
 >button : Symbol(JSX.IntrinsicElements.button, Decl(react.d.ts, 2386, 43))
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences2.types b/tests/baselines/reference/correctlyMarkAliasAsReferences2.types
index da7806339a7be..4eb31046db991 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences2.types
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences2.types
@@ -1,6 +1,7 @@
 //// [tests/cases/conformance/jsx/correctlyMarkAliasAsReferences2.tsx] ////
 
 === 0.tsx ===
+/// <reference path="react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 >cx : any
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences3.errors.txt b/tests/baselines/reference/correctlyMarkAliasAsReferences3.errors.txt
index 47a8158859ea4..6eb67cbc99bd7 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences3.errors.txt
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences3.errors.txt
@@ -1,7 +1,8 @@
-0.tsx(6,21): error TS2698: Spread types may only be created from object types.
+0.tsx(7,21): error TS2698: Spread types may only be created from object types.
 
 
 ==== 0.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
     ///<reference path="declaration.d.ts" />
     import * as cx from 'classnames';
     import * as React from "react";
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences3.js b/tests/baselines/reference/correctlyMarkAliasAsReferences3.js
index 166e29d56dbb9..1e1accca25f75 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences3.js
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences3.js
@@ -4,6 +4,7 @@
 declare module "classnames";
 
 //// [0.tsx]
+/// <reference path="/.lib/react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 import * as React from "react";
@@ -15,6 +16,7 @@ let k = <button {...buttonProps}>
 
 
 //// [0.js]
+/// <reference path="/.lib/react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 import * as React from "react";
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences3.symbols b/tests/baselines/reference/correctlyMarkAliasAsReferences3.symbols
index 35fdd60bdd447..0113490738bae 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences3.symbols
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences3.symbols
@@ -1,26 +1,27 @@
 //// [tests/cases/conformance/jsx/correctlyMarkAliasAsReferences3.tsx] ////
 
 === 0.tsx ===
+/// <reference path="react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
->cx : Symbol(cx, Decl(0.tsx, 1, 6))
+>cx : Symbol(cx, Decl(0.tsx, 2, 6))
 
 import * as React from "react";
->React : Symbol(React, Decl(0.tsx, 2, 6))
+>React : Symbol(React, Decl(0.tsx, 3, 6))
 
 let buttonProps;
->buttonProps : Symbol(buttonProps, Decl(0.tsx, 4, 3))
+>buttonProps : Symbol(buttonProps, Decl(0.tsx, 5, 3))
 
 let k = <button {...buttonProps}>
->k : Symbol(k, Decl(0.tsx, 5, 3))
+>k : Symbol(k, Decl(0.tsx, 6, 3))
 >button : Symbol(JSX.IntrinsicElements.button, Decl(react.d.ts, 2386, 43))
->buttonProps : Symbol(buttonProps, Decl(0.tsx, 4, 3))
+>buttonProps : Symbol(buttonProps, Decl(0.tsx, 5, 3))
 
             <span className={cx('class1', { class2: true })} />
 >span : Symbol(JSX.IntrinsicElements.span, Decl(react.d.ts, 2461, 51))
->className : Symbol(className, Decl(0.tsx, 6, 17))
->cx : Symbol(cx, Decl(0.tsx, 1, 6))
->class2 : Symbol(class2, Decl(0.tsx, 6, 43))
+>className : Symbol(className, Decl(0.tsx, 7, 17))
+>cx : Symbol(cx, Decl(0.tsx, 2, 6))
+>class2 : Symbol(class2, Decl(0.tsx, 7, 43))
 
         </button>;
 >button : Symbol(JSX.IntrinsicElements.button, Decl(react.d.ts, 2386, 43))
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences3.types b/tests/baselines/reference/correctlyMarkAliasAsReferences3.types
index 639409a9e3e7e..c1ef9ec38d157 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences3.types
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences3.types
@@ -1,6 +1,7 @@
 //// [tests/cases/conformance/jsx/correctlyMarkAliasAsReferences3.tsx] ////
 
 === 0.tsx ===
+/// <reference path="react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 >cx : any
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences4.js b/tests/baselines/reference/correctlyMarkAliasAsReferences4.js
index 631d06cc5b362..5ece7ba7a1ae0 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences4.js
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences4.js
@@ -4,6 +4,7 @@
 declare module "classnames";
 
 //// [0.tsx]
+/// <reference path="/.lib/react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 import * as React from "react";
@@ -12,6 +13,7 @@ let buttonProps : {[attributeName: string]: ''}
 let k = <button {...buttonProps} className={cx('class1', { class2: true })} />;
 
 //// [0.js]
+/// <reference path="/.lib/react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 import * as React from "react";
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences4.symbols b/tests/baselines/reference/correctlyMarkAliasAsReferences4.symbols
index c56a152b383f2..6480e01dd1c8c 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences4.symbols
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences4.symbols
@@ -1,24 +1,25 @@
 //// [tests/cases/conformance/jsx/correctlyMarkAliasAsReferences4.tsx] ////
 
 === 0.tsx ===
+/// <reference path="react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
->cx : Symbol(cx, Decl(0.tsx, 1, 6))
+>cx : Symbol(cx, Decl(0.tsx, 2, 6))
 
 import * as React from "react";
->React : Symbol(React, Decl(0.tsx, 2, 6))
+>React : Symbol(React, Decl(0.tsx, 3, 6))
 
 let buttonProps : {[attributeName: string]: ''}
->buttonProps : Symbol(buttonProps, Decl(0.tsx, 4, 3))
->attributeName : Symbol(attributeName, Decl(0.tsx, 4, 20))
+>buttonProps : Symbol(buttonProps, Decl(0.tsx, 5, 3))
+>attributeName : Symbol(attributeName, Decl(0.tsx, 5, 20))
 
 let k = <button {...buttonProps} className={cx('class1', { class2: true })} />;
->k : Symbol(k, Decl(0.tsx, 5, 3))
+>k : Symbol(k, Decl(0.tsx, 6, 3))
 >button : Symbol(JSX.IntrinsicElements.button, Decl(react.d.ts, 2386, 43))
->buttonProps : Symbol(buttonProps, Decl(0.tsx, 4, 3))
->className : Symbol(className, Decl(0.tsx, 5, 32))
->cx : Symbol(cx, Decl(0.tsx, 1, 6))
->class2 : Symbol(class2, Decl(0.tsx, 5, 58))
+>buttonProps : Symbol(buttonProps, Decl(0.tsx, 5, 3))
+>className : Symbol(className, Decl(0.tsx, 6, 32))
+>cx : Symbol(cx, Decl(0.tsx, 2, 6))
+>class2 : Symbol(class2, Decl(0.tsx, 6, 58))
 
 === declaration.d.ts ===
 declare module "classnames";
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences4.types b/tests/baselines/reference/correctlyMarkAliasAsReferences4.types
index 474ed236af2a1..03651fba46104 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences4.types
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences4.types
@@ -1,6 +1,7 @@
 //// [tests/cases/conformance/jsx/correctlyMarkAliasAsReferences4.tsx] ////
 
 === 0.tsx ===
+/// <reference path="react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 >cx : any
diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt
index dac66868a5172..41fc7268d4aeb 100644
--- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt
+++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt
@@ -1,9 +1,11 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 declFile.d.ts(2,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context.
 declFile.d.ts(3,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context.
 declFile.d.ts(5,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context.
 declFile.d.ts(7,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== client.ts (0 errors) ====
     ///<reference path="declFile.d.ts" preserve="true"/>
     var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file
diff --git a/tests/baselines/reference/declarationEmitAmdModuleDefault.errors.txt b/tests/baselines/reference/declarationEmitAmdModuleDefault.errors.txt
index f5d93de80e5ea..2a3d52cc51590 100644
--- a/tests/baselines/reference/declarationEmitAmdModuleDefault.errors.txt
+++ b/tests/baselines/reference/declarationEmitAmdModuleDefault.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== declarationEmitAmdModuleDefault.ts (0 errors) ====
     export default class DefaultClass { }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitBundleWithAmbientReferences.errors.txt b/tests/baselines/reference/declarationEmitBundleWithAmbientReferences.errors.txt
index 50a797b87f127..b35e12ef152f7 100644
--- a/tests/baselines/reference/declarationEmitBundleWithAmbientReferences.errors.txt
+++ b/tests/baselines/reference/declarationEmitBundleWithAmbientReferences.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== lib/lib.d.ts (0 errors) ====
     declare module "lib/result" {
diff --git a/tests/baselines/reference/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.errors.txt b/tests/baselines/reference/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.errors.txt
new file mode 100644
index 0000000000000..ea1f64fae5c27
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.errors.txt
@@ -0,0 +1,16 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== /a/index.ts (0 errors) ====
+    export * from "./src/"
+==== /b/index.ts (0 errors) ====
+    export * from "./src/"
+==== /b/src/index.ts (0 errors) ====
+    export class B {}
+==== /a/src/index.ts (0 errors) ====
+    import { B } from "b";
+    
+    export default function () {
+    	return new B();
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.js b/tests/baselines/reference/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.js
index 993c4598352a9..a5afb1395aba4 100644
--- a/tests/baselines/reference/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.js
+++ b/tests/baselines/reference/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.js
@@ -23,22 +23,3 @@ declare module "src/index" {
 declare module "index" {
     export * from "src/index";
 }
-
-
-//// [DtsFileErrors]
-
-
-/a/dist/index.d.ts(2,23): error TS2307: Cannot find module 'b' or its corresponding type declarations.
-
-
-==== /a/dist/index.d.ts (1 errors) ====
-    declare module "src/index" {
-        import { B } from "b";
-                          ~~~
-!!! error TS2307: Cannot find module 'b' or its corresponding type declarations.
-        export default function (): B;
-    }
-    declare module "index" {
-        export * from "src/index";
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.errors.txt b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.errors.txt
index 6e43f0a6d1213..1c092f652be1c 100644
--- a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.errors.txt
+++ b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== pi.ts (0 errors) ====
     export default 3.14159;
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitDestructuringParameterProperties2.errors.txt b/tests/baselines/reference/declarationEmitDestructuringParameterProperties2.errors.txt
new file mode 100644
index 0000000000000..dbfd04701a929
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDestructuringParameterProperties2.errors.txt
@@ -0,0 +1,28 @@
+declarationEmitDestructuringParameterProperties2.ts(2,17): error TS1187: A parameter property may not be declared using a binding pattern.
+declarationEmitDestructuringParameterProperties2.ts(8,17): error TS1187: A parameter property may not be declared using a binding pattern.
+declarationEmitDestructuringParameterProperties2.ts(14,17): error TS1187: A parameter property may not be declared using a binding pattern.
+
+
+==== declarationEmitDestructuringParameterProperties2.ts (3 errors) ====
+    class C1 {
+        constructor(public [x, y, z]: string[]) {
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1187: A parameter property may not be declared using a binding pattern.
+        }
+    }
+    
+    type TupleType1 =[string, number, boolean];
+    class C2 {
+        constructor(public [x, y, z]: TupleType1) {
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1187: A parameter property may not be declared using a binding pattern.
+        }
+    }
+    
+    type ObjType1 = { x: number; y: string; z: boolean }
+    class C3 {
+        constructor(public { x, y, z }: ObjType1) {
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1187: A parameter property may not be declared using a binding pattern.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitDestructuringParameterProperties2.js b/tests/baselines/reference/declarationEmitDestructuringParameterProperties2.js
new file mode 100644
index 0000000000000..15a67e835bb89
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDestructuringParameterProperties2.js
@@ -0,0 +1,60 @@
+//// [tests/cases/compiler/declarationEmitDestructuringParameterProperties2.ts] ////
+
+//// [declarationEmitDestructuringParameterProperties2.ts]
+class C1 {
+    constructor(public [x, y, z]: string[]) {
+    }
+}
+
+type TupleType1 =[string, number, boolean];
+class C2 {
+    constructor(public [x, y, z]: TupleType1) {
+    }
+}
+
+type ObjType1 = { x: number; y: string; z: boolean }
+class C3 {
+    constructor(public { x, y, z }: ObjType1) {
+    }
+}
+
+//// [declarationEmitDestructuringParameterProperties2.js]
+class C1 {
+    constructor([x, y, z]) {
+    }
+}
+class C2 {
+    constructor([x, y, z]) {
+    }
+}
+class C3 {
+    constructor({ x, y, z }) {
+    }
+}
+
+
+//// [declarationEmitDestructuringParameterProperties2.d.ts]
+declare class C1 {
+    x: string;
+    y: string;
+    z: string;
+    constructor([x, y, z]: string[]);
+}
+type TupleType1 = [string, number, boolean];
+declare class C2 {
+    x: string;
+    y: number;
+    z: boolean;
+    constructor([x, y, z]: TupleType1);
+}
+type ObjType1 = {
+    x: number;
+    y: string;
+    z: boolean;
+};
+declare class C3 {
+    x: number;
+    y: string;
+    z: boolean;
+    constructor({ x, y, z }: ObjType1);
+}
diff --git a/tests/baselines/reference/declarationEmitDestructuringParameterProperties2.symbols b/tests/baselines/reference/declarationEmitDestructuringParameterProperties2.symbols
new file mode 100644
index 0000000000000..dd073e280dced
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDestructuringParameterProperties2.symbols
@@ -0,0 +1,43 @@
+//// [tests/cases/compiler/declarationEmitDestructuringParameterProperties2.ts] ////
+
+=== declarationEmitDestructuringParameterProperties2.ts ===
+class C1 {
+>C1 : Symbol(C1, Decl(declarationEmitDestructuringParameterProperties2.ts, 0, 0))
+
+    constructor(public [x, y, z]: string[]) {
+>x : Symbol(x, Decl(declarationEmitDestructuringParameterProperties2.ts, 1, 24))
+>y : Symbol(y, Decl(declarationEmitDestructuringParameterProperties2.ts, 1, 26))
+>z : Symbol(z, Decl(declarationEmitDestructuringParameterProperties2.ts, 1, 29))
+    }
+}
+
+type TupleType1 =[string, number, boolean];
+>TupleType1 : Symbol(TupleType1, Decl(declarationEmitDestructuringParameterProperties2.ts, 3, 1))
+
+class C2 {
+>C2 : Symbol(C2, Decl(declarationEmitDestructuringParameterProperties2.ts, 5, 43))
+
+    constructor(public [x, y, z]: TupleType1) {
+>x : Symbol(x, Decl(declarationEmitDestructuringParameterProperties2.ts, 7, 24))
+>y : Symbol(y, Decl(declarationEmitDestructuringParameterProperties2.ts, 7, 26))
+>z : Symbol(z, Decl(declarationEmitDestructuringParameterProperties2.ts, 7, 29))
+>TupleType1 : Symbol(TupleType1, Decl(declarationEmitDestructuringParameterProperties2.ts, 3, 1))
+    }
+}
+
+type ObjType1 = { x: number; y: string; z: boolean }
+>ObjType1 : Symbol(ObjType1, Decl(declarationEmitDestructuringParameterProperties2.ts, 9, 1))
+>x : Symbol(x, Decl(declarationEmitDestructuringParameterProperties2.ts, 11, 17))
+>y : Symbol(y, Decl(declarationEmitDestructuringParameterProperties2.ts, 11, 28))
+>z : Symbol(z, Decl(declarationEmitDestructuringParameterProperties2.ts, 11, 39))
+
+class C3 {
+>C3 : Symbol(C3, Decl(declarationEmitDestructuringParameterProperties2.ts, 11, 52))
+
+    constructor(public { x, y, z }: ObjType1) {
+>x : Symbol(x, Decl(declarationEmitDestructuringParameterProperties2.ts, 13, 24))
+>y : Symbol(y, Decl(declarationEmitDestructuringParameterProperties2.ts, 13, 27))
+>z : Symbol(z, Decl(declarationEmitDestructuringParameterProperties2.ts, 13, 30))
+>ObjType1 : Symbol(ObjType1, Decl(declarationEmitDestructuringParameterProperties2.ts, 9, 1))
+    }
+}
diff --git a/tests/baselines/reference/declarationEmitDestructuringParameterProperties2.types b/tests/baselines/reference/declarationEmitDestructuringParameterProperties2.types
new file mode 100644
index 0000000000000..2dc2cdbf0e4f5
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDestructuringParameterProperties2.types
@@ -0,0 +1,58 @@
+//// [tests/cases/compiler/declarationEmitDestructuringParameterProperties2.ts] ////
+
+=== declarationEmitDestructuringParameterProperties2.ts ===
+class C1 {
+>C1 : C1
+>   : ^^
+
+    constructor(public [x, y, z]: string[]) {
+>x : string
+>  : ^^^^^^
+>y : string
+>  : ^^^^^^
+>z : string
+>  : ^^^^^^
+    }
+}
+
+type TupleType1 =[string, number, boolean];
+>TupleType1 : TupleType1
+>           : ^^^^^^^^^^
+
+class C2 {
+>C2 : C2
+>   : ^^
+
+    constructor(public [x, y, z]: TupleType1) {
+>x : string
+>  : ^^^^^^
+>y : number
+>  : ^^^^^^
+>z : boolean
+>  : ^^^^^^^
+    }
+}
+
+type ObjType1 = { x: number; y: string; z: boolean }
+>ObjType1 : ObjType1
+>         : ^^^^^^^^
+>x : number
+>  : ^^^^^^
+>y : string
+>  : ^^^^^^
+>z : boolean
+>  : ^^^^^^^
+
+class C3 {
+>C3 : C3
+>   : ^^
+
+    constructor(public { x, y, z }: ObjType1) {
+>x : number
+>  : ^^^^^^
+>y : string
+>  : ^^^^^^
+>z : boolean
+>  : ^^^^^^^
+    }
+}
diff --git a/tests/baselines/reference/declarationEmitMonorepoBaseUrl.errors.txt b/tests/baselines/reference/declarationEmitMonorepoBaseUrl.errors.txt
index e8805648d8e91..1208b91dd9ea0 100644
--- a/tests/baselines/reference/declarationEmitMonorepoBaseUrl.errors.txt
+++ b/tests/baselines/reference/declarationEmitMonorepoBaseUrl.errors.txt
@@ -1,13 +1,18 @@
+/tsconfig.json(5,5): error TS5011: The common source directory of 'tsconfig.json' is './packages'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
 /tsconfig.json(6,5): error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
 
 
-==== /tsconfig.json (1 errors) ====
+==== /tsconfig.json (2 errors) ====
     {
       "compilerOptions": {
         "module": "nodenext",
         "declaration": true,
         "outDir": "temp",
+        ~~~~~~~~
+!!! error TS5011: The common source directory of 'tsconfig.json' is './packages'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+!!! error TS5011:   Visit https://aka.ms/ts6 for migration information.
         "baseUrl": "."
         ~~~~~~~~~
 !!! error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
diff --git a/tests/baselines/reference/declarationEmitOutFileBundlePaths.errors.txt b/tests/baselines/reference/declarationEmitOutFileBundlePaths.errors.txt
new file mode 100644
index 0000000000000..01ae7ea639b1e
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitOutFileBundlePaths.errors.txt
@@ -0,0 +1,16 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== js/versions.static.js (0 errors) ====
+    export default {
+        "@a/b": "1.0.0",
+        "@a/c": "1.2.3"
+    };
+==== js/index.js (0 errors) ====
+    import versions from './versions.static.js';
+    
+    export {
+        versions
+    };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitPathMappingMonorepo.errors.txt b/tests/baselines/reference/declarationEmitPathMappingMonorepo.errors.txt
index 653d7e7aca506..07f7344ed0bd0 100644
--- a/tests/baselines/reference/declarationEmitPathMappingMonorepo.errors.txt
+++ b/tests/baselines/reference/declarationEmitPathMappingMonorepo.errors.txt
@@ -1,11 +1,16 @@
+packages/b/tsconfig.json(3,9): error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
 packages/b/tsconfig.json(5,9): error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
 
 
-==== packages/b/tsconfig.json (1 errors) ====
+==== packages/b/tsconfig.json (2 errors) ====
     {
         "compilerOptions": {
             "outDir": "dist",
+            ~~~~~~~~
+!!! error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+!!! error TS5011:   Visit https://aka.ms/ts6 for migration information.
             "declaration": true,
             "baseUrl": ".",
             ~~~~~~~~~
diff --git a/tests/baselines/reference/declarationEmitPathMappingMonorepo2.errors.txt b/tests/baselines/reference/declarationEmitPathMappingMonorepo2.errors.txt
index e9a010c421b52..dc74d26c3004d 100644
--- a/tests/baselines/reference/declarationEmitPathMappingMonorepo2.errors.txt
+++ b/tests/baselines/reference/declarationEmitPathMappingMonorepo2.errors.txt
@@ -1,11 +1,16 @@
+packages/lab/tsconfig.json(3,9): error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
 packages/lab/tsconfig.json(5,9): error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
 
 
-==== packages/lab/tsconfig.json (1 errors) ====
+==== packages/lab/tsconfig.json (2 errors) ====
     {
         "compilerOptions": {
             "outDir": "dist",
+            ~~~~~~~~
+!!! error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+!!! error TS5011:   Visit https://aka.ms/ts6 for migration information.
             "declaration": true,
             "baseUrl": "../",
             ~~~~~~~~~
diff --git a/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.errors.txt b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.errors.txt
index 61dd1f4f22343..ffd31d2848ed2 100644
--- a/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.errors.txt
+++ b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.errors.txt
@@ -1,10 +1,12 @@
 error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5101:   Visit https://aka.ms/ts6 for migration information.
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== src/lib/operators/scalar.ts (0 errors) ====
     export interface Scalar {
diff --git a/tests/baselines/reference/declarationEmitToDeclarationDirWithDeclarationOption.js b/tests/baselines/reference/declarationEmitToDeclarationDirWithDeclarationOption.js
index 0a0189ac4c6d4..79c4aeaf74393 100644
--- a/tests/baselines/reference/declarationEmitToDeclarationDirWithDeclarationOption.js
+++ b/tests/baselines/reference/declarationEmitToDeclarationDirWithDeclarationOption.js
@@ -17,3 +17,20 @@ interface Foo {
     x: number;
 }
 export default Foo;
+
+
+//// [DtsFileErrors]
+
+
+/foo/tsconfig.json(2,47): error TS5011: The common source directory of 'tsconfig.json' is '../.src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+
+==== /foo/tsconfig.json (1 errors) ====
+    {
+        "compilerOptions": { "declaration": true, "declarationDir": "out" }
+                                                  ~~~~~~~~~~~~~~~~
+!!! error TS5011: The common source directory of 'tsconfig.json' is '../.src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+!!! error TS5011:   Visit https://aka.ms/ts6 for migration information.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
index 42418f6900c2e..2e7769a83898d 100644
--- a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
+++ b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
@@ -1,9 +1,11 @@
 error TS5055: Cannot write file '/out.d.ts' because it would overwrite input file.
   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5055: Cannot write file '/out.d.ts' because it would overwrite input file.
 !!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /out.d.ts (0 errors) ====
     declare class c {
     }
diff --git a/tests/baselines/reference/declarationFilesGeneratingTypeReferences.errors.txt b/tests/baselines/reference/declarationFilesGeneratingTypeReferences.errors.txt
new file mode 100644
index 0000000000000..7f627a922cdd4
--- /dev/null
+++ b/tests/baselines/reference/declarationFilesGeneratingTypeReferences.errors.txt
@@ -0,0 +1,15 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== /a/node_modules/@types/jquery/index.d.ts (0 errors) ====
+    interface JQuery {
+    
+    }
+    
+==== /a/app.ts (0 errors) ====
+    /// <reference types="jquery" preserve="true" />
+    namespace Test {
+        export var x: JQuery;
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationFilesGeneratingTypeReferences.js b/tests/baselines/reference/declarationFilesGeneratingTypeReferences.js
index 91b3f03563fa8..ab7e828779193 100644
--- a/tests/baselines/reference/declarationFilesGeneratingTypeReferences.js
+++ b/tests/baselines/reference/declarationFilesGeneratingTypeReferences.js
@@ -24,24 +24,3 @@ var Test;
 declare namespace Test {
     var x: JQuery;
 }
-
-
-//// [DtsFileErrors]
-
-
-out.d.ts(1,23): error TS2688: Cannot find type definition file for 'jquery'.
-
-
-==== /a/node_modules/@types/jquery/index.d.ts (0 errors) ====
-    interface JQuery {
-    
-    }
-    
-==== out.d.ts (1 errors) ====
-    /// <reference types="jquery" preserve="true" />
-                          ~~~~~~
-!!! error TS2688: Cannot find type definition file for 'jquery'.
-    declare namespace Test {
-        var x: JQuery;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationMapsOutFile.errors.txt b/tests/baselines/reference/declarationMapsOutFile.errors.txt
index 8732b01aa92ca..79ad38d304bec 100644
--- a/tests/baselines/reference/declarationMapsOutFile.errors.txt
+++ b/tests/baselines/reference/declarationMapsOutFile.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (0 errors) ====
     export class Foo {
diff --git a/tests/baselines/reference/declarationMapsOutFile2.errors.txt b/tests/baselines/reference/declarationMapsOutFile2.errors.txt
new file mode 100644
index 0000000000000..79396a123463b
--- /dev/null
+++ b/tests/baselines/reference/declarationMapsOutFile2.errors.txt
@@ -0,0 +1,19 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.ts (0 errors) ====
+    class Foo {
+        doThing(x: {a: number}) {
+            return {b: x.a};
+        }
+        static make() {
+            return new Foo();
+        }
+    }
+==== index.ts (0 errors) ====
+    const c = new Foo();
+    c.doThing({a: 42});
+    
+    let x = c.doThing({a: 12});
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationMapsWithSourceMap.errors.txt b/tests/baselines/reference/declarationMapsWithSourceMap.errors.txt
new file mode 100644
index 0000000000000..79396a123463b
--- /dev/null
+++ b/tests/baselines/reference/declarationMapsWithSourceMap.errors.txt
@@ -0,0 +1,19 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.ts (0 errors) ====
+    class Foo {
+        doThing(x: {a: number}) {
+            return {b: x.a};
+        }
+        static make() {
+            return new Foo();
+        }
+    }
+==== index.ts (0 errors) ====
+    const c = new Foo();
+    c.doThing({a: 42});
+    
+    let x = c.doThing({a: 12});
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationMapsWithoutDeclaration.errors.txt b/tests/baselines/reference/declarationMapsWithoutDeclaration.errors.txt
index b254f30cc92d8..f7b37d4ed4b74 100644
--- a/tests/baselines/reference/declarationMapsWithoutDeclaration.errors.txt
+++ b/tests/baselines/reference/declarationMapsWithoutDeclaration.errors.txt
@@ -14,7 +14,7 @@ error TS5069: Option 'declarationMap' cannot be specified without specifying opt
     
     }
     
-    var m2: {
+    declare var m2: {
         (): m2.connectExport;
         test1: m2.connectModule;
         test2(): m2.connectModule;
diff --git a/tests/baselines/reference/declarationMapsWithoutDeclaration.js b/tests/baselines/reference/declarationMapsWithoutDeclaration.js
index adf5c0ccaf21a..137473a886603 100644
--- a/tests/baselines/reference/declarationMapsWithoutDeclaration.js
+++ b/tests/baselines/reference/declarationMapsWithoutDeclaration.js
@@ -12,7 +12,7 @@ namespace m2 {
 
 }
 
-var m2: {
+declare var m2: {
     (): m2.connectExport;
     test1: m2.connectModule;
     test2(): m2.connectModule;
@@ -22,5 +22,4 @@ export = m2;
 
 //// [declarationMapsWithoutDeclaration.js]
 "use strict";
-var m2;
 module.exports = m2;
diff --git a/tests/baselines/reference/declarationMapsWithoutDeclaration.symbols b/tests/baselines/reference/declarationMapsWithoutDeclaration.symbols
index f8e0849051b58..d3295aa65f46e 100644
--- a/tests/baselines/reference/declarationMapsWithoutDeclaration.symbols
+++ b/tests/baselines/reference/declarationMapsWithoutDeclaration.symbols
@@ -2,7 +2,7 @@
 
 === declarationMapsWithoutDeclaration.ts ===
 namespace m2 {
->m2 : Symbol(m2, Decl(declarationMapsWithoutDeclaration.ts, 0, 0), Decl(declarationMapsWithoutDeclaration.ts, 11, 3))
+>m2 : Symbol(m2, Decl(declarationMapsWithoutDeclaration.ts, 0, 0), Decl(declarationMapsWithoutDeclaration.ts, 11, 11))
 
     export interface connectModule {
 >connectModule : Symbol(connectModule, Decl(declarationMapsWithoutDeclaration.ts, 0, 14))
@@ -28,25 +28,25 @@ namespace m2 {
 
 }
 
-var m2: {
->m2 : Symbol(m2, Decl(declarationMapsWithoutDeclaration.ts, 0, 0), Decl(declarationMapsWithoutDeclaration.ts, 11, 3))
+declare var m2: {
+>m2 : Symbol(m2, Decl(declarationMapsWithoutDeclaration.ts, 0, 0), Decl(declarationMapsWithoutDeclaration.ts, 11, 11))
 
     (): m2.connectExport;
->m2 : Symbol(m2, Decl(declarationMapsWithoutDeclaration.ts, 0, 0), Decl(declarationMapsWithoutDeclaration.ts, 11, 3))
+>m2 : Symbol(m2, Decl(declarationMapsWithoutDeclaration.ts, 0, 0), Decl(declarationMapsWithoutDeclaration.ts, 11, 11))
 >connectExport : Symbol(m2.connectExport, Decl(declarationMapsWithoutDeclaration.ts, 3, 5))
 
     test1: m2.connectModule;
 >test1 : Symbol(test1, Decl(declarationMapsWithoutDeclaration.ts, 12, 25))
->m2 : Symbol(m2, Decl(declarationMapsWithoutDeclaration.ts, 0, 0), Decl(declarationMapsWithoutDeclaration.ts, 11, 3))
+>m2 : Symbol(m2, Decl(declarationMapsWithoutDeclaration.ts, 0, 0), Decl(declarationMapsWithoutDeclaration.ts, 11, 11))
 >connectModule : Symbol(m2.connectModule, Decl(declarationMapsWithoutDeclaration.ts, 0, 14))
 
     test2(): m2.connectModule;
 >test2 : Symbol(test2, Decl(declarationMapsWithoutDeclaration.ts, 13, 28))
->m2 : Symbol(m2, Decl(declarationMapsWithoutDeclaration.ts, 0, 0), Decl(declarationMapsWithoutDeclaration.ts, 11, 3))
+>m2 : Symbol(m2, Decl(declarationMapsWithoutDeclaration.ts, 0, 0), Decl(declarationMapsWithoutDeclaration.ts, 11, 11))
 >connectModule : Symbol(m2.connectModule, Decl(declarationMapsWithoutDeclaration.ts, 0, 14))
 
 };
 
 export = m2;
->m2 : Symbol(m2, Decl(declarationMapsWithoutDeclaration.ts, 0, 0), Decl(declarationMapsWithoutDeclaration.ts, 11, 3))
+>m2 : Symbol(m2, Decl(declarationMapsWithoutDeclaration.ts, 0, 0), Decl(declarationMapsWithoutDeclaration.ts, 11, 11))
 
diff --git a/tests/baselines/reference/declarationMapsWithoutDeclaration.types b/tests/baselines/reference/declarationMapsWithoutDeclaration.types
index 5aaaf4f706f7a..3572972cd2fb8 100644
--- a/tests/baselines/reference/declarationMapsWithoutDeclaration.types
+++ b/tests/baselines/reference/declarationMapsWithoutDeclaration.types
@@ -27,7 +27,7 @@ namespace m2 {
 
 }
 
-var m2: {
+declare var m2: {
 >m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
 >   : ^^^^^^                ^^^^^^^^^                ^^^^^^^^^^^                ^^^
 
diff --git a/tests/baselines/reference/declarationsAndAssignments.errors.txt b/tests/baselines/reference/declarationsAndAssignments.errors.txt
index bf2f168a34955..07a55bb59d92f 100644
--- a/tests/baselines/reference/declarationsAndAssignments.errors.txt
+++ b/tests/baselines/reference/declarationsAndAssignments.errors.txt
@@ -29,8 +29,8 @@ declarationsAndAssignments.ts(138,9): error TS2322: Type 'number' is not assigna
                    ~
 !!! error TS2493: Tuple type '[number, string]' of length '2' has no element at index '2'.
         var [,, x] = [0, 1, 2];
-        var x: number;
-        var y: string;
+        var x!: number;
+        var y!: string;
     }
     
     function f1() {
@@ -38,9 +38,9 @@ declarationsAndAssignments.ts(138,9): error TS2322: Type 'number' is not assigna
         var [x] = a;
         var [x, y] = a;
         var [x, y, z] = a;
-        var x: number | string;
-        var y: number | string;
-        var z: number | string;
+        var x!: number | string;
+        var y!: number | string;
+        var z!: number | string;
     }
     
     function f2() {
@@ -52,8 +52,8 @@ declarationsAndAssignments.ts(138,9): error TS2322: Type 'number' is not assigna
                       ~
 !!! error TS2353: Object literal may only specify known properties, and 'x' does not exist in type '{ y: any; }'.
         var { x, y } = { x: 5, y: "hello" };
-        var x: number;
-        var y: string;
+        var x!: number;
+        var y!: string;
         var { x: a } = { x: 5, y: "hello" };  // Error, no y in target
                                ~
 !!! error TS2353: Object literal may only specify known properties, and 'y' does not exist in type '{ x: any; }'.
@@ -61,34 +61,34 @@ declarationsAndAssignments.ts(138,9): error TS2322: Type 'number' is not assigna
                          ~
 !!! error TS2353: Object literal may only specify known properties, and 'x' does not exist in type '{ y: any; }'.
         var { x: a, y: b } = { x: 5, y: "hello" };
-        var a: number;
-        var b: string;
+        var a!: number;
+        var b!: string;
     }
     
     function f3() {
         var [x, [y, [z]]] = [1, ["hello", [true]]];
-        var x: number;
-        var y: string;
-        var z: boolean;
+        var x!: number;
+        var y!: string;
+        var z!: boolean;
     }
     
     function f4() {
         var { a: x, b: { a: y, b: { a: z }}} = { a: 1, b: { a: "hello", b: { a: true } } };
-        var x: number;
-        var y: string;
-        var z: boolean;
+        var x!: number;
+        var y!: string;
+        var z!: boolean;
     }
     
     function f6() {
         var [x = 0, y = ""] = [1, "hello"];
-        var x: number;
-        var y: string;
+        var x!: number;
+        var y!: string;
     }
     
     function f7() {
         var [x = 0, y = 1] = [1, "hello"];  // Error, initializer for y must be string
-        var x: number;
-        var y: string;
+        var x!: number;
+        var y!: string;
             ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'y' must be of type 'string | number', but here has type 'string'.
 !!! related TS6203 declarationsAndAssignments.ts:56:17: 'y' was also declared here.
@@ -137,16 +137,16 @@ declarationsAndAssignments.ts(138,9): error TS2322: Type 'number' is not assigna
         var { 0: a, 1: b } = { 0: 10, 1: "hello" };
         var { "<": a, ">": b } = { "<": 10, ">": "hello" };
         var { 0: a, 1: b } = [10, "hello"];
-        var a: number;
-        var b: string;
+        var a!: number;
+        var b!: string;
     }
     
     function f12() {
         var [a, [b, { x, y: c }] = ["abc", { x: 10, y: false }]] = [1, ["hello", { x: 5, y: true }]];
-        var a: number;
-        var b: string;
-        var x: number;
-        var c: boolean;
+        var a!: number;
+        var b!: string;
+        var x!: number;
+        var c!: boolean;
     }
     
     function f13() {
@@ -155,9 +155,9 @@ declarationsAndAssignments.ts(138,9): error TS2322: Type 'number' is not assigna
     }
     
     function f14([a = 1, [b = "hello", { x, y: c = false }]]) {
-        var a: number;
-        var b: string;
-        var c: boolean;
+        var a!: number;
+        var b!: string;
+        var c!: boolean;
     }
     f14([2, ["abc", { x: 0, y: true }]]);
     f14([2, ["abc", { x: 0 }]]);
@@ -189,9 +189,9 @@ declarationsAndAssignments.ts(138,9): error TS2322: Type 'number' is not assigna
     f17(f15());
     
     function f18() {
-        var a: number;
-        var b: string;
-        var aa: number[];
+        var a!: number;
+        var b!: string;
+        var aa!: number[];
         ({ a, b } = { a, b });
         ({ a, b } = { b, a });
         [aa[0], b] = [a, b];
@@ -213,13 +213,13 @@ declarationsAndAssignments.ts(138,9): error TS2322: Type 'number' is not assigna
     }
     
     function f20(v: [number, number, number]) {
-        var x: number;
-        var y: number;
-        var z: number;
-        var a0: [];
-        var a1: [number];
-        var a2: [number, number];
-        var a3: [number, number, number];
+        var x!: number;
+        var y!: number;
+        var z!: number;
+        var a0!: [];
+        var a1!: [number];
+        var a2!: [number, number];
+        var a3!: [number, number, number];
         var [...a3] = v;
         var [x, ...a2] = v;
         var [x, y, ...a1] = v;
@@ -231,13 +231,13 @@ declarationsAndAssignments.ts(138,9): error TS2322: Type 'number' is not assigna
     }
     
     function f21(v: [number, string, boolean]) {
-        var x: number;
-        var y: string;
-        var z: boolean;
-        var a0: [number, string, boolean];
-        var a1: [string, boolean];
-        var a2: [boolean];
-        var a3: [];
+        var x!: number;
+        var y!: string;
+        var z!: boolean;
+        var a0!: [number, string, boolean];
+        var a1!: [string, boolean];
+        var a2!: [boolean];
+        var a3!: [];
         var [...a0] = v;
         var [x, ...a1] = v;
         var [x, y, ...a2] = v;
diff --git a/tests/baselines/reference/declarationsAndAssignments.js b/tests/baselines/reference/declarationsAndAssignments.js
index 7821ad1d77ee6..e74b1769ef2b4 100644
--- a/tests/baselines/reference/declarationsAndAssignments.js
+++ b/tests/baselines/reference/declarationsAndAssignments.js
@@ -7,8 +7,8 @@ function f0() {
     var [x, y] = [1, "hello"];
     var [x, y, z] = [1, "hello"];
     var [,, x] = [0, 1, 2];
-    var x: number;
-    var y: string;
+    var x!: number;
+    var y!: string;
 }
 
 function f1() {
@@ -16,9 +16,9 @@ function f1() {
     var [x] = a;
     var [x, y] = a;
     var [x, y, z] = a;
-    var x: number | string;
-    var y: number | string;
-    var z: number | string;
+    var x!: number | string;
+    var y!: number | string;
+    var z!: number | string;
 }
 
 function f2() {
@@ -26,39 +26,39 @@ function f2() {
     var { x } = { x: 5, y: "hello" };     // Error, no y in target
     var { y } = { x: 5, y: "hello" };     // Error, no x in target
     var { x, y } = { x: 5, y: "hello" };
-    var x: number;
-    var y: string;
+    var x!: number;
+    var y!: string;
     var { x: a } = { x: 5, y: "hello" };  // Error, no y in target
     var { y: b } = { x: 5, y: "hello" };  // Error, no x in target
     var { x: a, y: b } = { x: 5, y: "hello" };
-    var a: number;
-    var b: string;
+    var a!: number;
+    var b!: string;
 }
 
 function f3() {
     var [x, [y, [z]]] = [1, ["hello", [true]]];
-    var x: number;
-    var y: string;
-    var z: boolean;
+    var x!: number;
+    var y!: string;
+    var z!: boolean;
 }
 
 function f4() {
     var { a: x, b: { a: y, b: { a: z }}} = { a: 1, b: { a: "hello", b: { a: true } } };
-    var x: number;
-    var y: string;
-    var z: boolean;
+    var x!: number;
+    var y!: string;
+    var z!: boolean;
 }
 
 function f6() {
     var [x = 0, y = ""] = [1, "hello"];
-    var x: number;
-    var y: string;
+    var x!: number;
+    var y!: string;
 }
 
 function f7() {
     var [x = 0, y = 1] = [1, "hello"];  // Error, initializer for y must be string
-    var x: number;
-    var y: string;
+    var x!: number;
+    var y!: string;
 }
 
 function f8() {
@@ -82,16 +82,16 @@ function f11() {
     var { 0: a, 1: b } = { 0: 10, 1: "hello" };
     var { "<": a, ">": b } = { "<": 10, ">": "hello" };
     var { 0: a, 1: b } = [10, "hello"];
-    var a: number;
-    var b: string;
+    var a!: number;
+    var b!: string;
 }
 
 function f12() {
     var [a, [b, { x, y: c }] = ["abc", { x: 10, y: false }]] = [1, ["hello", { x: 5, y: true }]];
-    var a: number;
-    var b: string;
-    var x: number;
-    var c: boolean;
+    var a!: number;
+    var b!: string;
+    var x!: number;
+    var c!: boolean;
 }
 
 function f13() {
@@ -100,9 +100,9 @@ function f13() {
 }
 
 function f14([a = 1, [b = "hello", { x, y: c = false }]]) {
-    var a: number;
-    var b: string;
-    var c: boolean;
+    var a!: number;
+    var b!: string;
+    var c!: boolean;
 }
 f14([2, ["abc", { x: 0, y: true }]]);
 f14([2, ["abc", { x: 0 }]]);
@@ -132,9 +132,9 @@ f17({ c: true });
 f17(f15());
 
 function f18() {
-    var a: number;
-    var b: string;
-    var aa: number[];
+    var a!: number;
+    var b!: string;
+    var aa!: number[];
     ({ a, b } = { a, b });
     ({ a, b } = { b, a });
     [aa[0], b] = [a, b];
@@ -152,13 +152,13 @@ function f19() {
 }
 
 function f20(v: [number, number, number]) {
-    var x: number;
-    var y: number;
-    var z: number;
-    var a0: [];
-    var a1: [number];
-    var a2: [number, number];
-    var a3: [number, number, number];
+    var x!: number;
+    var y!: number;
+    var z!: number;
+    var a0!: [];
+    var a1!: [number];
+    var a2!: [number, number];
+    var a3!: [number, number, number];
     var [...a3] = v;
     var [x, ...a2] = v;
     var [x, y, ...a1] = v;
@@ -170,13 +170,13 @@ function f20(v: [number, number, number]) {
 }
 
 function f21(v: [number, string, boolean]) {
-    var x: number;
-    var y: string;
-    var z: boolean;
-    var a0: [number, string, boolean];
-    var a1: [string, boolean];
-    var a2: [boolean];
-    var a3: [];
+    var x!: number;
+    var y!: string;
+    var z!: boolean;
+    var a0!: [number, string, boolean];
+    var a1!: [string, boolean];
+    var a2!: [boolean];
+    var a3!: [];
     var [...a0] = v;
     var [x, ...a1] = v;
     var [x, y, ...a2] = v;
diff --git a/tests/baselines/reference/declarationsAndAssignments.symbols b/tests/baselines/reference/declarationsAndAssignments.symbols
index 81e98b6bc9f8a..fa26e4590fa9c 100644
--- a/tests/baselines/reference/declarationsAndAssignments.symbols
+++ b/tests/baselines/reference/declarationsAndAssignments.symbols
@@ -20,10 +20,10 @@ function f0() {
     var [,, x] = [0, 1, 2];
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 2, 9), Decl(declarationsAndAssignments.ts, 3, 9), Decl(declarationsAndAssignments.ts, 4, 9), Decl(declarationsAndAssignments.ts, 5, 11), Decl(declarationsAndAssignments.ts, 6, 7))
 
-    var x: number;
+    var x!: number;
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 2, 9), Decl(declarationsAndAssignments.ts, 3, 9), Decl(declarationsAndAssignments.ts, 4, 9), Decl(declarationsAndAssignments.ts, 5, 11), Decl(declarationsAndAssignments.ts, 6, 7))
 
-    var y: string;
+    var y!: string;
 >y : Symbol(y, Decl(declarationsAndAssignments.ts, 3, 11), Decl(declarationsAndAssignments.ts, 4, 11), Decl(declarationsAndAssignments.ts, 7, 7))
 }
 
@@ -48,13 +48,13 @@ function f1() {
 >z : Symbol(z, Decl(declarationsAndAssignments.ts, 14, 14), Decl(declarationsAndAssignments.ts, 17, 7))
 >a : Symbol(a, Decl(declarationsAndAssignments.ts, 11, 7))
 
-    var x: number | string;
+    var x!: number | string;
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 12, 9), Decl(declarationsAndAssignments.ts, 13, 9), Decl(declarationsAndAssignments.ts, 14, 9), Decl(declarationsAndAssignments.ts, 15, 7))
 
-    var y: number | string;
+    var y!: number | string;
 >y : Symbol(y, Decl(declarationsAndAssignments.ts, 13, 11), Decl(declarationsAndAssignments.ts, 14, 11), Decl(declarationsAndAssignments.ts, 16, 7))
 
-    var z: number | string;
+    var z!: number | string;
 >z : Symbol(z, Decl(declarationsAndAssignments.ts, 14, 14), Decl(declarationsAndAssignments.ts, 17, 7))
 }
 
@@ -81,10 +81,10 @@ function f2() {
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 24, 20))
 >y : Symbol(y, Decl(declarationsAndAssignments.ts, 24, 26))
 
-    var x: number;
+    var x!: number;
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 22, 9), Decl(declarationsAndAssignments.ts, 24, 9), Decl(declarationsAndAssignments.ts, 25, 7))
 
-    var y: string;
+    var y!: string;
 >y : Symbol(y, Decl(declarationsAndAssignments.ts, 23, 9), Decl(declarationsAndAssignments.ts, 24, 12), Decl(declarationsAndAssignments.ts, 26, 7))
 
     var { x: a } = { x: 5, y: "hello" };  // Error, no y in target
@@ -107,10 +107,10 @@ function f2() {
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 29, 26))
 >y : Symbol(y, Decl(declarationsAndAssignments.ts, 29, 32))
 
-    var a: number;
+    var a!: number;
 >a : Symbol(a, Decl(declarationsAndAssignments.ts, 27, 9), Decl(declarationsAndAssignments.ts, 29, 9), Decl(declarationsAndAssignments.ts, 30, 7))
 
-    var b: string;
+    var b!: string;
 >b : Symbol(b, Decl(declarationsAndAssignments.ts, 28, 9), Decl(declarationsAndAssignments.ts, 29, 15), Decl(declarationsAndAssignments.ts, 31, 7))
 }
 
@@ -122,13 +122,13 @@ function f3() {
 >y : Symbol(y, Decl(declarationsAndAssignments.ts, 35, 13), Decl(declarationsAndAssignments.ts, 37, 7))
 >z : Symbol(z, Decl(declarationsAndAssignments.ts, 35, 17), Decl(declarationsAndAssignments.ts, 38, 7))
 
-    var x: number;
+    var x!: number;
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 35, 9), Decl(declarationsAndAssignments.ts, 36, 7))
 
-    var y: string;
+    var y!: string;
 >y : Symbol(y, Decl(declarationsAndAssignments.ts, 35, 13), Decl(declarationsAndAssignments.ts, 37, 7))
 
-    var z: boolean;
+    var z!: boolean;
 >z : Symbol(z, Decl(declarationsAndAssignments.ts, 35, 17), Decl(declarationsAndAssignments.ts, 38, 7))
 }
 
@@ -150,13 +150,13 @@ function f4() {
 >b : Symbol(b, Decl(declarationsAndAssignments.ts, 42, 67))
 >a : Symbol(a, Decl(declarationsAndAssignments.ts, 42, 72))
 
-    var x: number;
+    var x!: number;
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 42, 9), Decl(declarationsAndAssignments.ts, 43, 7))
 
-    var y: string;
+    var y!: string;
 >y : Symbol(y, Decl(declarationsAndAssignments.ts, 42, 20), Decl(declarationsAndAssignments.ts, 44, 7))
 
-    var z: boolean;
+    var z!: boolean;
 >z : Symbol(z, Decl(declarationsAndAssignments.ts, 42, 31), Decl(declarationsAndAssignments.ts, 45, 7))
 }
 
@@ -167,10 +167,10 @@ function f6() {
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 49, 9), Decl(declarationsAndAssignments.ts, 50, 7))
 >y : Symbol(y, Decl(declarationsAndAssignments.ts, 49, 15), Decl(declarationsAndAssignments.ts, 51, 7))
 
-    var x: number;
+    var x!: number;
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 49, 9), Decl(declarationsAndAssignments.ts, 50, 7))
 
-    var y: string;
+    var y!: string;
 >y : Symbol(y, Decl(declarationsAndAssignments.ts, 49, 15), Decl(declarationsAndAssignments.ts, 51, 7))
 }
 
@@ -181,10 +181,10 @@ function f7() {
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 55, 9), Decl(declarationsAndAssignments.ts, 56, 7))
 >y : Symbol(y, Decl(declarationsAndAssignments.ts, 55, 15), Decl(declarationsAndAssignments.ts, 57, 7))
 
-    var x: number;
+    var x!: number;
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 55, 9), Decl(declarationsAndAssignments.ts, 56, 7))
 
-    var y: string;
+    var y!: string;
 >y : Symbol(y, Decl(declarationsAndAssignments.ts, 55, 15), Decl(declarationsAndAssignments.ts, 57, 7))
 }
 
@@ -259,10 +259,10 @@ function f11() {
 >a : Symbol(a, Decl(declarationsAndAssignments.ts, 77, 9), Decl(declarationsAndAssignments.ts, 78, 9), Decl(declarationsAndAssignments.ts, 79, 9), Decl(declarationsAndAssignments.ts, 80, 9), Decl(declarationsAndAssignments.ts, 81, 7))
 >b : Symbol(b, Decl(declarationsAndAssignments.ts, 77, 15), Decl(declarationsAndAssignments.ts, 78, 15), Decl(declarationsAndAssignments.ts, 79, 17), Decl(declarationsAndAssignments.ts, 80, 15), Decl(declarationsAndAssignments.ts, 82, 7))
 
-    var a: number;
+    var a!: number;
 >a : Symbol(a, Decl(declarationsAndAssignments.ts, 77, 9), Decl(declarationsAndAssignments.ts, 78, 9), Decl(declarationsAndAssignments.ts, 79, 9), Decl(declarationsAndAssignments.ts, 80, 9), Decl(declarationsAndAssignments.ts, 81, 7))
 
-    var b: string;
+    var b!: string;
 >b : Symbol(b, Decl(declarationsAndAssignments.ts, 77, 15), Decl(declarationsAndAssignments.ts, 78, 15), Decl(declarationsAndAssignments.ts, 79, 17), Decl(declarationsAndAssignments.ts, 80, 15), Decl(declarationsAndAssignments.ts, 82, 7))
 }
 
@@ -280,16 +280,16 @@ function f12() {
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 86, 78))
 >y : Symbol(y, Decl(declarationsAndAssignments.ts, 86, 84))
 
-    var a: number;
+    var a!: number;
 >a : Symbol(a, Decl(declarationsAndAssignments.ts, 86, 9), Decl(declarationsAndAssignments.ts, 87, 7))
 
-    var b: string;
+    var b!: string;
 >b : Symbol(b, Decl(declarationsAndAssignments.ts, 86, 13), Decl(declarationsAndAssignments.ts, 88, 7))
 
-    var x: number;
+    var x!: number;
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 86, 17), Decl(declarationsAndAssignments.ts, 89, 7))
 
-    var c: boolean;
+    var c!: boolean;
 >c : Symbol(c, Decl(declarationsAndAssignments.ts, 86, 20), Decl(declarationsAndAssignments.ts, 90, 7))
 }
 
@@ -319,13 +319,13 @@ function f14([a = 1, [b = "hello", { x, y: c = false }]]) {
 >y : Symbol(y)
 >c : Symbol(c, Decl(declarationsAndAssignments.ts, 98, 39), Decl(declarationsAndAssignments.ts, 101, 7))
 
-    var a: number;
+    var a!: number;
 >a : Symbol(a, Decl(declarationsAndAssignments.ts, 98, 14), Decl(declarationsAndAssignments.ts, 99, 7))
 
-    var b: string;
+    var b!: string;
 >b : Symbol(b, Decl(declarationsAndAssignments.ts, 98, 22), Decl(declarationsAndAssignments.ts, 100, 7))
 
-    var c: boolean;
+    var c!: boolean;
 >c : Symbol(c, Decl(declarationsAndAssignments.ts, 98, 39), Decl(declarationsAndAssignments.ts, 101, 7))
 }
 f14([2, ["abc", { x: 0, y: true }]]);
@@ -402,13 +402,13 @@ f17(f15());
 function f18() {
 >f18 : Symbol(f18, Decl(declarationsAndAssignments.ts, 128, 11))
 
-    var a: number;
+    var a!: number;
 >a : Symbol(a, Decl(declarationsAndAssignments.ts, 131, 7))
 
-    var b: string;
+    var b!: string;
 >b : Symbol(b, Decl(declarationsAndAssignments.ts, 132, 7))
 
-    var aa: number[];
+    var aa!: number[];
 >aa : Symbol(aa, Decl(declarationsAndAssignments.ts, 133, 7))
 
     ({ a, b } = { a, b });
@@ -477,25 +477,25 @@ function f20(v: [number, number, number]) {
 >f20 : Symbol(f20, Decl(declarationsAndAssignments.ts, 148, 1))
 >v : Symbol(v, Decl(declarationsAndAssignments.ts, 150, 13))
 
-    var x: number;
+    var x!: number;
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 151, 7), Decl(declarationsAndAssignments.ts, 159, 9), Decl(declarationsAndAssignments.ts, 160, 9), Decl(declarationsAndAssignments.ts, 161, 9))
 
-    var y: number;
+    var y!: number;
 >y : Symbol(y, Decl(declarationsAndAssignments.ts, 152, 7), Decl(declarationsAndAssignments.ts, 160, 11), Decl(declarationsAndAssignments.ts, 161, 11))
 
-    var z: number;
+    var z!: number;
 >z : Symbol(z, Decl(declarationsAndAssignments.ts, 153, 7), Decl(declarationsAndAssignments.ts, 161, 14))
 
-    var a0: [];
+    var a0!: [];
 >a0 : Symbol(a0, Decl(declarationsAndAssignments.ts, 154, 7), Decl(declarationsAndAssignments.ts, 161, 17))
 
-    var a1: [number];
+    var a1!: [number];
 >a1 : Symbol(a1, Decl(declarationsAndAssignments.ts, 155, 7), Decl(declarationsAndAssignments.ts, 160, 14))
 
-    var a2: [number, number];
+    var a2!: [number, number];
 >a2 : Symbol(a2, Decl(declarationsAndAssignments.ts, 156, 7), Decl(declarationsAndAssignments.ts, 159, 11))
 
-    var a3: [number, number, number];
+    var a3!: [number, number, number];
 >a3 : Symbol(a3, Decl(declarationsAndAssignments.ts, 157, 7), Decl(declarationsAndAssignments.ts, 158, 9))
 
     var [...a3] = v;
@@ -547,25 +547,25 @@ function f21(v: [number, string, boolean]) {
 >f21 : Symbol(f21, Decl(declarationsAndAssignments.ts, 166, 1))
 >v : Symbol(v, Decl(declarationsAndAssignments.ts, 168, 13))
 
-    var x: number;
+    var x!: number;
 >x : Symbol(x, Decl(declarationsAndAssignments.ts, 169, 7), Decl(declarationsAndAssignments.ts, 177, 9), Decl(declarationsAndAssignments.ts, 178, 9), Decl(declarationsAndAssignments.ts, 179, 9))
 
-    var y: string;
+    var y!: string;
 >y : Symbol(y, Decl(declarationsAndAssignments.ts, 170, 7), Decl(declarationsAndAssignments.ts, 178, 11), Decl(declarationsAndAssignments.ts, 179, 11))
 
-    var z: boolean;
+    var z!: boolean;
 >z : Symbol(z, Decl(declarationsAndAssignments.ts, 171, 7), Decl(declarationsAndAssignments.ts, 179, 14))
 
-    var a0: [number, string, boolean];
+    var a0!: [number, string, boolean];
 >a0 : Symbol(a0, Decl(declarationsAndAssignments.ts, 172, 7), Decl(declarationsAndAssignments.ts, 176, 9))
 
-    var a1: [string, boolean];
+    var a1!: [string, boolean];
 >a1 : Symbol(a1, Decl(declarationsAndAssignments.ts, 173, 7), Decl(declarationsAndAssignments.ts, 177, 11))
 
-    var a2: [boolean];
+    var a2!: [boolean];
 >a2 : Symbol(a2, Decl(declarationsAndAssignments.ts, 174, 7), Decl(declarationsAndAssignments.ts, 178, 14))
 
-    var a3: [];
+    var a3!: [];
 >a3 : Symbol(a3, Decl(declarationsAndAssignments.ts, 175, 7), Decl(declarationsAndAssignments.ts, 179, 17))
 
     var [...a0] = v;
diff --git a/tests/baselines/reference/declarationsAndAssignments.types b/tests/baselines/reference/declarationsAndAssignments.types
index 11b4ce7c39580..c9c8a339e0f7a 100644
--- a/tests/baselines/reference/declarationsAndAssignments.types
+++ b/tests/baselines/reference/declarationsAndAssignments.types
@@ -68,11 +68,11 @@ function f0() {
 >2 : 2
 >  : ^
 
-    var x: number;
+    var x!: number;
 >x : number
 >  : ^^^^^^
 
-    var y: string;
+    var y!: string;
 >y : string
 >  : ^^^^^^
 }
@@ -115,15 +115,15 @@ function f1() {
 >a : (string | number)[]
 >  : ^^^^^^^^^^^^^^^^^^^
 
-    var x: number | string;
+    var x!: number | string;
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
 
-    var y: number | string;
+    var y!: number | string;
 >y : string | number
 >  : ^^^^^^^^^^^^^^^
 
-    var z: number | string;
+    var z!: number | string;
 >z : string | number
 >  : ^^^^^^^^^^^^^^^
 }
@@ -188,11 +188,11 @@ function f2() {
 >"hello" : "hello"
 >        : ^^^^^^^
 
-    var x: number;
+    var x!: number;
 >x : number
 >  : ^^^^^^
 
-    var y: string;
+    var y!: string;
 >y : string
 >  : ^^^^^^
 
@@ -248,11 +248,11 @@ function f2() {
 >"hello" : "hello"
 >        : ^^^^^^^
 
-    var a: number;
+    var a!: number;
 >a : number
 >  : ^^^^^^
 
-    var b: string;
+    var b!: string;
 >b : string
 >  : ^^^^^^
 }
@@ -281,15 +281,15 @@ function f3() {
 >true : true
 >     : ^^^^
 
-    var x: number;
+    var x!: number;
 >x : number
 >  : ^^^^^^
 
-    var y: string;
+    var y!: string;
 >y : string
 >  : ^^^^^^
 
-    var z: boolean;
+    var z!: boolean;
 >z : boolean
 >  : ^^^^^^^
 }
@@ -338,15 +338,15 @@ function f4() {
 >true : true
 >     : ^^^^
 
-    var x: number;
+    var x!: number;
 >x : number
 >  : ^^^^^^
 
-    var y: string;
+    var y!: string;
 >y : string
 >  : ^^^^^^
 
-    var z: boolean;
+    var z!: boolean;
 >z : boolean
 >  : ^^^^^^^
 }
@@ -371,11 +371,11 @@ function f6() {
 >"hello" : "hello"
 >        : ^^^^^^^
 
-    var x: number;
+    var x!: number;
 >x : number
 >  : ^^^^^^
 
-    var y: string;
+    var y!: string;
 >y : string
 >  : ^^^^^^
 }
@@ -400,11 +400,11 @@ function f7() {
 >"hello" : "hello"
 >        : ^^^^^^^
 
-    var x: number;
+    var x!: number;
 >x : number
 >  : ^^^^^^
 
-    var y: string;
+    var y!: string;
 >y : string | number
 >  : ^^^^^^^^^^^^^^^
 }
@@ -566,11 +566,11 @@ function f11() {
 >"hello" : "hello"
 >        : ^^^^^^^
 
-    var a: number;
+    var a!: number;
 >a : number
 >  : ^^^^^^
 
-    var b: string;
+    var b!: string;
 >b : string
 >  : ^^^^^^
 }
@@ -623,19 +623,19 @@ function f12() {
 >true : true
 >     : ^^^^
 
-    var a: number;
+    var a!: number;
 >a : number
 >  : ^^^^^^
 
-    var b: string;
+    var b!: string;
 >b : string
 >  : ^^^^^^
 
-    var x: number;
+    var x!: number;
 >x : number
 >  : ^^^^^^
 
-    var c: boolean;
+    var c!: boolean;
 >c : boolean
 >  : ^^^^^^^
 }
@@ -701,15 +701,15 @@ function f14([a = 1, [b = "hello", { x, y: c = false }]]) {
 >false : false
 >      : ^^^^^
 
-    var a: number;
+    var a!: number;
 >a : number
 >  : ^^^^^^
 
-    var b: string;
+    var b!: string;
 >b : string
 >  : ^^^^^^
 
-    var c: boolean;
+    var c!: boolean;
 >c : boolean
 >  : ^^^^^^^
 }
@@ -907,15 +907,15 @@ function f18() {
 >f18 : () => void
 >    : ^^^^^^^^^^
 
-    var a: number;
+    var a!: number;
 >a : number
 >  : ^^^^^^
 
-    var b: string;
+    var b!: string;
 >b : string
 >  : ^^^^^^
 
-    var aa: number[];
+    var aa!: number[];
 >aa : number[]
 >   : ^^^^^^^^
 
@@ -1131,31 +1131,31 @@ function f20(v: [number, number, number]) {
 >v : [number, number, number]
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^
 
-    var x: number;
+    var x!: number;
 >x : number
 >  : ^^^^^^
 
-    var y: number;
+    var y!: number;
 >y : number
 >  : ^^^^^^
 
-    var z: number;
+    var z!: number;
 >z : number
 >  : ^^^^^^
 
-    var a0: [];
+    var a0!: [];
 >a0 : []
 >   : ^^
 
-    var a1: [number];
+    var a1!: [number];
 >a1 : [number]
 >   : ^^^^^^^^
 
-    var a2: [number, number];
+    var a2!: [number, number];
 >a2 : [number, number]
 >   : ^^^^^^^^^^^^^^^^
 
-    var a3: [number, number, number];
+    var a3!: [number, number, number];
 >a3 : [number, number, number]
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -1262,31 +1262,31 @@ function f21(v: [number, string, boolean]) {
 >v : [number, string, boolean]
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-    var x: number;
+    var x!: number;
 >x : number
 >  : ^^^^^^
 
-    var y: string;
+    var y!: string;
 >y : string
 >  : ^^^^^^
 
-    var z: boolean;
+    var z!: boolean;
 >z : boolean
 >  : ^^^^^^^
 
-    var a0: [number, string, boolean];
+    var a0!: [number, string, boolean];
 >a0 : [number, string, boolean]
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-    var a1: [string, boolean];
+    var a1!: [string, boolean];
 >a1 : [string, boolean]
 >   : ^^^^^^^^^^^^^^^^^
 
-    var a2: [boolean];
+    var a2!: [boolean];
 >a2 : [boolean]
 >   : ^^^^^^^^^
 
-    var a3: [];
+    var a3!: [];
 >a3 : []
 >   : ^^
 
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS1.js b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
index ad8a57ab01244..6e2b258cd8742 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS1.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
@@ -1,6 +1,7 @@
 //// [tests/cases/conformance/decorators/class/decoratedClassExportsCommonJS1.ts] ////
 
-//// [decoratedClassExportsCommonJS1.ts]
+//// [a.ts]
+declare function forwardRef(x: any): any;
 declare var Something: any;
 @Something({ v: () => Testing123 })
 export class Testing123 {
@@ -8,7 +9,7 @@ export class Testing123 {
     static prop1 = Testing123.prop0;
 }
 
-//// [decoratedClassExportsCommonJS1.js]
+//// [a.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS1.symbols b/tests/baselines/reference/decoratedClassExportsCommonJS1.symbols
index 1134ada758812..e2bca53fe8438 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS1.symbols
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS1.symbols
@@ -1,23 +1,27 @@
 //// [tests/cases/conformance/decorators/class/decoratedClassExportsCommonJS1.ts] ////
 
-=== decoratedClassExportsCommonJS1.ts ===
+=== a.ts ===
+declare function forwardRef(x: any): any;
+>forwardRef : Symbol(forwardRef, Decl(a.ts, 0, 0))
+>x : Symbol(x, Decl(a.ts, 0, 28))
+
 declare var Something: any;
->Something : Symbol(Something, Decl(decoratedClassExportsCommonJS1.ts, 0, 11))
+>Something : Symbol(Something, Decl(a.ts, 1, 11))
 
 @Something({ v: () => Testing123 })
->Something : Symbol(Something, Decl(decoratedClassExportsCommonJS1.ts, 0, 11))
->v : Symbol(v, Decl(decoratedClassExportsCommonJS1.ts, 1, 12))
->Testing123 : Symbol(Testing123, Decl(decoratedClassExportsCommonJS1.ts, 0, 27))
+>Something : Symbol(Something, Decl(a.ts, 1, 11))
+>v : Symbol(v, Decl(a.ts, 2, 12))
+>Testing123 : Symbol(Testing123, Decl(a.ts, 1, 27))
 
 export class Testing123 {
->Testing123 : Symbol(Testing123, Decl(decoratedClassExportsCommonJS1.ts, 0, 27))
+>Testing123 : Symbol(Testing123, Decl(a.ts, 1, 27))
 
     static prop0: string;
->prop0 : Symbol(Testing123.prop0, Decl(decoratedClassExportsCommonJS1.ts, 2, 25))
+>prop0 : Symbol(Testing123.prop0, Decl(a.ts, 3, 25))
 
     static prop1 = Testing123.prop0;
->prop1 : Symbol(Testing123.prop1, Decl(decoratedClassExportsCommonJS1.ts, 3, 25))
->Testing123.prop0 : Symbol(Testing123.prop0, Decl(decoratedClassExportsCommonJS1.ts, 2, 25))
->Testing123 : Symbol(Testing123, Decl(decoratedClassExportsCommonJS1.ts, 0, 27))
->prop0 : Symbol(Testing123.prop0, Decl(decoratedClassExportsCommonJS1.ts, 2, 25))
+>prop1 : Symbol(Testing123.prop1, Decl(a.ts, 4, 25))
+>Testing123.prop0 : Symbol(Testing123.prop0, Decl(a.ts, 3, 25))
+>Testing123 : Symbol(Testing123, Decl(a.ts, 1, 27))
+>prop0 : Symbol(Testing123.prop0, Decl(a.ts, 3, 25))
 }
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS1.types b/tests/baselines/reference/decoratedClassExportsCommonJS1.types
index a931e19930fe4..368258ebdd17a 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS1.types
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS1.types
@@ -1,6 +1,11 @@
 //// [tests/cases/conformance/decorators/class/decoratedClassExportsCommonJS1.ts] ////
 
-=== decoratedClassExportsCommonJS1.ts ===
+=== a.ts ===
+declare function forwardRef(x: any): any;
+>forwardRef : (x: any) => any
+>           : ^ ^^   ^^^^^   
+>x : any
+
 declare var Something: any;
 >Something : any
 
diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt
index dac2aad2c92fb..d7bcd6f3b03ad 100644
--- a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt
+++ b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt
@@ -54,10 +54,10 @@ decrementOperatorWithAnyOtherTypeInvalidOperations.ts(72,12): error TS1109: Expr
 
 ==== decrementOperatorWithAnyOtherTypeInvalidOperations.ts (52 errors) ====
     // -- operator on any type
-    var ANY1: any;
+    declare var ANY1: any;
     var ANY2: any[] = ["", ""];
     
-    var obj: () => {}
+    declare var obj: () => {}
     var obj1 = { x: "", y: () => { } };
     function foo(): any {
         var a;
diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js
index 15e149c778387..ad74954fd365f 100644
--- a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js
+++ b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js
@@ -2,10 +2,10 @@
 
 //// [decrementOperatorWithAnyOtherTypeInvalidOperations.ts]
 // -- operator on any type
-var ANY1: any;
+declare var ANY1: any;
 var ANY2: any[] = ["", ""];
 
-var obj: () => {}
+declare var obj: () => {}
 var obj1 = { x: "", y: () => { } };
 function foo(): any {
     var a;
@@ -75,10 +75,7 @@ ANY2--;
 ++ANY2[0]--;
 
 //// [decrementOperatorWithAnyOtherTypeInvalidOperations.js]
-// -- operator on any type
-var ANY1;
 var ANY2 = ["", ""];
-var obj;
 var obj1 = { x: "", y: function () { } };
 function foo() {
     var a;
diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.symbols b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.symbols
index 4315ba14cfa22..3351e6b8d4b43 100644
--- a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.symbols
+++ b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.symbols
@@ -2,14 +2,14 @@
 
 === decrementOperatorWithAnyOtherTypeInvalidOperations.ts ===
 // -- operator on any type
-var ANY1: any;
->ANY1 : Symbol(ANY1, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 1, 3))
+declare var ANY1: any;
+>ANY1 : Symbol(ANY1, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 1, 11))
 
 var ANY2: any[] = ["", ""];
 >ANY2 : Symbol(ANY2, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 2, 3))
 
-var obj: () => {}
->obj : Symbol(obj, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 4, 3))
+declare var obj: () => {}
+>obj : Symbol(obj, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 4, 11))
 
 var obj1 = { x: "", y: () => { } };
 >obj1 : Symbol(obj1, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 5, 3))
@@ -66,7 +66,7 @@ var ResultIsNumber3 = --M;
 
 var ResultIsNumber4 = --obj;
 >ResultIsNumber4 : Symbol(ResultIsNumber4, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 26, 3))
->obj : Symbol(obj, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 4, 3))
+>obj : Symbol(obj, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 4, 11))
 
 var ResultIsNumber5 = --obj1;
 >ResultIsNumber5 : Symbol(ResultIsNumber5, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 27, 3))
@@ -86,7 +86,7 @@ var ResultIsNumber8 = M--;
 
 var ResultIsNumber9 = obj--;
 >ResultIsNumber9 : Symbol(ResultIsNumber9, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 32, 3))
->obj : Symbol(obj, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 4, 3))
+>obj : Symbol(obj, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 4, 11))
 
 var ResultIsNumber10 = obj1--;
 >ResultIsNumber10 : Symbol(ResultIsNumber10, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 33, 3))
@@ -190,13 +190,13 @@ ANY2--;
 >ANY2 : Symbol(ANY2, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 2, 3))
 
 --ANY1--;
->ANY1 : Symbol(ANY1, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 1, 3))
+>ANY1 : Symbol(ANY1, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 1, 11))
 
 --ANY1++;
->ANY1 : Symbol(ANY1, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 1, 3))
+>ANY1 : Symbol(ANY1, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 1, 11))
 
 ++ANY1--;
->ANY1 : Symbol(ANY1, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 1, 3))
+>ANY1 : Symbol(ANY1, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 1, 11))
 
 --ANY2[0]--;
 >ANY2 : Symbol(ANY2, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 2, 3))
diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.types b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.types
index c46452ebe4c16..513a9f14e5e23 100644
--- a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.types
+++ b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.types
@@ -2,7 +2,7 @@
 
 === decrementOperatorWithAnyOtherTypeInvalidOperations.ts ===
 // -- operator on any type
-var ANY1: any;
+declare var ANY1: any;
 >ANY1 : any
 >     : ^^^
 
@@ -16,7 +16,7 @@ var ANY2: any[] = ["", ""];
 >"" : ""
 >   : ^^
 
-var obj: () => {}
+declare var obj: () => {}
 >obj : () => {}
 >    : ^^^^^^  
 
diff --git a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.errors.txt b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.errors.txt
index 212bcd2a5c2df..3b999eab6d79f 100644
--- a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.errors.txt
+++ b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.errors.txt
@@ -22,7 +22,7 @@ decrementOperatorWithNumberTypeInvalidOperations.ts(46,1): error TS2357: The ope
 
 ==== decrementOperatorWithNumberTypeInvalidOperations.ts (20 errors) ====
     // -- operator on number type
-    var NUMBER: number;
+    declare var NUMBER: number;
     var NUMBER1: number[] = [1, 2];
     
     function foo(): number { return 1; }
diff --git a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js
index ed1a9c60e8128..ea5ed5708c1b9 100644
--- a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js
+++ b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js
@@ -2,7 +2,7 @@
 
 //// [decrementOperatorWithNumberTypeInvalidOperations.ts]
 // -- operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
 
 function foo(): number { return 1; }
@@ -49,8 +49,6 @@ NUMBER1--;
 foo()--;
 
 //// [decrementOperatorWithNumberTypeInvalidOperations.js]
-// -- operator on number type
-var NUMBER;
 var NUMBER1 = [1, 2];
 function foo() { return 1; }
 var A = /** @class */ (function () {
diff --git a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.symbols b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.symbols
index bf6b7d623a648..46ea9283d6322 100644
--- a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.symbols
+++ b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.symbols
@@ -2,8 +2,8 @@
 
 === decrementOperatorWithNumberTypeInvalidOperations.ts ===
 // -- operator on number type
-var NUMBER: number;
->NUMBER : Symbol(NUMBER, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 1, 3))
+declare var NUMBER: number;
+>NUMBER : Symbol(NUMBER, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 1, 11))
 
 var NUMBER1: number[] = [1, 2];
 >NUMBER1 : Symbol(NUMBER1, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 2, 3))
@@ -84,8 +84,8 @@ var ResultIsNumber10 = --A.foo();
 
 var ResultIsNumber11 = --(NUMBER + NUMBER);
 >ResultIsNumber11 : Symbol(ResultIsNumber11, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 32, 3))
->NUMBER : Symbol(NUMBER, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 1, 3))
->NUMBER : Symbol(NUMBER, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 1, 11))
+>NUMBER : Symbol(NUMBER, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 1, 11))
 
 var ResultIsNumber12 = foo()--;
 >ResultIsNumber12 : Symbol(ResultIsNumber12, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 34, 3))
@@ -99,8 +99,8 @@ var ResultIsNumber13 = A.foo()--;
 
 var ResultIsNumber14 = (NUMBER + NUMBER)--;
 >ResultIsNumber14 : Symbol(ResultIsNumber14, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 36, 3))
->NUMBER : Symbol(NUMBER, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 1, 3))
->NUMBER : Symbol(NUMBER, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 1, 11))
+>NUMBER : Symbol(NUMBER, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 1, 11))
 
 // miss assignment operator
 --1;
diff --git a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.types b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.types
index dda36256f07f4..4fa7180037715 100644
--- a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.types
+++ b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.types
@@ -2,7 +2,7 @@
 
 === decrementOperatorWithNumberTypeInvalidOperations.ts ===
 // -- operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 >NUMBER : number
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.errors.txt b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.errors.txt
index b4ef56d81e586..17d55c780f0ef 100644
--- a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.errors.txt
+++ b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.errors.txt
@@ -31,7 +31,7 @@ decrementOperatorWithUnsupportedBooleanType.ts(54,11): error TS2356: An arithmet
 
 ==== decrementOperatorWithUnsupportedBooleanType.ts (29 errors) ====
     // -- operator on boolean type
-    var BOOLEAN: boolean;
+    declare var BOOLEAN: boolean;
     
     function foo(): boolean { return true; }
     
diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js
index 5e1d1cdf55bc7..170be44722104 100644
--- a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js
+++ b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js
@@ -2,7 +2,7 @@
 
 //// [decrementOperatorWithUnsupportedBooleanType.ts]
 // -- operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 
 function foo(): boolean { return true; }
 
@@ -57,8 +57,6 @@ M.n--;
 objA.a--, M.n--;
 
 //// [decrementOperatorWithUnsupportedBooleanType.js]
-// -- operator on boolean type
-var BOOLEAN;
 function foo() { return true; }
 var A = /** @class */ (function () {
     function A() {
diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.symbols b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.symbols
index cd777f813b651..99436bdbc8b3a 100644
--- a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.symbols
+++ b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.symbols
@@ -2,11 +2,11 @@
 
 === decrementOperatorWithUnsupportedBooleanType.ts ===
 // -- operator on boolean type
-var BOOLEAN: boolean;
->BOOLEAN : Symbol(BOOLEAN, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 3))
+declare var BOOLEAN: boolean;
+>BOOLEAN : Symbol(BOOLEAN, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 11))
 
 function foo(): boolean { return true; }
->foo : Symbol(foo, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 29))
 
 class A {
 >A : Symbol(A, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 3, 40))
@@ -31,11 +31,11 @@ var objA = new A();
 // boolean type var
 var ResultIsNumber1 = --BOOLEAN;
 >ResultIsNumber1 : Symbol(ResultIsNumber1, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 16, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 11))
 
 var ResultIsNumber2 = BOOLEAN--;
 >ResultIsNumber2 : Symbol(ResultIsNumber2, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 18, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 11))
 
 // boolean type literal
 var ResultIsNumber3 = --true;
@@ -83,7 +83,7 @@ var ResultIsNumber10 = --M.n;
 
 var ResultIsNumber11 = --foo();
 >ResultIsNumber11 : Symbol(ResultIsNumber11, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 32, 3))
->foo : Symbol(foo, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 29))
 
 var ResultIsNumber12 = --A.foo();
 >ResultIsNumber12 : Symbol(ResultIsNumber12, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 33, 3))
@@ -93,7 +93,7 @@ var ResultIsNumber12 = --A.foo();
 
 var ResultIsNumber13 = foo()--;
 >ResultIsNumber13 : Symbol(ResultIsNumber13, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 35, 3))
->foo : Symbol(foo, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 29))
 
 var ResultIsNumber14 = A.foo()--;
 >ResultIsNumber14 : Symbol(ResultIsNumber14, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 36, 3))
@@ -116,10 +116,10 @@ var ResultIsNumber16 = M.n--;
 // miss assignment operators
 --true;
 --BOOLEAN;
->BOOLEAN : Symbol(BOOLEAN, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 11))
 
 --foo();
->foo : Symbol(foo, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 29))
 
 --objA.a;
 >objA.a : Symbol(A.a, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 5, 9))
@@ -141,10 +141,10 @@ var ResultIsNumber16 = M.n--;
 
 true--;
 BOOLEAN--;
->BOOLEAN : Symbol(BOOLEAN, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 11))
 
 foo()--;
->foo : Symbol(foo, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 1, 29))
 
 objA.a--;
 >objA.a : Symbol(A.a, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 5, 9))
diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.types b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.types
index bc878233a3f37..06997f86a9699 100644
--- a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.types
+++ b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.types
@@ -2,7 +2,7 @@
 
 === decrementOperatorWithUnsupportedBooleanType.ts ===
 // -- operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 >BOOLEAN : boolean
 >        : ^^^^^^^
 
diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.errors.txt b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.errors.txt
index 4af5b2599b8b4..938fd490568a5 100644
--- a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.errors.txt
+++ b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.errors.txt
@@ -41,7 +41,7 @@ decrementOperatorWithUnsupportedStringType.ts(65,11): error TS2356: An arithmeti
 
 ==== decrementOperatorWithUnsupportedStringType.ts (39 errors) ====
     // -- operator on string type
-    var STRING: string;
+    declare var STRING: string;
     var STRING1: string[] = ["", ""];
     
     function foo(): string { return ""; }
diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js
index 7f56d22342f74..7464e7761d8ed 100644
--- a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js
+++ b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js
@@ -2,7 +2,7 @@
 
 //// [decrementOperatorWithUnsupportedStringType.ts]
 // -- operator on string type
-var STRING: string;
+declare var STRING: string;
 var STRING1: string[] = ["", ""];
 
 function foo(): string { return ""; }
@@ -68,8 +68,6 @@ M.n--;
 objA.a--, M.n--;
 
 //// [decrementOperatorWithUnsupportedStringType.js]
-// -- operator on string type
-var STRING;
 var STRING1 = ["", ""];
 function foo() { return ""; }
 var A = /** @class */ (function () {
diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.symbols b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.symbols
index 5ece05a621a89..d4377bf9fb7c3 100644
--- a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.symbols
+++ b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.symbols
@@ -2,8 +2,8 @@
 
 === decrementOperatorWithUnsupportedStringType.ts ===
 // -- operator on string type
-var STRING: string;
->STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 3))
+declare var STRING: string;
+>STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 11))
 
 var STRING1: string[] = ["", ""];
 >STRING1 : Symbol(STRING1, Decl(decrementOperatorWithUnsupportedStringType.ts, 2, 3))
@@ -34,7 +34,7 @@ var objA = new A();
 // string type var
 var ResultIsNumber1 = --STRING;
 >ResultIsNumber1 : Symbol(ResultIsNumber1, Decl(decrementOperatorWithUnsupportedStringType.ts, 17, 3))
->STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 11))
 
 var ResultIsNumber2 = --STRING1;
 >ResultIsNumber2 : Symbol(ResultIsNumber2, Decl(decrementOperatorWithUnsupportedStringType.ts, 18, 3))
@@ -42,7 +42,7 @@ var ResultIsNumber2 = --STRING1;
 
 var ResultIsNumber3 = STRING--;
 >ResultIsNumber3 : Symbol(ResultIsNumber3, Decl(decrementOperatorWithUnsupportedStringType.ts, 20, 3))
->STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 11))
 
 var ResultIsNumber4 = STRING1--;
 >ResultIsNumber4 : Symbol(ResultIsNumber4, Decl(decrementOperatorWithUnsupportedStringType.ts, 21, 3))
@@ -108,8 +108,8 @@ var ResultIsNumber15 = --A.foo();
 
 var ResultIsNumber16 = --(STRING + STRING);
 >ResultIsNumber16 : Symbol(ResultIsNumber16, Decl(decrementOperatorWithUnsupportedStringType.ts, 38, 3))
->STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 3))
->STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 11))
+>STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 11))
 
 var ResultIsNumber17 = objA.a--;
 >ResultIsNumber17 : Symbol(ResultIsNumber17, Decl(decrementOperatorWithUnsupportedStringType.ts, 40, 3))
@@ -139,13 +139,13 @@ var ResultIsNumber21 = A.foo()--;
 
 var ResultIsNumber22 = (STRING + STRING)--;
 >ResultIsNumber22 : Symbol(ResultIsNumber22, Decl(decrementOperatorWithUnsupportedStringType.ts, 45, 3))
->STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 3))
->STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 11))
+>STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 11))
 
 // miss assignment operators
 --"";
 --STRING;
->STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 11))
 
 --STRING1;
 >STRING1 : Symbol(STRING1, Decl(decrementOperatorWithUnsupportedStringType.ts, 2, 3))
@@ -176,7 +176,7 @@ var ResultIsNumber22 = (STRING + STRING)--;
 
 ""--;
 STRING--;
->STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(decrementOperatorWithUnsupportedStringType.ts, 1, 11))
 
 STRING1--;
 >STRING1 : Symbol(STRING1, Decl(decrementOperatorWithUnsupportedStringType.ts, 2, 3))
diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.types b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.types
index feeea54376ef6..9d636a28d9279 100644
--- a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.types
+++ b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.types
@@ -2,7 +2,7 @@
 
 === decrementOperatorWithUnsupportedStringType.ts ===
 // -- operator on string type
-var STRING: string;
+declare var STRING: string;
 >STRING : string
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/deleteOperatorWithAnyOtherType.errors.txt b/tests/baselines/reference/deleteOperatorWithAnyOtherType.errors.txt
index 2bfa9fb37ce6f..82266312f7190 100644
--- a/tests/baselines/reference/deleteOperatorWithAnyOtherType.errors.txt
+++ b/tests/baselines/reference/deleteOperatorWithAnyOtherType.errors.txt
@@ -28,10 +28,10 @@ deleteOperatorWithAnyOtherType.ts(57,8): error TS2703: The operand of a 'delete'
 ==== deleteOperatorWithAnyOtherType.ts (25 errors) ====
     // delete  operator on any type
     
-    var ANY: any;
-    var ANY1;
+    declare var ANY: any;
+    declare var ANY1;
     var ANY2: any[] = ["", ""];
-    var obj: () => {};
+    declare var obj: () => {};
     var obj1 = { x: "", y: () => { }};
     function foo(): any {
         var a;
diff --git a/tests/baselines/reference/deleteOperatorWithAnyOtherType.js b/tests/baselines/reference/deleteOperatorWithAnyOtherType.js
index 558121f113dc8..96c6a1e9532ee 100644
--- a/tests/baselines/reference/deleteOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/deleteOperatorWithAnyOtherType.js
@@ -3,10 +3,10 @@
 //// [deleteOperatorWithAnyOtherType.ts]
 // delete  operator on any type
 
-var ANY: any;
-var ANY1;
+declare var ANY: any;
+declare var ANY1;
 var ANY2: any[] = ["", ""];
-var obj: () => {};
+declare var obj: () => {};
 var obj1 = { x: "", y: () => { }};
 function foo(): any {
     var a;
@@ -65,10 +65,7 @@ delete M.n;
 
 //// [deleteOperatorWithAnyOtherType.js]
 // delete  operator on any type
-var ANY;
-var ANY1;
 var ANY2 = ["", ""];
-var obj;
 var obj1 = { x: "", y: function () { } };
 function foo() {
     var a;
diff --git a/tests/baselines/reference/deleteOperatorWithAnyOtherType.symbols b/tests/baselines/reference/deleteOperatorWithAnyOtherType.symbols
index d76ad90cadfa9..e307ee95891ed 100644
--- a/tests/baselines/reference/deleteOperatorWithAnyOtherType.symbols
+++ b/tests/baselines/reference/deleteOperatorWithAnyOtherType.symbols
@@ -3,17 +3,17 @@
 === deleteOperatorWithAnyOtherType.ts ===
 // delete  operator on any type
 
-var ANY: any;
->ANY : Symbol(ANY, Decl(deleteOperatorWithAnyOtherType.ts, 2, 3))
+declare var ANY: any;
+>ANY : Symbol(ANY, Decl(deleteOperatorWithAnyOtherType.ts, 2, 11))
 
-var ANY1;
->ANY1 : Symbol(ANY1, Decl(deleteOperatorWithAnyOtherType.ts, 3, 3))
+declare var ANY1;
+>ANY1 : Symbol(ANY1, Decl(deleteOperatorWithAnyOtherType.ts, 3, 11))
 
 var ANY2: any[] = ["", ""];
 >ANY2 : Symbol(ANY2, Decl(deleteOperatorWithAnyOtherType.ts, 4, 3))
 
-var obj: () => {};
->obj : Symbol(obj, Decl(deleteOperatorWithAnyOtherType.ts, 5, 3))
+declare var obj: () => {};
+>obj : Symbol(obj, Decl(deleteOperatorWithAnyOtherType.ts, 5, 11))
 
 var obj1 = { x: "", y: () => { }};
 >obj1 : Symbol(obj1, Decl(deleteOperatorWithAnyOtherType.ts, 6, 3))
@@ -58,7 +58,7 @@ var objA = new A();
 // any type var
 var ResultIsBoolean1 = delete ANY1;
 >ResultIsBoolean1 : Symbol(ResultIsBoolean1, Decl(deleteOperatorWithAnyOtherType.ts, 24, 3))
->ANY1 : Symbol(ANY1, Decl(deleteOperatorWithAnyOtherType.ts, 3, 3))
+>ANY1 : Symbol(ANY1, Decl(deleteOperatorWithAnyOtherType.ts, 3, 11))
 
 var ResultIsBoolean2 = delete ANY2;
 >ResultIsBoolean2 : Symbol(ResultIsBoolean2, Decl(deleteOperatorWithAnyOtherType.ts, 25, 3))
@@ -74,7 +74,7 @@ var ResultIsBoolean4 = delete M;
 
 var ResultIsBoolean5 = delete obj;
 >ResultIsBoolean5 : Symbol(ResultIsBoolean5, Decl(deleteOperatorWithAnyOtherType.ts, 28, 3))
->obj : Symbol(obj, Decl(deleteOperatorWithAnyOtherType.ts, 5, 3))
+>obj : Symbol(obj, Decl(deleteOperatorWithAnyOtherType.ts, 5, 11))
 
 var ResultIsBoolean6 = delete obj1;
 >ResultIsBoolean6 : Symbol(ResultIsBoolean6, Decl(deleteOperatorWithAnyOtherType.ts, 29, 3))
@@ -129,8 +129,8 @@ var ResultIsBoolean15 = delete A.foo();
 
 var ResultIsBoolean16 = delete (ANY + ANY1);
 >ResultIsBoolean16 : Symbol(ResultIsBoolean16, Decl(deleteOperatorWithAnyOtherType.ts, 43, 3))
->ANY : Symbol(ANY, Decl(deleteOperatorWithAnyOtherType.ts, 2, 3))
->ANY1 : Symbol(ANY1, Decl(deleteOperatorWithAnyOtherType.ts, 3, 3))
+>ANY : Symbol(ANY, Decl(deleteOperatorWithAnyOtherType.ts, 2, 11))
+>ANY1 : Symbol(ANY1, Decl(deleteOperatorWithAnyOtherType.ts, 3, 11))
 
 var ResultIsBoolean17 = delete (null + undefined);
 >ResultIsBoolean17 : Symbol(ResultIsBoolean17, Decl(deleteOperatorWithAnyOtherType.ts, 44, 3))
@@ -147,26 +147,26 @@ var ResultIsBoolean19 = delete (undefined + undefined);
 // multiple delete  operators
 var ResultIsBoolean20 = delete delete ANY;
 >ResultIsBoolean20 : Symbol(ResultIsBoolean20, Decl(deleteOperatorWithAnyOtherType.ts, 49, 3))
->ANY : Symbol(ANY, Decl(deleteOperatorWithAnyOtherType.ts, 2, 3))
+>ANY : Symbol(ANY, Decl(deleteOperatorWithAnyOtherType.ts, 2, 11))
 
 var ResultIsBoolean21 = delete delete delete (ANY + ANY1);
 >ResultIsBoolean21 : Symbol(ResultIsBoolean21, Decl(deleteOperatorWithAnyOtherType.ts, 50, 3))
->ANY : Symbol(ANY, Decl(deleteOperatorWithAnyOtherType.ts, 2, 3))
->ANY1 : Symbol(ANY1, Decl(deleteOperatorWithAnyOtherType.ts, 3, 3))
+>ANY : Symbol(ANY, Decl(deleteOperatorWithAnyOtherType.ts, 2, 11))
+>ANY1 : Symbol(ANY1, Decl(deleteOperatorWithAnyOtherType.ts, 3, 11))
 
 // miss assignment operators
 delete ANY;
->ANY : Symbol(ANY, Decl(deleteOperatorWithAnyOtherType.ts, 2, 3))
+>ANY : Symbol(ANY, Decl(deleteOperatorWithAnyOtherType.ts, 2, 11))
 
 delete ANY1;
->ANY1 : Symbol(ANY1, Decl(deleteOperatorWithAnyOtherType.ts, 3, 3))
+>ANY1 : Symbol(ANY1, Decl(deleteOperatorWithAnyOtherType.ts, 3, 11))
 
 delete ANY2[0];
 >ANY2 : Symbol(ANY2, Decl(deleteOperatorWithAnyOtherType.ts, 4, 3))
 
 delete ANY, ANY1;
->ANY : Symbol(ANY, Decl(deleteOperatorWithAnyOtherType.ts, 2, 3))
->ANY1 : Symbol(ANY1, Decl(deleteOperatorWithAnyOtherType.ts, 3, 3))
+>ANY : Symbol(ANY, Decl(deleteOperatorWithAnyOtherType.ts, 2, 11))
+>ANY1 : Symbol(ANY1, Decl(deleteOperatorWithAnyOtherType.ts, 3, 11))
 
 delete obj1.x;
 >obj1.x : Symbol(x, Decl(deleteOperatorWithAnyOtherType.ts, 6, 12))
diff --git a/tests/baselines/reference/deleteOperatorWithAnyOtherType.types b/tests/baselines/reference/deleteOperatorWithAnyOtherType.types
index aa521d6c4c79d..f86f73f992e5d 100644
--- a/tests/baselines/reference/deleteOperatorWithAnyOtherType.types
+++ b/tests/baselines/reference/deleteOperatorWithAnyOtherType.types
@@ -3,11 +3,11 @@
 === deleteOperatorWithAnyOtherType.ts ===
 // delete  operator on any type
 
-var ANY: any;
+declare var ANY: any;
 >ANY : any
 >    : ^^^
 
-var ANY1;
+declare var ANY1;
 >ANY1 : any
 >     : ^^^
 
@@ -21,7 +21,7 @@ var ANY2: any[] = ["", ""];
 >"" : ""
 >   : ^^
 
-var obj: () => {};
+declare var obj: () => {};
 >obj : () => {}
 >    : ^^^^^^  
 
diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.errors.txt b/tests/baselines/reference/deleteOperatorWithBooleanType.errors.txt
index f46de29b79ebf..57563e975fbf2 100644
--- a/tests/baselines/reference/deleteOperatorWithBooleanType.errors.txt
+++ b/tests/baselines/reference/deleteOperatorWithBooleanType.errors.txt
@@ -13,7 +13,7 @@ deleteOperatorWithBooleanType.ts(36,8): error TS2703: The operand of a 'delete'
 
 ==== deleteOperatorWithBooleanType.ts (11 errors) ====
     // delete  operator on boolean type
-    var BOOLEAN: boolean;
+    declare var BOOLEAN: boolean;
     
     function foo(): boolean { return true; }
     
diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.js b/tests/baselines/reference/deleteOperatorWithBooleanType.js
index dc38d82c5d198..b9041dc353ed3 100644
--- a/tests/baselines/reference/deleteOperatorWithBooleanType.js
+++ b/tests/baselines/reference/deleteOperatorWithBooleanType.js
@@ -2,7 +2,7 @@
 
 //// [deleteOperatorWithBooleanType.ts]
 // delete  operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 
 function foo(): boolean { return true; }
 
@@ -41,8 +41,6 @@ delete objA.a;
 delete M.n;
 
 //// [deleteOperatorWithBooleanType.js]
-// delete  operator on boolean type
-var BOOLEAN;
 function foo() { return true; }
 var A = /** @class */ (function () {
     function A() {
diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.symbols b/tests/baselines/reference/deleteOperatorWithBooleanType.symbols
index 2e32bf4a01c60..21d58783f26e3 100644
--- a/tests/baselines/reference/deleteOperatorWithBooleanType.symbols
+++ b/tests/baselines/reference/deleteOperatorWithBooleanType.symbols
@@ -2,11 +2,11 @@
 
 === deleteOperatorWithBooleanType.ts ===
 // delete  operator on boolean type
-var BOOLEAN: boolean;
->BOOLEAN : Symbol(BOOLEAN, Decl(deleteOperatorWithBooleanType.ts, 1, 3))
+declare var BOOLEAN: boolean;
+>BOOLEAN : Symbol(BOOLEAN, Decl(deleteOperatorWithBooleanType.ts, 1, 11))
 
 function foo(): boolean { return true; }
->foo : Symbol(foo, Decl(deleteOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(deleteOperatorWithBooleanType.ts, 1, 29))
 
 class A {
 >A : Symbol(A, Decl(deleteOperatorWithBooleanType.ts, 3, 40))
@@ -31,7 +31,7 @@ var objA = new A();
 // boolean type var
 var ResultIsBoolean1 = delete BOOLEAN;
 >ResultIsBoolean1 : Symbol(ResultIsBoolean1, Decl(deleteOperatorWithBooleanType.ts, 16, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(deleteOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(deleteOperatorWithBooleanType.ts, 1, 11))
 
 // boolean type literal
 var ResultIsBoolean2 = delete true;
@@ -57,7 +57,7 @@ var ResultIsBoolean5 = delete M.n;
 
 var ResultIsBoolean6 = delete foo();
 >ResultIsBoolean6 : Symbol(ResultIsBoolean6, Decl(deleteOperatorWithBooleanType.ts, 25, 3))
->foo : Symbol(foo, Decl(deleteOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(deleteOperatorWithBooleanType.ts, 1, 29))
 
 var ResultIsBoolean7 = delete A.foo();
 >ResultIsBoolean7 : Symbol(ResultIsBoolean7, Decl(deleteOperatorWithBooleanType.ts, 26, 3))
@@ -68,15 +68,15 @@ var ResultIsBoolean7 = delete A.foo();
 // multiple delete  operator
 var ResultIsBoolean8 = delete delete BOOLEAN;
 >ResultIsBoolean8 : Symbol(ResultIsBoolean8, Decl(deleteOperatorWithBooleanType.ts, 29, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(deleteOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(deleteOperatorWithBooleanType.ts, 1, 11))
 
 // miss assignment operators
 delete true;
 delete BOOLEAN;
->BOOLEAN : Symbol(BOOLEAN, Decl(deleteOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(deleteOperatorWithBooleanType.ts, 1, 11))
 
 delete foo();
->foo : Symbol(foo, Decl(deleteOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(deleteOperatorWithBooleanType.ts, 1, 29))
 
 delete true, false;
 delete objA.a;
diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.types b/tests/baselines/reference/deleteOperatorWithBooleanType.types
index 76a02dd23bf0b..e3a5fb5e544c2 100644
--- a/tests/baselines/reference/deleteOperatorWithBooleanType.types
+++ b/tests/baselines/reference/deleteOperatorWithBooleanType.types
@@ -2,7 +2,7 @@
 
 === deleteOperatorWithBooleanType.ts ===
 // delete  operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 >BOOLEAN : boolean
 >        : ^^^^^^^
 
diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.errors.txt b/tests/baselines/reference/deleteOperatorWithNumberType.errors.txt
index 204d920a189fd..86d0813cfc9dc 100644
--- a/tests/baselines/reference/deleteOperatorWithNumberType.errors.txt
+++ b/tests/baselines/reference/deleteOperatorWithNumberType.errors.txt
@@ -19,7 +19,7 @@ deleteOperatorWithNumberType.ts(42,8): error TS2703: The operand of a 'delete' o
 
 ==== deleteOperatorWithNumberType.ts (17 errors) ====
     // delete  operator on number type
-    var NUMBER: number;
+    declare var NUMBER: number;
     var NUMBER1: number[] = [1, 2];
     
     function foo(): number { return 1; }
diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.js b/tests/baselines/reference/deleteOperatorWithNumberType.js
index 7968bf2208e89..e86c940f50d1c 100644
--- a/tests/baselines/reference/deleteOperatorWithNumberType.js
+++ b/tests/baselines/reference/deleteOperatorWithNumberType.js
@@ -2,7 +2,7 @@
 
 //// [deleteOperatorWithNumberType.ts]
 // delete  operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
 
 function foo(): number { return 1; }
@@ -48,8 +48,6 @@ delete M.n;
 delete objA.a, M.n;
 
 //// [deleteOperatorWithNumberType.js]
-// delete  operator on number type
-var NUMBER;
 var NUMBER1 = [1, 2];
 function foo() { return 1; }
 var A = /** @class */ (function () {
diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.symbols b/tests/baselines/reference/deleteOperatorWithNumberType.symbols
index 9445b513fd68a..92d0109390253 100644
--- a/tests/baselines/reference/deleteOperatorWithNumberType.symbols
+++ b/tests/baselines/reference/deleteOperatorWithNumberType.symbols
@@ -2,8 +2,8 @@
 
 === deleteOperatorWithNumberType.ts ===
 // delete  operator on number type
-var NUMBER: number;
->NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 3))
+declare var NUMBER: number;
+>NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 11))
 
 var NUMBER1: number[] = [1, 2];
 >NUMBER1 : Symbol(NUMBER1, Decl(deleteOperatorWithNumberType.ts, 2, 3))
@@ -34,7 +34,7 @@ var objA = new A();
 // number type var
 var ResultIsBoolean1 = delete NUMBER;
 >ResultIsBoolean1 : Symbol(ResultIsBoolean1, Decl(deleteOperatorWithNumberType.ts, 17, 3))
->NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 11))
 
 var ResultIsBoolean2 = delete NUMBER1;
 >ResultIsBoolean2 : Symbol(ResultIsBoolean2, Decl(deleteOperatorWithNumberType.ts, 18, 3))
@@ -85,23 +85,23 @@ var ResultIsBoolean10 = delete A.foo();
 
 var ResultIsBoolean11 = delete (NUMBER + NUMBER);
 >ResultIsBoolean11 : Symbol(ResultIsBoolean11, Decl(deleteOperatorWithNumberType.ts, 31, 3))
->NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 3))
->NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 11))
+>NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 11))
 
 // multiple delete  operator
 var ResultIsBoolean12 = delete delete NUMBER;
 >ResultIsBoolean12 : Symbol(ResultIsBoolean12, Decl(deleteOperatorWithNumberType.ts, 34, 3))
->NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 11))
 
 var ResultIsBoolean13 = delete delete delete (NUMBER + NUMBER);
 >ResultIsBoolean13 : Symbol(ResultIsBoolean13, Decl(deleteOperatorWithNumberType.ts, 35, 3))
->NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 3))
->NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 11))
+>NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 11))
 
 // miss assignment operators
 delete 1;
 delete NUMBER;
->NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(deleteOperatorWithNumberType.ts, 1, 11))
 
 delete NUMBER1;
 >NUMBER1 : Symbol(NUMBER1, Decl(deleteOperatorWithNumberType.ts, 2, 3))
diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.types b/tests/baselines/reference/deleteOperatorWithNumberType.types
index 4832c43be4713..a0ff1e842aec4 100644
--- a/tests/baselines/reference/deleteOperatorWithNumberType.types
+++ b/tests/baselines/reference/deleteOperatorWithNumberType.types
@@ -2,7 +2,7 @@
 
 === deleteOperatorWithNumberType.ts ===
 // delete  operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 >NUMBER : number
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/deleteOperatorWithStringType.errors.txt b/tests/baselines/reference/deleteOperatorWithStringType.errors.txt
index 02a6dee07181e..346ea15e1e077 100644
--- a/tests/baselines/reference/deleteOperatorWithStringType.errors.txt
+++ b/tests/baselines/reference/deleteOperatorWithStringType.errors.txt
@@ -20,7 +20,7 @@ deleteOperatorWithStringType.ts(43,8): error TS2703: The operand of a 'delete' o
 
 ==== deleteOperatorWithStringType.ts (18 errors) ====
     // delete  operator on string type
-    var STRING: string;
+    declare var STRING: string;
     var STRING1: string[] = ["", "abc"];
     
     function foo(): string { return "abc"; }
diff --git a/tests/baselines/reference/deleteOperatorWithStringType.js b/tests/baselines/reference/deleteOperatorWithStringType.js
index b77be424eb784..60e7ecd779ac9 100644
--- a/tests/baselines/reference/deleteOperatorWithStringType.js
+++ b/tests/baselines/reference/deleteOperatorWithStringType.js
@@ -2,7 +2,7 @@
 
 //// [deleteOperatorWithStringType.ts]
 // delete  operator on string type
-var STRING: string;
+declare var STRING: string;
 var STRING1: string[] = ["", "abc"];
 
 function foo(): string { return "abc"; }
@@ -47,8 +47,6 @@ delete foo();
 delete objA.a,M.n;
 
 //// [deleteOperatorWithStringType.js]
-// delete  operator on string type
-var STRING;
 var STRING1 = ["", "abc"];
 function foo() { return "abc"; }
 var A = /** @class */ (function () {
diff --git a/tests/baselines/reference/deleteOperatorWithStringType.symbols b/tests/baselines/reference/deleteOperatorWithStringType.symbols
index 5740ae6f151e6..f6a631c298ecc 100644
--- a/tests/baselines/reference/deleteOperatorWithStringType.symbols
+++ b/tests/baselines/reference/deleteOperatorWithStringType.symbols
@@ -2,8 +2,8 @@
 
 === deleteOperatorWithStringType.ts ===
 // delete  operator on string type
-var STRING: string;
->STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 3))
+declare var STRING: string;
+>STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 11))
 
 var STRING1: string[] = ["", "abc"];
 >STRING1 : Symbol(STRING1, Decl(deleteOperatorWithStringType.ts, 2, 3))
@@ -34,7 +34,7 @@ var objA = new A();
 // string type var
 var ResultIsBoolean1 = delete STRING;
 >ResultIsBoolean1 : Symbol(ResultIsBoolean1, Decl(deleteOperatorWithStringType.ts, 17, 3))
->STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 11))
 
 var ResultIsBoolean2 = delete STRING1;
 >ResultIsBoolean2 : Symbol(ResultIsBoolean2, Decl(deleteOperatorWithStringType.ts, 18, 3))
@@ -85,29 +85,29 @@ var ResultIsBoolean10 = delete A.foo();
 
 var ResultIsBoolean11 = delete (STRING + STRING);
 >ResultIsBoolean11 : Symbol(ResultIsBoolean11, Decl(deleteOperatorWithStringType.ts, 31, 3))
->STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 3))
->STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 11))
+>STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 11))
 
 var ResultIsBoolean12 = delete STRING.charAt(0);
 >ResultIsBoolean12 : Symbol(ResultIsBoolean12, Decl(deleteOperatorWithStringType.ts, 32, 3))
 >STRING.charAt : Symbol(String.charAt, Decl(lib.es5.d.ts, --, --))
->STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 11))
 >charAt : Symbol(String.charAt, Decl(lib.es5.d.ts, --, --))
 
 // multiple delete  operator
 var ResultIsBoolean13 = delete delete STRING;
 >ResultIsBoolean13 : Symbol(ResultIsBoolean13, Decl(deleteOperatorWithStringType.ts, 35, 3))
->STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 11))
 
 var ResultIsBoolean14 = delete delete delete (STRING + STRING);
 >ResultIsBoolean14 : Symbol(ResultIsBoolean14, Decl(deleteOperatorWithStringType.ts, 36, 3))
->STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 3))
->STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 11))
+>STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 11))
 
 // miss assignment operators
 delete "";
 delete STRING;
->STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(deleteOperatorWithStringType.ts, 1, 11))
 
 delete STRING1;
 >STRING1 : Symbol(STRING1, Decl(deleteOperatorWithStringType.ts, 2, 3))
diff --git a/tests/baselines/reference/deleteOperatorWithStringType.types b/tests/baselines/reference/deleteOperatorWithStringType.types
index b8eae1af69595..1eb97b3b1296b 100644
--- a/tests/baselines/reference/deleteOperatorWithStringType.types
+++ b/tests/baselines/reference/deleteOperatorWithStringType.types
@@ -2,7 +2,7 @@
 
 === deleteOperatorWithStringType.ts ===
 // delete  operator on string type
-var STRING: string;
+declare var STRING: string;
 >STRING : string
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/deprecatedCompilerOptions1.errors.txt b/tests/baselines/reference/deprecatedCompilerOptions1.errors.txt
index effa688c713b0..c06c55655f590 100644
--- a/tests/baselines/reference/deprecatedCompilerOptions1.errors.txt
+++ b/tests/baselines/reference/deprecatedCompilerOptions1.errors.txt
@@ -6,7 +6,6 @@
 /foo/tsconfig.json(8,9): error TS5101: Option 'noStrictGenericChecks' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
 /foo/tsconfig.json(9,9): error TS5101: Option 'charset' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
 /foo/tsconfig.json(10,9): error TS5101: Option 'out' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
-  Use 'outFile' instead.
 
 
 ==== /foo/tsconfig.json (8 errors) ====
@@ -36,7 +35,6 @@
             "out": "dist.js"
             ~~~~~
 !!! error TS5101: Option 'out' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
-!!! error TS5101:   Use 'outFile' instead.
         }
     }
     
diff --git a/tests/baselines/reference/deprecatedCompilerOptions3.errors.txt b/tests/baselines/reference/deprecatedCompilerOptions3.errors.txt
index c484184a8cba4..c00d752f39546 100644
--- a/tests/baselines/reference/deprecatedCompilerOptions3.errors.txt
+++ b/tests/baselines/reference/deprecatedCompilerOptions3.errors.txt
@@ -6,7 +6,6 @@
 /foo/tsconfig.json(8,9): error TS5102: Option 'noStrictGenericChecks' has been removed. Please remove it from your configuration.
 /foo/tsconfig.json(9,9): error TS5102: Option 'charset' has been removed. Please remove it from your configuration.
 /foo/tsconfig.json(10,9): error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 
 
 ==== /foo/tsconfig.json (8 errors) ====
@@ -36,7 +35,6 @@
             "out": "dist.js",
             ~~~~~
 !!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
         }
     }
     
diff --git a/tests/baselines/reference/deprecatedCompilerOptions4.errors.txt b/tests/baselines/reference/deprecatedCompilerOptions4.errors.txt
index 01d4b95238ce6..c24bb8607fe16 100644
--- a/tests/baselines/reference/deprecatedCompilerOptions4.errors.txt
+++ b/tests/baselines/reference/deprecatedCompilerOptions4.errors.txt
@@ -6,7 +6,6 @@
 /foo/tsconfig.json(8,9): error TS5102: Option 'noStrictGenericChecks' has been removed. Please remove it from your configuration.
 /foo/tsconfig.json(9,9): error TS5102: Option 'charset' has been removed. Please remove it from your configuration.
 /foo/tsconfig.json(10,9): error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 
 
 ==== /foo/tsconfig.json (8 errors) ====
@@ -36,7 +35,6 @@
             "out": "dist.js",
             ~~~~~
 !!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
             "ignoreDeprecations": "5.0"
         }
     }
diff --git a/tests/baselines/reference/deprecatedCompilerOptions5.errors.txt b/tests/baselines/reference/deprecatedCompilerOptions5.errors.txt
index 01d4b95238ce6..c24bb8607fe16 100644
--- a/tests/baselines/reference/deprecatedCompilerOptions5.errors.txt
+++ b/tests/baselines/reference/deprecatedCompilerOptions5.errors.txt
@@ -6,7 +6,6 @@
 /foo/tsconfig.json(8,9): error TS5102: Option 'noStrictGenericChecks' has been removed. Please remove it from your configuration.
 /foo/tsconfig.json(9,9): error TS5102: Option 'charset' has been removed. Please remove it from your configuration.
 /foo/tsconfig.json(10,9): error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 
 
 ==== /foo/tsconfig.json (8 errors) ====
@@ -36,7 +35,6 @@
             "out": "dist.js",
             ~~~~~
 !!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
             "ignoreDeprecations": "5.0"
         }
     }
diff --git a/tests/baselines/reference/deprecatedCompilerOptions6.errors.txt b/tests/baselines/reference/deprecatedCompilerOptions6.errors.txt
index 401c87dd813f0..3d220d77acdf0 100644
--- a/tests/baselines/reference/deprecatedCompilerOptions6.errors.txt
+++ b/tests/baselines/reference/deprecatedCompilerOptions6.errors.txt
@@ -7,7 +7,6 @@
 /foo/tsconfig.json(9,9): error TS5101: Option 'noStrictGenericChecks' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
 /foo/tsconfig.json(10,9): error TS5101: Option 'charset' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
 /foo/tsconfig.json(11,9): error TS5101: Option 'out' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
-  Use 'outFile' instead.
 /foo/tsconfig.json(12,31): error TS5103: Invalid value for '--ignoreDeprecations'.
 
 
@@ -41,7 +40,6 @@
             "out": "dist.js",
             ~~~~~
 !!! error TS5101: Option 'out' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
-!!! error TS5101:   Use 'outFile' instead.
             "ignoreDeprecations": "5.1"
                                   ~~~~~
 !!! error TS5103: Invalid value for '--ignoreDeprecations'.
diff --git a/tests/baselines/reference/derivedClassTransitivity.errors.txt b/tests/baselines/reference/derivedClassTransitivity.errors.txt
index 35884f41f5bf8..a486c4bcca21d 100644
--- a/tests/baselines/reference/derivedClassTransitivity.errors.txt
+++ b/tests/baselines/reference/derivedClassTransitivity.errors.txt
@@ -20,9 +20,9 @@ derivedClassTransitivity.ts(18,1): error TS2322: Type 'E' is not assignable to t
         foo(x?: string) { } // ok to add optional parameters
     }
     
-    var c: C;
-    var d: D;
-    var e: E;
+    declare var c: C;
+    declare var d: D;
+    declare var e: E;
     c = e;
     ~
 !!! error TS2322: Type 'E' is not assignable to type 'C'.
diff --git a/tests/baselines/reference/derivedClassTransitivity.js b/tests/baselines/reference/derivedClassTransitivity.js
index d2de43fd1912b..931afb99a96f3 100644
--- a/tests/baselines/reference/derivedClassTransitivity.js
+++ b/tests/baselines/reference/derivedClassTransitivity.js
@@ -15,9 +15,9 @@ class E extends D {
     foo(x?: string) { } // ok to add optional parameters
 }
 
-var c: C;
-var d: D;
-var e: E;
+declare var c: C;
+declare var d: D;
+declare var e: E;
 c = e;
 var r = c.foo(1);
 var r2 = e.foo('');
@@ -61,9 +61,6 @@ var E = /** @class */ (function (_super) {
     E.prototype.foo = function (x) { }; // ok to add optional parameters
     return E;
 }(D));
-var c;
-var d;
-var e;
 c = e;
 var r = c.foo(1);
 var r2 = e.foo('');
diff --git a/tests/baselines/reference/derivedClassTransitivity.symbols b/tests/baselines/reference/derivedClassTransitivity.symbols
index f1b9953ecfc57..d56bee96dcc2b 100644
--- a/tests/baselines/reference/derivedClassTransitivity.symbols
+++ b/tests/baselines/reference/derivedClassTransitivity.symbols
@@ -28,31 +28,31 @@ class E extends D {
 >x : Symbol(x, Decl(derivedClassTransitivity.ts, 11, 8))
 }
 
-var c: C;
->c : Symbol(c, Decl(derivedClassTransitivity.ts, 14, 3))
+declare var c: C;
+>c : Symbol(c, Decl(derivedClassTransitivity.ts, 14, 11))
 >C : Symbol(C, Decl(derivedClassTransitivity.ts, 0, 0))
 
-var d: D;
->d : Symbol(d, Decl(derivedClassTransitivity.ts, 15, 3))
+declare var d: D;
+>d : Symbol(d, Decl(derivedClassTransitivity.ts, 15, 11))
 >D : Symbol(D, Decl(derivedClassTransitivity.ts, 4, 1))
 
-var e: E;
->e : Symbol(e, Decl(derivedClassTransitivity.ts, 16, 3))
+declare var e: E;
+>e : Symbol(e, Decl(derivedClassTransitivity.ts, 16, 11))
 >E : Symbol(E, Decl(derivedClassTransitivity.ts, 8, 1))
 
 c = e;
->c : Symbol(c, Decl(derivedClassTransitivity.ts, 14, 3))
->e : Symbol(e, Decl(derivedClassTransitivity.ts, 16, 3))
+>c : Symbol(c, Decl(derivedClassTransitivity.ts, 14, 11))
+>e : Symbol(e, Decl(derivedClassTransitivity.ts, 16, 11))
 
 var r = c.foo(1);
 >r : Symbol(r, Decl(derivedClassTransitivity.ts, 18, 3))
 >c.foo : Symbol(C.foo, Decl(derivedClassTransitivity.ts, 2, 9))
->c : Symbol(c, Decl(derivedClassTransitivity.ts, 14, 3))
+>c : Symbol(c, Decl(derivedClassTransitivity.ts, 14, 11))
 >foo : Symbol(C.foo, Decl(derivedClassTransitivity.ts, 2, 9))
 
 var r2 = e.foo('');
 >r2 : Symbol(r2, Decl(derivedClassTransitivity.ts, 19, 3))
 >e.foo : Symbol(E.foo, Decl(derivedClassTransitivity.ts, 10, 19))
->e : Symbol(e, Decl(derivedClassTransitivity.ts, 16, 3))
+>e : Symbol(e, Decl(derivedClassTransitivity.ts, 16, 11))
 >foo : Symbol(E.foo, Decl(derivedClassTransitivity.ts, 10, 19))
 
diff --git a/tests/baselines/reference/derivedClassTransitivity.types b/tests/baselines/reference/derivedClassTransitivity.types
index b3547691f4681..92b7ad8cb7bc0 100644
--- a/tests/baselines/reference/derivedClassTransitivity.types
+++ b/tests/baselines/reference/derivedClassTransitivity.types
@@ -38,15 +38,15 @@ class E extends D {
 >  : ^^^^^^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
-var d: D;
+declare var d: D;
 >d : D
 >  : ^
 
-var e: E;
+declare var e: E;
 >e : E
 >  : ^
 
diff --git a/tests/baselines/reference/derivedClassTransitivity2.errors.txt b/tests/baselines/reference/derivedClassTransitivity2.errors.txt
index 00f73edd9a5c1..836c261ade739 100644
--- a/tests/baselines/reference/derivedClassTransitivity2.errors.txt
+++ b/tests/baselines/reference/derivedClassTransitivity2.errors.txt
@@ -20,9 +20,9 @@ derivedClassTransitivity2.ts(18,1): error TS2322: Type 'E' is not assignable to
         foo(x: number, y?: string) { } // ok to add optional parameters
     }
     
-    var c: C;
-    var d: D;
-    var e: E;
+    declare var c: C;
+    declare var d: D;
+    declare var e: E;
     c = e;
     ~
 !!! error TS2322: Type 'E' is not assignable to type 'C'.
diff --git a/tests/baselines/reference/derivedClassTransitivity2.js b/tests/baselines/reference/derivedClassTransitivity2.js
index 2ccba211a6748..558dd41264f36 100644
--- a/tests/baselines/reference/derivedClassTransitivity2.js
+++ b/tests/baselines/reference/derivedClassTransitivity2.js
@@ -15,9 +15,9 @@ class E extends D {
     foo(x: number, y?: string) { } // ok to add optional parameters
 }
 
-var c: C;
-var d: D;
-var e: E;
+declare var c: C;
+declare var d: D;
+declare var e: E;
 c = e;
 var r = c.foo(1, 1);
 var r2 = e.foo(1, '');
@@ -61,9 +61,6 @@ var E = /** @class */ (function (_super) {
     E.prototype.foo = function (x, y) { }; // ok to add optional parameters
     return E;
 }(D));
-var c;
-var d;
-var e;
 c = e;
 var r = c.foo(1, 1);
 var r2 = e.foo(1, '');
diff --git a/tests/baselines/reference/derivedClassTransitivity2.symbols b/tests/baselines/reference/derivedClassTransitivity2.symbols
index 4543595bae6dd..d4028ef2afd94 100644
--- a/tests/baselines/reference/derivedClassTransitivity2.symbols
+++ b/tests/baselines/reference/derivedClassTransitivity2.symbols
@@ -31,31 +31,31 @@ class E extends D {
 >y : Symbol(y, Decl(derivedClassTransitivity2.ts, 11, 18))
 }
 
-var c: C;
->c : Symbol(c, Decl(derivedClassTransitivity2.ts, 14, 3))
+declare var c: C;
+>c : Symbol(c, Decl(derivedClassTransitivity2.ts, 14, 11))
 >C : Symbol(C, Decl(derivedClassTransitivity2.ts, 0, 0))
 
-var d: D;
->d : Symbol(d, Decl(derivedClassTransitivity2.ts, 15, 3))
+declare var d: D;
+>d : Symbol(d, Decl(derivedClassTransitivity2.ts, 15, 11))
 >D : Symbol(D, Decl(derivedClassTransitivity2.ts, 4, 1))
 
-var e: E;
->e : Symbol(e, Decl(derivedClassTransitivity2.ts, 16, 3))
+declare var e: E;
+>e : Symbol(e, Decl(derivedClassTransitivity2.ts, 16, 11))
 >E : Symbol(E, Decl(derivedClassTransitivity2.ts, 8, 1))
 
 c = e;
->c : Symbol(c, Decl(derivedClassTransitivity2.ts, 14, 3))
->e : Symbol(e, Decl(derivedClassTransitivity2.ts, 16, 3))
+>c : Symbol(c, Decl(derivedClassTransitivity2.ts, 14, 11))
+>e : Symbol(e, Decl(derivedClassTransitivity2.ts, 16, 11))
 
 var r = c.foo(1, 1);
 >r : Symbol(r, Decl(derivedClassTransitivity2.ts, 18, 3))
 >c.foo : Symbol(C.foo, Decl(derivedClassTransitivity2.ts, 2, 9))
->c : Symbol(c, Decl(derivedClassTransitivity2.ts, 14, 3))
+>c : Symbol(c, Decl(derivedClassTransitivity2.ts, 14, 11))
 >foo : Symbol(C.foo, Decl(derivedClassTransitivity2.ts, 2, 9))
 
 var r2 = e.foo(1, '');
 >r2 : Symbol(r2, Decl(derivedClassTransitivity2.ts, 19, 3))
 >e.foo : Symbol(E.foo, Decl(derivedClassTransitivity2.ts, 10, 19))
->e : Symbol(e, Decl(derivedClassTransitivity2.ts, 16, 3))
+>e : Symbol(e, Decl(derivedClassTransitivity2.ts, 16, 11))
 >foo : Symbol(E.foo, Decl(derivedClassTransitivity2.ts, 10, 19))
 
diff --git a/tests/baselines/reference/derivedClassTransitivity2.types b/tests/baselines/reference/derivedClassTransitivity2.types
index 7dfd5821fd070..5776ac416941f 100644
--- a/tests/baselines/reference/derivedClassTransitivity2.types
+++ b/tests/baselines/reference/derivedClassTransitivity2.types
@@ -44,15 +44,15 @@ class E extends D {
 >  : ^^^^^^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
-var d: D;
+declare var d: D;
 >d : D
 >  : ^
 
-var e: E;
+declare var e: E;
 >e : E
 >  : ^
 
diff --git a/tests/baselines/reference/derivedClassTransitivity3.errors.txt b/tests/baselines/reference/derivedClassTransitivity3.errors.txt
index e2b20403d2200..b4f48ad37d574 100644
--- a/tests/baselines/reference/derivedClassTransitivity3.errors.txt
+++ b/tests/baselines/reference/derivedClassTransitivity3.errors.txt
@@ -20,9 +20,9 @@ derivedClassTransitivity3.ts(18,1): error TS2322: Type 'E<string>' is not assign
         foo(x: T, y?: number) { } // ok to add optional parameters
     }
     
-    var c: C<string>;
-    var d: D<string>;
-    var e: E<string>;
+    declare var c: C<string>;
+    declare var d: D<string>;
+    declare var e: E<string>;
     c = e;
     ~
 !!! error TS2322: Type 'E<string>' is not assignable to type 'C<string>'.
diff --git a/tests/baselines/reference/derivedClassTransitivity3.js b/tests/baselines/reference/derivedClassTransitivity3.js
index cd6f21e786426..5c05cec05b87e 100644
--- a/tests/baselines/reference/derivedClassTransitivity3.js
+++ b/tests/baselines/reference/derivedClassTransitivity3.js
@@ -15,9 +15,9 @@ class E<T> extends D<T> {
     foo(x: T, y?: number) { } // ok to add optional parameters
 }
 
-var c: C<string>;
-var d: D<string>;
-var e: E<string>;
+declare var c: C<string>;
+declare var d: D<string>;
+declare var e: E<string>;
 c = e;
 var r = c.foo('', '');
 var r2 = e.foo('', 1);
@@ -61,9 +61,6 @@ var E = /** @class */ (function (_super) {
     E.prototype.foo = function (x, y) { }; // ok to add optional parameters
     return E;
 }(D));
-var c;
-var d;
-var e;
 c = e;
 var r = c.foo('', '');
 var r2 = e.foo('', 1);
diff --git a/tests/baselines/reference/derivedClassTransitivity3.symbols b/tests/baselines/reference/derivedClassTransitivity3.symbols
index 57d6682082498..35f1fee7a6a67 100644
--- a/tests/baselines/reference/derivedClassTransitivity3.symbols
+++ b/tests/baselines/reference/derivedClassTransitivity3.symbols
@@ -40,31 +40,31 @@ class E<T> extends D<T> {
 >y : Symbol(y, Decl(derivedClassTransitivity3.ts, 11, 13))
 }
 
-var c: C<string>;
->c : Symbol(c, Decl(derivedClassTransitivity3.ts, 14, 3))
+declare var c: C<string>;
+>c : Symbol(c, Decl(derivedClassTransitivity3.ts, 14, 11))
 >C : Symbol(C, Decl(derivedClassTransitivity3.ts, 0, 0))
 
-var d: D<string>;
->d : Symbol(d, Decl(derivedClassTransitivity3.ts, 15, 3))
+declare var d: D<string>;
+>d : Symbol(d, Decl(derivedClassTransitivity3.ts, 15, 11))
 >D : Symbol(D, Decl(derivedClassTransitivity3.ts, 4, 1))
 
-var e: E<string>;
->e : Symbol(e, Decl(derivedClassTransitivity3.ts, 16, 3))
+declare var e: E<string>;
+>e : Symbol(e, Decl(derivedClassTransitivity3.ts, 16, 11))
 >E : Symbol(E, Decl(derivedClassTransitivity3.ts, 8, 1))
 
 c = e;
->c : Symbol(c, Decl(derivedClassTransitivity3.ts, 14, 3))
->e : Symbol(e, Decl(derivedClassTransitivity3.ts, 16, 3))
+>c : Symbol(c, Decl(derivedClassTransitivity3.ts, 14, 11))
+>e : Symbol(e, Decl(derivedClassTransitivity3.ts, 16, 11))
 
 var r = c.foo('', '');
 >r : Symbol(r, Decl(derivedClassTransitivity3.ts, 18, 3))
 >c.foo : Symbol(C.foo, Decl(derivedClassTransitivity3.ts, 2, 12))
->c : Symbol(c, Decl(derivedClassTransitivity3.ts, 14, 3))
+>c : Symbol(c, Decl(derivedClassTransitivity3.ts, 14, 11))
 >foo : Symbol(C.foo, Decl(derivedClassTransitivity3.ts, 2, 12))
 
 var r2 = e.foo('', 1);
 >r2 : Symbol(r2, Decl(derivedClassTransitivity3.ts, 19, 3))
 >e.foo : Symbol(E.foo, Decl(derivedClassTransitivity3.ts, 10, 25))
->e : Symbol(e, Decl(derivedClassTransitivity3.ts, 16, 3))
+>e : Symbol(e, Decl(derivedClassTransitivity3.ts, 16, 11))
 >foo : Symbol(E.foo, Decl(derivedClassTransitivity3.ts, 10, 25))
 
diff --git a/tests/baselines/reference/derivedClassTransitivity3.types b/tests/baselines/reference/derivedClassTransitivity3.types
index 9ed86c2517ef2..036a73f03dd74 100644
--- a/tests/baselines/reference/derivedClassTransitivity3.types
+++ b/tests/baselines/reference/derivedClassTransitivity3.types
@@ -44,15 +44,15 @@ class E<T> extends D<T> {
 >  : ^^^^^^
 }
 
-var c: C<string>;
+declare var c: C<string>;
 >c : C<string>
 >  : ^^^^^^^^^
 
-var d: D<string>;
+declare var d: D<string>;
 >d : D<string>
 >  : ^^^^^^^^^
 
-var e: E<string>;
+declare var e: E<string>;
 >e : E<string>
 >  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/derivedClassTransitivity4.errors.txt b/tests/baselines/reference/derivedClassTransitivity4.errors.txt
index 639725f27605c..bfe3dbbfbc48a 100644
--- a/tests/baselines/reference/derivedClassTransitivity4.errors.txt
+++ b/tests/baselines/reference/derivedClassTransitivity4.errors.txt
@@ -21,9 +21,9 @@ derivedClassTransitivity4.ts(19,11): error TS2445: Property 'foo' is protected a
         public foo(x?: string) { } // ok to add optional parameters
     }
     
-    var c: C;
-    var d: D;
-    var e: E;
+    declare var c: C;
+    declare var d: D;
+    declare var e: E;
     c = e;
     ~
 !!! error TS2322: Type 'E' is not assignable to type 'C'.
diff --git a/tests/baselines/reference/derivedClassTransitivity4.js b/tests/baselines/reference/derivedClassTransitivity4.js
index d6df84bd5fc4f..80abfba7ef4ee 100644
--- a/tests/baselines/reference/derivedClassTransitivity4.js
+++ b/tests/baselines/reference/derivedClassTransitivity4.js
@@ -15,9 +15,9 @@ class E extends D {
     public foo(x?: string) { } // ok to add optional parameters
 }
 
-var c: C;
-var d: D;
-var e: E;
+declare var c: C;
+declare var d: D;
+declare var e: E;
 c = e;
 var r = c.foo(1);
 var r2 = e.foo('');
@@ -61,9 +61,6 @@ var E = /** @class */ (function (_super) {
     E.prototype.foo = function (x) { }; // ok to add optional parameters
     return E;
 }(D));
-var c;
-var d;
-var e;
 c = e;
 var r = c.foo(1);
 var r2 = e.foo('');
diff --git a/tests/baselines/reference/derivedClassTransitivity4.symbols b/tests/baselines/reference/derivedClassTransitivity4.symbols
index eec885d9bcbc3..b32fc1cc9e649 100644
--- a/tests/baselines/reference/derivedClassTransitivity4.symbols
+++ b/tests/baselines/reference/derivedClassTransitivity4.symbols
@@ -28,31 +28,31 @@ class E extends D {
 >x : Symbol(x, Decl(derivedClassTransitivity4.ts, 11, 15))
 }
 
-var c: C;
->c : Symbol(c, Decl(derivedClassTransitivity4.ts, 14, 3))
+declare var c: C;
+>c : Symbol(c, Decl(derivedClassTransitivity4.ts, 14, 11))
 >C : Symbol(C, Decl(derivedClassTransitivity4.ts, 0, 0))
 
-var d: D;
->d : Symbol(d, Decl(derivedClassTransitivity4.ts, 15, 3))
+declare var d: D;
+>d : Symbol(d, Decl(derivedClassTransitivity4.ts, 15, 11))
 >D : Symbol(D, Decl(derivedClassTransitivity4.ts, 4, 1))
 
-var e: E;
->e : Symbol(e, Decl(derivedClassTransitivity4.ts, 16, 3))
+declare var e: E;
+>e : Symbol(e, Decl(derivedClassTransitivity4.ts, 16, 11))
 >E : Symbol(E, Decl(derivedClassTransitivity4.ts, 8, 1))
 
 c = e;
->c : Symbol(c, Decl(derivedClassTransitivity4.ts, 14, 3))
->e : Symbol(e, Decl(derivedClassTransitivity4.ts, 16, 3))
+>c : Symbol(c, Decl(derivedClassTransitivity4.ts, 14, 11))
+>e : Symbol(e, Decl(derivedClassTransitivity4.ts, 16, 11))
 
 var r = c.foo(1);
 >r : Symbol(r, Decl(derivedClassTransitivity4.ts, 18, 3))
 >c.foo : Symbol(C.foo, Decl(derivedClassTransitivity4.ts, 2, 9))
->c : Symbol(c, Decl(derivedClassTransitivity4.ts, 14, 3))
+>c : Symbol(c, Decl(derivedClassTransitivity4.ts, 14, 11))
 >foo : Symbol(C.foo, Decl(derivedClassTransitivity4.ts, 2, 9))
 
 var r2 = e.foo('');
 >r2 : Symbol(r2, Decl(derivedClassTransitivity4.ts, 19, 3))
 >e.foo : Symbol(E.foo, Decl(derivedClassTransitivity4.ts, 10, 19))
->e : Symbol(e, Decl(derivedClassTransitivity4.ts, 16, 3))
+>e : Symbol(e, Decl(derivedClassTransitivity4.ts, 16, 11))
 >foo : Symbol(E.foo, Decl(derivedClassTransitivity4.ts, 10, 19))
 
diff --git a/tests/baselines/reference/derivedClassTransitivity4.types b/tests/baselines/reference/derivedClassTransitivity4.types
index e99a76ced92ff..988b3231bdc71 100644
--- a/tests/baselines/reference/derivedClassTransitivity4.types
+++ b/tests/baselines/reference/derivedClassTransitivity4.types
@@ -38,15 +38,15 @@ class E extends D {
 >  : ^^^^^^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
-var d: D;
+declare var d: D;
 >d : D
 >  : ^
 
-var e: E;
+declare var e: E;
 >e : E
 >  : ^
 
diff --git a/tests/baselines/reference/derivedClassWithAny.errors.txt b/tests/baselines/reference/derivedClassWithAny.errors.txt
index bc8c95c120571..e0774ecd4fad9 100644
--- a/tests/baselines/reference/derivedClassWithAny.errors.txt
+++ b/tests/baselines/reference/derivedClassWithAny.errors.txt
@@ -55,9 +55,9 @@ derivedClassWithAny.ts(57,1): error TS2322: Type 'E' is not assignable to type '
         }
     }
     
-    var c: C;
-    var d: D;
-    var e: E;
+    declare var c: C;
+    declare var d: D;
+    declare var e: E;
     
     c = d;
     c = e;
diff --git a/tests/baselines/reference/derivedClassWithAny.js b/tests/baselines/reference/derivedClassWithAny.js
index edb9651799b88..b612afaa5b293 100644
--- a/tests/baselines/reference/derivedClassWithAny.js
+++ b/tests/baselines/reference/derivedClassWithAny.js
@@ -52,9 +52,9 @@ class E extends D {
     }
 }
 
-var c: C;
-var d: D;
-var e: E;
+declare var c: C;
+declare var d: D;
+declare var e: E;
 
 c = d;
 c = e;
@@ -153,9 +153,6 @@ var E = /** @class */ (function (_super) {
     };
     return E;
 }(D));
-var c;
-var d;
-var e;
 c = d;
 c = e;
 var r = c.foo(); // e.foo would return string
diff --git a/tests/baselines/reference/derivedClassWithAny.symbols b/tests/baselines/reference/derivedClassWithAny.symbols
index c73c5d116e370..ed28c4822f890 100644
--- a/tests/baselines/reference/derivedClassWithAny.symbols
+++ b/tests/baselines/reference/derivedClassWithAny.symbols
@@ -96,29 +96,29 @@ class E extends D {
     }
 }
 
-var c: C;
->c : Symbol(c, Decl(derivedClassWithAny.ts, 51, 3))
+declare var c: C;
+>c : Symbol(c, Decl(derivedClassWithAny.ts, 51, 11))
 >C : Symbol(C, Decl(derivedClassWithAny.ts, 0, 0))
 
-var d: D;
->d : Symbol(d, Decl(derivedClassWithAny.ts, 52, 3))
+declare var d: D;
+>d : Symbol(d, Decl(derivedClassWithAny.ts, 52, 11))
 >D : Symbol(D, Decl(derivedClassWithAny.ts, 14, 1))
 
-var e: E;
->e : Symbol(e, Decl(derivedClassWithAny.ts, 53, 3))
+declare var e: E;
+>e : Symbol(e, Decl(derivedClassWithAny.ts, 53, 11))
 >E : Symbol(E, Decl(derivedClassWithAny.ts, 32, 1))
 
 c = d;
->c : Symbol(c, Decl(derivedClassWithAny.ts, 51, 3))
->d : Symbol(d, Decl(derivedClassWithAny.ts, 52, 3))
+>c : Symbol(c, Decl(derivedClassWithAny.ts, 51, 11))
+>d : Symbol(d, Decl(derivedClassWithAny.ts, 52, 11))
 
 c = e;
->c : Symbol(c, Decl(derivedClassWithAny.ts, 51, 3))
->e : Symbol(e, Decl(derivedClassWithAny.ts, 53, 3))
+>c : Symbol(c, Decl(derivedClassWithAny.ts, 51, 11))
+>e : Symbol(e, Decl(derivedClassWithAny.ts, 53, 11))
 
 var r = c.foo(); // e.foo would return string
 >r : Symbol(r, Decl(derivedClassWithAny.ts, 57, 3))
 >c.foo : Symbol(C.foo, Decl(derivedClassWithAny.ts, 2, 33))
->c : Symbol(c, Decl(derivedClassWithAny.ts, 51, 3))
+>c : Symbol(c, Decl(derivedClassWithAny.ts, 51, 11))
 >foo : Symbol(C.foo, Decl(derivedClassWithAny.ts, 2, 33))
 
diff --git a/tests/baselines/reference/derivedClassWithAny.types b/tests/baselines/reference/derivedClassWithAny.types
index ce6bd848ddc9a..5b97e6e57f132 100644
--- a/tests/baselines/reference/derivedClassWithAny.types
+++ b/tests/baselines/reference/derivedClassWithAny.types
@@ -137,15 +137,15 @@ class E extends D {
     }
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
-var d: D;
+declare var d: D;
 >d : D
 >  : ^
 
-var e: E;
+declare var e: E;
 >e : E
 >  : ^
 
diff --git a/tests/baselines/reference/derivedGenericClassWithAny.errors.txt b/tests/baselines/reference/derivedGenericClassWithAny.errors.txt
index b5135febd83aa..f07d68c717030 100644
--- a/tests/baselines/reference/derivedGenericClassWithAny.errors.txt
+++ b/tests/baselines/reference/derivedGenericClassWithAny.errors.txt
@@ -49,9 +49,9 @@ derivedGenericClassWithAny.ts(41,1): error TS2322: Type 'E<string>' is not assig
         }
     }
     
-    var c: C<number>;
-    var d: D;
-    var e: E<string>;
+    declare var c: C<number>;
+    declare var d: D;
+    declare var e: E<string>;
     
     c = d;
     c = e;
diff --git a/tests/baselines/reference/derivedGenericClassWithAny.js b/tests/baselines/reference/derivedGenericClassWithAny.js
index 464ff4514e822..948b2df6f1bb1 100644
--- a/tests/baselines/reference/derivedGenericClassWithAny.js
+++ b/tests/baselines/reference/derivedGenericClassWithAny.js
@@ -36,9 +36,9 @@ class E<T extends string> extends D {
     }
 }
 
-var c: C<number>;
-var d: D;
-var e: E<string>;
+declare var c: C<number>;
+declare var d: D;
+declare var e: E<string>;
 
 c = d;
 c = e;
@@ -117,9 +117,6 @@ var E = /** @class */ (function (_super) {
     };
     return E;
 }(D));
-var c;
-var d;
-var e;
 c = d;
 c = e;
 var r = c.foo(); // e.foo would return string
diff --git a/tests/baselines/reference/derivedGenericClassWithAny.symbols b/tests/baselines/reference/derivedGenericClassWithAny.symbols
index 2cc972e792b0f..7c1dcf8a572c9 100644
--- a/tests/baselines/reference/derivedGenericClassWithAny.symbols
+++ b/tests/baselines/reference/derivedGenericClassWithAny.symbols
@@ -76,29 +76,29 @@ class E<T extends string> extends D {
     }
 }
 
-var c: C<number>;
->c : Symbol(c, Decl(derivedGenericClassWithAny.ts, 35, 3))
+declare var c: C<number>;
+>c : Symbol(c, Decl(derivedGenericClassWithAny.ts, 35, 11))
 >C : Symbol(C, Decl(derivedGenericClassWithAny.ts, 0, 0))
 
-var d: D;
->d : Symbol(d, Decl(derivedGenericClassWithAny.ts, 36, 3))
+declare var d: D;
+>d : Symbol(d, Decl(derivedGenericClassWithAny.ts, 36, 11))
 >D : Symbol(D, Decl(derivedGenericClassWithAny.ts, 6, 1))
 
-var e: E<string>;
->e : Symbol(e, Decl(derivedGenericClassWithAny.ts, 37, 3))
+declare var e: E<string>;
+>e : Symbol(e, Decl(derivedGenericClassWithAny.ts, 37, 11))
 >E : Symbol(E, Decl(derivedGenericClassWithAny.ts, 24, 1))
 
 c = d;
->c : Symbol(c, Decl(derivedGenericClassWithAny.ts, 35, 3))
->d : Symbol(d, Decl(derivedGenericClassWithAny.ts, 36, 3))
+>c : Symbol(c, Decl(derivedGenericClassWithAny.ts, 35, 11))
+>d : Symbol(d, Decl(derivedGenericClassWithAny.ts, 36, 11))
 
 c = e;
->c : Symbol(c, Decl(derivedGenericClassWithAny.ts, 35, 3))
->e : Symbol(e, Decl(derivedGenericClassWithAny.ts, 37, 3))
+>c : Symbol(c, Decl(derivedGenericClassWithAny.ts, 35, 11))
+>e : Symbol(e, Decl(derivedGenericClassWithAny.ts, 37, 11))
 
 var r = c.foo(); // e.foo would return string
 >r : Symbol(r, Decl(derivedGenericClassWithAny.ts, 41, 3))
 >c.foo : Symbol(C.foo, Decl(derivedGenericClassWithAny.ts, 2, 31))
->c : Symbol(c, Decl(derivedGenericClassWithAny.ts, 35, 3))
+>c : Symbol(c, Decl(derivedGenericClassWithAny.ts, 35, 11))
 >foo : Symbol(C.foo, Decl(derivedGenericClassWithAny.ts, 2, 31))
 
diff --git a/tests/baselines/reference/derivedGenericClassWithAny.types b/tests/baselines/reference/derivedGenericClassWithAny.types
index 29f75b4c41e75..df993d744abfd 100644
--- a/tests/baselines/reference/derivedGenericClassWithAny.types
+++ b/tests/baselines/reference/derivedGenericClassWithAny.types
@@ -91,15 +91,15 @@ class E<T extends string> extends D {
     }
 }
 
-var c: C<number>;
+declare var c: C<number>;
 >c : C<number>
 >  : ^^^^^^^^^
 
-var d: D;
+declare var d: D;
 >d : D
 >  : ^
 
-var e: E<string>;
+declare var e: E<string>;
 >e : E<string>
 >  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/derivedInterfaceCallSignature.errors.txt b/tests/baselines/reference/derivedInterfaceCallSignature.errors.txt
index 05c6f9f86916f..087ff25721a71 100644
--- a/tests/baselines/reference/derivedInterfaceCallSignature.errors.txt
+++ b/tests/baselines/reference/derivedInterfaceCallSignature.errors.txt
@@ -35,5 +35,5 @@ derivedInterfaceCallSignature.ts(11,11): error TS2430: Interface 'D3SvgArea' inc
         defined(defined: (data: any, index?: number) => boolean): D3SvgArea;
     }
     
-    var area: D3SvgArea;
+    declare var area: D3SvgArea;
     area.interpolate('two')('one');
\ No newline at end of file
diff --git a/tests/baselines/reference/derivedInterfaceCallSignature.js b/tests/baselines/reference/derivedInterfaceCallSignature.js
index b02ce0ec13d05..fde7a98286c6d 100644
--- a/tests/baselines/reference/derivedInterfaceCallSignature.js
+++ b/tests/baselines/reference/derivedInterfaceCallSignature.js
@@ -26,9 +26,8 @@ interface D3SvgArea extends D3SvgPath {
     defined(defined: (data: any, index?: number) => boolean): D3SvgArea;
 }
 
-var area: D3SvgArea;
+declare var area: D3SvgArea;
 area.interpolate('two')('one');
 
 //// [derivedInterfaceCallSignature.js]
-var area;
 area.interpolate('two')('one');
diff --git a/tests/baselines/reference/derivedInterfaceCallSignature.symbols b/tests/baselines/reference/derivedInterfaceCallSignature.symbols
index 63023fd29291c..833a2ad5c74d9 100644
--- a/tests/baselines/reference/derivedInterfaceCallSignature.symbols
+++ b/tests/baselines/reference/derivedInterfaceCallSignature.symbols
@@ -100,12 +100,12 @@ interface D3SvgArea extends D3SvgPath {
 >D3SvgArea : Symbol(D3SvgArea, Decl(derivedInterfaceCallSignature.ts, 8, 1))
 }
 
-var area: D3SvgArea;
->area : Symbol(area, Decl(derivedInterfaceCallSignature.ts, 25, 3))
+declare var area: D3SvgArea;
+>area : Symbol(area, Decl(derivedInterfaceCallSignature.ts, 25, 11))
 >D3SvgArea : Symbol(D3SvgArea, Decl(derivedInterfaceCallSignature.ts, 8, 1))
 
 area.interpolate('two')('one');
 >area.interpolate : Symbol(D3SvgArea.interpolate, Decl(derivedInterfaceCallSignature.ts, 18, 60))
->area : Symbol(area, Decl(derivedInterfaceCallSignature.ts, 25, 3))
+>area : Symbol(area, Decl(derivedInterfaceCallSignature.ts, 25, 11))
 >interpolate : Symbol(D3SvgArea.interpolate, Decl(derivedInterfaceCallSignature.ts, 18, 60))
 
diff --git a/tests/baselines/reference/derivedInterfaceCallSignature.types b/tests/baselines/reference/derivedInterfaceCallSignature.types
index ab1cf1b00c331..740f36c9311aa 100644
--- a/tests/baselines/reference/derivedInterfaceCallSignature.types
+++ b/tests/baselines/reference/derivedInterfaceCallSignature.types
@@ -133,7 +133,7 @@ interface D3SvgArea extends D3SvgPath {
 >      : ^^^^^^
 }
 
-var area: D3SvgArea;
+declare var area: D3SvgArea;
 >area : D3SvgArea
 >     : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/duplicateLocalVariable1.errors.txt b/tests/baselines/reference/duplicateLocalVariable1.errors.txt
index 649778dea5e20..5d0ced61fb776 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.errors.txt
+++ b/tests/baselines/reference/duplicateLocalVariable1.errors.txt
@@ -35,7 +35,7 @@ duplicateLocalVariable1.ts(184,37): error TS2356: An arithmetic operand must be
                 try {
                     testResult = testcase.test();
                 }
-                catch (e) {
+                catch (e: any) {
                     exception = true;
                     testResult = false;
                     if (typeof testcase.errorMessageRegEx === "string") {
diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js
index c72d618466d63..9dc20b390aeb9 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.js
+++ b/tests/baselines/reference/duplicateLocalVariable1.js
@@ -32,7 +32,7 @@ export class TestRunner {
             try {
                 testResult = testcase.test();
             }
-            catch (e) {
+            catch (e: any) {
                 exception = true;
                 testResult = false;
                 if (typeof testcase.errorMessageRegEx === "string") {
diff --git a/tests/baselines/reference/duplicateLocalVariable1.symbols b/tests/baselines/reference/duplicateLocalVariable1.symbols
index 5d89389b1f8f2..974db0a732df0 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.symbols
+++ b/tests/baselines/reference/duplicateLocalVariable1.symbols
@@ -91,7 +91,7 @@ export class TestRunner {
 >testcase : Symbol(testcase, Decl(duplicateLocalVariable1.ts, 26, 15))
 >test : Symbol(TestCase.test, Decl(duplicateLocalVariable1.ts, 9, 37))
             }
-            catch (e) {
+            catch (e: any) {
 >e : Symbol(e, Decl(duplicateLocalVariable1.ts, 31, 19))
 
                 exception = true;
diff --git a/tests/baselines/reference/duplicateLocalVariable1.types b/tests/baselines/reference/duplicateLocalVariable1.types
index 30c540696609c..76e2c907796f8 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.types
+++ b/tests/baselines/reference/duplicateLocalVariable1.types
@@ -163,7 +163,7 @@ export class TestRunner {
 >test : () => boolean
 >     : ^^^^^^       
             }
-            catch (e) {
+            catch (e: any) {
 >e : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/dynamicNamesErrors.errors.txt b/tests/baselines/reference/dynamicNamesErrors.errors.txt
index 5ad3741bafbe2..10a607f836d6f 100644
--- a/tests/baselines/reference/dynamicNamesErrors.errors.txt
+++ b/tests/baselines/reference/dynamicNamesErrors.errors.txt
@@ -32,8 +32,8 @@ dynamicNamesErrors.ts(25,1): error TS2322: Type 'T1' is not assignable to type '
 !!! related TS6203 dynamicNamesErrors.ts:18:5: '[c1]' was also declared here.
     }
     
-    let t1: T1;
-    let t2: T2;
+    declare let t1: T1;
+    declare let t2: T2;
     t1 = t2;
     ~~
 !!! error TS2322: Type 'T2' is not assignable to type 'T1'.
diff --git a/tests/baselines/reference/dynamicNamesErrors.js b/tests/baselines/reference/dynamicNamesErrors.js
index 67cbfde3e8cd5..2a67b990b13f6 100644
--- a/tests/baselines/reference/dynamicNamesErrors.js
+++ b/tests/baselines/reference/dynamicNamesErrors.js
@@ -22,8 +22,8 @@ interface T3 {
     [c1]: string;
 }
 
-let t1: T1;
-let t2: T2;
+declare let t1: T1;
+declare let t2: T2;
 t1 = t2;
 t2 = t1;
 
@@ -67,8 +67,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectLiteralVisibility = exports.ClassMemberVisibility = void 0;
 const c0 = "1";
 const c1 = 1;
-let t1;
-let t2;
 t1 = t2;
 t2 = t1;
 const x = Symbol();
diff --git a/tests/baselines/reference/dynamicNamesErrors.symbols b/tests/baselines/reference/dynamicNamesErrors.symbols
index 06eb5614310cf..a690a6a1c06df 100644
--- a/tests/baselines/reference/dynamicNamesErrors.symbols
+++ b/tests/baselines/reference/dynamicNamesErrors.symbols
@@ -46,21 +46,21 @@ interface T3 {
 >c1 : Symbol(c1, Decl(dynamicNamesErrors.ts, 1, 5))
 }
 
-let t1: T1;
->t1 : Symbol(t1, Decl(dynamicNamesErrors.ts, 21, 3))
+declare let t1: T1;
+>t1 : Symbol(t1, Decl(dynamicNamesErrors.ts, 21, 11))
 >T1 : Symbol(T1, Decl(dynamicNamesErrors.ts, 6, 1))
 
-let t2: T2;
->t2 : Symbol(t2, Decl(dynamicNamesErrors.ts, 22, 3))
+declare let t2: T2;
+>t2 : Symbol(t2, Decl(dynamicNamesErrors.ts, 22, 11))
 >T2 : Symbol(T2, Decl(dynamicNamesErrors.ts, 10, 1))
 
 t1 = t2;
->t1 : Symbol(t1, Decl(dynamicNamesErrors.ts, 21, 3))
->t2 : Symbol(t2, Decl(dynamicNamesErrors.ts, 22, 3))
+>t1 : Symbol(t1, Decl(dynamicNamesErrors.ts, 21, 11))
+>t2 : Symbol(t2, Decl(dynamicNamesErrors.ts, 22, 11))
 
 t2 = t1;
->t2 : Symbol(t2, Decl(dynamicNamesErrors.ts, 22, 3))
->t1 : Symbol(t1, Decl(dynamicNamesErrors.ts, 21, 3))
+>t2 : Symbol(t2, Decl(dynamicNamesErrors.ts, 22, 11))
+>t1 : Symbol(t1, Decl(dynamicNamesErrors.ts, 21, 11))
 
 const x = Symbol();
 >x : Symbol(x, Decl(dynamicNamesErrors.ts, 26, 5))
diff --git a/tests/baselines/reference/dynamicNamesErrors.types b/tests/baselines/reference/dynamicNamesErrors.types
index 3c707d01e9f33..b0f01e6efd6cd 100644
--- a/tests/baselines/reference/dynamicNamesErrors.types
+++ b/tests/baselines/reference/dynamicNamesErrors.types
@@ -55,11 +55,11 @@ interface T3 {
 >   : ^
 }
 
-let t1: T1;
+declare let t1: T1;
 >t1 : T1
 >   : ^^
 
-let t2: T2;
+declare let t2: T2;
 >t2 : T2
 >   : ^^
 
diff --git a/tests/baselines/reference/dynamicRequire.errors.txt b/tests/baselines/reference/dynamicRequire.errors.txt
index 7fb9861b1c809..86b94e53fb8c0 100644
--- a/tests/baselines/reference/dynamicRequire.errors.txt
+++ b/tests/baselines/reference/dynamicRequire.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.js (0 errors) ====
     function foo(name) {
diff --git a/tests/baselines/reference/elaboratedErrors.errors.txt b/tests/baselines/reference/elaboratedErrors.errors.txt
index 509bfa220d63a..6e53897cc593d 100644
--- a/tests/baselines/reference/elaboratedErrors.errors.txt
+++ b/tests/baselines/reference/elaboratedErrors.errors.txt
@@ -25,8 +25,8 @@ elaboratedErrors.ts(25,1): error TS2741: Property 'y' is missing in type 'Alpha'
     
     interface Alpha { x: string; }
     interface Beta { y: number; }
-    var x: Alpha;
-    var y: Beta;
+    declare var x: Alpha;
+    declare var y: Beta;
     
     // Only one of these errors should be large
     x = y;
diff --git a/tests/baselines/reference/elaboratedErrors.js b/tests/baselines/reference/elaboratedErrors.js
index e3a5ae8f773f8..24d4ea2b743d5 100644
--- a/tests/baselines/reference/elaboratedErrors.js
+++ b/tests/baselines/reference/elaboratedErrors.js
@@ -16,8 +16,8 @@ class WorkerFS implements FileSystem {
 
 interface Alpha { x: string; }
 interface Beta { y: number; }
-var x: Alpha;
-var y: Beta;
+declare var x: Alpha;
+declare var y: Beta;
 
 // Only one of these errors should be large
 x = y;
@@ -36,8 +36,6 @@ var WorkerFS = /** @class */ (function () {
     }
     return WorkerFS;
 }());
-var x;
-var y;
 // Only one of these errors should be large
 x = y;
 x = y;
diff --git a/tests/baselines/reference/elaboratedErrors.symbols b/tests/baselines/reference/elaboratedErrors.symbols
index 7b1ca8dcd0f83..6c13542665e53 100644
--- a/tests/baselines/reference/elaboratedErrors.symbols
+++ b/tests/baselines/reference/elaboratedErrors.symbols
@@ -41,29 +41,29 @@ interface Beta { y: number; }
 >Beta : Symbol(Beta, Decl(elaboratedErrors.ts, 13, 30))
 >y : Symbol(Beta.y, Decl(elaboratedErrors.ts, 14, 16))
 
-var x: Alpha;
->x : Symbol(x, Decl(elaboratedErrors.ts, 15, 3))
+declare var x: Alpha;
+>x : Symbol(x, Decl(elaboratedErrors.ts, 15, 11))
 >Alpha : Symbol(Alpha, Decl(elaboratedErrors.ts, 11, 1))
 
-var y: Beta;
->y : Symbol(y, Decl(elaboratedErrors.ts, 16, 3))
+declare var y: Beta;
+>y : Symbol(y, Decl(elaboratedErrors.ts, 16, 11))
 >Beta : Symbol(Beta, Decl(elaboratedErrors.ts, 13, 30))
 
 // Only one of these errors should be large
 x = y;
->x : Symbol(x, Decl(elaboratedErrors.ts, 15, 3))
->y : Symbol(y, Decl(elaboratedErrors.ts, 16, 3))
+>x : Symbol(x, Decl(elaboratedErrors.ts, 15, 11))
+>y : Symbol(y, Decl(elaboratedErrors.ts, 16, 11))
 
 x = y;
->x : Symbol(x, Decl(elaboratedErrors.ts, 15, 3))
->y : Symbol(y, Decl(elaboratedErrors.ts, 16, 3))
+>x : Symbol(x, Decl(elaboratedErrors.ts, 15, 11))
+>y : Symbol(y, Decl(elaboratedErrors.ts, 16, 11))
 
 // Only one of these errors should be large
 y = x;
->y : Symbol(y, Decl(elaboratedErrors.ts, 16, 3))
->x : Symbol(x, Decl(elaboratedErrors.ts, 15, 3))
+>y : Symbol(y, Decl(elaboratedErrors.ts, 16, 11))
+>x : Symbol(x, Decl(elaboratedErrors.ts, 15, 11))
 
 y = x;
->y : Symbol(y, Decl(elaboratedErrors.ts, 16, 3))
->x : Symbol(x, Decl(elaboratedErrors.ts, 15, 3))
+>y : Symbol(y, Decl(elaboratedErrors.ts, 16, 11))
+>x : Symbol(x, Decl(elaboratedErrors.ts, 15, 11))
 
diff --git a/tests/baselines/reference/elaboratedErrors.types b/tests/baselines/reference/elaboratedErrors.types
index 93a4171af8484..1601e27be1c54 100644
--- a/tests/baselines/reference/elaboratedErrors.types
+++ b/tests/baselines/reference/elaboratedErrors.types
@@ -43,11 +43,11 @@ interface Beta { y: number; }
 >y : number
 >  : ^^^^^^
 
-var x: Alpha;
+declare var x: Alpha;
 >x : Alpha
 >  : ^^^^^
 
-var y: Beta;
+declare var y: Beta;
 >y : Beta
 >  : ^^^^
 
diff --git a/tests/baselines/reference/emitBundleWithPrologueDirectives1.errors.txt b/tests/baselines/reference/emitBundleWithPrologueDirectives1.errors.txt
index be3f26e9f4f17..2b0a50bc548e6 100644
--- a/tests/baselines/reference/emitBundleWithPrologueDirectives1.errors.txt
+++ b/tests/baselines/reference/emitBundleWithPrologueDirectives1.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (0 errors) ====
     /* Detached Comment */
diff --git a/tests/baselines/reference/emitBundleWithShebang1.errors.txt b/tests/baselines/reference/emitBundleWithShebang1.errors.txt
index 021ac05175bd5..01ca1d3ba8974 100644
--- a/tests/baselines/reference/emitBundleWithShebang1.errors.txt
+++ b/tests/baselines/reference/emitBundleWithShebang1.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== emitBundleWithShebang1.ts (0 errors) ====
     #!/usr/bin/env gjs
diff --git a/tests/baselines/reference/emitBundleWithShebang2.errors.txt b/tests/baselines/reference/emitBundleWithShebang2.errors.txt
index a03d46fc493a9..11b1812fa3224 100644
--- a/tests/baselines/reference/emitBundleWithShebang2.errors.txt
+++ b/tests/baselines/reference/emitBundleWithShebang2.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (0 errors) ====
     #!/usr/bin/env gjs
diff --git a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.errors.txt b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.errors.txt
index 1664ccbe0bf8a..1997915181d7c 100644
--- a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.errors.txt
+++ b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (0 errors) ====
     #!/usr/bin/env gjs
diff --git a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.errors.txt b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.errors.txt
index 5aa3055ef8c13..d78e0bd69f794 100644
--- a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.errors.txt
+++ b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (0 errors) ====
     #!/usr/bin/env gjs
diff --git a/tests/baselines/reference/enumAssignmentCompat3.errors.txt b/tests/baselines/reference/enumAssignmentCompat3.errors.txt
index c9207db308055..bf6af2af7603d 100644
--- a/tests/baselines/reference/enumAssignmentCompat3.errors.txt
+++ b/tests/baselines/reference/enumAssignmentCompat3.errors.txt
@@ -77,16 +77,16 @@ enumAssignmentCompat3.ts(87,1): error TS2322: Type 'First.E' is not assignable t
         }
     }
     
-    var abc: First.E;
-    var secondAbc: Abc.E;
-    var secondAbcd: Abcd.E;
-    var secondAb: Ab.E;
-    var secondCd: Cd.E;
-    var nope: Abc.Nope;
-    var k: Const.E;
-    var decl: Decl.E;
-    var merged: Merged.E;
-    var merged2: Merged2.E;
+    declare var abc: First.E;
+    declare var secondAbc: Abc.E;
+    declare var secondAbcd: Abcd.E;
+    declare var secondAb: Ab.E;
+    declare var secondCd: Cd.E;
+    declare var nope: Abc.Nope;
+    declare var k: Const.E;
+    declare var decl: Decl.E;
+    declare var merged: Merged.E;
+    declare var merged2: Merged2.E;
     abc = secondAbc; // ok
     abc = secondAbcd; // missing 'd'
     ~~~
diff --git a/tests/baselines/reference/enumAssignmentCompat3.js b/tests/baselines/reference/enumAssignmentCompat3.js
index 6cde4593a82c0..e8074dd7bdfb0 100644
--- a/tests/baselines/reference/enumAssignmentCompat3.js
+++ b/tests/baselines/reference/enumAssignmentCompat3.js
@@ -57,16 +57,16 @@ namespace Merged2 {
     }
 }
 
-var abc: First.E;
-var secondAbc: Abc.E;
-var secondAbcd: Abcd.E;
-var secondAb: Ab.E;
-var secondCd: Cd.E;
-var nope: Abc.Nope;
-var k: Const.E;
-var decl: Decl.E;
-var merged: Merged.E;
-var merged2: Merged2.E;
+declare var abc: First.E;
+declare var secondAbc: Abc.E;
+declare var secondAbcd: Abcd.E;
+declare var secondAb: Ab.E;
+declare var secondCd: Cd.E;
+declare var nope: Abc.Nope;
+declare var k: Const.E;
+declare var decl: Decl.E;
+declare var merged: Merged.E;
+declare var merged2: Merged2.E;
 abc = secondAbc; // ok
 abc = secondAbcd; // missing 'd'
 abc = secondAb; // ok
@@ -169,16 +169,6 @@ var Merged2;
         E.d = 5;
     })(E = Merged2.E || (Merged2.E = {}));
 })(Merged2 || (Merged2 = {}));
-var abc;
-var secondAbc;
-var secondAbcd;
-var secondAb;
-var secondCd;
-var nope;
-var k;
-var decl;
-var merged;
-var merged2;
 abc = secondAbc; // ok
 abc = secondAbcd; // missing 'd'
 abc = secondAb; // ok
diff --git a/tests/baselines/reference/enumAssignmentCompat3.symbols b/tests/baselines/reference/enumAssignmentCompat3.symbols
index 7b8ff5fc9e335..d0965fb5a44a5 100644
--- a/tests/baselines/reference/enumAssignmentCompat3.symbols
+++ b/tests/baselines/reference/enumAssignmentCompat3.symbols
@@ -130,131 +130,131 @@ namespace Merged2 {
     }
 }
 
-var abc: First.E;
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
+declare var abc: First.E;
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
 >First : Symbol(First, Decl(enumAssignmentCompat3.ts, 0, 0))
 >E : Symbol(First.E, Decl(enumAssignmentCompat3.ts, 0, 17))
 
-var secondAbc: Abc.E;
->secondAbc : Symbol(secondAbc, Decl(enumAssignmentCompat3.ts, 57, 3))
+declare var secondAbc: Abc.E;
+>secondAbc : Symbol(secondAbc, Decl(enumAssignmentCompat3.ts, 57, 11))
 >Abc : Symbol(Abc, Decl(enumAssignmentCompat3.ts, 4, 1))
 >E : Symbol(Abc.E, Decl(enumAssignmentCompat3.ts, 5, 15))
 
-var secondAbcd: Abcd.E;
->secondAbcd : Symbol(secondAbcd, Decl(enumAssignmentCompat3.ts, 58, 3))
+declare var secondAbcd: Abcd.E;
+>secondAbcd : Symbol(secondAbcd, Decl(enumAssignmentCompat3.ts, 58, 11))
 >Abcd : Symbol(Abcd, Decl(enumAssignmentCompat3.ts, 12, 1))
 >E : Symbol(Abcd.E, Decl(enumAssignmentCompat3.ts, 13, 16))
 
-var secondAb: Ab.E;
->secondAb : Symbol(secondAb, Decl(enumAssignmentCompat3.ts, 59, 3))
+declare var secondAb: Ab.E;
+>secondAb : Symbol(secondAb, Decl(enumAssignmentCompat3.ts, 59, 11))
 >Ab : Symbol(Ab, Decl(enumAssignmentCompat3.ts, 17, 1))
 >E : Symbol(Ab.E, Decl(enumAssignmentCompat3.ts, 18, 14))
 
-var secondCd: Cd.E;
->secondCd : Symbol(secondCd, Decl(enumAssignmentCompat3.ts, 60, 3))
+declare var secondCd: Cd.E;
+>secondCd : Symbol(secondCd, Decl(enumAssignmentCompat3.ts, 60, 11))
 >Cd : Symbol(Cd, Decl(enumAssignmentCompat3.ts, 22, 1))
 >E : Symbol(Cd.E, Decl(enumAssignmentCompat3.ts, 23, 14))
 
-var nope: Abc.Nope;
->nope : Symbol(nope, Decl(enumAssignmentCompat3.ts, 61, 3))
+declare var nope: Abc.Nope;
+>nope : Symbol(nope, Decl(enumAssignmentCompat3.ts, 61, 11))
 >Abc : Symbol(Abc, Decl(enumAssignmentCompat3.ts, 4, 1))
 >Nope : Symbol(Abc.Nope, Decl(enumAssignmentCompat3.ts, 8, 5))
 
-var k: Const.E;
->k : Symbol(k, Decl(enumAssignmentCompat3.ts, 62, 3))
+declare var k: Const.E;
+>k : Symbol(k, Decl(enumAssignmentCompat3.ts, 62, 11))
 >Const : Symbol(Const, Decl(enumAssignmentCompat3.ts, 27, 1))
 >E : Symbol(Const.E, Decl(enumAssignmentCompat3.ts, 28, 17))
 
-var decl: Decl.E;
->decl : Symbol(decl, Decl(enumAssignmentCompat3.ts, 63, 3))
+declare var decl: Decl.E;
+>decl : Symbol(decl, Decl(enumAssignmentCompat3.ts, 63, 11))
 >Decl : Symbol(Decl, Decl(enumAssignmentCompat3.ts, 32, 1))
 >E : Symbol(Decl.E, Decl(enumAssignmentCompat3.ts, 33, 16))
 
-var merged: Merged.E;
->merged : Symbol(merged, Decl(enumAssignmentCompat3.ts, 64, 3))
+declare var merged: Merged.E;
+>merged : Symbol(merged, Decl(enumAssignmentCompat3.ts, 64, 11))
 >Merged : Symbol(Merged, Decl(enumAssignmentCompat3.ts, 37, 1))
 >E : Symbol(Merged.E, Decl(enumAssignmentCompat3.ts, 38, 18), Decl(enumAssignmentCompat3.ts, 41, 5))
 
-var merged2: Merged2.E;
->merged2 : Symbol(merged2, Decl(enumAssignmentCompat3.ts, 65, 3))
+declare var merged2: Merged2.E;
+>merged2 : Symbol(merged2, Decl(enumAssignmentCompat3.ts, 65, 11))
 >Merged2 : Symbol(Merged2, Decl(enumAssignmentCompat3.ts, 45, 1))
 >E : Symbol(Merged2.E, Decl(enumAssignmentCompat3.ts, 47, 19), Decl(enumAssignmentCompat3.ts, 50, 5))
 
 abc = secondAbc; // ok
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
->secondAbc : Symbol(secondAbc, Decl(enumAssignmentCompat3.ts, 57, 3))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
+>secondAbc : Symbol(secondAbc, Decl(enumAssignmentCompat3.ts, 57, 11))
 
 abc = secondAbcd; // missing 'd'
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
->secondAbcd : Symbol(secondAbcd, Decl(enumAssignmentCompat3.ts, 58, 3))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
+>secondAbcd : Symbol(secondAbcd, Decl(enumAssignmentCompat3.ts, 58, 11))
 
 abc = secondAb; // ok
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
->secondAb : Symbol(secondAb, Decl(enumAssignmentCompat3.ts, 59, 3))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
+>secondAb : Symbol(secondAb, Decl(enumAssignmentCompat3.ts, 59, 11))
 
 abc = secondCd; // missing 'd'
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
->secondCd : Symbol(secondCd, Decl(enumAssignmentCompat3.ts, 60, 3))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
+>secondCd : Symbol(secondCd, Decl(enumAssignmentCompat3.ts, 60, 11))
 
 abc = nope; // nope!
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
->nope : Symbol(nope, Decl(enumAssignmentCompat3.ts, 61, 3))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
+>nope : Symbol(nope, Decl(enumAssignmentCompat3.ts, 61, 11))
 
 abc = decl; // bad - value of 'c' differs between these enums
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
->decl : Symbol(decl, Decl(enumAssignmentCompat3.ts, 63, 3))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
+>decl : Symbol(decl, Decl(enumAssignmentCompat3.ts, 63, 11))
 
 secondAbc = abc; // ok
->secondAbc : Symbol(secondAbc, Decl(enumAssignmentCompat3.ts, 57, 3))
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
+>secondAbc : Symbol(secondAbc, Decl(enumAssignmentCompat3.ts, 57, 11))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
 
 secondAbcd = abc; // ok
->secondAbcd : Symbol(secondAbcd, Decl(enumAssignmentCompat3.ts, 58, 3))
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
+>secondAbcd : Symbol(secondAbcd, Decl(enumAssignmentCompat3.ts, 58, 11))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
 
 secondAb = abc; // missing 'c'
->secondAb : Symbol(secondAb, Decl(enumAssignmentCompat3.ts, 59, 3))
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
+>secondAb : Symbol(secondAb, Decl(enumAssignmentCompat3.ts, 59, 11))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
 
 secondCd = abc; // missing 'a' and 'b'
->secondCd : Symbol(secondCd, Decl(enumAssignmentCompat3.ts, 60, 3))
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
+>secondCd : Symbol(secondCd, Decl(enumAssignmentCompat3.ts, 60, 11))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
 
 nope = abc; // nope!
->nope : Symbol(nope, Decl(enumAssignmentCompat3.ts, 61, 3))
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
+>nope : Symbol(nope, Decl(enumAssignmentCompat3.ts, 61, 11))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
 
 decl = abc; // bad - value of 'c' differs between these enums
->decl : Symbol(decl, Decl(enumAssignmentCompat3.ts, 63, 3))
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
+>decl : Symbol(decl, Decl(enumAssignmentCompat3.ts, 63, 11))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
 
 // const is only assignable to itself
 k = k;
->k : Symbol(k, Decl(enumAssignmentCompat3.ts, 62, 3))
->k : Symbol(k, Decl(enumAssignmentCompat3.ts, 62, 3))
+>k : Symbol(k, Decl(enumAssignmentCompat3.ts, 62, 11))
+>k : Symbol(k, Decl(enumAssignmentCompat3.ts, 62, 11))
 
 abc = k; // error
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
->k : Symbol(k, Decl(enumAssignmentCompat3.ts, 62, 3))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
+>k : Symbol(k, Decl(enumAssignmentCompat3.ts, 62, 11))
 
 k = abc;
->k : Symbol(k, Decl(enumAssignmentCompat3.ts, 62, 3))
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
+>k : Symbol(k, Decl(enumAssignmentCompat3.ts, 62, 11))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
 
 // merged enums compare all their members
 abc = merged; // missing 'd'
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
->merged : Symbol(merged, Decl(enumAssignmentCompat3.ts, 64, 3))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
+>merged : Symbol(merged, Decl(enumAssignmentCompat3.ts, 64, 11))
 
 merged = abc; // bad - value of 'c' differs between these enums
->merged : Symbol(merged, Decl(enumAssignmentCompat3.ts, 64, 3))
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
+>merged : Symbol(merged, Decl(enumAssignmentCompat3.ts, 64, 11))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
 
 abc = merged2; // ok
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
->merged2 : Symbol(merged2, Decl(enumAssignmentCompat3.ts, 65, 3))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
+>merged2 : Symbol(merged2, Decl(enumAssignmentCompat3.ts, 65, 11))
 
 merged2 = abc; // ok
->merged2 : Symbol(merged2, Decl(enumAssignmentCompat3.ts, 65, 3))
->abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 3))
+>merged2 : Symbol(merged2, Decl(enumAssignmentCompat3.ts, 65, 11))
+>abc : Symbol(abc, Decl(enumAssignmentCompat3.ts, 56, 11))
 
diff --git a/tests/baselines/reference/enumAssignmentCompat3.types b/tests/baselines/reference/enumAssignmentCompat3.types
index 0296cef8a7431..b875fc6db1f2f 100644
--- a/tests/baselines/reference/enumAssignmentCompat3.types
+++ b/tests/baselines/reference/enumAssignmentCompat3.types
@@ -185,61 +185,61 @@ namespace Merged2 {
     }
 }
 
-var abc: First.E;
+declare var abc: First.E;
 >abc : First.E
 >    : ^^^^^^^
 >First : any
 >      : ^^^
 
-var secondAbc: Abc.E;
+declare var secondAbc: Abc.E;
 >secondAbc : Abc.E
 >          : ^^^^^
 >Abc : any
 >    : ^^^
 
-var secondAbcd: Abcd.E;
+declare var secondAbcd: Abcd.E;
 >secondAbcd : Abcd.E
 >           : ^^^^^^
 >Abcd : any
 >     : ^^^
 
-var secondAb: Ab.E;
+declare var secondAb: Ab.E;
 >secondAb : Ab.E
 >         : ^^^^
 >Ab : any
 >   : ^^^
 
-var secondCd: Cd.E;
+declare var secondCd: Cd.E;
 >secondCd : Cd.E
 >         : ^^^^
 >Cd : any
 >   : ^^^
 
-var nope: Abc.Nope;
+declare var nope: Abc.Nope;
 >nope : Abc.Nope
 >     : ^^^^^^^^
 >Abc : any
 >    : ^^^
 
-var k: Const.E;
+declare var k: Const.E;
 >k : Const.E
 >  : ^^^^^^^
 >Const : any
 >      : ^^^
 
-var decl: Decl.E;
+declare var decl: Decl.E;
 >decl : Decl.E
 >     : ^^^^^^
 >Decl : any
 >     : ^^^
 
-var merged: Merged.E;
+declare var merged: Merged.E;
 >merged : Merged.E
 >       : ^^^^^^^^
 >Merged : any
 >       : ^^^
 
-var merged2: Merged2.E;
+declare var merged2: Merged2.E;
 >merged2 : Merged2.E
 >        : ^^^^^^^^^
 >Merged2 : any
diff --git a/tests/baselines/reference/enumAssignmentCompat5.errors.txt b/tests/baselines/reference/enumAssignmentCompat5.errors.txt
index 6fa0da1673af4..230f34889c378 100644
--- a/tests/baselines/reference/enumAssignmentCompat5.errors.txt
+++ b/tests/baselines/reference/enumAssignmentCompat5.errors.txt
@@ -12,7 +12,7 @@ enumAssignmentCompat5.ts(20,5): error TS2322: Type '1' is not assignable to type
         B = 1 << 2,
         C = 1 << 3,
     }
-    let n: number;
+    declare let n: number;
     let e: E = n; // ok because it's too inconvenient otherwise
     e = 0; // ok, in range
     e = 4; // ok, out of range, but allowed computed enums don't have all members
diff --git a/tests/baselines/reference/enumAssignmentCompat5.js b/tests/baselines/reference/enumAssignmentCompat5.js
index 110326ab5f025..9c136b8b8c053 100644
--- a/tests/baselines/reference/enumAssignmentCompat5.js
+++ b/tests/baselines/reference/enumAssignmentCompat5.js
@@ -9,7 +9,7 @@ enum Computed {
     B = 1 << 2,
     C = 1 << 3,
 }
-let n: number;
+declare let n: number;
 let e: E = n; // ok because it's too inconvenient otherwise
 e = 0; // ok, in range
 e = 4; // ok, out of range, but allowed computed enums don't have all members
@@ -39,7 +39,6 @@ var Computed;
     Computed[Computed["B"] = 4] = "B";
     Computed[Computed["C"] = 8] = "C";
 })(Computed || (Computed = {}));
-var n;
 var e = n; // ok because it's too inconvenient otherwise
 e = 0; // ok, in range
 e = 4; // ok, out of range, but allowed computed enums don't have all members
diff --git a/tests/baselines/reference/enumAssignmentCompat5.symbols b/tests/baselines/reference/enumAssignmentCompat5.symbols
index 80bc35f1b36c3..545f410ffb13a 100644
--- a/tests/baselines/reference/enumAssignmentCompat5.symbols
+++ b/tests/baselines/reference/enumAssignmentCompat5.symbols
@@ -21,13 +21,13 @@ enum Computed {
     C = 1 << 3,
 >C : Symbol(Computed.C, Decl(enumAssignmentCompat5.ts, 5, 15))
 }
-let n: number;
->n : Symbol(n, Decl(enumAssignmentCompat5.ts, 8, 3))
+declare let n: number;
+>n : Symbol(n, Decl(enumAssignmentCompat5.ts, 8, 11))
 
 let e: E = n; // ok because it's too inconvenient otherwise
 >e : Symbol(e, Decl(enumAssignmentCompat5.ts, 9, 3))
 >E : Symbol(E, Decl(enumAssignmentCompat5.ts, 0, 0))
->n : Symbol(n, Decl(enumAssignmentCompat5.ts, 8, 3))
+>n : Symbol(n, Decl(enumAssignmentCompat5.ts, 8, 11))
 
 e = 0; // ok, in range
 >e : Symbol(e, Decl(enumAssignmentCompat5.ts, 9, 3))
@@ -45,16 +45,16 @@ a = 2; // error, 2 !== 0
 
 a = n; // ok
 >a : Symbol(a, Decl(enumAssignmentCompat5.ts, 12, 3))
->n : Symbol(n, Decl(enumAssignmentCompat5.ts, 8, 3))
+>n : Symbol(n, Decl(enumAssignmentCompat5.ts, 8, 11))
 
 let c: Computed = n; // ok
 >c : Symbol(c, Decl(enumAssignmentCompat5.ts, 16, 3))
 >Computed : Symbol(Computed, Decl(enumAssignmentCompat5.ts, 2, 1))
->n : Symbol(n, Decl(enumAssignmentCompat5.ts, 8, 3))
+>n : Symbol(n, Decl(enumAssignmentCompat5.ts, 8, 11))
 
 c = n; // ok
 >c : Symbol(c, Decl(enumAssignmentCompat5.ts, 16, 3))
->n : Symbol(n, Decl(enumAssignmentCompat5.ts, 8, 3))
+>n : Symbol(n, Decl(enumAssignmentCompat5.ts, 8, 11))
 
 c = 4; // ok
 >c : Symbol(c, Decl(enumAssignmentCompat5.ts, 16, 3))
diff --git a/tests/baselines/reference/enumAssignmentCompat5.types b/tests/baselines/reference/enumAssignmentCompat5.types
index 7538bf7b27bea..400a432c66cb0 100644
--- a/tests/baselines/reference/enumAssignmentCompat5.types
+++ b/tests/baselines/reference/enumAssignmentCompat5.types
@@ -47,7 +47,7 @@ enum Computed {
 >3 : 3
 >  : ^
 }
-let n: number;
+declare let n: number;
 >n : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/errorElaboration.errors.txt b/tests/baselines/reference/errorElaboration.errors.txt
index 4b46c263726b1..af491ab3b3a6c 100644
--- a/tests/baselines/reference/errorElaboration.errors.txt
+++ b/tests/baselines/reference/errorElaboration.errors.txt
@@ -22,7 +22,7 @@ errorElaboration.ts(23,19): error TS2339: Property 'bar' does not exist on type
     declare function foo(x: () => Container<Ref<number>>): void;
                      ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
-    let a: () => Container<Ref<string>>;
+    declare let a: () => Container<Ref<string>>;
     foo(a);
         ~
 !!! error TS2345: Argument of type '() => Container<Ref<string>>' is not assignable to parameter of type '() => Container<Ref<number>>'.
diff --git a/tests/baselines/reference/errorElaboration.js b/tests/baselines/reference/errorElaboration.js
index 5788b78dbd5eb..0ea7bed1a8177 100644
--- a/tests/baselines/reference/errorElaboration.js
+++ b/tests/baselines/reference/errorElaboration.js
@@ -11,7 +11,7 @@ interface Container<T> {
     m2: T;
 }
 declare function foo(x: () => Container<Ref<number>>): void;
-let a: () => Container<Ref<string>>;
+declare let a: () => Container<Ref<string>>;
 foo(a);
 
 // Repro for #25498
@@ -28,7 +28,6 @@ const x = ({ [foo.bar]: c }) => undefined;
 
 //// [errorElaboration.js]
 // Repro for #5712
-var a;
 foo(a);
 // Repro for #25498
 function test() {
diff --git a/tests/baselines/reference/errorElaboration.symbols b/tests/baselines/reference/errorElaboration.symbols
index c4bfd5dd07574..74fe224b8e97f 100644
--- a/tests/baselines/reference/errorElaboration.symbols
+++ b/tests/baselines/reference/errorElaboration.symbols
@@ -31,14 +31,14 @@ declare function foo(x: () => Container<Ref<number>>): void;
 >Container : Symbol(Container, Decl(errorElaboration.ts, 4, 1))
 >Ref : Symbol(Ref, Decl(errorElaboration.ts, 0, 0))
 
-let a: () => Container<Ref<string>>;
->a : Symbol(a, Decl(errorElaboration.ts, 10, 3))
+declare let a: () => Container<Ref<string>>;
+>a : Symbol(a, Decl(errorElaboration.ts, 10, 11))
 >Container : Symbol(Container, Decl(errorElaboration.ts, 4, 1))
 >Ref : Symbol(Ref, Decl(errorElaboration.ts, 0, 0))
 
 foo(a);
 >foo : Symbol(foo, Decl(errorElaboration.ts, 8, 1))
->a : Symbol(a, Decl(errorElaboration.ts, 10, 3))
+>a : Symbol(a, Decl(errorElaboration.ts, 10, 11))
 
 // Repro for #25498
 
diff --git a/tests/baselines/reference/errorElaboration.types b/tests/baselines/reference/errorElaboration.types
index 26e24684fdef6..a27b39418cb57 100644
--- a/tests/baselines/reference/errorElaboration.types
+++ b/tests/baselines/reference/errorElaboration.types
@@ -23,7 +23,7 @@ declare function foo(x: () => Container<Ref<number>>): void;
 >x : () => Container<Ref<number>>
 >  : ^^^^^^                      
 
-let a: () => Container<Ref<string>>;
+declare let a: () => Container<Ref<string>>;
 >a : () => Container<Ref<string>>
 >  : ^^^^^^                      
 
diff --git a/tests/baselines/reference/errorInfoForRelatedIndexTypesNoConstraintElaboration.js b/tests/baselines/reference/errorInfoForRelatedIndexTypesNoConstraintElaboration.js
index 800340549ba7e..7642757ce8259 100644
--- a/tests/baselines/reference/errorInfoForRelatedIndexTypesNoConstraintElaboration.js
+++ b/tests/baselines/reference/errorInfoForRelatedIndexTypesNoConstraintElaboration.js
@@ -11,7 +11,7 @@ class I<T1 extends keyof JSX.IntrinsicElements, T2 extends keyof JSX.IntrinsicEl
 }
 
 //// [errorInfoForRelatedIndexTypesNoConstraintElaboration.js]
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var I = /** @class */ (function () {
     function I() {
     }
diff --git a/tests/baselines/reference/errorMessageOnObjectLiteralType.errors.txt b/tests/baselines/reference/errorMessageOnObjectLiteralType.errors.txt
index 907357a0689d0..281f05380a477 100644
--- a/tests/baselines/reference/errorMessageOnObjectLiteralType.errors.txt
+++ b/tests/baselines/reference/errorMessageOnObjectLiteralType.errors.txt
@@ -3,7 +3,7 @@ errorMessageOnObjectLiteralType.ts(6,8): error TS2551: Property 'getOwnPropertyN
 
 
 ==== errorMessageOnObjectLiteralType.ts (2 errors) ====
-    var x: {
+    declare var x: {
         a: string;
         b: number;
     };
diff --git a/tests/baselines/reference/errorMessageOnObjectLiteralType.js b/tests/baselines/reference/errorMessageOnObjectLiteralType.js
index 2d14d7a75ef29..63f3e5ce1363a 100644
--- a/tests/baselines/reference/errorMessageOnObjectLiteralType.js
+++ b/tests/baselines/reference/errorMessageOnObjectLiteralType.js
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/errorMessageOnObjectLiteralType.ts] ////
 
 //// [errorMessageOnObjectLiteralType.ts]
-var x: {
+declare var x: {
     a: string;
     b: number;
 };
@@ -9,6 +9,5 @@ x.getOwnPropertyNamess();
 Object.getOwnPropertyNamess(null);
 
 //// [errorMessageOnObjectLiteralType.js]
-var x;
 x.getOwnPropertyNamess();
 Object.getOwnPropertyNamess(null);
diff --git a/tests/baselines/reference/errorMessageOnObjectLiteralType.symbols b/tests/baselines/reference/errorMessageOnObjectLiteralType.symbols
index b634b64ee7a0d..6d5c07de7ffd6 100644
--- a/tests/baselines/reference/errorMessageOnObjectLiteralType.symbols
+++ b/tests/baselines/reference/errorMessageOnObjectLiteralType.symbols
@@ -1,18 +1,18 @@
 //// [tests/cases/compiler/errorMessageOnObjectLiteralType.ts] ////
 
 === errorMessageOnObjectLiteralType.ts ===
-var x: {
->x : Symbol(x, Decl(errorMessageOnObjectLiteralType.ts, 0, 3))
+declare var x: {
+>x : Symbol(x, Decl(errorMessageOnObjectLiteralType.ts, 0, 11))
 
     a: string;
->a : Symbol(a, Decl(errorMessageOnObjectLiteralType.ts, 0, 8))
+>a : Symbol(a, Decl(errorMessageOnObjectLiteralType.ts, 0, 16))
 
     b: number;
 >b : Symbol(b, Decl(errorMessageOnObjectLiteralType.ts, 1, 14))
 
 };
 x.getOwnPropertyNamess();
->x : Symbol(x, Decl(errorMessageOnObjectLiteralType.ts, 0, 3))
+>x : Symbol(x, Decl(errorMessageOnObjectLiteralType.ts, 0, 11))
 
 Object.getOwnPropertyNamess(null);
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
diff --git a/tests/baselines/reference/errorMessageOnObjectLiteralType.types b/tests/baselines/reference/errorMessageOnObjectLiteralType.types
index bab2eed08f83d..34c408adeca98 100644
--- a/tests/baselines/reference/errorMessageOnObjectLiteralType.types
+++ b/tests/baselines/reference/errorMessageOnObjectLiteralType.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/errorMessageOnObjectLiteralType.ts] ////
 
 === errorMessageOnObjectLiteralType.ts ===
-var x: {
+declare var x: {
 >x : { a: string; b: number; }
 >  : ^^^^^      ^^^^^      ^^^
 
diff --git a/tests/baselines/reference/errorWithSameNameType.errors.txt b/tests/baselines/reference/errorWithSameNameType.errors.txt
index 282462d525309..00ce37e18d615 100644
--- a/tests/baselines/reference/errorWithSameNameType.errors.txt
+++ b/tests/baselines/reference/errorWithSameNameType.errors.txt
@@ -16,8 +16,8 @@ c.ts(11,1): error TS2741: Property 'foo1' is missing in type 'import("b").F' but
     import * as A from './a'
     import * as B from './b'
     
-    let a: A.F
-    let b: B.F
+    declare let a: A.F
+    declare let b: B.F
     
     if (a === b) {
         ~~~~~~~
diff --git a/tests/baselines/reference/errorWithSameNameType.js b/tests/baselines/reference/errorWithSameNameType.js
index 95e8aff34fde1..1176326dd65d6 100644
--- a/tests/baselines/reference/errorWithSameNameType.js
+++ b/tests/baselines/reference/errorWithSameNameType.js
@@ -14,8 +14,8 @@ export interface F {
 import * as A from './a'
 import * as B from './b'
 
-let a: A.F
-let b: B.F
+declare let a: A.F
+declare let b: B.F
 
 if (a === b) {
 
@@ -33,8 +33,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 //// [c.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var a;
-var b;
 if (a === b) {
 }
 a = b;
diff --git a/tests/baselines/reference/errorWithSameNameType.symbols b/tests/baselines/reference/errorWithSameNameType.symbols
index a2a9af53d4584..b87065d1b3e0b 100644
--- a/tests/baselines/reference/errorWithSameNameType.symbols
+++ b/tests/baselines/reference/errorWithSameNameType.symbols
@@ -23,23 +23,23 @@ import * as A from './a'
 import * as B from './b'
 >B : Symbol(B, Decl(c.ts, 1, 6))
 
-let a: A.F
->a : Symbol(a, Decl(c.ts, 3, 3))
+declare let a: A.F
+>a : Symbol(a, Decl(c.ts, 3, 11))
 >A : Symbol(A, Decl(c.ts, 0, 6))
 >F : Symbol(A.F, Decl(a.ts, 0, 0))
 
-let b: B.F
->b : Symbol(b, Decl(c.ts, 4, 3))
+declare let b: B.F
+>b : Symbol(b, Decl(c.ts, 4, 11))
 >B : Symbol(B, Decl(c.ts, 1, 6))
 >F : Symbol(B.F, Decl(b.ts, 0, 0))
 
 if (a === b) {
->a : Symbol(a, Decl(c.ts, 3, 3))
->b : Symbol(b, Decl(c.ts, 4, 3))
+>a : Symbol(a, Decl(c.ts, 3, 11))
+>b : Symbol(b, Decl(c.ts, 4, 11))
 
 }
 
 a = b
->a : Symbol(a, Decl(c.ts, 3, 3))
->b : Symbol(b, Decl(c.ts, 4, 3))
+>a : Symbol(a, Decl(c.ts, 3, 11))
+>b : Symbol(b, Decl(c.ts, 4, 11))
 
diff --git a/tests/baselines/reference/errorWithSameNameType.types b/tests/baselines/reference/errorWithSameNameType.types
index ecfc4f1c6abe2..32cd001ae72b9 100644
--- a/tests/baselines/reference/errorWithSameNameType.types
+++ b/tests/baselines/reference/errorWithSameNameType.types
@@ -23,13 +23,13 @@ import * as B from './b'
 >B : typeof B
 >  : ^^^^^^^^
 
-let a: A.F
+declare let a: A.F
 >a : A.F
 >  : ^^^
 >A : any
 >  : ^^^
 
-let b: B.F
+declare let b: B.F
 >b : B.F
 >  : ^^^
 >B : any
diff --git a/tests/baselines/reference/errorWithTruncatedType.errors.txt b/tests/baselines/reference/errorWithTruncatedType.errors.txt
index d461e78881e67..f90cde4019f92 100644
--- a/tests/baselines/reference/errorWithTruncatedType.errors.txt
+++ b/tests/baselines/reference/errorWithTruncatedType.errors.txt
@@ -2,7 +2,7 @@ errorWithTruncatedType.ts(10,5): error TS2322: Type '{ propertyWithAnExceedingly
 
 
 ==== errorWithTruncatedType.ts (1 errors) ====
-    var x: {
+    declare var x: {
         propertyWithAnExceedinglyLongName1: string;
         propertyWithAnExceedinglyLongName2: string;
         propertyWithAnExceedinglyLongName3: string;
diff --git a/tests/baselines/reference/errorWithTruncatedType.js b/tests/baselines/reference/errorWithTruncatedType.js
index 8163474acc09e..2a8800c8477db 100644
--- a/tests/baselines/reference/errorWithTruncatedType.js
+++ b/tests/baselines/reference/errorWithTruncatedType.js
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/errorWithTruncatedType.ts] ////
 
 //// [errorWithTruncatedType.ts]
-var x: {
+declare var x: {
     propertyWithAnExceedinglyLongName1: string;
     propertyWithAnExceedinglyLongName2: string;
     propertyWithAnExceedinglyLongName3: string;
@@ -14,6 +14,5 @@ var s: string = x;
 
 
 //// [errorWithTruncatedType.js]
-var x;
 // String representation of type of 'x' should be truncated in error message
 var s = x;
diff --git a/tests/baselines/reference/errorWithTruncatedType.symbols b/tests/baselines/reference/errorWithTruncatedType.symbols
index 80175be8e15ca..4e4dded516f0c 100644
--- a/tests/baselines/reference/errorWithTruncatedType.symbols
+++ b/tests/baselines/reference/errorWithTruncatedType.symbols
@@ -1,11 +1,11 @@
 //// [tests/cases/compiler/errorWithTruncatedType.ts] ////
 
 === errorWithTruncatedType.ts ===
-var x: {
->x : Symbol(x, Decl(errorWithTruncatedType.ts, 0, 3))
+declare var x: {
+>x : Symbol(x, Decl(errorWithTruncatedType.ts, 0, 11))
 
     propertyWithAnExceedinglyLongName1: string;
->propertyWithAnExceedinglyLongName1 : Symbol(propertyWithAnExceedinglyLongName1, Decl(errorWithTruncatedType.ts, 0, 8))
+>propertyWithAnExceedinglyLongName1 : Symbol(propertyWithAnExceedinglyLongName1, Decl(errorWithTruncatedType.ts, 0, 16))
 
     propertyWithAnExceedinglyLongName2: string;
 >propertyWithAnExceedinglyLongName2 : Symbol(propertyWithAnExceedinglyLongName2, Decl(errorWithTruncatedType.ts, 1, 47))
@@ -24,5 +24,5 @@ var x: {
 // String representation of type of 'x' should be truncated in error message
 var s: string = x;
 >s : Symbol(s, Decl(errorWithTruncatedType.ts, 9, 3))
->x : Symbol(x, Decl(errorWithTruncatedType.ts, 0, 3))
+>x : Symbol(x, Decl(errorWithTruncatedType.ts, 0, 11))
 
diff --git a/tests/baselines/reference/errorWithTruncatedType.types b/tests/baselines/reference/errorWithTruncatedType.types
index 40bfb59649232..ff38b5148298d 100644
--- a/tests/baselines/reference/errorWithTruncatedType.types
+++ b/tests/baselines/reference/errorWithTruncatedType.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/errorWithTruncatedType.ts] ////
 
 === errorWithTruncatedType.ts ===
-var x: {
+declare var x: {
 >x : { propertyWithAnExceedinglyLongName1: string; propertyWithAnExceedinglyLongName2: string; propertyWithAnExceedinglyLongName3: string; propertyWithAnExceedinglyLongName4: string; propertyWithAnExceedinglyLongName5: string; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 
diff --git a/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.errors.txt b/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.errors.txt
index 50c613e29eb8c..faa971f1d6e4f 100644
--- a/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.errors.txt
+++ b/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.errors.txt
@@ -61,12 +61,12 @@ exponentiationOperatorWithInvalidOperands.ts(68,12): error TS2362: The left-hand
     // an enum type
     enum E { a, b, c }
     
-    var a: any;
-    var b: boolean;
-    var c: number;
-    var d: string;
-    var e: { a: number };
-    var f: Number;
+    declare var a: any;
+    declare var b: boolean;
+    declare var c: number;
+    declare var d: string;
+    declare var e: { a: number };
+    declare var f: Number;
     
     // All of the below should be an error unless otherwise noted
     // operator **
diff --git a/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.js b/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.js
index 2ac8e881c4739..9f45b969d94c6 100644
--- a/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.js
+++ b/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.js
@@ -5,12 +5,12 @@
 // an enum type
 enum E { a, b, c }
 
-var a: any;
-var b: boolean;
-var c: number;
-var d: string;
-var e: { a: number };
-var f: Number;
+declare var a: any;
+declare var b: boolean;
+declare var c: number;
+declare var d: string;
+declare var e: { a: number };
+declare var f: Number;
 
 // All of the below should be an error unless otherwise noted
 // operator **
@@ -79,12 +79,6 @@ var E;
     E[E["b"] = 1] = "b";
     E[E["c"] = 2] = "c";
 })(E || (E = {}));
-var a;
-var b;
-var c;
-var d;
-var e;
-var f;
 // All of the below should be an error unless otherwise noted
 // operator **
 var r1a1 = Math.pow(a, a); //ok
diff --git a/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.symbols b/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.symbols
index 0674bb3bfc491..3ec20a99dcd30 100644
--- a/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.symbols
+++ b/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.symbols
@@ -9,288 +9,288 @@ enum E { a, b, c }
 >b : Symbol(E.b, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 11))
 >c : Symbol(E.c, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 14))
 
-var a: any;
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 3))
+declare var a: any;
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 11))
 
-var b: boolean;
->b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 3))
+declare var b: boolean;
+>b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 11))
 
-var c: number;
->c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 3))
+declare var c: number;
+>c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 11))
 
-var d: string;
->d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 3))
+declare var d: string;
+>d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 11))
 
-var e: { a: number };
->e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 8))
+declare var e: { a: number };
+>e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 11))
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 16))
 
-var f: Number;
->f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 3))
+declare var f: Number;
+>f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 11))
 >Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 // All of the below should be an error unless otherwise noted
 // operator **
 var r1a1 = a ** a; //ok
 >r1a1 : Symbol(r1a1, Decl(exponentiationOperatorWithInvalidOperands.ts, 13, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 11))
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 11))
 
 var r1a2 = a ** b;
 >r1a2 : Symbol(r1a2, Decl(exponentiationOperatorWithInvalidOperands.ts, 14, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 11))
+>b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 11))
 
 var r1a3 = a ** c; //ok
 >r1a3 : Symbol(r1a3, Decl(exponentiationOperatorWithInvalidOperands.ts, 15, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 11))
+>c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 11))
 
 var r1a4 = a ** d;
 >r1a4 : Symbol(r1a4, Decl(exponentiationOperatorWithInvalidOperands.ts, 16, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 3))
->d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 11))
+>d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 11))
 
 var r1a5 = a ** e;
 >r1a5 : Symbol(r1a5, Decl(exponentiationOperatorWithInvalidOperands.ts, 17, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 3))
->e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 11))
+>e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 11))
 
 var r1a6 = a ** f;
 >r1a6 : Symbol(r1a6, Decl(exponentiationOperatorWithInvalidOperands.ts, 18, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 3))
->f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 11))
+>f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 11))
 
 var r1b1 = b ** a;
 >r1b1 : Symbol(r1b1, Decl(exponentiationOperatorWithInvalidOperands.ts, 20, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 11))
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 11))
 
 var r1b2 = b ** b;
 >r1b2 : Symbol(r1b2, Decl(exponentiationOperatorWithInvalidOperands.ts, 21, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 11))
+>b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 11))
 
 var r1b3 = b ** c;
 >r1b3 : Symbol(r1b3, Decl(exponentiationOperatorWithInvalidOperands.ts, 22, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 11))
+>c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 11))
 
 var r1b4 = b ** d;
 >r1b4 : Symbol(r1b4, Decl(exponentiationOperatorWithInvalidOperands.ts, 23, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 3))
->d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 11))
+>d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 11))
 
 var r1b5 = b ** e;
 >r1b5 : Symbol(r1b5, Decl(exponentiationOperatorWithInvalidOperands.ts, 24, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 3))
->e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 11))
+>e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 11))
 
 var r1b6 = b ** f;
 >r1b6 : Symbol(r1b6, Decl(exponentiationOperatorWithInvalidOperands.ts, 25, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 3))
->f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 11))
+>f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 11))
 
 var r1c1 = c ** a; //ok
 >r1c1 : Symbol(r1c1, Decl(exponentiationOperatorWithInvalidOperands.ts, 27, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 3))
+>c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 11))
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 11))
 
 var r1c2 = c ** b;
 >r1c2 : Symbol(r1c2, Decl(exponentiationOperatorWithInvalidOperands.ts, 28, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 11))
+>b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 11))
 
 var r1c3 = c ** c; //ok
 >r1c3 : Symbol(r1c3, Decl(exponentiationOperatorWithInvalidOperands.ts, 29, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 11))
+>c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 11))
 
 var r1c4 = c ** d;
 >r1c4 : Symbol(r1c4, Decl(exponentiationOperatorWithInvalidOperands.ts, 30, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 3))
->d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 3))
+>c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 11))
+>d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 11))
 
 var r1c5 = c ** e;
 >r1c5 : Symbol(r1c5, Decl(exponentiationOperatorWithInvalidOperands.ts, 31, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 3))
->e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 3))
+>c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 11))
+>e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 11))
 
 var r1c6 = c ** f;
 >r1c6 : Symbol(r1c6, Decl(exponentiationOperatorWithInvalidOperands.ts, 32, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 3))
->f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 3))
+>c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 11))
+>f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 11))
 
 var r1d1 = d ** a;
 >r1d1 : Symbol(r1d1, Decl(exponentiationOperatorWithInvalidOperands.ts, 34, 3))
->d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 3))
+>d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 11))
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 11))
 
 var r1d2 = d ** b;
 >r1d2 : Symbol(r1d2, Decl(exponentiationOperatorWithInvalidOperands.ts, 35, 3))
->d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 3))
+>d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 11))
+>b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 11))
 
 var r1d3 = d ** c;
 >r1d3 : Symbol(r1d3, Decl(exponentiationOperatorWithInvalidOperands.ts, 36, 3))
->d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 3))
+>d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 11))
+>c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 11))
 
 var r1d4 = d ** d;
 >r1d4 : Symbol(r1d4, Decl(exponentiationOperatorWithInvalidOperands.ts, 37, 3))
->d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 3))
->d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 11))
+>d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 11))
 
 var r1d5 = d ** e;
 >r1d5 : Symbol(r1d5, Decl(exponentiationOperatorWithInvalidOperands.ts, 38, 3))
->d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 3))
->e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 3))
+>d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 11))
+>e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 11))
 
 var r1d6 = d ** f;
 >r1d6 : Symbol(r1d6, Decl(exponentiationOperatorWithInvalidOperands.ts, 39, 3))
->d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 3))
->f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 3))
+>d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 11))
+>f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 11))
 
 var r1e1 = e ** a;
 >r1e1 : Symbol(r1e1, Decl(exponentiationOperatorWithInvalidOperands.ts, 41, 3))
->e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 3))
+>e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 11))
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 11))
 
 var r1e2 = e ** b;
 >r1e2 : Symbol(r1e2, Decl(exponentiationOperatorWithInvalidOperands.ts, 42, 3))
->e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 3))
+>e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 11))
+>b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 11))
 
 var r1e3 = e ** c;
 >r1e3 : Symbol(r1e3, Decl(exponentiationOperatorWithInvalidOperands.ts, 43, 3))
->e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 3))
+>e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 11))
+>c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 11))
 
 var r1e4 = e ** d;
 >r1e4 : Symbol(r1e4, Decl(exponentiationOperatorWithInvalidOperands.ts, 44, 3))
->e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 3))
->d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 3))
+>e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 11))
+>d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 11))
 
 var r1e5 = e ** e;
 >r1e5 : Symbol(r1e5, Decl(exponentiationOperatorWithInvalidOperands.ts, 45, 3))
->e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 3))
->e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 11))
+>e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 11))
 
 var r1e6 = e ** f;
 >r1e6 : Symbol(r1e6, Decl(exponentiationOperatorWithInvalidOperands.ts, 46, 3))
->e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 3))
->f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 3))
+>e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 11))
+>f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 11))
 
 var r1f1 = f ** a;
 >r1f1 : Symbol(r1f1, Decl(exponentiationOperatorWithInvalidOperands.ts, 48, 3))
->f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 3))
+>f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 11))
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 11))
 
 var r1f2 = f ** b;
 >r1f2 : Symbol(r1f2, Decl(exponentiationOperatorWithInvalidOperands.ts, 49, 3))
->f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 3))
+>f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 11))
+>b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 11))
 
 var r1f3 = f ** c;
 >r1f3 : Symbol(r1f3, Decl(exponentiationOperatorWithInvalidOperands.ts, 50, 3))
->f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 3))
+>f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 11))
+>c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 11))
 
 var r1f4 = f ** d;
 >r1f4 : Symbol(r1f4, Decl(exponentiationOperatorWithInvalidOperands.ts, 51, 3))
->f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 3))
->d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 3))
+>f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 11))
+>d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 11))
 
 var r1f5 = f ** e;
 >r1f5 : Symbol(r1f5, Decl(exponentiationOperatorWithInvalidOperands.ts, 52, 3))
->f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 3))
->e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 3))
+>f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 11))
+>e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 11))
 
 var r1f6 = f ** f;
 >r1f6 : Symbol(r1f6, Decl(exponentiationOperatorWithInvalidOperands.ts, 53, 3))
->f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 3))
->f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 11))
+>f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 11))
 
 var r1g1 = E.a ** a; //ok
 >r1g1 : Symbol(r1g1, Decl(exponentiationOperatorWithInvalidOperands.ts, 55, 3))
 >E.a : Symbol(E.a, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(exponentiationOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 8))
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 11))
 
 var r1g2 = E.a ** b;
 >r1g2 : Symbol(r1g2, Decl(exponentiationOperatorWithInvalidOperands.ts, 56, 3))
 >E.a : Symbol(E.a, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(exponentiationOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 8))
->b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 11))
 
 var r1g3 = E.a ** c; //ok
 >r1g3 : Symbol(r1g3, Decl(exponentiationOperatorWithInvalidOperands.ts, 57, 3))
 >E.a : Symbol(E.a, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(exponentiationOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 8))
->c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 11))
 
 var r1g4 = E.a ** d;
 >r1g4 : Symbol(r1g4, Decl(exponentiationOperatorWithInvalidOperands.ts, 58, 3))
 >E.a : Symbol(E.a, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(exponentiationOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 8))
->d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 11))
 
 var r1g5 = E.a ** e;
 >r1g5 : Symbol(r1g5, Decl(exponentiationOperatorWithInvalidOperands.ts, 59, 3))
 >E.a : Symbol(E.a, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(exponentiationOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 8))
->e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 11))
 
 var r1g6 = E.a ** f;
 >r1g6 : Symbol(r1g6, Decl(exponentiationOperatorWithInvalidOperands.ts, 60, 3))
 >E.a : Symbol(E.a, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 8))
 >E : Symbol(E, Decl(exponentiationOperatorWithInvalidOperands.ts, 0, 0))
 >a : Symbol(E.a, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 8))
->f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 11))
 
 var r1h1 = a ** E.b; //ok
 >r1h1 : Symbol(r1h1, Decl(exponentiationOperatorWithInvalidOperands.ts, 62, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithInvalidOperands.ts, 4, 11))
 >E.b : Symbol(E.b, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(exponentiationOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 11))
 
 var r1h2 = b ** E.b;
 >r1h2 : Symbol(r1h2, Decl(exponentiationOperatorWithInvalidOperands.ts, 63, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithInvalidOperands.ts, 5, 11))
 >E.b : Symbol(E.b, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(exponentiationOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 11))
 
 var r1h3 = c ** E.b; //ok
 >r1h3 : Symbol(r1h3, Decl(exponentiationOperatorWithInvalidOperands.ts, 64, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 3))
+>c : Symbol(c, Decl(exponentiationOperatorWithInvalidOperands.ts, 6, 11))
 >E.b : Symbol(E.b, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(exponentiationOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 11))
 
 var r1h4 = d ** E.b;
 >r1h4 : Symbol(r1h4, Decl(exponentiationOperatorWithInvalidOperands.ts, 65, 3))
->d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 3))
+>d : Symbol(d, Decl(exponentiationOperatorWithInvalidOperands.ts, 7, 11))
 >E.b : Symbol(E.b, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(exponentiationOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 11))
 
 var r1h5 = e ** E.b;
 >r1h5 : Symbol(r1h5, Decl(exponentiationOperatorWithInvalidOperands.ts, 66, 3))
->e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 3))
+>e : Symbol(e, Decl(exponentiationOperatorWithInvalidOperands.ts, 8, 11))
 >E.b : Symbol(E.b, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(exponentiationOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 11))
 
 var r1h6 = f ** E.b
 >r1h6 : Symbol(r1h6, Decl(exponentiationOperatorWithInvalidOperands.ts, 67, 3))
->f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 3))
+>f : Symbol(f, Decl(exponentiationOperatorWithInvalidOperands.ts, 9, 11))
 >E.b : Symbol(E.b, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 11))
 >E : Symbol(E, Decl(exponentiationOperatorWithInvalidOperands.ts, 0, 0))
 >b : Symbol(E.b, Decl(exponentiationOperatorWithInvalidOperands.ts, 2, 11))
diff --git a/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.types b/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.types
index 3691580b1afe8..dacbdb95130a9 100644
--- a/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.types
+++ b/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.types
@@ -13,29 +13,29 @@ enum E { a, b, c }
 >c : E.c
 >  : ^^^
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
-var b: boolean;
+declare var b: boolean;
 >b : boolean
 >  : ^^^^^^^
 
-var c: number;
+declare var c: number;
 >c : number
 >  : ^^^^^^
 
-var d: string;
+declare var d: string;
 >d : string
 >  : ^^^^^^
 
-var e: { a: number };
+declare var e: { a: number };
 >e : { a: number; }
 >  : ^^^^^      ^^^
 >a : number
 >  : ^^^^^^
 
-var f: Number;
+declare var f: Number;
 >f : Number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.errors.txt b/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.errors.txt
index 36676e82a991f..4b93351318d07 100644
--- a/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.errors.txt
+++ b/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.errors.txt
@@ -28,9 +28,9 @@ exponentiationOperatorWithNullValueAndInvalidOperands.ts(23,18): error TS18050:
     // If one operand is the null or undefined value, it is treated as having the type of the
     // other operand.
     
-    var a: boolean;
-    var b: string;
-    var c: Object;
+    declare var a: boolean;
+    declare var b: string;
+    declare var c: Object;
     
     // operator **
     var r1a1 = null ** a;
diff --git a/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.js b/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.js
index 3d29c4cf16e99..f52cdfde69870 100644
--- a/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.js
+++ b/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.js
@@ -4,9 +4,9 @@
 // If one operand is the null or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
-var b: string;
-var c: Object;
+declare var a: boolean;
+declare var b: string;
+declare var c: Object;
 
 // operator **
 var r1a1 = null ** a;
@@ -28,9 +28,6 @@ var r1d3 = {} ** null;
 //// [exponentiationOperatorWithNullValueAndInvalidOperands.js]
 // If one operand is the null or undefined value, it is treated as having the type of the
 // other operand.
-var a;
-var b;
-var c;
 // operator **
 var r1a1 = Math.pow(null, a);
 var r1a2 = Math.pow(null, b);
diff --git a/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.symbols b/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.symbols
index 26c1f1e3e9056..407fb5af0fab1 100644
--- a/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.symbols
+++ b/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.symbols
@@ -4,40 +4,40 @@
 // If one operand is the null or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
->a : Symbol(a, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+declare var a: boolean;
+>a : Symbol(a, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
-var b: string;
->b : Symbol(b, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+declare var b: string;
+>b : Symbol(b, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
-var c: Object;
->c : Symbol(c, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+declare var c: Object;
+>c : Symbol(c, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 // operator **
 var r1a1 = null ** a;
 >r1a1 : Symbol(r1a1, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 8, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r1a2 = null ** b;
 >r1a2 : Symbol(r1a2, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 9, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r1a3 = null ** c;
 >r1a3 : Symbol(r1a3, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 10, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r1b1 = a ** null;
 >r1b1 : Symbol(r1b1, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 12, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 3, 11))
 
 var r1b2 = b ** null;
 >r1b2 : Symbol(r1b2, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 13, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 4, 11))
 
 var r1b3 = c ** null;
 >r1b3 : Symbol(r1b3, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 14, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 5, 11))
 
 var r1c1 = null ** true;
 >r1c1 : Symbol(r1c1, Decl(exponentiationOperatorWithNullValueAndInvalidOperands.ts, 16, 3))
diff --git a/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.types b/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.types
index 07b06309ce8f2..3c1898af61682 100644
--- a/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.types
+++ b/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.types
@@ -4,15 +4,15 @@
 // If one operand is the null or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
+declare var a: boolean;
 >a : boolean
 >  : ^^^^^^^
 
-var b: string;
+declare var b: string;
 >b : string
 >  : ^^^^^^
 
-var c: Object;
+declare var c: Object;
 >c : Object
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.errors.txt b/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.errors.txt
index 1c27f0914bb36..070e1a1e214a9 100644
--- a/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.errors.txt
+++ b/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.errors.txt
@@ -17,8 +17,8 @@ exponentiationOperatorWithNullValueAndValidOperands.ts(20,17): error TS18050: Th
         b
     }
     
-    var a: any;
-    var b: number;
+    declare var a: any;
+    declare var b: number;
     
     // operator **
     var r1 = null ** a;
diff --git a/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.js b/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.js
index 48e046bc3cbd7..de86a45f2282b 100644
--- a/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.js
+++ b/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.js
@@ -9,8 +9,8 @@ enum E {
     b
 }
 
-var a: any;
-var b: number;
+declare var a: any;
+declare var b: number;
 
 // operator **
 var r1 = null ** a;
@@ -30,8 +30,6 @@ var E;
     E[E["a"] = 0] = "a";
     E[E["b"] = 1] = "b";
 })(E || (E = {}));
-var a;
-var b;
 // operator **
 var r1 = Math.pow(null, a);
 var r2 = Math.pow(null, b);
diff --git a/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.symbols b/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.symbols
index 888e1b54615eb..c7332150349f3 100644
--- a/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.symbols
+++ b/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.symbols
@@ -14,20 +14,20 @@ enum E {
 >b : Symbol(E.b, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 4, 6))
 }
 
-var a: any;
->a : Symbol(a, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 8, 3))
+declare var a: any;
+>a : Symbol(a, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
-var b: number;
->b : Symbol(b, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 9, 3))
+declare var b: number;
+>b : Symbol(b, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 // operator **
 var r1 = null ** a;
 >r1 : Symbol(r1, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 12, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var r2 = null ** b;
 >r2 : Symbol(r2, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 13, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var r3 = null ** 1;
 >r3 : Symbol(r3, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 14, 3))
@@ -40,11 +40,11 @@ var r4 = null ** E.a;
 
 var r5 = a ** null;
 >r5 : Symbol(r5, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 16, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 8, 11))
 
 var r6 = b ** null;
 >r6 : Symbol(r6, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 17, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 9, 11))
 
 var r7 = 0 ** null;
 >r7 : Symbol(r7, Decl(exponentiationOperatorWithNullValueAndValidOperands.ts, 18, 3))
diff --git a/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.types b/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.types
index 6a245a029f36b..cea8025cde9fc 100644
--- a/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.types
+++ b/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.types
@@ -17,11 +17,11 @@ enum E {
 >  : ^^^
 }
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
-var b: number;
+declare var b: number;
 >b : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/exponentiationOperatorWithTypeParameter.errors.txt b/tests/baselines/reference/exponentiationOperatorWithTypeParameter.errors.txt
index 9cf7e7ccb10a9..f348888428d8f 100644
--- a/tests/baselines/reference/exponentiationOperatorWithTypeParameter.errors.txt
+++ b/tests/baselines/reference/exponentiationOperatorWithTypeParameter.errors.txt
@@ -21,11 +21,11 @@ exponentiationOperatorWithTypeParameter.ts(19,21): error TS2363: The right-hand
 ==== exponentiationOperatorWithTypeParameter.ts (18 errors) ====
     // type parameter type is not valid for arithmetic operand
     function foo<T>(t: T) {
-        var a: any;
-        var b: boolean;
-        var c: number;
-        var d: string;
-        var e: {};
+        var a!: any;
+        var b!: boolean;
+        var c!: number;
+        var d!: string;
+        var e!: {};
     
         var r1a1 = a ** t;
                         ~
diff --git a/tests/baselines/reference/exponentiationOperatorWithTypeParameter.js b/tests/baselines/reference/exponentiationOperatorWithTypeParameter.js
index 449193bbc9cad..c9dcb316211ab 100644
--- a/tests/baselines/reference/exponentiationOperatorWithTypeParameter.js
+++ b/tests/baselines/reference/exponentiationOperatorWithTypeParameter.js
@@ -3,11 +3,11 @@
 //// [exponentiationOperatorWithTypeParameter.ts]
 // type parameter type is not valid for arithmetic operand
 function foo<T>(t: T) {
-    var a: any;
-    var b: boolean;
-    var c: number;
-    var d: string;
-    var e: {};
+    var a!: any;
+    var b!: boolean;
+    var c!: number;
+    var d!: string;
+    var e!: {};
 
     var r1a1 = a ** t;
     var r2a1 = t ** a;
diff --git a/tests/baselines/reference/exponentiationOperatorWithTypeParameter.symbols b/tests/baselines/reference/exponentiationOperatorWithTypeParameter.symbols
index 38e08eaee046a..bf73bb5282536 100644
--- a/tests/baselines/reference/exponentiationOperatorWithTypeParameter.symbols
+++ b/tests/baselines/reference/exponentiationOperatorWithTypeParameter.symbols
@@ -8,19 +8,19 @@ function foo<T>(t: T) {
 >t : Symbol(t, Decl(exponentiationOperatorWithTypeParameter.ts, 1, 16))
 >T : Symbol(T, Decl(exponentiationOperatorWithTypeParameter.ts, 1, 13))
 
-    var a: any;
+    var a!: any;
 >a : Symbol(a, Decl(exponentiationOperatorWithTypeParameter.ts, 2, 7))
 
-    var b: boolean;
+    var b!: boolean;
 >b : Symbol(b, Decl(exponentiationOperatorWithTypeParameter.ts, 3, 7))
 
-    var c: number;
+    var c!: number;
 >c : Symbol(c, Decl(exponentiationOperatorWithTypeParameter.ts, 4, 7))
 
-    var d: string;
+    var d!: string;
 >d : Symbol(d, Decl(exponentiationOperatorWithTypeParameter.ts, 5, 7))
 
-    var e: {};
+    var e!: {};
 >e : Symbol(e, Decl(exponentiationOperatorWithTypeParameter.ts, 6, 7))
 
     var r1a1 = a ** t;
diff --git a/tests/baselines/reference/exponentiationOperatorWithTypeParameter.types b/tests/baselines/reference/exponentiationOperatorWithTypeParameter.types
index 6baf251bbe260..62071a6729b50 100644
--- a/tests/baselines/reference/exponentiationOperatorWithTypeParameter.types
+++ b/tests/baselines/reference/exponentiationOperatorWithTypeParameter.types
@@ -8,23 +8,23 @@ function foo<T>(t: T) {
 >t : T
 >  : ^
 
-    var a: any;
+    var a!: any;
 >a : any
 >  : ^^^
 
-    var b: boolean;
+    var b!: boolean;
 >b : boolean
 >  : ^^^^^^^
 
-    var c: number;
+    var c!: number;
 >c : number
 >  : ^^^^^^
 
-    var d: string;
+    var d!: string;
 >d : string
 >  : ^^^^^^
 
-    var e: {};
+    var e!: {};
 >e : {}
 >  : ^^
 
diff --git a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.errors.txt b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.errors.txt
index b27525cd1b938..3a5f8b8c3a545 100644
--- a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.errors.txt
+++ b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.errors.txt
@@ -28,9 +28,9 @@ exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts(23,18): error TS18
     // If one operand is the undefined or undefined value, it is treated as having the type of the
     // other operand.
     
-    var a: boolean;
-    var b: string;
-    var c: Object;
+    declare var a: boolean;
+    declare var b: string;
+    declare var c: Object;
     
     // operator **
     var r1a1 = undefined ** a;
diff --git a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.js b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.js
index a113479f27126..e0a9130d21177 100644
--- a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.js
+++ b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.js
@@ -4,9 +4,9 @@
 // If one operand is the undefined or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
-var b: string;
-var c: Object;
+declare var a: boolean;
+declare var b: string;
+declare var c: Object;
 
 // operator **
 var r1a1 = undefined ** a;
@@ -28,9 +28,6 @@ var r1d3 = {} ** undefined;
 //// [exponentiationOperatorWithUndefinedValueAndInvalidOperands.js]
 // If one operand is the undefined or undefined value, it is treated as having the type of the
 // other operand.
-var a;
-var b;
-var c;
 // operator **
 var r1a1 = Math.pow(undefined, a);
 var r1a2 = Math.pow(undefined, b);
diff --git a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.symbols b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.symbols
index 58875fb318d69..b49de1ee9f7aa 100644
--- a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.symbols
+++ b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.symbols
@@ -4,45 +4,45 @@
 // If one operand is the undefined or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
->a : Symbol(a, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+declare var a: boolean;
+>a : Symbol(a, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 
-var b: string;
->b : Symbol(b, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+declare var b: string;
+>b : Symbol(b, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 
-var c: Object;
->c : Symbol(c, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+declare var c: Object;
+>c : Symbol(c, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 // operator **
 var r1a1 = undefined ** a;
 >r1a1 : Symbol(r1a1, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 8, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 
 var r1a2 = undefined ** b;
 >r1a2 : Symbol(r1a2, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 9, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 
 var r1a3 = undefined ** c;
 >r1a3 : Symbol(r1a3, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 10, 3))
 >undefined : Symbol(undefined)
->c : Symbol(c, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 
 var r1b1 = a ** undefined;
 >r1b1 : Symbol(r1b1, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 12, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 3, 11))
 >undefined : Symbol(undefined)
 
 var r1b2 = b ** undefined;
 >r1b2 : Symbol(r1b2, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 13, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 4, 11))
 >undefined : Symbol(undefined)
 
 var r1b3 = c ** undefined;
 >r1b3 : Symbol(r1b3, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 14, 3))
->c : Symbol(c, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 3))
+>c : Symbol(c, Decl(exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts, 5, 11))
 >undefined : Symbol(undefined)
 
 var r1c1 = undefined ** true;
diff --git a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.types b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.types
index bbe7ce1ed12c0..cccc65d9a2b29 100644
--- a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.types
+++ b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.types
@@ -4,15 +4,15 @@
 // If one operand is the undefined or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
+declare var a: boolean;
 >a : boolean
 >  : ^^^^^^^
 
-var b: string;
+declare var b: string;
 >b : string
 >  : ^^^^^^
 
-var c: Object;
+declare var c: Object;
 >c : Object
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.errors.txt b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.errors.txt
index ea2de6e3f4cab..78fcc489b5c96 100644
--- a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.errors.txt
+++ b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.errors.txt
@@ -17,8 +17,8 @@ exponentiationOperatorWithUndefinedValueAndValidOperands.ts(20,18): error TS1805
         b
     }
     
-    var a: any;
-    var b: number;
+    declare var a: any;
+    declare var b: number;
     
     // operator *
     var rk1 = undefined ** a;
diff --git a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.js b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.js
index f1aae0d14d80f..1dcfd18eadfee 100644
--- a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.js
+++ b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.js
@@ -9,8 +9,8 @@ enum E {
     b
 }
 
-var a: any;
-var b: number;
+declare var a: any;
+declare var b: number;
 
 // operator *
 var rk1 = undefined ** a;
@@ -30,8 +30,6 @@ var E;
     E[E["a"] = 0] = "a";
     E[E["b"] = 1] = "b";
 })(E || (E = {}));
-var a;
-var b;
 // operator *
 var rk1 = Math.pow(undefined, a);
 var rk2 = Math.pow(undefined, b);
diff --git a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.symbols b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.symbols
index cf2fa8043cb1e..f1a50835249ef 100644
--- a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.symbols
+++ b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.symbols
@@ -14,22 +14,22 @@ enum E {
 >b : Symbol(E.b, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 4, 6))
 }
 
-var a: any;
->a : Symbol(a, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+declare var a: any;
+>a : Symbol(a, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 
-var b: number;
->b : Symbol(b, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+declare var b: number;
+>b : Symbol(b, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 
 // operator *
 var rk1 = undefined ** a;
 >rk1 : Symbol(rk1, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 12, 3))
 >undefined : Symbol(undefined)
->a : Symbol(a, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 
 var rk2 = undefined ** b;
 >rk2 : Symbol(rk2, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 13, 3))
 >undefined : Symbol(undefined)
->b : Symbol(b, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 
 var rk3 = undefined ** 1;
 >rk3 : Symbol(rk3, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 14, 3))
@@ -44,12 +44,12 @@ var rk4 = undefined ** E.a;
 
 var rk5 = a ** undefined;
 >rk5 : Symbol(rk5, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 16, 3))
->a : Symbol(a, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 8, 3))
+>a : Symbol(a, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 8, 11))
 >undefined : Symbol(undefined)
 
 var rk6 = b ** undefined;
 >rk6 : Symbol(rk6, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 17, 3))
->b : Symbol(b, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 9, 3))
+>b : Symbol(b, Decl(exponentiationOperatorWithUndefinedValueAndValidOperands.ts, 9, 11))
 >undefined : Symbol(undefined)
 
 var rk7 = 0 ** undefined;
diff --git a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.types b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.types
index 3b313f32dbf09..010d09bd2e248 100644
--- a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.types
+++ b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.types
@@ -17,11 +17,11 @@ enum E {
 >  : ^^^
 }
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
-var b: number;
+declare var b: number;
 >b : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.errors.txt b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.errors.txt
index 5a89beeda9696..263bd5a747389 100644
--- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.errors.txt
+++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.errors.txt
@@ -11,7 +11,7 @@ exportAssignmentOfDeclaredExternalModule_1.ts(4,9): error TS2693: 'Sammy' only r
     var y = Sammy(); // error to use interface name as call target
             ~~~~~
 !!! error TS2693: 'Sammy' only refers to a type, but is being used as a value here.
-    var z: Sammy; // no error - z is of type interface Sammy from module 'M'
+    declare var z: Sammy; // no error - z is of type interface Sammy from module 'M'
     var a = new z(); // constructor - no error
     var b = z(); // call signature - no error
 ==== exportAssignmentOfDeclaredExternalModule_0.ts (0 errors) ====
diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
index db6b9e2fb3ef5..e36f10e7eab12 100644
--- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
+++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
@@ -12,7 +12,7 @@ export = Sammy;
 import Sammy = require('./exportAssignmentOfDeclaredExternalModule_0');
 var x = new Sammy(); // error to use as constructor as there is not constructor symbol
 var y = Sammy(); // error to use interface name as call target
-var z: Sammy; // no error - z is of type interface Sammy from module 'M'
+declare var z: Sammy; // no error - z is of type interface Sammy from module 'M'
 var a = new z(); // constructor - no error
 var b = z(); // call signature - no error
 
@@ -24,6 +24,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 Object.defineProperty(exports, "__esModule", { value: true });
 var x = new Sammy(); // error to use as constructor as there is not constructor symbol
 var y = Sammy(); // error to use interface name as call target
-var z; // no error - z is of type interface Sammy from module 'M'
 var a = new z(); // constructor - no error
 var b = z(); // call signature - no error
diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.symbols b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.symbols
index 31bcc58f646a5..7cac3b5b90cdd 100644
--- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.symbols
+++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.symbols
@@ -11,17 +11,17 @@ var x = new Sammy(); // error to use as constructor as there is not constructor
 var y = Sammy(); // error to use interface name as call target
 >y : Symbol(y, Decl(exportAssignmentOfDeclaredExternalModule_1.ts, 3, 3))
 
-var z: Sammy; // no error - z is of type interface Sammy from module 'M'
->z : Symbol(z, Decl(exportAssignmentOfDeclaredExternalModule_1.ts, 4, 3))
+declare var z: Sammy; // no error - z is of type interface Sammy from module 'M'
+>z : Symbol(z, Decl(exportAssignmentOfDeclaredExternalModule_1.ts, 4, 11))
 >Sammy : Symbol(Sammy, Decl(exportAssignmentOfDeclaredExternalModule_1.ts, 0, 0))
 
 var a = new z(); // constructor - no error
 >a : Symbol(a, Decl(exportAssignmentOfDeclaredExternalModule_1.ts, 5, 3))
->z : Symbol(z, Decl(exportAssignmentOfDeclaredExternalModule_1.ts, 4, 3))
+>z : Symbol(z, Decl(exportAssignmentOfDeclaredExternalModule_1.ts, 4, 11))
 
 var b = z(); // call signature - no error
 >b : Symbol(b, Decl(exportAssignmentOfDeclaredExternalModule_1.ts, 6, 3))
->z : Symbol(z, Decl(exportAssignmentOfDeclaredExternalModule_1.ts, 4, 3))
+>z : Symbol(z, Decl(exportAssignmentOfDeclaredExternalModule_1.ts, 4, 11))
 
 === exportAssignmentOfDeclaredExternalModule_0.ts ===
 interface Sammy {
diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.types b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.types
index 973f0a9803eb5..e0655836eb31d 100644
--- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.types
+++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.types
@@ -22,7 +22,7 @@ var y = Sammy(); // error to use interface name as call target
 >Sammy : any
 >      : ^^^
 
-var z: Sammy; // no error - z is of type interface Sammy from module 'M'
+declare var z: Sammy; // no error - z is of type interface Sammy from module 'M'
 >z : Sammy
 >  : ^^^^^
 
diff --git a/tests/baselines/reference/exportEqualErrorType.errors.txt b/tests/baselines/reference/exportEqualErrorType.errors.txt
index 37b58684c5726..0f0d32f173de2 100644
--- a/tests/baselines/reference/exportEqualErrorType.errors.txt
+++ b/tests/baselines/reference/exportEqualErrorType.errors.txt
@@ -17,7 +17,7 @@ exportEqualErrorType_1.ts(3,23): error TS2339: Property 'static' does not exist
             use: (mod: connectModule) => connectExport;
         }
     }
-    var server: {
+    declare var server: {
         (): server.connectExport;
         foo: Date;
     };
diff --git a/tests/baselines/reference/exportEqualErrorType.js b/tests/baselines/reference/exportEqualErrorType.js
index d1221baaa86d3..8ff1328676e93 100644
--- a/tests/baselines/reference/exportEqualErrorType.js
+++ b/tests/baselines/reference/exportEqualErrorType.js
@@ -9,7 +9,7 @@ namespace server {
         use: (mod: connectModule) => connectExport;
     }
 }
-var server: {
+declare var server: {
     (): server.connectExport;
     foo: Date;
 };
@@ -23,7 +23,6 @@ connect().use(connect.static('foo')); // Error  1      The property 'static' doe
 
 //// [exportEqualErrorType_0.js]
 "use strict";
-var server;
 module.exports = server;
 //// [exportEqualErrorType_1.js]
 "use strict";
diff --git a/tests/baselines/reference/exportEqualErrorType.symbols b/tests/baselines/reference/exportEqualErrorType.symbols
index d56b1472fdb58..0e38749de8ab4 100644
--- a/tests/baselines/reference/exportEqualErrorType.symbols
+++ b/tests/baselines/reference/exportEqualErrorType.symbols
@@ -13,7 +13,7 @@ connect().use(connect.static('foo')); // Error  1      The property 'static' doe
 
 === exportEqualErrorType_0.ts ===
 namespace server {
->server : Symbol(server, Decl(exportEqualErrorType_0.ts, 0, 0), Decl(exportEqualErrorType_0.ts, 8, 3))
+>server : Symbol(server, Decl(exportEqualErrorType_0.ts, 0, 0), Decl(exportEqualErrorType_0.ts, 8, 11))
 
     export interface connectModule {
 >connectModule : Symbol(connectModule, Decl(exportEqualErrorType_0.ts, 0, 18))
@@ -33,11 +33,11 @@ namespace server {
 >connectExport : Symbol(connectExport, Decl(exportEqualErrorType_0.ts, 3, 5))
     }
 }
-var server: {
->server : Symbol(server, Decl(exportEqualErrorType_0.ts, 0, 0), Decl(exportEqualErrorType_0.ts, 8, 3))
+declare var server: {
+>server : Symbol(server, Decl(exportEqualErrorType_0.ts, 0, 0), Decl(exportEqualErrorType_0.ts, 8, 11))
 
     (): server.connectExport;
->server : Symbol(server, Decl(exportEqualErrorType_0.ts, 0, 0), Decl(exportEqualErrorType_0.ts, 8, 3))
+>server : Symbol(server, Decl(exportEqualErrorType_0.ts, 0, 0), Decl(exportEqualErrorType_0.ts, 8, 11))
 >connectExport : Symbol(server.connectExport, Decl(exportEqualErrorType_0.ts, 3, 5))
 
     foo: Date;
@@ -46,5 +46,5 @@ var server: {
 
 };
 export = server;
->server : Symbol(server, Decl(exportEqualErrorType_0.ts, 0, 0), Decl(exportEqualErrorType_0.ts, 8, 3))
+>server : Symbol(server, Decl(exportEqualErrorType_0.ts, 0, 0), Decl(exportEqualErrorType_0.ts, 8, 11))
  
diff --git a/tests/baselines/reference/exportEqualErrorType.types b/tests/baselines/reference/exportEqualErrorType.types
index 673882b391485..3abfbe695d531 100644
--- a/tests/baselines/reference/exportEqualErrorType.types
+++ b/tests/baselines/reference/exportEqualErrorType.types
@@ -47,7 +47,7 @@ namespace server {
 >    : ^^^^^^^^^^^^^
     }
 }
-var server: {
+declare var server: {
 >server : { (): server.connectExport; foo: Date; }
 >       : ^^^^^^                    ^^^^^^^    ^^^
 
diff --git a/tests/baselines/reference/exportEqualMemberMissing.errors.txt b/tests/baselines/reference/exportEqualMemberMissing.errors.txt
index f255aaa4583e6..b406b8d764d20 100644
--- a/tests/baselines/reference/exportEqualMemberMissing.errors.txt
+++ b/tests/baselines/reference/exportEqualMemberMissing.errors.txt
@@ -17,7 +17,7 @@ exportEqualMemberMissing_1.ts(3,23): error TS2339: Property 'static' does not ex
             use: (mod: connectModule) => connectExport;
         }
     }
-    var server: {
+    declare var server: {
         (): server.connectExport;
         foo: Date;
     };
diff --git a/tests/baselines/reference/exportEqualMemberMissing.js b/tests/baselines/reference/exportEqualMemberMissing.js
index 47611dc052ec5..14c710b5cc855 100644
--- a/tests/baselines/reference/exportEqualMemberMissing.js
+++ b/tests/baselines/reference/exportEqualMemberMissing.js
@@ -9,7 +9,7 @@ namespace server {
         use: (mod: connectModule) => connectExport;
     }
 }
-var server: {
+declare var server: {
     (): server.connectExport;
     foo: Date;
 };
@@ -23,7 +23,6 @@ connect().use(connect.static('foo')); // Error	1	The property 'static' does not
 
 //// [exportEqualMemberMissing_0.js]
 "use strict";
-var server;
 module.exports = server;
 //// [exportEqualMemberMissing_1.js]
 "use strict";
diff --git a/tests/baselines/reference/exportEqualMemberMissing.symbols b/tests/baselines/reference/exportEqualMemberMissing.symbols
index 634ebbf47c160..d1db9c5faf2f9 100644
--- a/tests/baselines/reference/exportEqualMemberMissing.symbols
+++ b/tests/baselines/reference/exportEqualMemberMissing.symbols
@@ -13,7 +13,7 @@ connect().use(connect.static('foo')); // Error	1	The property 'static' does not
 
 === exportEqualMemberMissing_0.ts ===
 namespace server {
->server : Symbol(server, Decl(exportEqualMemberMissing_0.ts, 0, 0), Decl(exportEqualMemberMissing_0.ts, 8, 3))
+>server : Symbol(server, Decl(exportEqualMemberMissing_0.ts, 0, 0), Decl(exportEqualMemberMissing_0.ts, 8, 11))
 
     export interface connectModule {
 >connectModule : Symbol(connectModule, Decl(exportEqualMemberMissing_0.ts, 0, 18))
@@ -33,11 +33,11 @@ namespace server {
 >connectExport : Symbol(connectExport, Decl(exportEqualMemberMissing_0.ts, 3, 5))
     }
 }
-var server: {
->server : Symbol(server, Decl(exportEqualMemberMissing_0.ts, 0, 0), Decl(exportEqualMemberMissing_0.ts, 8, 3))
+declare var server: {
+>server : Symbol(server, Decl(exportEqualMemberMissing_0.ts, 0, 0), Decl(exportEqualMemberMissing_0.ts, 8, 11))
 
     (): server.connectExport;
->server : Symbol(server, Decl(exportEqualMemberMissing_0.ts, 0, 0), Decl(exportEqualMemberMissing_0.ts, 8, 3))
+>server : Symbol(server, Decl(exportEqualMemberMissing_0.ts, 0, 0), Decl(exportEqualMemberMissing_0.ts, 8, 11))
 >connectExport : Symbol(server.connectExport, Decl(exportEqualMemberMissing_0.ts, 3, 5))
 
     foo: Date;
@@ -46,5 +46,5 @@ var server: {
 
 };
 export = server;
->server : Symbol(server, Decl(exportEqualMemberMissing_0.ts, 0, 0), Decl(exportEqualMemberMissing_0.ts, 8, 3))
+>server : Symbol(server, Decl(exportEqualMemberMissing_0.ts, 0, 0), Decl(exportEqualMemberMissing_0.ts, 8, 11))
 
diff --git a/tests/baselines/reference/exportEqualMemberMissing.types b/tests/baselines/reference/exportEqualMemberMissing.types
index 23e1af6173f40..20fcf4fe87cb5 100644
--- a/tests/baselines/reference/exportEqualMemberMissing.types
+++ b/tests/baselines/reference/exportEqualMemberMissing.types
@@ -47,7 +47,7 @@ namespace server {
 >    : ^^^^^^^^^^^^^
     }
 }
-var server: {
+declare var server: {
 >server : { (): server.connectExport; foo: Date; }
 >       : ^^^^^^                    ^^^^^^^    ^^^
 
diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.errors.txt b/tests/baselines/reference/exportSpecifierForAGlobal.errors.txt
index f468cf161580d..591a459c3653c 100644
--- a/tests/baselines/reference/exportSpecifierForAGlobal.errors.txt
+++ b/tests/baselines/reference/exportSpecifierForAGlobal.errors.txt
@@ -9,7 +9,7 @@ b.ts(1,9): error TS2661: Cannot export 'X'. Only local declarations can be expor
             ~
 !!! error TS2661: Cannot export 'X'. Only local declarations can be exported from a module.
     export function f() {
-        var x: X;
+        var x!: X;
         return x;
     } 
     
\ No newline at end of file
diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.js b/tests/baselines/reference/exportSpecifierForAGlobal.js
index dfd37fa14812d..4aaf37a2ef1d9 100644
--- a/tests/baselines/reference/exportSpecifierForAGlobal.js
+++ b/tests/baselines/reference/exportSpecifierForAGlobal.js
@@ -6,7 +6,7 @@ declare class X { }
 //// [b.ts]
 export {X};
 export function f() {
-    var x: X;
+    var x!: X;
     return x;
 } 
 
diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.symbols b/tests/baselines/reference/exportSpecifierForAGlobal.symbols
index 73e88fb5324b5..fee279d372c4e 100644
--- a/tests/baselines/reference/exportSpecifierForAGlobal.symbols
+++ b/tests/baselines/reference/exportSpecifierForAGlobal.symbols
@@ -11,7 +11,7 @@ export {X};
 export function f() {
 >f : Symbol(f, Decl(b.ts, 0, 11))
 
-    var x: X;
+    var x!: X;
 >x : Symbol(x, Decl(b.ts, 2, 7))
 >X : Symbol(X, Decl(a.d.ts, 0, 0))
 
diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.types b/tests/baselines/reference/exportSpecifierForAGlobal.types
index 8e63ec2bb6024..68623deab0a70 100644
--- a/tests/baselines/reference/exportSpecifierForAGlobal.types
+++ b/tests/baselines/reference/exportSpecifierForAGlobal.types
@@ -14,7 +14,7 @@ export function f() {
 >f : () => X
 >  : ^^^^^^^
 
-    var x: X;
+    var x!: X;
 >x : X
 >  : ^
 
diff --git a/tests/baselines/reference/expr.errors.txt b/tests/baselines/reference/expr.errors.txt
index 4516be7044dc5..39f901bbf473c 100644
--- a/tests/baselines/reference/expr.errors.txt
+++ b/tests/baselines/reference/expr.errors.txt
@@ -78,12 +78,12 @@ expr.ts(242,7): error TS2363: The right-hand side of an arithmetic operation mus
     }
     
     function f() {
-        var a: any;
+        var a!: any;
         var n=3;
         var s="";
         var b=false;
-        var i:I;
-        var e:E;
+        var i!: I;
+        var e!: E;
     
         n&&a;
         n&&s;
diff --git a/tests/baselines/reference/expr.js b/tests/baselines/reference/expr.js
index 0538b3bddee0f..ff3a1062e5697 100644
--- a/tests/baselines/reference/expr.js
+++ b/tests/baselines/reference/expr.js
@@ -9,12 +9,12 @@ enum E {
 }
 
 function f() {
-    var a: any;
+    var a!: any;
     var n=3;
     var s="";
     var b=false;
-    var i:I;
-    var e:E;
+    var i!: I;
+    var e!: E;
 
     n&&a;
     n&&s;
diff --git a/tests/baselines/reference/expr.symbols b/tests/baselines/reference/expr.symbols
index de9a7b7787cc9..73e8363c1dd65 100644
--- a/tests/baselines/reference/expr.symbols
+++ b/tests/baselines/reference/expr.symbols
@@ -17,7 +17,7 @@ enum E {
 function f() {
 >f : Symbol(f, Decl(expr.ts, 5, 1))
 
-    var a: any;
+    var a!: any;
 >a : Symbol(a, Decl(expr.ts, 8, 7))
 
     var n=3;
@@ -29,11 +29,11 @@ function f() {
     var b=false;
 >b : Symbol(b, Decl(expr.ts, 11, 7))
 
-    var i:I;
+    var i!: I;
 >i : Symbol(i, Decl(expr.ts, 12, 7))
 >I : Symbol(I, Decl(expr.ts, 0, 0))
 
-    var e:E;
+    var e!: E;
 >e : Symbol(e, Decl(expr.ts, 13, 7))
 >E : Symbol(E, Decl(expr.ts, 1, 1))
 
diff --git a/tests/baselines/reference/expr.types b/tests/baselines/reference/expr.types
index 906b50b7a2ac6..8dff358b1084b 100644
--- a/tests/baselines/reference/expr.types
+++ b/tests/baselines/reference/expr.types
@@ -21,7 +21,7 @@ function f() {
 >f : () => void
 >  : ^^^^^^^^^^
 
-    var a: any;
+    var a!: any;
 >a : any
 >  : ^^^
 
@@ -43,11 +43,11 @@ function f() {
 >false : false
 >      : ^^^^^
 
-    var i:I;
+    var i!: I;
 >i : I
 >  : ^
 
-    var e:E;
+    var e!: E;
 >e : E
 >  : ^
 
diff --git a/tests/baselines/reference/extension.errors.txt b/tests/baselines/reference/extension.errors.txt
index bb8a3221dd52b..e283e74b47f9e 100644
--- a/tests/baselines/reference/extension.errors.txt
+++ b/tests/baselines/reference/extension.errors.txt
@@ -42,7 +42,7 @@ extension.ts(22,3): error TS2339: Property 'pe' does not exist on type 'C'.
       ~~
 !!! error TS2339: Property 'pe' does not exist on type 'C'.
     c.p;
-    var i:I;
+    declare var i:I;
     i.x;
     i.y;
     
diff --git a/tests/baselines/reference/extension.js b/tests/baselines/reference/extension.js
index e4c7881afc629..232533b28c4a3 100644
--- a/tests/baselines/reference/extension.js
+++ b/tests/baselines/reference/extension.js
@@ -24,7 +24,7 @@ declare namespace M {
 var c=new M.C();
 c.pe;
 c.p;
-var i:I;
+declare var i:I;
 i.x;
 i.y;
 
@@ -34,6 +34,5 @@ i.y;
 var c = new M.C();
 c.pe;
 c.p;
-var i;
 i.x;
 i.y;
diff --git a/tests/baselines/reference/extension.symbols b/tests/baselines/reference/extension.symbols
index 7a565d5e6bf60..34df33141d3ec 100644
--- a/tests/baselines/reference/extension.symbols
+++ b/tests/baselines/reference/extension.symbols
@@ -51,18 +51,18 @@ c.p;
 >c : Symbol(c, Decl(extension.ts, 20, 3))
 >p : Symbol(M.C.p, Decl(extension.ts, 9, 20))
 
-var i:I;
->i : Symbol(i, Decl(extension.ts, 23, 3))
+declare var i:I;
+>i : Symbol(i, Decl(extension.ts, 23, 11))
 >I : Symbol(I, Decl(extension.ts, 0, 0), Decl(extension.ts, 2, 1))
 
 i.x;
 >i.x : Symbol(I.x, Decl(extension.ts, 0, 13))
->i : Symbol(i, Decl(extension.ts, 23, 3))
+>i : Symbol(i, Decl(extension.ts, 23, 11))
 >x : Symbol(I.x, Decl(extension.ts, 0, 13))
 
 i.y;
 >i.y : Symbol(I.y, Decl(extension.ts, 4, 13))
->i : Symbol(i, Decl(extension.ts, 23, 3))
+>i : Symbol(i, Decl(extension.ts, 23, 11))
 >y : Symbol(I.y, Decl(extension.ts, 4, 13))
 
 
diff --git a/tests/baselines/reference/extension.types b/tests/baselines/reference/extension.types
index 556e869ac6647..14190bf1d2f7a 100644
--- a/tests/baselines/reference/extension.types
+++ b/tests/baselines/reference/extension.types
@@ -71,7 +71,7 @@ c.p;
 >p : number
 >  : ^^^^^^
 
-var i:I;
+declare var i:I;
 >i : I
 >  : ^
 
diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt
index 71d1329b520c5..66923f2e75169 100644
--- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt
+++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (0 errors) ====
     export class c {
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt b/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
index fe3cfc17c435b..29a93731f366b 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly2.errors.txt
@@ -10,7 +10,7 @@ fixingTypeParametersRepeatedly2.ts(17,5): error TS2403: Subsequent variable decl
         toBase(): Base;
     }
     
-    var derived: Derived;
+    declare var derived: Derived;
     
     declare function foo<T>(x: T, func: (p: T) => T): T;
     var result = foo(derived, d => d.toBase());
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly2.js b/tests/baselines/reference/fixingTypeParametersRepeatedly2.js
index aac4d3b39bec1..f36f1cc0969a7 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly2.js
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly2.js
@@ -8,7 +8,7 @@ interface Derived extends Base {
     toBase(): Base;
 }
 
-var derived: Derived;
+declare var derived: Derived;
 
 declare function foo<T>(x: T, func: (p: T) => T): T;
 var result = foo(derived, d => d.toBase());
@@ -20,6 +20,5 @@ declare function bar<T>(x: T, func: (p: T) => T): T;
 var result = bar(derived, d => d.toBase());
 
 //// [fixingTypeParametersRepeatedly2.js]
-var derived;
 var result = foo(derived, function (d) { return d.toBase(); });
 var result = bar(derived, function (d) { return d.toBase(); });
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly2.symbols b/tests/baselines/reference/fixingTypeParametersRepeatedly2.symbols
index adbd08092ed77..7dc3504e7d3da 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly2.symbols
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly2.symbols
@@ -16,12 +16,12 @@ interface Derived extends Base {
 >Base : Symbol(Base, Decl(fixingTypeParametersRepeatedly2.ts, 0, 0))
 }
 
-var derived: Derived;
->derived : Symbol(derived, Decl(fixingTypeParametersRepeatedly2.ts, 7, 3))
+declare var derived: Derived;
+>derived : Symbol(derived, Decl(fixingTypeParametersRepeatedly2.ts, 7, 11))
 >Derived : Symbol(Derived, Decl(fixingTypeParametersRepeatedly2.ts, 2, 1))
 
 declare function foo<T>(x: T, func: (p: T) => T): T;
->foo : Symbol(foo, Decl(fixingTypeParametersRepeatedly2.ts, 7, 21))
+>foo : Symbol(foo, Decl(fixingTypeParametersRepeatedly2.ts, 7, 29))
 >T : Symbol(T, Decl(fixingTypeParametersRepeatedly2.ts, 9, 21))
 >x : Symbol(x, Decl(fixingTypeParametersRepeatedly2.ts, 9, 24))
 >T : Symbol(T, Decl(fixingTypeParametersRepeatedly2.ts, 9, 21))
@@ -33,8 +33,8 @@ declare function foo<T>(x: T, func: (p: T) => T): T;
 
 var result = foo(derived, d => d.toBase());
 >result : Symbol(result, Decl(fixingTypeParametersRepeatedly2.ts, 10, 3), Decl(fixingTypeParametersRepeatedly2.ts, 16, 3))
->foo : Symbol(foo, Decl(fixingTypeParametersRepeatedly2.ts, 7, 21))
->derived : Symbol(derived, Decl(fixingTypeParametersRepeatedly2.ts, 7, 3))
+>foo : Symbol(foo, Decl(fixingTypeParametersRepeatedly2.ts, 7, 29))
+>derived : Symbol(derived, Decl(fixingTypeParametersRepeatedly2.ts, 7, 11))
 >d : Symbol(d, Decl(fixingTypeParametersRepeatedly2.ts, 10, 25))
 >d.toBase : Symbol(Derived.toBase, Decl(fixingTypeParametersRepeatedly2.ts, 3, 32))
 >d : Symbol(d, Decl(fixingTypeParametersRepeatedly2.ts, 10, 25))
@@ -67,7 +67,7 @@ declare function bar<T>(x: T, func: (p: T) => T): T;
 var result = bar(derived, d => d.toBase());
 >result : Symbol(result, Decl(fixingTypeParametersRepeatedly2.ts, 10, 3), Decl(fixingTypeParametersRepeatedly2.ts, 16, 3))
 >bar : Symbol(bar, Decl(fixingTypeParametersRepeatedly2.ts, 10, 43), Decl(fixingTypeParametersRepeatedly2.ts, 14, 52))
->derived : Symbol(derived, Decl(fixingTypeParametersRepeatedly2.ts, 7, 3))
+>derived : Symbol(derived, Decl(fixingTypeParametersRepeatedly2.ts, 7, 11))
 >d : Symbol(d, Decl(fixingTypeParametersRepeatedly2.ts, 16, 25))
 >d.toBase : Symbol(Derived.toBase, Decl(fixingTypeParametersRepeatedly2.ts, 3, 32))
 >d : Symbol(d, Decl(fixingTypeParametersRepeatedly2.ts, 16, 25))
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly2.types b/tests/baselines/reference/fixingTypeParametersRepeatedly2.types
index 8bc12eed1954b..70f31ef120cbe 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly2.types
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly2.types
@@ -12,7 +12,7 @@ interface Derived extends Base {
 >       : ^^^^^^    
 }
 
-var derived: Derived;
+declare var derived: Derived;
 >derived : Derived
 >        : ^^^^^^^
 
diff --git a/tests/baselines/reference/for-inStatementsArrayErrors.errors.txt b/tests/baselines/reference/for-inStatementsArrayErrors.errors.txt
index b458b3c22ebb2..20dc071efc0df 100644
--- a/tests/baselines/reference/for-inStatementsArrayErrors.errors.txt
+++ b/tests/baselines/reference/for-inStatementsArrayErrors.errors.txt
@@ -7,7 +7,7 @@ for-inStatementsArrayErrors.ts(16,10): error TS2403: Subsequent variable declara
 
 
 ==== for-inStatementsArrayErrors.ts (6 errors) ====
-    let a: Date[];
+    declare let a: Date[];
     
     for (let x in a) {
         let a1 = a[x + 1];
diff --git a/tests/baselines/reference/for-inStatementsArrayErrors.js b/tests/baselines/reference/for-inStatementsArrayErrors.js
index cde6322298d6c..91e9ca3447875 100644
--- a/tests/baselines/reference/for-inStatementsArrayErrors.js
+++ b/tests/baselines/reference/for-inStatementsArrayErrors.js
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts] ////
 
 //// [for-inStatementsArrayErrors.ts]
-let a: Date[];
+declare let a: Date[];
 
 for (let x in a) {
     let a1 = a[x + 1];
@@ -21,7 +21,6 @@ for (var j in a ) {
 
 
 //// [for-inStatementsArrayErrors.js]
-var a;
 for (var x in a) {
     var a1 = a[x + 1];
     var a2 = a[x - 1];
diff --git a/tests/baselines/reference/for-inStatementsArrayErrors.symbols b/tests/baselines/reference/for-inStatementsArrayErrors.symbols
index f6e75ca6c5805..8de3f45124f28 100644
--- a/tests/baselines/reference/for-inStatementsArrayErrors.symbols
+++ b/tests/baselines/reference/for-inStatementsArrayErrors.symbols
@@ -1,22 +1,22 @@
 //// [tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts] ////
 
 === for-inStatementsArrayErrors.ts ===
-let a: Date[];
->a : Symbol(a, Decl(for-inStatementsArrayErrors.ts, 0, 3))
+declare let a: Date[];
+>a : Symbol(a, Decl(for-inStatementsArrayErrors.ts, 0, 11))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 for (let x in a) {
 >x : Symbol(x, Decl(for-inStatementsArrayErrors.ts, 2, 8))
->a : Symbol(a, Decl(for-inStatementsArrayErrors.ts, 0, 3))
+>a : Symbol(a, Decl(for-inStatementsArrayErrors.ts, 0, 11))
 
     let a1 = a[x + 1];
 >a1 : Symbol(a1, Decl(for-inStatementsArrayErrors.ts, 3, 7))
->a : Symbol(a, Decl(for-inStatementsArrayErrors.ts, 0, 3))
+>a : Symbol(a, Decl(for-inStatementsArrayErrors.ts, 0, 11))
 >x : Symbol(x, Decl(for-inStatementsArrayErrors.ts, 2, 8))
 
     let a2 = a[x - 1];
 >a2 : Symbol(a2, Decl(for-inStatementsArrayErrors.ts, 4, 7))
->a : Symbol(a, Decl(for-inStatementsArrayErrors.ts, 0, 3))
+>a : Symbol(a, Decl(for-inStatementsArrayErrors.ts, 0, 11))
 >x : Symbol(x, Decl(for-inStatementsArrayErrors.ts, 2, 8))
 
     if (x === 1) {
@@ -32,7 +32,7 @@ var i: number;
 
 for (var i in a ) {
 >i : Symbol(i, Decl(for-inStatementsArrayErrors.ts, 10, 3), Decl(for-inStatementsArrayErrors.ts, 11, 8))
->a : Symbol(a, Decl(for-inStatementsArrayErrors.ts, 0, 3))
+>a : Symbol(a, Decl(for-inStatementsArrayErrors.ts, 0, 11))
 }
 
 var j: any;
@@ -40,6 +40,6 @@ var j: any;
 
 for (var j in a ) {
 >j : Symbol(j, Decl(for-inStatementsArrayErrors.ts, 14, 3), Decl(for-inStatementsArrayErrors.ts, 15, 8))
->a : Symbol(a, Decl(for-inStatementsArrayErrors.ts, 0, 3))
+>a : Symbol(a, Decl(for-inStatementsArrayErrors.ts, 0, 11))
 }
 
diff --git a/tests/baselines/reference/for-inStatementsArrayErrors.types b/tests/baselines/reference/for-inStatementsArrayErrors.types
index c93b2a4e25bcc..4ab51e0a12b52 100644
--- a/tests/baselines/reference/for-inStatementsArrayErrors.types
+++ b/tests/baselines/reference/for-inStatementsArrayErrors.types
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts] ////
 
 === for-inStatementsArrayErrors.ts ===
-let a: Date[];
+declare let a: Date[];
 >a : Date[]
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/for-inStatementsInvalid.errors.txt b/tests/baselines/reference/for-inStatementsInvalid.errors.txt
index 2ff7d19443911..2a6a73733d936 100644
--- a/tests/baselines/reference/for-inStatementsInvalid.errors.txt
+++ b/tests/baselines/reference/for-inStatementsInvalid.errors.txt
@@ -45,7 +45,7 @@ for-inStatementsInvalid.ts(62,15): error TS2407: The right-hand side of a 'for..
                   ~~~~
 !!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type 'void'.
     
-    var c : string, d:string, e;
+    declare var c : string, d:string, e: any;
     
     for (var x in c || d) { }
                   ~~~~~~
@@ -120,7 +120,7 @@ for-inStatementsInvalid.ts(62,15): error TS2407: The right-hand side of a 'for..
         id: number;
         [idx: number]: number;
     }
-    var i: I;
+    declare var i: I;
     
     for (var x in i[42]) { } 
                   ~~~~~
diff --git a/tests/baselines/reference/for-inStatementsInvalid.js b/tests/baselines/reference/for-inStatementsInvalid.js
index 01b04d4e76d87..e907f57b8ee82 100644
--- a/tests/baselines/reference/for-inStatementsInvalid.js
+++ b/tests/baselines/reference/for-inStatementsInvalid.js
@@ -15,7 +15,7 @@ for (var idx : number in {}) { }
 function fn(): void { }
 for (var x in fn()) { }
 
-var c : string, d:string, e;
+declare var c : string, d:string, e: any;
 
 for (var x in c || d) { }
 for (var x in e ? c : d) { }
@@ -60,7 +60,7 @@ interface I {
     id: number;
     [idx: number]: number;
 }
-var i: I;
+declare var i: I;
 
 for (var x in i[42]) { } 
 
@@ -90,7 +90,6 @@ for (aRegExp in {}) { }
 for (var idx in {}) { }
 function fn() { }
 for (var x in fn()) { }
-var c, d, e;
 for (var x in c || d) { }
 for (var x in e ? c : d) { }
 for (var x in 42 ? c : d) { }
@@ -131,5 +130,4 @@ var B = /** @class */ (function (_super) {
     };
     return B;
 }(A));
-var i;
 for (var x in i[42]) { }
diff --git a/tests/baselines/reference/for-inStatementsInvalid.symbols b/tests/baselines/reference/for-inStatementsInvalid.symbols
index 4029518bafe0d..9381533a765a4 100644
--- a/tests/baselines/reference/for-inStatementsInvalid.symbols
+++ b/tests/baselines/reference/for-inStatementsInvalid.symbols
@@ -30,42 +30,42 @@ for (var x in fn()) { }
 >x : Symbol(x, Decl(for-inStatementsInvalid.ts, 12, 8), Decl(for-inStatementsInvalid.ts, 16, 8), Decl(for-inStatementsInvalid.ts, 17, 8), Decl(for-inStatementsInvalid.ts, 18, 8), Decl(for-inStatementsInvalid.ts, 19, 8) ... and 5 more)
 >fn : Symbol(fn, Decl(for-inStatementsInvalid.ts, 9, 32))
 
-var c : string, d:string, e;
->c : Symbol(c, Decl(for-inStatementsInvalid.ts, 14, 3))
->d : Symbol(d, Decl(for-inStatementsInvalid.ts, 14, 15))
->e : Symbol(e, Decl(for-inStatementsInvalid.ts, 14, 25))
+declare var c : string, d:string, e: any;
+>c : Symbol(c, Decl(for-inStatementsInvalid.ts, 14, 11))
+>d : Symbol(d, Decl(for-inStatementsInvalid.ts, 14, 23))
+>e : Symbol(e, Decl(for-inStatementsInvalid.ts, 14, 33))
 
 for (var x in c || d) { }
 >x : Symbol(x, Decl(for-inStatementsInvalid.ts, 12, 8), Decl(for-inStatementsInvalid.ts, 16, 8), Decl(for-inStatementsInvalid.ts, 17, 8), Decl(for-inStatementsInvalid.ts, 18, 8), Decl(for-inStatementsInvalid.ts, 19, 8) ... and 5 more)
->c : Symbol(c, Decl(for-inStatementsInvalid.ts, 14, 3))
->d : Symbol(d, Decl(for-inStatementsInvalid.ts, 14, 15))
+>c : Symbol(c, Decl(for-inStatementsInvalid.ts, 14, 11))
+>d : Symbol(d, Decl(for-inStatementsInvalid.ts, 14, 23))
 
 for (var x in e ? c : d) { }
 >x : Symbol(x, Decl(for-inStatementsInvalid.ts, 12, 8), Decl(for-inStatementsInvalid.ts, 16, 8), Decl(for-inStatementsInvalid.ts, 17, 8), Decl(for-inStatementsInvalid.ts, 18, 8), Decl(for-inStatementsInvalid.ts, 19, 8) ... and 5 more)
->e : Symbol(e, Decl(for-inStatementsInvalid.ts, 14, 25))
->c : Symbol(c, Decl(for-inStatementsInvalid.ts, 14, 3))
->d : Symbol(d, Decl(for-inStatementsInvalid.ts, 14, 15))
+>e : Symbol(e, Decl(for-inStatementsInvalid.ts, 14, 33))
+>c : Symbol(c, Decl(for-inStatementsInvalid.ts, 14, 11))
+>d : Symbol(d, Decl(for-inStatementsInvalid.ts, 14, 23))
 
 for (var x in 42 ? c : d) { }
 >x : Symbol(x, Decl(for-inStatementsInvalid.ts, 12, 8), Decl(for-inStatementsInvalid.ts, 16, 8), Decl(for-inStatementsInvalid.ts, 17, 8), Decl(for-inStatementsInvalid.ts, 18, 8), Decl(for-inStatementsInvalid.ts, 19, 8) ... and 5 more)
->c : Symbol(c, Decl(for-inStatementsInvalid.ts, 14, 3))
->d : Symbol(d, Decl(for-inStatementsInvalid.ts, 14, 15))
+>c : Symbol(c, Decl(for-inStatementsInvalid.ts, 14, 11))
+>d : Symbol(d, Decl(for-inStatementsInvalid.ts, 14, 23))
 
 for (var x in '' ? c : d) { }
 >x : Symbol(x, Decl(for-inStatementsInvalid.ts, 12, 8), Decl(for-inStatementsInvalid.ts, 16, 8), Decl(for-inStatementsInvalid.ts, 17, 8), Decl(for-inStatementsInvalid.ts, 18, 8), Decl(for-inStatementsInvalid.ts, 19, 8) ... and 5 more)
->c : Symbol(c, Decl(for-inStatementsInvalid.ts, 14, 3))
->d : Symbol(d, Decl(for-inStatementsInvalid.ts, 14, 15))
+>c : Symbol(c, Decl(for-inStatementsInvalid.ts, 14, 11))
+>d : Symbol(d, Decl(for-inStatementsInvalid.ts, 14, 23))
 
 for (var x in 42 ? d[x] : c[x]) { }
 >x : Symbol(x, Decl(for-inStatementsInvalid.ts, 12, 8), Decl(for-inStatementsInvalid.ts, 16, 8), Decl(for-inStatementsInvalid.ts, 17, 8), Decl(for-inStatementsInvalid.ts, 18, 8), Decl(for-inStatementsInvalid.ts, 19, 8) ... and 5 more)
->d : Symbol(d, Decl(for-inStatementsInvalid.ts, 14, 15))
+>d : Symbol(d, Decl(for-inStatementsInvalid.ts, 14, 23))
 >x : Symbol(x, Decl(for-inStatementsInvalid.ts, 12, 8), Decl(for-inStatementsInvalid.ts, 16, 8), Decl(for-inStatementsInvalid.ts, 17, 8), Decl(for-inStatementsInvalid.ts, 18, 8), Decl(for-inStatementsInvalid.ts, 19, 8) ... and 5 more)
->c : Symbol(c, Decl(for-inStatementsInvalid.ts, 14, 3))
+>c : Symbol(c, Decl(for-inStatementsInvalid.ts, 14, 11))
 >x : Symbol(x, Decl(for-inStatementsInvalid.ts, 12, 8), Decl(for-inStatementsInvalid.ts, 16, 8), Decl(for-inStatementsInvalid.ts, 17, 8), Decl(for-inStatementsInvalid.ts, 18, 8), Decl(for-inStatementsInvalid.ts, 19, 8) ... and 5 more)
 
 for (var x in c[23]) { }
 >x : Symbol(x, Decl(for-inStatementsInvalid.ts, 12, 8), Decl(for-inStatementsInvalid.ts, 16, 8), Decl(for-inStatementsInvalid.ts, 17, 8), Decl(for-inStatementsInvalid.ts, 18, 8), Decl(for-inStatementsInvalid.ts, 19, 8) ... and 5 more)
->c : Symbol(c, Decl(for-inStatementsInvalid.ts, 14, 3))
+>c : Symbol(c, Decl(for-inStatementsInvalid.ts, 14, 11))
 
 for (var x in (<T>(x: T) => x)) { }
 >x : Symbol(x, Decl(for-inStatementsInvalid.ts, 12, 8), Decl(for-inStatementsInvalid.ts, 16, 8), Decl(for-inStatementsInvalid.ts, 17, 8), Decl(for-inStatementsInvalid.ts, 18, 8), Decl(for-inStatementsInvalid.ts, 19, 8) ... and 5 more)
@@ -177,11 +177,11 @@ interface I {
     [idx: number]: number;
 >idx : Symbol(idx, Decl(for-inStatementsInvalid.ts, 57, 5))
 }
-var i: I;
->i : Symbol(i, Decl(for-inStatementsInvalid.ts, 59, 3))
+declare var i: I;
+>i : Symbol(i, Decl(for-inStatementsInvalid.ts, 59, 11))
 >I : Symbol(I, Decl(for-inStatementsInvalid.ts, 53, 1))
 
 for (var x in i[42]) { } 
 >x : Symbol(x, Decl(for-inStatementsInvalid.ts, 12, 8), Decl(for-inStatementsInvalid.ts, 16, 8), Decl(for-inStatementsInvalid.ts, 17, 8), Decl(for-inStatementsInvalid.ts, 18, 8), Decl(for-inStatementsInvalid.ts, 19, 8) ... and 5 more)
->i : Symbol(i, Decl(for-inStatementsInvalid.ts, 59, 3))
+>i : Symbol(i, Decl(for-inStatementsInvalid.ts, 59, 11))
 
diff --git a/tests/baselines/reference/for-inStatementsInvalid.types b/tests/baselines/reference/for-inStatementsInvalid.types
index ea0ed3308dbee..b73d980f5f43c 100644
--- a/tests/baselines/reference/for-inStatementsInvalid.types
+++ b/tests/baselines/reference/for-inStatementsInvalid.types
@@ -49,7 +49,7 @@ for (var x in fn()) { }
 >fn : () => void
 >   : ^^^^^^    
 
-var c : string, d:string, e;
+declare var c : string, d:string, e: any;
 >c : string
 >  : ^^^^^^
 >d : string
@@ -309,7 +309,7 @@ interface I {
 >idx : number
 >    : ^^^^^^
 }
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
diff --git a/tests/baselines/reference/for-of29.errors.txt b/tests/baselines/reference/for-of29.errors.txt
index f091e9dc9a694..a3e558be96170 100644
--- a/tests/baselines/reference/for-of29.errors.txt
+++ b/tests/baselines/reference/for-of29.errors.txt
@@ -2,7 +2,7 @@ for-of29.ts(5,15): error TS2488: Type '{ [Symbol.iterator]?(): Iterator<string,
 
 
 ==== for-of29.ts (1 errors) ====
-    var iterableWithOptionalIterator: {
+    declare var iterableWithOptionalIterator: {
         [Symbol.iterator]?(): Iterator<string>
     };
     
diff --git a/tests/baselines/reference/for-of29.js b/tests/baselines/reference/for-of29.js
index 3732c3984b4f5..af88e044ef90b 100644
--- a/tests/baselines/reference/for-of29.js
+++ b/tests/baselines/reference/for-of29.js
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/es6/for-ofStatements/for-of29.ts] ////
 
 //// [for-of29.ts]
-var iterableWithOptionalIterator: {
+declare var iterableWithOptionalIterator: {
     [Symbol.iterator]?(): Iterator<string>
 };
 
@@ -9,5 +9,4 @@ for (var v of iterableWithOptionalIterator) { }
 
 
 //// [for-of29.js]
-var iterableWithOptionalIterator;
 for (var v of iterableWithOptionalIterator) { }
diff --git a/tests/baselines/reference/for-of29.symbols b/tests/baselines/reference/for-of29.symbols
index f5fd41ad9e930..8fb517c235bc7 100644
--- a/tests/baselines/reference/for-of29.symbols
+++ b/tests/baselines/reference/for-of29.symbols
@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/es6/for-ofStatements/for-of29.ts] ////
 
 === for-of29.ts ===
-var iterableWithOptionalIterator: {
->iterableWithOptionalIterator : Symbol(iterableWithOptionalIterator, Decl(for-of29.ts, 0, 3))
+declare var iterableWithOptionalIterator: {
+>iterableWithOptionalIterator : Symbol(iterableWithOptionalIterator, Decl(for-of29.ts, 0, 11))
 
     [Symbol.iterator]?(): Iterator<string>
->[Symbol.iterator] : Symbol([Symbol.iterator], Decl(for-of29.ts, 0, 35))
+>[Symbol.iterator] : Symbol([Symbol.iterator], Decl(for-of29.ts, 0, 43))
 >Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --))
 >Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --))
@@ -15,5 +15,5 @@ var iterableWithOptionalIterator: {
 
 for (var v of iterableWithOptionalIterator) { }
 >v : Symbol(v, Decl(for-of29.ts, 4, 8))
->iterableWithOptionalIterator : Symbol(iterableWithOptionalIterator, Decl(for-of29.ts, 0, 3))
+>iterableWithOptionalIterator : Symbol(iterableWithOptionalIterator, Decl(for-of29.ts, 0, 11))
 
diff --git a/tests/baselines/reference/for-of29.types b/tests/baselines/reference/for-of29.types
index 40e024d7f4e23..c5f17f65344c2 100644
--- a/tests/baselines/reference/for-of29.types
+++ b/tests/baselines/reference/for-of29.types
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/es6/for-ofStatements/for-of29.ts] ////
 
 === for-of29.ts ===
-var iterableWithOptionalIterator: {
+declare var iterableWithOptionalIterator: {
 >iterableWithOptionalIterator : { [Symbol.iterator]?(): Iterator<string>; }
 >                             : ^^^^^^^^^^^^^^^^^^^^^^^^                ^^^
 
diff --git a/tests/baselines/reference/forInStatement2.errors.txt b/tests/baselines/reference/forInStatement2.errors.txt
index 3dce3358a237d..ac12250254cd5 100644
--- a/tests/baselines/reference/forInStatement2.errors.txt
+++ b/tests/baselines/reference/forInStatement2.errors.txt
@@ -2,7 +2,7 @@ forInStatement2.ts(2,15): error TS2407: The right-hand side of a 'for...in' stat
 
 
 ==== forInStatement2.ts (1 errors) ====
-    var expr: number;
+    declare var expr: number;
     for (var a in expr) {
                   ~~~~
 !!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type 'number'.
diff --git a/tests/baselines/reference/forInStatement2.js b/tests/baselines/reference/forInStatement2.js
index 278fa698159c1..add41eb72115e 100644
--- a/tests/baselines/reference/forInStatement2.js
+++ b/tests/baselines/reference/forInStatement2.js
@@ -1,11 +1,10 @@
 //// [tests/cases/compiler/forInStatement2.ts] ////
 
 //// [forInStatement2.ts]
-var expr: number;
+declare var expr: number;
 for (var a in expr) {
 }
 
 //// [forInStatement2.js]
-var expr;
 for (var a in expr) {
 }
diff --git a/tests/baselines/reference/forInStatement2.symbols b/tests/baselines/reference/forInStatement2.symbols
index bd9f29861487e..5ca02feff8ce5 100644
--- a/tests/baselines/reference/forInStatement2.symbols
+++ b/tests/baselines/reference/forInStatement2.symbols
@@ -1,10 +1,10 @@
 //// [tests/cases/compiler/forInStatement2.ts] ////
 
 === forInStatement2.ts ===
-var expr: number;
->expr : Symbol(expr, Decl(forInStatement2.ts, 0, 3))
+declare var expr: number;
+>expr : Symbol(expr, Decl(forInStatement2.ts, 0, 11))
 
 for (var a in expr) {
 >a : Symbol(a, Decl(forInStatement2.ts, 1, 8))
->expr : Symbol(expr, Decl(forInStatement2.ts, 0, 3))
+>expr : Symbol(expr, Decl(forInStatement2.ts, 0, 11))
 }
diff --git a/tests/baselines/reference/forInStatement2.types b/tests/baselines/reference/forInStatement2.types
index 93f794b90db22..726f19c35ab24 100644
--- a/tests/baselines/reference/forInStatement2.types
+++ b/tests/baselines/reference/forInStatement2.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/forInStatement2.ts] ////
 
 === forInStatement2.ts ===
-var expr: number;
+declare var expr: number;
 >expr : number
 >     : ^^^^^^
 
diff --git a/tests/baselines/reference/functionAssignment.errors.txt b/tests/baselines/reference/functionAssignment.errors.txt
index 982a089eb561b..a519d7cb88436 100644
--- a/tests/baselines/reference/functionAssignment.errors.txt
+++ b/tests/baselines/reference/functionAssignment.errors.txt
@@ -14,8 +14,8 @@ functionAssignment.ts(34,17): error TS2339: Property 'length' does not exist on
         get(callback: Function): number;
     }
     
-    var barbaz: baz;
-    var test: foo;
+    declare var barbaz: baz;
+    declare var test: foo;
     
     test.get(function (param) {
         var x = barbaz.get(function () { });
diff --git a/tests/baselines/reference/functionAssignment.js b/tests/baselines/reference/functionAssignment.js
index 35df5b337993f..41f3940947ef6 100644
--- a/tests/baselines/reference/functionAssignment.js
+++ b/tests/baselines/reference/functionAssignment.js
@@ -12,8 +12,8 @@ interface baz {
     get(callback: Function): number;
 }
 
-var barbaz: baz;
-var test: foo;
+declare var barbaz: baz;
+declare var test: foo;
 
 test.get(function (param) {
     var x = barbaz.get(function () { });
@@ -42,8 +42,6 @@ callb((a) =>{ a.length; });
 //// [functionAssignment.js]
 function f(n) { }
 f(function () { });
-var barbaz;
-var test;
 test.get(function (param) {
     var x = barbaz.get(function () { });
 });
diff --git a/tests/baselines/reference/functionAssignment.symbols b/tests/baselines/reference/functionAssignment.symbols
index 9b953dedb821c..daa76198e22c6 100644
--- a/tests/baselines/reference/functionAssignment.symbols
+++ b/tests/baselines/reference/functionAssignment.symbols
@@ -27,24 +27,24 @@ interface baz {
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
 
-var barbaz: baz;
->barbaz : Symbol(barbaz, Decl(functionAssignment.ts, 11, 3))
+declare var barbaz: baz;
+>barbaz : Symbol(barbaz, Decl(functionAssignment.ts, 11, 11))
 >baz : Symbol(baz, Decl(functionAssignment.ts, 5, 1))
 
-var test: foo;
->test : Symbol(test, Decl(functionAssignment.ts, 12, 3))
+declare var test: foo;
+>test : Symbol(test, Decl(functionAssignment.ts, 12, 11))
 >foo : Symbol(foo, Decl(functionAssignment.ts, 1, 19))
 
 test.get(function (param) {
 >test.get : Symbol(foo.get, Decl(functionAssignment.ts, 3, 15))
->test : Symbol(test, Decl(functionAssignment.ts, 12, 3))
+>test : Symbol(test, Decl(functionAssignment.ts, 12, 11))
 >get : Symbol(foo.get, Decl(functionAssignment.ts, 3, 15))
 >param : Symbol(param, Decl(functionAssignment.ts, 14, 19))
 
     var x = barbaz.get(function () { });
 >x : Symbol(x, Decl(functionAssignment.ts, 15, 7))
 >barbaz.get : Symbol(baz.get, Decl(functionAssignment.ts, 7, 15))
->barbaz : Symbol(barbaz, Decl(functionAssignment.ts, 11, 3))
+>barbaz : Symbol(barbaz, Decl(functionAssignment.ts, 11, 11))
 >get : Symbol(baz.get, Decl(functionAssignment.ts, 7, 15))
 
 });
diff --git a/tests/baselines/reference/functionAssignment.types b/tests/baselines/reference/functionAssignment.types
index 876013f12baaa..7921805c74738 100644
--- a/tests/baselines/reference/functionAssignment.types
+++ b/tests/baselines/reference/functionAssignment.types
@@ -33,11 +33,11 @@ interface baz {
 >         : ^^^^^^^^
 }
 
-var barbaz: baz;
+declare var barbaz: baz;
 >barbaz : baz
 >       : ^^^
 
-var test: foo;
+declare var test: foo;
 >test : foo
 >     : ^^^
 
diff --git a/tests/baselines/reference/functionCalls.errors.txt b/tests/baselines/reference/functionCalls.errors.txt
index 012b4d7d31f07..8b323c2a9b768 100644
--- a/tests/baselines/reference/functionCalls.errors.txt
+++ b/tests/baselines/reference/functionCalls.errors.txt
@@ -11,7 +11,7 @@ functionCalls.ts(34,1): error TS2347: Untyped function calls may not accept type
 
 ==== functionCalls.ts (9 errors) ====
     // Invoke function call on value of type 'any' with no type arguments
-    var anyVar: any;
+    declare var anyVar: any;
     anyVar(0);
     anyVar('');
     
@@ -32,7 +32,7 @@ functionCalls.ts(34,1): error TS2347: Untyped function calls may not accept type
     interface SubFunc extends Function {
         prop: number;
     }
-    var subFunc: SubFunc;
+    declare var subFunc: SubFunc;
     subFunc(0);
     subFunc('');
     subFunc();
@@ -52,7 +52,7 @@ functionCalls.ts(34,1): error TS2347: Untyped function calls may not accept type
     
     // Invoke function call on value of type Function with no call signatures with type arguments
     // These should be errors
-    var func: Function;
+    declare var func: Function;
     func<number>(0);
     ~~~~~~~~~~~~~~~
 !!! error TS2347: Untyped function calls may not accept type arguments.
diff --git a/tests/baselines/reference/functionCalls.js b/tests/baselines/reference/functionCalls.js
index 5ccc866468131..bfddf4005e54c 100644
--- a/tests/baselines/reference/functionCalls.js
+++ b/tests/baselines/reference/functionCalls.js
@@ -2,7 +2,7 @@
 
 //// [functionCalls.ts]
 // Invoke function call on value of type 'any' with no type arguments
-var anyVar: any;
+declare var anyVar: any;
 anyVar(0);
 anyVar('');
 
@@ -17,7 +17,7 @@ anyVar<Window>(undefined);
 interface SubFunc extends Function {
     prop: number;
 }
-var subFunc: SubFunc;
+declare var subFunc: SubFunc;
 subFunc(0);
 subFunc('');
 subFunc();
@@ -31,15 +31,13 @@ subFunc<any>();
 
 // Invoke function call on value of type Function with no call signatures with type arguments
 // These should be errors
-var func: Function;
+declare var func: Function;
 func<number>(0);
 func<string>('');
 func<any>();
 
 
 //// [functionCalls.js]
-// Invoke function call on value of type 'any' with no type arguments
-var anyVar;
 anyVar(0);
 anyVar('');
 // Invoke function call on value of type 'any' with type arguments
@@ -47,7 +45,6 @@ anyVar('');
 anyVar('hello');
 anyVar();
 anyVar(undefined);
-var subFunc;
 subFunc(0);
 subFunc('');
 subFunc();
@@ -56,9 +53,6 @@ subFunc();
 subFunc(0);
 subFunc('');
 subFunc();
-// Invoke function call on value of type Function with no call signatures with type arguments
-// These should be errors
-var func;
 func(0);
 func('');
 func();
diff --git a/tests/baselines/reference/functionCalls.symbols b/tests/baselines/reference/functionCalls.symbols
index aa239dd6ca40a..fdf6df168178f 100644
--- a/tests/baselines/reference/functionCalls.symbols
+++ b/tests/baselines/reference/functionCalls.symbols
@@ -2,25 +2,25 @@
 
 === functionCalls.ts ===
 // Invoke function call on value of type 'any' with no type arguments
-var anyVar: any;
->anyVar : Symbol(anyVar, Decl(functionCalls.ts, 1, 3))
+declare var anyVar: any;
+>anyVar : Symbol(anyVar, Decl(functionCalls.ts, 1, 11))
 
 anyVar(0);
->anyVar : Symbol(anyVar, Decl(functionCalls.ts, 1, 3))
+>anyVar : Symbol(anyVar, Decl(functionCalls.ts, 1, 11))
 
 anyVar('');
->anyVar : Symbol(anyVar, Decl(functionCalls.ts, 1, 3))
+>anyVar : Symbol(anyVar, Decl(functionCalls.ts, 1, 11))
 
 // Invoke function call on value of type 'any' with type arguments
 // These should be errors
 anyVar<string>('hello');
->anyVar : Symbol(anyVar, Decl(functionCalls.ts, 1, 3))
+>anyVar : Symbol(anyVar, Decl(functionCalls.ts, 1, 11))
 
 anyVar<number>();
->anyVar : Symbol(anyVar, Decl(functionCalls.ts, 1, 3))
+>anyVar : Symbol(anyVar, Decl(functionCalls.ts, 1, 11))
 
 anyVar<Window>(undefined);
->anyVar : Symbol(anyVar, Decl(functionCalls.ts, 1, 3))
+>anyVar : Symbol(anyVar, Decl(functionCalls.ts, 1, 11))
 >Window : Symbol(Window, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
 >undefined : Symbol(undefined)
 
@@ -33,43 +33,43 @@ interface SubFunc extends Function {
     prop: number;
 >prop : Symbol(SubFunc.prop, Decl(functionCalls.ts, 13, 36))
 }
-var subFunc: SubFunc;
->subFunc : Symbol(subFunc, Decl(functionCalls.ts, 16, 3))
+declare var subFunc: SubFunc;
+>subFunc : Symbol(subFunc, Decl(functionCalls.ts, 16, 11))
 >SubFunc : Symbol(SubFunc, Decl(functionCalls.ts, 9, 26))
 
 subFunc(0);
->subFunc : Symbol(subFunc, Decl(functionCalls.ts, 16, 3))
+>subFunc : Symbol(subFunc, Decl(functionCalls.ts, 16, 11))
 
 subFunc('');
->subFunc : Symbol(subFunc, Decl(functionCalls.ts, 16, 3))
+>subFunc : Symbol(subFunc, Decl(functionCalls.ts, 16, 11))
 
 subFunc();
->subFunc : Symbol(subFunc, Decl(functionCalls.ts, 16, 3))
+>subFunc : Symbol(subFunc, Decl(functionCalls.ts, 16, 11))
 
 
 // Invoke function call on value of a subtype of Function with no call signatures with type arguments
 // These should be errors
 subFunc<number>(0);
->subFunc : Symbol(subFunc, Decl(functionCalls.ts, 16, 3))
+>subFunc : Symbol(subFunc, Decl(functionCalls.ts, 16, 11))
 
 subFunc<string>('');
->subFunc : Symbol(subFunc, Decl(functionCalls.ts, 16, 3))
+>subFunc : Symbol(subFunc, Decl(functionCalls.ts, 16, 11))
 
 subFunc<any>();
->subFunc : Symbol(subFunc, Decl(functionCalls.ts, 16, 3))
+>subFunc : Symbol(subFunc, Decl(functionCalls.ts, 16, 11))
 
 // Invoke function call on value of type Function with no call signatures with type arguments
 // These should be errors
-var func: Function;
->func : Symbol(func, Decl(functionCalls.ts, 30, 3))
+declare var func: Function;
+>func : Symbol(func, Decl(functionCalls.ts, 30, 11))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 func<number>(0);
->func : Symbol(func, Decl(functionCalls.ts, 30, 3))
+>func : Symbol(func, Decl(functionCalls.ts, 30, 11))
 
 func<string>('');
->func : Symbol(func, Decl(functionCalls.ts, 30, 3))
+>func : Symbol(func, Decl(functionCalls.ts, 30, 11))
 
 func<any>();
->func : Symbol(func, Decl(functionCalls.ts, 30, 3))
+>func : Symbol(func, Decl(functionCalls.ts, 30, 11))
 
diff --git a/tests/baselines/reference/functionCalls.types b/tests/baselines/reference/functionCalls.types
index 9990a3e264ec5..7eb067001401d 100644
--- a/tests/baselines/reference/functionCalls.types
+++ b/tests/baselines/reference/functionCalls.types
@@ -2,7 +2,7 @@
 
 === functionCalls.ts ===
 // Invoke function call on value of type 'any' with no type arguments
-var anyVar: any;
+declare var anyVar: any;
 >anyVar : any
 >       : ^^^
 
@@ -53,7 +53,7 @@ interface SubFunc extends Function {
 >prop : number
 >     : ^^^^^^
 }
-var subFunc: SubFunc;
+declare var subFunc: SubFunc;
 >subFunc : SubFunc
 >        : ^^^^^^^
 
@@ -106,7 +106,7 @@ subFunc<any>();
 
 // Invoke function call on value of type Function with no call signatures with type arguments
 // These should be errors
-var func: Function;
+declare var func: Function;
 >func : Function
 >     : ^^^^^^^^
 
diff --git a/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt b/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt
index d9249711d1d6a..18067aaf8f2b3 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt
+++ b/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt
@@ -48,13 +48,13 @@ functionConstraintSatisfaction2.ts(38,10): error TS2345: Argument of type 'U' is
         foo: string;
     }
     
-    var b: { new (x: string): string };
+    declare var b: { new (x: string): string };
     
     class C2<T> {
         foo: T;
     }
     
-    var b2: { new <T>(x: T): T };
+    declare var b2: { new <T>(x: T): T };
     
     var r = foo2(new Function());
                  ~~~~~~~~~~~~~~
@@ -88,7 +88,7 @@ functionConstraintSatisfaction2.ts(38,10): error TS2345: Argument of type 'U' is
 !!! error TS2345:   Type 'new <T>(x: T) => T' provides no match for the signature '(x: string): string'.
     
     interface F2 extends Function { foo: string; }
-    var f2: F2;
+    declare var f2: F2;
     var r16 = foo2(f2);
                    ~~
 !!! error TS2345: Argument of type 'F2' is not assignable to parameter of type '(x: string) => string'.
diff --git a/tests/baselines/reference/functionConstraintSatisfaction2.js b/tests/baselines/reference/functionConstraintSatisfaction2.js
index d35a77a52238f..151b325a843bf 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction2.js
+++ b/tests/baselines/reference/functionConstraintSatisfaction2.js
@@ -15,13 +15,13 @@ class C {
     foo: string;
 }
 
-var b: { new (x: string): string };
+declare var b: { new (x: string): string };
 
 class C2<T> {
     foo: T;
 }
 
-var b2: { new <T>(x: T): T };
+declare var b2: { new <T>(x: T): T };
 
 var r = foo2(new Function());
 var r2 = foo2((x: string[]) => x);
@@ -33,7 +33,7 @@ var r13 = foo2(C2);
 var r14 = foo2(b2);
 
 interface F2 extends Function { foo: string; }
-var f2: F2;
+declare var f2: F2;
 var r16 = foo2(f2);
 
 function fff<T extends { (): void }, U extends T>(x: T, y: U) {
@@ -54,13 +54,11 @@ var C = /** @class */ (function () {
     }
     return C;
 }());
-var b;
 var C2 = /** @class */ (function () {
     function C2() {
     }
     return C2;
 }());
-var b2;
 var r = foo2(new Function());
 var r2 = foo2(function (x) { return x; });
 var r6 = foo2(C);
@@ -69,7 +67,6 @@ var r8 = foo2(function (x) { return x; }); // no error expected
 var r11 = foo2(function (x, y) { return x; });
 var r13 = foo2(C2);
 var r14 = foo2(b2);
-var f2;
 var r16 = foo2(f2);
 function fff(x, y) {
     foo2(x);
diff --git a/tests/baselines/reference/functionConstraintSatisfaction2.symbols b/tests/baselines/reference/functionConstraintSatisfaction2.symbols
index 6a81fcd74ed75..0553c98b6119d 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction2.symbols
+++ b/tests/baselines/reference/functionConstraintSatisfaction2.symbols
@@ -37,12 +37,12 @@ class C {
 >foo : Symbol(C.foo, Decl(functionConstraintSatisfaction2.ts, 10, 9))
 }
 
-var b: { new (x: string): string };
->b : Symbol(b, Decl(functionConstraintSatisfaction2.ts, 14, 3))
->x : Symbol(x, Decl(functionConstraintSatisfaction2.ts, 14, 14))
+declare var b: { new (x: string): string };
+>b : Symbol(b, Decl(functionConstraintSatisfaction2.ts, 14, 11))
+>x : Symbol(x, Decl(functionConstraintSatisfaction2.ts, 14, 22))
 
 class C2<T> {
->C2 : Symbol(C2, Decl(functionConstraintSatisfaction2.ts, 14, 35))
+>C2 : Symbol(C2, Decl(functionConstraintSatisfaction2.ts, 14, 43))
 >T : Symbol(T, Decl(functionConstraintSatisfaction2.ts, 16, 9))
 
     foo: T;
@@ -50,12 +50,12 @@ class C2<T> {
 >T : Symbol(T, Decl(functionConstraintSatisfaction2.ts, 16, 9))
 }
 
-var b2: { new <T>(x: T): T };
->b2 : Symbol(b2, Decl(functionConstraintSatisfaction2.ts, 20, 3))
->T : Symbol(T, Decl(functionConstraintSatisfaction2.ts, 20, 15))
->x : Symbol(x, Decl(functionConstraintSatisfaction2.ts, 20, 18))
->T : Symbol(T, Decl(functionConstraintSatisfaction2.ts, 20, 15))
->T : Symbol(T, Decl(functionConstraintSatisfaction2.ts, 20, 15))
+declare var b2: { new <T>(x: T): T };
+>b2 : Symbol(b2, Decl(functionConstraintSatisfaction2.ts, 20, 11))
+>T : Symbol(T, Decl(functionConstraintSatisfaction2.ts, 20, 23))
+>x : Symbol(x, Decl(functionConstraintSatisfaction2.ts, 20, 26))
+>T : Symbol(T, Decl(functionConstraintSatisfaction2.ts, 20, 23))
+>T : Symbol(T, Decl(functionConstraintSatisfaction2.ts, 20, 23))
 
 var r = foo2(new Function());
 >r : Symbol(r, Decl(functionConstraintSatisfaction2.ts, 22, 3))
@@ -76,7 +76,7 @@ var r6 = foo2(C);
 var r7 = foo2(b);
 >r7 : Symbol(r7, Decl(functionConstraintSatisfaction2.ts, 25, 3))
 >foo2 : Symbol(foo2, Decl(functionConstraintSatisfaction2.ts, 6, 18))
->b : Symbol(b, Decl(functionConstraintSatisfaction2.ts, 14, 3))
+>b : Symbol(b, Decl(functionConstraintSatisfaction2.ts, 14, 11))
 
 var r8 = foo2(<U>(x: U) => x); // no error expected
 >r8 : Symbol(r8, Decl(functionConstraintSatisfaction2.ts, 26, 3))
@@ -100,26 +100,26 @@ var r11 = foo2(<U, V>(x: U, y: V) => x);
 var r13 = foo2(C2);
 >r13 : Symbol(r13, Decl(functionConstraintSatisfaction2.ts, 28, 3))
 >foo2 : Symbol(foo2, Decl(functionConstraintSatisfaction2.ts, 6, 18))
->C2 : Symbol(C2, Decl(functionConstraintSatisfaction2.ts, 14, 35))
+>C2 : Symbol(C2, Decl(functionConstraintSatisfaction2.ts, 14, 43))
 
 var r14 = foo2(b2);
 >r14 : Symbol(r14, Decl(functionConstraintSatisfaction2.ts, 29, 3))
 >foo2 : Symbol(foo2, Decl(functionConstraintSatisfaction2.ts, 6, 18))
->b2 : Symbol(b2, Decl(functionConstraintSatisfaction2.ts, 20, 3))
+>b2 : Symbol(b2, Decl(functionConstraintSatisfaction2.ts, 20, 11))
 
 interface F2 extends Function { foo: string; }
 >F2 : Symbol(F2, Decl(functionConstraintSatisfaction2.ts, 29, 19))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >foo : Symbol(F2.foo, Decl(functionConstraintSatisfaction2.ts, 31, 31))
 
-var f2: F2;
->f2 : Symbol(f2, Decl(functionConstraintSatisfaction2.ts, 32, 3))
+declare var f2: F2;
+>f2 : Symbol(f2, Decl(functionConstraintSatisfaction2.ts, 32, 11))
 >F2 : Symbol(F2, Decl(functionConstraintSatisfaction2.ts, 29, 19))
 
 var r16 = foo2(f2);
 >r16 : Symbol(r16, Decl(functionConstraintSatisfaction2.ts, 33, 3))
 >foo2 : Symbol(foo2, Decl(functionConstraintSatisfaction2.ts, 6, 18))
->f2 : Symbol(f2, Decl(functionConstraintSatisfaction2.ts, 32, 3))
+>f2 : Symbol(f2, Decl(functionConstraintSatisfaction2.ts, 32, 11))
 
 function fff<T extends { (): void }, U extends T>(x: T, y: U) {
 >fff : Symbol(fff, Decl(functionConstraintSatisfaction2.ts, 33, 19))
diff --git a/tests/baselines/reference/functionConstraintSatisfaction2.types b/tests/baselines/reference/functionConstraintSatisfaction2.types
index 01a26139c40db..4bee39fece8f3 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction2.types
+++ b/tests/baselines/reference/functionConstraintSatisfaction2.types
@@ -58,7 +58,7 @@ class C {
 >    : ^^^^^^
 }
 
-var b: { new (x: string): string };
+declare var b: { new (x: string): string };
 >b : new (x: string) => string
 >  : ^^^^^ ^^      ^^^^^      
 >x : string
@@ -73,7 +73,7 @@ class C2<T> {
 >    : ^
 }
 
-var b2: { new <T>(x: T): T };
+declare var b2: { new <T>(x: T): T };
 >b2 : new <T>(x: T) => T
 >   : ^^^^^ ^^ ^^ ^^^^^ 
 >x : T
@@ -179,7 +179,7 @@ interface F2 extends Function { foo: string; }
 >foo : string
 >    : ^^^^^^
 
-var f2: F2;
+declare var f2: F2;
 >f2 : F2
 >   : ^^
 
diff --git a/tests/baselines/reference/functionImplementationErrors.errors.txt b/tests/baselines/reference/functionImplementationErrors.errors.txt
index 09a5987d82ae2..cc073249894d9 100644
--- a/tests/baselines/reference/functionImplementationErrors.errors.txt
+++ b/tests/baselines/reference/functionImplementationErrors.errors.txt
@@ -34,7 +34,7 @@ functionImplementationErrors.ts(40,1): error TS2839: This condition will always
 !!! error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
     }
     
-    var m;
+    declare var m: any;
     // Function signature with parameter initializer referencing in scope local variable
     function f6(n = m) {
                     ~
diff --git a/tests/baselines/reference/functionImplementationErrors.js b/tests/baselines/reference/functionImplementationErrors.js
index dbe978ed8d0db..455ee411b1d88 100644
--- a/tests/baselines/reference/functionImplementationErrors.js
+++ b/tests/baselines/reference/functionImplementationErrors.js
@@ -28,7 +28,7 @@ var f4 = function () {
 function f5(): number {
 }
 
-var m;
+declare var m: any;
 // Function signature with parameter initializer referencing in scope local variable
 function f6(n = m) {
     var m = 4;
@@ -116,7 +116,6 @@ var f4 = function () {
 // Function implemetnation with non -void return type annotation with no return
 function f5() {
 }
-var m;
 // Function signature with parameter initializer referencing in scope local variable
 function f6(n) {
     if (n === void 0) { n = m; }
diff --git a/tests/baselines/reference/functionImplementationErrors.symbols b/tests/baselines/reference/functionImplementationErrors.symbols
index 3c207c5a95d2d..f652ac2accbca 100644
--- a/tests/baselines/reference/functionImplementationErrors.symbols
+++ b/tests/baselines/reference/functionImplementationErrors.symbols
@@ -38,12 +38,12 @@ function f5(): number {
 >f5 : Symbol(f5, Decl(functionImplementationErrors.ts, 21, 1))
 }
 
-var m;
->m : Symbol(m, Decl(functionImplementationErrors.ts, 27, 3))
+declare var m: any;
+>m : Symbol(m, Decl(functionImplementationErrors.ts, 27, 11))
 
 // Function signature with parameter initializer referencing in scope local variable
 function f6(n = m) {
->f6 : Symbol(f6, Decl(functionImplementationErrors.ts, 27, 6))
+>f6 : Symbol(f6, Decl(functionImplementationErrors.ts, 27, 19))
 >n : Symbol(n, Decl(functionImplementationErrors.ts, 29, 12))
 >m : Symbol(m, Decl(functionImplementationErrors.ts, 30, 7))
 
diff --git a/tests/baselines/reference/functionImplementationErrors.types b/tests/baselines/reference/functionImplementationErrors.types
index 271ed68920ce6..4d80ab0a83e53 100644
--- a/tests/baselines/reference/functionImplementationErrors.types
+++ b/tests/baselines/reference/functionImplementationErrors.types
@@ -82,7 +82,7 @@ function f5(): number {
 >   : ^^^^^^      
 }
 
-var m;
+declare var m: any;
 >m : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/functionSignatureAssignmentCompat1.errors.txt b/tests/baselines/reference/functionSignatureAssignmentCompat1.errors.txt
index 2fdf76333c55e..988841db3e316 100644
--- a/tests/baselines/reference/functionSignatureAssignmentCompat1.errors.txt
+++ b/tests/baselines/reference/functionSignatureAssignmentCompat1.errors.txt
@@ -11,7 +11,7 @@ functionSignatureAssignmentCompat1.ts(10,21): error TS2322: Type '(delimiter?: s
         raw: ParserFunc;
         readline(delimiter?: string): ParserFunc;
     }
-    var parsers: Parsers;
+    declare var parsers: Parsers;
     var c: ParserFunc = parsers.raw; // ok!
     var d: ParserFunc = parsers.readline; // not ok
                         ~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/functionSignatureAssignmentCompat1.js b/tests/baselines/reference/functionSignatureAssignmentCompat1.js
index a690b5846a02b..1657fc8fcfade 100644
--- a/tests/baselines/reference/functionSignatureAssignmentCompat1.js
+++ b/tests/baselines/reference/functionSignatureAssignmentCompat1.js
@@ -8,13 +8,12 @@ interface Parsers {
     raw: ParserFunc;
     readline(delimiter?: string): ParserFunc;
 }
-var parsers: Parsers;
+declare var parsers: Parsers;
 var c: ParserFunc = parsers.raw; // ok!
 var d: ParserFunc = parsers.readline; // not ok
 var e: ParserFunc = parsers.readline(); // ok
 
 //// [functionSignatureAssignmentCompat1.js]
-var parsers;
 var c = parsers.raw; // ok!
 var d = parsers.readline; // not ok
 var e = parsers.readline(); // ok
diff --git a/tests/baselines/reference/functionSignatureAssignmentCompat1.symbols b/tests/baselines/reference/functionSignatureAssignmentCompat1.symbols
index 3a71520281b9f..3eaf2f70fa5b3 100644
--- a/tests/baselines/reference/functionSignatureAssignmentCompat1.symbols
+++ b/tests/baselines/reference/functionSignatureAssignmentCompat1.symbols
@@ -20,28 +20,28 @@ interface Parsers {
 >delimiter : Symbol(delimiter, Decl(functionSignatureAssignmentCompat1.ts, 5, 13))
 >ParserFunc : Symbol(ParserFunc, Decl(functionSignatureAssignmentCompat1.ts, 0, 0))
 }
-var parsers: Parsers;
->parsers : Symbol(parsers, Decl(functionSignatureAssignmentCompat1.ts, 7, 3))
+declare var parsers: Parsers;
+>parsers : Symbol(parsers, Decl(functionSignatureAssignmentCompat1.ts, 7, 11))
 >Parsers : Symbol(Parsers, Decl(functionSignatureAssignmentCompat1.ts, 2, 1))
 
 var c: ParserFunc = parsers.raw; // ok!
 >c : Symbol(c, Decl(functionSignatureAssignmentCompat1.ts, 8, 3))
 >ParserFunc : Symbol(ParserFunc, Decl(functionSignatureAssignmentCompat1.ts, 0, 0))
 >parsers.raw : Symbol(Parsers.raw, Decl(functionSignatureAssignmentCompat1.ts, 3, 19))
->parsers : Symbol(parsers, Decl(functionSignatureAssignmentCompat1.ts, 7, 3))
+>parsers : Symbol(parsers, Decl(functionSignatureAssignmentCompat1.ts, 7, 11))
 >raw : Symbol(Parsers.raw, Decl(functionSignatureAssignmentCompat1.ts, 3, 19))
 
 var d: ParserFunc = parsers.readline; // not ok
 >d : Symbol(d, Decl(functionSignatureAssignmentCompat1.ts, 9, 3))
 >ParserFunc : Symbol(ParserFunc, Decl(functionSignatureAssignmentCompat1.ts, 0, 0))
 >parsers.readline : Symbol(Parsers.readline, Decl(functionSignatureAssignmentCompat1.ts, 4, 20))
->parsers : Symbol(parsers, Decl(functionSignatureAssignmentCompat1.ts, 7, 3))
+>parsers : Symbol(parsers, Decl(functionSignatureAssignmentCompat1.ts, 7, 11))
 >readline : Symbol(Parsers.readline, Decl(functionSignatureAssignmentCompat1.ts, 4, 20))
 
 var e: ParserFunc = parsers.readline(); // ok
 >e : Symbol(e, Decl(functionSignatureAssignmentCompat1.ts, 10, 3))
 >ParserFunc : Symbol(ParserFunc, Decl(functionSignatureAssignmentCompat1.ts, 0, 0))
 >parsers.readline : Symbol(Parsers.readline, Decl(functionSignatureAssignmentCompat1.ts, 4, 20))
->parsers : Symbol(parsers, Decl(functionSignatureAssignmentCompat1.ts, 7, 3))
+>parsers : Symbol(parsers, Decl(functionSignatureAssignmentCompat1.ts, 7, 11))
 >readline : Symbol(Parsers.readline, Decl(functionSignatureAssignmentCompat1.ts, 4, 20))
 
diff --git a/tests/baselines/reference/functionSignatureAssignmentCompat1.types b/tests/baselines/reference/functionSignatureAssignmentCompat1.types
index aa105d377e866..645cdb37ff6c3 100644
--- a/tests/baselines/reference/functionSignatureAssignmentCompat1.types
+++ b/tests/baselines/reference/functionSignatureAssignmentCompat1.types
@@ -19,7 +19,7 @@ interface Parsers {
 >delimiter : string
 >          : ^^^^^^
 }
-var parsers: Parsers;
+declare var parsers: Parsers;
 >parsers : Parsers
 >        : ^^^^^^^
 
diff --git a/tests/baselines/reference/genericArray0.js b/tests/baselines/reference/genericArray0.js
index 833ae661cc26f..b437091fcf95a 100644
--- a/tests/baselines/reference/genericArray0.js
+++ b/tests/baselines/reference/genericArray0.js
@@ -1,7 +1,6 @@
 //// [tests/cases/compiler/genericArray0.ts] ////
 
 //// [genericArray0.ts]
-
 var x:number[];
 
 
diff --git a/tests/baselines/reference/genericArray0.symbols b/tests/baselines/reference/genericArray0.symbols
index e06c294a93020..9ec736a1b1725 100644
--- a/tests/baselines/reference/genericArray0.symbols
+++ b/tests/baselines/reference/genericArray0.symbols
@@ -1,21 +1,20 @@
 //// [tests/cases/compiler/genericArray0.ts] ////
 
 === genericArray0.ts ===
-
 var x:number[];
->x : Symbol(x, Decl(genericArray0.ts, 1, 3))
+>x : Symbol(x, Decl(genericArray0.ts, 0, 3))
 
 
 var y = x; 
->y : Symbol(y, Decl(genericArray0.ts, 4, 3))
->x : Symbol(x, Decl(genericArray0.ts, 1, 3))
+>y : Symbol(y, Decl(genericArray0.ts, 3, 3))
+>x : Symbol(x, Decl(genericArray0.ts, 0, 3))
 
 function map<U>() {
->map : Symbol(map, Decl(genericArray0.ts, 4, 10))
->U : Symbol(U, Decl(genericArray0.ts, 6, 13))
+>map : Symbol(map, Decl(genericArray0.ts, 3, 10))
+>U : Symbol(U, Decl(genericArray0.ts, 5, 13))
 
     var ys: U[] = [];
->ys : Symbol(ys, Decl(genericArray0.ts, 7, 7))
->U : Symbol(U, Decl(genericArray0.ts, 6, 13))
+>ys : Symbol(ys, Decl(genericArray0.ts, 6, 7))
+>U : Symbol(U, Decl(genericArray0.ts, 5, 13))
 }
 
diff --git a/tests/baselines/reference/genericArray0.types b/tests/baselines/reference/genericArray0.types
index 0589420cc24d6..3947445ff7d56 100644
--- a/tests/baselines/reference/genericArray0.types
+++ b/tests/baselines/reference/genericArray0.types
@@ -1,7 +1,6 @@
 //// [tests/cases/compiler/genericArray0.ts] ////
 
 === genericArray0.ts ===
-
 var x:number[];
 >x : number[]
 >  : ^^^^^^^^
diff --git a/tests/baselines/reference/genericArrayAssignment1.errors.txt b/tests/baselines/reference/genericArrayAssignment1.errors.txt
index 039e094f86be5..c8e1989f43d64 100644
--- a/tests/baselines/reference/genericArrayAssignment1.errors.txt
+++ b/tests/baselines/reference/genericArrayAssignment1.errors.txt
@@ -3,8 +3,8 @@ genericArrayAssignment1.ts(4,1): error TS2322: Type 'number[]' is not assignable
 
 
 ==== genericArrayAssignment1.ts (1 errors) ====
-    var s: string[];
-    var n: number[];
+    declare var s: string[];
+    declare var n: number[];
     
     s = n;
     ~
diff --git a/tests/baselines/reference/genericArrayAssignment1.js b/tests/baselines/reference/genericArrayAssignment1.js
index b30ed6c06b804..98e3d9e1fae80 100644
--- a/tests/baselines/reference/genericArrayAssignment1.js
+++ b/tests/baselines/reference/genericArrayAssignment1.js
@@ -1,12 +1,10 @@
 //// [tests/cases/compiler/genericArrayAssignment1.ts] ////
 
 //// [genericArrayAssignment1.ts]
-var s: string[];
-var n: number[];
+declare var s: string[];
+declare var n: number[];
 
 s = n;
 
 //// [genericArrayAssignment1.js]
-var s;
-var n;
 s = n;
diff --git a/tests/baselines/reference/genericArrayAssignment1.symbols b/tests/baselines/reference/genericArrayAssignment1.symbols
index 0dfd89697648e..34ad263ccc457 100644
--- a/tests/baselines/reference/genericArrayAssignment1.symbols
+++ b/tests/baselines/reference/genericArrayAssignment1.symbols
@@ -1,13 +1,13 @@
 //// [tests/cases/compiler/genericArrayAssignment1.ts] ////
 
 === genericArrayAssignment1.ts ===
-var s: string[];
->s : Symbol(s, Decl(genericArrayAssignment1.ts, 0, 3))
+declare var s: string[];
+>s : Symbol(s, Decl(genericArrayAssignment1.ts, 0, 11))
 
-var n: number[];
->n : Symbol(n, Decl(genericArrayAssignment1.ts, 1, 3))
+declare var n: number[];
+>n : Symbol(n, Decl(genericArrayAssignment1.ts, 1, 11))
 
 s = n;
->s : Symbol(s, Decl(genericArrayAssignment1.ts, 0, 3))
->n : Symbol(n, Decl(genericArrayAssignment1.ts, 1, 3))
+>s : Symbol(s, Decl(genericArrayAssignment1.ts, 0, 11))
+>n : Symbol(n, Decl(genericArrayAssignment1.ts, 1, 11))
 
diff --git a/tests/baselines/reference/genericArrayAssignment1.types b/tests/baselines/reference/genericArrayAssignment1.types
index 889fde883863d..9d2b9b8e1e9b2 100644
--- a/tests/baselines/reference/genericArrayAssignment1.types
+++ b/tests/baselines/reference/genericArrayAssignment1.types
@@ -1,11 +1,11 @@
 //// [tests/cases/compiler/genericArrayAssignment1.ts] ////
 
 === genericArrayAssignment1.ts ===
-var s: string[];
+declare var s: string[];
 >s : string[]
 >  : ^^^^^^^^
 
-var n: number[];
+declare var n: number[];
 >n : number[]
 >  : ^^^^^^^^
 
diff --git a/tests/baselines/reference/genericArrayAssignmentCompatErrors.errors.txt b/tests/baselines/reference/genericArrayAssignmentCompatErrors.errors.txt
index 28dadd442cea2..4889c5fc4eddf 100644
--- a/tests/baselines/reference/genericArrayAssignmentCompatErrors.errors.txt
+++ b/tests/baselines/reference/genericArrayAssignmentCompatErrors.errors.txt
@@ -1,6 +1,6 @@
 genericArrayAssignmentCompatErrors.ts(2,19): error TS2351: This expression is not constructable.
   Type 'undefined[]' has no construct signatures.
-genericArrayAssignmentCompatErrors.ts(4,14): error TS2314: Generic type 'Array<T>' requires 1 type argument(s).
+genericArrayAssignmentCompatErrors.ts(4,22): error TS2314: Generic type 'Array<T>' requires 1 type argument(s).
 
 
 ==== genericArrayAssignmentCompatErrors.ts (2 errors) ====
@@ -10,10 +10,10 @@ genericArrayAssignmentCompatErrors.ts(4,14): error TS2314: Generic type 'Array<T
 !!! error TS2351: This expression is not constructable.
 !!! error TS2351:   Type 'undefined[]' has no construct signatures.
     var myCars3 = new Array({});
-    var myCars4: Array; // error
-                 ~~~~~
+    declare var myCars4: Array; // error
+                         ~~~~~
 !!! error TS2314: Generic type 'Array<T>' requires 1 type argument(s).
-    var myCars5: Array<any>[];
+    declare var myCars5: Array<any>[];
      
     myCars = myCars2;
     myCars = myCars3;
diff --git a/tests/baselines/reference/genericArrayAssignmentCompatErrors.js b/tests/baselines/reference/genericArrayAssignmentCompatErrors.js
index 2d01edfa6a4ca..4749c56a18b82 100644
--- a/tests/baselines/reference/genericArrayAssignmentCompatErrors.js
+++ b/tests/baselines/reference/genericArrayAssignmentCompatErrors.js
@@ -4,8 +4,8 @@
 var myCars=new Array(); 
 var myCars2 = new [];
 var myCars3 = new Array({});
-var myCars4: Array; // error
-var myCars5: Array<any>[];
+declare var myCars4: Array; // error
+declare var myCars5: Array<any>[];
  
 myCars = myCars2;
 myCars = myCars3;
@@ -27,8 +27,6 @@ myCars3 = myCars5;
 var myCars = new Array();
 var myCars2 = new [];
 var myCars3 = new Array({});
-var myCars4; // error
-var myCars5;
 myCars = myCars2;
 myCars = myCars3;
 myCars = myCars4;
diff --git a/tests/baselines/reference/genericArrayAssignmentCompatErrors.symbols b/tests/baselines/reference/genericArrayAssignmentCompatErrors.symbols
index 76c1c48e57f11..abc7201025b43 100644
--- a/tests/baselines/reference/genericArrayAssignmentCompatErrors.symbols
+++ b/tests/baselines/reference/genericArrayAssignmentCompatErrors.symbols
@@ -12,12 +12,12 @@ var myCars3 = new Array({});
 >myCars3 : Symbol(myCars3, Decl(genericArrayAssignmentCompatErrors.ts, 2, 3))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
-var myCars4: Array; // error
->myCars4 : Symbol(myCars4, Decl(genericArrayAssignmentCompatErrors.ts, 3, 3))
+declare var myCars4: Array; // error
+>myCars4 : Symbol(myCars4, Decl(genericArrayAssignmentCompatErrors.ts, 3, 11))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
-var myCars5: Array<any>[];
->myCars5 : Symbol(myCars5, Decl(genericArrayAssignmentCompatErrors.ts, 4, 3))
+declare var myCars5: Array<any>[];
+>myCars5 : Symbol(myCars5, Decl(genericArrayAssignmentCompatErrors.ts, 4, 11))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
  
 myCars = myCars2;
@@ -30,11 +30,11 @@ myCars = myCars3;
 
 myCars = myCars4;
 >myCars : Symbol(myCars, Decl(genericArrayAssignmentCompatErrors.ts, 0, 3))
->myCars4 : Symbol(myCars4, Decl(genericArrayAssignmentCompatErrors.ts, 3, 3))
+>myCars4 : Symbol(myCars4, Decl(genericArrayAssignmentCompatErrors.ts, 3, 11))
 
 myCars = myCars5;
 >myCars : Symbol(myCars, Decl(genericArrayAssignmentCompatErrors.ts, 0, 3))
->myCars5 : Symbol(myCars5, Decl(genericArrayAssignmentCompatErrors.ts, 4, 3))
+>myCars5 : Symbol(myCars5, Decl(genericArrayAssignmentCompatErrors.ts, 4, 11))
  
 myCars2 = myCars;
 >myCars2 : Symbol(myCars2, Decl(genericArrayAssignmentCompatErrors.ts, 1, 3))
@@ -46,11 +46,11 @@ myCars2 = myCars3;
 
 myCars2 = myCars4;
 >myCars2 : Symbol(myCars2, Decl(genericArrayAssignmentCompatErrors.ts, 1, 3))
->myCars4 : Symbol(myCars4, Decl(genericArrayAssignmentCompatErrors.ts, 3, 3))
+>myCars4 : Symbol(myCars4, Decl(genericArrayAssignmentCompatErrors.ts, 3, 11))
 
 myCars2 = myCars5;
 >myCars2 : Symbol(myCars2, Decl(genericArrayAssignmentCompatErrors.ts, 1, 3))
->myCars5 : Symbol(myCars5, Decl(genericArrayAssignmentCompatErrors.ts, 4, 3))
+>myCars5 : Symbol(myCars5, Decl(genericArrayAssignmentCompatErrors.ts, 4, 11))
  
 myCars3 = myCars;
 >myCars3 : Symbol(myCars3, Decl(genericArrayAssignmentCompatErrors.ts, 2, 3))
@@ -62,9 +62,9 @@ myCars3 = myCars2;
 
 myCars3 = myCars4;
 >myCars3 : Symbol(myCars3, Decl(genericArrayAssignmentCompatErrors.ts, 2, 3))
->myCars4 : Symbol(myCars4, Decl(genericArrayAssignmentCompatErrors.ts, 3, 3))
+>myCars4 : Symbol(myCars4, Decl(genericArrayAssignmentCompatErrors.ts, 3, 11))
 
 myCars3 = myCars5;   
 >myCars3 : Symbol(myCars3, Decl(genericArrayAssignmentCompatErrors.ts, 2, 3))
->myCars5 : Symbol(myCars5, Decl(genericArrayAssignmentCompatErrors.ts, 4, 3))
+>myCars5 : Symbol(myCars5, Decl(genericArrayAssignmentCompatErrors.ts, 4, 11))
 
diff --git a/tests/baselines/reference/genericArrayAssignmentCompatErrors.types b/tests/baselines/reference/genericArrayAssignmentCompatErrors.types
index 702114062d8ac..82f20185d7746 100644
--- a/tests/baselines/reference/genericArrayAssignmentCompatErrors.types
+++ b/tests/baselines/reference/genericArrayAssignmentCompatErrors.types
@@ -27,11 +27,11 @@ var myCars3 = new Array({});
 >{} : {}
 >   : ^^
 
-var myCars4: Array; // error
+declare var myCars4: Array; // error
 >myCars4 : any
 >        : ^^^
 
-var myCars5: Array<any>[];
+declare var myCars5: Array<any>[];
 >myCars5 : any[][]
 >        : ^^^^^^^
  
diff --git a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.errors.txt b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.errors.txt
index 01a2e085d3f9d..537e2569794d6 100644
--- a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.errors.txt
+++ b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.errors.txt
@@ -42,7 +42,7 @@ genericCallToOverloadedMethodWithOverloadedArguments.ts(84,38): error TS2769: No
     
         declare function testFunction(n: number): Promise<number>;
     
-        var numPromise: Promise<number>;
+        declare var numPromise: Promise<number>;
         var newPromise = numPromise.then(testFunction);
     }
     
@@ -56,7 +56,7 @@ genericCallToOverloadedMethodWithOverloadedArguments.ts(84,38): error TS2769: No
         declare function testFunction(n: number): Promise<number>;
         declare function testFunction(s: string): Promise<string>;
     
-        var numPromise: Promise<number>;
+        declare var numPromise: Promise<number>;
         var newPromise = numPromise.then(testFunction);
                                          ~~~~~~~~~~~~
 !!! error TS2345: Argument of type '{ (n: number): Promise<number>; (s: string): Promise<string>; }' is not assignable to parameter of type '(x: number) => Promise<string>'.
@@ -74,7 +74,7 @@ genericCallToOverloadedMethodWithOverloadedArguments.ts(84,38): error TS2769: No
     
         declare function testFunction(n: number): Promise<number>;
     
-        var numPromise: Promise<number>;
+        declare var numPromise: Promise<number>;
         var newPromise = numPromise.then(testFunction);
     }
     
@@ -89,7 +89,7 @@ genericCallToOverloadedMethodWithOverloadedArguments.ts(84,38): error TS2769: No
         declare function testFunction(n: number): Promise<number>;
         declare function testFunction(s: string): Promise<string>;
     
-        var numPromise: Promise<number>;
+        declare var numPromise: Promise<number>;
         var newPromise = numPromise.then(testFunction);
                                          ~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -115,7 +115,7 @@ genericCallToOverloadedMethodWithOverloadedArguments.ts(84,38): error TS2769: No
         declare function testFunction(n: number): Promise<number>;
         declare function testFunction(s: string): Promise<string>;
     
-        var numPromise: Promise<number>;
+        declare var numPromise: Promise<number>;
         var newPromise = numPromise.then(testFunction);
                                          ~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -145,7 +145,7 @@ genericCallToOverloadedMethodWithOverloadedArguments.ts(84,38): error TS2769: No
         declare function testFunction(s: string): Promise<string>;
         declare function testFunction(b: boolean): Promise<boolean>;
     
-        var numPromise: Promise<number>;
+        declare var numPromise: Promise<number>;
         var newPromise = numPromise.then(testFunction);
                                          ~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
diff --git a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.js b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.js
index 30eee28bcdeac..09eed54c91248 100644
--- a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.js
+++ b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.js
@@ -8,7 +8,7 @@ namespace m1 {
 
     declare function testFunction(n: number): Promise<number>;
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
     var newPromise = numPromise.then(testFunction);
 }
 
@@ -22,7 +22,7 @@ namespace m2 {
     declare function testFunction(n: number): Promise<number>;
     declare function testFunction(s: string): Promise<string>;
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
     var newPromise = numPromise.then(testFunction);
 }
 
@@ -36,7 +36,7 @@ namespace m3 {
 
     declare function testFunction(n: number): Promise<number>;
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
     var newPromise = numPromise.then(testFunction);
 }
 
@@ -51,7 +51,7 @@ namespace m4 {
     declare function testFunction(n: number): Promise<number>;
     declare function testFunction(s: string): Promise<string>;
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
     var newPromise = numPromise.then(testFunction);
 }
 
@@ -67,7 +67,7 @@ namespace m5 {
     declare function testFunction(n: number): Promise<number>;
     declare function testFunction(s: string): Promise<string>;
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
     var newPromise = numPromise.then(testFunction);
 }
 
@@ -83,7 +83,7 @@ namespace m6 {
     declare function testFunction(s: string): Promise<string>;
     declare function testFunction(b: boolean): Promise<boolean>;
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
     var newPromise = numPromise.then(testFunction);
 }
 
@@ -91,36 +91,30 @@ namespace m6 {
 //// [genericCallToOverloadedMethodWithOverloadedArguments.js]
 var m1;
 (function (m1) {
-    var numPromise;
     var newPromise = numPromise.then(testFunction);
 })(m1 || (m1 = {}));
 //////////////////////////////////////
 var m2;
 (function (m2) {
-    var numPromise;
     var newPromise = numPromise.then(testFunction);
 })(m2 || (m2 = {}));
 //////////////////////////////////////
 var m3;
 (function (m3) {
-    var numPromise;
     var newPromise = numPromise.then(testFunction);
 })(m3 || (m3 = {}));
 //////////////////////////////////////
 var m4;
 (function (m4) {
-    var numPromise;
     var newPromise = numPromise.then(testFunction);
 })(m4 || (m4 = {}));
 //////////////////////////////////////
 var m5;
 (function (m5) {
-    var numPromise;
     var newPromise = numPromise.then(testFunction);
 })(m5 || (m5 = {}));
 //////////////////////////////////////
 var m6;
 (function (m6) {
-    var numPromise;
     var newPromise = numPromise.then(testFunction);
 })(m6 || (m6 = {}));
diff --git a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.symbols b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.symbols
index 770090eff1a26..80dcb4d5dcd72 100644
--- a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.symbols
+++ b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.symbols
@@ -25,14 +25,14 @@ namespace m1 {
 >n : Symbol(n, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 5, 34))
 >Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 0, 14))
 
-    var numPromise: Promise<number>;
->numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 7, 7))
+    declare var numPromise: Promise<number>;
+>numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 7, 15))
 >Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 0, 14))
 
     var newPromise = numPromise.then(testFunction);
 >newPromise : Symbol(newPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 8, 7))
 >numPromise.then : Symbol(Promise.then, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 1, 26))
->numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 7, 7))
+>numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 7, 15))
 >then : Symbol(Promise.then, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 1, 26))
 >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 3, 5))
 }
@@ -68,14 +68,14 @@ namespace m2 {
 >s : Symbol(s, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 19, 34))
 >Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 13, 14))
 
-    var numPromise: Promise<number>;
->numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 21, 7))
+    declare var numPromise: Promise<number>;
+>numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 21, 15))
 >Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 13, 14))
 
     var newPromise = numPromise.then(testFunction);
 >newPromise : Symbol(newPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 22, 7))
 >numPromise.then : Symbol(Promise.then, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 14, 26))
->numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 21, 7))
+>numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 21, 15))
 >then : Symbol(Promise.then, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 14, 26))
 >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 16, 5), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 18, 62))
 }
@@ -121,14 +121,14 @@ namespace m3 {
 >n : Symbol(n, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 33, 34))
 >Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 14))
 
-    var numPromise: Promise<number>;
->numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 35, 7))
+    declare var numPromise: Promise<number>;
+>numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 35, 15))
 >Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 14))
 
     var newPromise = numPromise.then(testFunction);
 >newPromise : Symbol(newPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 36, 7))
 >numPromise.then : Symbol(Promise.then, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 28, 26), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 29, 54))
->numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 35, 7))
+>numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 35, 15))
 >then : Symbol(Promise.then, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 28, 26), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 29, 54))
 >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 31, 5))
 }
@@ -179,14 +179,14 @@ namespace m4 {
 >s : Symbol(s, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 48, 34))
 >Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 14))
 
-    var numPromise: Promise<number>;
->numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 50, 7))
+    declare var numPromise: Promise<number>;
+>numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 50, 15))
 >Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 14))
 
     var newPromise = numPromise.then(testFunction);
 >newPromise : Symbol(newPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 51, 7))
 >numPromise.then : Symbol(Promise.then, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 42, 26), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 43, 54))
->numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 50, 7))
+>numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 50, 15))
 >then : Symbol(Promise.then, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 42, 26), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 43, 54))
 >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 45, 5), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 47, 62))
 }
@@ -253,14 +253,14 @@ namespace m5 {
 >s : Symbol(s, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 64, 34))
 >Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 14))
 
-    var numPromise: Promise<number>;
->numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 66, 7))
+    declare var numPromise: Promise<number>;
+>numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 66, 15))
 >Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 14))
 
     var newPromise = numPromise.then(testFunction);
 >newPromise : Symbol(newPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 67, 7))
 >numPromise.then : Symbol(Promise.then, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 57, 26), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 58, 54), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 59, 90))
->numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 66, 7))
+>numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 66, 15))
 >then : Symbol(Promise.then, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 57, 26), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 58, 54), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 59, 90))
 >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 61, 5), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 63, 62))
 }
@@ -316,14 +316,14 @@ namespace m6 {
 >b : Symbol(b, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 80, 34))
 >Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 14))
 
-    var numPromise: Promise<number>;
->numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 82, 7))
+    declare var numPromise: Promise<number>;
+>numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 82, 15))
 >Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 14))
 
     var newPromise = numPromise.then(testFunction);
 >newPromise : Symbol(newPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 83, 7))
 >numPromise.then : Symbol(Promise.then, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 73, 26), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 74, 54))
->numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 82, 7))
+>numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 82, 15))
 >then : Symbol(Promise.then, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 73, 26), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 74, 54))
 >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 76, 5), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 78, 62), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 79, 62))
 }
diff --git a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types
index d1658fdc1895f..726c884306b7b 100644
--- a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types
+++ b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types
@@ -21,7 +21,7 @@ namespace m1 {
 >n : number
 >  : ^^^^^^
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
 >numPromise : Promise<number>
 >           : ^^^^^^^^^^^^^^^
 
@@ -68,7 +68,7 @@ namespace m2 {
 >s : string
 >  : ^^^^^^
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
 >numPromise : Promise<number>
 >           : ^^^^^^^^^^^^^^^
 
@@ -121,7 +121,7 @@ namespace m3 {
 >n : number
 >  : ^^^^^^
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
 >numPromise : Promise<number>
 >           : ^^^^^^^^^^^^^^^
 
@@ -180,7 +180,7 @@ namespace m4 {
 >s : string
 >  : ^^^^^^
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
 >numPromise : Promise<number>
 >           : ^^^^^^^^^^^^^^^
 
@@ -255,7 +255,7 @@ namespace m5 {
 >s : string
 >  : ^^^^^^
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
 >numPromise : Promise<number>
 >           : ^^^^^^^^^^^^^^^
 
@@ -320,7 +320,7 @@ namespace m6 {
 >b : boolean
 >  : ^^^^^^^
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
 >numPromise : Promise<number>
 >           : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.errors.txt b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.errors.txt
index 54390da7fd94e..3288604ebcc96 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.errors.txt
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.errors.txt
@@ -5,7 +5,7 @@ genericCallWithConstraintsTypeArgumentInference2.ts(11,26): error TS2345: Argume
     // Generic call with parameters of T and U, U extends T, no parameter of type U
     
     function foo<T, U extends T>(t: T) {
-        var u: U;
+        var u!: U;
         return u;
     }
     
diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.js b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.js
index d41f68107d8b3..bc591ac360cbe 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.js
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.js
@@ -4,7 +4,7 @@
 // Generic call with parameters of T and U, U extends T, no parameter of type U
 
 function foo<T, U extends T>(t: T) {
-    var u: U;
+    var u!: U;
     return u;
 }
 
diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.symbols b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.symbols
index 3498b5159d6e5..2e2992012eb6c 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.symbols
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.symbols
@@ -11,7 +11,7 @@ function foo<T, U extends T>(t: T) {
 >t : Symbol(t, Decl(genericCallWithConstraintsTypeArgumentInference2.ts, 2, 29))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference2.ts, 2, 13))
 
-    var u: U;
+    var u!: U;
 >u : Symbol(u, Decl(genericCallWithConstraintsTypeArgumentInference2.ts, 3, 7))
 >U : Symbol(U, Decl(genericCallWithConstraintsTypeArgumentInference2.ts, 2, 15))
 
diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.types b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.types
index 695867b12baf4..244a9188abf4e 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.types
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.types
@@ -9,7 +9,7 @@ function foo<T, U extends T>(t: T) {
 >t : T
 >  : ^
 
-    var u: U;
+    var u!: U;
 >u : U
 >  : ^
 
diff --git a/tests/baselines/reference/genericCallWithConstructorTypedArguments5.errors.txt b/tests/baselines/reference/genericCallWithConstructorTypedArguments5.errors.txt
index 048bb6814c544..bc7e3f4d358ea 100644
--- a/tests/baselines/reference/genericCallWithConstructorTypedArguments5.errors.txt
+++ b/tests/baselines/reference/genericCallWithConstructorTypedArguments5.errors.txt
@@ -15,17 +15,17 @@ genericCallWithConstructorTypedArguments5.ts(13,14): error TS2345: Argument of t
         return new arg.cb(null);
     }
     
-    var arg: { cb: new<T>(x: T) => string };
+    declare var arg: { cb: new<T>(x: T) => string };
     var r = foo(arg); // {}
     // more args not allowed
-    var arg2: { cb: new <T>(x: T, y: T) => string };
+    declare var arg2: { cb: new <T>(x: T, y: T) => string };
     var r2 = foo(arg2); // error
                  ~~~~
 !!! error TS2345: Argument of type '{ cb: new <T>(x: T, y: T) => string; }' is not assignable to parameter of type '{ cb: new (t: unknown) => string; }'.
 !!! error TS2345:   Types of property 'cb' are incompatible.
 !!! error TS2345:     Type 'new <T>(x: T, y: T) => string' is not assignable to type 'new (t: unknown) => string'.
 !!! error TS2345:       Target signature provides too few arguments. Expected 2 or more, but got 1.
-    var arg3: { cb: new (x: string, y: number) => string };
+    declare var arg3: { cb: new (x: string, y: number) => string };
     var r3 = foo(arg3); // error
                  ~~~~
 !!! error TS2345: Argument of type '{ cb: new (x: string, y: number) => string; }' is not assignable to parameter of type '{ cb: new (t: string) => string; }'.
@@ -39,8 +39,8 @@ genericCallWithConstructorTypedArguments5.ts(13,14): error TS2345: Argument of t
     
     // fewer args ok
     var r4 = foo(arg); // {}
-    var arg4: { cb: new (x: string) => string };
+    declare var arg4: { cb: new (x: string) => string };
     var r6 = foo(arg4); // string
-    var arg5: { cb: new () => string };
+    declare var arg5: { cb: new () => string };
     var r7 = foo(arg5); // string
     
\ No newline at end of file
diff --git a/tests/baselines/reference/genericCallWithConstructorTypedArguments5.js b/tests/baselines/reference/genericCallWithConstructorTypedArguments5.js
index c14b9af70fc93..304622ed7a3a0 100644
--- a/tests/baselines/reference/genericCallWithConstructorTypedArguments5.js
+++ b/tests/baselines/reference/genericCallWithConstructorTypedArguments5.js
@@ -7,12 +7,12 @@ function foo<T, U>(arg: { cb: new(t: T) => U }) {
     return new arg.cb(null);
 }
 
-var arg: { cb: new<T>(x: T) => string };
+declare var arg: { cb: new<T>(x: T) => string };
 var r = foo(arg); // {}
 // more args not allowed
-var arg2: { cb: new <T>(x: T, y: T) => string };
+declare var arg2: { cb: new <T>(x: T, y: T) => string };
 var r2 = foo(arg2); // error
-var arg3: { cb: new (x: string, y: number) => string };
+declare var arg3: { cb: new (x: string, y: number) => string };
 var r3 = foo(arg3); // error
 
 function foo2<T, U>(arg: { cb: new(t: T, t2: T) => U }) {
@@ -21,9 +21,9 @@ function foo2<T, U>(arg: { cb: new(t: T, t2: T) => U }) {
 
 // fewer args ok
 var r4 = foo(arg); // {}
-var arg4: { cb: new (x: string) => string };
+declare var arg4: { cb: new (x: string) => string };
 var r6 = foo(arg4); // string
-var arg5: { cb: new () => string };
+declare var arg5: { cb: new () => string };
 var r7 = foo(arg5); // string
 
 
@@ -32,19 +32,13 @@ var r7 = foo(arg5); // string
 function foo(arg) {
     return new arg.cb(null);
 }
-var arg;
 var r = foo(arg); // {}
-// more args not allowed
-var arg2;
 var r2 = foo(arg2); // error
-var arg3;
 var r3 = foo(arg3); // error
 function foo2(arg) {
     return new arg.cb(null, null);
 }
 // fewer args ok
 var r4 = foo(arg); // {}
-var arg4;
 var r6 = foo(arg4); // string
-var arg5;
 var r7 = foo(arg5); // string
diff --git a/tests/baselines/reference/genericCallWithConstructorTypedArguments5.symbols b/tests/baselines/reference/genericCallWithConstructorTypedArguments5.symbols
index 3b8f0958f9936..4111f616223bf 100644
--- a/tests/baselines/reference/genericCallWithConstructorTypedArguments5.symbols
+++ b/tests/baselines/reference/genericCallWithConstructorTypedArguments5.symbols
@@ -19,43 +19,43 @@ function foo<T, U>(arg: { cb: new(t: T) => U }) {
 >cb : Symbol(cb, Decl(genericCallWithConstructorTypedArguments5.ts, 2, 25))
 }
 
-var arg: { cb: new<T>(x: T) => string };
->arg : Symbol(arg, Decl(genericCallWithConstructorTypedArguments5.ts, 6, 3))
->cb : Symbol(cb, Decl(genericCallWithConstructorTypedArguments5.ts, 6, 10))
->T : Symbol(T, Decl(genericCallWithConstructorTypedArguments5.ts, 6, 19))
->x : Symbol(x, Decl(genericCallWithConstructorTypedArguments5.ts, 6, 22))
->T : Symbol(T, Decl(genericCallWithConstructorTypedArguments5.ts, 6, 19))
+declare var arg: { cb: new<T>(x: T) => string };
+>arg : Symbol(arg, Decl(genericCallWithConstructorTypedArguments5.ts, 6, 11))
+>cb : Symbol(cb, Decl(genericCallWithConstructorTypedArguments5.ts, 6, 18))
+>T : Symbol(T, Decl(genericCallWithConstructorTypedArguments5.ts, 6, 27))
+>x : Symbol(x, Decl(genericCallWithConstructorTypedArguments5.ts, 6, 30))
+>T : Symbol(T, Decl(genericCallWithConstructorTypedArguments5.ts, 6, 27))
 
 var r = foo(arg); // {}
 >r : Symbol(r, Decl(genericCallWithConstructorTypedArguments5.ts, 7, 3))
 >foo : Symbol(foo, Decl(genericCallWithConstructorTypedArguments5.ts, 0, 0))
->arg : Symbol(arg, Decl(genericCallWithConstructorTypedArguments5.ts, 6, 3))
+>arg : Symbol(arg, Decl(genericCallWithConstructorTypedArguments5.ts, 6, 11))
 
 // more args not allowed
-var arg2: { cb: new <T>(x: T, y: T) => string };
->arg2 : Symbol(arg2, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 3))
->cb : Symbol(cb, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 11))
->T : Symbol(T, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 21))
->x : Symbol(x, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 24))
->T : Symbol(T, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 21))
->y : Symbol(y, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 29))
->T : Symbol(T, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 21))
+declare var arg2: { cb: new <T>(x: T, y: T) => string };
+>arg2 : Symbol(arg2, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 11))
+>cb : Symbol(cb, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 19))
+>T : Symbol(T, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 29))
+>x : Symbol(x, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 32))
+>T : Symbol(T, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 29))
+>y : Symbol(y, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 37))
+>T : Symbol(T, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 29))
 
 var r2 = foo(arg2); // error
 >r2 : Symbol(r2, Decl(genericCallWithConstructorTypedArguments5.ts, 10, 3))
 >foo : Symbol(foo, Decl(genericCallWithConstructorTypedArguments5.ts, 0, 0))
->arg2 : Symbol(arg2, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 3))
+>arg2 : Symbol(arg2, Decl(genericCallWithConstructorTypedArguments5.ts, 9, 11))
 
-var arg3: { cb: new (x: string, y: number) => string };
->arg3 : Symbol(arg3, Decl(genericCallWithConstructorTypedArguments5.ts, 11, 3))
->cb : Symbol(cb, Decl(genericCallWithConstructorTypedArguments5.ts, 11, 11))
->x : Symbol(x, Decl(genericCallWithConstructorTypedArguments5.ts, 11, 21))
->y : Symbol(y, Decl(genericCallWithConstructorTypedArguments5.ts, 11, 31))
+declare var arg3: { cb: new (x: string, y: number) => string };
+>arg3 : Symbol(arg3, Decl(genericCallWithConstructorTypedArguments5.ts, 11, 11))
+>cb : Symbol(cb, Decl(genericCallWithConstructorTypedArguments5.ts, 11, 19))
+>x : Symbol(x, Decl(genericCallWithConstructorTypedArguments5.ts, 11, 29))
+>y : Symbol(y, Decl(genericCallWithConstructorTypedArguments5.ts, 11, 39))
 
 var r3 = foo(arg3); // error
 >r3 : Symbol(r3, Decl(genericCallWithConstructorTypedArguments5.ts, 12, 3))
 >foo : Symbol(foo, Decl(genericCallWithConstructorTypedArguments5.ts, 0, 0))
->arg3 : Symbol(arg3, Decl(genericCallWithConstructorTypedArguments5.ts, 11, 3))
+>arg3 : Symbol(arg3, Decl(genericCallWithConstructorTypedArguments5.ts, 11, 11))
 
 function foo2<T, U>(arg: { cb: new(t: T, t2: T) => U }) {
 >foo2 : Symbol(foo2, Decl(genericCallWithConstructorTypedArguments5.ts, 12, 19))
@@ -79,24 +79,24 @@ function foo2<T, U>(arg: { cb: new(t: T, t2: T) => U }) {
 var r4 = foo(arg); // {}
 >r4 : Symbol(r4, Decl(genericCallWithConstructorTypedArguments5.ts, 19, 3))
 >foo : Symbol(foo, Decl(genericCallWithConstructorTypedArguments5.ts, 0, 0))
->arg : Symbol(arg, Decl(genericCallWithConstructorTypedArguments5.ts, 6, 3))
+>arg : Symbol(arg, Decl(genericCallWithConstructorTypedArguments5.ts, 6, 11))
 
-var arg4: { cb: new (x: string) => string };
->arg4 : Symbol(arg4, Decl(genericCallWithConstructorTypedArguments5.ts, 20, 3))
->cb : Symbol(cb, Decl(genericCallWithConstructorTypedArguments5.ts, 20, 11))
->x : Symbol(x, Decl(genericCallWithConstructorTypedArguments5.ts, 20, 21))
+declare var arg4: { cb: new (x: string) => string };
+>arg4 : Symbol(arg4, Decl(genericCallWithConstructorTypedArguments5.ts, 20, 11))
+>cb : Symbol(cb, Decl(genericCallWithConstructorTypedArguments5.ts, 20, 19))
+>x : Symbol(x, Decl(genericCallWithConstructorTypedArguments5.ts, 20, 29))
 
 var r6 = foo(arg4); // string
 >r6 : Symbol(r6, Decl(genericCallWithConstructorTypedArguments5.ts, 21, 3))
 >foo : Symbol(foo, Decl(genericCallWithConstructorTypedArguments5.ts, 0, 0))
->arg4 : Symbol(arg4, Decl(genericCallWithConstructorTypedArguments5.ts, 20, 3))
+>arg4 : Symbol(arg4, Decl(genericCallWithConstructorTypedArguments5.ts, 20, 11))
 
-var arg5: { cb: new () => string };
->arg5 : Symbol(arg5, Decl(genericCallWithConstructorTypedArguments5.ts, 22, 3))
->cb : Symbol(cb, Decl(genericCallWithConstructorTypedArguments5.ts, 22, 11))
+declare var arg5: { cb: new () => string };
+>arg5 : Symbol(arg5, Decl(genericCallWithConstructorTypedArguments5.ts, 22, 11))
+>cb : Symbol(cb, Decl(genericCallWithConstructorTypedArguments5.ts, 22, 19))
 
 var r7 = foo(arg5); // string
 >r7 : Symbol(r7, Decl(genericCallWithConstructorTypedArguments5.ts, 23, 3))
 >foo : Symbol(foo, Decl(genericCallWithConstructorTypedArguments5.ts, 0, 0))
->arg5 : Symbol(arg5, Decl(genericCallWithConstructorTypedArguments5.ts, 22, 3))
+>arg5 : Symbol(arg5, Decl(genericCallWithConstructorTypedArguments5.ts, 22, 11))
 
diff --git a/tests/baselines/reference/genericCallWithConstructorTypedArguments5.types b/tests/baselines/reference/genericCallWithConstructorTypedArguments5.types
index 2220e844528eb..cc491814e77d0 100644
--- a/tests/baselines/reference/genericCallWithConstructorTypedArguments5.types
+++ b/tests/baselines/reference/genericCallWithConstructorTypedArguments5.types
@@ -24,7 +24,7 @@ function foo<T, U>(arg: { cb: new(t: T) => U }) {
 >   : ^^^^^ ^^ ^^^^^ 
 }
 
-var arg: { cb: new<T>(x: T) => string };
+declare var arg: { cb: new<T>(x: T) => string };
 >arg : { cb: new <T>(x: T) => string; }
 >    : ^^^^^^                       ^^^
 >cb : new <T>(x: T) => string
@@ -43,7 +43,7 @@ var r = foo(arg); // {}
 >    : ^^^^^^                       ^^^
 
 // more args not allowed
-var arg2: { cb: new <T>(x: T, y: T) => string };
+declare var arg2: { cb: new <T>(x: T, y: T) => string };
 >arg2 : { cb: new <T>(x: T, y: T) => string; }
 >     : ^^^^^^                             ^^^
 >cb : new <T>(x: T, y: T) => string
@@ -63,7 +63,7 @@ var r2 = foo(arg2); // error
 >arg2 : { cb: new <T>(x: T, y: T) => string; }
 >     : ^^^^^^                             ^^^
 
-var arg3: { cb: new (x: string, y: number) => string };
+declare var arg3: { cb: new (x: string, y: number) => string };
 >arg3 : { cb: new (x: string, y: number) => string; }
 >     : ^^^^^^                                    ^^^
 >cb : new (x: string, y: number) => string
@@ -117,7 +117,7 @@ var r4 = foo(arg); // {}
 >arg : { cb: new <T>(x: T) => string; }
 >    : ^^^^^^                       ^^^
 
-var arg4: { cb: new (x: string) => string };
+declare var arg4: { cb: new (x: string) => string };
 >arg4 : { cb: new (x: string) => string; }
 >     : ^^^^^^                         ^^^
 >cb : new (x: string) => string
@@ -135,7 +135,7 @@ var r6 = foo(arg4); // string
 >arg4 : { cb: new (x: string) => string; }
 >     : ^^^^^^                         ^^^
 
-var arg5: { cb: new () => string };
+declare var arg5: { cb: new () => string };
 >arg5 : { cb: new () => string; }
 >     : ^^^^^^                ^^^
 >cb : new () => string
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.errors.txt b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.errors.txt
index 83ea42f802762..5c7060b9e1967 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.errors.txt
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.errors.txt
@@ -20,9 +20,9 @@ genericCallWithFunctionTypedArguments2.ts(40,18): error TS2345: Argument of type
     interface I2<T> {
         new (x: T): T;
     }
-    var i: I;
-    var i2: I2<string>;
-    var a: {
+    declare var i: I;
+    declare var i2: I2<string>;
+    declare var a: {
         new <T>(x: T): T;
     }
     
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.js b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.js
index 701a93fce1a25..2ef8b36bd084e 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.js
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.js
@@ -14,9 +14,9 @@ interface I {
 interface I2<T> {
     new (x: T): T;
 }
-var i: I;
-var i2: I2<string>;
-var a: {
+declare var i: I;
+declare var i2: I2<string>;
+declare var a: {
     new <T>(x: T): T;
 }
 
@@ -49,9 +49,6 @@ var r9 = foo3<string, string>('', i2, ''); // string
 function foo(x) {
     return new x(null);
 }
-var i;
-var i2;
-var a;
 var r = foo(i); // any
 var r2 = foo(i); // string 
 var r3 = foo(i2); // string
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.symbols b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.symbols
index 51a2c11cd3d10..320a37bb288eb 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.symbols
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.symbols
@@ -34,16 +34,16 @@ interface I2<T> {
 >T : Symbol(T, Decl(genericCallWithFunctionTypedArguments2.ts, 10, 13))
 >T : Symbol(T, Decl(genericCallWithFunctionTypedArguments2.ts, 10, 13))
 }
-var i: I;
->i : Symbol(i, Decl(genericCallWithFunctionTypedArguments2.ts, 13, 3))
+declare var i: I;
+>i : Symbol(i, Decl(genericCallWithFunctionTypedArguments2.ts, 13, 11))
 >I : Symbol(I, Decl(genericCallWithFunctionTypedArguments2.ts, 5, 1))
 
-var i2: I2<string>;
->i2 : Symbol(i2, Decl(genericCallWithFunctionTypedArguments2.ts, 14, 3))
+declare var i2: I2<string>;
+>i2 : Symbol(i2, Decl(genericCallWithFunctionTypedArguments2.ts, 14, 11))
 >I2 : Symbol(I2, Decl(genericCallWithFunctionTypedArguments2.ts, 9, 1))
 
-var a: {
->a : Symbol(a, Decl(genericCallWithFunctionTypedArguments2.ts, 15, 3))
+declare var a: {
+>a : Symbol(a, Decl(genericCallWithFunctionTypedArguments2.ts, 15, 11))
 
     new <T>(x: T): T;
 >T : Symbol(T, Decl(genericCallWithFunctionTypedArguments2.ts, 16, 9))
@@ -55,22 +55,22 @@ var a: {
 var r = foo(i); // any
 >r : Symbol(r, Decl(genericCallWithFunctionTypedArguments2.ts, 19, 3))
 >foo : Symbol(foo, Decl(genericCallWithFunctionTypedArguments2.ts, 0, 0))
->i : Symbol(i, Decl(genericCallWithFunctionTypedArguments2.ts, 13, 3))
+>i : Symbol(i, Decl(genericCallWithFunctionTypedArguments2.ts, 13, 11))
 
 var r2 = foo<string>(i); // string 
 >r2 : Symbol(r2, Decl(genericCallWithFunctionTypedArguments2.ts, 20, 3))
 >foo : Symbol(foo, Decl(genericCallWithFunctionTypedArguments2.ts, 0, 0))
->i : Symbol(i, Decl(genericCallWithFunctionTypedArguments2.ts, 13, 3))
+>i : Symbol(i, Decl(genericCallWithFunctionTypedArguments2.ts, 13, 11))
 
 var r3 = foo(i2); // string
 >r3 : Symbol(r3, Decl(genericCallWithFunctionTypedArguments2.ts, 21, 3))
 >foo : Symbol(foo, Decl(genericCallWithFunctionTypedArguments2.ts, 0, 0))
->i2 : Symbol(i2, Decl(genericCallWithFunctionTypedArguments2.ts, 14, 3))
+>i2 : Symbol(i2, Decl(genericCallWithFunctionTypedArguments2.ts, 14, 11))
 
 var r3b = foo(a); // any
 >r3b : Symbol(r3b, Decl(genericCallWithFunctionTypedArguments2.ts, 22, 3))
 >foo : Symbol(foo, Decl(genericCallWithFunctionTypedArguments2.ts, 0, 0))
->a : Symbol(a, Decl(genericCallWithFunctionTypedArguments2.ts, 15, 3))
+>a : Symbol(a, Decl(genericCallWithFunctionTypedArguments2.ts, 15, 11))
 
 function foo2<T, U>(x: T, cb: new(a: T) => U) {
 >foo2 : Symbol(foo2, Decl(genericCallWithFunctionTypedArguments2.ts, 22, 17))
@@ -91,22 +91,22 @@ function foo2<T, U>(x: T, cb: new(a: T) => U) {
 var r4 = foo2(1, i2); // error
 >r4 : Symbol(r4, Decl(genericCallWithFunctionTypedArguments2.ts, 28, 3))
 >foo2 : Symbol(foo2, Decl(genericCallWithFunctionTypedArguments2.ts, 22, 17))
->i2 : Symbol(i2, Decl(genericCallWithFunctionTypedArguments2.ts, 14, 3))
+>i2 : Symbol(i2, Decl(genericCallWithFunctionTypedArguments2.ts, 14, 11))
 
 var r4b = foo2(1, a); // any
 >r4b : Symbol(r4b, Decl(genericCallWithFunctionTypedArguments2.ts, 29, 3))
 >foo2 : Symbol(foo2, Decl(genericCallWithFunctionTypedArguments2.ts, 22, 17))
->a : Symbol(a, Decl(genericCallWithFunctionTypedArguments2.ts, 15, 3))
+>a : Symbol(a, Decl(genericCallWithFunctionTypedArguments2.ts, 15, 11))
 
 var r5 = foo2(1, i); // any
 >r5 : Symbol(r5, Decl(genericCallWithFunctionTypedArguments2.ts, 30, 3))
 >foo2 : Symbol(foo2, Decl(genericCallWithFunctionTypedArguments2.ts, 22, 17))
->i : Symbol(i, Decl(genericCallWithFunctionTypedArguments2.ts, 13, 3))
+>i : Symbol(i, Decl(genericCallWithFunctionTypedArguments2.ts, 13, 11))
 
 var r6 = foo2<string, string>('', i2); // string
 >r6 : Symbol(r6, Decl(genericCallWithFunctionTypedArguments2.ts, 31, 3))
 >foo2 : Symbol(foo2, Decl(genericCallWithFunctionTypedArguments2.ts, 22, 17))
->i2 : Symbol(i2, Decl(genericCallWithFunctionTypedArguments2.ts, 14, 3))
+>i2 : Symbol(i2, Decl(genericCallWithFunctionTypedArguments2.ts, 14, 11))
 
 function foo3<T, U>(x: T, cb: new(a: T) => U, y: U) {
 >foo3 : Symbol(foo3, Decl(genericCallWithFunctionTypedArguments2.ts, 31, 38))
@@ -129,20 +129,20 @@ function foo3<T, U>(x: T, cb: new(a: T) => U, y: U) {
 var r7 = foo3(null, i, ''); // any
 >r7 : Symbol(r7, Decl(genericCallWithFunctionTypedArguments2.ts, 37, 3))
 >foo3 : Symbol(foo3, Decl(genericCallWithFunctionTypedArguments2.ts, 31, 38))
->i : Symbol(i, Decl(genericCallWithFunctionTypedArguments2.ts, 13, 3))
+>i : Symbol(i, Decl(genericCallWithFunctionTypedArguments2.ts, 13, 11))
 
 var r7b = foo3(null, a, ''); // any
 >r7b : Symbol(r7b, Decl(genericCallWithFunctionTypedArguments2.ts, 38, 3))
 >foo3 : Symbol(foo3, Decl(genericCallWithFunctionTypedArguments2.ts, 31, 38))
->a : Symbol(a, Decl(genericCallWithFunctionTypedArguments2.ts, 15, 3))
+>a : Symbol(a, Decl(genericCallWithFunctionTypedArguments2.ts, 15, 11))
 
 var r8 = foo3(1, i2, 1); // error
 >r8 : Symbol(r8, Decl(genericCallWithFunctionTypedArguments2.ts, 39, 3))
 >foo3 : Symbol(foo3, Decl(genericCallWithFunctionTypedArguments2.ts, 31, 38))
->i2 : Symbol(i2, Decl(genericCallWithFunctionTypedArguments2.ts, 14, 3))
+>i2 : Symbol(i2, Decl(genericCallWithFunctionTypedArguments2.ts, 14, 11))
 
 var r9 = foo3<string, string>('', i2, ''); // string
 >r9 : Symbol(r9, Decl(genericCallWithFunctionTypedArguments2.ts, 40, 3))
 >foo3 : Symbol(foo3, Decl(genericCallWithFunctionTypedArguments2.ts, 31, 38))
->i2 : Symbol(i2, Decl(genericCallWithFunctionTypedArguments2.ts, 14, 3))
+>i2 : Symbol(i2, Decl(genericCallWithFunctionTypedArguments2.ts, 14, 11))
 
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
index 05e4e0bd0dda1..fcc1367aaa4ab 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
@@ -29,15 +29,15 @@ interface I2<T> {
 >x : T
 >  : ^
 }
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
-var i2: I2<string>;
+declare var i2: I2<string>;
 >i2 : I2<string>
 >   : ^^^^^^^^^^
 
-var a: {
+declare var a: {
 >a : new <T>(x: T) => T
 >  : ^^^^^ ^^ ^^ ^^^^^ 
 
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt
index bc374e7e856c5..6f7f1af1a39a9 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt
@@ -28,7 +28,7 @@ genericCallWithGenericSignatureArguments2.ts(67,57): error TS2304: Cannot find n
     
     namespace onlyT {
         function foo<T>(a: (x: T) => T, b: (x: T) => T) {
-            var r: (x: T) => T;
+            var r!: (x: T) => T;
             return r;
         }
     
@@ -52,7 +52,7 @@ genericCallWithGenericSignatureArguments2.ts(67,57): error TS2304: Cannot find n
         }
     
         function foo2<T extends Date>(a: (x: T) => T, b: (x: T) => T) {
-            var r: (x: T) => T;
+            var r!: (x: T) => T;
             return r;
         }
     
@@ -70,7 +70,7 @@ genericCallWithGenericSignatureArguments2.ts(67,57): error TS2304: Cannot find n
         enum F { A }
     
         function foo3<T>(x: T, a: (x: T) => T, b: (x: T) => T) {
-            var r: (x: T) => T;
+            var r!: (x: T) => T;
             return r;
         }
     
@@ -82,7 +82,7 @@ genericCallWithGenericSignatureArguments2.ts(67,57): error TS2304: Cannot find n
     
     namespace TU {
         function foo<T, U>(a: (x: T) => T, b: (x: U) => U) {
-            var r: (x: T) => T;
+            var r!: (x: T) => T;
             return r;
         }
     
@@ -101,7 +101,7 @@ genericCallWithGenericSignatureArguments2.ts(67,57): error TS2304: Cannot find n
         }
     
         function foo2<T extends Date, U extends Date>(a: (x: T) => T, b: (x: U) => U) {
-            var r: (x: T) => T;
+            var r!: (x: T) => T;
             return r;
         }
     
@@ -123,7 +123,7 @@ genericCallWithGenericSignatureArguments2.ts(67,57): error TS2304: Cannot find n
 !!! error TS2304: Cannot find name 'U'.
                                                             ~
 !!! error TS2304: Cannot find name 'U'.
-            var r: (x: T) => T;
+            var r!: (x: T) => T;
             return r;
         }
     
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js
index ab99f367c8c16..1a94b1247d462 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js
@@ -6,7 +6,7 @@
 
 namespace onlyT {
     function foo<T>(a: (x: T) => T, b: (x: T) => T) {
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
         return r;
     }
 
@@ -20,7 +20,7 @@ namespace onlyT {
     }
 
     function foo2<T extends Date>(a: (x: T) => T, b: (x: T) => T) {
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
         return r;
     }
 
@@ -33,7 +33,7 @@ namespace onlyT {
     enum F { A }
 
     function foo3<T>(x: T, a: (x: T) => T, b: (x: T) => T) {
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
         return r;
     }
 
@@ -42,7 +42,7 @@ namespace onlyT {
 
 namespace TU {
     function foo<T, U>(a: (x: T) => T, b: (x: U) => U) {
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
         return r;
     }
 
@@ -55,7 +55,7 @@ namespace TU {
     }
 
     function foo2<T extends Date, U extends Date>(a: (x: T) => T, b: (x: U) => U) {
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
         return r;
     }
 
@@ -68,7 +68,7 @@ namespace TU {
     enum F { A }
 
     function foo3<T>(x: T, a: (x: T) => T, b: (x: U) => U) {
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
         return r;
     }
 
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.symbols b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.symbols
index 11eb3e4dcc661..70e6fb6ca65b1 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.symbols
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.symbols
@@ -19,9 +19,9 @@ namespace onlyT {
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 4, 17))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 4, 17))
 
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
 >r : Symbol(r, Decl(genericCallWithGenericSignatureArguments2.ts, 5, 11))
->x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 5, 16))
+>x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 5, 17))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 4, 17))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 4, 17))
 
@@ -77,9 +77,9 @@ namespace onlyT {
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 18, 18))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 18, 18))
 
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
 >r : Symbol(r, Decl(genericCallWithGenericSignatureArguments2.ts, 19, 11))
->x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 19, 16))
+>x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 19, 17))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 18, 18))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 18, 18))
 
@@ -135,9 +135,9 @@ namespace onlyT {
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 31, 18))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 31, 18))
 
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
 >r : Symbol(r, Decl(genericCallWithGenericSignatureArguments2.ts, 32, 11))
->x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 32, 16))
+>x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 32, 17))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 31, 18))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 31, 18))
 
@@ -177,9 +177,9 @@ namespace TU {
 >U : Symbol(U, Decl(genericCallWithGenericSignatureArguments2.ts, 40, 19))
 >U : Symbol(U, Decl(genericCallWithGenericSignatureArguments2.ts, 40, 19))
 
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
 >r : Symbol(r, Decl(genericCallWithGenericSignatureArguments2.ts, 41, 11))
->x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 41, 16))
+>x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 41, 17))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 40, 17))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 40, 17))
 
@@ -236,9 +236,9 @@ namespace TU {
 >U : Symbol(U, Decl(genericCallWithGenericSignatureArguments2.ts, 53, 33))
 >U : Symbol(U, Decl(genericCallWithGenericSignatureArguments2.ts, 53, 33))
 
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
 >r : Symbol(r, Decl(genericCallWithGenericSignatureArguments2.ts, 54, 11))
->x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 54, 16))
+>x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 54, 17))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 53, 18))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 53, 18))
 
@@ -294,9 +294,9 @@ namespace TU {
 >U : Symbol(U)
 >U : Symbol(U)
 
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
 >r : Symbol(r, Decl(genericCallWithGenericSignatureArguments2.ts, 67, 11))
->x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 67, 16))
+>x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 67, 17))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 66, 18))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 66, 18))
 
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
index 0f43a3ff048d1..9dcf4e6563928 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
@@ -20,7 +20,7 @@ namespace onlyT {
 >x : T
 >  : ^
 
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
 >r : (x: T) => T
 >  : ^ ^^ ^^^^^ 
 >x : T
@@ -115,7 +115,7 @@ namespace onlyT {
 >x : T
 >  : ^
 
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
 >r : (x: T) => T
 >  : ^ ^^ ^^^^^ 
 >x : T
@@ -199,7 +199,7 @@ namespace onlyT {
 >x : T
 >  : ^
 
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
 >r : (x: T) => T
 >  : ^ ^^ ^^^^^ 
 >x : T
@@ -261,7 +261,7 @@ namespace TU {
 >x : U
 >  : ^
 
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
 >r : (x: T) => T
 >  : ^ ^^ ^^^^^ 
 >x : T
@@ -355,7 +355,7 @@ namespace TU {
 >x : U
 >  : ^
 
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
 >r : (x: T) => T
 >  : ^ ^^ ^^^^^ 
 >x : T
@@ -439,7 +439,7 @@ namespace TU {
 >x : U
 >  : ^
 
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
 >r : (x: T) => T
 >  : ^ ^^ ^^^^^ 
 >x : T
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.errors.txt b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.errors.txt
index 5fd2927b27460..83cd484c7b7f4 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.errors.txt
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.errors.txt
@@ -11,7 +11,7 @@ genericCallWithGenericSignatureArguments3.ts(33,69): error TS2345: Argument of t
     // the corresponding inferred type arguments to become fixed and no further candidate inferences are made for them.
     
     function foo<T>(x: T, a: (x: T) => T, b: (x: T) => T) {
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
         return r;
     }
     
@@ -29,7 +29,7 @@ genericCallWithGenericSignatureArguments3.ts(33,69): error TS2345: Argument of t
     
     
     function foo2<T, U>(x: T, a: (x: T) => U, b: (x: T) => U) {
-        var r: (x: T) => U;
+        var r!: (x: T) => U;
         return r;
     }
     
@@ -37,7 +37,7 @@ genericCallWithGenericSignatureArguments3.ts(33,69): error TS2345: Argument of t
     var r9 = foo2(null, (x) => '', (x) => ''); // any => any
     var r10 = foo2(null, (x: Object) => '', (x: string) => ''); // Object => Object
     
-    var x: (a: string) => boolean;
+    declare var x: (a: string) => boolean;
     var r11 = foo2(x, (a1: (y: string) => string) => (n: Object) => 1, (a2: (z: string) => string) => 2); // error
                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(a1: (y: string) => string) => (n: Object) => 1' is not assignable to parameter of type '(x: (a: string) => boolean) => (n: Object) => 1'.
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js
index 8fb3e2db7b7ed..1f618fa610665 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js
@@ -5,7 +5,7 @@
 // the corresponding inferred type arguments to become fixed and no further candidate inferences are made for them.
 
 function foo<T>(x: T, a: (x: T) => T, b: (x: T) => T) {
-    var r: (x: T) => T;
+    var r!: (x: T) => T;
     return r;
 }
 
@@ -23,7 +23,7 @@ var r6 = foo(E.A, (x: number) => E.A, (x: F) => F.A); // number => number
 
 
 function foo2<T, U>(x: T, a: (x: T) => U, b: (x: T) => U) {
-    var r: (x: T) => U;
+    var r!: (x: T) => U;
     return r;
 }
 
@@ -31,7 +31,7 @@ var r8 = foo2('', (x) => '', (x) => null); // string => string
 var r9 = foo2(null, (x) => '', (x) => ''); // any => any
 var r10 = foo2(null, (x: Object) => '', (x: string) => ''); // Object => Object
 
-var x: (a: string) => boolean;
+declare var x: (a: string) => boolean;
 var r11 = foo2(x, (a1: (y: string) => string) => (n: Object) => 1, (a2: (z: string) => string) => 2); // error
 var r12 = foo2(x, (a1: (y: string) => boolean) => (n: Object) => 1, (a2: (z: string) => boolean) => 2); // error
 
@@ -64,6 +64,5 @@ function foo2(x, a, b) {
 var r8 = foo2('', function (x) { return ''; }, function (x) { return null; }); // string => string
 var r9 = foo2(null, function (x) { return ''; }, function (x) { return ''; }); // any => any
 var r10 = foo2(null, function (x) { return ''; }, function (x) { return ''; }); // Object => Object
-var x;
 var r11 = foo2(x, function (a1) { return function (n) { return 1; }; }, function (a2) { return 2; }); // error
 var r12 = foo2(x, function (a1) { return function (n) { return 1; }; }, function (a2) { return 2; }); // error
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.symbols b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.symbols
index b9c7b4820e7ff..d04e33e2dd90a 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.symbols
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.symbols
@@ -18,9 +18,9 @@ function foo<T>(x: T, a: (x: T) => T, b: (x: T) => T) {
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments3.ts, 3, 13))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments3.ts, 3, 13))
 
-    var r: (x: T) => T;
+    var r!: (x: T) => T;
 >r : Symbol(r, Decl(genericCallWithGenericSignatureArguments3.ts, 4, 7))
->x : Symbol(x, Decl(genericCallWithGenericSignatureArguments3.ts, 4, 12))
+>x : Symbol(x, Decl(genericCallWithGenericSignatureArguments3.ts, 4, 13))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments3.ts, 3, 13))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments3.ts, 3, 13))
 
@@ -108,9 +108,9 @@ function foo2<T, U>(x: T, a: (x: T) => U, b: (x: T) => U) {
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments3.ts, 21, 14))
 >U : Symbol(U, Decl(genericCallWithGenericSignatureArguments3.ts, 21, 16))
 
-    var r: (x: T) => U;
+    var r!: (x: T) => U;
 >r : Symbol(r, Decl(genericCallWithGenericSignatureArguments3.ts, 22, 7))
->x : Symbol(x, Decl(genericCallWithGenericSignatureArguments3.ts, 22, 12))
+>x : Symbol(x, Decl(genericCallWithGenericSignatureArguments3.ts, 22, 13))
 >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments3.ts, 21, 14))
 >U : Symbol(U, Decl(genericCallWithGenericSignatureArguments3.ts, 21, 16))
 
@@ -137,14 +137,14 @@ var r10 = foo2(null, (x: Object) => '', (x: string) => ''); // Object => Object
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(genericCallWithGenericSignatureArguments3.ts, 28, 41))
 
-var x: (a: string) => boolean;
->x : Symbol(x, Decl(genericCallWithGenericSignatureArguments3.ts, 30, 3))
->a : Symbol(a, Decl(genericCallWithGenericSignatureArguments3.ts, 30, 8))
+declare var x: (a: string) => boolean;
+>x : Symbol(x, Decl(genericCallWithGenericSignatureArguments3.ts, 30, 11))
+>a : Symbol(a, Decl(genericCallWithGenericSignatureArguments3.ts, 30, 16))
 
 var r11 = foo2(x, (a1: (y: string) => string) => (n: Object) => 1, (a2: (z: string) => string) => 2); // error
 >r11 : Symbol(r11, Decl(genericCallWithGenericSignatureArguments3.ts, 31, 3))
 >foo2 : Symbol(foo2, Decl(genericCallWithGenericSignatureArguments3.ts, 18, 53))
->x : Symbol(x, Decl(genericCallWithGenericSignatureArguments3.ts, 30, 3))
+>x : Symbol(x, Decl(genericCallWithGenericSignatureArguments3.ts, 30, 11))
 >a1 : Symbol(a1, Decl(genericCallWithGenericSignatureArguments3.ts, 31, 19))
 >y : Symbol(y, Decl(genericCallWithGenericSignatureArguments3.ts, 31, 24))
 >n : Symbol(n, Decl(genericCallWithGenericSignatureArguments3.ts, 31, 50))
@@ -155,7 +155,7 @@ var r11 = foo2(x, (a1: (y: string) => string) => (n: Object) => 1, (a2: (z: stri
 var r12 = foo2(x, (a1: (y: string) => boolean) => (n: Object) => 1, (a2: (z: string) => boolean) => 2); // error
 >r12 : Symbol(r12, Decl(genericCallWithGenericSignatureArguments3.ts, 32, 3))
 >foo2 : Symbol(foo2, Decl(genericCallWithGenericSignatureArguments3.ts, 18, 53))
->x : Symbol(x, Decl(genericCallWithGenericSignatureArguments3.ts, 30, 3))
+>x : Symbol(x, Decl(genericCallWithGenericSignatureArguments3.ts, 30, 11))
 >a1 : Symbol(a1, Decl(genericCallWithGenericSignatureArguments3.ts, 32, 19))
 >y : Symbol(y, Decl(genericCallWithGenericSignatureArguments3.ts, 32, 24))
 >n : Symbol(n, Decl(genericCallWithGenericSignatureArguments3.ts, 32, 51))
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types
index cb753a16d6098..0bb949d73d4fa 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types
@@ -18,7 +18,7 @@ function foo<T>(x: T, a: (x: T) => T, b: (x: T) => T) {
 >x : T
 >  : ^
 
-    var r: (x: T) => T;
+    var r!: (x: T) => T;
 >r : (x: T) => T
 >  : ^ ^^ ^^^^^ 
 >x : T
@@ -216,7 +216,7 @@ function foo2<T, U>(x: T, a: (x: T) => U, b: (x: T) => U) {
 >x : T
 >  : ^
 
-    var r: (x: T) => U;
+    var r!: (x: T) => U;
 >r : (x: T) => U
 >  : ^ ^^ ^^^^^ 
 >x : T
@@ -287,7 +287,7 @@ var r10 = foo2(null, (x: Object) => '', (x: string) => ''); // Object => Object
 >'' : ""
 >   : ^^
 
-var x: (a: string) => boolean;
+declare var x: (a: string) => boolean;
 >x : (a: string) => boolean
 >  : ^ ^^      ^^^^^       
 >a : string
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgs.errors.txt
index 383ca5958b2e0..6992393daff78 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs.errors.txt
@@ -17,7 +17,7 @@ genericCallWithObjectTypeArgs.ts(20,17): error TS2345: Argument of type 'X<D>' i
     }
     
     function foo<T>(t: X<T>, t2: X<T>) {
-        var x: T;
+        var x!: T;
         return x;
     }
     
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs.js b/tests/baselines/reference/genericCallWithObjectTypeArgs.js
index f3ba8ea048a1f..c5cc4d41ad5c3 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs.js
@@ -14,7 +14,7 @@ class X<T> {
 }
 
 function foo<T>(t: X<T>, t2: X<T>) {
-    var x: T;
+    var x!: T;
     return x;
 }
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgs.symbols
index a2e201d3b697e..efc84f8b1b8b2 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs.symbols
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs.symbols
@@ -34,7 +34,7 @@ function foo<T>(t: X<T>, t2: X<T>) {
 >X : Symbol(X, Decl(genericCallWithObjectTypeArgs.ts, 6, 1))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgs.ts, 12, 13))
 
-    var x: T;
+    var x!: T;
 >x : Symbol(x, Decl(genericCallWithObjectTypeArgs.ts, 13, 7))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgs.ts, 12, 13))
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs.types b/tests/baselines/reference/genericCallWithObjectTypeArgs.types
index 7c2552afbe6b7..b3a766d14bc00 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs.types
@@ -36,7 +36,7 @@ function foo<T>(t: X<T>, t2: X<T>) {
 >t2 : X<T>
 >   : ^^^^
 
-    var x: T;
+    var x!: T;
 >x : T
 >  : ^
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt
index 650e9b3819fe8..32f472858a0ca 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt
@@ -15,7 +15,7 @@ genericCallWithObjectTypeArgsAndConstraints3.ts(18,32): error TS2741: Property '
     }
     
     function f<T extends Base>(a: { x: T; y: T }) {
-        var r: T;
+        var r!: T;
         return r;
     }
     
@@ -26,7 +26,7 @@ genericCallWithObjectTypeArgsAndConstraints3.ts(18,32): error TS2741: Property '
 !!! related TS6500 genericCallWithObjectTypeArgsAndConstraints3.ts:13:39: The expected type comes from property 'y' which is declared here on type '{ x: Derived; y: Derived; }'
     
     function f2<T extends Base, U extends { x: T; y: T }>(a: U) {
-        var r: T;
+        var r!: T;
         return r;
     }
     
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
index 8e71c2626a652..46e0479bde340 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
@@ -14,14 +14,14 @@ class Derived2 extends Base {
 }
 
 function f<T extends Base>(a: { x: T; y: T }) {
-    var r: T;
+    var r!: T;
     return r;
 }
 
 var r1 = f({ x: new Derived(), y: new Derived2() }); // error because neither is supertype of the other
 
 function f2<T extends Base, U extends { x: T; y: T }>(a: U) {
-    var r: T;
+    var r!: T;
     return r;
 }
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.symbols
index a4f5516cc69a4..d9dd512dab412 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.symbols
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.symbols
@@ -34,7 +34,7 @@ function f<T extends Base>(a: { x: T; y: T }) {
 >y : Symbol(y, Decl(genericCallWithObjectTypeArgsAndConstraints3.ts, 12, 37))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndConstraints3.ts, 12, 11))
 
-    var r: T;
+    var r!: T;
 >r : Symbol(r, Decl(genericCallWithObjectTypeArgsAndConstraints3.ts, 13, 7))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndConstraints3.ts, 12, 11))
 
@@ -62,7 +62,7 @@ function f2<T extends Base, U extends { x: T; y: T }>(a: U) {
 >a : Symbol(a, Decl(genericCallWithObjectTypeArgsAndConstraints3.ts, 19, 54))
 >U : Symbol(U, Decl(genericCallWithObjectTypeArgsAndConstraints3.ts, 19, 27))
 
-    var r: T;
+    var r!: T;
 >r : Symbol(r, Decl(genericCallWithObjectTypeArgsAndConstraints3.ts, 20, 7))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndConstraints3.ts, 19, 12))
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.types
index 7c56096b2fb23..96244fa1ea314 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.types
@@ -42,7 +42,7 @@ function f<T extends Base>(a: { x: T; y: T }) {
 >y : T
 >  : ^
 
-    var r: T;
+    var r!: T;
 >r : T
 >  : ^
 
@@ -83,7 +83,7 @@ function f2<T extends Base, U extends { x: T; y: T }>(a: U) {
 >a : U
 >  : ^
 
-    var r: T;
+    var r!: T;
 >r : T
 >  : ^
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt
index 44c46bdffb129..b0ba26ecd7d91 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt
@@ -20,8 +20,8 @@ genericCallWithObjectTypeArgsAndConstraints4.ts(30,24): error TS2345: Argument o
         return (x: T) => t2;
     }
     
-    var c: C;
-    var d: D;
+    declare var c: C;
+    declare var d: D;
     var r = foo(c, d);
     var r2 = foo(d, c); // error because C does not extend D
                     ~
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js
index caa8155f7a391..d272b63e8d89d 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js
@@ -16,8 +16,8 @@ function foo<T, U extends T>(t: T, t2: U) {
     return (x: T) => t2;
 }
 
-var c: C;
-var d: D;
+declare var c: C;
+declare var d: D;
 var r = foo(c, d);
 var r2 = foo(d, c); // error because C does not extend D
 var r3 = foo(c, { x: '', foo: c });
@@ -50,8 +50,6 @@ var D = /** @class */ (function () {
 function foo(t, t2) {
     return function (x) { return t2; };
 }
-var c;
-var d;
 var r = foo(c, d);
 var r2 = foo(d, c); // error because C does not extend D
 var r3 = foo(c, { x: '', foo: c });
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.symbols
index 898342cd642ed..7029185a0a153 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.symbols
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.symbols
@@ -36,33 +36,33 @@ function foo<T, U extends T>(t: T, t2: U) {
 >t2 : Symbol(t2, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 11, 34))
 }
 
-var c: C;
->c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 15, 3))
+declare var c: C;
+>c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 15, 11))
 >C : Symbol(C, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 0, 0))
 
-var d: D;
->d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 16, 3))
+declare var d: D;
+>d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 16, 11))
 >D : Symbol(D, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 4, 1))
 
 var r = foo(c, d);
 >r : Symbol(r, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 17, 3))
 >foo : Symbol(foo, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 9, 1))
->c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 15, 3))
->d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 16, 3))
+>c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 15, 11))
+>d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 16, 11))
 
 var r2 = foo(d, c); // error because C does not extend D
 >r2 : Symbol(r2, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 18, 3))
 >foo : Symbol(foo, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 9, 1))
->d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 16, 3))
->c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 15, 3))
+>d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 16, 11))
+>c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 15, 11))
 
 var r3 = foo(c, { x: '', foo: c });
 >r3 : Symbol(r3, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 19, 3))
 >foo : Symbol(foo, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 9, 1))
->c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 15, 3))
+>c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 15, 11))
 >x : Symbol(x, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 19, 17))
 >foo : Symbol(foo, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 19, 24))
->c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 15, 3))
+>c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 15, 11))
 
 var r4 = foo(null, null);
 >r4 : Symbol(r4, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 20, 3))
@@ -97,16 +97,16 @@ function other<T, U extends T>() {
     var r4 = foo(c, d);
 >r4 : Symbol(r4, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 28, 7))
 >foo : Symbol(foo, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 9, 1))
->c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 15, 3))
->d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 16, 3))
+>c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 15, 11))
+>d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 16, 11))
 
     var r5 = foo<T, U>(c, d); // error
 >r5 : Symbol(r5, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 29, 7))
 >foo : Symbol(foo, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 9, 1))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 27, 15))
 >U : Symbol(U, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 27, 17))
->c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 15, 3))
->d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 16, 3))
+>c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 15, 11))
+>d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 16, 11))
 }
 
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types
index f540f37df42b2..a9fb6b1992ddf 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types
@@ -42,11 +42,11 @@ function foo<T, U extends T>(t: T, t2: U) {
 >   : ^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
-var d: D;
+declare var d: D;
 >d : D
 >  : ^
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt
index c7c4b3ed7f01b..f49fd5f883c10 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt
@@ -22,8 +22,8 @@ genericCallWithObjectTypeArgsAndConstraints5.ts(22,24): error TS2345: Argument o
         return (x: T) => t2;
     }
     
-    var c: C;
-    var d: D;
+    declare var c: C;
+    declare var d: D;
     var r2 = foo(d, c); // the constraints are self-referencing, no downstream error
                     ~
 !!! error TS2345: Argument of type 'C' is not assignable to parameter of type 'D'.
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js
index f1bad19baaab0..dddc80eef2e3a 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js
@@ -16,8 +16,8 @@ function foo<T, U extends T>(t: T, t2: U) {
     return (x: T) => t2;
 }
 
-var c: C;
-var d: D;
+declare var c: C;
+declare var d: D;
 var r2 = foo(d, c); // the constraints are self-referencing, no downstream error
 var r9 = foo(() => 1, () => { }); // the constraints are self-referencing, no downstream error
 
@@ -41,8 +41,6 @@ var D = /** @class */ (function () {
 function foo(t, t2) {
     return function (x) { return t2; };
 }
-var c;
-var d;
 var r2 = foo(d, c); // the constraints are self-referencing, no downstream error
 var r9 = foo(function () { return 1; }, function () { }); // the constraints are self-referencing, no downstream error
 function other() {
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.symbols
index d8506c2316205..37649123bceff 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.symbols
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.symbols
@@ -36,19 +36,19 @@ function foo<T, U extends T>(t: T, t2: U) {
 >t2 : Symbol(t2, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 11, 34))
 }
 
-var c: C;
->c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 15, 3))
+declare var c: C;
+>c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 15, 11))
 >C : Symbol(C, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 0, 0))
 
-var d: D;
->d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 16, 3))
+declare var d: D;
+>d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 16, 11))
 >D : Symbol(D, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 4, 1))
 
 var r2 = foo(d, c); // the constraints are self-referencing, no downstream error
 >r2 : Symbol(r2, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 17, 3))
 >foo : Symbol(foo, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 9, 1))
->d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 16, 3))
->c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 15, 3))
+>d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 16, 11))
+>c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 15, 11))
 
 var r9 = foo(() => 1, () => { }); // the constraints are self-referencing, no downstream error
 >r9 : Symbol(r9, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 18, 3))
@@ -65,7 +65,7 @@ function other<T, U extends T>() {
 >foo : Symbol(foo, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 9, 1))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 20, 15))
 >U : Symbol(U, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 20, 17))
->c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 15, 3))
->d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 16, 3))
+>c : Symbol(c, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 15, 11))
+>d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 16, 11))
 }
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types
index 072c2e96aa1e0..2ffd2e34651d6 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types
@@ -42,11 +42,11 @@ function foo<T, U extends T>(t: T, t2: U) {
 >   : ^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
-var d: D;
+declare var d: D;
 >d : D
 >  : ^
 
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.errors.txt b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.errors.txt
index e9c57cf7182dc..1777d1b363e22 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.errors.txt
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.errors.txt
@@ -7,7 +7,7 @@ genericCallWithOverloadedConstructorTypedArguments2.ts(31,20): error TS2345: Arg
     // Inferences are made quadratic-pairwise to and from these overload sets
     
     namespace NonGenericParameter {
-        var a: {
+        declare var a: {
             new(x: boolean): boolean;
             new(x: string): string;
         }
@@ -16,7 +16,7 @@ genericCallWithOverloadedConstructorTypedArguments2.ts(31,20): error TS2345: Arg
             return cb;
         }
     
-        var b: { new <T, U>(x: T): U }
+        declare var b: { new <T, U>(x: T): U }
         var r3 = foo4(b); // ok
     }
     
@@ -25,14 +25,14 @@ genericCallWithOverloadedConstructorTypedArguments2.ts(31,20): error TS2345: Arg
             return cb;
         }
     
-        var a: { new <T>(x: T): T };
+        declare var a: { new <T>(x: T): T };
         var r6 = foo5(a); // ok
     
         function foo6<T>(cb: { new(x: T): string; new(x: T, y?: T): string }) {
             return cb;
         }
     
-        var b: { new <T>(x: T, y: T): string };
+        declare var b: { new <T>(x: T, y: T): string };
         var r10 = foo6(b); // error
                        ~
 !!! error TS2345: Argument of type 'new <T>(x: T, y: T) => string' is not assignable to parameter of type '{ new (x: unknown): string; new (x: unknown, y?: unknown): string; }'.
@@ -43,6 +43,6 @@ genericCallWithOverloadedConstructorTypedArguments2.ts(31,20): error TS2345: Arg
         }
     
         var r13 = foo7(1, a); // ok
-        var c: { new<T>(x: T): number; new<T>(x: number): T; }
+        declare var c: { new<T>(x: T): number; new<T>(x: number): T; }
         var r14 = foo7(1, c); // ok
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.js b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.js
index 98349b629a1c4..755d19ed220f5 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.js
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.js
@@ -5,7 +5,7 @@
 // Inferences are made quadratic-pairwise to and from these overload sets
 
 namespace NonGenericParameter {
-    var a: {
+    declare var a: {
         new(x: boolean): boolean;
         new(x: string): string;
     }
@@ -14,7 +14,7 @@ namespace NonGenericParameter {
         return cb;
     }
 
-    var b: { new <T, U>(x: T): U }
+    declare var b: { new <T, U>(x: T): U }
     var r3 = foo4(b); // ok
 }
 
@@ -23,14 +23,14 @@ namespace GenericParameter {
         return cb;
     }
 
-    var a: { new <T>(x: T): T };
+    declare var a: { new <T>(x: T): T };
     var r6 = foo5(a); // ok
 
     function foo6<T>(cb: { new(x: T): string; new(x: T, y?: T): string }) {
         return cb;
     }
 
-    var b: { new <T>(x: T, y: T): string };
+    declare var b: { new <T>(x: T, y: T): string };
     var r10 = foo6(b); // error
 
     function foo7<T>(x:T, cb: { new(x: T): string; new(x: T, y?: T): string }) {
@@ -38,7 +38,7 @@ namespace GenericParameter {
     }
 
     var r13 = foo7(1, a); // ok
-    var c: { new<T>(x: T): number; new<T>(x: number): T; }
+    declare var c: { new<T>(x: T): number; new<T>(x: number): T; }
     var r14 = foo7(1, c); // ok
 }
 
@@ -47,11 +47,9 @@ namespace GenericParameter {
 // Inferences are made quadratic-pairwise to and from these overload sets
 var NonGenericParameter;
 (function (NonGenericParameter) {
-    var a;
     function foo4(cb) {
         return cb;
     }
-    var b;
     var r3 = foo4(b); // ok
 })(NonGenericParameter || (NonGenericParameter = {}));
 var GenericParameter;
@@ -59,17 +57,14 @@ var GenericParameter;
     function foo5(cb) {
         return cb;
     }
-    var a;
     var r6 = foo5(a); // ok
     function foo6(cb) {
         return cb;
     }
-    var b;
     var r10 = foo6(b); // error
     function foo7(x, cb) {
         return cb;
     }
     var r13 = foo7(1, a); // ok
-    var c;
     var r14 = foo7(1, c); // ok
 })(GenericParameter || (GenericParameter = {}));
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.symbols b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.symbols
index f4d567818c6d6..3c654774b4888 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.symbols
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.symbols
@@ -7,8 +7,8 @@
 namespace NonGenericParameter {
 >NonGenericParameter : Symbol(NonGenericParameter, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 0, 0))
 
-    var a: {
->a : Symbol(a, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 4, 7))
+    declare var a: {
+>a : Symbol(a, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 4, 15))
 
         new(x: boolean): boolean;
 >x : Symbol(x, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 5, 12))
@@ -20,24 +20,24 @@ namespace NonGenericParameter {
     function foo4(cb: typeof a) {
 >foo4 : Symbol(foo4, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 7, 5))
 >cb : Symbol(cb, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 9, 18))
->a : Symbol(a, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 4, 7))
+>a : Symbol(a, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 4, 15))
 
         return cb;
 >cb : Symbol(cb, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 9, 18))
     }
 
-    var b: { new <T, U>(x: T): U }
->b : Symbol(b, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 13, 7))
->T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 13, 18))
->U : Symbol(U, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 13, 20))
->x : Symbol(x, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 13, 24))
->T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 13, 18))
->U : Symbol(U, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 13, 20))
+    declare var b: { new <T, U>(x: T): U }
+>b : Symbol(b, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 13, 15))
+>T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 13, 26))
+>U : Symbol(U, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 13, 28))
+>x : Symbol(x, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 13, 32))
+>T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 13, 26))
+>U : Symbol(U, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 13, 28))
 
     var r3 = foo4(b); // ok
 >r3 : Symbol(r3, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 14, 7))
 >foo4 : Symbol(foo4, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 7, 5))
->b : Symbol(b, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 13, 7))
+>b : Symbol(b, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 13, 15))
 }
 
 namespace GenericParameter {
@@ -56,17 +56,17 @@ namespace GenericParameter {
 >cb : Symbol(cb, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 18, 21))
     }
 
-    var a: { new <T>(x: T): T };
->a : Symbol(a, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 22, 7))
->T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 22, 18))
->x : Symbol(x, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 22, 21))
->T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 22, 18))
->T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 22, 18))
+    declare var a: { new <T>(x: T): T };
+>a : Symbol(a, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 22, 15))
+>T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 22, 26))
+>x : Symbol(x, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 22, 29))
+>T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 22, 26))
+>T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 22, 26))
 
     var r6 = foo5(a); // ok
 >r6 : Symbol(r6, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 23, 7))
 >foo5 : Symbol(foo5, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 17, 28))
->a : Symbol(a, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 22, 7))
+>a : Symbol(a, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 22, 15))
 
     function foo6<T>(cb: { new(x: T): string; new(x: T, y?: T): string }) {
 >foo6 : Symbol(foo6, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 23, 21))
@@ -83,18 +83,18 @@ namespace GenericParameter {
 >cb : Symbol(cb, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 25, 21))
     }
 
-    var b: { new <T>(x: T, y: T): string };
->b : Symbol(b, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 29, 7))
->T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 29, 18))
->x : Symbol(x, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 29, 21))
->T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 29, 18))
->y : Symbol(y, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 29, 26))
->T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 29, 18))
+    declare var b: { new <T>(x: T, y: T): string };
+>b : Symbol(b, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 29, 15))
+>T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 29, 26))
+>x : Symbol(x, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 29, 29))
+>T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 29, 26))
+>y : Symbol(y, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 29, 34))
+>T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 29, 26))
 
     var r10 = foo6(b); // error
 >r10 : Symbol(r10, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 30, 7))
 >foo6 : Symbol(foo6, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 23, 21))
->b : Symbol(b, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 29, 7))
+>b : Symbol(b, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 29, 15))
 
     function foo7<T>(x:T, cb: { new(x: T): string; new(x: T, y?: T): string }) {
 >foo7 : Symbol(foo7, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 30, 22))
@@ -116,19 +116,19 @@ namespace GenericParameter {
     var r13 = foo7(1, a); // ok
 >r13 : Symbol(r13, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 36, 7))
 >foo7 : Symbol(foo7, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 30, 22))
->a : Symbol(a, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 22, 7))
+>a : Symbol(a, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 22, 15))
 
-    var c: { new<T>(x: T): number; new<T>(x: number): T; }
->c : Symbol(c, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 7))
->T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 17))
->x : Symbol(x, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 20))
->T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 17))
->T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 39))
->x : Symbol(x, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 42))
->T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 39))
+    declare var c: { new<T>(x: T): number; new<T>(x: number): T; }
+>c : Symbol(c, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 15))
+>T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 25))
+>x : Symbol(x, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 28))
+>T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 25))
+>T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 47))
+>x : Symbol(x, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 50))
+>T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 47))
 
     var r14 = foo7(1, c); // ok
 >r14 : Symbol(r14, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 38, 7))
 >foo7 : Symbol(foo7, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 30, 22))
->c : Symbol(c, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 7))
+>c : Symbol(c, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 37, 15))
 }
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types
index c4a4c4d3a8ad4..f67fe0cead79a 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types
@@ -8,7 +8,7 @@ namespace NonGenericParameter {
 >NonGenericParameter : typeof NonGenericParameter
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-    var a: {
+    declare var a: {
 >a : { new (x: boolean): boolean; new (x: string): string; }
 >  : ^^^^^^^ ^^       ^^^       ^^^^^^^ ^^      ^^^      ^^^
 
@@ -34,7 +34,7 @@ namespace NonGenericParameter {
 >   : ^^^^^^^ ^^       ^^^       ^^^^^^^ ^^      ^^^      ^^^
     }
 
-    var b: { new <T, U>(x: T): U }
+    declare var b: { new <T, U>(x: T): U }
 >b : new <T, U>(x: T) => U
 >  : ^^^^^ ^^ ^^ ^^ ^^^^^ 
 >x : T
@@ -70,7 +70,7 @@ namespace GenericParameter {
 >   : ^^^^^^^ ^^ ^^^      ^^^^^^^ ^^      ^^^ ^^^
     }
 
-    var a: { new <T>(x: T): T };
+    declare var a: { new <T>(x: T): T };
 >a : new <T>(x: T) => T
 >  : ^^^^^ ^^ ^^ ^^^^^ 
 >x : T
@@ -103,7 +103,7 @@ namespace GenericParameter {
 >   : ^^^^^^^ ^^ ^^^      ^^^^^^^ ^^ ^^ ^^^ ^^^      ^^^
     }
 
-    var b: { new <T>(x: T, y: T): string };
+    declare var b: { new <T>(x: T, y: T): string };
 >b : new <T>(x: T, y: T) => string
 >  : ^^^^^ ^^ ^^ ^^ ^^ ^^^^^      
 >x : T
@@ -152,7 +152,7 @@ namespace GenericParameter {
 >a : new <T>(x: T) => T
 >  : ^^^^^ ^^ ^^ ^^^^^ 
 
-    var c: { new<T>(x: T): number; new<T>(x: number): T; }
+    declare var c: { new<T>(x: T): number; new<T>(x: number): T; }
 >c : { new <T>(x: T): number; new <T>(x: number): T; }
 >  : ^^^^^^^ ^^ ^^ ^^^      ^^^^^^^ ^^ ^^      ^^^ ^^^
 >x : T
diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.errors.txt b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.errors.txt
index e7a8d29e35dab..166b7d50a2c15 100644
--- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.errors.txt
+++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.errors.txt
@@ -7,7 +7,7 @@ genericCallWithOverloadedFunctionTypedArguments2.ts(28,20): error TS2345: Argume
     // Inferences are made quadratic-pairwise to and from these overload sets
     
     namespace NonGenericParameter {
-        var a: {
+        declare var a: {
             (x: boolean): boolean;
             (x: string): string;
         }
@@ -16,7 +16,7 @@ genericCallWithOverloadedFunctionTypedArguments2.ts(28,20): error TS2345: Argume
             return cb;
         }
     
-        var r3 = foo4(<T, U>(x: T) => { var r: U; return r }); // ok
+        var r3 = foo4(<T, U>(x: T) => { var r!: U; return r }); // ok
     }
     
     namespace GenericParameter {
@@ -40,6 +40,6 @@ genericCallWithOverloadedFunctionTypedArguments2.ts(28,20): error TS2345: Argume
         }
     
         var r13 = foo7(1, <T>(x: T) => x); // ok
-        var a: { <T>(x: T): number; <T>(x: number): T; }
+        declare var a: { <T>(x: T): number; <T>(x: number): T; }
         var r14 = foo7(1, a); // ok
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js
index 9a133c9fb3bd8..76feb2ec0c9c1 100644
--- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js
+++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js
@@ -5,7 +5,7 @@
 // Inferences are made quadratic-pairwise to and from these overload sets
 
 namespace NonGenericParameter {
-    var a: {
+    declare var a: {
         (x: boolean): boolean;
         (x: string): string;
     }
@@ -14,7 +14,7 @@ namespace NonGenericParameter {
         return cb;
     }
 
-    var r3 = foo4(<T, U>(x: T) => { var r: U; return r }); // ok
+    var r3 = foo4(<T, U>(x: T) => { var r!: U; return r }); // ok
 }
 
 namespace GenericParameter {
@@ -35,7 +35,7 @@ namespace GenericParameter {
     }
 
     var r13 = foo7(1, <T>(x: T) => x); // ok
-    var a: { <T>(x: T): number; <T>(x: number): T; }
+    declare var a: { <T>(x: T): number; <T>(x: number): T; }
     var r14 = foo7(1, a); // ok
 }
 
@@ -44,7 +44,6 @@ namespace GenericParameter {
 // Inferences are made quadratic-pairwise to and from these overload sets
 var NonGenericParameter;
 (function (NonGenericParameter) {
-    var a;
     function foo4(cb) {
         return cb;
     }
@@ -64,6 +63,5 @@ var GenericParameter;
         return cb;
     }
     var r13 = foo7(1, function (x) { return x; }); // ok
-    var a;
     var r14 = foo7(1, a); // ok
 })(GenericParameter || (GenericParameter = {}));
diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.symbols b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.symbols
index 10d9154a97e1b..cee0ed57ed7d0 100644
--- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.symbols
+++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.symbols
@@ -7,8 +7,8 @@
 namespace NonGenericParameter {
 >NonGenericParameter : Symbol(NonGenericParameter, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 0, 0))
 
-    var a: {
->a : Symbol(a, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 4, 7))
+    declare var a: {
+>a : Symbol(a, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 4, 15))
 
         (x: boolean): boolean;
 >x : Symbol(x, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 5, 9))
@@ -20,13 +20,13 @@ namespace NonGenericParameter {
     function foo4(cb: typeof a) {
 >foo4 : Symbol(foo4, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 7, 5))
 >cb : Symbol(cb, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 9, 18))
->a : Symbol(a, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 4, 7))
+>a : Symbol(a, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 4, 15))
 
         return cb;
 >cb : Symbol(cb, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 9, 18))
     }
 
-    var r3 = foo4(<T, U>(x: T) => { var r: U; return r }); // ok
+    var r3 = foo4(<T, U>(x: T) => { var r!: U; return r }); // ok
 >r3 : Symbol(r3, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 13, 7))
 >foo4 : Symbol(foo4, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 7, 5))
 >T : Symbol(T, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 13, 19))
@@ -111,17 +111,17 @@ namespace GenericParameter {
 >T : Symbol(T, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 33, 23))
 >x : Symbol(x, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 33, 26))
 
-    var a: { <T>(x: T): number; <T>(x: number): T; }
->a : Symbol(a, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 7))
->T : Symbol(T, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 14))
->x : Symbol(x, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 17))
->T : Symbol(T, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 14))
->T : Symbol(T, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 33))
->x : Symbol(x, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 36))
->T : Symbol(T, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 33))
+    declare var a: { <T>(x: T): number; <T>(x: number): T; }
+>a : Symbol(a, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 15))
+>T : Symbol(T, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 22))
+>x : Symbol(x, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 25))
+>T : Symbol(T, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 22))
+>T : Symbol(T, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 41))
+>x : Symbol(x, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 44))
+>T : Symbol(T, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 41))
 
     var r14 = foo7(1, a); // ok
 >r14 : Symbol(r14, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 35, 7))
 >foo7 : Symbol(foo7, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 27, 42))
->a : Symbol(a, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 7))
+>a : Symbol(a, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 34, 15))
 }
diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types
index 72dc867a3b49a..ccaccfd0065a0 100644
--- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types
+++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types
@@ -8,7 +8,7 @@ namespace NonGenericParameter {
 >NonGenericParameter : typeof NonGenericParameter
 >                    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-    var a: {
+    declare var a: {
 >a : { (x: boolean): boolean; (x: string): string; }
 >  : ^^^ ^^       ^^^       ^^^ ^^      ^^^      ^^^
 
@@ -34,15 +34,15 @@ namespace NonGenericParameter {
 >   : ^^^ ^^       ^^^       ^^^ ^^      ^^^      ^^^
     }
 
-    var r3 = foo4(<T, U>(x: T) => { var r: U; return r }); // ok
+    var r3 = foo4(<T, U>(x: T) => { var r!: U; return r }); // ok
 >r3 : { (x: boolean): boolean; (x: string): string; }
 >   : ^^^ ^^       ^^^       ^^^ ^^      ^^^      ^^^
->foo4(<T, U>(x: T) => { var r: U; return r }) : { (x: boolean): boolean; (x: string): string; }
->                                             : ^^^ ^^       ^^^       ^^^ ^^      ^^^      ^^^
+>foo4(<T, U>(x: T) => { var r!: U; return r }) : { (x: boolean): boolean; (x: string): string; }
+>                                              : ^^^ ^^       ^^^       ^^^ ^^      ^^^      ^^^
 >foo4 : (cb: typeof a) => { (x: boolean): boolean; (x: string): string; }
 >     : ^  ^^        ^^^^^^^^ ^^       ^^^       ^^^ ^^      ^^^      ^^^
-><T, U>(x: T) => { var r: U; return r } : <T, U>(x: T) => U
->                                       : ^ ^^ ^^ ^^ ^^^^^^
+><T, U>(x: T) => { var r!: U; return r } : <T, U>(x: T) => U
+>                                        : ^ ^^ ^^ ^^ ^^^^^^
 >x : T
 >  : ^
 >r : U
@@ -152,7 +152,7 @@ namespace GenericParameter {
 >x : T
 >  : ^
 
-    var a: { <T>(x: T): number; <T>(x: number): T; }
+    declare var a: { <T>(x: T): number; <T>(x: number): T; }
 >a : { <T>(x: T): number; <T>(x: number): T; }
 >  : ^^^ ^^ ^^ ^^^      ^^^ ^^ ^^      ^^^ ^^^
 >x : T
diff --git a/tests/baselines/reference/genericCallWithTupleType.errors.txt b/tests/baselines/reference/genericCallWithTupleType.errors.txt
index cfbbcaa68837e..4c5b8fc636774 100644
--- a/tests/baselines/reference/genericCallWithTupleType.errors.txt
+++ b/tests/baselines/reference/genericCallWithTupleType.errors.txt
@@ -1,14 +1,14 @@
-genericCallWithTupleType.ts(12,1): error TS2322: Type '[string, number, boolean, boolean]' is not assignable to type '[string, number]'.
+genericCallWithTupleType.ts(13,1): error TS2322: Type '[string, number, boolean, boolean]' is not assignable to type '[string, number]'.
   Source has 4 element(s) but target allows only 2.
-genericCallWithTupleType.ts(13,20): error TS2493: Tuple type '[string, number]' of length '2' has no element at index '2'.
-genericCallWithTupleType.ts(14,1): error TS2322: Type '{ a: string; }' is not assignable to type 'undefined'.
-genericCallWithTupleType.ts(14,11): error TS2493: Tuple type '[string, number]' of length '2' has no element at index '3'.
-genericCallWithTupleType.ts(15,20): error TS2493: Tuple type '[string, number]' of length '2' has no element at index '3'.
-genericCallWithTupleType.ts(22,14): error TS2322: Type 'number' is not assignable to type 'string'.
-genericCallWithTupleType.ts(22,17): error TS2322: Type 'string' is not assignable to type 'number'.
-genericCallWithTupleType.ts(23,14): error TS2322: Type '{}' is not assignable to type 'string'.
-genericCallWithTupleType.ts(23,18): error TS2322: Type '{}' is not assignable to type 'number'.
-genericCallWithTupleType.ts(24,1): error TS2322: Type '[{}]' is not assignable to type '[{}, {}]'.
+genericCallWithTupleType.ts(14,20): error TS2493: Tuple type '[string, number]' of length '2' has no element at index '2'.
+genericCallWithTupleType.ts(15,1): error TS2322: Type '{ a: string; }' is not assignable to type 'undefined'.
+genericCallWithTupleType.ts(15,11): error TS2493: Tuple type '[string, number]' of length '2' has no element at index '3'.
+genericCallWithTupleType.ts(16,20): error TS2493: Tuple type '[string, number]' of length '2' has no element at index '3'.
+genericCallWithTupleType.ts(23,14): error TS2322: Type 'number' is not assignable to type 'string'.
+genericCallWithTupleType.ts(23,17): error TS2322: Type 'string' is not assignable to type 'number'.
+genericCallWithTupleType.ts(24,14): error TS2322: Type '{}' is not assignable to type 'string'.
+genericCallWithTupleType.ts(24,18): error TS2322: Type '{}' is not assignable to type 'number'.
+genericCallWithTupleType.ts(25,1): error TS2322: Type '[{}]' is not assignable to type '[{}, {}]'.
   Source has 1 element(s) but target requires 2.
 
 
@@ -18,7 +18,8 @@ genericCallWithTupleType.ts(24,1): error TS2322: Type '[{}]' is not assignable t
     } 
     
     var i1: I<string, number>;
-    var i2: I<{}, {}>;
+    declare var i1: I<string, number>;
+    declare var i2: I<{}, {}>;
     
     // no error
     i1.tuple1 = ["foo", 5];
diff --git a/tests/baselines/reference/genericCallWithTupleType.js b/tests/baselines/reference/genericCallWithTupleType.js
index 8141a06c8580d..c420b8d9b0595 100644
--- a/tests/baselines/reference/genericCallWithTupleType.js
+++ b/tests/baselines/reference/genericCallWithTupleType.js
@@ -6,7 +6,8 @@ interface I<T, U> {
 } 
 
 var i1: I<string, number>;
-var i2: I<{}, {}>;
+declare var i1: I<string, number>;
+declare var i2: I<{}, {}>;
 
 // no error
 i1.tuple1 = ["foo", 5];
@@ -29,7 +30,6 @@ i2.tuple1 = [{}];
 
 //// [genericCallWithTupleType.js]
 var i1;
-var i2;
 // no error
 i1.tuple1 = ["foo", 5];
 var e1 = i1.tuple1[0]; // string
diff --git a/tests/baselines/reference/genericCallWithTupleType.symbols b/tests/baselines/reference/genericCallWithTupleType.symbols
index a529acac6567f..d84c0704438ec 100644
--- a/tests/baselines/reference/genericCallWithTupleType.symbols
+++ b/tests/baselines/reference/genericCallWithTupleType.symbols
@@ -13,89 +13,93 @@ interface I<T, U> {
 } 
 
 var i1: I<string, number>;
->i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3))
+>i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3), Decl(genericCallWithTupleType.ts, 5, 11))
 >I : Symbol(I, Decl(genericCallWithTupleType.ts, 0, 0))
 
-var i2: I<{}, {}>;
->i2 : Symbol(i2, Decl(genericCallWithTupleType.ts, 5, 3))
+declare var i1: I<string, number>;
+>i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3), Decl(genericCallWithTupleType.ts, 5, 11))
+>I : Symbol(I, Decl(genericCallWithTupleType.ts, 0, 0))
+
+declare var i2: I<{}, {}>;
+>i2 : Symbol(i2, Decl(genericCallWithTupleType.ts, 6, 11))
 >I : Symbol(I, Decl(genericCallWithTupleType.ts, 0, 0))
 
 // no error
 i1.tuple1 = ["foo", 5];
 >i1.tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
->i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3))
+>i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3), Decl(genericCallWithTupleType.ts, 5, 11))
 >tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
 
 var e1 = i1.tuple1[0];  // string
->e1 : Symbol(e1, Decl(genericCallWithTupleType.ts, 9, 3))
+>e1 : Symbol(e1, Decl(genericCallWithTupleType.ts, 10, 3))
 >i1.tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
->i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3))
+>i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3), Decl(genericCallWithTupleType.ts, 5, 11))
 >tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
 >0 : Symbol(0)
 
 var e2 = i1.tuple1[1];  // number
->e2 : Symbol(e2, Decl(genericCallWithTupleType.ts, 10, 3))
+>e2 : Symbol(e2, Decl(genericCallWithTupleType.ts, 11, 3))
 >i1.tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
->i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3))
+>i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3), Decl(genericCallWithTupleType.ts, 5, 11))
 >tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
 >1 : Symbol(1)
 
 i1.tuple1 = ["foo", 5, false, true];
 >i1.tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
->i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3))
+>i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3), Decl(genericCallWithTupleType.ts, 5, 11))
 >tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
 
 var e3 = i1.tuple1[2];  // {}
->e3 : Symbol(e3, Decl(genericCallWithTupleType.ts, 12, 3))
+>e3 : Symbol(e3, Decl(genericCallWithTupleType.ts, 13, 3))
 >i1.tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
->i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3))
+>i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3), Decl(genericCallWithTupleType.ts, 5, 11))
 >tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
 
 i1.tuple1[3] = { a: "string" };
 >i1.tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
->i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3))
+>i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3), Decl(genericCallWithTupleType.ts, 5, 11))
 >tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
->a : Symbol(a, Decl(genericCallWithTupleType.ts, 13, 16))
+>a : Symbol(a, Decl(genericCallWithTupleType.ts, 14, 16))
 
 var e4 = i1.tuple1[3];  // {}
->e4 : Symbol(e4, Decl(genericCallWithTupleType.ts, 14, 3))
+>e4 : Symbol(e4, Decl(genericCallWithTupleType.ts, 15, 3))
 >i1.tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
->i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3))
+>i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3), Decl(genericCallWithTupleType.ts, 5, 11))
 >tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
 
 i2.tuple1 = ["foo", 5];
 >i2.tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
->i2 : Symbol(i2, Decl(genericCallWithTupleType.ts, 5, 3))
+>i2 : Symbol(i2, Decl(genericCallWithTupleType.ts, 6, 11))
 >tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
 
 i2.tuple1 = ["foo", "bar"];
 >i2.tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
->i2 : Symbol(i2, Decl(genericCallWithTupleType.ts, 5, 3))
+>i2 : Symbol(i2, Decl(genericCallWithTupleType.ts, 6, 11))
 >tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
 
 i2.tuple1 = [5, "bar"];
 >i2.tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
->i2 : Symbol(i2, Decl(genericCallWithTupleType.ts, 5, 3))
+>i2 : Symbol(i2, Decl(genericCallWithTupleType.ts, 6, 11))
 >tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
 
 i2.tuple1 = [{}, {}];
 >i2.tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
->i2 : Symbol(i2, Decl(genericCallWithTupleType.ts, 5, 3))
+>i2 : Symbol(i2, Decl(genericCallWithTupleType.ts, 6, 11))
 >tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
 
 // error
 i1.tuple1 = [5, "foo"];
 >i1.tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
->i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3))
+>i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3), Decl(genericCallWithTupleType.ts, 5, 11))
 >tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
 
 i1.tuple1 = [{}, {}];
 >i1.tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
->i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3))
+>i1 : Symbol(i1, Decl(genericCallWithTupleType.ts, 4, 3), Decl(genericCallWithTupleType.ts, 5, 11))
 >tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
 
 i2.tuple1 = [{}];
 >i2.tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
->i2 : Symbol(i2, Decl(genericCallWithTupleType.ts, 5, 3))
+>i2 : Symbol(i2, Decl(genericCallWithTupleType.ts, 6, 11))
 >tuple1 : Symbol(I.tuple1, Decl(genericCallWithTupleType.ts, 0, 19))
 
diff --git a/tests/baselines/reference/genericCallWithTupleType.types b/tests/baselines/reference/genericCallWithTupleType.types
index 94b6b2cda0d15..146bf5a916da3 100644
--- a/tests/baselines/reference/genericCallWithTupleType.types
+++ b/tests/baselines/reference/genericCallWithTupleType.types
@@ -11,7 +11,11 @@ var i1: I<string, number>;
 >i1 : I<string, number>
 >   : ^^^^^^^^^^^^^^^^^
 
-var i2: I<{}, {}>;
+declare var i1: I<string, number>;
+>i1 : I<string, number>
+>   : ^^^^^^^^^^^^^^^^^
+
+declare var i2: I<{}, {}>;
 >i2 : I<{}, {}>
 >   : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.errors.txt b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.errors.txt
index a28da68692005..8d1a7e1e484b1 100644
--- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.errors.txt
+++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.errors.txt
@@ -48,7 +48,7 @@ genericClassWithFunctionTypedMemberArguments.ts(62,30): error TS2345: Argument o
             }
         }
     
-        var c: C<number>;
+        declare var c: C<number>;
         var r4 = c.foo2(1, function <Z>(a: Z) { return '' }); // string, contextual signature instantiation is applied to generic functions
         var r5 = c.foo2(1, (a) => ''); // string
         var r6 = c.foo2<string, number>('', <Z>(a: Z) => 1); // number
@@ -59,7 +59,7 @@ genericClassWithFunctionTypedMemberArguments.ts(62,30): error TS2345: Argument o
             }
         }
     
-        var c2: C2<number, string>;
+        declare var c2: C2<number, string>;
         var r7 = c2.foo3(1, <Z>(a: Z) => '', ''); // string
         var r8 = c2.foo3(1, function (a) { return '' }, ''); // string
     
@@ -68,7 +68,7 @@ genericClassWithFunctionTypedMemberArguments.ts(62,30): error TS2345: Argument o
                 return cb(x);
             }
         }
-        var c3: C3<number, string>;
+        declare var c3: C3<number, string>;
     
         function other<T, U>(t: T, u: U) {
             var r10 = c.foo2(1, (x: T) => ''); // error
diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js
index 158303f002566..809ef27d70e09 100644
--- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js
+++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js
@@ -34,7 +34,7 @@ namespace WithCandidates {
         }
     }
 
-    var c: C<number>;
+    declare var c: C<number>;
     var r4 = c.foo2(1, function <Z>(a: Z) { return '' }); // string, contextual signature instantiation is applied to generic functions
     var r5 = c.foo2(1, (a) => ''); // string
     var r6 = c.foo2<string, number>('', <Z>(a: Z) => 1); // number
@@ -45,7 +45,7 @@ namespace WithCandidates {
         }
     }
 
-    var c2: C2<number, string>;
+    declare var c2: C2<number, string>;
     var r7 = c2.foo3(1, <Z>(a: Z) => '', ''); // string
     var r8 = c2.foo3(1, function (a) { return '' }, ''); // string
 
@@ -54,7 +54,7 @@ namespace WithCandidates {
             return cb(x);
         }
     }
-    var c3: C3<number, string>;
+    declare var c3: C3<number, string>;
 
     function other<T, U>(t: T, u: U) {
         var r10 = c.foo2(1, (x: T) => ''); // error
@@ -105,7 +105,6 @@ var WithCandidates;
         };
         return C;
     }());
-    var c;
     var r4 = c.foo2(1, function (a) { return ''; }); // string, contextual signature instantiation is applied to generic functions
     var r5 = c.foo2(1, function (a) { return ''; }); // string
     var r6 = c.foo2('', function (a) { return 1; }); // number
@@ -117,7 +116,6 @@ var WithCandidates;
         };
         return C2;
     }());
-    var c2;
     var r7 = c2.foo3(1, function (a) { return ''; }, ''); // string
     var r8 = c2.foo3(1, function (a) { return ''; }, ''); // string
     var C3 = /** @class */ (function () {
@@ -128,7 +126,6 @@ var WithCandidates;
         };
         return C3;
     }());
-    var c3;
     function other(t, u) {
         var r10 = c.foo2(1, function (x) { return ''; }); // error
         var r10 = c.foo2(1, function (x) { return ''; }); // string
diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.symbols b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.symbols
index d3bcbed99dbd2..1a5f0b1e5cf1a 100644
--- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.symbols
+++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.symbols
@@ -114,14 +114,14 @@ namespace WithCandidates {
         }
     }
 
-    var c: C<number>;
->c : Symbol(c, Decl(genericClassWithFunctionTypedMemberArguments.ts, 33, 7))
+    declare var c: C<number>;
+>c : Symbol(c, Decl(genericClassWithFunctionTypedMemberArguments.ts, 33, 15))
 >C : Symbol(C, Decl(genericClassWithFunctionTypedMemberArguments.ts, 26, 26))
 
     var r4 = c.foo2(1, function <Z>(a: Z) { return '' }); // string, contextual signature instantiation is applied to generic functions
 >r4 : Symbol(r4, Decl(genericClassWithFunctionTypedMemberArguments.ts, 34, 7))
 >c.foo2 : Symbol(C.foo2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 27, 16))
->c : Symbol(c, Decl(genericClassWithFunctionTypedMemberArguments.ts, 33, 7))
+>c : Symbol(c, Decl(genericClassWithFunctionTypedMemberArguments.ts, 33, 15))
 >foo2 : Symbol(C.foo2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 27, 16))
 >Z : Symbol(Z, Decl(genericClassWithFunctionTypedMemberArguments.ts, 34, 33))
 >a : Symbol(a, Decl(genericClassWithFunctionTypedMemberArguments.ts, 34, 36))
@@ -130,14 +130,14 @@ namespace WithCandidates {
     var r5 = c.foo2(1, (a) => ''); // string
 >r5 : Symbol(r5, Decl(genericClassWithFunctionTypedMemberArguments.ts, 35, 7))
 >c.foo2 : Symbol(C.foo2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 27, 16))
->c : Symbol(c, Decl(genericClassWithFunctionTypedMemberArguments.ts, 33, 7))
+>c : Symbol(c, Decl(genericClassWithFunctionTypedMemberArguments.ts, 33, 15))
 >foo2 : Symbol(C.foo2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 27, 16))
 >a : Symbol(a, Decl(genericClassWithFunctionTypedMemberArguments.ts, 35, 24))
 
     var r6 = c.foo2<string, number>('', <Z>(a: Z) => 1); // number
 >r6 : Symbol(r6, Decl(genericClassWithFunctionTypedMemberArguments.ts, 36, 7))
 >c.foo2 : Symbol(C.foo2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 27, 16))
->c : Symbol(c, Decl(genericClassWithFunctionTypedMemberArguments.ts, 33, 7))
+>c : Symbol(c, Decl(genericClassWithFunctionTypedMemberArguments.ts, 33, 15))
 >foo2 : Symbol(C.foo2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 27, 16))
 >Z : Symbol(Z, Decl(genericClassWithFunctionTypedMemberArguments.ts, 36, 41))
 >a : Symbol(a, Decl(genericClassWithFunctionTypedMemberArguments.ts, 36, 44))
@@ -165,14 +165,14 @@ namespace WithCandidates {
         }
     }
 
-    var c2: C2<number, string>;
->c2 : Symbol(c2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 44, 7))
+    declare var c2: C2<number, string>;
+>c2 : Symbol(c2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 44, 15))
 >C2 : Symbol(C2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 36, 56))
 
     var r7 = c2.foo3(1, <Z>(a: Z) => '', ''); // string
 >r7 : Symbol(r7, Decl(genericClassWithFunctionTypedMemberArguments.ts, 45, 7))
 >c2.foo3 : Symbol(C2.foo3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 38, 20))
->c2 : Symbol(c2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 44, 7))
+>c2 : Symbol(c2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 44, 15))
 >foo3 : Symbol(C2.foo3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 38, 20))
 >Z : Symbol(Z, Decl(genericClassWithFunctionTypedMemberArguments.ts, 45, 25))
 >a : Symbol(a, Decl(genericClassWithFunctionTypedMemberArguments.ts, 45, 28))
@@ -181,7 +181,7 @@ namespace WithCandidates {
     var r8 = c2.foo3(1, function (a) { return '' }, ''); // string
 >r8 : Symbol(r8, Decl(genericClassWithFunctionTypedMemberArguments.ts, 46, 7))
 >c2.foo3 : Symbol(C2.foo3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 38, 20))
->c2 : Symbol(c2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 44, 7))
+>c2 : Symbol(c2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 44, 15))
 >foo3 : Symbol(C2.foo3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 38, 20))
 >a : Symbol(a, Decl(genericClassWithFunctionTypedMemberArguments.ts, 46, 34))
 
@@ -208,12 +208,12 @@ namespace WithCandidates {
 >x : Symbol(x, Decl(genericClassWithFunctionTypedMemberArguments.ts, 49, 18))
         }
     }
-    var c3: C3<number, string>;
->c3 : Symbol(c3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 53, 7))
+    declare var c3: C3<number, string>;
+>c3 : Symbol(c3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 53, 15))
 >C3 : Symbol(C3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 46, 56))
 
     function other<T, U>(t: T, u: U) {
->other : Symbol(other, Decl(genericClassWithFunctionTypedMemberArguments.ts, 53, 31))
+>other : Symbol(other, Decl(genericClassWithFunctionTypedMemberArguments.ts, 53, 39))
 >T : Symbol(T, Decl(genericClassWithFunctionTypedMemberArguments.ts, 55, 19))
 >U : Symbol(U, Decl(genericClassWithFunctionTypedMemberArguments.ts, 55, 21))
 >t : Symbol(t, Decl(genericClassWithFunctionTypedMemberArguments.ts, 55, 25))
@@ -224,7 +224,7 @@ namespace WithCandidates {
         var r10 = c.foo2(1, (x: T) => ''); // error
 >r10 : Symbol(r10, Decl(genericClassWithFunctionTypedMemberArguments.ts, 56, 11), Decl(genericClassWithFunctionTypedMemberArguments.ts, 57, 11))
 >c.foo2 : Symbol(C.foo2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 27, 16))
->c : Symbol(c, Decl(genericClassWithFunctionTypedMemberArguments.ts, 33, 7))
+>c : Symbol(c, Decl(genericClassWithFunctionTypedMemberArguments.ts, 33, 15))
 >foo2 : Symbol(C.foo2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 27, 16))
 >x : Symbol(x, Decl(genericClassWithFunctionTypedMemberArguments.ts, 56, 29))
 >T : Symbol(T, Decl(genericClassWithFunctionTypedMemberArguments.ts, 55, 19))
@@ -232,14 +232,14 @@ namespace WithCandidates {
         var r10 = c.foo2(1, (x) => ''); // string
 >r10 : Symbol(r10, Decl(genericClassWithFunctionTypedMemberArguments.ts, 56, 11), Decl(genericClassWithFunctionTypedMemberArguments.ts, 57, 11))
 >c.foo2 : Symbol(C.foo2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 27, 16))
->c : Symbol(c, Decl(genericClassWithFunctionTypedMemberArguments.ts, 33, 7))
+>c : Symbol(c, Decl(genericClassWithFunctionTypedMemberArguments.ts, 33, 15))
 >foo2 : Symbol(C.foo2, Decl(genericClassWithFunctionTypedMemberArguments.ts, 27, 16))
 >x : Symbol(x, Decl(genericClassWithFunctionTypedMemberArguments.ts, 57, 29))
 
         var r11 = c3.foo3(1, (x: T) => '', ''); // error
 >r11 : Symbol(r11, Decl(genericClassWithFunctionTypedMemberArguments.ts, 59, 11))
 >c3.foo3 : Symbol(C3.foo3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 48, 20))
->c3 : Symbol(c3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 53, 7))
+>c3 : Symbol(c3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 53, 15))
 >foo3 : Symbol(C3.foo3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 48, 20))
 >x : Symbol(x, Decl(genericClassWithFunctionTypedMemberArguments.ts, 59, 30))
 >T : Symbol(T, Decl(genericClassWithFunctionTypedMemberArguments.ts, 55, 19))
@@ -247,7 +247,7 @@ namespace WithCandidates {
         var r11b = c3.foo3(1, (x: T) => '', 1); // error
 >r11b : Symbol(r11b, Decl(genericClassWithFunctionTypedMemberArguments.ts, 60, 11))
 >c3.foo3 : Symbol(C3.foo3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 48, 20))
->c3 : Symbol(c3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 53, 7))
+>c3 : Symbol(c3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 53, 15))
 >foo3 : Symbol(C3.foo3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 48, 20))
 >x : Symbol(x, Decl(genericClassWithFunctionTypedMemberArguments.ts, 60, 31))
 >T : Symbol(T, Decl(genericClassWithFunctionTypedMemberArguments.ts, 55, 19))
@@ -255,7 +255,7 @@ namespace WithCandidates {
         var r12 = c3.foo3(1, function (a) { return '' }, 1); // error
 >r12 : Symbol(r12, Decl(genericClassWithFunctionTypedMemberArguments.ts, 61, 11))
 >c3.foo3 : Symbol(C3.foo3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 48, 20))
->c3 : Symbol(c3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 53, 7))
+>c3 : Symbol(c3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 53, 15))
 >foo3 : Symbol(C3.foo3, Decl(genericClassWithFunctionTypedMemberArguments.ts, 48, 20))
 >a : Symbol(a, Decl(genericClassWithFunctionTypedMemberArguments.ts, 61, 39))
     }
diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
index 7e21c8f182cc6..aae2a63e894c0 100644
--- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
+++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
@@ -183,7 +183,7 @@ namespace WithCandidates {
         }
     }
 
-    var c: C<number>;
+    declare var c: C<number>;
 >c : C<number>
 >  : ^^^^^^^^^
 
@@ -273,7 +273,7 @@ namespace WithCandidates {
         }
     }
 
-    var c2: C2<number, string>;
+    declare var c2: C2<number, string>;
 >c2 : C2<number, string>
 >   : ^^^^^^^^^^^^^^^^^^
 
@@ -346,7 +346,7 @@ namespace WithCandidates {
 >  : ^
         }
     }
-    var c3: C3<number, string>;
+    declare var c3: C3<number, string>;
 >c3 : C3<number, string>
 >   : ^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/genericCombinators2.errors.txt b/tests/baselines/reference/genericCombinators2.errors.txt
index 84799b53993d8..57b14eaea791a 100644
--- a/tests/baselines/reference/genericCombinators2.errors.txt
+++ b/tests/baselines/reference/genericCombinators2.errors.txt
@@ -16,8 +16,8 @@ genericCombinators2.ts(16,43): error TS2345: Argument of type '(x: number, y: st
         map<T, U, V>(c: Collection<T, U>, f: (x: T, y: U) => V): Collection<T, V>;
     }
     
-    var _: Combinators;
-    var c2: Collection<number, string>;
+    declare var _: Combinators;
+    declare var c2: Collection<number, string>;
     var rf1 = (x: number, y: string) => { return x.toFixed() };
     var r5a = _.map<number, string, Date>(c2, (x, y) => { return x.toFixed() });
                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/genericCombinators2.js b/tests/baselines/reference/genericCombinators2.js
index 0a725c30f3465..d167af3150fc8 100644
--- a/tests/baselines/reference/genericCombinators2.js
+++ b/tests/baselines/reference/genericCombinators2.js
@@ -12,15 +12,13 @@ interface Combinators {
     map<T, U, V>(c: Collection<T, U>, f: (x: T, y: U) => V): Collection<T, V>;
 }
 
-var _: Combinators;
-var c2: Collection<number, string>;
+declare var _: Combinators;
+declare var c2: Collection<number, string>;
 var rf1 = (x: number, y: string) => { return x.toFixed() };
 var r5a = _.map<number, string, Date>(c2, (x, y) => { return x.toFixed() });
 var r5b = _.map<number, string, Date>(c2, rf1);
 
 //// [genericCombinators2.js]
-var _;
-var c2;
 var rf1 = function (x, y) { return x.toFixed(); };
 var r5a = _.map(c2, function (x, y) { return x.toFixed(); });
 var r5b = _.map(c2, rf1);
diff --git a/tests/baselines/reference/genericCombinators2.symbols b/tests/baselines/reference/genericCombinators2.symbols
index 7aa002caad268..bf9dfcf57ae76 100644
--- a/tests/baselines/reference/genericCombinators2.symbols
+++ b/tests/baselines/reference/genericCombinators2.symbols
@@ -62,12 +62,12 @@ interface Combinators {
 >V : Symbol(V, Decl(genericCombinators2.ts, 8, 13))
 }
 
-var _: Combinators;
->_ : Symbol(_, Decl(genericCombinators2.ts, 11, 3))
+declare var _: Combinators;
+>_ : Symbol(_, Decl(genericCombinators2.ts, 11, 11))
 >Combinators : Symbol(Combinators, Decl(genericCombinators2.ts, 4, 1))
 
-var c2: Collection<number, string>;
->c2 : Symbol(c2, Decl(genericCombinators2.ts, 12, 3))
+declare var c2: Collection<number, string>;
+>c2 : Symbol(c2, Decl(genericCombinators2.ts, 12, 11))
 >Collection : Symbol(Collection, Decl(genericCombinators2.ts, 0, 0))
 
 var rf1 = (x: number, y: string) => { return x.toFixed() };
@@ -81,10 +81,10 @@ var rf1 = (x: number, y: string) => { return x.toFixed() };
 var r5a = _.map<number, string, Date>(c2, (x, y) => { return x.toFixed() });
 >r5a : Symbol(r5a, Decl(genericCombinators2.ts, 14, 3))
 >_.map : Symbol(Combinators.map, Decl(genericCombinators2.ts, 6, 23), Decl(genericCombinators2.ts, 7, 81))
->_ : Symbol(_, Decl(genericCombinators2.ts, 11, 3))
+>_ : Symbol(_, Decl(genericCombinators2.ts, 11, 11))
 >map : Symbol(Combinators.map, Decl(genericCombinators2.ts, 6, 23), Decl(genericCombinators2.ts, 7, 81))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->c2 : Symbol(c2, Decl(genericCombinators2.ts, 12, 3))
+>c2 : Symbol(c2, Decl(genericCombinators2.ts, 12, 11))
 >x : Symbol(x, Decl(genericCombinators2.ts, 14, 43))
 >y : Symbol(y, Decl(genericCombinators2.ts, 14, 45))
 >x.toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --))
@@ -94,9 +94,9 @@ var r5a = _.map<number, string, Date>(c2, (x, y) => { return x.toFixed() });
 var r5b = _.map<number, string, Date>(c2, rf1);
 >r5b : Symbol(r5b, Decl(genericCombinators2.ts, 15, 3))
 >_.map : Symbol(Combinators.map, Decl(genericCombinators2.ts, 6, 23), Decl(genericCombinators2.ts, 7, 81))
->_ : Symbol(_, Decl(genericCombinators2.ts, 11, 3))
+>_ : Symbol(_, Decl(genericCombinators2.ts, 11, 11))
 >map : Symbol(Combinators.map, Decl(genericCombinators2.ts, 6, 23), Decl(genericCombinators2.ts, 7, 81))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->c2 : Symbol(c2, Decl(genericCombinators2.ts, 12, 3))
+>c2 : Symbol(c2, Decl(genericCombinators2.ts, 12, 11))
 >rf1 : Symbol(rf1, Decl(genericCombinators2.ts, 13, 3))
 
diff --git a/tests/baselines/reference/genericCombinators2.types b/tests/baselines/reference/genericCombinators2.types
index 37a441ff08f22..1f46f4b5bf4c4 100644
--- a/tests/baselines/reference/genericCombinators2.types
+++ b/tests/baselines/reference/genericCombinators2.types
@@ -49,11 +49,11 @@ interface Combinators {
 >  : ^
 }
 
-var _: Combinators;
+declare var _: Combinators;
 >_ : Combinators
 >  : ^^^^^^^^^^^
 
-var c2: Collection<number, string>;
+declare var c2: Collection<number, string>;
 >c2 : Collection<number, string>
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/genericConstraintSatisfaction1.errors.txt b/tests/baselines/reference/genericConstraintSatisfaction1.errors.txt
index 7b35b2b696b7e..aff230413a0c4 100644
--- a/tests/baselines/reference/genericConstraintSatisfaction1.errors.txt
+++ b/tests/baselines/reference/genericConstraintSatisfaction1.errors.txt
@@ -1,4 +1,4 @@
-genericConstraintSatisfaction1.ts(6,6): error TS2322: Type 'number' is not assignable to type 'string'.
+genericConstraintSatisfaction1.ts(7,6): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
 ==== genericConstraintSatisfaction1.ts (1 errors) ====
@@ -7,6 +7,7 @@ genericConstraintSatisfaction1.ts(6,6): error TS2322: Type 'number' is not assig
     }
      
     var x: I<{s: string}>
+    declare var x: I<{s: string}>
     x.f({s: 1})
          ~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/genericConstraintSatisfaction1.js b/tests/baselines/reference/genericConstraintSatisfaction1.js
index c547d69d2d33a..aef5258246f9c 100644
--- a/tests/baselines/reference/genericConstraintSatisfaction1.js
+++ b/tests/baselines/reference/genericConstraintSatisfaction1.js
@@ -6,6 +6,7 @@ interface I<S> {
 }
  
 var x: I<{s: string}>
+declare var x: I<{s: string}>
 x.f({s: 1})
 
 
diff --git a/tests/baselines/reference/genericConstraintSatisfaction1.symbols b/tests/baselines/reference/genericConstraintSatisfaction1.symbols
index f8883d495ba57..be55fff2e11e8 100644
--- a/tests/baselines/reference/genericConstraintSatisfaction1.symbols
+++ b/tests/baselines/reference/genericConstraintSatisfaction1.symbols
@@ -14,13 +14,18 @@ interface I<S> {
 }
  
 var x: I<{s: string}>
->x : Symbol(x, Decl(genericConstraintSatisfaction1.ts, 4, 3))
+>x : Symbol(x, Decl(genericConstraintSatisfaction1.ts, 4, 3), Decl(genericConstraintSatisfaction1.ts, 5, 11))
 >I : Symbol(I, Decl(genericConstraintSatisfaction1.ts, 0, 0))
 >s : Symbol(s, Decl(genericConstraintSatisfaction1.ts, 4, 10))
 
+declare var x: I<{s: string}>
+>x : Symbol(x, Decl(genericConstraintSatisfaction1.ts, 4, 3), Decl(genericConstraintSatisfaction1.ts, 5, 11))
+>I : Symbol(I, Decl(genericConstraintSatisfaction1.ts, 0, 0))
+>s : Symbol(s, Decl(genericConstraintSatisfaction1.ts, 5, 18))
+
 x.f({s: 1})
 >x.f : Symbol(I.f, Decl(genericConstraintSatisfaction1.ts, 0, 16))
->x : Symbol(x, Decl(genericConstraintSatisfaction1.ts, 4, 3))
+>x : Symbol(x, Decl(genericConstraintSatisfaction1.ts, 4, 3), Decl(genericConstraintSatisfaction1.ts, 5, 11))
 >f : Symbol(I.f, Decl(genericConstraintSatisfaction1.ts, 0, 16))
->s : Symbol(s, Decl(genericConstraintSatisfaction1.ts, 5, 5))
+>s : Symbol(s, Decl(genericConstraintSatisfaction1.ts, 6, 5))
 
diff --git a/tests/baselines/reference/genericConstraintSatisfaction1.types b/tests/baselines/reference/genericConstraintSatisfaction1.types
index 55c74f9f64f51..0aee46e1fe23f 100644
--- a/tests/baselines/reference/genericConstraintSatisfaction1.types
+++ b/tests/baselines/reference/genericConstraintSatisfaction1.types
@@ -15,6 +15,12 @@ var x: I<{s: string}>
 >s : string
 >  : ^^^^^^
 
+declare var x: I<{s: string}>
+>x : I<{ s: string; }>
+>  : ^^^^^^^      ^^^^
+>s : string
+>  : ^^^^^^
+
 x.f({s: 1})
 >x.f({s: 1}) : void
 >            : ^^^^
diff --git a/tests/baselines/reference/genericConstructorFunction1.errors.txt b/tests/baselines/reference/genericConstructorFunction1.errors.txt
index 8e13febf382ff..08fba530be13d 100644
--- a/tests/baselines/reference/genericConstructorFunction1.errors.txt
+++ b/tests/baselines/reference/genericConstructorFunction1.errors.txt
@@ -4,7 +4,7 @@ genericConstructorFunction1.ts(13,13): error TS2348: Value of type 'I1<T>' is no
 
 ==== genericConstructorFunction1.ts (2 errors) ====
     function f1<T>(args: T) {
-        var v1: { [index: string]: new (arg: T) => Date };
+        var v1!: { [index: string]: new (arg: T) => Date };
         var v2 = v1['test'];
         v2(args); 
         ~~~~~~~~
@@ -15,7 +15,7 @@ genericConstructorFunction1.ts(13,13): error TS2348: Value of type 'I1<T>' is no
     
     interface I1<T> { new (arg: T): Date };
     function f2<T>(args: T) {
-        var v1: { [index: string]: I1<T> };
+        var v1!: { [index: string]: I1<T> };
         var v2 = v1['test'];
         var y = v2(args); 
                 ~~~~~~~~
diff --git a/tests/baselines/reference/genericConstructorFunction1.js b/tests/baselines/reference/genericConstructorFunction1.js
index aeefbad95354b..687f265dccc8c 100644
--- a/tests/baselines/reference/genericConstructorFunction1.js
+++ b/tests/baselines/reference/genericConstructorFunction1.js
@@ -2,7 +2,7 @@
 
 //// [genericConstructorFunction1.ts]
 function f1<T>(args: T) {
-    var v1: { [index: string]: new (arg: T) => Date };
+    var v1!: { [index: string]: new (arg: T) => Date };
     var v2 = v1['test'];
     v2(args); 
     return new v2(args); // used to give error
@@ -11,7 +11,7 @@ function f1<T>(args: T) {
 
 interface I1<T> { new (arg: T): Date };
 function f2<T>(args: T) {
-    var v1: { [index: string]: I1<T> };
+    var v1!: { [index: string]: I1<T> };
     var v2 = v1['test'];
     var y = v2(args); 
     return new v2(args); // used to give error
diff --git a/tests/baselines/reference/genericConstructorFunction1.symbols b/tests/baselines/reference/genericConstructorFunction1.symbols
index b8c0e65aed232..db9bbd7b3796c 100644
--- a/tests/baselines/reference/genericConstructorFunction1.symbols
+++ b/tests/baselines/reference/genericConstructorFunction1.symbols
@@ -7,10 +7,10 @@ function f1<T>(args: T) {
 >args : Symbol(args, Decl(genericConstructorFunction1.ts, 0, 15))
 >T : Symbol(T, Decl(genericConstructorFunction1.ts, 0, 12))
 
-    var v1: { [index: string]: new (arg: T) => Date };
+    var v1!: { [index: string]: new (arg: T) => Date };
 >v1 : Symbol(v1, Decl(genericConstructorFunction1.ts, 1, 7))
->index : Symbol(index, Decl(genericConstructorFunction1.ts, 1, 15))
->arg : Symbol(arg, Decl(genericConstructorFunction1.ts, 1, 36))
+>index : Symbol(index, Decl(genericConstructorFunction1.ts, 1, 16))
+>arg : Symbol(arg, Decl(genericConstructorFunction1.ts, 1, 37))
 >T : Symbol(T, Decl(genericConstructorFunction1.ts, 0, 12))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
@@ -41,9 +41,9 @@ function f2<T>(args: T) {
 >args : Symbol(args, Decl(genericConstructorFunction1.ts, 9, 15))
 >T : Symbol(T, Decl(genericConstructorFunction1.ts, 9, 12))
 
-    var v1: { [index: string]: I1<T> };
+    var v1!: { [index: string]: I1<T> };
 >v1 : Symbol(v1, Decl(genericConstructorFunction1.ts, 10, 7))
->index : Symbol(index, Decl(genericConstructorFunction1.ts, 10, 15))
+>index : Symbol(index, Decl(genericConstructorFunction1.ts, 10, 16))
 >I1 : Symbol(I1, Decl(genericConstructorFunction1.ts, 5, 1))
 >T : Symbol(T, Decl(genericConstructorFunction1.ts, 9, 12))
 
diff --git a/tests/baselines/reference/genericConstructorFunction1.types b/tests/baselines/reference/genericConstructorFunction1.types
index b9349680c0bae..a1645fdcdbb1b 100644
--- a/tests/baselines/reference/genericConstructorFunction1.types
+++ b/tests/baselines/reference/genericConstructorFunction1.types
@@ -7,7 +7,7 @@ function f1<T>(args: T) {
 >args : T
 >     : ^
 
-    var v1: { [index: string]: new (arg: T) => Date };
+    var v1!: { [index: string]: new (arg: T) => Date };
 >v1 : { [index: string]: new (arg: T) => Date; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^   ^^ ^^^^^    ^^^
 >index : string
@@ -53,7 +53,7 @@ function f2<T>(args: T) {
 >args : T
 >     : ^
 
-    var v1: { [index: string]: I1<T> };
+    var v1!: { [index: string]: I1<T> };
 >v1 : { [index: string]: I1<T>; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >index : string
diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.errors.txt b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.errors.txt
index cc940c41d7f83..bf631bd15b9b7 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.errors.txt
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.errors.txt
@@ -12,8 +12,8 @@ genericDerivedTypeWithSpecializedBase.ts(11,1): error TS2322: Type 'B<number>' i
         y: U;
     }
     
-    var x: A<number>;
-    var y: B<number>;
+    declare var x: A<number>;
+    declare var y: B<number>;
     x = y;  // error
     ~
 !!! error TS2322: Type 'B<number>' is not assignable to type 'A<number>'.
diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
index 0b5e338a0c3de..8542c6a60e4cb 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
@@ -9,8 +9,8 @@ class B<U> extends A<string> {
     y: U;
 }
 
-var x: A<number>;
-var y: B<number>;
+declare var x: A<number>;
+declare var y: B<number>;
 x = y;  // error
 
 
@@ -42,6 +42,4 @@ var B = /** @class */ (function (_super) {
     }
     return B;
 }(A));
-var x;
-var y;
 x = y; // error
diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.symbols b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.symbols
index 955d43be22c9c..6a0b08b2f3e39 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.symbols
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.symbols
@@ -20,15 +20,15 @@ class B<U> extends A<string> {
 >U : Symbol(U, Decl(genericDerivedTypeWithSpecializedBase.ts, 4, 8))
 }
 
-var x: A<number>;
->x : Symbol(x, Decl(genericDerivedTypeWithSpecializedBase.ts, 8, 3))
+declare var x: A<number>;
+>x : Symbol(x, Decl(genericDerivedTypeWithSpecializedBase.ts, 8, 11))
 >A : Symbol(A, Decl(genericDerivedTypeWithSpecializedBase.ts, 0, 0))
 
-var y: B<number>;
->y : Symbol(y, Decl(genericDerivedTypeWithSpecializedBase.ts, 9, 3))
+declare var y: B<number>;
+>y : Symbol(y, Decl(genericDerivedTypeWithSpecializedBase.ts, 9, 11))
 >B : Symbol(B, Decl(genericDerivedTypeWithSpecializedBase.ts, 2, 1))
 
 x = y;  // error
->x : Symbol(x, Decl(genericDerivedTypeWithSpecializedBase.ts, 8, 3))
->y : Symbol(y, Decl(genericDerivedTypeWithSpecializedBase.ts, 9, 3))
+>x : Symbol(x, Decl(genericDerivedTypeWithSpecializedBase.ts, 8, 11))
+>y : Symbol(y, Decl(genericDerivedTypeWithSpecializedBase.ts, 9, 11))
 
diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.types b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.types
index e6c85fcb03c79..704daff47537e 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.types
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.types
@@ -21,11 +21,11 @@ class B<U> extends A<string> {
 >  : ^
 }
 
-var x: A<number>;
+declare var x: A<number>;
 >x : A<number>
 >  : ^^^^^^^^^
 
-var y: B<number>;
+declare var y: B<number>;
 >y : B<number>
 >  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.errors.txt b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.errors.txt
index 1b5e52e58442b..723457824ae08 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.errors.txt
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.errors.txt
@@ -12,8 +12,8 @@ genericDerivedTypeWithSpecializedBase2.ts(11,1): error TS2322: Type 'B<number>'
         y: U;
     }
     
-    var x: A<{ length: number; foo: number }>;
-    var y: B<number>;
+    declare var x: A<{ length: number; foo: number }>;
+    declare var y: B<number>;
     x = y;  // error
     ~
 !!! error TS2322: Type 'B<number>' is not assignable to type 'A<{ length: number; foo: number; }>'.
diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
index de40fd79a1920..1393167f8f0af 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
@@ -9,8 +9,8 @@ class B<U> extends A<string> {
     y: U;
 }
 
-var x: A<{ length: number; foo: number }>;
-var y: B<number>;
+declare var x: A<{ length: number; foo: number }>;
+declare var y: B<number>;
 x = y;  // error
 
 
@@ -42,6 +42,4 @@ var B = /** @class */ (function (_super) {
     }
     return B;
 }(A));
-var x;
-var y;
 x = y; // error
diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.symbols b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.symbols
index 1b459af0bd7a8..a3b68167743af 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.symbols
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.symbols
@@ -21,17 +21,17 @@ class B<U> extends A<string> {
 >U : Symbol(U, Decl(genericDerivedTypeWithSpecializedBase2.ts, 4, 8))
 }
 
-var x: A<{ length: number; foo: number }>;
->x : Symbol(x, Decl(genericDerivedTypeWithSpecializedBase2.ts, 8, 3))
+declare var x: A<{ length: number; foo: number }>;
+>x : Symbol(x, Decl(genericDerivedTypeWithSpecializedBase2.ts, 8, 11))
 >A : Symbol(A, Decl(genericDerivedTypeWithSpecializedBase2.ts, 0, 0))
->length : Symbol(length, Decl(genericDerivedTypeWithSpecializedBase2.ts, 8, 10))
->foo : Symbol(foo, Decl(genericDerivedTypeWithSpecializedBase2.ts, 8, 26))
+>length : Symbol(length, Decl(genericDerivedTypeWithSpecializedBase2.ts, 8, 18))
+>foo : Symbol(foo, Decl(genericDerivedTypeWithSpecializedBase2.ts, 8, 34))
 
-var y: B<number>;
->y : Symbol(y, Decl(genericDerivedTypeWithSpecializedBase2.ts, 9, 3))
+declare var y: B<number>;
+>y : Symbol(y, Decl(genericDerivedTypeWithSpecializedBase2.ts, 9, 11))
 >B : Symbol(B, Decl(genericDerivedTypeWithSpecializedBase2.ts, 2, 1))
 
 x = y;  // error
->x : Symbol(x, Decl(genericDerivedTypeWithSpecializedBase2.ts, 8, 3))
->y : Symbol(y, Decl(genericDerivedTypeWithSpecializedBase2.ts, 9, 3))
+>x : Symbol(x, Decl(genericDerivedTypeWithSpecializedBase2.ts, 8, 11))
+>y : Symbol(y, Decl(genericDerivedTypeWithSpecializedBase2.ts, 9, 11))
 
diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.types b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.types
index 4d0fa6ce3e5c0..18111c96b0547 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.types
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.types
@@ -23,7 +23,7 @@ class B<U> extends A<string> {
 >  : ^
 }
 
-var x: A<{ length: number; foo: number }>;
+declare var x: A<{ length: number; foo: number }>;
 >x : A<{ length: number; foo: number; }>
 >  : ^^^^^^^^^^^^      ^^^^^^^      ^^^^
 >length : number
@@ -31,7 +31,7 @@ var x: A<{ length: number; foo: number }>;
 >foo : number
 >    : ^^^^^^
 
-var y: B<number>;
+declare var y: B<number>;
 >y : B<number>
 >  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.errors.txt b/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.errors.txt
index 9f11f385a7a7d..c5fd4d30152bc 100644
--- a/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.errors.txt
+++ b/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.errors.txt
@@ -6,9 +6,9 @@ genericFunctionCallSignatureReturnTypeMismatch.ts(6,1): error TS2322: Type '<S>(
 ==== genericFunctionCallSignatureReturnTypeMismatch.ts (1 errors) ====
     interface Array<T> {}
     
-    var f : { <T>(x:T): T; }
+    declare var f : { <T>(x:T): T; }
     
-    var g : { <S>() : S[]; };
+    declare var g : { <S>() : S[]; };
     f = g;
     ~
 !!! error TS2322: Type '<S>() => S[]' is not assignable to type '<T>(x: T) => T'.
diff --git a/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.js b/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.js
index 0343b86b2f240..f95de5e4b71a2 100644
--- a/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.js
+++ b/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.js
@@ -3,9 +3,9 @@
 //// [genericFunctionCallSignatureReturnTypeMismatch.ts]
 interface Array<T> {}
 
-var f : { <T>(x:T): T; }
+declare var f : { <T>(x:T): T; }
 
-var g : { <S>() : S[]; };
+declare var g : { <S>() : S[]; };
 f = g;
 
 var s = f("str").toUpperCase();
@@ -14,8 +14,6 @@ console.log(s);
 
 
 //// [genericFunctionCallSignatureReturnTypeMismatch.js]
-var f;
-var g;
 f = g;
 var s = f("str").toUpperCase();
 console.log(s);
diff --git a/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.symbols b/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.symbols
index 6728fa28fac3f..0f2b2da0db9ed 100644
--- a/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.symbols
+++ b/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.symbols
@@ -5,26 +5,26 @@ interface Array<T> {}
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --) ... and 1 more)
 >T : Symbol(T, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 0, 16))
 
-var f : { <T>(x:T): T; }
->f : Symbol(f, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 2, 3))
->T : Symbol(T, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 2, 11))
->x : Symbol(x, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 2, 14))
->T : Symbol(T, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 2, 11))
->T : Symbol(T, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 2, 11))
+declare var f : { <T>(x:T): T; }
+>f : Symbol(f, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 2, 11))
+>T : Symbol(T, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 2, 19))
+>x : Symbol(x, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 2, 22))
+>T : Symbol(T, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 2, 19))
+>T : Symbol(T, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 2, 19))
 
-var g : { <S>() : S[]; };
->g : Symbol(g, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 4, 3))
->S : Symbol(S, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 4, 11))
->S : Symbol(S, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 4, 11))
+declare var g : { <S>() : S[]; };
+>g : Symbol(g, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 4, 11))
+>S : Symbol(S, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 4, 19))
+>S : Symbol(S, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 4, 19))
 
 f = g;
->f : Symbol(f, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 2, 3))
->g : Symbol(g, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 4, 3))
+>f : Symbol(f, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 2, 11))
+>g : Symbol(g, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 4, 11))
 
 var s = f("str").toUpperCase();
 >s : Symbol(s, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 7, 3))
 >f("str").toUpperCase : Symbol(String.toUpperCase, Decl(lib.es5.d.ts, --, --))
->f : Symbol(f, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 2, 3))
+>f : Symbol(f, Decl(genericFunctionCallSignatureReturnTypeMismatch.ts, 2, 11))
 >toUpperCase : Symbol(String.toUpperCase, Decl(lib.es5.d.ts, --, --))
 
 console.log(s);
diff --git a/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.types b/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.types
index 9f2acb454dc8a..3df68179e7f5a 100644
--- a/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.types
+++ b/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.types
@@ -3,13 +3,13 @@
 === genericFunctionCallSignatureReturnTypeMismatch.ts ===
 interface Array<T> {}
 
-var f : { <T>(x:T): T; }
+declare var f : { <T>(x:T): T; }
 >f : <T>(x: T) => T
 >  : ^ ^^ ^^ ^^^^^ 
 >x : T
 >  : ^
 
-var g : { <S>() : S[]; };
+declare var g : { <S>() : S[]; };
 >g : <S>() => S[]
 >  : ^ ^^^^^^^   
 
diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters2.errors.txt b/tests/baselines/reference/genericFunctionsWithOptionalParameters2.errors.txt
index 87e42423628bc..d645e18a6de98 100644
--- a/tests/baselines/reference/genericFunctionsWithOptionalParameters2.errors.txt
+++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters2.errors.txt
@@ -6,7 +6,7 @@ genericFunctionsWithOptionalParameters2.ts(7,7): error TS2554: Expected 1-3 argu
        fold<T, S>(c: Array<T>, folder?: (s: S, t: T) => T, init?: S): T;
     }
     
-    var utils: Utils;
+    declare var utils: Utils;
     
     utils.fold(); // error
           ~~~~
diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters2.js b/tests/baselines/reference/genericFunctionsWithOptionalParameters2.js
index ecf0021c7fc44..3ac52228ce6a1 100644
--- a/tests/baselines/reference/genericFunctionsWithOptionalParameters2.js
+++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters2.js
@@ -5,7 +5,7 @@ interface Utils {
    fold<T, S>(c: Array<T>, folder?: (s: S, t: T) => T, init?: S): T;
 }
 
-var utils: Utils;
+declare var utils: Utils;
 
 utils.fold(); // error
 utils.fold(null); // no error
@@ -14,7 +14,6 @@ utils.fold(null, null, null); // error: Unable to invoke type with no call signa
 
 
 //// [genericFunctionsWithOptionalParameters2.js]
-var utils;
 utils.fold(); // error
 utils.fold(null); // no error
 utils.fold(null, null); // no error
diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters2.symbols b/tests/baselines/reference/genericFunctionsWithOptionalParameters2.symbols
index 55e7cc6db1684..41c944f87a019 100644
--- a/tests/baselines/reference/genericFunctionsWithOptionalParameters2.symbols
+++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters2.symbols
@@ -22,27 +22,27 @@ interface Utils {
 >T : Symbol(T, Decl(genericFunctionsWithOptionalParameters2.ts, 1, 8))
 }
 
-var utils: Utils;
->utils : Symbol(utils, Decl(genericFunctionsWithOptionalParameters2.ts, 4, 3))
+declare var utils: Utils;
+>utils : Symbol(utils, Decl(genericFunctionsWithOptionalParameters2.ts, 4, 11))
 >Utils : Symbol(Utils, Decl(genericFunctionsWithOptionalParameters2.ts, 0, 0))
 
 utils.fold(); // error
 >utils.fold : Symbol(Utils.fold, Decl(genericFunctionsWithOptionalParameters2.ts, 0, 17))
->utils : Symbol(utils, Decl(genericFunctionsWithOptionalParameters2.ts, 4, 3))
+>utils : Symbol(utils, Decl(genericFunctionsWithOptionalParameters2.ts, 4, 11))
 >fold : Symbol(Utils.fold, Decl(genericFunctionsWithOptionalParameters2.ts, 0, 17))
 
 utils.fold(null); // no error
 >utils.fold : Symbol(Utils.fold, Decl(genericFunctionsWithOptionalParameters2.ts, 0, 17))
->utils : Symbol(utils, Decl(genericFunctionsWithOptionalParameters2.ts, 4, 3))
+>utils : Symbol(utils, Decl(genericFunctionsWithOptionalParameters2.ts, 4, 11))
 >fold : Symbol(Utils.fold, Decl(genericFunctionsWithOptionalParameters2.ts, 0, 17))
 
 utils.fold(null, null); // no error
 >utils.fold : Symbol(Utils.fold, Decl(genericFunctionsWithOptionalParameters2.ts, 0, 17))
->utils : Symbol(utils, Decl(genericFunctionsWithOptionalParameters2.ts, 4, 3))
+>utils : Symbol(utils, Decl(genericFunctionsWithOptionalParameters2.ts, 4, 11))
 >fold : Symbol(Utils.fold, Decl(genericFunctionsWithOptionalParameters2.ts, 0, 17))
 
 utils.fold(null, null, null); // error: Unable to invoke type with no call signatures
 >utils.fold : Symbol(Utils.fold, Decl(genericFunctionsWithOptionalParameters2.ts, 0, 17))
->utils : Symbol(utils, Decl(genericFunctionsWithOptionalParameters2.ts, 4, 3))
+>utils : Symbol(utils, Decl(genericFunctionsWithOptionalParameters2.ts, 4, 11))
 >fold : Symbol(Utils.fold, Decl(genericFunctionsWithOptionalParameters2.ts, 0, 17))
 
diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters2.types b/tests/baselines/reference/genericFunctionsWithOptionalParameters2.types
index e3b555bcaf788..9c708c8f9b9eb 100644
--- a/tests/baselines/reference/genericFunctionsWithOptionalParameters2.types
+++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters2.types
@@ -17,7 +17,7 @@ interface Utils {
 >     : ^
 }
 
-var utils: Utils;
+declare var utils: Utils;
 >utils : Utils
 >      : ^^^^^
 
diff --git a/tests/baselines/reference/genericInferenceDefaultTypeParameterJsxReact.js b/tests/baselines/reference/genericInferenceDefaultTypeParameterJsxReact.js
index 036c538dd3db3..9d5436485134f 100644
--- a/tests/baselines/reference/genericInferenceDefaultTypeParameterJsxReact.js
+++ b/tests/baselines/reference/genericInferenceDefaultTypeParameterJsxReact.js
@@ -18,7 +18,7 @@ const v1 = <Component onClick={e => e.preventDefault()} />;
 
 //// [genericInferenceDefaultTypeParameterJsxReact.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
diff --git a/tests/baselines/reference/genericSetterInClassTypeJsDoc.errors.txt b/tests/baselines/reference/genericSetterInClassTypeJsDoc.errors.txt
new file mode 100644
index 0000000000000..b34e2978fe739
--- /dev/null
+++ b/tests/baselines/reference/genericSetterInClassTypeJsDoc.errors.txt
@@ -0,0 +1,28 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== genericSetterInClassTypeJsDoc.js (0 errors) ====
+    /**
+     * @template T
+     */
+     class Box {
+        #value;
+    
+        /** @param {T} initialValue */
+        constructor(initialValue) {
+            this.#value = initialValue;
+        }
+        
+        /** @type {T} */
+        get value() {
+            return this.#value;
+        }
+    
+        set value(value) {
+            this.#value = value;
+        }
+    }
+    
+    new Box(3).value = 3;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/genericSpecializations3.errors.txt b/tests/baselines/reference/genericSpecializations3.errors.txt
index 31c493d104437..4cf7a6c50245f 100644
--- a/tests/baselines/reference/genericSpecializations3.errors.txt
+++ b/tests/baselines/reference/genericSpecializations3.errors.txt
@@ -19,7 +19,7 @@ genericSpecializations3.ts(29,1): error TS2322: Type 'IntFoo' is not assignable
         foo(x: T): T;
     }
     
-    var iFoo: IFoo<number>;
+    declare var iFoo: IFoo<number>;
     iFoo.foo(1);
     
     class IntFooBad implements IFoo<number> { // error
@@ -31,19 +31,19 @@ genericSpecializations3.ts(29,1): error TS2322: Type 'IntFoo' is not assignable
 !!! error TS2416:       Type 'number' is not assignable to type 'string'.
     }
     
-    var intFooBad: IntFooBad;
+    declare var intFooBad: IntFooBad;
     
     class IntFoo implements IFoo<number> {
         foo(x: number): number { return null; }
     }
     
-    var intFoo: IntFoo;
+    declare var intFoo: IntFoo;
     
     class StringFoo2 implements IFoo<string> {
         foo(x: string): string { return null; }
     }
     
-    var stringFoo2: StringFoo2;
+    declare var stringFoo2: StringFoo2;
     stringFoo2.foo("hm");
     
     
diff --git a/tests/baselines/reference/genericSpecializations3.js b/tests/baselines/reference/genericSpecializations3.js
index 4c5916698d7d6..b2601ce0be45e 100644
--- a/tests/baselines/reference/genericSpecializations3.js
+++ b/tests/baselines/reference/genericSpecializations3.js
@@ -5,26 +5,26 @@ interface IFoo<T> {
     foo(x: T): T;
 }
 
-var iFoo: IFoo<number>;
+declare var iFoo: IFoo<number>;
 iFoo.foo(1);
 
 class IntFooBad implements IFoo<number> { // error
     foo(x: string): string { return null; }
 }
 
-var intFooBad: IntFooBad;
+declare var intFooBad: IntFooBad;
 
 class IntFoo implements IFoo<number> {
     foo(x: number): number { return null; }
 }
 
-var intFoo: IntFoo;
+declare var intFoo: IntFoo;
 
 class StringFoo2 implements IFoo<string> {
     foo(x: string): string { return null; }
 }
 
-var stringFoo2: StringFoo2;
+declare var stringFoo2: StringFoo2;
 stringFoo2.foo("hm");
 
 
@@ -38,7 +38,6 @@ class StringFoo3 implements IFoo<string> { // error
 var stringFoo3: StringFoo3;
 
 //// [genericSpecializations3.js]
-var iFoo;
 iFoo.foo(1);
 var IntFooBad = /** @class */ (function () {
     function IntFooBad() {
@@ -46,21 +45,18 @@ var IntFooBad = /** @class */ (function () {
     IntFooBad.prototype.foo = function (x) { return null; };
     return IntFooBad;
 }());
-var intFooBad;
 var IntFoo = /** @class */ (function () {
     function IntFoo() {
     }
     IntFoo.prototype.foo = function (x) { return null; };
     return IntFoo;
 }());
-var intFoo;
 var StringFoo2 = /** @class */ (function () {
     function StringFoo2() {
     }
     StringFoo2.prototype.foo = function (x) { return null; };
     return StringFoo2;
 }());
-var stringFoo2;
 stringFoo2.foo("hm");
 intFoo = stringFoo2; // error
 stringFoo2 = intFoo; // error
diff --git a/tests/baselines/reference/genericSpecializations3.symbols b/tests/baselines/reference/genericSpecializations3.symbols
index 70d68389c6d8d..d35c1a848378a 100644
--- a/tests/baselines/reference/genericSpecializations3.symbols
+++ b/tests/baselines/reference/genericSpecializations3.symbols
@@ -12,13 +12,13 @@ interface IFoo<T> {
 >T : Symbol(T, Decl(genericSpecializations3.ts, 0, 15))
 }
 
-var iFoo: IFoo<number>;
->iFoo : Symbol(iFoo, Decl(genericSpecializations3.ts, 4, 3))
+declare var iFoo: IFoo<number>;
+>iFoo : Symbol(iFoo, Decl(genericSpecializations3.ts, 4, 11))
 >IFoo : Symbol(IFoo, Decl(genericSpecializations3.ts, 0, 0))
 
 iFoo.foo(1);
 >iFoo.foo : Symbol(IFoo.foo, Decl(genericSpecializations3.ts, 0, 19))
->iFoo : Symbol(iFoo, Decl(genericSpecializations3.ts, 4, 3))
+>iFoo : Symbol(iFoo, Decl(genericSpecializations3.ts, 4, 11))
 >foo : Symbol(IFoo.foo, Decl(genericSpecializations3.ts, 0, 19))
 
 class IntFooBad implements IFoo<number> { // error
@@ -30,12 +30,12 @@ class IntFooBad implements IFoo<number> { // error
 >x : Symbol(x, Decl(genericSpecializations3.ts, 8, 8))
 }
 
-var intFooBad: IntFooBad;
->intFooBad : Symbol(intFooBad, Decl(genericSpecializations3.ts, 11, 3))
+declare var intFooBad: IntFooBad;
+>intFooBad : Symbol(intFooBad, Decl(genericSpecializations3.ts, 11, 11))
 >IntFooBad : Symbol(IntFooBad, Decl(genericSpecializations3.ts, 5, 12))
 
 class IntFoo implements IFoo<number> {
->IntFoo : Symbol(IntFoo, Decl(genericSpecializations3.ts, 11, 25))
+>IntFoo : Symbol(IntFoo, Decl(genericSpecializations3.ts, 11, 33))
 >IFoo : Symbol(IFoo, Decl(genericSpecializations3.ts, 0, 0))
 
     foo(x: number): number { return null; }
@@ -43,12 +43,12 @@ class IntFoo implements IFoo<number> {
 >x : Symbol(x, Decl(genericSpecializations3.ts, 14, 8))
 }
 
-var intFoo: IntFoo;
->intFoo : Symbol(intFoo, Decl(genericSpecializations3.ts, 17, 3))
->IntFoo : Symbol(IntFoo, Decl(genericSpecializations3.ts, 11, 25))
+declare var intFoo: IntFoo;
+>intFoo : Symbol(intFoo, Decl(genericSpecializations3.ts, 17, 11))
+>IntFoo : Symbol(IntFoo, Decl(genericSpecializations3.ts, 11, 33))
 
 class StringFoo2 implements IFoo<string> {
->StringFoo2 : Symbol(StringFoo2, Decl(genericSpecializations3.ts, 17, 19))
+>StringFoo2 : Symbol(StringFoo2, Decl(genericSpecializations3.ts, 17, 27))
 >IFoo : Symbol(IFoo, Decl(genericSpecializations3.ts, 0, 0))
 
     foo(x: string): string { return null; }
@@ -56,23 +56,23 @@ class StringFoo2 implements IFoo<string> {
 >x : Symbol(x, Decl(genericSpecializations3.ts, 20, 8))
 }
 
-var stringFoo2: StringFoo2;
->stringFoo2 : Symbol(stringFoo2, Decl(genericSpecializations3.ts, 23, 3))
->StringFoo2 : Symbol(StringFoo2, Decl(genericSpecializations3.ts, 17, 19))
+declare var stringFoo2: StringFoo2;
+>stringFoo2 : Symbol(stringFoo2, Decl(genericSpecializations3.ts, 23, 11))
+>StringFoo2 : Symbol(StringFoo2, Decl(genericSpecializations3.ts, 17, 27))
 
 stringFoo2.foo("hm");
 >stringFoo2.foo : Symbol(StringFoo2.foo, Decl(genericSpecializations3.ts, 19, 42))
->stringFoo2 : Symbol(stringFoo2, Decl(genericSpecializations3.ts, 23, 3))
+>stringFoo2 : Symbol(stringFoo2, Decl(genericSpecializations3.ts, 23, 11))
 >foo : Symbol(StringFoo2.foo, Decl(genericSpecializations3.ts, 19, 42))
 
 
 intFoo = stringFoo2; // error
->intFoo : Symbol(intFoo, Decl(genericSpecializations3.ts, 17, 3))
->stringFoo2 : Symbol(stringFoo2, Decl(genericSpecializations3.ts, 23, 3))
+>intFoo : Symbol(intFoo, Decl(genericSpecializations3.ts, 17, 11))
+>stringFoo2 : Symbol(stringFoo2, Decl(genericSpecializations3.ts, 23, 11))
 
 stringFoo2 = intFoo; // error
->stringFoo2 : Symbol(stringFoo2, Decl(genericSpecializations3.ts, 23, 3))
->intFoo : Symbol(intFoo, Decl(genericSpecializations3.ts, 17, 3))
+>stringFoo2 : Symbol(stringFoo2, Decl(genericSpecializations3.ts, 23, 11))
+>intFoo : Symbol(intFoo, Decl(genericSpecializations3.ts, 17, 11))
 
 
 class StringFoo3 implements IFoo<string> { // error
diff --git a/tests/baselines/reference/genericSpecializations3.types b/tests/baselines/reference/genericSpecializations3.types
index 23823d193ad98..840ce341dc260 100644
--- a/tests/baselines/reference/genericSpecializations3.types
+++ b/tests/baselines/reference/genericSpecializations3.types
@@ -9,7 +9,7 @@ interface IFoo<T> {
 >  : ^
 }
 
-var iFoo: IFoo<number>;
+declare var iFoo: IFoo<number>;
 >iFoo : IFoo<number>
 >     : ^^^^^^^^^^^^
 
@@ -36,7 +36,7 @@ class IntFooBad implements IFoo<number> { // error
 >  : ^^^^^^
 }
 
-var intFooBad: IntFooBad;
+declare var intFooBad: IntFooBad;
 >intFooBad : IntFooBad
 >          : ^^^^^^^^^
 
@@ -51,7 +51,7 @@ class IntFoo implements IFoo<number> {
 >  : ^^^^^^
 }
 
-var intFoo: IntFoo;
+declare var intFoo: IntFoo;
 >intFoo : IntFoo
 >       : ^^^^^^
 
@@ -66,7 +66,7 @@ class StringFoo2 implements IFoo<string> {
 >  : ^^^^^^
 }
 
-var stringFoo2: StringFoo2;
+declare var stringFoo2: StringFoo2;
 >stringFoo2 : StringFoo2
 >           : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/genericTypeAssertions6.errors.txt b/tests/baselines/reference/genericTypeAssertions6.errors.txt
index c57fecfbf43fb..4a6435e3c068b 100644
--- a/tests/baselines/reference/genericTypeAssertions6.errors.txt
+++ b/tests/baselines/reference/genericTypeAssertions6.errors.txt
@@ -40,5 +40,5 @@ genericTypeAssertions6.ts(19,17): error TS2352: Conversion of type 'U' to type '
         }
     }
     
-    var b: B<Date, Date>;
+    declare var b: B<Date, Date>;
     var c: A<Date, Date> = <A<Date, Date>>b;
\ No newline at end of file
diff --git a/tests/baselines/reference/genericTypeAssertions6.js b/tests/baselines/reference/genericTypeAssertions6.js
index 7a5635f79c40b..39dd26a6e1c62 100644
--- a/tests/baselines/reference/genericTypeAssertions6.js
+++ b/tests/baselines/reference/genericTypeAssertions6.js
@@ -23,7 +23,7 @@ class B<T extends Date, U extends Date> extends A<T, U> {
     }
 }
 
-var b: B<Date, Date>;
+declare var b: B<Date, Date>;
 var c: A<Date, Date> = <A<Date, Date>>b;
 
 //// [genericTypeAssertions6.js]
@@ -67,5 +67,4 @@ var B = /** @class */ (function (_super) {
     };
     return B;
 }(A));
-var b;
 var c = b;
diff --git a/tests/baselines/reference/genericTypeAssertions6.symbols b/tests/baselines/reference/genericTypeAssertions6.symbols
index 5d17d1c975d43..a8982eb264305 100644
--- a/tests/baselines/reference/genericTypeAssertions6.symbols
+++ b/tests/baselines/reference/genericTypeAssertions6.symbols
@@ -82,8 +82,8 @@ class B<T extends Date, U extends Date> extends A<T, U> {
     }
 }
 
-var b: B<Date, Date>;
->b : Symbol(b, Decl(genericTypeAssertions6.ts, 22, 3))
+declare var b: B<Date, Date>;
+>b : Symbol(b, Decl(genericTypeAssertions6.ts, 22, 11))
 >B : Symbol(B, Decl(genericTypeAssertions6.ts, 10, 1))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
@@ -96,5 +96,5 @@ var c: A<Date, Date> = <A<Date, Date>>b;
 >A : Symbol(A, Decl(genericTypeAssertions6.ts, 0, 0))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->b : Symbol(b, Decl(genericTypeAssertions6.ts, 22, 3))
+>b : Symbol(b, Decl(genericTypeAssertions6.ts, 22, 11))
 
diff --git a/tests/baselines/reference/genericTypeAssertions6.types b/tests/baselines/reference/genericTypeAssertions6.types
index 9848d46348581..34a9ef5d3a811 100644
--- a/tests/baselines/reference/genericTypeAssertions6.types
+++ b/tests/baselines/reference/genericTypeAssertions6.types
@@ -116,7 +116,7 @@ class B<T extends Date, U extends Date> extends A<T, U> {
     }
 }
 
-var b: B<Date, Date>;
+declare var b: B<Date, Date>;
 >b : B<Date, Date>
 >  : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/genericWithOpenTypeParameters1.errors.txt b/tests/baselines/reference/genericWithOpenTypeParameters1.errors.txt
index cf68e04123162..32f8ded4e7c15 100644
--- a/tests/baselines/reference/genericWithOpenTypeParameters1.errors.txt
+++ b/tests/baselines/reference/genericWithOpenTypeParameters1.errors.txt
@@ -9,7 +9,7 @@ genericWithOpenTypeParameters1.ts(9,41): error TS2558: Expected 0 type arguments
        foo(x: T): T { return null; }
     }
     
-    var x: B<number>;
+    declare var x: B<number>;
     x.foo(1); // no error
     var f = <T>(x: B<T>) => { return x.foo(1); } // error
                                            ~
diff --git a/tests/baselines/reference/genericWithOpenTypeParameters1.js b/tests/baselines/reference/genericWithOpenTypeParameters1.js
index 4ea9ab384d816..d6dfe50133113 100644
--- a/tests/baselines/reference/genericWithOpenTypeParameters1.js
+++ b/tests/baselines/reference/genericWithOpenTypeParameters1.js
@@ -5,7 +5,7 @@ class B<T> {
    foo(x: T): T { return null; }
 }
 
-var x: B<number>;
+declare var x: B<number>;
 x.foo(1); // no error
 var f = <T>(x: B<T>) => { return x.foo(1); } // error
 var f2 = <T>(x: B<T>) => { return x.foo<T>(1); } // error
@@ -20,7 +20,6 @@ var B = /** @class */ (function () {
     B.prototype.foo = function (x) { return null; };
     return B;
 }());
-var x;
 x.foo(1); // no error
 var f = function (x) { return x.foo(1); }; // error
 var f2 = function (x) { return x.foo(1); }; // error
diff --git a/tests/baselines/reference/genericWithOpenTypeParameters1.symbols b/tests/baselines/reference/genericWithOpenTypeParameters1.symbols
index 455753e69fcd3..77885f2775df3 100644
--- a/tests/baselines/reference/genericWithOpenTypeParameters1.symbols
+++ b/tests/baselines/reference/genericWithOpenTypeParameters1.symbols
@@ -12,13 +12,13 @@ class B<T> {
 >T : Symbol(T, Decl(genericWithOpenTypeParameters1.ts, 0, 8))
 }
 
-var x: B<number>;
->x : Symbol(x, Decl(genericWithOpenTypeParameters1.ts, 4, 3))
+declare var x: B<number>;
+>x : Symbol(x, Decl(genericWithOpenTypeParameters1.ts, 4, 11))
 >B : Symbol(B, Decl(genericWithOpenTypeParameters1.ts, 0, 0))
 
 x.foo(1); // no error
 >x.foo : Symbol(B.foo, Decl(genericWithOpenTypeParameters1.ts, 0, 12))
->x : Symbol(x, Decl(genericWithOpenTypeParameters1.ts, 4, 3))
+>x : Symbol(x, Decl(genericWithOpenTypeParameters1.ts, 4, 11))
 >foo : Symbol(B.foo, Decl(genericWithOpenTypeParameters1.ts, 0, 12))
 
 var f = <T>(x: B<T>) => { return x.foo(1); } // error
diff --git a/tests/baselines/reference/genericWithOpenTypeParameters1.types b/tests/baselines/reference/genericWithOpenTypeParameters1.types
index eb17dba87dbdb..77e67304241db 100644
--- a/tests/baselines/reference/genericWithOpenTypeParameters1.types
+++ b/tests/baselines/reference/genericWithOpenTypeParameters1.types
@@ -12,7 +12,7 @@ class B<T> {
 >  : ^
 }
 
-var x: B<number>;
+declare var x: B<number>;
 >x : B<number>
 >  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/generics4.errors.txt b/tests/baselines/reference/generics4.errors.txt
index d1c24fa740f46..0a1a77fd130b1 100644
--- a/tests/baselines/reference/generics4.errors.txt
+++ b/tests/baselines/reference/generics4.errors.txt
@@ -8,8 +8,8 @@ generics4.ts(7,1): error TS2322: Type 'C<Y>' is not assignable to type 'C<X>'.
     class C<T> { private x: T; }
     interface X { f(): string; }
     interface Y { f(): boolean; }
-    var a: C<X>;
-    var b: C<Y>;
+    declare var a: C<X>;
+    declare var b: C<Y>;
     
     a = b; // Not ok - return types of "f" are different
     ~
diff --git a/tests/baselines/reference/generics4.js b/tests/baselines/reference/generics4.js
index c69753da3492c..a57b66ff69ac5 100644
--- a/tests/baselines/reference/generics4.js
+++ b/tests/baselines/reference/generics4.js
@@ -4,8 +4,8 @@
 class C<T> { private x: T; }
 interface X { f(): string; }
 interface Y { f(): boolean; }
-var a: C<X>;
-var b: C<Y>;
+declare var a: C<X>;
+declare var b: C<Y>;
 
 a = b; // Not ok - return types of "f" are different
 
@@ -15,6 +15,4 @@ var C = /** @class */ (function () {
     }
     return C;
 }());
-var a;
-var b;
 a = b; // Not ok - return types of "f" are different
diff --git a/tests/baselines/reference/generics4.symbols b/tests/baselines/reference/generics4.symbols
index f2a3970ba725c..b7d8a0965a22e 100644
--- a/tests/baselines/reference/generics4.symbols
+++ b/tests/baselines/reference/generics4.symbols
@@ -15,17 +15,17 @@ interface Y { f(): boolean; }
 >Y : Symbol(Y, Decl(generics4.ts, 1, 28))
 >f : Symbol(Y.f, Decl(generics4.ts, 2, 13))
 
-var a: C<X>;
->a : Symbol(a, Decl(generics4.ts, 3, 3))
+declare var a: C<X>;
+>a : Symbol(a, Decl(generics4.ts, 3, 11))
 >C : Symbol(C, Decl(generics4.ts, 0, 0))
 >X : Symbol(X, Decl(generics4.ts, 0, 28))
 
-var b: C<Y>;
->b : Symbol(b, Decl(generics4.ts, 4, 3))
+declare var b: C<Y>;
+>b : Symbol(b, Decl(generics4.ts, 4, 11))
 >C : Symbol(C, Decl(generics4.ts, 0, 0))
 >Y : Symbol(Y, Decl(generics4.ts, 1, 28))
 
 a = b; // Not ok - return types of "f" are different
->a : Symbol(a, Decl(generics4.ts, 3, 3))
->b : Symbol(b, Decl(generics4.ts, 4, 3))
+>a : Symbol(a, Decl(generics4.ts, 3, 11))
+>b : Symbol(b, Decl(generics4.ts, 4, 11))
 
diff --git a/tests/baselines/reference/generics4.types b/tests/baselines/reference/generics4.types
index 6e91e500218eb..b418fb635706b 100644
--- a/tests/baselines/reference/generics4.types
+++ b/tests/baselines/reference/generics4.types
@@ -15,11 +15,11 @@ interface Y { f(): boolean; }
 >f : () => boolean
 >  : ^^^^^^       
 
-var a: C<X>;
+declare var a: C<X>;
 >a : C<X>
 >  : ^^^^
 
-var b: C<Y>;
+declare var b: C<Y>;
 >b : C<Y>
 >  : ^^^^
 
diff --git a/tests/baselines/reference/globalThisVarDeclaration.errors.txt b/tests/baselines/reference/globalThisVarDeclaration.errors.txt
index 7bbcdac3736cf..1d4929c6a648f 100644
--- a/tests/baselines/reference/globalThisVarDeclaration.errors.txt
+++ b/tests/baselines/reference/globalThisVarDeclaration.errors.txt
@@ -1,9 +1,11 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 actual.ts(12,5): error TS2339: Property 'a' does not exist on type 'Window'.
 actual.ts(13,5): error TS2339: Property 'b' does not exist on type 'Window'.
 b.js(12,5): error TS2339: Property 'a' does not exist on type 'Window'.
 b.js(13,5): error TS2339: Property 'b' does not exist on type 'Window'.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== b.js (2 errors) ====
     var a = 10;
     this.a;
diff --git a/tests/baselines/reference/goToTypeDefinitionImportMeta.baseline.jsonc b/tests/baselines/reference/goToTypeDefinitionImportMeta.baseline.jsonc
index 2e03384c8bcc9..afbc94b2a8ef5 100644
--- a/tests/baselines/reference/goToTypeDefinitionImportMeta.baseline.jsonc
+++ b/tests/baselines/reference/goToTypeDefinitionImportMeta.baseline.jsonc
@@ -1,5 +1,5 @@
 // === goToType ===
-// === lib.d.ts ===
+// === /home/src/tslibs/TS/Lib/lib.es5.d.ts ===
 // --- (line: --) skipped ---
 //  * If you need to declare that a given property exists on `import.meta`,
 //  * this type may be augmented via interface merging.
diff --git a/tests/baselines/reference/goToTypeDefinitionModifiers.baseline.jsonc b/tests/baselines/reference/goToTypeDefinitionModifiers.baseline.jsonc
index 0971205dbcaaf..f8abf5ad19c26 100644
--- a/tests/baselines/reference/goToTypeDefinitionModifiers.baseline.jsonc
+++ b/tests/baselines/reference/goToTypeDefinitionModifiers.baseline.jsonc
@@ -187,7 +187,7 @@
 
 
 // === goToType ===
-// === lib.d.ts ===
+// === /home/src/tslibs/TS/Lib/lib.es5.d.ts ===
 // --- (line: --) skipped ---
 // /**
 //  * Represents the completion of an asynchronous operation
@@ -240,7 +240,7 @@
 
 
 // === goToType ===
-// === lib.d.ts ===
+// === /home/src/tslibs/TS/Lib/lib.es5.d.ts ===
 // --- (line: --) skipped ---
 // /**
 //  * Represents the completion of an asynchronous operation
@@ -347,7 +347,7 @@
 
 
 // === goToType ===
-// === lib.d.ts ===
+// === /home/src/tslibs/TS/Lib/lib.es5.d.ts ===
 // --- (line: --) skipped ---
 // /**
 //  * Represents the completion of an asynchronous operation
@@ -399,7 +399,7 @@
 
 
 // === goToType ===
-// === lib.d.ts ===
+// === /home/src/tslibs/TS/Lib/lib.es5.d.ts ===
 // --- (line: --) skipped ---
 // /**
 //  * Represents the completion of an asynchronous operation
@@ -451,7 +451,7 @@
 
 
 // === goToType ===
-// === lib.d.ts ===
+// === /home/src/tslibs/TS/Lib/lib.es5.d.ts ===
 // --- (line: --) skipped ---
 // /**
 //  * Represents the completion of an asynchronous operation
@@ -503,7 +503,7 @@
 
 
 // === goToType ===
-// === lib.d.ts ===
+// === /home/src/tslibs/TS/Lib/lib.es5.d.ts ===
 // --- (line: --) skipped ---
 // /**
 //  * Represents the completion of an asynchronous operation
diff --git a/tests/baselines/reference/goToTypeDefinition_Pick.baseline.jsonc b/tests/baselines/reference/goToTypeDefinition_Pick.baseline.jsonc
index 2765d9876b1a3..b3bf63d6f4b47 100644
--- a/tests/baselines/reference/goToTypeDefinition_Pick.baseline.jsonc
+++ b/tests/baselines/reference/goToTypeDefinition_Pick.baseline.jsonc
@@ -8,7 +8,7 @@
 // declare const user2: PickedUser
 // user2
 
-// === lib.d.ts ===
+// === /home/src/tslibs/TS/Lib/lib.es5.d.ts ===
 // --- (line: --) skipped ---
 // /**
 //  * From T, pick a set of properties whose keys are in the union K
@@ -57,7 +57,7 @@
 // declare const user2: PickedUser
 // /*GOTO TYPE*/user2
 
-// === lib.d.ts ===
+// === /home/src/tslibs/TS/Lib/lib.es5.d.ts ===
 // --- (line: --) skipped ---
 // /**
 //  * From T, pick a set of properties whose keys are in the union K
diff --git a/tests/baselines/reference/goToTypeDefinition_arrayType.baseline.jsonc b/tests/baselines/reference/goToTypeDefinition_arrayType.baseline.jsonc
index 1cd2c60375f26..0330ae276a185 100644
--- a/tests/baselines/reference/goToTypeDefinition_arrayType.baseline.jsonc
+++ b/tests/baselines/reference/goToTypeDefinition_arrayType.baseline.jsonc
@@ -8,7 +8,7 @@
 // declare const users2: UsersArr
 // --- (line: 7) skipped ---
 
-// === lib.d.ts ===
+// === /home/src/tslibs/TS/Lib/lib.es5.d.ts ===
 // --- (line: --) skipped ---
 //     slice(start?: number, end?: number): T[];
 // }
@@ -265,7 +265,7 @@
 // declare const users3: CustomArray<User>
 // users3
 
-// === lib.d.ts ===
+// === /home/src/tslibs/TS/Lib/lib.es5.d.ts ===
 // --- (line: --) skipped ---
 //     slice(start?: number, end?: number): T[];
 // }
diff --git a/tests/baselines/reference/goToTypeDefinition_promiseType.baseline.jsonc b/tests/baselines/reference/goToTypeDefinition_promiseType.baseline.jsonc
index f84caf2e46250..58ed625e78a5d 100644
--- a/tests/baselines/reference/goToTypeDefinition_promiseType.baseline.jsonc
+++ b/tests/baselines/reference/goToTypeDefinition_promiseType.baseline.jsonc
@@ -7,7 +7,7 @@
 // 
 // export {}
 
-// === lib.d.ts ===
+// === /home/src/tslibs/TS/Lib/lib.es5.d.ts ===
 // --- (line: --) skipped ---
 // /**
 //  * Represents the completion of an asynchronous operation
@@ -33,6 +33,14 @@
 //  * Recursively unwraps the "awaited type" of a type. Non-promise "thenables" should resolve to `never`. This emulates the behavior of `await`.
 // --- (line: --) skipped ---
 
+// === /home/src/tslibs/TS/Lib/lib.es2015.promise.d.ts ===
+// --- (line: --) skipped ---
+//     resolve<T>(value: T | PromiseLike<T>): Promise<Awaited<T>>;
+// }
+// 
+// <|declare var [|{| defId: 2 |}Promise|]: PromiseConstructor;|>
+// 
+
   // === Details ===
   [
    {
@@ -47,7 +55,17 @@
    },
    {
     "defId": 1,
-    "kind": "interface",
+    "kind": "var",
+    "name": "Promise",
+    "containerName": "",
+    "isLocal": false,
+    "isAmbient": true,
+    "unverified": false,
+    "failedAliasResolution": false
+   },
+   {
+    "defId": 2,
+    "kind": "var",
     "name": "Promise",
     "containerName": "",
     "isLocal": false,
@@ -68,7 +86,7 @@
 // 
 // export {}
 
-// === lib.d.ts ===
+// === /home/src/tslibs/TS/Lib/lib.es5.d.ts ===
 // --- (line: --) skipped ---
 // /**
 //  * Represents the completion of an asynchronous operation
@@ -94,6 +112,14 @@
 //  * Recursively unwraps the "awaited type" of a type. Non-promise "thenables" should resolve to `never`. This emulates the behavior of `await`.
 // --- (line: --) skipped ---
 
+// === /home/src/tslibs/TS/Lib/lib.es2015.promise.d.ts ===
+// --- (line: --) skipped ---
+//     resolve<T>(value: T | PromiseLike<T>): Promise<Awaited<T>>;
+// }
+// 
+// <|declare var [|{| defId: 2 |}Promise|]: PromiseConstructor;|>
+// 
+
   // === Details ===
   [
    {
@@ -108,7 +134,17 @@
    },
    {
     "defId": 1,
-    "kind": "interface",
+    "kind": "var",
+    "name": "Promise",
+    "containerName": "",
+    "isLocal": false,
+    "isAmbient": true,
+    "unverified": false,
+    "failedAliasResolution": false
+   },
+   {
+    "defId": 2,
+    "kind": "var",
     "name": "Promise",
     "containerName": "",
     "isLocal": false,
diff --git a/tests/baselines/reference/i3.errors.txt b/tests/baselines/reference/i3.errors.txt
index 3a6d8c3164b4d..8058b21069348 100644
--- a/tests/baselines/reference/i3.errors.txt
+++ b/tests/baselines/reference/i3.errors.txt
@@ -4,8 +4,8 @@ i3.ts(6,1): error TS2322: Type 'I3' is not assignable to type '{ one: number; }'
 
 ==== i3.ts (1 errors) ====
     interface I3 { one?: number; }; 
-    var x: {one: number};
-    var i: I3;
+    declare var x: {one: number};
+    declare var i: I3;
     
     i = x;
     x = i;
diff --git a/tests/baselines/reference/i3.js b/tests/baselines/reference/i3.js
index 9534519cf2b9f..10165c82a992c 100644
--- a/tests/baselines/reference/i3.js
+++ b/tests/baselines/reference/i3.js
@@ -2,15 +2,13 @@
 
 //// [i3.ts]
 interface I3 { one?: number; }; 
-var x: {one: number};
-var i: I3;
+declare var x: {one: number};
+declare var i: I3;
 
 i = x;
 x = i;
 
 //// [i3.js]
 ;
-var x;
-var i;
 i = x;
 x = i;
diff --git a/tests/baselines/reference/i3.symbols b/tests/baselines/reference/i3.symbols
index f68f83aab3b41..a61b60520b137 100644
--- a/tests/baselines/reference/i3.symbols
+++ b/tests/baselines/reference/i3.symbols
@@ -5,19 +5,19 @@ interface I3 { one?: number; };
 >I3 : Symbol(I3, Decl(i3.ts, 0, 0))
 >one : Symbol(I3.one, Decl(i3.ts, 0, 14))
 
-var x: {one: number};
->x : Symbol(x, Decl(i3.ts, 1, 3))
->one : Symbol(one, Decl(i3.ts, 1, 8))
+declare var x: {one: number};
+>x : Symbol(x, Decl(i3.ts, 1, 11))
+>one : Symbol(one, Decl(i3.ts, 1, 16))
 
-var i: I3;
->i : Symbol(i, Decl(i3.ts, 2, 3))
+declare var i: I3;
+>i : Symbol(i, Decl(i3.ts, 2, 11))
 >I3 : Symbol(I3, Decl(i3.ts, 0, 0))
 
 i = x;
->i : Symbol(i, Decl(i3.ts, 2, 3))
->x : Symbol(x, Decl(i3.ts, 1, 3))
+>i : Symbol(i, Decl(i3.ts, 2, 11))
+>x : Symbol(x, Decl(i3.ts, 1, 11))
 
 x = i;
->x : Symbol(x, Decl(i3.ts, 1, 3))
->i : Symbol(i, Decl(i3.ts, 2, 3))
+>x : Symbol(x, Decl(i3.ts, 1, 11))
+>i : Symbol(i, Decl(i3.ts, 2, 11))
 
diff --git a/tests/baselines/reference/i3.types b/tests/baselines/reference/i3.types
index 9d8e1cf46abd2..2e62432a0e3f8 100644
--- a/tests/baselines/reference/i3.types
+++ b/tests/baselines/reference/i3.types
@@ -5,13 +5,13 @@ interface I3 { one?: number; };
 >one : number
 >    : ^^^^^^
 
-var x: {one: number};
+declare var x: {one: number};
 >x : { one: number; }
 >  : ^^^^^^^      ^^^
 >one : number
 >    : ^^^^^^
 
-var i: I3;
+declare var i: I3;
 >i : I3
 >  : ^^
 
diff --git a/tests/baselines/reference/ignoredJsxAttributes.js b/tests/baselines/reference/ignoredJsxAttributes.js
index e25687859eccf..b399e17054b8f 100644
--- a/tests/baselines/reference/ignoredJsxAttributes.js
+++ b/tests/baselines/reference/ignoredJsxAttributes.js
@@ -25,7 +25,7 @@ let x2 = <Yadda bar="hello" data-yadda={42}/>;  // Error
 
 //// [ignoredJsxAttributes.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt
index 8d22f82f4c6f8..6c7d2151ea313 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt
@@ -30,7 +30,7 @@ implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2420: Clas
 
 ==== implementingAnInterfaceExtendingClassWithPrivates2.ts (15 errors) ====
     class Foo {
-        private x: string;
+        private x!: string;
     }
     
     interface I extends Foo {
@@ -38,7 +38,7 @@ implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2420: Clas
     }
     
     class Bar extends Foo implements I { // ok
-        y: number;
+        y!: number;
     }
     
     class Bar2 extends Foo implements I { // error
@@ -48,8 +48,8 @@ implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2420: Clas
           ~~~~
 !!! error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'x' is private in type 'I' but not in type 'Bar2'.
-        x: string;
-        y: number;
+        x!: string;
+        y!: number;
     }
     
     class Bar3 extends Foo implements I { // error
@@ -59,18 +59,18 @@ implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2420: Clas
           ~~~~
 !!! error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
 !!! error TS2420:   Types have separate declarations of a private property 'x'.
-        private x: string;
-        y: number;
+        private x!: string;
+        y!: number;
     }
     
     // another level of indirection
     namespace M {
         class Foo {
-            private x: string;
+            private x!: string;
         }
     
         class Baz extends Foo {
-            z: number;
+            z!: number;
         }
     
         interface I extends Baz {
@@ -78,8 +78,8 @@ implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2420: Clas
         }
     
         class Bar extends Foo implements I { // ok
-            y: number;
-            z: number;
+            y!: number;
+            z!: number;
         }
     
         class Bar2 extends Foo implements I { // error
@@ -90,8 +90,8 @@ implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2420: Clas
 !!! error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'z' is missing in type 'Bar2' but required in type 'I'.
 !!! related TS2728 implementingAnInterfaceExtendingClassWithPrivates2.ts:30:9: 'z' is declared here.
-            x: string;
-            y: number;
+            x!: string;
+            y!: number;
         }
     
         class Bar3 extends Foo implements I { // error
@@ -102,19 +102,19 @@ implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2420: Clas
 !!! error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'z' is missing in type 'Bar3' but required in type 'I'.
 !!! related TS2728 implementingAnInterfaceExtendingClassWithPrivates2.ts:30:9: 'z' is declared here.
-            private x: string;
-            y: number;
+            private x!: string;
+            y!: number;
         }
     }
     
     // two levels of privates
     namespace M2 {
         class Foo {
-            private x: string;
+            private x!: string;
         }
     
         class Baz extends Foo {
-            private y: number;
+            private y!: number;
         }
     
         interface I extends Baz {
@@ -126,10 +126,10 @@ implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2420: Clas
 !!! error TS2420: Class 'Bar' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'y' is missing in type 'Bar' but required in type 'I'.
 !!! related TS2728 implementingAnInterfaceExtendingClassWithPrivates2.ts:60:17: 'y' is declared here.
-            z: number;
+            z!: number;
         }
     
-        var b: Bar;
+        declare var b: Bar;
         var r1 = b.z;
         var r2 = b.x; // error
                    ~
@@ -146,8 +146,8 @@ implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2420: Clas
 !!! error TS2420: Class 'Bar2' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'y' is missing in type 'Bar2' but required in type 'I'.
 !!! related TS2728 implementingAnInterfaceExtendingClassWithPrivates2.ts:60:17: 'y' is declared here.
-            x: string;
-            z: number;
+            x!: string;
+            z!: number;
         }
     
         class Bar3 extends Foo implements I { // error
@@ -158,7 +158,7 @@ implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2420: Clas
 !!! error TS2420: Class 'Bar3' incorrectly implements interface 'I'.
 !!! error TS2420:   Property 'y' is missing in type 'Bar3' but required in type 'I'.
 !!! related TS2728 implementingAnInterfaceExtendingClassWithPrivates2.ts:60:17: 'y' is declared here.
-            private x: string;
-            z: number;
+            private x!: string;
+            z!: number;
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
index 6151047203698..53752d5942912 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
@@ -2,7 +2,7 @@
 
 //// [implementingAnInterfaceExtendingClassWithPrivates2.ts]
 class Foo {
-    private x: string;
+    private x!: string;
 }
 
 interface I extends Foo {
@@ -10,27 +10,27 @@ interface I extends Foo {
 }
 
 class Bar extends Foo implements I { // ok
-    y: number;
+    y!: number;
 }
 
 class Bar2 extends Foo implements I { // error
-    x: string;
-    y: number;
+    x!: string;
+    y!: number;
 }
 
 class Bar3 extends Foo implements I { // error
-    private x: string;
-    y: number;
+    private x!: string;
+    y!: number;
 }
 
 // another level of indirection
 namespace M {
     class Foo {
-        private x: string;
+        private x!: string;
     }
 
     class Baz extends Foo {
-        z: number;
+        z!: number;
     }
 
     interface I extends Baz {
@@ -38,29 +38,29 @@ namespace M {
     }
 
     class Bar extends Foo implements I { // ok
-        y: number;
-        z: number;
+        y!: number;
+        z!: number;
     }
 
     class Bar2 extends Foo implements I { // error
-        x: string;
-        y: number;
+        x!: string;
+        y!: number;
     }
 
     class Bar3 extends Foo implements I { // error
-        private x: string;
-        y: number;
+        private x!: string;
+        y!: number;
     }
 }
 
 // two levels of privates
 namespace M2 {
     class Foo {
-        private x: string;
+        private x!: string;
     }
 
     class Baz extends Foo {
-        private y: number;
+        private y!: number;
     }
 
     interface I extends Baz {
@@ -68,22 +68,22 @@ namespace M2 {
     }
 
     class Bar extends Foo implements I { // error
-        z: number;
+        z!: number;
     }
 
-    var b: Bar;
+    declare var b: Bar;
     var r1 = b.z;
     var r2 = b.x; // error
     var r3 = b.y; // error
 
     class Bar2 extends Foo implements I { // error
-        x: string;
-        z: number;
+        x!: string;
+        z!: number;
     }
 
     class Bar3 extends Foo implements I { // error
-        private x: string;
-        z: number;
+        private x!: string;
+        z!: number;
     }
 }
 
@@ -188,7 +188,6 @@ var M2;
         }
         return Bar;
     }(Foo));
-    var b;
     var r1 = b.z;
     var r2 = b.x; // error
     var r3 = b.y; // error
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.symbols b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.symbols
index b1f4ba83a713e..4877032a3e549 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.symbols
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.symbols
@@ -4,7 +4,7 @@
 class Foo {
 >Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 0, 0))
 
-    private x: string;
+    private x!: string;
 >x : Symbol(Foo.x, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 0, 11))
 }
 
@@ -21,7 +21,7 @@ class Bar extends Foo implements I { // ok
 >Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 0, 0))
 >I : Symbol(I, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 2, 1))
 
-    y: number;
+    y!: number;
 >y : Symbol(Bar.y, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 8, 36))
 }
 
@@ -30,11 +30,11 @@ class Bar2 extends Foo implements I { // error
 >Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 0, 0))
 >I : Symbol(I, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 2, 1))
 
-    x: string;
+    x!: string;
 >x : Symbol(Bar2.x, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 12, 37))
 
-    y: number;
->y : Symbol(Bar2.y, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 13, 14))
+    y!: number;
+>y : Symbol(Bar2.y, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 13, 15))
 }
 
 class Bar3 extends Foo implements I { // error
@@ -42,11 +42,11 @@ class Bar3 extends Foo implements I { // error
 >Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 0, 0))
 >I : Symbol(I, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 2, 1))
 
-    private x: string;
+    private x!: string;
 >x : Symbol(Bar3.x, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 17, 37))
 
-    y: number;
->y : Symbol(Bar3.y, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 18, 22))
+    y!: number;
+>y : Symbol(Bar3.y, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 18, 23))
 }
 
 // another level of indirection
@@ -56,7 +56,7 @@ namespace M {
     class Foo {
 >Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 23, 13))
 
-        private x: string;
+        private x!: string;
 >x : Symbol(Foo.x, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 24, 15))
     }
 
@@ -64,7 +64,7 @@ namespace M {
 >Baz : Symbol(Baz, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 26, 5))
 >Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 23, 13))
 
-        z: number;
+        z!: number;
 >z : Symbol(Baz.z, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 28, 27))
     }
 
@@ -81,11 +81,11 @@ namespace M {
 >Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 23, 13))
 >I : Symbol(I, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 30, 5))
 
-        y: number;
+        y!: number;
 >y : Symbol(Bar.y, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 36, 40))
 
-        z: number;
->z : Symbol(Bar.z, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 37, 18))
+        z!: number;
+>z : Symbol(Bar.z, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 37, 19))
     }
 
     class Bar2 extends Foo implements I { // error
@@ -93,11 +93,11 @@ namespace M {
 >Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 23, 13))
 >I : Symbol(I, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 30, 5))
 
-        x: string;
+        x!: string;
 >x : Symbol(Bar2.x, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 41, 41))
 
-        y: number;
->y : Symbol(Bar2.y, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 42, 18))
+        y!: number;
+>y : Symbol(Bar2.y, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 42, 19))
     }
 
     class Bar3 extends Foo implements I { // error
@@ -105,11 +105,11 @@ namespace M {
 >Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 23, 13))
 >I : Symbol(I, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 30, 5))
 
-        private x: string;
+        private x!: string;
 >x : Symbol(Bar3.x, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 46, 41))
 
-        y: number;
->y : Symbol(Bar3.y, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 47, 26))
+        y!: number;
+>y : Symbol(Bar3.y, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 47, 27))
     }
 }
 
@@ -120,7 +120,7 @@ namespace M2 {
     class Foo {
 >Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 53, 14))
 
-        private x: string;
+        private x!: string;
 >x : Symbol(Foo.x, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 54, 15))
     }
 
@@ -128,7 +128,7 @@ namespace M2 {
 >Baz : Symbol(Baz, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 56, 5))
 >Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 53, 14))
 
-        private y: number;
+        private y!: number;
 >y : Symbol(Baz.y, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 58, 27))
     }
 
@@ -145,40 +145,40 @@ namespace M2 {
 >Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 53, 14))
 >I : Symbol(I, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 60, 5))
 
-        z: number;
+        z!: number;
 >z : Symbol(Bar.z, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 66, 40))
     }
 
-    var b: Bar;
->b : Symbol(b, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 70, 7))
+    declare var b: Bar;
+>b : Symbol(b, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 70, 15))
 >Bar : Symbol(Bar, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 64, 5))
 
     var r1 = b.z;
 >r1 : Symbol(r1, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 71, 7))
 >b.z : Symbol(Bar.z, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 66, 40))
->b : Symbol(b, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 70, 7))
+>b : Symbol(b, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 70, 15))
 >z : Symbol(Bar.z, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 66, 40))
 
     var r2 = b.x; // error
 >r2 : Symbol(r2, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 72, 7))
 >b.x : Symbol(Foo.x, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 54, 15))
->b : Symbol(b, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 70, 7))
+>b : Symbol(b, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 70, 15))
 >x : Symbol(Foo.x, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 54, 15))
 
     var r3 = b.y; // error
 >r3 : Symbol(r3, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 73, 7))
->b : Symbol(b, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 70, 7))
+>b : Symbol(b, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 70, 15))
 
     class Bar2 extends Foo implements I { // error
 >Bar2 : Symbol(Bar2, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 73, 17))
 >Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 53, 14))
 >I : Symbol(I, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 60, 5))
 
-        x: string;
+        x!: string;
 >x : Symbol(Bar2.x, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 75, 41))
 
-        z: number;
->z : Symbol(Bar2.z, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 76, 18))
+        z!: number;
+>z : Symbol(Bar2.z, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 76, 19))
     }
 
     class Bar3 extends Foo implements I { // error
@@ -186,10 +186,10 @@ namespace M2 {
 >Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 53, 14))
 >I : Symbol(I, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 60, 5))
 
-        private x: string;
+        private x!: string;
 >x : Symbol(Bar3.x, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 80, 41))
 
-        z: number;
->z : Symbol(Bar3.z, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 81, 26))
+        z!: number;
+>z : Symbol(Bar3.z, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 81, 27))
     }
 }
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.types b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.types
index 087f521da0958..2d316bd2bd8ed 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.types
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.types
@@ -5,7 +5,7 @@ class Foo {
 >Foo : Foo
 >    : ^^^
 
-    private x: string;
+    private x!: string;
 >x : string
 >  : ^^^^^^
 }
@@ -22,7 +22,7 @@ class Bar extends Foo implements I { // ok
 >Foo : Foo
 >    : ^^^
 
-    y: number;
+    y!: number;
 >y : number
 >  : ^^^^^^
 }
@@ -33,11 +33,11 @@ class Bar2 extends Foo implements I { // error
 >Foo : Foo
 >    : ^^^
 
-    x: string;
+    x!: string;
 >x : string
 >  : ^^^^^^
 
-    y: number;
+    y!: number;
 >y : number
 >  : ^^^^^^
 }
@@ -48,11 +48,11 @@ class Bar3 extends Foo implements I { // error
 >Foo : Foo
 >    : ^^^
 
-    private x: string;
+    private x!: string;
 >x : string
 >  : ^^^^^^
 
-    y: number;
+    y!: number;
 >y : number
 >  : ^^^^^^
 }
@@ -66,7 +66,7 @@ namespace M {
 >Foo : Foo
 >    : ^^^
 
-        private x: string;
+        private x!: string;
 >x : string
 >  : ^^^^^^
     }
@@ -77,7 +77,7 @@ namespace M {
 >Foo : Foo
 >    : ^^^
 
-        z: number;
+        z!: number;
 >z : number
 >  : ^^^^^^
     }
@@ -94,11 +94,11 @@ namespace M {
 >Foo : Foo
 >    : ^^^
 
-        y: number;
+        y!: number;
 >y : number
 >  : ^^^^^^
 
-        z: number;
+        z!: number;
 >z : number
 >  : ^^^^^^
     }
@@ -109,11 +109,11 @@ namespace M {
 >Foo : Foo
 >    : ^^^
 
-        x: string;
+        x!: string;
 >x : string
 >  : ^^^^^^
 
-        y: number;
+        y!: number;
 >y : number
 >  : ^^^^^^
     }
@@ -124,11 +124,11 @@ namespace M {
 >Foo : Foo
 >    : ^^^
 
-        private x: string;
+        private x!: string;
 >x : string
 >  : ^^^^^^
 
-        y: number;
+        y!: number;
 >y : number
 >  : ^^^^^^
     }
@@ -143,7 +143,7 @@ namespace M2 {
 >Foo : Foo
 >    : ^^^
 
-        private x: string;
+        private x!: string;
 >x : string
 >  : ^^^^^^
     }
@@ -154,7 +154,7 @@ namespace M2 {
 >Foo : Foo
 >    : ^^^
 
-        private y: number;
+        private y!: number;
 >y : number
 >  : ^^^^^^
     }
@@ -171,12 +171,12 @@ namespace M2 {
 >Foo : Foo
 >    : ^^^
 
-        z: number;
+        z!: number;
 >z : number
 >  : ^^^^^^
     }
 
-    var b: Bar;
+    declare var b: Bar;
 >b : Bar
 >  : ^^^
 
@@ -216,11 +216,11 @@ namespace M2 {
 >Foo : Foo
 >    : ^^^
 
-        x: string;
+        x!: string;
 >x : string
 >  : ^^^^^^
 
-        z: number;
+        z!: number;
 >z : number
 >  : ^^^^^^
     }
@@ -231,11 +231,11 @@ namespace M2 {
 >Foo : Foo
 >    : ^^^
 
-        private x: string;
+        private x!: string;
 >x : string
 >  : ^^^^^^
 
-        z: number;
+        z!: number;
 >z : number
 >  : ^^^^^^
     }
diff --git a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.errors.txt b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.errors.txt
index 38ea304c81679..93e732390201f 100644
--- a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.errors.txt
+++ b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.errors.txt
@@ -1,7 +1,7 @@
 implicitAnyFunctionInvocationWithAnyArguements.ts(3,5): error TS7005: Variable 'anyArray' implicitly has an 'any[]' type.
-implicitAnyFunctionInvocationWithAnyArguements.ts(4,13): error TS7008: Member 'v' implicitly has an 'any' type.
-implicitAnyFunctionInvocationWithAnyArguements.ts(4,16): error TS7008: Member 'w' implicitly has an 'any' type.
-implicitAnyFunctionInvocationWithAnyArguements.ts(5,13): error TS7006: Parameter 'y2' implicitly has an 'any' type.
+implicitAnyFunctionInvocationWithAnyArguements.ts(4,21): error TS7008: Member 'v' implicitly has an 'any' type.
+implicitAnyFunctionInvocationWithAnyArguements.ts(4,24): error TS7008: Member 'w' implicitly has an 'any' type.
+implicitAnyFunctionInvocationWithAnyArguements.ts(5,21): error TS7006: Parameter 'y2' implicitly has an 'any' type.
 implicitAnyFunctionInvocationWithAnyArguements.ts(6,16): error TS7006: Parameter 'arg1' implicitly has an 'any' type.
 implicitAnyFunctionInvocationWithAnyArguements.ts(10,36): error TS7006: Parameter 'y2' implicitly has an 'any' type.
 
@@ -12,13 +12,13 @@ implicitAnyFunctionInvocationWithAnyArguements.ts(10,36): error TS7006: Paramete
     var anyArray = [null, undefined];  // error at array literal
         ~~~~~~~~
 !!! error TS7005: Variable 'anyArray' implicitly has an 'any[]' type.
-    var objL: { v; w; }             // error at "y,z"
-                ~
+    declare var objL: { v; w; }             // error at "y,z"
+                        ~
 !!! error TS7008: Member 'v' implicitly has an 'any' type.
-                   ~
+                           ~
 !!! error TS7008: Member 'w' implicitly has an 'any' type.
-    var funcL: (y2) => number;
-                ~~
+    declare var funcL: (y2) => number;
+                        ~~
 !!! error TS7006: Parameter 'y2' implicitly has an 'any' type.
     function temp1(arg1) { }  // error at "temp1"
                    ~~~~
diff --git a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js
index 36073cb9ff8f5..0f8970c1e980b 100644
--- a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js
+++ b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js
@@ -4,8 +4,8 @@
 // this should be errors
 var arg0 = null;  // error at "arg0"
 var anyArray = [null, undefined];  // error at array literal
-var objL: { v; w; }             // error at "y,z"
-var funcL: (y2) => number;
+declare var objL: { v; w; }             // error at "y,z"
+declare var funcL: (y2) => number;
 function temp1(arg1) { }  // error at "temp1"
 function testFunctionExprC(subReplace: (s: string, ...arg: any[]) => string) { }
 function testFunctionExprC2(eq: (v1: any, v2: any) => number) { };
@@ -41,8 +41,6 @@ var newC2 = new C(<any>[], null)
 // this should be errors
 var arg0 = null; // error at "arg0"
 var anyArray = [null, undefined]; // error at array literal
-var objL; // error at "y,z"
-var funcL;
 function temp1(arg1) { } // error at "temp1"
 function testFunctionExprC(subReplace) { }
 function testFunctionExprC2(eq) { }
diff --git a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.symbols b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.symbols
index 9f78d635cf45a..7944c114c0607 100644
--- a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.symbols
+++ b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.symbols
@@ -9,17 +9,17 @@ var anyArray = [null, undefined];  // error at array literal
 >anyArray : Symbol(anyArray, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 2, 3))
 >undefined : Symbol(undefined)
 
-var objL: { v; w; }             // error at "y,z"
->objL : Symbol(objL, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 3, 3))
->v : Symbol(v, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 3, 11))
->w : Symbol(w, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 3, 14))
+declare var objL: { v; w; }             // error at "y,z"
+>objL : Symbol(objL, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 3, 11))
+>v : Symbol(v, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 3, 19))
+>w : Symbol(w, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 3, 22))
 
-var funcL: (y2) => number;
->funcL : Symbol(funcL, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 4, 3))
->y2 : Symbol(y2, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 4, 12))
+declare var funcL: (y2) => number;
+>funcL : Symbol(funcL, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 4, 11))
+>y2 : Symbol(y2, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 4, 20))
 
 function temp1(arg1) { }  // error at "temp1"
->temp1 : Symbol(temp1, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 4, 26))
+>temp1 : Symbol(temp1, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 4, 34))
 >arg1 : Symbol(arg1, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 5, 15))
 
 function testFunctionExprC(subReplace: (s: string, ...arg: any[]) => string) { }
@@ -53,24 +53,24 @@ testFunctionExprC2((v1, v2) => 1);
 
 testObjLiteral(objL);
 >testObjLiteral : Symbol(testObjLiteral, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 7, 66))
->objL : Symbol(objL, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 3, 3))
+>objL : Symbol(objL, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 3, 11))
 
 testFuncLiteral(funcL);
 >testFuncLiteral : Symbol(testFuncLiteral, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 8, 56))
->funcL : Symbol(funcL, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 4, 3))
+>funcL : Symbol(funcL, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 4, 11))
 
 var k = temp1(null);
 >k : Symbol(k, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 16, 3))
->temp1 : Symbol(temp1, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 4, 26))
+>temp1 : Symbol(temp1, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 4, 34))
 
 var result = temp1(arg0);
 >result : Symbol(result, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 17, 3))
->temp1 : Symbol(temp1, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 4, 26))
+>temp1 : Symbol(temp1, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 4, 34))
 >arg0 : Symbol(arg0, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 1, 3))
 
 var result1 = temp1(anyArray);
 >result1 : Symbol(result1, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 18, 3))
->temp1 : Symbol(temp1, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 4, 26))
+>temp1 : Symbol(temp1, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 4, 34))
 >anyArray : Symbol(anyArray, Decl(implicitAnyFunctionInvocationWithAnyArguements.ts, 2, 3))
 
 function noError(variable: any, array?: any) { }
diff --git a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.types b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.types
index b9ef09d20d7a9..5a2212641f17a 100644
--- a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.types
+++ b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.types
@@ -14,7 +14,7 @@ var anyArray = [null, undefined];  // error at array literal
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var objL: { v; w; }             // error at "y,z"
+declare var objL: { v; w; }             // error at "y,z"
 >objL : { v: any; w: any; }
 >     : ^^^^^^^^^^^^^^^^^^^
 >v : any
@@ -22,7 +22,7 @@ var objL: { v; w; }             // error at "y,z"
 >w : any
 >  : ^^^
 
-var funcL: (y2) => number;
+declare var funcL: (y2) => number;
 >funcL : (y2: any) => number
 >      : ^  ^^^^^^^^^^      
 >y2 : any
diff --git a/tests/baselines/reference/implicitAnyWidenToAny.errors.txt b/tests/baselines/reference/implicitAnyWidenToAny.errors.txt
index 1d9883e561162..192fb24dac8e2 100644
--- a/tests/baselines/reference/implicitAnyWidenToAny.errors.txt
+++ b/tests/baselines/reference/implicitAnyWidenToAny.errors.txt
@@ -26,7 +26,7 @@ implicitAnyWidenToAny.ts(4,5): error TS7005: Variable 'widenArray' implicitly ha
     var array4: number[] = [null, undefined];
     var array5 = <any[]>[null, undefined];
     
-    var objLit: { new (n: number): any; };
+    declare var objLit: { new (n: number): any; };
     function anyReturnFunc(): any { }
     var obj0 = new objLit(1);
     var obj1 = anyReturnFunc();
diff --git a/tests/baselines/reference/implicitAnyWidenToAny.js b/tests/baselines/reference/implicitAnyWidenToAny.js
index 4f6683ef8a499..258e44d3d91b5 100644
--- a/tests/baselines/reference/implicitAnyWidenToAny.js
+++ b/tests/baselines/reference/implicitAnyWidenToAny.js
@@ -23,7 +23,7 @@ var array3: any[] = [null, undefined];
 var array4: number[] = [null, undefined];
 var array5 = <any[]>[null, undefined];
 
-var objLit: { new (n: number): any; };
+declare var objLit: { new (n: number): any; };
 function anyReturnFunc(): any { }
 var obj0 = new objLit(1);
 var obj1 = anyReturnFunc();
@@ -52,7 +52,6 @@ var array2 = [];
 var array3 = [null, undefined];
 var array4 = [null, undefined];
 var array5 = [null, undefined];
-var objLit;
 function anyReturnFunc() { }
 var obj0 = new objLit(1);
 var obj1 = anyReturnFunc();
diff --git a/tests/baselines/reference/implicitAnyWidenToAny.symbols b/tests/baselines/reference/implicitAnyWidenToAny.symbols
index 2dac95c64417b..5abc05a572eab 100644
--- a/tests/baselines/reference/implicitAnyWidenToAny.symbols
+++ b/tests/baselines/reference/implicitAnyWidenToAny.symbols
@@ -62,18 +62,18 @@ var array5 = <any[]>[null, undefined];
 >array5 : Symbol(array5, Decl(implicitAnyWidenToAny.ts, 20, 3))
 >undefined : Symbol(undefined)
 
-var objLit: { new (n: number): any; };
->objLit : Symbol(objLit, Decl(implicitAnyWidenToAny.ts, 22, 3))
->n : Symbol(n, Decl(implicitAnyWidenToAny.ts, 22, 19))
+declare var objLit: { new (n: number): any; };
+>objLit : Symbol(objLit, Decl(implicitAnyWidenToAny.ts, 22, 11))
+>n : Symbol(n, Decl(implicitAnyWidenToAny.ts, 22, 27))
 
 function anyReturnFunc(): any { }
->anyReturnFunc : Symbol(anyReturnFunc, Decl(implicitAnyWidenToAny.ts, 22, 38))
+>anyReturnFunc : Symbol(anyReturnFunc, Decl(implicitAnyWidenToAny.ts, 22, 46))
 
 var obj0 = new objLit(1);
 >obj0 : Symbol(obj0, Decl(implicitAnyWidenToAny.ts, 24, 3))
->objLit : Symbol(objLit, Decl(implicitAnyWidenToAny.ts, 22, 3))
+>objLit : Symbol(objLit, Decl(implicitAnyWidenToAny.ts, 22, 11))
 
 var obj1 = anyReturnFunc();
 >obj1 : Symbol(obj1, Decl(implicitAnyWidenToAny.ts, 25, 3))
->anyReturnFunc : Symbol(anyReturnFunc, Decl(implicitAnyWidenToAny.ts, 22, 38))
+>anyReturnFunc : Symbol(anyReturnFunc, Decl(implicitAnyWidenToAny.ts, 22, 46))
 
diff --git a/tests/baselines/reference/implicitAnyWidenToAny.types b/tests/baselines/reference/implicitAnyWidenToAny.types
index fd148986b0e40..4e7482fcde54c 100644
--- a/tests/baselines/reference/implicitAnyWidenToAny.types
+++ b/tests/baselines/reference/implicitAnyWidenToAny.types
@@ -113,7 +113,7 @@ var array5 = <any[]>[null, undefined];
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var objLit: { new (n: number): any; };
+declare var objLit: { new (n: number): any; };
 >objLit : new (n: number) => any
 >       : ^^^^^ ^^      ^^^^^   
 >n : number
diff --git a/tests/baselines/reference/importHelpersOutFile.errors.txt b/tests/baselines/reference/importHelpersOutFile.errors.txt
index 10450e3f12f6c..2fc7e8ffeabae 100644
--- a/tests/baselines/reference/importHelpersOutFile.errors.txt
+++ b/tests/baselines/reference/importHelpersOutFile.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (0 errors) ====
     export class A { }
diff --git a/tests/baselines/reference/importTypeAmdBundleRewrite.errors.txt b/tests/baselines/reference/importTypeAmdBundleRewrite.errors.txt
index 8986a26bb0304..ade25f886be10 100644
--- a/tests/baselines/reference/importTypeAmdBundleRewrite.errors.txt
+++ b/tests/baselines/reference/importTypeAmdBundleRewrite.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a/b/c.ts (0 errors) ====
     export interface Foo {
diff --git a/tests/baselines/reference/importsNotUsedAsValues_error.errors.txt b/tests/baselines/reference/importsNotUsedAsValues_error.errors.txt
index 39a41bd454c53..91aaa2d04fac9 100644
--- a/tests/baselines/reference/importsNotUsedAsValues_error.errors.txt
+++ b/tests/baselines/reference/importsNotUsedAsValues_error.errors.txt
@@ -13,20 +13,20 @@ error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it
     
 ==== /b.ts (0 errors) ====
     import { A, B } from './a'; // Error
-    let a: A;
-    let b: B;
+    declare let a: A;
+    declare let b: B;
     console.log(a, b);
     
 ==== /c.ts (0 errors) ====
     import Default, * as named from './a'; // Error
-    let a: Default;
-    let b: named.B;
+    declare let a: Default;
+    declare let b: named.B;
     console.log(a, b);
     
 ==== /d.ts (0 errors) ====
     import Default, { A } from './a';
     const a = A;
-    let b: Default;
+    declare let b: Default;
     console.log(a, b);
     
 ==== /e.ts (1 errors) ====
@@ -44,8 +44,8 @@ error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it
     
 ==== /g.ts (0 errors) ====
     import { C } from './a';
-    let c: C;
-    let d: C.Two;
+    declare let c: C;
+    declare let d: C.Two;
     console.log(c, d);
     
 ==== /h.ts (0 errors) ====
diff --git a/tests/baselines/reference/importsNotUsedAsValues_error.js b/tests/baselines/reference/importsNotUsedAsValues_error.js
index 7d9f1a2be56f9..5716c66d632ab 100644
--- a/tests/baselines/reference/importsNotUsedAsValues_error.js
+++ b/tests/baselines/reference/importsNotUsedAsValues_error.js
@@ -8,20 +8,20 @@ export const enum C { One, Two }
 
 //// [b.ts]
 import { A, B } from './a'; // Error
-let a: A;
-let b: B;
+declare let a: A;
+declare let b: B;
 console.log(a, b);
 
 //// [c.ts]
 import Default, * as named from './a'; // Error
-let a: Default;
-let b: named.B;
+declare let a: Default;
+declare let b: named.B;
 console.log(a, b);
 
 //// [d.ts]
 import Default, { A } from './a';
 const a = A;
-let b: Default;
+declare let b: Default;
 console.log(a, b);
 
 //// [e.ts]
@@ -37,8 +37,8 @@ console.log(c, d);
 
 //// [g.ts]
 import { C } from './a';
-let c: C;
-let d: C.Two;
+declare let c: C;
+declare let d: C.Two;
 console.log(c, d);
 
 //// [h.ts]
@@ -83,21 +83,16 @@ exports.A = A;
 //// [b.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var a;
-var b;
 console.log(a, b);
 //// [c.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var a;
-var b;
 console.log(a, b);
 //// [d.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var a_1 = require("./a");
 var a = a_1.A;
-var b;
 console.log(a, b);
 //// [e.js]
 "use strict";
@@ -112,8 +107,6 @@ console.log(c, d);
 //// [g.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var c;
-var d;
 console.log(c, d);
 //// [h.js]
 "use strict";
diff --git a/tests/baselines/reference/importsNotUsedAsValues_error.symbols b/tests/baselines/reference/importsNotUsedAsValues_error.symbols
index 6412034b53c5c..e1df2957bb909 100644
--- a/tests/baselines/reference/importsNotUsedAsValues_error.symbols
+++ b/tests/baselines/reference/importsNotUsedAsValues_error.symbols
@@ -18,32 +18,32 @@ import { A, B } from './a'; // Error
 >A : Symbol(A, Decl(b.ts, 0, 8))
 >B : Symbol(B, Decl(b.ts, 0, 11))
 
-let a: A;
->a : Symbol(a, Decl(b.ts, 1, 3))
+declare let a: A;
+>a : Symbol(a, Decl(b.ts, 1, 11))
 >A : Symbol(A, Decl(b.ts, 0, 8))
 
-let b: B;
->b : Symbol(b, Decl(b.ts, 2, 3))
+declare let b: B;
+>b : Symbol(b, Decl(b.ts, 2, 11))
 >B : Symbol(B, Decl(b.ts, 0, 11))
 
 console.log(a, b);
 >console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
 >console : Symbol(console, Decl(lib.dom.d.ts, --, --))
 >log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
->a : Symbol(a, Decl(b.ts, 1, 3))
->b : Symbol(b, Decl(b.ts, 2, 3))
+>a : Symbol(a, Decl(b.ts, 1, 11))
+>b : Symbol(b, Decl(b.ts, 2, 11))
 
 === /c.ts ===
 import Default, * as named from './a'; // Error
 >Default : Symbol(Default, Decl(c.ts, 0, 6))
 >named : Symbol(named, Decl(c.ts, 0, 15))
 
-let a: Default;
->a : Symbol(a, Decl(c.ts, 1, 3))
+declare let a: Default;
+>a : Symbol(a, Decl(c.ts, 1, 11))
 >Default : Symbol(Default, Decl(c.ts, 0, 6))
 
-let b: named.B;
->b : Symbol(b, Decl(c.ts, 2, 3))
+declare let b: named.B;
+>b : Symbol(b, Decl(c.ts, 2, 11))
 >named : Symbol(named, Decl(c.ts, 0, 15))
 >B : Symbol(named.B, Decl(a.ts, 1, 17))
 
@@ -51,8 +51,8 @@ console.log(a, b);
 >console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
 >console : Symbol(console, Decl(lib.dom.d.ts, --, --))
 >log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
->a : Symbol(a, Decl(c.ts, 1, 3))
->b : Symbol(b, Decl(c.ts, 2, 3))
+>a : Symbol(a, Decl(c.ts, 1, 11))
+>b : Symbol(b, Decl(c.ts, 2, 11))
 
 === /d.ts ===
 import Default, { A } from './a';
@@ -63,8 +63,8 @@ const a = A;
 >a : Symbol(a, Decl(d.ts, 1, 5))
 >A : Symbol(A, Decl(d.ts, 0, 17))
 
-let b: Default;
->b : Symbol(b, Decl(d.ts, 2, 3))
+declare let b: Default;
+>b : Symbol(b, Decl(d.ts, 2, 11))
 >Default : Symbol(Default, Decl(d.ts, 0, 6))
 
 console.log(a, b);
@@ -72,7 +72,7 @@ console.log(a, b);
 >console : Symbol(console, Decl(lib.dom.d.ts, --, --))
 >log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
 >a : Symbol(a, Decl(d.ts, 1, 5))
->b : Symbol(b, Decl(d.ts, 2, 3))
+>b : Symbol(b, Decl(d.ts, 2, 11))
 
 === /e.ts ===
 import { A, B } from './a'; // noUnusedLocals error only
@@ -118,12 +118,12 @@ console.log(c, d);
 import { C } from './a';
 >C : Symbol(C, Decl(g.ts, 0, 8))
 
-let c: C;
->c : Symbol(c, Decl(g.ts, 1, 3))
+declare let c: C;
+>c : Symbol(c, Decl(g.ts, 1, 11))
 >C : Symbol(C, Decl(g.ts, 0, 8))
 
-let d: C.Two;
->d : Symbol(d, Decl(g.ts, 2, 3))
+declare let d: C.Two;
+>d : Symbol(d, Decl(g.ts, 2, 11))
 >C : Symbol(C, Decl(g.ts, 0, 8))
 >Two : Symbol(C.Two, Decl(a.ts, 3, 26))
 
@@ -131,8 +131,8 @@ console.log(c, d);
 >console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
 >console : Symbol(console, Decl(lib.dom.d.ts, --, --))
 >log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
->c : Symbol(c, Decl(g.ts, 1, 3))
->d : Symbol(d, Decl(g.ts, 2, 3))
+>c : Symbol(c, Decl(g.ts, 1, 11))
+>d : Symbol(d, Decl(g.ts, 2, 11))
 
 === /h.ts ===
 class H {}
diff --git a/tests/baselines/reference/importsNotUsedAsValues_error.types b/tests/baselines/reference/importsNotUsedAsValues_error.types
index 3f439eeaf5389..e67a6fbe9ce0c 100644
--- a/tests/baselines/reference/importsNotUsedAsValues_error.types
+++ b/tests/baselines/reference/importsNotUsedAsValues_error.types
@@ -25,11 +25,11 @@ import { A, B } from './a'; // Error
 >B : any
 >  : ^^^
 
-let a: A;
+declare let a: A;
 >a : A
 >  : ^
 
-let b: B;
+declare let b: B;
 >b : B
 >  : ^
 
@@ -54,11 +54,11 @@ import Default, * as named from './a'; // Error
 >named : typeof named
 >      : ^^^^^^^^^^^^
 
-let a: Default;
+declare let a: Default;
 >a : Default
 >  : ^^^^^^^
 
-let b: named.B;
+declare let b: named.B;
 >b : named.B
 >  : ^^^^^^^
 >named : any
@@ -91,7 +91,7 @@ const a = A;
 >A : typeof A
 >  : ^^^^^^^^
 
-let b: Default;
+declare let b: Default;
 >b : Default
 >  : ^^^^^^^
 
@@ -176,11 +176,11 @@ import { C } from './a';
 >C : typeof C
 >  : ^^^^^^^^
 
-let c: C;
+declare let c: C;
 >c : C
 >  : ^
 
-let d: C.Two;
+declare let d: C.Two;
 >d : C.Two
 >  : ^^^^^
 >C : any
diff --git a/tests/baselines/reference/inOperator.errors.txt b/tests/baselines/reference/inOperator.errors.txt
index 8e63a035c2a93..4aece57e501c6 100644
--- a/tests/baselines/reference/inOperator.errors.txt
+++ b/tests/baselines/reference/inOperator.errors.txt
@@ -12,7 +12,7 @@ inOperator.ts(7,15): error TS2322: Type 'number' is not assignable to type 'obje
                   ~
 !!! error TS2322: Type 'number' is not assignable to type 'object'.
     
-    var c: any;
-    var y: number;
+    declare var c: any;
+    declare var y: number;
     if (y in c) { }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/inOperator.js b/tests/baselines/reference/inOperator.js
index 7be1a42256b1b..cf4448af24d68 100644
--- a/tests/baselines/reference/inOperator.js
+++ b/tests/baselines/reference/inOperator.js
@@ -9,8 +9,8 @@ if (3 in a) {}
 
 var b = '' in 0;
 
-var c: any;
-var y: number;
+declare var c: any;
+declare var y: number;
 if (y in c) { }
 
 
@@ -19,6 +19,4 @@ var a = [];
 for (var x in a) { }
 if (3 in a) { }
 var b = '' in 0;
-var c;
-var y;
 if (y in c) { }
diff --git a/tests/baselines/reference/inOperator.symbols b/tests/baselines/reference/inOperator.symbols
index 9f612eae68527..6e76c85aa9610 100644
--- a/tests/baselines/reference/inOperator.symbols
+++ b/tests/baselines/reference/inOperator.symbols
@@ -14,13 +14,13 @@ if (3 in a) {}
 var b = '' in 0;
 >b : Symbol(b, Decl(inOperator.ts, 6, 3))
 
-var c: any;
->c : Symbol(c, Decl(inOperator.ts, 8, 3))
+declare var c: any;
+>c : Symbol(c, Decl(inOperator.ts, 8, 11))
 
-var y: number;
->y : Symbol(y, Decl(inOperator.ts, 9, 3))
+declare var y: number;
+>y : Symbol(y, Decl(inOperator.ts, 9, 11))
 
 if (y in c) { }
->y : Symbol(y, Decl(inOperator.ts, 9, 3))
->c : Symbol(c, Decl(inOperator.ts, 8, 3))
+>y : Symbol(y, Decl(inOperator.ts, 9, 11))
+>c : Symbol(c, Decl(inOperator.ts, 8, 11))
 
diff --git a/tests/baselines/reference/inOperator.types b/tests/baselines/reference/inOperator.types
index cf562c9deceb7..62a69a6f37c43 100644
--- a/tests/baselines/reference/inOperator.types
+++ b/tests/baselines/reference/inOperator.types
@@ -31,11 +31,11 @@ var b = '' in 0;
 >0 : 0
 >  : ^
 
-var c: any;
+declare var c: any;
 >c : any
 >  : ^^^
 
-var y: number;
+declare var y: number;
 >y : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/inOperatorWithInvalidOperands.errors.txt b/tests/baselines/reference/inOperatorWithInvalidOperands.errors.txt
index f1eb8b112d526..2052ea3d3ee0c 100644
--- a/tests/baselines/reference/inOperatorWithInvalidOperands.errors.txt
+++ b/tests/baselines/reference/inOperatorWithInvalidOperands.errors.txt
@@ -31,12 +31,12 @@ inOperatorWithInvalidOperands.ts(47,17): error TS2322: Type 'string' is not assi
     
     // invalid left operands
     // the left operand is required to be of type Any, the String primitive type, or the Number primitive type
-    var a1: boolean;
-    var a2: void;
-    var a3: {};
-    var a4: E;
-    var a5: Foo | string;
-    var a6: Foo;
+    declare var a1: boolean;
+    declare var a2: void;
+    declare var a3: {};
+    declare var a4: E;
+    declare var a5: Foo | string;
+    declare var a6: Foo;
     
     var ra1 = a1 in x;
               ~~
@@ -71,11 +71,11 @@ inOperatorWithInvalidOperands.ts(47,17): error TS2322: Type 'string' is not assi
     
     // invalid right operands
     // the right operand is required to be of type Any, an object type, or a type parameter type
-    var b1: number;
-    var b2: boolean;
-    var b3: string;
-    var b4: void;
-    var b5: string | number;
+    declare var b1: number;
+    declare var b2: boolean;
+    declare var b3: string;
+    declare var b4: void;
+    declare var b5: string | number;
     
     var rb1 = x in b1;
                    ~~
diff --git a/tests/baselines/reference/inOperatorWithInvalidOperands.js b/tests/baselines/reference/inOperatorWithInvalidOperands.js
index 778883e786778..9d66c5b81bfe1 100644
--- a/tests/baselines/reference/inOperatorWithInvalidOperands.js
+++ b/tests/baselines/reference/inOperatorWithInvalidOperands.js
@@ -8,12 +8,12 @@ var x: any;
 
 // invalid left operands
 // the left operand is required to be of type Any, the String primitive type, or the Number primitive type
-var a1: boolean;
-var a2: void;
-var a3: {};
-var a4: E;
-var a5: Foo | string;
-var a6: Foo;
+declare var a1: boolean;
+declare var a2: void;
+declare var a3: {};
+declare var a4: E;
+declare var a5: Foo | string;
+declare var a6: Foo;
 
 var ra1 = a1 in x;
 var ra2 = a2 in x;
@@ -29,11 +29,11 @@ var ra11 = a6 in x;
 
 // invalid right operands
 // the right operand is required to be of type Any, an object type, or a type parameter type
-var b1: number;
-var b2: boolean;
-var b3: string;
-var b4: void;
-var b5: string | number;
+declare var b1: number;
+declare var b2: boolean;
+declare var b3: string;
+declare var b4: void;
+declare var b5: string | number;
 
 var rb1 = x in b1;
 var rb2 = x in b2;
@@ -60,14 +60,6 @@ var E;
     E[E["a"] = 0] = "a";
 })(E || (E = {}));
 var x;
-// invalid left operands
-// the left operand is required to be of type Any, the String primitive type, or the Number primitive type
-var a1;
-var a2;
-var a3;
-var a4;
-var a5;
-var a6;
 var ra1 = a1 in x;
 var ra2 = a2 in x;
 var ra3 = a3 in x;
@@ -79,13 +71,6 @@ var ra8 = false in x;
 var ra9 = {} in x;
 var ra10 = a5 in x;
 var ra11 = a6 in x;
-// invalid right operands
-// the right operand is required to be of type Any, an object type, or a type parameter type
-var b1;
-var b2;
-var b3;
-var b4;
-var b5;
 var rb1 = x in b1;
 var rb2 = x in b2;
 var rb3 = x in b3;
diff --git a/tests/baselines/reference/inOperatorWithInvalidOperands.symbols b/tests/baselines/reference/inOperatorWithInvalidOperands.symbols
index 4fe110b5864f2..a0d9806152fb0 100644
--- a/tests/baselines/reference/inOperatorWithInvalidOperands.symbols
+++ b/tests/baselines/reference/inOperatorWithInvalidOperands.symbols
@@ -13,45 +13,45 @@ var x: any;
 
 // invalid left operands
 // the left operand is required to be of type Any, the String primitive type, or the Number primitive type
-var a1: boolean;
->a1 : Symbol(a1, Decl(inOperatorWithInvalidOperands.ts, 7, 3))
+declare var a1: boolean;
+>a1 : Symbol(a1, Decl(inOperatorWithInvalidOperands.ts, 7, 11))
 
-var a2: void;
->a2 : Symbol(a2, Decl(inOperatorWithInvalidOperands.ts, 8, 3))
+declare var a2: void;
+>a2 : Symbol(a2, Decl(inOperatorWithInvalidOperands.ts, 8, 11))
 
-var a3: {};
->a3 : Symbol(a3, Decl(inOperatorWithInvalidOperands.ts, 9, 3))
+declare var a3: {};
+>a3 : Symbol(a3, Decl(inOperatorWithInvalidOperands.ts, 9, 11))
 
-var a4: E;
->a4 : Symbol(a4, Decl(inOperatorWithInvalidOperands.ts, 10, 3))
+declare var a4: E;
+>a4 : Symbol(a4, Decl(inOperatorWithInvalidOperands.ts, 10, 11))
 >E : Symbol(E, Decl(inOperatorWithInvalidOperands.ts, 0, 12))
 
-var a5: Foo | string;
->a5 : Symbol(a5, Decl(inOperatorWithInvalidOperands.ts, 11, 3))
+declare var a5: Foo | string;
+>a5 : Symbol(a5, Decl(inOperatorWithInvalidOperands.ts, 11, 11))
 >Foo : Symbol(Foo, Decl(inOperatorWithInvalidOperands.ts, 0, 0))
 
-var a6: Foo;
->a6 : Symbol(a6, Decl(inOperatorWithInvalidOperands.ts, 12, 3))
+declare var a6: Foo;
+>a6 : Symbol(a6, Decl(inOperatorWithInvalidOperands.ts, 12, 11))
 >Foo : Symbol(Foo, Decl(inOperatorWithInvalidOperands.ts, 0, 0))
 
 var ra1 = a1 in x;
 >ra1 : Symbol(ra1, Decl(inOperatorWithInvalidOperands.ts, 14, 3))
->a1 : Symbol(a1, Decl(inOperatorWithInvalidOperands.ts, 7, 3))
+>a1 : Symbol(a1, Decl(inOperatorWithInvalidOperands.ts, 7, 11))
 >x : Symbol(x, Decl(inOperatorWithInvalidOperands.ts, 3, 3))
 
 var ra2 = a2 in x;
 >ra2 : Symbol(ra2, Decl(inOperatorWithInvalidOperands.ts, 15, 3))
->a2 : Symbol(a2, Decl(inOperatorWithInvalidOperands.ts, 8, 3))
+>a2 : Symbol(a2, Decl(inOperatorWithInvalidOperands.ts, 8, 11))
 >x : Symbol(x, Decl(inOperatorWithInvalidOperands.ts, 3, 3))
 
 var ra3 = a3 in x;
 >ra3 : Symbol(ra3, Decl(inOperatorWithInvalidOperands.ts, 16, 3))
->a3 : Symbol(a3, Decl(inOperatorWithInvalidOperands.ts, 9, 3))
+>a3 : Symbol(a3, Decl(inOperatorWithInvalidOperands.ts, 9, 11))
 >x : Symbol(x, Decl(inOperatorWithInvalidOperands.ts, 3, 3))
 
 var ra4 = a4 in x;
 >ra4 : Symbol(ra4, Decl(inOperatorWithInvalidOperands.ts, 17, 3))
->a4 : Symbol(a4, Decl(inOperatorWithInvalidOperands.ts, 10, 3))
+>a4 : Symbol(a4, Decl(inOperatorWithInvalidOperands.ts, 10, 11))
 >x : Symbol(x, Decl(inOperatorWithInvalidOperands.ts, 3, 3))
 
 var ra5 = null in x;
@@ -80,55 +80,55 @@ var ra9 = {} in x;
 
 var ra10 = a5 in x;
 >ra10 : Symbol(ra10, Decl(inOperatorWithInvalidOperands.ts, 23, 3))
->a5 : Symbol(a5, Decl(inOperatorWithInvalidOperands.ts, 11, 3))
+>a5 : Symbol(a5, Decl(inOperatorWithInvalidOperands.ts, 11, 11))
 >x : Symbol(x, Decl(inOperatorWithInvalidOperands.ts, 3, 3))
 
 var ra11 = a6 in x;
 >ra11 : Symbol(ra11, Decl(inOperatorWithInvalidOperands.ts, 24, 3))
->a6 : Symbol(a6, Decl(inOperatorWithInvalidOperands.ts, 12, 3))
+>a6 : Symbol(a6, Decl(inOperatorWithInvalidOperands.ts, 12, 11))
 >x : Symbol(x, Decl(inOperatorWithInvalidOperands.ts, 3, 3))
 
 // invalid right operands
 // the right operand is required to be of type Any, an object type, or a type parameter type
-var b1: number;
->b1 : Symbol(b1, Decl(inOperatorWithInvalidOperands.ts, 28, 3))
+declare var b1: number;
+>b1 : Symbol(b1, Decl(inOperatorWithInvalidOperands.ts, 28, 11))
 
-var b2: boolean;
->b2 : Symbol(b2, Decl(inOperatorWithInvalidOperands.ts, 29, 3))
+declare var b2: boolean;
+>b2 : Symbol(b2, Decl(inOperatorWithInvalidOperands.ts, 29, 11))
 
-var b3: string;
->b3 : Symbol(b3, Decl(inOperatorWithInvalidOperands.ts, 30, 3))
+declare var b3: string;
+>b3 : Symbol(b3, Decl(inOperatorWithInvalidOperands.ts, 30, 11))
 
-var b4: void;
->b4 : Symbol(b4, Decl(inOperatorWithInvalidOperands.ts, 31, 3))
+declare var b4: void;
+>b4 : Symbol(b4, Decl(inOperatorWithInvalidOperands.ts, 31, 11))
 
-var b5: string | number;
->b5 : Symbol(b5, Decl(inOperatorWithInvalidOperands.ts, 32, 3))
+declare var b5: string | number;
+>b5 : Symbol(b5, Decl(inOperatorWithInvalidOperands.ts, 32, 11))
 
 var rb1 = x in b1;
 >rb1 : Symbol(rb1, Decl(inOperatorWithInvalidOperands.ts, 34, 3))
 >x : Symbol(x, Decl(inOperatorWithInvalidOperands.ts, 3, 3))
->b1 : Symbol(b1, Decl(inOperatorWithInvalidOperands.ts, 28, 3))
+>b1 : Symbol(b1, Decl(inOperatorWithInvalidOperands.ts, 28, 11))
 
 var rb2 = x in b2;
 >rb2 : Symbol(rb2, Decl(inOperatorWithInvalidOperands.ts, 35, 3))
 >x : Symbol(x, Decl(inOperatorWithInvalidOperands.ts, 3, 3))
->b2 : Symbol(b2, Decl(inOperatorWithInvalidOperands.ts, 29, 3))
+>b2 : Symbol(b2, Decl(inOperatorWithInvalidOperands.ts, 29, 11))
 
 var rb3 = x in b3;
 >rb3 : Symbol(rb3, Decl(inOperatorWithInvalidOperands.ts, 36, 3))
 >x : Symbol(x, Decl(inOperatorWithInvalidOperands.ts, 3, 3))
->b3 : Symbol(b3, Decl(inOperatorWithInvalidOperands.ts, 30, 3))
+>b3 : Symbol(b3, Decl(inOperatorWithInvalidOperands.ts, 30, 11))
 
 var rb4 = x in b4;
 >rb4 : Symbol(rb4, Decl(inOperatorWithInvalidOperands.ts, 37, 3))
 >x : Symbol(x, Decl(inOperatorWithInvalidOperands.ts, 3, 3))
->b4 : Symbol(b4, Decl(inOperatorWithInvalidOperands.ts, 31, 3))
+>b4 : Symbol(b4, Decl(inOperatorWithInvalidOperands.ts, 31, 11))
 
 var rb5 = x in b5;
 >rb5 : Symbol(rb5, Decl(inOperatorWithInvalidOperands.ts, 38, 3))
 >x : Symbol(x, Decl(inOperatorWithInvalidOperands.ts, 3, 3))
->b5 : Symbol(b5, Decl(inOperatorWithInvalidOperands.ts, 32, 3))
+>b5 : Symbol(b5, Decl(inOperatorWithInvalidOperands.ts, 32, 11))
 
 var rb6 = x in 0;
 >rb6 : Symbol(rb6, Decl(inOperatorWithInvalidOperands.ts, 39, 3))
diff --git a/tests/baselines/reference/inOperatorWithInvalidOperands.types b/tests/baselines/reference/inOperatorWithInvalidOperands.types
index d7d7bcad4c7c0..5d6c4256ecc01 100644
--- a/tests/baselines/reference/inOperatorWithInvalidOperands.types
+++ b/tests/baselines/reference/inOperatorWithInvalidOperands.types
@@ -17,27 +17,27 @@ var x: any;
 
 // invalid left operands
 // the left operand is required to be of type Any, the String primitive type, or the Number primitive type
-var a1: boolean;
+declare var a1: boolean;
 >a1 : boolean
 >   : ^^^^^^^
 
-var a2: void;
+declare var a2: void;
 >a2 : void
 >   : ^^^^
 
-var a3: {};
+declare var a3: {};
 >a3 : {}
 >   : ^^
 
-var a4: E;
+declare var a4: E;
 >a4 : E
 >   : ^
 
-var a5: Foo | string;
+declare var a5: Foo | string;
 >a5 : string | Foo
 >   : ^^^^^^^^^^^^
 
-var a6: Foo;
+declare var a6: Foo;
 >a6 : Foo
 >   : ^^^
 
@@ -155,23 +155,23 @@ var ra11 = a6 in x;
 
 // invalid right operands
 // the right operand is required to be of type Any, an object type, or a type parameter type
-var b1: number;
+declare var b1: number;
 >b1 : number
 >   : ^^^^^^
 
-var b2: boolean;
+declare var b2: boolean;
 >b2 : boolean
 >   : ^^^^^^^
 
-var b3: string;
+declare var b3: string;
 >b3 : string
 >   : ^^^^^^
 
-var b4: void;
+declare var b4: void;
 >b4 : void
 >   : ^^^^
 
-var b5: string | number;
+declare var b5: string | number;
 >b5 : string | number
 >   : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/inOperatorWithValidOperands.errors.txt b/tests/baselines/reference/inOperatorWithValidOperands.errors.txt
index 0fad942f62026..cb46b07e28bf2 100644
--- a/tests/baselines/reference/inOperatorWithValidOperands.errors.txt
+++ b/tests/baselines/reference/inOperatorWithValidOperands.errors.txt
@@ -10,10 +10,10 @@ inOperatorWithValidOperands.ts(34,20): error TS2322: Type 'object | T' is not as
     
     // valid left operands
     // the left operand is required to be of type Any, the String primitive type, or the Number primitive type
-    var a1: string;
-    var a2: number;
-    var a3: string | number | symbol;
-    var a4: any;
+    declare var a1: string;
+    declare var a2: number;
+    declare var a3: string | number | symbol;
+    declare var a4: any;
     
     var ra1 = x in x;
     var ra2 = a1 in x;
@@ -25,7 +25,7 @@ inOperatorWithValidOperands.ts(34,20): error TS2322: Type 'object | T' is not as
     
     // valid right operands
     // the right operand is required to be of type Any, an object type, or a type parameter type
-    var b1: {};
+    declare var b1: {};
     
     var rb1 = x in b1;
     var rb2 = x in {};
@@ -56,9 +56,9 @@ inOperatorWithValidOperands.ts(34,20): error TS2322: Type 'object | T' is not as
     interface X { x: number }
     interface Y { y: number }
     
-    var c1: X | Y;
-    var c2: X;
-    var c3: Y;
+    declare var c1: X | Y;
+    declare var c2: X;
+    declare var c3: Y;
     
     var rc1 = x in c1;
     var rc2 = x in (c2 || c3);
diff --git a/tests/baselines/reference/inOperatorWithValidOperands.js b/tests/baselines/reference/inOperatorWithValidOperands.js
index 4ac96557eb238..d47b0a7626643 100644
--- a/tests/baselines/reference/inOperatorWithValidOperands.js
+++ b/tests/baselines/reference/inOperatorWithValidOperands.js
@@ -5,10 +5,10 @@ var x: any;
 
 // valid left operands
 // the left operand is required to be of type Any, the String primitive type, or the Number primitive type
-var a1: string;
-var a2: number;
-var a3: string | number | symbol;
-var a4: any;
+declare var a1: string;
+declare var a2: number;
+declare var a3: string | number | symbol;
+declare var a4: any;
 
 var ra1 = x in x;
 var ra2 = a1 in x;
@@ -20,7 +20,7 @@ var ra7 = a4 in x;
 
 // valid right operands
 // the right operand is required to be of type Any, an object type, or a type parameter type
-var b1: {};
+declare var b1: {};
 
 var rb1 = x in b1;
 var rb2 = x in {};
@@ -40,9 +40,9 @@ function unionCase2<T>(t: T | object) {
 interface X { x: number }
 interface Y { y: number }
 
-var c1: X | Y;
-var c2: X;
-var c3: Y;
+declare var c1: X | Y;
+declare var c2: X;
+declare var c3: Y;
 
 var rc1 = x in c1;
 var rc2 = x in (c2 || c3);
@@ -50,12 +50,6 @@ var rc2 = x in (c2 || c3);
 
 //// [inOperatorWithValidOperands.js]
 var x;
-// valid left operands
-// the left operand is required to be of type Any, the String primitive type, or the Number primitive type
-var a1;
-var a2;
-var a3;
-var a4;
 var ra1 = x in x;
 var ra2 = a1 in x;
 var ra3 = a2 in x;
@@ -63,9 +57,6 @@ var ra4 = '' in x;
 var ra5 = 0 in x;
 var ra6 = a3 in x;
 var ra7 = a4 in x;
-// valid right operands
-// the right operand is required to be of type Any, an object type, or a type parameter type
-var b1;
 var rb1 = x in b1;
 var rb2 = x in {};
 function foo(t) {
@@ -77,8 +68,5 @@ function unionCase(t) {
 function unionCase2(t) {
     var rb5 = x in t;
 }
-var c1;
-var c2;
-var c3;
 var rc1 = x in c1;
 var rc2 = x in (c2 || c3);
diff --git a/tests/baselines/reference/inOperatorWithValidOperands.symbols b/tests/baselines/reference/inOperatorWithValidOperands.symbols
index 951e3da691d8b..f61b8aaf8c95f 100644
--- a/tests/baselines/reference/inOperatorWithValidOperands.symbols
+++ b/tests/baselines/reference/inOperatorWithValidOperands.symbols
@@ -6,17 +6,17 @@ var x: any;
 
 // valid left operands
 // the left operand is required to be of type Any, the String primitive type, or the Number primitive type
-var a1: string;
->a1 : Symbol(a1, Decl(inOperatorWithValidOperands.ts, 4, 3))
+declare var a1: string;
+>a1 : Symbol(a1, Decl(inOperatorWithValidOperands.ts, 4, 11))
 
-var a2: number;
->a2 : Symbol(a2, Decl(inOperatorWithValidOperands.ts, 5, 3))
+declare var a2: number;
+>a2 : Symbol(a2, Decl(inOperatorWithValidOperands.ts, 5, 11))
 
-var a3: string | number | symbol;
->a3 : Symbol(a3, Decl(inOperatorWithValidOperands.ts, 6, 3))
+declare var a3: string | number | symbol;
+>a3 : Symbol(a3, Decl(inOperatorWithValidOperands.ts, 6, 11))
 
-var a4: any;
->a4 : Symbol(a4, Decl(inOperatorWithValidOperands.ts, 7, 3))
+declare var a4: any;
+>a4 : Symbol(a4, Decl(inOperatorWithValidOperands.ts, 7, 11))
 
 var ra1 = x in x;
 >ra1 : Symbol(ra1, Decl(inOperatorWithValidOperands.ts, 9, 3))
@@ -25,12 +25,12 @@ var ra1 = x in x;
 
 var ra2 = a1 in x;
 >ra2 : Symbol(ra2, Decl(inOperatorWithValidOperands.ts, 10, 3))
->a1 : Symbol(a1, Decl(inOperatorWithValidOperands.ts, 4, 3))
+>a1 : Symbol(a1, Decl(inOperatorWithValidOperands.ts, 4, 11))
 >x : Symbol(x, Decl(inOperatorWithValidOperands.ts, 0, 3))
 
 var ra3 = a2 in x;
 >ra3 : Symbol(ra3, Decl(inOperatorWithValidOperands.ts, 11, 3))
->a2 : Symbol(a2, Decl(inOperatorWithValidOperands.ts, 5, 3))
+>a2 : Symbol(a2, Decl(inOperatorWithValidOperands.ts, 5, 11))
 >x : Symbol(x, Decl(inOperatorWithValidOperands.ts, 0, 3))
 
 var ra4 = '' in x;
@@ -43,23 +43,23 @@ var ra5 = 0 in x;
 
 var ra6 = a3 in x;
 >ra6 : Symbol(ra6, Decl(inOperatorWithValidOperands.ts, 14, 3))
->a3 : Symbol(a3, Decl(inOperatorWithValidOperands.ts, 6, 3))
+>a3 : Symbol(a3, Decl(inOperatorWithValidOperands.ts, 6, 11))
 >x : Symbol(x, Decl(inOperatorWithValidOperands.ts, 0, 3))
 
 var ra7 = a4 in x;
 >ra7 : Symbol(ra7, Decl(inOperatorWithValidOperands.ts, 15, 3))
->a4 : Symbol(a4, Decl(inOperatorWithValidOperands.ts, 7, 3))
+>a4 : Symbol(a4, Decl(inOperatorWithValidOperands.ts, 7, 11))
 >x : Symbol(x, Decl(inOperatorWithValidOperands.ts, 0, 3))
 
 // valid right operands
 // the right operand is required to be of type Any, an object type, or a type parameter type
-var b1: {};
->b1 : Symbol(b1, Decl(inOperatorWithValidOperands.ts, 19, 3))
+declare var b1: {};
+>b1 : Symbol(b1, Decl(inOperatorWithValidOperands.ts, 19, 11))
 
 var rb1 = x in b1;
 >rb1 : Symbol(rb1, Decl(inOperatorWithValidOperands.ts, 21, 3))
 >x : Symbol(x, Decl(inOperatorWithValidOperands.ts, 0, 3))
->b1 : Symbol(b1, Decl(inOperatorWithValidOperands.ts, 19, 3))
+>b1 : Symbol(b1, Decl(inOperatorWithValidOperands.ts, 19, 11))
 
 var rb2 = x in {};
 >rb2 : Symbol(rb2, Decl(inOperatorWithValidOperands.ts, 22, 3))
@@ -111,27 +111,27 @@ interface Y { y: number }
 >Y : Symbol(Y, Decl(inOperatorWithValidOperands.ts, 36, 25))
 >y : Symbol(Y.y, Decl(inOperatorWithValidOperands.ts, 37, 13))
 
-var c1: X | Y;
->c1 : Symbol(c1, Decl(inOperatorWithValidOperands.ts, 39, 3))
+declare var c1: X | Y;
+>c1 : Symbol(c1, Decl(inOperatorWithValidOperands.ts, 39, 11))
 >X : Symbol(X, Decl(inOperatorWithValidOperands.ts, 34, 1))
 >Y : Symbol(Y, Decl(inOperatorWithValidOperands.ts, 36, 25))
 
-var c2: X;
->c2 : Symbol(c2, Decl(inOperatorWithValidOperands.ts, 40, 3))
+declare var c2: X;
+>c2 : Symbol(c2, Decl(inOperatorWithValidOperands.ts, 40, 11))
 >X : Symbol(X, Decl(inOperatorWithValidOperands.ts, 34, 1))
 
-var c3: Y;
->c3 : Symbol(c3, Decl(inOperatorWithValidOperands.ts, 41, 3))
+declare var c3: Y;
+>c3 : Symbol(c3, Decl(inOperatorWithValidOperands.ts, 41, 11))
 >Y : Symbol(Y, Decl(inOperatorWithValidOperands.ts, 36, 25))
 
 var rc1 = x in c1;
 >rc1 : Symbol(rc1, Decl(inOperatorWithValidOperands.ts, 43, 3))
 >x : Symbol(x, Decl(inOperatorWithValidOperands.ts, 0, 3))
->c1 : Symbol(c1, Decl(inOperatorWithValidOperands.ts, 39, 3))
+>c1 : Symbol(c1, Decl(inOperatorWithValidOperands.ts, 39, 11))
 
 var rc2 = x in (c2 || c3);
 >rc2 : Symbol(rc2, Decl(inOperatorWithValidOperands.ts, 44, 3))
 >x : Symbol(x, Decl(inOperatorWithValidOperands.ts, 0, 3))
->c2 : Symbol(c2, Decl(inOperatorWithValidOperands.ts, 40, 3))
->c3 : Symbol(c3, Decl(inOperatorWithValidOperands.ts, 41, 3))
+>c2 : Symbol(c2, Decl(inOperatorWithValidOperands.ts, 40, 11))
+>c3 : Symbol(c3, Decl(inOperatorWithValidOperands.ts, 41, 11))
 
diff --git a/tests/baselines/reference/inOperatorWithValidOperands.types b/tests/baselines/reference/inOperatorWithValidOperands.types
index 2233fac204492..8852958e31b43 100644
--- a/tests/baselines/reference/inOperatorWithValidOperands.types
+++ b/tests/baselines/reference/inOperatorWithValidOperands.types
@@ -7,19 +7,19 @@ var x: any;
 
 // valid left operands
 // the left operand is required to be of type Any, the String primitive type, or the Number primitive type
-var a1: string;
+declare var a1: string;
 >a1 : string
 >   : ^^^^^^
 
-var a2: number;
+declare var a2: number;
 >a2 : number
 >   : ^^^^^^
 
-var a3: string | number | symbol;
+declare var a3: string | number | symbol;
 >a3 : string | number | symbol
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^
 
-var a4: any;
+declare var a4: any;
 >a4 : any
 >   : ^^^
 
@@ -95,7 +95,7 @@ var ra7 = a4 in x;
 
 // valid right operands
 // the right operand is required to be of type Any, an object type, or a type parameter type
-var b1: {};
+declare var b1: {};
 >b1 : {}
 >   : ^^
 
@@ -178,15 +178,15 @@ interface Y { y: number }
 >y : number
 >  : ^^^^^^
 
-var c1: X | Y;
+declare var c1: X | Y;
 >c1 : X | Y
 >   : ^^^^^
 
-var c2: X;
+declare var c2: X;
 >c2 : X
 >   : ^
 
-var c3: Y;
+declare var c3: Y;
 >c3 : Y
 >   : ^
 
diff --git a/tests/baselines/reference/incrementOnTypeParameter.errors.txt b/tests/baselines/reference/incrementOnTypeParameter.errors.txt
index 2b84370708989..4ddc32429ed00 100644
--- a/tests/baselines/reference/incrementOnTypeParameter.errors.txt
+++ b/tests/baselines/reference/incrementOnTypeParameter.errors.txt
@@ -1,16 +1,16 @@
 incrementOnTypeParameter.ts(4,9): error TS2356: An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type.
-incrementOnTypeParameter.ts(5,39): error TS2356: An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type.
+incrementOnTypeParameter.ts(5,48): error TS2356: An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type.
 
 
 ==== incrementOnTypeParameter.ts (2 errors) ====
     class C<T> {
-        a: T;
+        a!: T;
         foo() {
             this.a++; 
             ~~~~~~
 !!! error TS2356: An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type.
-            for (var i: T, j = 0; j < 10; i++) { 
-                                          ~
+            for (var i: T = this.a, j = 0; j < 10; i++) { 
+                                                   ~
 !!! error TS2356: An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type.
             }
         }
diff --git a/tests/baselines/reference/incrementOnTypeParameter.js b/tests/baselines/reference/incrementOnTypeParameter.js
index f8efeedb20801..d9786bca6fbfe 100644
--- a/tests/baselines/reference/incrementOnTypeParameter.js
+++ b/tests/baselines/reference/incrementOnTypeParameter.js
@@ -2,10 +2,10 @@
 
 //// [incrementOnTypeParameter.ts]
 class C<T> {
-    a: T;
+    a!: T;
     foo() {
         this.a++; 
-        for (var i: T, j = 0; j < 10; i++) { 
+        for (var i: T = this.a, j = 0; j < 10; i++) { 
         }
     }
 }
@@ -17,7 +17,7 @@ var C = /** @class */ (function () {
     }
     C.prototype.foo = function () {
         this.a++;
-        for (var i, j = 0; j < 10; i++) {
+        for (var i = this.a, j = 0; j < 10; i++) {
         }
     };
     return C;
diff --git a/tests/baselines/reference/incrementOnTypeParameter.symbols b/tests/baselines/reference/incrementOnTypeParameter.symbols
index 52d615de57876..d9fa69ba102bf 100644
--- a/tests/baselines/reference/incrementOnTypeParameter.symbols
+++ b/tests/baselines/reference/incrementOnTypeParameter.symbols
@@ -5,23 +5,26 @@ class C<T> {
 >C : Symbol(C, Decl(incrementOnTypeParameter.ts, 0, 0))
 >T : Symbol(T, Decl(incrementOnTypeParameter.ts, 0, 8))
 
-    a: T;
+    a!: T;
 >a : Symbol(C.a, Decl(incrementOnTypeParameter.ts, 0, 12))
 >T : Symbol(T, Decl(incrementOnTypeParameter.ts, 0, 8))
 
     foo() {
->foo : Symbol(C.foo, Decl(incrementOnTypeParameter.ts, 1, 9))
+>foo : Symbol(C.foo, Decl(incrementOnTypeParameter.ts, 1, 10))
 
         this.a++; 
 >this.a : Symbol(C.a, Decl(incrementOnTypeParameter.ts, 0, 12))
 >this : Symbol(C, Decl(incrementOnTypeParameter.ts, 0, 0))
 >a : Symbol(C.a, Decl(incrementOnTypeParameter.ts, 0, 12))
 
-        for (var i: T, j = 0; j < 10; i++) { 
+        for (var i: T = this.a, j = 0; j < 10; i++) { 
 >i : Symbol(i, Decl(incrementOnTypeParameter.ts, 4, 16))
 >T : Symbol(T, Decl(incrementOnTypeParameter.ts, 0, 8))
->j : Symbol(j, Decl(incrementOnTypeParameter.ts, 4, 22))
->j : Symbol(j, Decl(incrementOnTypeParameter.ts, 4, 22))
+>this.a : Symbol(C.a, Decl(incrementOnTypeParameter.ts, 0, 12))
+>this : Symbol(C, Decl(incrementOnTypeParameter.ts, 0, 0))
+>a : Symbol(C.a, Decl(incrementOnTypeParameter.ts, 0, 12))
+>j : Symbol(j, Decl(incrementOnTypeParameter.ts, 4, 31))
+>j : Symbol(j, Decl(incrementOnTypeParameter.ts, 4, 31))
 >i : Symbol(i, Decl(incrementOnTypeParameter.ts, 4, 16))
         }
     }
diff --git a/tests/baselines/reference/incrementOnTypeParameter.types b/tests/baselines/reference/incrementOnTypeParameter.types
index 82c3b21630c98..f1a5fd114ee1c 100644
--- a/tests/baselines/reference/incrementOnTypeParameter.types
+++ b/tests/baselines/reference/incrementOnTypeParameter.types
@@ -5,7 +5,7 @@ class C<T> {
 >C : C<T>
 >  : ^^^^
 
-    a: T;
+    a!: T;
 >a : T
 >  : ^
 
@@ -23,9 +23,15 @@ class C<T> {
 >a : T
 >  : ^
 
-        for (var i: T, j = 0; j < 10; i++) { 
+        for (var i: T = this.a, j = 0; j < 10; i++) { 
 >i : T
 >  : ^
+>this.a : T
+>       : ^
+>this : this
+>     : ^^^^
+>a : T
+>  : ^
 >j : number
 >  : ^^^^^^
 >0 : 0
diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt
index 8bd403848a43c..d3881d9e1965d 100644
--- a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt
+++ b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt
@@ -52,7 +52,7 @@ incrementOperatorWithAnyOtherTypeInvalidOperations.ts(69,12): error TS1109: Expr
     var ANY1: any;
     var ANY2: any[] = [1, 2];
     
-    var obj: () => {}
+    declare var obj: () => {}
     var obj1 = { x: "", y: () => { } };
     function foo(): any {
         var a;
diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js
index ce1fd88c81a92..2c1938e416e5c 100644
--- a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js
+++ b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js
@@ -5,7 +5,7 @@
 var ANY1: any;
 var ANY2: any[] = [1, 2];
 
-var obj: () => {}
+declare var obj: () => {}
 var obj1 = { x: "", y: () => { } };
 function foo(): any {
     var a;
@@ -75,7 +75,6 @@ ANY2++;
 // ++ operator on any type
 var ANY1;
 var ANY2 = [1, 2];
-var obj;
 var obj1 = { x: "", y: function () { } };
 function foo() {
     var a;
diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.symbols b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.symbols
index 1b82da655a090..e8b328682fbad 100644
--- a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.symbols
+++ b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.symbols
@@ -8,8 +8,8 @@ var ANY1: any;
 var ANY2: any[] = [1, 2];
 >ANY2 : Symbol(ANY2, Decl(incrementOperatorWithAnyOtherTypeInvalidOperations.ts, 2, 3))
 
-var obj: () => {}
->obj : Symbol(obj, Decl(incrementOperatorWithAnyOtherTypeInvalidOperations.ts, 4, 3))
+declare var obj: () => {}
+>obj : Symbol(obj, Decl(incrementOperatorWithAnyOtherTypeInvalidOperations.ts, 4, 11))
 
 var obj1 = { x: "", y: () => { } };
 >obj1 : Symbol(obj1, Decl(incrementOperatorWithAnyOtherTypeInvalidOperations.ts, 5, 3))
@@ -66,7 +66,7 @@ var ResultIsNumber3 = ++M;
 
 var ResultIsNumber4 = ++obj;
 >ResultIsNumber4 : Symbol(ResultIsNumber4, Decl(incrementOperatorWithAnyOtherTypeInvalidOperations.ts, 26, 3))
->obj : Symbol(obj, Decl(incrementOperatorWithAnyOtherTypeInvalidOperations.ts, 4, 3))
+>obj : Symbol(obj, Decl(incrementOperatorWithAnyOtherTypeInvalidOperations.ts, 4, 11))
 
 var ResultIsNumber5 = ++obj1;
 >ResultIsNumber5 : Symbol(ResultIsNumber5, Decl(incrementOperatorWithAnyOtherTypeInvalidOperations.ts, 27, 3))
@@ -86,7 +86,7 @@ var ResultIsNumber8 = M++;
 
 var ResultIsNumber9 = obj++;
 >ResultIsNumber9 : Symbol(ResultIsNumber9, Decl(incrementOperatorWithAnyOtherTypeInvalidOperations.ts, 32, 3))
->obj : Symbol(obj, Decl(incrementOperatorWithAnyOtherTypeInvalidOperations.ts, 4, 3))
+>obj : Symbol(obj, Decl(incrementOperatorWithAnyOtherTypeInvalidOperations.ts, 4, 11))
 
 var ResultIsNumber10 = obj1++;
 >ResultIsNumber10 : Symbol(ResultIsNumber10, Decl(incrementOperatorWithAnyOtherTypeInvalidOperations.ts, 33, 3))
diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.types b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.types
index fa4e72b53982d..1a2596905f188 100644
--- a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.types
+++ b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.types
@@ -16,7 +16,7 @@ var ANY2: any[] = [1, 2];
 >2 : 2
 >  : ^
 
-var obj: () => {}
+declare var obj: () => {}
 >obj : () => {}
 >    : ^^^^^^  
 
diff --git a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.errors.txt b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.errors.txt
index 589c5ef11b2ea..ccff4d7fc465a 100644
--- a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.errors.txt
+++ b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.errors.txt
@@ -22,13 +22,13 @@ incrementOperatorWithNumberTypeInvalidOperations.ts(46,1): error TS2357: The ope
 
 ==== incrementOperatorWithNumberTypeInvalidOperations.ts (20 errors) ====
     // ++ operator on number type
-    var NUMBER: number;
+    declare var NUMBER: number;
     var NUMBER1: number[] = [1, 2];
     
     function foo(): number { return 1; }
     
     class A {
-        public a: number;
+        public a!: number;
         static foo() { return 1; }
     }
     namespace M {
diff --git a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js
index e9f69783d5c76..cf2ed13880b52 100644
--- a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js
+++ b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js
@@ -2,13 +2,13 @@
 
 //// [incrementOperatorWithNumberTypeInvalidOperations.ts]
 // ++ operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
 
 function foo(): number { return 1; }
 
 class A {
-    public a: number;
+    public a!: number;
     static foo() { return 1; }
 }
 namespace M {
@@ -49,8 +49,6 @@ NUMBER1++;
 foo()++;
 
 //// [incrementOperatorWithNumberTypeInvalidOperations.js]
-// ++ operator on number type
-var NUMBER;
 var NUMBER1 = [1, 2];
 function foo() { return 1; }
 var A = /** @class */ (function () {
diff --git a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.symbols b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.symbols
index 267b32bfccdf0..fe7c2e37ab679 100644
--- a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.symbols
+++ b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.symbols
@@ -2,8 +2,8 @@
 
 === incrementOperatorWithNumberTypeInvalidOperations.ts ===
 // ++ operator on number type
-var NUMBER: number;
->NUMBER : Symbol(NUMBER, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 1, 3))
+declare var NUMBER: number;
+>NUMBER : Symbol(NUMBER, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 1, 11))
 
 var NUMBER1: number[] = [1, 2];
 >NUMBER1 : Symbol(NUMBER1, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 2, 3))
@@ -14,11 +14,11 @@ function foo(): number { return 1; }
 class A {
 >A : Symbol(A, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 4, 36))
 
-    public a: number;
+    public a!: number;
 >a : Symbol(A.a, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 6, 9))
 
     static foo() { return 1; }
->foo : Symbol(A.foo, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 7, 22))
 }
 namespace M {
 >M : Symbol(M, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 9, 1))
@@ -78,14 +78,14 @@ var ResultIsNumber9 = ++foo();
 
 var ResultIsNumber10 = ++A.foo();
 >ResultIsNumber10 : Symbol(ResultIsNumber10, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 31, 3))
->A.foo : Symbol(A.foo, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 7, 21))
+>A.foo : Symbol(A.foo, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 7, 22))
 >A : Symbol(A, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 4, 36))
->foo : Symbol(A.foo, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 7, 22))
 
 var ResultIsNumber11 = ++(NUMBER + NUMBER);
 >ResultIsNumber11 : Symbol(ResultIsNumber11, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 32, 3))
->NUMBER : Symbol(NUMBER, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 1, 3))
->NUMBER : Symbol(NUMBER, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 1, 11))
+>NUMBER : Symbol(NUMBER, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 1, 11))
 
 var ResultIsNumber12 = foo()++;
 >ResultIsNumber12 : Symbol(ResultIsNumber12, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 34, 3))
@@ -93,14 +93,14 @@ var ResultIsNumber12 = foo()++;
 
 var ResultIsNumber13 = A.foo()++;
 >ResultIsNumber13 : Symbol(ResultIsNumber13, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 35, 3))
->A.foo : Symbol(A.foo, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 7, 21))
+>A.foo : Symbol(A.foo, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 7, 22))
 >A : Symbol(A, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 4, 36))
->foo : Symbol(A.foo, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 7, 22))
 
 var ResultIsNumber14 = (NUMBER + NUMBER)++;
 >ResultIsNumber14 : Symbol(ResultIsNumber14, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 36, 3))
->NUMBER : Symbol(NUMBER, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 1, 3))
->NUMBER : Symbol(NUMBER, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 1, 11))
+>NUMBER : Symbol(NUMBER, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 1, 11))
 
 // miss assignment operator
 ++1;
diff --git a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.types b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.types
index 11d273f909122..56e556ef1a7a5 100644
--- a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.types
+++ b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.types
@@ -2,7 +2,7 @@
 
 === incrementOperatorWithNumberTypeInvalidOperations.ts ===
 // ++ operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 >NUMBER : number
 >       : ^^^^^^
 
@@ -26,7 +26,7 @@ class A {
 >A : A
 >  : ^
 
-    public a: number;
+    public a!: number;
 >a : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.errors.txt b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.errors.txt
index 9d8b72b35da29..0753c38121b6a 100644
--- a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.errors.txt
+++ b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.errors.txt
@@ -31,12 +31,12 @@ incrementOperatorWithUnsupportedBooleanType.ts(54,11): error TS2356: An arithmet
 
 ==== incrementOperatorWithUnsupportedBooleanType.ts (29 errors) ====
     // ++ operator on boolean type
-    var BOOLEAN: boolean;
+    declare var BOOLEAN: boolean;
     
     function foo(): boolean { return true; }
     
     class A {
-        public a: boolean;
+        public a!: boolean;
         static foo() { return true; }
     }
     namespace M {
diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js
index 2b9df4f9d0906..10241566d2d35 100644
--- a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js
+++ b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js
@@ -2,12 +2,12 @@
 
 //// [incrementOperatorWithUnsupportedBooleanType.ts]
 // ++ operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 
 function foo(): boolean { return true; }
 
 class A {
-    public a: boolean;
+    public a!: boolean;
     static foo() { return true; }
 }
 namespace M {
@@ -57,8 +57,6 @@ M.n++;
 objA.a++, M.n++;
 
 //// [incrementOperatorWithUnsupportedBooleanType.js]
-// ++ operator on boolean type
-var BOOLEAN;
 function foo() { return true; }
 var A = /** @class */ (function () {
     function A() {
diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.symbols b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.symbols
index dc5fd80c7f433..3ecda8222022b 100644
--- a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.symbols
+++ b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.symbols
@@ -2,20 +2,20 @@
 
 === incrementOperatorWithUnsupportedBooleanType.ts ===
 // ++ operator on boolean type
-var BOOLEAN: boolean;
->BOOLEAN : Symbol(BOOLEAN, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 3))
+declare var BOOLEAN: boolean;
+>BOOLEAN : Symbol(BOOLEAN, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 11))
 
 function foo(): boolean { return true; }
->foo : Symbol(foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 29))
 
 class A {
 >A : Symbol(A, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 3, 40))
 
-    public a: boolean;
+    public a!: boolean;
 >a : Symbol(A.a, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 5, 9))
 
     static foo() { return true; }
->foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 6, 22))
+>foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 6, 23))
 }
 namespace M {
 >M : Symbol(M, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 8, 1))
@@ -31,11 +31,11 @@ var objA = new A();
 // boolean type var
 var ResultIsNumber1 = ++BOOLEAN;
 >ResultIsNumber1 : Symbol(ResultIsNumber1, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 16, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 11))
 
 var ResultIsNumber2 = BOOLEAN++;
 >ResultIsNumber2 : Symbol(ResultIsNumber2, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 18, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 11))
 
 // boolean type literal
 var ResultIsNumber3 = ++true;
@@ -83,23 +83,23 @@ var ResultIsNumber10 = ++M.n;
 
 var ResultIsNumber11 = ++foo();
 >ResultIsNumber11 : Symbol(ResultIsNumber11, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 32, 3))
->foo : Symbol(foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 29))
 
 var ResultIsNumber12 = ++A.foo();
 >ResultIsNumber12 : Symbol(ResultIsNumber12, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 33, 3))
->A.foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 6, 22))
+>A.foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 6, 23))
 >A : Symbol(A, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 3, 40))
->foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 6, 22))
+>foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 6, 23))
 
 var ResultIsNumber13 = foo()++;
 >ResultIsNumber13 : Symbol(ResultIsNumber13, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 35, 3))
->foo : Symbol(foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 29))
 
 var ResultIsNumber14 = A.foo()++;
 >ResultIsNumber14 : Symbol(ResultIsNumber14, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 36, 3))
->A.foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 6, 22))
+>A.foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 6, 23))
 >A : Symbol(A, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 3, 40))
->foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 6, 22))
+>foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 6, 23))
 
 var ResultIsNumber15 = objA.a++;
 >ResultIsNumber15 : Symbol(ResultIsNumber15, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 37, 3))
@@ -116,10 +116,10 @@ var ResultIsNumber16 = M.n++;
 // miss assignment operators
 ++true;
 ++BOOLEAN;
->BOOLEAN : Symbol(BOOLEAN, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 11))
 
 ++foo();
->foo : Symbol(foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 29))
 
 ++objA.a;
 >objA.a : Symbol(A.a, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 5, 9))
@@ -141,10 +141,10 @@ var ResultIsNumber16 = M.n++;
 
 true++;
 BOOLEAN++;
->BOOLEAN : Symbol(BOOLEAN, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 11))
 
 foo()++;
->foo : Symbol(foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 1, 29))
 
 objA.a++;
 >objA.a : Symbol(A.a, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 5, 9))
diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.types b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.types
index 791de200216f3..118af1a8705dc 100644
--- a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.types
+++ b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.types
@@ -2,7 +2,7 @@
 
 === incrementOperatorWithUnsupportedBooleanType.ts ===
 // ++ operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 >BOOLEAN : boolean
 >        : ^^^^^^^
 
@@ -16,7 +16,7 @@ class A {
 >A : A
 >  : ^
 
-    public a: boolean;
+    public a!: boolean;
 >a : boolean
 >  : ^^^^^^^
 
diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.errors.txt b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.errors.txt
index 5e4aae9d0932d..0cc9b73866316 100644
--- a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.errors.txt
+++ b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.errors.txt
@@ -41,13 +41,13 @@ incrementOperatorWithUnsupportedStringType.ts(65,11): error TS2356: An arithmeti
 
 ==== incrementOperatorWithUnsupportedStringType.ts (39 errors) ====
     // ++ operator on string type
-    var STRING: string;
+    declare var STRING: string;
     var STRING1: string[] = ["", ""];
     
     function foo(): string { return ""; }
     
     class A {
-        public a: string;
+        public a!: string;
         static foo() { return ""; }
     }
     namespace M {
diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js
index 97750fb3cf86d..67a1e52b19866 100644
--- a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js
+++ b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js
@@ -2,13 +2,13 @@
 
 //// [incrementOperatorWithUnsupportedStringType.ts]
 // ++ operator on string type
-var STRING: string;
+declare var STRING: string;
 var STRING1: string[] = ["", ""];
 
 function foo(): string { return ""; }
 
 class A {
-    public a: string;
+    public a!: string;
     static foo() { return ""; }
 }
 namespace M {
@@ -68,8 +68,6 @@ M.n++;
 objA.a++, M.n++;
 
 //// [incrementOperatorWithUnsupportedStringType.js]
-// ++ operator on string type
-var STRING;
 var STRING1 = ["", ""];
 function foo() { return ""; }
 var A = /** @class */ (function () {
diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.symbols b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.symbols
index 82fd057ea1c80..5937bd55220bb 100644
--- a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.symbols
+++ b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.symbols
@@ -2,8 +2,8 @@
 
 === incrementOperatorWithUnsupportedStringType.ts ===
 // ++ operator on string type
-var STRING: string;
->STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 3))
+declare var STRING: string;
+>STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 11))
 
 var STRING1: string[] = ["", ""];
 >STRING1 : Symbol(STRING1, Decl(incrementOperatorWithUnsupportedStringType.ts, 2, 3))
@@ -14,11 +14,11 @@ function foo(): string { return ""; }
 class A {
 >A : Symbol(A, Decl(incrementOperatorWithUnsupportedStringType.ts, 4, 37))
 
-    public a: string;
+    public a!: string;
 >a : Symbol(A.a, Decl(incrementOperatorWithUnsupportedStringType.ts, 6, 9))
 
     static foo() { return ""; }
->foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedStringType.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedStringType.ts, 7, 22))
 }
 namespace M {
 >M : Symbol(M, Decl(incrementOperatorWithUnsupportedStringType.ts, 9, 1))
@@ -34,7 +34,7 @@ var objA = new A();
 // string type var
 var ResultIsNumber1 = ++STRING;
 >ResultIsNumber1 : Symbol(ResultIsNumber1, Decl(incrementOperatorWithUnsupportedStringType.ts, 17, 3))
->STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 11))
 
 var ResultIsNumber2 = ++STRING1;
 >ResultIsNumber2 : Symbol(ResultIsNumber2, Decl(incrementOperatorWithUnsupportedStringType.ts, 18, 3))
@@ -42,7 +42,7 @@ var ResultIsNumber2 = ++STRING1;
 
 var ResultIsNumber3 = STRING++;
 >ResultIsNumber3 : Symbol(ResultIsNumber3, Decl(incrementOperatorWithUnsupportedStringType.ts, 20, 3))
->STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 11))
 
 var ResultIsNumber4 = STRING1++;
 >ResultIsNumber4 : Symbol(ResultIsNumber4, Decl(incrementOperatorWithUnsupportedStringType.ts, 21, 3))
@@ -102,14 +102,14 @@ var ResultIsNumber14 = ++foo();
 
 var ResultIsNumber15 = ++A.foo();
 >ResultIsNumber15 : Symbol(ResultIsNumber15, Decl(incrementOperatorWithUnsupportedStringType.ts, 37, 3))
->A.foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedStringType.ts, 7, 21))
+>A.foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedStringType.ts, 7, 22))
 >A : Symbol(A, Decl(incrementOperatorWithUnsupportedStringType.ts, 4, 37))
->foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedStringType.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedStringType.ts, 7, 22))
 
 var ResultIsNumber16 = ++(STRING + STRING);
 >ResultIsNumber16 : Symbol(ResultIsNumber16, Decl(incrementOperatorWithUnsupportedStringType.ts, 38, 3))
->STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 3))
->STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 11))
+>STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 11))
 
 var ResultIsNumber17 = objA.a++;
 >ResultIsNumber17 : Symbol(ResultIsNumber17, Decl(incrementOperatorWithUnsupportedStringType.ts, 40, 3))
@@ -133,19 +133,19 @@ var ResultIsNumber20 = foo()++;
 
 var ResultIsNumber21 = A.foo()++;
 >ResultIsNumber21 : Symbol(ResultIsNumber21, Decl(incrementOperatorWithUnsupportedStringType.ts, 44, 3))
->A.foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedStringType.ts, 7, 21))
+>A.foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedStringType.ts, 7, 22))
 >A : Symbol(A, Decl(incrementOperatorWithUnsupportedStringType.ts, 4, 37))
->foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedStringType.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedStringType.ts, 7, 22))
 
 var ResultIsNumber22 = (STRING + STRING)++;
 >ResultIsNumber22 : Symbol(ResultIsNumber22, Decl(incrementOperatorWithUnsupportedStringType.ts, 45, 3))
->STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 3))
->STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 11))
+>STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 11))
 
 // miss assignment operators
 ++"";
 ++STRING;
->STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 11))
 
 ++STRING1;
 >STRING1 : Symbol(STRING1, Decl(incrementOperatorWithUnsupportedStringType.ts, 2, 3))
@@ -176,7 +176,7 @@ var ResultIsNumber22 = (STRING + STRING)++;
 
 ""++;
 STRING++;
->STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(incrementOperatorWithUnsupportedStringType.ts, 1, 11))
 
 STRING1++;
 >STRING1 : Symbol(STRING1, Decl(incrementOperatorWithUnsupportedStringType.ts, 2, 3))
diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.types b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.types
index 6a148ce475c96..b048b174b4fa4 100644
--- a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.types
+++ b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.types
@@ -2,7 +2,7 @@
 
 === incrementOperatorWithUnsupportedStringType.ts ===
 // ++ operator on string type
-var STRING: string;
+declare var STRING: string;
 >STRING : string
 >       : ^^^^^^
 
@@ -26,7 +26,7 @@ class A {
 >A : A
 >  : ^
 
-    public a: string;
+    public a!: string;
 >a : string
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/incrementalOut.errors.txt b/tests/baselines/reference/incrementalOut.errors.txt
new file mode 100644
index 0000000000000..109917fd1f74c
--- /dev/null
+++ b/tests/baselines/reference/incrementalOut.errors.txt
@@ -0,0 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== incrementalOut.ts (0 errors) ====
+    const x = 10;
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/indexIntoArraySubclass.errors.txt b/tests/baselines/reference/indexIntoArraySubclass.errors.txt
index 2774ff2c29f70..d17f36812f631 100644
--- a/tests/baselines/reference/indexIntoArraySubclass.errors.txt
+++ b/tests/baselines/reference/indexIntoArraySubclass.errors.txt
@@ -3,7 +3,7 @@ indexIntoArraySubclass.ts(4,1): error TS2322: Type 'number' is not assignable to
 
 ==== indexIntoArraySubclass.ts (1 errors) ====
     interface Foo2<T> extends Array<T> { }
-    var x2: Foo2<string>;
+    declare var x2: Foo2<string>;
     var r = x2[0]; // string
     r = 0; //error
     ~
diff --git a/tests/baselines/reference/indexIntoArraySubclass.js b/tests/baselines/reference/indexIntoArraySubclass.js
index 6388d9f39b10e..7c793cedd290e 100644
--- a/tests/baselines/reference/indexIntoArraySubclass.js
+++ b/tests/baselines/reference/indexIntoArraySubclass.js
@@ -2,11 +2,10 @@
 
 //// [indexIntoArraySubclass.ts]
 interface Foo2<T> extends Array<T> { }
-var x2: Foo2<string>;
+declare var x2: Foo2<string>;
 var r = x2[0]; // string
 r = 0; //error
 
 //// [indexIntoArraySubclass.js]
-var x2;
 var r = x2[0]; // string
 r = 0; //error
diff --git a/tests/baselines/reference/indexIntoArraySubclass.symbols b/tests/baselines/reference/indexIntoArraySubclass.symbols
index a393e77866b25..e5534a70ddbd1 100644
--- a/tests/baselines/reference/indexIntoArraySubclass.symbols
+++ b/tests/baselines/reference/indexIntoArraySubclass.symbols
@@ -7,13 +7,13 @@ interface Foo2<T> extends Array<T> { }
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >T : Symbol(T, Decl(indexIntoArraySubclass.ts, 0, 15))
 
-var x2: Foo2<string>;
->x2 : Symbol(x2, Decl(indexIntoArraySubclass.ts, 1, 3))
+declare var x2: Foo2<string>;
+>x2 : Symbol(x2, Decl(indexIntoArraySubclass.ts, 1, 11))
 >Foo2 : Symbol(Foo2, Decl(indexIntoArraySubclass.ts, 0, 0))
 
 var r = x2[0]; // string
 >r : Symbol(r, Decl(indexIntoArraySubclass.ts, 2, 3))
->x2 : Symbol(x2, Decl(indexIntoArraySubclass.ts, 1, 3))
+>x2 : Symbol(x2, Decl(indexIntoArraySubclass.ts, 1, 11))
 
 r = 0; //error
 >r : Symbol(r, Decl(indexIntoArraySubclass.ts, 2, 3))
diff --git a/tests/baselines/reference/indexIntoArraySubclass.types b/tests/baselines/reference/indexIntoArraySubclass.types
index f3c44ec0df75a..cb61a3bc8b843 100644
--- a/tests/baselines/reference/indexIntoArraySubclass.types
+++ b/tests/baselines/reference/indexIntoArraySubclass.types
@@ -2,7 +2,7 @@
 
 === indexIntoArraySubclass.ts ===
 interface Foo2<T> extends Array<T> { }
-var x2: Foo2<string>;
+declare var x2: Foo2<string>;
 >x2 : Foo2<string>
 >   : ^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/indexSignatureTypeInference.errors.txt b/tests/baselines/reference/indexSignatureTypeInference.errors.txt
index a7b03c735838e..edd2da448d6cd 100644
--- a/tests/baselines/reference/indexSignatureTypeInference.errors.txt
+++ b/tests/baselines/reference/indexSignatureTypeInference.errors.txt
@@ -15,8 +15,8 @@ indexSignatureTypeInference.ts(18,27): error TS2345: Argument of type 'NumberMap
     declare function numberMapToArray<T>(object: NumberMap<T>): T[];
     declare function stringMapToArray<T>(object: StringMap<T>): T[];
     
-    var numberMap: NumberMap<Function>;
-    var stringMap: StringMap<Function>;
+    declare var numberMap: NumberMap<Function>;
+    declare var stringMap: StringMap<Function>;
     
     var v1: Function[];
     var v1 = numberMapToArray(numberMap);  // Ok
diff --git a/tests/baselines/reference/indexSignatureTypeInference.js b/tests/baselines/reference/indexSignatureTypeInference.js
index 0dfd4c77f3554..bd9d92dd437ee 100644
--- a/tests/baselines/reference/indexSignatureTypeInference.js
+++ b/tests/baselines/reference/indexSignatureTypeInference.js
@@ -12,8 +12,8 @@ interface StringMap<T> {
 declare function numberMapToArray<T>(object: NumberMap<T>): T[];
 declare function stringMapToArray<T>(object: StringMap<T>): T[];
 
-var numberMap: NumberMap<Function>;
-var stringMap: StringMap<Function>;
+declare var numberMap: NumberMap<Function>;
+declare var stringMap: StringMap<Function>;
 
 var v1: Function[];
 var v1 = numberMapToArray(numberMap);  // Ok
@@ -23,8 +23,6 @@ var v1 = stringMapToArray(stringMap);  // Ok
 
 
 //// [indexSignatureTypeInference.js]
-var numberMap;
-var stringMap;
 var v1;
 var v1 = numberMapToArray(numberMap); // Ok
 var v1 = numberMapToArray(stringMap); // Ok
diff --git a/tests/baselines/reference/indexSignatureTypeInference.symbols b/tests/baselines/reference/indexSignatureTypeInference.symbols
index e992b9c1e1c97..034c4ab9a1cc0 100644
--- a/tests/baselines/reference/indexSignatureTypeInference.symbols
+++ b/tests/baselines/reference/indexSignatureTypeInference.symbols
@@ -35,13 +35,13 @@ declare function stringMapToArray<T>(object: StringMap<T>): T[];
 >T : Symbol(T, Decl(indexSignatureTypeInference.ts, 9, 34))
 >T : Symbol(T, Decl(indexSignatureTypeInference.ts, 9, 34))
 
-var numberMap: NumberMap<Function>;
->numberMap : Symbol(numberMap, Decl(indexSignatureTypeInference.ts, 11, 3))
+declare var numberMap: NumberMap<Function>;
+>numberMap : Symbol(numberMap, Decl(indexSignatureTypeInference.ts, 11, 11))
 >NumberMap : Symbol(NumberMap, Decl(indexSignatureTypeInference.ts, 0, 0))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
-var stringMap: StringMap<Function>;
->stringMap : Symbol(stringMap, Decl(indexSignatureTypeInference.ts, 12, 3))
+declare var stringMap: StringMap<Function>;
+>stringMap : Symbol(stringMap, Decl(indexSignatureTypeInference.ts, 12, 11))
 >StringMap : Symbol(StringMap, Decl(indexSignatureTypeInference.ts, 2, 1))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
@@ -52,20 +52,20 @@ var v1: Function[];
 var v1 = numberMapToArray(numberMap);  // Ok
 >v1 : Symbol(v1, Decl(indexSignatureTypeInference.ts, 14, 3), Decl(indexSignatureTypeInference.ts, 15, 3), Decl(indexSignatureTypeInference.ts, 16, 3), Decl(indexSignatureTypeInference.ts, 17, 3), Decl(indexSignatureTypeInference.ts, 18, 3))
 >numberMapToArray : Symbol(numberMapToArray, Decl(indexSignatureTypeInference.ts, 6, 1))
->numberMap : Symbol(numberMap, Decl(indexSignatureTypeInference.ts, 11, 3))
+>numberMap : Symbol(numberMap, Decl(indexSignatureTypeInference.ts, 11, 11))
 
 var v1 = numberMapToArray(stringMap);  // Ok
 >v1 : Symbol(v1, Decl(indexSignatureTypeInference.ts, 14, 3), Decl(indexSignatureTypeInference.ts, 15, 3), Decl(indexSignatureTypeInference.ts, 16, 3), Decl(indexSignatureTypeInference.ts, 17, 3), Decl(indexSignatureTypeInference.ts, 18, 3))
 >numberMapToArray : Symbol(numberMapToArray, Decl(indexSignatureTypeInference.ts, 6, 1))
->stringMap : Symbol(stringMap, Decl(indexSignatureTypeInference.ts, 12, 3))
+>stringMap : Symbol(stringMap, Decl(indexSignatureTypeInference.ts, 12, 11))
 
 var v1 = stringMapToArray(numberMap);  // Error expected here
 >v1 : Symbol(v1, Decl(indexSignatureTypeInference.ts, 14, 3), Decl(indexSignatureTypeInference.ts, 15, 3), Decl(indexSignatureTypeInference.ts, 16, 3), Decl(indexSignatureTypeInference.ts, 17, 3), Decl(indexSignatureTypeInference.ts, 18, 3))
 >stringMapToArray : Symbol(stringMapToArray, Decl(indexSignatureTypeInference.ts, 8, 64))
->numberMap : Symbol(numberMap, Decl(indexSignatureTypeInference.ts, 11, 3))
+>numberMap : Symbol(numberMap, Decl(indexSignatureTypeInference.ts, 11, 11))
 
 var v1 = stringMapToArray(stringMap);  // Ok
 >v1 : Symbol(v1, Decl(indexSignatureTypeInference.ts, 14, 3), Decl(indexSignatureTypeInference.ts, 15, 3), Decl(indexSignatureTypeInference.ts, 16, 3), Decl(indexSignatureTypeInference.ts, 17, 3), Decl(indexSignatureTypeInference.ts, 18, 3))
 >stringMapToArray : Symbol(stringMapToArray, Decl(indexSignatureTypeInference.ts, 8, 64))
->stringMap : Symbol(stringMap, Decl(indexSignatureTypeInference.ts, 12, 3))
+>stringMap : Symbol(stringMap, Decl(indexSignatureTypeInference.ts, 12, 11))
 
diff --git a/tests/baselines/reference/indexSignatureTypeInference.types b/tests/baselines/reference/indexSignatureTypeInference.types
index 44c4297bbbdab..c665920bba597 100644
--- a/tests/baselines/reference/indexSignatureTypeInference.types
+++ b/tests/baselines/reference/indexSignatureTypeInference.types
@@ -25,11 +25,11 @@ declare function stringMapToArray<T>(object: StringMap<T>): T[];
 >object : StringMap<T>
 >       : ^^^^^^^^^^^^
 
-var numberMap: NumberMap<Function>;
+declare var numberMap: NumberMap<Function>;
 >numberMap : NumberMap<Function>
 >          : ^^^^^^^^^^^^^^^^^^^
 
-var stringMap: StringMap<Function>;
+declare var stringMap: StringMap<Function>;
 >stringMap : StringMap<Function>
 >          : ^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/indexTypeCheck.errors.txt b/tests/baselines/reference/indexTypeCheck.errors.txt
index 7504c6a5f6225..ccf0c99e3919d 100644
--- a/tests/baselines/reference/indexTypeCheck.errors.txt
+++ b/tests/baselines/reference/indexTypeCheck.errors.txt
@@ -61,8 +61,8 @@ indexTypeCheck.ts(51,8): error TS2538: Type 'Blue' cannot be used as an index ty
 !!! error TS1268: An index signature parameter type must be 'string', 'number', 'symbol', or a template literal type.
     }
     
-    var yellow: Yellow;
-    var blue: Blue;
+    declare var yellow: Yellow;
+    declare var blue: Blue;
     var s = "some string";
     
     yellow[5]; // ok
@@ -77,7 +77,7 @@ indexTypeCheck.ts(51,8): error TS2538: Type 'Blue' cannot be used as an index ty
            ~~~~
 !!! error TS2538: Type 'Blue' cannot be used as an index type.
     
-    var x:number[];
+    declare var x:number[];
     x[0];
     
     class Benchmark {
diff --git a/tests/baselines/reference/indexTypeCheck.js b/tests/baselines/reference/indexTypeCheck.js
index 9a7e2f2e657e7..ce026a807ecdf 100644
--- a/tests/baselines/reference/indexTypeCheck.js
+++ b/tests/baselines/reference/indexTypeCheck.js
@@ -39,8 +39,8 @@ interface Magenta {
 	[p:Purple]; // error
 }
 
-var yellow: Yellow;
-var blue: Blue;
+declare var yellow: Yellow;
+declare var blue: Blue;
 var s = "some string";
 
 yellow[5]; // ok
@@ -53,7 +53,7 @@ s[<any>{}]; // ok
 
 yellow[blue]; // error
 
-var x:number[];
+declare var x:number[];
 x[0];
 
 class Benchmark {
@@ -66,8 +66,6 @@ class Benchmark {
 }
 
 //// [indexTypeCheck.js]
-var yellow;
-var blue;
 var s = "some string";
 yellow[5]; // ok
 yellow["hue"]; // ok
@@ -76,7 +74,6 @@ s[0]; // error
 s["s"]; // ok
 s[{}]; // ok
 yellow[blue]; // error
-var x;
 x[0];
 var Benchmark = /** @class */ (function () {
     function Benchmark() {
diff --git a/tests/baselines/reference/indexTypeCheck.symbols b/tests/baselines/reference/indexTypeCheck.symbols
index acf32bab1a0f1..2a60487181002 100644
--- a/tests/baselines/reference/indexTypeCheck.symbols
+++ b/tests/baselines/reference/indexTypeCheck.symbols
@@ -81,25 +81,25 @@ interface Magenta {
 >Purple : Symbol(Purple, Decl(indexTypeCheck.ts, 28, 1))
 }
 
-var yellow: Yellow;
->yellow : Symbol(yellow, Decl(indexTypeCheck.ts, 38, 3))
+declare var yellow: Yellow;
+>yellow : Symbol(yellow, Decl(indexTypeCheck.ts, 38, 11))
 >Yellow : Symbol(Yellow, Decl(indexTypeCheck.ts, 8, 1))
 
-var blue: Blue;
->blue : Symbol(blue, Decl(indexTypeCheck.ts, 39, 3))
+declare var blue: Blue;
+>blue : Symbol(blue, Decl(indexTypeCheck.ts, 39, 11))
 >Blue : Symbol(Blue, Decl(indexTypeCheck.ts, 3, 1))
 
 var s = "some string";
 >s : Symbol(s, Decl(indexTypeCheck.ts, 40, 3))
 
 yellow[5]; // ok
->yellow : Symbol(yellow, Decl(indexTypeCheck.ts, 38, 3))
+>yellow : Symbol(yellow, Decl(indexTypeCheck.ts, 38, 11))
 
 yellow["hue"]; // ok
->yellow : Symbol(yellow, Decl(indexTypeCheck.ts, 38, 3))
+>yellow : Symbol(yellow, Decl(indexTypeCheck.ts, 38, 11))
 
 yellow[<any>{}]; // ok
->yellow : Symbol(yellow, Decl(indexTypeCheck.ts, 38, 3))
+>yellow : Symbol(yellow, Decl(indexTypeCheck.ts, 38, 11))
 
 s[0]; // error
 >s : Symbol(s, Decl(indexTypeCheck.ts, 40, 3))
@@ -111,14 +111,14 @@ s[<any>{}]; // ok
 >s : Symbol(s, Decl(indexTypeCheck.ts, 40, 3))
 
 yellow[blue]; // error
->yellow : Symbol(yellow, Decl(indexTypeCheck.ts, 38, 3))
->blue : Symbol(blue, Decl(indexTypeCheck.ts, 39, 3))
+>yellow : Symbol(yellow, Decl(indexTypeCheck.ts, 38, 11))
+>blue : Symbol(blue, Decl(indexTypeCheck.ts, 39, 11))
 
-var x:number[];
->x : Symbol(x, Decl(indexTypeCheck.ts, 52, 3))
+declare var x:number[];
+>x : Symbol(x, Decl(indexTypeCheck.ts, 52, 11))
 
 x[0];
->x : Symbol(x, Decl(indexTypeCheck.ts, 52, 3))
+>x : Symbol(x, Decl(indexTypeCheck.ts, 52, 11))
 
 class Benchmark {
 >Benchmark : Symbol(Benchmark, Decl(indexTypeCheck.ts, 53, 5))
diff --git a/tests/baselines/reference/indexTypeCheck.types b/tests/baselines/reference/indexTypeCheck.types
index 57eb19d179acc..51ad9a2b890f7 100644
--- a/tests/baselines/reference/indexTypeCheck.types
+++ b/tests/baselines/reference/indexTypeCheck.types
@@ -75,11 +75,11 @@ interface Magenta {
 >  : ^^^^^^
 }
 
-var yellow: Yellow;
+declare var yellow: Yellow;
 >yellow : Yellow
 >       : ^^^^^^
 
-var blue: Blue;
+declare var blue: Blue;
 >blue : Blue
 >     : ^^^^
 
@@ -149,7 +149,7 @@ yellow[blue]; // error
 >blue : Blue
 >     : ^^^^
 
-var x:number[];
+declare var x:number[];
 >x : number[]
 >  : ^^^^^^^^
 
diff --git a/tests/baselines/reference/inferringClassMembersFromAssignments.errors.txt b/tests/baselines/reference/inferringClassMembersFromAssignments.errors.txt
index d0ec3d2795394..ea7a8aec7af1f 100644
--- a/tests/baselines/reference/inferringClassMembersFromAssignments.errors.txt
+++ b/tests/baselines/reference/inferringClassMembersFromAssignments.errors.txt
@@ -1,8 +1,10 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 a.js(14,13): error TS7008: Member 'inMethodNullable' implicitly has an 'any' type.
 a.js(20,9): error TS2322: Type 'string' is not assignable to type 'number'.
 a.js(39,9): error TS2322: Type 'boolean' is not assignable to type 'number'.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.js (3 errors) ====
     class C {
         constructor() {
diff --git a/tests/baselines/reference/infiniteExpansionThroughInstantiation.errors.txt b/tests/baselines/reference/infiniteExpansionThroughInstantiation.errors.txt
index 948ba636018d9..f4ae82e9df707 100644
--- a/tests/baselines/reference/infiniteExpansionThroughInstantiation.errors.txt
+++ b/tests/baselines/reference/infiniteExpansionThroughInstantiation.errors.txt
@@ -21,8 +21,8 @@ infiniteExpansionThroughInstantiation.ts(21,5): error TS2322: Type 'OwnerList<T>
         name: string;
     }
     
-    var list: List<string>;
-    var ownerList: OwnerList<string>;
+    declare var list: List<string>;
+    declare var ownerList: OwnerList<string>;
     list = ownerList; 
     ~~~~
 !!! error TS2322: Type 'OwnerList<string>' is not assignable to type 'List<string>'.
@@ -31,7 +31,7 @@ infiniteExpansionThroughInstantiation.ts(21,5): error TS2322: Type 'OwnerList<T>
     
     function other<T>(x: T) {
         var list: List<T>;
-        var ownerList: OwnerList<T>;
+        var ownerList!: OwnerList<T>;
         list = ownerList; 
         ~~~~
 !!! error TS2322: Type 'OwnerList<T>' is not assignable to type 'List<T>'.
diff --git a/tests/baselines/reference/infiniteExpansionThroughInstantiation.js b/tests/baselines/reference/infiniteExpansionThroughInstantiation.js
index ceddd6b4bc93f..0089646135f16 100644
--- a/tests/baselines/reference/infiniteExpansionThroughInstantiation.js
+++ b/tests/baselines/reference/infiniteExpansionThroughInstantiation.js
@@ -14,13 +14,13 @@ interface OwnerList<U> extends List<List<U>> {
     name: string;
 }
 
-var list: List<string>;
-var ownerList: OwnerList<string>;
+declare var list: List<string>;
+declare var ownerList: OwnerList<string>;
 list = ownerList; 
 
 function other<T>(x: T) {
     var list: List<T>;
-    var ownerList: OwnerList<T>;
+    var ownerList!: OwnerList<T>;
     list = ownerList; 
 
 }
@@ -28,8 +28,6 @@ function other<T>(x: T) {
 
 //// [infiniteExpansionThroughInstantiation.js]
 // instantiating a derived type can cause an infinitely expanding type reference to be generated
-var list;
-var ownerList;
 list = ownerList;
 function other(x) {
     var list;
diff --git a/tests/baselines/reference/infiniteExpansionThroughInstantiation.symbols b/tests/baselines/reference/infiniteExpansionThroughInstantiation.symbols
index 30970e52c80a3..8ec89b5f4c1d5 100644
--- a/tests/baselines/reference/infiniteExpansionThroughInstantiation.symbols
+++ b/tests/baselines/reference/infiniteExpansionThroughInstantiation.symbols
@@ -34,17 +34,17 @@ interface OwnerList<U> extends List<List<U>> {
 >name : Symbol(OwnerList.name, Decl(infiniteExpansionThroughInstantiation.ts, 9, 46))
 }
 
-var list: List<string>;
->list : Symbol(list, Decl(infiniteExpansionThroughInstantiation.ts, 13, 3))
+declare var list: List<string>;
+>list : Symbol(list, Decl(infiniteExpansionThroughInstantiation.ts, 13, 11))
 >List : Symbol(List, Decl(infiniteExpansionThroughInstantiation.ts, 0, 0))
 
-var ownerList: OwnerList<string>;
->ownerList : Symbol(ownerList, Decl(infiniteExpansionThroughInstantiation.ts, 14, 3))
+declare var ownerList: OwnerList<string>;
+>ownerList : Symbol(ownerList, Decl(infiniteExpansionThroughInstantiation.ts, 14, 11))
 >OwnerList : Symbol(OwnerList, Decl(infiniteExpansionThroughInstantiation.ts, 6, 1))
 
 list = ownerList; 
->list : Symbol(list, Decl(infiniteExpansionThroughInstantiation.ts, 13, 3))
->ownerList : Symbol(ownerList, Decl(infiniteExpansionThroughInstantiation.ts, 14, 3))
+>list : Symbol(list, Decl(infiniteExpansionThroughInstantiation.ts, 13, 11))
+>ownerList : Symbol(ownerList, Decl(infiniteExpansionThroughInstantiation.ts, 14, 11))
 
 function other<T>(x: T) {
 >other : Symbol(other, Decl(infiniteExpansionThroughInstantiation.ts, 15, 17))
@@ -57,7 +57,7 @@ function other<T>(x: T) {
 >List : Symbol(List, Decl(infiniteExpansionThroughInstantiation.ts, 0, 0))
 >T : Symbol(T, Decl(infiniteExpansionThroughInstantiation.ts, 17, 15))
 
-    var ownerList: OwnerList<T>;
+    var ownerList!: OwnerList<T>;
 >ownerList : Symbol(ownerList, Decl(infiniteExpansionThroughInstantiation.ts, 19, 7))
 >OwnerList : Symbol(OwnerList, Decl(infiniteExpansionThroughInstantiation.ts, 6, 1))
 >T : Symbol(T, Decl(infiniteExpansionThroughInstantiation.ts, 17, 15))
diff --git a/tests/baselines/reference/infiniteExpansionThroughInstantiation.types b/tests/baselines/reference/infiniteExpansionThroughInstantiation.types
index 218e9c11da17e..b82c8d85b95dc 100644
--- a/tests/baselines/reference/infiniteExpansionThroughInstantiation.types
+++ b/tests/baselines/reference/infiniteExpansionThroughInstantiation.types
@@ -24,11 +24,11 @@ interface OwnerList<U> extends List<List<U>> {
 >     : ^^^^^^
 }
 
-var list: List<string>;
+declare var list: List<string>;
 >list : List<string>
 >     : ^^^^^^^^^^^^
 
-var ownerList: OwnerList<string>;
+declare var ownerList: OwnerList<string>;
 >ownerList : OwnerList<string>
 >          : ^^^^^^^^^^^^^^^^^
 
@@ -50,7 +50,7 @@ function other<T>(x: T) {
 >list : List<T>
 >     : ^^^^^^^
 
-    var ownerList: OwnerList<T>;
+    var ownerList!: OwnerList<T>;
 >ownerList : OwnerList<T>
 >          : ^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/inheritance1.errors.txt b/tests/baselines/reference/inheritance1.errors.txt
index b96db00d8ff7a..4e40ddef88d78 100644
--- a/tests/baselines/reference/inheritance1.errors.txt
+++ b/tests/baselines/reference/inheritance1.errors.txt
@@ -46,10 +46,10 @@ inheritance1.ts(61,1): error TS2741: Property 'select' is missing in type 'Contr
     class Locations1 {
         select() { }
     }
-    var sc: SelectableControl;
-    var c: Control;
+    declare var sc: SelectableControl;
+    declare var c: Control;
     
-    var b: Button;
+    declare var b: Button;
     sc = b;
     c = b;
     b = sc;
@@ -58,7 +58,7 @@ inheritance1.ts(61,1): error TS2741: Property 'select' is missing in type 'Contr
 !!! error TS2741: Property 'select' is missing in type 'Control' but required in type 'Button'.
 !!! related TS2728 inheritance1.ts:9:5: 'select' is declared here.
     
-    var t: TextBox;
+    declare var t: TextBox;
     sc = t;
     c = t;
     t = sc;
@@ -67,7 +67,7 @@ inheritance1.ts(61,1): error TS2741: Property 'select' is missing in type 'Contr
 !!! error TS2741: Property 'select' is missing in type 'Control' but required in type 'TextBox'.
 !!! related TS2728 inheritance1.ts:12:5: 'select' is declared here.
     
-    var i: ImageBase;
+    declare var i: ImageBase;
     sc = i;
     ~~
 !!! error TS2741: Property 'select' is missing in type 'Control' but required in type 'SelectableControl'.
@@ -76,7 +76,7 @@ inheritance1.ts(61,1): error TS2741: Property 'select' is missing in type 'Contr
     i = sc;
     i = c;
     
-    var i1: Image1;
+    declare var i1: Image1;
     sc = i1;
     ~~
 !!! error TS2741: Property 'select' is missing in type 'Control' but required in type 'SelectableControl'.
@@ -85,7 +85,7 @@ inheritance1.ts(61,1): error TS2741: Property 'select' is missing in type 'Contr
     i1 = sc;
     i1 = c;
     
-    var l: Locations;
+    declare var l: Locations;
     sc = l;
     ~~
 !!! error TS2741: Property 'state' is missing in type 'Locations' but required in type 'SelectableControl'.
@@ -100,7 +100,7 @@ inheritance1.ts(61,1): error TS2741: Property 'select' is missing in type 'Contr
 !!! error TS2741: Property 'select' is missing in type 'Control' but required in type 'Locations'.
 !!! related TS2728 inheritance1.ts:19:5: 'select' is declared here.
     
-    var l1: Locations1;
+    declare var l1: Locations1;
     sc = l1;
     ~~
 !!! error TS2741: Property 'state' is missing in type 'Locations1' but required in type 'SelectableControl'.
diff --git a/tests/baselines/reference/inheritance1.js b/tests/baselines/reference/inheritance1.js
index a0230873412ee..87bea2f68fa6a 100644
--- a/tests/baselines/reference/inheritance1.js
+++ b/tests/baselines/reference/inheritance1.js
@@ -24,40 +24,40 @@ class Locations implements SelectableControl {
 class Locations1 {
     select() { }
 }
-var sc: SelectableControl;
-var c: Control;
+declare var sc: SelectableControl;
+declare var c: Control;
 
-var b: Button;
+declare var b: Button;
 sc = b;
 c = b;
 b = sc;
 b = c;
 
-var t: TextBox;
+declare var t: TextBox;
 sc = t;
 c = t;
 t = sc;
 t = c;
 
-var i: ImageBase;
+declare var i: ImageBase;
 sc = i;
 c = i;
 i = sc;
 i = c;
 
-var i1: Image1;
+declare var i1: Image1;
 sc = i1;
 c = i1;
 i1 = sc;
 i1 = c;
 
-var l: Locations;
+declare var l: Locations;
 sc = l;
 c = l;
 l = sc;
 l = c;
 
-var l1: Locations1;
+declare var l1: Locations1;
 sc = l1;
 c = l1;
 l1 = sc;
@@ -126,34 +126,26 @@ var Locations1 = /** @class */ (function () {
     Locations1.prototype.select = function () { };
     return Locations1;
 }());
-var sc;
-var c;
-var b;
 sc = b;
 c = b;
 b = sc;
 b = c;
-var t;
 sc = t;
 c = t;
 t = sc;
 t = c;
-var i;
 sc = i;
 c = i;
 i = sc;
 i = c;
-var i1;
 sc = i1;
 c = i1;
 i1 = sc;
 i1 = c;
-var l;
 sc = l;
 c = l;
 l = sc;
 l = c;
-var l1;
 sc = l1;
 c = l1;
 l1 = sc;
diff --git a/tests/baselines/reference/inheritance1.symbols b/tests/baselines/reference/inheritance1.symbols
index 9d512f4842c50..381e26f630638 100644
--- a/tests/baselines/reference/inheritance1.symbols
+++ b/tests/baselines/reference/inheritance1.symbols
@@ -52,131 +52,131 @@ class Locations1 {
     select() { }
 >select : Symbol(Locations1.select, Decl(inheritance1.ts, 20, 18))
 }
-var sc: SelectableControl;
->sc : Symbol(sc, Decl(inheritance1.ts, 23, 3))
+declare var sc: SelectableControl;
+>sc : Symbol(sc, Decl(inheritance1.ts, 23, 11))
 >SelectableControl : Symbol(SelectableControl, Decl(inheritance1.ts, 2, 1))
 
-var c: Control;
->c : Symbol(c, Decl(inheritance1.ts, 24, 3))
+declare var c: Control;
+>c : Symbol(c, Decl(inheritance1.ts, 24, 11))
 >Control : Symbol(Control, Decl(inheritance1.ts, 0, 0))
 
-var b: Button;
->b : Symbol(b, Decl(inheritance1.ts, 26, 3))
+declare var b: Button;
+>b : Symbol(b, Decl(inheritance1.ts, 26, 11))
 >Button : Symbol(Button, Decl(inheritance1.ts, 5, 1))
 
 sc = b;
->sc : Symbol(sc, Decl(inheritance1.ts, 23, 3))
->b : Symbol(b, Decl(inheritance1.ts, 26, 3))
+>sc : Symbol(sc, Decl(inheritance1.ts, 23, 11))
+>b : Symbol(b, Decl(inheritance1.ts, 26, 11))
 
 c = b;
->c : Symbol(c, Decl(inheritance1.ts, 24, 3))
->b : Symbol(b, Decl(inheritance1.ts, 26, 3))
+>c : Symbol(c, Decl(inheritance1.ts, 24, 11))
+>b : Symbol(b, Decl(inheritance1.ts, 26, 11))
 
 b = sc;
->b : Symbol(b, Decl(inheritance1.ts, 26, 3))
->sc : Symbol(sc, Decl(inheritance1.ts, 23, 3))
+>b : Symbol(b, Decl(inheritance1.ts, 26, 11))
+>sc : Symbol(sc, Decl(inheritance1.ts, 23, 11))
 
 b = c;
->b : Symbol(b, Decl(inheritance1.ts, 26, 3))
->c : Symbol(c, Decl(inheritance1.ts, 24, 3))
+>b : Symbol(b, Decl(inheritance1.ts, 26, 11))
+>c : Symbol(c, Decl(inheritance1.ts, 24, 11))
 
-var t: TextBox;
->t : Symbol(t, Decl(inheritance1.ts, 32, 3))
+declare var t: TextBox;
+>t : Symbol(t, Decl(inheritance1.ts, 32, 11))
 >TextBox : Symbol(TextBox, Decl(inheritance1.ts, 9, 1))
 
 sc = t;
->sc : Symbol(sc, Decl(inheritance1.ts, 23, 3))
->t : Symbol(t, Decl(inheritance1.ts, 32, 3))
+>sc : Symbol(sc, Decl(inheritance1.ts, 23, 11))
+>t : Symbol(t, Decl(inheritance1.ts, 32, 11))
 
 c = t;
->c : Symbol(c, Decl(inheritance1.ts, 24, 3))
->t : Symbol(t, Decl(inheritance1.ts, 32, 3))
+>c : Symbol(c, Decl(inheritance1.ts, 24, 11))
+>t : Symbol(t, Decl(inheritance1.ts, 32, 11))
 
 t = sc;
->t : Symbol(t, Decl(inheritance1.ts, 32, 3))
->sc : Symbol(sc, Decl(inheritance1.ts, 23, 3))
+>t : Symbol(t, Decl(inheritance1.ts, 32, 11))
+>sc : Symbol(sc, Decl(inheritance1.ts, 23, 11))
 
 t = c;
->t : Symbol(t, Decl(inheritance1.ts, 32, 3))
->c : Symbol(c, Decl(inheritance1.ts, 24, 3))
+>t : Symbol(t, Decl(inheritance1.ts, 32, 11))
+>c : Symbol(c, Decl(inheritance1.ts, 24, 11))
 
-var i: ImageBase;
->i : Symbol(i, Decl(inheritance1.ts, 38, 3))
+declare var i: ImageBase;
+>i : Symbol(i, Decl(inheritance1.ts, 38, 11))
 >ImageBase : Symbol(ImageBase, Decl(inheritance1.ts, 12, 1))
 
 sc = i;
->sc : Symbol(sc, Decl(inheritance1.ts, 23, 3))
->i : Symbol(i, Decl(inheritance1.ts, 38, 3))
+>sc : Symbol(sc, Decl(inheritance1.ts, 23, 11))
+>i : Symbol(i, Decl(inheritance1.ts, 38, 11))
 
 c = i;
->c : Symbol(c, Decl(inheritance1.ts, 24, 3))
->i : Symbol(i, Decl(inheritance1.ts, 38, 3))
+>c : Symbol(c, Decl(inheritance1.ts, 24, 11))
+>i : Symbol(i, Decl(inheritance1.ts, 38, 11))
 
 i = sc;
->i : Symbol(i, Decl(inheritance1.ts, 38, 3))
->sc : Symbol(sc, Decl(inheritance1.ts, 23, 3))
+>i : Symbol(i, Decl(inheritance1.ts, 38, 11))
+>sc : Symbol(sc, Decl(inheritance1.ts, 23, 11))
 
 i = c;
->i : Symbol(i, Decl(inheritance1.ts, 38, 3))
->c : Symbol(c, Decl(inheritance1.ts, 24, 3))
+>i : Symbol(i, Decl(inheritance1.ts, 38, 11))
+>c : Symbol(c, Decl(inheritance1.ts, 24, 11))
 
-var i1: Image1;
->i1 : Symbol(i1, Decl(inheritance1.ts, 44, 3))
+declare var i1: Image1;
+>i1 : Symbol(i1, Decl(inheritance1.ts, 44, 11))
 >Image1 : Symbol(Image1, Decl(inheritance1.ts, 14, 1))
 
 sc = i1;
->sc : Symbol(sc, Decl(inheritance1.ts, 23, 3))
->i1 : Symbol(i1, Decl(inheritance1.ts, 44, 3))
+>sc : Symbol(sc, Decl(inheritance1.ts, 23, 11))
+>i1 : Symbol(i1, Decl(inheritance1.ts, 44, 11))
 
 c = i1;
->c : Symbol(c, Decl(inheritance1.ts, 24, 3))
->i1 : Symbol(i1, Decl(inheritance1.ts, 44, 3))
+>c : Symbol(c, Decl(inheritance1.ts, 24, 11))
+>i1 : Symbol(i1, Decl(inheritance1.ts, 44, 11))
 
 i1 = sc;
->i1 : Symbol(i1, Decl(inheritance1.ts, 44, 3))
->sc : Symbol(sc, Decl(inheritance1.ts, 23, 3))
+>i1 : Symbol(i1, Decl(inheritance1.ts, 44, 11))
+>sc : Symbol(sc, Decl(inheritance1.ts, 23, 11))
 
 i1 = c;
->i1 : Symbol(i1, Decl(inheritance1.ts, 44, 3))
->c : Symbol(c, Decl(inheritance1.ts, 24, 3))
+>i1 : Symbol(i1, Decl(inheritance1.ts, 44, 11))
+>c : Symbol(c, Decl(inheritance1.ts, 24, 11))
 
-var l: Locations;
->l : Symbol(l, Decl(inheritance1.ts, 50, 3))
+declare var l: Locations;
+>l : Symbol(l, Decl(inheritance1.ts, 50, 11))
 >Locations : Symbol(Locations, Decl(inheritance1.ts, 16, 1))
 
 sc = l;
->sc : Symbol(sc, Decl(inheritance1.ts, 23, 3))
->l : Symbol(l, Decl(inheritance1.ts, 50, 3))
+>sc : Symbol(sc, Decl(inheritance1.ts, 23, 11))
+>l : Symbol(l, Decl(inheritance1.ts, 50, 11))
 
 c = l;
->c : Symbol(c, Decl(inheritance1.ts, 24, 3))
->l : Symbol(l, Decl(inheritance1.ts, 50, 3))
+>c : Symbol(c, Decl(inheritance1.ts, 24, 11))
+>l : Symbol(l, Decl(inheritance1.ts, 50, 11))
 
 l = sc;
->l : Symbol(l, Decl(inheritance1.ts, 50, 3))
->sc : Symbol(sc, Decl(inheritance1.ts, 23, 3))
+>l : Symbol(l, Decl(inheritance1.ts, 50, 11))
+>sc : Symbol(sc, Decl(inheritance1.ts, 23, 11))
 
 l = c;
->l : Symbol(l, Decl(inheritance1.ts, 50, 3))
->c : Symbol(c, Decl(inheritance1.ts, 24, 3))
+>l : Symbol(l, Decl(inheritance1.ts, 50, 11))
+>c : Symbol(c, Decl(inheritance1.ts, 24, 11))
 
-var l1: Locations1;
->l1 : Symbol(l1, Decl(inheritance1.ts, 56, 3))
+declare var l1: Locations1;
+>l1 : Symbol(l1, Decl(inheritance1.ts, 56, 11))
 >Locations1 : Symbol(Locations1, Decl(inheritance1.ts, 19, 1))
 
 sc = l1;
->sc : Symbol(sc, Decl(inheritance1.ts, 23, 3))
->l1 : Symbol(l1, Decl(inheritance1.ts, 56, 3))
+>sc : Symbol(sc, Decl(inheritance1.ts, 23, 11))
+>l1 : Symbol(l1, Decl(inheritance1.ts, 56, 11))
 
 c = l1;
->c : Symbol(c, Decl(inheritance1.ts, 24, 3))
->l1 : Symbol(l1, Decl(inheritance1.ts, 56, 3))
+>c : Symbol(c, Decl(inheritance1.ts, 24, 11))
+>l1 : Symbol(l1, Decl(inheritance1.ts, 56, 11))
 
 l1 = sc;
->l1 : Symbol(l1, Decl(inheritance1.ts, 56, 3))
->sc : Symbol(sc, Decl(inheritance1.ts, 23, 3))
+>l1 : Symbol(l1, Decl(inheritance1.ts, 56, 11))
+>sc : Symbol(sc, Decl(inheritance1.ts, 23, 11))
 
 l1 = c;
->l1 : Symbol(l1, Decl(inheritance1.ts, 56, 3))
->c : Symbol(c, Decl(inheritance1.ts, 24, 3))
+>l1 : Symbol(l1, Decl(inheritance1.ts, 56, 11))
+>c : Symbol(c, Decl(inheritance1.ts, 24, 11))
 
diff --git a/tests/baselines/reference/inheritance1.types b/tests/baselines/reference/inheritance1.types
index a6031b8e0b015..f462af4f2da7b 100644
--- a/tests/baselines/reference/inheritance1.types
+++ b/tests/baselines/reference/inheritance1.types
@@ -63,15 +63,15 @@ class Locations1 {
 >select : () => void
 >       : ^^^^^^^^^^
 }
-var sc: SelectableControl;
+declare var sc: SelectableControl;
 >sc : SelectableControl
 >   : ^^^^^^^^^^^^^^^^^
 
-var c: Control;
+declare var c: Control;
 >c : Control
 >  : ^^^^^^^
 
-var b: Button;
+declare var b: Button;
 >b : Button
 >  : ^^^^^^
 
@@ -107,7 +107,7 @@ b = c;
 >c : Control
 >  : ^^^^^^^
 
-var t: TextBox;
+declare var t: TextBox;
 >t : TextBox
 >  : ^^^^^^^
 
@@ -143,7 +143,7 @@ t = c;
 >c : Control
 >  : ^^^^^^^
 
-var i: ImageBase;
+declare var i: ImageBase;
 >i : ImageBase
 >  : ^^^^^^^^^
 
@@ -179,7 +179,7 @@ i = c;
 >c : Control
 >  : ^^^^^^^
 
-var i1: Image1;
+declare var i1: Image1;
 >i1 : Image1
 >   : ^^^^^^
 
@@ -215,7 +215,7 @@ i1 = c;
 >c : Control
 >  : ^^^^^^^
 
-var l: Locations;
+declare var l: Locations;
 >l : Locations
 >  : ^^^^^^^^^
 
@@ -251,7 +251,7 @@ l = c;
 >c : Control
 >  : ^^^^^^^
 
-var l1: Locations1;
+declare var l1: Locations1;
 >l1 : Locations1
 >   : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/initializersWidened.errors.txt b/tests/baselines/reference/initializersWidened.errors.txt
index d39383da36391..448ad57be8b9c 100644
--- a/tests/baselines/reference/initializersWidened.errors.txt
+++ b/tests/baselines/reference/initializersWidened.errors.txt
@@ -15,8 +15,8 @@ initializersWidened.ts(24,10): error TS2873: This kind of expression is always f
     
     // these are not widened
     
-    var x2: null;
-    var y2: undefined;
+    declare var x2: null;
+    declare var y2: undefined;
     
     var x3: null = null;
     var y3: undefined = undefined;
diff --git a/tests/baselines/reference/initializersWidened.js b/tests/baselines/reference/initializersWidened.js
index 3241570b6c663..4c4c7c64cd6cc 100644
--- a/tests/baselines/reference/initializersWidened.js
+++ b/tests/baselines/reference/initializersWidened.js
@@ -9,8 +9,8 @@ var z1 = void 0;
 
 // these are not widened
 
-var x2: null;
-var y2: undefined;
+declare var x2: null;
+declare var y2: undefined;
 
 var x3: null = null;
 var y3: undefined = undefined;
@@ -31,9 +31,6 @@ var z5 = void 0 || y2;
 var x1 = null;
 var y1 = undefined;
 var z1 = void 0;
-// these are not widened
-var x2;
-var y2;
 var x3 = null;
 var y3 = undefined;
 var z3 = void 0;
diff --git a/tests/baselines/reference/initializersWidened.symbols b/tests/baselines/reference/initializersWidened.symbols
index 1dcd101cb5232..3e75a660cf679 100644
--- a/tests/baselines/reference/initializersWidened.symbols
+++ b/tests/baselines/reference/initializersWidened.symbols
@@ -15,11 +15,11 @@ var z1 = void 0;
 
 // these are not widened
 
-var x2: null;
->x2 : Symbol(x2, Decl(initializersWidened.ts, 8, 3))
+declare var x2: null;
+>x2 : Symbol(x2, Decl(initializersWidened.ts, 8, 11))
 
-var y2: undefined;
->y2 : Symbol(y2, Decl(initializersWidened.ts, 9, 3))
+declare var y2: undefined;
+>y2 : Symbol(y2, Decl(initializersWidened.ts, 9, 11))
 
 var x3: null = null;
 >x3 : Symbol(x3, Decl(initializersWidened.ts, 11, 3))
@@ -46,14 +46,14 @@ var z4 = void 0 || void 0;
 
 var x5 = null || x2;
 >x5 : Symbol(x5, Decl(initializersWidened.ts, 21, 3))
->x2 : Symbol(x2, Decl(initializersWidened.ts, 8, 3))
+>x2 : Symbol(x2, Decl(initializersWidened.ts, 8, 11))
 
 var y5 = undefined || y2;
 >y5 : Symbol(y5, Decl(initializersWidened.ts, 22, 3))
 >undefined : Symbol(undefined)
->y2 : Symbol(y2, Decl(initializersWidened.ts, 9, 3))
+>y2 : Symbol(y2, Decl(initializersWidened.ts, 9, 11))
 
 var z5 = void 0 || y2;
 >z5 : Symbol(z5, Decl(initializersWidened.ts, 23, 3))
->y2 : Symbol(y2, Decl(initializersWidened.ts, 9, 3))
+>y2 : Symbol(y2, Decl(initializersWidened.ts, 9, 11))
 
diff --git a/tests/baselines/reference/initializersWidened.types b/tests/baselines/reference/initializersWidened.types
index 485a47c2eee92..9d939ef98a514 100644
--- a/tests/baselines/reference/initializersWidened.types
+++ b/tests/baselines/reference/initializersWidened.types
@@ -23,11 +23,11 @@ var z1 = void 0;
 
 // these are not widened
 
-var x2: null;
+declare var x2: null;
 >x2 : null
 >   : ^^^^
 
-var y2: undefined;
+declare var y2: undefined;
 >y2 : undefined
 >   : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/inlayHintsInteractiveMultifile1.baseline b/tests/baselines/reference/inlayHintsInteractiveMultifile1.baseline
index df760582ca2de..4bdab84121cf7 100644
--- a/tests/baselines/reference/inlayHintsInteractiveMultifile1.baseline
+++ b/tests/baselines/reference/inlayHintsInteractiveMultifile1.baseline
@@ -13,7 +13,7 @@ async function foo () {
         "start": -1,
         "length": 7
       },
-      "file": "lib.d.ts"
+      "file": "/home/src/tslibs/TS/Lib/lib.es5.d.ts"
     },
     {
       "text": "<"
@@ -49,7 +49,7 @@ function bar () { return import('./a') }
         "start": -1,
         "length": 7
       },
-      "file": "lib.d.ts"
+      "file": "/home/src/tslibs/TS/Lib/lib.es5.d.ts"
     },
     {
       "text": "<"
@@ -89,7 +89,7 @@ async function main () {
         "start": -1,
         "length": 7
       },
-      "file": "lib.d.ts"
+      "file": "/home/src/tslibs/TS/Lib/lib.es5.d.ts"
     },
     {
       "text": "<"
diff --git a/tests/baselines/reference/inlineSourceMap2.errors.txt b/tests/baselines/reference/inlineSourceMap2.errors.txt
index e4ba724320001..a75327adb984e 100644
--- a/tests/baselines/reference/inlineSourceMap2.errors.txt
+++ b/tests/baselines/reference/inlineSourceMap2.errors.txt
@@ -1,9 +1,11 @@
 error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'.
 error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'.
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'.
 !!! error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'.
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== inlineSourceMap2.ts (0 errors) ====
     // configuration errors
     
diff --git a/tests/baselines/reference/inlineSources.errors.txt b/tests/baselines/reference/inlineSources.errors.txt
new file mode 100644
index 0000000000000..00080a5469031
--- /dev/null
+++ b/tests/baselines/reference/inlineSources.errors.txt
@@ -0,0 +1,12 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.ts (0 errors) ====
+    var a = 0;
+    console.log(a);
+    
+==== b.ts (0 errors) ====
+    var b = 0;
+    console.log(b);
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/inlineSources2.errors.txt b/tests/baselines/reference/inlineSources2.errors.txt
new file mode 100644
index 0000000000000..00080a5469031
--- /dev/null
+++ b/tests/baselines/reference/inlineSources2.errors.txt
@@ -0,0 +1,12 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.ts (0 errors) ====
+    var a = 0;
+    console.log(a);
+    
+==== b.ts (0 errors) ====
+    var b = 0;
+    console.log(b);
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/instanceofOperator.errors.txt b/tests/baselines/reference/instanceofOperator.errors.txt
index f49b3794771ca..126d3dd80f464 100644
--- a/tests/baselines/reference/instanceofOperator.errors.txt
+++ b/tests/baselines/reference/instanceofOperator.errors.txt
@@ -16,7 +16,7 @@ instanceofOperator.ts(21,5): error TS2358: The left-hand side of an 'instanceof'
         class Object { }
               ~~~~~~
 !!! error TS2725: Class name cannot be 'Object' when targeting ES5 and above with module CommonJS.
-        var obj: Object;
+        declare var obj: Object;
     
     
     
diff --git a/tests/baselines/reference/instanceofOperator.js b/tests/baselines/reference/instanceofOperator.js
index 4ef0a01133350..63b93f6783a5a 100644
--- a/tests/baselines/reference/instanceofOperator.js
+++ b/tests/baselines/reference/instanceofOperator.js
@@ -8,7 +8,7 @@
 
 namespace test {
     class Object { }
-    var obj: Object;
+    declare var obj: Object;
 
 
 
@@ -38,7 +38,6 @@ var test;
         }
         return Object;
     }());
-    var obj;
     4 instanceof null;
     // Error and should be error
     obj instanceof 4;
diff --git a/tests/baselines/reference/instanceofOperator.symbols b/tests/baselines/reference/instanceofOperator.symbols
index a5ec149a69e98..d7c5dcf0b6e4c 100644
--- a/tests/baselines/reference/instanceofOperator.symbols
+++ b/tests/baselines/reference/instanceofOperator.symbols
@@ -12,8 +12,8 @@ namespace test {
     class Object { }
 >Object : Symbol(Object, Decl(instanceofOperator.ts, 5, 16))
 
-    var obj: Object;
->obj : Symbol(obj, Decl(instanceofOperator.ts, 7, 7))
+    declare var obj: Object;
+>obj : Symbol(obj, Decl(instanceofOperator.ts, 7, 15))
 >Object : Symbol(Object, Decl(instanceofOperator.ts, 5, 16))
 
 
@@ -22,16 +22,16 @@ namespace test {
 
     // Error and should be error
     obj instanceof 4;
->obj : Symbol(obj, Decl(instanceofOperator.ts, 7, 7))
+>obj : Symbol(obj, Decl(instanceofOperator.ts, 7, 15))
 
     Object instanceof obj;
 >Object : Symbol(Object, Decl(instanceofOperator.ts, 5, 16))
->obj : Symbol(obj, Decl(instanceofOperator.ts, 7, 7))
+>obj : Symbol(obj, Decl(instanceofOperator.ts, 7, 15))
 
     // Error on left hand side
     null instanceof null;
     obj instanceof Object;
->obj : Symbol(obj, Decl(instanceofOperator.ts, 7, 7))
+>obj : Symbol(obj, Decl(instanceofOperator.ts, 7, 15))
 >Object : Symbol(Object, Decl(instanceofOperator.ts, 5, 16))
 
     undefined instanceof undefined;
diff --git a/tests/baselines/reference/instanceofOperator.types b/tests/baselines/reference/instanceofOperator.types
index a4c14ca8b612c..53d08d2b0cea5 100644
--- a/tests/baselines/reference/instanceofOperator.types
+++ b/tests/baselines/reference/instanceofOperator.types
@@ -14,7 +14,7 @@ namespace test {
 >Object : Object
 >       : ^^^^^^
 
-    var obj: Object;
+    declare var obj: Object;
 >obj : Object
 >    : ^^^^^^
 
diff --git a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.errors.txt b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.errors.txt
index 7c27b020db429..5d077322a530a 100644
--- a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.errors.txt
+++ b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.errors.txt
@@ -30,9 +30,9 @@ instanceofOperatorWithInvalidOperands.ts(46,25): error TS2359: The right-hand si
     
     // invalid left operand
     // the left operand is required to be of type Any, an object type, or a type parameter type
-    var a1: number;
-    var a2: boolean;
-    var a3: string;
+    declare var a1: number;
+    declare var a2: boolean;
+    declare var a3: string;
     var a4: void;
     
     var ra1 = a1 instanceof x;
@@ -65,13 +65,13 @@ instanceofOperatorWithInvalidOperands.ts(46,25): error TS2359: The right-hand si
     
     // invalid right operand
     // the right operand to be of type Any or a subtype of the 'Function' interface type
-    var b1: number;
-    var b2: boolean;
-    var b3: string;
-    var b4: void;
-    var o1: {};
-    var o2: Object;
-    var o3: C;
+    declare var b1: number;
+    declare var b2: boolean;
+    declare var b3: string;
+    declare var b4: void;
+    declare var o1: {};
+    declare var o2: Object;
+    declare var o3: C;
     
     var rb1 = x instanceof b1;
                            ~~
diff --git a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.errors.txt b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.errors.txt
index f65722f6e3ef3..f061e260e0bb7 100644
--- a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.errors.txt
+++ b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.errors.txt
@@ -34,9 +34,9 @@ instanceofOperatorWithInvalidOperands.es2015.ts(55,25): error TS2861: An object'
     
     // invalid left operand
     // the left operand is required to be of type Any, an object type, or a type parameter type
-    var a1: number;
-    var a2: boolean;
-    var a3: string;
+    declare var a1: number;
+    declare var a2: boolean;
+    declare var a3: string;
     var a4: void;
     
     var ra1 = a1 instanceof x;
@@ -69,13 +69,13 @@ instanceofOperatorWithInvalidOperands.es2015.ts(55,25): error TS2861: An object'
     
     // invalid right operand
     // the right operand to be of type Any or a subtype of the 'Function' interface type
-    var b1: number;
-    var b2: boolean;
-    var b3: string;
+    declare var b1: number;
+    declare var b2: boolean;
+    declare var b3: string;
     var b4: void;
-    var o1: {};
-    var o2: Object;
-    var o3: C;
+    declare var o1: {};
+    declare var o2: Object;
+    declare var o3: C;
     
     var rb1 = x instanceof b1;
                            ~~
@@ -116,17 +116,17 @@ instanceofOperatorWithInvalidOperands.es2015.ts(55,25): error TS2861: An object'
 !!! error TS2359: The right-hand side of an 'instanceof' expression must be either of type 'any', a class, function, or other type assignable to the 'Function' interface type, or an object type with a 'Symbol.hasInstance' method.
     
     // @@hasInstance restricts LHS
-    var o4: {[Symbol.hasInstance](value: { x: number }): boolean;};
-    var o5: { y: string };
+    declare var o4: {[Symbol.hasInstance](value: { x: number }): boolean;};
+    declare var o5: { y: string };
     var ra10 = o5 instanceof o4;
                ~~
 !!! error TS2860: The left-hand side of an 'instanceof' expression must be assignable to the first argument of the right-hand side's '[Symbol.hasInstance]' method.
 !!! error TS2860:   Argument of type '{ y: string; }' is not assignable to parameter of type '{ x: number; }'.
 !!! error TS2860:     Property 'x' is missing in type '{ y: string; }' but required in type '{ x: number; }'.
-!!! related TS2728 instanceofOperatorWithInvalidOperands.es2015.ts:49:40: 'x' is declared here.
+!!! related TS2728 instanceofOperatorWithInvalidOperands.es2015.ts:49:48: 'x' is declared here.
     
     // invalid @@hasInstance method return type on RHS
-    var o6: {[Symbol.hasInstance](value: unknown): number;};
+    declare var o6: {[Symbol.hasInstance](value: unknown): number;};
     var rb11 = x instanceof o6;
                             ~~
 !!! error TS2861: An object's '[Symbol.hasInstance]' method must return a boolean value for it to be used on the right-hand side of an 'instanceof' expression.
\ No newline at end of file
diff --git a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.js b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.js
index 738afe34a063d..5ed5ee9e0369b 100644
--- a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.js
+++ b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.js
@@ -9,9 +9,9 @@ var x: any;
 
 // invalid left operand
 // the left operand is required to be of type Any, an object type, or a type parameter type
-var a1: number;
-var a2: boolean;
-var a3: string;
+declare var a1: number;
+declare var a2: boolean;
+declare var a3: string;
 var a4: void;
 
 var ra1 = a1 instanceof x;
@@ -26,13 +26,13 @@ var ra9 = undefined instanceof x;
 
 // invalid right operand
 // the right operand to be of type Any or a subtype of the 'Function' interface type
-var b1: number;
-var b2: boolean;
-var b3: string;
+declare var b1: number;
+declare var b2: boolean;
+declare var b3: string;
 var b4: void;
-var o1: {};
-var o2: Object;
-var o3: C;
+declare var o1: {};
+declare var o2: Object;
+declare var o3: C;
 
 var rb1 = x instanceof b1;
 var rb2 = x instanceof b2;
@@ -49,12 +49,12 @@ var rb10 = x instanceof o3;
 var rc1 = '' instanceof {};
 
 // @@hasInstance restricts LHS
-var o4: {[Symbol.hasInstance](value: { x: number }): boolean;};
-var o5: { y: string };
+declare var o4: {[Symbol.hasInstance](value: { x: number }): boolean;};
+declare var o5: { y: string };
 var ra10 = o5 instanceof o4;
 
 // invalid @@hasInstance method return type on RHS
-var o6: {[Symbol.hasInstance](value: unknown): number;};
+declare var o6: {[Symbol.hasInstance](value: unknown): number;};
 var rb11 = x instanceof o6;
 
 //// [instanceofOperatorWithInvalidOperands.es2015.js]
@@ -62,11 +62,6 @@ class C {
     foo() { }
 }
 var x;
-// invalid left operand
-// the left operand is required to be of type Any, an object type, or a type parameter type
-var a1;
-var a2;
-var a3;
 var a4;
 var ra1 = a1 instanceof x;
 var ra2 = a2 instanceof x;
@@ -77,15 +72,7 @@ var ra6 = true instanceof x;
 var ra7 = '' instanceof x;
 var ra8 = null instanceof x;
 var ra9 = undefined instanceof x;
-// invalid right operand
-// the right operand to be of type Any or a subtype of the 'Function' interface type
-var b1;
-var b2;
-var b3;
 var b4;
-var o1;
-var o2;
-var o3;
 var rb1 = x instanceof b1;
 var rb2 = x instanceof b2;
 var rb3 = x instanceof b3;
@@ -98,10 +85,5 @@ var rb9 = x instanceof o2;
 var rb10 = x instanceof o3;
 // both operands are invalid
 var rc1 = '' instanceof {};
-// @@hasInstance restricts LHS
-var o4;
-var o5;
 var ra10 = o5 instanceof o4;
-// invalid @@hasInstance method return type on RHS
-var o6;
 var rb11 = x instanceof o6;
diff --git a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.symbols b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.symbols
index 4936b1a4ac7e6..3436bc778342c 100644
--- a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.symbols
+++ b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.symbols
@@ -13,31 +13,31 @@ var x: any;
 
 // invalid left operand
 // the left operand is required to be of type Any, an object type, or a type parameter type
-var a1: number;
->a1 : Symbol(a1, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 8, 3))
+declare var a1: number;
+>a1 : Symbol(a1, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 8, 11))
 
-var a2: boolean;
->a2 : Symbol(a2, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 9, 3))
+declare var a2: boolean;
+>a2 : Symbol(a2, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 9, 11))
 
-var a3: string;
->a3 : Symbol(a3, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 10, 3))
+declare var a3: string;
+>a3 : Symbol(a3, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 10, 11))
 
 var a4: void;
 >a4 : Symbol(a4, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 11, 3))
 
 var ra1 = a1 instanceof x;
 >ra1 : Symbol(ra1, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 13, 3))
->a1 : Symbol(a1, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 8, 3))
+>a1 : Symbol(a1, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 8, 11))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 4, 3))
 
 var ra2 = a2 instanceof x;
 >ra2 : Symbol(ra2, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 14, 3))
->a2 : Symbol(a2, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 9, 3))
+>a2 : Symbol(a2, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 9, 11))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 4, 3))
 
 var ra3 = a3 instanceof x;
 >ra3 : Symbol(ra3, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 15, 3))
->a3 : Symbol(a3, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 10, 3))
+>a3 : Symbol(a3, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 10, 11))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 4, 3))
 
 var ra4 = a4 instanceof x;
@@ -68,43 +68,43 @@ var ra9 = undefined instanceof x;
 
 // invalid right operand
 // the right operand to be of type Any or a subtype of the 'Function' interface type
-var b1: number;
->b1 : Symbol(b1, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 25, 3))
+declare var b1: number;
+>b1 : Symbol(b1, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 25, 11))
 
-var b2: boolean;
->b2 : Symbol(b2, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 26, 3))
+declare var b2: boolean;
+>b2 : Symbol(b2, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 26, 11))
 
-var b3: string;
->b3 : Symbol(b3, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 27, 3))
+declare var b3: string;
+>b3 : Symbol(b3, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 27, 11))
 
 var b4: void;
 >b4 : Symbol(b4, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 28, 3))
 
-var o1: {};
->o1 : Symbol(o1, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 29, 3))
+declare var o1: {};
+>o1 : Symbol(o1, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 29, 11))
 
-var o2: Object;
->o2 : Symbol(o2, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 30, 3))
+declare var o2: Object;
+>o2 : Symbol(o2, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 30, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
-var o3: C;
->o3 : Symbol(o3, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 31, 3))
+declare var o3: C;
+>o3 : Symbol(o3, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 31, 11))
 >C : Symbol(C, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 0, 0))
 
 var rb1 = x instanceof b1;
 >rb1 : Symbol(rb1, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 33, 3))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 4, 3))
->b1 : Symbol(b1, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 25, 3))
+>b1 : Symbol(b1, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 25, 11))
 
 var rb2 = x instanceof b2;
 >rb2 : Symbol(rb2, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 34, 3))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 4, 3))
->b2 : Symbol(b2, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 26, 3))
+>b2 : Symbol(b2, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 26, 11))
 
 var rb3 = x instanceof b3;
 >rb3 : Symbol(rb3, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 35, 3))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 4, 3))
->b3 : Symbol(b3, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 27, 3))
+>b3 : Symbol(b3, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 27, 11))
 
 var rb4 = x instanceof b4;
 >rb4 : Symbol(rb4, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 36, 3))
@@ -126,52 +126,52 @@ var rb7 = x instanceof '';
 var rb8 = x instanceof o1;
 >rb8 : Symbol(rb8, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 40, 3))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 4, 3))
->o1 : Symbol(o1, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 29, 3))
+>o1 : Symbol(o1, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 29, 11))
 
 var rb9 = x instanceof o2;
 >rb9 : Symbol(rb9, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 41, 3))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 4, 3))
->o2 : Symbol(o2, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 30, 3))
+>o2 : Symbol(o2, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 30, 11))
 
 var rb10 = x instanceof o3;
 >rb10 : Symbol(rb10, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 42, 3))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 4, 3))
->o3 : Symbol(o3, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 31, 3))
+>o3 : Symbol(o3, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 31, 11))
 
 // both operands are invalid
 var rc1 = '' instanceof {};
 >rc1 : Symbol(rc1, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 45, 3))
 
 // @@hasInstance restricts LHS
-var o4: {[Symbol.hasInstance](value: { x: number }): boolean;};
->o4 : Symbol(o4, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 48, 3))
->[Symbol.hasInstance] : Symbol([Symbol.hasInstance], Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 48, 9))
+declare var o4: {[Symbol.hasInstance](value: { x: number }): boolean;};
+>o4 : Symbol(o4, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 48, 11))
+>[Symbol.hasInstance] : Symbol([Symbol.hasInstance], Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 48, 17))
 >Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->value : Symbol(value, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 48, 30))
->x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 48, 38))
+>value : Symbol(value, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 48, 38))
+>x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 48, 46))
 
-var o5: { y: string };
->o5 : Symbol(o5, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 49, 3))
->y : Symbol(y, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 49, 9))
+declare var o5: { y: string };
+>o5 : Symbol(o5, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 49, 11))
+>y : Symbol(y, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 49, 17))
 
 var ra10 = o5 instanceof o4;
 >ra10 : Symbol(ra10, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 50, 3))
->o5 : Symbol(o5, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 49, 3))
->o4 : Symbol(o4, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 48, 3))
+>o5 : Symbol(o5, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 49, 11))
+>o4 : Symbol(o4, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 48, 11))
 
 // invalid @@hasInstance method return type on RHS
-var o6: {[Symbol.hasInstance](value: unknown): number;};
->o6 : Symbol(o6, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 53, 3))
->[Symbol.hasInstance] : Symbol([Symbol.hasInstance], Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 53, 9))
+declare var o6: {[Symbol.hasInstance](value: unknown): number;};
+>o6 : Symbol(o6, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 53, 11))
+>[Symbol.hasInstance] : Symbol([Symbol.hasInstance], Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 53, 17))
 >Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->value : Symbol(value, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 53, 30))
+>value : Symbol(value, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 53, 38))
 
 var rb11 = x instanceof o6;
 >rb11 : Symbol(rb11, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 54, 3))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 4, 3))
->o6 : Symbol(o6, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 53, 3))
+>o6 : Symbol(o6, Decl(instanceofOperatorWithInvalidOperands.es2015.ts, 53, 11))
 
diff --git a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.types b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.types
index e51568e6aaf41..29e9633551de8 100644
--- a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.types
+++ b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.es2015.types
@@ -16,15 +16,15 @@ var x: any;
 
 // invalid left operand
 // the left operand is required to be of type Any, an object type, or a type parameter type
-var a1: number;
+declare var a1: number;
 >a1 : number
 >   : ^^^^^^
 
-var a2: boolean;
+declare var a2: boolean;
 >a2 : boolean
 >   : ^^^^^^^
 
-var a3: string;
+declare var a3: string;
 >a3 : string
 >   : ^^^^^^
 
@@ -122,15 +122,15 @@ var ra9 = undefined instanceof x;
 
 // invalid right operand
 // the right operand to be of type Any or a subtype of the 'Function' interface type
-var b1: number;
+declare var b1: number;
 >b1 : number
 >   : ^^^^^^
 
-var b2: boolean;
+declare var b2: boolean;
 >b2 : boolean
 >   : ^^^^^^^
 
-var b3: string;
+declare var b3: string;
 >b3 : string
 >   : ^^^^^^
 
@@ -138,15 +138,15 @@ var b4: void;
 >b4 : void
 >   : ^^^^
 
-var o1: {};
+declare var o1: {};
 >o1 : {}
 >   : ^^
 
-var o2: Object;
+declare var o2: Object;
 >o2 : Object
 >   : ^^^^^^
 
-var o3: C;
+declare var o3: C;
 >o3 : C
 >   : ^
 
@@ -262,7 +262,7 @@ var rc1 = '' instanceof {};
 >   : ^^
 
 // @@hasInstance restricts LHS
-var o4: {[Symbol.hasInstance](value: { x: number }): boolean;};
+declare var o4: {[Symbol.hasInstance](value: { x: number }): boolean;};
 >o4 : { [Symbol.hasInstance](value: { x: number; }): boolean; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^     ^^              ^^^       ^^^
 >[Symbol.hasInstance] : (value: { x: number; }) => boolean
@@ -278,7 +278,7 @@ var o4: {[Symbol.hasInstance](value: { x: number }): boolean;};
 >x : number
 >  : ^^^^^^
 
-var o5: { y: string };
+declare var o5: { y: string };
 >o5 : { y: string; }
 >   : ^^^^^      ^^^
 >y : string
@@ -295,7 +295,7 @@ var ra10 = o5 instanceof o4;
 >   : ^^^^^^^^^^^^^^^^^^^^^^^     ^^              ^^^       ^^^
 
 // invalid @@hasInstance method return type on RHS
-var o6: {[Symbol.hasInstance](value: unknown): number;};
+declare var o6: {[Symbol.hasInstance](value: unknown): number;};
 >o6 : { [Symbol.hasInstance](value: unknown): number; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^     ^^       ^^^      ^^^
 >[Symbol.hasInstance] : (value: unknown) => number
diff --git a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js
index 680a04512e1fe..9425be9addc03 100644
--- a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js
+++ b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js
@@ -9,9 +9,9 @@ var x: any;
 
 // invalid left operand
 // the left operand is required to be of type Any, an object type, or a type parameter type
-var a1: number;
-var a2: boolean;
-var a3: string;
+declare var a1: number;
+declare var a2: boolean;
+declare var a3: string;
 var a4: void;
 
 var ra1 = a1 instanceof x;
@@ -26,13 +26,13 @@ var ra9 = undefined instanceof x;
 
 // invalid right operand
 // the right operand to be of type Any or a subtype of the 'Function' interface type
-var b1: number;
-var b2: boolean;
-var b3: string;
-var b4: void;
-var o1: {};
-var o2: Object;
-var o3: C;
+declare var b1: number;
+declare var b2: boolean;
+declare var b3: string;
+declare var b4: void;
+declare var o1: {};
+declare var o2: Object;
+declare var o3: C;
 
 var rb1 = x instanceof b1;
 var rb2 = x instanceof b2;
@@ -56,11 +56,6 @@ var C = /** @class */ (function () {
     return C;
 }());
 var x;
-// invalid left operand
-// the left operand is required to be of type Any, an object type, or a type parameter type
-var a1;
-var a2;
-var a3;
 var a4;
 var ra1 = a1 instanceof x;
 var ra2 = a2 instanceof x;
@@ -71,15 +66,6 @@ var ra6 = true instanceof x;
 var ra7 = '' instanceof x;
 var ra8 = null instanceof x;
 var ra9 = undefined instanceof x;
-// invalid right operand
-// the right operand to be of type Any or a subtype of the 'Function' interface type
-var b1;
-var b2;
-var b3;
-var b4;
-var o1;
-var o2;
-var o3;
 var rb1 = x instanceof b1;
 var rb2 = x instanceof b2;
 var rb3 = x instanceof b3;
diff --git a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.symbols b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.symbols
index 9a10203d97b14..8a344b1885c7d 100644
--- a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.symbols
+++ b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.symbols
@@ -13,31 +13,31 @@ var x: any;
 
 // invalid left operand
 // the left operand is required to be of type Any, an object type, or a type parameter type
-var a1: number;
->a1 : Symbol(a1, Decl(instanceofOperatorWithInvalidOperands.ts, 8, 3))
+declare var a1: number;
+>a1 : Symbol(a1, Decl(instanceofOperatorWithInvalidOperands.ts, 8, 11))
 
-var a2: boolean;
->a2 : Symbol(a2, Decl(instanceofOperatorWithInvalidOperands.ts, 9, 3))
+declare var a2: boolean;
+>a2 : Symbol(a2, Decl(instanceofOperatorWithInvalidOperands.ts, 9, 11))
 
-var a3: string;
->a3 : Symbol(a3, Decl(instanceofOperatorWithInvalidOperands.ts, 10, 3))
+declare var a3: string;
+>a3 : Symbol(a3, Decl(instanceofOperatorWithInvalidOperands.ts, 10, 11))
 
 var a4: void;
 >a4 : Symbol(a4, Decl(instanceofOperatorWithInvalidOperands.ts, 11, 3))
 
 var ra1 = a1 instanceof x;
 >ra1 : Symbol(ra1, Decl(instanceofOperatorWithInvalidOperands.ts, 13, 3))
->a1 : Symbol(a1, Decl(instanceofOperatorWithInvalidOperands.ts, 8, 3))
+>a1 : Symbol(a1, Decl(instanceofOperatorWithInvalidOperands.ts, 8, 11))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.ts, 4, 3))
 
 var ra2 = a2 instanceof x;
 >ra2 : Symbol(ra2, Decl(instanceofOperatorWithInvalidOperands.ts, 14, 3))
->a2 : Symbol(a2, Decl(instanceofOperatorWithInvalidOperands.ts, 9, 3))
+>a2 : Symbol(a2, Decl(instanceofOperatorWithInvalidOperands.ts, 9, 11))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.ts, 4, 3))
 
 var ra3 = a3 instanceof x;
 >ra3 : Symbol(ra3, Decl(instanceofOperatorWithInvalidOperands.ts, 15, 3))
->a3 : Symbol(a3, Decl(instanceofOperatorWithInvalidOperands.ts, 10, 3))
+>a3 : Symbol(a3, Decl(instanceofOperatorWithInvalidOperands.ts, 10, 11))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.ts, 4, 3))
 
 var ra4 = a4 instanceof x;
@@ -68,48 +68,48 @@ var ra9 = undefined instanceof x;
 
 // invalid right operand
 // the right operand to be of type Any or a subtype of the 'Function' interface type
-var b1: number;
->b1 : Symbol(b1, Decl(instanceofOperatorWithInvalidOperands.ts, 25, 3))
+declare var b1: number;
+>b1 : Symbol(b1, Decl(instanceofOperatorWithInvalidOperands.ts, 25, 11))
 
-var b2: boolean;
->b2 : Symbol(b2, Decl(instanceofOperatorWithInvalidOperands.ts, 26, 3))
+declare var b2: boolean;
+>b2 : Symbol(b2, Decl(instanceofOperatorWithInvalidOperands.ts, 26, 11))
 
-var b3: string;
->b3 : Symbol(b3, Decl(instanceofOperatorWithInvalidOperands.ts, 27, 3))
+declare var b3: string;
+>b3 : Symbol(b3, Decl(instanceofOperatorWithInvalidOperands.ts, 27, 11))
 
-var b4: void;
->b4 : Symbol(b4, Decl(instanceofOperatorWithInvalidOperands.ts, 28, 3))
+declare var b4: void;
+>b4 : Symbol(b4, Decl(instanceofOperatorWithInvalidOperands.ts, 28, 11))
 
-var o1: {};
->o1 : Symbol(o1, Decl(instanceofOperatorWithInvalidOperands.ts, 29, 3))
+declare var o1: {};
+>o1 : Symbol(o1, Decl(instanceofOperatorWithInvalidOperands.ts, 29, 11))
 
-var o2: Object;
->o2 : Symbol(o2, Decl(instanceofOperatorWithInvalidOperands.ts, 30, 3))
+declare var o2: Object;
+>o2 : Symbol(o2, Decl(instanceofOperatorWithInvalidOperands.ts, 30, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
-var o3: C;
->o3 : Symbol(o3, Decl(instanceofOperatorWithInvalidOperands.ts, 31, 3))
+declare var o3: C;
+>o3 : Symbol(o3, Decl(instanceofOperatorWithInvalidOperands.ts, 31, 11))
 >C : Symbol(C, Decl(instanceofOperatorWithInvalidOperands.ts, 0, 0))
 
 var rb1 = x instanceof b1;
 >rb1 : Symbol(rb1, Decl(instanceofOperatorWithInvalidOperands.ts, 33, 3))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.ts, 4, 3))
->b1 : Symbol(b1, Decl(instanceofOperatorWithInvalidOperands.ts, 25, 3))
+>b1 : Symbol(b1, Decl(instanceofOperatorWithInvalidOperands.ts, 25, 11))
 
 var rb2 = x instanceof b2;
 >rb2 : Symbol(rb2, Decl(instanceofOperatorWithInvalidOperands.ts, 34, 3))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.ts, 4, 3))
->b2 : Symbol(b2, Decl(instanceofOperatorWithInvalidOperands.ts, 26, 3))
+>b2 : Symbol(b2, Decl(instanceofOperatorWithInvalidOperands.ts, 26, 11))
 
 var rb3 = x instanceof b3;
 >rb3 : Symbol(rb3, Decl(instanceofOperatorWithInvalidOperands.ts, 35, 3))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.ts, 4, 3))
->b3 : Symbol(b3, Decl(instanceofOperatorWithInvalidOperands.ts, 27, 3))
+>b3 : Symbol(b3, Decl(instanceofOperatorWithInvalidOperands.ts, 27, 11))
 
 var rb4 = x instanceof b4;
 >rb4 : Symbol(rb4, Decl(instanceofOperatorWithInvalidOperands.ts, 36, 3))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.ts, 4, 3))
->b4 : Symbol(b4, Decl(instanceofOperatorWithInvalidOperands.ts, 28, 3))
+>b4 : Symbol(b4, Decl(instanceofOperatorWithInvalidOperands.ts, 28, 11))
 
 var rb5 = x instanceof 0;
 >rb5 : Symbol(rb5, Decl(instanceofOperatorWithInvalidOperands.ts, 37, 3))
@@ -126,17 +126,17 @@ var rb7 = x instanceof '';
 var rb8 = x instanceof o1;
 >rb8 : Symbol(rb8, Decl(instanceofOperatorWithInvalidOperands.ts, 40, 3))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.ts, 4, 3))
->o1 : Symbol(o1, Decl(instanceofOperatorWithInvalidOperands.ts, 29, 3))
+>o1 : Symbol(o1, Decl(instanceofOperatorWithInvalidOperands.ts, 29, 11))
 
 var rb9 = x instanceof o2;
 >rb9 : Symbol(rb9, Decl(instanceofOperatorWithInvalidOperands.ts, 41, 3))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.ts, 4, 3))
->o2 : Symbol(o2, Decl(instanceofOperatorWithInvalidOperands.ts, 30, 3))
+>o2 : Symbol(o2, Decl(instanceofOperatorWithInvalidOperands.ts, 30, 11))
 
 var rb10 = x instanceof o3;
 >rb10 : Symbol(rb10, Decl(instanceofOperatorWithInvalidOperands.ts, 42, 3))
 >x : Symbol(x, Decl(instanceofOperatorWithInvalidOperands.ts, 4, 3))
->o3 : Symbol(o3, Decl(instanceofOperatorWithInvalidOperands.ts, 31, 3))
+>o3 : Symbol(o3, Decl(instanceofOperatorWithInvalidOperands.ts, 31, 11))
 
 // both operands are invalid
 var rc1 = '' instanceof {};
diff --git a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.types b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.types
index a69a90c78ce97..5d625e0357d1e 100644
--- a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.types
+++ b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.types
@@ -16,15 +16,15 @@ var x: any;
 
 // invalid left operand
 // the left operand is required to be of type Any, an object type, or a type parameter type
-var a1: number;
+declare var a1: number;
 >a1 : number
 >   : ^^^^^^
 
-var a2: boolean;
+declare var a2: boolean;
 >a2 : boolean
 >   : ^^^^^^^
 
-var a3: string;
+declare var a3: string;
 >a3 : string
 >   : ^^^^^^
 
@@ -122,31 +122,31 @@ var ra9 = undefined instanceof x;
 
 // invalid right operand
 // the right operand to be of type Any or a subtype of the 'Function' interface type
-var b1: number;
+declare var b1: number;
 >b1 : number
 >   : ^^^^^^
 
-var b2: boolean;
+declare var b2: boolean;
 >b2 : boolean
 >   : ^^^^^^^
 
-var b3: string;
+declare var b3: string;
 >b3 : string
 >   : ^^^^^^
 
-var b4: void;
+declare var b4: void;
 >b4 : void
 >   : ^^^^
 
-var o1: {};
+declare var o1: {};
 >o1 : {}
 >   : ^^
 
-var o2: Object;
+declare var o2: Object;
 >o2 : Object
 >   : ^^^^^^
 
-var o3: C;
+declare var o3: C;
 >o3 : C
 >   : ^
 
diff --git a/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.errors.txt b/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.errors.txt
index 32e765fd462a4..45769b668f598 100644
--- a/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.errors.txt
+++ b/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.errors.txt
@@ -9,7 +9,7 @@ instantiateNonGenericTypeWithTypeArguments.ts(18,10): error TS2347: Untyped func
     // all of these are errors
     
     class C {
-        x: string;
+        x!: string;
     }
     
     var c = new C<number>();
@@ -21,7 +21,7 @@ instantiateNonGenericTypeWithTypeArguments.ts(18,10): error TS2347: Untyped func
                     ~~~~~~
 !!! error TS2558: Expected 0 type arguments, but got 1.
     
-    var f: { (): void };
+    declare var f: { (): void };
     var r2 = new f<number>();
                    ~~~~~~
 !!! error TS2558: Expected 0 type arguments, but got 1.
diff --git a/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js b/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js
index e34f3394a44be..0b4ecc6ccf469 100644
--- a/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js
+++ b/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js
@@ -5,7 +5,7 @@
 // all of these are errors
 
 class C {
-    x: string;
+    x!: string;
 }
 
 var c = new C<number>();
@@ -13,7 +13,7 @@ var c = new C<number>();
 function Foo(): void { }
 var r = new Foo<number>();
 
-var f: { (): void };
+declare var f: { (): void };
 var r2 = new f<number>();
 
 var a: any;
@@ -31,7 +31,6 @@ var C = /** @class */ (function () {
 var c = new C();
 function Foo() { }
 var r = new Foo();
-var f;
 var r2 = new f();
 var a;
 // BUG 790977
diff --git a/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.symbols b/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.symbols
index fc22359c8b33e..6342f22294528 100644
--- a/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.symbols
+++ b/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.symbols
@@ -7,7 +7,7 @@
 class C {
 >C : Symbol(C, Decl(instantiateNonGenericTypeWithTypeArguments.ts, 0, 0))
 
-    x: string;
+    x!: string;
 >x : Symbol(C.x, Decl(instantiateNonGenericTypeWithTypeArguments.ts, 3, 9))
 }
 
@@ -22,12 +22,12 @@ var r = new Foo<number>();
 >r : Symbol(r, Decl(instantiateNonGenericTypeWithTypeArguments.ts, 10, 3))
 >Foo : Symbol(Foo, Decl(instantiateNonGenericTypeWithTypeArguments.ts, 7, 24))
 
-var f: { (): void };
->f : Symbol(f, Decl(instantiateNonGenericTypeWithTypeArguments.ts, 12, 3))
+declare var f: { (): void };
+>f : Symbol(f, Decl(instantiateNonGenericTypeWithTypeArguments.ts, 12, 11))
 
 var r2 = new f<number>();
 >r2 : Symbol(r2, Decl(instantiateNonGenericTypeWithTypeArguments.ts, 13, 3), Decl(instantiateNonGenericTypeWithTypeArguments.ts, 17, 3))
->f : Symbol(f, Decl(instantiateNonGenericTypeWithTypeArguments.ts, 12, 3))
+>f : Symbol(f, Decl(instantiateNonGenericTypeWithTypeArguments.ts, 12, 11))
 
 var a: any;
 >a : Symbol(a, Decl(instantiateNonGenericTypeWithTypeArguments.ts, 15, 3))
diff --git a/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.types b/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.types
index 122bffd2bd563..a04a58d2e8241 100644
--- a/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.types
+++ b/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.types
@@ -8,7 +8,7 @@ class C {
 >C : C
 >  : ^
 
-    x: string;
+    x!: string;
 >x : string
 >  : ^^^^^^
 }
@@ -33,7 +33,7 @@ var r = new Foo<number>();
 >Foo : () => void
 >    : ^^^^^^    
 
-var f: { (): void };
+declare var f: { (): void };
 >f : () => void
 >  : ^^^^^^    
 
diff --git a/tests/baselines/reference/intTypeCheck.errors.txt b/tests/baselines/reference/intTypeCheck.errors.txt
index 7555e19a87bbb..106687e9d5c29 100644
--- a/tests/baselines/reference/intTypeCheck.errors.txt
+++ b/tests/baselines/reference/intTypeCheck.errors.txt
@@ -194,7 +194,7 @@ intTypeCheck.ts(205,21): error TS2351: This expression is not constructable.
     //
     // Property signatures
     //
-    var obj0: i1;
+    declare var obj0: i1;
     var obj1: i1 = {
         p: null,
         p3: function ():any { return 0; },
@@ -232,7 +232,7 @@ intTypeCheck.ts(205,21): error TS2351: This expression is not constructable.
     //
     // Call signatures
     //
-    var obj11: i2;
+    declare var obj11: i2;
     var obj12: i2 = {};
         ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'i2'.
@@ -267,7 +267,7 @@ intTypeCheck.ts(205,21): error TS2351: This expression is not constructable.
     //
     // Construct Signatures
     //
-    var obj22: i3;
+    declare var obj22: i3;
     var obj23: i3 = {};
         ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'i3'.
@@ -303,7 +303,7 @@ intTypeCheck.ts(205,21): error TS2351: This expression is not constructable.
     //
     // Index Signatures
     //
-    var obj33: i4;
+    declare var obj33: i4;
     var obj34: i4 = {};
     var obj35: i4 = new Object();
     var obj36: i4 = new obj33;
@@ -329,7 +329,7 @@ intTypeCheck.ts(205,21): error TS2351: This expression is not constructable.
     //
     // Interface Derived I1
     //
-    var obj44: i5;
+    declare var obj44: i5;
     var obj45: i5 = {};
         ~~~~~
 !!! error TS2739: Type '{}' is missing the following properties from type 'i5': p, p3, p6
@@ -364,7 +364,7 @@ intTypeCheck.ts(205,21): error TS2351: This expression is not constructable.
     //
     // Interface Derived I2
     //
-    var obj55: i6;
+    declare var obj55: i6;
     var obj56: i6 = {};
         ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'i6'.
@@ -402,7 +402,7 @@ intTypeCheck.ts(205,21): error TS2351: This expression is not constructable.
     //
     // Interface Derived I3
     //
-    var obj66: i7;
+    declare var obj66: i7;
     var obj67: i7 = {};
         ~~~~~
 !!! error TS2322: Type '{}' is not assignable to type 'i7'.
@@ -438,7 +438,7 @@ intTypeCheck.ts(205,21): error TS2351: This expression is not constructable.
     //
     // Interface Derived I4
     //
-    var obj77: i8;
+    declare var obj77: i8;
     var obj78: i8 = {};
     var obj79: i8 = new Object();
     var obj80: i8 = new obj77;
diff --git a/tests/baselines/reference/intTypeCheck.js b/tests/baselines/reference/intTypeCheck.js
index 757ed02e5dddf..2efd21cbe1902 100644
--- a/tests/baselines/reference/intTypeCheck.js
+++ b/tests/baselines/reference/intTypeCheck.js
@@ -92,7 +92,7 @@ var anyVar: any;
 //
 // Property signatures
 //
-var obj0: i1;
+declare var obj0: i1;
 var obj1: i1 = {
     p: null,
     p3: function ():any { return 0; },
@@ -111,7 +111,7 @@ var obj10: i1 = new {};
 //
 // Call signatures
 //
-var obj11: i2;
+declare var obj11: i2;
 var obj12: i2 = {};
 var obj13: i2 = new Object();
 var obj14: i2 = new obj11;
@@ -125,7 +125,7 @@ var obj21: i2 = new {};
 //
 // Construct Signatures
 //
-var obj22: i3;
+declare var obj22: i3;
 var obj23: i3 = {};
 var obj24: i3 = new Object();
 var obj25: i3 = new obj22;
@@ -139,7 +139,7 @@ var obj32: i3 = new {};
 //
 // Index Signatures
 //
-var obj33: i4;
+declare var obj33: i4;
 var obj34: i4 = {};
 var obj35: i4 = new Object();
 var obj36: i4 = new obj33;
@@ -153,7 +153,7 @@ var obj43: i4 = new {};
 //
 // Interface Derived I1
 //
-var obj44: i5;
+declare var obj44: i5;
 var obj45: i5 = {};
 var obj46: i5 = new Object();
 var obj47: i5 = new obj44;
@@ -167,7 +167,7 @@ var obj54: i5 = new {};
 //
 // Interface Derived I2
 //
-var obj55: i6;
+declare var obj55: i6;
 var obj56: i6 = {};
 var obj57: i6 = new Object();
 var obj58: i6 = new obj55;
@@ -181,7 +181,7 @@ var obj65: i6 = new {};
 //
 // Interface Derived I3
 //
-var obj66: i7;
+declare var obj66: i7;
 var obj67: i7 = {};
 var obj68: i7 = new Object();
 var obj69: i7 = new obj66;
@@ -195,7 +195,7 @@ var obj76: i7 = new {};
 //
 // Interface Derived I4
 //
-var obj77: i8;
+declare var obj77: i8;
 var obj78: i8 = {};
 var obj79: i8 = new Object();
 var obj80: i8 = new obj77;
@@ -215,10 +215,6 @@ var Base = /** @class */ (function () {
     return Base;
 }());
 var anyVar;
-//
-// Property signatures
-//
-var obj0;
 var obj1 = {
     p: null,
     p3: function () { return 0; },
@@ -234,10 +230,6 @@ var obj6 = function () { };
 var obj8 = anyVar;
 var obj9 = new  < i1 > anyVar;
 var obj10 = new {};
-//
-// Call signatures
-//
-var obj11;
 var obj12 = {};
 var obj13 = new Object();
 var obj14 = new obj11;
@@ -248,10 +240,6 @@ var obj17 = function () { return 0; };
 var obj19 = anyVar;
 var obj20 = new  < i2 > anyVar;
 var obj21 = new {};
-//
-// Construct Signatures
-//
-var obj22;
 var obj23 = {};
 var obj24 = new Object();
 var obj25 = new obj22;
@@ -262,10 +250,6 @@ var obj28 = function () { };
 var obj30 = anyVar;
 var obj31 = new  < i3 > anyVar;
 var obj32 = new {};
-//
-// Index Signatures
-//
-var obj33;
 var obj34 = {};
 var obj35 = new Object();
 var obj36 = new obj33;
@@ -276,10 +260,6 @@ var obj39 = function () { };
 var obj41 = anyVar;
 var obj42 = new  < i4 > anyVar;
 var obj43 = new {};
-//
-// Interface Derived I1
-//
-var obj44;
 var obj45 = {};
 var obj46 = new Object();
 var obj47 = new obj44;
@@ -290,10 +270,6 @@ var obj50 = function () { };
 var obj52 = anyVar;
 var obj53 = new  < i5 > anyVar;
 var obj54 = new {};
-//
-// Interface Derived I2
-//
-var obj55;
 var obj56 = {};
 var obj57 = new Object();
 var obj58 = new obj55;
@@ -304,10 +280,6 @@ var obj61 = function () { };
 var obj63 = anyVar;
 var obj64 = new  < i6 > anyVar;
 var obj65 = new {};
-//
-// Interface Derived I3
-//
-var obj66;
 var obj67 = {};
 var obj68 = new Object();
 var obj69 = new obj66;
@@ -318,10 +290,6 @@ var obj72 = function () { };
 var obj74 = anyVar;
 var obj75 = new  < i7 > anyVar;
 var obj76 = new {};
-//
-// Interface Derived I4
-//
-var obj77;
 var obj78 = {};
 var obj79 = new Object();
 var obj80 = new obj77;
diff --git a/tests/baselines/reference/intTypeCheck.symbols b/tests/baselines/reference/intTypeCheck.symbols
index dcdddf3eea17f..b156159f70faa 100644
--- a/tests/baselines/reference/intTypeCheck.symbols
+++ b/tests/baselines/reference/intTypeCheck.symbols
@@ -220,8 +220,8 @@ var anyVar: any;
 //
 // Property signatures
 //
-var obj0: i1;
->obj0 : Symbol(obj0, Decl(intTypeCheck.ts, 91, 3))
+declare var obj0: i1;
+>obj0 : Symbol(obj0, Decl(intTypeCheck.ts, 91, 11))
 >i1 : Symbol(i1, Decl(intTypeCheck.ts, 0, 0))
 
 var obj1: i1 = {
@@ -252,7 +252,7 @@ var obj2: i1 = new Object();
 var obj3: i1 = new obj0;
 >obj3 : Symbol(obj3, Decl(intTypeCheck.ts, 99, 3))
 >i1 : Symbol(i1, Decl(intTypeCheck.ts, 0, 0))
->obj0 : Symbol(obj0, Decl(intTypeCheck.ts, 91, 3))
+>obj0 : Symbol(obj0, Decl(intTypeCheck.ts, 91, 11))
 
 var obj4: i1 = new Base;
 >obj4 : Symbol(obj4, Decl(intTypeCheck.ts, 100, 3))
@@ -286,8 +286,8 @@ var obj10: i1 = new {};
 //
 // Call signatures
 //
-var obj11: i2;
->obj11 : Symbol(obj11, Decl(intTypeCheck.ts, 110, 3))
+declare var obj11: i2;
+>obj11 : Symbol(obj11, Decl(intTypeCheck.ts, 110, 11))
 >i2 : Symbol(i2, Decl(intTypeCheck.ts, 10, 1))
 
 var obj12: i2 = {};
@@ -302,7 +302,7 @@ var obj13: i2 = new Object();
 var obj14: i2 = new obj11;
 >obj14 : Symbol(obj14, Decl(intTypeCheck.ts, 113, 3))
 >i2 : Symbol(i2, Decl(intTypeCheck.ts, 10, 1))
->obj11 : Symbol(obj11, Decl(intTypeCheck.ts, 110, 3))
+>obj11 : Symbol(obj11, Decl(intTypeCheck.ts, 110, 11))
 
 var obj15: i2 = new Base;
 >obj15 : Symbol(obj15, Decl(intTypeCheck.ts, 114, 3))
@@ -336,8 +336,8 @@ var obj21: i2 = new {};
 //
 // Construct Signatures
 //
-var obj22: i3;
->obj22 : Symbol(obj22, Decl(intTypeCheck.ts, 124, 3))
+declare var obj22: i3;
+>obj22 : Symbol(obj22, Decl(intTypeCheck.ts, 124, 11))
 >i3 : Symbol(i3, Decl(intTypeCheck.ts, 21, 1))
 
 var obj23: i3 = {};
@@ -352,7 +352,7 @@ var obj24: i3 = new Object();
 var obj25: i3 = new obj22;
 >obj25 : Symbol(obj25, Decl(intTypeCheck.ts, 127, 3))
 >i3 : Symbol(i3, Decl(intTypeCheck.ts, 21, 1))
->obj22 : Symbol(obj22, Decl(intTypeCheck.ts, 124, 3))
+>obj22 : Symbol(obj22, Decl(intTypeCheck.ts, 124, 11))
 
 var obj26: i3 = new Base;
 >obj26 : Symbol(obj26, Decl(intTypeCheck.ts, 128, 3))
@@ -386,8 +386,8 @@ var obj32: i3 = new {};
 //
 // Index Signatures
 //
-var obj33: i4;
->obj33 : Symbol(obj33, Decl(intTypeCheck.ts, 138, 3))
+declare var obj33: i4;
+>obj33 : Symbol(obj33, Decl(intTypeCheck.ts, 138, 11))
 >i4 : Symbol(i4, Decl(intTypeCheck.ts, 31, 1))
 
 var obj34: i4 = {};
@@ -402,7 +402,7 @@ var obj35: i4 = new Object();
 var obj36: i4 = new obj33;
 >obj36 : Symbol(obj36, Decl(intTypeCheck.ts, 141, 3))
 >i4 : Symbol(i4, Decl(intTypeCheck.ts, 31, 1))
->obj33 : Symbol(obj33, Decl(intTypeCheck.ts, 138, 3))
+>obj33 : Symbol(obj33, Decl(intTypeCheck.ts, 138, 11))
 
 var obj37: i4 = new Base;
 >obj37 : Symbol(obj37, Decl(intTypeCheck.ts, 142, 3))
@@ -436,8 +436,8 @@ var obj43: i4 = new {};
 //
 // Interface Derived I1
 //
-var obj44: i5;
->obj44 : Symbol(obj44, Decl(intTypeCheck.ts, 152, 3))
+declare var obj44: i5;
+>obj44 : Symbol(obj44, Decl(intTypeCheck.ts, 152, 11))
 >i5 : Symbol(i5, Decl(intTypeCheck.ts, 38, 1))
 
 var obj45: i5 = {};
@@ -452,7 +452,7 @@ var obj46: i5 = new Object();
 var obj47: i5 = new obj44;
 >obj47 : Symbol(obj47, Decl(intTypeCheck.ts, 155, 3))
 >i5 : Symbol(i5, Decl(intTypeCheck.ts, 38, 1))
->obj44 : Symbol(obj44, Decl(intTypeCheck.ts, 152, 3))
+>obj44 : Symbol(obj44, Decl(intTypeCheck.ts, 152, 11))
 
 var obj48: i5 = new Base;
 >obj48 : Symbol(obj48, Decl(intTypeCheck.ts, 156, 3))
@@ -486,8 +486,8 @@ var obj54: i5 = new {};
 //
 // Interface Derived I2
 //
-var obj55: i6;
->obj55 : Symbol(obj55, Decl(intTypeCheck.ts, 166, 3))
+declare var obj55: i6;
+>obj55 : Symbol(obj55, Decl(intTypeCheck.ts, 166, 11))
 >i6 : Symbol(i6, Decl(intTypeCheck.ts, 39, 27))
 
 var obj56: i6 = {};
@@ -502,7 +502,7 @@ var obj57: i6 = new Object();
 var obj58: i6 = new obj55;
 >obj58 : Symbol(obj58, Decl(intTypeCheck.ts, 169, 3))
 >i6 : Symbol(i6, Decl(intTypeCheck.ts, 39, 27))
->obj55 : Symbol(obj55, Decl(intTypeCheck.ts, 166, 3))
+>obj55 : Symbol(obj55, Decl(intTypeCheck.ts, 166, 11))
 
 var obj59: i6 = new Base;
 >obj59 : Symbol(obj59, Decl(intTypeCheck.ts, 170, 3))
@@ -536,8 +536,8 @@ var obj65: i6 = new {};
 //
 // Interface Derived I3
 //
-var obj66: i7;
->obj66 : Symbol(obj66, Decl(intTypeCheck.ts, 180, 3))
+declare var obj66: i7;
+>obj66 : Symbol(obj66, Decl(intTypeCheck.ts, 180, 11))
 >i7 : Symbol(i7, Decl(intTypeCheck.ts, 40, 27))
 
 var obj67: i7 = {};
@@ -552,7 +552,7 @@ var obj68: i7 = new Object();
 var obj69: i7 = new obj66;
 >obj69 : Symbol(obj69, Decl(intTypeCheck.ts, 183, 3))
 >i7 : Symbol(i7, Decl(intTypeCheck.ts, 40, 27))
->obj66 : Symbol(obj66, Decl(intTypeCheck.ts, 180, 3))
+>obj66 : Symbol(obj66, Decl(intTypeCheck.ts, 180, 11))
 
 var obj70: i7 = <i7>new Base;
 >obj70 : Symbol(obj70, Decl(intTypeCheck.ts, 184, 3))
@@ -587,8 +587,8 @@ var obj76: i7 = new {};
 //
 // Interface Derived I4
 //
-var obj77: i8;
->obj77 : Symbol(obj77, Decl(intTypeCheck.ts, 194, 3))
+declare var obj77: i8;
+>obj77 : Symbol(obj77, Decl(intTypeCheck.ts, 194, 11))
 >i8 : Symbol(i8, Decl(intTypeCheck.ts, 41, 27))
 
 var obj78: i8 = {};
@@ -603,7 +603,7 @@ var obj79: i8 = new Object();
 var obj80: i8 = new obj77;
 >obj80 : Symbol(obj80, Decl(intTypeCheck.ts, 197, 3))
 >i8 : Symbol(i8, Decl(intTypeCheck.ts, 41, 27))
->obj77 : Symbol(obj77, Decl(intTypeCheck.ts, 194, 3))
+>obj77 : Symbol(obj77, Decl(intTypeCheck.ts, 194, 11))
 
 var obj81: i8 = new Base;
 >obj81 : Symbol(obj81, Decl(intTypeCheck.ts, 198, 3))
diff --git a/tests/baselines/reference/intTypeCheck.types b/tests/baselines/reference/intTypeCheck.types
index cf1d1dc400001..ad188272b3de0 100644
--- a/tests/baselines/reference/intTypeCheck.types
+++ b/tests/baselines/reference/intTypeCheck.types
@@ -267,7 +267,7 @@ var anyVar: any;
 //
 // Property signatures
 //
-var obj0: i1;
+declare var obj0: i1;
 >obj0 : i1
 >     : ^^
 
@@ -382,7 +382,7 @@ var obj10: i1 = new {};
 //
 // Call signatures
 //
-var obj11: i2;
+declare var obj11: i2;
 >obj11 : i2
 >      : ^^
 
@@ -464,7 +464,7 @@ var obj21: i2 = new {};
 //
 // Construct Signatures
 //
-var obj22: i3;
+declare var obj22: i3;
 >obj22 : i3
 >      : ^^
 
@@ -544,7 +544,7 @@ var obj32: i3 = new {};
 //
 // Index Signatures
 //
-var obj33: i4;
+declare var obj33: i4;
 >obj33 : i4
 >      : ^^
 
@@ -624,7 +624,7 @@ var obj43: i4 = new {};
 //
 // Interface Derived I1
 //
-var obj44: i5;
+declare var obj44: i5;
 >obj44 : i5
 >      : ^^
 
@@ -704,7 +704,7 @@ var obj54: i5 = new {};
 //
 // Interface Derived I2
 //
-var obj55: i6;
+declare var obj55: i6;
 >obj55 : i6
 >      : ^^
 
@@ -784,7 +784,7 @@ var obj65: i6 = new {};
 //
 // Interface Derived I3
 //
-var obj66: i7;
+declare var obj66: i7;
 >obj66 : i7
 >      : ^^
 
@@ -866,7 +866,7 @@ var obj76: i7 = new {};
 //
 // Interface Derived I4
 //
-var obj77: i8;
+declare var obj77: i8;
 >obj77 : i8
 >      : ^^
 
diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates.errors.txt b/tests/baselines/reference/interfaceExtendingClassWithPrivates.errors.txt
index 47e3f90201708..098b8307e1944 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithPrivates.errors.txt
+++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates.errors.txt
@@ -5,7 +5,7 @@ interfaceExtendingClassWithPrivates.ts(15,12): error TS2341: Property 'x' is pri
 
 ==== interfaceExtendingClassWithPrivates.ts (2 errors) ====
     class Foo {
-        private x: string;
+        private x!: string;
     }
     
     interface I extends Foo { // error
@@ -19,7 +19,7 @@ interfaceExtendingClassWithPrivates.ts(15,12): error TS2341: Property 'x' is pri
         y: string;
     }
     
-    var i: I2;
+    declare var i: I2;
     var r = i.y;
     var r2 = i.x; // error
                ~
diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates.js b/tests/baselines/reference/interfaceExtendingClassWithPrivates.js
index e65f79cc841e9..57fc7fe3b6d23 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithPrivates.js
+++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates.js
@@ -2,7 +2,7 @@
 
 //// [interfaceExtendingClassWithPrivates.ts]
 class Foo {
-    private x: string;
+    private x!: string;
 }
 
 interface I extends Foo { // error
@@ -13,7 +13,7 @@ interface I2 extends Foo {
     y: string;
 }
 
-var i: I2;
+declare var i: I2;
 var r = i.y;
 var r2 = i.x; // error
 
@@ -23,6 +23,5 @@ var Foo = /** @class */ (function () {
     }
     return Foo;
 }());
-var i;
 var r = i.y;
 var r2 = i.x; // error
diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates.symbols b/tests/baselines/reference/interfaceExtendingClassWithPrivates.symbols
index b592c0b2be2d1..81c0af39777c4 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithPrivates.symbols
+++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates.symbols
@@ -4,7 +4,7 @@
 class Foo {
 >Foo : Symbol(Foo, Decl(interfaceExtendingClassWithPrivates.ts, 0, 0))
 
-    private x: string;
+    private x!: string;
 >x : Symbol(Foo.x, Decl(interfaceExtendingClassWithPrivates.ts, 0, 11))
 }
 
@@ -24,19 +24,19 @@ interface I2 extends Foo {
 >y : Symbol(I2.y, Decl(interfaceExtendingClassWithPrivates.ts, 8, 26))
 }
 
-var i: I2;
->i : Symbol(i, Decl(interfaceExtendingClassWithPrivates.ts, 12, 3))
+declare var i: I2;
+>i : Symbol(i, Decl(interfaceExtendingClassWithPrivates.ts, 12, 11))
 >I2 : Symbol(I2, Decl(interfaceExtendingClassWithPrivates.ts, 6, 1))
 
 var r = i.y;
 >r : Symbol(r, Decl(interfaceExtendingClassWithPrivates.ts, 13, 3))
 >i.y : Symbol(I2.y, Decl(interfaceExtendingClassWithPrivates.ts, 8, 26))
->i : Symbol(i, Decl(interfaceExtendingClassWithPrivates.ts, 12, 3))
+>i : Symbol(i, Decl(interfaceExtendingClassWithPrivates.ts, 12, 11))
 >y : Symbol(I2.y, Decl(interfaceExtendingClassWithPrivates.ts, 8, 26))
 
 var r2 = i.x; // error
 >r2 : Symbol(r2, Decl(interfaceExtendingClassWithPrivates.ts, 14, 3))
 >i.x : Symbol(Foo.x, Decl(interfaceExtendingClassWithPrivates.ts, 0, 11))
->i : Symbol(i, Decl(interfaceExtendingClassWithPrivates.ts, 12, 3))
+>i : Symbol(i, Decl(interfaceExtendingClassWithPrivates.ts, 12, 11))
 >x : Symbol(Foo.x, Decl(interfaceExtendingClassWithPrivates.ts, 0, 11))
 
diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates.types b/tests/baselines/reference/interfaceExtendingClassWithPrivates.types
index e9a39f256bcb7..b024ac3bd7c22 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithPrivates.types
+++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates.types
@@ -5,7 +5,7 @@ class Foo {
 >Foo : Foo
 >    : ^^^
 
-    private x: string;
+    private x!: string;
 >x : string
 >  : ^^^^^^
 }
@@ -22,7 +22,7 @@ interface I2 extends Foo {
 >  : ^^^^^^
 }
 
-var i: I2;
+declare var i: I2;
 >i : I2
 >  : ^^
 
diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.errors.txt b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.errors.txt
index 83b2eaad3e5c2..75ae60ea9a0ff 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.errors.txt
+++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.errors.txt
@@ -10,11 +10,11 @@ interfaceExtendingClassWithPrivates2.ts(27,12): error TS2341: Property 'y' is pr
 
 ==== interfaceExtendingClassWithPrivates2.ts (5 errors) ====
     class Foo {
-        private x: string;
+        private x!: string;
     }
     
     class Bar {
-        private x: string;
+        private x!: string;
     }
     
     interface I3 extends Foo, Bar { // error
@@ -34,14 +34,14 @@ interfaceExtendingClassWithPrivates2.ts(27,12): error TS2341: Property 'y' is pr
     }
     
     class Baz {
-        private y: string;
+        private y!: string;
     }
     
     interface I5 extends Foo, Baz {
         z: string;
     }
     
-    var i: I5;
+    declare var i: I5;
     var r: string = i.z;
     var r2 = i.x; // error
                ~
diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js
index 10180549c2dcb..d7de9354dbd79 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js
+++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js
@@ -2,11 +2,11 @@
 
 //// [interfaceExtendingClassWithPrivates2.ts]
 class Foo {
-    private x: string;
+    private x!: string;
 }
 
 class Bar {
-    private x: string;
+    private x!: string;
 }
 
 interface I3 extends Foo, Bar { // error
@@ -17,14 +17,14 @@ interface I4 extends Foo, Bar { // error
 }
 
 class Baz {
-    private y: string;
+    private y!: string;
 }
 
 interface I5 extends Foo, Baz {
     z: string;
 }
 
-var i: I5;
+declare var i: I5;
 var r: string = i.z;
 var r2 = i.x; // error
 var r3 = i.y; // error
@@ -45,7 +45,6 @@ var Baz = /** @class */ (function () {
     }
     return Baz;
 }());
-var i;
 var r = i.z;
 var r2 = i.x; // error
 var r3 = i.y; // error
diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.symbols b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.symbols
index 43739965c1552..1f29df2670527 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.symbols
+++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.symbols
@@ -4,14 +4,14 @@
 class Foo {
 >Foo : Symbol(Foo, Decl(interfaceExtendingClassWithPrivates2.ts, 0, 0))
 
-    private x: string;
+    private x!: string;
 >x : Symbol(Foo.x, Decl(interfaceExtendingClassWithPrivates2.ts, 0, 11))
 }
 
 class Bar {
 >Bar : Symbol(Bar, Decl(interfaceExtendingClassWithPrivates2.ts, 2, 1))
 
-    private x: string;
+    private x!: string;
 >x : Symbol(Bar.x, Decl(interfaceExtendingClassWithPrivates2.ts, 4, 11))
 }
 
@@ -33,7 +33,7 @@ interface I4 extends Foo, Bar { // error
 class Baz {
 >Baz : Symbol(Baz, Decl(interfaceExtendingClassWithPrivates2.ts, 13, 1))
 
-    private y: string;
+    private y!: string;
 >y : Symbol(Baz.y, Decl(interfaceExtendingClassWithPrivates2.ts, 15, 11))
 }
 
@@ -46,25 +46,25 @@ interface I5 extends Foo, Baz {
 >z : Symbol(I5.z, Decl(interfaceExtendingClassWithPrivates2.ts, 19, 31))
 }
 
-var i: I5;
->i : Symbol(i, Decl(interfaceExtendingClassWithPrivates2.ts, 23, 3))
+declare var i: I5;
+>i : Symbol(i, Decl(interfaceExtendingClassWithPrivates2.ts, 23, 11))
 >I5 : Symbol(I5, Decl(interfaceExtendingClassWithPrivates2.ts, 17, 1))
 
 var r: string = i.z;
 >r : Symbol(r, Decl(interfaceExtendingClassWithPrivates2.ts, 24, 3))
 >i.z : Symbol(I5.z, Decl(interfaceExtendingClassWithPrivates2.ts, 19, 31))
->i : Symbol(i, Decl(interfaceExtendingClassWithPrivates2.ts, 23, 3))
+>i : Symbol(i, Decl(interfaceExtendingClassWithPrivates2.ts, 23, 11))
 >z : Symbol(I5.z, Decl(interfaceExtendingClassWithPrivates2.ts, 19, 31))
 
 var r2 = i.x; // error
 >r2 : Symbol(r2, Decl(interfaceExtendingClassWithPrivates2.ts, 25, 3))
 >i.x : Symbol(Foo.x, Decl(interfaceExtendingClassWithPrivates2.ts, 0, 11))
->i : Symbol(i, Decl(interfaceExtendingClassWithPrivates2.ts, 23, 3))
+>i : Symbol(i, Decl(interfaceExtendingClassWithPrivates2.ts, 23, 11))
 >x : Symbol(Foo.x, Decl(interfaceExtendingClassWithPrivates2.ts, 0, 11))
 
 var r3 = i.y; // error
 >r3 : Symbol(r3, Decl(interfaceExtendingClassWithPrivates2.ts, 26, 3))
 >i.y : Symbol(Baz.y, Decl(interfaceExtendingClassWithPrivates2.ts, 15, 11))
->i : Symbol(i, Decl(interfaceExtendingClassWithPrivates2.ts, 23, 3))
+>i : Symbol(i, Decl(interfaceExtendingClassWithPrivates2.ts, 23, 11))
 >y : Symbol(Baz.y, Decl(interfaceExtendingClassWithPrivates2.ts, 15, 11))
 
diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.types b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.types
index ac1436e405c6c..fb5735221e94b 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.types
+++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.types
@@ -5,7 +5,7 @@ class Foo {
 >Foo : Foo
 >    : ^^^
 
-    private x: string;
+    private x!: string;
 >x : string
 >  : ^^^^^^
 }
@@ -14,7 +14,7 @@ class Bar {
 >Bar : Bar
 >    : ^^^
 
-    private x: string;
+    private x!: string;
 >x : string
 >  : ^^^^^^
 }
@@ -32,7 +32,7 @@ class Baz {
 >Baz : Baz
 >    : ^^^
 
-    private y: string;
+    private y!: string;
 >y : string
 >  : ^^^^^^
 }
@@ -43,7 +43,7 @@ interface I5 extends Foo, Baz {
 >  : ^^^^^^
 }
 
-var i: I5;
+declare var i: I5;
 >i : I5
 >  : ^^
 
diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.errors.txt b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.errors.txt
index 179b5b81e0d03..4694288621c0f 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.errors.txt
+++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.errors.txt
@@ -5,7 +5,7 @@ interfaceExtendingClassWithProtecteds.ts(15,12): error TS2445: Property 'x' is p
 
 ==== interfaceExtendingClassWithProtecteds.ts (2 errors) ====
     class Foo {
-        protected x: string;
+        protected x!: string;
     }
     
     interface I extends Foo { // error
@@ -19,7 +19,7 @@ interfaceExtendingClassWithProtecteds.ts(15,12): error TS2445: Property 'x' is p
         y: string;
     }
     
-    var i: I2;
+    declare var i: I2;
     var r = i.y;
     var r2 = i.x; // error
                ~
diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.js b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.js
index 60174da5d4ac9..a31d644cbae70 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.js
+++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.js
@@ -2,7 +2,7 @@
 
 //// [interfaceExtendingClassWithProtecteds.ts]
 class Foo {
-    protected x: string;
+    protected x!: string;
 }
 
 interface I extends Foo { // error
@@ -13,7 +13,7 @@ interface I2 extends Foo {
     y: string;
 }
 
-var i: I2;
+declare var i: I2;
 var r = i.y;
 var r2 = i.x; // error
 
@@ -23,6 +23,5 @@ var Foo = /** @class */ (function () {
     }
     return Foo;
 }());
-var i;
 var r = i.y;
 var r2 = i.x; // error
diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.symbols b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.symbols
index d46b386b3aad5..ef037931b4b86 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.symbols
+++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.symbols
@@ -4,7 +4,7 @@
 class Foo {
 >Foo : Symbol(Foo, Decl(interfaceExtendingClassWithProtecteds.ts, 0, 0))
 
-    protected x: string;
+    protected x!: string;
 >x : Symbol(Foo.x, Decl(interfaceExtendingClassWithProtecteds.ts, 0, 11))
 }
 
@@ -24,19 +24,19 @@ interface I2 extends Foo {
 >y : Symbol(I2.y, Decl(interfaceExtendingClassWithProtecteds.ts, 8, 26))
 }
 
-var i: I2;
->i : Symbol(i, Decl(interfaceExtendingClassWithProtecteds.ts, 12, 3))
+declare var i: I2;
+>i : Symbol(i, Decl(interfaceExtendingClassWithProtecteds.ts, 12, 11))
 >I2 : Symbol(I2, Decl(interfaceExtendingClassWithProtecteds.ts, 6, 1))
 
 var r = i.y;
 >r : Symbol(r, Decl(interfaceExtendingClassWithProtecteds.ts, 13, 3))
 >i.y : Symbol(I2.y, Decl(interfaceExtendingClassWithProtecteds.ts, 8, 26))
->i : Symbol(i, Decl(interfaceExtendingClassWithProtecteds.ts, 12, 3))
+>i : Symbol(i, Decl(interfaceExtendingClassWithProtecteds.ts, 12, 11))
 >y : Symbol(I2.y, Decl(interfaceExtendingClassWithProtecteds.ts, 8, 26))
 
 var r2 = i.x; // error
 >r2 : Symbol(r2, Decl(interfaceExtendingClassWithProtecteds.ts, 14, 3))
 >i.x : Symbol(Foo.x, Decl(interfaceExtendingClassWithProtecteds.ts, 0, 11))
->i : Symbol(i, Decl(interfaceExtendingClassWithProtecteds.ts, 12, 3))
+>i : Symbol(i, Decl(interfaceExtendingClassWithProtecteds.ts, 12, 11))
 >x : Symbol(Foo.x, Decl(interfaceExtendingClassWithProtecteds.ts, 0, 11))
 
diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.types b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.types
index 14884a641f93a..7fc8b87651cd8 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.types
+++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.types
@@ -5,7 +5,7 @@ class Foo {
 >Foo : Foo
 >    : ^^^
 
-    protected x: string;
+    protected x!: string;
 >x : string
 >  : ^^^^^^
 }
@@ -22,7 +22,7 @@ interface I2 extends Foo {
 >  : ^^^^^^
 }
 
-var i: I2;
+declare var i: I2;
 >i : I2
 >  : ^^
 
diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.errors.txt b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.errors.txt
index 32d216df96efe..8857a876a307b 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.errors.txt
+++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.errors.txt
@@ -10,11 +10,11 @@ interfaceExtendingClassWithProtecteds2.ts(27,12): error TS2445: Property 'y' is
 
 ==== interfaceExtendingClassWithProtecteds2.ts (5 errors) ====
     class Foo {
-        protected x: string;
+        protected x!: string;
     }
     
     class Bar {
-        protected x: string;
+        protected x!: string;
     }
     
     interface I3 extends Foo, Bar { // error
@@ -34,14 +34,14 @@ interfaceExtendingClassWithProtecteds2.ts(27,12): error TS2445: Property 'y' is
     }
     
     class Baz {
-        protected y: string;
+        protected y!: string;
     }
     
     interface I5 extends Foo, Baz {
         z: string;
     }
     
-    var i: I5;
+    declare var i: I5;
     var r: string = i.z;
     var r2 = i.x; // error
                ~
diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.js b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.js
index 355280637879d..21038846b855b 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.js
+++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.js
@@ -2,11 +2,11 @@
 
 //// [interfaceExtendingClassWithProtecteds2.ts]
 class Foo {
-    protected x: string;
+    protected x!: string;
 }
 
 class Bar {
-    protected x: string;
+    protected x!: string;
 }
 
 interface I3 extends Foo, Bar { // error
@@ -17,14 +17,14 @@ interface I4 extends Foo, Bar { // error
 }
 
 class Baz {
-    protected y: string;
+    protected y!: string;
 }
 
 interface I5 extends Foo, Baz {
     z: string;
 }
 
-var i: I5;
+declare var i: I5;
 var r: string = i.z;
 var r2 = i.x; // error
 var r3 = i.y; // error
@@ -45,7 +45,6 @@ var Baz = /** @class */ (function () {
     }
     return Baz;
 }());
-var i;
 var r = i.z;
 var r2 = i.x; // error
 var r3 = i.y; // error
diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.symbols b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.symbols
index 28d6f5993863a..c5075db92763c 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.symbols
+++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.symbols
@@ -4,14 +4,14 @@
 class Foo {
 >Foo : Symbol(Foo, Decl(interfaceExtendingClassWithProtecteds2.ts, 0, 0))
 
-    protected x: string;
+    protected x!: string;
 >x : Symbol(Foo.x, Decl(interfaceExtendingClassWithProtecteds2.ts, 0, 11))
 }
 
 class Bar {
 >Bar : Symbol(Bar, Decl(interfaceExtendingClassWithProtecteds2.ts, 2, 1))
 
-    protected x: string;
+    protected x!: string;
 >x : Symbol(Bar.x, Decl(interfaceExtendingClassWithProtecteds2.ts, 4, 11))
 }
 
@@ -33,7 +33,7 @@ interface I4 extends Foo, Bar { // error
 class Baz {
 >Baz : Symbol(Baz, Decl(interfaceExtendingClassWithProtecteds2.ts, 13, 1))
 
-    protected y: string;
+    protected y!: string;
 >y : Symbol(Baz.y, Decl(interfaceExtendingClassWithProtecteds2.ts, 15, 11))
 }
 
@@ -46,25 +46,25 @@ interface I5 extends Foo, Baz {
 >z : Symbol(I5.z, Decl(interfaceExtendingClassWithProtecteds2.ts, 19, 31))
 }
 
-var i: I5;
->i : Symbol(i, Decl(interfaceExtendingClassWithProtecteds2.ts, 23, 3))
+declare var i: I5;
+>i : Symbol(i, Decl(interfaceExtendingClassWithProtecteds2.ts, 23, 11))
 >I5 : Symbol(I5, Decl(interfaceExtendingClassWithProtecteds2.ts, 17, 1))
 
 var r: string = i.z;
 >r : Symbol(r, Decl(interfaceExtendingClassWithProtecteds2.ts, 24, 3))
 >i.z : Symbol(I5.z, Decl(interfaceExtendingClassWithProtecteds2.ts, 19, 31))
->i : Symbol(i, Decl(interfaceExtendingClassWithProtecteds2.ts, 23, 3))
+>i : Symbol(i, Decl(interfaceExtendingClassWithProtecteds2.ts, 23, 11))
 >z : Symbol(I5.z, Decl(interfaceExtendingClassWithProtecteds2.ts, 19, 31))
 
 var r2 = i.x; // error
 >r2 : Symbol(r2, Decl(interfaceExtendingClassWithProtecteds2.ts, 25, 3))
 >i.x : Symbol(Foo.x, Decl(interfaceExtendingClassWithProtecteds2.ts, 0, 11))
->i : Symbol(i, Decl(interfaceExtendingClassWithProtecteds2.ts, 23, 3))
+>i : Symbol(i, Decl(interfaceExtendingClassWithProtecteds2.ts, 23, 11))
 >x : Symbol(Foo.x, Decl(interfaceExtendingClassWithProtecteds2.ts, 0, 11))
 
 var r3 = i.y; // error
 >r3 : Symbol(r3, Decl(interfaceExtendingClassWithProtecteds2.ts, 26, 3))
 >i.y : Symbol(Baz.y, Decl(interfaceExtendingClassWithProtecteds2.ts, 15, 11))
->i : Symbol(i, Decl(interfaceExtendingClassWithProtecteds2.ts, 23, 3))
+>i : Symbol(i, Decl(interfaceExtendingClassWithProtecteds2.ts, 23, 11))
 >y : Symbol(Baz.y, Decl(interfaceExtendingClassWithProtecteds2.ts, 15, 11))
 
diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.types b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.types
index 59fb1d4a71aff..8e0e6976bf603 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.types
+++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.types
@@ -5,7 +5,7 @@ class Foo {
 >Foo : Foo
 >    : ^^^
 
-    protected x: string;
+    protected x!: string;
 >x : string
 >  : ^^^^^^
 }
@@ -14,7 +14,7 @@ class Bar {
 >Bar : Bar
 >    : ^^^
 
-    protected x: string;
+    protected x!: string;
 >x : string
 >  : ^^^^^^
 }
@@ -32,7 +32,7 @@ class Baz {
 >Baz : Baz
 >    : ^^^
 
-    protected y: string;
+    protected y!: string;
 >y : string
 >  : ^^^^^^
 }
@@ -43,7 +43,7 @@ interface I5 extends Foo, Baz {
 >  : ^^^^^^
 }
 
-var i: I5;
+declare var i: I5;
 >i : I5
 >  : ^^
 
diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt
index 0be832ddc238a..dd09fa28c06f5 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.errors.txt
@@ -20,8 +20,8 @@ interfaceExtendsClassWithPrivate1.ts(27,1): error TS2739: Type 'C' is missing th
     } 
     
     var c: C;
-    var i: I;
-    var d: D;
+    declare var i: I;
+    declare var d: D;
     
     c = i;
     i = c; // error
diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
index 8d8f0e3ef712b..7ae863d8e923c 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
@@ -17,8 +17,8 @@ class D extends C implements I {
 } 
 
 var c: C;
-var i: I;
-var d: D;
+declare var i: I;
+declare var d: D;
 
 c = i;
 i = c; // error
@@ -63,8 +63,6 @@ var D = /** @class */ (function (_super) {
     return D;
 }(C));
 var c;
-var i;
-var d;
 c = i;
 i = c; // error
 i = d;
diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.symbols b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.symbols
index 930127968065f..e89706a713e13 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.symbols
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.symbols
@@ -45,35 +45,35 @@ var c: C;
 >c : Symbol(c, Decl(interfaceExtendsClassWithPrivate1.ts, 15, 3))
 >C : Symbol(C, Decl(interfaceExtendsClassWithPrivate1.ts, 0, 0))
 
-var i: I;
->i : Symbol(i, Decl(interfaceExtendsClassWithPrivate1.ts, 16, 3))
+declare var i: I;
+>i : Symbol(i, Decl(interfaceExtendsClassWithPrivate1.ts, 16, 11))
 >I : Symbol(I, Decl(interfaceExtendsClassWithPrivate1.ts, 3, 1))
 
-var d: D;
->d : Symbol(d, Decl(interfaceExtendsClassWithPrivate1.ts, 17, 3))
+declare var d: D;
+>d : Symbol(d, Decl(interfaceExtendsClassWithPrivate1.ts, 17, 11))
 >D : Symbol(D, Decl(interfaceExtendsClassWithPrivate1.ts, 7, 1))
 
 c = i;
 >c : Symbol(c, Decl(interfaceExtendsClassWithPrivate1.ts, 15, 3))
->i : Symbol(i, Decl(interfaceExtendsClassWithPrivate1.ts, 16, 3))
+>i : Symbol(i, Decl(interfaceExtendsClassWithPrivate1.ts, 16, 11))
 
 i = c; // error
->i : Symbol(i, Decl(interfaceExtendsClassWithPrivate1.ts, 16, 3))
+>i : Symbol(i, Decl(interfaceExtendsClassWithPrivate1.ts, 16, 11))
 >c : Symbol(c, Decl(interfaceExtendsClassWithPrivate1.ts, 15, 3))
 
 i = d;
->i : Symbol(i, Decl(interfaceExtendsClassWithPrivate1.ts, 16, 3))
->d : Symbol(d, Decl(interfaceExtendsClassWithPrivate1.ts, 17, 3))
+>i : Symbol(i, Decl(interfaceExtendsClassWithPrivate1.ts, 16, 11))
+>d : Symbol(d, Decl(interfaceExtendsClassWithPrivate1.ts, 17, 11))
 
 d = i; // error
->d : Symbol(d, Decl(interfaceExtendsClassWithPrivate1.ts, 17, 3))
->i : Symbol(i, Decl(interfaceExtendsClassWithPrivate1.ts, 16, 3))
+>d : Symbol(d, Decl(interfaceExtendsClassWithPrivate1.ts, 17, 11))
+>i : Symbol(i, Decl(interfaceExtendsClassWithPrivate1.ts, 16, 11))
 
 c = d;
 >c : Symbol(c, Decl(interfaceExtendsClassWithPrivate1.ts, 15, 3))
->d : Symbol(d, Decl(interfaceExtendsClassWithPrivate1.ts, 17, 3))
+>d : Symbol(d, Decl(interfaceExtendsClassWithPrivate1.ts, 17, 11))
 
 d = c; // error
->d : Symbol(d, Decl(interfaceExtendsClassWithPrivate1.ts, 17, 3))
+>d : Symbol(d, Decl(interfaceExtendsClassWithPrivate1.ts, 17, 11))
 >c : Symbol(c, Decl(interfaceExtendsClassWithPrivate1.ts, 15, 3))
 
diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.types b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.types
index 8b9602e5534f7..d187dc22086c7 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.types
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.types
@@ -59,11 +59,11 @@ var c: C;
 >c : C
 >  : ^
 
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
-var d: D;
+declare var d: D;
 >d : D
 >  : ^
 
diff --git a/tests/baselines/reference/interfaceImplementation1.errors.txt b/tests/baselines/reference/interfaceImplementation1.errors.txt
index 7de348c7ce7b4..bc99f57704f8c 100644
--- a/tests/baselines/reference/interfaceImplementation1.errors.txt
+++ b/tests/baselines/reference/interfaceImplementation1.errors.txt
@@ -28,8 +28,8 @@ interfaceImplementation1.ts(34,5): error TS2322: Type '() => C2' is not assignab
         private iFn();
     	private iFn(n?:number, s?:string) { }
         private iAny:any;
-        private iNum:number;
-        private iObj:{ };
+        private iNum!:number;
+        private iObj!:{ };
     }
     
     interface I3 {
@@ -58,7 +58,7 @@ interfaceImplementation1.ts(34,5): error TS2322: Type '() => C2' is not assignab
     new b();
     */
     
-    var c:I4;
+    declare var c:I4;
     c[5];
     c["foo"];
     
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceImplementation1.js b/tests/baselines/reference/interfaceImplementation1.js
index ae6e09bef4df6..9fd852e9ca3e9 100644
--- a/tests/baselines/reference/interfaceImplementation1.js
+++ b/tests/baselines/reference/interfaceImplementation1.js
@@ -16,8 +16,8 @@ class C1 implements I1,I2 {
     private iFn();
 	private iFn(n?:number, s?:string) { }
     private iAny:any;
-    private iNum:number;
-    private iObj:{ };
+    private iNum!:number;
+    private iObj!:{ };
 }
 
 interface I3 {
@@ -43,7 +43,7 @@ new a();
 new b();
 */
 
-var c:I4;
+declare var c:I4;
 c[5];
 c["foo"];
 
@@ -65,9 +65,5 @@ var a = function () {
     return new C2();
 };
 new a();
-/*var b:I4 = C2;
-new b();
-*/
-var c;
 c[5];
 c["foo"];
diff --git a/tests/baselines/reference/interfaceImplementation1.symbols b/tests/baselines/reference/interfaceImplementation1.symbols
index 9cfe5e1e4518b..153b84aa841c0 100644
--- a/tests/baselines/reference/interfaceImplementation1.symbols
+++ b/tests/baselines/reference/interfaceImplementation1.symbols
@@ -42,11 +42,11 @@ class C1 implements I1,I2 {
     private iAny:any;
 >iAny : Symbol(C1.iAny, Decl(interfaceImplementation1.ts, 13, 38))
 
-    private iNum:number;
+    private iNum!:number;
 >iNum : Symbol(C1.iNum, Decl(interfaceImplementation1.ts, 14, 21))
 
-    private iObj:{ };
->iObj : Symbol(C1.iObj, Decl(interfaceImplementation1.ts, 15, 24))
+    private iObj!:{ };
+>iObj : Symbol(C1.iObj, Decl(interfaceImplementation1.ts, 15, 25))
 }
 
 interface I3 {
@@ -91,13 +91,13 @@ new a();
 new b();
 */
 
-var c:I4;
->c : Symbol(c, Decl(interfaceImplementation1.ts, 42, 3))
+declare var c:I4;
+>c : Symbol(c, Decl(interfaceImplementation1.ts, 42, 11))
 >I4 : Symbol(I4, Decl(interfaceImplementation1.ts, 21, 1))
 
 c[5];
->c : Symbol(c, Decl(interfaceImplementation1.ts, 42, 3))
+>c : Symbol(c, Decl(interfaceImplementation1.ts, 42, 11))
 
 c["foo"];
->c : Symbol(c, Decl(interfaceImplementation1.ts, 42, 3))
+>c : Symbol(c, Decl(interfaceImplementation1.ts, 42, 11))
 
diff --git a/tests/baselines/reference/interfaceImplementation1.types b/tests/baselines/reference/interfaceImplementation1.types
index d00a06ed54224..19ba91c9fb7b3 100644
--- a/tests/baselines/reference/interfaceImplementation1.types
+++ b/tests/baselines/reference/interfaceImplementation1.types
@@ -49,11 +49,11 @@ class C1 implements I1,I2 {
 >iAny : any
 >     : ^^^
 
-    private iNum:number;
+    private iNum!:number;
 >iNum : number
 >     : ^^^^^^
 
-    private iObj:{ };
+    private iObj!:{ };
 >iObj : {}
 >     : ^^
 }
@@ -105,7 +105,7 @@ new a();
 new b();
 */
 
-var c:I4;
+declare var c:I4;
 >c : I4
 >  : ^^
 
diff --git a/tests/baselines/reference/interfaceInheritance.errors.txt b/tests/baselines/reference/interfaceInheritance.errors.txt
index 18c263919df0a..6afb6e902beda 100644
--- a/tests/baselines/reference/interfaceInheritance.errors.txt
+++ b/tests/baselines/reference/interfaceInheritance.errors.txt
@@ -35,12 +35,12 @@ interfaceInheritance.ts(38,1): error TS2322: Type 'I4' is not assignable to type
           ~~
 !!! error TS2420: Class 'C1' incorrectly implements interface 'I2'.
 !!! error TS2420:   Type 'C1' is missing the following properties from type 'I2': i1P1, i1P2
-        public i2P1: string;
+        public i2P1!: string;
     }
     
-    var i2: I2;
+    declare var i2: I2;
     var i1: I1;
-    var i3: I3;
+    declare var i3: I3;
     i1 = i2;
     i2 = i3; // should be an error - i3 does not implement the members of i1
     ~~
@@ -48,8 +48,8 @@ interfaceInheritance.ts(38,1): error TS2322: Type 'I4' is not assignable to type
     
     var c1: C1;
     
-    var i4: I4;
-    var i5: I5;
+    declare var i4: I4;
+    declare var i5: I5;
     
     i4 = i5; // should be an error
     ~~
diff --git a/tests/baselines/reference/interfaceInheritance.js b/tests/baselines/reference/interfaceInheritance.js
index 2c4ec8b8a0800..9b3f38735ca06 100644
--- a/tests/baselines/reference/interfaceInheritance.js
+++ b/tests/baselines/reference/interfaceInheritance.js
@@ -23,19 +23,19 @@ interface I5 {
 }
 
 class C1 implements I2 { // should be an error - it doesn't implement the members of I1
-    public i2P1: string;
+    public i2P1!: string;
 }
 
-var i2: I2;
+declare var i2: I2;
 var i1: I1;
-var i3: I3;
+declare var i3: I3;
 i1 = i2;
 i2 = i3; // should be an error - i3 does not implement the members of i1
 
 var c1: C1;
 
-var i4: I4;
-var i5: I5;
+declare var i4: I4;
+declare var i5: I5;
 
 i4 = i5; // should be an error
 i5 = i4; // should be an error
@@ -48,13 +48,9 @@ var C1 = /** @class */ (function () {
     }
     return C1;
 }());
-var i2;
 var i1;
-var i3;
 i1 = i2;
 i2 = i3; // should be an error - i3 does not implement the members of i1
 var c1;
-var i4;
-var i5;
 i4 = i5; // should be an error
 i5 = i4; // should be an error
diff --git a/tests/baselines/reference/interfaceInheritance.symbols b/tests/baselines/reference/interfaceInheritance.symbols
index ecb3e6b2b7f6f..0ae5f8b44bb68 100644
--- a/tests/baselines/reference/interfaceInheritance.symbols
+++ b/tests/baselines/reference/interfaceInheritance.symbols
@@ -44,48 +44,48 @@ class C1 implements I2 { // should be an error - it doesn't implement the member
 >C1 : Symbol(C1, Decl(interfaceInheritance.ts, 19, 1))
 >I2 : Symbol(I2, Decl(interfaceInheritance.ts, 3, 1))
 
-    public i2P1: string;
+    public i2P1!: string;
 >i2P1 : Symbol(C1.i2P1, Decl(interfaceInheritance.ts, 21, 24))
 }
 
-var i2: I2;
->i2 : Symbol(i2, Decl(interfaceInheritance.ts, 25, 3))
+declare var i2: I2;
+>i2 : Symbol(i2, Decl(interfaceInheritance.ts, 25, 11))
 >I2 : Symbol(I2, Decl(interfaceInheritance.ts, 3, 1))
 
 var i1: I1;
 >i1 : Symbol(i1, Decl(interfaceInheritance.ts, 26, 3))
 >I1 : Symbol(I1, Decl(interfaceInheritance.ts, 0, 0))
 
-var i3: I3;
->i3 : Symbol(i3, Decl(interfaceInheritance.ts, 27, 3))
+declare var i3: I3;
+>i3 : Symbol(i3, Decl(interfaceInheritance.ts, 27, 11))
 >I3 : Symbol(I3, Decl(interfaceInheritance.ts, 7, 1))
 
 i1 = i2;
 >i1 : Symbol(i1, Decl(interfaceInheritance.ts, 26, 3))
->i2 : Symbol(i2, Decl(interfaceInheritance.ts, 25, 3))
+>i2 : Symbol(i2, Decl(interfaceInheritance.ts, 25, 11))
 
 i2 = i3; // should be an error - i3 does not implement the members of i1
->i2 : Symbol(i2, Decl(interfaceInheritance.ts, 25, 3))
->i3 : Symbol(i3, Decl(interfaceInheritance.ts, 27, 3))
+>i2 : Symbol(i2, Decl(interfaceInheritance.ts, 25, 11))
+>i3 : Symbol(i3, Decl(interfaceInheritance.ts, 27, 11))
 
 var c1: C1;
 >c1 : Symbol(c1, Decl(interfaceInheritance.ts, 31, 3))
 >C1 : Symbol(C1, Decl(interfaceInheritance.ts, 19, 1))
 
-var i4: I4;
->i4 : Symbol(i4, Decl(interfaceInheritance.ts, 33, 3))
+declare var i4: I4;
+>i4 : Symbol(i4, Decl(interfaceInheritance.ts, 33, 11))
 >I4 : Symbol(I4, Decl(interfaceInheritance.ts, 11, 1))
 
-var i5: I5;
->i5 : Symbol(i5, Decl(interfaceInheritance.ts, 34, 3))
+declare var i5: I5;
+>i5 : Symbol(i5, Decl(interfaceInheritance.ts, 34, 11))
 >I5 : Symbol(I5, Decl(interfaceInheritance.ts, 15, 1))
 
 i4 = i5; // should be an error
->i4 : Symbol(i4, Decl(interfaceInheritance.ts, 33, 3))
->i5 : Symbol(i5, Decl(interfaceInheritance.ts, 34, 3))
+>i4 : Symbol(i4, Decl(interfaceInheritance.ts, 33, 11))
+>i5 : Symbol(i5, Decl(interfaceInheritance.ts, 34, 11))
 
 i5 = i4; // should be an error
->i5 : Symbol(i5, Decl(interfaceInheritance.ts, 34, 3))
->i4 : Symbol(i4, Decl(interfaceInheritance.ts, 33, 3))
+>i5 : Symbol(i5, Decl(interfaceInheritance.ts, 34, 11))
+>i4 : Symbol(i4, Decl(interfaceInheritance.ts, 33, 11))
 
 
diff --git a/tests/baselines/reference/interfaceInheritance.types b/tests/baselines/reference/interfaceInheritance.types
index 570d997e999d9..c07af14a26b18 100644
--- a/tests/baselines/reference/interfaceInheritance.types
+++ b/tests/baselines/reference/interfaceInheritance.types
@@ -39,12 +39,12 @@ class C1 implements I2 { // should be an error - it doesn't implement the member
 >C1 : C1
 >   : ^^
 
-    public i2P1: string;
+    public i2P1!: string;
 >i2P1 : string
 >     : ^^^^^^
 }
 
-var i2: I2;
+declare var i2: I2;
 >i2 : I2
 >   : ^^
 
@@ -52,7 +52,7 @@ var i1: I1;
 >i1 : I1
 >   : ^^
 
-var i3: I3;
+declare var i3: I3;
 >i3 : I3
 >   : ^^
 
@@ -76,11 +76,11 @@ var c1: C1;
 >c1 : C1
 >   : ^^
 
-var i4: I4;
+declare var i4: I4;
 >i4 : I4
 >   : ^^
 
-var i5: I5;
+declare var i5: I5;
 >i5 : I5
 >   : ^^
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt
index 7a702689ed566..51b5505aae3c4 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt
@@ -12,7 +12,7 @@ internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts(16,
     
     export namespace c {
         import b = a.b;
-        export var x: b.I;
+        export declare var x: b.I;
         x.foo();
     }
     
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
index a08dcb4ac9e2d..2b2674ba95d4a 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -11,7 +11,7 @@ export namespace a {
 
 export namespace c {
     import b = a.b;
-    export var x: b.I;
+    export declare var x: b.I;
     x.foo();
 }
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.symbols b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.symbols
index 2173f7455f860..249c73b2dd3cb 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.symbols
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.symbols
@@ -24,14 +24,14 @@ export namespace c {
 >a : Symbol(a, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 0))
 >b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 20))
 
-    export var x: b.I;
->x : Symbol(x, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 10, 14))
+    export declare var x: b.I;
+>x : Symbol(x, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 10, 22))
 >b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 8, 20))
 >I : Symbol(b.I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 24))
 
     x.foo();
 >x.foo : Symbol(b.I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 2, 28))
->x : Symbol(x, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 10, 14))
+>x : Symbol(x, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 10, 22))
 >foo : Symbol(b.I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 2, 28))
 }
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types
index 530a15c3eac31..b2e497da539f3 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types
@@ -23,7 +23,7 @@ export namespace c {
 >b : any
 >  : ^^^
 
-    export var x: b.I;
+    export declare var x: b.I;
 >x : b.I
 >  : ^^^
 >b : any
diff --git a/tests/baselines/reference/intersectionTypeAssignment.errors.txt b/tests/baselines/reference/intersectionTypeAssignment.errors.txt
index e65c089752d7d..57017acf18057 100644
--- a/tests/baselines/reference/intersectionTypeAssignment.errors.txt
+++ b/tests/baselines/reference/intersectionTypeAssignment.errors.txt
@@ -7,34 +7,34 @@ intersectionTypeAssignment.ts(14,1): error TS2322: Type '{ b: string; }' is not
 
 
 ==== intersectionTypeAssignment.ts (4 errors) ====
-    var a: { a: string };
-    var b: { b: string };
-    var x: { a: string, b: string };
-    var y: { a: string } & { b: string };
+    declare var a: { a: string };
+    declare var b: { b: string };
+    declare var x: { a: string, b: string };
+    declare var y: { a: string } & { b: string };
     
     a = x;
     a = y;
     x = a;  // Error
     ~
 !!! error TS2741: Property 'b' is missing in type '{ a: string; }' but required in type '{ a: string; b: string; }'.
-!!! related TS2728 intersectionTypeAssignment.ts:3:21: 'b' is declared here.
+!!! related TS2728 intersectionTypeAssignment.ts:3:29: 'b' is declared here.
     y = a;  // Error
     ~
 !!! error TS2322: Type '{ a: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
 !!! error TS2322:   Property 'b' is missing in type '{ a: string; }' but required in type '{ b: string; }'.
-!!! related TS2728 intersectionTypeAssignment.ts:4:26: 'b' is declared here.
+!!! related TS2728 intersectionTypeAssignment.ts:4:34: 'b' is declared here.
     
     b = x;
     b = y;
     x = b;  // Error
     ~
 !!! error TS2741: Property 'a' is missing in type '{ b: string; }' but required in type '{ a: string; b: string; }'.
-!!! related TS2728 intersectionTypeAssignment.ts:3:10: 'a' is declared here.
+!!! related TS2728 intersectionTypeAssignment.ts:3:18: 'a' is declared here.
     y = b;  // Error
     ~
 !!! error TS2322: Type '{ b: string; }' is not assignable to type '{ a: string; } & { b: string; }'.
 !!! error TS2322:   Property 'a' is missing in type '{ b: string; }' but required in type '{ a: string; }'.
-!!! related TS2728 intersectionTypeAssignment.ts:4:10: 'a' is declared here.
+!!! related TS2728 intersectionTypeAssignment.ts:4:18: 'a' is declared here.
     
     x = y;
     y = x;
diff --git a/tests/baselines/reference/intersectionTypeAssignment.js b/tests/baselines/reference/intersectionTypeAssignment.js
index be3e620ba40df..3970c72e95a72 100644
--- a/tests/baselines/reference/intersectionTypeAssignment.js
+++ b/tests/baselines/reference/intersectionTypeAssignment.js
@@ -1,10 +1,10 @@
 //// [tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts] ////
 
 //// [intersectionTypeAssignment.ts]
-var a: { a: string };
-var b: { b: string };
-var x: { a: string, b: string };
-var y: { a: string } & { b: string };
+declare var a: { a: string };
+declare var b: { b: string };
+declare var x: { a: string, b: string };
+declare var y: { a: string } & { b: string };
 
 a = x;
 a = y;
@@ -21,10 +21,6 @@ y = x;
 
 
 //// [intersectionTypeAssignment.js]
-var a;
-var b;
-var x;
-var y;
 a = x;
 a = y;
 x = a; // Error
diff --git a/tests/baselines/reference/intersectionTypeAssignment.symbols b/tests/baselines/reference/intersectionTypeAssignment.symbols
index 19659e1ed7def..f0dd11264ef08 100644
--- a/tests/baselines/reference/intersectionTypeAssignment.symbols
+++ b/tests/baselines/reference/intersectionTypeAssignment.symbols
@@ -1,61 +1,61 @@
 //// [tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts] ////
 
 === intersectionTypeAssignment.ts ===
-var a: { a: string };
->a : Symbol(a, Decl(intersectionTypeAssignment.ts, 0, 3))
->a : Symbol(a, Decl(intersectionTypeAssignment.ts, 0, 8))
+declare var a: { a: string };
+>a : Symbol(a, Decl(intersectionTypeAssignment.ts, 0, 11))
+>a : Symbol(a, Decl(intersectionTypeAssignment.ts, 0, 16))
 
-var b: { b: string };
->b : Symbol(b, Decl(intersectionTypeAssignment.ts, 1, 3))
->b : Symbol(b, Decl(intersectionTypeAssignment.ts, 1, 8))
+declare var b: { b: string };
+>b : Symbol(b, Decl(intersectionTypeAssignment.ts, 1, 11))
+>b : Symbol(b, Decl(intersectionTypeAssignment.ts, 1, 16))
 
-var x: { a: string, b: string };
->x : Symbol(x, Decl(intersectionTypeAssignment.ts, 2, 3))
->a : Symbol(a, Decl(intersectionTypeAssignment.ts, 2, 8))
->b : Symbol(b, Decl(intersectionTypeAssignment.ts, 2, 19))
+declare var x: { a: string, b: string };
+>x : Symbol(x, Decl(intersectionTypeAssignment.ts, 2, 11))
+>a : Symbol(a, Decl(intersectionTypeAssignment.ts, 2, 16))
+>b : Symbol(b, Decl(intersectionTypeAssignment.ts, 2, 27))
 
-var y: { a: string } & { b: string };
->y : Symbol(y, Decl(intersectionTypeAssignment.ts, 3, 3))
->a : Symbol(a, Decl(intersectionTypeAssignment.ts, 3, 8))
->b : Symbol(b, Decl(intersectionTypeAssignment.ts, 3, 24))
+declare var y: { a: string } & { b: string };
+>y : Symbol(y, Decl(intersectionTypeAssignment.ts, 3, 11))
+>a : Symbol(a, Decl(intersectionTypeAssignment.ts, 3, 16))
+>b : Symbol(b, Decl(intersectionTypeAssignment.ts, 3, 32))
 
 a = x;
->a : Symbol(a, Decl(intersectionTypeAssignment.ts, 0, 3))
->x : Symbol(x, Decl(intersectionTypeAssignment.ts, 2, 3))
+>a : Symbol(a, Decl(intersectionTypeAssignment.ts, 0, 11))
+>x : Symbol(x, Decl(intersectionTypeAssignment.ts, 2, 11))
 
 a = y;
->a : Symbol(a, Decl(intersectionTypeAssignment.ts, 0, 3))
->y : Symbol(y, Decl(intersectionTypeAssignment.ts, 3, 3))
+>a : Symbol(a, Decl(intersectionTypeAssignment.ts, 0, 11))
+>y : Symbol(y, Decl(intersectionTypeAssignment.ts, 3, 11))
 
 x = a;  // Error
->x : Symbol(x, Decl(intersectionTypeAssignment.ts, 2, 3))
->a : Symbol(a, Decl(intersectionTypeAssignment.ts, 0, 3))
+>x : Symbol(x, Decl(intersectionTypeAssignment.ts, 2, 11))
+>a : Symbol(a, Decl(intersectionTypeAssignment.ts, 0, 11))
 
 y = a;  // Error
->y : Symbol(y, Decl(intersectionTypeAssignment.ts, 3, 3))
->a : Symbol(a, Decl(intersectionTypeAssignment.ts, 0, 3))
+>y : Symbol(y, Decl(intersectionTypeAssignment.ts, 3, 11))
+>a : Symbol(a, Decl(intersectionTypeAssignment.ts, 0, 11))
 
 b = x;
->b : Symbol(b, Decl(intersectionTypeAssignment.ts, 1, 3))
->x : Symbol(x, Decl(intersectionTypeAssignment.ts, 2, 3))
+>b : Symbol(b, Decl(intersectionTypeAssignment.ts, 1, 11))
+>x : Symbol(x, Decl(intersectionTypeAssignment.ts, 2, 11))
 
 b = y;
->b : Symbol(b, Decl(intersectionTypeAssignment.ts, 1, 3))
->y : Symbol(y, Decl(intersectionTypeAssignment.ts, 3, 3))
+>b : Symbol(b, Decl(intersectionTypeAssignment.ts, 1, 11))
+>y : Symbol(y, Decl(intersectionTypeAssignment.ts, 3, 11))
 
 x = b;  // Error
->x : Symbol(x, Decl(intersectionTypeAssignment.ts, 2, 3))
->b : Symbol(b, Decl(intersectionTypeAssignment.ts, 1, 3))
+>x : Symbol(x, Decl(intersectionTypeAssignment.ts, 2, 11))
+>b : Symbol(b, Decl(intersectionTypeAssignment.ts, 1, 11))
 
 y = b;  // Error
->y : Symbol(y, Decl(intersectionTypeAssignment.ts, 3, 3))
->b : Symbol(b, Decl(intersectionTypeAssignment.ts, 1, 3))
+>y : Symbol(y, Decl(intersectionTypeAssignment.ts, 3, 11))
+>b : Symbol(b, Decl(intersectionTypeAssignment.ts, 1, 11))
 
 x = y;
->x : Symbol(x, Decl(intersectionTypeAssignment.ts, 2, 3))
->y : Symbol(y, Decl(intersectionTypeAssignment.ts, 3, 3))
+>x : Symbol(x, Decl(intersectionTypeAssignment.ts, 2, 11))
+>y : Symbol(y, Decl(intersectionTypeAssignment.ts, 3, 11))
 
 y = x;
->y : Symbol(y, Decl(intersectionTypeAssignment.ts, 3, 3))
->x : Symbol(x, Decl(intersectionTypeAssignment.ts, 2, 3))
+>y : Symbol(y, Decl(intersectionTypeAssignment.ts, 3, 11))
+>x : Symbol(x, Decl(intersectionTypeAssignment.ts, 2, 11))
 
diff --git a/tests/baselines/reference/intersectionTypeAssignment.types b/tests/baselines/reference/intersectionTypeAssignment.types
index 6c58a8e4a5ba5..568407e67a045 100644
--- a/tests/baselines/reference/intersectionTypeAssignment.types
+++ b/tests/baselines/reference/intersectionTypeAssignment.types
@@ -1,19 +1,19 @@
 //// [tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts] ////
 
 === intersectionTypeAssignment.ts ===
-var a: { a: string };
+declare var a: { a: string };
 >a : { a: string; }
 >  : ^^^^^      ^^^
 >a : string
 >  : ^^^^^^
 
-var b: { b: string };
+declare var b: { b: string };
 >b : { b: string; }
 >  : ^^^^^      ^^^
 >b : string
 >  : ^^^^^^
 
-var x: { a: string, b: string };
+declare var x: { a: string, b: string };
 >x : { a: string; b: string; }
 >  : ^^^^^      ^^^^^      ^^^
 >a : string
@@ -21,7 +21,7 @@ var x: { a: string, b: string };
 >b : string
 >  : ^^^^^^
 
-var y: { a: string } & { b: string };
+declare var y: { a: string } & { b: string };
 >y : { a: string; } & { b: string; }
 >  : ^^^^^      ^^^^^^^^^^^      ^^^
 >a : string
diff --git a/tests/baselines/reference/intersectionTypeInference.errors.txt b/tests/baselines/reference/intersectionTypeInference.errors.txt
index 20c4a70a9938a..bed738785acf6 100644
--- a/tests/baselines/reference/intersectionTypeInference.errors.txt
+++ b/tests/baselines/reference/intersectionTypeInference.errors.txt
@@ -8,7 +8,7 @@ intersectionTypeInference.ts(6,5): error TS2322: Type 'U' is not assignable to t
 
 ==== intersectionTypeInference.ts (2 errors) ====
     function extend<T, U>(obj1: T, obj2: U): T & U {
-        var result: T & U;
+        var result!: T & U;
         obj1 = result;
         obj2 = result;
         result = obj1;  // Error
diff --git a/tests/baselines/reference/intersectionTypeInference.js b/tests/baselines/reference/intersectionTypeInference.js
index deaeac6499707..601a88e3753f5 100644
--- a/tests/baselines/reference/intersectionTypeInference.js
+++ b/tests/baselines/reference/intersectionTypeInference.js
@@ -2,7 +2,7 @@
 
 //// [intersectionTypeInference.ts]
 function extend<T, U>(obj1: T, obj2: U): T & U {
-    var result: T & U;
+    var result!: T & U;
     obj1 = result;
     obj2 = result;
     result = obj1;  // Error
diff --git a/tests/baselines/reference/intersectionTypeInference.symbols b/tests/baselines/reference/intersectionTypeInference.symbols
index 82300e0131829..e4f0e09be077b 100644
--- a/tests/baselines/reference/intersectionTypeInference.symbols
+++ b/tests/baselines/reference/intersectionTypeInference.symbols
@@ -12,7 +12,7 @@ function extend<T, U>(obj1: T, obj2: U): T & U {
 >T : Symbol(T, Decl(intersectionTypeInference.ts, 0, 16))
 >U : Symbol(U, Decl(intersectionTypeInference.ts, 0, 18))
 
-    var result: T & U;
+    var result!: T & U;
 >result : Symbol(result, Decl(intersectionTypeInference.ts, 1, 7))
 >T : Symbol(T, Decl(intersectionTypeInference.ts, 0, 16))
 >U : Symbol(U, Decl(intersectionTypeInference.ts, 0, 18))
diff --git a/tests/baselines/reference/intersectionTypeInference.types b/tests/baselines/reference/intersectionTypeInference.types
index 6b946847277f2..f15f9a748536e 100644
--- a/tests/baselines/reference/intersectionTypeInference.types
+++ b/tests/baselines/reference/intersectionTypeInference.types
@@ -9,7 +9,7 @@ function extend<T, U>(obj1: T, obj2: U): T & U {
 >obj2 : U
 >     : ^
 
-    var result: T & U;
+    var result!: T & U;
 >result : T & U
 >       : ^^^^^
 
diff --git a/tests/baselines/reference/intersectionTypeReadonly.errors.txt b/tests/baselines/reference/intersectionTypeReadonly.errors.txt
index c99d3cb25cf1d..217a30bf6880e 100644
--- a/tests/baselines/reference/intersectionTypeReadonly.errors.txt
+++ b/tests/baselines/reference/intersectionTypeReadonly.errors.txt
@@ -20,21 +20,21 @@ intersectionTypeReadonly.ts(25,15): error TS2540: Cannot assign to 'value' becau
     interface DifferentName {
         readonly other: number;
     }
-    let base: Base;
+    declare let base: Base;
     base.value = 12 // error, lhs can't be a readonly property
          ~~~~~
 !!! error TS2540: Cannot assign to 'value' because it is a read-only property.
-    let identical: Base & Identical;
+    declare let identical: Base & Identical;
     identical.value = 12; // error, lhs can't be a readonly property
               ~~~~~
 !!! error TS2540: Cannot assign to 'value' because it is a read-only property.
-    let mutable: Base & Mutable;
+    declare let mutable: Base & Mutable;
     mutable.value = 12;
-    let differentType: Base & DifferentType;
+    declare let differentType: Base & DifferentType;
     differentType.value = 12; // error, lhs can't be a readonly property
                   ~~~~~
 !!! error TS2540: Cannot assign to 'value' because it is a read-only property.
-    let differentName: Base & DifferentName;
+    declare let differentName: Base & DifferentName;
     differentName.value = 12; // error, property 'value' doesn't exist
                   ~~~~~
 !!! error TS2540: Cannot assign to 'value' because it is a read-only property.
diff --git a/tests/baselines/reference/intersectionTypeReadonly.js b/tests/baselines/reference/intersectionTypeReadonly.js
index e286754dc4d2f..d031123d41b08 100644
--- a/tests/baselines/reference/intersectionTypeReadonly.js
+++ b/tests/baselines/reference/intersectionTypeReadonly.js
@@ -16,26 +16,21 @@ interface DifferentType {
 interface DifferentName {
     readonly other: number;
 }
-let base: Base;
+declare let base: Base;
 base.value = 12 // error, lhs can't be a readonly property
-let identical: Base & Identical;
+declare let identical: Base & Identical;
 identical.value = 12; // error, lhs can't be a readonly property
-let mutable: Base & Mutable;
+declare let mutable: Base & Mutable;
 mutable.value = 12;
-let differentType: Base & DifferentType;
+declare let differentType: Base & DifferentType;
 differentType.value = 12; // error, lhs can't be a readonly property
-let differentName: Base & DifferentName;
+declare let differentName: Base & DifferentName;
 differentName.value = 12; // error, property 'value' doesn't exist
 
 
 //// [intersectionTypeReadonly.js]
-var base;
 base.value = 12; // error, lhs can't be a readonly property
-var identical;
 identical.value = 12; // error, lhs can't be a readonly property
-var mutable;
 mutable.value = 12;
-var differentType;
 differentType.value = 12; // error, lhs can't be a readonly property
-var differentName;
 differentName.value = 12; // error, property 'value' doesn't exist
diff --git a/tests/baselines/reference/intersectionTypeReadonly.symbols b/tests/baselines/reference/intersectionTypeReadonly.symbols
index 589138fe5f89b..420121fbee31d 100644
--- a/tests/baselines/reference/intersectionTypeReadonly.symbols
+++ b/tests/baselines/reference/intersectionTypeReadonly.symbols
@@ -31,52 +31,52 @@ interface DifferentName {
     readonly other: number;
 >other : Symbol(DifferentName.other, Decl(intersectionTypeReadonly.ts, 12, 25))
 }
-let base: Base;
->base : Symbol(base, Decl(intersectionTypeReadonly.ts, 15, 3))
+declare let base: Base;
+>base : Symbol(base, Decl(intersectionTypeReadonly.ts, 15, 11))
 >Base : Symbol(Base, Decl(intersectionTypeReadonly.ts, 0, 0))
 
 base.value = 12 // error, lhs can't be a readonly property
 >base.value : Symbol(Base.value, Decl(intersectionTypeReadonly.ts, 0, 16))
->base : Symbol(base, Decl(intersectionTypeReadonly.ts, 15, 3))
+>base : Symbol(base, Decl(intersectionTypeReadonly.ts, 15, 11))
 >value : Symbol(Base.value, Decl(intersectionTypeReadonly.ts, 0, 16))
 
-let identical: Base & Identical;
->identical : Symbol(identical, Decl(intersectionTypeReadonly.ts, 17, 3))
+declare let identical: Base & Identical;
+>identical : Symbol(identical, Decl(intersectionTypeReadonly.ts, 17, 11))
 >Base : Symbol(Base, Decl(intersectionTypeReadonly.ts, 0, 0))
 >Identical : Symbol(Identical, Decl(intersectionTypeReadonly.ts, 2, 1))
 
 identical.value = 12; // error, lhs can't be a readonly property
 >identical.value : Symbol(value, Decl(intersectionTypeReadonly.ts, 0, 16), Decl(intersectionTypeReadonly.ts, 3, 21))
->identical : Symbol(identical, Decl(intersectionTypeReadonly.ts, 17, 3))
+>identical : Symbol(identical, Decl(intersectionTypeReadonly.ts, 17, 11))
 >value : Symbol(value, Decl(intersectionTypeReadonly.ts, 0, 16), Decl(intersectionTypeReadonly.ts, 3, 21))
 
-let mutable: Base & Mutable;
->mutable : Symbol(mutable, Decl(intersectionTypeReadonly.ts, 19, 3))
+declare let mutable: Base & Mutable;
+>mutable : Symbol(mutable, Decl(intersectionTypeReadonly.ts, 19, 11))
 >Base : Symbol(Base, Decl(intersectionTypeReadonly.ts, 0, 0))
 >Mutable : Symbol(Mutable, Decl(intersectionTypeReadonly.ts, 5, 1))
 
 mutable.value = 12;
 >mutable.value : Symbol(value, Decl(intersectionTypeReadonly.ts, 0, 16), Decl(intersectionTypeReadonly.ts, 6, 19))
->mutable : Symbol(mutable, Decl(intersectionTypeReadonly.ts, 19, 3))
+>mutable : Symbol(mutable, Decl(intersectionTypeReadonly.ts, 19, 11))
 >value : Symbol(value, Decl(intersectionTypeReadonly.ts, 0, 16), Decl(intersectionTypeReadonly.ts, 6, 19))
 
-let differentType: Base & DifferentType;
->differentType : Symbol(differentType, Decl(intersectionTypeReadonly.ts, 21, 3))
+declare let differentType: Base & DifferentType;
+>differentType : Symbol(differentType, Decl(intersectionTypeReadonly.ts, 21, 11))
 >Base : Symbol(Base, Decl(intersectionTypeReadonly.ts, 0, 0))
 >DifferentType : Symbol(DifferentType, Decl(intersectionTypeReadonly.ts, 8, 1))
 
 differentType.value = 12; // error, lhs can't be a readonly property
 >differentType.value : Symbol(value, Decl(intersectionTypeReadonly.ts, 0, 16), Decl(intersectionTypeReadonly.ts, 9, 25))
->differentType : Symbol(differentType, Decl(intersectionTypeReadonly.ts, 21, 3))
+>differentType : Symbol(differentType, Decl(intersectionTypeReadonly.ts, 21, 11))
 >value : Symbol(value, Decl(intersectionTypeReadonly.ts, 0, 16), Decl(intersectionTypeReadonly.ts, 9, 25))
 
-let differentName: Base & DifferentName;
->differentName : Symbol(differentName, Decl(intersectionTypeReadonly.ts, 23, 3))
+declare let differentName: Base & DifferentName;
+>differentName : Symbol(differentName, Decl(intersectionTypeReadonly.ts, 23, 11))
 >Base : Symbol(Base, Decl(intersectionTypeReadonly.ts, 0, 0))
 >DifferentName : Symbol(DifferentName, Decl(intersectionTypeReadonly.ts, 11, 1))
 
 differentName.value = 12; // error, property 'value' doesn't exist
 >differentName.value : Symbol(Base.value, Decl(intersectionTypeReadonly.ts, 0, 16))
->differentName : Symbol(differentName, Decl(intersectionTypeReadonly.ts, 23, 3))
+>differentName : Symbol(differentName, Decl(intersectionTypeReadonly.ts, 23, 11))
 >value : Symbol(Base.value, Decl(intersectionTypeReadonly.ts, 0, 16))
 
diff --git a/tests/baselines/reference/intersectionTypeReadonly.types b/tests/baselines/reference/intersectionTypeReadonly.types
index 003a28d818102..0188e31e9a055 100644
--- a/tests/baselines/reference/intersectionTypeReadonly.types
+++ b/tests/baselines/reference/intersectionTypeReadonly.types
@@ -26,7 +26,7 @@ interface DifferentName {
 >other : number
 >      : ^^^^^^
 }
-let base: Base;
+declare let base: Base;
 >base : Base
 >     : ^^^^
 
@@ -42,7 +42,7 @@ base.value = 12 // error, lhs can't be a readonly property
 >12 : 12
 >   : ^^
 
-let identical: Base & Identical;
+declare let identical: Base & Identical;
 >identical : Base & Identical
 >          : ^^^^^^^^^^^^^^^^
 
@@ -58,7 +58,7 @@ identical.value = 12; // error, lhs can't be a readonly property
 >12 : 12
 >   : ^^
 
-let mutable: Base & Mutable;
+declare let mutable: Base & Mutable;
 >mutable : Base & Mutable
 >        : ^^^^^^^^^^^^^^
 
@@ -74,7 +74,7 @@ mutable.value = 12;
 >12 : 12
 >   : ^^
 
-let differentType: Base & DifferentType;
+declare let differentType: Base & DifferentType;
 >differentType : Base & DifferentType
 >              : ^^^^^^^^^^^^^^^^^^^^
 
@@ -90,7 +90,7 @@ differentType.value = 12; // error, lhs can't be a readonly property
 >12 : 12
 >   : ^^
 
-let differentName: Base & DifferentName;
+declare let differentName: Base & DifferentName;
 >differentName : Base & DifferentName
 >              : ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/invalidAssignmentsToVoid.errors.txt b/tests/baselines/reference/invalidAssignmentsToVoid.errors.txt
index 5fc31d83ae4fa..9bbc49ff385d5 100644
--- a/tests/baselines/reference/invalidAssignmentsToVoid.errors.txt
+++ b/tests/baselines/reference/invalidAssignmentsToVoid.errors.txt
@@ -25,8 +25,8 @@ invalidAssignmentsToVoid.ts(22,5): error TS2322: Type '<T>(a: T) => void' is not
     ~
 !!! error TS2322: Type '{}' is not assignable to type 'void'.
     
-    class C { foo: string; }
-    var c: C;
+    class C { foo!: string; }
+    declare var c: C;
     x = C;
     ~
 !!! error TS2322: Type 'typeof C' is not assignable to type 'void'.
@@ -35,7 +35,7 @@ invalidAssignmentsToVoid.ts(22,5): error TS2322: Type '<T>(a: T) => void' is not
 !!! error TS2322: Type 'C' is not assignable to type 'void'.
     
     interface I { foo: string; }
-    var i: I;
+    declare var i: I;
     x = i;
     ~
 !!! error TS2322: Type 'I' is not assignable to type 'void'.
diff --git a/tests/baselines/reference/invalidAssignmentsToVoid.js b/tests/baselines/reference/invalidAssignmentsToVoid.js
index 29a324850a39b..899e90d01d844 100644
--- a/tests/baselines/reference/invalidAssignmentsToVoid.js
+++ b/tests/baselines/reference/invalidAssignmentsToVoid.js
@@ -7,13 +7,13 @@ x = true;
 x = '';
 x = {}
 
-class C { foo: string; }
-var c: C;
+class C { foo!: string; }
+declare var c: C;
 x = C;
 x = c;
 
 interface I { foo: string; }
-var i: I;
+declare var i: I;
 x = i;
 
 namespace M { export var x = 1; }
@@ -35,10 +35,8 @@ var C = /** @class */ (function () {
     }
     return C;
 }());
-var c;
 x = C;
 x = c;
-var i;
 x = i;
 var M;
 (function (M) {
diff --git a/tests/baselines/reference/invalidAssignmentsToVoid.symbols b/tests/baselines/reference/invalidAssignmentsToVoid.symbols
index 26724370a4cf4..8d30bc2065b8c 100644
--- a/tests/baselines/reference/invalidAssignmentsToVoid.symbols
+++ b/tests/baselines/reference/invalidAssignmentsToVoid.symbols
@@ -16,12 +16,12 @@ x = '';
 x = {}
 >x : Symbol(x, Decl(invalidAssignmentsToVoid.ts, 0, 3))
 
-class C { foo: string; }
+class C { foo!: string; }
 >C : Symbol(C, Decl(invalidAssignmentsToVoid.ts, 4, 6))
 >foo : Symbol(C.foo, Decl(invalidAssignmentsToVoid.ts, 6, 9))
 
-var c: C;
->c : Symbol(c, Decl(invalidAssignmentsToVoid.ts, 7, 3))
+declare var c: C;
+>c : Symbol(c, Decl(invalidAssignmentsToVoid.ts, 7, 11))
 >C : Symbol(C, Decl(invalidAssignmentsToVoid.ts, 4, 6))
 
 x = C;
@@ -30,19 +30,19 @@ x = C;
 
 x = c;
 >x : Symbol(x, Decl(invalidAssignmentsToVoid.ts, 0, 3))
->c : Symbol(c, Decl(invalidAssignmentsToVoid.ts, 7, 3))
+>c : Symbol(c, Decl(invalidAssignmentsToVoid.ts, 7, 11))
 
 interface I { foo: string; }
 >I : Symbol(I, Decl(invalidAssignmentsToVoid.ts, 9, 6))
 >foo : Symbol(I.foo, Decl(invalidAssignmentsToVoid.ts, 11, 13))
 
-var i: I;
->i : Symbol(i, Decl(invalidAssignmentsToVoid.ts, 12, 3))
+declare var i: I;
+>i : Symbol(i, Decl(invalidAssignmentsToVoid.ts, 12, 11))
 >I : Symbol(I, Decl(invalidAssignmentsToVoid.ts, 9, 6))
 
 x = i;
 >x : Symbol(x, Decl(invalidAssignmentsToVoid.ts, 0, 3))
->i : Symbol(i, Decl(invalidAssignmentsToVoid.ts, 12, 3))
+>i : Symbol(i, Decl(invalidAssignmentsToVoid.ts, 12, 11))
 
 namespace M { export var x = 1; }
 >M : Symbol(M, Decl(invalidAssignmentsToVoid.ts, 13, 6))
diff --git a/tests/baselines/reference/invalidAssignmentsToVoid.types b/tests/baselines/reference/invalidAssignmentsToVoid.types
index 63730d9da3767..9a9118553f884 100644
--- a/tests/baselines/reference/invalidAssignmentsToVoid.types
+++ b/tests/baselines/reference/invalidAssignmentsToVoid.types
@@ -37,13 +37,13 @@ x = {}
 >{} : {}
 >   : ^^
 
-class C { foo: string; }
+class C { foo!: string; }
 >C : C
 >  : ^
 >foo : string
 >    : ^^^^^^
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
@@ -67,7 +67,7 @@ interface I { foo: string; }
 >foo : string
 >    : ^^^^^^
 
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
diff --git a/tests/baselines/reference/invalidVoidValues.errors.txt b/tests/baselines/reference/invalidVoidValues.errors.txt
index 53a20d362a6ba..0c0966dfaadf6 100644
--- a/tests/baselines/reference/invalidVoidValues.errors.txt
+++ b/tests/baselines/reference/invalidVoidValues.errors.txt
@@ -31,14 +31,14 @@ invalidVoidValues.ts(26,5): error TS2322: Type '<T>(a: T) => void' is not assign
     ~
 !!! error TS2322: Type 'E' is not assignable to type 'void'.
     
-    class C { foo: string }
-    var a: C;
+    class C { foo!: string }
+    declare var a: C;
     x = a;
     ~
 !!! error TS2322: Type 'C' is not assignable to type 'void'.
     
     interface I { foo: string }
-    var b: I;
+    declare var b: I;
     x = b;
     ~
 !!! error TS2322: Type 'I' is not assignable to type 'void'.
diff --git a/tests/baselines/reference/invalidVoidValues.js b/tests/baselines/reference/invalidVoidValues.js
index 4b1a9ccad0b62..1f0bac6e5df46 100644
--- a/tests/baselines/reference/invalidVoidValues.js
+++ b/tests/baselines/reference/invalidVoidValues.js
@@ -10,12 +10,12 @@ enum E { A }
 x = E;
 x = E.A;
 
-class C { foo: string }
-var a: C;
+class C { foo!: string }
+declare var a: C;
 x = a;
 
 interface I { foo: string }
-var b: I;
+declare var b: I;
 x = b;
 
 x = { f() {} }
@@ -44,9 +44,7 @@ var C = /** @class */ (function () {
     }
     return C;
 }());
-var a;
 x = a;
-var b;
 x = b;
 x = { f: function () { } };
 var M;
diff --git a/tests/baselines/reference/invalidVoidValues.symbols b/tests/baselines/reference/invalidVoidValues.symbols
index de16e867cdf98..172feb4cc4f57 100644
--- a/tests/baselines/reference/invalidVoidValues.symbols
+++ b/tests/baselines/reference/invalidVoidValues.symbols
@@ -27,29 +27,29 @@ x = E.A;
 >E : Symbol(E, Decl(invalidVoidValues.ts, 3, 9))
 >A : Symbol(E.A, Decl(invalidVoidValues.ts, 5, 8))
 
-class C { foo: string }
+class C { foo!: string }
 >C : Symbol(C, Decl(invalidVoidValues.ts, 7, 8))
 >foo : Symbol(C.foo, Decl(invalidVoidValues.ts, 9, 9))
 
-var a: C;
->a : Symbol(a, Decl(invalidVoidValues.ts, 10, 3))
+declare var a: C;
+>a : Symbol(a, Decl(invalidVoidValues.ts, 10, 11))
 >C : Symbol(C, Decl(invalidVoidValues.ts, 7, 8))
 
 x = a;
 >x : Symbol(x, Decl(invalidVoidValues.ts, 0, 3))
->a : Symbol(a, Decl(invalidVoidValues.ts, 10, 3))
+>a : Symbol(a, Decl(invalidVoidValues.ts, 10, 11))
 
 interface I { foo: string }
 >I : Symbol(I, Decl(invalidVoidValues.ts, 11, 6))
 >foo : Symbol(I.foo, Decl(invalidVoidValues.ts, 13, 13))
 
-var b: I;
->b : Symbol(b, Decl(invalidVoidValues.ts, 14, 3))
+declare var b: I;
+>b : Symbol(b, Decl(invalidVoidValues.ts, 14, 11))
 >I : Symbol(I, Decl(invalidVoidValues.ts, 11, 6))
 
 x = b;
 >x : Symbol(x, Decl(invalidVoidValues.ts, 0, 3))
->b : Symbol(b, Decl(invalidVoidValues.ts, 14, 3))
+>b : Symbol(b, Decl(invalidVoidValues.ts, 14, 11))
 
 x = { f() {} }
 >x : Symbol(x, Decl(invalidVoidValues.ts, 0, 3))
diff --git a/tests/baselines/reference/invalidVoidValues.types b/tests/baselines/reference/invalidVoidValues.types
index ad12d6a458659..cc0d16fe059f2 100644
--- a/tests/baselines/reference/invalidVoidValues.types
+++ b/tests/baselines/reference/invalidVoidValues.types
@@ -55,13 +55,13 @@ x = E.A;
 >A : E
 >  : ^
 
-class C { foo: string }
+class C { foo!: string }
 >C : C
 >  : ^
 >foo : string
 >    : ^^^^^^
 
-var a: C;
+declare var a: C;
 >a : C
 >  : ^
 
@@ -77,7 +77,7 @@ interface I { foo: string }
 >foo : string
 >    : ^^^^^^
 
-var b: I;
+declare var b: I;
 >b : I
 >  : ^
 
diff --git a/tests/baselines/reference/isolatedDeclarationOutFile.errors.txt b/tests/baselines/reference/isolatedDeclarationOutFile.errors.txt
index 3db3e59dd3df9..3e53956c6c6c9 100644
--- a/tests/baselines/reference/isolatedDeclarationOutFile.errors.txt
+++ b/tests/baselines/reference/isolatedDeclarationOutFile.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (0 errors) ====
     export class A {
diff --git a/tests/baselines/reference/isolatedModulesOut.errors.txt b/tests/baselines/reference/isolatedModulesOut.errors.txt
index 9c2d706216e44..87d2bc77cf6bd 100644
--- a/tests/baselines/reference/isolatedModulesOut.errors.txt
+++ b/tests/baselines/reference/isolatedModulesOut.errors.txt
@@ -1,9 +1,7 @@
 error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 
 
 !!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== file1.ts (0 errors) ====
     export var x;
 ==== file2.ts (0 errors) ====
diff --git a/tests/baselines/reference/jsDeclarationsImportTypeBundled.errors.txt b/tests/baselines/reference/jsDeclarationsImportTypeBundled.errors.txt
index 2c8a21b54d7a2..933365da2c1bc 100644
--- a/tests/baselines/reference/jsDeclarationsImportTypeBundled.errors.txt
+++ b/tests/baselines/reference/jsDeclarationsImportTypeBundled.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== folder/mod1.js (0 errors) ====
     /**
diff --git a/tests/baselines/reference/jsDeclarationsNonIdentifierInferredNames.js b/tests/baselines/reference/jsDeclarationsNonIdentifierInferredNames.js
index 126e019e73967..db0c501ec035a 100644
--- a/tests/baselines/reference/jsDeclarationsNonIdentifierInferredNames.js
+++ b/tests/baselines/reference/jsDeclarationsNonIdentifierInferredNames.js
@@ -9,7 +9,7 @@ export const ExampleFunctionalComponent = ({ "data-testid": dataTestId, [dynProp
 );
 
 //// [jsDeclarationsNonIdentifierInferredNames.js]
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 import * as React from "react";
 const dynPropName = "data-dyn";
 export const ExampleFunctionalComponent = ({ "data-testid": dataTestId, [dynPropName]: dynProp }) => (React.createElement(React.Fragment, null, "Hello"));
diff --git a/tests/baselines/reference/jsDeclarationsReactComponents.js b/tests/baselines/reference/jsDeclarationsReactComponents.js
index 305958e3b1550..d0b1f37953ac0 100644
--- a/tests/baselines/reference/jsDeclarationsReactComponents.js
+++ b/tests/baselines/reference/jsDeclarationsReactComponents.js
@@ -101,7 +101,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" preserve="true" />
+/// <reference path="/.lib/react16.d.ts" preserve="true" />
 var react_1 = __importDefault(require("react"));
 var prop_types_1 = __importDefault(require("prop-types"));
 var TabbedShowLayout = function (_a) {
@@ -185,7 +185,7 @@ exports.default = Tree;
 
 
 //// [jsDeclarationsReactComponents1.d.ts]
-/// <reference path="../..react16.d.ts" preserve="true" />
+/// <reference path="../../.lib/react16.d.ts" preserve="true" />
 export default TabbedShowLayout;
 declare function TabbedShowLayout({}: {}): JSX.Element;
 declare namespace TabbedShowLayout {
diff --git a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.errors.txt b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.errors.txt
new file mode 100644
index 0000000000000..6294075ca1194
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.errors.txt
@@ -0,0 +1,11 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.js (0 errors) ====
+    class c {
+        method(a) {
+            let x = a => this.method(a);
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.types b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.types
index 26f1a4455ccf2..68626f05b442c 100644
--- a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.types
+++ b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.types
@@ -9,6 +9,7 @@ class c {
 >method : (a: any) => void
 >       : ^ ^^^^^^^^^^^^^^
 >a : any
+>  : ^^^
 
         let x = a => this.method(a);
 >x : (a: any) => void
@@ -16,6 +17,7 @@ class c {
 >a => this.method(a) : (a: any) => void
 >                    : ^ ^^^^^^^^^^^^^^
 >a : any
+>  : ^^^
 >this.method(a) : void
 >               : ^^^^
 >this.method : (a: any) => void
@@ -25,6 +27,7 @@ class c {
 >method : (a: any) => void
 >       : ^ ^^^^^^^^^^^^^^
 >a : any
+>  : ^^^
     }
 }
 
diff --git a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt
index 51e16b7a0ce15..677972dc5178d 100644
--- a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 a.ts(1,10): error TS2393: Duplicate function implementation.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== b.js (0 errors) ====
     function foo() {
         return 10;
diff --git a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt
index 142ed1352d92a..5ac6647743259 100644
--- a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 a.ts(1,10): error TS2393: Duplicate function implementation.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (1 errors) ====
     function foo() {
              ~~~
diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariable.errors.txt b/tests/baselines/reference/jsFileCompilationDuplicateVariable.errors.txt
new file mode 100644
index 0000000000000..32b119072cd55
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationDuplicateVariable.errors.txt
@@ -0,0 +1,10 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.ts (0 errors) ====
+    var x = 10;
+    
+==== b.js (0 errors) ====
+    var x = "hello"; // Error is recorded here, but suppressed because the js file isn't checked
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariable.js b/tests/baselines/reference/jsFileCompilationDuplicateVariable.js
index 11416c427f7b1..6286060cac053 100644
--- a/tests/baselines/reference/jsFileCompilationDuplicateVariable.js
+++ b/tests/baselines/reference/jsFileCompilationDuplicateVariable.js
@@ -15,18 +15,3 @@ var x = "hello"; // Error is recorded here, but suppressed because the js file i
 //// [out.d.ts]
 declare var x: number;
 declare var x: string;
-
-
-//// [DtsFileErrors]
-
-
-out.d.ts(2,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'number', but here has type 'string'.
-
-
-==== out.d.ts (1 errors) ====
-    declare var x: number;
-    declare var x: string;
-                ~
-!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'number', but here has type 'string'.
-!!! related TS6203 out.d.ts:1:13: 'x' was also declared here.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt
index a44b8c591ddfc..b3d54a7293f19 100644
--- a/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 a.ts(1,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'number'.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== b.js (0 errors) ====
     var x = "hello";
     
diff --git a/tests/baselines/reference/jsFileCompilationEmitDeclarations.errors.txt b/tests/baselines/reference/jsFileCompilationEmitDeclarations.errors.txt
new file mode 100644
index 0000000000000..51667b535131d
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationEmitDeclarations.errors.txt
@@ -0,0 +1,12 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.ts (0 errors) ====
+    class c {
+    }
+    
+==== b.js (0 errors) ====
+    function foo() {
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.errors.txt b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.errors.txt
new file mode 100644
index 0000000000000..06289a1658af8
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.errors.txt
@@ -0,0 +1,17 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.ts (0 errors) ====
+    class c {
+    }
+    
+==== b.js (0 errors) ====
+    /// <reference path="c.js"/>
+    function foo() {
+    }
+    
+==== c.js (0 errors) ====
+    function bar() {
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt
new file mode 100644
index 0000000000000..b7b8ac10b4b4f
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt
@@ -0,0 +1,17 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.ts (0 errors) ====
+    class c {
+    }
+    
+==== b.ts (0 errors) ====
+    /// <reference path="c.js"/>
+    function foo() {
+    }
+    
+==== c.js (0 errors) ====
+    function bar() {
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.errors.txt b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.errors.txt
new file mode 100644
index 0000000000000..cc2d16b747d1d
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.errors.txt
@@ -0,0 +1,11 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.js (0 errors) ====
+    function foo(a) {
+        for (let a = 0; a < 10; a++) {
+            // do something
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.types b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.types
index f77b25a5212e4..d16a887a5c6a3 100644
--- a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.types
+++ b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.types
@@ -5,6 +5,7 @@ function foo(a) {
 >foo : (a: any) => void
 >    : ^ ^^^^^^^^^^^^^^
 >a : any
+>  : ^^^
 
     for (let a = 0; a < 10; a++) {
 >a : number
diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.errors.txt b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.errors.txt
new file mode 100644
index 0000000000000..6af1dd6cf71b1
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.errors.txt
@@ -0,0 +1,12 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== b.js (0 errors) ====
+    let a = 10;
+    b = 30;
+    
+==== a.ts (0 errors) ====
+    let b = 30;
+    a = 10;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt
index 7085a34f80d09..940600472d393 100644
--- a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 a.ts(2,1): error TS2448: Block-scoped variable 'a' used before its declaration.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (1 errors) ====
     let b = 30;
     a = 10;
diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.errors.txt b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.errors.txt
new file mode 100644
index 0000000000000..8219901249429
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.errors.txt
@@ -0,0 +1,18 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.ts (0 errors) ====
+    class c {
+    }
+    
+==== b.ts (0 errors) ====
+    /// <reference path="c.js"/>
+    //no  error on above reference since not emitting declarations
+    function foo() {
+    }
+    
+==== c.js (0 errors) ====
+    function bar() {
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationNonNullAssertion.errors.txt b/tests/baselines/reference/jsFileCompilationNonNullAssertion.errors.txt
index 68250662d890c..bbb3b15c1a76b 100644
--- a/tests/baselines/reference/jsFileCompilationNonNullAssertion.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationNonNullAssertion.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 /src/a.js(1,1): error TS8013: Non-null assertions can only be used in TypeScript files.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /src/a.js (1 errors) ====
     0!
     ~~
diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.errors.txt b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.errors.txt
index caaae70c3ac3e..581060076c360 100644
--- a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== _apply.js (0 errors) ====
     /**
diff --git a/tests/baselines/reference/jsFileCompilationRestParameter.errors.txt b/tests/baselines/reference/jsFileCompilationRestParameter.errors.txt
new file mode 100644
index 0000000000000..c8ed07899bf8e
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationRestParameter.errors.txt
@@ -0,0 +1,7 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.js (0 errors) ====
+    function foo(...a) { }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationShortHandProperty.errors.txt b/tests/baselines/reference/jsFileCompilationShortHandProperty.errors.txt
new file mode 100644
index 0000000000000..e7fda26e0a2f7
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationShortHandProperty.errors.txt
@@ -0,0 +1,14 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.js (0 errors) ====
+    function foo() {
+        var a = 10;
+        var b = "Hello";
+        return {
+            a,
+            b
+        };
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt
index c120f1de95352..847a2eb27889c 100644
--- a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt
@@ -1,8 +1,10 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 /src/a.js(1,6): error TS8016: Type assertion expressions can only be used in TypeScript files.
 /src/a.js(2,10): error TS17008: JSX element 'string' has no corresponding closing tag.
 /src/a.js(3,1): error TS1005: '</' expected.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /src/a.js (3 errors) ====
     0 as number;
          ~~~~~~
diff --git a/tests/baselines/reference/jsFileCompilationWithEnabledCompositeOption.errors.txt b/tests/baselines/reference/jsFileCompilationWithEnabledCompositeOption.errors.txt
new file mode 100644
index 0000000000000..51667b535131d
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationWithEnabledCompositeOption.errors.txt
@@ -0,0 +1,12 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.ts (0 errors) ====
+    class c {
+    }
+    
+==== b.js (0 errors) ====
+    function foo() {
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationWithOut.errors.txt b/tests/baselines/reference/jsFileCompilationWithOut.errors.txt
new file mode 100644
index 0000000000000..51667b535131d
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationWithOut.errors.txt
@@ -0,0 +1,12 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.ts (0 errors) ====
+    class c {
+    }
+    
+==== b.js (0 errors) ====
+    function foo() {
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt
index a13d5723db6e1..76d40a9fe244f 100644
--- a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt
@@ -1,9 +1,11 @@
 error TS5055: Cannot write file '/b.d.ts' because it would overwrite input file.
   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5055: Cannot write file '/b.d.ts' because it would overwrite input file.
 !!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /a.ts (0 errors) ====
     class c {
     }
diff --git a/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt b/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt
index e546e4dd11ef5..41c84133d7b83 100644
--- a/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt
@@ -1,9 +1,11 @@
 error TS5055: Cannot write file '/b.js' because it would overwrite input file.
   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5055: Cannot write file '/b.js' because it would overwrite input file.
 !!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /a.ts (0 errors) ====
     class c {
     }
diff --git a/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.errors.txt b/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.errors.txt
new file mode 100644
index 0000000000000..ab01823147365
--- /dev/null
+++ b/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.errors.txt
@@ -0,0 +1,38 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.js (0 errors) ====
+    var variable = {};
+    variable.a = 0;
+    
+    class C {
+        initializedMember = {};
+        constructor() {
+            this.member = {};
+            this.member.a = 0;
+        }
+    }
+    
+    var obj = {
+        property: {}
+    };
+    
+    obj.property.a = 0;
+    
+    var arr = [{}];
+    
+    function getObj() {
+        return {};
+    }
+    
+    
+==== b.ts (0 errors) ====
+    variable.a = 1;
+    (new C()).member.a = 1;
+    (new C()).initializedMember.a = 1;
+    obj.property.a = 1;
+    arr[0].a = 1;
+    getObj().a = 1;
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types b/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types
index f8ff1ce2977f0..65576420a1b5f 100644
--- a/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types
+++ b/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types
@@ -34,6 +34,7 @@ class C {
 >this.member = {} : {}
 >                 : ^^
 >this.member : any
+>            : ^^^
 >this : this
 >     : ^^^^
 >member : any
@@ -44,7 +45,8 @@ class C {
         this.member.a = 0;
 >this.member.a = 0 : 0
 >                  : ^
->this.member.a : error
+>this.member.a : any
+>              : ^^^
 >this.member : {}
 >            : ^^
 >this : this
@@ -75,7 +77,8 @@ var obj = {
 obj.property.a = 0;
 >obj.property.a = 0 : 0
 >                   : ^
->obj.property.a : error
+>obj.property.a : any
+>               : ^^^
 >obj.property : {}
 >             : ^^
 >obj : { property: {}; }
@@ -122,6 +125,7 @@ variable.a = 1;
 >(new C()).member.a = 1 : 1
 >                       : ^
 >(new C()).member.a : any
+>                   : ^^^
 >(new C()).member : {}
 >                 : ^^
 >(new C()) : C
@@ -141,6 +145,7 @@ variable.a = 1;
 >(new C()).initializedMember.a = 1 : 1
 >                                  : ^
 >(new C()).initializedMember.a : any
+>                              : ^^^
 >(new C()).initializedMember : {}
 >                            : ^^
 >(new C()) : C
@@ -160,6 +165,7 @@ obj.property.a = 1;
 >obj.property.a = 1 : 1
 >                   : ^
 >obj.property.a : any
+>               : ^^^
 >obj.property : {}
 >             : ^^
 >obj : { property: {}; }
@@ -175,6 +181,7 @@ arr[0].a = 1;
 >arr[0].a = 1 : 1
 >             : ^
 >arr[0].a : any
+>         : ^^^
 >arr[0] : {}
 >       : ^^
 >arr : {}[]
@@ -190,6 +197,7 @@ getObj().a = 1;
 >getObj().a = 1 : 1
 >               : ^
 >getObj().a : any
+>           : ^^^
 >getObj() : {}
 >         : ^^
 >getObj : () => {}
diff --git a/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.errors.txt b/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.errors.txt
new file mode 100644
index 0000000000000..0cd2160f65128
--- /dev/null
+++ b/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.errors.txt
@@ -0,0 +1,43 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== jsdocAccessibilityTagDeclarations.js (0 errors) ====
+    class Protected {
+        /** @protected */
+        constructor(c) {
+            /** @protected */
+            this.c = c
+        }
+        /** @protected */
+        m() {
+            return this.c
+        }
+        /** @protected */
+        get p() { return this.c }
+        /** @protected */
+        set p(value) { this.c = value }
+    }
+    
+    class Private {
+        /** @private */
+        constructor(c) {
+            /** @private */
+            this.c = c
+        }
+        /** @private */
+        m() {
+            return this.c
+        }
+        /** @private */
+        get p() { return this.c }
+        /** @private */
+        set p(value) { this.c = value }
+    }
+    
+    // https://github.com/microsoft/TypeScript/issues/38401
+    class C {
+        constructor(/** @public */ x, /** @protected */ y, /** @private */ z) {
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.types b/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.types
index 07faa0a717dd0..1f9e3490d7b94 100644
--- a/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.types
+++ b/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.types
@@ -8,16 +8,20 @@ class Protected {
     /** @protected */
     constructor(c) {
 >c : any
+>  : ^^^
 
         /** @protected */
         this.c = c
 >this.c = c : any
+>           : ^^^
 >this.c : any
+>       : ^^^
 >this : this
 >     : ^^^^
 >c : any
 >  : ^^^
 >c : any
+>  : ^^^
     }
     /** @protected */
     m() {
@@ -26,6 +30,7 @@ class Protected {
 
         return this.c
 >this.c : any
+>       : ^^^
 >this : this
 >     : ^^^^
 >c : any
@@ -34,7 +39,9 @@ class Protected {
     /** @protected */
     get p() { return this.c }
 >p : any
+>  : ^^^
 >this.c : any
+>       : ^^^
 >this : this
 >     : ^^^^
 >c : any
@@ -43,14 +50,19 @@ class Protected {
     /** @protected */
     set p(value) { this.c = value }
 >p : any
+>  : ^^^
 >value : any
+>      : ^^^
 >this.c = value : any
+>               : ^^^
 >this.c : any
+>       : ^^^
 >this : this
 >     : ^^^^
 >c : any
 >  : ^^^
 >value : any
+>      : ^^^
 }
 
 class Private {
@@ -60,16 +72,20 @@ class Private {
     /** @private */
     constructor(c) {
 >c : any
+>  : ^^^
 
         /** @private */
         this.c = c
 >this.c = c : any
+>           : ^^^
 >this.c : any
+>       : ^^^
 >this : this
 >     : ^^^^
 >c : any
 >  : ^^^
 >c : any
+>  : ^^^
     }
     /** @private */
     m() {
@@ -78,6 +94,7 @@ class Private {
 
         return this.c
 >this.c : any
+>       : ^^^
 >this : this
 >     : ^^^^
 >c : any
@@ -86,7 +103,9 @@ class Private {
     /** @private */
     get p() { return this.c }
 >p : any
+>  : ^^^
 >this.c : any
+>       : ^^^
 >this : this
 >     : ^^^^
 >c : any
@@ -95,14 +114,19 @@ class Private {
     /** @private */
     set p(value) { this.c = value }
 >p : any
+>  : ^^^
 >value : any
+>      : ^^^
 >this.c = value : any
+>               : ^^^
 >this.c : any
+>       : ^^^
 >this : this
 >     : ^^^^
 >c : any
 >  : ^^^
 >value : any
+>      : ^^^
 }
 
 // https://github.com/microsoft/TypeScript/issues/38401
@@ -112,8 +136,11 @@ class C {
 
     constructor(/** @public */ x, /** @protected */ y, /** @private */ z) {
 >x : any
+>  : ^^^
 >y : any
+>  : ^^^
 >z : any
+>  : ^^^
     }
 }
 
diff --git a/tests/baselines/reference/jsdocCallbackAndType.errors.txt b/tests/baselines/reference/jsdocCallbackAndType.errors.txt
index b3a6719491c7d..650d61b5f78f6 100644
--- a/tests/baselines/reference/jsdocCallbackAndType.errors.txt
+++ b/tests/baselines/reference/jsdocCallbackAndType.errors.txt
@@ -1,13 +1,18 @@
+/a.js(6,5): error TS2322: Type '{}' is not assignable to type 'B<string>'.
+  Type '{}' provides no match for the signature '(): any'.
 /a.js(8,3): error TS2554: Expected 0 arguments, but got 1.
 
 
-==== /a.js (1 errors) ====
+==== /a.js (2 errors) ====
     /**
      * @template T
      * @callback B
      */
     /** @type {B<string>} */
-    let b;
+    let b = {};
+        ~
+!!! error TS2322: Type '{}' is not assignable to type 'B<string>'.
+!!! error TS2322:   Type '{}' provides no match for the signature '(): any'.
     b();
     b(1);
       ~
diff --git a/tests/baselines/reference/jsdocCallbackAndType.symbols b/tests/baselines/reference/jsdocCallbackAndType.symbols
index f0ae77ce45364..dce8c2eb8305f 100644
--- a/tests/baselines/reference/jsdocCallbackAndType.symbols
+++ b/tests/baselines/reference/jsdocCallbackAndType.symbols
@@ -6,7 +6,7 @@
  * @callback B
  */
 /** @type {B<string>} */
-let b;
+let b = {};
 >b : Symbol(b, Decl(a.js, 5, 3))
 
 b();
diff --git a/tests/baselines/reference/jsdocCallbackAndType.types b/tests/baselines/reference/jsdocCallbackAndType.types
index 720a62178b90d..a5a404ed832e3 100644
--- a/tests/baselines/reference/jsdocCallbackAndType.types
+++ b/tests/baselines/reference/jsdocCallbackAndType.types
@@ -6,9 +6,11 @@
  * @callback B
  */
 /** @type {B<string>} */
-let b;
+let b = {};
 >b : B<string>
 >  : ^^^^^^^^^
+>{} : {}
+>   : ^^
 
 b();
 >b() : any
diff --git a/tests/baselines/reference/jsdocLiteral.errors.txt b/tests/baselines/reference/jsdocLiteral.errors.txt
new file mode 100644
index 0000000000000..958fd3b537076
--- /dev/null
+++ b/tests/baselines/reference/jsdocLiteral.errors.txt
@@ -0,0 +1,16 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== in.js (0 errors) ====
+    /**
+     * @param {'literal'} p1
+     * @param {"literal"} p2
+     * @param {'literal' | 'other'} p3
+     * @param {'literal' | number} p4
+     * @param {12 | true | 'str'} p5
+     */
+    function f(p1, p2, p3, p4, p5) {
+        return p1 + p2 + p3 + p4 + p5 + '.';
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocNeverUndefinedNull.errors.txt b/tests/baselines/reference/jsdocNeverUndefinedNull.errors.txt
new file mode 100644
index 0000000000000..10ccd0ff34311
--- /dev/null
+++ b/tests/baselines/reference/jsdocNeverUndefinedNull.errors.txt
@@ -0,0 +1,14 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== in.js (0 errors) ====
+    /**
+     * @param {never} p1
+     * @param {undefined} p2
+     * @param {null} p3
+     * @returns {void} nothing
+     */
+    function f(p1, p2, p3) {
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocReadonlyDeclarations.errors.txt b/tests/baselines/reference/jsdocReadonlyDeclarations.errors.txt
new file mode 100644
index 0000000000000..767924a35a0ad
--- /dev/null
+++ b/tests/baselines/reference/jsdocReadonlyDeclarations.errors.txt
@@ -0,0 +1,30 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== jsdocReadonlyDeclarations.js (0 errors) ====
+    class C {
+        /** @readonly */
+        x = 6
+        /** @readonly */
+        constructor(n) {
+            this.x = n
+            /**
+             * @readonly
+             * @type {number}
+             */
+            this.y = n
+        }
+    }
+    new C().x
+    
+    function F() {
+        /** @readonly */
+        this.z = 1
+    }
+    
+    // https://github.com/microsoft/TypeScript/issues/38401
+    class D {
+        constructor(/** @readonly */ x) {}
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocReadonlyDeclarations.types b/tests/baselines/reference/jsdocReadonlyDeclarations.types
index 1f91b14674ba6..cd61a8cb9c88b 100644
--- a/tests/baselines/reference/jsdocReadonlyDeclarations.types
+++ b/tests/baselines/reference/jsdocReadonlyDeclarations.types
@@ -15,9 +15,11 @@ class C {
     /** @readonly */
     constructor(n) {
 >n : any
+>  : ^^^
 
         this.x = n
 >this.x = n : any
+>           : ^^^
 >this.x : 6
 >       : ^
 >this : this
@@ -25,6 +27,7 @@ class C {
 >x : 6
 >  : ^
 >n : any
+>  : ^^^
 
         /**
          * @readonly
@@ -32,6 +35,7 @@ class C {
          */
         this.y = n
 >this.y = n : any
+>           : ^^^
 >this.y : number
 >       : ^^^^^^
 >this : this
@@ -39,6 +43,7 @@ class C {
 >y : number
 >  : ^^^^^^
 >n : any
+>  : ^^^
     }
 }
 new C().x
@@ -60,6 +65,7 @@ function F() {
 >this.z = 1 : 1
 >           : ^
 >this.z : any
+>       : ^^^
 >this : this
 >     : ^^^^
 >z : any
@@ -75,5 +81,6 @@ class D {
 
     constructor(/** @readonly */ x) {}
 >x : any
+>  : ^^^
 }
 
diff --git a/tests/baselines/reference/jsdocReturnTag1.errors.txt b/tests/baselines/reference/jsdocReturnTag1.errors.txt
new file mode 100644
index 0000000000000..44e8cc0b18d9a
--- /dev/null
+++ b/tests/baselines/reference/jsdocReturnTag1.errors.txt
@@ -0,0 +1,26 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== returns.js (0 errors) ====
+    /**
+     * @returns {string} This comment is not currently exposed
+     */
+    function f() {
+        return 5;
+    }
+    
+    /**
+     * @returns {string=} This comment is not currently exposed
+     */
+    function f1() {
+        return 5;
+    }
+    
+    /**
+     * @returns {string|number} This comment is not currently exposed
+     */
+    function f2() {
+        return 5 || "hello";
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxCallElaborationCheckNoCrash1.js b/tests/baselines/reference/jsxCallElaborationCheckNoCrash1.js
index 0338e0385f24c..8d90752876629 100644
--- a/tests/baselines/reference/jsxCallElaborationCheckNoCrash1.js
+++ b/tests/baselines/reference/jsxCallElaborationCheckNoCrash1.js
@@ -17,7 +17,7 @@ export const Hoc = <Tag extends Tags>(
 
 //// [jsxCallElaborationCheckNoCrash1.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
diff --git a/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.errors.txt b/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.errors.txt
index dc6dce045ded2..07d3951e980af 100644
--- a/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.errors.txt
+++ b/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.errors.txt
@@ -1,24 +1,14 @@
-file.jsx(1,18): error TS18042: 'Prop' is a type and cannot be imported in JavaScript files. Use 'import("./component").Prop' in a JSDoc type annotation.
-file.jsx(4,9): error TS2657: JSX expressions must have one parent element.
-file.jsx(4,16): error TS1003: Identifier expected.
-file.jsx(4,17): error TS2693: 'Prop' only refers to a type, but is being used as a value here.
-file.jsx(4,17): error TS17008: JSX element 'Prop' has no corresponding closing tag.
-file.jsx(4,38): error TS1382: Unexpected token. Did you mean `{'>'}` or `&gt;`?
-file.jsx(5,1): error TS1005: '</' expected.
+file.jsx(2,18): error TS18042: 'Prop' is a type and cannot be imported in JavaScript files. Use 'import("./component").Prop' in a JSDoc type annotation.
+file.jsx(5,9): error TS2657: JSX expressions must have one parent element.
+file.jsx(5,16): error TS1003: Identifier expected.
+file.jsx(5,17): error TS2693: 'Prop' only refers to a type, but is being used as a value here.
+file.jsx(5,17): error TS17008: JSX element 'Prop' has no corresponding closing tag.
+file.jsx(5,38): error TS1382: Unexpected token. Did you mean `{'>'}` or `&gt;`?
+file.jsx(6,1): error TS1005: '</' expected.
 
 
-==== component.d.ts (0 errors) ====
-    import * as React from "react";
-    export declare class MyComp<P> extends React.Component<P, {}> {
-        internalProp: P;
-    }
-    
-    export interface Prop {
-        a: number,
-        b: string
-    }
-    
 ==== file.jsx (7 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
     import { MyComp, Prop } from "./component";
                      ~~~~
 !!! error TS18042: 'Prop' is a type and cannot be imported in JavaScript files. Use 'import("./component").Prop' in a JSDoc type annotation.
@@ -38,4 +28,15 @@ file.jsx(5,1): error TS1005: '</' expected.
     
 !!! error TS2657: JSX expressions must have one parent element.
     
-!!! error TS1005: '</' expected.
\ No newline at end of file
+!!! error TS1005: '</' expected.
+==== component.d.ts (0 errors) ====
+    import * as React from "react";
+    export declare class MyComp<P> extends React.Component<P, {}> {
+        internalProp: P;
+    }
+    
+    export interface Prop {
+        a: number,
+        b: string
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.js b/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.js
index 15e2270ab7206..729378118fe66 100644
--- a/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.js
+++ b/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.js
@@ -12,6 +12,7 @@ export interface Prop {
 }
 
 //// [file.jsx]
+/// <reference path="/.lib/react.d.ts" />
 import { MyComp, Prop } from "./component";
 import * as React from "react";
 
@@ -54,6 +55,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+/// <reference path="/.lib/react.d.ts" />
 var component_1 = require("./component");
 var React = __importStar(require("react"));
 var x = <component_1.MyComp />, <component_1.Prop> a={10} b="hi" />; // error, no type arguments in js
diff --git a/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.symbols b/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.symbols
index a21ff874bb561..ebbbdcf570e56 100644
--- a/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.symbols
+++ b/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.symbols
@@ -1,5 +1,18 @@
 //// [tests/cases/conformance/jsx/jsxCheckJsxNoTypeArgumentsAllowed.tsx] ////
 
+=== file.jsx ===
+/// <reference path="react.d.ts" />
+import { MyComp, Prop } from "./component";
+>MyComp : Symbol(MyComp, Decl(file.jsx, 1, 8))
+>Prop : Symbol(Prop, Decl(file.jsx, 1, 16))
+
+import * as React from "react";
+>React : Symbol(React, Decl(file.jsx, 2, 6))
+
+let x = <MyComp<Prop> a={10} b="hi" />; // error, no type arguments in js
+>x : Symbol(x, Decl(file.jsx, 4, 3))
+>MyComp : Symbol(MyComp, Decl(file.jsx, 1, 8))
+
 === component.d.ts ===
 import * as React from "react";
 >React : Symbol(React, Decl(component.d.ts, 0, 6))
@@ -27,15 +40,3 @@ export interface Prop {
 >b : Symbol(Prop.b, Decl(component.d.ts, 6, 14))
 }
 
-=== file.jsx ===
-import { MyComp, Prop } from "./component";
->MyComp : Symbol(MyComp, Decl(file.jsx, 0, 8))
->Prop : Symbol(Prop, Decl(file.jsx, 0, 16))
-
-import * as React from "react";
->React : Symbol(React, Decl(file.jsx, 1, 6))
-
-let x = <MyComp<Prop> a={10} b="hi" />; // error, no type arguments in js
->x : Symbol(x, Decl(file.jsx, 3, 3))
->MyComp : Symbol(MyComp, Decl(file.jsx, 0, 8))
-
diff --git a/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.types b/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.types
index 16375b8f6c33b..07d3c84c95052 100644
--- a/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.types
+++ b/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.types
@@ -1,36 +1,7 @@
 //// [tests/cases/conformance/jsx/jsxCheckJsxNoTypeArgumentsAllowed.tsx] ////
 
-=== component.d.ts ===
-import * as React from "react";
->React : typeof React
->      : ^^^^^^^^^^^^
-
-export declare class MyComp<P> extends React.Component<P, {}> {
->MyComp : MyComp<P>
->       : ^^^^^^^^^
->React.Component : React.Component<P, {}>
->                : ^^^^^^^^^^^^^^^^^^^^^^
->React : typeof React
->      : ^^^^^^^^^^^^
->Component : typeof React.Component
->          : ^^^^^^^^^^^^^^^^^^^^^^
-
-    internalProp: P;
->internalProp : P
->             : ^
-}
-
-export interface Prop {
-    a: number,
->a : number
->  : ^^^^^^
-
-    b: string
->b : string
->  : ^^^^^^
-}
-
 === file.jsx ===
+/// <reference path="react.d.ts" />
 import { MyComp, Prop } from "./component";
 >MyComp : typeof MyComp
 >       : ^^^^^^^^^^^^^
@@ -60,3 +31,33 @@ let x = <MyComp<Prop> a={10} b="hi" />; // error, no type arguments in js
 > : any
 > : ^^^
 
+=== component.d.ts ===
+import * as React from "react";
+>React : typeof React
+>      : ^^^^^^^^^^^^
+
+export declare class MyComp<P> extends React.Component<P, {}> {
+>MyComp : MyComp<P>
+>       : ^^^^^^^^^
+>React.Component : React.Component<P, {}>
+>                : ^^^^^^^^^^^^^^^^^^^^^^
+>React : typeof React
+>      : ^^^^^^^^^^^^
+>Component : typeof React.Component
+>          : ^^^^^^^^^^^^^^^^^^^^^^
+
+    internalProp: P;
+>internalProp : P
+>             : ^
+}
+
+export interface Prop {
+    a: number,
+>a : number
+>  : ^^^^^^
+
+    b: string
+>b : string
+>  : ^^^^^^
+}
+
diff --git a/tests/baselines/reference/jsxChildWrongType.js b/tests/baselines/reference/jsxChildWrongType.js
index f7b1c2fcf867a..5b9691a2bd032 100644
--- a/tests/baselines/reference/jsxChildWrongType.js
+++ b/tests/baselines/reference/jsxChildWrongType.js
@@ -14,8 +14,8 @@ const a = (
 
 //// [index.js]
 "use strict";
-/// <reference path="react18/react18.d.ts" />
-/// <reference path="react18/global.d.ts" />
+/// <reference path="/.lib/react18/react18.d.ts" />
+/// <reference path="/.lib/react18/global.d.ts" />
 const a = (React.createElement("main", null,
     (React.createElement("div", null)),
     React.createElement("span", null)));
diff --git a/tests/baselines/reference/jsxChildrenArrayWrongType.js b/tests/baselines/reference/jsxChildrenArrayWrongType.js
index 35648b8cecbaa..2d2e61a822a15 100644
--- a/tests/baselines/reference/jsxChildrenArrayWrongType.js
+++ b/tests/baselines/reference/jsxChildrenArrayWrongType.js
@@ -19,8 +19,8 @@ const b = (
 
 //// [index.js]
 "use strict";
-/// <reference path="react18/react18.d.ts" />
-/// <reference path="react18/global.d.ts" />
+/// <reference path="/.lib/react18/react18.d.ts" />
+/// <reference path="/.lib/react18/global.d.ts" />
 var b = (React.createElement(Foo, null,
     React.createElement("div", null),
     "aa"));
diff --git a/tests/baselines/reference/jsxChildrenIndividualErrorElaborations.js b/tests/baselines/reference/jsxChildrenIndividualErrorElaborations.js
index bfdb778a1586d..c665e901064e1 100644
--- a/tests/baselines/reference/jsxChildrenIndividualErrorElaborations.js
+++ b/tests/baselines/reference/jsxChildrenIndividualErrorElaborations.js
@@ -117,7 +117,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Blah = Blah;
 exports.Blah2 = Blah2;
 exports.Blah3 = Blah3;
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var React = __importStar(require("react"));
 function Blah(props) {
     return React.createElement(React.Fragment, null);
diff --git a/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js b/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
index 83121c9f7e887..b7915b508aed4 100644
--- a/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
+++ b/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
@@ -28,7 +28,7 @@ export class App extends React.Component<{}> {
 
 //// [jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/jsxChildrenWrongType.js b/tests/baselines/reference/jsxChildrenWrongType.js
index 105528019f7c6..540adbf69cd5c 100644
--- a/tests/baselines/reference/jsxChildrenWrongType.js
+++ b/tests/baselines/reference/jsxChildrenWrongType.js
@@ -18,8 +18,8 @@ const b = (
 
 //// [other.js]
 "use strict";
-/// <reference path="react18/react18.d.ts" />
-/// <reference path="react18/global.d.ts" />
+/// <reference path="/.lib/react18/react18.d.ts" />
+/// <reference path="/.lib/react18/global.d.ts" />
 const b = (React.createElement(Foo, null,
     React.createElement("div", null),
     "aa"));
diff --git a/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js b/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js
index b5a82fb9e4447..1d61cacbcac62 100644
--- a/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js
+++ b/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js
@@ -612,7 +612,7 @@ export interface ReactSelectProps<TValue = OptionValues> extends React.Props<Rea
 
 //// [jsxComplexSignatureHasApplicabilityError.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
diff --git a/tests/baselines/reference/jsxDeclarationsWithEsModuleInteropNoCrash.js b/tests/baselines/reference/jsxDeclarationsWithEsModuleInteropNoCrash.js
index f58780490e1e5..2b120b079c439 100644
--- a/tests/baselines/reference/jsxDeclarationsWithEsModuleInteropNoCrash.js
+++ b/tests/baselines/reference/jsxDeclarationsWithEsModuleInteropNoCrash.js
@@ -25,7 +25,7 @@ export default Foo;
 
 
 //// [jsxDeclarationsWithEsModuleInteropNoCrash.d.ts]
-/// <reference path="..react16.d.ts" preserve="true" />
+/// <reference path="../.lib/react16.d.ts" preserve="true" />
 export default Foo;
 declare function Foo({ bar }: {
     bar: any;
diff --git a/tests/baselines/reference/jsxElementType.js b/tests/baselines/reference/jsxElementType.js
index 33b9bfa9d2d19..4697d4574e180 100644
--- a/tests/baselines/reference/jsxElementType.js
+++ b/tests/baselines/reference/jsxElementType.js
@@ -201,7 +201,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var React = __importStar(require("react"));
 var Component;
 var RenderElement = function (_a) {
diff --git a/tests/baselines/reference/jsxElementTypeLiteral.js b/tests/baselines/reference/jsxElementTypeLiteral.js
index 76e163485d026..2bf3794f30fbd 100644
--- a/tests/baselines/reference/jsxElementTypeLiteral.js
+++ b/tests/baselines/reference/jsxElementTypeLiteral.js
@@ -59,7 +59,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var React = __importStar(require("react"));
 // should be fine - `ElementType` accepts `div`
 var a = React.createElement("div", null);
diff --git a/tests/baselines/reference/jsxElementTypeLiteralWithGeneric.js b/tests/baselines/reference/jsxElementTypeLiteralWithGeneric.js
index 6fd1e77e2c1ae..2db47b4c75e5f 100644
--- a/tests/baselines/reference/jsxElementTypeLiteralWithGeneric.js
+++ b/tests/baselines/reference/jsxElementTypeLiteralWithGeneric.js
@@ -60,7 +60,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var React = __importStar(require("react"));
 // should be fine - `ElementType` accepts `div`
 var a = React.createElement("div", null);
diff --git a/tests/baselines/reference/jsxEmptyExpressionNotCountedAsChild(jsx=react).js b/tests/baselines/reference/jsxEmptyExpressionNotCountedAsChild(jsx=react).js
index fbbcb46c2d709..e998b27297d10 100644
--- a/tests/baselines/reference/jsxEmptyExpressionNotCountedAsChild(jsx=react).js
+++ b/tests/baselines/reference/jsxEmptyExpressionNotCountedAsChild(jsx=react).js
@@ -55,7 +55,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var React = __importStar(require("react"));
 function Wrapper(props) {
     return React.createElement("div", null, props.children);
diff --git a/tests/baselines/reference/jsxExcessPropsAndAssignability.js b/tests/baselines/reference/jsxExcessPropsAndAssignability.js
index eec661691ba3b..8f5f994513a9c 100644
--- a/tests/baselines/reference/jsxExcessPropsAndAssignability.js
+++ b/tests/baselines/reference/jsxExcessPropsAndAssignability.js
@@ -20,7 +20,7 @@ const myHoc = <ComposedComponentProps extends any>(
 
 //// [jsxExcessPropsAndAssignability.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.errors.txt b/tests/baselines/reference/jsxFactoryAndReactNamespace.errors.txt
index 3784948d57a2f..877adc2e803f7 100644
--- a/tests/baselines/reference/jsxFactoryAndReactNamespace.errors.txt
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.errors.txt
@@ -36,7 +36,7 @@ error TS5053: Option 'reactNamespace' cannot be specified with option 'jsxFactor
 ==== test.tsx (0 errors) ====
     import { Element} from './Element';
     
-    let c: {
+    declare let c: {
     	a?: {
     		b: string
     	}
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.js b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
index 243700d76b1d4..fd74fa7225792 100644
--- a/tests/baselines/reference/jsxFactoryAndReactNamespace.js
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
@@ -34,7 +34,7 @@ function toCamelCase(text: string): string {
 //// [test.tsx]
 import { Element} from './Element';
 
-let c: {
+declare let c: {
 	a?: {
 		b: string
 	}
@@ -72,7 +72,6 @@ function toCamelCase(text) {
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
-let c;
 class A {
     view() {
         return [
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.symbols b/tests/baselines/reference/jsxFactoryAndReactNamespace.symbols
index e177e45714a14..24ba3b5817569 100644
--- a/tests/baselines/reference/jsxFactoryAndReactNamespace.symbols
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.symbols
@@ -82,11 +82,11 @@ function toCamelCase(text: string): string {
 import { Element} from './Element';
 >Element : Symbol(Element, Decl(test.tsx, 0, 8))
 
-let c: {
->c : Symbol(c, Decl(test.tsx, 2, 3))
+declare let c: {
+>c : Symbol(c, Decl(test.tsx, 2, 11))
 
 	a?: {
->a : Symbol(a, Decl(test.tsx, 2, 8))
+>a : Symbol(a, Decl(test.tsx, 2, 16))
 
 		b: string
 >b : Symbol(b, Decl(test.tsx, 3, 6))
@@ -106,9 +106,9 @@ class A {
 			<meta content={c.a!.b}></meta>
 >content : Symbol(content, Decl(test.tsx, 12, 8))
 >c.a!.b : Symbol(b, Decl(test.tsx, 3, 6))
->c.a : Symbol(a, Decl(test.tsx, 2, 8))
->c : Symbol(c, Decl(test.tsx, 2, 3))
->a : Symbol(a, Decl(test.tsx, 2, 8))
+>c.a : Symbol(a, Decl(test.tsx, 2, 16))
+>c : Symbol(c, Decl(test.tsx, 2, 11))
+>a : Symbol(a, Decl(test.tsx, 2, 16))
 >b : Symbol(b, Decl(test.tsx, 3, 6))
 
 		];
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.types b/tests/baselines/reference/jsxFactoryAndReactNamespace.types
index 021e638349d38..26f147d1dced4 100644
--- a/tests/baselines/reference/jsxFactoryAndReactNamespace.types
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.types
@@ -128,7 +128,7 @@ import { Element} from './Element';
 >Element : typeof Element
 >        : ^^^^^^^^^^^^^^
 
-let c: {
+declare let c: {
 >c : { a?: { b: string; }; }
 >  : ^^^^^^              ^^^
 
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.errors.txt b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.errors.txt
index eb27397177344..3077f086fed64 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.errors.txt
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.errors.txt
@@ -38,7 +38,7 @@ test.tsx(13,5): error TS2874: This JSX tag requires 'React' to be in scope, but
 ==== test.tsx (2 errors) ====
     import { Element} from './Element';
     
-    let c: {
+    declare let c: {
     	a?: {
     		b: string
     	}
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
index 4a8c53383b38f..97293555c2973 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
@@ -34,7 +34,7 @@ function toCamelCase(text: string): string {
 //// [test.tsx]
 import { Element} from './Element';
 
-let c: {
+declare let c: {
 	a?: {
 		b: string
 	}
@@ -71,7 +71,6 @@ function toCamelCase(text) {
 //// [test.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-let c;
 class A {
     view() {
         return [
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.symbols b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.symbols
index 3fe6e8fe4186d..98229ecaab4d2 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.symbols
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.symbols
@@ -82,11 +82,11 @@ function toCamelCase(text: string): string {
 import { Element} from './Element';
 >Element : Symbol(Element, Decl(test.tsx, 0, 8))
 
-let c: {
->c : Symbol(c, Decl(test.tsx, 2, 3))
+declare let c: {
+>c : Symbol(c, Decl(test.tsx, 2, 11))
 
 	a?: {
->a : Symbol(a, Decl(test.tsx, 2, 8))
+>a : Symbol(a, Decl(test.tsx, 2, 16))
 
 		b: string
 >b : Symbol(b, Decl(test.tsx, 3, 6))
@@ -106,9 +106,9 @@ class A {
 			<meta content={c.a!.b}></meta>
 >content : Symbol(content, Decl(test.tsx, 12, 8))
 >c.a!.b : Symbol(b, Decl(test.tsx, 3, 6))
->c.a : Symbol(a, Decl(test.tsx, 2, 8))
->c : Symbol(c, Decl(test.tsx, 2, 3))
->a : Symbol(a, Decl(test.tsx, 2, 8))
+>c.a : Symbol(a, Decl(test.tsx, 2, 16))
+>c : Symbol(c, Decl(test.tsx, 2, 11))
+>a : Symbol(a, Decl(test.tsx, 2, 16))
 >b : Symbol(b, Decl(test.tsx, 3, 6))
 
 		];
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types
index bee5a41234b64..4ab04fda2b60d 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types
@@ -128,7 +128,7 @@ import { Element} from './Element';
 >Element : typeof Element
 >        : ^^^^^^^^^^^^^^
 
-let c: {
+declare let c: {
 >c : { a?: { b: string; }; }
 >  : ^^^^^^              ^^^
 
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.errors.txt b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.errors.txt
index 1e0a70a8debf8..765cf8875431e 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.errors.txt
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.errors.txt
@@ -38,7 +38,7 @@ test.tsx(13,5): error TS2874: This JSX tag requires 'React' to be in scope, but
 ==== test.tsx (2 errors) ====
     import { Element} from './Element';
     
-    let c: {
+    declare let c: {
     	a?: {
     		b: string
     	}
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
index 6d7e2781b8ece..9156caaf750fa 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
@@ -34,7 +34,7 @@ function toCamelCase(text: string): string {
 //// [test.tsx]
 import { Element} from './Element';
 
-let c: {
+declare let c: {
 	a?: {
 		b: string
 	}
@@ -71,7 +71,6 @@ function toCamelCase(text) {
 //// [test.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-let c;
 class A {
     view() {
         return [
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.symbols b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.symbols
index 17be608f15f42..c2bd98a800a06 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.symbols
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.symbols
@@ -82,11 +82,11 @@ function toCamelCase(text: string): string {
 import { Element} from './Element';
 >Element : Symbol(Element, Decl(test.tsx, 0, 8))
 
-let c: {
->c : Symbol(c, Decl(test.tsx, 2, 3))
+declare let c: {
+>c : Symbol(c, Decl(test.tsx, 2, 11))
 
 	a?: {
->a : Symbol(a, Decl(test.tsx, 2, 8))
+>a : Symbol(a, Decl(test.tsx, 2, 16))
 
 		b: string
 >b : Symbol(b, Decl(test.tsx, 3, 6))
@@ -106,9 +106,9 @@ class A {
 			<meta content={c.a!.b}></meta>
 >content : Symbol(content, Decl(test.tsx, 12, 8))
 >c.a!.b : Symbol(b, Decl(test.tsx, 3, 6))
->c.a : Symbol(a, Decl(test.tsx, 2, 8))
->c : Symbol(c, Decl(test.tsx, 2, 3))
->a : Symbol(a, Decl(test.tsx, 2, 8))
+>c.a : Symbol(a, Decl(test.tsx, 2, 16))
+>c : Symbol(c, Decl(test.tsx, 2, 11))
+>a : Symbol(a, Decl(test.tsx, 2, 16))
 >b : Symbol(b, Decl(test.tsx, 3, 6))
 
 		];
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types
index b44a81844e020..243a230e4556d 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types
@@ -128,7 +128,7 @@ import { Element} from './Element';
 >Element : typeof Element
 >        : ^^^^^^^^^^^^^^
 
-let c: {
+declare let c: {
 >c : { a?: { b: string; }; }
 >  : ^^^^^^              ^^^
 
diff --git a/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).js b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).js
index 29e499dbf98ea..4b9862f13fa12 100644
--- a/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).js
+++ b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).js
@@ -10,8 +10,8 @@ return <>
 }
 
 //// [jsxFragReactReferenceErrors.jsx]
-/// <reference path="react18/react18.d.ts" />
-/// <reference path="react18/global.d.ts" />
+/// <reference path="/.lib/react18/react18.d.ts" />
+/// <reference path="/.lib/react18/global.d.ts" />
 export function Component() {
     return <>
   </>;
diff --git a/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).js b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).js
index 9ccb21875c4e4..dde6a23cde9b2 100644
--- a/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).js
+++ b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).js
@@ -10,8 +10,8 @@ return <>
 }
 
 //// [jsxFragReactReferenceErrors.js]
-/// <reference path="react18/react18.d.ts" />
-/// <reference path="react18/global.d.ts" />
+/// <reference path="/.lib/react18/react18.d.ts" />
+/// <reference path="/.lib/react18/global.d.ts" />
 export function Component() {
     return <>
   </>;
diff --git a/tests/baselines/reference/jsxFragmentFactoryNoUnusedLocals.js b/tests/baselines/reference/jsxFragmentFactoryNoUnusedLocals.js
index a924ced342d7b..2d15aa2d80f5e 100644
--- a/tests/baselines/reference/jsxFragmentFactoryNoUnusedLocals.js
+++ b/tests/baselines/reference/jsxFragmentFactoryNoUnusedLocals.js
@@ -20,7 +20,7 @@ export function Counter({ count = 0 }: CounterProps) {
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Counter = Counter;
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var react_1 = require("react");
 function Counter(_a) {
     var _b = _a.count, count = _b === void 0 ? 0 : _b;
diff --git a/tests/baselines/reference/jsxFragmentWrongType.js b/tests/baselines/reference/jsxFragmentWrongType.js
index 1ae32537896e1..4047503e145b5 100644
--- a/tests/baselines/reference/jsxFragmentWrongType.js
+++ b/tests/baselines/reference/jsxFragmentWrongType.js
@@ -12,8 +12,8 @@ const jsxWithReactFragment = <React.Fragment>{test}</React.Fragment>;
 
 //// [a.js]
 "use strict";
-/// <reference path="react18/react18.d.ts" />
-/// <reference path="react18/global.d.ts" />
+/// <reference path="/.lib/react18/react18.d.ts" />
+/// <reference path="/.lib/react18/global.d.ts" />
 const test = () => "asd";
 const jsxWithJsxFragment = React.createElement(React.Fragment, null, test);
 const jsxWithReactFragment = React.createElement(React.Fragment, null, test);
diff --git a/tests/baselines/reference/jsxHasLiteralType.js b/tests/baselines/reference/jsxHasLiteralType.js
index 5064fa100c36e..e97e1042938d9 100644
--- a/tests/baselines/reference/jsxHasLiteralType.js
+++ b/tests/baselines/reference/jsxHasLiteralType.js
@@ -1,6 +1,7 @@
 //// [tests/cases/compiler/jsxHasLiteralType.tsx] ////
 
 //// [jsxHasLiteralType.tsx]
+/// <reference path="/.lib/react.d.ts" />
 import * as React from "react";
 
 interface Props {
@@ -61,6 +62,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+/// <reference path="/.lib/react.d.ts" />
 var React = __importStar(require("react"));
 var MyComponent = /** @class */ (function (_super) {
     __extends(MyComponent, _super);
diff --git a/tests/baselines/reference/jsxHasLiteralType.symbols b/tests/baselines/reference/jsxHasLiteralType.symbols
index b256ef84ccdf8..9120d2e6d5ac0 100644
--- a/tests/baselines/reference/jsxHasLiteralType.symbols
+++ b/tests/baselines/reference/jsxHasLiteralType.symbols
@@ -1,27 +1,28 @@
 //// [tests/cases/compiler/jsxHasLiteralType.tsx] ////
 
 === jsxHasLiteralType.tsx ===
+/// <reference path="react.d.ts" />
 import * as React from "react";
->React : Symbol(React, Decl(jsxHasLiteralType.tsx, 0, 6))
+>React : Symbol(React, Decl(jsxHasLiteralType.tsx, 1, 6))
 
 interface Props {
->Props : Symbol(Props, Decl(jsxHasLiteralType.tsx, 0, 31))
+>Props : Symbol(Props, Decl(jsxHasLiteralType.tsx, 1, 31))
 
     x?: "a" | "b";
->x : Symbol(Props.x, Decl(jsxHasLiteralType.tsx, 2, 17))
+>x : Symbol(Props.x, Decl(jsxHasLiteralType.tsx, 3, 17))
 }
 class MyComponent<P extends Props = Props> extends React.Component<P, {}> {}
->MyComponent : Symbol(MyComponent, Decl(jsxHasLiteralType.tsx, 4, 1))
->P : Symbol(P, Decl(jsxHasLiteralType.tsx, 5, 18))
->Props : Symbol(Props, Decl(jsxHasLiteralType.tsx, 0, 31))
->Props : Symbol(Props, Decl(jsxHasLiteralType.tsx, 0, 31))
+>MyComponent : Symbol(MyComponent, Decl(jsxHasLiteralType.tsx, 5, 1))
+>P : Symbol(P, Decl(jsxHasLiteralType.tsx, 6, 18))
+>Props : Symbol(Props, Decl(jsxHasLiteralType.tsx, 1, 31))
+>Props : Symbol(Props, Decl(jsxHasLiteralType.tsx, 1, 31))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->React : Symbol(React, Decl(jsxHasLiteralType.tsx, 0, 6))
+>React : Symbol(React, Decl(jsxHasLiteralType.tsx, 1, 6))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->P : Symbol(P, Decl(jsxHasLiteralType.tsx, 5, 18))
+>P : Symbol(P, Decl(jsxHasLiteralType.tsx, 6, 18))
 
 const m = <MyComponent x="a"/>
->m : Symbol(m, Decl(jsxHasLiteralType.tsx, 6, 5))
->MyComponent : Symbol(MyComponent, Decl(jsxHasLiteralType.tsx, 4, 1))
->x : Symbol(x, Decl(jsxHasLiteralType.tsx, 6, 22))
+>m : Symbol(m, Decl(jsxHasLiteralType.tsx, 7, 5))
+>MyComponent : Symbol(MyComponent, Decl(jsxHasLiteralType.tsx, 5, 1))
+>x : Symbol(x, Decl(jsxHasLiteralType.tsx, 7, 22))
 
diff --git a/tests/baselines/reference/jsxHasLiteralType.types b/tests/baselines/reference/jsxHasLiteralType.types
index 95bb296037931..8ac39d8b9d063 100644
--- a/tests/baselines/reference/jsxHasLiteralType.types
+++ b/tests/baselines/reference/jsxHasLiteralType.types
@@ -1,6 +1,7 @@
 //// [tests/cases/compiler/jsxHasLiteralType.tsx] ////
 
 === jsxHasLiteralType.tsx ===
+/// <reference path="react.d.ts" />
 import * as React from "react";
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.js b/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.js
index 7a3cb23a80a42..06246bcf4330e 100644
--- a/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.js
+++ b/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.js
@@ -45,7 +45,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var React = __importStar(require("react"));
 require("./App.css"); // doesn't actually exist
 var tag = React.createElement("div", null);
diff --git a/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.js b/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.js
index 79c020420f6b5..d85ed0294d4a2 100644
--- a/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.js
+++ b/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.js
@@ -1,6 +1,7 @@
 //// [tests/cases/compiler/jsxInferenceProducesLiteralAsExpected.tsx] ////
 
 //// [jsxInferenceProducesLiteralAsExpected.tsx]
+/// <reference path="/.lib/react.d.ts" />
 import React = require("react");
 type FunctionPropertyNames<T> = { [K in keyof T]: T[K] extends Function ? K : never }[keyof T];
 class TestObject {
@@ -21,6 +22,7 @@ const el2 = <Test<TestObject> model={model} foo="c" />;
 //// [jsxInferenceProducesLiteralAsExpected.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/// <reference path="/.lib/react.d.ts" />
 var React = require("react");
 var TestObject = /** @class */ (function () {
     function TestObject() {
diff --git a/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.symbols b/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.symbols
index 880e73c8bd482..75f6c2201f961 100644
--- a/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.symbols
+++ b/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.symbols
@@ -1,68 +1,69 @@
 //// [tests/cases/compiler/jsxInferenceProducesLiteralAsExpected.tsx] ////
 
 === jsxInferenceProducesLiteralAsExpected.tsx ===
+/// <reference path="react.d.ts" />
 import React = require("react");
 >React : Symbol(React, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 0, 0))
 
 type FunctionPropertyNames<T> = { [K in keyof T]: T[K] extends Function ? K : never }[keyof T];
->FunctionPropertyNames : Symbol(FunctionPropertyNames, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 0, 32))
->T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 1, 27))
->K : Symbol(K, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 1, 35))
->T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 1, 27))
->T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 1, 27))
->K : Symbol(K, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 1, 35))
+>FunctionPropertyNames : Symbol(FunctionPropertyNames, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 1, 32))
+>T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 2, 27))
+>K : Symbol(K, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 2, 35))
+>T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 2, 27))
+>T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 2, 27))
+>K : Symbol(K, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 2, 35))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->K : Symbol(K, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 1, 35))
->T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 1, 27))
+>K : Symbol(K, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 2, 35))
+>T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 2, 27))
 
 class TestObject {
->TestObject : Symbol(TestObject, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 1, 95))
+>TestObject : Symbol(TestObject, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 2, 95))
 
     a: string = '';
->a : Symbol(TestObject.a, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 2, 18))
+>a : Symbol(TestObject.a, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 3, 18))
 
     b: number = 1;
->b : Symbol(TestObject.b, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 3, 19))
+>b : Symbol(TestObject.b, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 4, 19))
 
     c: () => void = () => { };
->c : Symbol(TestObject.c, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 4, 18))
+>c : Symbol(TestObject.c, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 5, 18))
 }
 interface TestProps<T> {
->TestProps : Symbol(TestProps, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 6, 1))
->T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 7, 20))
+>TestProps : Symbol(TestProps, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 7, 1))
+>T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 8, 20))
 
     model: T;
->model : Symbol(TestProps.model, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 7, 24))
->T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 7, 20))
+>model : Symbol(TestProps.model, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 8, 24))
+>T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 8, 20))
 
     foo: FunctionPropertyNames<T>;
->foo : Symbol(TestProps.foo, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 8, 13))
->FunctionPropertyNames : Symbol(FunctionPropertyNames, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 0, 32))
->T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 7, 20))
+>foo : Symbol(TestProps.foo, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 9, 13))
+>FunctionPropertyNames : Symbol(FunctionPropertyNames, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 1, 32))
+>T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 8, 20))
 }
 function Test<T>(props: TestProps<T>) { return <></>; }
->Test : Symbol(Test, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 10, 1))
->T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 11, 14))
->props : Symbol(props, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 11, 17))
->TestProps : Symbol(TestProps, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 6, 1))
->T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 11, 14))
+>Test : Symbol(Test, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 11, 1))
+>T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 12, 14))
+>props : Symbol(props, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 12, 17))
+>TestProps : Symbol(TestProps, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 7, 1))
+>T : Symbol(T, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 12, 14))
 
 const model = new TestObject();
->model : Symbol(model, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 12, 5))
->TestObject : Symbol(TestObject, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 1, 95))
+>model : Symbol(model, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 13, 5))
+>TestObject : Symbol(TestObject, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 2, 95))
 
 const el1 = <Test model={model} foo="c" />;
->el1 : Symbol(el1, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 14, 5))
->Test : Symbol(Test, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 10, 1))
->model : Symbol(model, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 14, 17))
->model : Symbol(model, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 12, 5))
->foo : Symbol(foo, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 14, 31))
+>el1 : Symbol(el1, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 15, 5))
+>Test : Symbol(Test, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 11, 1))
+>model : Symbol(model, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 15, 17))
+>model : Symbol(model, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 13, 5))
+>foo : Symbol(foo, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 15, 31))
 
 const el2 = <Test<TestObject> model={model} foo="c" />;
->el2 : Symbol(el2, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 15, 5))
->Test : Symbol(Test, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 10, 1))
->TestObject : Symbol(TestObject, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 1, 95))
->model : Symbol(model, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 15, 29))
->model : Symbol(model, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 12, 5))
->foo : Symbol(foo, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 15, 43))
+>el2 : Symbol(el2, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 16, 5))
+>Test : Symbol(Test, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 11, 1))
+>TestObject : Symbol(TestObject, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 2, 95))
+>model : Symbol(model, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 16, 29))
+>model : Symbol(model, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 13, 5))
+>foo : Symbol(foo, Decl(jsxInferenceProducesLiteralAsExpected.tsx, 16, 43))
 
diff --git a/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.types b/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.types
index 7e9cee1af46d6..4d52024be8476 100644
--- a/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.types
+++ b/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.types
@@ -6,6 +6,7 @@ Type Count: 5,000
 Instantiation count: 10,000
 
 === jsxInferenceProducesLiteralAsExpected.tsx ===
+/// <reference path="react.d.ts" />
 import React = require("react");
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/jsxIntrinsicElementsCompatability.js b/tests/baselines/reference/jsxIntrinsicElementsCompatability.js
index 42d7bba5817a6..bfef3e2319820 100644
--- a/tests/baselines/reference/jsxIntrinsicElementsCompatability.js
+++ b/tests/baselines/reference/jsxIntrinsicElementsCompatability.js
@@ -48,7 +48,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var React = __importStar(require("react"));
 function SomeComponent(props) {
     // Just so the return value is RectElement, the rendered element doesnt matter
diff --git a/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.js b/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.js
index d9aa42c0d725e..94e8f888bc77b 100644
--- a/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.js
+++ b/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.js
@@ -67,7 +67,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var React = __importStar(require("react"));
 // opening + closing
 var a = React.createElement("div", null); // empty type args
diff --git a/tests/baselines/reference/jsxIntrinsicUnions.js b/tests/baselines/reference/jsxIntrinsicUnions.js
index 4c25bbb44902e..3c45fc199acd6 100644
--- a/tests/baselines/reference/jsxIntrinsicUnions.js
+++ b/tests/baselines/reference/jsxIntrinsicUnions.js
@@ -12,7 +12,7 @@ const tag = <El className="ok" key="key">{"Title"}</El>;
 
 //// [jsxIntrinsicUnions.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
diff --git a/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.js b/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.js
index 195ca5b5746f4..fb1fda0ae4e86 100644
--- a/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.js
+++ b/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.js
@@ -28,7 +28,7 @@ const d = <MyTagWithOptionalNonJSXBits x={2} />; // Technically OK, but probably
 
 //// [jsxIssuesErrorWhenTagExpectsTooManyArguments.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformChildren(jsx=react-jsx).js b/tests/baselines/reference/jsxJsxsCjsTransformChildren(jsx=react-jsx).js
index 87b4ca1caf85a..a81f427c6c390 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformChildren(jsx=react-jsx).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformChildren(jsx=react-jsx).js
@@ -11,5 +11,5 @@ export {};
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var a = (0, jsx_runtime_1.jsx)("div", { children: "text" });
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformChildren(jsx=react-jsxdev).js b/tests/baselines/reference/jsxJsxsCjsTransformChildren(jsx=react-jsxdev).js
index 6b7527be6f216..9c1142c829c6e 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformChildren(jsx=react-jsxdev).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformChildren(jsx=react-jsxdev).js
@@ -12,5 +12,5 @@ export {};
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
 var _jsxFileName = "jsxJsxsCjsTransformChildren.tsx";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var a = (0, jsx_dev_runtime_1.jsxDEV)("div", { children: "text" }, void 0, false, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).js b/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).js
index 4f8b504854d7a..b141720f7cab2 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).js
@@ -14,5 +14,5 @@ export {};
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("preact/jsx-runtime");
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var a = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("p", {}), "text", (0, jsx_runtime_1.jsx)("div", { className: "foo" })] });
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).js b/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).js
index 026bf9ff40343..2b6a98cf136e7 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).js
@@ -15,5 +15,5 @@ export {};
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_dev_runtime_1 = require("preact/jsx-dev-runtime");
 var _jsxFileName = "jsxJsxsCjsTransformCustomImport.tsx";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var a = (0, jsx_dev_runtime_1.jsxDEV)(jsx_dev_runtime_1.Fragment, { children: [(0, jsx_dev_runtime_1.jsxDEV)("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 3 }, this), "text", (0, jsx_dev_runtime_1.jsxDEV)("div", { className: "foo" }, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).js b/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).js
index a30cfa0d547c0..af6a112701fb4 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).js
@@ -26,14 +26,14 @@ export {};
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("preact/jsx-runtime");
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxImportSource preact */
 var a = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("p", {}), "text", (0, jsx_runtime_1.jsx)("div", { className: "foo" })] });
 //// [react.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxImportSource react */
 require("./preact");
 var a = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("p", {}), "text", (0, jsx_runtime_1.jsx)("div", { className: "foo" })] });
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).js b/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).js
index 7db430ee8e58a..b373eae7fce93 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).js
@@ -26,8 +26,8 @@ export {};
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_dev_runtime_1 = require("preact/jsx-dev-runtime");
-var _jsxFileName = "preact.tsx";
-/// <reference path="react16.d.ts" />
+var _jsxFileName = "/.src/preact.tsx";
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxImportSource preact */
 var a = (0, jsx_dev_runtime_1.jsxDEV)(jsx_dev_runtime_1.Fragment, { children: [(0, jsx_dev_runtime_1.jsxDEV)("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 4, columnNumber: 3 }, this), "text", (0, jsx_dev_runtime_1.jsxDEV)("div", { className: "foo" }, void 0, false, { fileName: _jsxFileName, lineNumber: 6, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 10 }, this);
 //// [react.js]
@@ -35,7 +35,7 @@ var a = (0, jsx_dev_runtime_1.jsxDEV)(jsx_dev_runtime_1.Fragment, { children: [(
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
 var _jsxFileName = "react.tsx";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxImportSource react */
 require("./preact");
 var a = (0, jsx_dev_runtime_1.jsxDEV)(jsx_dev_runtime_1.Fragment, { children: [(0, jsx_dev_runtime_1.jsxDEV)("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 3 }, this), "text", (0, jsx_dev_runtime_1.jsxDEV)("div", { className: "foo" }, void 0, false, { fileName: _jsxFileName, lineNumber: 7, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 4, columnNumber: 10 }, this);
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsx).js b/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsx).js
index 1a26bcf92bf90..8edda8fd9a63a 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsx).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsx).js
@@ -25,7 +25,7 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
 var jsx_runtime_1 = require("react/jsx-runtime");
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var props = { answer: 42 };
 var a = (0, jsx_runtime_1.jsx)("div", __assign({}, props, { children: "text" }), "foo");
 var b = (0, react_1.createElement)("div", __assign({}, props, { key: "bar" }), "text");
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsxdev).js b/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsxdev).js
index 91eca31420e94..fd6d5cfc85264 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsxdev).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsxdev).js
@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
 var jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
 var _jsxFileName = "jsxJsxsCjsTransformKeyProp.tsx";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var props = { answer: 42 };
 var a = (0, jsx_dev_runtime_1.jsxDEV)("div", __assign({}, props, { children: "text" }), "foo", false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 10 }, this);
 var b = (0, react_1.createElement)("div", __assign({}, props, { key: "bar" }), "text");
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsx).js b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsx).js
index b541a5fd7c4e6..98a94f003a37a 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsx).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsx).js
@@ -25,7 +25,7 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 var preact_1 = require("preact");
 var jsx_runtime_1 = require("preact/jsx-runtime");
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var props = { answer: 42 };
 var a = (0, jsx_runtime_1.jsx)("div", __assign({}, props, { children: "text" }), "foo");
 var b = (0, preact_1.createElement)("div", __assign({}, props, { key: "bar" }), "text");
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsxdev).js b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsxdev).js
index aebf6bc35e98c..ff1fa475b3876 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsxdev).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsxdev).js
@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var preact_1 = require("preact");
 var jsx_dev_runtime_1 = require("preact/jsx-dev-runtime");
 var _jsxFileName = "jsxJsxsCjsTransformKeyPropCustomImport.tsx";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var props = { answer: 42 };
 var a = (0, jsx_dev_runtime_1.jsxDEV)("div", __assign({}, props, { children: "text" }), "foo", false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 10 }, this);
 var b = (0, preact_1.createElement)("div", __assign({}, props, { key: "bar" }), "text");
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsx).js b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsx).js
index 8d70495e99aa8..f79616363e44f 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsx).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsx).js
@@ -36,7 +36,7 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 var preact_1 = require("preact");
 var jsx_runtime_1 = require("preact/jsx-runtime");
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxImportSource preact */
 var props = { answer: 42 };
 var a = (0, jsx_runtime_1.jsx)("div", __assign({}, props, { children: "text" }), "foo");
@@ -57,7 +57,7 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
 var jsx_runtime_1 = require("react/jsx-runtime");
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxImportSource react */
 require("./preact");
 var props2 = { answer: 42 };
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsxdev).js b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsxdev).js
index fa7e3fcc2624b..d7eb6ab57bc7e 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsxdev).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsxdev).js
@@ -36,8 +36,8 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 var preact_1 = require("preact");
 var jsx_dev_runtime_1 = require("preact/jsx-dev-runtime");
-var _jsxFileName = "preact.tsx";
-/// <reference path="react16.d.ts" />
+var _jsxFileName = "/.src/preact.tsx";
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxImportSource preact */
 var props = { answer: 42 };
 var a = (0, jsx_dev_runtime_1.jsxDEV)("div", __assign({}, props, { children: "text" }), "foo", false, { fileName: _jsxFileName, lineNumber: 4, columnNumber: 10 }, this);
@@ -59,7 +59,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
 var jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
 var _jsxFileName = "react.tsx";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxImportSource react */
 require("./preact");
 var props2 = { answer: 42 };
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNames(jsx=react-jsx).js b/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNames(jsx=react-jsx).js
index 89de2ac2aee33..55f8bef270f0b 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNames(jsx=react-jsx).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNames(jsx=react-jsx).js
@@ -10,5 +10,5 @@ export {};
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var a = (0, jsx_runtime_1.jsx)("div", {});
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNames(jsx=react-jsxdev).js b/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNames(jsx=react-jsxdev).js
index f759f5d185230..df7072e91ac96 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNames(jsx=react-jsxdev).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNames(jsx=react-jsxdev).js
@@ -11,5 +11,5 @@ export {};
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
 var _jsxFileName = "jsxJsxsCjsTransformSubstitutesNames.tsx";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var a = (0, jsx_dev_runtime_1.jsxDEV)("div", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsx).js b/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsx).js
index c20a3be31edba..41411f34cdda6 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsx).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsx).js
@@ -14,5 +14,5 @@ export {};
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var a = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("p", {}), "text", (0, jsx_runtime_1.jsx)("div", {})] });
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsxdev).js b/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsxdev).js
index 2d7673469591a..c11a5de4af6db 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsxdev).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsxdev).js
@@ -15,5 +15,5 @@ export {};
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
 var _jsxFileName = "jsxJsxsCjsTransformSubstitutesNamesFragment.tsx";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var a = (0, jsx_dev_runtime_1.jsxDEV)(jsx_dev_runtime_1.Fragment, { children: [(0, jsx_dev_runtime_1.jsxDEV)("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 3 }, this), "text", (0, jsx_dev_runtime_1.jsxDEV)("div", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);
diff --git a/tests/baselines/reference/jsxNamespacedNameNotComparedToNonMatchingIndexSignature.js b/tests/baselines/reference/jsxNamespacedNameNotComparedToNonMatchingIndexSignature.js
index 5a20394746ee2..e4fdd3bd7ec77 100644
--- a/tests/baselines/reference/jsxNamespacedNameNotComparedToNonMatchingIndexSignature.js
+++ b/tests/baselines/reference/jsxNamespacedNameNotComparedToNonMatchingIndexSignature.js
@@ -14,5 +14,5 @@ export const tag = <div ns:thing="a"/>
 
 //// [jsxNamespacedNameNotComparedToNonMatchingIndexSignature.js]
 import { jsx as _jsx } from "react/jsx-runtime";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 export const tag = _jsx("div", { "ns:thing": "a" });
diff --git a/tests/baselines/reference/jsxPartialSpread.js b/tests/baselines/reference/jsxPartialSpread.js
index 1a4b1c080de8f..192c2b548aac7 100644
--- a/tests/baselines/reference/jsxPartialSpread.js
+++ b/tests/baselines/reference/jsxPartialSpread.js
@@ -18,7 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Repro = Repro;
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var Select = function (p) { return <p></p>; };
 var react_1 = __importDefault(require("react"));
 function Repro(_a) {
diff --git a/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).js b/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).js
index b91b48357abdd..f698429ed0e44 100644
--- a/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).js
+++ b/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).js
@@ -71,7 +71,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime classic */
 var React = __importStar(require("react"));
 var HelloWorld = function () { return <h1>Hello world</h1>; };
@@ -82,7 +82,7 @@ exports.selfClosing = <img src="./image.png"/>;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime automatic */
 var HelloWorld = function () { return <h1>Hello world</h1>; };
 exports.HelloWorld = HelloWorld;
@@ -92,7 +92,7 @@ exports.selfClosing = <img src="./image.png"/>;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime classic */
 /* @jsxRuntime automatic */
 var HelloWorld = function () { return <h1>Hello world</h1>; };
@@ -136,7 +136,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime automatic */
 /* @jsxRuntime classic */
 var React = __importStar(require("react"));
diff --git a/tests/baselines/reference/jsxRuntimePragma(jsx=react).js b/tests/baselines/reference/jsxRuntimePragma(jsx=react).js
index ca060d3ae8507..945701342891e 100644
--- a/tests/baselines/reference/jsxRuntimePragma(jsx=react).js
+++ b/tests/baselines/reference/jsxRuntimePragma(jsx=react).js
@@ -71,7 +71,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime classic */
 var React = __importStar(require("react"));
 var HelloWorld = function () { return React.createElement("h1", null, "Hello world"); };
@@ -84,7 +84,7 @@ exports.selfClosing = React.createElement("img", { src: "./image.png" });
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime automatic */
 var HelloWorld = function () { return (0, jsx_runtime_1.jsx)("h1", { children: "Hello world" }); };
 exports.HelloWorld = HelloWorld;
@@ -95,7 +95,7 @@ exports.selfClosing = (0, jsx_runtime_1.jsx)("img", { src: "./image.png" });
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime classic */
 /* @jsxRuntime automatic */
 var HelloWorld = function () { return (0, jsx_runtime_1.jsx)("h1", { children: "Hello world" }); };
@@ -139,7 +139,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime automatic */
 /* @jsxRuntime classic */
 var React = __importStar(require("react"));
diff --git a/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsx).js b/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsx).js
index ca060d3ae8507..945701342891e 100644
--- a/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsx).js
+++ b/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsx).js
@@ -71,7 +71,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime classic */
 var React = __importStar(require("react"));
 var HelloWorld = function () { return React.createElement("h1", null, "Hello world"); };
@@ -84,7 +84,7 @@ exports.selfClosing = React.createElement("img", { src: "./image.png" });
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime automatic */
 var HelloWorld = function () { return (0, jsx_runtime_1.jsx)("h1", { children: "Hello world" }); };
 exports.HelloWorld = HelloWorld;
@@ -95,7 +95,7 @@ exports.selfClosing = (0, jsx_runtime_1.jsx)("img", { src: "./image.png" });
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime classic */
 /* @jsxRuntime automatic */
 var HelloWorld = function () { return (0, jsx_runtime_1.jsx)("h1", { children: "Hello world" }); };
@@ -139,7 +139,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime automatic */
 /* @jsxRuntime classic */
 var React = __importStar(require("react"));
diff --git a/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsxdev).js b/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsxdev).js
index 71f270ca594a6..7a4708a681903 100644
--- a/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsxdev).js
+++ b/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsxdev).js
@@ -71,7 +71,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime classic */
 var React = __importStar(require("react"));
 var HelloWorld = function () { return React.createElement("h1", null, "Hello world"); };
@@ -86,7 +86,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
 var jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
 var _jsxFileName = "two.tsx";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime automatic */
 var HelloWorld = function () { return (0, jsx_dev_runtime_1.jsxDEV)("h1", { children: "Hello world" }, void 0, false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 32 }, _this); };
 exports.HelloWorld = HelloWorld;
@@ -99,7 +99,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
 var jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
 var _jsxFileName = "three.tsx";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime classic */
 /* @jsxRuntime automatic */
 var HelloWorld = function () { return (0, jsx_dev_runtime_1.jsxDEV)("h1", { children: "Hello world" }, void 0, false, { fileName: _jsxFileName, lineNumber: 4, columnNumber: 32 }, _this); };
@@ -143,7 +143,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 /* @jsxRuntime automatic */
 /* @jsxRuntime classic */
 var React = __importStar(require("react"));
diff --git a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js
index bd05bb83527d5..39815241efe2c 100644
--- a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js
+++ b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js
@@ -1,6 +1,7 @@
 //// [tests/cases/compiler/jsxSpreadFirstUnionNoErrors.tsx] ////
 
 //// [jsxSpreadFirstUnionNoErrors.tsx]
+/// <reference path="/.lib/react.d.ts" />
 import React from "react";
 
 type InfoProps =
@@ -35,6 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/// <reference path="/.lib/react.d.ts" />
 var react_1 = __importDefault(require("react"));
 var Info = function (props) {
     return props.status === "hidden"
diff --git a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.symbols b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.symbols
index a3b544c01280e..2ab54bb34c95e 100644
--- a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.symbols
+++ b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.symbols
@@ -1,56 +1,57 @@
 //// [tests/cases/compiler/jsxSpreadFirstUnionNoErrors.tsx] ////
 
 === jsxSpreadFirstUnionNoErrors.tsx ===
+/// <reference path="react.d.ts" />
 import React from "react";
->React : Symbol(React, Decl(jsxSpreadFirstUnionNoErrors.tsx, 0, 6))
+>React : Symbol(React, Decl(jsxSpreadFirstUnionNoErrors.tsx, 1, 6))
 
 type InfoProps =
->InfoProps : Symbol(InfoProps, Decl(jsxSpreadFirstUnionNoErrors.tsx, 0, 26))
+>InfoProps : Symbol(InfoProps, Decl(jsxSpreadFirstUnionNoErrors.tsx, 1, 26))
 
 | { status: "hidden" }
->status : Symbol(status, Decl(jsxSpreadFirstUnionNoErrors.tsx, 3, 3))
+>status : Symbol(status, Decl(jsxSpreadFirstUnionNoErrors.tsx, 4, 3))
 
 | { status: "visible"; content: string };
->status : Symbol(status, Decl(jsxSpreadFirstUnionNoErrors.tsx, 4, 3))
->content : Symbol(content, Decl(jsxSpreadFirstUnionNoErrors.tsx, 4, 22))
+>status : Symbol(status, Decl(jsxSpreadFirstUnionNoErrors.tsx, 5, 3))
+>content : Symbol(content, Decl(jsxSpreadFirstUnionNoErrors.tsx, 5, 22))
 
 const Info = (props: InfoProps) =>
->Info : Symbol(Info, Decl(jsxSpreadFirstUnionNoErrors.tsx, 6, 5))
->props : Symbol(props, Decl(jsxSpreadFirstUnionNoErrors.tsx, 6, 14))
->InfoProps : Symbol(InfoProps, Decl(jsxSpreadFirstUnionNoErrors.tsx, 0, 26))
+>Info : Symbol(Info, Decl(jsxSpreadFirstUnionNoErrors.tsx, 7, 5))
+>props : Symbol(props, Decl(jsxSpreadFirstUnionNoErrors.tsx, 7, 14))
+>InfoProps : Symbol(InfoProps, Decl(jsxSpreadFirstUnionNoErrors.tsx, 1, 26))
 
 props.status === "hidden"
->props.status : Symbol(status, Decl(jsxSpreadFirstUnionNoErrors.tsx, 3, 3), Decl(jsxSpreadFirstUnionNoErrors.tsx, 4, 3))
->props : Symbol(props, Decl(jsxSpreadFirstUnionNoErrors.tsx, 6, 14))
->status : Symbol(status, Decl(jsxSpreadFirstUnionNoErrors.tsx, 3, 3), Decl(jsxSpreadFirstUnionNoErrors.tsx, 4, 3))
+>props.status : Symbol(status, Decl(jsxSpreadFirstUnionNoErrors.tsx, 4, 3), Decl(jsxSpreadFirstUnionNoErrors.tsx, 5, 3))
+>props : Symbol(props, Decl(jsxSpreadFirstUnionNoErrors.tsx, 7, 14))
+>status : Symbol(status, Decl(jsxSpreadFirstUnionNoErrors.tsx, 4, 3), Decl(jsxSpreadFirstUnionNoErrors.tsx, 5, 3))
 
   ? <noscript />
 >noscript : Symbol(JSX.IntrinsicElements.noscript, Decl(react.d.ts, 2439, 42))
 
   : <div>{props.content}</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->props.content : Symbol(content, Decl(jsxSpreadFirstUnionNoErrors.tsx, 4, 22))
->props : Symbol(props, Decl(jsxSpreadFirstUnionNoErrors.tsx, 6, 14))
->content : Symbol(content, Decl(jsxSpreadFirstUnionNoErrors.tsx, 4, 22))
+>props.content : Symbol(content, Decl(jsxSpreadFirstUnionNoErrors.tsx, 5, 22))
+>props : Symbol(props, Decl(jsxSpreadFirstUnionNoErrors.tsx, 7, 14))
+>content : Symbol(content, Decl(jsxSpreadFirstUnionNoErrors.tsx, 5, 22))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
 const a = <Info status="hidden" />;
->a : Symbol(a, Decl(jsxSpreadFirstUnionNoErrors.tsx, 11, 5))
->Info : Symbol(Info, Decl(jsxSpreadFirstUnionNoErrors.tsx, 6, 5))
->status : Symbol(status, Decl(jsxSpreadFirstUnionNoErrors.tsx, 11, 15))
+>a : Symbol(a, Decl(jsxSpreadFirstUnionNoErrors.tsx, 12, 5))
+>Info : Symbol(Info, Decl(jsxSpreadFirstUnionNoErrors.tsx, 7, 5))
+>status : Symbol(status, Decl(jsxSpreadFirstUnionNoErrors.tsx, 12, 15))
 
 const b = <Info status="visible" content="hello world" />;
->b : Symbol(b, Decl(jsxSpreadFirstUnionNoErrors.tsx, 12, 5))
->Info : Symbol(Info, Decl(jsxSpreadFirstUnionNoErrors.tsx, 6, 5))
->status : Symbol(status, Decl(jsxSpreadFirstUnionNoErrors.tsx, 12, 15))
->content : Symbol(content, Decl(jsxSpreadFirstUnionNoErrors.tsx, 12, 32))
+>b : Symbol(b, Decl(jsxSpreadFirstUnionNoErrors.tsx, 13, 5))
+>Info : Symbol(Info, Decl(jsxSpreadFirstUnionNoErrors.tsx, 7, 5))
+>status : Symbol(status, Decl(jsxSpreadFirstUnionNoErrors.tsx, 13, 15))
+>content : Symbol(content, Decl(jsxSpreadFirstUnionNoErrors.tsx, 13, 32))
 
 declare const infoProps: InfoProps;
->infoProps : Symbol(infoProps, Decl(jsxSpreadFirstUnionNoErrors.tsx, 13, 13))
->InfoProps : Symbol(InfoProps, Decl(jsxSpreadFirstUnionNoErrors.tsx, 0, 26))
+>infoProps : Symbol(infoProps, Decl(jsxSpreadFirstUnionNoErrors.tsx, 14, 13))
+>InfoProps : Symbol(InfoProps, Decl(jsxSpreadFirstUnionNoErrors.tsx, 1, 26))
 
 const c = <Info {...infoProps} />;
->c : Symbol(c, Decl(jsxSpreadFirstUnionNoErrors.tsx, 15, 5))
->Info : Symbol(Info, Decl(jsxSpreadFirstUnionNoErrors.tsx, 6, 5))
->infoProps : Symbol(infoProps, Decl(jsxSpreadFirstUnionNoErrors.tsx, 13, 13))
+>c : Symbol(c, Decl(jsxSpreadFirstUnionNoErrors.tsx, 16, 5))
+>Info : Symbol(Info, Decl(jsxSpreadFirstUnionNoErrors.tsx, 7, 5))
+>infoProps : Symbol(infoProps, Decl(jsxSpreadFirstUnionNoErrors.tsx, 14, 13))
 
diff --git a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.types b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.types
index a9d71339a915a..d1dcbe94d125b 100644
--- a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.types
+++ b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.types
@@ -1,6 +1,7 @@
 //// [tests/cases/compiler/jsxSpreadFirstUnionNoErrors.tsx] ////
 
 === jsxSpreadFirstUnionNoErrors.tsx ===
+/// <reference path="react.d.ts" />
 import React from "react";
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.errors.txt b/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.errors.txt
index 0b891b78e5316..bd3023f2bfb2a 100644
--- a/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.errors.txt
+++ b/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.errors.txt
@@ -1,17 +1,15 @@
-error TS2318: Cannot find global type 'CallableFunction'.
-error TS2318: Cannot find global type 'NewableFunction'.
-file.tsx(19,17): error TS2783: 'a' is specified more than once, so this usage will be overwritten.
-file.tsx(20,17): error TS2783: 'a' is specified more than once, so this usage will be overwritten.
-file.tsx(20,23): error TS2783: 'b' is specified more than once, so this usage will be overwritten.
 file.tsx(21,17): error TS2783: 'a' is specified more than once, so this usage will be overwritten.
-file.tsx(21,23): error TS2783: 'd' is specified more than once, so this usage will be overwritten.
 file.tsx(22,17): error TS2783: 'a' is specified more than once, so this usage will be overwritten.
-file.tsx(22,23): error TS2783: 'd' is specified more than once, so this usage will be overwritten.
+file.tsx(22,23): error TS2783: 'b' is specified more than once, so this usage will be overwritten.
+file.tsx(23,17): error TS2783: 'a' is specified more than once, so this usage will be overwritten.
+file.tsx(23,23): error TS2783: 'd' is specified more than once, so this usage will be overwritten.
+file.tsx(24,17): error TS2783: 'a' is specified more than once, so this usage will be overwritten.
+file.tsx(24,23): error TS2783: 'd' is specified more than once, so this usage will be overwritten.
 
 
-!!! error TS2318: Cannot find global type 'CallableFunction'.
-!!! error TS2318: Cannot find global type 'NewableFunction'.
 ==== file.tsx (7 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface Props {
@@ -33,26 +31,26 @@ file.tsx(22,23): error TS2783: 'd' is specified more than once, so this usage wi
     const b1 = <Foo a={1} {...props}></Foo>;
                     ~~~~~
 !!! error TS2783: 'a' is specified more than once, so this usage will be overwritten.
-!!! related TS2785 file.tsx:19:23: This spread always overwrites this property.
+!!! related TS2785 file.tsx:21:23: This spread always overwrites this property.
     const b2 = <Foo a={1} b={2} {...props}></Foo>;
                     ~~~~~
 !!! error TS2783: 'a' is specified more than once, so this usage will be overwritten.
-!!! related TS2785 file.tsx:20:29: This spread always overwrites this property.
+!!! related TS2785 file.tsx:22:29: This spread always overwrites this property.
                           ~~~~~
 !!! error TS2783: 'b' is specified more than once, so this usage will be overwritten.
-!!! related TS2785 file.tsx:20:29: This spread always overwrites this property.
+!!! related TS2785 file.tsx:22:29: This spread always overwrites this property.
     const b3 = <Foo a={1} d={1} {...props} {...{ d: 1 }}></Foo>;
                     ~~~~~
 !!! error TS2783: 'a' is specified more than once, so this usage will be overwritten.
-!!! related TS2785 file.tsx:21:29: This spread always overwrites this property.
+!!! related TS2785 file.tsx:23:29: This spread always overwrites this property.
                           ~~~~~
 !!! error TS2783: 'd' is specified more than once, so this usage will be overwritten.
-!!! related TS2785 file.tsx:21:40: This spread always overwrites this property.
+!!! related TS2785 file.tsx:23:40: This spread always overwrites this property.
     const b4 = <Foo a={1} d={1} {...props} {...{ a: 1, d: 1 }}></Foo>;
                     ~~~~~
 !!! error TS2783: 'a' is specified more than once, so this usage will be overwritten.
-!!! related TS2785 file.tsx:22:29: This spread always overwrites this property.
+!!! related TS2785 file.tsx:24:29: This spread always overwrites this property.
                           ~~~~~
 !!! error TS2783: 'd' is specified more than once, so this usage will be overwritten.
-!!! related TS2785 file.tsx:22:40: This spread always overwrites this property.
+!!! related TS2785 file.tsx:24:40: This spread always overwrites this property.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.js b/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.js
index 53f1e7e81490b..b9015558c4872 100644
--- a/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.js
+++ b/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/jsxSpreadOverwritesAttributeStrict.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Props {
@@ -27,6 +29,7 @@ const b4 = <Foo a={1} d={1} {...props} {...{ a: 1, d: 1 }}></Foo>;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 var props = { a: 1, b: 1 };
diff --git a/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.symbols b/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.symbols
index cda29325de1d0..7a12af99e7947 100644
--- a/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.symbols
+++ b/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.symbols
@@ -1,88 +1,90 @@
 //// [tests/cases/conformance/jsx/jsxSpreadOverwritesAttributeStrict.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Props {
->Props : Symbol(Props, Decl(file.tsx, 0, 32))
+>Props : Symbol(Props, Decl(file.tsx, 2, 32))
 
     a: number;
->a : Symbol(Props.a, Decl(file.tsx, 2, 17))
+>a : Symbol(Props.a, Decl(file.tsx, 4, 17))
 
     b: number;
->b : Symbol(Props.b, Decl(file.tsx, 3, 14))
+>b : Symbol(Props.b, Decl(file.tsx, 5, 14))
 
     c?: number;
->c : Symbol(Props.c, Decl(file.tsx, 4, 14))
+>c : Symbol(Props.c, Decl(file.tsx, 6, 14))
 
     d?: number;
->d : Symbol(Props.d, Decl(file.tsx, 5, 15))
+>d : Symbol(Props.d, Decl(file.tsx, 7, 15))
 }
 
 
 const props: Props = { a: 1, b: 1 };
->props : Symbol(props, Decl(file.tsx, 10, 5))
->Props : Symbol(Props, Decl(file.tsx, 0, 32))
->a : Symbol(a, Decl(file.tsx, 10, 22))
->b : Symbol(b, Decl(file.tsx, 10, 28))
+>props : Symbol(props, Decl(file.tsx, 12, 5))
+>Props : Symbol(Props, Decl(file.tsx, 2, 32))
+>a : Symbol(a, Decl(file.tsx, 12, 22))
+>b : Symbol(b, Decl(file.tsx, 12, 28))
 
 const Foo = (props: Props) => <div>{ props.a }</div>;
->Foo : Symbol(Foo, Decl(file.tsx, 11, 5))
->props : Symbol(props, Decl(file.tsx, 11, 13))
->Props : Symbol(Props, Decl(file.tsx, 0, 32))
+>Foo : Symbol(Foo, Decl(file.tsx, 13, 5))
+>props : Symbol(props, Decl(file.tsx, 13, 13))
+>Props : Symbol(Props, Decl(file.tsx, 2, 32))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->props.a : Symbol(Props.a, Decl(file.tsx, 2, 17))
->props : Symbol(props, Decl(file.tsx, 11, 13))
->a : Symbol(Props.a, Decl(file.tsx, 2, 17))
+>props.a : Symbol(Props.a, Decl(file.tsx, 4, 17))
+>props : Symbol(props, Decl(file.tsx, 13, 13))
+>a : Symbol(Props.a, Decl(file.tsx, 4, 17))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
 // ok
 const a1 = <Foo {...props}></Foo>;
->a1 : Symbol(a1, Decl(file.tsx, 14, 5))
->Foo : Symbol(Foo, Decl(file.tsx, 11, 5))
->props : Symbol(props, Decl(file.tsx, 10, 5))
->Foo : Symbol(Foo, Decl(file.tsx, 11, 5))
+>a1 : Symbol(a1, Decl(file.tsx, 16, 5))
+>Foo : Symbol(Foo, Decl(file.tsx, 13, 5))
+>props : Symbol(props, Decl(file.tsx, 12, 5))
+>Foo : Symbol(Foo, Decl(file.tsx, 13, 5))
 
 const a2 = <Foo d={1} {...props}></Foo>;
->a2 : Symbol(a2, Decl(file.tsx, 15, 5))
->Foo : Symbol(Foo, Decl(file.tsx, 11, 5))
->d : Symbol(d, Decl(file.tsx, 15, 15))
->props : Symbol(props, Decl(file.tsx, 10, 5))
->Foo : Symbol(Foo, Decl(file.tsx, 11, 5))
+>a2 : Symbol(a2, Decl(file.tsx, 17, 5))
+>Foo : Symbol(Foo, Decl(file.tsx, 13, 5))
+>d : Symbol(d, Decl(file.tsx, 17, 15))
+>props : Symbol(props, Decl(file.tsx, 12, 5))
+>Foo : Symbol(Foo, Decl(file.tsx, 13, 5))
 
 // error
 const b1 = <Foo a={1} {...props}></Foo>;
->b1 : Symbol(b1, Decl(file.tsx, 18, 5))
->Foo : Symbol(Foo, Decl(file.tsx, 11, 5))
->a : Symbol(a, Decl(file.tsx, 18, 15))
->props : Symbol(props, Decl(file.tsx, 10, 5))
->Foo : Symbol(Foo, Decl(file.tsx, 11, 5))
+>b1 : Symbol(b1, Decl(file.tsx, 20, 5))
+>Foo : Symbol(Foo, Decl(file.tsx, 13, 5))
+>a : Symbol(a, Decl(file.tsx, 20, 15))
+>props : Symbol(props, Decl(file.tsx, 12, 5))
+>Foo : Symbol(Foo, Decl(file.tsx, 13, 5))
 
 const b2 = <Foo a={1} b={2} {...props}></Foo>;
->b2 : Symbol(b2, Decl(file.tsx, 19, 5))
->Foo : Symbol(Foo, Decl(file.tsx, 11, 5))
->a : Symbol(a, Decl(file.tsx, 19, 15))
->b : Symbol(b, Decl(file.tsx, 19, 21))
->props : Symbol(props, Decl(file.tsx, 10, 5))
->Foo : Symbol(Foo, Decl(file.tsx, 11, 5))
+>b2 : Symbol(b2, Decl(file.tsx, 21, 5))
+>Foo : Symbol(Foo, Decl(file.tsx, 13, 5))
+>a : Symbol(a, Decl(file.tsx, 21, 15))
+>b : Symbol(b, Decl(file.tsx, 21, 21))
+>props : Symbol(props, Decl(file.tsx, 12, 5))
+>Foo : Symbol(Foo, Decl(file.tsx, 13, 5))
 
 const b3 = <Foo a={1} d={1} {...props} {...{ d: 1 }}></Foo>;
->b3 : Symbol(b3, Decl(file.tsx, 20, 5))
->Foo : Symbol(Foo, Decl(file.tsx, 11, 5))
->a : Symbol(a, Decl(file.tsx, 20, 15))
->d : Symbol(d, Decl(file.tsx, 20, 21))
->props : Symbol(props, Decl(file.tsx, 10, 5))
->d : Symbol(d, Decl(file.tsx, 20, 44))
->Foo : Symbol(Foo, Decl(file.tsx, 11, 5))
+>b3 : Symbol(b3, Decl(file.tsx, 22, 5))
+>Foo : Symbol(Foo, Decl(file.tsx, 13, 5))
+>a : Symbol(a, Decl(file.tsx, 22, 15))
+>d : Symbol(d, Decl(file.tsx, 22, 21))
+>props : Symbol(props, Decl(file.tsx, 12, 5))
+>d : Symbol(d, Decl(file.tsx, 22, 44))
+>Foo : Symbol(Foo, Decl(file.tsx, 13, 5))
 
 const b4 = <Foo a={1} d={1} {...props} {...{ a: 1, d: 1 }}></Foo>;
->b4 : Symbol(b4, Decl(file.tsx, 21, 5))
->Foo : Symbol(Foo, Decl(file.tsx, 11, 5))
->a : Symbol(a, Decl(file.tsx, 21, 15))
->d : Symbol(d, Decl(file.tsx, 21, 21))
->props : Symbol(props, Decl(file.tsx, 10, 5))
->a : Symbol(a, Decl(file.tsx, 21, 44))
->d : Symbol(d, Decl(file.tsx, 21, 50))
->Foo : Symbol(Foo, Decl(file.tsx, 11, 5))
+>b4 : Symbol(b4, Decl(file.tsx, 23, 5))
+>Foo : Symbol(Foo, Decl(file.tsx, 13, 5))
+>a : Symbol(a, Decl(file.tsx, 23, 15))
+>d : Symbol(d, Decl(file.tsx, 23, 21))
+>props : Symbol(props, Decl(file.tsx, 12, 5))
+>a : Symbol(a, Decl(file.tsx, 23, 44))
+>d : Symbol(d, Decl(file.tsx, 23, 50))
+>Foo : Symbol(Foo, Decl(file.tsx, 13, 5))
 
diff --git a/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.types b/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.types
index 83782a6cae16e..5d7582a281234 100644
--- a/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.types
+++ b/tests/baselines/reference/jsxSpreadOverwritesAttributeStrict.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/jsxSpreadOverwritesAttributeStrict.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/keepImportsInDts3.errors.txt b/tests/baselines/reference/keepImportsInDts3.errors.txt
index ab575337fb28a..ba9ad6c9a92c2 100644
--- a/tests/baselines/reference/keepImportsInDts3.errors.txt
+++ b/tests/baselines/reference/keepImportsInDts3.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== c:/test.ts (0 errors) ====
     export {};
diff --git a/tests/baselines/reference/keepImportsInDts4.errors.txt b/tests/baselines/reference/keepImportsInDts4.errors.txt
index 1fc5e4d5f136a..13e2f4565093c 100644
--- a/tests/baselines/reference/keepImportsInDts4.errors.txt
+++ b/tests/baselines/reference/keepImportsInDts4.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== folder/test.ts (0 errors) ====
     export {};
diff --git a/tests/baselines/reference/keyRemappingKeyofResult.errors.txt b/tests/baselines/reference/keyRemappingKeyofResult.errors.txt
new file mode 100644
index 0000000000000..c92c299465e8b
--- /dev/null
+++ b/tests/baselines/reference/keyRemappingKeyofResult.errors.txt
@@ -0,0 +1,80 @@
+keyRemappingKeyofResult.ts(69,5): error TS2322: Type 'string' is not assignable to type 'keyof Remapped'.
+  Type '"whatever"' is not assignable to type 'unique symbol | "str" | DistributiveNonIndex<K>'.
+
+
+==== keyRemappingKeyofResult.ts (1 errors) ====
+    const sym = Symbol("")
+    type Orig = { [k: string]: any, str: any, [sym]: any }
+    
+    type Okay = Exclude<keyof Orig, never>
+    // type Okay = string | number | typeof sym
+    
+    type Remapped = { [K in keyof Orig as {} extends Record<K, any> ? never : K]: any }
+    /* type Remapped = {
+        str: any;
+        [sym]: any;
+    } */
+    // no string index signature, right?
+    
+    type Oops = Exclude<keyof Remapped, never>
+    declare let x: Oops;
+    x = sym;
+    x = "str";
+    // type Oops = typeof sym <-- what happened to "str"?
+    
+    // equivalently, with an unresolved generic (no `exclude` shenanigans, since conditions won't execute):
+    function f<T>() {
+        type Orig = { [k: string]: any, str: any, [sym]: any } & T;
+        
+        type Okay = keyof Orig;
+        let a: Okay;
+        a = "str";
+        a = sym;
+        a = "whatever";
+        // type Okay = string | number | typeof sym
+        
+        type Remapped = { [K in keyof Orig as {} extends Record<K, any> ? never : K]: any }
+        /* type Remapped = {
+            str: any;
+            [sym]: any;
+        } */
+        // no string index signature, right?
+        
+        type Oops = keyof Remapped;
+        let x: Oops;
+        x = sym;
+        x = "str";
+    }
+    
+    // and another generic case with a _distributive_ mapping, to trigger a different branch in `getIndexType`
+    function g<T>() {
+        type Orig = { [k: string]: any, str: any, [sym]: any } & T;
+        
+        type Okay = keyof Orig;
+        let a: Okay;
+        a = "str";
+        a = sym;
+        a = "whatever";
+        // type Okay = string | number | typeof sym
+    
+        type NonIndex<T extends PropertyKey> = {} extends Record<T, any> ? never : T;
+        type DistributiveNonIndex<T extends PropertyKey> = T extends unknown ? NonIndex<T> : never;
+        
+        type Remapped = { [K in keyof Orig as DistributiveNonIndex<K>]: any }
+        /* type Remapped = {
+            str: any;
+            [sym]: any;
+        } */
+        // no string index signature, right?
+        
+        type Oops = keyof Remapped;
+        let x: Oops;
+        x = sym;
+        x = "str";
+        x = "whatever"; // error
+        ~
+!!! error TS2322: Type 'string' is not assignable to type 'keyof Remapped'.
+!!! error TS2322:   Type '"whatever"' is not assignable to type 'unique symbol | "str" | DistributiveNonIndex<K>'.
+    }
+    
+    export {};
\ No newline at end of file
diff --git a/tests/baselines/reference/keyRemappingKeyofResult.js b/tests/baselines/reference/keyRemappingKeyofResult.js
index 3b51e02dc735e..9e4d1ea336c3f 100644
--- a/tests/baselines/reference/keyRemappingKeyofResult.js
+++ b/tests/baselines/reference/keyRemappingKeyofResult.js
@@ -69,6 +69,7 @@ function g<T>() {
     let x: Oops;
     x = sym;
     x = "str";
+    x = "whatever"; // error
 }
 
 export {};
@@ -97,5 +98,6 @@ function g() {
     let x;
     x = sym;
     x = "str";
+    x = "whatever"; // error
 }
 export {};
diff --git a/tests/baselines/reference/keyRemappingKeyofResult.symbols b/tests/baselines/reference/keyRemappingKeyofResult.symbols
index 722c000f268fa..3be5cf2460e84 100644
--- a/tests/baselines/reference/keyRemappingKeyofResult.symbols
+++ b/tests/baselines/reference/keyRemappingKeyofResult.symbols
@@ -190,6 +190,9 @@ function g<T>() {
 
     x = "str";
 >x : Symbol(x, Decl(keyRemappingKeyofResult.ts, 65, 7))
+
+    x = "whatever"; // error
+>x : Symbol(x, Decl(keyRemappingKeyofResult.ts, 65, 7))
 }
 
 export {};
diff --git a/tests/baselines/reference/keyRemappingKeyofResult.types b/tests/baselines/reference/keyRemappingKeyofResult.types
index 50949e385daa2..ce371fb30e5de 100644
--- a/tests/baselines/reference/keyRemappingKeyofResult.types
+++ b/tests/baselines/reference/keyRemappingKeyofResult.types
@@ -17,7 +17,9 @@ type Orig = { [k: string]: any, str: any, [sym]: any }
 >k : string
 >  : ^^^^^^
 >str : any
+>    : ^^^
 >[sym] : any
+>      : ^^^
 >sym : unique symbol
 >    : ^^^^^^^^^^^^^
 
@@ -74,7 +76,9 @@ function f<T>() {
 >k : string
 >  : ^^^^^^
 >str : any
+>    : ^^^
 >[sym] : any
+>      : ^^^
 >sym : unique symbol
 >    : ^^^^^^^^^^^^^
     
@@ -158,7 +162,9 @@ function g<T>() {
 >k : string
 >  : ^^^^^^
 >str : any
+>    : ^^^
 >[sym] : any
+>      : ^^^
 >sym : unique symbol
 >    : ^^^^^^^^^^^^^
     
@@ -237,6 +243,14 @@ function g<T>() {
 >  : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^^^^^^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >"str" : "str"
 >      : ^^^^^
+
+    x = "whatever"; // error
+>x = "whatever" : "whatever"
+>               : ^^^^^^^^^^
+>x : keyof { [K in keyof ({ [k: string]: any; str: any; [sym]: any; } & T) as K extends unknown ? {} extends Record<K, any> ? never : K : never]: any; }
+>  : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^^^^^^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>"whatever" : "whatever"
+>           : ^^^^^^^^^^
 }
 
 export {};
diff --git a/tests/baselines/reference/keyRemappingKeyofResult2.symbols b/tests/baselines/reference/keyRemappingKeyofResult2.symbols
new file mode 100644
index 0000000000000..b3fd16667f89f
--- /dev/null
+++ b/tests/baselines/reference/keyRemappingKeyofResult2.symbols
@@ -0,0 +1,84 @@
+//// [tests/cases/compiler/keyRemappingKeyofResult2.ts] ////
+
+=== keyRemappingKeyofResult2.ts ===
+// https://github.com/microsoft/TypeScript/issues/56239
+
+type Values<T> = T[keyof T];
+>Values : Symbol(Values, Decl(keyRemappingKeyofResult2.ts, 0, 0))
+>T : Symbol(T, Decl(keyRemappingKeyofResult2.ts, 2, 12))
+>T : Symbol(T, Decl(keyRemappingKeyofResult2.ts, 2, 12))
+>T : Symbol(T, Decl(keyRemappingKeyofResult2.ts, 2, 12))
+
+type ProvidedActor = {
+>ProvidedActor : Symbol(ProvidedActor, Decl(keyRemappingKeyofResult2.ts, 2, 28))
+
+  src: string;
+>src : Symbol(src, Decl(keyRemappingKeyofResult2.ts, 4, 22))
+
+  logic: unknown;
+>logic : Symbol(logic, Decl(keyRemappingKeyofResult2.ts, 5, 14))
+
+};
+
+interface StateMachineConfig<TActors extends ProvidedActor> {
+>StateMachineConfig : Symbol(StateMachineConfig, Decl(keyRemappingKeyofResult2.ts, 7, 2))
+>TActors : Symbol(TActors, Decl(keyRemappingKeyofResult2.ts, 9, 29))
+>ProvidedActor : Symbol(ProvidedActor, Decl(keyRemappingKeyofResult2.ts, 2, 28))
+
+  invoke: {
+>invoke : Symbol(StateMachineConfig.invoke, Decl(keyRemappingKeyofResult2.ts, 9, 61))
+
+    src: TActors["src"];
+>src : Symbol(src, Decl(keyRemappingKeyofResult2.ts, 10, 11))
+>TActors : Symbol(TActors, Decl(keyRemappingKeyofResult2.ts, 9, 29))
+
+  };
+}
+
+declare function setup<TActors extends Record<string, unknown>>(_: {
+>setup : Symbol(setup, Decl(keyRemappingKeyofResult2.ts, 13, 1))
+>TActors : Symbol(TActors, Decl(keyRemappingKeyofResult2.ts, 15, 23))
+>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --))
+>_ : Symbol(_, Decl(keyRemappingKeyofResult2.ts, 15, 64))
+
+  actors: {
+>actors : Symbol(actors, Decl(keyRemappingKeyofResult2.ts, 15, 68))
+
+    [K in keyof TActors]: TActors[K];
+>K : Symbol(K, Decl(keyRemappingKeyofResult2.ts, 17, 5))
+>TActors : Symbol(TActors, Decl(keyRemappingKeyofResult2.ts, 15, 23))
+>TActors : Symbol(TActors, Decl(keyRemappingKeyofResult2.ts, 15, 23))
+>K : Symbol(K, Decl(keyRemappingKeyofResult2.ts, 17, 5))
+
+  };
+}): {
+  createMachine: (
+>createMachine : Symbol(createMachine, Decl(keyRemappingKeyofResult2.ts, 19, 5))
+
+    config: StateMachineConfig<
+>config : Symbol(config, Decl(keyRemappingKeyofResult2.ts, 20, 18))
+>StateMachineConfig : Symbol(StateMachineConfig, Decl(keyRemappingKeyofResult2.ts, 7, 2))
+
+      Values<{
+>Values : Symbol(Values, Decl(keyRemappingKeyofResult2.ts, 0, 0))
+
+        [K in keyof TActors as K & string]: {
+>K : Symbol(K, Decl(keyRemappingKeyofResult2.ts, 23, 9))
+>TActors : Symbol(TActors, Decl(keyRemappingKeyofResult2.ts, 15, 23))
+>K : Symbol(K, Decl(keyRemappingKeyofResult2.ts, 23, 9))
+
+          src: K;
+>src : Symbol(src, Decl(keyRemappingKeyofResult2.ts, 23, 45))
+>K : Symbol(K, Decl(keyRemappingKeyofResult2.ts, 23, 9))
+
+          logic: TActors[K];
+>logic : Symbol(logic, Decl(keyRemappingKeyofResult2.ts, 24, 17))
+>TActors : Symbol(TActors, Decl(keyRemappingKeyofResult2.ts, 15, 23))
+>K : Symbol(K, Decl(keyRemappingKeyofResult2.ts, 23, 9))
+
+        };
+      }>
+    >,
+  ) => void;
+};
+
diff --git a/tests/baselines/reference/keyRemappingKeyofResult2.types b/tests/baselines/reference/keyRemappingKeyofResult2.types
new file mode 100644
index 0000000000000..b65ebbf5b6a0e
--- /dev/null
+++ b/tests/baselines/reference/keyRemappingKeyofResult2.types
@@ -0,0 +1,72 @@
+//// [tests/cases/compiler/keyRemappingKeyofResult2.ts] ////
+
+=== keyRemappingKeyofResult2.ts ===
+// https://github.com/microsoft/TypeScript/issues/56239
+
+type Values<T> = T[keyof T];
+>Values : Values<T>
+>       : ^^^^^^^^^
+
+type ProvidedActor = {
+>ProvidedActor : ProvidedActor
+>              : ^^^^^^^^^^^^^
+
+  src: string;
+>src : string
+>    : ^^^^^^
+
+  logic: unknown;
+>logic : unknown
+>      : ^^^^^^^
+
+};
+
+interface StateMachineConfig<TActors extends ProvidedActor> {
+  invoke: {
+>invoke : { src: TActors["src"]; }
+>       : ^^^^^^^              ^^^
+
+    src: TActors["src"];
+>src : TActors["src"]
+>    : ^^^^^^^^^^^^^^
+
+  };
+}
+
+declare function setup<TActors extends Record<string, unknown>>(_: {
+>setup : <TActors extends Record<string, unknown>>(_: { actors: { [K in keyof TActors]: TActors[K]; }; }) => { createMachine: (config: StateMachineConfig<Values<{ [K in keyof TActors as K & string]: { src: K; logic: TActors[K]; }; }>>) => void; }
+>      : ^       ^^^^^^^^^                       ^^ ^^                                                  ^^^^^                                                                                                                                         
+>_ : { actors: { [K in keyof TActors]: TActors[K]; }; }
+>  : ^^^^^^^^^^                                     ^^^
+
+  actors: {
+>actors : { [K in keyof TActors]: TActors[K]; }
+>       : ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+    [K in keyof TActors]: TActors[K];
+  };
+}): {
+  createMachine: (
+>createMachine : (config: StateMachineConfig<Values<{ [K in keyof TActors as K & string]: { src: K; logic: TActors[K]; }; }>>) => void
+>              : ^      ^^                                                                                                   ^^^^^    
+
+    config: StateMachineConfig<
+>config : StateMachineConfig<Values<{ [K in keyof TActors as K & string]: { src: K; logic: TActors[K]; }; }>>
+>       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^          ^^^^^^^^
+
+      Values<{
+        [K in keyof TActors as K & string]: {
+          src: K;
+>src : K
+>    : ^
+
+          logic: TActors[K];
+>logic : TActors[K]
+>      : ^^^^^^^^^^
+
+        };
+      }>
+    >,
+  ) => void;
+};
+
diff --git a/tests/baselines/reference/letDeclarations-useBeforeDefinition2.errors.txt b/tests/baselines/reference/letDeclarations-useBeforeDefinition2.errors.txt
index cc9de6e37d86d..8789432816ac5 100644
--- a/tests/baselines/reference/letDeclarations-useBeforeDefinition2.errors.txt
+++ b/tests/baselines/reference/letDeclarations-useBeforeDefinition2.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 file1.ts(1,1): error TS2448: Block-scoped variable 'l' used before its declaration.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file1.ts (1 errors) ====
     l;
     ~
diff --git a/tests/baselines/reference/libReferenceDeclarationEmitBundle.errors.txt b/tests/baselines/reference/libReferenceDeclarationEmitBundle.errors.txt
index 35581620421d6..198ff337a1d45 100644
--- a/tests/baselines/reference/libReferenceDeclarationEmitBundle.errors.txt
+++ b/tests/baselines/reference/libReferenceDeclarationEmitBundle.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file1.ts (0 errors) ====
     /// <reference lib="dom" preserve="true" />
diff --git a/tests/baselines/reference/libReferenceNoLibBundle.errors.txt b/tests/baselines/reference/libReferenceNoLibBundle.errors.txt
index 2f82acb2c125b..a10ba8fc033b6 100644
--- a/tests/baselines/reference/libReferenceNoLibBundle.errors.txt
+++ b/tests/baselines/reference/libReferenceNoLibBundle.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== fakelib.ts (0 errors) ====
     interface Object { }
diff --git a/tests/baselines/reference/literalsInComputedProperties1.errors.txt b/tests/baselines/reference/literalsInComputedProperties1.errors.txt
index fabe67e261674..6078c332c9324 100644
--- a/tests/baselines/reference/literalsInComputedProperties1.errors.txt
+++ b/tests/baselines/reference/literalsInComputedProperties1.errors.txt
@@ -23,20 +23,20 @@ literalsInComputedProperties1.ts(42,5): error TS2452: An enum member cannot have
         ["4"]:number;
     }
     
-    let y:A;
+    declare let y:A;
     y[1].toExponential();
     y[2].toExponential();
     y[3].toExponential();
     y[4].toExponential();
     
     class C {
-        1:number;
-        [2]:number;
+        1!:number;
+        [2]!:number;
         "3":number;
-        ["4"]:number;
+        ["4"]!:number;
     }
     
-    let z:C;
+    declare let z:C;
     z[1].toExponential();
     z[2].toExponential();
     z[3].toExponential();
diff --git a/tests/baselines/reference/literalsInComputedProperties1.js b/tests/baselines/reference/literalsInComputedProperties1.js
index 2ee167e2ae280..e8a1650793e9f 100644
--- a/tests/baselines/reference/literalsInComputedProperties1.js
+++ b/tests/baselines/reference/literalsInComputedProperties1.js
@@ -19,20 +19,20 @@ interface A {
     ["4"]:number;
 }
 
-let y:A;
+declare let y:A;
 y[1].toExponential();
 y[2].toExponential();
 y[3].toExponential();
 y[4].toExponential();
 
 class C {
-    1:number;
-    [2]:number;
+    1!:number;
+    [2]!:number;
     "3":number;
-    ["4"]:number;
+    ["4"]!:number;
 }
 
-let z:C;
+declare let z:C;
 z[1].toExponential();
 z[2].toExponential();
 z[3].toExponential();
@@ -65,7 +65,6 @@ x[1].toExponential();
 x[2].toExponential();
 x[3].toExponential();
 x[4].toExponential();
-var y;
 y[1].toExponential();
 y[2].toExponential();
 y[3].toExponential();
@@ -75,7 +74,6 @@ var C = /** @class */ (function () {
     }
     return C;
 }());
-var z;
 z[1].toExponential();
 z[2].toExponential();
 z[3].toExponential();
diff --git a/tests/baselines/reference/literalsInComputedProperties1.symbols b/tests/baselines/reference/literalsInComputedProperties1.symbols
index 18a9492660176..3a601d48fd444 100644
--- a/tests/baselines/reference/literalsInComputedProperties1.symbols
+++ b/tests/baselines/reference/literalsInComputedProperties1.symbols
@@ -60,77 +60,77 @@ interface A {
 >"4" : Symbol(A["4"], Decl(literalsInComputedProperties1.ts, 14, 15))
 }
 
-let y:A;
->y : Symbol(y, Decl(literalsInComputedProperties1.ts, 18, 3))
+declare let y:A;
+>y : Symbol(y, Decl(literalsInComputedProperties1.ts, 18, 11))
 >A : Symbol(A, Decl(literalsInComputedProperties1.ts, 9, 21))
 
 y[1].toExponential();
 >y[1].toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
->y : Symbol(y, Decl(literalsInComputedProperties1.ts, 18, 3))
+>y : Symbol(y, Decl(literalsInComputedProperties1.ts, 18, 11))
 >1 : Symbol(A[1], Decl(literalsInComputedProperties1.ts, 11, 13))
 >toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
 
 y[2].toExponential();
 >y[2].toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
->y : Symbol(y, Decl(literalsInComputedProperties1.ts, 18, 3))
+>y : Symbol(y, Decl(literalsInComputedProperties1.ts, 18, 11))
 >2 : Symbol(A[2], Decl(literalsInComputedProperties1.ts, 12, 13))
 >toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
 
 y[3].toExponential();
 >y[3].toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
->y : Symbol(y, Decl(literalsInComputedProperties1.ts, 18, 3))
+>y : Symbol(y, Decl(literalsInComputedProperties1.ts, 18, 11))
 >3 : Symbol(A["3"], Decl(literalsInComputedProperties1.ts, 13, 15))
 >toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
 
 y[4].toExponential();
 >y[4].toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
->y : Symbol(y, Decl(literalsInComputedProperties1.ts, 18, 3))
+>y : Symbol(y, Decl(literalsInComputedProperties1.ts, 18, 11))
 >4 : Symbol(A["4"], Decl(literalsInComputedProperties1.ts, 14, 15))
 >toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
 
 class C {
 >C : Symbol(C, Decl(literalsInComputedProperties1.ts, 22, 21))
 
-    1:number;
+    1!:number;
 >1 : Symbol(C[1], Decl(literalsInComputedProperties1.ts, 24, 9))
 
-    [2]:number;
->[2] : Symbol(C[2], Decl(literalsInComputedProperties1.ts, 25, 13))
->2 : Symbol(C[2], Decl(literalsInComputedProperties1.ts, 25, 13))
+    [2]!:number;
+>[2] : Symbol(C[2], Decl(literalsInComputedProperties1.ts, 25, 14))
+>2 : Symbol(C[2], Decl(literalsInComputedProperties1.ts, 25, 14))
 
     "3":number;
->"3" : Symbol(C["3"], Decl(literalsInComputedProperties1.ts, 26, 15))
+>"3" : Symbol(C["3"], Decl(literalsInComputedProperties1.ts, 26, 16))
 
-    ["4"]:number;
+    ["4"]!:number;
 >["4"] : Symbol(C["4"], Decl(literalsInComputedProperties1.ts, 27, 15))
 >"4" : Symbol(C["4"], Decl(literalsInComputedProperties1.ts, 27, 15))
 }
 
-let z:C;
->z : Symbol(z, Decl(literalsInComputedProperties1.ts, 31, 3))
+declare let z:C;
+>z : Symbol(z, Decl(literalsInComputedProperties1.ts, 31, 11))
 >C : Symbol(C, Decl(literalsInComputedProperties1.ts, 22, 21))
 
 z[1].toExponential();
 >z[1].toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
->z : Symbol(z, Decl(literalsInComputedProperties1.ts, 31, 3))
+>z : Symbol(z, Decl(literalsInComputedProperties1.ts, 31, 11))
 >1 : Symbol(C[1], Decl(literalsInComputedProperties1.ts, 24, 9))
 >toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
 
 z[2].toExponential();
 >z[2].toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
->z : Symbol(z, Decl(literalsInComputedProperties1.ts, 31, 3))
->2 : Symbol(C[2], Decl(literalsInComputedProperties1.ts, 25, 13))
+>z : Symbol(z, Decl(literalsInComputedProperties1.ts, 31, 11))
+>2 : Symbol(C[2], Decl(literalsInComputedProperties1.ts, 25, 14))
 >toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
 
 z[3].toExponential();
 >z[3].toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
->z : Symbol(z, Decl(literalsInComputedProperties1.ts, 31, 3))
->3 : Symbol(C["3"], Decl(literalsInComputedProperties1.ts, 26, 15))
+>z : Symbol(z, Decl(literalsInComputedProperties1.ts, 31, 11))
+>3 : Symbol(C["3"], Decl(literalsInComputedProperties1.ts, 26, 16))
 >toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
 
 z[4].toExponential();
 >z[4].toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
->z : Symbol(z, Decl(literalsInComputedProperties1.ts, 31, 3))
+>z : Symbol(z, Decl(literalsInComputedProperties1.ts, 31, 11))
 >4 : Symbol(C["4"], Decl(literalsInComputedProperties1.ts, 27, 15))
 >toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --))
 
diff --git a/tests/baselines/reference/literalsInComputedProperties1.types b/tests/baselines/reference/literalsInComputedProperties1.types
index 3df57877b2b03..ceab8b6f63740 100644
--- a/tests/baselines/reference/literalsInComputedProperties1.types
+++ b/tests/baselines/reference/literalsInComputedProperties1.types
@@ -113,7 +113,7 @@ interface A {
 >    : ^^^
 }
 
-let y:A;
+declare let y:A;
 >y : A
 >  : ^
 
@@ -177,11 +177,11 @@ class C {
 >C : C
 >  : ^
 
-    1:number;
+    1!:number;
 >1 : number
 >  : ^^^^^^
 
-    [2]:number;
+    [2]!:number;
 >[2] : number
 >    : ^^^^^^
 >2 : 2
@@ -191,14 +191,14 @@ class C {
 >"3" : number
 >    : ^^^^^^
 
-    ["4"]:number;
+    ["4"]!:number;
 >["4"] : number
 >      : ^^^^^^
 >"4" : "4"
 >    : ^^^
 }
 
-let z:C;
+declare let z:C;
 >z : C
 >  : ^
 
diff --git a/tests/baselines/reference/logicalAndOperatorWithEveryType.errors.txt b/tests/baselines/reference/logicalAndOperatorWithEveryType.errors.txt
index 7f10b53cd3f30..94207877d0449 100644
--- a/tests/baselines/reference/logicalAndOperatorWithEveryType.errors.txt
+++ b/tests/baselines/reference/logicalAndOperatorWithEveryType.errors.txt
@@ -37,13 +37,13 @@ logicalAndOperatorWithEveryType.ts(123,12): error TS2873: This kind of expressio
     enum E { a, b, c }
     
     var a1: any;
-    var a2: boolean;
-    var a3: number
-    var a4: string;
-    var a5: void;
-    var a6: E;
-    var a7: {};
-    var a8: string[];
+    declare var a2: boolean;
+    declare var a3: number;
+    declare var a4: string;
+    declare var a5: void;
+    declare var a6: E;
+    declare var a7: {};
+    declare var a8: string[];
     
     var ra1 = a1 && a1;
     var ra2 = a2 && a1;
diff --git a/tests/baselines/reference/logicalAndOperatorWithEveryType.js b/tests/baselines/reference/logicalAndOperatorWithEveryType.js
index 3f39c5efbe39b..6ad32731b4b56 100644
--- a/tests/baselines/reference/logicalAndOperatorWithEveryType.js
+++ b/tests/baselines/reference/logicalAndOperatorWithEveryType.js
@@ -7,13 +7,13 @@
 enum E { a, b, c }
 
 var a1: any;
-var a2: boolean;
-var a3: number
-var a4: string;
-var a5: void;
-var a6: E;
-var a7: {};
-var a8: string[];
+declare var a2: boolean;
+declare var a3: number;
+declare var a4: string;
+declare var a5: void;
+declare var a6: E;
+declare var a7: {};
+declare var a8: string[];
 
 var ra1 = a1 && a1;
 var ra2 = a2 && a1;
@@ -135,13 +135,6 @@ var E;
     E[E["c"] = 2] = "c";
 })(E || (E = {}));
 var a1;
-var a2;
-var a3;
-var a4;
-var a5;
-var a6;
-var a7;
-var a8;
 var ra1 = a1 && a1;
 var ra2 = a2 && a1;
 var ra3 = a3 && a1;
diff --git a/tests/baselines/reference/logicalAndOperatorWithEveryType.symbols b/tests/baselines/reference/logicalAndOperatorWithEveryType.symbols
index d07b3fd505b63..4e3b1f76cea3a 100644
--- a/tests/baselines/reference/logicalAndOperatorWithEveryType.symbols
+++ b/tests/baselines/reference/logicalAndOperatorWithEveryType.symbols
@@ -13,27 +13,27 @@ enum E { a, b, c }
 var a1: any;
 >a1 : Symbol(a1, Decl(logicalAndOperatorWithEveryType.ts, 5, 3))
 
-var a2: boolean;
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
+declare var a2: boolean;
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
 
-var a3: number
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
+declare var a3: number;
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
 
-var a4: string;
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
+declare var a4: string;
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
 
-var a5: void;
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
+declare var a5: void;
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
 
-var a6: E;
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
+declare var a6: E;
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
 >E : Symbol(E, Decl(logicalAndOperatorWithEveryType.ts, 0, 0))
 
-var a7: {};
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
+declare var a7: {};
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
 
-var a8: string[];
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
+declare var a8: string[];
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
 
 var ra1 = a1 && a1;
 >ra1 : Symbol(ra1, Decl(logicalAndOperatorWithEveryType.ts, 14, 3))
@@ -42,37 +42,37 @@ var ra1 = a1 && a1;
 
 var ra2 = a2 && a1;
 >ra2 : Symbol(ra2, Decl(logicalAndOperatorWithEveryType.ts, 15, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
 >a1 : Symbol(a1, Decl(logicalAndOperatorWithEveryType.ts, 5, 3))
 
 var ra3 = a3 && a1;
 >ra3 : Symbol(ra3, Decl(logicalAndOperatorWithEveryType.ts, 16, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
 >a1 : Symbol(a1, Decl(logicalAndOperatorWithEveryType.ts, 5, 3))
 
 var ra4 = a4 && a1;
 >ra4 : Symbol(ra4, Decl(logicalAndOperatorWithEveryType.ts, 17, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
 >a1 : Symbol(a1, Decl(logicalAndOperatorWithEveryType.ts, 5, 3))
 
 var ra5 = a5 && a1;
 >ra5 : Symbol(ra5, Decl(logicalAndOperatorWithEveryType.ts, 18, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
 >a1 : Symbol(a1, Decl(logicalAndOperatorWithEveryType.ts, 5, 3))
 
 var ra6 = a6 && a1;
 >ra6 : Symbol(ra6, Decl(logicalAndOperatorWithEveryType.ts, 19, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
 >a1 : Symbol(a1, Decl(logicalAndOperatorWithEveryType.ts, 5, 3))
 
 var ra7 = a7 && a1;
 >ra7 : Symbol(ra7, Decl(logicalAndOperatorWithEveryType.ts, 20, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
 >a1 : Symbol(a1, Decl(logicalAndOperatorWithEveryType.ts, 5, 3))
 
 var ra8 = a8 && a1;
 >ra8 : Symbol(ra8, Decl(logicalAndOperatorWithEveryType.ts, 21, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
 >a1 : Symbol(a1, Decl(logicalAndOperatorWithEveryType.ts, 5, 3))
 
 var ra9 = null && a1;
@@ -87,345 +87,345 @@ var ra10 = undefined && a1;
 var rb1 = a1 && a2;
 >rb1 : Symbol(rb1, Decl(logicalAndOperatorWithEveryType.ts, 25, 3))
 >a1 : Symbol(a1, Decl(logicalAndOperatorWithEveryType.ts, 5, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
 
 var rb2 = a2 && a2;
 >rb2 : Symbol(rb2, Decl(logicalAndOperatorWithEveryType.ts, 26, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
 
 var rb3 = a3 && a2;
 >rb3 : Symbol(rb3, Decl(logicalAndOperatorWithEveryType.ts, 27, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
 
 var rb4 = a4 && a2;
 >rb4 : Symbol(rb4, Decl(logicalAndOperatorWithEveryType.ts, 28, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
 
 var rb5 = a5 && a2;
 >rb5 : Symbol(rb5, Decl(logicalAndOperatorWithEveryType.ts, 29, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
 
 var rb6 = a6 && a2;
 >rb6 : Symbol(rb6, Decl(logicalAndOperatorWithEveryType.ts, 30, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
 
 var rb7 = a7 && a2;
 >rb7 : Symbol(rb7, Decl(logicalAndOperatorWithEveryType.ts, 31, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
 
 var rb8 = a8 && a2;
 >rb8 : Symbol(rb8, Decl(logicalAndOperatorWithEveryType.ts, 32, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
 
 var rb9 = null && a2;
 >rb9 : Symbol(rb9, Decl(logicalAndOperatorWithEveryType.ts, 33, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
 
 var rb10 = undefined && a2;
 >rb10 : Symbol(rb10, Decl(logicalAndOperatorWithEveryType.ts, 34, 3))
 >undefined : Symbol(undefined)
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
 
 var rc1 = a1 && a3;
 >rc1 : Symbol(rc1, Decl(logicalAndOperatorWithEveryType.ts, 36, 3))
 >a1 : Symbol(a1, Decl(logicalAndOperatorWithEveryType.ts, 5, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
 
 var rc2 = a2 && a3;
 >rc2 : Symbol(rc2, Decl(logicalAndOperatorWithEveryType.ts, 37, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
 
 var rc3 = a3 && a3;
 >rc3 : Symbol(rc3, Decl(logicalAndOperatorWithEveryType.ts, 38, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
 
 var rc4 = a4 && a3;
 >rc4 : Symbol(rc4, Decl(logicalAndOperatorWithEveryType.ts, 39, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
 
 var rc5 = a5 && a3;
 >rc5 : Symbol(rc5, Decl(logicalAndOperatorWithEveryType.ts, 40, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
 
 var rc6 = a6 && a3;
 >rc6 : Symbol(rc6, Decl(logicalAndOperatorWithEveryType.ts, 41, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
 
 var rc7 = a7 && a3;
 >rc7 : Symbol(rc7, Decl(logicalAndOperatorWithEveryType.ts, 42, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
 
 var rc8 = a8 && a3;
 >rc8 : Symbol(rc8, Decl(logicalAndOperatorWithEveryType.ts, 43, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
 
 var rc9 = null && a3;
 >rc9 : Symbol(rc9, Decl(logicalAndOperatorWithEveryType.ts, 44, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
 
 var rc10 = undefined && a3;
 >rc10 : Symbol(rc10, Decl(logicalAndOperatorWithEveryType.ts, 45, 3))
 >undefined : Symbol(undefined)
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
 
 var rd1 = a1 && a4;
 >rd1 : Symbol(rd1, Decl(logicalAndOperatorWithEveryType.ts, 47, 3))
 >a1 : Symbol(a1, Decl(logicalAndOperatorWithEveryType.ts, 5, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
 
 var rd2 = a2 && a4;
 >rd2 : Symbol(rd2, Decl(logicalAndOperatorWithEveryType.ts, 48, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
 
 var rd3 = a3 && a4;
 >rd3 : Symbol(rd3, Decl(logicalAndOperatorWithEveryType.ts, 49, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
 
 var rd4 = a4 && a4;
 >rd4 : Symbol(rd4, Decl(logicalAndOperatorWithEveryType.ts, 50, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
 
 var rd5 = a5 && a4;
 >rd5 : Symbol(rd5, Decl(logicalAndOperatorWithEveryType.ts, 51, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
 
 var rd6 = a6 && a4;
 >rd6 : Symbol(rd6, Decl(logicalAndOperatorWithEveryType.ts, 52, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
 
 var rd7 = a7 && a4;
 >rd7 : Symbol(rd7, Decl(logicalAndOperatorWithEveryType.ts, 53, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
 
 var rd8 = a8 && a4;
 >rd8 : Symbol(rd8, Decl(logicalAndOperatorWithEveryType.ts, 54, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
 
 var rd9 = null && a4;
 >rd9 : Symbol(rd9, Decl(logicalAndOperatorWithEveryType.ts, 55, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
 
 var rd10 = undefined && a4;
 >rd10 : Symbol(rd10, Decl(logicalAndOperatorWithEveryType.ts, 56, 3))
 >undefined : Symbol(undefined)
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
 
 var re1 = a1 && a5;
 >re1 : Symbol(re1, Decl(logicalAndOperatorWithEveryType.ts, 58, 3))
 >a1 : Symbol(a1, Decl(logicalAndOperatorWithEveryType.ts, 5, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
 
 var re2 = a2 && a5;
 >re2 : Symbol(re2, Decl(logicalAndOperatorWithEveryType.ts, 59, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
 
 var re3 = a3 && a5;
 >re3 : Symbol(re3, Decl(logicalAndOperatorWithEveryType.ts, 60, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
 
 var re4 = a4 && a5;
 >re4 : Symbol(re4, Decl(logicalAndOperatorWithEveryType.ts, 61, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
 
 var re5 = a5 && a5;
 >re5 : Symbol(re5, Decl(logicalAndOperatorWithEveryType.ts, 62, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
 
 var re6 = a6 && a5;
 >re6 : Symbol(re6, Decl(logicalAndOperatorWithEveryType.ts, 63, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
 
 var re7 = a7 && a5;
 >re7 : Symbol(re7, Decl(logicalAndOperatorWithEveryType.ts, 64, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
 
 var re8 = a8 && a5;
 >re8 : Symbol(re8, Decl(logicalAndOperatorWithEveryType.ts, 65, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
 
 var re9 = null && a5;
 >re9 : Symbol(re9, Decl(logicalAndOperatorWithEveryType.ts, 66, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
 
 var re10 = undefined && a5;
 >re10 : Symbol(re10, Decl(logicalAndOperatorWithEveryType.ts, 67, 3))
 >undefined : Symbol(undefined)
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
 
 var rf1 = a1 && a6;
 >rf1 : Symbol(rf1, Decl(logicalAndOperatorWithEveryType.ts, 69, 3))
 >a1 : Symbol(a1, Decl(logicalAndOperatorWithEveryType.ts, 5, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
 
 var rf2 = a2 && a6;
 >rf2 : Symbol(rf2, Decl(logicalAndOperatorWithEveryType.ts, 70, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
 
 var rf3 = a3 && a6;
 >rf3 : Symbol(rf3, Decl(logicalAndOperatorWithEveryType.ts, 71, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
 
 var rf4 = a4 && a6;
 >rf4 : Symbol(rf4, Decl(logicalAndOperatorWithEveryType.ts, 72, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
 
 var rf5 = a5 && a6;
 >rf5 : Symbol(rf5, Decl(logicalAndOperatorWithEveryType.ts, 73, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
 
 var rf6 = a6 && a6;
 >rf6 : Symbol(rf6, Decl(logicalAndOperatorWithEveryType.ts, 74, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
 
 var rf7 = a7 && a6;
 >rf7 : Symbol(rf7, Decl(logicalAndOperatorWithEveryType.ts, 75, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
 
 var rf8 = a8 && a6;
 >rf8 : Symbol(rf8, Decl(logicalAndOperatorWithEveryType.ts, 76, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
 
 var rf9 = null && a6;
 >rf9 : Symbol(rf9, Decl(logicalAndOperatorWithEveryType.ts, 77, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
 
 var rf10 = undefined && a6;
 >rf10 : Symbol(rf10, Decl(logicalAndOperatorWithEveryType.ts, 78, 3))
 >undefined : Symbol(undefined)
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
 
 var rg1 = a1 && a7;
 >rg1 : Symbol(rg1, Decl(logicalAndOperatorWithEveryType.ts, 80, 3))
 >a1 : Symbol(a1, Decl(logicalAndOperatorWithEveryType.ts, 5, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
 
 var rg2 = a2 && a7;
 >rg2 : Symbol(rg2, Decl(logicalAndOperatorWithEveryType.ts, 81, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
 
 var rg3 = a3 && a7;
 >rg3 : Symbol(rg3, Decl(logicalAndOperatorWithEveryType.ts, 82, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
 
 var rg4 = a4 && a7;
 >rg4 : Symbol(rg4, Decl(logicalAndOperatorWithEveryType.ts, 83, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
 
 var rg5 = a5 && a7;
 >rg5 : Symbol(rg5, Decl(logicalAndOperatorWithEveryType.ts, 84, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
 
 var rg6 = a6 && a7;
 >rg6 : Symbol(rg6, Decl(logicalAndOperatorWithEveryType.ts, 85, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
 
 var rg7 = a7 && a7;
 >rg7 : Symbol(rg7, Decl(logicalAndOperatorWithEveryType.ts, 86, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
 
 var rg8 = a8 && a7;
 >rg8 : Symbol(rg8, Decl(logicalAndOperatorWithEveryType.ts, 87, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
 
 var rg9 = null && a7;
 >rg9 : Symbol(rg9, Decl(logicalAndOperatorWithEveryType.ts, 88, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
 
 var rg10 = undefined && a7;
 >rg10 : Symbol(rg10, Decl(logicalAndOperatorWithEveryType.ts, 89, 3))
 >undefined : Symbol(undefined)
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
 
 var rh1 = a1 && a8;
 >rh1 : Symbol(rh1, Decl(logicalAndOperatorWithEveryType.ts, 91, 3))
 >a1 : Symbol(a1, Decl(logicalAndOperatorWithEveryType.ts, 5, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
 
 var rh2 = a2 && a8;
 >rh2 : Symbol(rh2, Decl(logicalAndOperatorWithEveryType.ts, 92, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
 
 var rh3 = a3 && a8;
 >rh3 : Symbol(rh3, Decl(logicalAndOperatorWithEveryType.ts, 93, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
 
 var rh4 = a4 && a8;
 >rh4 : Symbol(rh4, Decl(logicalAndOperatorWithEveryType.ts, 94, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
 
 var rh5 = a5 && a8;
 >rh5 : Symbol(rh5, Decl(logicalAndOperatorWithEveryType.ts, 95, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
 
 var rh6 = a6 && a8;
 >rh6 : Symbol(rh6, Decl(logicalAndOperatorWithEveryType.ts, 96, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
 
 var rh7 = a7 && a8;
 >rh7 : Symbol(rh7, Decl(logicalAndOperatorWithEveryType.ts, 97, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
 
 var rh8 = a8 && a8;
 >rh8 : Symbol(rh8, Decl(logicalAndOperatorWithEveryType.ts, 98, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
 
 var rh9 = null && a8;
 >rh9 : Symbol(rh9, Decl(logicalAndOperatorWithEveryType.ts, 99, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
 
 var rh10 = undefined && a8;
 >rh10 : Symbol(rh10, Decl(logicalAndOperatorWithEveryType.ts, 100, 3))
 >undefined : Symbol(undefined)
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
 
 var ri1 = a1 && null;
 >ri1 : Symbol(ri1, Decl(logicalAndOperatorWithEveryType.ts, 102, 3))
@@ -433,31 +433,31 @@ var ri1 = a1 && null;
 
 var ri2 = a2 && null;
 >ri2 : Symbol(ri2, Decl(logicalAndOperatorWithEveryType.ts, 103, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
 
 var ri3 = a3 && null;
 >ri3 : Symbol(ri3, Decl(logicalAndOperatorWithEveryType.ts, 104, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
 
 var ri4 = a4 && null;
 >ri4 : Symbol(ri4, Decl(logicalAndOperatorWithEveryType.ts, 105, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
 
 var ri5 = a5 && null;
 >ri5 : Symbol(ri5, Decl(logicalAndOperatorWithEveryType.ts, 106, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
 
 var ri6 = a6 && null;
 >ri6 : Symbol(ri6, Decl(logicalAndOperatorWithEveryType.ts, 107, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
 
 var ri7 = a7 && null;
 >ri7 : Symbol(ri7, Decl(logicalAndOperatorWithEveryType.ts, 108, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
 
 var ri8 = a8 && null;
 >ri8 : Symbol(ri8, Decl(logicalAndOperatorWithEveryType.ts, 109, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
 
 var ri9 = null && null;
 >ri9 : Symbol(ri9, Decl(logicalAndOperatorWithEveryType.ts, 110, 3))
@@ -473,37 +473,37 @@ var rj1 = a1 && undefined;
 
 var rj2 = a2 && undefined;
 >rj2 : Symbol(rj2, Decl(logicalAndOperatorWithEveryType.ts, 114, 3))
->a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 3))
+>a2 : Symbol(a2, Decl(logicalAndOperatorWithEveryType.ts, 6, 11))
 >undefined : Symbol(undefined)
 
 var rj3 = a3 && undefined;
 >rj3 : Symbol(rj3, Decl(logicalAndOperatorWithEveryType.ts, 115, 3))
->a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 3))
+>a3 : Symbol(a3, Decl(logicalAndOperatorWithEveryType.ts, 7, 11))
 >undefined : Symbol(undefined)
 
 var rj4 = a4 && undefined;
 >rj4 : Symbol(rj4, Decl(logicalAndOperatorWithEveryType.ts, 116, 3))
->a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 3))
+>a4 : Symbol(a4, Decl(logicalAndOperatorWithEveryType.ts, 8, 11))
 >undefined : Symbol(undefined)
 
 var rj5 = a5 && undefined;
 >rj5 : Symbol(rj5, Decl(logicalAndOperatorWithEveryType.ts, 117, 3))
->a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 3))
+>a5 : Symbol(a5, Decl(logicalAndOperatorWithEveryType.ts, 9, 11))
 >undefined : Symbol(undefined)
 
 var rj6 = a6 && undefined;
 >rj6 : Symbol(rj6, Decl(logicalAndOperatorWithEveryType.ts, 118, 3))
->a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 3))
+>a6 : Symbol(a6, Decl(logicalAndOperatorWithEveryType.ts, 10, 11))
 >undefined : Symbol(undefined)
 
 var rj7 = a7 && undefined;
 >rj7 : Symbol(rj7, Decl(logicalAndOperatorWithEveryType.ts, 119, 3))
->a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 3))
+>a7 : Symbol(a7, Decl(logicalAndOperatorWithEveryType.ts, 11, 11))
 >undefined : Symbol(undefined)
 
 var rj8 = a8 && undefined;
 >rj8 : Symbol(rj8, Decl(logicalAndOperatorWithEveryType.ts, 120, 3))
->a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 3))
+>a8 : Symbol(a8, Decl(logicalAndOperatorWithEveryType.ts, 12, 11))
 >undefined : Symbol(undefined)
 
 var rj9 = null && undefined;
diff --git a/tests/baselines/reference/logicalAndOperatorWithEveryType.types b/tests/baselines/reference/logicalAndOperatorWithEveryType.types
index f44d3ee366c39..519f350c13d52 100644
--- a/tests/baselines/reference/logicalAndOperatorWithEveryType.types
+++ b/tests/baselines/reference/logicalAndOperatorWithEveryType.types
@@ -18,31 +18,31 @@ var a1: any;
 >a1 : any
 >   : ^^^
 
-var a2: boolean;
+declare var a2: boolean;
 >a2 : boolean
 >   : ^^^^^^^
 
-var a3: number
+declare var a3: number;
 >a3 : number
 >   : ^^^^^^
 
-var a4: string;
+declare var a4: string;
 >a4 : string
 >   : ^^^^^^
 
-var a5: void;
+declare var a5: void;
 >a5 : void
 >   : ^^^^
 
-var a6: E;
+declare var a6: E;
 >a6 : E
 >   : ^
 
-var a7: {};
+declare var a7: {};
 >a7 : {}
 >   : ^^
 
-var a8: string[];
+declare var a8: string[];
 >a8 : string[]
 >   : ^^^^^^^^
 
diff --git a/tests/baselines/reference/logicalNotOperatorInvalidOperations.errors.txt b/tests/baselines/reference/logicalNotOperatorInvalidOperations.errors.txt
index 82af107f6874d..f90bdea67846f 100644
--- a/tests/baselines/reference/logicalNotOperatorInvalidOperations.errors.txt
+++ b/tests/baselines/reference/logicalNotOperatorInvalidOperations.errors.txt
@@ -4,7 +4,7 @@ logicalNotOperatorInvalidOperations.ts(11,16): error TS1109: Expression expected
 
 ==== logicalNotOperatorInvalidOperations.ts (2 errors) ====
     // Unary operator !
-    var b: number;
+    declare var b: number;
     
     // operand before !
     var BOOLEAN1 = b!;  //expect error
diff --git a/tests/baselines/reference/logicalNotOperatorInvalidOperations.js b/tests/baselines/reference/logicalNotOperatorInvalidOperations.js
index e8c509e372a5a..ad0f41bb1d15a 100644
--- a/tests/baselines/reference/logicalNotOperatorInvalidOperations.js
+++ b/tests/baselines/reference/logicalNotOperatorInvalidOperations.js
@@ -2,7 +2,7 @@
 
 //// [logicalNotOperatorInvalidOperations.ts]
 // Unary operator !
-var b: number;
+declare var b: number;
 
 // operand before !
 var BOOLEAN1 = b!;  //expect error
@@ -14,8 +14,6 @@ var BOOLEAN2 = !b + b;
 var BOOLEAN3 =!;
 
 //// [logicalNotOperatorInvalidOperations.js]
-// Unary operator !
-var b;
 // operand before !
 var BOOLEAN1 = b; //expect error
 // miss parentheses
diff --git a/tests/baselines/reference/logicalNotOperatorInvalidOperations.symbols b/tests/baselines/reference/logicalNotOperatorInvalidOperations.symbols
index 370b44b759950..371479d049fb3 100644
--- a/tests/baselines/reference/logicalNotOperatorInvalidOperations.symbols
+++ b/tests/baselines/reference/logicalNotOperatorInvalidOperations.symbols
@@ -2,19 +2,19 @@
 
 === logicalNotOperatorInvalidOperations.ts ===
 // Unary operator !
-var b: number;
->b : Symbol(b, Decl(logicalNotOperatorInvalidOperations.ts, 1, 3))
+declare var b: number;
+>b : Symbol(b, Decl(logicalNotOperatorInvalidOperations.ts, 1, 11))
 
 // operand before !
 var BOOLEAN1 = b!;  //expect error
 >BOOLEAN1 : Symbol(BOOLEAN1, Decl(logicalNotOperatorInvalidOperations.ts, 4, 3))
->b : Symbol(b, Decl(logicalNotOperatorInvalidOperations.ts, 1, 3))
+>b : Symbol(b, Decl(logicalNotOperatorInvalidOperations.ts, 1, 11))
 
 // miss parentheses
 var BOOLEAN2 = !b + b;
 >BOOLEAN2 : Symbol(BOOLEAN2, Decl(logicalNotOperatorInvalidOperations.ts, 7, 3))
->b : Symbol(b, Decl(logicalNotOperatorInvalidOperations.ts, 1, 3))
->b : Symbol(b, Decl(logicalNotOperatorInvalidOperations.ts, 1, 3))
+>b : Symbol(b, Decl(logicalNotOperatorInvalidOperations.ts, 1, 11))
+>b : Symbol(b, Decl(logicalNotOperatorInvalidOperations.ts, 1, 11))
 
 // miss an operand
 var BOOLEAN3 =!;
diff --git a/tests/baselines/reference/logicalNotOperatorInvalidOperations.types b/tests/baselines/reference/logicalNotOperatorInvalidOperations.types
index 817e92db0ffa2..76d5b68ab9e0a 100644
--- a/tests/baselines/reference/logicalNotOperatorInvalidOperations.types
+++ b/tests/baselines/reference/logicalNotOperatorInvalidOperations.types
@@ -2,7 +2,7 @@
 
 === logicalNotOperatorInvalidOperations.ts ===
 // Unary operator !
-var b: number;
+declare var b: number;
 >b : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.errors.txt b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.errors.txt
index 043289f9b7523..0c22adf45301a 100644
--- a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.errors.txt
+++ b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.errors.txt
@@ -12,7 +12,7 @@ logicalNotOperatorWithAnyOtherType.ts(57,1): error TS2695: Left side of comma op
     var ANY: any;
     var ANY1;
     var ANY2: any[] = ["", ""];
-    var obj: () => {}
+    declare var obj: () => {}
     var obj1 = { x: "", y: () => { }};
     function foo(): any {
         var a;
diff --git a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js
index 0d36d1e07af8c..e72bc55b517c8 100644
--- a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js
@@ -6,7 +6,7 @@
 var ANY: any;
 var ANY1;
 var ANY2: any[] = ["", ""];
-var obj: () => {}
+declare var obj: () => {}
 var obj1 = { x: "", y: () => { }};
 function foo(): any {
     var a;
@@ -66,7 +66,6 @@ var ResultIsBoolean21 = !!!(ANY + ANY1);
 var ANY;
 var ANY1;
 var ANY2 = ["", ""];
-var obj;
 var obj1 = { x: "", y: function () { } };
 function foo() {
     var a;
diff --git a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.symbols b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.symbols
index 74db3a79283cf..8031565c0db58 100644
--- a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.symbols
+++ b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.symbols
@@ -12,8 +12,8 @@ var ANY1;
 var ANY2: any[] = ["", ""];
 >ANY2 : Symbol(ANY2, Decl(logicalNotOperatorWithAnyOtherType.ts, 4, 3))
 
-var obj: () => {}
->obj : Symbol(obj, Decl(logicalNotOperatorWithAnyOtherType.ts, 5, 3))
+declare var obj: () => {}
+>obj : Symbol(obj, Decl(logicalNotOperatorWithAnyOtherType.ts, 5, 11))
 
 var obj1 = { x: "", y: () => { }};
 >obj1 : Symbol(obj1, Decl(logicalNotOperatorWithAnyOtherType.ts, 6, 3))
@@ -74,7 +74,7 @@ var ResultIsBoolean4 = !M;
 
 var ResultIsBoolean5 = !obj;
 >ResultIsBoolean5 : Symbol(ResultIsBoolean5, Decl(logicalNotOperatorWithAnyOtherType.ts, 28, 3))
->obj : Symbol(obj, Decl(logicalNotOperatorWithAnyOtherType.ts, 5, 3))
+>obj : Symbol(obj, Decl(logicalNotOperatorWithAnyOtherType.ts, 5, 11))
 
 var ResultIsBoolean6 = !obj1;
 >ResultIsBoolean6 : Symbol(ResultIsBoolean6, Decl(logicalNotOperatorWithAnyOtherType.ts, 29, 3))
diff --git a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.types b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.types
index 2008f78882470..843d715802911 100644
--- a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.types
@@ -21,7 +21,7 @@ var ANY2: any[] = ["", ""];
 >"" : ""
 >   : ^^
 
-var obj: () => {}
+declare var obj: () => {}
 >obj : () => {}
 >    : ^^^^^^  
 
diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.errors.txt b/tests/baselines/reference/logicalNotOperatorWithBooleanType.errors.txt
index cb601859fb889..7f4a6b7ff891e 100644
--- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.errors.txt
+++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.errors.txt
@@ -4,16 +4,16 @@ logicalNotOperatorWithBooleanType.ts(36,1): error TS2695: Left side of comma ope
 
 ==== logicalNotOperatorWithBooleanType.ts (2 errors) ====
     // ! operator on boolean type
-    var BOOLEAN: boolean;
+    declare var BOOLEAN: boolean;
     
     function foo(): boolean { return true; }
     
     class A {
-        public a: boolean;
+        public a!: boolean;
         static foo() { return false; }
     }
     namespace M {
-        export var n: boolean;
+        export declare var n: boolean;
     }
     
     var objA = new A();
diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.js b/tests/baselines/reference/logicalNotOperatorWithBooleanType.js
index 3ba85d07e8fe4..605c1960eea1a 100644
--- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.js
+++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.js
@@ -2,16 +2,16 @@
 
 //// [logicalNotOperatorWithBooleanType.ts]
 // ! operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 
 function foo(): boolean { return true; }
 
 class A {
-    public a: boolean;
+    public a!: boolean;
     static foo() { return false; }
 }
 namespace M {
-    export var n: boolean;
+    export declare var n: boolean;
 }
 
 var objA = new A();
@@ -41,8 +41,6 @@ var ResultIsBoolean = !!BOOLEAN;
 !M.n;
 
 //// [logicalNotOperatorWithBooleanType.js]
-// ! operator on boolean type
-var BOOLEAN;
 function foo() { return true; }
 var A = /** @class */ (function () {
     function A() {
diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.symbols b/tests/baselines/reference/logicalNotOperatorWithBooleanType.symbols
index b70b8a19fedb4..88709f1acb5c7 100644
--- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.symbols
+++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.symbols
@@ -2,26 +2,26 @@
 
 === logicalNotOperatorWithBooleanType.ts ===
 // ! operator on boolean type
-var BOOLEAN: boolean;
->BOOLEAN : Symbol(BOOLEAN, Decl(logicalNotOperatorWithBooleanType.ts, 1, 3))
+declare var BOOLEAN: boolean;
+>BOOLEAN : Symbol(BOOLEAN, Decl(logicalNotOperatorWithBooleanType.ts, 1, 11))
 
 function foo(): boolean { return true; }
->foo : Symbol(foo, Decl(logicalNotOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(logicalNotOperatorWithBooleanType.ts, 1, 29))
 
 class A {
 >A : Symbol(A, Decl(logicalNotOperatorWithBooleanType.ts, 3, 40))
 
-    public a: boolean;
+    public a!: boolean;
 >a : Symbol(A.a, Decl(logicalNotOperatorWithBooleanType.ts, 5, 9))
 
     static foo() { return false; }
->foo : Symbol(A.foo, Decl(logicalNotOperatorWithBooleanType.ts, 6, 22))
+>foo : Symbol(A.foo, Decl(logicalNotOperatorWithBooleanType.ts, 6, 23))
 }
 namespace M {
 >M : Symbol(M, Decl(logicalNotOperatorWithBooleanType.ts, 8, 1))
 
-    export var n: boolean;
->n : Symbol(n, Decl(logicalNotOperatorWithBooleanType.ts, 10, 14))
+    export declare var n: boolean;
+>n : Symbol(n, Decl(logicalNotOperatorWithBooleanType.ts, 10, 22))
 }
 
 var objA = new A();
@@ -31,7 +31,7 @@ var objA = new A();
 // boolean type var
 var ResultIsBoolean1 = !BOOLEAN;
 >ResultIsBoolean1 : Symbol(ResultIsBoolean1, Decl(logicalNotOperatorWithBooleanType.ts, 16, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(logicalNotOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(logicalNotOperatorWithBooleanType.ts, 1, 11))
 
 // boolean type literal
 var ResultIsBoolean2 = !true;
@@ -51,32 +51,32 @@ var ResultIsBoolean4 = !objA.a;
 
 var ResultIsBoolean5 = !M.n;
 >ResultIsBoolean5 : Symbol(ResultIsBoolean5, Decl(logicalNotOperatorWithBooleanType.ts, 24, 3))
->M.n : Symbol(M.n, Decl(logicalNotOperatorWithBooleanType.ts, 10, 14))
+>M.n : Symbol(M.n, Decl(logicalNotOperatorWithBooleanType.ts, 10, 22))
 >M : Symbol(M, Decl(logicalNotOperatorWithBooleanType.ts, 8, 1))
->n : Symbol(M.n, Decl(logicalNotOperatorWithBooleanType.ts, 10, 14))
+>n : Symbol(M.n, Decl(logicalNotOperatorWithBooleanType.ts, 10, 22))
 
 var ResultIsBoolean6 = !foo();
 >ResultIsBoolean6 : Symbol(ResultIsBoolean6, Decl(logicalNotOperatorWithBooleanType.ts, 25, 3))
->foo : Symbol(foo, Decl(logicalNotOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(logicalNotOperatorWithBooleanType.ts, 1, 29))
 
 var ResultIsBoolean7 = !A.foo();
 >ResultIsBoolean7 : Symbol(ResultIsBoolean7, Decl(logicalNotOperatorWithBooleanType.ts, 26, 3))
->A.foo : Symbol(A.foo, Decl(logicalNotOperatorWithBooleanType.ts, 6, 22))
+>A.foo : Symbol(A.foo, Decl(logicalNotOperatorWithBooleanType.ts, 6, 23))
 >A : Symbol(A, Decl(logicalNotOperatorWithBooleanType.ts, 3, 40))
->foo : Symbol(A.foo, Decl(logicalNotOperatorWithBooleanType.ts, 6, 22))
+>foo : Symbol(A.foo, Decl(logicalNotOperatorWithBooleanType.ts, 6, 23))
 
 // multiple ! operators
 var ResultIsBoolean = !!BOOLEAN;
 >ResultIsBoolean : Symbol(ResultIsBoolean, Decl(logicalNotOperatorWithBooleanType.ts, 29, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(logicalNotOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(logicalNotOperatorWithBooleanType.ts, 1, 11))
 
 // miss assignment operators
 !true;
 !BOOLEAN;
->BOOLEAN : Symbol(BOOLEAN, Decl(logicalNotOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(logicalNotOperatorWithBooleanType.ts, 1, 11))
 
 !foo();
->foo : Symbol(foo, Decl(logicalNotOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(logicalNotOperatorWithBooleanType.ts, 1, 29))
 
 !true, false;
 !objA.a;
@@ -85,7 +85,7 @@ var ResultIsBoolean = !!BOOLEAN;
 >a : Symbol(A.a, Decl(logicalNotOperatorWithBooleanType.ts, 5, 9))
 
 !M.n;
->M.n : Symbol(M.n, Decl(logicalNotOperatorWithBooleanType.ts, 10, 14))
+>M.n : Symbol(M.n, Decl(logicalNotOperatorWithBooleanType.ts, 10, 22))
 >M : Symbol(M, Decl(logicalNotOperatorWithBooleanType.ts, 8, 1))
->n : Symbol(M.n, Decl(logicalNotOperatorWithBooleanType.ts, 10, 14))
+>n : Symbol(M.n, Decl(logicalNotOperatorWithBooleanType.ts, 10, 22))
 
diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.types b/tests/baselines/reference/logicalNotOperatorWithBooleanType.types
index 12bdf272c643e..f073f8e8de9b3 100644
--- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.types
@@ -2,7 +2,7 @@
 
 === logicalNotOperatorWithBooleanType.ts ===
 // ! operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 >BOOLEAN : boolean
 >        : ^^^^^^^
 
@@ -16,7 +16,7 @@ class A {
 >A : A
 >  : ^
 
-    public a: boolean;
+    public a!: boolean;
 >a : boolean
 >  : ^^^^^^^
 
@@ -30,7 +30,7 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: boolean;
+    export declare var n: boolean;
 >n : boolean
 >  : ^^^^^^^
 }
diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.errors.txt b/tests/baselines/reference/logicalNotOperatorWithNumberType.errors.txt
index a81e764f76862..6e81484323eac 100644
--- a/tests/baselines/reference/logicalNotOperatorWithNumberType.errors.txt
+++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.errors.txt
@@ -5,17 +5,17 @@ logicalNotOperatorWithNumberType.ts(45,1): error TS2695: Left side of comma oper
 
 ==== logicalNotOperatorWithNumberType.ts (3 errors) ====
     // ! operator on number type
-    var NUMBER: number;
+    declare var NUMBER: number;
     var NUMBER1: number[] = [1, 2];
     
     function foo(): number { return 1; }
     
     class A {
-        public a: number;
+        public a!: number;
         static foo() { return 1; }
     }
     namespace M {
-        export var n: number;
+        export declare var n: number;
     }
     
     var objA = new A();
diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.js b/tests/baselines/reference/logicalNotOperatorWithNumberType.js
index 513b10d0add6a..0242fa51fbec0 100644
--- a/tests/baselines/reference/logicalNotOperatorWithNumberType.js
+++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.js
@@ -2,17 +2,17 @@
 
 //// [logicalNotOperatorWithNumberType.ts]
 // ! operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
 
 function foo(): number { return 1; }
 
 class A {
-    public a: number;
+    public a!: number;
     static foo() { return 1; }
 }
 namespace M {
-    export var n: number;
+    export declare var n: number;
 }
 
 var objA = new A();
@@ -48,8 +48,6 @@ var ResultIsBoolean13 = !!!(NUMBER + NUMBER);
 !objA.a, M.n;
 
 //// [logicalNotOperatorWithNumberType.js]
-// ! operator on number type
-var NUMBER;
 var NUMBER1 = [1, 2];
 function foo() { return 1; }
 var A = /** @class */ (function () {
diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.symbols b/tests/baselines/reference/logicalNotOperatorWithNumberType.symbols
index b67517c14ae5b..a5b24f962bad5 100644
--- a/tests/baselines/reference/logicalNotOperatorWithNumberType.symbols
+++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.symbols
@@ -2,8 +2,8 @@
 
 === logicalNotOperatorWithNumberType.ts ===
 // ! operator on number type
-var NUMBER: number;
->NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 3))
+declare var NUMBER: number;
+>NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 11))
 
 var NUMBER1: number[] = [1, 2];
 >NUMBER1 : Symbol(NUMBER1, Decl(logicalNotOperatorWithNumberType.ts, 2, 3))
@@ -14,17 +14,17 @@ function foo(): number { return 1; }
 class A {
 >A : Symbol(A, Decl(logicalNotOperatorWithNumberType.ts, 4, 36))
 
-    public a: number;
+    public a!: number;
 >a : Symbol(A.a, Decl(logicalNotOperatorWithNumberType.ts, 6, 9))
 
     static foo() { return 1; }
->foo : Symbol(A.foo, Decl(logicalNotOperatorWithNumberType.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(logicalNotOperatorWithNumberType.ts, 7, 22))
 }
 namespace M {
 >M : Symbol(M, Decl(logicalNotOperatorWithNumberType.ts, 9, 1))
 
-    export var n: number;
->n : Symbol(n, Decl(logicalNotOperatorWithNumberType.ts, 11, 14))
+    export declare var n: number;
+>n : Symbol(n, Decl(logicalNotOperatorWithNumberType.ts, 11, 22))
 }
 
 var objA = new A();
@@ -34,7 +34,7 @@ var objA = new A();
 // number type var
 var ResultIsBoolean1 = !NUMBER;
 >ResultIsBoolean1 : Symbol(ResultIsBoolean1, Decl(logicalNotOperatorWithNumberType.ts, 17, 3))
->NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 11))
 
 var ResultIsBoolean2 = !NUMBER1;
 >ResultIsBoolean2 : Symbol(ResultIsBoolean2, Decl(logicalNotOperatorWithNumberType.ts, 18, 3))
@@ -65,9 +65,9 @@ var ResultIsBoolean6 = !objA.a;
 
 var ResultIsBoolean7 = !M.n;
 >ResultIsBoolean7 : Symbol(ResultIsBoolean7, Decl(logicalNotOperatorWithNumberType.ts, 27, 3))
->M.n : Symbol(M.n, Decl(logicalNotOperatorWithNumberType.ts, 11, 14))
+>M.n : Symbol(M.n, Decl(logicalNotOperatorWithNumberType.ts, 11, 22))
 >M : Symbol(M, Decl(logicalNotOperatorWithNumberType.ts, 9, 1))
->n : Symbol(M.n, Decl(logicalNotOperatorWithNumberType.ts, 11, 14))
+>n : Symbol(M.n, Decl(logicalNotOperatorWithNumberType.ts, 11, 22))
 
 var ResultIsBoolean8 = !NUMBER1[0];
 >ResultIsBoolean8 : Symbol(ResultIsBoolean8, Decl(logicalNotOperatorWithNumberType.ts, 28, 3))
@@ -79,29 +79,29 @@ var ResultIsBoolean9 = !foo();
 
 var ResultIsBoolean10 = !A.foo();
 >ResultIsBoolean10 : Symbol(ResultIsBoolean10, Decl(logicalNotOperatorWithNumberType.ts, 30, 3))
->A.foo : Symbol(A.foo, Decl(logicalNotOperatorWithNumberType.ts, 7, 21))
+>A.foo : Symbol(A.foo, Decl(logicalNotOperatorWithNumberType.ts, 7, 22))
 >A : Symbol(A, Decl(logicalNotOperatorWithNumberType.ts, 4, 36))
->foo : Symbol(A.foo, Decl(logicalNotOperatorWithNumberType.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(logicalNotOperatorWithNumberType.ts, 7, 22))
 
 var ResultIsBoolean11 = !(NUMBER + NUMBER);
 >ResultIsBoolean11 : Symbol(ResultIsBoolean11, Decl(logicalNotOperatorWithNumberType.ts, 31, 3))
->NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 3))
->NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 11))
+>NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 11))
 
 // multiple ! operator
 var ResultIsBoolean12 = !!NUMBER;
 >ResultIsBoolean12 : Symbol(ResultIsBoolean12, Decl(logicalNotOperatorWithNumberType.ts, 34, 3))
->NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 11))
 
 var ResultIsBoolean13 = !!!(NUMBER + NUMBER);
 >ResultIsBoolean13 : Symbol(ResultIsBoolean13, Decl(logicalNotOperatorWithNumberType.ts, 35, 3))
->NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 3))
->NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 11))
+>NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 11))
 
 // miss assignment operators
 !1;
 !NUMBER;
->NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(logicalNotOperatorWithNumberType.ts, 1, 11))
 
 !NUMBER1;
 >NUMBER1 : Symbol(NUMBER1, Decl(logicalNotOperatorWithNumberType.ts, 2, 3))
@@ -115,15 +115,15 @@ var ResultIsBoolean13 = !!!(NUMBER + NUMBER);
 >a : Symbol(A.a, Decl(logicalNotOperatorWithNumberType.ts, 6, 9))
 
 !M.n;
->M.n : Symbol(M.n, Decl(logicalNotOperatorWithNumberType.ts, 11, 14))
+>M.n : Symbol(M.n, Decl(logicalNotOperatorWithNumberType.ts, 11, 22))
 >M : Symbol(M, Decl(logicalNotOperatorWithNumberType.ts, 9, 1))
->n : Symbol(M.n, Decl(logicalNotOperatorWithNumberType.ts, 11, 14))
+>n : Symbol(M.n, Decl(logicalNotOperatorWithNumberType.ts, 11, 22))
 
 !objA.a, M.n;
 >objA.a : Symbol(A.a, Decl(logicalNotOperatorWithNumberType.ts, 6, 9))
 >objA : Symbol(objA, Decl(logicalNotOperatorWithNumberType.ts, 14, 3))
 >a : Symbol(A.a, Decl(logicalNotOperatorWithNumberType.ts, 6, 9))
->M.n : Symbol(M.n, Decl(logicalNotOperatorWithNumberType.ts, 11, 14))
+>M.n : Symbol(M.n, Decl(logicalNotOperatorWithNumberType.ts, 11, 22))
 >M : Symbol(M, Decl(logicalNotOperatorWithNumberType.ts, 9, 1))
->n : Symbol(M.n, Decl(logicalNotOperatorWithNumberType.ts, 11, 14))
+>n : Symbol(M.n, Decl(logicalNotOperatorWithNumberType.ts, 11, 22))
 
diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.types b/tests/baselines/reference/logicalNotOperatorWithNumberType.types
index f1f661e88a70c..f527de0112f65 100644
--- a/tests/baselines/reference/logicalNotOperatorWithNumberType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.types
@@ -2,7 +2,7 @@
 
 === logicalNotOperatorWithNumberType.ts ===
 // ! operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 >NUMBER : number
 >       : ^^^^^^
 
@@ -26,7 +26,7 @@ class A {
 >A : A
 >  : ^
 
-    public a: number;
+    public a!: number;
 >a : number
 >  : ^^^^^^
 
@@ -40,7 +40,7 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: number;
+    export declare var n: number;
 >n : number
 >  : ^^^^^^
 }
diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.errors.txt b/tests/baselines/reference/logicalNotOperatorWithStringType.errors.txt
index a03d7785b3b69..55190b5507138 100644
--- a/tests/baselines/reference/logicalNotOperatorWithStringType.errors.txt
+++ b/tests/baselines/reference/logicalNotOperatorWithStringType.errors.txt
@@ -7,17 +7,17 @@ logicalNotOperatorWithStringType.ts(44,1): error TS2695: Left side of comma oper
 
 ==== logicalNotOperatorWithStringType.ts (5 errors) ====
     // ! operator on string type
-    var STRING: string;
+    declare var STRING: string;
     var STRING1: string[] = ["", "abc"];
     
     function foo(): string { return "abc"; }
     
     class A {
-        public a: string;
+        public a!: string;
         static foo() { return ""; }
     }
     namespace M {
-        export var n: string;
+        export declare var n: string;
     }
     
     var objA = new A();
diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.js b/tests/baselines/reference/logicalNotOperatorWithStringType.js
index a958ace014f5f..b40db09e300a0 100644
--- a/tests/baselines/reference/logicalNotOperatorWithStringType.js
+++ b/tests/baselines/reference/logicalNotOperatorWithStringType.js
@@ -2,17 +2,17 @@
 
 //// [logicalNotOperatorWithStringType.ts]
 // ! operator on string type
-var STRING: string;
+declare var STRING: string;
 var STRING1: string[] = ["", "abc"];
 
 function foo(): string { return "abc"; }
 
 class A {
-    public a: string;
+    public a!: string;
     static foo() { return ""; }
 }
 namespace M {
-    export var n: string;
+    export declare var n: string;
 }
 
 var objA = new A();
@@ -47,8 +47,6 @@ var ResultIsBoolean14 = !!!(STRING + STRING);
 !objA.a,M.n;
 
 //// [logicalNotOperatorWithStringType.js]
-// ! operator on string type
-var STRING;
 var STRING1 = ["", "abc"];
 function foo() { return "abc"; }
 var A = /** @class */ (function () {
diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.symbols b/tests/baselines/reference/logicalNotOperatorWithStringType.symbols
index 0c4d3f3141fba..f70a944afc1ff 100644
--- a/tests/baselines/reference/logicalNotOperatorWithStringType.symbols
+++ b/tests/baselines/reference/logicalNotOperatorWithStringType.symbols
@@ -2,8 +2,8 @@
 
 === logicalNotOperatorWithStringType.ts ===
 // ! operator on string type
-var STRING: string;
->STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 3))
+declare var STRING: string;
+>STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 11))
 
 var STRING1: string[] = ["", "abc"];
 >STRING1 : Symbol(STRING1, Decl(logicalNotOperatorWithStringType.ts, 2, 3))
@@ -14,17 +14,17 @@ function foo(): string { return "abc"; }
 class A {
 >A : Symbol(A, Decl(logicalNotOperatorWithStringType.ts, 4, 40))
 
-    public a: string;
+    public a!: string;
 >a : Symbol(A.a, Decl(logicalNotOperatorWithStringType.ts, 6, 9))
 
     static foo() { return ""; }
->foo : Symbol(A.foo, Decl(logicalNotOperatorWithStringType.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(logicalNotOperatorWithStringType.ts, 7, 22))
 }
 namespace M {
 >M : Symbol(M, Decl(logicalNotOperatorWithStringType.ts, 9, 1))
 
-    export var n: string;
->n : Symbol(n, Decl(logicalNotOperatorWithStringType.ts, 11, 14))
+    export declare var n: string;
+>n : Symbol(n, Decl(logicalNotOperatorWithStringType.ts, 11, 22))
 }
 
 var objA = new A();
@@ -34,7 +34,7 @@ var objA = new A();
 // string type var
 var ResultIsBoolean1 = !STRING;
 >ResultIsBoolean1 : Symbol(ResultIsBoolean1, Decl(logicalNotOperatorWithStringType.ts, 17, 3))
->STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 11))
 
 var ResultIsBoolean2 = !STRING1;
 >ResultIsBoolean2 : Symbol(ResultIsBoolean2, Decl(logicalNotOperatorWithStringType.ts, 18, 3))
@@ -65,9 +65,9 @@ var ResultIsBoolean6 = !objA.a;
 
 var ResultIsBoolean7 = !M.n;
 >ResultIsBoolean7 : Symbol(ResultIsBoolean7, Decl(logicalNotOperatorWithStringType.ts, 27, 3))
->M.n : Symbol(M.n, Decl(logicalNotOperatorWithStringType.ts, 11, 14))
+>M.n : Symbol(M.n, Decl(logicalNotOperatorWithStringType.ts, 11, 22))
 >M : Symbol(M, Decl(logicalNotOperatorWithStringType.ts, 9, 1))
->n : Symbol(M.n, Decl(logicalNotOperatorWithStringType.ts, 11, 14))
+>n : Symbol(M.n, Decl(logicalNotOperatorWithStringType.ts, 11, 22))
 
 var ResultIsBoolean8 = !STRING1[0];
 >ResultIsBoolean8 : Symbol(ResultIsBoolean8, Decl(logicalNotOperatorWithStringType.ts, 28, 3))
@@ -79,35 +79,35 @@ var ResultIsBoolean9 = !foo();
 
 var ResultIsBoolean10 = !A.foo();
 >ResultIsBoolean10 : Symbol(ResultIsBoolean10, Decl(logicalNotOperatorWithStringType.ts, 30, 3))
->A.foo : Symbol(A.foo, Decl(logicalNotOperatorWithStringType.ts, 7, 21))
+>A.foo : Symbol(A.foo, Decl(logicalNotOperatorWithStringType.ts, 7, 22))
 >A : Symbol(A, Decl(logicalNotOperatorWithStringType.ts, 4, 40))
->foo : Symbol(A.foo, Decl(logicalNotOperatorWithStringType.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(logicalNotOperatorWithStringType.ts, 7, 22))
 
 var ResultIsBoolean11 = !(STRING + STRING);
 >ResultIsBoolean11 : Symbol(ResultIsBoolean11, Decl(logicalNotOperatorWithStringType.ts, 31, 3))
->STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 3))
->STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 11))
+>STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 11))
 
 var ResultIsBoolean12 = !STRING.charAt(0);
 >ResultIsBoolean12 : Symbol(ResultIsBoolean12, Decl(logicalNotOperatorWithStringType.ts, 32, 3))
 >STRING.charAt : Symbol(String.charAt, Decl(lib.es5.d.ts, --, --))
->STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 11))
 >charAt : Symbol(String.charAt, Decl(lib.es5.d.ts, --, --))
 
 // multiple ! operator
 var ResultIsBoolean13 = !!STRING;
 >ResultIsBoolean13 : Symbol(ResultIsBoolean13, Decl(logicalNotOperatorWithStringType.ts, 35, 3))
->STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 11))
 
 var ResultIsBoolean14 = !!!(STRING + STRING);
 >ResultIsBoolean14 : Symbol(ResultIsBoolean14, Decl(logicalNotOperatorWithStringType.ts, 36, 3))
->STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 3))
->STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 11))
+>STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 11))
 
 // miss assignment operators
 !"";
 !STRING;
->STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(logicalNotOperatorWithStringType.ts, 1, 11))
 
 !STRING1;
 >STRING1 : Symbol(STRING1, Decl(logicalNotOperatorWithStringType.ts, 2, 3))
@@ -119,7 +119,7 @@ var ResultIsBoolean14 = !!!(STRING + STRING);
 >objA.a : Symbol(A.a, Decl(logicalNotOperatorWithStringType.ts, 6, 9))
 >objA : Symbol(objA, Decl(logicalNotOperatorWithStringType.ts, 14, 3))
 >a : Symbol(A.a, Decl(logicalNotOperatorWithStringType.ts, 6, 9))
->M.n : Symbol(M.n, Decl(logicalNotOperatorWithStringType.ts, 11, 14))
+>M.n : Symbol(M.n, Decl(logicalNotOperatorWithStringType.ts, 11, 22))
 >M : Symbol(M, Decl(logicalNotOperatorWithStringType.ts, 9, 1))
->n : Symbol(M.n, Decl(logicalNotOperatorWithStringType.ts, 11, 14))
+>n : Symbol(M.n, Decl(logicalNotOperatorWithStringType.ts, 11, 22))
 
diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.types b/tests/baselines/reference/logicalNotOperatorWithStringType.types
index 833ff05adc6f9..4089937448771 100644
--- a/tests/baselines/reference/logicalNotOperatorWithStringType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithStringType.types
@@ -2,7 +2,7 @@
 
 === logicalNotOperatorWithStringType.ts ===
 // ! operator on string type
-var STRING: string;
+declare var STRING: string;
 >STRING : string
 >       : ^^^^^^
 
@@ -26,7 +26,7 @@ class A {
 >A : A
 >  : ^
 
-    public a: string;
+    public a!: string;
 >a : string
 >  : ^^^^^^
 
@@ -40,7 +40,7 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: string;
+    export declare var n: string;
 >n : string
 >  : ^^^^^^
 }
diff --git a/tests/baselines/reference/logicalOrOperatorWithEveryType.errors.txt b/tests/baselines/reference/logicalOrOperatorWithEveryType.errors.txt
index 86b419f8e4a9f..f51d8cce31fad 100644
--- a/tests/baselines/reference/logicalOrOperatorWithEveryType.errors.txt
+++ b/tests/baselines/reference/logicalOrOperatorWithEveryType.errors.txt
@@ -39,13 +39,13 @@ logicalOrOperatorWithEveryType.ts(125,12): error TS2873: This kind of expression
     enum E { a, b, c }
     
     var a1: any;
-    var a2: boolean;
-    var a3: number
-    var a4: string;
-    var a5: void;
-    var a6: E;
-    var a7: {a: string};
-    var a8: string[];
+    declare var a2: boolean;
+    declare var a3: number;
+    declare var a4: string;
+    declare var a5: void;
+    declare var a6: E;
+    declare var a7: {a: string};
+    declare var a8: string[];
     
     var ra1 = a1 || a1;         // any       || any is any
     var ra2 = a2 || a1;         // boolean   || any is any
diff --git a/tests/baselines/reference/logicalOrOperatorWithEveryType.js b/tests/baselines/reference/logicalOrOperatorWithEveryType.js
index be589fa0554c8..8cc3a145693b8 100644
--- a/tests/baselines/reference/logicalOrOperatorWithEveryType.js
+++ b/tests/baselines/reference/logicalOrOperatorWithEveryType.js
@@ -9,13 +9,13 @@
 enum E { a, b, c }
 
 var a1: any;
-var a2: boolean;
-var a3: number
-var a4: string;
-var a5: void;
-var a6: E;
-var a7: {a: string};
-var a8: string[];
+declare var a2: boolean;
+declare var a3: number;
+declare var a4: string;
+declare var a5: void;
+declare var a6: E;
+declare var a7: {a: string};
+declare var a8: string[];
 
 var ra1 = a1 || a1;         // any       || any is any
 var ra2 = a2 || a1;         // boolean   || any is any
@@ -139,13 +139,6 @@ var E;
     E[E["c"] = 2] = "c";
 })(E || (E = {}));
 var a1;
-var a2;
-var a3;
-var a4;
-var a5;
-var a6;
-var a7;
-var a8;
 var ra1 = a1 || a1; // any       || any is any
 var ra2 = a2 || a1; // boolean   || any is any
 var ra3 = a3 || a1; // number    || any is any
diff --git a/tests/baselines/reference/logicalOrOperatorWithEveryType.symbols b/tests/baselines/reference/logicalOrOperatorWithEveryType.symbols
index a90da3f14adbd..9ac758ace4b80 100644
--- a/tests/baselines/reference/logicalOrOperatorWithEveryType.symbols
+++ b/tests/baselines/reference/logicalOrOperatorWithEveryType.symbols
@@ -15,28 +15,28 @@ enum E { a, b, c }
 var a1: any;
 >a1 : Symbol(a1, Decl(logicalOrOperatorWithEveryType.ts, 7, 3))
 
-var a2: boolean;
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
+declare var a2: boolean;
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
 
-var a3: number
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
+declare var a3: number;
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
 
-var a4: string;
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
+declare var a4: string;
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
 
-var a5: void;
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
+declare var a5: void;
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
 
-var a6: E;
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
+declare var a6: E;
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
 >E : Symbol(E, Decl(logicalOrOperatorWithEveryType.ts, 0, 0))
 
-var a7: {a: string};
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
->a : Symbol(a, Decl(logicalOrOperatorWithEveryType.ts, 13, 9))
+declare var a7: {a: string};
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
+>a : Symbol(a, Decl(logicalOrOperatorWithEveryType.ts, 13, 17))
 
-var a8: string[];
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
+declare var a8: string[];
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
 
 var ra1 = a1 || a1;         // any       || any is any
 >ra1 : Symbol(ra1, Decl(logicalOrOperatorWithEveryType.ts, 16, 3))
@@ -45,37 +45,37 @@ var ra1 = a1 || a1;         // any       || any is any
 
 var ra2 = a2 || a1;         // boolean   || any is any
 >ra2 : Symbol(ra2, Decl(logicalOrOperatorWithEveryType.ts, 17, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
 >a1 : Symbol(a1, Decl(logicalOrOperatorWithEveryType.ts, 7, 3))
 
 var ra3 = a3 || a1;         // number    || any is any
 >ra3 : Symbol(ra3, Decl(logicalOrOperatorWithEveryType.ts, 18, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
 >a1 : Symbol(a1, Decl(logicalOrOperatorWithEveryType.ts, 7, 3))
 
 var ra4 = a4 || a1;         // string    || any is any
 >ra4 : Symbol(ra4, Decl(logicalOrOperatorWithEveryType.ts, 19, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
 >a1 : Symbol(a1, Decl(logicalOrOperatorWithEveryType.ts, 7, 3))
 
 var ra5 = a5 || a1;         // void      || any is any
 >ra5 : Symbol(ra5, Decl(logicalOrOperatorWithEveryType.ts, 20, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
 >a1 : Symbol(a1, Decl(logicalOrOperatorWithEveryType.ts, 7, 3))
 
 var ra6 = a6 || a1;         // enum      || any is any
 >ra6 : Symbol(ra6, Decl(logicalOrOperatorWithEveryType.ts, 21, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
 >a1 : Symbol(a1, Decl(logicalOrOperatorWithEveryType.ts, 7, 3))
 
 var ra7 = a7 || a1;         // object    || any is any
 >ra7 : Symbol(ra7, Decl(logicalOrOperatorWithEveryType.ts, 22, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
 >a1 : Symbol(a1, Decl(logicalOrOperatorWithEveryType.ts, 7, 3))
 
 var ra8 = a8 || a1;         // array     || any is any
 >ra8 : Symbol(ra8, Decl(logicalOrOperatorWithEveryType.ts, 23, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
 >a1 : Symbol(a1, Decl(logicalOrOperatorWithEveryType.ts, 7, 3))
 
 var ra9 = null || a1;       // null      || any is any
@@ -90,345 +90,345 @@ var ra10 = undefined || a1; // undefined || any is any
 var rb1 = a1 || a2;         // any       || boolean is any
 >rb1 : Symbol(rb1, Decl(logicalOrOperatorWithEveryType.ts, 27, 3))
 >a1 : Symbol(a1, Decl(logicalOrOperatorWithEveryType.ts, 7, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
 
 var rb2 = a2 || a2;         // boolean   || boolean is boolean
 >rb2 : Symbol(rb2, Decl(logicalOrOperatorWithEveryType.ts, 28, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
 
 var rb3 = a3 || a2;         // number    || boolean is number | boolean
 >rb3 : Symbol(rb3, Decl(logicalOrOperatorWithEveryType.ts, 29, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
 
 var rb4 = a4 || a2;         // string    || boolean is string | boolean
 >rb4 : Symbol(rb4, Decl(logicalOrOperatorWithEveryType.ts, 30, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
 
 var rb5 = a5 || a2;         // void      || boolean is void | boolean
 >rb5 : Symbol(rb5, Decl(logicalOrOperatorWithEveryType.ts, 31, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
 
 var rb6 = a6 || a2;         // enum      || boolean is E | boolean
 >rb6 : Symbol(rb6, Decl(logicalOrOperatorWithEveryType.ts, 32, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
 
 var rb7 = a7 || a2;         // object    || boolean is object | boolean
 >rb7 : Symbol(rb7, Decl(logicalOrOperatorWithEveryType.ts, 33, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
 
 var rb8 = a8 || a2;         // array     || boolean is array | boolean
 >rb8 : Symbol(rb8, Decl(logicalOrOperatorWithEveryType.ts, 34, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
 
 var rb9 = null || a2;       // null      || boolean is boolean
 >rb9 : Symbol(rb9, Decl(logicalOrOperatorWithEveryType.ts, 35, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
 
 var rb10= undefined || a2;  // undefined || boolean is boolean
 >rb10 : Symbol(rb10, Decl(logicalOrOperatorWithEveryType.ts, 36, 3))
 >undefined : Symbol(undefined)
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
 
 var rc1 = a1 || a3;         // any       || number is any
 >rc1 : Symbol(rc1, Decl(logicalOrOperatorWithEveryType.ts, 38, 3))
 >a1 : Symbol(a1, Decl(logicalOrOperatorWithEveryType.ts, 7, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
 
 var rc2 = a2 || a3;         // boolean   || number is boolean | number
 >rc2 : Symbol(rc2, Decl(logicalOrOperatorWithEveryType.ts, 39, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
 
 var rc3 = a3 || a3;         // number    || number is number
 >rc3 : Symbol(rc3, Decl(logicalOrOperatorWithEveryType.ts, 40, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
 
 var rc4 = a4 || a3;         // string    || number is string | number
 >rc4 : Symbol(rc4, Decl(logicalOrOperatorWithEveryType.ts, 41, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
 
 var rc5 = a5 || a3;         // void      || number is void | number
 >rc5 : Symbol(rc5, Decl(logicalOrOperatorWithEveryType.ts, 42, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
 
 var rc6 = a6 || a3;         // enum      || number is number
 >rc6 : Symbol(rc6, Decl(logicalOrOperatorWithEveryType.ts, 43, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
 
 var rc7 = a7 || a3;         // object    || number is object | number
 >rc7 : Symbol(rc7, Decl(logicalOrOperatorWithEveryType.ts, 44, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
 
 var rc8 = a8 || a3;         // array     || number is array | number
 >rc8 : Symbol(rc8, Decl(logicalOrOperatorWithEveryType.ts, 45, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
 
 var rc9 = null || a3;       // null      || number is number
 >rc9 : Symbol(rc9, Decl(logicalOrOperatorWithEveryType.ts, 46, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
 
 var rc10 = undefined || a3; // undefined || number is number
 >rc10 : Symbol(rc10, Decl(logicalOrOperatorWithEveryType.ts, 47, 3))
 >undefined : Symbol(undefined)
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
 
 var rd1 = a1 || a4;         // any       || string is any
 >rd1 : Symbol(rd1, Decl(logicalOrOperatorWithEveryType.ts, 49, 3))
 >a1 : Symbol(a1, Decl(logicalOrOperatorWithEveryType.ts, 7, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
 
 var rd2 = a2 || a4;         // boolean   || string is boolean | string
 >rd2 : Symbol(rd2, Decl(logicalOrOperatorWithEveryType.ts, 50, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
 
 var rd3 = a3 || a4;         // number    || string is number | string
 >rd3 : Symbol(rd3, Decl(logicalOrOperatorWithEveryType.ts, 51, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
 
 var rd4 = a4 || a4;         // string    || string is string
 >rd4 : Symbol(rd4, Decl(logicalOrOperatorWithEveryType.ts, 52, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
 
 var rd5 = a5 || a4;         // void      || string is void | string
 >rd5 : Symbol(rd5, Decl(logicalOrOperatorWithEveryType.ts, 53, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
 
 var rd6 = a6 || a4;         // enum      || string is enum | string
 >rd6 : Symbol(rd6, Decl(logicalOrOperatorWithEveryType.ts, 54, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
 
 var rd7 = a7 || a4;         // object    || string is object | string
 >rd7 : Symbol(rd7, Decl(logicalOrOperatorWithEveryType.ts, 55, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
 
 var rd8 = a8 || a4;         // array     || string is array | string
 >rd8 : Symbol(rd8, Decl(logicalOrOperatorWithEveryType.ts, 56, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
 
 var rd9 = null || a4;       // null      || string is string
 >rd9 : Symbol(rd9, Decl(logicalOrOperatorWithEveryType.ts, 57, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
 
 var rd10 = undefined || a4; // undefined || string is string
 >rd10 : Symbol(rd10, Decl(logicalOrOperatorWithEveryType.ts, 58, 3))
 >undefined : Symbol(undefined)
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
 
 var re1 = a1 || a5;         // any       || void is any
 >re1 : Symbol(re1, Decl(logicalOrOperatorWithEveryType.ts, 60, 3))
 >a1 : Symbol(a1, Decl(logicalOrOperatorWithEveryType.ts, 7, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
 
 var re2 = a2 || a5;         // boolean   || void is boolean | void
 >re2 : Symbol(re2, Decl(logicalOrOperatorWithEveryType.ts, 61, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
 
 var re3 = a3 || a5;         // number    || void is number | void
 >re3 : Symbol(re3, Decl(logicalOrOperatorWithEveryType.ts, 62, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
 
 var re4 = a4 || a5;         // string    || void is string | void
 >re4 : Symbol(re4, Decl(logicalOrOperatorWithEveryType.ts, 63, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
 
 var re5 = a5 || a5;         // void      || void is void
 >re5 : Symbol(re5, Decl(logicalOrOperatorWithEveryType.ts, 64, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
 
 var re6 = a6 || a5;         // enum      || void is enum | void
 >re6 : Symbol(re6, Decl(logicalOrOperatorWithEveryType.ts, 65, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
 
 var re7 = a7 || a5;         // object    || void is object | void
 >re7 : Symbol(re7, Decl(logicalOrOperatorWithEveryType.ts, 66, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
 
 var re8 = a8 || a5;         // array     || void is array | void
 >re8 : Symbol(re8, Decl(logicalOrOperatorWithEveryType.ts, 67, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
 
 var re9 = null || a5;       // null      || void is void
 >re9 : Symbol(re9, Decl(logicalOrOperatorWithEveryType.ts, 68, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
 
 var re10 = undefined || a5; // undefined || void is void
 >re10 : Symbol(re10, Decl(logicalOrOperatorWithEveryType.ts, 69, 3))
 >undefined : Symbol(undefined)
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
 
 var rg1 = a1 || a6;         // any       || enum is any
 >rg1 : Symbol(rg1, Decl(logicalOrOperatorWithEveryType.ts, 71, 3))
 >a1 : Symbol(a1, Decl(logicalOrOperatorWithEveryType.ts, 7, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
 
 var rg2 = a2 || a6;         // boolean   || enum is boolean | enum
 >rg2 : Symbol(rg2, Decl(logicalOrOperatorWithEveryType.ts, 72, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
 
 var rg3 = a3 || a6;         // number    || enum is number
 >rg3 : Symbol(rg3, Decl(logicalOrOperatorWithEveryType.ts, 73, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
 
 var rg4 = a4 || a6;         // string    || enum is string | enum
 >rg4 : Symbol(rg4, Decl(logicalOrOperatorWithEveryType.ts, 74, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
 
 var rg5 = a5 || a6;         // void      || enum is void | enum
 >rg5 : Symbol(rg5, Decl(logicalOrOperatorWithEveryType.ts, 75, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
 
 var rg6 = a6 || a6;         // enum      || enum is E
 >rg6 : Symbol(rg6, Decl(logicalOrOperatorWithEveryType.ts, 76, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
 
 var rg7 = a7 || a6;         // object    || enum is object | enum
 >rg7 : Symbol(rg7, Decl(logicalOrOperatorWithEveryType.ts, 77, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
 
 var rg8 = a8 || a6;         // array     || enum is array | enum
 >rg8 : Symbol(rg8, Decl(logicalOrOperatorWithEveryType.ts, 78, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
 
 var rg9 = null || a6;       // null      || enum is E
 >rg9 : Symbol(rg9, Decl(logicalOrOperatorWithEveryType.ts, 79, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
 
 var rg10 = undefined || a6; // undefined || enum is E
 >rg10 : Symbol(rg10, Decl(logicalOrOperatorWithEveryType.ts, 80, 3))
 >undefined : Symbol(undefined)
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
 
 var rh1 = a1 || a7;         // any       || object is any
 >rh1 : Symbol(rh1, Decl(logicalOrOperatorWithEveryType.ts, 82, 3))
 >a1 : Symbol(a1, Decl(logicalOrOperatorWithEveryType.ts, 7, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
 
 var rh2 = a2 || a7;         // boolean   || object is boolean | object
 >rh2 : Symbol(rh2, Decl(logicalOrOperatorWithEveryType.ts, 83, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
 
 var rh3 = a3 || a7;         // number    || object is number | object
 >rh3 : Symbol(rh3, Decl(logicalOrOperatorWithEveryType.ts, 84, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
 
 var rh4 = a4 || a7;         // string    || object is string | object
 >rh4 : Symbol(rh4, Decl(logicalOrOperatorWithEveryType.ts, 85, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
 
 var rh5 = a5 || a7;         // void      || object is void | object
 >rh5 : Symbol(rh5, Decl(logicalOrOperatorWithEveryType.ts, 86, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
 
 var rh6 = a6 || a7;         // enum      || object is enum | object
 >rh6 : Symbol(rh6, Decl(logicalOrOperatorWithEveryType.ts, 87, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
 
 var rh7 = a7 || a7;         // object    || object is object
 >rh7 : Symbol(rh7, Decl(logicalOrOperatorWithEveryType.ts, 88, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
 
 var rh8 = a8 || a7;         // array     || object is array | object
 >rh8 : Symbol(rh8, Decl(logicalOrOperatorWithEveryType.ts, 89, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
 
 var rh9 = null || a7;       // null      || object is object
 >rh9 : Symbol(rh9, Decl(logicalOrOperatorWithEveryType.ts, 90, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
 
 var rh10 = undefined || a7; // undefined || object is object
 >rh10 : Symbol(rh10, Decl(logicalOrOperatorWithEveryType.ts, 91, 3))
 >undefined : Symbol(undefined)
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
 
 var ri1 = a1 || a8;         // any       || array is any
 >ri1 : Symbol(ri1, Decl(logicalOrOperatorWithEveryType.ts, 93, 3))
 >a1 : Symbol(a1, Decl(logicalOrOperatorWithEveryType.ts, 7, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
 
 var ri2 = a2 || a8;         // boolean   || array is boolean | array
 >ri2 : Symbol(ri2, Decl(logicalOrOperatorWithEveryType.ts, 94, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
 
 var ri3 = a3 || a8;         // number    || array is number | array
 >ri3 : Symbol(ri3, Decl(logicalOrOperatorWithEveryType.ts, 95, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
 
 var ri4 = a4 || a8;         // string    || array is string | array
 >ri4 : Symbol(ri4, Decl(logicalOrOperatorWithEveryType.ts, 96, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
 
 var ri5 = a5 || a8;         // void      || array is void | array
 >ri5 : Symbol(ri5, Decl(logicalOrOperatorWithEveryType.ts, 97, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
 
 var ri6 = a6 || a8;         // enum      || array is enum | array
 >ri6 : Symbol(ri6, Decl(logicalOrOperatorWithEveryType.ts, 98, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
 
 var ri7 = a7 || a8;         // object    || array is object | array
 >ri7 : Symbol(ri7, Decl(logicalOrOperatorWithEveryType.ts, 99, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
 
 var ri8 = a8 || a8;         // array     || array is array
 >ri8 : Symbol(ri8, Decl(logicalOrOperatorWithEveryType.ts, 100, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
 
 var ri9 = null || a8;       // null      || array is array
 >ri9 : Symbol(ri9, Decl(logicalOrOperatorWithEveryType.ts, 101, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
 
 var ri10 = undefined || a8; // undefined || array is array
 >ri10 : Symbol(ri10, Decl(logicalOrOperatorWithEveryType.ts, 102, 3))
 >undefined : Symbol(undefined)
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
 
 var rj1 = a1 || null;         // any       || null is any
 >rj1 : Symbol(rj1, Decl(logicalOrOperatorWithEveryType.ts, 104, 3))
@@ -436,31 +436,31 @@ var rj1 = a1 || null;         // any       || null is any
 
 var rj2 = a2 || null;         // boolean   || null is boolean
 >rj2 : Symbol(rj2, Decl(logicalOrOperatorWithEveryType.ts, 105, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
 
 var rj3 = a3 || null;         // number    || null is number
 >rj3 : Symbol(rj3, Decl(logicalOrOperatorWithEveryType.ts, 106, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
 
 var rj4 = a4 || null;         // string    || null is string
 >rj4 : Symbol(rj4, Decl(logicalOrOperatorWithEveryType.ts, 107, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
 
 var rj5 = a5 || null;         // void      || null is void
 >rj5 : Symbol(rj5, Decl(logicalOrOperatorWithEveryType.ts, 108, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
 
 var rj6 = a6 || null;         // enum      || null is E
 >rj6 : Symbol(rj6, Decl(logicalOrOperatorWithEveryType.ts, 109, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
 
 var rj7 = a7 || null;         // object    || null is object
 >rj7 : Symbol(rj7, Decl(logicalOrOperatorWithEveryType.ts, 110, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
 
 var rj8 = a8 || null;         // array     || null is array
 >rj8 : Symbol(rj8, Decl(logicalOrOperatorWithEveryType.ts, 111, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
 
 var rj9 = null || null;       // null      || null is any
 >rj9 : Symbol(rj9, Decl(logicalOrOperatorWithEveryType.ts, 112, 3))
@@ -476,37 +476,37 @@ var rf1 = a1 || undefined;         // any       || undefined is any
 
 var rf2 = a2 || undefined;         // boolean   || undefined is boolean
 >rf2 : Symbol(rf2, Decl(logicalOrOperatorWithEveryType.ts, 116, 3))
->a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 3))
+>a2 : Symbol(a2, Decl(logicalOrOperatorWithEveryType.ts, 8, 11))
 >undefined : Symbol(undefined)
 
 var rf3 = a3 || undefined;         // number    || undefined is number
 >rf3 : Symbol(rf3, Decl(logicalOrOperatorWithEveryType.ts, 117, 3))
->a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 3))
+>a3 : Symbol(a3, Decl(logicalOrOperatorWithEveryType.ts, 9, 11))
 >undefined : Symbol(undefined)
 
 var rf4 = a4 || undefined;         // string    || undefined is string
 >rf4 : Symbol(rf4, Decl(logicalOrOperatorWithEveryType.ts, 118, 3))
->a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 3))
+>a4 : Symbol(a4, Decl(logicalOrOperatorWithEveryType.ts, 10, 11))
 >undefined : Symbol(undefined)
 
 var rf5 = a5 || undefined;         // void      || undefined is void
 >rf5 : Symbol(rf5, Decl(logicalOrOperatorWithEveryType.ts, 119, 3))
->a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 3))
+>a5 : Symbol(a5, Decl(logicalOrOperatorWithEveryType.ts, 11, 11))
 >undefined : Symbol(undefined)
 
 var rf6 = a6 || undefined;         // enum      || undefined is E
 >rf6 : Symbol(rf6, Decl(logicalOrOperatorWithEveryType.ts, 120, 3))
->a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 3))
+>a6 : Symbol(a6, Decl(logicalOrOperatorWithEveryType.ts, 12, 11))
 >undefined : Symbol(undefined)
 
 var rf7 = a7 || undefined;         // object    || undefined is object
 >rf7 : Symbol(rf7, Decl(logicalOrOperatorWithEveryType.ts, 121, 3))
->a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 3))
+>a7 : Symbol(a7, Decl(logicalOrOperatorWithEveryType.ts, 13, 11))
 >undefined : Symbol(undefined)
 
 var rf8 = a8 || undefined;         // array     || undefined is array
 >rf8 : Symbol(rf8, Decl(logicalOrOperatorWithEveryType.ts, 122, 3))
->a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 3))
+>a8 : Symbol(a8, Decl(logicalOrOperatorWithEveryType.ts, 14, 11))
 >undefined : Symbol(undefined)
 
 var rf9 = null || undefined;       // null      || undefined is any
diff --git a/tests/baselines/reference/logicalOrOperatorWithEveryType.types b/tests/baselines/reference/logicalOrOperatorWithEveryType.types
index bc39f9219c7c0..9f8e09559e89a 100644
--- a/tests/baselines/reference/logicalOrOperatorWithEveryType.types
+++ b/tests/baselines/reference/logicalOrOperatorWithEveryType.types
@@ -20,33 +20,33 @@ var a1: any;
 >a1 : any
 >   : ^^^
 
-var a2: boolean;
+declare var a2: boolean;
 >a2 : boolean
 >   : ^^^^^^^
 
-var a3: number
+declare var a3: number;
 >a3 : number
 >   : ^^^^^^
 
-var a4: string;
+declare var a4: string;
 >a4 : string
 >   : ^^^^^^
 
-var a5: void;
+declare var a5: void;
 >a5 : void
 >   : ^^^^
 
-var a6: E;
+declare var a6: E;
 >a6 : E
 >   : ^
 
-var a7: {a: string};
+declare var a7: {a: string};
 >a7 : { a: string; }
 >   : ^^^^^      ^^^
 >a : string
 >  : ^^^^^^
 
-var a8: string[];
+declare var a8: string[];
 >a8 : string[]
 >   : ^^^^^^^^
 
diff --git a/tests/baselines/reference/looseThisTypeInFunctions.errors.txt b/tests/baselines/reference/looseThisTypeInFunctions.errors.txt
index d5a7ed58fb7c3..192093aa9c635 100644
--- a/tests/baselines/reference/looseThisTypeInFunctions.errors.txt
+++ b/tests/baselines/reference/looseThisTypeInFunctions.errors.txt
@@ -16,7 +16,7 @@ looseThisTypeInFunctions.ts(46,20): error TS2339: Property 'length' does not exi
         implicitNoThis(m: number): number;
     }
     class C implements I {
-        n: number;
+        n!: number;
         explicitThis(this: this, m: number): number {
             return this.n + m;
         }
@@ -55,7 +55,7 @@ looseThisTypeInFunctions.ts(46,20): error TS2339: Property 'length' does not exi
     let n = x(12); // callee:void doesn't match this:I
             ~~~~~
 !!! error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'I'.
-    let u: Unused;
+    declare let u: Unused;
     let y = u.implicitNoThis;
     n = y(12); // ok, callee:void matches this:any
     c.explicitVoid = c.implicitThis // ok, implicitThis(this:any)
diff --git a/tests/baselines/reference/looseThisTypeInFunctions.js b/tests/baselines/reference/looseThisTypeInFunctions.js
index b738556f05bcc..951c6234841db 100644
--- a/tests/baselines/reference/looseThisTypeInFunctions.js
+++ b/tests/baselines/reference/looseThisTypeInFunctions.js
@@ -9,7 +9,7 @@ interface Unused {
     implicitNoThis(m: number): number;
 }
 class C implements I {
-    n: number;
+    n!: number;
     explicitThis(this: this, m: number): number {
         return this.n + m;
     }
@@ -38,7 +38,7 @@ let o2: I = {
 }
 let x = i.explicitThis;
 let n = x(12); // callee:void doesn't match this:I
-let u: Unused;
+declare let u: Unused;
 let y = u.implicitNoThis;
 n = y(12); // ok, callee:void matches this:any
 c.explicitVoid = c.implicitThis // ok, implicitThis(this:any)
@@ -83,7 +83,6 @@ var o2 = {
 };
 var x = i.explicitThis;
 var n = x(12); // callee:void doesn't match this:I
-var u;
 var y = u.implicitNoThis;
 n = y(12); // ok, callee:void matches this:any
 c.explicitVoid = c.implicitThis; // ok, implicitThis(this:any)
diff --git a/tests/baselines/reference/looseThisTypeInFunctions.symbols b/tests/baselines/reference/looseThisTypeInFunctions.symbols
index 44de155a8886c..304596e60ff7c 100644
--- a/tests/baselines/reference/looseThisTypeInFunctions.symbols
+++ b/tests/baselines/reference/looseThisTypeInFunctions.symbols
@@ -23,11 +23,11 @@ class C implements I {
 >C : Symbol(C, Decl(looseThisTypeInFunctions.ts, 6, 1))
 >I : Symbol(I, Decl(looseThisTypeInFunctions.ts, 0, 0))
 
-    n: number;
+    n!: number;
 >n : Symbol(C.n, Decl(looseThisTypeInFunctions.ts, 7, 22))
 
     explicitThis(this: this, m: number): number {
->explicitThis : Symbol(C.explicitThis, Decl(looseThisTypeInFunctions.ts, 8, 14))
+>explicitThis : Symbol(C.explicitThis, Decl(looseThisTypeInFunctions.ts, 8, 15))
 >this : Symbol(this, Decl(looseThisTypeInFunctions.ts, 9, 17))
 >m : Symbol(m, Decl(looseThisTypeInFunctions.ts, 9, 28))
 
@@ -64,9 +64,9 @@ c.explicitVoid = c.explicitThis; // error, 'void' is missing everything
 >c.explicitVoid : Symbol(C.explicitVoid, Decl(looseThisTypeInFunctions.ts, 14, 5))
 >c : Symbol(c, Decl(looseThisTypeInFunctions.ts, 19, 3))
 >explicitVoid : Symbol(C.explicitVoid, Decl(looseThisTypeInFunctions.ts, 14, 5))
->c.explicitThis : Symbol(C.explicitThis, Decl(looseThisTypeInFunctions.ts, 8, 14))
+>c.explicitThis : Symbol(C.explicitThis, Decl(looseThisTypeInFunctions.ts, 8, 15))
 >c : Symbol(c, Decl(looseThisTypeInFunctions.ts, 19, 3))
->explicitThis : Symbol(C.explicitThis, Decl(looseThisTypeInFunctions.ts, 8, 14))
+>explicitThis : Symbol(C.explicitThis, Decl(looseThisTypeInFunctions.ts, 8, 15))
 
 let o = {
 >o : Symbol(o, Decl(looseThisTypeInFunctions.ts, 21, 3))
@@ -125,14 +125,14 @@ let n = x(12); // callee:void doesn't match this:I
 >n : Symbol(n, Decl(looseThisTypeInFunctions.ts, 36, 3))
 >x : Symbol(x, Decl(looseThisTypeInFunctions.ts, 35, 3))
 
-let u: Unused;
->u : Symbol(u, Decl(looseThisTypeInFunctions.ts, 37, 3))
+declare let u: Unused;
+>u : Symbol(u, Decl(looseThisTypeInFunctions.ts, 37, 11))
 >Unused : Symbol(Unused, Decl(looseThisTypeInFunctions.ts, 3, 1))
 
 let y = u.implicitNoThis;
 >y : Symbol(y, Decl(looseThisTypeInFunctions.ts, 38, 3))
 >u.implicitNoThis : Symbol(Unused.implicitNoThis, Decl(looseThisTypeInFunctions.ts, 4, 18))
->u : Symbol(u, Decl(looseThisTypeInFunctions.ts, 37, 3))
+>u : Symbol(u, Decl(looseThisTypeInFunctions.ts, 37, 11))
 >implicitNoThis : Symbol(Unused.implicitNoThis, Decl(looseThisTypeInFunctions.ts, 4, 18))
 
 n = y(12); // ok, callee:void matches this:any
@@ -159,9 +159,9 @@ o.implicitThis = c.explicitThis; // ok, implicitThis(this:any) is assignable to
 >o.implicitThis : Symbol(implicitThis, Decl(looseThisTypeInFunctions.ts, 25, 6))
 >o : Symbol(o, Decl(looseThisTypeInFunctions.ts, 21, 3))
 >implicitThis : Symbol(implicitThis, Decl(looseThisTypeInFunctions.ts, 25, 6))
->c.explicitThis : Symbol(C.explicitThis, Decl(looseThisTypeInFunctions.ts, 8, 14))
+>c.explicitThis : Symbol(C.explicitThis, Decl(looseThisTypeInFunctions.ts, 8, 15))
 >c : Symbol(c, Decl(looseThisTypeInFunctions.ts, 19, 3))
->explicitThis : Symbol(C.explicitThis, Decl(looseThisTypeInFunctions.ts, 8, 14))
+>explicitThis : Symbol(C.explicitThis, Decl(looseThisTypeInFunctions.ts, 8, 15))
 
 o.implicitThis = i.explicitThis;
 >o.implicitThis : Symbol(implicitThis, Decl(looseThisTypeInFunctions.ts, 25, 6))
diff --git a/tests/baselines/reference/looseThisTypeInFunctions.types b/tests/baselines/reference/looseThisTypeInFunctions.types
index 094d633a0bf9c..5be46ad725b49 100644
--- a/tests/baselines/reference/looseThisTypeInFunctions.types
+++ b/tests/baselines/reference/looseThisTypeInFunctions.types
@@ -25,7 +25,7 @@ class C implements I {
 >C : C
 >  : ^
 
-    n: number;
+    n!: number;
 >n : number
 >  : ^^^^^^
 
@@ -218,7 +218,7 @@ let n = x(12); // callee:void doesn't match this:I
 >12 : 12
 >   : ^^
 
-let u: Unused;
+declare let u: Unused;
 >u : Unused
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/mappedTypeAsClauseRecursiveNoCrash1.symbols b/tests/baselines/reference/mappedTypeAsClauseRecursiveNoCrash1.symbols
new file mode 100644
index 0000000000000..2aa6ec2b1a5bd
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeAsClauseRecursiveNoCrash1.symbols
@@ -0,0 +1,121 @@
+//// [tests/cases/conformance/types/mapped/mappedTypeAsClauseRecursiveNoCrash1.ts] ////
+
+=== mappedTypeAsClauseRecursiveNoCrash1.ts ===
+// https://github.com/microsoft/TypeScript/issues/60476
+
+export type FlattenType<Source extends object, Target> = {
+>FlattenType : Symbol(FlattenType, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 0, 0))
+>Source : Symbol(Source, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 2, 24))
+>Target : Symbol(Target, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 2, 46))
+
+  [Key in keyof Source as Key extends string
+>Key : Symbol(Key, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 3, 3))
+>Source : Symbol(Source, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 2, 24))
+>Key : Symbol(Key, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 3, 3))
+
+    ? Source[Key] extends object
+>Source : Symbol(Source, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 2, 24))
+>Key : Symbol(Key, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 3, 3))
+
+      ? `${Key}.${keyof FlattenType<Source[Key], Target> & string}`
+>Key : Symbol(Key, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 3, 3))
+>FlattenType : Symbol(FlattenType, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 0, 0))
+>Source : Symbol(Source, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 2, 24))
+>Key : Symbol(Key, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 3, 3))
+>Target : Symbol(Target, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 2, 46))
+
+      : Key
+>Key : Symbol(Key, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 3, 3))
+
+    : never]-?: Target;
+>Target : Symbol(Target, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 2, 46))
+
+};
+
+type FieldSelect = {
+>FieldSelect : Symbol(FieldSelect, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 8, 2))
+
+  table: string;
+>table : Symbol(table, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 10, 20))
+
+  field: string;
+>field : Symbol(field, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 11, 16))
+
+};
+
+type Address = {
+>Address : Symbol(Address, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 13, 2))
+
+  postCode: string;
+>postCode : Symbol(postCode, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 15, 16))
+
+  description: string;
+>description : Symbol(description, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 16, 19))
+
+  address: string;
+>address : Symbol(address, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 17, 22))
+
+};
+
+type User = {
+>User : Symbol(User, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 19, 2))
+
+  id: number;
+>id : Symbol(id, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 21, 13))
+
+  name: string;
+>name : Symbol(name, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 22, 13))
+
+  address: Address;
+>address : Symbol(address, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 23, 15))
+>Address : Symbol(Address, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 13, 2))
+
+};
+
+type FlattenedUser = FlattenType<User, FieldSelect>;
+>FlattenedUser : Symbol(FlattenedUser, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 25, 2))
+>FlattenType : Symbol(FlattenType, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 0, 0))
+>User : Symbol(User, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 19, 2))
+>FieldSelect : Symbol(FieldSelect, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 8, 2))
+
+type FlattenedUserKeys = keyof FlattenType<User, FieldSelect>;
+>FlattenedUserKeys : Symbol(FlattenedUserKeys, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 27, 52))
+>FlattenType : Symbol(FlattenType, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 0, 0))
+>User : Symbol(User, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 19, 2))
+>FieldSelect : Symbol(FieldSelect, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 8, 2))
+
+export type FlattenTypeKeys<Source extends object, Target> = keyof {
+>FlattenTypeKeys : Symbol(FlattenTypeKeys, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 28, 62))
+>Source : Symbol(Source, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 30, 28))
+>Target : Symbol(Target, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 30, 50))
+
+  [Key in keyof Source as Key extends string
+>Key : Symbol(Key, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 31, 3))
+>Source : Symbol(Source, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 30, 28))
+>Key : Symbol(Key, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 31, 3))
+
+    ? Source[Key] extends object
+>Source : Symbol(Source, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 30, 28))
+>Key : Symbol(Key, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 31, 3))
+
+      ? `${Key}.${keyof FlattenType<Source[Key], Target> & string}`
+>Key : Symbol(Key, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 31, 3))
+>FlattenType : Symbol(FlattenType, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 0, 0))
+>Source : Symbol(Source, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 30, 28))
+>Key : Symbol(Key, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 31, 3))
+>Target : Symbol(Target, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 30, 50))
+
+      : Key
+>Key : Symbol(Key, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 31, 3))
+
+    : never]-?: Target;
+>Target : Symbol(Target, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 30, 50))
+
+};
+
+type FlattenedUserKeys2 = FlattenTypeKeys<User, FieldSelect>;
+>FlattenedUserKeys2 : Symbol(FlattenedUserKeys2, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 36, 2))
+>FlattenTypeKeys : Symbol(FlattenTypeKeys, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 28, 62))
+>User : Symbol(User, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 19, 2))
+>FieldSelect : Symbol(FieldSelect, Decl(mappedTypeAsClauseRecursiveNoCrash1.ts, 8, 2))
+
diff --git a/tests/baselines/reference/mappedTypeAsClauseRecursiveNoCrash1.types b/tests/baselines/reference/mappedTypeAsClauseRecursiveNoCrash1.types
new file mode 100644
index 0000000000000..945943cb99f36
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeAsClauseRecursiveNoCrash1.types
@@ -0,0 +1,89 @@
+//// [tests/cases/conformance/types/mapped/mappedTypeAsClauseRecursiveNoCrash1.ts] ////
+
+=== mappedTypeAsClauseRecursiveNoCrash1.ts ===
+// https://github.com/microsoft/TypeScript/issues/60476
+
+export type FlattenType<Source extends object, Target> = {
+>FlattenType : FlattenType<Source, Target>
+>            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  [Key in keyof Source as Key extends string
+    ? Source[Key] extends object
+      ? `${Key}.${keyof FlattenType<Source[Key], Target> & string}`
+      : Key
+    : never]-?: Target;
+};
+
+type FieldSelect = {
+>FieldSelect : FieldSelect
+>            : ^^^^^^^^^^^
+
+  table: string;
+>table : string
+>      : ^^^^^^
+
+  field: string;
+>field : string
+>      : ^^^^^^
+
+};
+
+type Address = {
+>Address : Address
+>        : ^^^^^^^
+
+  postCode: string;
+>postCode : string
+>         : ^^^^^^
+
+  description: string;
+>description : string
+>            : ^^^^^^
+
+  address: string;
+>address : string
+>        : ^^^^^^
+
+};
+
+type User = {
+>User : User
+>     : ^^^^
+
+  id: number;
+>id : number
+>   : ^^^^^^
+
+  name: string;
+>name : string
+>     : ^^^^^^
+
+  address: Address;
+>address : Address
+>        : ^^^^^^^
+
+};
+
+type FlattenedUser = FlattenType<User, FieldSelect>;
+>FlattenedUser : FlattenType<User, FieldSelect>
+>              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+type FlattenedUserKeys = keyof FlattenType<User, FieldSelect>;
+>FlattenedUserKeys : "id" | "name" | "address.address" | "address.postCode" | "address.description"
+>                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+export type FlattenTypeKeys<Source extends object, Target> = keyof {
+>FlattenTypeKeys : keyof { [Key in keyof Source as Key extends string ? Source[Key] extends object ? `${Key}.${keyof FlattenType<Source[Key], Target> & string}` : Key : never]-?: Target; }
+>                : ^^^^^^^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  [Key in keyof Source as Key extends string
+    ? Source[Key] extends object
+      ? `${Key}.${keyof FlattenType<Source[Key], Target> & string}`
+      : Key
+    : never]-?: Target;
+};
+
+type FlattenedUserKeys2 = FlattenTypeKeys<User, FieldSelect>;
+>FlattenedUserKeys2 : "id" | "name" | "address.address" | "address.postCode" | "address.description"
+>                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
diff --git a/tests/baselines/reference/mappedTypeConstraints2.errors.txt b/tests/baselines/reference/mappedTypeConstraints2.errors.txt
index 0d3b3244c9e66..a94ee5f734764 100644
--- a/tests/baselines/reference/mappedTypeConstraints2.errors.txt
+++ b/tests/baselines/reference/mappedTypeConstraints2.errors.txt
@@ -4,11 +4,11 @@ mappedTypeConstraints2.ts(16,11): error TS2322: Type 'Mapped3<K>[Uppercase<K>]'
   Type 'Mapped3<K>[Uppercase<string>]' is not assignable to type '{ a: K; }'.
     Type 'Mapped3<K>[string]' is not assignable to type '{ a: K; }'.
 mappedTypeConstraints2.ts(42,7): error TS2322: Type 'Mapped6<K>[keyof Mapped6<K>]' is not assignable to type '`_${string}`'.
-  Type 'Mapped6<K>[string] | Mapped6<K>[number] | Mapped6<K>[symbol]' is not assignable to type '`_${string}`'.
-    Type 'Mapped6<K>[string]' is not assignable to type '`_${string}`'.
-mappedTypeConstraints2.ts(51,57): error TS2322: Type 'Foo<T>[`get${T}`]' is not assignable to type 'T'.
+  Type 'Mapped6<K>[`_${K}`]' is not assignable to type '`_${string}`'.
+    Type 'Mapped6<K>[`_${string}`]' is not assignable to type '`_${string}`'.
+mappedTypeConstraints2.ts(59,57): error TS2322: Type 'Foo<T>[`get${T}`]' is not assignable to type 'T'.
   'T' could be instantiated with an arbitrary type which could be unrelated to 'Foo<T>[`get${T}`]'.
-mappedTypeConstraints2.ts(82,9): error TS2322: Type 'ObjectWithUnderscoredKeys<K>[`_${K}`]' is not assignable to type 'true'.
+mappedTypeConstraints2.ts(90,9): error TS2322: Type 'ObjectWithUnderscoredKeys<K>[`_${K}`]' is not assignable to type 'true'.
   Type 'ObjectWithUnderscoredKeys<K>[`_${string}`]' is not assignable to type 'true'.
 
 
@@ -64,8 +64,16 @@ mappedTypeConstraints2.ts(82,9): error TS2322: Type 'ObjectWithUnderscoredKeys<K
       let s: `_${string}` = obj[key]; // Error
           ~
 !!! error TS2322: Type 'Mapped6<K>[keyof Mapped6<K>]' is not assignable to type '`_${string}`'.
-!!! error TS2322:   Type 'Mapped6<K>[string] | Mapped6<K>[number] | Mapped6<K>[symbol]' is not assignable to type '`_${string}`'.
-!!! error TS2322:     Type 'Mapped6<K>[string]' is not assignable to type '`_${string}`'.
+!!! error TS2322:   Type 'Mapped6<K>[`_${K}`]' is not assignable to type '`_${string}`'.
+!!! error TS2322:     Type 'Mapped6<K>[`_${string}`]' is not assignable to type '`_${string}`'.
+    }
+    
+    type Mapped7<K extends string> = {
+      [P in K as [P] extends [`_${string}`] ? P : never]: P;
+    };
+    
+    function f7<K extends string>(obj: Mapped7<K>, key: keyof Mapped7<K>) {
+      let s: `_${string}` = obj[key];
     }
     
     // Repro from #47794
diff --git a/tests/baselines/reference/mappedTypeConstraints2.js b/tests/baselines/reference/mappedTypeConstraints2.js
index df4e0eb12d429..4c19254560680 100644
--- a/tests/baselines/reference/mappedTypeConstraints2.js
+++ b/tests/baselines/reference/mappedTypeConstraints2.js
@@ -45,6 +45,14 @@ function f6<K extends string>(obj: Mapped6<K>, key: keyof Mapped6<K>) {
   let s: `_${string}` = obj[key]; // Error
 }
 
+type Mapped7<K extends string> = {
+  [P in K as [P] extends [`_${string}`] ? P : never]: P;
+};
+
+function f7<K extends string>(obj: Mapped7<K>, key: keyof Mapped7<K>) {
+  let s: `_${string}` = obj[key];
+}
+
 // Repro from #47794
 
 type Foo<T extends string> = {
@@ -106,6 +114,9 @@ function f5(obj, key) {
 function f6(obj, key) {
     let s = obj[key]; // Error
 }
+function f7(obj, key) {
+    let s = obj[key];
+}
 const get = (t, foo) => foo[`get${t}`]; // Type 'Foo<T>[`get${T}`]' is not assignable to type 'T'
 function validate(obj, bounds) {
     for (const [key, val] of Object.entries(obj)) {
@@ -154,6 +165,10 @@ type Mapped6<K extends string> = {
     [P in K as `_${P}`]: P;
 };
 declare function f6<K extends string>(obj: Mapped6<K>, key: keyof Mapped6<K>): void;
+type Mapped7<K extends string> = {
+    [P in K as [P] extends [`_${string}`] ? P : never]: P;
+};
+declare function f7<K extends string>(obj: Mapped7<K>, key: keyof Mapped7<K>): void;
 type Foo<T extends string> = {
     [RemappedT in T as `get${RemappedT}`]: RemappedT;
 };
diff --git a/tests/baselines/reference/mappedTypeConstraints2.symbols b/tests/baselines/reference/mappedTypeConstraints2.symbols
index 74a16d5ac1446..1cf513e4e63fc 100644
--- a/tests/baselines/reference/mappedTypeConstraints2.symbols
+++ b/tests/baselines/reference/mappedTypeConstraints2.symbols
@@ -166,94 +166,123 @@ function f6<K extends string>(obj: Mapped6<K>, key: keyof Mapped6<K>) {
 >key : Symbol(key, Decl(mappedTypeConstraints2.ts, 40, 46))
 }
 
+type Mapped7<K extends string> = {
+>Mapped7 : Symbol(Mapped7, Decl(mappedTypeConstraints2.ts, 42, 1))
+>K : Symbol(K, Decl(mappedTypeConstraints2.ts, 44, 13))
+
+  [P in K as [P] extends [`_${string}`] ? P : never]: P;
+>P : Symbol(P, Decl(mappedTypeConstraints2.ts, 45, 3))
+>K : Symbol(K, Decl(mappedTypeConstraints2.ts, 44, 13))
+>P : Symbol(P, Decl(mappedTypeConstraints2.ts, 45, 3))
+>P : Symbol(P, Decl(mappedTypeConstraints2.ts, 45, 3))
+>P : Symbol(P, Decl(mappedTypeConstraints2.ts, 45, 3))
+
+};
+
+function f7<K extends string>(obj: Mapped7<K>, key: keyof Mapped7<K>) {
+>f7 : Symbol(f7, Decl(mappedTypeConstraints2.ts, 46, 2))
+>K : Symbol(K, Decl(mappedTypeConstraints2.ts, 48, 12))
+>obj : Symbol(obj, Decl(mappedTypeConstraints2.ts, 48, 30))
+>Mapped7 : Symbol(Mapped7, Decl(mappedTypeConstraints2.ts, 42, 1))
+>K : Symbol(K, Decl(mappedTypeConstraints2.ts, 48, 12))
+>key : Symbol(key, Decl(mappedTypeConstraints2.ts, 48, 46))
+>Mapped7 : Symbol(Mapped7, Decl(mappedTypeConstraints2.ts, 42, 1))
+>K : Symbol(K, Decl(mappedTypeConstraints2.ts, 48, 12))
+
+  let s: `_${string}` = obj[key];
+>s : Symbol(s, Decl(mappedTypeConstraints2.ts, 49, 5))
+>obj : Symbol(obj, Decl(mappedTypeConstraints2.ts, 48, 30))
+>key : Symbol(key, Decl(mappedTypeConstraints2.ts, 48, 46))
+}
+
 // Repro from #47794
 
 type Foo<T extends string> = {
->Foo : Symbol(Foo, Decl(mappedTypeConstraints2.ts, 42, 1))
->T : Symbol(T, Decl(mappedTypeConstraints2.ts, 46, 9))
+>Foo : Symbol(Foo, Decl(mappedTypeConstraints2.ts, 50, 1))
+>T : Symbol(T, Decl(mappedTypeConstraints2.ts, 54, 9))
 
     [RemappedT in T as `get${RemappedT}`]: RemappedT;
->RemappedT : Symbol(RemappedT, Decl(mappedTypeConstraints2.ts, 47, 5))
->T : Symbol(T, Decl(mappedTypeConstraints2.ts, 46, 9))
->RemappedT : Symbol(RemappedT, Decl(mappedTypeConstraints2.ts, 47, 5))
->RemappedT : Symbol(RemappedT, Decl(mappedTypeConstraints2.ts, 47, 5))
+>RemappedT : Symbol(RemappedT, Decl(mappedTypeConstraints2.ts, 55, 5))
+>T : Symbol(T, Decl(mappedTypeConstraints2.ts, 54, 9))
+>RemappedT : Symbol(RemappedT, Decl(mappedTypeConstraints2.ts, 55, 5))
+>RemappedT : Symbol(RemappedT, Decl(mappedTypeConstraints2.ts, 55, 5))
 
 };
 
 const get = <T extends string>(t: T, foo: Foo<T>): T => foo[`get${t}`];  // Type 'Foo<T>[`get${T}`]' is not assignable to type 'T'
->get : Symbol(get, Decl(mappedTypeConstraints2.ts, 50, 5))
->T : Symbol(T, Decl(mappedTypeConstraints2.ts, 50, 13))
->t : Symbol(t, Decl(mappedTypeConstraints2.ts, 50, 31))
->T : Symbol(T, Decl(mappedTypeConstraints2.ts, 50, 13))
->foo : Symbol(foo, Decl(mappedTypeConstraints2.ts, 50, 36))
->Foo : Symbol(Foo, Decl(mappedTypeConstraints2.ts, 42, 1))
->T : Symbol(T, Decl(mappedTypeConstraints2.ts, 50, 13))
->T : Symbol(T, Decl(mappedTypeConstraints2.ts, 50, 13))
->foo : Symbol(foo, Decl(mappedTypeConstraints2.ts, 50, 36))
->t : Symbol(t, Decl(mappedTypeConstraints2.ts, 50, 31))
+>get : Symbol(get, Decl(mappedTypeConstraints2.ts, 58, 5))
+>T : Symbol(T, Decl(mappedTypeConstraints2.ts, 58, 13))
+>t : Symbol(t, Decl(mappedTypeConstraints2.ts, 58, 31))
+>T : Symbol(T, Decl(mappedTypeConstraints2.ts, 58, 13))
+>foo : Symbol(foo, Decl(mappedTypeConstraints2.ts, 58, 36))
+>Foo : Symbol(Foo, Decl(mappedTypeConstraints2.ts, 50, 1))
+>T : Symbol(T, Decl(mappedTypeConstraints2.ts, 58, 13))
+>T : Symbol(T, Decl(mappedTypeConstraints2.ts, 58, 13))
+>foo : Symbol(foo, Decl(mappedTypeConstraints2.ts, 58, 36))
+>t : Symbol(t, Decl(mappedTypeConstraints2.ts, 58, 31))
 
 // Repro from #48626
 
 interface Bounds {
->Bounds : Symbol(Bounds, Decl(mappedTypeConstraints2.ts, 50, 71))
+>Bounds : Symbol(Bounds, Decl(mappedTypeConstraints2.ts, 58, 71))
 
     min: number;
->min : Symbol(Bounds.min, Decl(mappedTypeConstraints2.ts, 54, 18))
+>min : Symbol(Bounds.min, Decl(mappedTypeConstraints2.ts, 62, 18))
 
     max: number;
->max : Symbol(Bounds.max, Decl(mappedTypeConstraints2.ts, 55, 16))
+>max : Symbol(Bounds.max, Decl(mappedTypeConstraints2.ts, 63, 16))
 }
 
 type NumericBoundsOf<T> = {
->NumericBoundsOf : Symbol(NumericBoundsOf, Decl(mappedTypeConstraints2.ts, 57, 1))
->T : Symbol(T, Decl(mappedTypeConstraints2.ts, 59, 21))
+>NumericBoundsOf : Symbol(NumericBoundsOf, Decl(mappedTypeConstraints2.ts, 65, 1))
+>T : Symbol(T, Decl(mappedTypeConstraints2.ts, 67, 21))
 
     [K in keyof T as T[K] extends number | undefined ? K : never]: Bounds;
->K : Symbol(K, Decl(mappedTypeConstraints2.ts, 60, 5))
->T : Symbol(T, Decl(mappedTypeConstraints2.ts, 59, 21))
->T : Symbol(T, Decl(mappedTypeConstraints2.ts, 59, 21))
->K : Symbol(K, Decl(mappedTypeConstraints2.ts, 60, 5))
->K : Symbol(K, Decl(mappedTypeConstraints2.ts, 60, 5))
->Bounds : Symbol(Bounds, Decl(mappedTypeConstraints2.ts, 50, 71))
+>K : Symbol(K, Decl(mappedTypeConstraints2.ts, 68, 5))
+>T : Symbol(T, Decl(mappedTypeConstraints2.ts, 67, 21))
+>T : Symbol(T, Decl(mappedTypeConstraints2.ts, 67, 21))
+>K : Symbol(K, Decl(mappedTypeConstraints2.ts, 68, 5))
+>K : Symbol(K, Decl(mappedTypeConstraints2.ts, 68, 5))
+>Bounds : Symbol(Bounds, Decl(mappedTypeConstraints2.ts, 58, 71))
 }
 
 function validate<T extends object>(obj: T, bounds: NumericBoundsOf<T>) {
->validate : Symbol(validate, Decl(mappedTypeConstraints2.ts, 61, 1))
->T : Symbol(T, Decl(mappedTypeConstraints2.ts, 63, 18))
->obj : Symbol(obj, Decl(mappedTypeConstraints2.ts, 63, 36))
->T : Symbol(T, Decl(mappedTypeConstraints2.ts, 63, 18))
->bounds : Symbol(bounds, Decl(mappedTypeConstraints2.ts, 63, 43))
->NumericBoundsOf : Symbol(NumericBoundsOf, Decl(mappedTypeConstraints2.ts, 57, 1))
->T : Symbol(T, Decl(mappedTypeConstraints2.ts, 63, 18))
+>validate : Symbol(validate, Decl(mappedTypeConstraints2.ts, 69, 1))
+>T : Symbol(T, Decl(mappedTypeConstraints2.ts, 71, 18))
+>obj : Symbol(obj, Decl(mappedTypeConstraints2.ts, 71, 36))
+>T : Symbol(T, Decl(mappedTypeConstraints2.ts, 71, 18))
+>bounds : Symbol(bounds, Decl(mappedTypeConstraints2.ts, 71, 43))
+>NumericBoundsOf : Symbol(NumericBoundsOf, Decl(mappedTypeConstraints2.ts, 65, 1))
+>T : Symbol(T, Decl(mappedTypeConstraints2.ts, 71, 18))
 
     for (const [key, val] of Object.entries(obj)) {
->key : Symbol(key, Decl(mappedTypeConstraints2.ts, 64, 16))
->val : Symbol(val, Decl(mappedTypeConstraints2.ts, 64, 20))
+>key : Symbol(key, Decl(mappedTypeConstraints2.ts, 72, 16))
+>val : Symbol(val, Decl(mappedTypeConstraints2.ts, 72, 20))
 >Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
->obj : Symbol(obj, Decl(mappedTypeConstraints2.ts, 63, 36))
+>obj : Symbol(obj, Decl(mappedTypeConstraints2.ts, 71, 36))
 
         const boundsForKey = bounds[key as keyof NumericBoundsOf<T>];
->boundsForKey : Symbol(boundsForKey, Decl(mappedTypeConstraints2.ts, 65, 13))
->bounds : Symbol(bounds, Decl(mappedTypeConstraints2.ts, 63, 43))
->key : Symbol(key, Decl(mappedTypeConstraints2.ts, 64, 16))
->NumericBoundsOf : Symbol(NumericBoundsOf, Decl(mappedTypeConstraints2.ts, 57, 1))
->T : Symbol(T, Decl(mappedTypeConstraints2.ts, 63, 18))
+>boundsForKey : Symbol(boundsForKey, Decl(mappedTypeConstraints2.ts, 73, 13))
+>bounds : Symbol(bounds, Decl(mappedTypeConstraints2.ts, 71, 43))
+>key : Symbol(key, Decl(mappedTypeConstraints2.ts, 72, 16))
+>NumericBoundsOf : Symbol(NumericBoundsOf, Decl(mappedTypeConstraints2.ts, 65, 1))
+>T : Symbol(T, Decl(mappedTypeConstraints2.ts, 71, 18))
 
         if (boundsForKey) {
->boundsForKey : Symbol(boundsForKey, Decl(mappedTypeConstraints2.ts, 65, 13))
+>boundsForKey : Symbol(boundsForKey, Decl(mappedTypeConstraints2.ts, 73, 13))
 
             const { min, max } = boundsForKey;
->min : Symbol(min, Decl(mappedTypeConstraints2.ts, 67, 19))
->max : Symbol(max, Decl(mappedTypeConstraints2.ts, 67, 24))
->boundsForKey : Symbol(boundsForKey, Decl(mappedTypeConstraints2.ts, 65, 13))
+>min : Symbol(min, Decl(mappedTypeConstraints2.ts, 75, 19))
+>max : Symbol(max, Decl(mappedTypeConstraints2.ts, 75, 24))
+>boundsForKey : Symbol(boundsForKey, Decl(mappedTypeConstraints2.ts, 73, 13))
 
             if (min > val || max < val) return false;
->min : Symbol(min, Decl(mappedTypeConstraints2.ts, 67, 19))
->val : Symbol(val, Decl(mappedTypeConstraints2.ts, 64, 20))
->max : Symbol(max, Decl(mappedTypeConstraints2.ts, 67, 24))
->val : Symbol(val, Decl(mappedTypeConstraints2.ts, 64, 20))
+>min : Symbol(min, Decl(mappedTypeConstraints2.ts, 75, 19))
+>val : Symbol(val, Decl(mappedTypeConstraints2.ts, 72, 20))
+>max : Symbol(max, Decl(mappedTypeConstraints2.ts, 75, 24))
+>val : Symbol(val, Decl(mappedTypeConstraints2.ts, 72, 20))
         }
     }
     return true;
@@ -262,28 +291,28 @@ function validate<T extends object>(obj: T, bounds: NumericBoundsOf<T>) {
 // repro from #50030
 
 type ObjectWithUnderscoredKeys<K extends string> = {
->ObjectWithUnderscoredKeys : Symbol(ObjectWithUnderscoredKeys, Decl(mappedTypeConstraints2.ts, 72, 1))
->K : Symbol(K, Decl(mappedTypeConstraints2.ts, 76, 31))
+>ObjectWithUnderscoredKeys : Symbol(ObjectWithUnderscoredKeys, Decl(mappedTypeConstraints2.ts, 80, 1))
+>K : Symbol(K, Decl(mappedTypeConstraints2.ts, 84, 31))
 
     [k in K as `_${k}`]: true;
->k : Symbol(k, Decl(mappedTypeConstraints2.ts, 77, 5))
->K : Symbol(K, Decl(mappedTypeConstraints2.ts, 76, 31))
->k : Symbol(k, Decl(mappedTypeConstraints2.ts, 77, 5))
+>k : Symbol(k, Decl(mappedTypeConstraints2.ts, 85, 5))
+>K : Symbol(K, Decl(mappedTypeConstraints2.ts, 84, 31))
+>k : Symbol(k, Decl(mappedTypeConstraints2.ts, 85, 5))
 
 };
 
 function genericTest<K extends string>(objectWithUnderscoredKeys: ObjectWithUnderscoredKeys<K>, key: K) {
->genericTest : Symbol(genericTest, Decl(mappedTypeConstraints2.ts, 78, 2))
->K : Symbol(K, Decl(mappedTypeConstraints2.ts, 80, 21))
->objectWithUnderscoredKeys : Symbol(objectWithUnderscoredKeys, Decl(mappedTypeConstraints2.ts, 80, 39))
->ObjectWithUnderscoredKeys : Symbol(ObjectWithUnderscoredKeys, Decl(mappedTypeConstraints2.ts, 72, 1))
->K : Symbol(K, Decl(mappedTypeConstraints2.ts, 80, 21))
->key : Symbol(key, Decl(mappedTypeConstraints2.ts, 80, 95))
->K : Symbol(K, Decl(mappedTypeConstraints2.ts, 80, 21))
+>genericTest : Symbol(genericTest, Decl(mappedTypeConstraints2.ts, 86, 2))
+>K : Symbol(K, Decl(mappedTypeConstraints2.ts, 88, 21))
+>objectWithUnderscoredKeys : Symbol(objectWithUnderscoredKeys, Decl(mappedTypeConstraints2.ts, 88, 39))
+>ObjectWithUnderscoredKeys : Symbol(ObjectWithUnderscoredKeys, Decl(mappedTypeConstraints2.ts, 80, 1))
+>K : Symbol(K, Decl(mappedTypeConstraints2.ts, 88, 21))
+>key : Symbol(key, Decl(mappedTypeConstraints2.ts, 88, 95))
+>K : Symbol(K, Decl(mappedTypeConstraints2.ts, 88, 21))
 
   const shouldBeTrue: true = objectWithUnderscoredKeys[`_${key}`]; // assignability fails here, but ideally should not
->shouldBeTrue : Symbol(shouldBeTrue, Decl(mappedTypeConstraints2.ts, 81, 7))
->objectWithUnderscoredKeys : Symbol(objectWithUnderscoredKeys, Decl(mappedTypeConstraints2.ts, 80, 39))
->key : Symbol(key, Decl(mappedTypeConstraints2.ts, 80, 95))
+>shouldBeTrue : Symbol(shouldBeTrue, Decl(mappedTypeConstraints2.ts, 89, 7))
+>objectWithUnderscoredKeys : Symbol(objectWithUnderscoredKeys, Decl(mappedTypeConstraints2.ts, 88, 39))
+>key : Symbol(key, Decl(mappedTypeConstraints2.ts, 88, 95))
 }
 
diff --git a/tests/baselines/reference/mappedTypeConstraints2.types b/tests/baselines/reference/mappedTypeConstraints2.types
index b975d98fa9293..3c1d30fa74117 100644
--- a/tests/baselines/reference/mappedTypeConstraints2.types
+++ b/tests/baselines/reference/mappedTypeConstraints2.types
@@ -120,18 +120,18 @@ function f5<K extends string>(obj: Mapped5<K>, key: keyof Mapped5<K>) {
 >   : ^ ^^^^^^^^^      ^^   ^^          ^^   ^^                ^^^^^^^^^
 >obj : Mapped5<K>
 >    : ^^^^^^^^^^
->key : K extends `_${string}` ? K : never
->    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>key : keyof Mapped5<K>
+>    : ^^^^^^^^^^^^^^^^
 
   let s: `_${string}` = obj[key];
 >s : `_${string}`
 >  : ^^^^^^^^^^^^
->obj[key] : Mapped5<K>[K extends `_${string}` ? K : never]
->         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>obj[key] : Mapped5<K>[keyof Mapped5<K>]
+>         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >obj : Mapped5<K>
 >    : ^^^^^^^^^^
->key : K extends `_${string}` ? K : never
->    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>key : keyof Mapped5<K>
+>    : ^^^^^^^^^^^^^^^^
 }
 
 // repro from #53066#issuecomment-1913384757
@@ -162,6 +162,32 @@ function f6<K extends string>(obj: Mapped6<K>, key: keyof Mapped6<K>) {
 >    : ^^^^^^^^^^^^^^^^
 }
 
+type Mapped7<K extends string> = {
+>Mapped7 : Mapped7<K>
+>        : ^^^^^^^^^^
+
+  [P in K as [P] extends [`_${string}`] ? P : never]: P;
+};
+
+function f7<K extends string>(obj: Mapped7<K>, key: keyof Mapped7<K>) {
+>f7 : <K extends string>(obj: Mapped7<K>, key: keyof Mapped7<K>) => void
+>   : ^ ^^^^^^^^^      ^^   ^^          ^^   ^^                ^^^^^^^^^
+>obj : Mapped7<K>
+>    : ^^^^^^^^^^
+>key : keyof Mapped7<K>
+>    : ^^^^^^^^^^^^^^^^
+
+  let s: `_${string}` = obj[key];
+>s : `_${string}`
+>  : ^^^^^^^^^^^^
+>obj[key] : Mapped7<K>[keyof Mapped7<K>]
+>         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>obj : Mapped7<K>
+>    : ^^^^^^^^^^
+>key : keyof Mapped7<K>
+>    : ^^^^^^^^^^^^^^^^
+}
+
 // Repro from #47794
 
 type Foo<T extends string> = {
diff --git a/tests/baselines/reference/mappedTypeErrors.errors.txt b/tests/baselines/reference/mappedTypeErrors.errors.txt
index e03c20d64bff7..f05b82726619c 100644
--- a/tests/baselines/reference/mappedTypeErrors.errors.txt
+++ b/tests/baselines/reference/mappedTypeErrors.errors.txt
@@ -21,15 +21,15 @@ mappedTypeErrors.ts(77,59): error TS2353: Object literal may only specify known
 mappedTypeErrors.ts(83,58): error TS2353: Object literal may only specify known properties, and 'z' does not exist in type 'Partial<{ x: number; y: number; }>'.
 mappedTypeErrors.ts(105,17): error TS2322: Type 'undefined' is not assignable to type 'string'.
 mappedTypeErrors.ts(106,17): error TS2353: Object literal may only specify known properties, and 'c' does not exist in type 'Pick<Foo, keyof Foo>'.
-mappedTypeErrors.ts(123,14): error TS2322: Type 'undefined' is not assignable to type 'string'.
-mappedTypeErrors.ts(124,14): error TS2353: Object literal may only specify known properties, and 'c' does not exist in type 'Pick<Foo, keyof Foo>'.
-mappedTypeErrors.ts(128,16): error TS2322: Type 'string' is not assignable to type 'number'.
-mappedTypeErrors.ts(129,25): error TS2322: Type 'string' is not assignable to type 'number'.
-mappedTypeErrors.ts(130,39): error TS2322: Type 'string' is not assignable to type 'number'.
-mappedTypeErrors.ts(136,16): error TS2322: Type 'T' is not assignable to type 'string | number | symbol'.
-mappedTypeErrors.ts(136,21): error TS2536: Type 'P' cannot be used to index type 'T'.
-mappedTypeErrors.ts(148,17): error TS2339: Property 'foo' does not exist on type 'Pick<T, K>'.
-mappedTypeErrors.ts(152,17): error TS2339: Property 'foo' does not exist on type 'Record<K, number>'.
+mappedTypeErrors.ts(126,14): error TS2322: Type 'undefined' is not assignable to type 'string'.
+mappedTypeErrors.ts(127,14): error TS2353: Object literal may only specify known properties, and 'c' does not exist in type 'Pick<Foo, keyof Foo>'.
+mappedTypeErrors.ts(131,16): error TS2322: Type 'string' is not assignable to type 'number'.
+mappedTypeErrors.ts(132,25): error TS2322: Type 'string' is not assignable to type 'number'.
+mappedTypeErrors.ts(133,39): error TS2322: Type 'string' is not assignable to type 'number'.
+mappedTypeErrors.ts(139,16): error TS2322: Type 'T' is not assignable to type 'string | number | symbol'.
+mappedTypeErrors.ts(139,21): error TS2536: Type 'P' cannot be used to index type 'T'.
+mappedTypeErrors.ts(151,17): error TS2339: Property 'foo' does not exist on type 'Pick<T, K>'.
+mappedTypeErrors.ts(155,17): error TS2339: Property 'foo' does not exist on type 'Record<K, number>'.
 
 
 ==== mappedTypeErrors.ts (27 errors) ====
@@ -190,6 +190,9 @@ mappedTypeErrors.ts(152,17): error TS2339: Property 'foo' does not exist on type
     
     class C<T> {
         state: T;
+        constructor(initialState: T) {
+            this.state = initialState;
+        }
         setState<K extends keyof T>(props: Pick<T, K>) {
             for (let k in props) {
                 this.state[k] = props[k];
@@ -197,7 +200,7 @@ mappedTypeErrors.ts(152,17): error TS2339: Property 'foo' does not exist on type
         }
     }
     
-    let c = new C<Foo>();
+    let c = new C<Foo>({ a: "hello", b: 42 });
     c.setState({ a: "test", b: 43 });
     c.setState({ a: "hi" });
     c.setState({ b: undefined });
@@ -216,15 +219,15 @@ mappedTypeErrors.ts(152,17): error TS2339: Property 'foo' does not exist on type
     let x1: T2 = { a: 'no' };  // Error
                    ~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
-!!! related TS6500 mappedTypeErrors.ts:126:13: The expected type comes from property 'a' which is declared here on type 'T2'
+!!! related TS6500 mappedTypeErrors.ts:129:13: The expected type comes from property 'a' which is declared here on type 'T2'
     let x2: Partial<T2> = { a: 'no' }; // Error
                             ~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
-!!! related TS6500 mappedTypeErrors.ts:126:13: The expected type comes from property 'a' which is declared here on type 'Partial<T2>'
+!!! related TS6500 mappedTypeErrors.ts:129:13: The expected type comes from property 'a' which is declared here on type 'Partial<T2>'
     let x3: { [P in keyof T2]: T2[P]} = { a: 'no' };  // Error
                                           ~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
-!!! related TS6500 mappedTypeErrors.ts:126:13: The expected type comes from property 'a' which is declared here on type '{ [x: string]: any; a?: number | undefined; }'
+!!! related TS6500 mappedTypeErrors.ts:129:13: The expected type comes from property 'a' which is declared here on type '{ [x: string]: any; a?: number | undefined; }'
     
     // Repro from #13044
     
@@ -233,7 +236,7 @@ mappedTypeErrors.ts(152,17): error TS2339: Property 'foo' does not exist on type
         pt: {[P in T]?: T[P]}, // note: should be in keyof T
                    ~
 !!! error TS2322: Type 'T' is not assignable to type 'string | number | symbol'.
-!!! related TS2208 mappedTypeErrors.ts:134:11: This type parameter might need an `extends string | number | symbol` constraint.
+!!! related TS2208 mappedTypeErrors.ts:137:11: This type parameter might need an `extends string | number | symbol` constraint.
                         ~~~~
 !!! error TS2536: Type 'P' cannot be used to index type 'T'.
     };
diff --git a/tests/baselines/reference/mappedTypeErrors.js b/tests/baselines/reference/mappedTypeErrors.js
index 81d183c94831a..39018b0e2874c 100644
--- a/tests/baselines/reference/mappedTypeErrors.js
+++ b/tests/baselines/reference/mappedTypeErrors.js
@@ -110,6 +110,9 @@ setState(foo, { c: true });  // Error
 
 class C<T> {
     state: T;
+    constructor(initialState: T) {
+        this.state = initialState;
+    }
     setState<K extends keyof T>(props: Pick<T, K>) {
         for (let k in props) {
             this.state[k] = props[k];
@@ -117,7 +120,7 @@ class C<T> {
     }
 }
 
-let c = new C<Foo>();
+let c = new C<Foo>({ a: "hello", b: 42 });
 c.setState({ a: "test", b: 43 });
 c.setState({ a: "hi" });
 c.setState({ b: undefined });
@@ -209,7 +212,8 @@ setState(foo, foo);
 setState(foo, { a: undefined }); // Error
 setState(foo, { c: true }); // Error
 var C = /** @class */ (function () {
-    function C() {
+    function C(initialState) {
+        this.state = initialState;
     }
     C.prototype.setState = function (props) {
         for (var k in props) {
@@ -218,7 +222,7 @@ var C = /** @class */ (function () {
     };
     return C;
 }());
-var c = new C();
+var c = new C({ a: "hello", b: 42 });
 c.setState({ a: "test", b: 43 });
 c.setState({ a: "hi" });
 c.setState({ b: undefined });
@@ -293,6 +297,7 @@ declare function setState<T, K extends keyof T>(obj: T, props: Pick<T, K>): void
 declare let foo: Foo;
 declare class C<T> {
     state: T;
+    constructor(initialState: T);
     setState<K extends keyof T>(props: Pick<T, K>): void;
 }
 declare let c: C<Foo>;
diff --git a/tests/baselines/reference/mappedTypeErrors.symbols b/tests/baselines/reference/mappedTypeErrors.symbols
index 092881722f5b1..62a33c71c7aa2 100644
--- a/tests/baselines/reference/mappedTypeErrors.symbols
+++ b/tests/baselines/reference/mappedTypeErrors.symbols
@@ -395,181 +395,193 @@ class C<T> {
 >state : Symbol(C.state, Decl(mappedTypeErrors.ts, 107, 12))
 >T : Symbol(T, Decl(mappedTypeErrors.ts, 107, 8))
 
+    constructor(initialState: T) {
+>initialState : Symbol(initialState, Decl(mappedTypeErrors.ts, 109, 16))
+>T : Symbol(T, Decl(mappedTypeErrors.ts, 107, 8))
+
+        this.state = initialState;
+>this.state : Symbol(C.state, Decl(mappedTypeErrors.ts, 107, 12))
+>this : Symbol(C, Decl(mappedTypeErrors.ts, 105, 27))
+>state : Symbol(C.state, Decl(mappedTypeErrors.ts, 107, 12))
+>initialState : Symbol(initialState, Decl(mappedTypeErrors.ts, 109, 16))
+    }
     setState<K extends keyof T>(props: Pick<T, K>) {
->setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 108, 13))
->K : Symbol(K, Decl(mappedTypeErrors.ts, 109, 13))
+>setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 111, 5))
+>K : Symbol(K, Decl(mappedTypeErrors.ts, 112, 13))
 >T : Symbol(T, Decl(mappedTypeErrors.ts, 107, 8))
->props : Symbol(props, Decl(mappedTypeErrors.ts, 109, 32))
+>props : Symbol(props, Decl(mappedTypeErrors.ts, 112, 32))
 >Pick : Symbol(Pick, Decl(lib.es5.d.ts, --, --))
 >T : Symbol(T, Decl(mappedTypeErrors.ts, 107, 8))
->K : Symbol(K, Decl(mappedTypeErrors.ts, 109, 13))
+>K : Symbol(K, Decl(mappedTypeErrors.ts, 112, 13))
 
         for (let k in props) {
->k : Symbol(k, Decl(mappedTypeErrors.ts, 110, 16))
->props : Symbol(props, Decl(mappedTypeErrors.ts, 109, 32))
+>k : Symbol(k, Decl(mappedTypeErrors.ts, 113, 16))
+>props : Symbol(props, Decl(mappedTypeErrors.ts, 112, 32))
 
             this.state[k] = props[k];
 >this.state : Symbol(C.state, Decl(mappedTypeErrors.ts, 107, 12))
 >this : Symbol(C, Decl(mappedTypeErrors.ts, 105, 27))
 >state : Symbol(C.state, Decl(mappedTypeErrors.ts, 107, 12))
->k : Symbol(k, Decl(mappedTypeErrors.ts, 110, 16))
->props : Symbol(props, Decl(mappedTypeErrors.ts, 109, 32))
->k : Symbol(k, Decl(mappedTypeErrors.ts, 110, 16))
+>k : Symbol(k, Decl(mappedTypeErrors.ts, 113, 16))
+>props : Symbol(props, Decl(mappedTypeErrors.ts, 112, 32))
+>k : Symbol(k, Decl(mappedTypeErrors.ts, 113, 16))
         }
     }
 }
 
-let c = new C<Foo>();
->c : Symbol(c, Decl(mappedTypeErrors.ts, 116, 3))
+let c = new C<Foo>({ a: "hello", b: 42 });
+>c : Symbol(c, Decl(mappedTypeErrors.ts, 119, 3))
 >C : Symbol(C, Decl(mappedTypeErrors.ts, 105, 27))
 >Foo : Symbol(Foo, Decl(mappedTypeErrors.ts, 83, 1))
+>a : Symbol(a, Decl(mappedTypeErrors.ts, 119, 20))
+>b : Symbol(b, Decl(mappedTypeErrors.ts, 119, 32))
 
 c.setState({ a: "test", b: 43 });
->c.setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 108, 13))
->c : Symbol(c, Decl(mappedTypeErrors.ts, 116, 3))
->setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 108, 13))
->a : Symbol(a, Decl(mappedTypeErrors.ts, 117, 12))
->b : Symbol(b, Decl(mappedTypeErrors.ts, 117, 23))
+>c.setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 111, 5))
+>c : Symbol(c, Decl(mappedTypeErrors.ts, 119, 3))
+>setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 111, 5))
+>a : Symbol(a, Decl(mappedTypeErrors.ts, 120, 12))
+>b : Symbol(b, Decl(mappedTypeErrors.ts, 120, 23))
 
 c.setState({ a: "hi" });
->c.setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 108, 13))
->c : Symbol(c, Decl(mappedTypeErrors.ts, 116, 3))
->setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 108, 13))
->a : Symbol(a, Decl(mappedTypeErrors.ts, 118, 12))
+>c.setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 111, 5))
+>c : Symbol(c, Decl(mappedTypeErrors.ts, 119, 3))
+>setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 111, 5))
+>a : Symbol(a, Decl(mappedTypeErrors.ts, 121, 12))
 
 c.setState({ b: undefined });
->c.setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 108, 13))
->c : Symbol(c, Decl(mappedTypeErrors.ts, 116, 3))
->setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 108, 13))
->b : Symbol(b, Decl(mappedTypeErrors.ts, 119, 12))
+>c.setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 111, 5))
+>c : Symbol(c, Decl(mappedTypeErrors.ts, 119, 3))
+>setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 111, 5))
+>b : Symbol(b, Decl(mappedTypeErrors.ts, 122, 12))
 >undefined : Symbol(undefined)
 
 c.setState({ });
->c.setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 108, 13))
->c : Symbol(c, Decl(mappedTypeErrors.ts, 116, 3))
->setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 108, 13))
+>c.setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 111, 5))
+>c : Symbol(c, Decl(mappedTypeErrors.ts, 119, 3))
+>setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 111, 5))
 
 c.setState(foo);
->c.setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 108, 13))
->c : Symbol(c, Decl(mappedTypeErrors.ts, 116, 3))
->setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 108, 13))
+>c.setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 111, 5))
+>c : Symbol(c, Decl(mappedTypeErrors.ts, 119, 3))
+>setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 111, 5))
 >foo : Symbol(foo, Decl(mappedTypeErrors.ts, 98, 3))
 
 c.setState({ a: undefined });  // Error
->c.setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 108, 13))
->c : Symbol(c, Decl(mappedTypeErrors.ts, 116, 3))
->setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 108, 13))
->a : Symbol(a, Decl(mappedTypeErrors.ts, 122, 12))
+>c.setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 111, 5))
+>c : Symbol(c, Decl(mappedTypeErrors.ts, 119, 3))
+>setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 111, 5))
+>a : Symbol(a, Decl(mappedTypeErrors.ts, 125, 12))
 >undefined : Symbol(undefined)
 
 c.setState({ c: true });  // Error
->c.setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 108, 13))
->c : Symbol(c, Decl(mappedTypeErrors.ts, 116, 3))
->setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 108, 13))
->c : Symbol(c, Decl(mappedTypeErrors.ts, 123, 12))
+>c.setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 111, 5))
+>c : Symbol(c, Decl(mappedTypeErrors.ts, 119, 3))
+>setState : Symbol(C.setState, Decl(mappedTypeErrors.ts, 111, 5))
+>c : Symbol(c, Decl(mappedTypeErrors.ts, 126, 12))
 
 type T2 = { a?: number, [key: string]: any };
->T2 : Symbol(T2, Decl(mappedTypeErrors.ts, 123, 24))
->a : Symbol(a, Decl(mappedTypeErrors.ts, 125, 11))
->key : Symbol(key, Decl(mappedTypeErrors.ts, 125, 25))
+>T2 : Symbol(T2, Decl(mappedTypeErrors.ts, 126, 24))
+>a : Symbol(a, Decl(mappedTypeErrors.ts, 128, 11))
+>key : Symbol(key, Decl(mappedTypeErrors.ts, 128, 25))
 
 let x1: T2 = { a: 'no' };  // Error
->x1 : Symbol(x1, Decl(mappedTypeErrors.ts, 127, 3))
->T2 : Symbol(T2, Decl(mappedTypeErrors.ts, 123, 24))
->a : Symbol(a, Decl(mappedTypeErrors.ts, 127, 14))
+>x1 : Symbol(x1, Decl(mappedTypeErrors.ts, 130, 3))
+>T2 : Symbol(T2, Decl(mappedTypeErrors.ts, 126, 24))
+>a : Symbol(a, Decl(mappedTypeErrors.ts, 130, 14))
 
 let x2: Partial<T2> = { a: 'no' }; // Error
->x2 : Symbol(x2, Decl(mappedTypeErrors.ts, 128, 3))
+>x2 : Symbol(x2, Decl(mappedTypeErrors.ts, 131, 3))
 >Partial : Symbol(Partial, Decl(lib.es5.d.ts, --, --))
->T2 : Symbol(T2, Decl(mappedTypeErrors.ts, 123, 24))
->a : Symbol(a, Decl(mappedTypeErrors.ts, 128, 23))
+>T2 : Symbol(T2, Decl(mappedTypeErrors.ts, 126, 24))
+>a : Symbol(a, Decl(mappedTypeErrors.ts, 131, 23))
 
 let x3: { [P in keyof T2]: T2[P]} = { a: 'no' };  // Error
->x3 : Symbol(x3, Decl(mappedTypeErrors.ts, 129, 3))
->P : Symbol(P, Decl(mappedTypeErrors.ts, 129, 11))
->T2 : Symbol(T2, Decl(mappedTypeErrors.ts, 123, 24))
->T2 : Symbol(T2, Decl(mappedTypeErrors.ts, 123, 24))
->P : Symbol(P, Decl(mappedTypeErrors.ts, 129, 11))
->a : Symbol(a, Decl(mappedTypeErrors.ts, 129, 37))
+>x3 : Symbol(x3, Decl(mappedTypeErrors.ts, 132, 3))
+>P : Symbol(P, Decl(mappedTypeErrors.ts, 132, 11))
+>T2 : Symbol(T2, Decl(mappedTypeErrors.ts, 126, 24))
+>T2 : Symbol(T2, Decl(mappedTypeErrors.ts, 126, 24))
+>P : Symbol(P, Decl(mappedTypeErrors.ts, 132, 11))
+>a : Symbol(a, Decl(mappedTypeErrors.ts, 132, 37))
 
 // Repro from #13044
 
 type Foo2<T, F extends keyof T> = {
->Foo2 : Symbol(Foo2, Decl(mappedTypeErrors.ts, 129, 48))
->T : Symbol(T, Decl(mappedTypeErrors.ts, 133, 10))
->F : Symbol(F, Decl(mappedTypeErrors.ts, 133, 12))
->T : Symbol(T, Decl(mappedTypeErrors.ts, 133, 10))
+>Foo2 : Symbol(Foo2, Decl(mappedTypeErrors.ts, 132, 48))
+>T : Symbol(T, Decl(mappedTypeErrors.ts, 136, 10))
+>F : Symbol(F, Decl(mappedTypeErrors.ts, 136, 12))
+>T : Symbol(T, Decl(mappedTypeErrors.ts, 136, 10))
 
     pf: {[P in F]?: T[P]},
->pf : Symbol(pf, Decl(mappedTypeErrors.ts, 133, 35))
->P : Symbol(P, Decl(mappedTypeErrors.ts, 134, 10))
->F : Symbol(F, Decl(mappedTypeErrors.ts, 133, 12))
->T : Symbol(T, Decl(mappedTypeErrors.ts, 133, 10))
->P : Symbol(P, Decl(mappedTypeErrors.ts, 134, 10))
+>pf : Symbol(pf, Decl(mappedTypeErrors.ts, 136, 35))
+>P : Symbol(P, Decl(mappedTypeErrors.ts, 137, 10))
+>F : Symbol(F, Decl(mappedTypeErrors.ts, 136, 12))
+>T : Symbol(T, Decl(mappedTypeErrors.ts, 136, 10))
+>P : Symbol(P, Decl(mappedTypeErrors.ts, 137, 10))
 
     pt: {[P in T]?: T[P]}, // note: should be in keyof T
->pt : Symbol(pt, Decl(mappedTypeErrors.ts, 134, 26))
->P : Symbol(P, Decl(mappedTypeErrors.ts, 135, 10))
->T : Symbol(T, Decl(mappedTypeErrors.ts, 133, 10))
->T : Symbol(T, Decl(mappedTypeErrors.ts, 133, 10))
->P : Symbol(P, Decl(mappedTypeErrors.ts, 135, 10))
+>pt : Symbol(pt, Decl(mappedTypeErrors.ts, 137, 26))
+>P : Symbol(P, Decl(mappedTypeErrors.ts, 138, 10))
+>T : Symbol(T, Decl(mappedTypeErrors.ts, 136, 10))
+>T : Symbol(T, Decl(mappedTypeErrors.ts, 136, 10))
+>P : Symbol(P, Decl(mappedTypeErrors.ts, 138, 10))
 
 };
 type O = {x: number, y: boolean};
->O : Symbol(O, Decl(mappedTypeErrors.ts, 136, 2))
->x : Symbol(x, Decl(mappedTypeErrors.ts, 137, 10))
->y : Symbol(y, Decl(mappedTypeErrors.ts, 137, 20))
+>O : Symbol(O, Decl(mappedTypeErrors.ts, 139, 2))
+>x : Symbol(x, Decl(mappedTypeErrors.ts, 140, 10))
+>y : Symbol(y, Decl(mappedTypeErrors.ts, 140, 20))
 
 let o: O = {x: 5, y: false};
->o : Symbol(o, Decl(mappedTypeErrors.ts, 138, 3))
->O : Symbol(O, Decl(mappedTypeErrors.ts, 136, 2))
->x : Symbol(x, Decl(mappedTypeErrors.ts, 138, 12))
->y : Symbol(y, Decl(mappedTypeErrors.ts, 138, 17))
+>o : Symbol(o, Decl(mappedTypeErrors.ts, 141, 3))
+>O : Symbol(O, Decl(mappedTypeErrors.ts, 139, 2))
+>x : Symbol(x, Decl(mappedTypeErrors.ts, 141, 12))
+>y : Symbol(y, Decl(mappedTypeErrors.ts, 141, 17))
 
 let f: Foo2<O, 'x'> = {
->f : Symbol(f, Decl(mappedTypeErrors.ts, 139, 3))
->Foo2 : Symbol(Foo2, Decl(mappedTypeErrors.ts, 129, 48))
->O : Symbol(O, Decl(mappedTypeErrors.ts, 136, 2))
+>f : Symbol(f, Decl(mappedTypeErrors.ts, 142, 3))
+>Foo2 : Symbol(Foo2, Decl(mappedTypeErrors.ts, 132, 48))
+>O : Symbol(O, Decl(mappedTypeErrors.ts, 139, 2))
 
     pf: {x: 7},
->pf : Symbol(pf, Decl(mappedTypeErrors.ts, 139, 23))
->x : Symbol(x, Decl(mappedTypeErrors.ts, 140, 9))
+>pf : Symbol(pf, Decl(mappedTypeErrors.ts, 142, 23))
+>x : Symbol(x, Decl(mappedTypeErrors.ts, 143, 9))
 
     pt: {x: 7, y: false},
->pt : Symbol(pt, Decl(mappedTypeErrors.ts, 140, 15))
->x : Symbol(x, Decl(mappedTypeErrors.ts, 141, 9))
->y : Symbol(y, Decl(mappedTypeErrors.ts, 141, 14))
+>pt : Symbol(pt, Decl(mappedTypeErrors.ts, 143, 15))
+>x : Symbol(x, Decl(mappedTypeErrors.ts, 144, 9))
+>y : Symbol(y, Decl(mappedTypeErrors.ts, 144, 14))
 
 };
 
 // Repro from #28170
 
 function test1<T, K extends keyof T>(obj: Pick<T, K>) {
->test1 : Symbol(test1, Decl(mappedTypeErrors.ts, 142, 2))
->T : Symbol(T, Decl(mappedTypeErrors.ts, 146, 15))
->K : Symbol(K, Decl(mappedTypeErrors.ts, 146, 17))
->T : Symbol(T, Decl(mappedTypeErrors.ts, 146, 15))
->obj : Symbol(obj, Decl(mappedTypeErrors.ts, 146, 37))
+>test1 : Symbol(test1, Decl(mappedTypeErrors.ts, 145, 2))
+>T : Symbol(T, Decl(mappedTypeErrors.ts, 149, 15))
+>K : Symbol(K, Decl(mappedTypeErrors.ts, 149, 17))
+>T : Symbol(T, Decl(mappedTypeErrors.ts, 149, 15))
+>obj : Symbol(obj, Decl(mappedTypeErrors.ts, 149, 37))
 >Pick : Symbol(Pick, Decl(lib.es5.d.ts, --, --))
->T : Symbol(T, Decl(mappedTypeErrors.ts, 146, 15))
->K : Symbol(K, Decl(mappedTypeErrors.ts, 146, 17))
+>T : Symbol(T, Decl(mappedTypeErrors.ts, 149, 15))
+>K : Symbol(K, Decl(mappedTypeErrors.ts, 149, 17))
 
     let x = obj.foo;  // Error
->x : Symbol(x, Decl(mappedTypeErrors.ts, 147, 7))
->obj : Symbol(obj, Decl(mappedTypeErrors.ts, 146, 37))
+>x : Symbol(x, Decl(mappedTypeErrors.ts, 150, 7))
+>obj : Symbol(obj, Decl(mappedTypeErrors.ts, 149, 37))
 }
 
 function test2<T, K extends keyof T>(obj: Record<K, number>) {
->test2 : Symbol(test2, Decl(mappedTypeErrors.ts, 148, 1))
->T : Symbol(T, Decl(mappedTypeErrors.ts, 150, 15))
->K : Symbol(K, Decl(mappedTypeErrors.ts, 150, 17))
->T : Symbol(T, Decl(mappedTypeErrors.ts, 150, 15))
->obj : Symbol(obj, Decl(mappedTypeErrors.ts, 150, 37))
+>test2 : Symbol(test2, Decl(mappedTypeErrors.ts, 151, 1))
+>T : Symbol(T, Decl(mappedTypeErrors.ts, 153, 15))
+>K : Symbol(K, Decl(mappedTypeErrors.ts, 153, 17))
+>T : Symbol(T, Decl(mappedTypeErrors.ts, 153, 15))
+>obj : Symbol(obj, Decl(mappedTypeErrors.ts, 153, 37))
 >Record : Symbol(Record, Decl(lib.es5.d.ts, --, --))
->K : Symbol(K, Decl(mappedTypeErrors.ts, 150, 17))
+>K : Symbol(K, Decl(mappedTypeErrors.ts, 153, 17))
 
     let x = obj.foo;  // Error
->x : Symbol(x, Decl(mappedTypeErrors.ts, 151, 7))
->obj : Symbol(obj, Decl(mappedTypeErrors.ts, 150, 37))
+>x : Symbol(x, Decl(mappedTypeErrors.ts, 154, 7))
+>obj : Symbol(obj, Decl(mappedTypeErrors.ts, 153, 37))
 }
 
diff --git a/tests/baselines/reference/mappedTypeErrors.types b/tests/baselines/reference/mappedTypeErrors.types
index 32839343182fc..8e3cc57116da1 100644
--- a/tests/baselines/reference/mappedTypeErrors.types
+++ b/tests/baselines/reference/mappedTypeErrors.types
@@ -538,6 +538,22 @@ class C<T> {
 >state : T
 >      : ^
 
+    constructor(initialState: T) {
+>initialState : T
+>             : ^
+
+        this.state = initialState;
+>this.state = initialState : T
+>                          : ^
+>this.state : T
+>           : ^
+>this : this
+>     : ^^^^
+>state : T
+>      : ^
+>initialState : T
+>             : ^
+    }
     setState<K extends keyof T>(props: Pick<T, K>) {
 >setState : <K extends keyof T>(props: Pick<T, K>) => void
 >         : ^ ^^^^^^^^^       ^^     ^^          ^^^^^^^^^
@@ -573,13 +589,23 @@ class C<T> {
     }
 }
 
-let c = new C<Foo>();
+let c = new C<Foo>({ a: "hello", b: 42 });
 >c : C<Foo>
 >  : ^^^^^^
->new C<Foo>() : C<Foo>
->             : ^^^^^^
+>new C<Foo>({ a: "hello", b: 42 }) : C<Foo>
+>                                  : ^^^^^^
 >C : typeof C
 >  : ^^^^^^^^
+>{ a: "hello", b: 42 } : { a: string; b: number; }
+>                      : ^^^^^^^^^^^^^^^^^^^^^^^^^
+>a : string
+>  : ^^^^^^
+>"hello" : "hello"
+>        : ^^^^^^^
+>b : number
+>  : ^^^^^^
+>42 : 42
+>   : ^^
 
 c.setState({ a: "test", b: 43 });
 >c.setState({ a: "test", b: 43 }) : void
diff --git a/tests/baselines/reference/mappedTypeRecursiveInference.errors.txt b/tests/baselines/reference/mappedTypeRecursiveInference.errors.txt
index c893f5d8a2072..519469d28e139 100644
--- a/tests/baselines/reference/mappedTypeRecursiveInference.errors.txt
+++ b/tests/baselines/reference/mappedTypeRecursiveInference.errors.txt
@@ -30,7 +30,7 @@ mappedTypeRecursiveInference.ts(19,18): error TS2345: Argument of type 'XMLHttpR
     oub.b.b
     oub.b.a.n.a.n.a
     
-    let xhr: XMLHttpRequest;
+    declare let xhr: XMLHttpRequest;
     const out2 = foo(xhr);
                      ~~~
 !!! error TS2345: Argument of type 'XMLHttpRequest' is not assignable to parameter of type 'Deep<{ onreadystatechange: unknown; readonly readyState: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; readonly response: unknown; readonly responseText: { toString: any; charAt: any; charCodeAt: any; concat: any; indexOf: any; lastIndexOf: any; localeCompare: any; match: any; replace: any; search: any; slice: any; split: any; substring: any; toLowerCase: any; toLocaleLowerCase: any; toUpperCase: any; toLocaleUpperCase: any; trim: any; readonly length: any; substr: any; valueOf: any; codePointAt: any; includes: any; endsWith: any; normalize: any; repeat: any; startsWith: any; anchor: any; big: any; blink: any; bold: any; fixed: any; fontcolor: any; fontsize: any; italics: any; link: any; small: any; strike: any; sub: any; sup: any; [Symbol.iterator]: any; }; responseType: { toString: any; charAt: any; charCodeAt: any; concat: any; indexOf: any; lastIndexOf: any; localeCompare: any; match: any; replace: any; search: any; slice: any; split: any; substring: any; toLowerCase: any; toLocaleLowerCase: any; toUpperCase: any; toLocaleUpperCase: any; trim: any; readonly length: any; substr: any; valueOf: any; codePointAt: any; includes: any; endsWith: any; normalize: any; repeat: any; startsWith: any; anchor: any; big: any; blink: any; bold: any; fixed: any; fontcolor: any; fontsize: any; italics: any; link: any; small: any; strike: any; sub: any; sup: any; [Symbol.iterator]: any; }; readonly responseURL: { toString: any; charAt: any; charCodeAt: any; concat: any; indexOf: any; lastIndexOf: any; localeCompare: any; match: any; replace: any; search: any; slice: any; split: any; substring: any; toLowerCase: any; toLocaleLowerCase: any; toUpperCase: any; toLocaleUpperCase: any; trim: any; readonly length: any; substr: any; valueOf: any; codePointAt: any; includes: any; endsWith: any; normalize: any; repeat: any; startsWith: any; anchor: any; big: any; blink: any; bold: any; fixed: any; fontcolor: any; fontsize: any; italics: any; link: any; small: any; strike: any; sub: any; sup: any; [Symbol.iterator]: any; }; readonly responseXML: { readonly URL: any; alinkColor: any; readonly all: any; readonly anchors: any; readonly applets: any; bgColor: any; body: any; readonly characterSet: any; readonly charset: any; readonly compatMode: any; readonly contentType: any; cookie: any; readonly currentScript: any; readonly defaultView: any; designMode: any; dir: any; readonly doctype: any; readonly documentElement: any; readonly documentURI: any; domain: any; readonly embeds: any; fgColor: any; readonly forms: any; readonly fragmentDirective: any; readonly fullscreen: any; readonly fullscreenEnabled: any; readonly head: any; readonly hidden: any; readonly images: any; readonly implementation: any; readonly inputEncoding: any; readonly lastModified: any; linkColor: any; readonly links: any; location: any; onfullscreenchange: any; onfullscreenerror: any; onpointerlockchange: any; onpointerlockerror: any; onreadystatechange: any; onvisibilitychange: any; readonly ownerDocument: any; readonly pictureInPictureEnabled: any; readonly plugins: any; readonly readyState: any; readonly referrer: any; readonly rootElement: any; readonly scripts: any; readonly scrollingElement: any; readonly timeline: any; title: any; readonly visibilityState: any; vlinkColor: any; adoptNode: any; captureEvents: any; caretPositionFromPoint: any; caretRangeFromPoint: any; clear: any; close: any; createAttribute: any; createAttributeNS: any; createCDATASection: any; createComment: any; createDocumentFragment: any; createElement: any; createElementNS: any; createEvent: any; createNodeIterator: any; createProcessingInstruction: any; createRange: any; createTextNode: any; createTreeWalker: any; execCommand: any; exitFullscreen: any; exitPictureInPicture: any; exitPointerLock: any; getElementById: any; getElementsByClassName: any; getElementsByName: any; getElementsByTagName: any; getElementsByTagNameNS: any; getSelection: any; hasFocus: any; hasStorageAccess: any; importNode: any; open: any; queryCommandEnabled: any; queryCommandIndeterm: any; queryCommandState: any; queryCommandSupported: any; queryCommandValue: any; releaseEvents: any; requestStorageAccess: any; startViewTransition: any; write: any; writeln: any; readonly textContent: any; addEventListener: any; removeEventListener: any; readonly baseURI: any; readonly childNodes: any; readonly firstChild: any; readonly isConnected: any; readonly lastChild: any; readonly nextSibling: any; readonly nodeName: any; readonly nodeType: any; nodeValue: any; readonly parentElement: any; readonly parentNode: any; readonly previousSibling: any; appendChild: any; cloneNode: any; compareDocumentPosition: any; contains: any; getRootNode: any; hasChildNodes: any; insertBefore: any; isDefaultNamespace: any; isEqualNode: any; isSameNode: any; lookupNamespaceURI: any; lookupPrefix: any; normalize: any; removeChild: any; replaceChild: any; readonly ELEMENT_NODE: any; readonly ATTRIBUTE_NODE: any; readonly TEXT_NODE: any; readonly CDATA_SECTION_NODE: any; readonly ENTITY_REFERENCE_NODE: any; readonly ENTITY_NODE: any; readonly PROCESSING_INSTRUCTION_NODE: any; readonly COMMENT_NODE: any; readonly DOCUMENT_NODE: any; readonly DOCUMENT_TYPE_NODE: any; readonly DOCUMENT_FRAGMENT_NODE: any; readonly NOTATION_NODE: any; readonly DOCUMENT_POSITION_DISCONNECTED: any; readonly DOCUMENT_POSITION_PRECEDING: any; readonly DOCUMENT_POSITION_FOLLOWING: any; readonly DOCUMENT_POSITION_CONTAINS: any; readonly DOCUMENT_POSITION_CONTAINED_BY: any; readonly DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: any; dispatchEvent: any; readonly activeElement: any; adoptedStyleSheets: any; readonly fullscreenElement: any; readonly pictureInPictureElement: any; readonly pointerLockElement: any; readonly styleSheets: any; elementFromPoint: any; elementsFromPoint: any; getAnimations: any; readonly fonts: any; onabort: any; onanimationcancel: any; onanimationend: any; onanimationiteration: any; onanimationstart: any; onauxclick: any; onbeforeinput: any; onbeforematch: any; onbeforetoggle: any; onblur: any; oncancel: any; oncanplay: any; oncanplaythrough: any; onchange: any; onclick: any; onclose: any; oncontextlost: any; oncontextmenu: any; oncontextrestored: any; oncopy: any; oncuechange: any; oncut: any; ondblclick: any; ondrag: any; ondragend: any; ondragenter: any; ondragleave: any; ondragover: any; ondragstart: any; ondrop: any; ondurationchange: any; onemptied: any; onended: any; onerror: any; onfocus: any; onformdata: any; ongotpointercapture: any; oninput: any; oninvalid: any; onkeydown: any; onkeypress: any; onkeyup: any; onload: any; onloadeddata: any; onloadedmetadata: any; onloadstart: any; onlostpointercapture: any; onmousedown: any; onmouseenter: any; onmouseleave: any; onmousemove: any; onmouseout: any; onmouseover: any; onmouseup: any; onpaste: any; onpause: any; onplay: any; onplaying: any; onpointercancel: any; onpointerdown: any; onpointerenter: any; onpointerleave: any; onpointermove: any; onpointerout: any; onpointerover: any; onpointerrawupdate: any; onpointerup: any; onprogress: any; onratechange: any; onreset: any; onresize: any; onscroll: any; onscrollend: any; onsecuritypolicyviolation: any; onseeked: any; onseeking: any; onselect: any; onselectionchange: any; onselectstart: any; onslotchange: any; onstalled: any; onsubmit: any; onsuspend: any; ontimeupdate: any; ontoggle: any; ontouchcancel?: any; ontouchend?: any; ontouchmove?: any; ontouchstart?: any; ontransitioncancel: any; ontransitionend: any; ontransitionrun: any; ontransitionstart: any; onvolumechange: any; onwaiting: any; onwebkitanimationend: any; onwebkitanimationiteration: any; onwebkitanimationstart: any; onwebkittransitionend: any; onwheel: any; readonly childElementCount: any; readonly children: any; readonly firstElementChild: any; readonly lastElementChild: any; append: any; moveBefore: any; prepend: any; querySelector: any; querySelectorAll: any; replaceChildren: any; createExpression: any; createNSResolver: any; evaluate: any; }; readonly status: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; readonly statusText: { toString: any; charAt: any; charCodeAt: any; concat: any; indexOf: any; lastIndexOf: any; localeCompare: any; match: any; replace: any; search: any; slice: any; split: any; substring: any; toLowerCase: any; toLocaleLowerCase: any; toUpperCase: any; toLocaleUpperCase: any; trim: any; readonly length: any; substr: any; valueOf: any; codePointAt: any; includes: any; endsWith: any; normalize: any; repeat: any; startsWith: any; anchor: any; big: any; blink: any; bold: any; fixed: any; fontcolor: any; fontsize: any; italics: any; link: any; small: any; strike: any; sub: any; sup: any; [Symbol.iterator]: any; }; timeout: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; readonly upload: { addEventListener: any; removeEventListener: any; onabort: any; onerror: any; onload: any; onloadend: any; onloadstart: any; onprogress: any; ontimeout: any; dispatchEvent: any; }; withCredentials: { valueOf: any; }; abort: unknown; getAllResponseHeaders: unknown; getResponseHeader: unknown; open: unknown; overrideMimeType: unknown; send: unknown; setRequestHeader: unknown; readonly UNSENT: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; readonly OPENED: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; readonly HEADERS_RECEIVED: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; readonly LOADING: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; readonly DONE: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; addEventListener: unknown; removeEventListener: unknown; onabort: unknown; onerror: unknown; onload: unknown; onloadend: unknown; onloadstart: unknown; onprogress: unknown; ontimeout: unknown; dispatchEvent: unknown; }>'.
diff --git a/tests/baselines/reference/mappedTypeRecursiveInference.js b/tests/baselines/reference/mappedTypeRecursiveInference.js
index a63f20d996421..cd6547dde2f79 100644
--- a/tests/baselines/reference/mappedTypeRecursiveInference.js
+++ b/tests/baselines/reference/mappedTypeRecursiveInference.js
@@ -18,7 +18,7 @@ oub.b
 oub.b.b
 oub.b.a.n.a.n.a
 
-let xhr: XMLHttpRequest;
+declare let xhr: XMLHttpRequest;
 const out2 = foo(xhr);
 out2.responseXML
 out2.responseXML.activeElement.className.length
@@ -33,7 +33,6 @@ var oub = foo(b);
 oub.b;
 oub.b.b;
 oub.b.a.n.a.n.a;
-var xhr;
 var out2 = foo(xhr);
 out2.responseXML;
 out2.responseXML.activeElement.className.length;
diff --git a/tests/baselines/reference/mappedTypeRecursiveInference.symbols b/tests/baselines/reference/mappedTypeRecursiveInference.symbols
index 55804b8fbc3eb..0aaf5e6d2a08e 100644
--- a/tests/baselines/reference/mappedTypeRecursiveInference.symbols
+++ b/tests/baselines/reference/mappedTypeRecursiveInference.symbols
@@ -85,14 +85,14 @@ oub.b.b
 oub.b.a.n.a.n.a
 >oub : Symbol(oub, Decl(mappedTypeRecursiveInference.ts, 12, 5))
 
-let xhr: XMLHttpRequest;
->xhr : Symbol(xhr, Decl(mappedTypeRecursiveInference.ts, 17, 3))
+declare let xhr: XMLHttpRequest;
+>xhr : Symbol(xhr, Decl(mappedTypeRecursiveInference.ts, 17, 11))
 >XMLHttpRequest : Symbol(XMLHttpRequest, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
 
 const out2 = foo(xhr);
 >out2 : Symbol(out2, Decl(mappedTypeRecursiveInference.ts, 18, 5))
 >foo : Symbol(foo, Decl(mappedTypeRecursiveInference.ts, 2, 45))
->xhr : Symbol(xhr, Decl(mappedTypeRecursiveInference.ts, 17, 3))
+>xhr : Symbol(xhr, Decl(mappedTypeRecursiveInference.ts, 17, 11))
 
 out2.responseXML
 >out2.responseXML : Symbol(responseXML, Decl(lib.dom.d.ts, --, --))
diff --git a/tests/baselines/reference/mappedTypeRecursiveInference.types b/tests/baselines/reference/mappedTypeRecursiveInference.types
index b84f220cd62a0..4a8d81cd63b7b 100644
--- a/tests/baselines/reference/mappedTypeRecursiveInference.types
+++ b/tests/baselines/reference/mappedTypeRecursiveInference.types
@@ -154,7 +154,7 @@ oub.b.a.n.a.n.a
 >a : { [x: string]: any; }
 >  : ^^^^^^^^^^^^^^^^^^^^^
 
-let xhr: XMLHttpRequest;
+declare let xhr: XMLHttpRequest;
 >xhr : XMLHttpRequest
 >    : ^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.errors.txt b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.errors.txt
index bcd97026f3bdc..ef40943d67fc5 100644
--- a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.errors.txt
+++ b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.errors.txt
@@ -46,12 +46,12 @@ memberFunctionsWithPrivateOverloads.ts(49,12): error TS2341: Property 'bar' is p
     
     }
     
-    var c: C;
+    declare var c: C;
     var r = c.foo(1); // error
               ~~~
 !!! error TS2341: Property 'foo' is private and only accessible within class 'C'.
     
-    var d: D<number>;
+    declare var d: D<number>;
     var r2 = d.foo(2); // error
                ~~~
 !!! error TS2341: Property 'foo' is private and only accessible within class 'D<T>'.
diff --git a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js
index faf752124909a..b71039879a36c 100644
--- a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js
+++ b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js
@@ -42,10 +42,10 @@ class D<T> {
 
 }
 
-var c: C;
+declare var c: C;
 var r = c.foo(1); // error
 
-var d: D<number>;
+declare var d: D<number>;
 var r2 = d.foo(2); // error
 
 var r3 = C.foo(1); // error
@@ -70,9 +70,7 @@ var D = /** @class */ (function () {
     D.bar = function (x, y) { };
     return D;
 }());
-var c;
 var r = c.foo(1); // error
-var d;
 var r2 = d.foo(2); // error
 var r3 = C.foo(1); // error
 var r4 = D.bar(''); // error
diff --git a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.symbols b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.symbols
index 6a31867035c59..b95bbf0bd2cbc 100644
--- a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.symbols
+++ b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.symbols
@@ -143,24 +143,24 @@ class D<T> {
 
 }
 
-var c: C;
->c : Symbol(c, Decl(memberFunctionsWithPrivateOverloads.ts, 41, 3))
+declare var c: C;
+>c : Symbol(c, Decl(memberFunctionsWithPrivateOverloads.ts, 41, 11))
 >C : Symbol(C, Decl(memberFunctionsWithPrivateOverloads.ts, 0, 0))
 
 var r = c.foo(1); // error
 >r : Symbol(r, Decl(memberFunctionsWithPrivateOverloads.ts, 42, 3))
 >c.foo : Symbol(C.foo, Decl(memberFunctionsWithPrivateOverloads.ts, 0, 9), Decl(memberFunctionsWithPrivateOverloads.ts, 1, 27), Decl(memberFunctionsWithPrivateOverloads.ts, 2, 38))
->c : Symbol(c, Decl(memberFunctionsWithPrivateOverloads.ts, 41, 3))
+>c : Symbol(c, Decl(memberFunctionsWithPrivateOverloads.ts, 41, 11))
 >foo : Symbol(C.foo, Decl(memberFunctionsWithPrivateOverloads.ts, 0, 9), Decl(memberFunctionsWithPrivateOverloads.ts, 1, 27), Decl(memberFunctionsWithPrivateOverloads.ts, 2, 38))
 
-var d: D<number>;
->d : Symbol(d, Decl(memberFunctionsWithPrivateOverloads.ts, 44, 3))
+declare var d: D<number>;
+>d : Symbol(d, Decl(memberFunctionsWithPrivateOverloads.ts, 44, 11))
 >D : Symbol(D, Decl(memberFunctionsWithPrivateOverloads.ts, 18, 1))
 
 var r2 = d.foo(2); // error
 >r2 : Symbol(r2, Decl(memberFunctionsWithPrivateOverloads.ts, 45, 3))
 >d.foo : Symbol(D.foo, Decl(memberFunctionsWithPrivateOverloads.ts, 20, 12), Decl(memberFunctionsWithPrivateOverloads.ts, 21, 27), Decl(memberFunctionsWithPrivateOverloads.ts, 22, 28))
->d : Symbol(d, Decl(memberFunctionsWithPrivateOverloads.ts, 44, 3))
+>d : Symbol(d, Decl(memberFunctionsWithPrivateOverloads.ts, 44, 11))
 >foo : Symbol(D.foo, Decl(memberFunctionsWithPrivateOverloads.ts, 20, 12), Decl(memberFunctionsWithPrivateOverloads.ts, 21, 27), Decl(memberFunctionsWithPrivateOverloads.ts, 22, 28))
 
 var r3 = C.foo(1); // error
diff --git a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.types b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.types
index bef0bd6187da7..710da6e2c3022 100644
--- a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.types
+++ b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.types
@@ -212,7 +212,7 @@ class D<T> {
 
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
@@ -230,7 +230,7 @@ var r = c.foo(1); // error
 >1 : 1
 >  : ^
 
-var d: D<number>;
+declare var d: D<number>;
 >d : D<number>
 >  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.errors.txt b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.errors.txt
index 14ccfb28be548..a7d9ce47e81d5 100644
--- a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.errors.txt
+++ b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.errors.txt
@@ -99,12 +99,12 @@ memberFunctionsWithPublicPrivateOverloads.ts(62,12): error TS2341: Property 'foo
         protected static baz(x: any, y?: any) { }
     }
     
-    var c: C;
+    declare var c: C;
     var r = c.foo(1); // error
               ~~~
 !!! error TS2341: Property 'foo' is private and only accessible within class 'C'.
     
-    var d: D<number>;
+    declare var d: D<number>;
     var r2 = d.foo(2); // error
                ~~~
 !!! error TS2341: Property 'foo' is private and only accessible within class 'D<T>'.
\ No newline at end of file
diff --git a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js
index 0f1f333e461cc..72b0d2f011992 100644
--- a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js
+++ b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js
@@ -58,10 +58,10 @@ class D<T> {
     protected static baz(x: any, y?: any) { }
 }
 
-var c: C;
+declare var c: C;
 var r = c.foo(1); // error
 
-var d: D<number>;
+declare var d: D<number>;
 var r2 = d.foo(2); // error
 
 //// [memberFunctionsWithPublicPrivateOverloads.js]
@@ -87,7 +87,5 @@ var D = /** @class */ (function () {
     D.baz = function (x, y) { };
     return D;
 }());
-var c;
 var r = c.foo(1); // error
-var d;
 var r2 = d.foo(2); // error
diff --git a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.symbols b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.symbols
index 42435dd64e99d..33602b22b6479 100644
--- a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.symbols
+++ b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.symbols
@@ -202,23 +202,23 @@ class D<T> {
 >y : Symbol(y, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 54, 32))
 }
 
-var c: C;
->c : Symbol(c, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 57, 3))
+declare var c: C;
+>c : Symbol(c, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 57, 11))
 >C : Symbol(C, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 0, 0))
 
 var r = c.foo(1); // error
 >r : Symbol(r, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 58, 3))
 >c.foo : Symbol(C.foo, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 0, 9), Decl(memberFunctionsWithPublicPrivateOverloads.ts, 1, 27), Decl(memberFunctionsWithPublicPrivateOverloads.ts, 2, 37))
->c : Symbol(c, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 57, 3))
+>c : Symbol(c, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 57, 11))
 >foo : Symbol(C.foo, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 0, 9), Decl(memberFunctionsWithPublicPrivateOverloads.ts, 1, 27), Decl(memberFunctionsWithPublicPrivateOverloads.ts, 2, 37))
 
-var d: D<number>;
->d : Symbol(d, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 60, 3))
+declare var d: D<number>;
+>d : Symbol(d, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 60, 11))
 >D : Symbol(D, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 27, 1))
 
 var r2 = d.foo(2); // error
 >r2 : Symbol(r2, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 61, 3))
 >d.foo : Symbol(D.foo, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 29, 12), Decl(memberFunctionsWithPublicPrivateOverloads.ts, 30, 27), Decl(memberFunctionsWithPublicPrivateOverloads.ts, 31, 27))
->d : Symbol(d, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 60, 3))
+>d : Symbol(d, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 60, 11))
 >foo : Symbol(D.foo, Decl(memberFunctionsWithPublicPrivateOverloads.ts, 29, 12), Decl(memberFunctionsWithPublicPrivateOverloads.ts, 30, 27), Decl(memberFunctionsWithPublicPrivateOverloads.ts, 31, 27))
 
diff --git a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.types b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.types
index 47ca9abf3fc24..3abdd98cae1c6 100644
--- a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.types
+++ b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.types
@@ -305,7 +305,7 @@ class D<T> {
 >  : ^^^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
@@ -323,7 +323,7 @@ var r = c.foo(1); // error
 >1 : 1
 >  : ^
 
-var d: D<number>;
+declare var d: D<number>;
 >d : D<number>
 >  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.errors.txt b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.errors.txt
index c4b68ea4256de..703f3b87c86b3 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.errors.txt
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.errors.txt
@@ -7,7 +7,7 @@ mergedInterfacesWithInheritedPrivates.ts(26,11): error TS2341: Property 'x' is p
 
 ==== mergedInterfacesWithInheritedPrivates.ts (3 errors) ====
     class C {
-        private x: number;
+        private x!: number;
     }
     
     interface A extends C {
@@ -22,21 +22,21 @@ mergedInterfacesWithInheritedPrivates.ts(26,11): error TS2341: Property 'x' is p
           ~
 !!! error TS2420: Class 'D' incorrectly implements interface 'A'.
 !!! error TS2420:   Types have separate declarations of a private property 'x'.
-        private x: number;
-        y: string;
-        z: string;
+        private x!: number;
+        y!: string;
+        z!: string;
     }
     
     class E implements A { // error
           ~
 !!! error TS2420: Class 'E' incorrectly implements interface 'A'.
 !!! error TS2420:   Property 'x' is private in type 'A' but not in type 'E'.
-        x: number;
-        y: string;
-        z: string;
+        x!: number;
+        y!: string;
+        z!: string;
     }
     
-    var a: A;
+    declare var a: A;
     var r = a.x; // error
               ~
 !!! error TS2341: Property 'x' is private and only accessible within class 'C'.
\ No newline at end of file
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js
index 87e2ae1b1c504..dbb09dc88cc42 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js
@@ -2,7 +2,7 @@
 
 //// [mergedInterfacesWithInheritedPrivates.ts]
 class C {
-    private x: number;
+    private x!: number;
 }
 
 interface A extends C {
@@ -14,18 +14,18 @@ interface A {
 }
 
 class D implements A { // error
-    private x: number;
-    y: string;
-    z: string;
+    private x!: number;
+    y!: string;
+    z!: string;
 }
 
 class E implements A { // error
-    x: number;
-    y: string;
-    z: string;
+    x!: number;
+    y!: string;
+    z!: string;
 }
 
-var a: A;
+declare var a: A;
 var r = a.x; // error
 
 //// [mergedInterfacesWithInheritedPrivates.js]
@@ -44,5 +44,4 @@ var E = /** @class */ (function () {
     }
     return E;
 }());
-var a;
 var r = a.x; // error
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.symbols b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.symbols
index 1868a1c119e06..01f936baeb319 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.symbols
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.symbols
@@ -4,7 +4,7 @@
 class C {
 >C : Symbol(C, Decl(mergedInterfacesWithInheritedPrivates.ts, 0, 0))
 
-    private x: number;
+    private x!: number;
 >x : Symbol(C.x, Decl(mergedInterfacesWithInheritedPrivates.ts, 0, 9))
 }
 
@@ -27,37 +27,37 @@ class D implements A { // error
 >D : Symbol(D, Decl(mergedInterfacesWithInheritedPrivates.ts, 10, 1))
 >A : Symbol(A, Decl(mergedInterfacesWithInheritedPrivates.ts, 2, 1), Decl(mergedInterfacesWithInheritedPrivates.ts, 6, 1))
 
-    private x: number;
+    private x!: number;
 >x : Symbol(D.x, Decl(mergedInterfacesWithInheritedPrivates.ts, 12, 22))
 
-    y: string;
->y : Symbol(D.y, Decl(mergedInterfacesWithInheritedPrivates.ts, 13, 22))
+    y!: string;
+>y : Symbol(D.y, Decl(mergedInterfacesWithInheritedPrivates.ts, 13, 23))
 
-    z: string;
->z : Symbol(D.z, Decl(mergedInterfacesWithInheritedPrivates.ts, 14, 14))
+    z!: string;
+>z : Symbol(D.z, Decl(mergedInterfacesWithInheritedPrivates.ts, 14, 15))
 }
 
 class E implements A { // error
 >E : Symbol(E, Decl(mergedInterfacesWithInheritedPrivates.ts, 16, 1))
 >A : Symbol(A, Decl(mergedInterfacesWithInheritedPrivates.ts, 2, 1), Decl(mergedInterfacesWithInheritedPrivates.ts, 6, 1))
 
-    x: number;
+    x!: number;
 >x : Symbol(E.x, Decl(mergedInterfacesWithInheritedPrivates.ts, 18, 22))
 
-    y: string;
->y : Symbol(E.y, Decl(mergedInterfacesWithInheritedPrivates.ts, 19, 14))
+    y!: string;
+>y : Symbol(E.y, Decl(mergedInterfacesWithInheritedPrivates.ts, 19, 15))
 
-    z: string;
->z : Symbol(E.z, Decl(mergedInterfacesWithInheritedPrivates.ts, 20, 14))
+    z!: string;
+>z : Symbol(E.z, Decl(mergedInterfacesWithInheritedPrivates.ts, 20, 15))
 }
 
-var a: A;
->a : Symbol(a, Decl(mergedInterfacesWithInheritedPrivates.ts, 24, 3))
+declare var a: A;
+>a : Symbol(a, Decl(mergedInterfacesWithInheritedPrivates.ts, 24, 11))
 >A : Symbol(A, Decl(mergedInterfacesWithInheritedPrivates.ts, 2, 1), Decl(mergedInterfacesWithInheritedPrivates.ts, 6, 1))
 
 var r = a.x; // error
 >r : Symbol(r, Decl(mergedInterfacesWithInheritedPrivates.ts, 25, 3))
 >a.x : Symbol(C.x, Decl(mergedInterfacesWithInheritedPrivates.ts, 0, 9))
->a : Symbol(a, Decl(mergedInterfacesWithInheritedPrivates.ts, 24, 3))
+>a : Symbol(a, Decl(mergedInterfacesWithInheritedPrivates.ts, 24, 11))
 >x : Symbol(C.x, Decl(mergedInterfacesWithInheritedPrivates.ts, 0, 9))
 
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.types b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.types
index e67dd805dfdb4..2564cc69e67f1 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.types
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.types
@@ -5,7 +5,7 @@ class C {
 >C : C
 >  : ^
 
-    private x: number;
+    private x!: number;
 >x : number
 >  : ^^^^^^
 }
@@ -26,15 +26,15 @@ class D implements A { // error
 >D : D
 >  : ^
 
-    private x: number;
+    private x!: number;
 >x : number
 >  : ^^^^^^
 
-    y: string;
+    y!: string;
 >y : string
 >  : ^^^^^^
 
-    z: string;
+    z!: string;
 >z : string
 >  : ^^^^^^
 }
@@ -43,20 +43,20 @@ class E implements A { // error
 >E : E
 >  : ^
 
-    x: number;
+    x!: number;
 >x : number
 >  : ^^^^^^
 
-    y: string;
+    y!: string;
 >y : string
 >  : ^^^^^^
 
-    z: string;
+    z!: string;
 >z : string
 >  : ^^^^^^
 }
 
-var a: A;
+declare var a: A;
 >a : A
 >  : ^
 
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt
index d43580c04f92b..2f5ad182f75ce 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt
@@ -10,11 +10,11 @@ mergedInterfacesWithInheritedPrivates2.ts(31,12): error TS2341: Property 'w' is
 
 ==== mergedInterfacesWithInheritedPrivates2.ts (5 errors) ====
     class C {
-        private x: number;
+        private x!: number;
     }
     
     class C2 {
-        private w: number;
+        private w!: number;
     }
     
     interface A extends C {
@@ -29,9 +29,9 @@ mergedInterfacesWithInheritedPrivates2.ts(31,12): error TS2341: Property 'w' is
           ~
 !!! error TS2420: Class 'D' incorrectly implements interface 'A'.
 !!! error TS2420:   Types have separate declarations of a private property 'w'.
-        private w: number;
-        y: string;
-        z: string;
+        private w!: number;
+        y!: string;
+        z!: string;
     }
     
     class E extends C2 implements A { // error
@@ -42,12 +42,12 @@ mergedInterfacesWithInheritedPrivates2.ts(31,12): error TS2341: Property 'w' is
 !!! error TS2420: Class 'E' incorrectly implements interface 'A'.
 !!! error TS2420:   Property 'x' is missing in type 'E' but required in type 'A'.
 !!! related TS2728 mergedInterfacesWithInheritedPrivates2.ts:2:13: 'x' is declared here.
-        w: number;
-        y: string;
-        z: string;
+        w!: number;
+        y!: string;
+        z!: string;
     }
     
-    var a: A;
+    declare var a: A;
     var r = a.x; // error
               ~
 !!! error TS2341: Property 'x' is private and only accessible within class 'C'.
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
index e58d454f3873b..9111c795c8a6b 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
@@ -2,11 +2,11 @@
 
 //// [mergedInterfacesWithInheritedPrivates2.ts]
 class C {
-    private x: number;
+    private x!: number;
 }
 
 class C2 {
-    private w: number;
+    private w!: number;
 }
 
 interface A extends C {
@@ -18,18 +18,18 @@ interface A extends C2 {
 }
 
 class D extends C implements A { // error
-    private w: number;
-    y: string;
-    z: string;
+    private w!: number;
+    y!: string;
+    z!: string;
 }
 
 class E extends C2 implements A { // error
-    w: number;
-    y: string;
-    z: string;
+    w!: number;
+    y!: string;
+    z!: string;
 }
 
-var a: A;
+declare var a: A;
 var r = a.x; // error
 var r2 = a.w; // error
 
@@ -73,6 +73,5 @@ var E = /** @class */ (function (_super) {
     }
     return E;
 }(C2));
-var a;
 var r = a.x; // error
 var r2 = a.w; // error
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.symbols b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.symbols
index caa0da8615faf..ac501abb6d22a 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.symbols
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.symbols
@@ -4,14 +4,14 @@
 class C {
 >C : Symbol(C, Decl(mergedInterfacesWithInheritedPrivates2.ts, 0, 0))
 
-    private x: number;
+    private x!: number;
 >x : Symbol(C.x, Decl(mergedInterfacesWithInheritedPrivates2.ts, 0, 9))
 }
 
 class C2 {
 >C2 : Symbol(C2, Decl(mergedInterfacesWithInheritedPrivates2.ts, 2, 1))
 
-    private w: number;
+    private w!: number;
 >w : Symbol(C2.w, Decl(mergedInterfacesWithInheritedPrivates2.ts, 4, 10))
 }
 
@@ -36,14 +36,14 @@ class D extends C implements A { // error
 >C : Symbol(C, Decl(mergedInterfacesWithInheritedPrivates2.ts, 0, 0))
 >A : Symbol(A, Decl(mergedInterfacesWithInheritedPrivates2.ts, 6, 1), Decl(mergedInterfacesWithInheritedPrivates2.ts, 10, 1))
 
-    private w: number;
+    private w!: number;
 >w : Symbol(D.w, Decl(mergedInterfacesWithInheritedPrivates2.ts, 16, 32))
 
-    y: string;
->y : Symbol(D.y, Decl(mergedInterfacesWithInheritedPrivates2.ts, 17, 22))
+    y!: string;
+>y : Symbol(D.y, Decl(mergedInterfacesWithInheritedPrivates2.ts, 17, 23))
 
-    z: string;
->z : Symbol(D.z, Decl(mergedInterfacesWithInheritedPrivates2.ts, 18, 14))
+    z!: string;
+>z : Symbol(D.z, Decl(mergedInterfacesWithInheritedPrivates2.ts, 18, 15))
 }
 
 class E extends C2 implements A { // error
@@ -51,29 +51,29 @@ class E extends C2 implements A { // error
 >C2 : Symbol(C2, Decl(mergedInterfacesWithInheritedPrivates2.ts, 2, 1))
 >A : Symbol(A, Decl(mergedInterfacesWithInheritedPrivates2.ts, 6, 1), Decl(mergedInterfacesWithInheritedPrivates2.ts, 10, 1))
 
-    w: number;
+    w!: number;
 >w : Symbol(E.w, Decl(mergedInterfacesWithInheritedPrivates2.ts, 22, 33))
 
-    y: string;
->y : Symbol(E.y, Decl(mergedInterfacesWithInheritedPrivates2.ts, 23, 14))
+    y!: string;
+>y : Symbol(E.y, Decl(mergedInterfacesWithInheritedPrivates2.ts, 23, 15))
 
-    z: string;
->z : Symbol(E.z, Decl(mergedInterfacesWithInheritedPrivates2.ts, 24, 14))
+    z!: string;
+>z : Symbol(E.z, Decl(mergedInterfacesWithInheritedPrivates2.ts, 24, 15))
 }
 
-var a: A;
->a : Symbol(a, Decl(mergedInterfacesWithInheritedPrivates2.ts, 28, 3))
+declare var a: A;
+>a : Symbol(a, Decl(mergedInterfacesWithInheritedPrivates2.ts, 28, 11))
 >A : Symbol(A, Decl(mergedInterfacesWithInheritedPrivates2.ts, 6, 1), Decl(mergedInterfacesWithInheritedPrivates2.ts, 10, 1))
 
 var r = a.x; // error
 >r : Symbol(r, Decl(mergedInterfacesWithInheritedPrivates2.ts, 29, 3))
 >a.x : Symbol(C.x, Decl(mergedInterfacesWithInheritedPrivates2.ts, 0, 9))
->a : Symbol(a, Decl(mergedInterfacesWithInheritedPrivates2.ts, 28, 3))
+>a : Symbol(a, Decl(mergedInterfacesWithInheritedPrivates2.ts, 28, 11))
 >x : Symbol(C.x, Decl(mergedInterfacesWithInheritedPrivates2.ts, 0, 9))
 
 var r2 = a.w; // error
 >r2 : Symbol(r2, Decl(mergedInterfacesWithInheritedPrivates2.ts, 30, 3))
 >a.w : Symbol(C2.w, Decl(mergedInterfacesWithInheritedPrivates2.ts, 4, 10))
->a : Symbol(a, Decl(mergedInterfacesWithInheritedPrivates2.ts, 28, 3))
+>a : Symbol(a, Decl(mergedInterfacesWithInheritedPrivates2.ts, 28, 11))
 >w : Symbol(C2.w, Decl(mergedInterfacesWithInheritedPrivates2.ts, 4, 10))
 
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.types b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.types
index 4e6978950c3ed..e9dc6134f0392 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.types
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.types
@@ -5,7 +5,7 @@ class C {
 >C : C
 >  : ^
 
-    private x: number;
+    private x!: number;
 >x : number
 >  : ^^^^^^
 }
@@ -14,7 +14,7 @@ class C2 {
 >C2 : C2
 >   : ^^
 
-    private w: number;
+    private w!: number;
 >w : number
 >  : ^^^^^^
 }
@@ -37,15 +37,15 @@ class D extends C implements A { // error
 >C : C
 >  : ^
 
-    private w: number;
+    private w!: number;
 >w : number
 >  : ^^^^^^
 
-    y: string;
+    y!: string;
 >y : string
 >  : ^^^^^^
 
-    z: string;
+    z!: string;
 >z : string
 >  : ^^^^^^
 }
@@ -56,20 +56,20 @@ class E extends C2 implements A { // error
 >C2 : C2
 >   : ^^
 
-    w: number;
+    w!: number;
 >w : number
 >  : ^^^^^^
 
-    y: string;
+    y!: string;
 >y : string
 >  : ^^^^^^
 
-    z: string;
+    z!: string;
 >z : string
 >  : ^^^^^^
 }
 
-var a: A;
+declare var a: A;
 >a : A
 >  : ^
 
diff --git a/tests/baselines/reference/metadataOfClassFromAlias(strict=false).js b/tests/baselines/reference/metadataOfClassFromAlias(strict=false).js
new file mode 100644
index 0000000000000..3caae58547030
--- /dev/null
+++ b/tests/baselines/reference/metadataOfClassFromAlias(strict=false).js
@@ -0,0 +1,89 @@
+//// [tests/cases/compiler/metadataOfClassFromAlias.ts] ////
+
+//// [auxiliary.ts]
+export class SomeClass {
+    field: string;
+}
+
+//// [testA.ts]
+import { SomeClass } from './auxiliary';
+function annotation(): PropertyDecorator {
+    return (target: any): void => { };
+}
+export class ClassA {
+    @annotation() aaa: SomeClass;
+}
+
+//// [testB.ts]
+import { SomeClass } from './auxiliary';
+function annotation(): PropertyDecorator {
+    return (target: any): void => { };
+}
+export class ClassB {
+    @annotation() bbb: SomeClass | null;
+}
+
+//// [auxiliary.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SomeClass = void 0;
+var SomeClass = /** @class */ (function () {
+    function SomeClass() {
+    }
+    return SomeClass;
+}());
+exports.SomeClass = SomeClass;
+//// [testA.js]
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClassA = void 0;
+var auxiliary_1 = require("./auxiliary");
+function annotation() {
+    return function (target) { };
+}
+var ClassA = /** @class */ (function () {
+    function ClassA() {
+    }
+    __decorate([
+        annotation(),
+        __metadata("design:type", auxiliary_1.SomeClass)
+    ], ClassA.prototype, "aaa", void 0);
+    return ClassA;
+}());
+exports.ClassA = ClassA;
+//// [testB.js]
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClassB = void 0;
+var auxiliary_1 = require("./auxiliary");
+function annotation() {
+    return function (target) { };
+}
+var ClassB = /** @class */ (function () {
+    function ClassB() {
+    }
+    __decorate([
+        annotation(),
+        __metadata("design:type", auxiliary_1.SomeClass)
+    ], ClassB.prototype, "bbb", void 0);
+    return ClassB;
+}());
+exports.ClassB = ClassB;
diff --git a/tests/baselines/reference/metadataOfClassFromAlias(strict=false).symbols b/tests/baselines/reference/metadataOfClassFromAlias(strict=false).symbols
new file mode 100644
index 0000000000000..11709d87afae1
--- /dev/null
+++ b/tests/baselines/reference/metadataOfClassFromAlias(strict=false).symbols
@@ -0,0 +1,49 @@
+//// [tests/cases/compiler/metadataOfClassFromAlias.ts] ////
+
+=== auxiliary.ts ===
+export class SomeClass {
+>SomeClass : Symbol(SomeClass, Decl(auxiliary.ts, 0, 0))
+
+    field: string;
+>field : Symbol(SomeClass.field, Decl(auxiliary.ts, 0, 24))
+}
+
+=== testA.ts ===
+import { SomeClass } from './auxiliary';
+>SomeClass : Symbol(SomeClass, Decl(testA.ts, 0, 8))
+
+function annotation(): PropertyDecorator {
+>annotation : Symbol(annotation, Decl(testA.ts, 0, 40))
+>PropertyDecorator : Symbol(PropertyDecorator, Decl(lib.decorators.legacy.d.ts, --, --))
+
+    return (target: any): void => { };
+>target : Symbol(target, Decl(testA.ts, 2, 12))
+}
+export class ClassA {
+>ClassA : Symbol(ClassA, Decl(testA.ts, 3, 1))
+
+    @annotation() aaa: SomeClass;
+>annotation : Symbol(annotation, Decl(testA.ts, 0, 40))
+>aaa : Symbol(ClassA.aaa, Decl(testA.ts, 4, 21))
+>SomeClass : Symbol(SomeClass, Decl(testA.ts, 0, 8))
+}
+
+=== testB.ts ===
+import { SomeClass } from './auxiliary';
+>SomeClass : Symbol(SomeClass, Decl(testB.ts, 0, 8))
+
+function annotation(): PropertyDecorator {
+>annotation : Symbol(annotation, Decl(testB.ts, 0, 40))
+>PropertyDecorator : Symbol(PropertyDecorator, Decl(lib.decorators.legacy.d.ts, --, --))
+
+    return (target: any): void => { };
+>target : Symbol(target, Decl(testB.ts, 2, 12))
+}
+export class ClassB {
+>ClassB : Symbol(ClassB, Decl(testB.ts, 3, 1))
+
+    @annotation() bbb: SomeClass | null;
+>annotation : Symbol(annotation, Decl(testB.ts, 0, 40))
+>bbb : Symbol(ClassB.bbb, Decl(testB.ts, 4, 21))
+>SomeClass : Symbol(SomeClass, Decl(testB.ts, 0, 8))
+}
diff --git a/tests/baselines/reference/metadataOfClassFromAlias(strict=false).types b/tests/baselines/reference/metadataOfClassFromAlias(strict=false).types
new file mode 100644
index 0000000000000..70c6e5161ba23
--- /dev/null
+++ b/tests/baselines/reference/metadataOfClassFromAlias(strict=false).types
@@ -0,0 +1,65 @@
+//// [tests/cases/compiler/metadataOfClassFromAlias.ts] ////
+
+=== auxiliary.ts ===
+export class SomeClass {
+>SomeClass : SomeClass
+>          : ^^^^^^^^^
+
+    field: string;
+>field : string
+>      : ^^^^^^
+}
+
+=== testA.ts ===
+import { SomeClass } from './auxiliary';
+>SomeClass : typeof SomeClass
+>          : ^^^^^^^^^^^^^^^^
+
+function annotation(): PropertyDecorator {
+>annotation : () => PropertyDecorator
+>           : ^^^^^^                 
+
+    return (target: any): void => { };
+>(target: any): void => { } : (target: any) => void
+>                           : ^      ^^   ^^^^^    
+>target : any
+}
+export class ClassA {
+>ClassA : ClassA
+>       : ^^^^^^
+
+    @annotation() aaa: SomeClass;
+>annotation() : PropertyDecorator
+>             : ^^^^^^^^^^^^^^^^^
+>annotation : () => PropertyDecorator
+>           : ^^^^^^                 
+>aaa : SomeClass
+>    : ^^^^^^^^^
+}
+
+=== testB.ts ===
+import { SomeClass } from './auxiliary';
+>SomeClass : typeof SomeClass
+>          : ^^^^^^^^^^^^^^^^
+
+function annotation(): PropertyDecorator {
+>annotation : () => PropertyDecorator
+>           : ^^^^^^                 
+
+    return (target: any): void => { };
+>(target: any): void => { } : (target: any) => void
+>                           : ^      ^^   ^^^^^    
+>target : any
+}
+export class ClassB {
+>ClassB : ClassB
+>       : ^^^^^^
+
+    @annotation() bbb: SomeClass | null;
+>annotation() : PropertyDecorator
+>             : ^^^^^^^^^^^^^^^^^
+>annotation : () => PropertyDecorator
+>           : ^^^^^^                 
+>bbb : SomeClass
+>    : ^^^^^^^^^
+}
diff --git a/tests/baselines/reference/metadataOfClassFromAlias(strict=true).errors.txt b/tests/baselines/reference/metadataOfClassFromAlias(strict=true).errors.txt
new file mode 100644
index 0000000000000..fa2ac7a8d184a
--- /dev/null
+++ b/tests/baselines/reference/metadataOfClassFromAlias(strict=true).errors.txt
@@ -0,0 +1,33 @@
+auxiliary.ts(2,5): error TS2564: Property 'field' has no initializer and is not definitely assigned in the constructor.
+testA.ts(6,19): error TS2564: Property 'aaa' has no initializer and is not definitely assigned in the constructor.
+testB.ts(6,19): error TS2564: Property 'bbb' has no initializer and is not definitely assigned in the constructor.
+
+
+==== auxiliary.ts (1 errors) ====
+    export class SomeClass {
+        field: string;
+        ~~~~~
+!!! error TS2564: Property 'field' has no initializer and is not definitely assigned in the constructor.
+    }
+    
+==== testA.ts (1 errors) ====
+    import { SomeClass } from './auxiliary';
+    function annotation(): PropertyDecorator {
+        return (target: any): void => { };
+    }
+    export class ClassA {
+        @annotation() aaa: SomeClass;
+                      ~~~
+!!! error TS2564: Property 'aaa' has no initializer and is not definitely assigned in the constructor.
+    }
+    
+==== testB.ts (1 errors) ====
+    import { SomeClass } from './auxiliary';
+    function annotation(): PropertyDecorator {
+        return (target: any): void => { };
+    }
+    export class ClassB {
+        @annotation() bbb: SomeClass | null;
+                      ~~~
+!!! error TS2564: Property 'bbb' has no initializer and is not definitely assigned in the constructor.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/metadataOfClassFromAlias(strict=true).js b/tests/baselines/reference/metadataOfClassFromAlias(strict=true).js
new file mode 100644
index 0000000000000..9dd50e5eed290
--- /dev/null
+++ b/tests/baselines/reference/metadataOfClassFromAlias(strict=true).js
@@ -0,0 +1,88 @@
+//// [tests/cases/compiler/metadataOfClassFromAlias.ts] ////
+
+//// [auxiliary.ts]
+export class SomeClass {
+    field: string;
+}
+
+//// [testA.ts]
+import { SomeClass } from './auxiliary';
+function annotation(): PropertyDecorator {
+    return (target: any): void => { };
+}
+export class ClassA {
+    @annotation() aaa: SomeClass;
+}
+
+//// [testB.ts]
+import { SomeClass } from './auxiliary';
+function annotation(): PropertyDecorator {
+    return (target: any): void => { };
+}
+export class ClassB {
+    @annotation() bbb: SomeClass | null;
+}
+
+//// [auxiliary.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SomeClass = void 0;
+var SomeClass = /** @class */ (function () {
+    function SomeClass() {
+    }
+    return SomeClass;
+}());
+exports.SomeClass = SomeClass;
+//// [testA.js]
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClassA = void 0;
+var auxiliary_1 = require("./auxiliary");
+function annotation() {
+    return function (target) { };
+}
+var ClassA = /** @class */ (function () {
+    function ClassA() {
+    }
+    __decorate([
+        annotation(),
+        __metadata("design:type", auxiliary_1.SomeClass)
+    ], ClassA.prototype, "aaa", void 0);
+    return ClassA;
+}());
+exports.ClassA = ClassA;
+//// [testB.js]
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClassB = void 0;
+function annotation() {
+    return function (target) { };
+}
+var ClassB = /** @class */ (function () {
+    function ClassB() {
+    }
+    __decorate([
+        annotation(),
+        __metadata("design:type", Object)
+    ], ClassB.prototype, "bbb", void 0);
+    return ClassB;
+}());
+exports.ClassB = ClassB;
diff --git a/tests/baselines/reference/metadataOfClassFromAlias(strict=true).symbols b/tests/baselines/reference/metadataOfClassFromAlias(strict=true).symbols
new file mode 100644
index 0000000000000..11709d87afae1
--- /dev/null
+++ b/tests/baselines/reference/metadataOfClassFromAlias(strict=true).symbols
@@ -0,0 +1,49 @@
+//// [tests/cases/compiler/metadataOfClassFromAlias.ts] ////
+
+=== auxiliary.ts ===
+export class SomeClass {
+>SomeClass : Symbol(SomeClass, Decl(auxiliary.ts, 0, 0))
+
+    field: string;
+>field : Symbol(SomeClass.field, Decl(auxiliary.ts, 0, 24))
+}
+
+=== testA.ts ===
+import { SomeClass } from './auxiliary';
+>SomeClass : Symbol(SomeClass, Decl(testA.ts, 0, 8))
+
+function annotation(): PropertyDecorator {
+>annotation : Symbol(annotation, Decl(testA.ts, 0, 40))
+>PropertyDecorator : Symbol(PropertyDecorator, Decl(lib.decorators.legacy.d.ts, --, --))
+
+    return (target: any): void => { };
+>target : Symbol(target, Decl(testA.ts, 2, 12))
+}
+export class ClassA {
+>ClassA : Symbol(ClassA, Decl(testA.ts, 3, 1))
+
+    @annotation() aaa: SomeClass;
+>annotation : Symbol(annotation, Decl(testA.ts, 0, 40))
+>aaa : Symbol(ClassA.aaa, Decl(testA.ts, 4, 21))
+>SomeClass : Symbol(SomeClass, Decl(testA.ts, 0, 8))
+}
+
+=== testB.ts ===
+import { SomeClass } from './auxiliary';
+>SomeClass : Symbol(SomeClass, Decl(testB.ts, 0, 8))
+
+function annotation(): PropertyDecorator {
+>annotation : Symbol(annotation, Decl(testB.ts, 0, 40))
+>PropertyDecorator : Symbol(PropertyDecorator, Decl(lib.decorators.legacy.d.ts, --, --))
+
+    return (target: any): void => { };
+>target : Symbol(target, Decl(testB.ts, 2, 12))
+}
+export class ClassB {
+>ClassB : Symbol(ClassB, Decl(testB.ts, 3, 1))
+
+    @annotation() bbb: SomeClass | null;
+>annotation : Symbol(annotation, Decl(testB.ts, 0, 40))
+>bbb : Symbol(ClassB.bbb, Decl(testB.ts, 4, 21))
+>SomeClass : Symbol(SomeClass, Decl(testB.ts, 0, 8))
+}
diff --git a/tests/baselines/reference/metadataOfClassFromAlias(strict=true).types b/tests/baselines/reference/metadataOfClassFromAlias(strict=true).types
new file mode 100644
index 0000000000000..06e5367e6f358
--- /dev/null
+++ b/tests/baselines/reference/metadataOfClassFromAlias(strict=true).types
@@ -0,0 +1,67 @@
+//// [tests/cases/compiler/metadataOfClassFromAlias.ts] ////
+
+=== auxiliary.ts ===
+export class SomeClass {
+>SomeClass : SomeClass
+>          : ^^^^^^^^^
+
+    field: string;
+>field : string
+>      : ^^^^^^
+}
+
+=== testA.ts ===
+import { SomeClass } from './auxiliary';
+>SomeClass : typeof SomeClass
+>          : ^^^^^^^^^^^^^^^^
+
+function annotation(): PropertyDecorator {
+>annotation : () => PropertyDecorator
+>           : ^^^^^^                 
+
+    return (target: any): void => { };
+>(target: any): void => { } : (target: any) => void
+>                           : ^      ^^   ^^^^^    
+>target : any
+>       : ^^^
+}
+export class ClassA {
+>ClassA : ClassA
+>       : ^^^^^^
+
+    @annotation() aaa: SomeClass;
+>annotation() : PropertyDecorator
+>             : ^^^^^^^^^^^^^^^^^
+>annotation : () => PropertyDecorator
+>           : ^^^^^^                 
+>aaa : SomeClass
+>    : ^^^^^^^^^
+}
+
+=== testB.ts ===
+import { SomeClass } from './auxiliary';
+>SomeClass : typeof SomeClass
+>          : ^^^^^^^^^^^^^^^^
+
+function annotation(): PropertyDecorator {
+>annotation : () => PropertyDecorator
+>           : ^^^^^^                 
+
+    return (target: any): void => { };
+>(target: any): void => { } : (target: any) => void
+>                           : ^      ^^   ^^^^^    
+>target : any
+>       : ^^^
+}
+export class ClassB {
+>ClassB : ClassB
+>       : ^^^^^^
+
+    @annotation() bbb: SomeClass | null;
+>annotation() : PropertyDecorator
+>             : ^^^^^^^^^^^^^^^^^
+>annotation : () => PropertyDecorator
+>           : ^^^^^^                 
+>bbb : SomeClass | null
+>    : ^^^^^^^^^^^^^^^^
+}
diff --git a/tests/baselines/reference/metadataOfClassFromAlias.js b/tests/baselines/reference/metadataOfClassFromAlias.js
deleted file mode 100644
index 657cdf21f975f..0000000000000
--- a/tests/baselines/reference/metadataOfClassFromAlias.js
+++ /dev/null
@@ -1,53 +0,0 @@
-//// [tests/cases/compiler/metadataOfClassFromAlias.ts] ////
-
-//// [auxiliry.ts]
-export class SomeClass {
-    field: string;
-}
-
-//// [test.ts]
-import { SomeClass } from './auxiliry';
-function annotation(): PropertyDecorator {
-    return (target: any): void => { };
-}
-export class ClassA {
-    @annotation() array: SomeClass | null;
-}
-
-//// [auxiliry.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SomeClass = void 0;
-var SomeClass = /** @class */ (function () {
-    function SomeClass() {
-    }
-    return SomeClass;
-}());
-exports.SomeClass = SomeClass;
-//// [test.js]
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClassA = void 0;
-var auxiliry_1 = require("./auxiliry");
-function annotation() {
-    return function (target) { };
-}
-var ClassA = /** @class */ (function () {
-    function ClassA() {
-    }
-    __decorate([
-        annotation(),
-        __metadata("design:type", auxiliry_1.SomeClass)
-    ], ClassA.prototype, "array", void 0);
-    return ClassA;
-}());
-exports.ClassA = ClassA;
diff --git a/tests/baselines/reference/metadataOfClassFromAlias.symbols b/tests/baselines/reference/metadataOfClassFromAlias.symbols
deleted file mode 100644
index b11225e880e93..0000000000000
--- a/tests/baselines/reference/metadataOfClassFromAlias.symbols
+++ /dev/null
@@ -1,29 +0,0 @@
-//// [tests/cases/compiler/metadataOfClassFromAlias.ts] ////
-
-=== auxiliry.ts ===
-export class SomeClass {
->SomeClass : Symbol(SomeClass, Decl(auxiliry.ts, 0, 0))
-
-    field: string;
->field : Symbol(SomeClass.field, Decl(auxiliry.ts, 0, 24))
-}
-
-=== test.ts ===
-import { SomeClass } from './auxiliry';
->SomeClass : Symbol(SomeClass, Decl(test.ts, 0, 8))
-
-function annotation(): PropertyDecorator {
->annotation : Symbol(annotation, Decl(test.ts, 0, 39))
->PropertyDecorator : Symbol(PropertyDecorator, Decl(lib.decorators.legacy.d.ts, --, --))
-
-    return (target: any): void => { };
->target : Symbol(target, Decl(test.ts, 2, 12))
-}
-export class ClassA {
->ClassA : Symbol(ClassA, Decl(test.ts, 3, 1))
-
-    @annotation() array: SomeClass | null;
->annotation : Symbol(annotation, Decl(test.ts, 0, 39))
->array : Symbol(ClassA.array, Decl(test.ts, 4, 21))
->SomeClass : Symbol(SomeClass, Decl(test.ts, 0, 8))
-}
diff --git a/tests/baselines/reference/metadataOfClassFromAlias.types b/tests/baselines/reference/metadataOfClassFromAlias.types
deleted file mode 100644
index 4cb3f654a5c87..0000000000000
--- a/tests/baselines/reference/metadataOfClassFromAlias.types
+++ /dev/null
@@ -1,38 +0,0 @@
-//// [tests/cases/compiler/metadataOfClassFromAlias.ts] ////
-
-=== auxiliry.ts ===
-export class SomeClass {
->SomeClass : SomeClass
->          : ^^^^^^^^^
-
-    field: string;
->field : string
->      : ^^^^^^
-}
-
-=== test.ts ===
-import { SomeClass } from './auxiliry';
->SomeClass : typeof SomeClass
->          : ^^^^^^^^^^^^^^^^
-
-function annotation(): PropertyDecorator {
->annotation : () => PropertyDecorator
->           : ^^^^^^                 
-
-    return (target: any): void => { };
->(target: any): void => { } : (target: any) => void
->                           : ^      ^^   ^^^^^    
->target : any
-}
-export class ClassA {
->ClassA : ClassA
->       : ^^^^^^
-
-    @annotation() array: SomeClass | null;
->annotation() : PropertyDecorator
->             : ^^^^^^^^^^^^^^^^^
->annotation : () => PropertyDecorator
->           : ^^^^^^                 
->array : SomeClass
->      : ^^^^^^^^^
-}
diff --git a/tests/baselines/reference/metadataOfUnionWithNull.js b/tests/baselines/reference/metadataOfUnionWithNull(strictnullchecks=false).js
similarity index 100%
rename from tests/baselines/reference/metadataOfUnionWithNull.js
rename to tests/baselines/reference/metadataOfUnionWithNull(strictnullchecks=false).js
diff --git a/tests/baselines/reference/metadataOfUnionWithNull.symbols b/tests/baselines/reference/metadataOfUnionWithNull(strictnullchecks=false).symbols
similarity index 100%
rename from tests/baselines/reference/metadataOfUnionWithNull.symbols
rename to tests/baselines/reference/metadataOfUnionWithNull(strictnullchecks=false).symbols
diff --git a/tests/baselines/reference/metadataOfUnionWithNull.types b/tests/baselines/reference/metadataOfUnionWithNull(strictnullchecks=false).types
similarity index 100%
rename from tests/baselines/reference/metadataOfUnionWithNull.types
rename to tests/baselines/reference/metadataOfUnionWithNull(strictnullchecks=false).types
diff --git a/tests/baselines/reference/metadataOfUnionWithNull(strictnullchecks=true).js b/tests/baselines/reference/metadataOfUnionWithNull(strictnullchecks=true).js
new file mode 100644
index 0000000000000..877fcb4ae1dcf
--- /dev/null
+++ b/tests/baselines/reference/metadataOfUnionWithNull(strictnullchecks=true).js
@@ -0,0 +1,115 @@
+//// [tests/cases/compiler/metadataOfUnionWithNull.ts] ////
+
+//// [metadataOfUnionWithNull.ts]
+function PropDeco(target: Object, propKey: string | symbol) { }
+
+class A {
+}
+
+class B {
+    @PropDeco
+    x: "foo" | null;
+
+    @PropDeco
+    y: true | never;
+
+    @PropDeco
+    z: "foo" | undefined;
+
+    @PropDeco
+    a: null;
+
+    @PropDeco
+    b: never;
+
+    @PropDeco
+    c: undefined;
+
+    @PropDeco
+    d: undefined | null;
+
+    @PropDeco
+    e: symbol | null;
+
+    @PropDeco
+    f: symbol | A;
+
+    @PropDeco
+    g: A | null;
+
+    @PropDeco
+    h: null | B;
+
+    @PropDeco
+    j: null | symbol;
+}
+
+//// [metadataOfUnionWithNull.js]
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+function PropDeco(target, propKey) { }
+var A = /** @class */ (function () {
+    function A() {
+    }
+    return A;
+}());
+var B = /** @class */ (function () {
+    function B() {
+    }
+    __decorate([
+        PropDeco,
+        __metadata("design:type", Object)
+    ], B.prototype, "x", void 0);
+    __decorate([
+        PropDeco,
+        __metadata("design:type", Boolean)
+    ], B.prototype, "y", void 0);
+    __decorate([
+        PropDeco,
+        __metadata("design:type", Object)
+    ], B.prototype, "z", void 0);
+    __decorate([
+        PropDeco,
+        __metadata("design:type", void 0)
+    ], B.prototype, "a", void 0);
+    __decorate([
+        PropDeco,
+        __metadata("design:type", void 0)
+    ], B.prototype, "b", void 0);
+    __decorate([
+        PropDeco,
+        __metadata("design:type", void 0)
+    ], B.prototype, "c", void 0);
+    __decorate([
+        PropDeco,
+        __metadata("design:type", void 0)
+    ], B.prototype, "d", void 0);
+    __decorate([
+        PropDeco,
+        __metadata("design:type", Object)
+    ], B.prototype, "e", void 0);
+    __decorate([
+        PropDeco,
+        __metadata("design:type", Object)
+    ], B.prototype, "f", void 0);
+    __decorate([
+        PropDeco,
+        __metadata("design:type", Object)
+    ], B.prototype, "g", void 0);
+    __decorate([
+        PropDeco,
+        __metadata("design:type", Object)
+    ], B.prototype, "h", void 0);
+    __decorate([
+        PropDeco,
+        __metadata("design:type", Object)
+    ], B.prototype, "j", void 0);
+    return B;
+}());
diff --git a/tests/baselines/reference/metadataOfUnionWithNull(strictnullchecks=true).symbols b/tests/baselines/reference/metadataOfUnionWithNull(strictnullchecks=true).symbols
new file mode 100644
index 0000000000000..8405164fbabfa
--- /dev/null
+++ b/tests/baselines/reference/metadataOfUnionWithNull(strictnullchecks=true).symbols
@@ -0,0 +1,91 @@
+//// [tests/cases/compiler/metadataOfUnionWithNull.ts] ////
+
+=== metadataOfUnionWithNull.ts ===
+function PropDeco(target: Object, propKey: string | symbol) { }
+>PropDeco : Symbol(PropDeco, Decl(metadataOfUnionWithNull.ts, 0, 0))
+>target : Symbol(target, Decl(metadataOfUnionWithNull.ts, 0, 18))
+>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>propKey : Symbol(propKey, Decl(metadataOfUnionWithNull.ts, 0, 33))
+
+class A {
+>A : Symbol(A, Decl(metadataOfUnionWithNull.ts, 0, 63))
+}
+
+class B {
+>B : Symbol(B, Decl(metadataOfUnionWithNull.ts, 3, 1))
+
+    @PropDeco
+>PropDeco : Symbol(PropDeco, Decl(metadataOfUnionWithNull.ts, 0, 0))
+
+    x: "foo" | null;
+>x : Symbol(B.x, Decl(metadataOfUnionWithNull.ts, 5, 9))
+
+    @PropDeco
+>PropDeco : Symbol(PropDeco, Decl(metadataOfUnionWithNull.ts, 0, 0))
+
+    y: true | never;
+>y : Symbol(B.y, Decl(metadataOfUnionWithNull.ts, 7, 20))
+
+    @PropDeco
+>PropDeco : Symbol(PropDeco, Decl(metadataOfUnionWithNull.ts, 0, 0))
+
+    z: "foo" | undefined;
+>z : Symbol(B.z, Decl(metadataOfUnionWithNull.ts, 10, 20))
+
+    @PropDeco
+>PropDeco : Symbol(PropDeco, Decl(metadataOfUnionWithNull.ts, 0, 0))
+
+    a: null;
+>a : Symbol(B.a, Decl(metadataOfUnionWithNull.ts, 13, 25))
+
+    @PropDeco
+>PropDeco : Symbol(PropDeco, Decl(metadataOfUnionWithNull.ts, 0, 0))
+
+    b: never;
+>b : Symbol(B.b, Decl(metadataOfUnionWithNull.ts, 16, 12))
+
+    @PropDeco
+>PropDeco : Symbol(PropDeco, Decl(metadataOfUnionWithNull.ts, 0, 0))
+
+    c: undefined;
+>c : Symbol(B.c, Decl(metadataOfUnionWithNull.ts, 19, 13))
+
+    @PropDeco
+>PropDeco : Symbol(PropDeco, Decl(metadataOfUnionWithNull.ts, 0, 0))
+
+    d: undefined | null;
+>d : Symbol(B.d, Decl(metadataOfUnionWithNull.ts, 22, 17))
+
+    @PropDeco
+>PropDeco : Symbol(PropDeco, Decl(metadataOfUnionWithNull.ts, 0, 0))
+
+    e: symbol | null;
+>e : Symbol(B.e, Decl(metadataOfUnionWithNull.ts, 25, 24))
+
+    @PropDeco
+>PropDeco : Symbol(PropDeco, Decl(metadataOfUnionWithNull.ts, 0, 0))
+
+    f: symbol | A;
+>f : Symbol(B.f, Decl(metadataOfUnionWithNull.ts, 28, 21))
+>A : Symbol(A, Decl(metadataOfUnionWithNull.ts, 0, 63))
+
+    @PropDeco
+>PropDeco : Symbol(PropDeco, Decl(metadataOfUnionWithNull.ts, 0, 0))
+
+    g: A | null;
+>g : Symbol(B.g, Decl(metadataOfUnionWithNull.ts, 31, 18))
+>A : Symbol(A, Decl(metadataOfUnionWithNull.ts, 0, 63))
+
+    @PropDeco
+>PropDeco : Symbol(PropDeco, Decl(metadataOfUnionWithNull.ts, 0, 0))
+
+    h: null | B;
+>h : Symbol(B.h, Decl(metadataOfUnionWithNull.ts, 34, 16))
+>B : Symbol(B, Decl(metadataOfUnionWithNull.ts, 3, 1))
+
+    @PropDeco
+>PropDeco : Symbol(PropDeco, Decl(metadataOfUnionWithNull.ts, 0, 0))
+
+    j: null | symbol;
+>j : Symbol(B.j, Decl(metadataOfUnionWithNull.ts, 37, 16))
+}
diff --git a/tests/baselines/reference/metadataOfUnionWithNull(strictnullchecks=true).types b/tests/baselines/reference/metadataOfUnionWithNull(strictnullchecks=true).types
new file mode 100644
index 0000000000000..d175797d3c774
--- /dev/null
+++ b/tests/baselines/reference/metadataOfUnionWithNull(strictnullchecks=true).types
@@ -0,0 +1,118 @@
+//// [tests/cases/compiler/metadataOfUnionWithNull.ts] ////
+
+=== metadataOfUnionWithNull.ts ===
+function PropDeco(target: Object, propKey: string | symbol) { }
+>PropDeco : (target: Object, propKey: string | symbol) => void
+>         : ^      ^^      ^^       ^^               ^^^^^^^^^
+>target : Object
+>       : ^^^^^^
+>propKey : string | symbol
+>        : ^^^^^^^^^^^^^^^
+
+class A {
+>A : A
+>  : ^
+}
+
+class B {
+>B : B
+>  : ^
+
+    @PropDeco
+>PropDeco : (target: Object, propKey: string | symbol) => void
+>         : ^      ^^      ^^       ^^               ^^^^^^^^^
+
+    x: "foo" | null;
+>x : "foo" | null
+>  : ^^^^^^^^^^^^
+
+    @PropDeco
+>PropDeco : (target: Object, propKey: string | symbol) => void
+>         : ^      ^^      ^^       ^^               ^^^^^^^^^
+
+    y: true | never;
+>y : true
+>  : ^^^^
+>true : true
+>     : ^^^^
+
+    @PropDeco
+>PropDeco : (target: Object, propKey: string | symbol) => void
+>         : ^      ^^      ^^       ^^               ^^^^^^^^^
+
+    z: "foo" | undefined;
+>z : "foo" | undefined
+>  : ^^^^^^^^^^^^^^^^^
+
+    @PropDeco
+>PropDeco : (target: Object, propKey: string | symbol) => void
+>         : ^      ^^      ^^       ^^               ^^^^^^^^^
+
+    a: null;
+>a : null
+>  : ^^^^
+
+    @PropDeco
+>PropDeco : (target: Object, propKey: string | symbol) => void
+>         : ^      ^^      ^^       ^^               ^^^^^^^^^
+
+    b: never;
+>b : never
+>  : ^^^^^
+
+    @PropDeco
+>PropDeco : (target: Object, propKey: string | symbol) => void
+>         : ^      ^^      ^^       ^^               ^^^^^^^^^
+
+    c: undefined;
+>c : undefined
+>  : ^^^^^^^^^
+
+    @PropDeco
+>PropDeco : (target: Object, propKey: string | symbol) => void
+>         : ^      ^^      ^^       ^^               ^^^^^^^^^
+
+    d: undefined | null;
+>d : null | undefined
+>  : ^^^^^^^^^^^^^^^^
+
+    @PropDeco
+>PropDeco : (target: Object, propKey: string | symbol) => void
+>         : ^      ^^      ^^       ^^               ^^^^^^^^^
+
+    e: symbol | null;
+>e : symbol | null
+>  : ^^^^^^^^^^^^^
+
+    @PropDeco
+>PropDeco : (target: Object, propKey: string | symbol) => void
+>         : ^      ^^      ^^       ^^               ^^^^^^^^^
+
+    f: symbol | A;
+>f : symbol | A
+>  : ^^^^^^^^^^
+
+    @PropDeco
+>PropDeco : (target: Object, propKey: string | symbol) => void
+>         : ^      ^^      ^^       ^^               ^^^^^^^^^
+
+    g: A | null;
+>g : A | null
+>  : ^^^^^^^^
+
+    @PropDeco
+>PropDeco : (target: Object, propKey: string | symbol) => void
+>         : ^      ^^      ^^       ^^               ^^^^^^^^^
+
+    h: null | B;
+>h : B | null
+>  : ^^^^^^^^
+
+    @PropDeco
+>PropDeco : (target: Object, propKey: string | symbol) => void
+>         : ^      ^^      ^^       ^^               ^^^^^^^^^
+
+    j: null | symbol;
+>j : symbol | null
+>  : ^^^^^^^^^^^^^
+}
diff --git a/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=false).js b/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=false).js
new file mode 100644
index 0000000000000..66e3281eefbfa
--- /dev/null
+++ b/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=false).js
@@ -0,0 +1,78 @@
+//// [tests/cases/compiler/metadataReferencedWithinFilteredUnion.ts] ////
+
+//// [Class1.ts]
+export class Class1 {
+}
+//// [Class2.ts]
+import { Class1 } from './Class1';
+
+function decorate(target: any, propertyKey: string) {
+}
+
+export class Class2 {
+    @decorate
+    get maybeProp(): Class1 | undefined {
+        return undefined;
+    }
+    @decorate
+    get prop(): Class1 {
+        return undefined;
+    }
+}
+
+//// [Class1.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Class1 = void 0;
+var Class1 = /** @class */ (function () {
+    function Class1() {
+    }
+    return Class1;
+}());
+exports.Class1 = Class1;
+//// [Class2.js]
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Class2 = void 0;
+var Class1_1 = require("./Class1");
+function decorate(target, propertyKey) {
+}
+var Class2 = /** @class */ (function () {
+    function Class2() {
+    }
+    Object.defineProperty(Class2.prototype, "maybeProp", {
+        get: function () {
+            return undefined;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Class2.prototype, "prop", {
+        get: function () {
+            return undefined;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    __decorate([
+        decorate,
+        __metadata("design:type", Class1_1.Class1),
+        __metadata("design:paramtypes", [])
+    ], Class2.prototype, "maybeProp", null);
+    __decorate([
+        decorate,
+        __metadata("design:type", Class1_1.Class1),
+        __metadata("design:paramtypes", [])
+    ], Class2.prototype, "prop", null);
+    return Class2;
+}());
+exports.Class2 = Class2;
diff --git a/tests/baselines/reference/metadataReferencedWithinFilteredUnion.symbols b/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=false).symbols
similarity index 64%
rename from tests/baselines/reference/metadataReferencedWithinFilteredUnion.symbols
rename to tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=false).symbols
index 2b764c948f624..cf34ba8b9fe0d 100644
--- a/tests/baselines/reference/metadataReferencedWithinFilteredUnion.symbols
+++ b/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=false).symbols
@@ -20,8 +20,18 @@ export class Class2 {
     @decorate
 >decorate : Symbol(decorate, Decl(Class2.ts, 0, 34))
 
-    get prop(): Class1 | undefined {
->prop : Symbol(Class2.prop, Decl(Class2.ts, 5, 21))
+    get maybeProp(): Class1 | undefined {
+>maybeProp : Symbol(Class2.maybeProp, Decl(Class2.ts, 5, 21))
+>Class1 : Symbol(Class1, Decl(Class2.ts, 0, 8))
+
+        return undefined;
+>undefined : Symbol(undefined)
+    }
+    @decorate
+>decorate : Symbol(decorate, Decl(Class2.ts, 0, 34))
+
+    get prop(): Class1 {
+>prop : Symbol(Class2.prop, Decl(Class2.ts, 9, 5))
 >Class1 : Symbol(Class1, Decl(Class2.ts, 0, 8))
 
         return undefined;
diff --git a/tests/baselines/reference/metadataReferencedWithinFilteredUnion.types b/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=false).types
similarity index 68%
rename from tests/baselines/reference/metadataReferencedWithinFilteredUnion.types
rename to tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=false).types
index 458131de33109..5a596676a3f05 100644
--- a/tests/baselines/reference/metadataReferencedWithinFilteredUnion.types
+++ b/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=false).types
@@ -26,7 +26,19 @@ export class Class2 {
 >decorate : (target: any, propertyKey: string) => void
 >         : ^      ^^   ^^           ^^      ^^^^^^^^^
 
-    get prop(): Class1 | undefined {
+    get maybeProp(): Class1 | undefined {
+>maybeProp : Class1
+>          : ^^^^^^
+
+        return undefined;
+>undefined : undefined
+>          : ^^^^^^^^^
+    }
+    @decorate
+>decorate : (target: any, propertyKey: string) => void
+>         : ^      ^^   ^^           ^^      ^^^^^^^^^
+
+    get prop(): Class1 {
 >prop : Class1
 >     : ^^^^^^
 
diff --git a/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=true).errors.txt b/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=true).errors.txt
new file mode 100644
index 0000000000000..4e39e852206b1
--- /dev/null
+++ b/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=true).errors.txt
@@ -0,0 +1,24 @@
+Class2.ts(13,9): error TS2322: Type 'undefined' is not assignable to type 'Class1'.
+
+
+==== Class1.ts (0 errors) ====
+    export class Class1 {
+    }
+==== Class2.ts (1 errors) ====
+    import { Class1 } from './Class1';
+    
+    function decorate(target: any, propertyKey: string) {
+    }
+    
+    export class Class2 {
+        @decorate
+        get maybeProp(): Class1 | undefined {
+            return undefined;
+        }
+        @decorate
+        get prop(): Class1 {
+            return undefined;
+            ~~~~~~
+!!! error TS2322: Type 'undefined' is not assignable to type 'Class1'.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/metadataReferencedWithinFilteredUnion.js b/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=true).js
similarity index 78%
rename from tests/baselines/reference/metadataReferencedWithinFilteredUnion.js
rename to tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=true).js
index 7c7d70c749b5a..809fb44c978ea 100644
--- a/tests/baselines/reference/metadataReferencedWithinFilteredUnion.js
+++ b/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=true).js
@@ -11,7 +11,11 @@ function decorate(target: any, propertyKey: string) {
 
 export class Class2 {
     @decorate
-    get prop(): Class1 | undefined {
+    get maybeProp(): Class1 | undefined {
+        return undefined;
+    }
+    @decorate
+    get prop(): Class1 {
         return undefined;
     }
 }
@@ -45,6 +49,13 @@ function decorate(target, propertyKey) {
 var Class2 = /** @class */ (function () {
     function Class2() {
     }
+    Object.defineProperty(Class2.prototype, "maybeProp", {
+        get: function () {
+            return undefined;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(Class2.prototype, "prop", {
         get: function () {
             return undefined;
@@ -52,6 +63,11 @@ var Class2 = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    __decorate([
+        decorate,
+        __metadata("design:type", Object),
+        __metadata("design:paramtypes", [])
+    ], Class2.prototype, "maybeProp", null);
     __decorate([
         decorate,
         __metadata("design:type", Class1_1.Class1),
diff --git a/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=true).symbols b/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=true).symbols
new file mode 100644
index 0000000000000..cf34ba8b9fe0d
--- /dev/null
+++ b/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=true).symbols
@@ -0,0 +1,40 @@
+//// [tests/cases/compiler/metadataReferencedWithinFilteredUnion.ts] ////
+
+=== Class1.ts ===
+export class Class1 {
+>Class1 : Symbol(Class1, Decl(Class1.ts, 0, 0))
+}
+=== Class2.ts ===
+import { Class1 } from './Class1';
+>Class1 : Symbol(Class1, Decl(Class2.ts, 0, 8))
+
+function decorate(target: any, propertyKey: string) {
+>decorate : Symbol(decorate, Decl(Class2.ts, 0, 34))
+>target : Symbol(target, Decl(Class2.ts, 2, 18))
+>propertyKey : Symbol(propertyKey, Decl(Class2.ts, 2, 30))
+}
+
+export class Class2 {
+>Class2 : Symbol(Class2, Decl(Class2.ts, 3, 1))
+
+    @decorate
+>decorate : Symbol(decorate, Decl(Class2.ts, 0, 34))
+
+    get maybeProp(): Class1 | undefined {
+>maybeProp : Symbol(Class2.maybeProp, Decl(Class2.ts, 5, 21))
+>Class1 : Symbol(Class1, Decl(Class2.ts, 0, 8))
+
+        return undefined;
+>undefined : Symbol(undefined)
+    }
+    @decorate
+>decorate : Symbol(decorate, Decl(Class2.ts, 0, 34))
+
+    get prop(): Class1 {
+>prop : Symbol(Class2.prop, Decl(Class2.ts, 9, 5))
+>Class1 : Symbol(Class1, Decl(Class2.ts, 0, 8))
+
+        return undefined;
+>undefined : Symbol(undefined)
+    }
+}
diff --git a/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=true).types b/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=true).types
new file mode 100644
index 0000000000000..248837954bead
--- /dev/null
+++ b/tests/baselines/reference/metadataReferencedWithinFilteredUnion(strictnullchecks=true).types
@@ -0,0 +1,50 @@
+//// [tests/cases/compiler/metadataReferencedWithinFilteredUnion.ts] ////
+
+=== Class1.ts ===
+export class Class1 {
+>Class1 : Class1
+>       : ^^^^^^
+}
+=== Class2.ts ===
+import { Class1 } from './Class1';
+>Class1 : typeof Class1
+>       : ^^^^^^^^^^^^^
+
+function decorate(target: any, propertyKey: string) {
+>decorate : (target: any, propertyKey: string) => void
+>         : ^      ^^   ^^           ^^      ^^^^^^^^^
+>target : any
+>       : ^^^
+>propertyKey : string
+>            : ^^^^^^
+}
+
+export class Class2 {
+>Class2 : Class2
+>       : ^^^^^^
+
+    @decorate
+>decorate : (target: any, propertyKey: string) => void
+>         : ^      ^^   ^^           ^^      ^^^^^^^^^
+
+    get maybeProp(): Class1 | undefined {
+>maybeProp : Class1 | undefined
+>          : ^^^^^^^^^^^^^^^^^^
+
+        return undefined;
+>undefined : undefined
+>          : ^^^^^^^^^
+    }
+    @decorate
+>decorate : (target: any, propertyKey: string) => void
+>         : ^      ^^   ^^           ^^      ^^^^^^^^^
+
+    get prop(): Class1 {
+>prop : Class1
+>     : ^^^^^^
+
+        return undefined;
+>undefined : undefined
+>          : ^^^^^^^^^
+    }
+}
diff --git a/tests/baselines/reference/methodsReturningThis.errors.txt b/tests/baselines/reference/methodsReturningThis.errors.txt
new file mode 100644
index 0000000000000..3ff49743c8a31
--- /dev/null
+++ b/tests/baselines/reference/methodsReturningThis.errors.txt
@@ -0,0 +1,24 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== input.js (0 errors) ====
+    function Class()
+    {
+    }
+    
+    // error: 'Class' doesn't have property 'notPresent'
+    Class.prototype.containsError = function () { return this.notPresent; };
+    
+    // lots of methods that return this, which caused out-of-memory in #9527
+    Class.prototype.m1 = function (a, b, c, d, tx, ty) { return this; };
+    Class.prototype.m2 = function (x, y) { return this; };
+    Class.prototype.m3 = function (x, y) { return this; };
+    Class.prototype.m4 = function (angle) { return this; };
+    Class.prototype.m5 = function (matrix) { return this; };
+    Class.prototype.m6 = function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; };
+    Class.prototype.m7 = function(matrix) { return this; };
+    Class.prototype.m8 = function() { return this; };
+    Class.prototype.m9 = function () { return this; };
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/methodsReturningThis.types b/tests/baselines/reference/methodsReturningThis.types
index a08b8208e1889..9d7bcaba68b4d 100644
--- a/tests/baselines/reference/methodsReturningThis.types
+++ b/tests/baselines/reference/methodsReturningThis.types
@@ -12,6 +12,7 @@ Class.prototype.containsError = function () { return this.notPresent; };
 >Class.prototype.containsError = function () { return this.notPresent; } : () => any
 >                                                                        : ^^^^^^^^^
 >Class.prototype.containsError : any
+>                              : ^^^
 >Class.prototype : any
 >                : ^^^
 >Class : typeof Class
@@ -22,7 +23,8 @@ Class.prototype.containsError = function () { return this.notPresent; };
 >              : ^^^
 >function () { return this.notPresent; } : () => any
 >                                        : ^^^^^^^^^
->this.notPresent : error
+>this.notPresent : any
+>                : ^^^
 >this : this
 >     : ^^^^
 >notPresent : any
@@ -33,6 +35,7 @@ Class.prototype.m1 = function (a, b, c, d, tx, ty) { return this; };
 >Class.prototype.m1 = function (a, b, c, d, tx, ty) { return this; } : (a: any, b: any, c: any, d: any, tx: any, ty: any) => this
 >                                                                    : ^ ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^^^^^^  ^^^^^^^  ^^^^^^^^^^^^^^
 >Class.prototype.m1 : any
+>                   : ^^^
 >Class.prototype : any
 >                : ^^^
 >Class : typeof Class
@@ -44,11 +47,17 @@ Class.prototype.m1 = function (a, b, c, d, tx, ty) { return this; };
 >function (a, b, c, d, tx, ty) { return this; } : (a: any, b: any, c: any, d: any, tx: any, ty: any) => this
 >                                               : ^ ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^^^^^^  ^^^^^^^  ^^^^^^^^^^^^^^
 >a : any
+>  : ^^^
 >b : any
+>  : ^^^
 >c : any
+>  : ^^^
 >d : any
+>  : ^^^
 >tx : any
+>   : ^^^
 >ty : any
+>   : ^^^
 >this : this
 >     : ^^^^
 
@@ -56,6 +65,7 @@ Class.prototype.m2 = function (x, y) { return this; };
 >Class.prototype.m2 = function (x, y) { return this; } : (x: any, y: any) => this
 >                                                      : ^ ^^^^^^^ ^^^^^^^^^^^^^^
 >Class.prototype.m2 : any
+>                   : ^^^
 >Class.prototype : any
 >                : ^^^
 >Class : typeof Class
@@ -67,7 +77,9 @@ Class.prototype.m2 = function (x, y) { return this; };
 >function (x, y) { return this; } : (x: any, y: any) => this
 >                                 : ^ ^^^^^^^ ^^^^^^^^^^^^^^
 >x : any
+>  : ^^^
 >y : any
+>  : ^^^
 >this : this
 >     : ^^^^
 
@@ -75,6 +87,7 @@ Class.prototype.m3 = function (x, y) { return this; };
 >Class.prototype.m3 = function (x, y) { return this; } : (x: any, y: any) => this
 >                                                      : ^ ^^^^^^^ ^^^^^^^^^^^^^^
 >Class.prototype.m3 : any
+>                   : ^^^
 >Class.prototype : any
 >                : ^^^
 >Class : typeof Class
@@ -86,7 +99,9 @@ Class.prototype.m3 = function (x, y) { return this; };
 >function (x, y) { return this; } : (x: any, y: any) => this
 >                                 : ^ ^^^^^^^ ^^^^^^^^^^^^^^
 >x : any
+>  : ^^^
 >y : any
+>  : ^^^
 >this : this
 >     : ^^^^
 
@@ -94,6 +109,7 @@ Class.prototype.m4 = function (angle) { return this; };
 >Class.prototype.m4 = function (angle) { return this; } : (angle: any) => this
 >                                                       : ^     ^^^^^^^^^^^^^^
 >Class.prototype.m4 : any
+>                   : ^^^
 >Class.prototype : any
 >                : ^^^
 >Class : typeof Class
@@ -105,6 +121,7 @@ Class.prototype.m4 = function (angle) { return this; };
 >function (angle) { return this; } : (angle: any) => this
 >                                  : ^     ^^^^^^^^^^^^^^
 >angle : any
+>      : ^^^
 >this : this
 >     : ^^^^
 
@@ -112,6 +129,7 @@ Class.prototype.m5 = function (matrix) { return this; };
 >Class.prototype.m5 = function (matrix) { return this; } : (matrix: any) => this
 >                                                        : ^      ^^^^^^^^^^^^^^
 >Class.prototype.m5 : any
+>                   : ^^^
 >Class.prototype : any
 >                : ^^^
 >Class : typeof Class
@@ -123,6 +141,7 @@ Class.prototype.m5 = function (matrix) { return this; };
 >function (matrix) { return this; } : (matrix: any) => this
 >                                   : ^      ^^^^^^^^^^^^^^
 >matrix : any
+>       : ^^^
 >this : this
 >     : ^^^^
 
@@ -130,6 +149,7 @@ Class.prototype.m6 = function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, s
 >Class.prototype.m6 = function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; } : (x: any, y: any, pivotX: any, pivotY: any, scaleX: any, scaleY: any, rotation: any, skewX: any, skewY: any) => this
 >                                                                                                              : ^ ^^^^^^^ ^^^^^^^      ^^^^^^^      ^^^^^^^      ^^^^^^^      ^^^^^^^        ^^^^^^^     ^^^^^^^     ^^^^^^^^^^^^^^
 >Class.prototype.m6 : any
+>                   : ^^^
 >Class.prototype : any
 >                : ^^^
 >Class : typeof Class
@@ -141,14 +161,23 @@ Class.prototype.m6 = function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, s
 >function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; } : (x: any, y: any, pivotX: any, pivotY: any, scaleX: any, scaleY: any, rotation: any, skewX: any, skewY: any) => this
 >                                                                                         : ^ ^^^^^^^ ^^^^^^^      ^^^^^^^      ^^^^^^^      ^^^^^^^      ^^^^^^^        ^^^^^^^     ^^^^^^^     ^^^^^^^^^^^^^^
 >x : any
+>  : ^^^
 >y : any
+>  : ^^^
 >pivotX : any
+>       : ^^^
 >pivotY : any
+>       : ^^^
 >scaleX : any
+>       : ^^^
 >scaleY : any
+>       : ^^^
 >rotation : any
+>         : ^^^
 >skewX : any
+>      : ^^^
 >skewY : any
+>      : ^^^
 >this : this
 >     : ^^^^
 
@@ -156,6 +185,7 @@ Class.prototype.m7 = function(matrix) { return this; };
 >Class.prototype.m7 = function(matrix) { return this; } : (matrix: any) => this
 >                                                       : ^      ^^^^^^^^^^^^^^
 >Class.prototype.m7 : any
+>                   : ^^^
 >Class.prototype : any
 >                : ^^^
 >Class : typeof Class
@@ -167,6 +197,7 @@ Class.prototype.m7 = function(matrix) { return this; };
 >function(matrix) { return this; } : (matrix: any) => this
 >                                  : ^      ^^^^^^^^^^^^^^
 >matrix : any
+>       : ^^^
 >this : this
 >     : ^^^^
 
@@ -174,6 +205,7 @@ Class.prototype.m8 = function() { return this; };
 >Class.prototype.m8 = function() { return this; } : () => this
 >                                                 : ^^^^^^^^^^
 >Class.prototype.m8 : any
+>                   : ^^^
 >Class.prototype : any
 >                : ^^^
 >Class : typeof Class
@@ -191,6 +223,7 @@ Class.prototype.m9 = function () { return this; };
 >Class.prototype.m9 = function () { return this; } : () => this
 >                                                  : ^^^^^^^^^^
 >Class.prototype.m9 : any
+>                   : ^^^
 >Class.prototype : any
 >                : ^^^
 >Class : typeof Class
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.errors.txt b/tests/baselines/reference/moduleAugmentationImportsAndExports2.errors.txt
index f472daec04d69..d32339fb36803 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.errors.txt
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.errors.txt
@@ -11,7 +11,7 @@ f4.ts(5,11): error TS2339: Property 'foo' does not exist on type 'A'.
     
 ==== f2.ts (0 errors) ====
     export class B {
-        n: number;
+        n!: number;
     }
     
 ==== f3.ts (5 errors) ====
@@ -51,7 +51,7 @@ f4.ts(5,11): error TS2339: Property 'foo' does not exist on type 'A'.
     import {A} from "./f1";
     import "./f3";
     
-    let a: A;
+    declare let a: A;
     let b = a.foo().n;
               ~~~
 !!! error TS2339: Property 'foo' does not exist on type 'A'.
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
index fc036be496f20..eb91dfeda615b 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
@@ -5,7 +5,7 @@ export class A {}
 
 //// [f2.ts]
 export class B {
-    n: number;
+    n!: number;
 }
 
 //// [f3.ts]
@@ -35,7 +35,7 @@ declare module "./f1" {
 import {A} from "./f1";
 import "./f3";
 
-let a: A;
+declare let a: A;
 let b = a.foo().n;
 
 //// [f1.js]
@@ -67,7 +67,6 @@ f1_1.A.prototype.foo = function () { return undefined; };
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 require("./f3");
-var a;
 var b = a.foo().n;
 
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.symbols b/tests/baselines/reference/moduleAugmentationImportsAndExports2.symbols
index 1cadf1bd8d8a8..657c82db14ed2 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.symbols
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.symbols
@@ -8,7 +8,7 @@ export class A {}
 export class B {
 >B : Symbol(B, Decl(f2.ts, 0, 0))
 
-    n: number;
+    n!: number;
 >n : Symbol(B.n, Decl(f2.ts, 0, 16))
 }
 
@@ -77,11 +77,11 @@ import {A} from "./f1";
 
 import "./f3";
 
-let a: A;
->a : Symbol(a, Decl(f4.ts, 3, 3))
+declare let a: A;
+>a : Symbol(a, Decl(f4.ts, 3, 11))
 >A : Symbol(A, Decl(f4.ts, 0, 8))
 
 let b = a.foo().n;
 >b : Symbol(b, Decl(f4.ts, 4, 3))
->a : Symbol(a, Decl(f4.ts, 3, 3))
+>a : Symbol(a, Decl(f4.ts, 3, 11))
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
index f120426e0aa12..111dc08d4383f 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
@@ -10,7 +10,7 @@ export class B {
 >B : B
 >  : ^
 
-    n: number;
+    n!: number;
 >n : number
 >  : ^^^^^^
 }
@@ -99,7 +99,7 @@ import {A} from "./f1";
 
 import "./f3";
 
-let a: A;
+declare let a: A;
 >a : A
 >  : ^
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.errors.txt b/tests/baselines/reference/moduleAugmentationImportsAndExports3.errors.txt
index f66ce9db2bfdd..8bc5549022fe6 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.errors.txt
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.errors.txt
@@ -7,7 +7,7 @@ f3.ts(11,21): error TS2307: Cannot find module './f2' or its corresponding type
     
 ==== f2.ts (0 errors) ====
     export class B {
-        n: number;
+        n!: number;
     }
     
 ==== f3.ts (2 errors) ====
@@ -39,5 +39,5 @@ f3.ts(11,21): error TS2307: Cannot find module './f2' or its corresponding type
     import {A} from "./f1";
     import "./f3";
     
-    let a: A;
+    declare let a: A;
     let b = a.foo().n;
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
index 905f347ea992a..18b76ee098aeb 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
@@ -5,7 +5,7 @@ export class A {}
 
 //// [f2.ts]
 export class B {
-    n: number;
+    n!: number;
 }
 
 //// [f3.ts]
@@ -33,7 +33,7 @@ declare module "./f1" {
 import {A} from "./f1";
 import "./f3";
 
-let a: A;
+declare let a: A;
 let b = a.foo().n;
 
 //// [f1.js]
@@ -65,7 +65,6 @@ f1_1.A.prototype.foo = function () { return undefined; };
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 require("./f3");
-var a;
 var b = a.foo().n;
 
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.symbols b/tests/baselines/reference/moduleAugmentationImportsAndExports3.symbols
index d2e1435215640..5725a2a605de0 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.symbols
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.symbols
@@ -8,7 +8,7 @@ export class A {}
 export class B {
 >B : Symbol(B, Decl(f2.ts, 0, 0))
 
-    n: number;
+    n!: number;
 >n : Symbol(B.n, Decl(f2.ts, 0, 16))
 }
 
@@ -75,13 +75,13 @@ import {A} from "./f1";
 
 import "./f3";
 
-let a: A;
->a : Symbol(a, Decl(f4.ts, 3, 3))
+declare let a: A;
+>a : Symbol(a, Decl(f4.ts, 3, 11))
 >A : Symbol(A, Decl(f4.ts, 0, 8))
 
 let b = a.foo().n;
 >b : Symbol(b, Decl(f4.ts, 4, 3))
 >a.foo : Symbol(A.foo, Decl(f3.ts, 13, 17))
->a : Symbol(a, Decl(f4.ts, 3, 3))
+>a : Symbol(a, Decl(f4.ts, 3, 11))
 >foo : Symbol(A.foo, Decl(f3.ts, 13, 17))
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
index 17d9fc3f6e23e..c49ba0985110a 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
@@ -10,7 +10,7 @@ export class B {
 >B : B
 >  : ^
 
-    n: number;
+    n!: number;
 >n : number
 >  : ^^^^^^
 }
@@ -94,7 +94,7 @@ import {A} from "./f1";
 
 import "./f3";
 
-let a: A;
+declare let a: A;
 >a : A
 >  : ^
 
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.errors.txt b/tests/baselines/reference/moduleAugmentationsBundledOutput1.errors.txt
index a45ae85babde3..5e87069549d3c 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.errors.txt
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
     export class Cls {
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.errors.txt b/tests/baselines/reference/moduleAugmentationsImports1.errors.txt
index eddd60c92f3de..b7f036c8e5591 100644
--- a/tests/baselines/reference/moduleAugmentationsImports1.errors.txt
+++ b/tests/baselines/reference/moduleAugmentationsImports1.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (0 errors) ====
     export class A {}
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.errors.txt b/tests/baselines/reference/moduleAugmentationsImports2.errors.txt
index 230be8a692bf6..486817fc39d0e 100644
--- a/tests/baselines/reference/moduleAugmentationsImports2.errors.txt
+++ b/tests/baselines/reference/moduleAugmentationsImports2.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (0 errors) ====
     export class A {}
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.errors.txt b/tests/baselines/reference/moduleAugmentationsImports3.errors.txt
index bdce32fc03a65..525e5b032ef64 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.errors.txt
+++ b/tests/baselines/reference/moduleAugmentationsImports3.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (0 errors) ====
     /// <reference path="d.d.ts"/>
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.errors.txt b/tests/baselines/reference/moduleAugmentationsImports4.errors.txt
index f2647f4fc4f1c..93c93fcc44319 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.errors.txt
+++ b/tests/baselines/reference/moduleAugmentationsImports4.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (0 errors) ====
     /// <reference path="d.d.ts"/>
diff --git a/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).errors.txt b/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).errors.txt
index 506f5a57da502..29e403726f021 100644
--- a/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).errors.txt
+++ b/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /a.ts (0 errors) ====
     const foo = import("./b");
diff --git a/tests/baselines/reference/moduleNoneDynamicImport(target=es2020).errors.txt b/tests/baselines/reference/moduleNoneDynamicImport(target=es2020).errors.txt
index 506f5a57da502..29e403726f021 100644
--- a/tests/baselines/reference/moduleNoneDynamicImport(target=es2020).errors.txt
+++ b/tests/baselines/reference/moduleNoneDynamicImport(target=es2020).errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /a.ts (0 errors) ====
     const foo = import("./b");
diff --git a/tests/baselines/reference/moduleNoneOutFile.errors.txt b/tests/baselines/reference/moduleNoneOutFile.errors.txt
index 12037428e5f2a..7d726f9290eca 100644
--- a/tests/baselines/reference/moduleNoneOutFile.errors.txt
+++ b/tests/baselines/reference/moduleNoneOutFile.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== first.ts (0 errors) ====
     class Foo {}
diff --git a/tests/baselines/reference/multiLineErrors.errors.txt b/tests/baselines/reference/multiLineErrors.errors.txt
index 666b71aac6d06..52c522bba2070 100644
--- a/tests/baselines/reference/multiLineErrors.errors.txt
+++ b/tests/baselines/reference/multiLineErrors.errors.txt
@@ -28,8 +28,8 @@ multiLineErrors.ts(21,1): error TS2322: Type 'A2' is not assignable to type 'A1'
         x: { y: string; };
     }
     
-    var t1: A1;
-    var t2: A2;
+    declare var t1: A1;
+    declare var t2: A2;
     t1 = t2;
     ~~
 !!! error TS2322: Type 'A2' is not assignable to type 'A1'.
diff --git a/tests/baselines/reference/multiLineErrors.js b/tests/baselines/reference/multiLineErrors.js
index d09dd6f238bdf..e789db15e9179 100644
--- a/tests/baselines/reference/multiLineErrors.js
+++ b/tests/baselines/reference/multiLineErrors.js
@@ -19,8 +19,8 @@ interface A2 {
     x: { y: string; };
 }
 
-var t1: A1;
-var t2: A2;
+declare var t1: A1;
+declare var t2: A2;
 t1 = t2;
 
 
@@ -30,6 +30,4 @@ function noReturn() {
     var x = 4;
     var y = 10;
 }
-var t1;
-var t2;
 t1 = t2;
diff --git a/tests/baselines/reference/multiLineErrors.symbols b/tests/baselines/reference/multiLineErrors.symbols
index 3835ed36da899..cab8cecb38374 100644
--- a/tests/baselines/reference/multiLineErrors.symbols
+++ b/tests/baselines/reference/multiLineErrors.symbols
@@ -36,15 +36,15 @@ interface A2 {
 >y : Symbol(y, Decl(multiLineErrors.ts, 15, 8))
 }
 
-var t1: A1;
->t1 : Symbol(t1, Decl(multiLineErrors.ts, 18, 3))
+declare var t1: A1;
+>t1 : Symbol(t1, Decl(multiLineErrors.ts, 18, 11))
 >A1 : Symbol(A1, Decl(multiLineErrors.ts, 9, 1))
 
-var t2: A2;
->t2 : Symbol(t2, Decl(multiLineErrors.ts, 19, 3))
+declare var t2: A2;
+>t2 : Symbol(t2, Decl(multiLineErrors.ts, 19, 11))
 >A2 : Symbol(A2, Decl(multiLineErrors.ts, 13, 1))
 
 t1 = t2;
->t1 : Symbol(t1, Decl(multiLineErrors.ts, 18, 3))
->t2 : Symbol(t2, Decl(multiLineErrors.ts, 19, 3))
+>t1 : Symbol(t1, Decl(multiLineErrors.ts, 18, 11))
+>t2 : Symbol(t2, Decl(multiLineErrors.ts, 19, 11))
 
diff --git a/tests/baselines/reference/multiLineErrors.types b/tests/baselines/reference/multiLineErrors.types
index 39c37ff50216d..e824a4a99b110 100644
--- a/tests/baselines/reference/multiLineErrors.types
+++ b/tests/baselines/reference/multiLineErrors.types
@@ -48,11 +48,11 @@ interface A2 {
 >  : ^^^^^^
 }
 
-var t1: A1;
+declare var t1: A1;
 >t1 : A1
 >   : ^^
 
-var t2: A2;
+declare var t2: A2;
 >t2 : A2
 >   : ^^
 
diff --git a/tests/baselines/reference/multiline.errors.txt b/tests/baselines/reference/multiline.errors.txt
index a1f21e41de003..04822263fd4bf 100644
--- a/tests/baselines/reference/multiline.errors.txt
+++ b/tests/baselines/reference/multiline.errors.txt
@@ -1,25 +1,8 @@
-a.ts(12,1): error TS2578: Unused '@ts-expect-error' directive.
-b.tsx(32,1): error TS2578: Unused '@ts-expect-error' directive.
+b.tsx(33,1): error TS2578: Unused '@ts-expect-error' directive.
 
 
-==== a.ts (1 errors) ====
-    export const texts: string[] = [];
-    
-    /**
-     @ts-ignore */
-    texts.push(100);
-    
-    /**
-     @ts-expect-error */
-    texts.push(100);
-    
-    /**
-     @ts-expect-error */
-    ~~~~~~~~~~~~~~~~~~~~
-!!! error TS2578: Unused '@ts-expect-error' directive.
-    texts.push("100");
-    
 ==== b.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
     import * as React from "react";
     
     export function MyComponent(props: { foo: string }) {
@@ -57,4 +40,19 @@ b.tsx(32,1): error TS2578: Unused '@ts-expect-error' directive.
         <MyComponent foo={"hooray"} />
       </div>
     );
+    
+==== a.ts (0 errors) ====
+    export const texts: string[] = [];
+    
+    /**
+     @ts-ignore */
+    texts.push(100);
+    
+    /**
+     @ts-expect-error */
+    texts.push(100);
+    
+    /**
+     @ts-expect-error */
+    texts.push("100");
     
\ No newline at end of file
diff --git a/tests/baselines/reference/multiline.js b/tests/baselines/reference/multiline.js
index d829ebd85287f..6023fb5538184 100644
--- a/tests/baselines/reference/multiline.js
+++ b/tests/baselines/reference/multiline.js
@@ -16,6 +16,7 @@ texts.push(100);
 texts.push("100");
 
 //// [b.tsx]
+/// <reference path="/.lib/react.d.ts" />
 import * as React from "react";
 
 export function MyComponent(props: { foo: string }) {
@@ -53,20 +54,6 @@ let x = (
 );
 
 
-//// [a.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.texts = void 0;
-exports.texts = [];
-/**
- @ts-ignore */
-exports.texts.push(100);
-/**
- @ts-expect-error */
-exports.texts.push(100);
-/**
- @ts-expect-error */
-exports.texts.push("100");
 //// [b.js]
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
@@ -104,6 +91,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyComponent = MyComponent;
+/// <reference path="/.lib/react.d.ts" />
 var React = __importStar(require("react"));
 function MyComponent(props) {
     return React.createElement("div", null);
diff --git a/tests/baselines/reference/multiline.symbols b/tests/baselines/reference/multiline.symbols
index 1377c6d90085f..cfaae631c4f2a 100644
--- a/tests/baselines/reference/multiline.symbols
+++ b/tests/baselines/reference/multiline.symbols
@@ -1,45 +1,21 @@
 //// [tests/cases/conformance/directives/multiline.tsx] ////
 
-=== a.ts ===
-export const texts: string[] = [];
->texts : Symbol(texts, Decl(a.ts, 0, 12))
-
-/**
- @ts-ignore */
-texts.push(100);
->texts.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
->texts : Symbol(texts, Decl(a.ts, 0, 12))
->push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
-
-/**
- @ts-expect-error */
-texts.push(100);
->texts.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
->texts : Symbol(texts, Decl(a.ts, 0, 12))
->push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
-
-/**
- @ts-expect-error */
-texts.push("100");
->texts.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
->texts : Symbol(texts, Decl(a.ts, 0, 12))
->push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
-
 === b.tsx ===
+/// <reference path="react.d.ts" />
 import * as React from "react";
->React : Symbol(React, Decl(b.tsx, 0, 6))
+>React : Symbol(React, Decl(b.tsx, 1, 6))
 
 export function MyComponent(props: { foo: string }) {
->MyComponent : Symbol(MyComponent, Decl(b.tsx, 0, 31))
->props : Symbol(props, Decl(b.tsx, 2, 28))
->foo : Symbol(foo, Decl(b.tsx, 2, 36))
+>MyComponent : Symbol(MyComponent, Decl(b.tsx, 1, 31))
+>props : Symbol(props, Decl(b.tsx, 3, 28))
+>foo : Symbol(foo, Decl(b.tsx, 3, 36))
 
   return <div />;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 }
 
 let x = (
->x : Symbol(x, Decl(b.tsx, 6, 3))
+>x : Symbol(x, Decl(b.tsx, 7, 3))
 
   <div>
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -47,42 +23,42 @@ let x = (
     {/*
    @ts-ignore */}
     <MyComponent foo={100} />
->MyComponent : Symbol(MyComponent, Decl(b.tsx, 0, 31))
->foo : Symbol(foo, Decl(b.tsx, 10, 16))
+>MyComponent : Symbol(MyComponent, Decl(b.tsx, 1, 31))
+>foo : Symbol(foo, Decl(b.tsx, 11, 16))
 
     {/*@ts-ignore*/}
     <MyComponent foo={100} />
->MyComponent : Symbol(MyComponent, Decl(b.tsx, 0, 31))
->foo : Symbol(foo, Decl(b.tsx, 13, 16))
+>MyComponent : Symbol(MyComponent, Decl(b.tsx, 1, 31))
+>foo : Symbol(foo, Decl(b.tsx, 14, 16))
 
     {/*
    @ts-expect-error */}
     <MyComponent foo={100} />
->MyComponent : Symbol(MyComponent, Decl(b.tsx, 0, 31))
->foo : Symbol(foo, Decl(b.tsx, 17, 16))
+>MyComponent : Symbol(MyComponent, Decl(b.tsx, 1, 31))
+>foo : Symbol(foo, Decl(b.tsx, 18, 16))
 
     {/*
    // @ts-expect-error */}
     <MyComponent foo={100} />
->MyComponent : Symbol(MyComponent, Decl(b.tsx, 0, 31))
->foo : Symbol(foo, Decl(b.tsx, 21, 16))
+>MyComponent : Symbol(MyComponent, Decl(b.tsx, 1, 31))
+>foo : Symbol(foo, Decl(b.tsx, 22, 16))
 
     {/*
    * @ts-expect-error */}
     <MyComponent foo={100} />
->MyComponent : Symbol(MyComponent, Decl(b.tsx, 0, 31))
->foo : Symbol(foo, Decl(b.tsx, 25, 16))
+>MyComponent : Symbol(MyComponent, Decl(b.tsx, 1, 31))
+>foo : Symbol(foo, Decl(b.tsx, 26, 16))
 
     {/*@ts-expect-error*/}
     <MyComponent foo={100} />
->MyComponent : Symbol(MyComponent, Decl(b.tsx, 0, 31))
->foo : Symbol(foo, Decl(b.tsx, 28, 16))
+>MyComponent : Symbol(MyComponent, Decl(b.tsx, 1, 31))
+>foo : Symbol(foo, Decl(b.tsx, 29, 16))
 
     {/*
    @ts-expect-error */}
     <MyComponent foo={"hooray"} />
->MyComponent : Symbol(MyComponent, Decl(b.tsx, 0, 31))
->foo : Symbol(foo, Decl(b.tsx, 32, 16))
+>MyComponent : Symbol(MyComponent, Decl(b.tsx, 1, 31))
+>foo : Symbol(foo, Decl(b.tsx, 33, 16))
 
   </div>
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
diff --git a/tests/baselines/reference/multiline.types b/tests/baselines/reference/multiline.types
index faa866b1c280b..fdad5badfeb58 100644
--- a/tests/baselines/reference/multiline.types
+++ b/tests/baselines/reference/multiline.types
@@ -5,56 +5,8 @@ Assignability cache: 1,000
 Type Count: 5,000
 Instantiation count: 10,000
 
-=== a.ts ===
-export const texts: string[] = [];
->texts : string[]
->      : ^^^^^^^^
->[] : undefined[]
->   : ^^^^^^^^^^^
-
-/**
- @ts-ignore */
-texts.push(100);
->texts.push(100) : number
->                : ^^^^^^
->texts.push : (...items: string[]) => number
->           : ^^^^     ^^^^^^^^^^^^^^^      
->texts : string[]
->      : ^^^^^^^^
->push : (...items: string[]) => number
->     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : 100
->    : ^^^
-
-/**
- @ts-expect-error */
-texts.push(100);
->texts.push(100) : number
->                : ^^^^^^
->texts.push : (...items: string[]) => number
->           : ^^^^     ^^^^^^^^^^^^^^^      
->texts : string[]
->      : ^^^^^^^^
->push : (...items: string[]) => number
->     : ^^^^     ^^^^^^^^^^^^^^^      
->100 : 100
->    : ^^^
-
-/**
- @ts-expect-error */
-texts.push("100");
->texts.push("100") : number
->                  : ^^^^^^
->texts.push : (...items: string[]) => number
->           : ^^^^     ^^^^^^^^^^^^^^^      
->texts : string[]
->      : ^^^^^^^^
->push : (...items: string[]) => number
->     : ^^^^     ^^^^^^^^^^^^^^^      
->"100" : "100"
->      : ^^^^^
-
 === b.tsx ===
+/// <reference path="react.d.ts" />
 import * as React from "react";
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/multipleDeclarations.errors.txt b/tests/baselines/reference/multipleDeclarations.errors.txt
new file mode 100644
index 0000000000000..0c970de0dc8d9
--- /dev/null
+++ b/tests/baselines/reference/multipleDeclarations.errors.txt
@@ -0,0 +1,40 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== input.js (0 errors) ====
+    function C() {
+        this.m = null;
+    }
+    C.prototype.m = function() {
+        this.nothing();
+    }
+    class X {
+        constructor() {
+            this.m = this.m.bind(this);
+            this.mistake = 'frankly, complete nonsense';
+        }
+        m() {
+        }
+        mistake() {
+        }
+    }
+    let x = new X();
+    X.prototype.mistake = false;
+    x.m();
+    x.mistake;
+    class Y {
+        mistake() {
+        }
+        m() {
+        }
+        constructor() {
+            this.m = this.m.bind(this);
+            this.mistake = 'even more nonsense';
+        }
+    }
+    Y.prototype.mistake = true;
+    let y = new Y();
+    y.m();
+    y.mistake();
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/multipleDeclarations.types b/tests/baselines/reference/multipleDeclarations.types
index 24af38040fa76..ccb49889b4ab0 100644
--- a/tests/baselines/reference/multipleDeclarations.types
+++ b/tests/baselines/reference/multipleDeclarations.types
@@ -9,6 +9,7 @@ function C() {
 >this.m = null : null
 >              : ^^^^
 >this.m : any
+>       : ^^^
 >this : this
 >     : ^^^^
 >m : any
@@ -18,6 +19,7 @@ C.prototype.m = function() {
 >C.prototype.m = function() {    this.nothing();} : () => void
 >                                                 : ^^^^^^^^^^
 >C.prototype.m : any
+>              : ^^^
 >C.prototype : any
 >            : ^^^
 >C : typeof C
@@ -30,8 +32,10 @@ C.prototype.m = function() {
 >                                 : ^^^^^^^^^^
 
     this.nothing();
->this.nothing() : error
->this.nothing : error
+>this.nothing() : any
+>               : ^^^
+>this.nothing : any
+>             : ^^^
 >this : this
 >     : ^^^^
 >nothing : any
@@ -44,6 +48,7 @@ class X {
     constructor() {
         this.m = this.m.bind(this);
 >this.m = this.m.bind(this) : any
+>                           : ^^^
 >this.m : () => void
 >       : ^^^^^^^^^^
 >this : this
@@ -51,6 +56,7 @@ class X {
 >m : () => void
 >  : ^^^^^^^^^^
 >this.m.bind(this) : any
+>                  : ^^^
 >this.m.bind : (this: Function, thisArg: any, ...argArray: any[]) => any
 >            : ^    ^^        ^^       ^^   ^^^^^        ^^     ^^^^^   
 >this.m : () => void
@@ -142,6 +148,7 @@ class Y {
     constructor() {
         this.m = this.m.bind(this);
 >this.m = this.m.bind(this) : any
+>                           : ^^^
 >this.m : () => void
 >       : ^^^^^^^^^^
 >this : this
@@ -149,6 +156,7 @@ class Y {
 >m : () => void
 >  : ^^^^^^^^^^
 >this.m.bind(this) : any
+>                  : ^^^
 >this.m.bind : (this: Function, thisArg: any, ...argArray: any[]) => any
 >            : ^    ^^        ^^       ^^   ^^^^^        ^^     ^^^^^   
 >this.m : () => void
diff --git a/tests/baselines/reference/multipleExportAssignments.errors.txt b/tests/baselines/reference/multipleExportAssignments.errors.txt
index ad7b34315aee3..eb4cf8cdd7c7b 100644
--- a/tests/baselines/reference/multipleExportAssignments.errors.txt
+++ b/tests/baselines/reference/multipleExportAssignments.errors.txt
@@ -10,7 +10,7 @@ multipleExportAssignments.ts(14,10): error TS2300: Duplicate identifier 'export=
         use: (mod: connectModule) => connectExport;
         listen: (port: number) => void;
     }
-    var server: {
+    declare const server: {
         (): connectExport;
         test1: connectModule;
         test2(): connectModule;
diff --git a/tests/baselines/reference/multipleExportAssignments.js b/tests/baselines/reference/multipleExportAssignments.js
index 8601870b3174d..169ef99a3abe0 100644
--- a/tests/baselines/reference/multipleExportAssignments.js
+++ b/tests/baselines/reference/multipleExportAssignments.js
@@ -8,7 +8,7 @@ interface connectExport {
     use: (mod: connectModule) => connectExport;
     listen: (port: number) => void;
 }
-var server: {
+declare const server: {
     (): connectExport;
     test1: connectModule;
     test2(): connectModule;
@@ -20,5 +20,4 @@ export = connectExport;
 
 //// [multipleExportAssignments.js]
 "use strict";
-var server;
 module.exports = server;
diff --git a/tests/baselines/reference/multipleExportAssignments.symbols b/tests/baselines/reference/multipleExportAssignments.symbols
index 2670ac50fbba9..ec465622050c6 100644
--- a/tests/baselines/reference/multipleExportAssignments.symbols
+++ b/tests/baselines/reference/multipleExportAssignments.symbols
@@ -22,8 +22,8 @@ interface connectExport {
 >listen : Symbol(connectExport.listen, Decl(multipleExportAssignments.ts, 4, 47))
 >port : Symbol(port, Decl(multipleExportAssignments.ts, 5, 13))
 }
-var server: {
->server : Symbol(server, Decl(multipleExportAssignments.ts, 7, 3))
+declare const server: {
+>server : Symbol(server, Decl(multipleExportAssignments.ts, 7, 13))
 
     (): connectExport;
 >connectExport : Symbol(connectExport, Decl(multipleExportAssignments.ts, 2, 1))
@@ -38,7 +38,7 @@ var server: {
 
 };
 export = server;
->server : Symbol(server, Decl(multipleExportAssignments.ts, 7, 3))
+>server : Symbol(server, Decl(multipleExportAssignments.ts, 7, 13))
 
 export = connectExport;
 >connectExport : Symbol(connectExport, Decl(multipleExportAssignments.ts, 2, 1))
diff --git a/tests/baselines/reference/multipleExportAssignments.types b/tests/baselines/reference/multipleExportAssignments.types
index e484dbb1b147f..263eed4f594f8 100644
--- a/tests/baselines/reference/multipleExportAssignments.types
+++ b/tests/baselines/reference/multipleExportAssignments.types
@@ -23,7 +23,7 @@ interface connectExport {
 >port : number
 >     : ^^^^^^
 }
-var server: {
+declare const server: {
 >server : { (): connectExport; test1: connectModule; test2(): connectModule; }
 >       : ^^^^^^             ^^^^^^^^^             ^^^^^^^^^^^             ^^^
 
diff --git a/tests/baselines/reference/namedImportNonExistentName.errors.txt b/tests/baselines/reference/namedImportNonExistentName.errors.txt
index 76e60a085ed74..ab93ba7bcfc5e 100644
--- a/tests/baselines/reference/namedImportNonExistentName.errors.txt
+++ b/tests/baselines/reference/namedImportNonExistentName.errors.txt
@@ -15,7 +15,7 @@ bar.ts(3,22): error TS2305: Module '"./foo2"' has no exported member 'toString'.
     }
     
 ==== foo2.ts (0 errors) ====
-    let x: { a: string; c: string; } | { b: number; c: number; };
+    declare let x: { a: string; c: string; } | { b: number; c: number; };
     export = x
     
 ==== bar.ts (6 errors) ====
diff --git a/tests/baselines/reference/namedImportNonExistentName.js b/tests/baselines/reference/namedImportNonExistentName.js
index 057aa65dbac33..33446cf30e94d 100644
--- a/tests/baselines/reference/namedImportNonExistentName.js
+++ b/tests/baselines/reference/namedImportNonExistentName.js
@@ -9,7 +9,7 @@ declare namespace Foo {
 }
 
 //// [foo2.ts]
-let x: { a: string; c: string; } | { b: number; c: number; };
+declare let x: { a: string; c: string; } | { b: number; c: number; };
 export = x
 
 //// [bar.ts]
@@ -20,7 +20,6 @@ c;
 
 //// [foo2.js]
 "use strict";
-var x;
 module.exports = x;
 //// [bar.js]
 "use strict";
diff --git a/tests/baselines/reference/namedImportNonExistentName.symbols b/tests/baselines/reference/namedImportNonExistentName.symbols
index 2a4fe5fa1327c..36a51f4d0867e 100644
--- a/tests/baselines/reference/namedImportNonExistentName.symbols
+++ b/tests/baselines/reference/namedImportNonExistentName.symbols
@@ -15,15 +15,15 @@ declare namespace Foo {
 }
 
 === foo2.ts ===
-let x: { a: string; c: string; } | { b: number; c: number; };
->x : Symbol(x, Decl(foo2.ts, 0, 3))
->a : Symbol(a, Decl(foo2.ts, 0, 8))
->c : Symbol(c, Decl(foo2.ts, 0, 19))
->b : Symbol(b, Decl(foo2.ts, 0, 36))
->c : Symbol(c, Decl(foo2.ts, 0, 47))
+declare let x: { a: string; c: string; } | { b: number; c: number; };
+>x : Symbol(x, Decl(foo2.ts, 0, 11))
+>a : Symbol(a, Decl(foo2.ts, 0, 16))
+>c : Symbol(c, Decl(foo2.ts, 0, 27))
+>b : Symbol(b, Decl(foo2.ts, 0, 44))
+>c : Symbol(c, Decl(foo2.ts, 0, 55))
 
 export = x
->x : Symbol(x, Decl(foo2.ts, 0, 3))
+>x : Symbol(x, Decl(foo2.ts, 0, 11))
 
 === bar.ts ===
 import { Bar, toString, foo } from './foo';
diff --git a/tests/baselines/reference/namedImportNonExistentName.types b/tests/baselines/reference/namedImportNonExistentName.types
index 37e863dc4815f..f35400d43ad58 100644
--- a/tests/baselines/reference/namedImportNonExistentName.types
+++ b/tests/baselines/reference/namedImportNonExistentName.types
@@ -19,7 +19,7 @@ declare namespace Foo {
 }
 
 === foo2.ts ===
-let x: { a: string; c: string; } | { b: number; c: number; };
+declare let x: { a: string; c: string; } | { b: number; c: number; };
 >x : { a: string; c: string; } | { b: number; c: number; }
 >  : ^^^^^      ^^^^^      ^^^^^^^^^^^      ^^^^^      ^^^
 >a : string
diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.errors.txt b/tests/baselines/reference/negateOperatorWithAnyOtherType.errors.txt
index 8470f20aff24e..dcded0e487843 100644
--- a/tests/baselines/reference/negateOperatorWithAnyOtherType.errors.txt
+++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.errors.txt
@@ -17,7 +17,7 @@ negateOperatorWithAnyOtherType.ts(51,1): error TS2695: Left side of comma operat
         return a;
     }
     class A {
-        public a: any;
+        public a!: any;
         static foo(): any {
             var a;
             return a;
diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.js b/tests/baselines/reference/negateOperatorWithAnyOtherType.js
index 2434d8aa05d38..3a358f1da8f59 100644
--- a/tests/baselines/reference/negateOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.js
@@ -14,7 +14,7 @@ function foo(): any {
     return a;
 }
 class A {
-    public a: any;
+    public a!: any;
     static foo(): any {
         var a;
         return a;
diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.symbols b/tests/baselines/reference/negateOperatorWithAnyOtherType.symbols
index 1b726ddd565f7..185921e894964 100644
--- a/tests/baselines/reference/negateOperatorWithAnyOtherType.symbols
+++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.symbols
@@ -32,11 +32,11 @@ function foo(): any {
 class A {
 >A : Symbol(A, Decl(negateOperatorWithAnyOtherType.ts, 11, 1))
 
-    public a: any;
+    public a!: any;
 >a : Symbol(A.a, Decl(negateOperatorWithAnyOtherType.ts, 12, 9))
 
     static foo(): any {
->foo : Symbol(A.foo, Decl(negateOperatorWithAnyOtherType.ts, 13, 18))
+>foo : Symbol(A.foo, Decl(negateOperatorWithAnyOtherType.ts, 13, 19))
 
         var a;
 >a : Symbol(a, Decl(negateOperatorWithAnyOtherType.ts, 15, 11))
@@ -123,9 +123,9 @@ var ResultIsNumber13 = -foo();
 
 var ResultIsNumber14 = -A.foo();
 >ResultIsNumber14 : Symbol(ResultIsNumber14, Decl(negateOperatorWithAnyOtherType.ts, 43, 3))
->A.foo : Symbol(A.foo, Decl(negateOperatorWithAnyOtherType.ts, 13, 18))
+>A.foo : Symbol(A.foo, Decl(negateOperatorWithAnyOtherType.ts, 13, 19))
 >A : Symbol(A, Decl(negateOperatorWithAnyOtherType.ts, 11, 1))
->foo : Symbol(A.foo, Decl(negateOperatorWithAnyOtherType.ts, 13, 18))
+>foo : Symbol(A.foo, Decl(negateOperatorWithAnyOtherType.ts, 13, 19))
 
 var ResultIsNumber15 = -(ANY - ANY1);
 >ResultIsNumber15 : Symbol(ResultIsNumber15, Decl(negateOperatorWithAnyOtherType.ts, 44, 3))
diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.types b/tests/baselines/reference/negateOperatorWithAnyOtherType.types
index beb251f9743a6..5e275f18bfcd2 100644
--- a/tests/baselines/reference/negateOperatorWithAnyOtherType.types
+++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.types
@@ -55,7 +55,7 @@ class A {
 >A : A
 >  : ^
 
-    public a: any;
+    public a!: any;
 >a : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.errors.txt b/tests/baselines/reference/negateOperatorWithBooleanType.errors.txt
index 7a7bf05bbe394..ac062be68cb95 100644
--- a/tests/baselines/reference/negateOperatorWithBooleanType.errors.txt
+++ b/tests/baselines/reference/negateOperatorWithBooleanType.errors.txt
@@ -3,16 +3,16 @@ negateOperatorWithBooleanType.ts(33,1): error TS2695: Left side of comma operato
 
 ==== negateOperatorWithBooleanType.ts (1 errors) ====
     // - operator on boolean type
-    var BOOLEAN: boolean;
+    declare var BOOLEAN: boolean;
     
     function foo(): boolean { return true; }
     
     class A {
-        public a: boolean;
+        public a!: boolean;
         static foo() { return false; }
     }
     namespace M {
-        export var n: boolean;
+        export declare var n: boolean;
     }
     
     var objA = new A();
diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.js b/tests/baselines/reference/negateOperatorWithBooleanType.js
index abe50078a187d..2f9e72b4ec718 100644
--- a/tests/baselines/reference/negateOperatorWithBooleanType.js
+++ b/tests/baselines/reference/negateOperatorWithBooleanType.js
@@ -2,16 +2,16 @@
 
 //// [negateOperatorWithBooleanType.ts]
 // - operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 
 function foo(): boolean { return true; }
 
 class A {
-    public a: boolean;
+    public a!: boolean;
     static foo() { return false; }
 }
 namespace M {
-    export var n: boolean;
+    export declare var n: boolean;
 }
 
 var objA = new A();
@@ -38,8 +38,6 @@ var ResultIsNumber7 = -A.foo();
 -M.n;
 
 //// [negateOperatorWithBooleanType.js]
-// - operator on boolean type
-var BOOLEAN;
 function foo() { return true; }
 var A = /** @class */ (function () {
     function A() {
diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.symbols b/tests/baselines/reference/negateOperatorWithBooleanType.symbols
index 14e8dd137a24b..d2e63e9c11c32 100644
--- a/tests/baselines/reference/negateOperatorWithBooleanType.symbols
+++ b/tests/baselines/reference/negateOperatorWithBooleanType.symbols
@@ -2,26 +2,26 @@
 
 === negateOperatorWithBooleanType.ts ===
 // - operator on boolean type
-var BOOLEAN: boolean;
->BOOLEAN : Symbol(BOOLEAN, Decl(negateOperatorWithBooleanType.ts, 1, 3))
+declare var BOOLEAN: boolean;
+>BOOLEAN : Symbol(BOOLEAN, Decl(negateOperatorWithBooleanType.ts, 1, 11))
 
 function foo(): boolean { return true; }
->foo : Symbol(foo, Decl(negateOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(negateOperatorWithBooleanType.ts, 1, 29))
 
 class A {
 >A : Symbol(A, Decl(negateOperatorWithBooleanType.ts, 3, 40))
 
-    public a: boolean;
+    public a!: boolean;
 >a : Symbol(A.a, Decl(negateOperatorWithBooleanType.ts, 5, 9))
 
     static foo() { return false; }
->foo : Symbol(A.foo, Decl(negateOperatorWithBooleanType.ts, 6, 22))
+>foo : Symbol(A.foo, Decl(negateOperatorWithBooleanType.ts, 6, 23))
 }
 namespace M {
 >M : Symbol(M, Decl(negateOperatorWithBooleanType.ts, 8, 1))
 
-    export var n: boolean;
->n : Symbol(n, Decl(negateOperatorWithBooleanType.ts, 10, 14))
+    export declare var n: boolean;
+>n : Symbol(n, Decl(negateOperatorWithBooleanType.ts, 10, 22))
 }
 
 var objA = new A();
@@ -31,7 +31,7 @@ var objA = new A();
 // boolean type var
 var ResultIsNumber1 = -BOOLEAN;
 >ResultIsNumber1 : Symbol(ResultIsNumber1, Decl(negateOperatorWithBooleanType.ts, 16, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(negateOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(negateOperatorWithBooleanType.ts, 1, 11))
 
 // boolean type literal
 var ResultIsNumber2 = -true;
@@ -51,27 +51,27 @@ var ResultIsNumber4 = -objA.a;
 
 var ResultIsNumber5 = -M.n;
 >ResultIsNumber5 : Symbol(ResultIsNumber5, Decl(negateOperatorWithBooleanType.ts, 24, 3))
->M.n : Symbol(M.n, Decl(negateOperatorWithBooleanType.ts, 10, 14))
+>M.n : Symbol(M.n, Decl(negateOperatorWithBooleanType.ts, 10, 22))
 >M : Symbol(M, Decl(negateOperatorWithBooleanType.ts, 8, 1))
->n : Symbol(M.n, Decl(negateOperatorWithBooleanType.ts, 10, 14))
+>n : Symbol(M.n, Decl(negateOperatorWithBooleanType.ts, 10, 22))
 
 var ResultIsNumber6 = -foo();
 >ResultIsNumber6 : Symbol(ResultIsNumber6, Decl(negateOperatorWithBooleanType.ts, 25, 3))
->foo : Symbol(foo, Decl(negateOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(negateOperatorWithBooleanType.ts, 1, 29))
 
 var ResultIsNumber7 = -A.foo();
 >ResultIsNumber7 : Symbol(ResultIsNumber7, Decl(negateOperatorWithBooleanType.ts, 26, 3))
->A.foo : Symbol(A.foo, Decl(negateOperatorWithBooleanType.ts, 6, 22))
+>A.foo : Symbol(A.foo, Decl(negateOperatorWithBooleanType.ts, 6, 23))
 >A : Symbol(A, Decl(negateOperatorWithBooleanType.ts, 3, 40))
->foo : Symbol(A.foo, Decl(negateOperatorWithBooleanType.ts, 6, 22))
+>foo : Symbol(A.foo, Decl(negateOperatorWithBooleanType.ts, 6, 23))
 
 // miss assignment operators
 -true;
 -BOOLEAN;
->BOOLEAN : Symbol(BOOLEAN, Decl(negateOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(negateOperatorWithBooleanType.ts, 1, 11))
 
 -foo();
->foo : Symbol(foo, Decl(negateOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(negateOperatorWithBooleanType.ts, 1, 29))
 
 -true, false;
 -objA.a;
@@ -80,7 +80,7 @@ var ResultIsNumber7 = -A.foo();
 >a : Symbol(A.a, Decl(negateOperatorWithBooleanType.ts, 5, 9))
 
 -M.n;
->M.n : Symbol(M.n, Decl(negateOperatorWithBooleanType.ts, 10, 14))
+>M.n : Symbol(M.n, Decl(negateOperatorWithBooleanType.ts, 10, 22))
 >M : Symbol(M, Decl(negateOperatorWithBooleanType.ts, 8, 1))
->n : Symbol(M.n, Decl(negateOperatorWithBooleanType.ts, 10, 14))
+>n : Symbol(M.n, Decl(negateOperatorWithBooleanType.ts, 10, 22))
 
diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.types b/tests/baselines/reference/negateOperatorWithBooleanType.types
index edf1a2f4de5b0..0ea2f5e1f2aec 100644
--- a/tests/baselines/reference/negateOperatorWithBooleanType.types
+++ b/tests/baselines/reference/negateOperatorWithBooleanType.types
@@ -2,7 +2,7 @@
 
 === negateOperatorWithBooleanType.ts ===
 // - operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 >BOOLEAN : boolean
 >        : ^^^^^^^
 
@@ -16,7 +16,7 @@ class A {
 >A : A
 >  : ^
 
-    public a: boolean;
+    public a!: boolean;
 >a : boolean
 >  : ^^^^^^^
 
@@ -30,7 +30,7 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: boolean;
+    export declare var n: boolean;
 >n : boolean
 >  : ^^^^^^^
 }
diff --git a/tests/baselines/reference/negateOperatorWithNumberType.errors.txt b/tests/baselines/reference/negateOperatorWithNumberType.errors.txt
index a8989f6bc0500..40e41efbc1c44 100644
--- a/tests/baselines/reference/negateOperatorWithNumberType.errors.txt
+++ b/tests/baselines/reference/negateOperatorWithNumberType.errors.txt
@@ -3,17 +3,17 @@ negateOperatorWithNumberType.ts(41,1): error TS2695: Left side of comma operator
 
 ==== negateOperatorWithNumberType.ts (1 errors) ====
     // - operator on number type
-    var NUMBER: number;
+    declare var NUMBER: number;
     var NUMBER1: number[] = [1, 2];
     
     function foo(): number { return 1; }
     
     class A {
-        public a: number;
+        public a!: number;
         static foo() { return 1; }
     }
     namespace M {
-        export var n: number;
+        export declare var n: number;
     }
     
     var objA = new A();
diff --git a/tests/baselines/reference/negateOperatorWithNumberType.js b/tests/baselines/reference/negateOperatorWithNumberType.js
index 1f6b029fbfe3a..134bd0d1b7611 100644
--- a/tests/baselines/reference/negateOperatorWithNumberType.js
+++ b/tests/baselines/reference/negateOperatorWithNumberType.js
@@ -2,17 +2,17 @@
 
 //// [negateOperatorWithNumberType.ts]
 // - operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
 
 function foo(): number { return 1; }
 
 class A {
-    public a: number;
+    public a!: number;
     static foo() { return 1; }
 }
 namespace M {
-    export var n: number;
+    export declare var n: number;
 }
 
 var objA = new A();
@@ -44,8 +44,6 @@ var ResultIsNumber11 = -(NUMBER - NUMBER);
 -objA.a, M.n;
 
 //// [negateOperatorWithNumberType.js]
-// - operator on number type
-var NUMBER;
 var NUMBER1 = [1, 2];
 function foo() { return 1; }
 var A = /** @class */ (function () {
diff --git a/tests/baselines/reference/negateOperatorWithNumberType.symbols b/tests/baselines/reference/negateOperatorWithNumberType.symbols
index 0b9f34f75e562..78e05fd7ed1ca 100644
--- a/tests/baselines/reference/negateOperatorWithNumberType.symbols
+++ b/tests/baselines/reference/negateOperatorWithNumberType.symbols
@@ -2,8 +2,8 @@
 
 === negateOperatorWithNumberType.ts ===
 // - operator on number type
-var NUMBER: number;
->NUMBER : Symbol(NUMBER, Decl(negateOperatorWithNumberType.ts, 1, 3))
+declare var NUMBER: number;
+>NUMBER : Symbol(NUMBER, Decl(negateOperatorWithNumberType.ts, 1, 11))
 
 var NUMBER1: number[] = [1, 2];
 >NUMBER1 : Symbol(NUMBER1, Decl(negateOperatorWithNumberType.ts, 2, 3))
@@ -14,17 +14,17 @@ function foo(): number { return 1; }
 class A {
 >A : Symbol(A, Decl(negateOperatorWithNumberType.ts, 4, 36))
 
-    public a: number;
+    public a!: number;
 >a : Symbol(A.a, Decl(negateOperatorWithNumberType.ts, 6, 9))
 
     static foo() { return 1; }
->foo : Symbol(A.foo, Decl(negateOperatorWithNumberType.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(negateOperatorWithNumberType.ts, 7, 22))
 }
 namespace M {
 >M : Symbol(M, Decl(negateOperatorWithNumberType.ts, 9, 1))
 
-    export var n: number;
->n : Symbol(n, Decl(negateOperatorWithNumberType.ts, 11, 14))
+    export declare var n: number;
+>n : Symbol(n, Decl(negateOperatorWithNumberType.ts, 11, 22))
 }
 
 var objA = new A();
@@ -34,7 +34,7 @@ var objA = new A();
 // number type var
 var ResultIsNumber1 = -NUMBER;
 >ResultIsNumber1 : Symbol(ResultIsNumber1, Decl(negateOperatorWithNumberType.ts, 17, 3))
->NUMBER : Symbol(NUMBER, Decl(negateOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(negateOperatorWithNumberType.ts, 1, 11))
 
 var ResultIsNumber2 = -NUMBER1;
 >ResultIsNumber2 : Symbol(ResultIsNumber2, Decl(negateOperatorWithNumberType.ts, 18, 3))
@@ -65,9 +65,9 @@ var ResultIsNumber6 = -objA.a;
 
 var ResultIsNumber7 = -M.n;
 >ResultIsNumber7 : Symbol(ResultIsNumber7, Decl(negateOperatorWithNumberType.ts, 27, 3))
->M.n : Symbol(M.n, Decl(negateOperatorWithNumberType.ts, 11, 14))
+>M.n : Symbol(M.n, Decl(negateOperatorWithNumberType.ts, 11, 22))
 >M : Symbol(M, Decl(negateOperatorWithNumberType.ts, 9, 1))
->n : Symbol(M.n, Decl(negateOperatorWithNumberType.ts, 11, 14))
+>n : Symbol(M.n, Decl(negateOperatorWithNumberType.ts, 11, 22))
 
 var ResultIsNumber8 = -NUMBER1[0];
 >ResultIsNumber8 : Symbol(ResultIsNumber8, Decl(negateOperatorWithNumberType.ts, 28, 3))
@@ -79,19 +79,19 @@ var ResultIsNumber9 = -foo();
 
 var ResultIsNumber10 = -A.foo();
 >ResultIsNumber10 : Symbol(ResultIsNumber10, Decl(negateOperatorWithNumberType.ts, 30, 3))
->A.foo : Symbol(A.foo, Decl(negateOperatorWithNumberType.ts, 7, 21))
+>A.foo : Symbol(A.foo, Decl(negateOperatorWithNumberType.ts, 7, 22))
 >A : Symbol(A, Decl(negateOperatorWithNumberType.ts, 4, 36))
->foo : Symbol(A.foo, Decl(negateOperatorWithNumberType.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(negateOperatorWithNumberType.ts, 7, 22))
 
 var ResultIsNumber11 = -(NUMBER - NUMBER);
 >ResultIsNumber11 : Symbol(ResultIsNumber11, Decl(negateOperatorWithNumberType.ts, 31, 3))
->NUMBER : Symbol(NUMBER, Decl(negateOperatorWithNumberType.ts, 1, 3))
->NUMBER : Symbol(NUMBER, Decl(negateOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(negateOperatorWithNumberType.ts, 1, 11))
+>NUMBER : Symbol(NUMBER, Decl(negateOperatorWithNumberType.ts, 1, 11))
 
 // miss assignment operators
 -1;
 -NUMBER;
->NUMBER : Symbol(NUMBER, Decl(negateOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(negateOperatorWithNumberType.ts, 1, 11))
 
 -NUMBER1;
 >NUMBER1 : Symbol(NUMBER1, Decl(negateOperatorWithNumberType.ts, 2, 3))
@@ -105,15 +105,15 @@ var ResultIsNumber11 = -(NUMBER - NUMBER);
 >a : Symbol(A.a, Decl(negateOperatorWithNumberType.ts, 6, 9))
 
 -M.n;
->M.n : Symbol(M.n, Decl(negateOperatorWithNumberType.ts, 11, 14))
+>M.n : Symbol(M.n, Decl(negateOperatorWithNumberType.ts, 11, 22))
 >M : Symbol(M, Decl(negateOperatorWithNumberType.ts, 9, 1))
->n : Symbol(M.n, Decl(negateOperatorWithNumberType.ts, 11, 14))
+>n : Symbol(M.n, Decl(negateOperatorWithNumberType.ts, 11, 22))
 
 -objA.a, M.n;
 >objA.a : Symbol(A.a, Decl(negateOperatorWithNumberType.ts, 6, 9))
 >objA : Symbol(objA, Decl(negateOperatorWithNumberType.ts, 14, 3))
 >a : Symbol(A.a, Decl(negateOperatorWithNumberType.ts, 6, 9))
->M.n : Symbol(M.n, Decl(negateOperatorWithNumberType.ts, 11, 14))
+>M.n : Symbol(M.n, Decl(negateOperatorWithNumberType.ts, 11, 22))
 >M : Symbol(M, Decl(negateOperatorWithNumberType.ts, 9, 1))
->n : Symbol(M.n, Decl(negateOperatorWithNumberType.ts, 11, 14))
+>n : Symbol(M.n, Decl(negateOperatorWithNumberType.ts, 11, 22))
 
diff --git a/tests/baselines/reference/negateOperatorWithNumberType.types b/tests/baselines/reference/negateOperatorWithNumberType.types
index a90192bed6104..c99ed4c70828f 100644
--- a/tests/baselines/reference/negateOperatorWithNumberType.types
+++ b/tests/baselines/reference/negateOperatorWithNumberType.types
@@ -2,7 +2,7 @@
 
 === negateOperatorWithNumberType.ts ===
 // - operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 >NUMBER : number
 >       : ^^^^^^
 
@@ -26,7 +26,7 @@ class A {
 >A : A
 >  : ^
 
-    public a: number;
+    public a!: number;
 >a : number
 >  : ^^^^^^
 
@@ -40,7 +40,7 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: number;
+    export declare var n: number;
 >n : number
 >  : ^^^^^^
 }
diff --git a/tests/baselines/reference/negateOperatorWithStringType.errors.txt b/tests/baselines/reference/negateOperatorWithStringType.errors.txt
index 6bb99cf65f89f..dc242c2b4867f 100644
--- a/tests/baselines/reference/negateOperatorWithStringType.errors.txt
+++ b/tests/baselines/reference/negateOperatorWithStringType.errors.txt
@@ -3,17 +3,17 @@ negateOperatorWithStringType.ts(40,1): error TS2695: Left side of comma operator
 
 ==== negateOperatorWithStringType.ts (1 errors) ====
     // - operator on string type
-    var STRING: string;
+    declare var STRING: string;
     var STRING1: string[] = ["", "abc"];
     
     function foo(): string { return "abc"; }
     
     class A {
-        public a: string;
+        public a!: string;
         static foo() { return ""; }
     }
     namespace M {
-        export var n: string;
+        export var n: string = "";
     }
     
     var objA = new A();
diff --git a/tests/baselines/reference/negateOperatorWithStringType.js b/tests/baselines/reference/negateOperatorWithStringType.js
index 4583e60272c36..079e955f1a479 100644
--- a/tests/baselines/reference/negateOperatorWithStringType.js
+++ b/tests/baselines/reference/negateOperatorWithStringType.js
@@ -2,17 +2,17 @@
 
 //// [negateOperatorWithStringType.ts]
 // - operator on string type
-var STRING: string;
+declare var STRING: string;
 var STRING1: string[] = ["", "abc"];
 
 function foo(): string { return "abc"; }
 
 class A {
-    public a: string;
+    public a!: string;
     static foo() { return ""; }
 }
 namespace M {
-    export var n: string;
+    export var n: string = "";
 }
 
 var objA = new A();
@@ -43,8 +43,6 @@ var ResultIsNumber12 = -STRING.charAt(0);
 -objA.a,M.n;
 
 //// [negateOperatorWithStringType.js]
-// - operator on string type
-var STRING;
 var STRING1 = ["", "abc"];
 function foo() { return "abc"; }
 var A = /** @class */ (function () {
@@ -55,6 +53,7 @@ var A = /** @class */ (function () {
 }());
 var M;
 (function (M) {
+    M.n = "";
 })(M || (M = {}));
 var objA = new A();
 // string type var
diff --git a/tests/baselines/reference/negateOperatorWithStringType.symbols b/tests/baselines/reference/negateOperatorWithStringType.symbols
index 048e88fea9851..5351c4c98ee9d 100644
--- a/tests/baselines/reference/negateOperatorWithStringType.symbols
+++ b/tests/baselines/reference/negateOperatorWithStringType.symbols
@@ -2,8 +2,8 @@
 
 === negateOperatorWithStringType.ts ===
 // - operator on string type
-var STRING: string;
->STRING : Symbol(STRING, Decl(negateOperatorWithStringType.ts, 1, 3))
+declare var STRING: string;
+>STRING : Symbol(STRING, Decl(negateOperatorWithStringType.ts, 1, 11))
 
 var STRING1: string[] = ["", "abc"];
 >STRING1 : Symbol(STRING1, Decl(negateOperatorWithStringType.ts, 2, 3))
@@ -14,16 +14,16 @@ function foo(): string { return "abc"; }
 class A {
 >A : Symbol(A, Decl(negateOperatorWithStringType.ts, 4, 40))
 
-    public a: string;
+    public a!: string;
 >a : Symbol(A.a, Decl(negateOperatorWithStringType.ts, 6, 9))
 
     static foo() { return ""; }
->foo : Symbol(A.foo, Decl(negateOperatorWithStringType.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(negateOperatorWithStringType.ts, 7, 22))
 }
 namespace M {
 >M : Symbol(M, Decl(negateOperatorWithStringType.ts, 9, 1))
 
-    export var n: string;
+    export var n: string = "";
 >n : Symbol(n, Decl(negateOperatorWithStringType.ts, 11, 14))
 }
 
@@ -34,7 +34,7 @@ var objA = new A();
 // string type var
 var ResultIsNumber1 = -STRING;
 >ResultIsNumber1 : Symbol(ResultIsNumber1, Decl(negateOperatorWithStringType.ts, 17, 3))
->STRING : Symbol(STRING, Decl(negateOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(negateOperatorWithStringType.ts, 1, 11))
 
 var ResultIsNumber2 = -STRING1;
 >ResultIsNumber2 : Symbol(ResultIsNumber2, Decl(negateOperatorWithStringType.ts, 18, 3))
@@ -79,25 +79,25 @@ var ResultIsNumber9 = -foo();
 
 var ResultIsNumber10 = -A.foo();
 >ResultIsNumber10 : Symbol(ResultIsNumber10, Decl(negateOperatorWithStringType.ts, 30, 3))
->A.foo : Symbol(A.foo, Decl(negateOperatorWithStringType.ts, 7, 21))
+>A.foo : Symbol(A.foo, Decl(negateOperatorWithStringType.ts, 7, 22))
 >A : Symbol(A, Decl(negateOperatorWithStringType.ts, 4, 40))
->foo : Symbol(A.foo, Decl(negateOperatorWithStringType.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(negateOperatorWithStringType.ts, 7, 22))
 
 var ResultIsNumber11 = -(STRING + STRING);
 >ResultIsNumber11 : Symbol(ResultIsNumber11, Decl(negateOperatorWithStringType.ts, 31, 3))
->STRING : Symbol(STRING, Decl(negateOperatorWithStringType.ts, 1, 3))
->STRING : Symbol(STRING, Decl(negateOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(negateOperatorWithStringType.ts, 1, 11))
+>STRING : Symbol(STRING, Decl(negateOperatorWithStringType.ts, 1, 11))
 
 var ResultIsNumber12 = -STRING.charAt(0);
 >ResultIsNumber12 : Symbol(ResultIsNumber12, Decl(negateOperatorWithStringType.ts, 32, 3))
 >STRING.charAt : Symbol(String.charAt, Decl(lib.es5.d.ts, --, --))
->STRING : Symbol(STRING, Decl(negateOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(negateOperatorWithStringType.ts, 1, 11))
 >charAt : Symbol(String.charAt, Decl(lib.es5.d.ts, --, --))
 
 // miss assignment operators
 -"";
 -STRING;
->STRING : Symbol(STRING, Decl(negateOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(negateOperatorWithStringType.ts, 1, 11))
 
 -STRING1;
 >STRING1 : Symbol(STRING1, Decl(negateOperatorWithStringType.ts, 2, 3))
diff --git a/tests/baselines/reference/negateOperatorWithStringType.types b/tests/baselines/reference/negateOperatorWithStringType.types
index ce90e74df7d5a..42617d78d2814 100644
--- a/tests/baselines/reference/negateOperatorWithStringType.types
+++ b/tests/baselines/reference/negateOperatorWithStringType.types
@@ -2,7 +2,7 @@
 
 === negateOperatorWithStringType.ts ===
 // - operator on string type
-var STRING: string;
+declare var STRING: string;
 >STRING : string
 >       : ^^^^^^
 
@@ -26,7 +26,7 @@ class A {
 >A : A
 >  : ^
 
-    public a: string;
+    public a!: string;
 >a : string
 >  : ^^^^^^
 
@@ -40,9 +40,11 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: string;
+    export var n: string = "";
 >n : string
 >  : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 var objA = new A();
diff --git a/tests/baselines/reference/neverNullishThroughParentheses.errors.txt b/tests/baselines/reference/neverNullishThroughParentheses.errors.txt
new file mode 100644
index 0000000000000..cbdc7e457557d
--- /dev/null
+++ b/tests/baselines/reference/neverNullishThroughParentheses.errors.txt
@@ -0,0 +1,44 @@
+neverNullishThroughParentheses.ts(6,13): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+neverNullishThroughParentheses.ts(7,14): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+neverNullishThroughParentheses.ts(10,15): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+neverNullishThroughParentheses.ts(11,16): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+neverNullishThroughParentheses.ts(14,15): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+neverNullishThroughParentheses.ts(15,16): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+neverNullishThroughParentheses.ts(16,17): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+neverNullishThroughParentheses.ts(16,17): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+
+
+==== neverNullishThroughParentheses.ts (8 errors) ====
+    // Repro for issue where "never nullish" checks miss "never nullish" through parentheses
+    
+    const x: { y: string | undefined } | undefined = undefined as any;
+    
+    // Both should error - both expressions are guaranteed to be "oops"
+    const foo = x?.y ?? `oops` ?? "";
+                ~~~~~~~~~~~~~~
+!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+    const bar = (x?.y ?? `oops`) ?? "";
+                 ~~~~~~~~~~~~~~
+!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+    
+    // Additional test cases with various levels of nesting
+    const baz = ((x?.y ?? `oops`)) ?? "";
+                  ~~~~~~~~~~~~~~
+!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+    const qux = (((x?.y ?? `oops`))) ?? "";
+                   ~~~~~~~~~~~~~~
+!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+    
+    // Test with different types
+    const str1 = ("literal") ?? "fallback";
+                  ~~~~~~~~~
+!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+    const str2 = (("nested")) ?? "fallback";
+                   ~~~~~~~~
+!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+    const nested = ("a" ?? "b") ?? "c";
+                    ~~~
+!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+                    ~~~~~~~~~~
+!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/neverNullishThroughParentheses.js b/tests/baselines/reference/neverNullishThroughParentheses.js
new file mode 100644
index 0000000000000..c2f9e37512a30
--- /dev/null
+++ b/tests/baselines/reference/neverNullishThroughParentheses.js
@@ -0,0 +1,36 @@
+//// [tests/cases/compiler/neverNullishThroughParentheses.ts] ////
+
+//// [neverNullishThroughParentheses.ts]
+// Repro for issue where "never nullish" checks miss "never nullish" through parentheses
+
+const x: { y: string | undefined } | undefined = undefined as any;
+
+// Both should error - both expressions are guaranteed to be "oops"
+const foo = x?.y ?? `oops` ?? "";
+const bar = (x?.y ?? `oops`) ?? "";
+
+// Additional test cases with various levels of nesting
+const baz = ((x?.y ?? `oops`)) ?? "";
+const qux = (((x?.y ?? `oops`))) ?? "";
+
+// Test with different types
+const str1 = ("literal") ?? "fallback";
+const str2 = (("nested")) ?? "fallback";
+const nested = ("a" ?? "b") ?? "c";
+
+
+//// [neverNullishThroughParentheses.js]
+"use strict";
+// Repro for issue where "never nullish" checks miss "never nullish" through parentheses
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+var x = undefined;
+// Both should error - both expressions are guaranteed to be "oops"
+var foo = (_b = (_a = x === null || x === void 0 ? void 0 : x.y) !== null && _a !== void 0 ? _a : "oops") !== null && _b !== void 0 ? _b : "";
+var bar = (_d = ((_c = x === null || x === void 0 ? void 0 : x.y) !== null && _c !== void 0 ? _c : "oops")) !== null && _d !== void 0 ? _d : "";
+// Additional test cases with various levels of nesting
+var baz = (_f = (((_e = x === null || x === void 0 ? void 0 : x.y) !== null && _e !== void 0 ? _e : "oops"))) !== null && _f !== void 0 ? _f : "";
+var qux = (_h = ((((_g = x === null || x === void 0 ? void 0 : x.y) !== null && _g !== void 0 ? _g : "oops")))) !== null && _h !== void 0 ? _h : "";
+// Test with different types
+var str1 = (_j = ("literal")) !== null && _j !== void 0 ? _j : "fallback";
+var str2 = (_k = (("nested"))) !== null && _k !== void 0 ? _k : "fallback";
+var nested = (_l = ("a" !== null && "a" !== void 0 ? "a" : "b")) !== null && _l !== void 0 ? _l : "c";
diff --git a/tests/baselines/reference/neverNullishThroughParentheses.symbols b/tests/baselines/reference/neverNullishThroughParentheses.symbols
new file mode 100644
index 0000000000000..2c509e730e29e
--- /dev/null
+++ b/tests/baselines/reference/neverNullishThroughParentheses.symbols
@@ -0,0 +1,46 @@
+//// [tests/cases/compiler/neverNullishThroughParentheses.ts] ////
+
+=== neverNullishThroughParentheses.ts ===
+// Repro for issue where "never nullish" checks miss "never nullish" through parentheses
+
+const x: { y: string | undefined } | undefined = undefined as any;
+>x : Symbol(x, Decl(neverNullishThroughParentheses.ts, 2, 5))
+>y : Symbol(y, Decl(neverNullishThroughParentheses.ts, 2, 10))
+>undefined : Symbol(undefined)
+
+// Both should error - both expressions are guaranteed to be "oops"
+const foo = x?.y ?? `oops` ?? "";
+>foo : Symbol(foo, Decl(neverNullishThroughParentheses.ts, 5, 5))
+>x?.y : Symbol(y, Decl(neverNullishThroughParentheses.ts, 2, 10))
+>x : Symbol(x, Decl(neverNullishThroughParentheses.ts, 2, 5))
+>y : Symbol(y, Decl(neverNullishThroughParentheses.ts, 2, 10))
+
+const bar = (x?.y ?? `oops`) ?? "";
+>bar : Symbol(bar, Decl(neverNullishThroughParentheses.ts, 6, 5))
+>x?.y : Symbol(y, Decl(neverNullishThroughParentheses.ts, 2, 10))
+>x : Symbol(x, Decl(neverNullishThroughParentheses.ts, 2, 5))
+>y : Symbol(y, Decl(neverNullishThroughParentheses.ts, 2, 10))
+
+// Additional test cases with various levels of nesting
+const baz = ((x?.y ?? `oops`)) ?? "";
+>baz : Symbol(baz, Decl(neverNullishThroughParentheses.ts, 9, 5))
+>x?.y : Symbol(y, Decl(neverNullishThroughParentheses.ts, 2, 10))
+>x : Symbol(x, Decl(neverNullishThroughParentheses.ts, 2, 5))
+>y : Symbol(y, Decl(neverNullishThroughParentheses.ts, 2, 10))
+
+const qux = (((x?.y ?? `oops`))) ?? "";
+>qux : Symbol(qux, Decl(neverNullishThroughParentheses.ts, 10, 5))
+>x?.y : Symbol(y, Decl(neverNullishThroughParentheses.ts, 2, 10))
+>x : Symbol(x, Decl(neverNullishThroughParentheses.ts, 2, 5))
+>y : Symbol(y, Decl(neverNullishThroughParentheses.ts, 2, 10))
+
+// Test with different types
+const str1 = ("literal") ?? "fallback";
+>str1 : Symbol(str1, Decl(neverNullishThroughParentheses.ts, 13, 5))
+
+const str2 = (("nested")) ?? "fallback";
+>str2 : Symbol(str2, Decl(neverNullishThroughParentheses.ts, 14, 5))
+
+const nested = ("a" ?? "b") ?? "c";
+>nested : Symbol(nested, Decl(neverNullishThroughParentheses.ts, 15, 5))
+
diff --git a/tests/baselines/reference/neverNullishThroughParentheses.types b/tests/baselines/reference/neverNullishThroughParentheses.types
new file mode 100644
index 0000000000000..e061aafd4289a
--- /dev/null
+++ b/tests/baselines/reference/neverNullishThroughParentheses.types
@@ -0,0 +1,144 @@
+//// [tests/cases/compiler/neverNullishThroughParentheses.ts] ////
+
+=== neverNullishThroughParentheses.ts ===
+// Repro for issue where "never nullish" checks miss "never nullish" through parentheses
+
+const x: { y: string | undefined } | undefined = undefined as any;
+>x : { y: string | undefined; } | undefined
+>  : ^^^^^                  ^^^^^^^^^^^^^^^
+>y : string | undefined
+>  : ^^^^^^^^^^^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
+
+// Both should error - both expressions are guaranteed to be "oops"
+const foo = x?.y ?? `oops` ?? "";
+>foo : string
+>    : ^^^^^^
+>x?.y ?? `oops` ?? "" : string
+>                     : ^^^^^^
+>x?.y ?? `oops` : string
+>               : ^^^^^^
+>x?.y : string | undefined
+>     : ^^^^^^^^^^^^^^^^^^
+>x : { y: string | undefined; } | undefined
+>  : ^^^^^                  ^^^^^^^^^^^^^^^
+>y : string | undefined
+>  : ^^^^^^^^^^^^^^^^^^
+>`oops` : "oops"
+>       : ^^^^^^
+>"" : ""
+>   : ^^
+
+const bar = (x?.y ?? `oops`) ?? "";
+>bar : string
+>    : ^^^^^^
+>(x?.y ?? `oops`) ?? "" : string
+>                       : ^^^^^^
+>(x?.y ?? `oops`) : string
+>                 : ^^^^^^
+>x?.y ?? `oops` : string
+>               : ^^^^^^
+>x?.y : string | undefined
+>     : ^^^^^^^^^^^^^^^^^^
+>x : { y: string | undefined; } | undefined
+>  : ^^^^^                  ^^^^^^^^^^^^^^^
+>y : string | undefined
+>  : ^^^^^^^^^^^^^^^^^^
+>`oops` : "oops"
+>       : ^^^^^^
+>"" : ""
+>   : ^^
+
+// Additional test cases with various levels of nesting
+const baz = ((x?.y ?? `oops`)) ?? "";
+>baz : string
+>    : ^^^^^^
+>((x?.y ?? `oops`)) ?? "" : string
+>                         : ^^^^^^
+>((x?.y ?? `oops`)) : string
+>                   : ^^^^^^
+>(x?.y ?? `oops`) : string
+>                 : ^^^^^^
+>x?.y ?? `oops` : string
+>               : ^^^^^^
+>x?.y : string | undefined
+>     : ^^^^^^^^^^^^^^^^^^
+>x : { y: string | undefined; } | undefined
+>  : ^^^^^                  ^^^^^^^^^^^^^^^
+>y : string | undefined
+>  : ^^^^^^^^^^^^^^^^^^
+>`oops` : "oops"
+>       : ^^^^^^
+>"" : ""
+>   : ^^
+
+const qux = (((x?.y ?? `oops`))) ?? "";
+>qux : string
+>    : ^^^^^^
+>(((x?.y ?? `oops`))) ?? "" : string
+>                           : ^^^^^^
+>(((x?.y ?? `oops`))) : string
+>                     : ^^^^^^
+>((x?.y ?? `oops`)) : string
+>                   : ^^^^^^
+>(x?.y ?? `oops`) : string
+>                 : ^^^^^^
+>x?.y ?? `oops` : string
+>               : ^^^^^^
+>x?.y : string | undefined
+>     : ^^^^^^^^^^^^^^^^^^
+>x : { y: string | undefined; } | undefined
+>  : ^^^^^                  ^^^^^^^^^^^^^^^
+>y : string | undefined
+>  : ^^^^^^^^^^^^^^^^^^
+>`oops` : "oops"
+>       : ^^^^^^
+>"" : ""
+>   : ^^
+
+// Test with different types
+const str1 = ("literal") ?? "fallback";
+>str1 : "literal"
+>     : ^^^^^^^^^
+>("literal") ?? "fallback" : "literal"
+>                          : ^^^^^^^^^
+>("literal") : "literal"
+>            : ^^^^^^^^^
+>"literal" : "literal"
+>          : ^^^^^^^^^
+>"fallback" : "fallback"
+>           : ^^^^^^^^^^
+
+const str2 = (("nested")) ?? "fallback";
+>str2 : "nested"
+>     : ^^^^^^^^
+>(("nested")) ?? "fallback" : "nested"
+>                           : ^^^^^^^^
+>(("nested")) : "nested"
+>             : ^^^^^^^^
+>("nested") : "nested"
+>           : ^^^^^^^^
+>"nested" : "nested"
+>         : ^^^^^^^^
+>"fallback" : "fallback"
+>           : ^^^^^^^^^^
+
+const nested = ("a" ?? "b") ?? "c";
+>nested : "a"
+>       : ^^^
+>("a" ?? "b") ?? "c" : "a"
+>                    : ^^^
+>("a" ?? "b") : "a"
+>             : ^^^
+>"a" ?? "b" : "a"
+>           : ^^^
+>"a" : "a"
+>    : ^^^
+>"b" : "b"
+>    : ^^^
+>"c" : "c"
+>    : ^^^
+
diff --git a/tests/baselines/reference/noBundledEmitFromNodeModules.errors.txt b/tests/baselines/reference/noBundledEmitFromNodeModules.errors.txt
index d6f3865e2b2ee..ef8c261efa3da 100644
--- a/tests/baselines/reference/noBundledEmitFromNodeModules.errors.txt
+++ b/tests/baselines/reference/noBundledEmitFromNodeModules.errors.txt
@@ -1,10 +1,12 @@
 error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 !!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /a.ts (0 errors) ====
     import { C } from "projB";
diff --git a/tests/baselines/reference/noCrashOnNoLib.errors.txt b/tests/baselines/reference/noCrashOnNoLib.errors.txt
index 2faa74d47c86a..e8c7885ffadc3 100644
--- a/tests/baselines/reference/noCrashOnNoLib.errors.txt
+++ b/tests/baselines/reference/noCrashOnNoLib.errors.txt
@@ -18,7 +18,7 @@ error TS2318: Cannot find global type 'String'.
 !!! error TS2318: Cannot find global type 'String'.
 ==== noCrashOnNoLib.ts (0 errors) ====
     export function f() {
-        let e: {}[];
+        let e: {}[] = [];
         while (true) {
           e = [...(e || [])];
         }
diff --git a/tests/baselines/reference/noCrashOnNoLib.js b/tests/baselines/reference/noCrashOnNoLib.js
index 252687ed30e2a..e54b0c8eaa3e5 100644
--- a/tests/baselines/reference/noCrashOnNoLib.js
+++ b/tests/baselines/reference/noCrashOnNoLib.js
@@ -2,7 +2,7 @@
 
 //// [noCrashOnNoLib.ts]
 export function f() {
-    let e: {}[];
+    let e: {}[] = [];
     while (true) {
       e = [...(e || [])];
     }
@@ -22,7 +22,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.f = f;
 function f() {
-    var e;
+    var e = [];
     while (true) {
         e = __spreadArray([], (e || []), true);
     }
diff --git a/tests/baselines/reference/noCrashOnNoLib.symbols b/tests/baselines/reference/noCrashOnNoLib.symbols
index f251dc86504e5..d53ac420a0fb5 100644
--- a/tests/baselines/reference/noCrashOnNoLib.symbols
+++ b/tests/baselines/reference/noCrashOnNoLib.symbols
@@ -4,7 +4,7 @@
 export function f() {
 >f : Symbol(f, Decl(noCrashOnNoLib.ts, 0, 0))
 
-    let e: {}[];
+    let e: {}[] = [];
 >e : Symbol(e, Decl(noCrashOnNoLib.ts, 1, 7))
 
     while (true) {
diff --git a/tests/baselines/reference/noCrashOnNoLib.types b/tests/baselines/reference/noCrashOnNoLib.types
index 5c15b9ec1db81..9fde42af8149a 100644
--- a/tests/baselines/reference/noCrashOnNoLib.types
+++ b/tests/baselines/reference/noCrashOnNoLib.types
@@ -5,9 +5,11 @@ export function f() {
 >f : () => void
 >  : ^^^^^^^^^^
 
-    let e: {}[];
+    let e: {}[] = [];
 >e : {}
 >  : ^^
+>[] : {}
+>   : ^^
 
     while (true) {
 >true : true
diff --git a/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.errors.txt b/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.errors.txt
index 3ca982dc24782..3b16db314f11b 100644
--- a/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.errors.txt
+++ b/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.errors.txt
@@ -170,7 +170,7 @@ noImplicitAnyStringIndexerOnObject.ts(99,1): error TS7052: Element implicitly ha
 !!! error TS7053:   Property '[sym]' does not exist on type '{ a: number; }'.
     
     enum NumEnum { a, b }
-    let numEnumKey: NumEnum;
+    declare let numEnumKey: NumEnum;
     o[numEnumKey];
     ~~~~~~~~~~~~~
 !!! error TS7053: Element implicitly has an 'any' type because expression of type 'NumEnum' can't be used to index type '{ a: number; }'.
@@ -178,7 +178,7 @@ noImplicitAnyStringIndexerOnObject.ts(99,1): error TS7052: Element implicitly ha
     
     
     enum StrEnum { a = "a", b = "b" }
-    let strEnumKey: StrEnum;
+    declare let strEnumKey: StrEnum;
     o[strEnumKey];
     ~~~~~~~~~~~~~
 !!! error TS7053: Element implicitly has an 'any' type because expression of type 'StrEnum' can't be used to index type '{ a: number; }'.
diff --git a/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.js b/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.js
index f9d7693136e82..c9430c443a1ea 100644
--- a/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.js
+++ b/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.js
@@ -75,12 +75,12 @@ declare const sym : unique symbol;
 o[sym];
 
 enum NumEnum { a, b }
-let numEnumKey: NumEnum;
+declare let numEnumKey: NumEnum;
 o[numEnumKey];
 
 
 enum StrEnum { a = "a", b = "b" }
-let strEnumKey: StrEnum;
+declare let strEnumKey: StrEnum;
 o[strEnumKey];
 
 
@@ -165,14 +165,12 @@ var NumEnum;
     NumEnum[NumEnum["a"] = 0] = "a";
     NumEnum[NumEnum["b"] = 1] = "b";
 })(NumEnum || (NumEnum = {}));
-var numEnumKey;
 o[numEnumKey];
 var StrEnum;
 (function (StrEnum) {
     StrEnum["a"] = "a";
     StrEnum["b"] = "b";
 })(StrEnum || (StrEnum = {}));
-var strEnumKey;
 o[strEnumKey];
 var rover = { bark: function () { } };
 map[rover] = "Rover";
diff --git a/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.symbols b/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.symbols
index 3e099cb984003..ca605eef8b14a 100644
--- a/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.symbols
+++ b/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.symbols
@@ -219,13 +219,13 @@ enum NumEnum { a, b }
 >a : Symbol(NumEnum.a, Decl(noImplicitAnyStringIndexerOnObject.ts, 73, 14))
 >b : Symbol(NumEnum.b, Decl(noImplicitAnyStringIndexerOnObject.ts, 73, 17))
 
-let numEnumKey: NumEnum;
->numEnumKey : Symbol(numEnumKey, Decl(noImplicitAnyStringIndexerOnObject.ts, 74, 3))
+declare let numEnumKey: NumEnum;
+>numEnumKey : Symbol(numEnumKey, Decl(noImplicitAnyStringIndexerOnObject.ts, 74, 11))
 >NumEnum : Symbol(NumEnum, Decl(noImplicitAnyStringIndexerOnObject.ts, 71, 7))
 
 o[numEnumKey];
 >o : Symbol(o, Decl(noImplicitAnyStringIndexerOnObject.ts, 61, 5))
->numEnumKey : Symbol(numEnumKey, Decl(noImplicitAnyStringIndexerOnObject.ts, 74, 3))
+>numEnumKey : Symbol(numEnumKey, Decl(noImplicitAnyStringIndexerOnObject.ts, 74, 11))
 
 
 enum StrEnum { a = "a", b = "b" }
@@ -233,13 +233,13 @@ enum StrEnum { a = "a", b = "b" }
 >a : Symbol(StrEnum.a, Decl(noImplicitAnyStringIndexerOnObject.ts, 78, 14))
 >b : Symbol(StrEnum.b, Decl(noImplicitAnyStringIndexerOnObject.ts, 78, 23))
 
-let strEnumKey: StrEnum;
->strEnumKey : Symbol(strEnumKey, Decl(noImplicitAnyStringIndexerOnObject.ts, 79, 3))
+declare let strEnumKey: StrEnum;
+>strEnumKey : Symbol(strEnumKey, Decl(noImplicitAnyStringIndexerOnObject.ts, 79, 11))
 >StrEnum : Symbol(StrEnum, Decl(noImplicitAnyStringIndexerOnObject.ts, 75, 14))
 
 o[strEnumKey];
 >o : Symbol(o, Decl(noImplicitAnyStringIndexerOnObject.ts, 61, 5))
->strEnumKey : Symbol(strEnumKey, Decl(noImplicitAnyStringIndexerOnObject.ts, 79, 3))
+>strEnumKey : Symbol(strEnumKey, Decl(noImplicitAnyStringIndexerOnObject.ts, 79, 11))
 
 
 interface MyMap<K, T> {
diff --git a/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.types b/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.types
index 534eb2113b5b5..97d325f4aea64 100644
--- a/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.types
+++ b/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.types
@@ -623,7 +623,7 @@ enum NumEnum { a, b }
 >b : NumEnum.b
 >  : ^^^^^^^^^
 
-let numEnumKey: NumEnum;
+declare let numEnumKey: NumEnum;
 >numEnumKey : NumEnum
 >           : ^^^^^^^
 
@@ -648,7 +648,7 @@ enum StrEnum { a = "a", b = "b" }
 >"b" : "b"
 >    : ^^^
 
-let strEnumKey: StrEnum;
+declare let strEnumKey: StrEnum;
 >strEnumKey : StrEnum
 >           : ^^^^^^^
 
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.errors.txt b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.errors.txt
deleted file mode 100644
index 500d58c848515..0000000000000
--- a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
-
-
-!!! error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
-==== tsconfig.json (0 errors) ====
-    {
-      "compilerOptions": {
-        "module": "nodenext",
-        "outDir": "./dist",
-        "declarationDir": "./types",
-        "declaration": true
-      }
-    }
-==== index.ts (0 errors) ====
-    export {srcthing as thing} from "./src/thing.js";
-==== src/thing.ts (0 errors) ====
-    // The following import should cause `index.ts`
-    // to be included in the build, which will,
-    // in turn, cause the common src directory to not be `src`
-    // (the harness is wierd here in that noImplicitReferences makes only
-    // this file get loaded as an entrypoint and emitted, while on the
-    // real command-line we'll crawl the imports for that set - a limitation
-    // of the harness, I suppose)
-    import * as me from "@this/package";
-    
-    me.thing();
-    
-    export function srcthing(): void {}
-    
-    
-==== package.json (0 errors) ====
-    {
-      "name": "@this/package",
-      "type": "module",
-      "exports": {
-        ".": {
-          "default": "./dist/index.js",
-          "types": "./types/index.d.ts"
-        }
-      }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/nonPrimitiveAccessProperty.errors.txt b/tests/baselines/reference/nonPrimitiveAccessProperty.errors.txt
index 6d6bf24fea1b5..69b90ec317801 100644
--- a/tests/baselines/reference/nonPrimitiveAccessProperty.errors.txt
+++ b/tests/baselines/reference/nonPrimitiveAccessProperty.errors.txt
@@ -3,7 +3,7 @@ nonPrimitiveAccessProperty.ts(5,7): error TS2339: Property 'destructuring' does
 
 
 ==== nonPrimitiveAccessProperty.ts (2 errors) ====
-    var a: object;
+    var a: object = {};
     a.toString();
     a.nonExist(); // error
       ~~~~~~~~
diff --git a/tests/baselines/reference/nonPrimitiveAccessProperty.js b/tests/baselines/reference/nonPrimitiveAccessProperty.js
index 67f01d0062b94..41d9b8873ad6e 100644
--- a/tests/baselines/reference/nonPrimitiveAccessProperty.js
+++ b/tests/baselines/reference/nonPrimitiveAccessProperty.js
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/types/nonPrimitive/nonPrimitiveAccessProperty.ts] ////
 
 //// [nonPrimitiveAccessProperty.ts]
-var a: object;
+var a: object = {};
 a.toString();
 a.nonExist(); // error
 
@@ -21,7 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var a;
+var a = {};
 a.toString();
 a.nonExist(); // error
 var destructuring = a.destructuring; // error
diff --git a/tests/baselines/reference/nonPrimitiveAccessProperty.symbols b/tests/baselines/reference/nonPrimitiveAccessProperty.symbols
index 266033651b486..69a5e551895d4 100644
--- a/tests/baselines/reference/nonPrimitiveAccessProperty.symbols
+++ b/tests/baselines/reference/nonPrimitiveAccessProperty.symbols
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/types/nonPrimitive/nonPrimitiveAccessProperty.ts] ////
 
 === nonPrimitiveAccessProperty.ts ===
-var a: object;
+var a: object = {};
 >a : Symbol(a, Decl(nonPrimitiveAccessProperty.ts, 0, 3))
 
 a.toString();
diff --git a/tests/baselines/reference/nonPrimitiveAccessProperty.types b/tests/baselines/reference/nonPrimitiveAccessProperty.types
index af249331e2a41..e2ed330c334f9 100644
--- a/tests/baselines/reference/nonPrimitiveAccessProperty.types
+++ b/tests/baselines/reference/nonPrimitiveAccessProperty.types
@@ -1,9 +1,11 @@
 //// [tests/cases/conformance/types/nonPrimitive/nonPrimitiveAccessProperty.ts] ////
 
 === nonPrimitiveAccessProperty.ts ===
-var a: object;
+var a: object = {};
 >a : object
 >  : ^^^^^^
+>{} : {}
+>   : ^^
 
 a.toString();
 >a.toString() : string
diff --git a/tests/baselines/reference/nonPrimitiveAssignError.errors.txt b/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
index 5316da5b70e9f..338a00baf0dee 100644
--- a/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
+++ b/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
@@ -10,7 +10,7 @@ nonPrimitiveAssignError.ts(19,1): error TS2322: Type 'object' is not assignable
 ==== nonPrimitiveAssignError.ts (7 errors) ====
     var x = {};
     var y = {foo: "bar"};
-    var a: object;
+    var a: object = {};
     x = a;
     y = a; // expect error
     ~
diff --git a/tests/baselines/reference/nonPrimitiveAssignError.js b/tests/baselines/reference/nonPrimitiveAssignError.js
index b7f3a6da076d4..a064c662de7cd 100644
--- a/tests/baselines/reference/nonPrimitiveAssignError.js
+++ b/tests/baselines/reference/nonPrimitiveAssignError.js
@@ -3,7 +3,7 @@
 //// [nonPrimitiveAssignError.ts]
 var x = {};
 var y = {foo: "bar"};
-var a: object;
+var a: object = {};
 x = a;
 y = a; // expect error
 a = x;
@@ -33,7 +33,7 @@ a = strObj; // ok
 //// [nonPrimitiveAssignError.js]
 var x = {};
 var y = { foo: "bar" };
-var a;
+var a = {};
 x = a;
 y = a; // expect error
 a = x;
diff --git a/tests/baselines/reference/nonPrimitiveAssignError.symbols b/tests/baselines/reference/nonPrimitiveAssignError.symbols
index afc0a3813d723..e14c7b596a26e 100644
--- a/tests/baselines/reference/nonPrimitiveAssignError.symbols
+++ b/tests/baselines/reference/nonPrimitiveAssignError.symbols
@@ -8,7 +8,7 @@ var y = {foo: "bar"};
 >y : Symbol(y, Decl(nonPrimitiveAssignError.ts, 1, 3))
 >foo : Symbol(foo, Decl(nonPrimitiveAssignError.ts, 1, 9))
 
-var a: object;
+var a: object = {};
 >a : Symbol(a, Decl(nonPrimitiveAssignError.ts, 2, 3))
 
 x = a;
diff --git a/tests/baselines/reference/nonPrimitiveAssignError.types b/tests/baselines/reference/nonPrimitiveAssignError.types
index bd836112c0460..f99b0e92376bb 100644
--- a/tests/baselines/reference/nonPrimitiveAssignError.types
+++ b/tests/baselines/reference/nonPrimitiveAssignError.types
@@ -17,9 +17,11 @@ var y = {foo: "bar"};
 >"bar" : "bar"
 >      : ^^^^^
 
-var a: object;
+var a: object = {};
 >a : object
 >  : ^^^^^^
+>{} : {}
+>   : ^^
 
 x = a;
 >x = a : object
diff --git a/tests/baselines/reference/nonPrimitiveInFunction.errors.txt b/tests/baselines/reference/nonPrimitiveInFunction.errors.txt
index 687f15cb02794..d74d3ae676441 100644
--- a/tests/baselines/reference/nonPrimitiveInFunction.errors.txt
+++ b/tests/baselines/reference/nonPrimitiveInFunction.errors.txt
@@ -9,7 +9,7 @@ nonPrimitiveInFunction.ts(17,5): error TS2322: Type 'number' is not assignable t
         return {};
     }
     
-    var nonPrimitive: object;
+    var nonPrimitive: object = {};
     var primitive: boolean;
     
     takeObject(nonPrimitive);
diff --git a/tests/baselines/reference/nonPrimitiveInFunction.js b/tests/baselines/reference/nonPrimitiveInFunction.js
index 4b2960c25e0fe..03b1b872c200a 100644
--- a/tests/baselines/reference/nonPrimitiveInFunction.js
+++ b/tests/baselines/reference/nonPrimitiveInFunction.js
@@ -6,7 +6,7 @@ function returnObject(): object {
     return {};
 }
 
-var nonPrimitive: object;
+var nonPrimitive: object = {};
 var primitive: boolean;
 
 takeObject(nonPrimitive);
@@ -26,7 +26,7 @@ function takeObject(o) { }
 function returnObject() {
     return {};
 }
-var nonPrimitive;
+var nonPrimitive = {};
 var primitive;
 takeObject(nonPrimitive);
 nonPrimitive = returnObject();
diff --git a/tests/baselines/reference/nonPrimitiveInFunction.symbols b/tests/baselines/reference/nonPrimitiveInFunction.symbols
index eb0a7c80ab897..5b919256fad63 100644
--- a/tests/baselines/reference/nonPrimitiveInFunction.symbols
+++ b/tests/baselines/reference/nonPrimitiveInFunction.symbols
@@ -11,7 +11,7 @@ function returnObject(): object {
     return {};
 }
 
-var nonPrimitive: object;
+var nonPrimitive: object = {};
 >nonPrimitive : Symbol(nonPrimitive, Decl(nonPrimitiveInFunction.ts, 5, 3))
 
 var primitive: boolean;
diff --git a/tests/baselines/reference/nonPrimitiveInFunction.types b/tests/baselines/reference/nonPrimitiveInFunction.types
index a11ac1b683c70..d26686bc76da1 100644
--- a/tests/baselines/reference/nonPrimitiveInFunction.types
+++ b/tests/baselines/reference/nonPrimitiveInFunction.types
@@ -16,9 +16,11 @@ function returnObject(): object {
 >   : ^^
 }
 
-var nonPrimitive: object;
+var nonPrimitive: object = {};
 >nonPrimitive : object
 >             : ^^^^^^
+>{} : {}
+>   : ^^
 
 var primitive: boolean;
 >primitive : boolean
diff --git a/tests/baselines/reference/nonPrimitiveIndexingWithForInNoImplicitAny.errors.txt b/tests/baselines/reference/nonPrimitiveIndexingWithForInNoImplicitAny.errors.txt
deleted file mode 100644
index 67edeef6da26d..0000000000000
--- a/tests/baselines/reference/nonPrimitiveIndexingWithForInNoImplicitAny.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-nonPrimitiveIndexingWithForInNoImplicitAny.ts(4,17): error TS7053: Element implicitly has an 'any' type because expression of type 'string' can't be used to index type '{}'.
-  No index signature with a parameter of type 'string' was found on type '{}'.
-
-
-==== nonPrimitiveIndexingWithForInNoImplicitAny.ts (1 errors) ====
-    var a: object;
-    
-    for (var key in a) {
-        var value = a[key]; // error
-                    ~~~~~~
-!!! error TS7053: Element implicitly has an 'any' type because expression of type 'string' can't be used to index type '{}'.
-!!! error TS7053:   No index signature with a parameter of type 'string' was found on type '{}'.
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/nonPrimitiveIndexingWithForInNoImplicitAny.js b/tests/baselines/reference/nonPrimitiveIndexingWithForInNoImplicitAny.js
index 45c34d2738bb0..b447629cec0b9 100644
--- a/tests/baselines/reference/nonPrimitiveIndexingWithForInNoImplicitAny.js
+++ b/tests/baselines/reference/nonPrimitiveIndexingWithForInNoImplicitAny.js
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForInNoImplicitAny.ts] ////
 
 //// [nonPrimitiveIndexingWithForInNoImplicitAny.ts]
-var a: object;
+var a: object = {};
 
 for (var key in a) {
     var value = a[key]; // error
@@ -9,7 +9,7 @@ for (var key in a) {
 
 
 //// [nonPrimitiveIndexingWithForInNoImplicitAny.js]
-var a;
+var a = {};
 for (var key in a) {
     var value = a[key]; // error
 }
diff --git a/tests/baselines/reference/nonPrimitiveIndexingWithForInNoImplicitAny.symbols b/tests/baselines/reference/nonPrimitiveIndexingWithForInNoImplicitAny.symbols
index bcf59f021afb0..62223a0dd734a 100644
--- a/tests/baselines/reference/nonPrimitiveIndexingWithForInNoImplicitAny.symbols
+++ b/tests/baselines/reference/nonPrimitiveIndexingWithForInNoImplicitAny.symbols
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForInNoImplicitAny.ts] ////
 
 === nonPrimitiveIndexingWithForInNoImplicitAny.ts ===
-var a: object;
+var a: object = {};
 >a : Symbol(a, Decl(nonPrimitiveIndexingWithForInNoImplicitAny.ts, 0, 3))
 
 for (var key in a) {
diff --git a/tests/baselines/reference/nonPrimitiveIndexingWithForInNoImplicitAny.types b/tests/baselines/reference/nonPrimitiveIndexingWithForInNoImplicitAny.types
index 1e221259fd9cd..79c65771c083c 100644
--- a/tests/baselines/reference/nonPrimitiveIndexingWithForInNoImplicitAny.types
+++ b/tests/baselines/reference/nonPrimitiveIndexingWithForInNoImplicitAny.types
@@ -1,9 +1,11 @@
 //// [tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForInNoImplicitAny.ts] ////
 
 === nonPrimitiveIndexingWithForInNoImplicitAny.ts ===
-var a: object;
+var a: object = {};
 >a : object
 >  : ^^^^^^
+>{} : {}
+>   : ^^
 
 for (var key in a) {
 >key : string
@@ -12,10 +14,8 @@ for (var key in a) {
 >  : ^^^^^^
 
     var value = a[key]; // error
->value : any
->      : ^^^
->a[key] : any
->       : ^^^
+>value : error
+>a[key] : error
 >a : object
 >  : ^^^^^^
 >key : string
diff --git a/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.errors.txt b/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.errors.txt
index 6f1c412623127..f8d146b3988b2 100644
--- a/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.errors.txt
+++ b/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.errors.txt
@@ -5,7 +5,7 @@ nonPrimitiveIndexingWithForInSupressError.ts(4,17): error TS7053: Element implic
 
 !!! error TS5102: Option 'suppressImplicitAnyIndexErrors' has been removed. Please remove it from your configuration.
 ==== nonPrimitiveIndexingWithForInSupressError.ts (1 errors) ====
-    var a: object;
+    var a: object = {};
     
     for (var key in a) {
         var value = a[key];
diff --git a/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.js b/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.js
index d53785f99d3a5..fefa7350782da 100644
--- a/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.js
+++ b/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.js
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForInSupressError.ts] ////
 
 //// [nonPrimitiveIndexingWithForInSupressError.ts]
-var a: object;
+var a: object = {};
 
 for (var key in a) {
     var value = a[key];
@@ -9,7 +9,7 @@ for (var key in a) {
 
 
 //// [nonPrimitiveIndexingWithForInSupressError.js]
-var a;
+var a = {};
 for (var key in a) {
     var value = a[key];
 }
diff --git a/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.symbols b/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.symbols
index 89c047c912111..69aac0a68c7ee 100644
--- a/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.symbols
+++ b/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.symbols
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForInSupressError.ts] ////
 
 === nonPrimitiveIndexingWithForInSupressError.ts ===
-var a: object;
+var a: object = {};
 >a : Symbol(a, Decl(nonPrimitiveIndexingWithForInSupressError.ts, 0, 3))
 
 for (var key in a) {
diff --git a/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.types b/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.types
index b44e9ea14a831..2531b50547d9c 100644
--- a/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.types
+++ b/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.types
@@ -1,9 +1,11 @@
 //// [tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForInSupressError.ts] ////
 
 === nonPrimitiveIndexingWithForInSupressError.ts ===
-var a: object;
+var a: object = {};
 >a : object
 >  : ^^^^^^
+>{} : {}
+>   : ^^
 
 for (var key in a) {
 >key : string
diff --git a/tests/baselines/reference/nonPrimitiveNarrow.errors.txt b/tests/baselines/reference/nonPrimitiveNarrow.errors.txt
index f93b5b3d87435..a359b5b9f7e19 100644
--- a/tests/baselines/reference/nonPrimitiveNarrow.errors.txt
+++ b/tests/baselines/reference/nonPrimitiveNarrow.errors.txt
@@ -5,10 +5,10 @@ nonPrimitiveNarrow.ts(21,6): error TS2339: Property 'toString' does not exist on
 
 ==== nonPrimitiveNarrow.ts (3 errors) ====
     class Narrow {
-        narrowed: boolean
+        narrowed!: boolean
     }
     
-    var a: object
+    declare var a: object;
     
     if (a instanceof Narrow) {
         a.narrowed; // ok
@@ -23,7 +23,7 @@ nonPrimitiveNarrow.ts(21,6): error TS2339: Property 'toString' does not exist on
 !!! error TS2339: Property 'toFixed' does not exist on type 'never'.
     }
     
-    var b: object | null
+    declare var b: object | null;
     
     if (typeof b === 'object') {
        b.toString(); // ok, object | null
diff --git a/tests/baselines/reference/nonPrimitiveNarrow.js b/tests/baselines/reference/nonPrimitiveNarrow.js
index 1122f619476cd..92eaafaabd477 100644
--- a/tests/baselines/reference/nonPrimitiveNarrow.js
+++ b/tests/baselines/reference/nonPrimitiveNarrow.js
@@ -2,10 +2,10 @@
 
 //// [nonPrimitiveNarrow.ts]
 class Narrow {
-    narrowed: boolean
+    narrowed!: boolean
 }
 
-var a: object
+declare var a: object;
 
 if (a instanceof Narrow) {
     a.narrowed; // ok
@@ -16,7 +16,7 @@ if (typeof a === 'number') {
     a.toFixed(); // error, never
 }
 
-var b: object | null
+declare var b: object | null;
 
 if (typeof b === 'object') {
    b.toString(); // ok, object | null
@@ -31,7 +31,6 @@ var Narrow = /** @class */ (function () {
     }
     return Narrow;
 }());
-var a;
 if (a instanceof Narrow) {
     a.narrowed; // ok
     a = 123; // error
@@ -39,7 +38,6 @@ if (a instanceof Narrow) {
 if (typeof a === 'number') {
     a.toFixed(); // error, never
 }
-var b;
 if (typeof b === 'object') {
     b.toString(); // ok, object | null
 }
diff --git a/tests/baselines/reference/nonPrimitiveNarrow.symbols b/tests/baselines/reference/nonPrimitiveNarrow.symbols
index 66cc2f79baa0e..1decf247d1414 100644
--- a/tests/baselines/reference/nonPrimitiveNarrow.symbols
+++ b/tests/baselines/reference/nonPrimitiveNarrow.symbols
@@ -4,46 +4,46 @@
 class Narrow {
 >Narrow : Symbol(Narrow, Decl(nonPrimitiveNarrow.ts, 0, 0))
 
-    narrowed: boolean
+    narrowed!: boolean
 >narrowed : Symbol(Narrow.narrowed, Decl(nonPrimitiveNarrow.ts, 0, 14))
 }
 
-var a: object
->a : Symbol(a, Decl(nonPrimitiveNarrow.ts, 4, 3))
+declare var a: object;
+>a : Symbol(a, Decl(nonPrimitiveNarrow.ts, 4, 11))
 
 if (a instanceof Narrow) {
->a : Symbol(a, Decl(nonPrimitiveNarrow.ts, 4, 3))
+>a : Symbol(a, Decl(nonPrimitiveNarrow.ts, 4, 11))
 >Narrow : Symbol(Narrow, Decl(nonPrimitiveNarrow.ts, 0, 0))
 
     a.narrowed; // ok
 >a.narrowed : Symbol(Narrow.narrowed, Decl(nonPrimitiveNarrow.ts, 0, 14))
->a : Symbol(a, Decl(nonPrimitiveNarrow.ts, 4, 3))
+>a : Symbol(a, Decl(nonPrimitiveNarrow.ts, 4, 11))
 >narrowed : Symbol(Narrow.narrowed, Decl(nonPrimitiveNarrow.ts, 0, 14))
 
     a = 123; // error
->a : Symbol(a, Decl(nonPrimitiveNarrow.ts, 4, 3))
+>a : Symbol(a, Decl(nonPrimitiveNarrow.ts, 4, 11))
 }
 
 if (typeof a === 'number') {
->a : Symbol(a, Decl(nonPrimitiveNarrow.ts, 4, 3))
+>a : Symbol(a, Decl(nonPrimitiveNarrow.ts, 4, 11))
 
     a.toFixed(); // error, never
->a : Symbol(a, Decl(nonPrimitiveNarrow.ts, 4, 3))
+>a : Symbol(a, Decl(nonPrimitiveNarrow.ts, 4, 11))
 }
 
-var b: object | null
->b : Symbol(b, Decl(nonPrimitiveNarrow.ts, 15, 3))
+declare var b: object | null;
+>b : Symbol(b, Decl(nonPrimitiveNarrow.ts, 15, 11))
 
 if (typeof b === 'object') {
->b : Symbol(b, Decl(nonPrimitiveNarrow.ts, 15, 3))
+>b : Symbol(b, Decl(nonPrimitiveNarrow.ts, 15, 11))
 
    b.toString(); // ok, object | null
 >b.toString : Symbol(Object.toString, Decl(lib.es5.d.ts, --, --))
->b : Symbol(b, Decl(nonPrimitiveNarrow.ts, 15, 3))
+>b : Symbol(b, Decl(nonPrimitiveNarrow.ts, 15, 11))
 >toString : Symbol(Object.toString, Decl(lib.es5.d.ts, --, --))
 
 } else {
    b.toString(); // error, never
->b : Symbol(b, Decl(nonPrimitiveNarrow.ts, 15, 3))
+>b : Symbol(b, Decl(nonPrimitiveNarrow.ts, 15, 11))
 }
 
diff --git a/tests/baselines/reference/nonPrimitiveNarrow.types b/tests/baselines/reference/nonPrimitiveNarrow.types
index 72d16fcdccb77..f0af6ff8686de 100644
--- a/tests/baselines/reference/nonPrimitiveNarrow.types
+++ b/tests/baselines/reference/nonPrimitiveNarrow.types
@@ -5,12 +5,12 @@ class Narrow {
 >Narrow : Narrow
 >       : ^^^^^^
 
-    narrowed: boolean
+    narrowed!: boolean
 >narrowed : boolean
 >         : ^^^^^^^
 }
 
-var a: object
+declare var a: object;
 >a : object
 >  : ^^^^^^
 
@@ -60,7 +60,7 @@ if (typeof a === 'number') {
 >        : ^^^
 }
 
-var b: object | null
+declare var b: object | null;
 >b : object
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/numberVsBigIntOperations.errors.txt b/tests/baselines/reference/numberVsBigIntOperations.errors.txt
index a4eb7e72d3a54..318d63967d7b0 100644
--- a/tests/baselines/reference/numberVsBigIntOperations.errors.txt
+++ b/tests/baselines/reference/numberVsBigIntOperations.errors.txt
@@ -60,13 +60,11 @@ numberVsBigIntOperations.ts(57,17): error TS2363: The right-hand side of an arit
 numberVsBigIntOperations.ts(60,1): error TS2365: Operator '+' cannot be applied to types 'number | bigint' and 'number | bigint'.
 numberVsBigIntOperations.ts(61,1): error TS2365: Operator '<<' cannot be applied to types 'number | bigint' and 'number | bigint'.
 numberVsBigIntOperations.ts(70,2): error TS2736: Operator '+' cannot be applied to type 'number | bigint'.
-numberVsBigIntOperations.ts(86,7): error TS1155: 'const' declarations must be initialized.
-numberVsBigIntOperations.ts(93,7): error TS1155: 'const' declarations must be initialized.
 numberVsBigIntOperations.ts(98,6): error TS2736: Operator '+' cannot be applied to type 'S'.
 numberVsBigIntOperations.ts(99,5): error TS2365: Operator '+' cannot be applied to types 'number' and 'S'.
 
 
-==== numberVsBigIntOperations.ts (66 errors) ====
+==== numberVsBigIntOperations.ts (64 errors) ====
     // Cannot mix bigints and numbers
     let bigInt = 1n, num = 2;
     bigInt = 1n; bigInt = 2; num = 1n; num = 2;
@@ -243,7 +241,7 @@ numberVsBigIntOperations.ts(99,5): error TS2365: Operator '+' cannot be applied
                     ~~~~~
 !!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
     num = ~"3"; num = -false; // should infer number
-    let bigIntOrNumber: bigint | number;
+    declare let bigIntOrNumber: bigint | number;
     bigIntOrNumber + bigIntOrNumber; // should error, result in any
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2365: Operator '+' cannot be applied to types 'number | bigint' and 'number | bigint'.
@@ -276,18 +274,14 @@ numberVsBigIntOperations.ts(99,5): error TS2365: Operator '+' cannot be applied
     // Distinguishing numbers from bigints with typeof
     const isBigInt: (x: 0n | 1n) => bigint = (x: 0n | 1n) => x;
     const isNumber: (x: 0 | 1) => number = (x: 0 | 1) => x;
-    const zeroOrBigOne: 0 | 1n;
-          ~~~~~~~~~~~~
-!!! error TS1155: 'const' declarations must be initialized.
+    declare const zeroOrBigOne: 0 | 1n;
     if (typeof zeroOrBigOne === "bigint") isBigInt(zeroOrBigOne);
     else isNumber(zeroOrBigOne);
     
     // Distinguishing truthy from falsy
     const isOne = (x: 1 | 1n) => x;
     if (zeroOrBigOne) isOne(zeroOrBigOne);
-    const bigZeroOrOne: 0n | 1;
-          ~~~~~~~~~~~~
-!!! error TS1155: 'const' declarations must be initialized.
+    declare const bigZeroOrOne: 0n | 1;
     if (bigZeroOrOne) isOne(bigZeroOrOne);
     
     type NumberOrBigint = number | bigint;
diff --git a/tests/baselines/reference/numberVsBigIntOperations.js b/tests/baselines/reference/numberVsBigIntOperations.js
index c0bc2bcd77bcd..c895cd09b4549 100644
--- a/tests/baselines/reference/numberVsBigIntOperations.js
+++ b/tests/baselines/reference/numberVsBigIntOperations.js
@@ -59,7 +59,7 @@ result = bigInt !== num;
 num = "3" & 5; num = 2 ** false; // should error, but infer number
 "3" & 5n; 2n ** false; // should error, result in any
 num = ~"3"; num = -false; // should infer number
-let bigIntOrNumber: bigint | number;
+declare let bigIntOrNumber: bigint | number;
 bigIntOrNumber + bigIntOrNumber; // should error, result in any
 bigIntOrNumber << bigIntOrNumber; // should error, result in any
 if (typeof bigIntOrNumber === "bigint") {
@@ -86,14 +86,14 @@ anyValue--; // should infer number
 // Distinguishing numbers from bigints with typeof
 const isBigInt: (x: 0n | 1n) => bigint = (x: 0n | 1n) => x;
 const isNumber: (x: 0 | 1) => number = (x: 0 | 1) => x;
-const zeroOrBigOne: 0 | 1n;
+declare const zeroOrBigOne: 0 | 1n;
 if (typeof zeroOrBigOne === "bigint") isBigInt(zeroOrBigOne);
 else isNumber(zeroOrBigOne);
 
 // Distinguishing truthy from falsy
 const isOne = (x: 1 | 1n) => x;
 if (zeroOrBigOne) isOne(zeroOrBigOne);
-const bigZeroOrOne: 0n | 1;
+declare const bigZeroOrOne: 0n | 1;
 if (bigZeroOrOne) isOne(bigZeroOrOne);
 
 type NumberOrBigint = number | bigint;
@@ -243,7 +243,6 @@ num = 2 ** false; // should error, but infer number
 2n ** false; // should error, result in any
 num = ~"3";
 num = -false; // should infer number
-let bigIntOrNumber;
 bigIntOrNumber + bigIntOrNumber; // should error, result in any
 bigIntOrNumber << bigIntOrNumber; // should error, result in any
 if (typeof bigIntOrNumber === "bigint") {
@@ -269,7 +268,6 @@ anyValue--; // should infer number
 // Distinguishing numbers from bigints with typeof
 const isBigInt = (x) => x;
 const isNumber = (x) => x;
-const zeroOrBigOne;
 if (typeof zeroOrBigOne === "bigint")
     isBigInt(zeroOrBigOne);
 else
@@ -278,7 +276,6 @@ else
 const isOne = (x) => x;
 if (zeroOrBigOne)
     isOne(zeroOrBigOne);
-const bigZeroOrOne;
 if (bigZeroOrOne)
     isOne(bigZeroOrOne);
 function getKey(key) {
diff --git a/tests/baselines/reference/numberVsBigIntOperations.symbols b/tests/baselines/reference/numberVsBigIntOperations.symbols
index 5c1fb6f07a64e..aeeb9b704d2ab 100644
--- a/tests/baselines/reference/numberVsBigIntOperations.symbols
+++ b/tests/baselines/reference/numberVsBigIntOperations.symbols
@@ -238,46 +238,46 @@ num = ~"3"; num = -false; // should infer number
 >num : Symbol(num, Decl(numberVsBigIntOperations.ts, 1, 16))
 >num : Symbol(num, Decl(numberVsBigIntOperations.ts, 1, 16))
 
-let bigIntOrNumber: bigint | number;
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
+declare let bigIntOrNumber: bigint | number;
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
 
 bigIntOrNumber + bigIntOrNumber; // should error, result in any
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
 
 bigIntOrNumber << bigIntOrNumber; // should error, result in any
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
 
 if (typeof bigIntOrNumber === "bigint") {
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
 
     // Allowed, as type is narrowed to bigint
     bigIntOrNumber = bigIntOrNumber << bigIntOrNumber;
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
 }
 if (typeof bigIntOrNumber === "number") {
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
 
     // Allowed, as type is narrowed to number
     bigIntOrNumber = bigIntOrNumber << bigIntOrNumber;
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
 }
 +bigIntOrNumber; // should error, result in number
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
 
 ~bigIntOrNumber; // should infer number | bigint
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
 
 bigIntOrNumber++; // should infer number | bigint
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
 
 ++bigIntOrNumber; // should infer number | bigint
->bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 3))
+>bigIntOrNumber : Symbol(bigIntOrNumber, Decl(numberVsBigIntOperations.ts, 58, 11))
 
 let anyValue: any;
 >anyValue : Symbol(anyValue, Decl(numberVsBigIntOperations.ts, 73, 3))
@@ -319,17 +319,17 @@ const isNumber: (x: 0 | 1) => number = (x: 0 | 1) => x;
 >x : Symbol(x, Decl(numberVsBigIntOperations.ts, 84, 40))
 >x : Symbol(x, Decl(numberVsBigIntOperations.ts, 84, 40))
 
-const zeroOrBigOne: 0 | 1n;
->zeroOrBigOne : Symbol(zeroOrBigOne, Decl(numberVsBigIntOperations.ts, 85, 5))
+declare const zeroOrBigOne: 0 | 1n;
+>zeroOrBigOne : Symbol(zeroOrBigOne, Decl(numberVsBigIntOperations.ts, 85, 13))
 
 if (typeof zeroOrBigOne === "bigint") isBigInt(zeroOrBigOne);
->zeroOrBigOne : Symbol(zeroOrBigOne, Decl(numberVsBigIntOperations.ts, 85, 5))
+>zeroOrBigOne : Symbol(zeroOrBigOne, Decl(numberVsBigIntOperations.ts, 85, 13))
 >isBigInt : Symbol(isBigInt, Decl(numberVsBigIntOperations.ts, 83, 5))
->zeroOrBigOne : Symbol(zeroOrBigOne, Decl(numberVsBigIntOperations.ts, 85, 5))
+>zeroOrBigOne : Symbol(zeroOrBigOne, Decl(numberVsBigIntOperations.ts, 85, 13))
 
 else isNumber(zeroOrBigOne);
 >isNumber : Symbol(isNumber, Decl(numberVsBigIntOperations.ts, 84, 5))
->zeroOrBigOne : Symbol(zeroOrBigOne, Decl(numberVsBigIntOperations.ts, 85, 5))
+>zeroOrBigOne : Symbol(zeroOrBigOne, Decl(numberVsBigIntOperations.ts, 85, 13))
 
 // Distinguishing truthy from falsy
 const isOne = (x: 1 | 1n) => x;
@@ -338,17 +338,17 @@ const isOne = (x: 1 | 1n) => x;
 >x : Symbol(x, Decl(numberVsBigIntOperations.ts, 90, 15))
 
 if (zeroOrBigOne) isOne(zeroOrBigOne);
->zeroOrBigOne : Symbol(zeroOrBigOne, Decl(numberVsBigIntOperations.ts, 85, 5))
+>zeroOrBigOne : Symbol(zeroOrBigOne, Decl(numberVsBigIntOperations.ts, 85, 13))
 >isOne : Symbol(isOne, Decl(numberVsBigIntOperations.ts, 90, 5))
->zeroOrBigOne : Symbol(zeroOrBigOne, Decl(numberVsBigIntOperations.ts, 85, 5))
+>zeroOrBigOne : Symbol(zeroOrBigOne, Decl(numberVsBigIntOperations.ts, 85, 13))
 
-const bigZeroOrOne: 0n | 1;
->bigZeroOrOne : Symbol(bigZeroOrOne, Decl(numberVsBigIntOperations.ts, 92, 5))
+declare const bigZeroOrOne: 0n | 1;
+>bigZeroOrOne : Symbol(bigZeroOrOne, Decl(numberVsBigIntOperations.ts, 92, 13))
 
 if (bigZeroOrOne) isOne(bigZeroOrOne);
->bigZeroOrOne : Symbol(bigZeroOrOne, Decl(numberVsBigIntOperations.ts, 92, 5))
+>bigZeroOrOne : Symbol(bigZeroOrOne, Decl(numberVsBigIntOperations.ts, 92, 13))
 >isOne : Symbol(isOne, Decl(numberVsBigIntOperations.ts, 90, 5))
->bigZeroOrOne : Symbol(bigZeroOrOne, Decl(numberVsBigIntOperations.ts, 92, 5))
+>bigZeroOrOne : Symbol(bigZeroOrOne, Decl(numberVsBigIntOperations.ts, 92, 13))
 
 type NumberOrBigint = number | bigint;
 >NumberOrBigint : Symbol(NumberOrBigint, Decl(numberVsBigIntOperations.ts, 93, 38))
diff --git a/tests/baselines/reference/numberVsBigIntOperations.types b/tests/baselines/reference/numberVsBigIntOperations.types
index 1d54ea840370a..4a5533b02b799 100644
--- a/tests/baselines/reference/numberVsBigIntOperations.types
+++ b/tests/baselines/reference/numberVsBigIntOperations.types
@@ -1070,7 +1070,7 @@ num = ~"3"; num = -false; // should infer number
 >false : false
 >      : ^^^^^
 
-let bigIntOrNumber: bigint | number;
+declare let bigIntOrNumber: bigint | number;
 >bigIntOrNumber : number | bigint
 >               : ^^^^^^^^^^^^^^^
 
@@ -1237,7 +1237,7 @@ const isNumber: (x: 0 | 1) => number = (x: 0 | 1) => x;
 >x : 0 | 1
 >  : ^^^^^
 
-const zeroOrBigOne: 0 | 1n;
+declare const zeroOrBigOne: 0 | 1n;
 >zeroOrBigOne : 0 | 1n
 >             : ^^^^^^
 
@@ -1286,7 +1286,7 @@ if (zeroOrBigOne) isOne(zeroOrBigOne);
 >zeroOrBigOne : 1n
 >             : ^^
 
-const bigZeroOrOne: 0n | 1;
+declare const bigZeroOrOne: 0n | 1;
 >bigZeroOrOne : 0n | 1
 >             : ^^^^^^
 
diff --git a/tests/baselines/reference/numericIndexExpressions.errors.txt b/tests/baselines/reference/numericIndexExpressions.errors.txt
index 57ca735d19a85..1e88a632eb655 100644
--- a/tests/baselines/reference/numericIndexExpressions.errors.txt
+++ b/tests/baselines/reference/numericIndexExpressions.errors.txt
@@ -13,7 +13,7 @@ numericIndexExpressions.ts(15,1): error TS2322: Type 'number' is not assignable
     }
      
      
-    var x: Numbers1;
+    declare var x: Numbers1;
     x[1] = 4; // error
     ~~~~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
@@ -21,7 +21,7 @@ numericIndexExpressions.ts(15,1): error TS2322: Type 'number' is not assignable
     ~~~~~~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
     
-    var y: Strings1;
+    declare var y: Strings1;
     y['1'] = 4; // should be error
     ~~~~~~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/numericIndexExpressions.js b/tests/baselines/reference/numericIndexExpressions.js
index 11b0e1c43f6da..2b4fbad5ceece 100644
--- a/tests/baselines/reference/numericIndexExpressions.js
+++ b/tests/baselines/reference/numericIndexExpressions.js
@@ -9,18 +9,16 @@ interface Strings1 {
 }
  
  
-var x: Numbers1;
+declare var x: Numbers1;
 x[1] = 4; // error
 x['1'] = 4; // error
 
-var y: Strings1;
+declare var y: Strings1;
 y['1'] = 4; // should be error
 y[1] = 4; // should be error
 
 //// [numericIndexExpressions.js]
-var x;
 x[1] = 4; // error
 x['1'] = 4; // error
-var y;
 y['1'] = 4; // should be error
 y[1] = 4; // should be error
diff --git a/tests/baselines/reference/numericIndexExpressions.symbols b/tests/baselines/reference/numericIndexExpressions.symbols
index 616a542809ca9..f9301930dc3f4 100644
--- a/tests/baselines/reference/numericIndexExpressions.symbols
+++ b/tests/baselines/reference/numericIndexExpressions.symbols
@@ -15,27 +15,27 @@ interface Strings1 {
 }
  
  
-var x: Numbers1;
->x : Symbol(x, Decl(numericIndexExpressions.ts, 8, 3))
+declare var x: Numbers1;
+>x : Symbol(x, Decl(numericIndexExpressions.ts, 8, 11))
 >Numbers1 : Symbol(Numbers1, Decl(numericIndexExpressions.ts, 0, 0))
 
 x[1] = 4; // error
->x : Symbol(x, Decl(numericIndexExpressions.ts, 8, 3))
+>x : Symbol(x, Decl(numericIndexExpressions.ts, 8, 11))
 >1 : Symbol(Numbers1[1], Decl(numericIndexExpressions.ts, 0, 20))
 
 x['1'] = 4; // error
->x : Symbol(x, Decl(numericIndexExpressions.ts, 8, 3))
+>x : Symbol(x, Decl(numericIndexExpressions.ts, 8, 11))
 >'1' : Symbol(Numbers1[1], Decl(numericIndexExpressions.ts, 0, 20))
 
-var y: Strings1;
->y : Symbol(y, Decl(numericIndexExpressions.ts, 12, 3))
+declare var y: Strings1;
+>y : Symbol(y, Decl(numericIndexExpressions.ts, 12, 11))
 >Strings1 : Symbol(Strings1, Decl(numericIndexExpressions.ts, 2, 1))
 
 y['1'] = 4; // should be error
->y : Symbol(y, Decl(numericIndexExpressions.ts, 12, 3))
+>y : Symbol(y, Decl(numericIndexExpressions.ts, 12, 11))
 >'1' : Symbol(Strings1['1'], Decl(numericIndexExpressions.ts, 3, 20))
 
 y[1] = 4; // should be error
->y : Symbol(y, Decl(numericIndexExpressions.ts, 12, 3))
+>y : Symbol(y, Decl(numericIndexExpressions.ts, 12, 11))
 >1 : Symbol(Strings1['1'], Decl(numericIndexExpressions.ts, 3, 20))
 
diff --git a/tests/baselines/reference/numericIndexExpressions.types b/tests/baselines/reference/numericIndexExpressions.types
index d92366b24ec2f..a88695d800398 100644
--- a/tests/baselines/reference/numericIndexExpressions.types
+++ b/tests/baselines/reference/numericIndexExpressions.types
@@ -13,7 +13,7 @@ interface Strings1 {
 }
  
  
-var x: Numbers1;
+declare var x: Numbers1;
 >x : Numbers1
 >  : ^^^^^^^^
 
@@ -41,7 +41,7 @@ x['1'] = 4; // error
 >4 : 4
 >  : ^
 
-var y: Strings1;
+declare var y: Strings1;
 >y : Strings1
 >  : ^^^^^^^^
 
diff --git a/tests/baselines/reference/numericIndexerConstraint1.errors.txt b/tests/baselines/reference/numericIndexerConstraint1.errors.txt
index ee8e910c2fb4f..4a2fda6b8320a 100644
--- a/tests/baselines/reference/numericIndexerConstraint1.errors.txt
+++ b/tests/baselines/reference/numericIndexerConstraint1.errors.txt
@@ -3,7 +3,7 @@ numericIndexerConstraint1.ts(3,5): error TS2322: Type 'number' is not assignable
 
 ==== numericIndexerConstraint1.ts (1 errors) ====
     class Foo { foo() { } }
-    var x: { [index: string]: number; };
+    declare var x: { [index: string]: number; };
     var result: Foo = x["one"]; // error
         ~~~~~~
 !!! error TS2322: Type 'number' is not assignable to type 'Foo'.
diff --git a/tests/baselines/reference/numericIndexerConstraint1.js b/tests/baselines/reference/numericIndexerConstraint1.js
index 1e009d0fc6150..bde751800f53a 100644
--- a/tests/baselines/reference/numericIndexerConstraint1.js
+++ b/tests/baselines/reference/numericIndexerConstraint1.js
@@ -2,7 +2,7 @@
 
 //// [numericIndexerConstraint1.ts]
 class Foo { foo() { } }
-var x: { [index: string]: number; };
+declare var x: { [index: string]: number; };
 var result: Foo = x["one"]; // error
 
 
@@ -13,5 +13,4 @@ var Foo = /** @class */ (function () {
     Foo.prototype.foo = function () { };
     return Foo;
 }());
-var x;
 var result = x["one"]; // error
diff --git a/tests/baselines/reference/numericIndexerConstraint1.symbols b/tests/baselines/reference/numericIndexerConstraint1.symbols
index 8e95e2172bc4a..3324af8acdecb 100644
--- a/tests/baselines/reference/numericIndexerConstraint1.symbols
+++ b/tests/baselines/reference/numericIndexerConstraint1.symbols
@@ -5,12 +5,12 @@ class Foo { foo() { } }
 >Foo : Symbol(Foo, Decl(numericIndexerConstraint1.ts, 0, 0))
 >foo : Symbol(Foo.foo, Decl(numericIndexerConstraint1.ts, 0, 11))
 
-var x: { [index: string]: number; };
->x : Symbol(x, Decl(numericIndexerConstraint1.ts, 1, 3))
->index : Symbol(index, Decl(numericIndexerConstraint1.ts, 1, 10))
+declare var x: { [index: string]: number; };
+>x : Symbol(x, Decl(numericIndexerConstraint1.ts, 1, 11))
+>index : Symbol(index, Decl(numericIndexerConstraint1.ts, 1, 18))
 
 var result: Foo = x["one"]; // error
 >result : Symbol(result, Decl(numericIndexerConstraint1.ts, 2, 3))
 >Foo : Symbol(Foo, Decl(numericIndexerConstraint1.ts, 0, 0))
->x : Symbol(x, Decl(numericIndexerConstraint1.ts, 1, 3))
+>x : Symbol(x, Decl(numericIndexerConstraint1.ts, 1, 11))
 
diff --git a/tests/baselines/reference/numericIndexerConstraint1.types b/tests/baselines/reference/numericIndexerConstraint1.types
index 7d288c77529dc..cf5c90b7f0af7 100644
--- a/tests/baselines/reference/numericIndexerConstraint1.types
+++ b/tests/baselines/reference/numericIndexerConstraint1.types
@@ -7,7 +7,7 @@ class Foo { foo() { } }
 >foo : () => void
 >    : ^^^^^^^^^^
 
-var x: { [index: string]: number; };
+declare var x: { [index: string]: number; };
 >x : { [index: string]: number; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >index : string
diff --git a/tests/baselines/reference/numericIndexerConstraint2.errors.txt b/tests/baselines/reference/numericIndexerConstraint2.errors.txt
index ab490864e3611..fe4593f5dae81 100644
--- a/tests/baselines/reference/numericIndexerConstraint2.errors.txt
+++ b/tests/baselines/reference/numericIndexerConstraint2.errors.txt
@@ -5,8 +5,8 @@ numericIndexerConstraint2.ts(4,1): error TS2322: Type '{ one: number; }' is not
 
 ==== numericIndexerConstraint2.ts (1 errors) ====
     class Foo { foo() { } }
-    var x: { [index: string]: Foo; };
-    var a: { one: number; };
+    declare var x: { [index: string]: Foo; };
+    var a: { one: number; } = { one: 1 };
     x = a;
     ~
 !!! error TS2322: Type '{ one: number; }' is not assignable to type '{ [index: string]: Foo; }'.
diff --git a/tests/baselines/reference/numericIndexerConstraint2.js b/tests/baselines/reference/numericIndexerConstraint2.js
index f9f4d10b52be2..8cb4493468d87 100644
--- a/tests/baselines/reference/numericIndexerConstraint2.js
+++ b/tests/baselines/reference/numericIndexerConstraint2.js
@@ -2,8 +2,8 @@
 
 //// [numericIndexerConstraint2.ts]
 class Foo { foo() { } }
-var x: { [index: string]: Foo; };
-var a: { one: number; };
+declare var x: { [index: string]: Foo; };
+var a: { one: number; } = { one: 1 };
 x = a;
 
 //// [numericIndexerConstraint2.js]
@@ -13,6 +13,5 @@ var Foo = /** @class */ (function () {
     Foo.prototype.foo = function () { };
     return Foo;
 }());
-var x;
-var a;
+var a = { one: 1 };
 x = a;
diff --git a/tests/baselines/reference/numericIndexerConstraint2.symbols b/tests/baselines/reference/numericIndexerConstraint2.symbols
index 65cc94e02e8c2..61cf8f8992e24 100644
--- a/tests/baselines/reference/numericIndexerConstraint2.symbols
+++ b/tests/baselines/reference/numericIndexerConstraint2.symbols
@@ -5,16 +5,17 @@ class Foo { foo() { } }
 >Foo : Symbol(Foo, Decl(numericIndexerConstraint2.ts, 0, 0))
 >foo : Symbol(Foo.foo, Decl(numericIndexerConstraint2.ts, 0, 11))
 
-var x: { [index: string]: Foo; };
->x : Symbol(x, Decl(numericIndexerConstraint2.ts, 1, 3))
->index : Symbol(index, Decl(numericIndexerConstraint2.ts, 1, 10))
+declare var x: { [index: string]: Foo; };
+>x : Symbol(x, Decl(numericIndexerConstraint2.ts, 1, 11))
+>index : Symbol(index, Decl(numericIndexerConstraint2.ts, 1, 18))
 >Foo : Symbol(Foo, Decl(numericIndexerConstraint2.ts, 0, 0))
 
-var a: { one: number; };
+var a: { one: number; } = { one: 1 };
 >a : Symbol(a, Decl(numericIndexerConstraint2.ts, 2, 3))
 >one : Symbol(one, Decl(numericIndexerConstraint2.ts, 2, 8))
+>one : Symbol(one, Decl(numericIndexerConstraint2.ts, 2, 27))
 
 x = a;
->x : Symbol(x, Decl(numericIndexerConstraint2.ts, 1, 3))
+>x : Symbol(x, Decl(numericIndexerConstraint2.ts, 1, 11))
 >a : Symbol(a, Decl(numericIndexerConstraint2.ts, 2, 3))
 
diff --git a/tests/baselines/reference/numericIndexerConstraint2.types b/tests/baselines/reference/numericIndexerConstraint2.types
index dc2f51b285e19..ee44f5bfeac5e 100644
--- a/tests/baselines/reference/numericIndexerConstraint2.types
+++ b/tests/baselines/reference/numericIndexerConstraint2.types
@@ -7,17 +7,23 @@ class Foo { foo() { } }
 >foo : () => void
 >    : ^^^^^^^^^^
 
-var x: { [index: string]: Foo; };
+declare var x: { [index: string]: Foo; };
 >x : { [index: string]: Foo; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >index : string
 >      : ^^^^^^
 
-var a: { one: number; };
+var a: { one: number; } = { one: 1 };
 >a : { one: number; }
 >  : ^^^^^^^      ^^^
 >one : number
 >    : ^^^^^^
+>{ one: 1 } : { one: number; }
+>           : ^^^^^^^^^^^^^^^^
+>one : number
+>    : ^^^^^^
+>1 : 1
+>  : ^
 
 x = a;
 >x = a : { one: number; }
diff --git a/tests/baselines/reference/numericIndexerTyping1.errors.txt b/tests/baselines/reference/numericIndexerTyping1.errors.txt
index e7f2a9cd9c443..d2268750fc530 100644
--- a/tests/baselines/reference/numericIndexerTyping1.errors.txt
+++ b/tests/baselines/reference/numericIndexerTyping1.errors.txt
@@ -10,12 +10,12 @@ numericIndexerTyping1.ts(12,5): error TS2322: Type 'Date' is not assignable to t
     interface I2 extends I {
     }
     
-    var i: I;
+    declare var i: I;
     var r: string = i[1]; // error: numeric indexer returns the type of the string indexer
         ~
 !!! error TS2322: Type 'Date' is not assignable to type 'string'.
     
-    var i2: I2;
+    declare var i2: I2;
     var r2: string = i2[1]; // error: numeric indexer returns the type of the string indexer
         ~~
 !!! error TS2322: Type 'Date' is not assignable to type 'string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/numericIndexerTyping1.js b/tests/baselines/reference/numericIndexerTyping1.js
index 4a3905b042c53..57289320bde72 100644
--- a/tests/baselines/reference/numericIndexerTyping1.js
+++ b/tests/baselines/reference/numericIndexerTyping1.js
@@ -8,14 +8,12 @@ interface I {
 interface I2 extends I {
 }
 
-var i: I;
+declare var i: I;
 var r: string = i[1]; // error: numeric indexer returns the type of the string indexer
 
-var i2: I2;
+declare var i2: I2;
 var r2: string = i2[1]; // error: numeric indexer returns the type of the string indexer
 
 //// [numericIndexerTyping1.js]
-var i;
 var r = i[1]; // error: numeric indexer returns the type of the string indexer
-var i2;
 var r2 = i2[1]; // error: numeric indexer returns the type of the string indexer
diff --git a/tests/baselines/reference/numericIndexerTyping1.symbols b/tests/baselines/reference/numericIndexerTyping1.symbols
index 0a673ac898454..f1d2762b3b721 100644
--- a/tests/baselines/reference/numericIndexerTyping1.symbols
+++ b/tests/baselines/reference/numericIndexerTyping1.symbols
@@ -14,19 +14,19 @@ interface I2 extends I {
 >I : Symbol(I, Decl(numericIndexerTyping1.ts, 0, 0))
 }
 
-var i: I;
->i : Symbol(i, Decl(numericIndexerTyping1.ts, 7, 3))
+declare var i: I;
+>i : Symbol(i, Decl(numericIndexerTyping1.ts, 7, 11))
 >I : Symbol(I, Decl(numericIndexerTyping1.ts, 0, 0))
 
 var r: string = i[1]; // error: numeric indexer returns the type of the string indexer
 >r : Symbol(r, Decl(numericIndexerTyping1.ts, 8, 3))
->i : Symbol(i, Decl(numericIndexerTyping1.ts, 7, 3))
+>i : Symbol(i, Decl(numericIndexerTyping1.ts, 7, 11))
 
-var i2: I2;
->i2 : Symbol(i2, Decl(numericIndexerTyping1.ts, 10, 3))
+declare var i2: I2;
+>i2 : Symbol(i2, Decl(numericIndexerTyping1.ts, 10, 11))
 >I2 : Symbol(I2, Decl(numericIndexerTyping1.ts, 2, 1))
 
 var r2: string = i2[1]; // error: numeric indexer returns the type of the string indexer
 >r2 : Symbol(r2, Decl(numericIndexerTyping1.ts, 11, 3))
->i2 : Symbol(i2, Decl(numericIndexerTyping1.ts, 10, 3))
+>i2 : Symbol(i2, Decl(numericIndexerTyping1.ts, 10, 11))
 
diff --git a/tests/baselines/reference/numericIndexerTyping1.types b/tests/baselines/reference/numericIndexerTyping1.types
index 2d5897fb5bc9c..64bf6adb2578c 100644
--- a/tests/baselines/reference/numericIndexerTyping1.types
+++ b/tests/baselines/reference/numericIndexerTyping1.types
@@ -10,7 +10,7 @@ interface I {
 interface I2 extends I {
 }
 
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
@@ -24,7 +24,7 @@ var r: string = i[1]; // error: numeric indexer returns the type of the string i
 >1 : 1
 >  : ^
 
-var i2: I2;
+declare var i2: I2;
 >i2 : I2
 >   : ^^
 
diff --git a/tests/baselines/reference/numericIndexerTyping2.errors.txt b/tests/baselines/reference/numericIndexerTyping2.errors.txt
index 336f812631cfc..109707bd81ed2 100644
--- a/tests/baselines/reference/numericIndexerTyping2.errors.txt
+++ b/tests/baselines/reference/numericIndexerTyping2.errors.txt
@@ -10,12 +10,12 @@ numericIndexerTyping2.ts(12,5): error TS2322: Type 'Date' is not assignable to t
     class I2 extends I {
     }
     
-    var i: I;
+    declare var i: I;
     var r: string = i[1]; // error: numeric indexer returns the type of the string indexer
         ~
 !!! error TS2322: Type 'Date' is not assignable to type 'string'.
     
-    var i2: I2;
+    declare var i2: I2;
     var r2: string = i2[1]; // error: numeric indexer returns the type of the string indexere
         ~~
 !!! error TS2322: Type 'Date' is not assignable to type 'string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/numericIndexerTyping2.js b/tests/baselines/reference/numericIndexerTyping2.js
index 0506bdb6e0270..ab52dc3c45cbb 100644
--- a/tests/baselines/reference/numericIndexerTyping2.js
+++ b/tests/baselines/reference/numericIndexerTyping2.js
@@ -8,10 +8,10 @@ class I {
 class I2 extends I {
 }
 
-var i: I;
+declare var i: I;
 var r: string = i[1]; // error: numeric indexer returns the type of the string indexer
 
-var i2: I2;
+declare var i2: I2;
 var r2: string = i2[1]; // error: numeric indexer returns the type of the string indexere
 
 //// [numericIndexerTyping2.js]
@@ -42,7 +42,5 @@ var I2 = /** @class */ (function (_super) {
     }
     return I2;
 }(I));
-var i;
 var r = i[1]; // error: numeric indexer returns the type of the string indexer
-var i2;
 var r2 = i2[1]; // error: numeric indexer returns the type of the string indexere
diff --git a/tests/baselines/reference/numericIndexerTyping2.symbols b/tests/baselines/reference/numericIndexerTyping2.symbols
index baea3b88223f7..3e79cfbe794ef 100644
--- a/tests/baselines/reference/numericIndexerTyping2.symbols
+++ b/tests/baselines/reference/numericIndexerTyping2.symbols
@@ -14,19 +14,19 @@ class I2 extends I {
 >I : Symbol(I, Decl(numericIndexerTyping2.ts, 0, 0))
 }
 
-var i: I;
->i : Symbol(i, Decl(numericIndexerTyping2.ts, 7, 3))
+declare var i: I;
+>i : Symbol(i, Decl(numericIndexerTyping2.ts, 7, 11))
 >I : Symbol(I, Decl(numericIndexerTyping2.ts, 0, 0))
 
 var r: string = i[1]; // error: numeric indexer returns the type of the string indexer
 >r : Symbol(r, Decl(numericIndexerTyping2.ts, 8, 3))
->i : Symbol(i, Decl(numericIndexerTyping2.ts, 7, 3))
+>i : Symbol(i, Decl(numericIndexerTyping2.ts, 7, 11))
 
-var i2: I2;
->i2 : Symbol(i2, Decl(numericIndexerTyping2.ts, 10, 3))
+declare var i2: I2;
+>i2 : Symbol(i2, Decl(numericIndexerTyping2.ts, 10, 11))
 >I2 : Symbol(I2, Decl(numericIndexerTyping2.ts, 2, 1))
 
 var r2: string = i2[1]; // error: numeric indexer returns the type of the string indexere
 >r2 : Symbol(r2, Decl(numericIndexerTyping2.ts, 11, 3))
->i2 : Symbol(i2, Decl(numericIndexerTyping2.ts, 10, 3))
+>i2 : Symbol(i2, Decl(numericIndexerTyping2.ts, 10, 11))
 
diff --git a/tests/baselines/reference/numericIndexerTyping2.types b/tests/baselines/reference/numericIndexerTyping2.types
index f08cc0205c7ed..408eaad1b0db8 100644
--- a/tests/baselines/reference/numericIndexerTyping2.types
+++ b/tests/baselines/reference/numericIndexerTyping2.types
@@ -17,7 +17,7 @@ class I2 extends I {
 >  : ^
 }
 
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
@@ -31,7 +31,7 @@ var r: string = i[1]; // error: numeric indexer returns the type of the string i
 >1 : 1
 >  : ^
 
-var i2: I2;
+declare var i2: I2;
 >i2 : I2
 >   : ^^
 
diff --git a/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt b/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
index c819749e009b0..1a877b12c15ab 100644
--- a/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
+++ b/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
@@ -11,8 +11,8 @@ objectLiteralIndexerErrors.ts(14,14): error TS2741: Property 'y' is missing in t
         y: string;
     }
     
-    var a: A;
-    var b: B;
+    declare var a: A;
+    declare var b: B;
     var c: any;
     
     var o1: { [s: string]: A;[n: number]: B; } = { x: b, 0: a }; // both indexers are A
diff --git a/tests/baselines/reference/objectLiteralIndexerErrors.js b/tests/baselines/reference/objectLiteralIndexerErrors.js
index 17351750a5ab6..8db724939e5f2 100644
--- a/tests/baselines/reference/objectLiteralIndexerErrors.js
+++ b/tests/baselines/reference/objectLiteralIndexerErrors.js
@@ -9,16 +9,14 @@ interface B extends A {
     y: string;
 }
 
-var a: A;
-var b: B;
+declare var a: A;
+declare var b: B;
 var c: any;
 
 var o1: { [s: string]: A;[n: number]: B; } = { x: b, 0: a }; // both indexers are A
 o1 = { x: c, 0: a }; // string indexer is any, number indexer is A
 
 //// [objectLiteralIndexerErrors.js]
-var a;
-var b;
 var c;
 var o1 = { x: b, 0: a }; // both indexers are A
 o1 = { x: c, 0: a }; // string indexer is any, number indexer is A
diff --git a/tests/baselines/reference/objectLiteralIndexerErrors.symbols b/tests/baselines/reference/objectLiteralIndexerErrors.symbols
index 62399d481a0a0..f58e9e091b51b 100644
--- a/tests/baselines/reference/objectLiteralIndexerErrors.symbols
+++ b/tests/baselines/reference/objectLiteralIndexerErrors.symbols
@@ -16,12 +16,12 @@ interface B extends A {
 >y : Symbol(B.y, Decl(objectLiteralIndexerErrors.ts, 4, 23))
 }
 
-var a: A;
->a : Symbol(a, Decl(objectLiteralIndexerErrors.ts, 8, 3))
+declare var a: A;
+>a : Symbol(a, Decl(objectLiteralIndexerErrors.ts, 8, 11))
 >A : Symbol(A, Decl(objectLiteralIndexerErrors.ts, 0, 0))
 
-var b: B;
->b : Symbol(b, Decl(objectLiteralIndexerErrors.ts, 9, 3))
+declare var b: B;
+>b : Symbol(b, Decl(objectLiteralIndexerErrors.ts, 9, 11))
 >B : Symbol(B, Decl(objectLiteralIndexerErrors.ts, 2, 1))
 
 var c: any;
@@ -34,14 +34,14 @@ var o1: { [s: string]: A;[n: number]: B; } = { x: b, 0: a }; // both indexers ar
 >n : Symbol(n, Decl(objectLiteralIndexerErrors.ts, 12, 26))
 >B : Symbol(B, Decl(objectLiteralIndexerErrors.ts, 2, 1))
 >x : Symbol(x, Decl(objectLiteralIndexerErrors.ts, 12, 46))
->b : Symbol(b, Decl(objectLiteralIndexerErrors.ts, 9, 3))
+>b : Symbol(b, Decl(objectLiteralIndexerErrors.ts, 9, 11))
 >0 : Symbol(0, Decl(objectLiteralIndexerErrors.ts, 12, 52))
->a : Symbol(a, Decl(objectLiteralIndexerErrors.ts, 8, 3))
+>a : Symbol(a, Decl(objectLiteralIndexerErrors.ts, 8, 11))
 
 o1 = { x: c, 0: a }; // string indexer is any, number indexer is A
 >o1 : Symbol(o1, Decl(objectLiteralIndexerErrors.ts, 12, 3))
 >x : Symbol(x, Decl(objectLiteralIndexerErrors.ts, 13, 6))
 >c : Symbol(c, Decl(objectLiteralIndexerErrors.ts, 10, 3))
 >0 : Symbol(0, Decl(objectLiteralIndexerErrors.ts, 13, 12))
->a : Symbol(a, Decl(objectLiteralIndexerErrors.ts, 8, 3))
+>a : Symbol(a, Decl(objectLiteralIndexerErrors.ts, 8, 11))
 
diff --git a/tests/baselines/reference/objectLiteralIndexerErrors.types b/tests/baselines/reference/objectLiteralIndexerErrors.types
index a0dcded9806a7..af515fb6c6463 100644
--- a/tests/baselines/reference/objectLiteralIndexerErrors.types
+++ b/tests/baselines/reference/objectLiteralIndexerErrors.types
@@ -13,11 +13,11 @@ interface B extends A {
 >  : ^^^^^^
 }
 
-var a: A;
+declare var a: A;
 >a : A
 >  : ^
 
-var b: B;
+declare var b: B;
 >b : B
 >  : ^
 
diff --git a/tests/baselines/reference/objectRest.errors.txt b/tests/baselines/reference/objectRest.errors.txt
index 46cb0c0f9996f..23e0e8044c63a 100644
--- a/tests/baselines/reference/objectRest.errors.txt
+++ b/tests/baselines/reference/objectRest.errors.txt
@@ -18,24 +18,24 @@ objectRest.ts(44,53): error TS2739: Type '{}' is missing the following propertie
     let o2 = { c: 'terrible idea?', d: 'yes' };
     var { d: renamed, ...d } = o2;
     
-    let nestedrest: { x: number, n1: { y: number, n2: { z: number, n3: { n4: number } } }, rest: number, restrest: number };
+    declare let nestedrest: { x: number, n1: { y: number, n2: { z: number, n3: { n4: number } } }, rest: number, restrest: number };
     var { x, n1: { y, n2: { z, n3: { ...nr } } }, ...restrest } = nestedrest;
     
-    let complex: { x: { ka, ki }, y: number };
+    declare let complex: { x: { ka, ki }, y: number };
     var { x: { ka, ...nested }, y: other, ...rest } = complex;
     ({x: { ka, ...nested }, y: other, ...rest} = complex);
     var { x, ...fresh } = { x: 1, y: 2 };
     ({ x, ...fresh } = { x: 1, y: 2 });
     
     class Removable {
-        private x: number;
-        protected y: number;
+        private x!: number;
+        protected y!: number;
         set z(value: number) { }
         get both(): number { return 12 }
         set both(value: number) { }
         m() { }
-        removed: string;
-        remainder: string;
+        removed!: string;
+        remainder!: string;
     }
     interface I {
         m(): void;
diff --git a/tests/baselines/reference/objectRest.js b/tests/baselines/reference/objectRest.js
index 753919805bbee..7fcd740a0bd57 100644
--- a/tests/baselines/reference/objectRest.js
+++ b/tests/baselines/reference/objectRest.js
@@ -12,24 +12,24 @@ var { b: { '0': n, '1': oooo }, ...justA } = o;
 let o2 = { c: 'terrible idea?', d: 'yes' };
 var { d: renamed, ...d } = o2;
 
-let nestedrest: { x: number, n1: { y: number, n2: { z: number, n3: { n4: number } } }, rest: number, restrest: number };
+declare let nestedrest: { x: number, n1: { y: number, n2: { z: number, n3: { n4: number } } }, rest: number, restrest: number };
 var { x, n1: { y, n2: { z, n3: { ...nr } } }, ...restrest } = nestedrest;
 
-let complex: { x: { ka, ki }, y: number };
+declare let complex: { x: { ka, ki }, y: number };
 var { x: { ka, ...nested }, y: other, ...rest } = complex;
 ({x: { ka, ...nested }, y: other, ...rest} = complex);
 var { x, ...fresh } = { x: 1, y: 2 };
 ({ x, ...fresh } = { x: 1, y: 2 });
 
 class Removable {
-    private x: number;
-    protected y: number;
+    private x!: number;
+    protected y!: number;
     set z(value: number) { }
     get both(): number { return 12 }
     set both(value: number) { }
     m() { }
-    removed: string;
-    remainder: string;
+    removed!: string;
+    remainder!: string;
 }
 interface I {
     m(): void;
@@ -71,9 +71,7 @@ var { 'b': renamed } = o, justA = __rest(o, ['b']);
 var { b: { '0': n, '1': oooo } } = o, justA = __rest(o, ["b"]);
 let o2 = { c: 'terrible idea?', d: 'yes' };
 var { d: renamed } = o2, d = __rest(o2, ["d"]);
-let nestedrest;
 var { x } = nestedrest, _f = nestedrest.n1, { y } = _f, _g = _f.n2, { z } = _g, nr = __rest(_g.n3, []), restrest = __rest(nestedrest, ["x", "n1"]);
-let complex;
 var _h = complex.x, { ka } = _h, nested = __rest(_h, ["ka"]), { y: other } = complex, rest = __rest(complex, ["x", "y"]);
 (_a = complex.x, { ka } = _a, nested = __rest(_a, ["ka"]), { y: other } = complex, rest = __rest(complex, ["x", "y"]));
 var _j = { x: 1, y: 2 }, { x } = _j, fresh = __rest(_j, ["x"]);
diff --git a/tests/baselines/reference/objectRest.symbols b/tests/baselines/reference/objectRest.symbols
index 520d2de8883d8..34f2a3f368f40 100644
--- a/tests/baselines/reference/objectRest.symbols
+++ b/tests/baselines/reference/objectRest.symbols
@@ -51,44 +51,44 @@ var { d: renamed, ...d } = o2;
 >d : Symbol(d, Decl(objectRest.ts, 9, 17))
 >o2 : Symbol(o2, Decl(objectRest.ts, 8, 3))
 
-let nestedrest: { x: number, n1: { y: number, n2: { z: number, n3: { n4: number } } }, rest: number, restrest: number };
->nestedrest : Symbol(nestedrest, Decl(objectRest.ts, 11, 3))
->x : Symbol(x, Decl(objectRest.ts, 11, 17))
->n1 : Symbol(n1, Decl(objectRest.ts, 11, 28))
->y : Symbol(y, Decl(objectRest.ts, 11, 34))
->n2 : Symbol(n2, Decl(objectRest.ts, 11, 45))
->z : Symbol(z, Decl(objectRest.ts, 11, 51))
->n3 : Symbol(n3, Decl(objectRest.ts, 11, 62))
->n4 : Symbol(n4, Decl(objectRest.ts, 11, 68))
->rest : Symbol(rest, Decl(objectRest.ts, 11, 86))
->restrest : Symbol(restrest, Decl(objectRest.ts, 11, 100))
+declare let nestedrest: { x: number, n1: { y: number, n2: { z: number, n3: { n4: number } } }, rest: number, restrest: number };
+>nestedrest : Symbol(nestedrest, Decl(objectRest.ts, 11, 11))
+>x : Symbol(x, Decl(objectRest.ts, 11, 25))
+>n1 : Symbol(n1, Decl(objectRest.ts, 11, 36))
+>y : Symbol(y, Decl(objectRest.ts, 11, 42))
+>n2 : Symbol(n2, Decl(objectRest.ts, 11, 53))
+>z : Symbol(z, Decl(objectRest.ts, 11, 59))
+>n3 : Symbol(n3, Decl(objectRest.ts, 11, 70))
+>n4 : Symbol(n4, Decl(objectRest.ts, 11, 76))
+>rest : Symbol(rest, Decl(objectRest.ts, 11, 94))
+>restrest : Symbol(restrest, Decl(objectRest.ts, 11, 108))
 
 var { x, n1: { y, n2: { z, n3: { ...nr } } }, ...restrest } = nestedrest;
 >x : Symbol(x, Decl(objectRest.ts, 12, 5), Decl(objectRest.ts, 17, 5))
->n1 : Symbol(n1, Decl(objectRest.ts, 11, 28))
+>n1 : Symbol(n1, Decl(objectRest.ts, 11, 36))
 >y : Symbol(y, Decl(objectRest.ts, 12, 14))
->n2 : Symbol(n2, Decl(objectRest.ts, 11, 45))
+>n2 : Symbol(n2, Decl(objectRest.ts, 11, 53))
 >z : Symbol(z, Decl(objectRest.ts, 12, 23))
->n3 : Symbol(n3, Decl(objectRest.ts, 11, 62))
+>n3 : Symbol(n3, Decl(objectRest.ts, 11, 70))
 >nr : Symbol(nr, Decl(objectRest.ts, 12, 32))
 >restrest : Symbol(restrest, Decl(objectRest.ts, 12, 45))
->nestedrest : Symbol(nestedrest, Decl(objectRest.ts, 11, 3))
+>nestedrest : Symbol(nestedrest, Decl(objectRest.ts, 11, 11))
 
-let complex: { x: { ka, ki }, y: number };
->complex : Symbol(complex, Decl(objectRest.ts, 14, 3))
->x : Symbol(x, Decl(objectRest.ts, 14, 14))
->ka : Symbol(ka, Decl(objectRest.ts, 14, 19))
->ki : Symbol(ki, Decl(objectRest.ts, 14, 23))
->y : Symbol(y, Decl(objectRest.ts, 14, 29))
+declare let complex: { x: { ka, ki }, y: number };
+>complex : Symbol(complex, Decl(objectRest.ts, 14, 11))
+>x : Symbol(x, Decl(objectRest.ts, 14, 22))
+>ka : Symbol(ka, Decl(objectRest.ts, 14, 27))
+>ki : Symbol(ki, Decl(objectRest.ts, 14, 31))
+>y : Symbol(y, Decl(objectRest.ts, 14, 37))
 
 var { x: { ka, ...nested }, y: other, ...rest } = complex;
->x : Symbol(x, Decl(objectRest.ts, 14, 14))
+>x : Symbol(x, Decl(objectRest.ts, 14, 22))
 >ka : Symbol(ka, Decl(objectRest.ts, 15, 10))
 >nested : Symbol(nested, Decl(objectRest.ts, 15, 14))
->y : Symbol(y, Decl(objectRest.ts, 14, 29))
+>y : Symbol(y, Decl(objectRest.ts, 14, 37))
 >other : Symbol(other, Decl(objectRest.ts, 15, 27))
 >rest : Symbol(rest, Decl(objectRest.ts, 15, 37))
->complex : Symbol(complex, Decl(objectRest.ts, 14, 3))
+>complex : Symbol(complex, Decl(objectRest.ts, 14, 11))
 
 ({x: { ka, ...nested }, y: other, ...rest} = complex);
 >x : Symbol(x, Decl(objectRest.ts, 16, 2))
@@ -97,7 +97,7 @@ var { x: { ka, ...nested }, y: other, ...rest } = complex;
 >y : Symbol(y, Decl(objectRest.ts, 16, 23))
 >other : Symbol(other, Decl(objectRest.ts, 15, 27))
 >rest : Symbol(rest, Decl(objectRest.ts, 15, 37))
->complex : Symbol(complex, Decl(objectRest.ts, 14, 3))
+>complex : Symbol(complex, Decl(objectRest.ts, 14, 11))
 
 var { x, ...fresh } = { x: 1, y: 2 };
 >x : Symbol(x, Decl(objectRest.ts, 12, 5), Decl(objectRest.ts, 17, 5))
@@ -114,14 +114,14 @@ var { x, ...fresh } = { x: 1, y: 2 };
 class Removable {
 >Removable : Symbol(Removable, Decl(objectRest.ts, 18, 35))
 
-    private x: number;
+    private x!: number;
 >x : Symbol(Removable.x, Decl(objectRest.ts, 20, 17))
 
-    protected y: number;
->y : Symbol(Removable.y, Decl(objectRest.ts, 21, 22))
+    protected y!: number;
+>y : Symbol(Removable.y, Decl(objectRest.ts, 21, 23))
 
     set z(value: number) { }
->z : Symbol(Removable.z, Decl(objectRest.ts, 22, 24))
+>z : Symbol(Removable.z, Decl(objectRest.ts, 22, 25))
 >value : Symbol(value, Decl(objectRest.ts, 23, 10))
 
     get both(): number { return 12 }
@@ -134,11 +134,11 @@ class Removable {
     m() { }
 >m : Symbol(Removable.m, Decl(objectRest.ts, 25, 31))
 
-    removed: string;
+    removed!: string;
 >removed : Symbol(Removable.removed, Decl(objectRest.ts, 26, 11))
 
-    remainder: string;
->remainder : Symbol(Removable.remainder, Decl(objectRest.ts, 27, 20))
+    remainder!: string;
+>remainder : Symbol(Removable.remainder, Decl(objectRest.ts, 27, 21))
 }
 interface I {
 >I : Symbol(I, Decl(objectRest.ts, 29, 1))
diff --git a/tests/baselines/reference/objectRest.types b/tests/baselines/reference/objectRest.types
index f363e066c76c9..7907f02e013f5 100644
--- a/tests/baselines/reference/objectRest.types
+++ b/tests/baselines/reference/objectRest.types
@@ -95,7 +95,7 @@ var { d: renamed, ...d } = o2;
 >o2 : { c: string; d: string; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-let nestedrest: { x: number, n1: { y: number, n2: { z: number, n3: { n4: number } } }, rest: number, restrest: number };
+declare let nestedrest: { x: number, n1: { y: number, n2: { z: number, n3: { n4: number } } }, rest: number, restrest: number };
 >nestedrest : { x: number; n1: { y: number; n2: { z: number; n3: { n4: number; }; }; }; rest: number; restrest: number; }
 >           : ^^^^^      ^^^^^^                                                       ^^^^^^^^      ^^^^^^^^^^^^      ^^^
 >x : number
@@ -137,7 +137,7 @@ var { x, n1: { y, n2: { z, n3: { ...nr } } }, ...restrest } = nestedrest;
 >nestedrest : { x: number; n1: { y: number; n2: { z: number; n3: { n4: number; }; }; }; rest: number; restrest: number; }
 >           : ^^^^^      ^^^^^^                                                       ^^^^^^^^      ^^^^^^^^^^^^      ^^^
 
-let complex: { x: { ka, ki }, y: number };
+declare let complex: { x: { ka, ki }, y: number };
 >complex : { x: { ka: any; ki: any; }; y: number; }
 >        : ^^^^^      ^^^      ^^^   ^^^^^      ^^^
 >x : { ka: any; ki: any; }
@@ -231,11 +231,11 @@ class Removable {
 >Removable : Removable
 >          : ^^^^^^^^^
 
-    private x: number;
+    private x!: number;
 >x : number
 >  : ^^^^^^
 
-    protected y: number;
+    protected y!: number;
 >y : number
 >  : ^^^^^^
 
@@ -261,11 +261,11 @@ class Removable {
 >m : () => void
 >  : ^^^^^^^^^^
 
-    removed: string;
+    removed!: string;
 >removed : string
 >        : ^^^^^^
 
-    remainder: string;
+    remainder!: string;
 >remainder : string
 >          : ^^^^^^
 }
diff --git a/tests/baselines/reference/objectRestNegative.errors.txt b/tests/baselines/reference/objectRestNegative.errors.txt
index e8501fa455092..c7be9e03add83 100644
--- a/tests/baselines/reference/objectRestNegative.errors.txt
+++ b/tests/baselines/reference/objectRestNegative.errors.txt
@@ -36,7 +36,7 @@ objectRestNegative.ts(17,9): error TS2701: The target of an object rest assignme
         return rest;
     }
     
-    let rest: { b: string }
+    let rest: { b: string } = { b: "" };
     ({a, ...rest.b + rest.b} = o);
             ~~~~~~~~~~~~~~~
 !!! error TS2701: The target of an object rest assignment must be a variable or a property access.
diff --git a/tests/baselines/reference/objectRestNegative.js b/tests/baselines/reference/objectRestNegative.js
index 9426056434258..70c14379e79e3 100644
--- a/tests/baselines/reference/objectRestNegative.js
+++ b/tests/baselines/reference/objectRestNegative.js
@@ -16,7 +16,7 @@ function generic<T extends { x, y }>(t: T) {
     return rest;
 }
 
-let rest: { b: string }
+let rest: { b: string } = { b: "" };
 ({a, ...rest.b + rest.b} = o);
 
 
@@ -44,5 +44,5 @@ function generic(t) {
     var x = t.x, rest = __rest(t, ["x"]);
     return rest;
 }
-var rest;
+var rest = { b: "" };
 (a = o.a, rest.b + rest.b = __rest(o, ["a"]));
diff --git a/tests/baselines/reference/objectRestNegative.symbols b/tests/baselines/reference/objectRestNegative.symbols
index fa8b091501492..3089cc1fa24b8 100644
--- a/tests/baselines/reference/objectRestNegative.symbols
+++ b/tests/baselines/reference/objectRestNegative.symbols
@@ -48,9 +48,10 @@ function generic<T extends { x, y }>(t: T) {
 >rest : Symbol(rest, Decl(objectRestNegative.ts, 11, 12))
 }
 
-let rest: { b: string }
+let rest: { b: string } = { b: "" };
 >rest : Symbol(rest, Decl(objectRestNegative.ts, 15, 3))
 >b : Symbol(b, Decl(objectRestNegative.ts, 15, 11))
+>b : Symbol(b, Decl(objectRestNegative.ts, 15, 27))
 
 ({a, ...rest.b + rest.b} = o);
 >a : Symbol(a, Decl(objectRestNegative.ts, 16, 2))
diff --git a/tests/baselines/reference/objectRestNegative.types b/tests/baselines/reference/objectRestNegative.types
index b57c5777e38a7..0e0aeea16b061 100644
--- a/tests/baselines/reference/objectRestNegative.types
+++ b/tests/baselines/reference/objectRestNegative.types
@@ -83,11 +83,17 @@ function generic<T extends { x, y }>(t: T) {
 >     : ^^^^^^^^^^^^
 }
 
-let rest: { b: string }
+let rest: { b: string } = { b: "" };
 >rest : { b: string; }
 >     : ^^^^^      ^^^
 >b : string
 >  : ^^^^^^
+>{ b: "" } : { b: string; }
+>          : ^^^^^^^^^^^^^^
+>b : string
+>  : ^^^^^^
+>"" : ""
+>   : ^^
 
 ({a, ...rest.b + rest.b} = o);
 >({a, ...rest.b + rest.b} = o) : { a: number; b: string; }
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index 860b430be4bd3..248cf36e66580 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -34,7 +34,7 @@ objectSpreadNegative.ts(74,11): error TS2339: Property 'a' does not exist on typ
         private x?: number;
     }
     class PublicX {
-        public x: number;
+        public x: number = 42;
     }
     declare let publicX: PublicX;
     declare let privateOptionalX: PrivateOptionalX;
diff --git a/tests/baselines/reference/objectSpreadNegative.js b/tests/baselines/reference/objectSpreadNegative.js
index 01c626ac93e03..474b76dd8cfc0 100644
--- a/tests/baselines/reference/objectSpreadNegative.js
+++ b/tests/baselines/reference/objectSpreadNegative.js
@@ -8,7 +8,7 @@ class PrivateOptionalX {
     private x?: number;
 }
 class PublicX {
-    public x: number;
+    public x: number = 42;
 }
 declare let publicX: PublicX;
 declare let privateOptionalX: PrivateOptionalX;
@@ -99,6 +99,7 @@ var PrivateOptionalX = /** @class */ (function () {
 }());
 var PublicX = /** @class */ (function () {
     function PublicX() {
+        this.x = 42;
     }
     return PublicX;
 }());
diff --git a/tests/baselines/reference/objectSpreadNegative.symbols b/tests/baselines/reference/objectSpreadNegative.symbols
index 55bc35f60e197..2862a1b864548 100644
--- a/tests/baselines/reference/objectSpreadNegative.symbols
+++ b/tests/baselines/reference/objectSpreadNegative.symbols
@@ -16,7 +16,7 @@ class PrivateOptionalX {
 class PublicX {
 >PublicX : Symbol(PublicX, Decl(objectSpreadNegative.ts, 5, 1))
 
-    public x: number;
+    public x: number = 42;
 >x : Symbol(PublicX.x, Decl(objectSpreadNegative.ts, 6, 15))
 }
 declare let publicX: PublicX;
diff --git a/tests/baselines/reference/objectSpreadNegative.types b/tests/baselines/reference/objectSpreadNegative.types
index 5a228136893ef..0e1c4abe618c2 100644
--- a/tests/baselines/reference/objectSpreadNegative.types
+++ b/tests/baselines/reference/objectSpreadNegative.types
@@ -28,9 +28,11 @@ class PublicX {
 >PublicX : PublicX
 >        : ^^^^^^^
 
-    public x: number;
+    public x: number = 42;
 >x : number
 >  : ^^^^^^
+>42 : 42
+>   : ^^
 }
 declare let publicX: PublicX;
 >publicX : PublicX
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.errors.txt b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.errors.txt
index b44e3793aac29..0e606228161cd 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.errors.txt
+++ b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.errors.txt
@@ -10,11 +10,11 @@ lib.es5.d.ts(--,--): error TS2411: Property 'propertyIsEnumerable' of type '(v:
 
 ==== objectTypeHidingMembersOfExtendedObject.ts (1 errors) ====
     class A {
-        foo: string;
+        foo!: string;
     }
     
     class B extends A {
-        bar: string;
+        bar!: string;
     }
     
     interface Object {
@@ -26,11 +26,11 @@ lib.es5.d.ts(--,--): error TS2411: Property 'propertyIsEnumerable' of type '(v:
     
     class C {
         valueOf() { }
-        data: B;
+        data!: B;
         [x: string]: any;
     }
     
-    var c: C;
+    declare var c: C;
     var r1: void = c.valueOf();
     var r1b: B = c.data;
     var r1c = r1b['hm']; // should be 'Object'
@@ -42,7 +42,7 @@ lib.es5.d.ts(--,--): error TS2411: Property 'propertyIsEnumerable' of type '(v:
         [x: string]: any;
     }
     
-    var i: I;
+    declare var i: I;
     var r2: void = i.valueOf();
     var r2b: B = i.data;
     var r2c = r2b['hm']; // should be 'Object'
@@ -58,7 +58,7 @@ lib.es5.d.ts(--,--): error TS2411: Property 'propertyIsEnumerable' of type '(v:
     var r3c = r3b['hm']; // should be 'Object'
     var r3d = i['hm'];
     
-    var b: {
+    declare var b: {
         valueOf(): void;
         data: B;
         [x: string]: any;
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
index 9fbebdecc7834..ea6279b5929e4 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
+++ b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
@@ -2,11 +2,11 @@
 
 //// [objectTypeHidingMembersOfExtendedObject.ts]
 class A {
-    foo: string;
+    foo!: string;
 }
 
 class B extends A {
-    bar: string;
+    bar!: string;
 }
 
 interface Object {
@@ -16,11 +16,11 @@ interface Object {
 
 class C {
     valueOf() { }
-    data: B;
+    data!: B;
     [x: string]: any;
 }
 
-var c: C;
+declare var c: C;
 var r1: void = c.valueOf();
 var r1b: B = c.data;
 var r1c = r1b['hm']; // should be 'Object'
@@ -32,7 +32,7 @@ interface I {
     [x: string]: any;
 }
 
-var i: I;
+declare var i: I;
 var r2: void = i.valueOf();
 var r2b: B = i.data;
 var r2c = r2b['hm']; // should be 'Object'
@@ -48,7 +48,7 @@ var r3b: B = a.data;
 var r3c = r3b['hm']; // should be 'Object'
 var r3d = i['hm'];
 
-var b: {
+declare var b: {
     valueOf(): void;
     data: B;
     [x: string]: any;
@@ -90,12 +90,10 @@ var C = /** @class */ (function () {
     C.prototype.valueOf = function () { };
     return C;
 }());
-var c;
 var r1 = c.valueOf();
 var r1b = c.data;
 var r1c = r1b['hm']; // should be 'Object'
 var r1d = c['hm']; // should be 'any'
-var i;
 var r2 = i.valueOf();
 var r2b = i.data;
 var r2c = r2b['hm']; // should be 'Object'
@@ -108,5 +106,4 @@ var r3 = a.valueOf();
 var r3b = a.data;
 var r3c = r3b['hm']; // should be 'Object'
 var r3d = i['hm'];
-var b;
 var r4 = b.valueOf();
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.symbols b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.symbols
index f7a30cb6c6bf3..a5bb51f4b9fff 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.symbols
+++ b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.symbols
@@ -4,7 +4,7 @@
 class A {
 >A : Symbol(A, Decl(objectTypeHidingMembersOfExtendedObject.ts, 0, 0))
 
-    foo: string;
+    foo!: string;
 >foo : Symbol(A.foo, Decl(objectTypeHidingMembersOfExtendedObject.ts, 0, 9))
 }
 
@@ -12,7 +12,7 @@ class B extends A {
 >B : Symbol(B, Decl(objectTypeHidingMembersOfExtendedObject.ts, 2, 1))
 >A : Symbol(A, Decl(objectTypeHidingMembersOfExtendedObject.ts, 0, 0))
 
-    bar: string;
+    bar!: string;
 >bar : Symbol(B.bar, Decl(objectTypeHidingMembersOfExtendedObject.ts, 4, 19))
 }
 
@@ -34,7 +34,7 @@ class C {
     valueOf() { }
 >valueOf : Symbol(C.valueOf, Decl(objectTypeHidingMembersOfExtendedObject.ts, 13, 9))
 
-    data: B;
+    data!: B;
 >data : Symbol(C.data, Decl(objectTypeHidingMembersOfExtendedObject.ts, 14, 17))
 >B : Symbol(B, Decl(objectTypeHidingMembersOfExtendedObject.ts, 2, 1))
 
@@ -42,21 +42,21 @@ class C {
 >x : Symbol(x, Decl(objectTypeHidingMembersOfExtendedObject.ts, 16, 5))
 }
 
-var c: C;
->c : Symbol(c, Decl(objectTypeHidingMembersOfExtendedObject.ts, 19, 3))
+declare var c: C;
+>c : Symbol(c, Decl(objectTypeHidingMembersOfExtendedObject.ts, 19, 11))
 >C : Symbol(C, Decl(objectTypeHidingMembersOfExtendedObject.ts, 11, 1))
 
 var r1: void = c.valueOf();
 >r1 : Symbol(r1, Decl(objectTypeHidingMembersOfExtendedObject.ts, 20, 3))
 >c.valueOf : Symbol(C.valueOf, Decl(objectTypeHidingMembersOfExtendedObject.ts, 13, 9))
->c : Symbol(c, Decl(objectTypeHidingMembersOfExtendedObject.ts, 19, 3))
+>c : Symbol(c, Decl(objectTypeHidingMembersOfExtendedObject.ts, 19, 11))
 >valueOf : Symbol(C.valueOf, Decl(objectTypeHidingMembersOfExtendedObject.ts, 13, 9))
 
 var r1b: B = c.data;
 >r1b : Symbol(r1b, Decl(objectTypeHidingMembersOfExtendedObject.ts, 21, 3))
 >B : Symbol(B, Decl(objectTypeHidingMembersOfExtendedObject.ts, 2, 1))
 >c.data : Symbol(C.data, Decl(objectTypeHidingMembersOfExtendedObject.ts, 14, 17))
->c : Symbol(c, Decl(objectTypeHidingMembersOfExtendedObject.ts, 19, 3))
+>c : Symbol(c, Decl(objectTypeHidingMembersOfExtendedObject.ts, 19, 11))
 >data : Symbol(C.data, Decl(objectTypeHidingMembersOfExtendedObject.ts, 14, 17))
 
 var r1c = r1b['hm']; // should be 'Object'
@@ -65,7 +65,7 @@ var r1c = r1b['hm']; // should be 'Object'
 
 var r1d = c['hm']; // should be 'any'
 >r1d : Symbol(r1d, Decl(objectTypeHidingMembersOfExtendedObject.ts, 23, 3))
->c : Symbol(c, Decl(objectTypeHidingMembersOfExtendedObject.ts, 19, 3))
+>c : Symbol(c, Decl(objectTypeHidingMembersOfExtendedObject.ts, 19, 11))
 
 interface I {
 >I : Symbol(I, Decl(objectTypeHidingMembersOfExtendedObject.ts, 23, 18))
@@ -81,21 +81,21 @@ interface I {
 >x : Symbol(x, Decl(objectTypeHidingMembersOfExtendedObject.ts, 28, 5))
 }
 
-var i: I;
->i : Symbol(i, Decl(objectTypeHidingMembersOfExtendedObject.ts, 31, 3))
+declare var i: I;
+>i : Symbol(i, Decl(objectTypeHidingMembersOfExtendedObject.ts, 31, 11))
 >I : Symbol(I, Decl(objectTypeHidingMembersOfExtendedObject.ts, 23, 18))
 
 var r2: void = i.valueOf();
 >r2 : Symbol(r2, Decl(objectTypeHidingMembersOfExtendedObject.ts, 32, 3))
 >i.valueOf : Symbol(I.valueOf, Decl(objectTypeHidingMembersOfExtendedObject.ts, 25, 13))
->i : Symbol(i, Decl(objectTypeHidingMembersOfExtendedObject.ts, 31, 3))
+>i : Symbol(i, Decl(objectTypeHidingMembersOfExtendedObject.ts, 31, 11))
 >valueOf : Symbol(I.valueOf, Decl(objectTypeHidingMembersOfExtendedObject.ts, 25, 13))
 
 var r2b: B = i.data;
 >r2b : Symbol(r2b, Decl(objectTypeHidingMembersOfExtendedObject.ts, 33, 3))
 >B : Symbol(B, Decl(objectTypeHidingMembersOfExtendedObject.ts, 2, 1))
 >i.data : Symbol(I.data, Decl(objectTypeHidingMembersOfExtendedObject.ts, 26, 20))
->i : Symbol(i, Decl(objectTypeHidingMembersOfExtendedObject.ts, 31, 3))
+>i : Symbol(i, Decl(objectTypeHidingMembersOfExtendedObject.ts, 31, 11))
 >data : Symbol(I.data, Decl(objectTypeHidingMembersOfExtendedObject.ts, 26, 20))
 
 var r2c = r2b['hm']; // should be 'Object'
@@ -104,7 +104,7 @@ var r2c = r2b['hm']; // should be 'Object'
 
 var r2d = i['hm']; // should be 'any'
 >r2d : Symbol(r2d, Decl(objectTypeHidingMembersOfExtendedObject.ts, 35, 3))
->i : Symbol(i, Decl(objectTypeHidingMembersOfExtendedObject.ts, 31, 3))
+>i : Symbol(i, Decl(objectTypeHidingMembersOfExtendedObject.ts, 31, 11))
 
 var a = {
 >a : Symbol(a, Decl(objectTypeHidingMembersOfExtendedObject.ts, 37, 3))
@@ -136,13 +136,13 @@ var r3c = r3b['hm']; // should be 'Object'
 
 var r3d = i['hm'];
 >r3d : Symbol(r3d, Decl(objectTypeHidingMembersOfExtendedObject.ts, 45, 3))
->i : Symbol(i, Decl(objectTypeHidingMembersOfExtendedObject.ts, 31, 3))
+>i : Symbol(i, Decl(objectTypeHidingMembersOfExtendedObject.ts, 31, 11))
 
-var b: {
->b : Symbol(b, Decl(objectTypeHidingMembersOfExtendedObject.ts, 47, 3))
+declare var b: {
+>b : Symbol(b, Decl(objectTypeHidingMembersOfExtendedObject.ts, 47, 11))
 
     valueOf(): void;
->valueOf : Symbol(valueOf, Decl(objectTypeHidingMembersOfExtendedObject.ts, 47, 8))
+>valueOf : Symbol(valueOf, Decl(objectTypeHidingMembersOfExtendedObject.ts, 47, 16))
 
     data: B;
 >data : Symbol(data, Decl(objectTypeHidingMembersOfExtendedObject.ts, 48, 20))
@@ -154,7 +154,7 @@ var b: {
 
 var r4: void = b.valueOf();
 >r4 : Symbol(r4, Decl(objectTypeHidingMembersOfExtendedObject.ts, 53, 3))
->b.valueOf : Symbol(valueOf, Decl(objectTypeHidingMembersOfExtendedObject.ts, 47, 8))
->b : Symbol(b, Decl(objectTypeHidingMembersOfExtendedObject.ts, 47, 3))
->valueOf : Symbol(valueOf, Decl(objectTypeHidingMembersOfExtendedObject.ts, 47, 8))
+>b.valueOf : Symbol(valueOf, Decl(objectTypeHidingMembersOfExtendedObject.ts, 47, 16))
+>b : Symbol(b, Decl(objectTypeHidingMembersOfExtendedObject.ts, 47, 11))
+>valueOf : Symbol(valueOf, Decl(objectTypeHidingMembersOfExtendedObject.ts, 47, 16))
 
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.types b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.types
index e3e0012ef4e02..7c7a60503bf1d 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.types
+++ b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.types
@@ -11,7 +11,7 @@ class A {
 >A : A
 >  : ^
 
-    foo: string;
+    foo!: string;
 >foo : string
 >    : ^^^^^^
 }
@@ -22,7 +22,7 @@ class B extends A {
 >A : A
 >  : ^
 
-    bar: string;
+    bar!: string;
 >bar : string
 >    : ^^^^^^
 }
@@ -45,7 +45,7 @@ class C {
 >valueOf : () => void
 >        : ^^^^^^^^^^
 
-    data: B;
+    data!: B;
 >data : B
 >     : ^
 
@@ -54,7 +54,7 @@ class C {
 >  : ^^^^^^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
@@ -114,7 +114,7 @@ interface I {
 >  : ^^^^^^
 }
 
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
@@ -223,7 +223,7 @@ var r3d = i['hm'];
 >'hm' : "hm"
 >     : ^^^^
 
-var b: {
+declare var b: {
 >b : { [x: string]: any; valueOf(): void; data: B; }
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    ^^^^^^^^ ^^^
 
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.errors.txt b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.errors.txt
index 8f99731af31fb..777c03c960eb6 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.errors.txt
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.errors.txt
@@ -14,8 +14,8 @@ objectTypeHidingMembersOfObjectAssignmentCompat.ts(20,1): error TS2322: Type '{
         toString(): void;
     }
     
-    var i: I;
-    var o: Object;
+    declare var i: I;
+    declare var o: Object;
     o = i; // error
     ~
 !!! error TS2322: Type 'I' is not assignable to type 'Object'.
@@ -26,7 +26,7 @@ objectTypeHidingMembersOfObjectAssignmentCompat.ts(20,1): error TS2322: Type '{
     class C {
         toString(): void { }
     }
-    var c: C;
+    declare var c: C;
     o = c; // error
     ~
 !!! error TS2322: Type 'C' is not assignable to type 'Object'.
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js
index a3b1ebd74746f..0531fe4fed403 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js
@@ -5,15 +5,15 @@ interface I {
     toString(): void;
 }
 
-var i: I;
-var o: Object;
+declare var i: I;
+declare var o: Object;
 o = i; // error
 i = o; // ok
 
 class C {
     toString(): void { }
 }
-var c: C;
+declare var c: C;
 o = c; // error
 c = o; // ok
 
@@ -24,8 +24,6 @@ o = a; // error
 a = o; // ok
 
 //// [objectTypeHidingMembersOfObjectAssignmentCompat.js]
-var i;
-var o;
 o = i; // error
 i = o; // ok
 var C = /** @class */ (function () {
@@ -34,7 +32,6 @@ var C = /** @class */ (function () {
     C.prototype.toString = function () { };
     return C;
 }());
-var c;
 o = c; // error
 c = o; // ok
 var a = {
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.symbols b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.symbols
index d4aba389a9982..4bda4af36ec58 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.symbols
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.symbols
@@ -8,21 +8,21 @@ interface I {
 >toString : Symbol(I.toString, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 0, 13))
 }
 
-var i: I;
->i : Symbol(i, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 4, 3))
+declare var i: I;
+>i : Symbol(i, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 4, 11))
 >I : Symbol(I, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 0, 0))
 
-var o: Object;
->o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 5, 3))
+declare var o: Object;
+>o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 5, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 o = i; // error
->o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 5, 3))
->i : Symbol(i, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 4, 3))
+>o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 5, 11))
+>i : Symbol(i, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 4, 11))
 
 i = o; // ok
->i : Symbol(i, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 4, 3))
->o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 5, 3))
+>i : Symbol(i, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 4, 11))
+>o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 5, 11))
 
 class C {
 >C : Symbol(C, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 7, 6))
@@ -30,17 +30,17 @@ class C {
     toString(): void { }
 >toString : Symbol(C.toString, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 9, 9))
 }
-var c: C;
->c : Symbol(c, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 12, 3))
+declare var c: C;
+>c : Symbol(c, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 12, 11))
 >C : Symbol(C, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 7, 6))
 
 o = c; // error
->o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 5, 3))
->c : Symbol(c, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 12, 3))
+>o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 5, 11))
+>c : Symbol(c, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 12, 11))
 
 c = o; // ok
->c : Symbol(c, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 12, 3))
->o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 5, 3))
+>c : Symbol(c, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 12, 11))
+>o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 5, 11))
 
 var a = {
 >a : Symbol(a, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 16, 3))
@@ -49,10 +49,10 @@ var a = {
 >toString : Symbol(toString, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 16, 9))
 }
 o = a; // error
->o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 5, 3))
+>o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 5, 11))
 >a : Symbol(a, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 16, 3))
 
 a = o; // ok
 >a : Symbol(a, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 16, 3))
->o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 5, 3))
+>o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat.ts, 5, 11))
 
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.types b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.types
index 865d4b62f36cd..6058e0e30464a 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.types
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.types
@@ -7,11 +7,11 @@ interface I {
 >         : ^^^^^^    
 }
 
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
-var o: Object;
+declare var o: Object;
 >o : Object
 >  : ^^^^^^
 
@@ -39,7 +39,7 @@ class C {
 >toString : () => void
 >         : ^^^^^^    
 }
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.errors.txt b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.errors.txt
index 9f99f44f1dc82..e321e9ca091e7 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.errors.txt
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.errors.txt
@@ -20,8 +20,8 @@ objectTypeHidingMembersOfObjectAssignmentCompat2.ts(20,1): error TS2322: Type '{
         toString(): number;
     }
     
-    var i: I;
-    var o: Object;
+    declare var i: I;
+    declare var o: Object;
     o = i; // error
     ~
 !!! error TS2322: Type 'I' is not assignable to type 'Object'.
@@ -36,7 +36,7 @@ objectTypeHidingMembersOfObjectAssignmentCompat2.ts(20,1): error TS2322: Type '{
     class C {
         toString(): number { return 1; }
     }
-    var c: C;
+    declare var c: C;
     o = c; // error
     ~
 !!! error TS2322: Type 'C' is not assignable to type 'Object'.
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js
index 2e3e568d3bacb..b16c3b4a70ad6 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js
@@ -5,15 +5,15 @@ interface I {
     toString(): number;
 }
 
-var i: I;
-var o: Object;
+declare var i: I;
+declare var o: Object;
 o = i; // error
 i = o; // error
 
 class C {
     toString(): number { return 1; }
 }
-var c: C;
+declare var c: C;
 o = c; // error
 c = o; // error
 
@@ -24,8 +24,6 @@ o = a; // error
 a = o; // ok
 
 //// [objectTypeHidingMembersOfObjectAssignmentCompat2.js]
-var i;
-var o;
 o = i; // error
 i = o; // error
 var C = /** @class */ (function () {
@@ -34,7 +32,6 @@ var C = /** @class */ (function () {
     C.prototype.toString = function () { return 1; };
     return C;
 }());
-var c;
 o = c; // error
 c = o; // error
 var a = {
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.symbols b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.symbols
index b5452dd68c29e..021b9cd2b1fd2 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.symbols
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.symbols
@@ -8,21 +8,21 @@ interface I {
 >toString : Symbol(I.toString, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 0, 13))
 }
 
-var i: I;
->i : Symbol(i, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 4, 3))
+declare var i: I;
+>i : Symbol(i, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 4, 11))
 >I : Symbol(I, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 0, 0))
 
-var o: Object;
->o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 5, 3))
+declare var o: Object;
+>o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 5, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 o = i; // error
->o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 5, 3))
->i : Symbol(i, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 4, 3))
+>o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 5, 11))
+>i : Symbol(i, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 4, 11))
 
 i = o; // error
->i : Symbol(i, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 4, 3))
->o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 5, 3))
+>i : Symbol(i, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 4, 11))
+>o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 5, 11))
 
 class C {
 >C : Symbol(C, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 7, 6))
@@ -30,17 +30,17 @@ class C {
     toString(): number { return 1; }
 >toString : Symbol(C.toString, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 9, 9))
 }
-var c: C;
->c : Symbol(c, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 12, 3))
+declare var c: C;
+>c : Symbol(c, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 12, 11))
 >C : Symbol(C, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 7, 6))
 
 o = c; // error
->o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 5, 3))
->c : Symbol(c, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 12, 3))
+>o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 5, 11))
+>c : Symbol(c, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 12, 11))
 
 c = o; // error
->c : Symbol(c, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 12, 3))
->o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 5, 3))
+>c : Symbol(c, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 12, 11))
+>o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 5, 11))
 
 var a = {
 >a : Symbol(a, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 16, 3))
@@ -49,10 +49,10 @@ var a = {
 >toString : Symbol(toString, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 16, 9))
 }
 o = a; // error
->o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 5, 3))
+>o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 5, 11))
 >a : Symbol(a, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 16, 3))
 
 a = o; // ok
 >a : Symbol(a, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 16, 3))
->o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 5, 3))
+>o : Symbol(o, Decl(objectTypeHidingMembersOfObjectAssignmentCompat2.ts, 5, 11))
 
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.types b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.types
index 82d62bbbe0cd7..c276ddfaedb8f 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.types
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.types
@@ -7,11 +7,11 @@ interface I {
 >         : ^^^^^^      
 }
 
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
-var o: Object;
+declare var o: Object;
 >o : Object
 >  : ^^^^^^
 
@@ -41,7 +41,7 @@ class C {
 >1 : 1
 >  : ^
 }
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
diff --git a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.errors.txt b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.errors.txt
index c11c0880b6542..88d248d1fc9d3 100644
--- a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.errors.txt
+++ b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.errors.txt
@@ -11,8 +11,8 @@ objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts(14,1): err
         (): void;
     }
     
-    var i: I;
-    var f: Object;
+    declare var i: I;
+    declare var f: Object;
     f = i;
     i = f;
     ~
@@ -20,7 +20,7 @@ objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts(14,1): err
 !!! error TS2322:   The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
 !!! error TS2322:     Type 'Object' provides no match for the signature '(): void'.
     
-    var a: {
+    declare var a: {
         (): void
     }
     f = a;
diff --git a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.js b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.js
index 5457338d3c6e6..6648e544dfe82 100644
--- a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.js
+++ b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.js
@@ -5,22 +5,19 @@ interface I {
     (): void;
 }
 
-var i: I;
-var f: Object;
+declare var i: I;
+declare var f: Object;
 f = i;
 i = f;
 
-var a: {
+declare var a: {
     (): void
 }
 f = a;
 a = f;
 
 //// [objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.js]
-var i;
-var f;
 f = i;
 i = f;
-var a;
 f = a;
 a = f;
diff --git a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.symbols b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.symbols
index c9f25230ff0ed..550beeee11bf7 100644
--- a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.symbols
+++ b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.symbols
@@ -7,32 +7,32 @@ interface I {
     (): void;
 }
 
-var i: I;
->i : Symbol(i, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 4, 3))
+declare var i: I;
+>i : Symbol(i, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 4, 11))
 >I : Symbol(I, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 0, 0))
 
-var f: Object;
->f : Symbol(f, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 3))
+declare var f: Object;
+>f : Symbol(f, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 f = i;
->f : Symbol(f, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 3))
->i : Symbol(i, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 4, 3))
+>f : Symbol(f, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 11))
+>i : Symbol(i, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 4, 11))
 
 i = f;
->i : Symbol(i, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 4, 3))
->f : Symbol(f, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 3))
+>i : Symbol(i, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 4, 11))
+>f : Symbol(f, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 11))
 
-var a: {
->a : Symbol(a, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 9, 3))
+declare var a: {
+>a : Symbol(a, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 9, 11))
 
     (): void
 }
 f = a;
->f : Symbol(f, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 3))
->a : Symbol(a, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 9, 3))
+>f : Symbol(f, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 11))
+>a : Symbol(a, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 9, 11))
 
 a = f;
->a : Symbol(a, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 9, 3))
->f : Symbol(f, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 3))
+>a : Symbol(a, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 9, 11))
+>f : Symbol(f, Decl(objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 11))
 
diff --git a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.types b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.types
index 48208f8f41aeb..93376b881a5a4 100644
--- a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.types
+++ b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.types
@@ -5,11 +5,11 @@ interface I {
     (): void;
 }
 
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
-var f: Object;
+declare var f: Object;
 >f : Object
 >  : ^^^^^^
 
@@ -29,7 +29,7 @@ i = f;
 >f : Object
 >  : ^^^^^^
 
-var a: {
+declare var a: {
 >a : () => void
 >  : ^^^^^^    
 
diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.errors.txt b/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.errors.txt
index 557c1260ae9f8..b0d792b6dab18 100644
--- a/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.errors.txt
+++ b/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.errors.txt
@@ -9,14 +9,14 @@ objectTypeWithConstructSignatureAppearsToBeFunctionType.ts(16,18): error TS2348:
         new(): number;
     }
     
-    var i: I;
+    declare var i: I;
     var r2: number = i();
                      ~~~
 !!! error TS2348: Value of type 'I' is not callable. Did you mean to include 'new'?
     var r2b: number = new i();
     var r2c: (x: any, y?: any) => any = i.apply;
     
-    var b: {
+    declare var b: {
         new(): number;
     }
     
diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.js b/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.js
index 98d6e73f30b72..989e2505c88d4 100644
--- a/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.js
+++ b/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.js
@@ -7,12 +7,12 @@ interface I {
     new(): number;
 }
 
-var i: I;
+declare var i: I;
 var r2: number = i();
 var r2b: number = new i();
 var r2c: (x: any, y?: any) => any = i.apply;
 
-var b: {
+declare var b: {
     new(): number;
 }
 
@@ -22,11 +22,9 @@ var r4c: (x: any, y?: any) => any = b.apply;
 
 //// [objectTypeWithConstructSignatureAppearsToBeFunctionType.js]
 // no errors expected below 
-var i;
 var r2 = i();
 var r2b = new i();
 var r2c = i.apply;
-var b;
 var r4 = b();
 var r4b = new b();
 var r4c = b.apply;
diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.symbols b/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.symbols
index 126bbbea0684d..aa02c178f1d6b 100644
--- a/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.symbols
+++ b/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.symbols
@@ -9,45 +9,45 @@ interface I {
     new(): number;
 }
 
-var i: I;
->i : Symbol(i, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 6, 3))
+declare var i: I;
+>i : Symbol(i, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 6, 11))
 >I : Symbol(I, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 0, 0))
 
 var r2: number = i();
 >r2 : Symbol(r2, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 7, 3))
->i : Symbol(i, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 6, 3))
+>i : Symbol(i, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 6, 11))
 
 var r2b: number = new i();
 >r2b : Symbol(r2b, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 8, 3))
->i : Symbol(i, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 6, 3))
+>i : Symbol(i, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 6, 11))
 
 var r2c: (x: any, y?: any) => any = i.apply;
 >r2c : Symbol(r2c, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 9, 3))
 >x : Symbol(x, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 9, 10))
 >y : Symbol(y, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 9, 17))
 >i.apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --))
->i : Symbol(i, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 6, 3))
+>i : Symbol(i, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 6, 11))
 >apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --))
 
-var b: {
->b : Symbol(b, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 11, 3))
+declare var b: {
+>b : Symbol(b, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 11, 11))
 
     new(): number;
 }
 
 var r4: number = b();
 >r4 : Symbol(r4, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 15, 3))
->b : Symbol(b, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 11, 3))
+>b : Symbol(b, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 11, 11))
 
 var r4b: number = new b();
 >r4b : Symbol(r4b, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 16, 3))
->b : Symbol(b, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 11, 3))
+>b : Symbol(b, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 11, 11))
 
 var r4c: (x: any, y?: any) => any = b.apply;
 >r4c : Symbol(r4c, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 17, 3))
 >x : Symbol(x, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 17, 10))
 >y : Symbol(y, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 17, 17))
 >b.apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --))
->b : Symbol(b, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 11, 3))
+>b : Symbol(b, Decl(objectTypeWithConstructSignatureAppearsToBeFunctionType.ts, 11, 11))
 >apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --))
 
diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.types b/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.types
index 9526daf2cd7a0..2dabbd26b2752 100644
--- a/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.types
+++ b/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.types
@@ -7,7 +7,7 @@ interface I {
     new(): number;
 }
 
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
@@ -41,7 +41,7 @@ var r2c: (x: any, y?: any) => any = i.apply;
 >apply : (this: Function, thisArg: any, argArray?: any) => any
 >      : ^    ^^        ^^       ^^   ^^        ^^^   ^^^^^   
 
-var b: {
+declare var b: {
 >b : new () => number
 >  : ^^^^^^^^^^      
 
diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.errors.txt b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.errors.txt
index 239e2ed612606..eb95debf29419 100644
--- a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.errors.txt
+++ b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.errors.txt
@@ -11,8 +11,8 @@ objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts(14,1)
         new(): any;
     }
     
-    var i: I;
-    var f: Object;
+    declare var i: I;
+    declare var f: Object;
     f = i;
     i = f;
     ~
@@ -20,7 +20,7 @@ objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts(14,1)
 !!! error TS2322:   The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
 !!! error TS2322:     Type 'Object' provides no match for the signature 'new (): any'.
     
-    var a: {
+    declare var a: {
         new(): any
     }
     f = a;
diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.js b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.js
index 9ea8489856810..3bcb1e76c19ea 100644
--- a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.js
+++ b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.js
@@ -5,22 +5,19 @@ interface I {
     new(): any;
 }
 
-var i: I;
-var f: Object;
+declare var i: I;
+declare var f: Object;
 f = i;
 i = f;
 
-var a: {
+declare var a: {
     new(): any
 }
 f = a;
 a = f;
 
 //// [objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.js]
-var i;
-var f;
 f = i;
 i = f;
-var a;
 f = a;
 a = f;
diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.symbols b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.symbols
index 4da43dd94f1e2..78fbe3feff98e 100644
--- a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.symbols
+++ b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.symbols
@@ -7,32 +7,32 @@ interface I {
     new(): any;
 }
 
-var i: I;
->i : Symbol(i, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 4, 3))
+declare var i: I;
+>i : Symbol(i, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 4, 11))
 >I : Symbol(I, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 0, 0))
 
-var f: Object;
->f : Symbol(f, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 3))
+declare var f: Object;
+>f : Symbol(f, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 f = i;
->f : Symbol(f, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 3))
->i : Symbol(i, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 4, 3))
+>f : Symbol(f, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 11))
+>i : Symbol(i, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 4, 11))
 
 i = f;
->i : Symbol(i, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 4, 3))
->f : Symbol(f, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 3))
+>i : Symbol(i, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 4, 11))
+>f : Symbol(f, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 11))
 
-var a: {
->a : Symbol(a, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 9, 3))
+declare var a: {
+>a : Symbol(a, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 9, 11))
 
     new(): any
 }
 f = a;
->f : Symbol(f, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 3))
->a : Symbol(a, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 9, 3))
+>f : Symbol(f, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 11))
+>a : Symbol(a, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 9, 11))
 
 a = f;
->a : Symbol(a, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 9, 3))
->f : Symbol(f, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 3))
+>a : Symbol(a, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 9, 11))
+>f : Symbol(f, Decl(objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts, 5, 11))
 
diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.types b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.types
index 534338085cce2..20b3423d50d3c 100644
--- a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.types
+++ b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.types
@@ -5,11 +5,11 @@ interface I {
     new(): any;
 }
 
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
-var f: Object;
+declare var f: Object;
 >f : Object
 >  : ^^^^^^
 
@@ -29,7 +29,7 @@ i = f;
 >f : Object
 >  : ^^^^^^
 
-var a: {
+declare var a: {
 >a : new () => any
 >  : ^^^^^^^^^^   
 
diff --git a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.errors.txt b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.errors.txt
index a360bc3f2a0f1..b7ee732f31686 100644
--- a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.errors.txt
+++ b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.errors.txt
@@ -18,20 +18,20 @@ lib.es5.d.ts(--,--): error TS2411: Property 'propertyIsEnumerable' of type '(v:
     var r = o['']; // should be Object
     
     class C {
-        foo: string;
+        foo!: string;
         [x: string]: string;
     }
-    var c: C;
+    declare var c: C;
     var r2: string = c[''];
     
     interface I {
         bar: string;
         [x: string]: string;
     }
-    var i: I;
+    declare var i: I;
     var r3: string = i[''];
     
-    var o2: {
+    declare var o2: {
         baz: string;
         [x: string]: string;
     }
diff --git a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.js b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.js
index c15019dd1b67c..95ff596fe0b42 100644
--- a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.js
+++ b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.js
@@ -11,20 +11,20 @@ var o = {};
 var r = o['']; // should be Object
 
 class C {
-    foo: string;
+    foo!: string;
     [x: string]: string;
 }
-var c: C;
+declare var c: C;
 var r2: string = c[''];
 
 interface I {
     bar: string;
     [x: string]: string;
 }
-var i: I;
+declare var i: I;
 var r3: string = i[''];
 
-var o2: {
+declare var o2: {
     baz: string;
     [x: string]: string;
 }
@@ -43,9 +43,6 @@ var C = /** @class */ (function () {
     }
     return C;
 }());
-var c;
 var r2 = c[''];
-var i;
 var r3 = i[''];
-var o2;
 var r4 = o2[''];
diff --git a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.symbols b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.symbols
index d8147ce2cea4e..426b2140f1748 100644
--- a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.symbols
+++ b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.symbols
@@ -21,19 +21,19 @@ var r = o['']; // should be Object
 class C {
 >C : Symbol(C, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 7, 14))
 
-    foo: string;
+    foo!: string;
 >foo : Symbol(C.foo, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 9, 9))
 
     [x: string]: string;
 >x : Symbol(x, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 11, 5))
 }
-var c: C;
->c : Symbol(c, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 13, 3))
+declare var c: C;
+>c : Symbol(c, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 13, 11))
 >C : Symbol(C, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 7, 14))
 
 var r2: string = c[''];
 >r2 : Symbol(r2, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 14, 3))
->c : Symbol(c, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 13, 3))
+>c : Symbol(c, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 13, 11))
 
 interface I {
 >I : Symbol(I, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 14, 23))
@@ -44,26 +44,26 @@ interface I {
     [x: string]: string;
 >x : Symbol(x, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 18, 5))
 }
-var i: I;
->i : Symbol(i, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 20, 3))
+declare var i: I;
+>i : Symbol(i, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 20, 11))
 >I : Symbol(I, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 14, 23))
 
 var r3: string = i[''];
 >r3 : Symbol(r3, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 21, 3))
->i : Symbol(i, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 20, 3))
+>i : Symbol(i, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 20, 11))
 
-var o2: {
->o2 : Symbol(o2, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 23, 3))
+declare var o2: {
+>o2 : Symbol(o2, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 23, 11))
 
     baz: string;
->baz : Symbol(baz, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 23, 9))
+>baz : Symbol(baz, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 23, 17))
 
     [x: string]: string;
 >x : Symbol(x, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 25, 5))
 }
 var r4: string = o2[''];
 >r4 : Symbol(r4, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 27, 3))
->o2 : Symbol(o2, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 23, 3))
+>o2 : Symbol(o2, Decl(objectTypeWithStringIndexerHidingObjectIndexer.ts, 23, 11))
 
 
 
diff --git a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.types b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.types
index 9109d390eb9d4..bf0170da58347 100644
--- a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.types
+++ b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.types
@@ -35,7 +35,7 @@ class C {
 >C : C
 >  : ^
 
-    foo: string;
+    foo!: string;
 >foo : string
 >    : ^^^^^^
 
@@ -43,7 +43,7 @@ class C {
 >x : string
 >  : ^^^^^^
 }
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
@@ -66,7 +66,7 @@ interface I {
 >x : string
 >  : ^^^^^^
 }
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
@@ -80,7 +80,7 @@ var r3: string = i[''];
 >'' : ""
 >   : ^^
 
-var o2: {
+declare var o2: {
 >o2 : { [x: string]: string; baz: string; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 
diff --git a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.errors.txt b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.errors.txt
index c42b7285c1524..fc992449f5dad 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.errors.txt
+++ b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.errors.txt
@@ -24,7 +24,7 @@ objectTypeWithStringNamedNumericProperty.ts(125,13): error TS1121: Octal literal
         "-1": Date;
     }
     
-    var c: C;
+    declare var c: C;
     var r1 = c['0.1'];
     var r2 = c['.1'];
     var r3 = c['1'];
@@ -59,7 +59,7 @@ objectTypeWithStringNamedNumericProperty.ts(125,13): error TS1121: Octal literal
         "-1": Date;
     }
     
-    var i: I;
+    declare var i: I;
     var r1 = i['0.1'];
     var r2 = i['.1'];
     var r3 = i['1'];
@@ -83,7 +83,7 @@ objectTypeWithStringNamedNumericProperty.ts(125,13): error TS1121: Octal literal
                 ~~~
 !!! error TS1121: Octal literals are not allowed. Use the syntax '-0o1'.
     
-    var a: {
+    declare var a: {
         "0.1": void;
         ".1": Object;
         "1": number;
diff --git a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.js b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.js
index f8eeeb3e9c337..530dc84165c7c 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.js
+++ b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.js
@@ -16,7 +16,7 @@ class C {
     "-1": Date;
 }
 
-var c: C;
+declare var c: C;
 var r1 = c['0.1'];
 var r2 = c['.1'];
 var r3 = c['1'];
@@ -47,7 +47,7 @@ interface I {
     "-1": Date;
 }
 
-var i: I;
+declare var i: I;
 var r1 = i['0.1'];
 var r2 = i['.1'];
 var r3 = i['1'];
@@ -67,7 +67,7 @@ var r11 = i[-0x1]
 var r12 = i[01]
 var r13 = i[-01]
 
-var a: {
+declare var a: {
     "0.1": void;
     ".1": Object;
     "1": number;
@@ -137,7 +137,6 @@ var C = /** @class */ (function () {
     }
     return C;
 }());
-var c;
 var r1 = c['0.1'];
 var r2 = c['.1'];
 var r3 = c['1'];
@@ -156,7 +155,6 @@ var r10 = i[0x1];
 var r11 = i[-0x1];
 var r12 = i[1];
 var r13 = i[-1];
-var i;
 var r1 = i['0.1'];
 var r2 = i['.1'];
 var r3 = i['1'];
@@ -175,7 +173,6 @@ var r10 = i[0x1];
 var r11 = i[-0x1];
 var r12 = i[1];
 var r13 = i[-1];
-var a;
 var r1 = a['0.1'];
 var r2 = a['.1'];
 var r3 = a['1'];
diff --git a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols
index 7807fd729dbd6..81187b6fad8f4 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols
+++ b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols
@@ -37,91 +37,91 @@ class C {
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
 
-var c: C;
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+declare var c: C;
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >C : Symbol(C, Decl(objectTypeWithStringNamedNumericProperty.ts, 0, 0))
 
 var r1 = c['0.1'];
 >r1 : Symbol(r1, Decl(objectTypeWithStringNamedNumericProperty.ts, 16, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 47, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 77, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 107, 3))
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >'0.1' : Symbol(C["0.1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 4, 9))
 
 var r2 = c['.1'];
 >r2 : Symbol(r2, Decl(objectTypeWithStringNamedNumericProperty.ts, 17, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 48, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 78, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 108, 3))
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >'.1' : Symbol(C[".1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 5, 16))
 
 var r3 = c['1'];
 >r3 : Symbol(r3, Decl(objectTypeWithStringNamedNumericProperty.ts, 18, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 19, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 21, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 24, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 49, 3) ... and 11 more)
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >'1' : Symbol(C["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 6, 17))
 
 var r3 = c[1];
 >r3 : Symbol(r3, Decl(objectTypeWithStringNamedNumericProperty.ts, 18, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 19, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 21, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 24, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 49, 3) ... and 11 more)
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >1 : Symbol(C["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 6, 17))
 
 var r4 = c['1.'];
 >r4 : Symbol(r4, Decl(objectTypeWithStringNamedNumericProperty.ts, 20, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 51, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 81, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 111, 3))
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >'1.' : Symbol(C["1."], Decl(objectTypeWithStringNamedNumericProperty.ts, 7, 16))
 
 var r3 = c[1.]; // same as indexing by 1 when done numerically
 >r3 : Symbol(r3, Decl(objectTypeWithStringNamedNumericProperty.ts, 18, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 19, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 21, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 24, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 49, 3) ... and 11 more)
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >1. : Symbol(C["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 6, 17))
 
 var r5 = c['1..'];
 >r5 : Symbol(r5, Decl(objectTypeWithStringNamedNumericProperty.ts, 22, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 53, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 83, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 113, 3))
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >'1..' : Symbol(C["1.."], Decl(objectTypeWithStringNamedNumericProperty.ts, 8, 17))
 
 var r6 = c['1.0'];
 >r6 : Symbol(r6, Decl(objectTypeWithStringNamedNumericProperty.ts, 23, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 54, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 84, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 114, 3))
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >'1.0' : Symbol(C["1.0"], Decl(objectTypeWithStringNamedNumericProperty.ts, 9, 19))
 
 var r3 = c[1.0]; // same as indexing by 1 when done numerically
 >r3 : Symbol(r3, Decl(objectTypeWithStringNamedNumericProperty.ts, 18, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 19, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 21, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 24, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 49, 3) ... and 11 more)
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >1.0 : Symbol(C["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 6, 17))
 
 // BUG 823822
 var r7 = i[-1];
 >r7 : Symbol(r7, Decl(objectTypeWithStringNamedNumericProperty.ts, 26, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 27, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 57, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 58, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 87, 3) ... and 3 more)
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
 var r7 = i[-1.0];
 >r7 : Symbol(r7, Decl(objectTypeWithStringNamedNumericProperty.ts, 26, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 27, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 57, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 58, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 87, 3) ... and 3 more)
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
 var r8 = i["-1.0"];
 >r8 : Symbol(r8, Decl(objectTypeWithStringNamedNumericProperty.ts, 28, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 59, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 89, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 119, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >"-1.0" : Symbol(I["-1.0"], Decl(objectTypeWithStringNamedNumericProperty.ts, 41, 16))
 
 var r9 = i["-1"];
 >r9 : Symbol(r9, Decl(objectTypeWithStringNamedNumericProperty.ts, 29, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 60, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 90, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 120, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >"-1" : Symbol(I["-1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 42, 19))
 
 var r10 = i[0x1]
 >r10 : Symbol(r10, Decl(objectTypeWithStringNamedNumericProperty.ts, 30, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 61, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 91, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 121, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >0x1 : Symbol(I["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 37, 17))
 
 var r11 = i[-0x1]
 >r11 : Symbol(r11, Decl(objectTypeWithStringNamedNumericProperty.ts, 31, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 62, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 92, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 122, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
 var r12 = i[01]
 >r12 : Symbol(r12, Decl(objectTypeWithStringNamedNumericProperty.ts, 32, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 63, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 93, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 123, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >01 : Symbol(I["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 37, 17))
 
 var r13 = i[-01]
 >r13 : Symbol(r13, Decl(objectTypeWithStringNamedNumericProperty.ts, 33, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 64, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 94, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 124, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
 interface I {
 >I : Symbol(I, Decl(objectTypeWithStringNamedNumericProperty.ts, 33, 16))
@@ -155,97 +155,97 @@ interface I {
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
 
-var i: I;
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+declare var i: I;
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >I : Symbol(I, Decl(objectTypeWithStringNamedNumericProperty.ts, 33, 16))
 
 var r1 = i['0.1'];
 >r1 : Symbol(r1, Decl(objectTypeWithStringNamedNumericProperty.ts, 16, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 47, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 77, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 107, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >'0.1' : Symbol(I["0.1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 35, 13))
 
 var r2 = i['.1'];
 >r2 : Symbol(r2, Decl(objectTypeWithStringNamedNumericProperty.ts, 17, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 48, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 78, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 108, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >'.1' : Symbol(I[".1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 36, 16))
 
 var r3 = i['1'];
 >r3 : Symbol(r3, Decl(objectTypeWithStringNamedNumericProperty.ts, 18, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 19, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 21, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 24, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 49, 3) ... and 11 more)
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >'1' : Symbol(I["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 37, 17))
 
 var r3 = c[1];
 >r3 : Symbol(r3, Decl(objectTypeWithStringNamedNumericProperty.ts, 18, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 19, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 21, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 24, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 49, 3) ... and 11 more)
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >1 : Symbol(C["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 6, 17))
 
 var r4 = i['1.'];
 >r4 : Symbol(r4, Decl(objectTypeWithStringNamedNumericProperty.ts, 20, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 51, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 81, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 111, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >'1.' : Symbol(I["1."], Decl(objectTypeWithStringNamedNumericProperty.ts, 38, 16))
 
 var r3 = c[1.]; // same as indexing by 1 when done numerically
 >r3 : Symbol(r3, Decl(objectTypeWithStringNamedNumericProperty.ts, 18, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 19, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 21, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 24, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 49, 3) ... and 11 more)
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >1. : Symbol(C["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 6, 17))
 
 var r5 = i['1..'];
 >r5 : Symbol(r5, Decl(objectTypeWithStringNamedNumericProperty.ts, 22, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 53, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 83, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 113, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >'1..' : Symbol(I["1.."], Decl(objectTypeWithStringNamedNumericProperty.ts, 39, 17))
 
 var r6 = i['1.0'];
 >r6 : Symbol(r6, Decl(objectTypeWithStringNamedNumericProperty.ts, 23, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 54, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 84, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 114, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >'1.0' : Symbol(I["1.0"], Decl(objectTypeWithStringNamedNumericProperty.ts, 40, 19))
 
 var r3 = c[1.0]; // same as indexing by 1 when done numerically
 >r3 : Symbol(r3, Decl(objectTypeWithStringNamedNumericProperty.ts, 18, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 19, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 21, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 24, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 49, 3) ... and 11 more)
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >1.0 : Symbol(C["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 6, 17))
 
 // BUG 823822
 var r7 = i[-1]; 
 >r7 : Symbol(r7, Decl(objectTypeWithStringNamedNumericProperty.ts, 26, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 27, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 57, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 58, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 87, 3) ... and 3 more)
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
 var r7 = i[-1.0]; 
 >r7 : Symbol(r7, Decl(objectTypeWithStringNamedNumericProperty.ts, 26, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 27, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 57, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 58, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 87, 3) ... and 3 more)
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
 var r8 = i["-1.0"];
 >r8 : Symbol(r8, Decl(objectTypeWithStringNamedNumericProperty.ts, 28, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 59, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 89, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 119, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >"-1.0" : Symbol(I["-1.0"], Decl(objectTypeWithStringNamedNumericProperty.ts, 41, 16))
 
 var r9 = i["-1"];
 >r9 : Symbol(r9, Decl(objectTypeWithStringNamedNumericProperty.ts, 29, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 60, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 90, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 120, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >"-1" : Symbol(I["-1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 42, 19))
 
 var r10 = i[0x1]
 >r10 : Symbol(r10, Decl(objectTypeWithStringNamedNumericProperty.ts, 30, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 61, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 91, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 121, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >0x1 : Symbol(I["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 37, 17))
 
 var r11 = i[-0x1]
 >r11 : Symbol(r11, Decl(objectTypeWithStringNamedNumericProperty.ts, 31, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 62, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 92, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 122, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
 var r12 = i[01]
 >r12 : Symbol(r12, Decl(objectTypeWithStringNamedNumericProperty.ts, 32, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 63, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 93, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 123, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >01 : Symbol(I["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 37, 17))
 
 var r13 = i[-01]
 >r13 : Symbol(r13, Decl(objectTypeWithStringNamedNumericProperty.ts, 33, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 64, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 94, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 124, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
-var a: {
->a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 3))
+declare var a: {
+>a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 11))
 
     "0.1": void;
->"0.1" : Symbol("0.1", Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 8))
+>"0.1" : Symbol("0.1", Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 16))
 
     ".1": Object;
 >".1" : Symbol(".1", Decl(objectTypeWithStringNamedNumericProperty.ts, 67, 16))
@@ -275,85 +275,85 @@ var a: {
 
 var r1 = a['0.1'];
 >r1 : Symbol(r1, Decl(objectTypeWithStringNamedNumericProperty.ts, 16, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 47, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 77, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 107, 3))
->a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 3))
->'0.1' : Symbol("0.1", Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 8))
+>a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 11))
+>'0.1' : Symbol("0.1", Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 16))
 
 var r2 = a['.1'];
 >r2 : Symbol(r2, Decl(objectTypeWithStringNamedNumericProperty.ts, 17, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 48, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 78, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 108, 3))
->a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 3))
+>a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 11))
 >'.1' : Symbol(".1", Decl(objectTypeWithStringNamedNumericProperty.ts, 67, 16))
 
 var r3 = a['1'];
 >r3 : Symbol(r3, Decl(objectTypeWithStringNamedNumericProperty.ts, 18, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 19, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 21, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 24, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 49, 3) ... and 11 more)
->a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 3))
+>a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 11))
 >'1' : Symbol("1", Decl(objectTypeWithStringNamedNumericProperty.ts, 68, 17))
 
 var r3 = c[1];
 >r3 : Symbol(r3, Decl(objectTypeWithStringNamedNumericProperty.ts, 18, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 19, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 21, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 24, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 49, 3) ... and 11 more)
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >1 : Symbol(C["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 6, 17))
 
 var r4 = a['1.'];
 >r4 : Symbol(r4, Decl(objectTypeWithStringNamedNumericProperty.ts, 20, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 51, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 81, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 111, 3))
->a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 3))
+>a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 11))
 >'1.' : Symbol("1.", Decl(objectTypeWithStringNamedNumericProperty.ts, 69, 16))
 
 var r3 = c[1.]; // same as indexing by 1 when done numerically
 >r3 : Symbol(r3, Decl(objectTypeWithStringNamedNumericProperty.ts, 18, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 19, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 21, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 24, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 49, 3) ... and 11 more)
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >1. : Symbol(C["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 6, 17))
 
 var r5 = a['1..'];
 >r5 : Symbol(r5, Decl(objectTypeWithStringNamedNumericProperty.ts, 22, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 53, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 83, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 113, 3))
->a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 3))
+>a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 11))
 >'1..' : Symbol("1..", Decl(objectTypeWithStringNamedNumericProperty.ts, 70, 17))
 
 var r6 = a['1.0'];
 >r6 : Symbol(r6, Decl(objectTypeWithStringNamedNumericProperty.ts, 23, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 54, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 84, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 114, 3))
->a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 3))
+>a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 11))
 >'1.0' : Symbol("1.0", Decl(objectTypeWithStringNamedNumericProperty.ts, 71, 19))
 
 var r3 = c[1.0]; // same as indexing by 1 when done numerically
 >r3 : Symbol(r3, Decl(objectTypeWithStringNamedNumericProperty.ts, 18, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 19, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 21, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 24, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 49, 3) ... and 11 more)
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >1.0 : Symbol(C["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 6, 17))
 
 // BUG 823822
 var r7 = i[-1];
 >r7 : Symbol(r7, Decl(objectTypeWithStringNamedNumericProperty.ts, 26, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 27, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 57, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 58, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 87, 3) ... and 3 more)
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
 var r7 = i[-1.0];
 >r7 : Symbol(r7, Decl(objectTypeWithStringNamedNumericProperty.ts, 26, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 27, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 57, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 58, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 87, 3) ... and 3 more)
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
 var r8 = i["-1.0"];
 >r8 : Symbol(r8, Decl(objectTypeWithStringNamedNumericProperty.ts, 28, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 59, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 89, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 119, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >"-1.0" : Symbol(I["-1.0"], Decl(objectTypeWithStringNamedNumericProperty.ts, 41, 16))
 
 var r9 = i["-1"];
 >r9 : Symbol(r9, Decl(objectTypeWithStringNamedNumericProperty.ts, 29, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 60, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 90, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 120, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >"-1" : Symbol(I["-1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 42, 19))
 
 var r10 = i[0x1]
 >r10 : Symbol(r10, Decl(objectTypeWithStringNamedNumericProperty.ts, 30, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 61, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 91, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 121, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >0x1 : Symbol(I["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 37, 17))
 
 var r11 = i[-0x1]
 >r11 : Symbol(r11, Decl(objectTypeWithStringNamedNumericProperty.ts, 31, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 62, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 92, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 122, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
 var r12 = i[01]
 >r12 : Symbol(r12, Decl(objectTypeWithStringNamedNumericProperty.ts, 32, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 63, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 93, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 123, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >01 : Symbol(I["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 37, 17))
 
 var r13 = i[-01]
 >r13 : Symbol(r13, Decl(objectTypeWithStringNamedNumericProperty.ts, 33, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 64, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 94, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 124, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
 var b = {
 >b : Symbol(b, Decl(objectTypeWithStringNamedNumericProperty.ts, 96, 3))
@@ -404,7 +404,7 @@ var r3 = b['1'];
 
 var r3 = c[1];
 >r3 : Symbol(r3, Decl(objectTypeWithStringNamedNumericProperty.ts, 18, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 19, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 21, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 24, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 49, 3) ... and 11 more)
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >1 : Symbol(C["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 6, 17))
 
 var r4 = b['1.'];
@@ -414,7 +414,7 @@ var r4 = b['1.'];
 
 var r3 = c[1.]; // same as indexing by 1 when done numerically
 >r3 : Symbol(r3, Decl(objectTypeWithStringNamedNumericProperty.ts, 18, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 19, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 21, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 24, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 49, 3) ... and 11 more)
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >1. : Symbol(C["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 6, 17))
 
 var r5 = b['1..'];
@@ -429,43 +429,43 @@ var r6 = b['1.0'];
 
 var r3 = c[1.0]; // same as indexing by 1 when done numerically
 >r3 : Symbol(r3, Decl(objectTypeWithStringNamedNumericProperty.ts, 18, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 19, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 21, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 24, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 49, 3) ... and 11 more)
->c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 3))
+>c : Symbol(c, Decl(objectTypeWithStringNamedNumericProperty.ts, 15, 11))
 >1.0 : Symbol(C["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 6, 17))
 
 // BUG 823822
 var r7 = i[-1];
 >r7 : Symbol(r7, Decl(objectTypeWithStringNamedNumericProperty.ts, 26, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 27, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 57, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 58, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 87, 3) ... and 3 more)
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
 var r7 = i[-1.0];
 >r7 : Symbol(r7, Decl(objectTypeWithStringNamedNumericProperty.ts, 26, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 27, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 57, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 58, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 87, 3) ... and 3 more)
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
 var r8 = i["-1.0"];
 >r8 : Symbol(r8, Decl(objectTypeWithStringNamedNumericProperty.ts, 28, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 59, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 89, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 119, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >"-1.0" : Symbol(I["-1.0"], Decl(objectTypeWithStringNamedNumericProperty.ts, 41, 16))
 
 var r9 = i["-1"];
 >r9 : Symbol(r9, Decl(objectTypeWithStringNamedNumericProperty.ts, 29, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 60, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 90, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 120, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >"-1" : Symbol(I["-1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 42, 19))
 
 var r10 = i[0x1]
 >r10 : Symbol(r10, Decl(objectTypeWithStringNamedNumericProperty.ts, 30, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 61, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 91, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 121, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >0x1 : Symbol(I["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 37, 17))
 
 var r11 = i[-0x1]
 >r11 : Symbol(r11, Decl(objectTypeWithStringNamedNumericProperty.ts, 31, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 62, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 92, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 122, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
 var r12 = i[01]
 >r12 : Symbol(r12, Decl(objectTypeWithStringNamedNumericProperty.ts, 32, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 63, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 93, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 123, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 >01 : Symbol(I["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 37, 17))
 
 var r13 = i[-01]
 >r13 : Symbol(r13, Decl(objectTypeWithStringNamedNumericProperty.ts, 33, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 64, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 94, 3), Decl(objectTypeWithStringNamedNumericProperty.ts, 124, 3))
->i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 3))
+>i : Symbol(i, Decl(objectTypeWithStringNamedNumericProperty.ts, 46, 11))
 
diff --git a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types
index 653fb50d33f09..b1143edd8655b 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types
+++ b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types
@@ -42,7 +42,7 @@ class C {
 >     : ^^^^
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
@@ -259,7 +259,7 @@ interface I {
 >     : ^^^^
 }
 
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
@@ -442,7 +442,7 @@ var r13 = i[-01]
 >01 : 1
 >   : ^
 
-var a: {
+declare var a: {
 >a : { "0.1": void; ".1": Object; "1": number; "1.": string; "1..": boolean; "1.0": Date; "-1.0": RegExp; "-1": Date; }
 >  : ^^^^^^^^^    ^^^^^^^^      ^^^^^^^      ^^^^^^^^      ^^^^^^^^^       ^^^^^^^^^    ^^^^^^^^^^      ^^^^^^^^    ^^^
 
diff --git a/tests/baselines/reference/optionalMethods.js b/tests/baselines/reference/optionalMethods.js
index b82fed9387b8f..c621119f5a591 100644
--- a/tests/baselines/reference/optionalMethods.js
+++ b/tests/baselines/reference/optionalMethods.js
@@ -19,7 +19,7 @@ function test1(x: Foo) {
 }
 
 class Bar {
-    a: number;
+    a: number = 0;
     b?: number;
     c? = 2;
     constructor(public d?: number, public e = 10) {}
@@ -88,6 +88,7 @@ var Bar = /** @class */ (function () {
         if (e === void 0) { e = 10; }
         this.d = d;
         this.e = e;
+        this.a = 0;
         this.c = 2;
     }
     Bar.prototype.f = function () {
diff --git a/tests/baselines/reference/optionalMethods.symbols b/tests/baselines/reference/optionalMethods.symbols
index 806d7d9043571..87e52a3b2a323 100644
--- a/tests/baselines/reference/optionalMethods.symbols
+++ b/tests/baselines/reference/optionalMethods.symbols
@@ -70,11 +70,11 @@ function test1(x: Foo) {
 class Bar {
 >Bar : Symbol(Bar, Decl(optionalMethods.ts, 15, 1))
 
-    a: number;
+    a: number = 0;
 >a : Symbol(Bar.a, Decl(optionalMethods.ts, 17, 11))
 
     b?: number;
->b : Symbol(Bar.b, Decl(optionalMethods.ts, 18, 14))
+>b : Symbol(Bar.b, Decl(optionalMethods.ts, 18, 18))
 
     c? = 2;
 >c : Symbol(Bar.c, Decl(optionalMethods.ts, 19, 15))
@@ -109,9 +109,9 @@ function test2(x: Bar) {
 >a : Symbol(Bar.a, Decl(optionalMethods.ts, 17, 11))
 
     x.b;
->x.b : Symbol(Bar.b, Decl(optionalMethods.ts, 18, 14))
+>x.b : Symbol(Bar.b, Decl(optionalMethods.ts, 18, 18))
 >x : Symbol(x, Decl(optionalMethods.ts, 31, 15))
->b : Symbol(Bar.b, Decl(optionalMethods.ts, 18, 14))
+>b : Symbol(Bar.b, Decl(optionalMethods.ts, 18, 18))
 
     x.c;
 >x.c : Symbol(Bar.c, Decl(optionalMethods.ts, 19, 15))
diff --git a/tests/baselines/reference/optionalMethods.types b/tests/baselines/reference/optionalMethods.types
index 7230b9e6cfb01..c76a6dae6a6ff 100644
--- a/tests/baselines/reference/optionalMethods.types
+++ b/tests/baselines/reference/optionalMethods.types
@@ -116,9 +116,11 @@ class Bar {
 >Bar : Bar
 >    : ^^^
 
-    a: number;
+    a: number = 0;
 >a : number
 >  : ^^^^^^
+>0 : 0
+>  : ^
 
     b?: number;
 >b : number | undefined
diff --git a/tests/baselines/reference/optionalParamAssignmentCompat.errors.txt b/tests/baselines/reference/optionalParamAssignmentCompat.errors.txt
index df554d1d1fd01..502ab34260fca 100644
--- a/tests/baselines/reference/optionalParamAssignmentCompat.errors.txt
+++ b/tests/baselines/reference/optionalParamAssignmentCompat.errors.txt
@@ -11,7 +11,7 @@ optionalParamAssignmentCompat.ts(10,13): error TS2322: Type '(p1?: string) => I1
         p1: I1;
         m1(p1?: string): I1;
     }
-    var i2: I2;
+    declare var i2: I2;
     var c: I1 = i2.p1; // should be ok
     var d: I1 = i2.m1; // should error
                 ~~~~~
diff --git a/tests/baselines/reference/optionalParamAssignmentCompat.js b/tests/baselines/reference/optionalParamAssignmentCompat.js
index d82ac61570419..a6ef2325f3be0 100644
--- a/tests/baselines/reference/optionalParamAssignmentCompat.js
+++ b/tests/baselines/reference/optionalParamAssignmentCompat.js
@@ -8,12 +8,11 @@ interface I2 {
     p1: I1;
     m1(p1?: string): I1;
 }
-var i2: I2;
+declare var i2: I2;
 var c: I1 = i2.p1; // should be ok
 var d: I1 = i2.m1; // should error
 
 
 //// [optionalParamAssignmentCompat.js]
-var i2;
 var c = i2.p1; // should be ok
 var d = i2.m1; // should error
diff --git a/tests/baselines/reference/optionalParamAssignmentCompat.symbols b/tests/baselines/reference/optionalParamAssignmentCompat.symbols
index d66df3a0542a0..d7f0f556ed9ef 100644
--- a/tests/baselines/reference/optionalParamAssignmentCompat.symbols
+++ b/tests/baselines/reference/optionalParamAssignmentCompat.symbols
@@ -20,21 +20,21 @@ interface I2 {
 >p1 : Symbol(p1, Decl(optionalParamAssignmentCompat.ts, 5, 7))
 >I1 : Symbol(I1, Decl(optionalParamAssignmentCompat.ts, 0, 0))
 }
-var i2: I2;
->i2 : Symbol(i2, Decl(optionalParamAssignmentCompat.ts, 7, 3))
+declare var i2: I2;
+>i2 : Symbol(i2, Decl(optionalParamAssignmentCompat.ts, 7, 11))
 >I2 : Symbol(I2, Decl(optionalParamAssignmentCompat.ts, 2, 1))
 
 var c: I1 = i2.p1; // should be ok
 >c : Symbol(c, Decl(optionalParamAssignmentCompat.ts, 8, 3))
 >I1 : Symbol(I1, Decl(optionalParamAssignmentCompat.ts, 0, 0))
 >i2.p1 : Symbol(I2.p1, Decl(optionalParamAssignmentCompat.ts, 3, 14))
->i2 : Symbol(i2, Decl(optionalParamAssignmentCompat.ts, 7, 3))
+>i2 : Symbol(i2, Decl(optionalParamAssignmentCompat.ts, 7, 11))
 >p1 : Symbol(I2.p1, Decl(optionalParamAssignmentCompat.ts, 3, 14))
 
 var d: I1 = i2.m1; // should error
 >d : Symbol(d, Decl(optionalParamAssignmentCompat.ts, 9, 3))
 >I1 : Symbol(I1, Decl(optionalParamAssignmentCompat.ts, 0, 0))
 >i2.m1 : Symbol(I2.m1, Decl(optionalParamAssignmentCompat.ts, 4, 11))
->i2 : Symbol(i2, Decl(optionalParamAssignmentCompat.ts, 7, 3))
+>i2 : Symbol(i2, Decl(optionalParamAssignmentCompat.ts, 7, 11))
 >m1 : Symbol(I2.m1, Decl(optionalParamAssignmentCompat.ts, 4, 11))
 
diff --git a/tests/baselines/reference/optionalParamAssignmentCompat.types b/tests/baselines/reference/optionalParamAssignmentCompat.types
index 3cebb1e292b27..0a68f20e71e7d 100644
--- a/tests/baselines/reference/optionalParamAssignmentCompat.types
+++ b/tests/baselines/reference/optionalParamAssignmentCompat.types
@@ -19,7 +19,7 @@ interface I2 {
 >p1 : string
 >   : ^^^^^^
 }
-var i2: I2;
+declare var i2: I2;
 >i2 : I2
 >   : ^^
 
diff --git a/tests/baselines/reference/optionalParamTypeComparison.errors.txt b/tests/baselines/reference/optionalParamTypeComparison.errors.txt
index a1073e0496fe5..790933f343249 100644
--- a/tests/baselines/reference/optionalParamTypeComparison.errors.txt
+++ b/tests/baselines/reference/optionalParamTypeComparison.errors.txt
@@ -7,8 +7,8 @@ optionalParamTypeComparison.ts(5,1): error TS2322: Type '(s: string, n?: number)
 
 
 ==== optionalParamTypeComparison.ts (2 errors) ====
-    var f: (s: string, n?: number) => void;
-    var g: (s: string, b?: boolean) => void;
+    declare var f: (s: string, n?: number) => void;
+    declare var g: (s: string, b?: boolean) => void;
     
     f = g;
     ~
diff --git a/tests/baselines/reference/optionalParamTypeComparison.js b/tests/baselines/reference/optionalParamTypeComparison.js
index c926e403ceaad..558a057b99feb 100644
--- a/tests/baselines/reference/optionalParamTypeComparison.js
+++ b/tests/baselines/reference/optionalParamTypeComparison.js
@@ -1,14 +1,12 @@
 //// [tests/cases/compiler/optionalParamTypeComparison.ts] ////
 
 //// [optionalParamTypeComparison.ts]
-var f: (s: string, n?: number) => void;
-var g: (s: string, b?: boolean) => void;
+declare var f: (s: string, n?: number) => void;
+declare var g: (s: string, b?: boolean) => void;
 
 f = g;
 g = f;
 
 //// [optionalParamTypeComparison.js]
-var f;
-var g;
 f = g;
 g = f;
diff --git a/tests/baselines/reference/optionalParamTypeComparison.symbols b/tests/baselines/reference/optionalParamTypeComparison.symbols
index 1f1e6bb414f1f..abec5967c11ae 100644
--- a/tests/baselines/reference/optionalParamTypeComparison.symbols
+++ b/tests/baselines/reference/optionalParamTypeComparison.symbols
@@ -1,21 +1,21 @@
 //// [tests/cases/compiler/optionalParamTypeComparison.ts] ////
 
 === optionalParamTypeComparison.ts ===
-var f: (s: string, n?: number) => void;
->f : Symbol(f, Decl(optionalParamTypeComparison.ts, 0, 3))
->s : Symbol(s, Decl(optionalParamTypeComparison.ts, 0, 8))
->n : Symbol(n, Decl(optionalParamTypeComparison.ts, 0, 18))
+declare var f: (s: string, n?: number) => void;
+>f : Symbol(f, Decl(optionalParamTypeComparison.ts, 0, 11))
+>s : Symbol(s, Decl(optionalParamTypeComparison.ts, 0, 16))
+>n : Symbol(n, Decl(optionalParamTypeComparison.ts, 0, 26))
 
-var g: (s: string, b?: boolean) => void;
->g : Symbol(g, Decl(optionalParamTypeComparison.ts, 1, 3))
->s : Symbol(s, Decl(optionalParamTypeComparison.ts, 1, 8))
->b : Symbol(b, Decl(optionalParamTypeComparison.ts, 1, 18))
+declare var g: (s: string, b?: boolean) => void;
+>g : Symbol(g, Decl(optionalParamTypeComparison.ts, 1, 11))
+>s : Symbol(s, Decl(optionalParamTypeComparison.ts, 1, 16))
+>b : Symbol(b, Decl(optionalParamTypeComparison.ts, 1, 26))
 
 f = g;
->f : Symbol(f, Decl(optionalParamTypeComparison.ts, 0, 3))
->g : Symbol(g, Decl(optionalParamTypeComparison.ts, 1, 3))
+>f : Symbol(f, Decl(optionalParamTypeComparison.ts, 0, 11))
+>g : Symbol(g, Decl(optionalParamTypeComparison.ts, 1, 11))
 
 g = f;
->g : Symbol(g, Decl(optionalParamTypeComparison.ts, 1, 3))
->f : Symbol(f, Decl(optionalParamTypeComparison.ts, 0, 3))
+>g : Symbol(g, Decl(optionalParamTypeComparison.ts, 1, 11))
+>f : Symbol(f, Decl(optionalParamTypeComparison.ts, 0, 11))
 
diff --git a/tests/baselines/reference/optionalParamTypeComparison.types b/tests/baselines/reference/optionalParamTypeComparison.types
index 3ced38ac55666..a8b1d7941c094 100644
--- a/tests/baselines/reference/optionalParamTypeComparison.types
+++ b/tests/baselines/reference/optionalParamTypeComparison.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/optionalParamTypeComparison.ts] ////
 
 === optionalParamTypeComparison.ts ===
-var f: (s: string, n?: number) => void;
+declare var f: (s: string, n?: number) => void;
 >f : (s: string, n?: number) => void
 >  : ^ ^^      ^^ ^^^      ^^^^^    
 >s : string
@@ -9,7 +9,7 @@ var f: (s: string, n?: number) => void;
 >n : number
 >  : ^^^^^^
 
-var g: (s: string, b?: boolean) => void;
+declare var g: (s: string, b?: boolean) => void;
 >g : (s: string, b?: boolean) => void
 >  : ^ ^^      ^^ ^^^       ^^^^^    
 >s : string
diff --git a/tests/baselines/reference/optionalParameterProperty.errors.txt b/tests/baselines/reference/optionalParameterProperty.errors.txt
index 8d0418dc6208e..cd7fb6f9f6f4e 100644
--- a/tests/baselines/reference/optionalParameterProperty.errors.txt
+++ b/tests/baselines/reference/optionalParameterProperty.errors.txt
@@ -6,7 +6,7 @@ optionalParameterProperty.ts(5,7): error TS2415: Class 'D' incorrectly extends b
 
 ==== optionalParameterProperty.ts (1 errors) ====
     class C {
-        p: number;
+        p: number = 0;
     }
     
     class D extends C { 
diff --git a/tests/baselines/reference/optionalParameterProperty.js b/tests/baselines/reference/optionalParameterProperty.js
index 071841946d2a4..43589fcd22e86 100644
--- a/tests/baselines/reference/optionalParameterProperty.js
+++ b/tests/baselines/reference/optionalParameterProperty.js
@@ -2,7 +2,7 @@
 
 //// [optionalParameterProperty.ts]
 class C {
-    p: number;
+    p: number = 0;
 }
 
 class D extends C { 
@@ -30,6 +30,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 var C = /** @class */ (function () {
     function C() {
+        this.p = 0;
     }
     return C;
 }());
diff --git a/tests/baselines/reference/optionalParameterProperty.symbols b/tests/baselines/reference/optionalParameterProperty.symbols
index fac6b778ef12e..ccbb8ec3ea740 100644
--- a/tests/baselines/reference/optionalParameterProperty.symbols
+++ b/tests/baselines/reference/optionalParameterProperty.symbols
@@ -4,7 +4,7 @@
 class C {
 >C : Symbol(C, Decl(optionalParameterProperty.ts, 0, 0))
 
-    p: number;
+    p: number = 0;
 >p : Symbol(C.p, Decl(optionalParameterProperty.ts, 0, 9))
 }
 
diff --git a/tests/baselines/reference/optionalParameterProperty.types b/tests/baselines/reference/optionalParameterProperty.types
index febddfe677bc4..602be37c049e0 100644
--- a/tests/baselines/reference/optionalParameterProperty.types
+++ b/tests/baselines/reference/optionalParameterProperty.types
@@ -5,9 +5,11 @@ class C {
 >C : C
 >  : ^
 
-    p: number;
+    p: number = 0;
 >p : number
 >  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 class D extends C { 
diff --git a/tests/baselines/reference/optionalPropertiesTest.errors.txt b/tests/baselines/reference/optionalPropertiesTest.errors.txt
index eef03891edf85..da823ca258b75 100644
--- a/tests/baselines/reference/optionalPropertiesTest.errors.txt
+++ b/tests/baselines/reference/optionalPropertiesTest.errors.txt
@@ -50,10 +50,10 @@ optionalPropertiesTest.ts(40,1): error TS2322: Type 'i2' is not assignable to ty
     var test8: i4 = { M: 5 }
     test8 = {};
     var test9_1: i2;
-    var test9_2: i1;
+    declare var test9_2: i1;
     test9_1 = test9_2;
     var test10_1: i1;
-    var test10_2: i2;
+    declare var test10_2: i2;
     test10_1 = test10_2;
     ~~~~~~~~
 !!! error TS2322: Type 'i2' is not assignable to type 'i1'.
diff --git a/tests/baselines/reference/optionalPropertiesTest.js b/tests/baselines/reference/optionalPropertiesTest.js
index b56924ba65946..e6502433556e7 100644
--- a/tests/baselines/reference/optionalPropertiesTest.js
+++ b/tests/baselines/reference/optionalPropertiesTest.js
@@ -36,10 +36,10 @@ test7 = {};
 var test8: i4 = { M: 5 }
 test8 = {};
 var test9_1: i2;
-var test9_2: i1;
+declare var test9_2: i1;
 test9_1 = test9_2;
 var test10_1: i1;
-var test10_2: i2;
+declare var test10_2: i2;
 test10_1 = test10_2;
 
 //// [optionalPropertiesTest.js]
@@ -67,8 +67,6 @@ test7 = {};
 var test8 = { M: 5 };
 test8 = {};
 var test9_1;
-var test9_2;
 test9_1 = test9_2;
 var test10_1;
-var test10_2;
 test10_1 = test10_2;
diff --git a/tests/baselines/reference/optionalPropertiesTest.symbols b/tests/baselines/reference/optionalPropertiesTest.symbols
index 771d21a494be8..e9ca81fdb5e77 100644
--- a/tests/baselines/reference/optionalPropertiesTest.symbols
+++ b/tests/baselines/reference/optionalPropertiesTest.symbols
@@ -120,23 +120,23 @@ var test9_1: i2;
 >test9_1 : Symbol(test9_1, Decl(optionalPropertiesTest.ts, 34, 3))
 >i2 : Symbol(i2, Decl(optionalPropertiesTest.ts, 19, 32))
 
-var test9_2: i1;
->test9_2 : Symbol(test9_2, Decl(optionalPropertiesTest.ts, 35, 3))
+declare var test9_2: i1;
+>test9_2 : Symbol(test9_2, Decl(optionalPropertiesTest.ts, 35, 11))
 >i1 : Symbol(i1, Decl(optionalPropertiesTest.ts, 17, 41))
 
 test9_1 = test9_2;
 >test9_1 : Symbol(test9_1, Decl(optionalPropertiesTest.ts, 34, 3))
->test9_2 : Symbol(test9_2, Decl(optionalPropertiesTest.ts, 35, 3))
+>test9_2 : Symbol(test9_2, Decl(optionalPropertiesTest.ts, 35, 11))
 
 var test10_1: i1;
 >test10_1 : Symbol(test10_1, Decl(optionalPropertiesTest.ts, 37, 3))
 >i1 : Symbol(i1, Decl(optionalPropertiesTest.ts, 17, 41))
 
-var test10_2: i2;
->test10_2 : Symbol(test10_2, Decl(optionalPropertiesTest.ts, 38, 3))
+declare var test10_2: i2;
+>test10_2 : Symbol(test10_2, Decl(optionalPropertiesTest.ts, 38, 11))
 >i2 : Symbol(i2, Decl(optionalPropertiesTest.ts, 19, 32))
 
 test10_1 = test10_2;
 >test10_1 : Symbol(test10_1, Decl(optionalPropertiesTest.ts, 37, 3))
->test10_2 : Symbol(test10_2, Decl(optionalPropertiesTest.ts, 38, 3))
+>test10_2 : Symbol(test10_2, Decl(optionalPropertiesTest.ts, 38, 11))
 
diff --git a/tests/baselines/reference/optionalPropertiesTest.types b/tests/baselines/reference/optionalPropertiesTest.types
index 4a907bb1ca1a4..885efbb1ed5b6 100644
--- a/tests/baselines/reference/optionalPropertiesTest.types
+++ b/tests/baselines/reference/optionalPropertiesTest.types
@@ -221,7 +221,7 @@ var test9_1: i2;
 >test9_1 : i2
 >        : ^^
 
-var test9_2: i1;
+declare var test9_2: i1;
 >test9_2 : i1
 >        : ^^
 
@@ -237,7 +237,7 @@ var test10_1: i1;
 >test10_1 : i1
 >         : ^^
 
-var test10_2: i2;
+declare var test10_2: i2;
 >test10_2 : i2
 >         : ^^
 
diff --git a/tests/baselines/reference/optionsOutAndNoModuleGen.errors.txt b/tests/baselines/reference/optionsOutAndNoModuleGen.errors.txt
index 29cc0ba1804e1..47dcf55fb2a36 100644
--- a/tests/baselines/reference/optionsOutAndNoModuleGen.errors.txt
+++ b/tests/baselines/reference/optionsOutAndNoModuleGen.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 optionsOutAndNoModuleGen.ts(1,1): error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== optionsOutAndNoModuleGen.ts (1 errors) ====
     export var x = 10;
     ~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.errors.txt b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.errors.txt
index cf8453f2e87b9..d87aa923504e7 100644
--- a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.errors.txt
+++ b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.errors.txt
@@ -4,7 +4,7 @@ orderMattersForSignatureGroupIdentity.ts(19,1): error TS2769: No overload matche
   Overload 2 of 2, '(x: { n: number; }): number', gave the following error.
     Object literal may only specify known properties, and 's' does not exist in type '{ n: number; }'.
 orderMattersForSignatureGroupIdentity.ts(19,20): error TS2339: Property 'toLowerCase' does not exist on type 'never'.
-orderMattersForSignatureGroupIdentity.ts(22,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 'w' must be of type 'A', but here has type 'C'.
+orderMattersForSignatureGroupIdentity.ts(22,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'w' must be of type 'A', but here has type 'C'.
 orderMattersForSignatureGroupIdentity.ts(24,1): error TS2769: No overload matches this call.
   Overload 1 of 2, '(x: { s: string; }): string', gave the following error.
     Object literal may only specify known properties, and 'n' does not exist in type '{ s: string; }'.
@@ -29,8 +29,8 @@ orderMattersForSignatureGroupIdentity.ts(24,20): error TS2339: Property 'toLower
         (x: { s: string }): string
     }
     
-    var v: A;
-    var v: B;
+    declare var v: A;
+    declare var v: B;
     
     v({ s: "", n: 0 }).toLowerCase();
     ~
@@ -42,11 +42,11 @@ orderMattersForSignatureGroupIdentity.ts(24,20): error TS2339: Property 'toLower
                        ~~~~~~~~~~~
 !!! error TS2339: Property 'toLowerCase' does not exist on type 'never'.
     
-    var w: A;
-    var w: C;
-        ~
+    declare var w: A;
+    declare var w: C;
+                ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'w' must be of type 'A', but here has type 'C'.
-!!! related TS6203 orderMattersForSignatureGroupIdentity.ts:21:5: 'w' was also declared here.
+!!! related TS6203 orderMattersForSignatureGroupIdentity.ts:21:13: 'w' was also declared here.
     
     w({ s: "", n: 0 }).toLowerCase();
     ~
diff --git a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.js b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.js
index 0a82c3abfa72e..2747ce7037a68 100644
--- a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.js
+++ b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.js
@@ -16,20 +16,16 @@ interface C {
     (x: { s: string }): string
 }
 
-var v: A;
-var v: B;
+declare var v: A;
+declare var v: B;
 
 v({ s: "", n: 0 }).toLowerCase();
 
-var w: A;
-var w: C;
+declare var w: A;
+declare var w: C;
 
 w({ s: "", n: 0 }).toLowerCase();
 
 //// [orderMattersForSignatureGroupIdentity.js]
-var v;
-var v;
 v({ s: "", n: 0 }).toLowerCase();
-var w;
-var w;
 w({ s: "", n: 0 }).toLowerCase();
diff --git a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.symbols b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.symbols
index a5fc55b002afe..6a0c7afc0a514 100644
--- a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.symbols
+++ b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.symbols
@@ -37,29 +37,29 @@ interface C {
 >s : Symbol(s, Decl(orderMattersForSignatureGroupIdentity.ts, 12, 9))
 }
 
-var v: A;
->v : Symbol(v, Decl(orderMattersForSignatureGroupIdentity.ts, 15, 3), Decl(orderMattersForSignatureGroupIdentity.ts, 16, 3))
+declare var v: A;
+>v : Symbol(v, Decl(orderMattersForSignatureGroupIdentity.ts, 15, 11), Decl(orderMattersForSignatureGroupIdentity.ts, 16, 11))
 >A : Symbol(A, Decl(orderMattersForSignatureGroupIdentity.ts, 0, 0))
 
-var v: B;
->v : Symbol(v, Decl(orderMattersForSignatureGroupIdentity.ts, 15, 3), Decl(orderMattersForSignatureGroupIdentity.ts, 16, 3))
+declare var v: B;
+>v : Symbol(v, Decl(orderMattersForSignatureGroupIdentity.ts, 15, 11), Decl(orderMattersForSignatureGroupIdentity.ts, 16, 11))
 >B : Symbol(B, Decl(orderMattersForSignatureGroupIdentity.ts, 3, 1))
 
 v({ s: "", n: 0 }).toLowerCase();
->v : Symbol(v, Decl(orderMattersForSignatureGroupIdentity.ts, 15, 3), Decl(orderMattersForSignatureGroupIdentity.ts, 16, 3))
+>v : Symbol(v, Decl(orderMattersForSignatureGroupIdentity.ts, 15, 11), Decl(orderMattersForSignatureGroupIdentity.ts, 16, 11))
 >s : Symbol(s, Decl(orderMattersForSignatureGroupIdentity.ts, 18, 3))
 >n : Symbol(n, Decl(orderMattersForSignatureGroupIdentity.ts, 18, 10))
 
-var w: A;
->w : Symbol(w, Decl(orderMattersForSignatureGroupIdentity.ts, 20, 3), Decl(orderMattersForSignatureGroupIdentity.ts, 21, 3))
+declare var w: A;
+>w : Symbol(w, Decl(orderMattersForSignatureGroupIdentity.ts, 20, 11), Decl(orderMattersForSignatureGroupIdentity.ts, 21, 11))
 >A : Symbol(A, Decl(orderMattersForSignatureGroupIdentity.ts, 0, 0))
 
-var w: C;
->w : Symbol(w, Decl(orderMattersForSignatureGroupIdentity.ts, 20, 3), Decl(orderMattersForSignatureGroupIdentity.ts, 21, 3))
+declare var w: C;
+>w : Symbol(w, Decl(orderMattersForSignatureGroupIdentity.ts, 20, 11), Decl(orderMattersForSignatureGroupIdentity.ts, 21, 11))
 >C : Symbol(C, Decl(orderMattersForSignatureGroupIdentity.ts, 8, 1))
 
 w({ s: "", n: 0 }).toLowerCase();
->w : Symbol(w, Decl(orderMattersForSignatureGroupIdentity.ts, 20, 3), Decl(orderMattersForSignatureGroupIdentity.ts, 21, 3))
+>w : Symbol(w, Decl(orderMattersForSignatureGroupIdentity.ts, 20, 11), Decl(orderMattersForSignatureGroupIdentity.ts, 21, 11))
 >s : Symbol(s, Decl(orderMattersForSignatureGroupIdentity.ts, 23, 3))
 >n : Symbol(n, Decl(orderMattersForSignatureGroupIdentity.ts, 23, 10))
 
diff --git a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.types b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.types
index 38088475c1905..2609b0ebe83f6 100644
--- a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.types
+++ b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.types
@@ -43,11 +43,11 @@ interface C {
 >  : ^^^^^^
 }
 
-var v: A;
+declare var v: A;
 >v : A
 >  : ^
 
-var v: B;
+declare var v: B;
 >v : A
 >  : ^
 
@@ -73,11 +73,11 @@ v({ s: "", n: 0 }).toLowerCase();
 >toLowerCase : any
 >            : ^^^
 
-var w: A;
+declare var w: A;
 >w : A
 >  : ^
 
-var w: C;
+declare var w: C;
 >w : A
 >  : ^
 
diff --git a/tests/baselines/reference/out-flag2.errors.txt b/tests/baselines/reference/out-flag2.errors.txt
index 8460347a217ca..0bfe608ab46cc 100644
--- a/tests/baselines/reference/out-flag2.errors.txt
+++ b/tests/baselines/reference/out-flag2.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== a.ts (0 errors) ====
     class A { }
diff --git a/tests/baselines/reference/out-flag3.errors.txt b/tests/baselines/reference/out-flag3.errors.txt
index 8460347a217ca..0bfe608ab46cc 100644
--- a/tests/baselines/reference/out-flag3.errors.txt
+++ b/tests/baselines/reference/out-flag3.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== a.ts (0 errors) ====
     class A { }
diff --git a/tests/baselines/reference/outFileIsDeprecated.js b/tests/baselines/reference/outFileIsDeprecated.js
new file mode 100644
index 0000000000000..89b2aec415c2f
--- /dev/null
+++ b/tests/baselines/reference/outFileIsDeprecated.js
@@ -0,0 +1,11 @@
+//// [tests/cases/compiler/outFileIsDeprecated.ts] ////
+
+//// [a.ts]
+const a = 1;
+
+//// [b.ts]
+const b = 1;
+
+//// [dist.js]
+var a = 1;
+var b = 1;
diff --git a/tests/baselines/reference/outFileIsDeprecated.symbols b/tests/baselines/reference/outFileIsDeprecated.symbols
new file mode 100644
index 0000000000000..0b97c355739f4
--- /dev/null
+++ b/tests/baselines/reference/outFileIsDeprecated.symbols
@@ -0,0 +1,10 @@
+//// [tests/cases/compiler/outFileIsDeprecated.ts] ////
+
+=== /foo/a.ts ===
+const a = 1;
+>a : Symbol(a, Decl(a.ts, 0, 5))
+
+=== /foo/b.ts ===
+const b = 1;
+>b : Symbol(b, Decl(b.ts, 0, 5))
+
diff --git a/tests/baselines/reference/outFileIsDeprecated.types b/tests/baselines/reference/outFileIsDeprecated.types
new file mode 100644
index 0000000000000..cd886ee1442c1
--- /dev/null
+++ b/tests/baselines/reference/outFileIsDeprecated.types
@@ -0,0 +1,16 @@
+//// [tests/cases/compiler/outFileIsDeprecated.ts] ////
+
+=== /foo/a.ts ===
+const a = 1;
+>a : 1
+>  : ^
+>1 : 1
+>  : ^
+
+=== /foo/b.ts ===
+const b = 1;
+>b : 1
+>  : ^
+>1 : 1
+>  : ^
+
diff --git a/tests/baselines/reference/outFilerootDirModuleNamesAmd.errors.txt b/tests/baselines/reference/outFilerootDirModuleNamesAmd.errors.txt
index 757436d42452f..3feaadf9a1969 100644
--- a/tests/baselines/reference/outFilerootDirModuleNamesAmd.errors.txt
+++ b/tests/baselines/reference/outFilerootDirModuleNamesAmd.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== src/a.ts (0 errors) ====
     import foo from "./b";
diff --git a/tests/baselines/reference/outFilerootDirModuleNamesSystem.errors.txt b/tests/baselines/reference/outFilerootDirModuleNamesSystem.errors.txt
index 978901f629afd..acb4a380b593a 100644
--- a/tests/baselines/reference/outFilerootDirModuleNamesSystem.errors.txt
+++ b/tests/baselines/reference/outFilerootDirModuleNamesSystem.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== src/a.ts (0 errors) ====
     import foo from "./b";
diff --git a/tests/baselines/reference/outModuleConcatAmd.errors.txt b/tests/baselines/reference/outModuleConcatAmd.errors.txt
index bf1bdc018fc57..30eab78f2d2ca 100644
--- a/tests/baselines/reference/outModuleConcatAmd.errors.txt
+++ b/tests/baselines/reference/outModuleConcatAmd.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/a.ts (0 errors) ====
     export class A { }
diff --git a/tests/baselines/reference/outModuleConcatCommonjs.errors.txt b/tests/baselines/reference/outModuleConcatCommonjs.errors.txt
index e408a429df8e2..3aafc61deaea9 100644
--- a/tests/baselines/reference/outModuleConcatCommonjs.errors.txt
+++ b/tests/baselines/reference/outModuleConcatCommonjs.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/a.ts (0 errors) ====
     export class A { }
diff --git a/tests/baselines/reference/outModuleConcatCommonjsDeclarationOnly.errors.txt b/tests/baselines/reference/outModuleConcatCommonjsDeclarationOnly.errors.txt
new file mode 100644
index 0000000000000..d9377e42f4d43
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatCommonjsDeclarationOnly.errors.txt
@@ -0,0 +1,11 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== ref/a.ts (0 errors) ====
+    export class A { }
+    
+==== b.ts (0 errors) ====
+    import {A} from "./ref/a";
+    export class B extends A { }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatES6.errors.txt b/tests/baselines/reference/outModuleConcatES6.errors.txt
index c4a744578f784..7d01f87b3e127 100644
--- a/tests/baselines/reference/outModuleConcatES6.errors.txt
+++ b/tests/baselines/reference/outModuleConcatES6.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/a.ts (0 errors) ====
     export class A { }
diff --git a/tests/baselines/reference/outModuleConcatSystem.errors.txt b/tests/baselines/reference/outModuleConcatSystem.errors.txt
index 635a9186a3446..dd3172aee8fa9 100644
--- a/tests/baselines/reference/outModuleConcatSystem.errors.txt
+++ b/tests/baselines/reference/outModuleConcatSystem.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/a.ts (0 errors) ====
     export class A { }
diff --git a/tests/baselines/reference/outModuleConcatUmd.errors.txt b/tests/baselines/reference/outModuleConcatUmd.errors.txt
index 142e3121e87af..d7af8b0ddf54e 100644
--- a/tests/baselines/reference/outModuleConcatUmd.errors.txt
+++ b/tests/baselines/reference/outModuleConcatUmd.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/a.ts (0 errors) ====
diff --git a/tests/baselines/reference/outModuleConcatUnspecifiedModuleKind.errors.txt b/tests/baselines/reference/outModuleConcatUnspecifiedModuleKind.errors.txt
index e7ed0eda04aa2..cf248dbdb0ee3 100644
--- a/tests/baselines/reference/outModuleConcatUnspecifiedModuleKind.errors.txt
+++ b/tests/baselines/reference/outModuleConcatUnspecifiedModuleKind.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 a.ts(1,14): error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (1 errors) ====
     export class A { } // module
                  ~
diff --git a/tests/baselines/reference/outModuleConcatUnspecifiedModuleKindDeclarationOnly.errors.txt b/tests/baselines/reference/outModuleConcatUnspecifiedModuleKindDeclarationOnly.errors.txt
index 088c7b4dc1656..c9d61aef9369a 100644
--- a/tests/baselines/reference/outModuleConcatUnspecifiedModuleKindDeclarationOnly.errors.txt
+++ b/tests/baselines/reference/outModuleConcatUnspecifiedModuleKindDeclarationOnly.errors.txt
@@ -1,7 +1,9 @@
 error TS5069: Option 'emitDeclarationOnly' cannot be specified without specifying option 'declaration' or option 'composite'.
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5069: Option 'emitDeclarationOnly' cannot be specified without specifying option 'declaration' or option 'composite'.
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (0 errors) ====
     export class A { } // module
     
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.errors.txt b/tests/baselines/reference/outModuleTripleSlashRefs.errors.txt
index 743cc840fe165..21cbb79b14952 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.errors.txt
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/a.ts (0 errors) ====
     /// <reference path="./b.ts" />
diff --git a/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.errors.txt b/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.errors.txt
index 8c10009c3c602..54738a9c24832 100644
--- a/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.errors.txt
+++ b/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.errors.txt
@@ -8,7 +8,7 @@ overloadErrorMatchesImplementationElaboaration.ts(8,12): error TS2345: Argument
         publish<T>(event: T): void {}
     }
     
-    var ea: EventAggregator;
+    declare var ea: EventAggregator;
     ea.publish([1,2,3]);
                ~~~~~~~
 !!! error TS2345: Argument of type 'number[]' is not assignable to parameter of type 'string'.
diff --git a/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.js b/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.js
index a253fb65da218..5766b5d61fe7e 100644
--- a/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.js
+++ b/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.js
@@ -7,7 +7,7 @@ class EventAggregator
     publish<T>(event: T): void {}
 }
 
-var ea: EventAggregator;
+declare var ea: EventAggregator;
 ea.publish([1,2,3]);
 
 //// [overloadErrorMatchesImplementationElaboaration.js]
@@ -17,5 +17,4 @@ var EventAggregator = /** @class */ (function () {
     EventAggregator.prototype.publish = function (event) { };
     return EventAggregator;
 }());
-var ea;
 ea.publish([1, 2, 3]);
diff --git a/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.symbols b/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.symbols
index a38e3fefcfbd7..e91662ff18283 100644
--- a/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.symbols
+++ b/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.symbols
@@ -16,12 +16,12 @@ class EventAggregator
 >T : Symbol(T, Decl(overloadErrorMatchesImplementationElaboaration.ts, 3, 12))
 }
 
-var ea: EventAggregator;
->ea : Symbol(ea, Decl(overloadErrorMatchesImplementationElaboaration.ts, 6, 3))
+declare var ea: EventAggregator;
+>ea : Symbol(ea, Decl(overloadErrorMatchesImplementationElaboaration.ts, 6, 11))
 >EventAggregator : Symbol(EventAggregator, Decl(overloadErrorMatchesImplementationElaboaration.ts, 0, 0))
 
 ea.publish([1,2,3]);
 >ea.publish : Symbol(EventAggregator.publish, Decl(overloadErrorMatchesImplementationElaboaration.ts, 1, 1), Decl(overloadErrorMatchesImplementationElaboaration.ts, 2, 45))
->ea : Symbol(ea, Decl(overloadErrorMatchesImplementationElaboaration.ts, 6, 3))
+>ea : Symbol(ea, Decl(overloadErrorMatchesImplementationElaboaration.ts, 6, 11))
 >publish : Symbol(EventAggregator.publish, Decl(overloadErrorMatchesImplementationElaboaration.ts, 1, 1), Decl(overloadErrorMatchesImplementationElaboaration.ts, 2, 45))
 
diff --git a/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.types b/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.types
index bf4a9a587c9cb..44fceaf7004bd 100644
--- a/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.types
+++ b/tests/baselines/reference/overloadErrorMatchesImplementationElaboaration.types
@@ -20,7 +20,7 @@ class EventAggregator
 >      : ^
 }
 
-var ea: EventAggregator;
+declare var ea: EventAggregator;
 >ea : EventAggregator
 >   : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt
index 87780c965b643..db79bb4856226 100644
--- a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt
+++ b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt
@@ -29,7 +29,7 @@ overloadOnConstNoAnyImplementation2.ts(21,9): error TS2345: Argument of type '(x
         }
     }
     
-    var c: C;
+    declare var c: C;
     c.x1(1, (x: 'hi') => { return 1; } );
     c.x1(1, (x: 'bye') => { return 1; } );
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js
index b0f356fe764fa..b4a3c6c027fc2 100644
--- a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js
+++ b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js
@@ -16,7 +16,7 @@ class C {
     }
 }
 
-var c: C;
+declare var c: C;
 c.x1(1, (x: 'hi') => { return 1; } );
 c.x1(1, (x: 'bye') => { return 1; } );
 c.x1(1, (x) => { return 1; } );
@@ -36,7 +36,6 @@ var C = /** @class */ (function () {
     };
     return C;
 }());
-var c;
 c.x1(1, function (x) { return 1; });
 c.x1(1, function (x) { return 1; });
 c.x1(1, function (x) { return 1; });
diff --git a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.symbols b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.symbols
index 2cf2ae24826f9..6a01ddb1dcbb2 100644
--- a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.symbols
+++ b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.symbols
@@ -44,31 +44,31 @@ class C {
     }
 }
 
-var c: C;
->c : Symbol(c, Decl(overloadOnConstNoAnyImplementation2.ts, 15, 3))
+declare var c: C;
+>c : Symbol(c, Decl(overloadOnConstNoAnyImplementation2.ts, 15, 11))
 >C : Symbol(C, Decl(overloadOnConstNoAnyImplementation2.ts, 2, 1))
 
 c.x1(1, (x: 'hi') => { return 1; } );
 >c.x1 : Symbol(C.x1, Decl(overloadOnConstNoAnyImplementation2.ts, 4, 9), Decl(overloadOnConstNoAnyImplementation2.ts, 5, 49))
->c : Symbol(c, Decl(overloadOnConstNoAnyImplementation2.ts, 15, 3))
+>c : Symbol(c, Decl(overloadOnConstNoAnyImplementation2.ts, 15, 11))
 >x1 : Symbol(C.x1, Decl(overloadOnConstNoAnyImplementation2.ts, 4, 9), Decl(overloadOnConstNoAnyImplementation2.ts, 5, 49))
 >x : Symbol(x, Decl(overloadOnConstNoAnyImplementation2.ts, 16, 9))
 
 c.x1(1, (x: 'bye') => { return 1; } );
 >c.x1 : Symbol(C.x1, Decl(overloadOnConstNoAnyImplementation2.ts, 4, 9), Decl(overloadOnConstNoAnyImplementation2.ts, 5, 49))
->c : Symbol(c, Decl(overloadOnConstNoAnyImplementation2.ts, 15, 3))
+>c : Symbol(c, Decl(overloadOnConstNoAnyImplementation2.ts, 15, 11))
 >x1 : Symbol(C.x1, Decl(overloadOnConstNoAnyImplementation2.ts, 4, 9), Decl(overloadOnConstNoAnyImplementation2.ts, 5, 49))
 >x : Symbol(x, Decl(overloadOnConstNoAnyImplementation2.ts, 17, 9))
 
 c.x1(1, (x) => { return 1; } );
 >c.x1 : Symbol(C.x1, Decl(overloadOnConstNoAnyImplementation2.ts, 4, 9), Decl(overloadOnConstNoAnyImplementation2.ts, 5, 49))
->c : Symbol(c, Decl(overloadOnConstNoAnyImplementation2.ts, 15, 3))
+>c : Symbol(c, Decl(overloadOnConstNoAnyImplementation2.ts, 15, 11))
 >x1 : Symbol(C.x1, Decl(overloadOnConstNoAnyImplementation2.ts, 4, 9), Decl(overloadOnConstNoAnyImplementation2.ts, 5, 49))
 >x : Symbol(x, Decl(overloadOnConstNoAnyImplementation2.ts, 18, 9))
 
 c.x1(1, (x: number) => { return 1; } );
 >c.x1 : Symbol(C.x1, Decl(overloadOnConstNoAnyImplementation2.ts, 4, 9), Decl(overloadOnConstNoAnyImplementation2.ts, 5, 49))
->c : Symbol(c, Decl(overloadOnConstNoAnyImplementation2.ts, 15, 3))
+>c : Symbol(c, Decl(overloadOnConstNoAnyImplementation2.ts, 15, 11))
 >x1 : Symbol(C.x1, Decl(overloadOnConstNoAnyImplementation2.ts, 4, 9), Decl(overloadOnConstNoAnyImplementation2.ts, 5, 49))
 >x : Symbol(x, Decl(overloadOnConstNoAnyImplementation2.ts, 20, 9))
 
diff --git a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.types b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.types
index f0950110a396e..f7050d836b79a 100644
--- a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.types
+++ b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.types
@@ -77,7 +77,7 @@ class C {
     }
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt b/tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt
index 89bfe17952419..9b7b8968d1d17 100644
--- a/tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt
+++ b/tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt
@@ -22,7 +22,7 @@ overloadOnConstNoStringImplementation2.ts(20,9): error TS2345: Argument of type
         }
     }
     
-    var c: C;
+    declare var c: C;
     c.x1(1, (x: 'hi') => { return 1; } );
     c.x1(1, (x: 'bye') => { return 1; } ); 
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.js b/tests/baselines/reference/overloadOnConstNoStringImplementation2.js
index 831779f35ce72..e95d2280a223e 100644
--- a/tests/baselines/reference/overloadOnConstNoStringImplementation2.js
+++ b/tests/baselines/reference/overloadOnConstNoStringImplementation2.js
@@ -16,7 +16,7 @@ class C implements I {
     }
 }
 
-var c: C;
+declare var c: C;
 c.x1(1, (x: 'hi') => { return 1; } );
 c.x1(1, (x: 'bye') => { return 1; } ); 
 c.x1(1, (x: string) => { return 1; } );
@@ -35,7 +35,6 @@ var C = /** @class */ (function () {
     };
     return C;
 }());
-var c;
 c.x1(1, function (x) { return 1; });
 c.x1(1, function (x) { return 1; });
 c.x1(1, function (x) { return 1; });
diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.symbols b/tests/baselines/reference/overloadOnConstNoStringImplementation2.symbols
index a23898c0b3f5c..3552e6d270c61 100644
--- a/tests/baselines/reference/overloadOnConstNoStringImplementation2.symbols
+++ b/tests/baselines/reference/overloadOnConstNoStringImplementation2.symbols
@@ -45,31 +45,31 @@ class C implements I {
     }
 }
 
-var c: C;
->c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 3))
+declare var c: C;
+>c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 11))
 >C : Symbol(C, Decl(overloadOnConstNoStringImplementation2.ts, 2, 1))
 
 c.x1(1, (x: 'hi') => { return 1; } );
 >c.x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49))
->c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 3))
+>c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 11))
 >x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49))
 >x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 16, 9))
 
 c.x1(1, (x: 'bye') => { return 1; } ); 
 >c.x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49))
->c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 3))
+>c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 11))
 >x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49))
 >x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 17, 9))
 
 c.x1(1, (x: string) => { return 1; } );
 >c.x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49))
->c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 3))
+>c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 11))
 >x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49))
 >x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 18, 9))
 
 c.x1(1, (x: number) => { return 1; } );
 >c.x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49))
->c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 3))
+>c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 11))
 >x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49))
 >x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 19, 9))
 
diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.types b/tests/baselines/reference/overloadOnConstNoStringImplementation2.types
index c8994bf9cab05..8eec6b0ff4414 100644
--- a/tests/baselines/reference/overloadOnConstNoStringImplementation2.types
+++ b/tests/baselines/reference/overloadOnConstNoStringImplementation2.types
@@ -77,7 +77,7 @@ class C implements I {
     }
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
diff --git a/tests/baselines/reference/overloadResolutionConstructors.errors.txt b/tests/baselines/reference/overloadResolutionConstructors.errors.txt
index 2a70698ec11c6..d8a18c8745595 100644
--- a/tests/baselines/reference/overloadResolutionConstructors.errors.txt
+++ b/tests/baselines/reference/overloadResolutionConstructors.errors.txt
@@ -42,7 +42,7 @@ overloadResolutionConstructors.ts(100,26): error TS2551: Property 'toFixed' does
         new (s: string): string;
         new (s: number): number;
     }
-    var fn1: fn1;
+    declare var fn1: fn1;
     
     // Ambiguous call picks the first overload in declaration order
     var s = new fn1(undefined);
@@ -62,7 +62,7 @@ overloadResolutionConstructors.ts(100,26): error TS2551: Property 'toFixed' does
         new (s: string, n: number): number;
         new <T>(n: number, t: T): T;
     }
-    var fn2: fn2;
+    declare var fn2: fn2;
     
     var d = new fn2<Date>(0, undefined);
     var d: Date;
@@ -84,7 +84,7 @@ overloadResolutionConstructors.ts(100,26): error TS2551: Property 'toFixed' does
         new<T, U>(s: string, t: T, u: U): U;
         new<T, U, V>(v: V, u: U, t: T): number;
     }
-    var fn3: fn3;
+    declare var fn3: fn3;
     
     var s = new fn3(3);
     var s = new fn3('', 3, '');
@@ -106,7 +106,7 @@ overloadResolutionConstructors.ts(100,26): error TS2551: Property 'toFixed' does
         new<T extends string, U extends number>(n: T, m: U);
         new<T extends number, U extends string>(n: T, m: U);
     }
-    var fn4: fn4;
+    declare var fn4: fn4;
     
     new fn4<string, number>('', 3);
     new fn4<string, number>(3, ''); // Error
@@ -149,7 +149,7 @@ overloadResolutionConstructors.ts(100,26): error TS2551: Property 'toFixed' does
         new(f: (n: string) => void): string;
         new(f: (n: number) => void): number;
     }
-    var fn5: fn5;
+    declare var fn5: fn5;
     var n = new fn5((n) => n.toFixed());
         ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'n' must be of type 'number', but here has type 'string'.
diff --git a/tests/baselines/reference/overloadResolutionConstructors.js b/tests/baselines/reference/overloadResolutionConstructors.js
index 178c9f981e4bc..0b02b6f757370 100644
--- a/tests/baselines/reference/overloadResolutionConstructors.js
+++ b/tests/baselines/reference/overloadResolutionConstructors.js
@@ -20,7 +20,7 @@ interface fn1 {
     new (s: string): string;
     new (s: number): number;
 }
-var fn1: fn1;
+declare var fn1: fn1;
 
 // Ambiguous call picks the first overload in declaration order
 var s = new fn1(undefined);
@@ -34,7 +34,7 @@ interface fn2 {
     new (s: string, n: number): number;
     new <T>(n: number, t: T): T;
 }
-var fn2: fn2;
+declare var fn2: fn2;
 
 var d = new fn2<Date>(0, undefined);
 var d: Date;
@@ -54,7 +54,7 @@ interface fn3 {
     new<T, U>(s: string, t: T, u: U): U;
     new<T, U, V>(v: V, u: U, t: T): number;
 }
-var fn3: fn3;
+declare var fn3: fn3;
 
 var s = new fn3(3);
 var s = new fn3('', 3, '');
@@ -74,7 +74,7 @@ interface fn4 {
     new<T extends string, U extends number>(n: T, m: U);
     new<T extends number, U extends string>(n: T, m: U);
 }
-var fn4: fn4;
+declare var fn4: fn4;
 
 new fn4<string, number>('', 3);
 new fn4<string, number>(3, ''); // Error
@@ -99,7 +99,7 @@ interface fn5 {
     new(f: (n: string) => void): string;
     new(f: (n: number) => void): number;
 }
-var fn5: fn5;
+declare var fn5: fn5;
 var n = new fn5((n) => n.toFixed());
 var s = new fn5((n) => n.substr(0));
 
@@ -146,13 +146,11 @@ var SomeDerived3 = /** @class */ (function (_super) {
     }
     return SomeDerived3;
 }(SomeBase));
-var fn1;
 // Ambiguous call picks the first overload in declaration order
 var s = new fn1(undefined);
 var s;
 // No candidate overloads found
 new fn1({}); // Error
-var fn2;
 var d = new fn2(0, undefined);
 var d;
 // Generic and non - generic overload where generic overload is the only candidate when called without type arguments
@@ -161,7 +159,6 @@ var s = new fn2(0, '');
 new fn2('', 0); // Error
 // Generic and non - generic overload where non - generic overload is the only candidate when called without type arguments
 new fn2('', 0); // OK
-var fn3;
 var s = new fn3(3);
 var s = new fn3('', 3, '');
 var n = new fn3(5, 5, 5);
@@ -172,7 +169,6 @@ var s = new fn3('', '', '');
 var n = new fn3('', '', 3);
 // Generic overloads with differing arity called with type argument count that doesn't match any overload
 new fn3(); // Error
-var fn4;
 new fn4('', 3);
 new fn4(3, ''); // Error
 new fn4('', 3); // Error
@@ -187,6 +183,5 @@ new fn4(null, null); // Error
 // Generic overloads with constraints called without type arguments but with types that do not satisfy the constraints
 new fn4(true, null); // Error
 new fn4(null, true); // Error
-var fn5;
 var n = new fn5(function (n) { return n.toFixed(); });
 var s = new fn5(function (n) { return n.substr(0); });
diff --git a/tests/baselines/reference/overloadResolutionConstructors.symbols b/tests/baselines/reference/overloadResolutionConstructors.symbols
index 61b234dfd0d00..1e0fc555c58ed 100644
--- a/tests/baselines/reference/overloadResolutionConstructors.symbols
+++ b/tests/baselines/reference/overloadResolutionConstructors.symbols
@@ -33,7 +33,7 @@ class SomeDerived3 extends SomeBase {
 }
 
 interface fn1 {
->fn1 : Symbol(fn1, Decl(overloadResolutionConstructors.ts, 13, 1), Decl(overloadResolutionConstructors.ts, 19, 3))
+>fn1 : Symbol(fn1, Decl(overloadResolutionConstructors.ts, 13, 1), Decl(overloadResolutionConstructors.ts, 19, 11))
 
     new (s: string): string;
 >s : Symbol(s, Decl(overloadResolutionConstructors.ts, 16, 9))
@@ -41,14 +41,14 @@ interface fn1 {
     new (s: number): number;
 >s : Symbol(s, Decl(overloadResolutionConstructors.ts, 17, 9))
 }
-var fn1: fn1;
->fn1 : Symbol(fn1, Decl(overloadResolutionConstructors.ts, 13, 1), Decl(overloadResolutionConstructors.ts, 19, 3))
->fn1 : Symbol(fn1, Decl(overloadResolutionConstructors.ts, 13, 1), Decl(overloadResolutionConstructors.ts, 19, 3))
+declare var fn1: fn1;
+>fn1 : Symbol(fn1, Decl(overloadResolutionConstructors.ts, 13, 1), Decl(overloadResolutionConstructors.ts, 19, 11))
+>fn1 : Symbol(fn1, Decl(overloadResolutionConstructors.ts, 13, 1), Decl(overloadResolutionConstructors.ts, 19, 11))
 
 // Ambiguous call picks the first overload in declaration order
 var s = new fn1(undefined);
 >s : Symbol(s, Decl(overloadResolutionConstructors.ts, 22, 3), Decl(overloadResolutionConstructors.ts, 23, 3), Decl(overloadResolutionConstructors.ts, 39, 3), Decl(overloadResolutionConstructors.ts, 55, 3), Decl(overloadResolutionConstructors.ts, 56, 3) ... and 3 more)
->fn1 : Symbol(fn1, Decl(overloadResolutionConstructors.ts, 13, 1), Decl(overloadResolutionConstructors.ts, 19, 3))
+>fn1 : Symbol(fn1, Decl(overloadResolutionConstructors.ts, 13, 1), Decl(overloadResolutionConstructors.ts, 19, 11))
 >undefined : Symbol(undefined)
 
 var s: string;
@@ -56,11 +56,11 @@ var s: string;
 
 // No candidate overloads found
 new fn1({}); // Error
->fn1 : Symbol(fn1, Decl(overloadResolutionConstructors.ts, 13, 1), Decl(overloadResolutionConstructors.ts, 19, 3))
+>fn1 : Symbol(fn1, Decl(overloadResolutionConstructors.ts, 13, 1), Decl(overloadResolutionConstructors.ts, 19, 11))
 
 // Generic and non - generic overload where generic overload is the only candidate when called with type arguments
 interface fn2 {
->fn2 : Symbol(fn2, Decl(overloadResolutionConstructors.ts, 26, 12), Decl(overloadResolutionConstructors.ts, 33, 3))
+>fn2 : Symbol(fn2, Decl(overloadResolutionConstructors.ts, 26, 12), Decl(overloadResolutionConstructors.ts, 33, 11))
 
     new (s: string, n: number): number;
 >s : Symbol(s, Decl(overloadResolutionConstructors.ts, 30, 9))
@@ -73,13 +73,13 @@ interface fn2 {
 >T : Symbol(T, Decl(overloadResolutionConstructors.ts, 31, 9))
 >T : Symbol(T, Decl(overloadResolutionConstructors.ts, 31, 9))
 }
-var fn2: fn2;
->fn2 : Symbol(fn2, Decl(overloadResolutionConstructors.ts, 26, 12), Decl(overloadResolutionConstructors.ts, 33, 3))
->fn2 : Symbol(fn2, Decl(overloadResolutionConstructors.ts, 26, 12), Decl(overloadResolutionConstructors.ts, 33, 3))
+declare var fn2: fn2;
+>fn2 : Symbol(fn2, Decl(overloadResolutionConstructors.ts, 26, 12), Decl(overloadResolutionConstructors.ts, 33, 11))
+>fn2 : Symbol(fn2, Decl(overloadResolutionConstructors.ts, 26, 12), Decl(overloadResolutionConstructors.ts, 33, 11))
 
 var d = new fn2<Date>(0, undefined);
 >d : Symbol(d, Decl(overloadResolutionConstructors.ts, 35, 3), Decl(overloadResolutionConstructors.ts, 36, 3))
->fn2 : Symbol(fn2, Decl(overloadResolutionConstructors.ts, 26, 12), Decl(overloadResolutionConstructors.ts, 33, 3))
+>fn2 : Symbol(fn2, Decl(overloadResolutionConstructors.ts, 26, 12), Decl(overloadResolutionConstructors.ts, 33, 11))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >undefined : Symbol(undefined)
 
@@ -90,20 +90,20 @@ var d: Date;
 // Generic and non - generic overload where generic overload is the only candidate when called without type arguments
 var s = new fn2(0, '');
 >s : Symbol(s, Decl(overloadResolutionConstructors.ts, 22, 3), Decl(overloadResolutionConstructors.ts, 23, 3), Decl(overloadResolutionConstructors.ts, 39, 3), Decl(overloadResolutionConstructors.ts, 55, 3), Decl(overloadResolutionConstructors.ts, 56, 3) ... and 3 more)
->fn2 : Symbol(fn2, Decl(overloadResolutionConstructors.ts, 26, 12), Decl(overloadResolutionConstructors.ts, 33, 3))
+>fn2 : Symbol(fn2, Decl(overloadResolutionConstructors.ts, 26, 12), Decl(overloadResolutionConstructors.ts, 33, 11))
 
 // Generic and non - generic overload where non - generic overload is the only candidate when called with type arguments
 new fn2<Date>('', 0); // Error
->fn2 : Symbol(fn2, Decl(overloadResolutionConstructors.ts, 26, 12), Decl(overloadResolutionConstructors.ts, 33, 3))
+>fn2 : Symbol(fn2, Decl(overloadResolutionConstructors.ts, 26, 12), Decl(overloadResolutionConstructors.ts, 33, 11))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 // Generic and non - generic overload where non - generic overload is the only candidate when called without type arguments
 new fn2('', 0); // OK
->fn2 : Symbol(fn2, Decl(overloadResolutionConstructors.ts, 26, 12), Decl(overloadResolutionConstructors.ts, 33, 3))
+>fn2 : Symbol(fn2, Decl(overloadResolutionConstructors.ts, 26, 12), Decl(overloadResolutionConstructors.ts, 33, 11))
 
 // Generic overloads with differing arity called without type arguments
 interface fn3 {
->fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 3))
+>fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 11))
 
     new<T>(n: T): string;
 >T : Symbol(T, Decl(overloadResolutionConstructors.ts, 49, 8))
@@ -131,21 +131,21 @@ interface fn3 {
 >t : Symbol(t, Decl(overloadResolutionConstructors.ts, 51, 28))
 >T : Symbol(T, Decl(overloadResolutionConstructors.ts, 51, 8))
 }
-var fn3: fn3;
->fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 3))
->fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 3))
+declare var fn3: fn3;
+>fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 11))
+>fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 11))
 
 var s = new fn3(3);
 >s : Symbol(s, Decl(overloadResolutionConstructors.ts, 22, 3), Decl(overloadResolutionConstructors.ts, 23, 3), Decl(overloadResolutionConstructors.ts, 39, 3), Decl(overloadResolutionConstructors.ts, 55, 3), Decl(overloadResolutionConstructors.ts, 56, 3) ... and 3 more)
->fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 3))
+>fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 11))
 
 var s = new fn3('', 3, '');
 >s : Symbol(s, Decl(overloadResolutionConstructors.ts, 22, 3), Decl(overloadResolutionConstructors.ts, 23, 3), Decl(overloadResolutionConstructors.ts, 39, 3), Decl(overloadResolutionConstructors.ts, 55, 3), Decl(overloadResolutionConstructors.ts, 56, 3) ... and 3 more)
->fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 3))
+>fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 11))
 
 var n = new fn3(5, 5, 5);
 >n : Symbol(n, Decl(overloadResolutionConstructors.ts, 57, 3), Decl(overloadResolutionConstructors.ts, 58, 3), Decl(overloadResolutionConstructors.ts, 63, 3), Decl(overloadResolutionConstructors.ts, 99, 3))
->fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 3))
+>fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 11))
 
 var n: number;
 >n : Symbol(n, Decl(overloadResolutionConstructors.ts, 57, 3), Decl(overloadResolutionConstructors.ts, 58, 3), Decl(overloadResolutionConstructors.ts, 63, 3), Decl(overloadResolutionConstructors.ts, 99, 3))
@@ -153,23 +153,23 @@ var n: number;
 // Generic overloads with differing arity called with type arguments matching each overload type parameter count
 var s = new fn3<number>(4);
 >s : Symbol(s, Decl(overloadResolutionConstructors.ts, 22, 3), Decl(overloadResolutionConstructors.ts, 23, 3), Decl(overloadResolutionConstructors.ts, 39, 3), Decl(overloadResolutionConstructors.ts, 55, 3), Decl(overloadResolutionConstructors.ts, 56, 3) ... and 3 more)
->fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 3))
+>fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 11))
 
 var s = new fn3<string, string>('', '', '');
 >s : Symbol(s, Decl(overloadResolutionConstructors.ts, 22, 3), Decl(overloadResolutionConstructors.ts, 23, 3), Decl(overloadResolutionConstructors.ts, 39, 3), Decl(overloadResolutionConstructors.ts, 55, 3), Decl(overloadResolutionConstructors.ts, 56, 3) ... and 3 more)
->fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 3))
+>fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 11))
 
 var n = new fn3<number, string, string>('', '', 3);
 >n : Symbol(n, Decl(overloadResolutionConstructors.ts, 57, 3), Decl(overloadResolutionConstructors.ts, 58, 3), Decl(overloadResolutionConstructors.ts, 63, 3), Decl(overloadResolutionConstructors.ts, 99, 3))
->fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 3))
+>fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 11))
 
 // Generic overloads with differing arity called with type argument count that doesn't match any overload
 new fn3<number, number, number, number>(); // Error
->fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 3))
+>fn3 : Symbol(fn3, Decl(overloadResolutionConstructors.ts, 45, 15), Decl(overloadResolutionConstructors.ts, 53, 11))
 
 // Generic overloads with constraints called with type arguments that satisfy the constraints
 interface fn4 {
->fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 3))
+>fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 11))
 
     new<T extends string, U extends number>(n: T, m: U);
 >T : Symbol(T, Decl(overloadResolutionConstructors.ts, 70, 8))
@@ -187,51 +187,51 @@ interface fn4 {
 >m : Symbol(m, Decl(overloadResolutionConstructors.ts, 71, 49))
 >U : Symbol(U, Decl(overloadResolutionConstructors.ts, 71, 25))
 }
-var fn4: fn4;
->fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 3))
->fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 3))
+declare var fn4: fn4;
+>fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 11))
+>fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 11))
 
 new fn4<string, number>('', 3);
->fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 3))
+>fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 11))
 
 new fn4<string, number>(3, ''); // Error
->fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 3))
+>fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 11))
 
 new fn4<number, string>('', 3); // Error
->fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 3))
+>fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 11))
 
 new fn4<number, string>(3, ''); 
->fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 3))
+>fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 11))
 
 // Generic overloads with constraints called without type arguments but with types that satisfy the constraints
 new fn4('', 3);
->fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 3))
+>fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 11))
 
 new fn4(3, '');
->fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 3))
+>fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 11))
 
 new fn4(3, undefined);
->fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 3))
+>fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 11))
 >undefined : Symbol(undefined)
 
 new fn4('', null);
->fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 3))
+>fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 11))
 
 // Generic overloads with constraints called with type arguments that do not satisfy the constraints
 new fn4<boolean, Date>(null, null); // Error
->fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 3))
+>fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 11))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 // Generic overloads with constraints called without type arguments but with types that do not satisfy the constraints
 new fn4(true, null); // Error
->fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 3))
+>fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 11))
 
 new fn4(null, true); // Error
->fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 3))
+>fn4 : Symbol(fn4, Decl(overloadResolutionConstructors.ts, 66, 42), Decl(overloadResolutionConstructors.ts, 73, 11))
 
 // Non - generic overloads where contextual typing of function arguments has errors
 interface fn5 {
->fn5 : Symbol(fn5, Decl(overloadResolutionConstructors.ts, 91, 20), Decl(overloadResolutionConstructors.ts, 98, 3))
+>fn5 : Symbol(fn5, Decl(overloadResolutionConstructors.ts, 91, 20), Decl(overloadResolutionConstructors.ts, 98, 11))
 
     new(f: (n: string) => void): string;
 >f : Symbol(f, Decl(overloadResolutionConstructors.ts, 95, 8))
@@ -241,19 +241,19 @@ interface fn5 {
 >f : Symbol(f, Decl(overloadResolutionConstructors.ts, 96, 8))
 >n : Symbol(n, Decl(overloadResolutionConstructors.ts, 96, 12))
 }
-var fn5: fn5;
->fn5 : Symbol(fn5, Decl(overloadResolutionConstructors.ts, 91, 20), Decl(overloadResolutionConstructors.ts, 98, 3))
->fn5 : Symbol(fn5, Decl(overloadResolutionConstructors.ts, 91, 20), Decl(overloadResolutionConstructors.ts, 98, 3))
+declare var fn5: fn5;
+>fn5 : Symbol(fn5, Decl(overloadResolutionConstructors.ts, 91, 20), Decl(overloadResolutionConstructors.ts, 98, 11))
+>fn5 : Symbol(fn5, Decl(overloadResolutionConstructors.ts, 91, 20), Decl(overloadResolutionConstructors.ts, 98, 11))
 
 var n = new fn5((n) => n.toFixed());
 >n : Symbol(n, Decl(overloadResolutionConstructors.ts, 57, 3), Decl(overloadResolutionConstructors.ts, 58, 3), Decl(overloadResolutionConstructors.ts, 63, 3), Decl(overloadResolutionConstructors.ts, 99, 3))
->fn5 : Symbol(fn5, Decl(overloadResolutionConstructors.ts, 91, 20), Decl(overloadResolutionConstructors.ts, 98, 3))
+>fn5 : Symbol(fn5, Decl(overloadResolutionConstructors.ts, 91, 20), Decl(overloadResolutionConstructors.ts, 98, 11))
 >n : Symbol(n, Decl(overloadResolutionConstructors.ts, 99, 17))
 >n : Symbol(n, Decl(overloadResolutionConstructors.ts, 99, 17))
 
 var s = new fn5((n) => n.substr(0));
 >s : Symbol(s, Decl(overloadResolutionConstructors.ts, 22, 3), Decl(overloadResolutionConstructors.ts, 23, 3), Decl(overloadResolutionConstructors.ts, 39, 3), Decl(overloadResolutionConstructors.ts, 55, 3), Decl(overloadResolutionConstructors.ts, 56, 3) ... and 3 more)
->fn5 : Symbol(fn5, Decl(overloadResolutionConstructors.ts, 91, 20), Decl(overloadResolutionConstructors.ts, 98, 3))
+>fn5 : Symbol(fn5, Decl(overloadResolutionConstructors.ts, 91, 20), Decl(overloadResolutionConstructors.ts, 98, 11))
 >n : Symbol(n, Decl(overloadResolutionConstructors.ts, 100, 17))
 >n.substr : Symbol(String.substr, Decl(lib.es5.d.ts, --, --))
 >n : Symbol(n, Decl(overloadResolutionConstructors.ts, 100, 17))
diff --git a/tests/baselines/reference/overloadResolutionConstructors.types b/tests/baselines/reference/overloadResolutionConstructors.types
index 5b6ab01d63534..e1e74df9f48a2 100644
--- a/tests/baselines/reference/overloadResolutionConstructors.types
+++ b/tests/baselines/reference/overloadResolutionConstructors.types
@@ -53,7 +53,7 @@ interface fn1 {
 >s : number
 >  : ^^^^^^
 }
-var fn1: fn1;
+declare var fn1: fn1;
 >fn1 : fn1
 >    : ^^^
 
@@ -95,7 +95,7 @@ interface fn2 {
 >t : T
 >  : ^
 }
-var fn2: fn2;
+declare var fn2: fn2;
 >fn2 : fn2
 >    : ^^^
 
@@ -172,7 +172,7 @@ interface fn3 {
 >t : T
 >  : ^
 }
-var fn3: fn3;
+declare var fn3: fn3;
 >fn3 : fn3
 >    : ^^^
 
@@ -278,7 +278,7 @@ interface fn4 {
 >m : U
 >  : ^
 }
-var fn4: fn4;
+declare var fn4: fn4;
 >fn4 : fn4
 >    : ^^^
 
@@ -399,7 +399,7 @@ interface fn5 {
 >n : number
 >  : ^^^^^^
 }
-var fn5: fn5;
+declare var fn5: fn5;
 >fn5 : fn5
 >    : ^^^
 
diff --git a/tests/baselines/reference/overloadingOnConstants1.errors.txt b/tests/baselines/reference/overloadingOnConstants1.errors.txt
index 8c3139b94c5ae..e862d55fe92b2 100644
--- a/tests/baselines/reference/overloadingOnConstants1.errors.txt
+++ b/tests/baselines/reference/overloadingOnConstants1.errors.txt
@@ -17,7 +17,7 @@ overloadingOnConstants1.ts(25,5): error TS2741: Property 'bar' is missing in typ
         createElement(tagName: string): Base;
     }
     
-    var d2: Document2;
+    declare var d2: Document2;
     
     // these are ok
     var htmlElement: Base = d2.createElement("yo")
diff --git a/tests/baselines/reference/overloadingOnConstants1.js b/tests/baselines/reference/overloadingOnConstants1.js
index 11865a43739bb..1c222af9a3d7e 100644
--- a/tests/baselines/reference/overloadingOnConstants1.js
+++ b/tests/baselines/reference/overloadingOnConstants1.js
@@ -13,7 +13,7 @@ interface Document2 {
     createElement(tagName: string): Base;
 }
 
-var d2: Document2;
+declare var d2: Document2;
 
 // these are ok
 var htmlElement: Base = d2.createElement("yo")
@@ -73,7 +73,6 @@ var Derived3 = /** @class */ (function (_super) {
     Derived3.prototype.biz = function () { };
     return Derived3;
 }(Base));
-var d2;
 // these are ok
 var htmlElement = d2.createElement("yo");
 var htmlCanvasElement = d2.createElement("canvas");
diff --git a/tests/baselines/reference/overloadingOnConstants1.symbols b/tests/baselines/reference/overloadingOnConstants1.symbols
index 0ec168e92c97c..cee9f28e7fb48 100644
--- a/tests/baselines/reference/overloadingOnConstants1.symbols
+++ b/tests/baselines/reference/overloadingOnConstants1.symbols
@@ -44,8 +44,8 @@ interface Document2 {
 >Base : Symbol(Base, Decl(overloadingOnConstants1.ts, 0, 0))
 }
 
-var d2: Document2;
->d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 3))
+declare var d2: Document2;
+>d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 11))
 >Document2 : Symbol(Document2, Decl(overloadingOnConstants1.ts, 3, 41))
 
 // these are ok
@@ -53,28 +53,28 @@ var htmlElement: Base = d2.createElement("yo")
 >htmlElement : Symbol(htmlElement, Decl(overloadingOnConstants1.ts, 15, 3))
 >Base : Symbol(Base, Decl(overloadingOnConstants1.ts, 0, 0))
 >d2.createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
->d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 3))
+>d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 11))
 >createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
 
 var htmlCanvasElement: Derived1 = d2.createElement("canvas");
 >htmlCanvasElement : Symbol(htmlCanvasElement, Decl(overloadingOnConstants1.ts, 16, 3))
 >Derived1 : Symbol(Derived1, Decl(overloadingOnConstants1.ts, 0, 24))
 >d2.createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
->d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 3))
+>d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 11))
 >createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
 
 var htmlDivElement: Derived2 = d2.createElement("div");
 >htmlDivElement : Symbol(htmlDivElement, Decl(overloadingOnConstants1.ts, 17, 3))
 >Derived2 : Symbol(Derived2, Decl(overloadingOnConstants1.ts, 1, 41))
 >d2.createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
->d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 3))
+>d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 11))
 >createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
 
 var htmlSpanElement: Derived3 = d2.createElement("span");
 >htmlSpanElement : Symbol(htmlSpanElement, Decl(overloadingOnConstants1.ts, 18, 3))
 >Derived3 : Symbol(Derived3, Decl(overloadingOnConstants1.ts, 2, 41))
 >d2.createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
->d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 3))
+>d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 11))
 >createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
 
 // these are errors
@@ -82,27 +82,27 @@ var htmlElement2: Derived1 = d2.createElement("yo")
 >htmlElement2 : Symbol(htmlElement2, Decl(overloadingOnConstants1.ts, 21, 3))
 >Derived1 : Symbol(Derived1, Decl(overloadingOnConstants1.ts, 0, 24))
 >d2.createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
->d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 3))
+>d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 11))
 >createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
 
 var htmlCanvasElement2: Derived3 = d2.createElement("canvas");
 >htmlCanvasElement2 : Symbol(htmlCanvasElement2, Decl(overloadingOnConstants1.ts, 22, 3))
 >Derived3 : Symbol(Derived3, Decl(overloadingOnConstants1.ts, 2, 41))
 >d2.createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
->d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 3))
+>d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 11))
 >createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
 
 var htmlDivElement2: Derived1 = d2.createElement("div");
 >htmlDivElement2 : Symbol(htmlDivElement2, Decl(overloadingOnConstants1.ts, 23, 3))
 >Derived1 : Symbol(Derived1, Decl(overloadingOnConstants1.ts, 0, 24))
 >d2.createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
->d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 3))
+>d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 11))
 >createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
 
 var htmlSpanElement2: Derived1 = d2.createElement("span");
 >htmlSpanElement2 : Symbol(htmlSpanElement2, Decl(overloadingOnConstants1.ts, 24, 3))
 >Derived1 : Symbol(Derived1, Decl(overloadingOnConstants1.ts, 0, 24))
 >d2.createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
->d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 3))
+>d2 : Symbol(d2, Decl(overloadingOnConstants1.ts, 12, 11))
 >createElement : Symbol(Document2.createElement, Decl(overloadingOnConstants1.ts, 5, 21), Decl(overloadingOnConstants1.ts, 6, 47), Decl(overloadingOnConstants1.ts, 7, 44), Decl(overloadingOnConstants1.ts, 8, 45))
 
diff --git a/tests/baselines/reference/overloadingOnConstants1.types b/tests/baselines/reference/overloadingOnConstants1.types
index d5eaa38fcc370..e5cee4e6f4a36 100644
--- a/tests/baselines/reference/overloadingOnConstants1.types
+++ b/tests/baselines/reference/overloadingOnConstants1.types
@@ -57,7 +57,7 @@ interface Document2 {
 >        : ^^^^^^
 }
 
-var d2: Document2;
+declare var d2: Document2;
 >d2 : Document2
 >   : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
index 9a005634ba887..78b4b47928065 100644
--- a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
+++ b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
@@ -38,9 +38,11 @@ overloadresolutionWithConstraintCheckingDeferred.ts(18,27): error TS2769: No ove
         Property 'q' is missing in type 'B' but required in type 'D'.
 overloadresolutionWithConstraintCheckingDeferred.ts(19,14): error TS2344: Type 'D' does not satisfy the constraint 'A'.
   Property 'x' is missing in type 'D' but required in type 'A'.
+overloadresolutionWithConstraintCheckingDeferred.ts(19,32): error TS2345: Argument of type 'D' is not assignable to parameter of type 'A'.
+  Property 'x' is missing in type 'D' but required in type 'A'.
 
 
-==== overloadresolutionWithConstraintCheckingDeferred.ts (6 errors) ====
+==== overloadresolutionWithConstraintCheckingDeferred.ts (7 errors) ====
     interface A { x }
     interface B { x; y }
     interface C { z }
@@ -112,10 +114,14 @@ overloadresolutionWithConstraintCheckingDeferred.ts(19,14): error TS2344: Type '
 !!! error TS2769:         Property 'q' is missing in type 'B' but required in type 'D'.
 !!! related TS2728 overloadresolutionWithConstraintCheckingDeferred.ts:4:15: 'q' is declared here.
 !!! related TS2728 overloadresolutionWithConstraintCheckingDeferred.ts:4:15: 'q' is declared here.
-        var y: G<typeof x>; // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
+        var y: G<typeof x> = new G(x); // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
                  ~~~~~~~~
 !!! error TS2344: Type 'D' does not satisfy the constraint 'A'.
 !!! error TS2344:   Property 'x' is missing in type 'D' but required in type 'A'.
+!!! related TS2728 overloadresolutionWithConstraintCheckingDeferred.ts:1:15: 'x' is declared here.
+                                   ~
+!!! error TS2345: Argument of type 'D' is not assignable to parameter of type 'A'.
+!!! error TS2345:   Property 'x' is missing in type 'D' but required in type 'A'.
 !!! related TS2728 overloadresolutionWithConstraintCheckingDeferred.ts:1:15: 'x' is declared here.
         return y;
     });
diff --git a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js
index e9e605652262b..7e87d422609ab 100644
--- a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js
+++ b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js
@@ -19,7 +19,7 @@ var result: number = foo(x => new G(x)); // x has type D, new G(x) fails, so fir
 var result2: number = foo(x => new G<typeof x>(x)); // x has type D, new G(x) fails, so first overload is picked.
 
 var result3: string = foo(x => { // x has type D
-    var y: G<typeof x>; // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
+    var y: G<typeof x> = new G(x); // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
     return y;
 });
 
@@ -33,6 +33,6 @@ var G = /** @class */ (function () {
 var result = foo(function (x) { return new G(x); }); // x has type D, new G(x) fails, so first overload is picked.
 var result2 = foo(function (x) { return new G(x); }); // x has type D, new G(x) fails, so first overload is picked.
 var result3 = foo(function (x) {
-    var y; // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
+    var y = new G(x); // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
     return y;
 });
diff --git a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.symbols b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.symbols
index a306f97f43d5f..c06f37a086801 100644
--- a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.symbols
+++ b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.symbols
@@ -66,9 +66,11 @@ var result3: string = foo(x => { // x has type D
 >foo : Symbol(foo, Decl(overloadresolutionWithConstraintCheckingDeferred.ts, 7, 1), Decl(overloadresolutionWithConstraintCheckingDeferred.ts, 9, 52), Decl(overloadresolutionWithConstraintCheckingDeferred.ts, 10, 49))
 >x : Symbol(x, Decl(overloadresolutionWithConstraintCheckingDeferred.ts, 17, 26))
 
-    var y: G<typeof x>; // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
+    var y: G<typeof x> = new G(x); // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
 >y : Symbol(y, Decl(overloadresolutionWithConstraintCheckingDeferred.ts, 18, 7))
 >G : Symbol(G, Decl(overloadresolutionWithConstraintCheckingDeferred.ts, 3, 17))
+>x : Symbol(x, Decl(overloadresolutionWithConstraintCheckingDeferred.ts, 17, 26))
+>G : Symbol(G, Decl(overloadresolutionWithConstraintCheckingDeferred.ts, 3, 17))
 >x : Symbol(x, Decl(overloadresolutionWithConstraintCheckingDeferred.ts, 17, 26))
 
     return y;
diff --git a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.types b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.types
index 335f52b8f58e4..60825160c51b0 100644
--- a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.types
+++ b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.types
@@ -93,19 +93,25 @@ var result2: number = foo(x => new G<typeof x>(x)); // x has type D, new G(x) fa
 var result3: string = foo(x => { // x has type D
 >result3 : string
 >        : ^^^^^^
->foo(x => { // x has type D    var y: G<typeof x>; // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error    return y;}) : never
->                                                                                                                                                                : ^^^^^
+>foo(x => { // x has type D    var y: G<typeof x> = new G(x); // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error    return y;}) : never
+>                                                                                                                                                                           : ^^^^^
 >foo : { (arg: (x: D) => number): string; (arg: (x: C) => any): string; (arg: (x: B) => any): number; }
 >    : ^^^   ^^                ^^^      ^^^   ^^             ^^^      ^^^   ^^             ^^^      ^^^
->x => { // x has type D    var y: G<typeof x>; // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error    return y;} : (x: D) => G<D>
->                                                                                                                                                           : ^ ^^^^^^^^^^^^
+>x => { // x has type D    var y: G<typeof x> = new G(x); // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error    return y;} : (x: D) => G<D>
+>                                                                                                                                                                      : ^ ^^^^^^^^^^^^
 >x : D
 >  : ^
 
-    var y: G<typeof x>; // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
+    var y: G<typeof x> = new G(x); // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
 >y : G<D>
 >  : ^^^^
 >x : D
+>  : ^
+>new G(x) : G<A>
+>         : ^^^^
+>G : typeof G
+>  : ^^^^^^^^
+>x : D
 >  : ^
 
     return y;
diff --git a/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt b/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
index 2cbb7768d07e8..b722283a0a880 100644
--- a/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
+++ b/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
@@ -13,7 +13,7 @@ overloadsWithProvisionalErrors.ts(8,17): error TS2304: Cannot find name 'blah'.
 
 
 ==== overloadsWithProvisionalErrors.ts (4 errors) ====
-    var func: {
+    declare var func: {
         (s: string): number;
         (lambda: (s: string) => { a: number; b: number }): string;
     };
diff --git a/tests/baselines/reference/overloadsWithProvisionalErrors.js b/tests/baselines/reference/overloadsWithProvisionalErrors.js
index fc10e75b3bae5..0b7cbd109b015 100644
--- a/tests/baselines/reference/overloadsWithProvisionalErrors.js
+++ b/tests/baselines/reference/overloadsWithProvisionalErrors.js
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/overloadsWithProvisionalErrors.ts] ////
 
 //// [overloadsWithProvisionalErrors.ts]
-var func: {
+declare var func: {
     (s: string): number;
     (lambda: (s: string) => { a: number; b: number }): string;
 };
@@ -11,7 +11,6 @@ func(s => ({ a: blah, b: 3 })); // Only error inside the function, but not outsi
 func(s => ({ a: blah })); // Two errors here, one for blah not being defined, and one for the overload since it would not be applicable anyway
 
 //// [overloadsWithProvisionalErrors.js]
-var func;
 func(function (s) { return ({}); }); // Error for no applicable overload (object type is missing a and b)
 func(function (s) { return ({ a: blah, b: 3 }); }); // Only error inside the function, but not outside (since it would be applicable if not for the provisional error)
 func(function (s) { return ({ a: blah }); }); // Two errors here, one for blah not being defined, and one for the overload since it would not be applicable anyway
diff --git a/tests/baselines/reference/overloadsWithProvisionalErrors.symbols b/tests/baselines/reference/overloadsWithProvisionalErrors.symbols
index f5597565a57b4..32a6652964e02 100644
--- a/tests/baselines/reference/overloadsWithProvisionalErrors.symbols
+++ b/tests/baselines/reference/overloadsWithProvisionalErrors.symbols
@@ -1,8 +1,8 @@
 //// [tests/cases/compiler/overloadsWithProvisionalErrors.ts] ////
 
 === overloadsWithProvisionalErrors.ts ===
-var func: {
->func : Symbol(func, Decl(overloadsWithProvisionalErrors.ts, 0, 3))
+declare var func: {
+>func : Symbol(func, Decl(overloadsWithProvisionalErrors.ts, 0, 11))
 
     (s: string): number;
 >s : Symbol(s, Decl(overloadsWithProvisionalErrors.ts, 1, 5))
@@ -16,17 +16,17 @@ var func: {
 };
 
 func(s => ({})); // Error for no applicable overload (object type is missing a and b)
->func : Symbol(func, Decl(overloadsWithProvisionalErrors.ts, 0, 3))
+>func : Symbol(func, Decl(overloadsWithProvisionalErrors.ts, 0, 11))
 >s : Symbol(s, Decl(overloadsWithProvisionalErrors.ts, 5, 5))
 
 func(s => ({ a: blah, b: 3 })); // Only error inside the function, but not outside (since it would be applicable if not for the provisional error)
->func : Symbol(func, Decl(overloadsWithProvisionalErrors.ts, 0, 3))
+>func : Symbol(func, Decl(overloadsWithProvisionalErrors.ts, 0, 11))
 >s : Symbol(s, Decl(overloadsWithProvisionalErrors.ts, 6, 5))
 >a : Symbol(a, Decl(overloadsWithProvisionalErrors.ts, 6, 12))
 >b : Symbol(b, Decl(overloadsWithProvisionalErrors.ts, 6, 21))
 
 func(s => ({ a: blah })); // Two errors here, one for blah not being defined, and one for the overload since it would not be applicable anyway
->func : Symbol(func, Decl(overloadsWithProvisionalErrors.ts, 0, 3))
+>func : Symbol(func, Decl(overloadsWithProvisionalErrors.ts, 0, 11))
 >s : Symbol(s, Decl(overloadsWithProvisionalErrors.ts, 7, 5))
 >a : Symbol(a, Decl(overloadsWithProvisionalErrors.ts, 7, 12))
 
diff --git a/tests/baselines/reference/overloadsWithProvisionalErrors.types b/tests/baselines/reference/overloadsWithProvisionalErrors.types
index 669e5c332e166..cc2c261119f55 100644
--- a/tests/baselines/reference/overloadsWithProvisionalErrors.types
+++ b/tests/baselines/reference/overloadsWithProvisionalErrors.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/overloadsWithProvisionalErrors.ts] ////
 
 === overloadsWithProvisionalErrors.ts ===
-var func: {
+declare var func: {
 >func : { (s: string): number; (lambda: (s: string) => { a: number; b: number; }): string; }
 >     : ^^^ ^^      ^^^      ^^^      ^^                                        ^^^      ^^^
 
diff --git a/tests/baselines/reference/parserAstSpans1.errors.txt b/tests/baselines/reference/parserAstSpans1.errors.txt
index 657aaca97162b..ec2867097cd58 100644
--- a/tests/baselines/reference/parserAstSpans1.errors.txt
+++ b/tests/baselines/reference/parserAstSpans1.errors.txt
@@ -22,28 +22,28 @@ parserAstSpans1.ts(217,24): error TS2340: Only public and protected methods of t
         nc_l1: () => void;
     }
     class c1 implements i1 {
-        public i1_p1: number;
+        public i1_p1!: number;
         public i1_f1() {
         }
-        public i1_l1: () => void;
-        public i1_nc_p1: number;
+        public i1_l1!: () => void;
+        public i1_nc_p1!: number;
         public i1_nc_f1() {
         }
-        public i1_nc_l1: () => void;
+        public i1_nc_l1!: () => void;
         /** c1_p1*/
-        public p1: number;
+        public p1!: number;
         /** c1_f1*/
         public f1() {
         }
         /** c1_l1*/
-        public l1: () => void;
+        public l1!: () => void;
         /** c1_nc_p1*/
-        public nc_p1: number;
+        public nc_p1!: number;
         /** c1_nc_f1*/
         public nc_f1() {
         }
         /** c1_nc_l1*/
-        public nc_l1: () => void;
+        public nc_l1!: () => void;
     }
     var i1_i: i1;
     i1_i.i1_f1();
@@ -84,14 +84,14 @@ parserAstSpans1.ts(217,24): error TS2340: Only public and protected methods of t
         public get c2_prop() {
             return 10;
         }
-        public c2_nc_p1: number;
+        public c2_nc_p1!: number;
         public c2_nc_f1() {
         }
         public get c2_nc_prop() {
             return 10;
         }
         /** c2 p1*/
-        public p1: number;
+        public p1!: number;
         /** c2 f1*/
         public f1() {
         }
@@ -99,7 +99,7 @@ parserAstSpans1.ts(217,24): error TS2340: Only public and protected methods of t
         public get prop() {
             return 10;
         }
-        public nc_p1: number;
+        public nc_p1!: number;
         public nc_f1() {
         }
         public get nc_prop() {
@@ -118,7 +118,7 @@ parserAstSpans1.ts(217,24): error TS2340: Only public and protected methods of t
 !!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
         }
         /** c3 p1*/
-        public p1: number;
+        public p1!: number;
         /** c3 f1*/
         public f1() {
         }
@@ -126,7 +126,7 @@ parserAstSpans1.ts(217,24): error TS2340: Only public and protected methods of t
         public get prop() {
             return 10;
         }
-        public nc_p1: number;
+        public nc_p1!: number;
         public nc_f1() {
         }
         public get nc_prop() {
@@ -215,10 +215,10 @@ parserAstSpans1.ts(217,24): error TS2340: Only public and protected methods of t
     
     /**c5 class*/
     class c5 {
-        public b: number;
+        public b!: number;
     }
     class c6 extends c5 {
-        public d;
+        public d!: any;
         constructor() {
             super();
             this.d = super.b;
diff --git a/tests/baselines/reference/parserAstSpans1.js b/tests/baselines/reference/parserAstSpans1.js
index 9d6bbdf7e4ee0..e13e7057ebfd0 100644
--- a/tests/baselines/reference/parserAstSpans1.js
+++ b/tests/baselines/reference/parserAstSpans1.js
@@ -20,28 +20,28 @@ interface i1 {
     nc_l1: () => void;
 }
 class c1 implements i1 {
-    public i1_p1: number;
+    public i1_p1!: number;
     public i1_f1() {
     }
-    public i1_l1: () => void;
-    public i1_nc_p1: number;
+    public i1_l1!: () => void;
+    public i1_nc_p1!: number;
     public i1_nc_f1() {
     }
-    public i1_nc_l1: () => void;
+    public i1_nc_l1!: () => void;
     /** c1_p1*/
-    public p1: number;
+    public p1!: number;
     /** c1_f1*/
     public f1() {
     }
     /** c1_l1*/
-    public l1: () => void;
+    public l1!: () => void;
     /** c1_nc_p1*/
-    public nc_p1: number;
+    public nc_p1!: number;
     /** c1_nc_f1*/
     public nc_f1() {
     }
     /** c1_nc_l1*/
-    public nc_l1: () => void;
+    public nc_l1!: () => void;
 }
 var i1_i: i1;
 i1_i.i1_f1();
@@ -82,14 +82,14 @@ class c2 {
     public get c2_prop() {
         return 10;
     }
-    public c2_nc_p1: number;
+    public c2_nc_p1!: number;
     public c2_nc_f1() {
     }
     public get c2_nc_prop() {
         return 10;
     }
     /** c2 p1*/
-    public p1: number;
+    public p1!: number;
     /** c2 f1*/
     public f1() {
     }
@@ -97,7 +97,7 @@ class c2 {
     public get prop() {
         return 10;
     }
-    public nc_p1: number;
+    public nc_p1!: number;
     public nc_f1() {
     }
     public get nc_prop() {
@@ -114,7 +114,7 @@ class c3 extends c2 {
         this.p1 = super.c2_p1;
     }
     /** c3 p1*/
-    public p1: number;
+    public p1!: number;
     /** c3 f1*/
     public f1() {
     }
@@ -122,7 +122,7 @@ class c3 extends c2 {
     public get prop() {
         return 10;
     }
-    public nc_p1: number;
+    public nc_p1!: number;
     public nc_f1() {
     }
     public get nc_prop() {
@@ -211,10 +211,10 @@ i2_i.nc_l1();
 
 /**c5 class*/
 class c5 {
-    public b: number;
+    public b!: number;
 }
 class c6 extends c5 {
-    public d;
+    public d!: any;
     constructor() {
         super();
         this.d = super.b;
diff --git a/tests/baselines/reference/parserAstSpans1.symbols b/tests/baselines/reference/parserAstSpans1.symbols
index 2779f141730fb..eaab00f94f30d 100644
--- a/tests/baselines/reference/parserAstSpans1.symbols
+++ b/tests/baselines/reference/parserAstSpans1.symbols
@@ -48,46 +48,46 @@ class c1 implements i1 {
 >c1 : Symbol(c1, Decl(parserAstSpans1.ts, 17, 1))
 >i1 : Symbol(i1, Decl(parserAstSpans1.ts, 0, 0))
 
-    public i1_p1: number;
+    public i1_p1!: number;
 >i1_p1 : Symbol(c1.i1_p1, Decl(parserAstSpans1.ts, 18, 24))
 
     public i1_f1() {
->i1_f1 : Symbol(c1.i1_f1, Decl(parserAstSpans1.ts, 19, 25))
+>i1_f1 : Symbol(c1.i1_f1, Decl(parserAstSpans1.ts, 19, 26))
     }
-    public i1_l1: () => void;
+    public i1_l1!: () => void;
 >i1_l1 : Symbol(c1.i1_l1, Decl(parserAstSpans1.ts, 21, 5))
 
-    public i1_nc_p1: number;
->i1_nc_p1 : Symbol(c1.i1_nc_p1, Decl(parserAstSpans1.ts, 22, 29))
+    public i1_nc_p1!: number;
+>i1_nc_p1 : Symbol(c1.i1_nc_p1, Decl(parserAstSpans1.ts, 22, 30))
 
     public i1_nc_f1() {
->i1_nc_f1 : Symbol(c1.i1_nc_f1, Decl(parserAstSpans1.ts, 23, 28))
+>i1_nc_f1 : Symbol(c1.i1_nc_f1, Decl(parserAstSpans1.ts, 23, 29))
     }
-    public i1_nc_l1: () => void;
+    public i1_nc_l1!: () => void;
 >i1_nc_l1 : Symbol(c1.i1_nc_l1, Decl(parserAstSpans1.ts, 25, 5))
 
     /** c1_p1*/
-    public p1: number;
->p1 : Symbol(c1.p1, Decl(parserAstSpans1.ts, 26, 32))
+    public p1!: number;
+>p1 : Symbol(c1.p1, Decl(parserAstSpans1.ts, 26, 33))
 
     /** c1_f1*/
     public f1() {
->f1 : Symbol(c1.f1, Decl(parserAstSpans1.ts, 28, 22))
+>f1 : Symbol(c1.f1, Decl(parserAstSpans1.ts, 28, 23))
     }
     /** c1_l1*/
-    public l1: () => void;
+    public l1!: () => void;
 >l1 : Symbol(c1.l1, Decl(parserAstSpans1.ts, 31, 5))
 
     /** c1_nc_p1*/
-    public nc_p1: number;
->nc_p1 : Symbol(c1.nc_p1, Decl(parserAstSpans1.ts, 33, 26))
+    public nc_p1!: number;
+>nc_p1 : Symbol(c1.nc_p1, Decl(parserAstSpans1.ts, 33, 27))
 
     /** c1_nc_f1*/
     public nc_f1() {
->nc_f1 : Symbol(c1.nc_f1, Decl(parserAstSpans1.ts, 35, 25))
+>nc_f1 : Symbol(c1.nc_f1, Decl(parserAstSpans1.ts, 35, 26))
     }
     /** c1_nc_l1*/
-    public nc_l1: () => void;
+    public nc_l1!: () => void;
 >nc_l1 : Symbol(c1.nc_l1, Decl(parserAstSpans1.ts, 38, 5))
 }
 var i1_i: i1;
@@ -139,24 +139,24 @@ var c1_i = new c1();
 >c1 : Symbol(c1, Decl(parserAstSpans1.ts, 17, 1))
 
 c1_i.i1_f1();
->c1_i.i1_f1 : Symbol(c1.i1_f1, Decl(parserAstSpans1.ts, 19, 25))
+>c1_i.i1_f1 : Symbol(c1.i1_f1, Decl(parserAstSpans1.ts, 19, 26))
 >c1_i : Symbol(c1_i, Decl(parserAstSpans1.ts, 51, 3))
->i1_f1 : Symbol(c1.i1_f1, Decl(parserAstSpans1.ts, 19, 25))
+>i1_f1 : Symbol(c1.i1_f1, Decl(parserAstSpans1.ts, 19, 26))
 
 c1_i.i1_nc_f1();
->c1_i.i1_nc_f1 : Symbol(c1.i1_nc_f1, Decl(parserAstSpans1.ts, 23, 28))
+>c1_i.i1_nc_f1 : Symbol(c1.i1_nc_f1, Decl(parserAstSpans1.ts, 23, 29))
 >c1_i : Symbol(c1_i, Decl(parserAstSpans1.ts, 51, 3))
->i1_nc_f1 : Symbol(c1.i1_nc_f1, Decl(parserAstSpans1.ts, 23, 28))
+>i1_nc_f1 : Symbol(c1.i1_nc_f1, Decl(parserAstSpans1.ts, 23, 29))
 
 c1_i.f1();
->c1_i.f1 : Symbol(c1.f1, Decl(parserAstSpans1.ts, 28, 22))
+>c1_i.f1 : Symbol(c1.f1, Decl(parserAstSpans1.ts, 28, 23))
 >c1_i : Symbol(c1_i, Decl(parserAstSpans1.ts, 51, 3))
->f1 : Symbol(c1.f1, Decl(parserAstSpans1.ts, 28, 22))
+>f1 : Symbol(c1.f1, Decl(parserAstSpans1.ts, 28, 23))
 
 c1_i.nc_f1();
->c1_i.nc_f1 : Symbol(c1.nc_f1, Decl(parserAstSpans1.ts, 35, 25))
+>c1_i.nc_f1 : Symbol(c1.nc_f1, Decl(parserAstSpans1.ts, 35, 26))
 >c1_i : Symbol(c1_i, Decl(parserAstSpans1.ts, 51, 3))
->nc_f1 : Symbol(c1.nc_f1, Decl(parserAstSpans1.ts, 35, 25))
+>nc_f1 : Symbol(c1.nc_f1, Decl(parserAstSpans1.ts, 35, 26))
 
 c1_i.i1_l1();
 >c1_i.i1_l1 : Symbol(c1.i1_l1, Decl(parserAstSpans1.ts, 21, 5))
@@ -240,11 +240,11 @@ class c2 {
 
         return 10;
     }
-    public c2_nc_p1: number;
+    public c2_nc_p1!: number;
 >c2_nc_p1 : Symbol(c2.c2_nc_p1, Decl(parserAstSpans1.ts, 80, 5))
 
     public c2_nc_f1() {
->c2_nc_f1 : Symbol(c2.c2_nc_f1, Decl(parserAstSpans1.ts, 81, 28))
+>c2_nc_f1 : Symbol(c2.c2_nc_f1, Decl(parserAstSpans1.ts, 81, 29))
     }
     public get c2_nc_prop() {
 >c2_nc_prop : Symbol(c2.c2_nc_prop, Decl(parserAstSpans1.ts, 83, 5))
@@ -252,12 +252,12 @@ class c2 {
         return 10;
     }
     /** c2 p1*/
-    public p1: number;
+    public p1!: number;
 >p1 : Symbol(c2.p1, Decl(parserAstSpans1.ts, 86, 5))
 
     /** c2 f1*/
     public f1() {
->f1 : Symbol(c2.f1, Decl(parserAstSpans1.ts, 88, 22))
+>f1 : Symbol(c2.f1, Decl(parserAstSpans1.ts, 88, 23))
     }
     /** c2 prop*/
     public get prop() {
@@ -265,11 +265,11 @@ class c2 {
 
         return 10;
     }
-    public nc_p1: number;
+    public nc_p1!: number;
 >nc_p1 : Symbol(c2.nc_p1, Decl(parserAstSpans1.ts, 95, 5))
 
     public nc_f1() {
->nc_f1 : Symbol(c2.nc_f1, Decl(parserAstSpans1.ts, 96, 25))
+>nc_f1 : Symbol(c2.nc_f1, Decl(parserAstSpans1.ts, 96, 26))
     }
     public get nc_prop() {
 >nc_prop : Symbol(c2.nc_prop, Decl(parserAstSpans1.ts, 98, 5))
@@ -304,12 +304,12 @@ class c3 extends c2 {
 >c2_p1 : Symbol(c2.c2_p1, Decl(parserAstSpans1.ts, 71, 10))
     }
     /** c3 p1*/
-    public p1: number;
+    public p1!: number;
 >p1 : Symbol(c3.p1, Decl(parserAstSpans1.ts, 111, 5))
 
     /** c3 f1*/
     public f1() {
->f1 : Symbol(c3.f1, Decl(parserAstSpans1.ts, 113, 22))
+>f1 : Symbol(c3.f1, Decl(parserAstSpans1.ts, 113, 23))
     }
     /** c3 prop*/
     public get prop() {
@@ -317,11 +317,11 @@ class c3 extends c2 {
 
         return 10;
     }
-    public nc_p1: number;
+    public nc_p1!: number;
 >nc_p1 : Symbol(c3.nc_p1, Decl(parserAstSpans1.ts, 120, 5))
 
     public nc_f1() {
->nc_f1 : Symbol(c3.nc_f1, Decl(parserAstSpans1.ts, 121, 25))
+>nc_f1 : Symbol(c3.nc_f1, Decl(parserAstSpans1.ts, 121, 26))
     }
     public get nc_prop() {
 >nc_prop : Symbol(c3.nc_prop, Decl(parserAstSpans1.ts, 123, 5))
@@ -343,19 +343,19 @@ c2_i.c2_f1();
 >c2_f1 : Symbol(c2.c2_f1, Decl(parserAstSpans1.ts, 73, 25))
 
 c2_i.c2_nc_f1();
->c2_i.c2_nc_f1 : Symbol(c2.c2_nc_f1, Decl(parserAstSpans1.ts, 81, 28))
+>c2_i.c2_nc_f1 : Symbol(c2.c2_nc_f1, Decl(parserAstSpans1.ts, 81, 29))
 >c2_i : Symbol(c2_i, Decl(parserAstSpans1.ts, 128, 3))
->c2_nc_f1 : Symbol(c2.c2_nc_f1, Decl(parserAstSpans1.ts, 81, 28))
+>c2_nc_f1 : Symbol(c2.c2_nc_f1, Decl(parserAstSpans1.ts, 81, 29))
 
 c2_i.f1();
->c2_i.f1 : Symbol(c2.f1, Decl(parserAstSpans1.ts, 88, 22))
+>c2_i.f1 : Symbol(c2.f1, Decl(parserAstSpans1.ts, 88, 23))
 >c2_i : Symbol(c2_i, Decl(parserAstSpans1.ts, 128, 3))
->f1 : Symbol(c2.f1, Decl(parserAstSpans1.ts, 88, 22))
+>f1 : Symbol(c2.f1, Decl(parserAstSpans1.ts, 88, 23))
 
 c2_i.nc_f1();
->c2_i.nc_f1 : Symbol(c2.nc_f1, Decl(parserAstSpans1.ts, 96, 25))
+>c2_i.nc_f1 : Symbol(c2.nc_f1, Decl(parserAstSpans1.ts, 96, 26))
 >c2_i : Symbol(c2_i, Decl(parserAstSpans1.ts, 128, 3))
->nc_f1 : Symbol(c2.nc_f1, Decl(parserAstSpans1.ts, 96, 25))
+>nc_f1 : Symbol(c2.nc_f1, Decl(parserAstSpans1.ts, 96, 26))
 
 c3_i.c2_f1();
 >c3_i.c2_f1 : Symbol(c2.c2_f1, Decl(parserAstSpans1.ts, 73, 25))
@@ -363,19 +363,19 @@ c3_i.c2_f1();
 >c2_f1 : Symbol(c2.c2_f1, Decl(parserAstSpans1.ts, 73, 25))
 
 c3_i.c2_nc_f1();
->c3_i.c2_nc_f1 : Symbol(c2.c2_nc_f1, Decl(parserAstSpans1.ts, 81, 28))
+>c3_i.c2_nc_f1 : Symbol(c2.c2_nc_f1, Decl(parserAstSpans1.ts, 81, 29))
 >c3_i : Symbol(c3_i, Decl(parserAstSpans1.ts, 129, 3))
->c2_nc_f1 : Symbol(c2.c2_nc_f1, Decl(parserAstSpans1.ts, 81, 28))
+>c2_nc_f1 : Symbol(c2.c2_nc_f1, Decl(parserAstSpans1.ts, 81, 29))
 
 c3_i.f1();
->c3_i.f1 : Symbol(c3.f1, Decl(parserAstSpans1.ts, 113, 22))
+>c3_i.f1 : Symbol(c3.f1, Decl(parserAstSpans1.ts, 113, 23))
 >c3_i : Symbol(c3_i, Decl(parserAstSpans1.ts, 129, 3))
->f1 : Symbol(c3.f1, Decl(parserAstSpans1.ts, 113, 22))
+>f1 : Symbol(c3.f1, Decl(parserAstSpans1.ts, 113, 23))
 
 c3_i.nc_f1();
->c3_i.nc_f1 : Symbol(c3.nc_f1, Decl(parserAstSpans1.ts, 121, 25))
+>c3_i.nc_f1 : Symbol(c3.nc_f1, Decl(parserAstSpans1.ts, 121, 26))
 >c3_i : Symbol(c3_i, Decl(parserAstSpans1.ts, 129, 3))
->nc_f1 : Symbol(c3.nc_f1, Decl(parserAstSpans1.ts, 121, 25))
+>nc_f1 : Symbol(c3.nc_f1, Decl(parserAstSpans1.ts, 121, 26))
 
 // assign
 c2_i = c3_i;
@@ -388,19 +388,19 @@ c2_i.c2_f1();
 >c2_f1 : Symbol(c2.c2_f1, Decl(parserAstSpans1.ts, 73, 25))
 
 c2_i.c2_nc_f1();
->c2_i.c2_nc_f1 : Symbol(c2.c2_nc_f1, Decl(parserAstSpans1.ts, 81, 28))
+>c2_i.c2_nc_f1 : Symbol(c2.c2_nc_f1, Decl(parserAstSpans1.ts, 81, 29))
 >c2_i : Symbol(c2_i, Decl(parserAstSpans1.ts, 128, 3))
->c2_nc_f1 : Symbol(c2.c2_nc_f1, Decl(parserAstSpans1.ts, 81, 28))
+>c2_nc_f1 : Symbol(c2.c2_nc_f1, Decl(parserAstSpans1.ts, 81, 29))
 
 c2_i.f1();
->c2_i.f1 : Symbol(c2.f1, Decl(parserAstSpans1.ts, 88, 22))
+>c2_i.f1 : Symbol(c2.f1, Decl(parserAstSpans1.ts, 88, 23))
 >c2_i : Symbol(c2_i, Decl(parserAstSpans1.ts, 128, 3))
->f1 : Symbol(c2.f1, Decl(parserAstSpans1.ts, 88, 22))
+>f1 : Symbol(c2.f1, Decl(parserAstSpans1.ts, 88, 23))
 
 c2_i.nc_f1();
->c2_i.nc_f1 : Symbol(c2.nc_f1, Decl(parserAstSpans1.ts, 96, 25))
+>c2_i.nc_f1 : Symbol(c2.nc_f1, Decl(parserAstSpans1.ts, 96, 26))
 >c2_i : Symbol(c2_i, Decl(parserAstSpans1.ts, 128, 3))
->nc_f1 : Symbol(c2.nc_f1, Decl(parserAstSpans1.ts, 96, 25))
+>nc_f1 : Symbol(c2.nc_f1, Decl(parserAstSpans1.ts, 96, 26))
 
 class c4 extends c2 {
 >c4 : Symbol(c4, Decl(parserAstSpans1.ts, 143, 13))
@@ -617,14 +617,14 @@ i2_i.nc_l1();
 class c5 {
 >c5 : Symbol(c5, Decl(parserAstSpans1.ts, 206, 13))
 
-    public b: number;
+    public b!: number;
 >b : Symbol(c5.b, Decl(parserAstSpans1.ts, 209, 10))
 }
 class c6 extends c5 {
 >c6 : Symbol(c6, Decl(parserAstSpans1.ts, 211, 1))
 >c5 : Symbol(c5, Decl(parserAstSpans1.ts, 206, 13))
 
-    public d;
+    public d!: any;
 >d : Symbol(c6.d, Decl(parserAstSpans1.ts, 212, 21))
 
     constructor() {
diff --git a/tests/baselines/reference/parserAstSpans1.types b/tests/baselines/reference/parserAstSpans1.types
index 7c4d7ca4540c0..98f77e579e631 100644
--- a/tests/baselines/reference/parserAstSpans1.types
+++ b/tests/baselines/reference/parserAstSpans1.types
@@ -58,7 +58,7 @@ class c1 implements i1 {
 >c1 : c1
 >   : ^^
 
-    public i1_p1: number;
+    public i1_p1!: number;
 >i1_p1 : number
 >      : ^^^^^^
 
@@ -66,11 +66,11 @@ class c1 implements i1 {
 >i1_f1 : () => void
 >      : ^^^^^^^^^^
     }
-    public i1_l1: () => void;
+    public i1_l1!: () => void;
 >i1_l1 : () => void
 >      : ^^^^^^    
 
-    public i1_nc_p1: number;
+    public i1_nc_p1!: number;
 >i1_nc_p1 : number
 >         : ^^^^^^
 
@@ -78,12 +78,12 @@ class c1 implements i1 {
 >i1_nc_f1 : () => void
 >         : ^^^^^^^^^^
     }
-    public i1_nc_l1: () => void;
+    public i1_nc_l1!: () => void;
 >i1_nc_l1 : () => void
 >         : ^^^^^^    
 
     /** c1_p1*/
-    public p1: number;
+    public p1!: number;
 >p1 : number
 >   : ^^^^^^
 
@@ -93,12 +93,12 @@ class c1 implements i1 {
 >   : ^^^^^^^^^^
     }
     /** c1_l1*/
-    public l1: () => void;
+    public l1!: () => void;
 >l1 : () => void
 >   : ^^^^^^    
 
     /** c1_nc_p1*/
-    public nc_p1: number;
+    public nc_p1!: number;
 >nc_p1 : number
 >      : ^^^^^^
 
@@ -108,7 +108,7 @@ class c1 implements i1 {
 >      : ^^^^^^^^^^
     }
     /** c1_nc_l1*/
-    public nc_l1: () => void;
+    public nc_l1!: () => void;
 >nc_l1 : () => void
 >      : ^^^^^^    
 }
@@ -396,7 +396,7 @@ class c2 {
 >10 : 10
 >   : ^^
     }
-    public c2_nc_p1: number;
+    public c2_nc_p1!: number;
 >c2_nc_p1 : number
 >         : ^^^^^^
 
@@ -413,7 +413,7 @@ class c2 {
 >   : ^^
     }
     /** c2 p1*/
-    public p1: number;
+    public p1!: number;
 >p1 : number
 >   : ^^^^^^
 
@@ -431,7 +431,7 @@ class c2 {
 >10 : 10
 >   : ^^
     }
-    public nc_p1: number;
+    public nc_p1!: number;
 >nc_p1 : number
 >      : ^^^^^^
 
@@ -497,7 +497,7 @@ class c3 extends c2 {
 >      : ^^^^^^
     }
     /** c3 p1*/
-    public p1: number;
+    public p1!: number;
 >p1 : number
 >   : ^^^^^^
 
@@ -515,7 +515,7 @@ class c3 extends c2 {
 >10 : 10
 >   : ^^
     }
-    public nc_p1: number;
+    public nc_p1!: number;
 >nc_p1 : number
 >      : ^^^^^^
 
@@ -1040,7 +1040,7 @@ class c5 {
 >c5 : c5
 >   : ^^
 
-    public b: number;
+    public b!: number;
 >b : number
 >  : ^^^^^^
 }
@@ -1050,7 +1050,7 @@ class c6 extends c5 {
 >c5 : c5
 >   : ^^
 
-    public d;
+    public d!: any;
 >d : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/parserAutomaticSemicolonInsertion1.errors.txt b/tests/baselines/reference/parserAutomaticSemicolonInsertion1.errors.txt
index d8859a024cb5c..6632f84fb8d79 100644
--- a/tests/baselines/reference/parserAutomaticSemicolonInsertion1.errors.txt
+++ b/tests/baselines/reference/parserAutomaticSemicolonInsertion1.errors.txt
@@ -11,7 +11,7 @@ parserAutomaticSemicolonInsertion1.ts(14,1): error TS2322: Type 'Object' is not
         (): void;
     }
      
-    var i: I;
+    declare var i: I;
     var o: Object;
     o = i;
     i = o;
@@ -20,7 +20,7 @@ parserAutomaticSemicolonInsertion1.ts(14,1): error TS2322: Type 'Object' is not
 !!! error TS2322:   The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
 !!! error TS2322:     Type 'Object' provides no match for the signature '(): void'.
      
-    var a: {
+    declare var a: {
         (): void
     }
     o = a;
diff --git a/tests/baselines/reference/parserAutomaticSemicolonInsertion1.js b/tests/baselines/reference/parserAutomaticSemicolonInsertion1.js
index edbeeb983a62a..4fb14b6ccf54f 100644
--- a/tests/baselines/reference/parserAutomaticSemicolonInsertion1.js
+++ b/tests/baselines/reference/parserAutomaticSemicolonInsertion1.js
@@ -5,12 +5,12 @@ interface I {
     (): void;
 }
  
-var i: I;
+declare var i: I;
 var o: Object;
 o = i;
 i = o;
  
-var a: {
+declare var a: {
     (): void
 }
 o = a;
@@ -18,10 +18,8 @@ a = o;
 
 
 //// [parserAutomaticSemicolonInsertion1.js]
-var i;
 var o;
 o = i;
 i = o;
-var a;
 o = a;
 a = o;
diff --git a/tests/baselines/reference/parserAutomaticSemicolonInsertion1.symbols b/tests/baselines/reference/parserAutomaticSemicolonInsertion1.symbols
index 0b7d10840329c..332e82dc8b65e 100644
--- a/tests/baselines/reference/parserAutomaticSemicolonInsertion1.symbols
+++ b/tests/baselines/reference/parserAutomaticSemicolonInsertion1.symbols
@@ -7,8 +7,8 @@ interface I {
     (): void;
 }
  
-var i: I;
->i : Symbol(i, Decl(parserAutomaticSemicolonInsertion1.ts, 4, 3))
+declare var i: I;
+>i : Symbol(i, Decl(parserAutomaticSemicolonInsertion1.ts, 4, 11))
 >I : Symbol(I, Decl(parserAutomaticSemicolonInsertion1.ts, 0, 0))
 
 var o: Object;
@@ -17,22 +17,22 @@ var o: Object;
 
 o = i;
 >o : Symbol(o, Decl(parserAutomaticSemicolonInsertion1.ts, 5, 3))
->i : Symbol(i, Decl(parserAutomaticSemicolonInsertion1.ts, 4, 3))
+>i : Symbol(i, Decl(parserAutomaticSemicolonInsertion1.ts, 4, 11))
 
 i = o;
->i : Symbol(i, Decl(parserAutomaticSemicolonInsertion1.ts, 4, 3))
+>i : Symbol(i, Decl(parserAutomaticSemicolonInsertion1.ts, 4, 11))
 >o : Symbol(o, Decl(parserAutomaticSemicolonInsertion1.ts, 5, 3))
  
-var a: {
->a : Symbol(a, Decl(parserAutomaticSemicolonInsertion1.ts, 9, 3))
+declare var a: {
+>a : Symbol(a, Decl(parserAutomaticSemicolonInsertion1.ts, 9, 11))
 
     (): void
 }
 o = a;
 >o : Symbol(o, Decl(parserAutomaticSemicolonInsertion1.ts, 5, 3))
->a : Symbol(a, Decl(parserAutomaticSemicolonInsertion1.ts, 9, 3))
+>a : Symbol(a, Decl(parserAutomaticSemicolonInsertion1.ts, 9, 11))
 
 a = o;
->a : Symbol(a, Decl(parserAutomaticSemicolonInsertion1.ts, 9, 3))
+>a : Symbol(a, Decl(parserAutomaticSemicolonInsertion1.ts, 9, 11))
 >o : Symbol(o, Decl(parserAutomaticSemicolonInsertion1.ts, 5, 3))
 
diff --git a/tests/baselines/reference/parserAutomaticSemicolonInsertion1.types b/tests/baselines/reference/parserAutomaticSemicolonInsertion1.types
index 1ad441045c569..92e05974e037e 100644
--- a/tests/baselines/reference/parserAutomaticSemicolonInsertion1.types
+++ b/tests/baselines/reference/parserAutomaticSemicolonInsertion1.types
@@ -5,7 +5,7 @@ interface I {
     (): void;
 }
  
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
@@ -29,7 +29,7 @@ i = o;
 >o : Object
 >  : ^^^^^^
  
-var a: {
+declare var a: {
 >a : () => void
 >  : ^^^^^^    
 
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt
index b1c065299a09f..f0d423f0440c3 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt
@@ -1,8 +1,14 @@
+error TS5055: Cannot write file '/bar.js' because it would overwrite input file.
 /root/tsconfig.json(3,9): error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
+/root/tsconfig.json(8,9): error TS5011: The common source directory of 'tsconfig.json' is '..'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+/root/a.ts(1,21): error TS6059: File '/foo.ts' is not under 'rootDir' '/root'. 'rootDir' is expected to contain all source files.
+/root/a.ts(2,21): error TS6059: File '/bar.js' is not under 'rootDir' '/root'. 'rootDir' is expected to contain all source files.
 
 
-==== /root/tsconfig.json (1 errors) ====
+!!! error TS5055: Cannot write file '/bar.js' because it would overwrite input file.
+==== /root/tsconfig.json (2 errors) ====
     {
         "compilerOptions": {
             "baseUrl": ".",
@@ -14,12 +20,19 @@
             },
             "allowJs": true,
             "outDir": "bin"
+            ~~~~~~~~
+!!! error TS5011: The common source directory of 'tsconfig.json' is '..'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+!!! error TS5011:   Visit https://aka.ms/ts6 for migration information.
         }
     }
     
-==== /root/a.ts (0 errors) ====
+==== /root/a.ts (2 errors) ====
     import { foo } from "/foo";
+                        ~~~~~~
+!!! error TS6059: File '/foo.ts' is not under 'rootDir' '/root'. 'rootDir' is expected to contain all source files.
     import { bar } from "/bar";
+                        ~~~~~~
+!!! error TS6059: File '/bar.js' is not under 'rootDir' '/root'. 'rootDir' is expected to contain all source files.
     
 ==== /foo.ts (0 errors) ====
     export function foo() {}
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.js b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.js
index 194e02979d3a4..75cc9125238d7 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.js
@@ -16,11 +16,6 @@ import { bar } from "/bar";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.foo = foo;
 function foo() { }
-//// [bar.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.bar = bar;
-function bar() { }
 //// [a.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt
index dd15993906e4e..b5c772fe8a854 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt
@@ -1,8 +1,14 @@
+error TS5055: Cannot write file '/bar.js' because it would overwrite input file.
 /root/tsconfig.json(3,9): error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
+/root/tsconfig.json(8,9): error TS5011: The common source directory of 'tsconfig.json' is '..'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+/root/a.ts(1,21): error TS6059: File '/foo.ts' is not under 'rootDir' '/root'. 'rootDir' is expected to contain all source files.
+/root/a.ts(2,21): error TS6059: File '/bar.js' is not under 'rootDir' '/root'. 'rootDir' is expected to contain all source files.
 
 
-==== /root/tsconfig.json (1 errors) ====
+!!! error TS5055: Cannot write file '/bar.js' because it would overwrite input file.
+==== /root/tsconfig.json (2 errors) ====
     {
         "compilerOptions": {
             "baseUrl": ".",
@@ -14,12 +20,19 @@
             },
             "allowJs": true,
             "outDir": "bin"
+            ~~~~~~~~
+!!! error TS5011: The common source directory of 'tsconfig.json' is '..'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+!!! error TS5011:   Visit https://aka.ms/ts6 for migration information.
         }
     }
     
-==== /root/a.ts (0 errors) ====
+==== /root/a.ts (2 errors) ====
     import { foo } from "/foo";
+                        ~~~~~~
+!!! error TS6059: File '/foo.ts' is not under 'rootDir' '/root'. 'rootDir' is expected to contain all source files.
     import { bar } from "/bar";
+                        ~~~~~~
+!!! error TS6059: File '/bar.js' is not under 'rootDir' '/root'. 'rootDir' is expected to contain all source files.
     
 ==== /foo.ts (0 errors) ====
     export function foo() {}
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.js b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.js
index 27ea060dd7f13..99fe5541922ae 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.js
@@ -16,11 +16,6 @@ import { bar } from "/bar";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.foo = foo;
 function foo() { }
-//// [bar.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.bar = bar;
-function bar() { }
 //// [a.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/plusOperatorWithAnyOtherType.errors.txt b/tests/baselines/reference/plusOperatorWithAnyOtherType.errors.txt
index 31241c511c6a7..bc4054f1ae0a3 100644
--- a/tests/baselines/reference/plusOperatorWithAnyOtherType.errors.txt
+++ b/tests/baselines/reference/plusOperatorWithAnyOtherType.errors.txt
@@ -9,25 +9,25 @@ plusOperatorWithAnyOtherType.ts(54,1): error TS2695: Left side of comma operator
 ==== plusOperatorWithAnyOtherType.ts (6 errors) ====
     // + operator on any type
     
-    var ANY: any;
-    var ANY1;
+    declare var ANY: any;
+    declare var ANY1: any;
     var ANY2: any[] = ["", ""];
-    var obj: () => {}
+    declare var obj: () => {}
     var obj1 = { x: (s: string) => { }, y: (s1) => { }};
     
     function foo(): any {
-        var a;
+        var a = undefined;
         return a;
     }
     class A {
-        public a: any;
+        public a!: any;
         static foo() {
-            var a;
+            var a: any = undefined;
             return a;
         }
     }
     namespace M {
-        export var n: any;
+        export var n: any = undefined;
     }
     var objA = new A();
     
diff --git a/tests/baselines/reference/plusOperatorWithAnyOtherType.js b/tests/baselines/reference/plusOperatorWithAnyOtherType.js
index 1f349e616dcb8..32203d8aa5694 100644
--- a/tests/baselines/reference/plusOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/plusOperatorWithAnyOtherType.js
@@ -3,25 +3,25 @@
 //// [plusOperatorWithAnyOtherType.ts]
 // + operator on any type
 
-var ANY: any;
-var ANY1;
+declare var ANY: any;
+declare var ANY1: any;
 var ANY2: any[] = ["", ""];
-var obj: () => {}
+declare var obj: () => {}
 var obj1 = { x: (s: string) => { }, y: (s1) => { }};
 
 function foo(): any {
-    var a;
+    var a = undefined;
     return a;
 }
 class A {
-    public a: any;
+    public a!: any;
     static foo() {
-        var a;
+        var a: any = undefined;
         return a;
     }
 }
 namespace M {
-    export var n: any;
+    export var n: any = undefined;
 }
 var objA = new A();
 
@@ -60,26 +60,24 @@ var ResultIsNumber19 = +(undefined + undefined);
 
 //// [plusOperatorWithAnyOtherType.js]
 // + operator on any type
-var ANY;
-var ANY1;
 var ANY2 = ["", ""];
-var obj;
 var obj1 = { x: function (s) { }, y: function (s1) { } };
 function foo() {
-    var a;
+    var a = undefined;
     return a;
 }
 var A = /** @class */ (function () {
     function A() {
     }
     A.foo = function () {
-        var a;
+        var a = undefined;
         return a;
     };
     return A;
 }());
 var M;
 (function (M) {
+    M.n = undefined;
 })(M || (M = {}));
 var objA = new A();
 // any other type var
diff --git a/tests/baselines/reference/plusOperatorWithAnyOtherType.symbols b/tests/baselines/reference/plusOperatorWithAnyOtherType.symbols
index e6e9bb4786e43..9545d513b47bc 100644
--- a/tests/baselines/reference/plusOperatorWithAnyOtherType.symbols
+++ b/tests/baselines/reference/plusOperatorWithAnyOtherType.symbols
@@ -3,17 +3,17 @@
 === plusOperatorWithAnyOtherType.ts ===
 // + operator on any type
 
-var ANY: any;
->ANY : Symbol(ANY, Decl(plusOperatorWithAnyOtherType.ts, 2, 3))
+declare var ANY: any;
+>ANY : Symbol(ANY, Decl(plusOperatorWithAnyOtherType.ts, 2, 11))
 
-var ANY1;
->ANY1 : Symbol(ANY1, Decl(plusOperatorWithAnyOtherType.ts, 3, 3))
+declare var ANY1: any;
+>ANY1 : Symbol(ANY1, Decl(plusOperatorWithAnyOtherType.ts, 3, 11))
 
 var ANY2: any[] = ["", ""];
 >ANY2 : Symbol(ANY2, Decl(plusOperatorWithAnyOtherType.ts, 4, 3))
 
-var obj: () => {}
->obj : Symbol(obj, Decl(plusOperatorWithAnyOtherType.ts, 5, 3))
+declare var obj: () => {}
+>obj : Symbol(obj, Decl(plusOperatorWithAnyOtherType.ts, 5, 11))
 
 var obj1 = { x: (s: string) => { }, y: (s1) => { }};
 >obj1 : Symbol(obj1, Decl(plusOperatorWithAnyOtherType.ts, 6, 3))
@@ -25,8 +25,9 @@ var obj1 = { x: (s: string) => { }, y: (s1) => { }};
 function foo(): any {
 >foo : Symbol(foo, Decl(plusOperatorWithAnyOtherType.ts, 6, 52))
 
-    var a;
+    var a = undefined;
 >a : Symbol(a, Decl(plusOperatorWithAnyOtherType.ts, 9, 7))
+>undefined : Symbol(undefined)
 
     return a;
 >a : Symbol(a, Decl(plusOperatorWithAnyOtherType.ts, 9, 7))
@@ -34,14 +35,15 @@ function foo(): any {
 class A {
 >A : Symbol(A, Decl(plusOperatorWithAnyOtherType.ts, 11, 1))
 
-    public a: any;
+    public a!: any;
 >a : Symbol(A.a, Decl(plusOperatorWithAnyOtherType.ts, 12, 9))
 
     static foo() {
->foo : Symbol(A.foo, Decl(plusOperatorWithAnyOtherType.ts, 13, 18))
+>foo : Symbol(A.foo, Decl(plusOperatorWithAnyOtherType.ts, 13, 19))
 
-        var a;
+        var a: any = undefined;
 >a : Symbol(a, Decl(plusOperatorWithAnyOtherType.ts, 15, 11))
+>undefined : Symbol(undefined)
 
         return a;
 >a : Symbol(a, Decl(plusOperatorWithAnyOtherType.ts, 15, 11))
@@ -50,8 +52,9 @@ class A {
 namespace M {
 >M : Symbol(M, Decl(plusOperatorWithAnyOtherType.ts, 18, 1))
 
-    export var n: any;
+    export var n: any = undefined;
 >n : Symbol(n, Decl(plusOperatorWithAnyOtherType.ts, 20, 14))
+>undefined : Symbol(undefined)
 }
 var objA = new A();
 >objA : Symbol(objA, Decl(plusOperatorWithAnyOtherType.ts, 22, 3))
@@ -60,7 +63,7 @@ var objA = new A();
 // any other type var
 var ResultIsNumber1 = +ANY1;
 >ResultIsNumber1 : Symbol(ResultIsNumber1, Decl(plusOperatorWithAnyOtherType.ts, 25, 3))
->ANY1 : Symbol(ANY1, Decl(plusOperatorWithAnyOtherType.ts, 3, 3))
+>ANY1 : Symbol(ANY1, Decl(plusOperatorWithAnyOtherType.ts, 3, 11))
 
 var ResultIsNumber2 = +ANY2;
 >ResultIsNumber2 : Symbol(ResultIsNumber2, Decl(plusOperatorWithAnyOtherType.ts, 26, 3))
@@ -76,7 +79,7 @@ var ResultIsNumber4 = +M;
 
 var ResultIsNumber5 = +obj;
 >ResultIsNumber5 : Symbol(ResultIsNumber5, Decl(plusOperatorWithAnyOtherType.ts, 29, 3))
->obj : Symbol(obj, Decl(plusOperatorWithAnyOtherType.ts, 5, 3))
+>obj : Symbol(obj, Decl(plusOperatorWithAnyOtherType.ts, 5, 11))
 
 var ResultIsNumber6 = +obj1;
 >ResultIsNumber6 : Symbol(ResultIsNumber6, Decl(plusOperatorWithAnyOtherType.ts, 30, 3))
@@ -125,14 +128,14 @@ var ResultIsNumber14 = +foo();
 
 var ResultIsNumber15 = +A.foo();
 >ResultIsNumber15 : Symbol(ResultIsNumber15, Decl(plusOperatorWithAnyOtherType.ts, 43, 3))
->A.foo : Symbol(A.foo, Decl(plusOperatorWithAnyOtherType.ts, 13, 18))
+>A.foo : Symbol(A.foo, Decl(plusOperatorWithAnyOtherType.ts, 13, 19))
 >A : Symbol(A, Decl(plusOperatorWithAnyOtherType.ts, 11, 1))
->foo : Symbol(A.foo, Decl(plusOperatorWithAnyOtherType.ts, 13, 18))
+>foo : Symbol(A.foo, Decl(plusOperatorWithAnyOtherType.ts, 13, 19))
 
 var ResultIsNumber16 = +(ANY + ANY1);
 >ResultIsNumber16 : Symbol(ResultIsNumber16, Decl(plusOperatorWithAnyOtherType.ts, 44, 3))
->ANY : Symbol(ANY, Decl(plusOperatorWithAnyOtherType.ts, 2, 3))
->ANY1 : Symbol(ANY1, Decl(plusOperatorWithAnyOtherType.ts, 3, 3))
+>ANY : Symbol(ANY, Decl(plusOperatorWithAnyOtherType.ts, 2, 11))
+>ANY1 : Symbol(ANY1, Decl(plusOperatorWithAnyOtherType.ts, 3, 11))
 
 var ResultIsNumber17 = +(null + undefined);
 >ResultIsNumber17 : Symbol(ResultIsNumber17, Decl(plusOperatorWithAnyOtherType.ts, 45, 3))
@@ -148,17 +151,17 @@ var ResultIsNumber19 = +(undefined + undefined);
 
 // miss assignment operators
 +ANY;
->ANY : Symbol(ANY, Decl(plusOperatorWithAnyOtherType.ts, 2, 3))
+>ANY : Symbol(ANY, Decl(plusOperatorWithAnyOtherType.ts, 2, 11))
 
 +ANY1;
->ANY1 : Symbol(ANY1, Decl(plusOperatorWithAnyOtherType.ts, 3, 3))
+>ANY1 : Symbol(ANY1, Decl(plusOperatorWithAnyOtherType.ts, 3, 11))
 
 +ANY2[0];
 >ANY2 : Symbol(ANY2, Decl(plusOperatorWithAnyOtherType.ts, 4, 3))
 
 +ANY, ANY1;
->ANY : Symbol(ANY, Decl(plusOperatorWithAnyOtherType.ts, 2, 3))
->ANY1 : Symbol(ANY1, Decl(plusOperatorWithAnyOtherType.ts, 3, 3))
+>ANY : Symbol(ANY, Decl(plusOperatorWithAnyOtherType.ts, 2, 11))
+>ANY1 : Symbol(ANY1, Decl(plusOperatorWithAnyOtherType.ts, 3, 11))
 
 +objA.a;
 >objA.a : Symbol(A.a, Decl(plusOperatorWithAnyOtherType.ts, 12, 9))
diff --git a/tests/baselines/reference/plusOperatorWithAnyOtherType.types b/tests/baselines/reference/plusOperatorWithAnyOtherType.types
index d0232fc8d9e5b..c40b037d28691 100644
--- a/tests/baselines/reference/plusOperatorWithAnyOtherType.types
+++ b/tests/baselines/reference/plusOperatorWithAnyOtherType.types
@@ -3,11 +3,11 @@
 === plusOperatorWithAnyOtherType.ts ===
 // + operator on any type
 
-var ANY: any;
+declare var ANY: any;
 >ANY : any
 >    : ^^^
 
-var ANY1;
+declare var ANY1: any;
 >ANY1 : any
 >     : ^^^
 
@@ -21,7 +21,7 @@ var ANY2: any[] = ["", ""];
 >"" : ""
 >   : ^^
 
-var obj: () => {}
+declare var obj: () => {}
 >obj : () => {}
 >    : ^^^^^^  
 
@@ -47,9 +47,11 @@ function foo(): any {
 >foo : () => any
 >    : ^^^^^^   
 
-    var a;
+    var a = undefined;
 >a : any
 >  : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
     return a;
 >a : any
@@ -59,7 +61,7 @@ class A {
 >A : A
 >  : ^
 
-    public a: any;
+    public a!: any;
 >a : any
 >  : ^^^
 
@@ -67,9 +69,11 @@ class A {
 >foo : () => any
 >    : ^^^^^^^^^
 
-        var a;
+        var a: any = undefined;
 >a : any
 >  : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
         return a;
 >a : any
@@ -80,9 +84,11 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: any;
+    export var n: any = undefined;
 >n : any
 >  : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 }
 var objA = new A();
 >objA : A
diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.errors.txt b/tests/baselines/reference/plusOperatorWithBooleanType.errors.txt
index e9712b5f4b4a7..9f7137cab9c77 100644
--- a/tests/baselines/reference/plusOperatorWithBooleanType.errors.txt
+++ b/tests/baselines/reference/plusOperatorWithBooleanType.errors.txt
@@ -3,16 +3,16 @@ plusOperatorWithBooleanType.ts(33,1): error TS2695: Left side of comma operator
 
 ==== plusOperatorWithBooleanType.ts (1 errors) ====
     // + operator on boolean type
-    var BOOLEAN: boolean;
+    declare var BOOLEAN: boolean;
     
     function foo(): boolean { return true; }
     
     class A {
-        public a: boolean;
+        public a!: boolean;
         static foo() { return false; }
     }
     namespace M {
-        export var n: boolean;
+        export var n: boolean = false;
     }
     
     var objA = new A();
diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.js b/tests/baselines/reference/plusOperatorWithBooleanType.js
index fd16e58407d63..b2c7439db4960 100644
--- a/tests/baselines/reference/plusOperatorWithBooleanType.js
+++ b/tests/baselines/reference/plusOperatorWithBooleanType.js
@@ -2,16 +2,16 @@
 
 //// [plusOperatorWithBooleanType.ts]
 // + operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 
 function foo(): boolean { return true; }
 
 class A {
-    public a: boolean;
+    public a!: boolean;
     static foo() { return false; }
 }
 namespace M {
-    export var n: boolean;
+    export var n: boolean = false;
 }
 
 var objA = new A();
@@ -38,8 +38,6 @@ var ResultIsNumber7 = +A.foo();
 +M.n;
 
 //// [plusOperatorWithBooleanType.js]
-// + operator on boolean type
-var BOOLEAN;
 function foo() { return true; }
 var A = /** @class */ (function () {
     function A() {
@@ -49,6 +47,7 @@ var A = /** @class */ (function () {
 }());
 var M;
 (function (M) {
+    M.n = false;
 })(M || (M = {}));
 var objA = new A();
 // boolean type var
diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.symbols b/tests/baselines/reference/plusOperatorWithBooleanType.symbols
index 175000bd2a9fd..f146c1ec3d83c 100644
--- a/tests/baselines/reference/plusOperatorWithBooleanType.symbols
+++ b/tests/baselines/reference/plusOperatorWithBooleanType.symbols
@@ -2,25 +2,25 @@
 
 === plusOperatorWithBooleanType.ts ===
 // + operator on boolean type
-var BOOLEAN: boolean;
->BOOLEAN : Symbol(BOOLEAN, Decl(plusOperatorWithBooleanType.ts, 1, 3))
+declare var BOOLEAN: boolean;
+>BOOLEAN : Symbol(BOOLEAN, Decl(plusOperatorWithBooleanType.ts, 1, 11))
 
 function foo(): boolean { return true; }
->foo : Symbol(foo, Decl(plusOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(plusOperatorWithBooleanType.ts, 1, 29))
 
 class A {
 >A : Symbol(A, Decl(plusOperatorWithBooleanType.ts, 3, 40))
 
-    public a: boolean;
+    public a!: boolean;
 >a : Symbol(A.a, Decl(plusOperatorWithBooleanType.ts, 5, 9))
 
     static foo() { return false; }
->foo : Symbol(A.foo, Decl(plusOperatorWithBooleanType.ts, 6, 22))
+>foo : Symbol(A.foo, Decl(plusOperatorWithBooleanType.ts, 6, 23))
 }
 namespace M {
 >M : Symbol(M, Decl(plusOperatorWithBooleanType.ts, 8, 1))
 
-    export var n: boolean;
+    export var n: boolean = false;
 >n : Symbol(n, Decl(plusOperatorWithBooleanType.ts, 10, 14))
 }
 
@@ -31,7 +31,7 @@ var objA = new A();
 // boolean type var
 var ResultIsNumber1 = +BOOLEAN;
 >ResultIsNumber1 : Symbol(ResultIsNumber1, Decl(plusOperatorWithBooleanType.ts, 16, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(plusOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(plusOperatorWithBooleanType.ts, 1, 11))
 
 // boolean type literal
 var ResultIsNumber2 = +true;
@@ -57,21 +57,21 @@ var ResultIsNumber5 = +M.n;
 
 var ResultIsNumber6 = +foo();
 >ResultIsNumber6 : Symbol(ResultIsNumber6, Decl(plusOperatorWithBooleanType.ts, 25, 3))
->foo : Symbol(foo, Decl(plusOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(plusOperatorWithBooleanType.ts, 1, 29))
 
 var ResultIsNumber7 = +A.foo();
 >ResultIsNumber7 : Symbol(ResultIsNumber7, Decl(plusOperatorWithBooleanType.ts, 26, 3))
->A.foo : Symbol(A.foo, Decl(plusOperatorWithBooleanType.ts, 6, 22))
+>A.foo : Symbol(A.foo, Decl(plusOperatorWithBooleanType.ts, 6, 23))
 >A : Symbol(A, Decl(plusOperatorWithBooleanType.ts, 3, 40))
->foo : Symbol(A.foo, Decl(plusOperatorWithBooleanType.ts, 6, 22))
+>foo : Symbol(A.foo, Decl(plusOperatorWithBooleanType.ts, 6, 23))
 
 // miss assignment operators
 +true;
 +BOOLEAN;
->BOOLEAN : Symbol(BOOLEAN, Decl(plusOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(plusOperatorWithBooleanType.ts, 1, 11))
 
 +foo();
->foo : Symbol(foo, Decl(plusOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(plusOperatorWithBooleanType.ts, 1, 29))
 
 +true, false;
 +objA.a;
diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.types b/tests/baselines/reference/plusOperatorWithBooleanType.types
index 749a233d53ce8..205a1c435ccdc 100644
--- a/tests/baselines/reference/plusOperatorWithBooleanType.types
+++ b/tests/baselines/reference/plusOperatorWithBooleanType.types
@@ -2,7 +2,7 @@
 
 === plusOperatorWithBooleanType.ts ===
 // + operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 >BOOLEAN : boolean
 >        : ^^^^^^^
 
@@ -16,7 +16,7 @@ class A {
 >A : A
 >  : ^
 
-    public a: boolean;
+    public a!: boolean;
 >a : boolean
 >  : ^^^^^^^
 
@@ -30,9 +30,11 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: boolean;
+    export var n: boolean = false;
 >n : boolean
 >  : ^^^^^^^
+>false : false
+>      : ^^^^^
 }
 
 var objA = new A();
diff --git a/tests/baselines/reference/plusOperatorWithNumberType.errors.txt b/tests/baselines/reference/plusOperatorWithNumberType.errors.txt
index ccc2e457c16a4..5a7a537cc97f7 100644
--- a/tests/baselines/reference/plusOperatorWithNumberType.errors.txt
+++ b/tests/baselines/reference/plusOperatorWithNumberType.errors.txt
@@ -3,17 +3,17 @@ plusOperatorWithNumberType.ts(41,1): error TS2695: Left side of comma operator i
 
 ==== plusOperatorWithNumberType.ts (1 errors) ====
     // + operator on number type
-    var NUMBER: number;
+    declare var NUMBER: number;
     var NUMBER1: number[] = [1, 2];
     
     function foo(): number { return 1; }
     
     class A {
-        public a: number;
+        public a!: number;
         static foo() { return 1; }
     }
     namespace M {
-        export var n: number;
+        export var n: number = 0;
     }
     
     var objA = new A();
diff --git a/tests/baselines/reference/plusOperatorWithNumberType.js b/tests/baselines/reference/plusOperatorWithNumberType.js
index dae064dedea60..d3ac188321f30 100644
--- a/tests/baselines/reference/plusOperatorWithNumberType.js
+++ b/tests/baselines/reference/plusOperatorWithNumberType.js
@@ -2,17 +2,17 @@
 
 //// [plusOperatorWithNumberType.ts]
 // + operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
 
 function foo(): number { return 1; }
 
 class A {
-    public a: number;
+    public a!: number;
     static foo() { return 1; }
 }
 namespace M {
-    export var n: number;
+    export var n: number = 0;
 }
 
 var objA = new A();
@@ -44,8 +44,6 @@ var ResultIsNumber11 = +(NUMBER + NUMBER);
 +objA.a, M.n;
 
 //// [plusOperatorWithNumberType.js]
-// + operator on number type
-var NUMBER;
 var NUMBER1 = [1, 2];
 function foo() { return 1; }
 var A = /** @class */ (function () {
@@ -56,6 +54,7 @@ var A = /** @class */ (function () {
 }());
 var M;
 (function (M) {
+    M.n = 0;
 })(M || (M = {}));
 var objA = new A();
 // number type var
diff --git a/tests/baselines/reference/plusOperatorWithNumberType.symbols b/tests/baselines/reference/plusOperatorWithNumberType.symbols
index e8414cdd61990..dc838010b03f5 100644
--- a/tests/baselines/reference/plusOperatorWithNumberType.symbols
+++ b/tests/baselines/reference/plusOperatorWithNumberType.symbols
@@ -2,8 +2,8 @@
 
 === plusOperatorWithNumberType.ts ===
 // + operator on number type
-var NUMBER: number;
->NUMBER : Symbol(NUMBER, Decl(plusOperatorWithNumberType.ts, 1, 3))
+declare var NUMBER: number;
+>NUMBER : Symbol(NUMBER, Decl(plusOperatorWithNumberType.ts, 1, 11))
 
 var NUMBER1: number[] = [1, 2];
 >NUMBER1 : Symbol(NUMBER1, Decl(plusOperatorWithNumberType.ts, 2, 3))
@@ -14,16 +14,16 @@ function foo(): number { return 1; }
 class A {
 >A : Symbol(A, Decl(plusOperatorWithNumberType.ts, 4, 36))
 
-    public a: number;
+    public a!: number;
 >a : Symbol(A.a, Decl(plusOperatorWithNumberType.ts, 6, 9))
 
     static foo() { return 1; }
->foo : Symbol(A.foo, Decl(plusOperatorWithNumberType.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(plusOperatorWithNumberType.ts, 7, 22))
 }
 namespace M {
 >M : Symbol(M, Decl(plusOperatorWithNumberType.ts, 9, 1))
 
-    export var n: number;
+    export var n: number = 0;
 >n : Symbol(n, Decl(plusOperatorWithNumberType.ts, 11, 14))
 }
 
@@ -34,7 +34,7 @@ var objA = new A();
 // number type var
 var ResultIsNumber1 = +NUMBER;
 >ResultIsNumber1 : Symbol(ResultIsNumber1, Decl(plusOperatorWithNumberType.ts, 17, 3))
->NUMBER : Symbol(NUMBER, Decl(plusOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(plusOperatorWithNumberType.ts, 1, 11))
 
 var ResultIsNumber2 = +NUMBER1;
 >ResultIsNumber2 : Symbol(ResultIsNumber2, Decl(plusOperatorWithNumberType.ts, 18, 3))
@@ -79,19 +79,19 @@ var ResultIsNumber9 = +foo();
 
 var ResultIsNumber10 = +A.foo();
 >ResultIsNumber10 : Symbol(ResultIsNumber10, Decl(plusOperatorWithNumberType.ts, 30, 3))
->A.foo : Symbol(A.foo, Decl(plusOperatorWithNumberType.ts, 7, 21))
+>A.foo : Symbol(A.foo, Decl(plusOperatorWithNumberType.ts, 7, 22))
 >A : Symbol(A, Decl(plusOperatorWithNumberType.ts, 4, 36))
->foo : Symbol(A.foo, Decl(plusOperatorWithNumberType.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(plusOperatorWithNumberType.ts, 7, 22))
 
 var ResultIsNumber11 = +(NUMBER + NUMBER);
 >ResultIsNumber11 : Symbol(ResultIsNumber11, Decl(plusOperatorWithNumberType.ts, 31, 3))
->NUMBER : Symbol(NUMBER, Decl(plusOperatorWithNumberType.ts, 1, 3))
->NUMBER : Symbol(NUMBER, Decl(plusOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(plusOperatorWithNumberType.ts, 1, 11))
+>NUMBER : Symbol(NUMBER, Decl(plusOperatorWithNumberType.ts, 1, 11))
 
 // miss assignment operators
 +1;
 +NUMBER;
->NUMBER : Symbol(NUMBER, Decl(plusOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(plusOperatorWithNumberType.ts, 1, 11))
 
 +NUMBER1;
 >NUMBER1 : Symbol(NUMBER1, Decl(plusOperatorWithNumberType.ts, 2, 3))
diff --git a/tests/baselines/reference/plusOperatorWithNumberType.types b/tests/baselines/reference/plusOperatorWithNumberType.types
index 860487df66fc0..ec446169ae399 100644
--- a/tests/baselines/reference/plusOperatorWithNumberType.types
+++ b/tests/baselines/reference/plusOperatorWithNumberType.types
@@ -2,7 +2,7 @@
 
 === plusOperatorWithNumberType.ts ===
 // + operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 >NUMBER : number
 >       : ^^^^^^
 
@@ -26,7 +26,7 @@ class A {
 >A : A
 >  : ^
 
-    public a: number;
+    public a!: number;
 >a : number
 >  : ^^^^^^
 
@@ -40,9 +40,11 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: number;
+    export var n: number = 0;
 >n : number
 >  : ^^^^^^
+>0 : 0
+>  : ^
 }
 
 var objA = new A();
diff --git a/tests/baselines/reference/plusOperatorWithStringType.errors.txt b/tests/baselines/reference/plusOperatorWithStringType.errors.txt
index 738936e19c77b..66e8f9091992e 100644
--- a/tests/baselines/reference/plusOperatorWithStringType.errors.txt
+++ b/tests/baselines/reference/plusOperatorWithStringType.errors.txt
@@ -3,17 +3,17 @@ plusOperatorWithStringType.ts(40,1): error TS2695: Left side of comma operator i
 
 ==== plusOperatorWithStringType.ts (1 errors) ====
     // + operator on string type
-    var STRING: string;
+    declare var STRING: string;
     var STRING1: string[] = ["", "abc"];
     
     function foo(): string { return "abc"; }
     
     class A {
-        public a: string;
+        public a!: string;
         static foo() { return ""; }
     }
     namespace M {
-        export var n: string;
+        export var n: string = "";
     }
     
     var objA = new A();
diff --git a/tests/baselines/reference/plusOperatorWithStringType.js b/tests/baselines/reference/plusOperatorWithStringType.js
index 222c94f425576..42d34eb6d8676 100644
--- a/tests/baselines/reference/plusOperatorWithStringType.js
+++ b/tests/baselines/reference/plusOperatorWithStringType.js
@@ -2,17 +2,17 @@
 
 //// [plusOperatorWithStringType.ts]
 // + operator on string type
-var STRING: string;
+declare var STRING: string;
 var STRING1: string[] = ["", "abc"];
 
 function foo(): string { return "abc"; }
 
 class A {
-    public a: string;
+    public a!: string;
     static foo() { return ""; }
 }
 namespace M {
-    export var n: string;
+    export var n: string = "";
 }
 
 var objA = new A();
@@ -43,8 +43,6 @@ var ResultIsNumber12 = +STRING.charAt(0);
 +objA.a,M.n;
 
 //// [plusOperatorWithStringType.js]
-// + operator on string type
-var STRING;
 var STRING1 = ["", "abc"];
 function foo() { return "abc"; }
 var A = /** @class */ (function () {
@@ -55,6 +53,7 @@ var A = /** @class */ (function () {
 }());
 var M;
 (function (M) {
+    M.n = "";
 })(M || (M = {}));
 var objA = new A();
 // string type var
diff --git a/tests/baselines/reference/plusOperatorWithStringType.symbols b/tests/baselines/reference/plusOperatorWithStringType.symbols
index 3480bd8b443a2..88dabd2272531 100644
--- a/tests/baselines/reference/plusOperatorWithStringType.symbols
+++ b/tests/baselines/reference/plusOperatorWithStringType.symbols
@@ -2,8 +2,8 @@
 
 === plusOperatorWithStringType.ts ===
 // + operator on string type
-var STRING: string;
->STRING : Symbol(STRING, Decl(plusOperatorWithStringType.ts, 1, 3))
+declare var STRING: string;
+>STRING : Symbol(STRING, Decl(plusOperatorWithStringType.ts, 1, 11))
 
 var STRING1: string[] = ["", "abc"];
 >STRING1 : Symbol(STRING1, Decl(plusOperatorWithStringType.ts, 2, 3))
@@ -14,16 +14,16 @@ function foo(): string { return "abc"; }
 class A {
 >A : Symbol(A, Decl(plusOperatorWithStringType.ts, 4, 40))
 
-    public a: string;
+    public a!: string;
 >a : Symbol(A.a, Decl(plusOperatorWithStringType.ts, 6, 9))
 
     static foo() { return ""; }
->foo : Symbol(A.foo, Decl(plusOperatorWithStringType.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(plusOperatorWithStringType.ts, 7, 22))
 }
 namespace M {
 >M : Symbol(M, Decl(plusOperatorWithStringType.ts, 9, 1))
 
-    export var n: string;
+    export var n: string = "";
 >n : Symbol(n, Decl(plusOperatorWithStringType.ts, 11, 14))
 }
 
@@ -34,7 +34,7 @@ var objA = new A();
 // string type var
 var ResultIsNumber1 = +STRING;
 >ResultIsNumber1 : Symbol(ResultIsNumber1, Decl(plusOperatorWithStringType.ts, 17, 3))
->STRING : Symbol(STRING, Decl(plusOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(plusOperatorWithStringType.ts, 1, 11))
 
 var ResultIsNumber2 = +STRING1;
 >ResultIsNumber2 : Symbol(ResultIsNumber2, Decl(plusOperatorWithStringType.ts, 18, 3))
@@ -79,25 +79,25 @@ var ResultIsNumber9 = +foo();
 
 var ResultIsNumber10 = +A.foo();
 >ResultIsNumber10 : Symbol(ResultIsNumber10, Decl(plusOperatorWithStringType.ts, 30, 3))
->A.foo : Symbol(A.foo, Decl(plusOperatorWithStringType.ts, 7, 21))
+>A.foo : Symbol(A.foo, Decl(plusOperatorWithStringType.ts, 7, 22))
 >A : Symbol(A, Decl(plusOperatorWithStringType.ts, 4, 40))
->foo : Symbol(A.foo, Decl(plusOperatorWithStringType.ts, 7, 21))
+>foo : Symbol(A.foo, Decl(plusOperatorWithStringType.ts, 7, 22))
 
 var ResultIsNumber11 = +(STRING + STRING);
 >ResultIsNumber11 : Symbol(ResultIsNumber11, Decl(plusOperatorWithStringType.ts, 31, 3))
->STRING : Symbol(STRING, Decl(plusOperatorWithStringType.ts, 1, 3))
->STRING : Symbol(STRING, Decl(plusOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(plusOperatorWithStringType.ts, 1, 11))
+>STRING : Symbol(STRING, Decl(plusOperatorWithStringType.ts, 1, 11))
 
 var ResultIsNumber12 = +STRING.charAt(0);
 >ResultIsNumber12 : Symbol(ResultIsNumber12, Decl(plusOperatorWithStringType.ts, 32, 3))
 >STRING.charAt : Symbol(String.charAt, Decl(lib.es5.d.ts, --, --))
->STRING : Symbol(STRING, Decl(plusOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(plusOperatorWithStringType.ts, 1, 11))
 >charAt : Symbol(String.charAt, Decl(lib.es5.d.ts, --, --))
 
 // miss assignment operators
 +"";
 +STRING;
->STRING : Symbol(STRING, Decl(plusOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(plusOperatorWithStringType.ts, 1, 11))
 
 +STRING1;
 >STRING1 : Symbol(STRING1, Decl(plusOperatorWithStringType.ts, 2, 3))
diff --git a/tests/baselines/reference/plusOperatorWithStringType.types b/tests/baselines/reference/plusOperatorWithStringType.types
index d588036ed2892..e368676bb73b5 100644
--- a/tests/baselines/reference/plusOperatorWithStringType.types
+++ b/tests/baselines/reference/plusOperatorWithStringType.types
@@ -2,7 +2,7 @@
 
 === plusOperatorWithStringType.ts ===
 // + operator on string type
-var STRING: string;
+declare var STRING: string;
 >STRING : string
 >       : ^^^^^^
 
@@ -26,7 +26,7 @@ class A {
 >A : A
 >  : ^
 
-    public a: string;
+    public a!: string;
 >a : string
 >  : ^^^^^^
 
@@ -40,9 +40,11 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: string;
+    export var n: string = "";
 >n : string
 >  : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 var objA = new A();
diff --git a/tests/baselines/reference/predicateSemantics.errors.txt b/tests/baselines/reference/predicateSemantics.errors.txt
index cf503611a4b88..9bc7e32be2280 100644
--- a/tests/baselines/reference/predicateSemantics.errors.txt
+++ b/tests/baselines/reference/predicateSemantics.errors.txt
@@ -7,26 +7,26 @@ predicateSemantics.ts(29,13): error TS2871: This expression is always nullish.
 predicateSemantics.ts(30,13): error TS2872: This kind of expression is always truthy.
 predicateSemantics.ts(31,13): error TS2872: This kind of expression is always truthy.
 predicateSemantics.ts(32,13): error TS2871: This expression is always nullish.
-predicateSemantics.ts(32,21): error TS2871: This expression is always nullish.
+predicateSemantics.ts(32,13): error TS2871: This expression is always nullish.
 predicateSemantics.ts(33,13): error TS2871: This expression is always nullish.
 predicateSemantics.ts(34,13): error TS2871: This expression is always nullish.
-predicateSemantics.ts(34,22): error TS2871: This expression is always nullish.
-predicateSemantics.ts(36,20): error TS2871: This expression is always nullish.
-predicateSemantics.ts(37,20): error TS2871: This expression is always nullish.
+predicateSemantics.ts(34,13): error TS2871: This expression is always nullish.
+predicateSemantics.ts(36,13): error TS2871: This expression is always nullish.
+predicateSemantics.ts(37,13): error TS2871: This expression is always nullish.
 predicateSemantics.ts(38,21): error TS2871: This expression is always nullish.
 predicateSemantics.ts(39,21): error TS2871: This expression is always nullish.
 predicateSemantics.ts(40,21): error TS2871: This expression is always nullish.
-predicateSemantics.ts(40,29): error TS2871: This expression is always nullish.
-predicateSemantics.ts(41,21): error TS2871: This expression is always nullish.
-predicateSemantics.ts(42,20): error TS2881: This expression is never nullish.
-predicateSemantics.ts(43,21): error TS2881: This expression is never nullish.
+predicateSemantics.ts(40,21): error TS2871: This expression is always nullish.
+predicateSemantics.ts(41,13): error TS2871: This expression is always nullish.
+predicateSemantics.ts(42,13): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+predicateSemantics.ts(43,13): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
+predicateSemantics.ts(45,13): error TS2871: This expression is always nullish.
+predicateSemantics.ts(45,13): error TS2871: This expression is always nullish.
 predicateSemantics.ts(45,13): error TS2871: This expression is always nullish.
-predicateSemantics.ts(45,21): error TS2871: This expression is always nullish.
-predicateSemantics.ts(45,29): error TS2871: This expression is always nullish.
 predicateSemantics.ts(46,13): error TS2871: This expression is always nullish.
-predicateSemantics.ts(46,21): error TS2881: This expression is never nullish.
+predicateSemantics.ts(46,13): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
 predicateSemantics.ts(47,13): error TS2871: This expression is always nullish.
-predicateSemantics.ts(47,22): error TS2881: This expression is never nullish.
+predicateSemantics.ts(47,13): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
 predicateSemantics.ts(50,8): error TS2872: This kind of expression is always truthy.
 predicateSemantics.ts(51,11): error TS2872: This kind of expression is always truthy.
 predicateSemantics.ts(52,8): error TS2872: This kind of expression is always truthy.
@@ -89,7 +89,7 @@ predicateSemantics.ts(90,1): error TS2869: Right operand of ?? is unreachable be
     const p07 = null ?? null ?? null;
                 ~~~~
 !!! error TS2871: This expression is always nullish.
-                        ~~~~
+                ~~~~~~~~~~~~
 !!! error TS2871: This expression is always nullish.
     const p08 = null ?? opt ?? null;
                 ~~~~
@@ -97,14 +97,14 @@ predicateSemantics.ts(90,1): error TS2869: Right operand of ?? is unreachable be
     const p09 = null ?? (opt ? null : undefined) ?? null;
                 ~~~~
 !!! error TS2871: This expression is always nullish.
-                         ~~~~~~~~~~~~~~~~~~~~~~
+                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2871: This expression is always nullish.
     
     const p10 = opt ?? null ?? 1;
-                       ~~~~
+                ~~~~~~~~~~~
 !!! error TS2871: This expression is always nullish.
     const p11 = opt ?? null ?? null;
-                       ~~~~
+                ~~~~~~~~~~~
 !!! error TS2871: This expression is always nullish.
     const p12 = opt ?? (null ?? 1);
                         ~~~~
@@ -115,35 +115,35 @@ predicateSemantics.ts(90,1): error TS2869: Right operand of ?? is unreachable be
     const p14 = opt ?? (null ?? null ?? null);
                         ~~~~
 !!! error TS2871: This expression is always nullish.
-                                ~~~~
+                        ~~~~~~~~~~~~
 !!! error TS2871: This expression is always nullish.
     const p15 = opt ?? (opt ? null : undefined) ?? null;
-                        ~~~~~~~~~~~~~~~~~~~~~~
+                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2871: This expression is always nullish.
     const p16 = opt ?? 1 ?? 2;
-                       ~
-!!! error TS2881: This expression is never nullish.
+                ~~~~~~~~
+!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
     const p17 = opt ?? (opt ? 1 : 2) ?? 3;
-                        ~~~~~~~~~~~
-!!! error TS2881: This expression is never nullish.
+                ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
     
     const p21 = null ?? null ?? null ?? null;
                 ~~~~
 !!! error TS2871: This expression is always nullish.
-                        ~~~~
+                ~~~~~~~~~~~~
 !!! error TS2871: This expression is always nullish.
-                                ~~~~
+                ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2871: This expression is always nullish.
     const p22 = null ?? 1 ?? 1;
                 ~~~~
 !!! error TS2871: This expression is always nullish.
-                        ~
-!!! error TS2881: This expression is never nullish.
+                ~~~~~~~~~
+!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
     const p23 = null ?? (opt ? 1 : 2) ?? 1;
                 ~~~~
 !!! error TS2871: This expression is always nullish.
-                         ~~~~~~~~~~~
-!!! error TS2881: This expression is never nullish.
+                ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
     
     // Outer expression tests
     while ({} as any) { }
diff --git a/tests/baselines/reference/primitiveMembers.errors.txt b/tests/baselines/reference/primitiveMembers.errors.txt
index a68f220c4244b..3118230d87b8a 100644
--- a/tests/baselines/reference/primitiveMembers.errors.txt
+++ b/tests/baselines/reference/primitiveMembers.errors.txt
@@ -15,7 +15,7 @@ primitiveMembers.ts(21,10): error TS2872: This kind of expression is always trut
     x.toString();
     
     var n = 0;
-    var N: Number;
+    declare var N: Number;
     
     n = N;  // should not work, as 'number' has a different brand
     ~
diff --git a/tests/baselines/reference/primitiveMembers.js b/tests/baselines/reference/primitiveMembers.js
index 1ca0715438301..924f510714a52 100644
--- a/tests/baselines/reference/primitiveMembers.js
+++ b/tests/baselines/reference/primitiveMembers.js
@@ -9,7 +9,7 @@ x.toBAZ();
 x.toString();
 
 var n = 0;
-var N: Number;
+declare var N: Number;
 
 n = N;  // should not work, as 'number' has a different brand
 N = n; // should work
@@ -55,7 +55,6 @@ r.source;
 x.toBAZ();
 x.toString();
 var n = 0;
-var N;
 n = N; // should not work, as 'number' has a different brand
 N = n; // should work
 var o = {};
diff --git a/tests/baselines/reference/primitiveMembers.symbols b/tests/baselines/reference/primitiveMembers.symbols
index 0d9f89691014b..71942f82f6b32 100644
--- a/tests/baselines/reference/primitiveMembers.symbols
+++ b/tests/baselines/reference/primitiveMembers.symbols
@@ -23,16 +23,16 @@ x.toString();
 var n = 0;
 >n : Symbol(n, Decl(primitiveMembers.ts, 7, 3))
 
-var N: Number;
->N : Symbol(N, Decl(primitiveMembers.ts, 8, 3))
+declare var N: Number;
+>N : Symbol(N, Decl(primitiveMembers.ts, 8, 11))
 >Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 n = N;  // should not work, as 'number' has a different brand
 >n : Symbol(n, Decl(primitiveMembers.ts, 7, 3))
->N : Symbol(N, Decl(primitiveMembers.ts, 8, 3))
+>N : Symbol(N, Decl(primitiveMembers.ts, 8, 11))
 
 N = n; // should work
->N : Symbol(N, Decl(primitiveMembers.ts, 8, 3))
+>N : Symbol(N, Decl(primitiveMembers.ts, 8, 11))
 >n : Symbol(n, Decl(primitiveMembers.ts, 7, 3))
 
 var o: Object = {}
diff --git a/tests/baselines/reference/primitiveMembers.types b/tests/baselines/reference/primitiveMembers.types
index bd2f700c7279d..61e8920ff3e4b 100644
--- a/tests/baselines/reference/primitiveMembers.types
+++ b/tests/baselines/reference/primitiveMembers.types
@@ -47,7 +47,7 @@ var n = 0;
 >0 : 0
 >  : ^
 
-var N: Number;
+declare var N: Number;
 >N : Number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt b/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt
index fdd4900316bb9..7bcad5e1f45c9 100644
--- a/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt
+++ b/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt
@@ -1,9 +1,11 @@
 error TS5053: Option 'declarationDir' cannot be specified with option 'outFile'.
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5053: Option 'declarationDir' cannot be specified with option 'outFile'.
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== b.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt
index 5ed911b169808..c7da5422fc52a 100644
--- a/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt
+++ b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt
@@ -1,9 +1,11 @@
 error TS5053: Option 'declarationDir' cannot be specified with option 'outFile'.
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
 !!! error TS5053: Option 'declarationDir' cannot be specified with option 'outFile'.
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== b.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.errors.txt
index 3d0b1a53d87a5..518fb695d5473 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.errors.txt
@@ -1,14 +1,17 @@
 DifferentNamesNotSpecified/tsconfig.json(2,3): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 DifferentNamesNotSpecified/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+DifferentNamesNotSpecified/tsconfig.json(2,24): error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
-==== DifferentNamesNotSpecified/tsconfig.json (2 errors) ====
+==== DifferentNamesNotSpecified/tsconfig.json (3 errors) ====
     {
       "compilerOptions": { "outFile": "test.js" }
       ~~~~~~~~~~~~~~~~~
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
       ~~~~~~~~~~~~~~~~~
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+                           ~~~~~~~~~
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
     }
     
 ==== DifferentNamesNotSpecified/a.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.errors.txt
index 7ecee4af6d6cc..c5d832f855066 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.errors.txt
@@ -1,13 +1,16 @@
 DifferentNamesNotSpecified/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+DifferentNamesNotSpecified/tsconfig.json(2,24): error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 DifferentNamesNotSpecified/tsconfig.json(2,24): error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-==== DifferentNamesNotSpecified/tsconfig.json (2 errors) ====
+==== DifferentNamesNotSpecified/tsconfig.json (3 errors) ====
     {
       "compilerOptions": { "outFile": "test.js" }
       ~~~~~~~~~~~~~~~~~
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
                            ~~~~~~~~~
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+                           ~~~~~~~~~
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
     }
     
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
index b40a4ad1bab39..80319e3916142 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
@@ -1,8 +1,9 @@
 DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json(3,5): error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
-==== DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json (2 errors) ====
+==== DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json (3 errors) ====
     {
       "compilerOptions": {
       ~~~~~~~~~~~~~~~~~
@@ -10,6 +11,8 @@ DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option '
       ~~~~~~~~~~~~~~~~~
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "outFile": "test.js",
+        ~~~~~~~~~
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "allowJs": true
       }
     }
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
index 454843c1b1547..9f2d90457abe0 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
@@ -1,14 +1,17 @@
 DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json(3,5): error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json(3,5): error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-==== DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json (2 errors) ====
+==== DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json (3 errors) ====
     {
       "compilerOptions": {
       ~~~~~~~~~~~~~~~~~
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "outFile": "test.js",
         ~~~~~~~~~
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+        ~~~~~~~~~
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
         "allowJs": true
       }
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt
index e1eb0c3dc70ae..3991623a1308c 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt
@@ -3,19 +3,22 @@ error TS6504: File 'DifferentNamesSpecified/b.js' is a JavaScript file. Did you
     Part of 'files' list in tsconfig.json
 DifferentNamesSpecified/tsconfig.json(2,3): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 DifferentNamesSpecified/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+DifferentNamesSpecified/tsconfig.json(2,24): error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS6504: File 'DifferentNamesSpecified/b.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 !!! error TS6504:   The file is in the program because:
 !!! error TS6504:     Part of 'files' list in tsconfig.json
 !!! related TS1410 DifferentNamesSpecified/tsconfig.json:3:22: File is matched by 'files' list specified here.
-==== DifferentNamesSpecified/tsconfig.json (2 errors) ====
+==== DifferentNamesSpecified/tsconfig.json (3 errors) ====
     {
       "compilerOptions": { "outFile": "test.js" },
       ~~~~~~~~~~~~~~~~~
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
       ~~~~~~~~~~~~~~~~~
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+                           ~~~~~~~~~
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
       "files": [ "a.ts", "b.js" ]
     }
     
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt
index 29b42d19cdc69..d14c7b38b2ce8 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt
@@ -2,6 +2,7 @@ error TS6504: File 'DifferentNamesSpecified/b.js' is a JavaScript file. Did you
   The file is in the program because:
     Part of 'files' list in tsconfig.json
 DifferentNamesSpecified/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+DifferentNamesSpecified/tsconfig.json(2,24): error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 DifferentNamesSpecified/tsconfig.json(2,24): error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
@@ -9,12 +10,14 @@ DifferentNamesSpecified/tsconfig.json(2,24): error TS6082: Only 'amd' and 'syste
 !!! error TS6504:   The file is in the program because:
 !!! error TS6504:     Part of 'files' list in tsconfig.json
 !!! related TS1410 DifferentNamesSpecified/tsconfig.json:3:22: File is matched by 'files' list specified here.
-==== DifferentNamesSpecified/tsconfig.json (2 errors) ====
+==== DifferentNamesSpecified/tsconfig.json (3 errors) ====
     {
       "compilerOptions": { "outFile": "test.js" },
       ~~~~~~~~~~~~~~~~~
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
                            ~~~~~~~~~
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+                           ~~~~~~~~~
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
       "files": [ "a.ts", "b.js" ]
     }
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
index 53ba08a0e8fbb..1c4212dcc361e 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
@@ -1,8 +1,9 @@
 DifferentNamesSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 DifferentNamesSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+DifferentNamesSpecifiedWithAllowJs/tsconfig.json(3,5): error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
-==== DifferentNamesSpecifiedWithAllowJs/tsconfig.json (2 errors) ====
+==== DifferentNamesSpecifiedWithAllowJs/tsconfig.json (3 errors) ====
     {
       "compilerOptions": {
       ~~~~~~~~~~~~~~~~~
@@ -10,6 +11,8 @@ DifferentNamesSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'mod
       ~~~~~~~~~~~~~~~~~
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "outFile": "test.js",
+        ~~~~~~~~~
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "allowJs": true
       },
       "files": [ "a.ts", "b.js" ]
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
index a6a84514ee0a7..01cd383e932da 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
@@ -1,14 +1,17 @@
 DifferentNamesSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+DifferentNamesSpecifiedWithAllowJs/tsconfig.json(3,5): error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 DifferentNamesSpecifiedWithAllowJs/tsconfig.json(3,5): error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-==== DifferentNamesSpecifiedWithAllowJs/tsconfig.json (2 errors) ====
+==== DifferentNamesSpecifiedWithAllowJs/tsconfig.json (3 errors) ====
     {
       "compilerOptions": {
       ~~~~~~~~~~~~~~~~~
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "outFile": "test.js",
         ~~~~~~~~~
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+        ~~~~~~~~~
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
         "allowJs": true
       },
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json
index 09ecf27ea6905..316261ffd39e5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json
index 09ecf27ea6905..316261ffd39e5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
index 344393c631cc7..0ec609a7aeb6f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
index 344393c631cc7..0ec609a7aeb6f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
index 07a45826b8bd9..3a9d78806e3b3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index c0c646220384c..842d1268d6f7f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..85d7886a09778 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index 69993b52b2cfa..49fd8f76ade2c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json
index 34768bd676dc2..9aef25e62d02d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json
index 34768bd676dc2..9aef25e62d02d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
index 657ba7585fc90..0c5f5dd58bbc3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
index 657ba7585fc90..0c5f5dd58bbc3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
index 3d31526af0a6b..f1b4df6081185 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index 71bdb92b4c3ee..887ed86d73e96 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..6b1d504fe02e1 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index c359770ee5fc0..02504862a5413 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json
index eadb8fec9b931..91992cfc49e8b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json
index eadb8fec9b931..91992cfc49e8b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
index 864c4119bb625..4d54be7055175 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
index 864c4119bb625..4d54be7055175 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
index 5336de40839f2..48adcd38d98bb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index b8129796d7c9d..7f84c6c0bb449 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..fed47cab32b85 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index 0f2fff849824b..bf93ac921368c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles",
     "resolveMapRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
index 7319ec3d03e3d..83f4874e25f73 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..71e416c72292c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
index 477be2decfcb0..af2fb429a4b48 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..2a5604f1fb3fc 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
index 0d25528f041b5..c082deade4022 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..418f27071208b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
index babb41566a553..654b3679c2e9c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..ddaa61fed3755 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json
index c4ce3aa0f7472..6404a052c2765 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json
index c4ce3aa0f7472..6404a052c2765 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
index 5503023d7b76a..1684532cd8e4b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
index 5503023d7b76a..1684532cd8e4b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
index 07a45826b8bd9..3a9d78806e3b3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
index defc6e1f513f1..7e5e79df8ac72 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..85d7886a09778 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
index 9cf596bb2abc8..e33821905abc2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json
index 5fad1b73f5580..656ee79154686 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json
index 5fad1b73f5580..656ee79154686 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json
index be94d728d42e3..f525c929bfc0f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json
index be94d728d42e3..f525c929bfc0f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
index 3d31526af0a6b..f1b4df6081185 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
index f67a962fe3a08..0022b278bc728 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..6b1d504fe02e1 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
index dec2a63151a83..6cdadea9071b6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json
index 06268f9e62544..b78d480ece622 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json
index 06268f9e62544..b78d480ece622 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
index 18d69858a1afd..0c2f2d61352c0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
index 18d69858a1afd..0c2f2d61352c0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
index 5336de40839f2..48adcd38d98bb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
index b10fa59247216..2d3e75b0b48ca 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..fed47cab32b85 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
index 6880d91a7224d..7e1cf2b9394a2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
index 7319ec3d03e3d..83f4874e25f73 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..71e416c72292c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
index 477be2decfcb0..af2fb429a4b48 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..2a5604f1fb3fc 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
index 0d25528f041b5..c082deade4022 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..418f27071208b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
index babb41566a553..654b3679c2e9c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..ddaa61fed3755 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json
index 4ef2816c00208..10b9fa1874f97 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json
index 4ef2816c00208..10b9fa1874f97 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json
index 1c707e92c7887..bdec0cfd4072d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json
index 1c707e92c7887..bdec0cfd4072d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
index 07a45826b8bd9..3a9d78806e3b3 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json
index 00606be4e8fa8..e1ad80590dd2a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..85d7886a09778 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json
index 85c13833e7493..bd323a9ae0ff0 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json
index eaf89425dde47..46c4732b42fe3 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json
index eaf89425dde47..46c4732b42fe3 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json
index 08a40b7e00fee..65b3e12e1a37a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json
index 08a40b7e00fee..65b3e12e1a37a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
index 3d31526af0a6b..f1b4df6081185 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json
index 3a0253543f6f8..6d93e3aa42594 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..6b1d504fe02e1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json
index b48f55c96f18e..6468e6c169dca 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json
index 8fc1d8cedb3a6..4a692d97e89d2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json
index 8fc1d8cedb3a6..4a692d97e89d2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json
index ff4cef3be13f8..69c3ba4c2d9ff 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json
index ff4cef3be13f8..69c3ba4c2d9ff 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
index 5336de40839f2..48adcd38d98bb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json
index 62022a2a153bd..2a5efef824c4d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..fed47cab32b85 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json
index 85f9744e785dd..96c4e543ea18f 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.errors.txt
index 7319ec3d03e3d..83f4874e25f73 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..71e416c72292c 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.errors.txt
index 477be2decfcb0..af2fb429a4b48 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..2a5604f1fb3fc 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.errors.txt
index 0d25528f041b5..c082deade4022 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..418f27071208b 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.errors.txt
index babb41566a553..654b3679c2e9c 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..ddaa61fed3755 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json
index d3df7e3693c9e..782e9beb78389 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json
index d3df7e3693c9e..782e9beb78389 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
index 93884030e88e6..a154f6bff5e0c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
index 93884030e88e6..a154f6bff5e0c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
index 07a45826b8bd9..3a9d78806e3b3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
index bde947b83f934..fcf55d117c86b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..85d7886a09778 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
index 26c67e9736058..545f8f93210e5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json
index 3e32619902a83..ce4d97a0b50f6 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json
index 3e32619902a83..ce4d97a0b50f6 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json
index 6464e9f189f1b..8a15fa645d39c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json
index 6464e9f189f1b..8a15fa645d39c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
index 3d31526af0a6b..f1b4df6081185 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
index fa233c59d3a27..14bd7e5cacc77 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..6b1d504fe02e1 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
index 1bc6bae5911d2..2290a81ece28c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json
index 93b2d0ff36805..031889e4c7fec 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json
index 93b2d0ff36805..031889e4c7fec 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
index f234ff79bb7be..9894ad9f6a62b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
index f234ff79bb7be..9894ad9f6a62b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
index 5336de40839f2..48adcd38d98bb 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
index 58b76d6f050bc..6fdb1682ce5f9 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..fed47cab32b85 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
index a1489a487ca7d..af833616a2b43 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
index 7319ec3d03e3d..83f4874e25f73 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..71e416c72292c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
index 477be2decfcb0..af2fb429a4b48 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..2a5604f1fb3fc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
index 0d25528f041b5..c082deade4022 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..418f27071208b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
index babb41566a553..654b3679c2e9c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..ddaa61fed3755 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.json
index 3b03cfce24fd8..7eafa7bee0816 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.json
@@ -6,6 +6,7 @@
     ],
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.json
index 3b03cfce24fd8..7eafa7bee0816 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.json
@@ -6,6 +6,7 @@
     ],
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.json
index af74f9b2f14e5..c00c6602e0992 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.json
@@ -7,6 +7,7 @@
     "outDir": "outdir/simple",
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.json
index af74f9b2f14e5..c00c6602e0992 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.json
@@ -7,6 +7,7 @@
     "outDir": "outdir/simple",
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.errors.txt
index 07a45826b8bd9..3a9d78806e3b3 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json
index 64960cadbd930..2659148fb03aa 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json
@@ -7,6 +7,7 @@
     "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..85d7886a09778 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json
index 45de87d52c9dd..1b3649314daf8 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json
@@ -7,6 +7,7 @@
     "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.json b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.json
index fc4107dacccde..05fa3a78dcab2 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.json
@@ -6,6 +6,7 @@
     ],
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.json b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.json
index fc4107dacccde..05fa3a78dcab2 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.json
@@ -6,6 +6,7 @@
     ],
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.json
index 8aa88510e71b0..4269468f21d51 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.json
@@ -7,6 +7,7 @@
     "outDir": "outdir/simple",
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.json
index 8aa88510e71b0..4269468f21d51 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.json
@@ -7,6 +7,7 @@
     "outDir": "outdir/simple",
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.errors.txt
index 3d31526af0a6b..f1b4df6081185 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json
index b664b24ac281e..b0db2f9d0a427 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json
@@ -7,6 +7,7 @@
     "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..6b1d504fe02e1 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json
index 3e391a0e3ad08..03e126f259f98 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json
@@ -7,6 +7,7 @@
     "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.json
index 341e05bc7bdc5..f87c84098abf5 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.json
@@ -6,6 +6,7 @@
     ],
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.json
index 341e05bc7bdc5..f87c84098abf5 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.json
@@ -6,6 +6,7 @@
     ],
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.json
index cfbe79831f704..7ba82d6217d0f 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.json
@@ -7,6 +7,7 @@
     "outDir": "outdir/simple",
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.json
index cfbe79831f704..7ba82d6217d0f 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.json
@@ -7,6 +7,7 @@
     "outDir": "outdir/simple",
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.errors.txt
index 5336de40839f2..48adcd38d98bb 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json
index d220bf9f619ed..29be4bfe563f6 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json
@@ -7,6 +7,7 @@
     "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..fed47cab32b85 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json
index 612b0844772ff..5e952676379c8 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json
@@ -7,6 +7,7 @@
     "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.errors.txt
index 7319ec3d03e3d..83f4874e25f73 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..71e416c72292c 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.errors.txt
index 477be2decfcb0..af2fb429a4b48 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..2a5604f1fb3fc 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.errors.txt
index 0d25528f041b5..c082deade4022 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..418f27071208b 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.errors.txt
index babb41566a553..654b3679c2e9c 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..ddaa61fed3755 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt b/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt
index b8f55915d4f74..6c11b922248be 100644
--- a/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt
+++ b/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== globalThisCapture.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
index 14f4663365e4f..6259ef8e0422e 100644
--- a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
+++ b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== globalThisCapture.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/relativeNested/amd/relativeNested.json b/tests/baselines/reference/project/relativeNested/amd/relativeNested.json
index afa486bfd7728..26c866c984186 100644
--- a/tests/baselines/reference/project/relativeNested/amd/relativeNested.json
+++ b/tests/baselines/reference/project/relativeNested/amd/relativeNested.json
@@ -5,6 +5,7 @@
         "app.ts"
     ],
     "runTest": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/relativeNested/node/relativeNested.json b/tests/baselines/reference/project/relativeNested/node/relativeNested.json
index afa486bfd7728..26c866c984186 100644
--- a/tests/baselines/reference/project/relativeNested/node/relativeNested.json
+++ b/tests/baselines/reference/project/relativeNested/node/relativeNested.json
@@ -5,6 +5,7 @@
         "app.ts"
     ],
     "runTest": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json
index cd1a32353f451..6327f3c512328 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json
index cd1a32353f451..6327f3c512328 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
index 943c9f685e5fa..f5db486978dd4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
index 943c9f685e5fa..f5db486978dd4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
index 07a45826b8bd9..3a9d78806e3b3 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index 45316284f412d..06b5498f69740 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..85d7886a09778 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index 51f70eb209e0a..a571376961a13 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json
index c91638a9c7454..f59b352391148 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_simple/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json
index c91638a9c7454..f59b352391148 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_simple/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
index 72c7e99dcf028..bfc05fcf3581e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_simple/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
index 72c7e99dcf028..bfc05fcf3581e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_simple/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
index 3d31526af0a6b..f1b4df6081185 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index 5fdcedd76edbf..eb36e9fb46fc3 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_simple/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..6b1d504fe02e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index 86ca493610032..dc5518c8f81b1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_simple/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json
index 4de88028c9fba..319dc2d4d2efc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json
index 4de88028c9fba..319dc2d4d2efc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json
@@ -9,6 +9,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
index 91547e5ec71b8..46c09a95342a8 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
index 91547e5ec71b8..46c09a95342a8 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
index 5336de40839f2..48adcd38d98bb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index e213d6c327a28..6366a71660ec3 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..fed47cab32b85 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index b8e4423ade941..30dc0ccdf08e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -10,6 +10,7 @@
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src",
     "resolveSourceRoot": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
index 7319ec3d03e3d..83f4874e25f73 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..71e416c72292c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
index 477be2decfcb0..af2fb429a4b48 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..2a5604f1fb3fc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
index 0d25528f041b5..c082deade4022 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..418f27071208b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
index babb41566a553..654b3679c2e9c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..ddaa61fed3755 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json
index 98a9d8ddee1ef..e82287935d647 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json
index 98a9d8ddee1ef..e82287935d647 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
index 26a7372bdd8b1..0d0898023023e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
index 26a7372bdd8b1..0d0898023023e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
index 07a45826b8bd9..3a9d78806e3b3 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
index fd197880aa9a6..45227935acc96 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..85d7886a09778 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
index af9087b1fdcca..38b6c6a550458 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json
index 095f1679fe75a..7a9483fa8ae2e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json
index 095f1679fe75a..7a9483fa8ae2e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json
index c76456c546746..8fc6fc52b888b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json
index c76456c546746..8fc6fc52b888b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
index 3d31526af0a6b..f1b4df6081185 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
index c18aaa793b65f..19ae847b615de 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..6b1d504fe02e1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
index 44c9dec0c5e4b..13e9f298a61b5 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json
index 35884f5fd2aa1..a7af6da07c3a2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json
index 35884f5fd2aa1..a7af6da07c3a2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
index 5fa148b713127..21f6d91d896a2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
index 5fa148b713127..21f6d91d896a2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
index 5336de40839f2..48adcd38d98bb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
index 7c600e86593ba..aa141f896677a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..fed47cab32b85 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
index 6563d66606a9c..56f0c46e4b2d1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
index 7319ec3d03e3d..83f4874e25f73 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..71e416c72292c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
index 477be2decfcb0..af2fb429a4b48 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..2a5604f1fb3fc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
index 0d25528f041b5..c082deade4022 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..418f27071208b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
index babb41566a553..654b3679c2e9c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..ddaa61fed3755 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.json
index 96573ef4e5f05..4c923220c7756 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.json
index 96573ef4e5f05..4c923220c7756 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.json
index b88e5a9345082..520f5f573064c 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.json
@@ -8,6 +8,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.json
index b88e5a9345082..520f5f573064c 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.json
@@ -8,6 +8,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
index 07a45826b8bd9..3a9d78806e3b3 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json
index c4bc520017cca..b399ffc992df9 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json
@@ -8,6 +8,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..85d7886a09778 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json
index 30a40201b6edb..a46c060b18416 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json
@@ -8,6 +8,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.json
index 0328c9914f0a1..73ff0dd88e68b 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.json
index 0328c9914f0a1..73ff0dd88e68b 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.json
index ed11d857232e6..8fbdc5c89d8c1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.json
@@ -8,6 +8,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.json
index ed11d857232e6..8fbdc5c89d8c1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.json
@@ -8,6 +8,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
index 3d31526af0a6b..f1b4df6081185 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json
index 926ee8e90c227..32035ecbe1dcf 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json
@@ -8,6 +8,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..6b1d504fe02e1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json
index 7588606f60680..cda12e840109c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json
@@ -8,6 +8,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.json
index 7c2604a204dbc..241fb0286fb08 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.json
index 7c2604a204dbc..241fb0286fb08 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.json
index f37af38b003d8..9e49d93691a92 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.json
@@ -8,6 +8,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.json
index f37af38b003d8..9e49d93691a92 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.json
@@ -8,6 +8,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
index 5336de40839f2..48adcd38d98bb 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json
index 1925480ffc8b1..2684d00d708a3 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json
@@ -8,6 +8,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..fed47cab32b85 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json
index b014e6bff344b..1e3613d34859e 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json
@@ -8,6 +8,7 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.errors.txt
index 7319ec3d03e3d..83f4874e25f73 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..71e416c72292c 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.errors.txt
index 477be2decfcb0..af2fb429a4b48 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..2a5604f1fb3fc 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.errors.txt
index 0d25528f041b5..c082deade4022 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..418f27071208b 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.errors.txt
index babb41566a553..654b3679c2e9c 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..ddaa61fed3755 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index a5ca1482b5cd4..ddecfa25b01f8 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..b796cb451777c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json
index 2fdfb4b184224..90db6cbe79293 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json
index 2fdfb4b184224..90db6cbe79293 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
index 27711bd31442e..6a5fb4243a1a1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
index 27711bd31442e..6a5fb4243a1a1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
index 07a45826b8bd9..3a9d78806e3b3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
index 3d4fe4f2d5936..99e54d41ae6e7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..85d7886a09778 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
index a1a7cd857fa1c..58998c9ea0318 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json
index a020dd6db380c..d89027e197d4a 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json
index a020dd6db380c..d89027e197d4a 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json
index c864c2d3766bb..c8874b7c5b4a3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json
index c864c2d3766bb..c8874b7c5b4a3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
index 3d31526af0a6b..f1b4df6081185 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json
index 98820967ad213..1af3e961e76fc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..6b1d504fe02e1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json
index 7bd6c4559983a..ecb364f828fba 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json
index 9e1589bd95e91..f2705c41120ce 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json
index 9e1589bd95e91..f2705c41120ce 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json
@@ -8,6 +8,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
index 0da3eb3fb008b..b166839b08ee0 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
index 0da3eb3fb008b..b166839b08ee0 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
index 5336de40839f2..48adcd38d98bb 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
index 6a3e7ecd4a271..980c9d207517e 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..fed47cab32b85 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
index f0d4c07c48afc..8bc875014e1c5 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -9,6 +9,7 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
index 7319ec3d03e3d..83f4874e25f73 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..71e416c72292c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
index 477be2decfcb0..af2fb429a4b48 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..2a5604f1fb3fc 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
index 0d25528f041b5..c082deade4022 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..418f27071208b 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
index babb41566a553..654b3679c2e9c 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..ddaa61fed3755 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/visibilityOfTypeUsedAcrossModules.json b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/visibilityOfTypeUsedAcrossModules.json
index b7ca119530677..0bf02f7e48f3c 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/visibilityOfTypeUsedAcrossModules.json
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/visibilityOfTypeUsedAcrossModules.json
@@ -5,6 +5,7 @@
         "commands.ts"
     ],
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/visibilityOfTypeUsedAcrossModules.json b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/visibilityOfTypeUsedAcrossModules.json
index b7ca119530677..0bf02f7e48f3c 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/visibilityOfTypeUsedAcrossModules.json
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/visibilityOfTypeUsedAcrossModules.json
@@ -5,6 +5,7 @@
         "commands.ts"
     ],
     "baselineCheck": true,
+    "strict": false,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
         "lib.decorators.d.ts",
diff --git a/tests/baselines/reference/promisePermutations.errors.txt b/tests/baselines/reference/promisePermutations.errors.txt
index 58ef3d36a79c2..89f3b21b8a3ef 100644
--- a/tests/baselines/reference/promisePermutations.errors.txt
+++ b/tests/baselines/reference/promisePermutations.errors.txt
@@ -200,29 +200,29 @@ promisePermutations.ts(160,21): error TS2769: No overload matches this call.
     declare function testFunction12P<T>(x: T): IPromise<T>;
     declare function testFunction12P<T>(x: T, y: T): Promise<T>;
     
-    var r1: IPromise<number>;
+    declare var r1: IPromise<number>;
     var r1a = r1.then(testFunction, testFunction, testFunction);
     var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, testFunction, testFunction);
     var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
-    var s1: Promise<number>;
+    declare var s1: Promise<number>;
     var s1a = s1.then(testFunction, testFunction, testFunction);
     var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
     var s1c = s1.then(testFunctionP, testFunction, testFunction);
     var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction, testFunction, testFunction);
     
-    var r2: IPromise<{ x: number; }>;
+    declare var r2: IPromise<{ x: number; }>;
     var r2a = r2.then(testFunction2, testFunction2, testFunction2);
     var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
-    var s2: Promise<{ x: number; }>;
+    declare var s2: Promise<{ x: number; }>;
     var s2a = s2.then(testFunction2, testFunction2, testFunction2);
     var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
     var s2c = s2.then(testFunction2P, testFunction2, testFunction2);
     var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
     
-    var r3: IPromise<number>;
+    declare var r3: IPromise<number>;
     var r3a = r3.then(testFunction3, testFunction3, testFunction3);
     var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3);
-    var s3: Promise<number>;
+    declare var s3: Promise<number>;
     var s3a = s3.then(testFunction3, testFunction3, testFunction3);
     var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
     var s3c = s3.then(testFunction3P, testFunction3, testFunction3);
@@ -235,9 +235,9 @@ promisePermutations.ts(160,21): error TS2769: No overload matches this call.
 !!! error TS2769:         Type 'IPromise<number>' is not assignable to type 'number'.
 !!! related TS2771 promisePermutations.ts:5:5: The last overload is declared here.
     
-    var r4: IPromise<string>;
-    var sIPromise: (x: any) => IPromise<string>;
-    var sPromise: (x: any) => Promise<string>;
+    declare var r4: IPromise<string>;
+    declare var sIPromise: (x: any) => IPromise<string>;
+    declare var sPromise: (x: any) => Promise<string>;
     var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -247,7 +247,7 @@ promisePermutations.ts(160,21): error TS2769: No overload matches this call.
 !!! error TS2769:         Type 'string' is not assignable to type 'number'.
 !!! related TS2771 promisePermutations.ts:13:5: The last overload is declared here.
     var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testFunction4, testFunction4); // ok
-    var s4: Promise<string>;
+    declare var s4: Promise<string>;
     var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -274,7 +274,7 @@ promisePermutations.ts(160,21): error TS2769: No overload matches this call.
 !!! related TS2771 promisePermutations.ts:5:5: The last overload is declared here.
     var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, testFunction4P, testFunction4);
     
-    var r5: IPromise<string>;
+    declare var r5: IPromise<string>;
     var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -283,7 +283,7 @@ promisePermutations.ts(160,21): error TS2769: No overload matches this call.
 !!! error TS2769:       Target signature provides too few arguments. Expected 2 or more, but got 1.
 !!! related TS2771 promisePermutations.ts:13:5: The last overload is declared here.
     var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-    var s5: Promise<string>;
+    declare var s5: Promise<string>;
     var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -307,7 +307,7 @@ promisePermutations.ts(160,21): error TS2769: No overload matches this call.
 !!! related TS2771 promisePermutations.ts:5:5: The last overload is declared here.
     var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
     
-    var r6: IPromise<string>;
+    declare var r6: IPromise<string>;
     var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -316,7 +316,7 @@ promisePermutations.ts(160,21): error TS2769: No overload matches this call.
 !!! error TS2769:       Target signature provides too few arguments. Expected 2 or more, but got 1.
 !!! related TS2771 promisePermutations.ts:13:5: The last overload is declared here.
     var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-    var s6: Promise<string>;
+    declare var s6: Promise<string>;
     var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -340,7 +340,7 @@ promisePermutations.ts(160,21): error TS2769: No overload matches this call.
 !!! related TS2771 promisePermutations.ts:5:5: The last overload is declared here.
     var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
     
-    var r7: IPromise<string>;
+    declare var r7: IPromise<string>;
     var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -350,7 +350,7 @@ promisePermutations.ts(160,21): error TS2769: No overload matches this call.
 !!! error TS2769:         Type 'string' is not assignable to type '<T>(a: T) => T'.
 !!! related TS2771 promisePermutations.ts:13:5: The last overload is declared here.
     var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-    var s7: Promise<string>;
+    declare var s7: Promise<string>;
     var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -377,9 +377,9 @@ promisePermutations.ts(160,21): error TS2769: No overload matches this call.
 !!! related TS2771 promisePermutations.ts:13:5: The last overload is declared here.
     var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromise); // ok?
     
-    var r8: IPromise<number>;
-    var nIPromise: (x: any) => IPromise<number>;
-    var nPromise: (x: any) => Promise<number>;
+    declare var r8: IPromise<number>;
+    declare var nIPromise: (x: any) => IPromise<number>;
+    declare var nPromise: (x: any) => Promise<number>;
     var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -412,7 +412,7 @@ promisePermutations.ts(160,21): error TS2769: No overload matches this call.
 !!! related TS2771 promisePermutations.ts:5:5: The last overload is declared here.
     var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
     
-    var r9: IPromise<number>;
+    declare var r9: IPromise<number>;
     var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -431,7 +431,7 @@ promisePermutations.ts(160,21): error TS2769: No overload matches this call.
 !!! error TS2769:         Type 'string' is not assignable to type 'number'.
 !!! related TS2771 promisePermutations.ts:13:5: The last overload is declared here.
     var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-    var s9: Promise<number>;
+    declare var s9: Promise<number>;
     var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -493,7 +493,7 @@ promisePermutations.ts(160,21): error TS2769: No overload matches this call.
 !!! related TS2771 promisePermutations.ts:5:5: The last overload is declared here.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
     
-    var r11: IPromise<number>;
+    declare var r11: IPromise<number>;
     var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
                         ~~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -502,7 +502,7 @@ promisePermutations.ts(160,21): error TS2769: No overload matches this call.
 !!! error TS2769:       Type 'IPromise<number>' is not assignable to type 'IPromise<string>'.
 !!! error TS2769:         Type 'number' is not assignable to type 'string'.
 !!! related TS2771 promisePermutations.ts:13:5: The last overload is declared here.
-    var s11: Promise<number>;
+    declare var s11: Promise<number>;
     var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
                         ~~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
diff --git a/tests/baselines/reference/promisePermutations.js b/tests/baselines/reference/promisePermutations.js
index 8cc6fae972954..a8f1924fb1f0e 100644
--- a/tests/baselines/reference/promisePermutations.js
+++ b/tests/baselines/reference/promisePermutations.js
@@ -48,75 +48,75 @@ declare function testFunction12<T>(x: T, y: T): IPromise<T>;
 declare function testFunction12P<T>(x: T): IPromise<T>;
 declare function testFunction12P<T>(x: T, y: T): Promise<T>;
 
-var r1: IPromise<number>;
+declare var r1: IPromise<number>;
 var r1a = r1.then(testFunction, testFunction, testFunction);
 var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, testFunction, testFunction);
 var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
-var s1: Promise<number>;
+declare var s1: Promise<number>;
 var s1a = s1.then(testFunction, testFunction, testFunction);
 var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
 var s1c = s1.then(testFunctionP, testFunction, testFunction);
 var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction, testFunction, testFunction);
 
-var r2: IPromise<{ x: number; }>;
+declare var r2: IPromise<{ x: number; }>;
 var r2a = r2.then(testFunction2, testFunction2, testFunction2);
 var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
-var s2: Promise<{ x: number; }>;
+declare var s2: Promise<{ x: number; }>;
 var s2a = s2.then(testFunction2, testFunction2, testFunction2);
 var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
 var s2c = s2.then(testFunction2P, testFunction2, testFunction2);
 var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
 
-var r3: IPromise<number>;
+declare var r3: IPromise<number>;
 var r3a = r3.then(testFunction3, testFunction3, testFunction3);
 var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3);
-var s3: Promise<number>;
+declare var s3: Promise<number>;
 var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
 var s3c = s3.then(testFunction3P, testFunction3, testFunction3);
 var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3); // error
 
-var r4: IPromise<string>;
-var sIPromise: (x: any) => IPromise<string>;
-var sPromise: (x: any) => Promise<string>;
+declare var r4: IPromise<string>;
+declare var sIPromise: (x: any) => IPromise<string>;
+declare var sPromise: (x: any) => Promise<string>;
 var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
 var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testFunction4, testFunction4); // ok
-var s4: Promise<string>;
+declare var s4: Promise<string>;
 var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error 
 var s4c = s4.then(testFunction4P, testFunction4, testFunction4); // error
 var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, testFunction4P, testFunction4);
 
-var r5: IPromise<string>;
+declare var r5: IPromise<string>;
 var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
 var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s5: Promise<string>;
+declare var s5: Promise<string>;
 var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 var s5b = s5.then(testFunction5P, testFunction5P, testFunction5P); // error
 var s5c = s5.then(testFunction5P, testFunction5, testFunction5); // error
 var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
 
-var r6: IPromise<string>;
+declare var r6: IPromise<string>;
 var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
 var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s6: Promise<string>;
+declare var s6: Promise<string>;
 var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 var s6b = s6.then(testFunction6P, testFunction6P, testFunction6P); // error
 var s6c = s6.then(testFunction6P, testFunction6, testFunction6); // error
 var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
 
-var r7: IPromise<string>;
+declare var r7: IPromise<string>;
 var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s7: Promise<string>;
+declare var s7: Promise<string>;
 var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
 var s7c = r7.then(testFunction7P, testFunction7, testFunction7); // error
 var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromise); // ok?
 
-var r8: IPromise<number>;
-var nIPromise: (x: any) => IPromise<number>;
-var nPromise: (x: any) => Promise<number>;
+declare var r8: IPromise<number>;
+declare var nIPromise: (x: any) => IPromise<number>;
+declare var nPromise: (x: any) => Promise<number>;
 var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
 var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 var s8: Promise<number>;
@@ -125,13 +125,13 @@ var s8b = s8.then(testFunction8P, testFunction8P, testFunction8P); // error
 var s8c = s8.then(testFunction8P, testFunction8, testFunction8); // error
 var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 
-var r9: IPromise<number>;
+declare var r9: IPromise<number>;
 var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 var r9b = r9.then(sIPromise, sIPromise, sIPromise); // ok
 var r9c = r9.then(nIPromise, nIPromise, nIPromise); // ok
 var r9d = r9.then(testFunction, sIPromise, nIPromise); // ok
 var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s9: Promise<number>;
+declare var s9: Promise<number>;
 var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
 var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
@@ -155,9 +155,9 @@ var s10e = s10.then(nIPromise, nPromise, nIPromise); // ok
 var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
 var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
 
-var r11: IPromise<number>;
+declare var r11: IPromise<number>;
 var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
-var s11: Promise<number>;
+declare var s11: Promise<number>;
 var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // error
 var s11c = s11.then(testFunction11P, testFunction11, testFunction11); // error
@@ -170,68 +170,49 @@ var s12b = s12.then(testFunction12P, testFunction12P, testFunction12P); // ok
 var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok
 
 //// [promisePermutations.js]
-var r1;
 var r1a = r1.then(testFunction, testFunction, testFunction);
 var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, testFunction, testFunction);
 var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
-var s1;
 var s1a = s1.then(testFunction, testFunction, testFunction);
 var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
 var s1c = s1.then(testFunctionP, testFunction, testFunction);
 var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction, testFunction, testFunction);
-var r2;
 var r2a = r2.then(testFunction2, testFunction2, testFunction2);
 var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
-var s2;
 var s2a = s2.then(testFunction2, testFunction2, testFunction2);
 var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
 var s2c = s2.then(testFunction2P, testFunction2, testFunction2);
 var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
-var r3;
 var r3a = r3.then(testFunction3, testFunction3, testFunction3);
 var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3);
-var s3;
 var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
 var s3c = s3.then(testFunction3P, testFunction3, testFunction3);
 var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3); // error
-var r4;
-var sIPromise;
-var sPromise;
 var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
 var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testFunction4, testFunction4); // ok
-var s4;
 var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error 
 var s4c = s4.then(testFunction4P, testFunction4, testFunction4); // error
 var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, testFunction4P, testFunction4);
-var r5;
 var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
 var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s5;
 var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 var s5b = s5.then(testFunction5P, testFunction5P, testFunction5P); // error
 var s5c = s5.then(testFunction5P, testFunction5, testFunction5); // error
 var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var r6;
 var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
 var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s6;
 var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 var s6b = s6.then(testFunction6P, testFunction6P, testFunction6P); // error
 var s6c = s6.then(testFunction6P, testFunction6, testFunction6); // error
 var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var r7;
 var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s7;
 var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
 var s7c = r7.then(testFunction7P, testFunction7, testFunction7); // error
 var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromise); // ok?
-var r8;
-var nIPromise;
-var nPromise;
 var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
 var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 var s8;
@@ -239,13 +220,11 @@ var s8a = s8.then(testFunction8, testFunction8, testFunction8); // error
 var s8b = s8.then(testFunction8P, testFunction8P, testFunction8P); // error
 var s8c = s8.then(testFunction8P, testFunction8, testFunction8); // error
 var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
-var r9;
 var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 var r9b = r9.then(sIPromise, sIPromise, sIPromise); // ok
 var r9c = r9.then(nIPromise, nIPromise, nIPromise); // ok
 var r9d = r9.then(testFunction, sIPromise, nIPromise); // ok
 var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s9;
 var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
 var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
@@ -267,9 +246,7 @@ var s10d = s10.then(sPromise, sPromise, sPromise); // ok
 var s10e = s10.then(nIPromise, nPromise, nIPromise); // ok
 var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
 var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
-var r11;
 var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
-var s11;
 var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // error
 var s11c = s11.then(testFunction11P, testFunction11, testFunction11); // error
diff --git a/tests/baselines/reference/promisePermutations.symbols b/tests/baselines/reference/promisePermutations.symbols
index 0bdab5102b05a..e71489914c4cf 100644
--- a/tests/baselines/reference/promisePermutations.symbols
+++ b/tests/baselines/reference/promisePermutations.symbols
@@ -381,14 +381,14 @@ declare function testFunction12P<T>(x: T, y: T): Promise<T>;
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations.ts, 0, 0))
 >T : Symbol(T, Decl(promisePermutations.ts, 45, 33))
 
-var r1: IPromise<number>;
->r1 : Symbol(r1, Decl(promisePermutations.ts, 47, 3))
+declare var r1: IPromise<number>;
+>r1 : Symbol(r1, Decl(promisePermutations.ts, 47, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations.ts, 6, 1))
 
 var r1a = r1.then(testFunction, testFunction, testFunction);
 >r1a : Symbol(r1a, Decl(promisePermutations.ts, 48, 3))
 >r1.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r1 : Symbol(r1, Decl(promisePermutations.ts, 47, 3))
+>r1 : Symbol(r1, Decl(promisePermutations.ts, 47, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
@@ -398,7 +398,7 @@ var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, t
 >r1b : Symbol(r1b, Decl(promisePermutations.ts, 49, 3))
 >r1.then(testFunction, testFunction, testFunction).then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >r1.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r1 : Symbol(r1, Decl(promisePermutations.ts, 47, 3))
+>r1 : Symbol(r1, Decl(promisePermutations.ts, 47, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
@@ -411,20 +411,20 @@ var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, t
 var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
 >r1c : Symbol(r1c, Decl(promisePermutations.ts, 50, 3))
 >r1.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r1 : Symbol(r1, Decl(promisePermutations.ts, 47, 3))
+>r1 : Symbol(r1, Decl(promisePermutations.ts, 47, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations.ts, 16, 50))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations.ts, 16, 50))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations.ts, 16, 50))
 
-var s1: Promise<number>;
->s1 : Symbol(s1, Decl(promisePermutations.ts, 51, 3))
+declare var s1: Promise<number>;
+>s1 : Symbol(s1, Decl(promisePermutations.ts, 51, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations.ts, 0, 0))
 
 var s1a = s1.then(testFunction, testFunction, testFunction);
 >s1a : Symbol(s1a, Decl(promisePermutations.ts, 52, 3))
 >s1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s1 : Symbol(s1, Decl(promisePermutations.ts, 51, 3))
+>s1 : Symbol(s1, Decl(promisePermutations.ts, 51, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
@@ -433,7 +433,7 @@ var s1a = s1.then(testFunction, testFunction, testFunction);
 var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
 >s1b : Symbol(s1b, Decl(promisePermutations.ts, 53, 3))
 >s1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s1 : Symbol(s1, Decl(promisePermutations.ts, 51, 3))
+>s1 : Symbol(s1, Decl(promisePermutations.ts, 51, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations.ts, 16, 50))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations.ts, 16, 50))
@@ -442,7 +442,7 @@ var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
 var s1c = s1.then(testFunctionP, testFunction, testFunction);
 >s1c : Symbol(s1c, Decl(promisePermutations.ts, 54, 3))
 >s1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s1 : Symbol(s1, Decl(promisePermutations.ts, 51, 3))
+>s1 : Symbol(s1, Decl(promisePermutations.ts, 51, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations.ts, 16, 50))
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
@@ -452,7 +452,7 @@ var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction,
 >s1d : Symbol(s1d, Decl(promisePermutations.ts, 55, 3))
 >s1.then(testFunctionP, testFunction, testFunction).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >s1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s1 : Symbol(s1, Decl(promisePermutations.ts, 51, 3))
+>s1 : Symbol(s1, Decl(promisePermutations.ts, 51, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations.ts, 16, 50))
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
@@ -462,15 +462,15 @@ var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction,
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
 
-var r2: IPromise<{ x: number; }>;
->r2 : Symbol(r2, Decl(promisePermutations.ts, 57, 3))
+declare var r2: IPromise<{ x: number; }>;
+>r2 : Symbol(r2, Decl(promisePermutations.ts, 57, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations.ts, 6, 1))
->x : Symbol(x, Decl(promisePermutations.ts, 57, 18))
+>x : Symbol(x, Decl(promisePermutations.ts, 57, 26))
 
 var r2a = r2.then(testFunction2, testFunction2, testFunction2);
 >r2a : Symbol(r2a, Decl(promisePermutations.ts, 58, 3))
 >r2.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r2 : Symbol(r2, Decl(promisePermutations.ts, 57, 3))
+>r2 : Symbol(r2, Decl(promisePermutations.ts, 57, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations.ts, 17, 50))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations.ts, 17, 50))
@@ -480,7 +480,7 @@ var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction
 >r2b : Symbol(r2b, Decl(promisePermutations.ts, 59, 3))
 >r2.then(testFunction2, testFunction2, testFunction2).then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >r2.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r2 : Symbol(r2, Decl(promisePermutations.ts, 57, 3))
+>r2 : Symbol(r2, Decl(promisePermutations.ts, 57, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations.ts, 17, 50))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations.ts, 17, 50))
@@ -490,15 +490,15 @@ var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations.ts, 17, 50))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations.ts, 17, 50))
 
-var s2: Promise<{ x: number; }>;
->s2 : Symbol(s2, Decl(promisePermutations.ts, 60, 3))
+declare var s2: Promise<{ x: number; }>;
+>s2 : Symbol(s2, Decl(promisePermutations.ts, 60, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations.ts, 0, 0))
->x : Symbol(x, Decl(promisePermutations.ts, 60, 17))
+>x : Symbol(x, Decl(promisePermutations.ts, 60, 25))
 
 var s2a = s2.then(testFunction2, testFunction2, testFunction2);
 >s2a : Symbol(s2a, Decl(promisePermutations.ts, 61, 3))
 >s2.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s2 : Symbol(s2, Decl(promisePermutations.ts, 60, 3))
+>s2 : Symbol(s2, Decl(promisePermutations.ts, 60, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations.ts, 17, 50))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations.ts, 17, 50))
@@ -507,7 +507,7 @@ var s2a = s2.then(testFunction2, testFunction2, testFunction2);
 var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
 >s2b : Symbol(s2b, Decl(promisePermutations.ts, 62, 3))
 >s2.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s2 : Symbol(s2, Decl(promisePermutations.ts, 60, 3))
+>s2 : Symbol(s2, Decl(promisePermutations.ts, 60, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction2P : Symbol(testFunction2P, Decl(promisePermutations.ts, 18, 58))
 >testFunction2P : Symbol(testFunction2P, Decl(promisePermutations.ts, 18, 58))
@@ -516,7 +516,7 @@ var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
 var s2c = s2.then(testFunction2P, testFunction2, testFunction2);
 >s2c : Symbol(s2c, Decl(promisePermutations.ts, 63, 3))
 >s2.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s2 : Symbol(s2, Decl(promisePermutations.ts, 60, 3))
+>s2 : Symbol(s2, Decl(promisePermutations.ts, 60, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction2P : Symbol(testFunction2P, Decl(promisePermutations.ts, 18, 58))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations.ts, 17, 50))
@@ -526,7 +526,7 @@ var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunctio
 >s2d : Symbol(s2d, Decl(promisePermutations.ts, 64, 3))
 >s2.then(testFunction2P, testFunction2, testFunction2).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >s2.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s2 : Symbol(s2, Decl(promisePermutations.ts, 60, 3))
+>s2 : Symbol(s2, Decl(promisePermutations.ts, 60, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction2P : Symbol(testFunction2P, Decl(promisePermutations.ts, 18, 58))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations.ts, 17, 50))
@@ -536,14 +536,14 @@ var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunctio
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations.ts, 17, 50))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations.ts, 17, 50))
 
-var r3: IPromise<number>;
->r3 : Symbol(r3, Decl(promisePermutations.ts, 66, 3))
+declare var r3: IPromise<number>;
+>r3 : Symbol(r3, Decl(promisePermutations.ts, 66, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations.ts, 6, 1))
 
 var r3a = r3.then(testFunction3, testFunction3, testFunction3);
 >r3a : Symbol(r3a, Decl(promisePermutations.ts, 67, 3))
 >r3.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r3 : Symbol(r3, Decl(promisePermutations.ts, 66, 3))
+>r3 : Symbol(r3, Decl(promisePermutations.ts, 66, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations.ts, 19, 58))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations.ts, 19, 58))
@@ -553,7 +553,7 @@ var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction
 >r3b : Symbol(r3b, Decl(promisePermutations.ts, 68, 3))
 >r3.then(testFunction3, testFunction3, testFunction3).then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >r3.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r3 : Symbol(r3, Decl(promisePermutations.ts, 66, 3))
+>r3 : Symbol(r3, Decl(promisePermutations.ts, 66, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations.ts, 19, 58))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations.ts, 19, 58))
@@ -563,14 +563,14 @@ var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations.ts, 19, 58))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations.ts, 19, 58))
 
-var s3: Promise<number>;
->s3 : Symbol(s3, Decl(promisePermutations.ts, 69, 3))
+declare var s3: Promise<number>;
+>s3 : Symbol(s3, Decl(promisePermutations.ts, 69, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations.ts, 0, 0))
 
 var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 >s3a : Symbol(s3a, Decl(promisePermutations.ts, 70, 3))
 >s3.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s3 : Symbol(s3, Decl(promisePermutations.ts, 69, 3))
+>s3 : Symbol(s3, Decl(promisePermutations.ts, 69, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations.ts, 19, 58))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations.ts, 19, 58))
@@ -579,7 +579,7 @@ var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
 >s3b : Symbol(s3b, Decl(promisePermutations.ts, 71, 3))
 >s3.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s3 : Symbol(s3, Decl(promisePermutations.ts, 69, 3))
+>s3 : Symbol(s3, Decl(promisePermutations.ts, 69, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction3P : Symbol(testFunction3P, Decl(promisePermutations.ts, 20, 60))
 >testFunction3P : Symbol(testFunction3P, Decl(promisePermutations.ts, 20, 60))
@@ -588,7 +588,7 @@ var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
 var s3c = s3.then(testFunction3P, testFunction3, testFunction3);
 >s3c : Symbol(s3c, Decl(promisePermutations.ts, 72, 3))
 >s3.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s3 : Symbol(s3, Decl(promisePermutations.ts, 69, 3))
+>s3 : Symbol(s3, Decl(promisePermutations.ts, 69, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction3P : Symbol(testFunction3P, Decl(promisePermutations.ts, 20, 60))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations.ts, 19, 58))
@@ -598,7 +598,7 @@ var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunctio
 >s3d : Symbol(s3d, Decl(promisePermutations.ts, 73, 3))
 >s3.then(testFunction3P, testFunction3, testFunction3).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >s3.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s3 : Symbol(s3, Decl(promisePermutations.ts, 69, 3))
+>s3 : Symbol(s3, Decl(promisePermutations.ts, 69, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction3P : Symbol(testFunction3P, Decl(promisePermutations.ts, 20, 60))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations.ts, 19, 58))
@@ -608,24 +608,24 @@ var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunctio
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations.ts, 19, 58))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations.ts, 19, 58))
 
-var r4: IPromise<string>;
->r4 : Symbol(r4, Decl(promisePermutations.ts, 75, 3))
+declare var r4: IPromise<string>;
+>r4 : Symbol(r4, Decl(promisePermutations.ts, 75, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations.ts, 6, 1))
 
-var sIPromise: (x: any) => IPromise<string>;
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->x : Symbol(x, Decl(promisePermutations.ts, 76, 16))
+declare var sIPromise: (x: any) => IPromise<string>;
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>x : Symbol(x, Decl(promisePermutations.ts, 76, 24))
 >IPromise : Symbol(IPromise, Decl(promisePermutations.ts, 6, 1))
 
-var sPromise: (x: any) => Promise<string>;
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
->x : Symbol(x, Decl(promisePermutations.ts, 77, 15))
+declare var sPromise: (x: any) => Promise<string>;
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
+>x : Symbol(x, Decl(promisePermutations.ts, 77, 23))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations.ts, 0, 0))
 
 var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
 >r4a : Symbol(r4a, Decl(promisePermutations.ts, 78, 3))
 >r4.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r4 : Symbol(r4, Decl(promisePermutations.ts, 75, 3))
+>r4 : Symbol(r4, Decl(promisePermutations.ts, 75, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations.ts, 21, 60))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations.ts, 21, 60))
@@ -635,24 +635,24 @@ var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testF
 >r4b : Symbol(r4b, Decl(promisePermutations.ts, 79, 3))
 >r4.then(sIPromise, testFunction4, testFunction4).then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >r4.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r4 : Symbol(r4, Decl(promisePermutations.ts, 75, 3))
+>r4 : Symbol(r4, Decl(promisePermutations.ts, 75, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations.ts, 21, 60))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations.ts, 21, 60))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations.ts, 21, 60))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations.ts, 21, 60))
 
-var s4: Promise<string>;
->s4 : Symbol(s4, Decl(promisePermutations.ts, 80, 3))
+declare var s4: Promise<string>;
+>s4 : Symbol(s4, Decl(promisePermutations.ts, 80, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations.ts, 0, 0))
 
 var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 >s4a : Symbol(s4a, Decl(promisePermutations.ts, 81, 3))
 >s4.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s4 : Symbol(s4, Decl(promisePermutations.ts, 80, 3))
+>s4 : Symbol(s4, Decl(promisePermutations.ts, 80, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations.ts, 21, 60))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations.ts, 21, 60))
@@ -661,7 +661,7 @@ var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error 
 >s4b : Symbol(s4b, Decl(promisePermutations.ts, 82, 3))
 >s4.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s4 : Symbol(s4, Decl(promisePermutations.ts, 80, 3))
+>s4 : Symbol(s4, Decl(promisePermutations.ts, 80, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction4P : Symbol(testFunction4P, Decl(promisePermutations.ts, 22, 72))
 >testFunction4P : Symbol(testFunction4P, Decl(promisePermutations.ts, 22, 72))
@@ -670,7 +670,7 @@ var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error
 var s4c = s4.then(testFunction4P, testFunction4, testFunction4); // error
 >s4c : Symbol(s4c, Decl(promisePermutations.ts, 83, 3))
 >s4.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s4 : Symbol(s4, Decl(promisePermutations.ts, 80, 3))
+>s4 : Symbol(s4, Decl(promisePermutations.ts, 80, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction4P : Symbol(testFunction4P, Decl(promisePermutations.ts, 22, 72))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations.ts, 21, 60))
@@ -680,24 +680,24 @@ var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, test
 >s4d : Symbol(s4d, Decl(promisePermutations.ts, 84, 3))
 >s4.then(sIPromise, testFunction4P, testFunction4).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >s4.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s4 : Symbol(s4, Decl(promisePermutations.ts, 80, 3))
+>s4 : Symbol(s4, Decl(promisePermutations.ts, 80, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 >testFunction4P : Symbol(testFunction4P, Decl(promisePermutations.ts, 22, 72))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations.ts, 21, 60))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 >testFunction4P : Symbol(testFunction4P, Decl(promisePermutations.ts, 22, 72))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations.ts, 21, 60))
 
-var r5: IPromise<string>;
->r5 : Symbol(r5, Decl(promisePermutations.ts, 86, 3))
+declare var r5: IPromise<string>;
+>r5 : Symbol(r5, Decl(promisePermutations.ts, 86, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations.ts, 6, 1))
 
 var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
 >r5a : Symbol(r5a, Decl(promisePermutations.ts, 87, 3))
 >r5.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r5 : Symbol(r5, Decl(promisePermutations.ts, 86, 3))
+>r5 : Symbol(r5, Decl(promisePermutations.ts, 86, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction5 : Symbol(testFunction5, Decl(promisePermutations.ts, 23, 72))
 >testFunction5 : Symbol(testFunction5, Decl(promisePermutations.ts, 23, 72))
@@ -707,24 +707,24 @@ var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >r5b : Symbol(r5b, Decl(promisePermutations.ts, 88, 3))
 >r5.then(sIPromise, sIPromise, sIPromise).then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >r5.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r5 : Symbol(r5, Decl(promisePermutations.ts, 86, 3))
+>r5 : Symbol(r5, Decl(promisePermutations.ts, 86, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 
-var s5: Promise<string>;
->s5 : Symbol(s5, Decl(promisePermutations.ts, 89, 3))
+declare var s5: Promise<string>;
+>s5 : Symbol(s5, Decl(promisePermutations.ts, 89, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations.ts, 0, 0))
 
 var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 >s5a : Symbol(s5a, Decl(promisePermutations.ts, 90, 3))
 >s5.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s5 : Symbol(s5, Decl(promisePermutations.ts, 89, 3))
+>s5 : Symbol(s5, Decl(promisePermutations.ts, 89, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction5 : Symbol(testFunction5, Decl(promisePermutations.ts, 23, 72))
 >testFunction5 : Symbol(testFunction5, Decl(promisePermutations.ts, 23, 72))
@@ -733,7 +733,7 @@ var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 var s5b = s5.then(testFunction5P, testFunction5P, testFunction5P); // error
 >s5b : Symbol(s5b, Decl(promisePermutations.ts, 91, 3))
 >s5.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s5 : Symbol(s5, Decl(promisePermutations.ts, 89, 3))
+>s5 : Symbol(s5, Decl(promisePermutations.ts, 89, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction5P : Symbol(testFunction5P, Decl(promisePermutations.ts, 24, 87))
 >testFunction5P : Symbol(testFunction5P, Decl(promisePermutations.ts, 24, 87))
@@ -742,7 +742,7 @@ var s5b = s5.then(testFunction5P, testFunction5P, testFunction5P); // error
 var s5c = s5.then(testFunction5P, testFunction5, testFunction5); // error
 >s5c : Symbol(s5c, Decl(promisePermutations.ts, 92, 3))
 >s5.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s5 : Symbol(s5, Decl(promisePermutations.ts, 89, 3))
+>s5 : Symbol(s5, Decl(promisePermutations.ts, 89, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction5P : Symbol(testFunction5P, Decl(promisePermutations.ts, 24, 87))
 >testFunction5 : Symbol(testFunction5, Decl(promisePermutations.ts, 23, 72))
@@ -752,24 +752,24 @@ var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 >s5d : Symbol(s5d, Decl(promisePermutations.ts, 93, 3))
 >s5.then(sPromise, sPromise, sPromise).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >s5.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s5 : Symbol(s5, Decl(promisePermutations.ts, 89, 3))
+>s5 : Symbol(s5, Decl(promisePermutations.ts, 89, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 
-var r6: IPromise<string>;
->r6 : Symbol(r6, Decl(promisePermutations.ts, 95, 3))
+declare var r6: IPromise<string>;
+>r6 : Symbol(r6, Decl(promisePermutations.ts, 95, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations.ts, 6, 1))
 
 var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
 >r6a : Symbol(r6a, Decl(promisePermutations.ts, 96, 3))
 >r6.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r6 : Symbol(r6, Decl(promisePermutations.ts, 95, 3))
+>r6 : Symbol(r6, Decl(promisePermutations.ts, 95, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction6 : Symbol(testFunction6, Decl(promisePermutations.ts, 25, 87))
 >testFunction6 : Symbol(testFunction6, Decl(promisePermutations.ts, 25, 87))
@@ -779,24 +779,24 @@ var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >r6b : Symbol(r6b, Decl(promisePermutations.ts, 97, 3))
 >r6.then(sIPromise, sIPromise, sIPromise).then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >r6.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r6 : Symbol(r6, Decl(promisePermutations.ts, 95, 3))
+>r6 : Symbol(r6, Decl(promisePermutations.ts, 95, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 
-var s6: Promise<string>;
->s6 : Symbol(s6, Decl(promisePermutations.ts, 98, 3))
+declare var s6: Promise<string>;
+>s6 : Symbol(s6, Decl(promisePermutations.ts, 98, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations.ts, 0, 0))
 
 var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 >s6a : Symbol(s6a, Decl(promisePermutations.ts, 99, 3))
 >s6.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s6 : Symbol(s6, Decl(promisePermutations.ts, 98, 3))
+>s6 : Symbol(s6, Decl(promisePermutations.ts, 98, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction6 : Symbol(testFunction6, Decl(promisePermutations.ts, 25, 87))
 >testFunction6 : Symbol(testFunction6, Decl(promisePermutations.ts, 25, 87))
@@ -805,7 +805,7 @@ var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 var s6b = s6.then(testFunction6P, testFunction6P, testFunction6P); // error
 >s6b : Symbol(s6b, Decl(promisePermutations.ts, 100, 3))
 >s6.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s6 : Symbol(s6, Decl(promisePermutations.ts, 98, 3))
+>s6 : Symbol(s6, Decl(promisePermutations.ts, 98, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction6P : Symbol(testFunction6P, Decl(promisePermutations.ts, 26, 80))
 >testFunction6P : Symbol(testFunction6P, Decl(promisePermutations.ts, 26, 80))
@@ -814,7 +814,7 @@ var s6b = s6.then(testFunction6P, testFunction6P, testFunction6P); // error
 var s6c = s6.then(testFunction6P, testFunction6, testFunction6); // error
 >s6c : Symbol(s6c, Decl(promisePermutations.ts, 101, 3))
 >s6.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s6 : Symbol(s6, Decl(promisePermutations.ts, 98, 3))
+>s6 : Symbol(s6, Decl(promisePermutations.ts, 98, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction6P : Symbol(testFunction6P, Decl(promisePermutations.ts, 26, 80))
 >testFunction6 : Symbol(testFunction6, Decl(promisePermutations.ts, 25, 87))
@@ -824,24 +824,24 @@ var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 >s6d : Symbol(s6d, Decl(promisePermutations.ts, 102, 3))
 >s6.then(sPromise, sPromise, sPromise).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >s6.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s6 : Symbol(s6, Decl(promisePermutations.ts, 98, 3))
+>s6 : Symbol(s6, Decl(promisePermutations.ts, 98, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 
-var r7: IPromise<string>;
->r7 : Symbol(r7, Decl(promisePermutations.ts, 104, 3))
+declare var r7: IPromise<string>;
+>r7 : Symbol(r7, Decl(promisePermutations.ts, 104, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations.ts, 6, 1))
 
 var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 >r7a : Symbol(r7a, Decl(promisePermutations.ts, 105, 3))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r7 : Symbol(r7, Decl(promisePermutations.ts, 104, 3))
+>r7 : Symbol(r7, Decl(promisePermutations.ts, 104, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction7 : Symbol(testFunction7, Decl(promisePermutations.ts, 27, 80))
 >testFunction7 : Symbol(testFunction7, Decl(promisePermutations.ts, 27, 80))
@@ -851,24 +851,24 @@ var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >r7b : Symbol(r7b, Decl(promisePermutations.ts, 106, 3))
 >r7.then(sIPromise, sIPromise, sIPromise).then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r7 : Symbol(r7, Decl(promisePermutations.ts, 104, 3))
+>r7 : Symbol(r7, Decl(promisePermutations.ts, 104, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 
-var s7: Promise<string>;
->s7 : Symbol(s7, Decl(promisePermutations.ts, 107, 3))
+declare var s7: Promise<string>;
+>s7 : Symbol(s7, Decl(promisePermutations.ts, 107, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations.ts, 0, 0))
 
 var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 >s7a : Symbol(s7a, Decl(promisePermutations.ts, 108, 3))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r7 : Symbol(r7, Decl(promisePermutations.ts, 104, 3))
+>r7 : Symbol(r7, Decl(promisePermutations.ts, 104, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction7 : Symbol(testFunction7, Decl(promisePermutations.ts, 27, 80))
 >testFunction7 : Symbol(testFunction7, Decl(promisePermutations.ts, 27, 80))
@@ -877,7 +877,7 @@ var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
 >s7b : Symbol(s7b, Decl(promisePermutations.ts, 109, 3))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r7 : Symbol(r7, Decl(promisePermutations.ts, 104, 3))
+>r7 : Symbol(r7, Decl(promisePermutations.ts, 104, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction7P : Symbol(testFunction7P, Decl(promisePermutations.ts, 28, 69))
 >testFunction7P : Symbol(testFunction7P, Decl(promisePermutations.ts, 28, 69))
@@ -886,7 +886,7 @@ var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
 var s7c = r7.then(testFunction7P, testFunction7, testFunction7); // error
 >s7c : Symbol(s7c, Decl(promisePermutations.ts, 110, 3))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r7 : Symbol(r7, Decl(promisePermutations.ts, 104, 3))
+>r7 : Symbol(r7, Decl(promisePermutations.ts, 104, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction7P : Symbol(testFunction7P, Decl(promisePermutations.ts, 28, 69))
 >testFunction7 : Symbol(testFunction7, Decl(promisePermutations.ts, 27, 80))
@@ -896,34 +896,34 @@ var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromis
 >s7d : Symbol(s7d, Decl(promisePermutations.ts, 111, 3))
 >r7.then(sPromise, sPromise, sPromise).then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r7 : Symbol(r7, Decl(promisePermutations.ts, 104, 3))
+>r7 : Symbol(r7, Decl(promisePermutations.ts, 104, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
 
-var r8: IPromise<number>;
->r8 : Symbol(r8, Decl(promisePermutations.ts, 113, 3))
+declare var r8: IPromise<number>;
+>r8 : Symbol(r8, Decl(promisePermutations.ts, 113, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations.ts, 6, 1))
 
-var nIPromise: (x: any) => IPromise<number>;
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->x : Symbol(x, Decl(promisePermutations.ts, 114, 16))
+declare var nIPromise: (x: any) => IPromise<number>;
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>x : Symbol(x, Decl(promisePermutations.ts, 114, 24))
 >IPromise : Symbol(IPromise, Decl(promisePermutations.ts, 6, 1))
 
-var nPromise: (x: any) => Promise<number>;
->nPromise : Symbol(nPromise, Decl(promisePermutations.ts, 115, 3))
->x : Symbol(x, Decl(promisePermutations.ts, 115, 15))
+declare var nPromise: (x: any) => Promise<number>;
+>nPromise : Symbol(nPromise, Decl(promisePermutations.ts, 115, 11))
+>x : Symbol(x, Decl(promisePermutations.ts, 115, 23))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations.ts, 0, 0))
 
 var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
 >r8a : Symbol(r8a, Decl(promisePermutations.ts, 116, 3))
 >r8.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r8 : Symbol(r8, Decl(promisePermutations.ts, 113, 3))
+>r8 : Symbol(r8, Decl(promisePermutations.ts, 113, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction8 : Symbol(testFunction8, Decl(promisePermutations.ts, 29, 69))
 >testFunction8 : Symbol(testFunction8, Decl(promisePermutations.ts, 29, 69))
@@ -933,15 +933,15 @@ var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nI
 >r8b : Symbol(r8b, Decl(promisePermutations.ts, 117, 3))
 >r8.then(nIPromise, nIPromise, nIPromise).then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >r8.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r8 : Symbol(r8, Decl(promisePermutations.ts, 113, 3))
+>r8 : Symbol(r8, Decl(promisePermutations.ts, 113, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
 
 var s8: Promise<number>;
 >s8 : Symbol(s8, Decl(promisePermutations.ts, 118, 3))
@@ -980,22 +980,22 @@ var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nI
 >s8.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >s8 : Symbol(s8, Decl(promisePermutations.ts, 118, 3))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
 
-var r9: IPromise<number>;
->r9 : Symbol(r9, Decl(promisePermutations.ts, 124, 3))
+declare var r9: IPromise<number>;
+>r9 : Symbol(r9, Decl(promisePermutations.ts, 124, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations.ts, 6, 1))
 
 var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 >r9a : Symbol(r9a, Decl(promisePermutations.ts, 125, 3))
 >r9.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r9 : Symbol(r9, Decl(promisePermutations.ts, 124, 3))
+>r9 : Symbol(r9, Decl(promisePermutations.ts, 124, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction9 : Symbol(testFunction9, Decl(promisePermutations.ts, 31, 70))
 >testFunction9 : Symbol(testFunction9, Decl(promisePermutations.ts, 31, 70))
@@ -1004,52 +1004,52 @@ var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 var r9b = r9.then(sIPromise, sIPromise, sIPromise); // ok
 >r9b : Symbol(r9b, Decl(promisePermutations.ts, 126, 3))
 >r9.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r9 : Symbol(r9, Decl(promisePermutations.ts, 124, 3))
+>r9 : Symbol(r9, Decl(promisePermutations.ts, 124, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 
 var r9c = r9.then(nIPromise, nIPromise, nIPromise); // ok
 >r9c : Symbol(r9c, Decl(promisePermutations.ts, 127, 3))
 >r9.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r9 : Symbol(r9, Decl(promisePermutations.ts, 124, 3))
+>r9 : Symbol(r9, Decl(promisePermutations.ts, 124, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
 
 var r9d = r9.then(testFunction, sIPromise, nIPromise); // ok
 >r9d : Symbol(r9d, Decl(promisePermutations.ts, 128, 3))
 >r9.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r9 : Symbol(r9, Decl(promisePermutations.ts, 124, 3))
+>r9 : Symbol(r9, Decl(promisePermutations.ts, 124, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
 
 var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
 >r9e : Symbol(r9e, Decl(promisePermutations.ts, 129, 3))
 >r9.then(testFunction, nIPromise, sIPromise).then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >r9.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r9 : Symbol(r9, Decl(promisePermutations.ts, 124, 3))
+>r9 : Symbol(r9, Decl(promisePermutations.ts, 124, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 
-var s9: Promise<number>;
->s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 3))
+declare var s9: Promise<number>;
+>s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations.ts, 0, 0))
 
 var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 >s9a : Symbol(s9a, Decl(promisePermutations.ts, 131, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 3))
+>s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction9 : Symbol(testFunction9, Decl(promisePermutations.ts, 31, 70))
 >testFunction9 : Symbol(testFunction9, Decl(promisePermutations.ts, 31, 70))
@@ -1058,7 +1058,7 @@ var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
 >s9b : Symbol(s9b, Decl(promisePermutations.ts, 132, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 3))
+>s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction9P : Symbol(testFunction9P, Decl(promisePermutations.ts, 32, 73))
 >testFunction9P : Symbol(testFunction9P, Decl(promisePermutations.ts, 32, 73))
@@ -1067,7 +1067,7 @@ var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
 var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
 >s9c : Symbol(s9c, Decl(promisePermutations.ts, 133, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 3))
+>s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction9P : Symbol(testFunction9P, Decl(promisePermutations.ts, 32, 73))
 >testFunction9 : Symbol(testFunction9, Decl(promisePermutations.ts, 31, 70))
@@ -1076,43 +1076,43 @@ var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
 var s9d = s9.then(sPromise, sPromise, sPromise); // ok
 >s9d : Symbol(s9d, Decl(promisePermutations.ts, 134, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 3))
+>s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
 
 var s9e = s9.then(nPromise, nPromise, nPromise); // ok
 >s9e : Symbol(s9e, Decl(promisePermutations.ts, 135, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 3))
+>s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->nPromise : Symbol(nPromise, Decl(promisePermutations.ts, 115, 3))
->nPromise : Symbol(nPromise, Decl(promisePermutations.ts, 115, 3))
->nPromise : Symbol(nPromise, Decl(promisePermutations.ts, 115, 3))
+>nPromise : Symbol(nPromise, Decl(promisePermutations.ts, 115, 11))
+>nPromise : Symbol(nPromise, Decl(promisePermutations.ts, 115, 11))
+>nPromise : Symbol(nPromise, Decl(promisePermutations.ts, 115, 11))
 
 var s9f = s9.then(testFunction, sIPromise, nIPromise); // error
 >s9f : Symbol(s9f, Decl(promisePermutations.ts, 136, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 3))
+>s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
 
 var s9g = s9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
 >s9g : Symbol(s9g, Decl(promisePermutations.ts, 137, 3))
 >s9.then(testFunction, nIPromise, sIPromise).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 3))
+>s9 : Symbol(s9, Decl(promisePermutations.ts, 130, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 
 var r10 = testFunction10(x => x);
 >r10 : Symbol(r10, Decl(promisePermutations.ts, 139, 3))
@@ -1134,18 +1134,18 @@ var r10b = r10.then(sIPromise, sIPromise, sIPromise); // ok
 >r10.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >r10 : Symbol(r10, Decl(promisePermutations.ts, 139, 3))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 
 var r10c = r10.then(nIPromise, nIPromise, nIPromise); // ok
 >r10c : Symbol(r10c, Decl(promisePermutations.ts, 142, 3))
 >r10.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >r10 : Symbol(r10, Decl(promisePermutations.ts, 139, 3))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
 
 var r10d = r10.then(testFunction, sIPromise, nIPromise); // ok
 >r10d : Symbol(r10d, Decl(promisePermutations.ts, 143, 3))
@@ -1153,8 +1153,8 @@ var r10d = r10.then(testFunction, sIPromise, nIPromise); // ok
 >r10 : Symbol(r10, Decl(promisePermutations.ts, 139, 3))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
 
 var r10e = r10.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
 >r10e : Symbol(r10e, Decl(promisePermutations.ts, 144, 3))
@@ -1163,12 +1163,12 @@ var r10e = r10.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromis
 >r10 : Symbol(r10, Decl(promisePermutations.ts, 139, 3))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction : Symbol(testFunction, Decl(promisePermutations.ts, 14, 1))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 
 var s10 = testFunction10P(x => x);
 >s10 : Symbol(s10, Decl(promisePermutations.ts, 145, 3))
@@ -1208,18 +1208,18 @@ var s10d = s10.then(sPromise, sPromise, sPromise); // ok
 >s10.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >s10 : Symbol(s10, Decl(promisePermutations.ts, 145, 3))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
 
 var s10e = s10.then(nIPromise, nPromise, nIPromise); // ok
 >s10e : Symbol(s10e, Decl(promisePermutations.ts, 150, 3))
 >s10.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >s10 : Symbol(s10, Decl(promisePermutations.ts, 145, 3))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->nPromise : Symbol(nPromise, Decl(promisePermutations.ts, 115, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>nPromise : Symbol(nPromise, Decl(promisePermutations.ts, 115, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
 
 var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
 >s10f : Symbol(s10f, Decl(promisePermutations.ts, 151, 3))
@@ -1227,8 +1227,8 @@ var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
 >s10 : Symbol(s10, Decl(promisePermutations.ts, 145, 3))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations.ts, 16, 50))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
 
 var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
 >s10g : Symbol(s10g, Decl(promisePermutations.ts, 152, 3))
@@ -1237,34 +1237,34 @@ var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromis
 >s10 : Symbol(s10, Decl(promisePermutations.ts, 145, 3))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations.ts, 16, 50))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations.ts, 114, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations.ts, 77, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations.ts, 76, 11))
 
-var r11: IPromise<number>;
->r11 : Symbol(r11, Decl(promisePermutations.ts, 154, 3))
+declare var r11: IPromise<number>;
+>r11 : Symbol(r11, Decl(promisePermutations.ts, 154, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations.ts, 6, 1))
 
 var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
 >r11a : Symbol(r11a, Decl(promisePermutations.ts, 155, 3))
 >r11.then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
->r11 : Symbol(r11, Decl(promisePermutations.ts, 154, 3))
+>r11 : Symbol(r11, Decl(promisePermutations.ts, 154, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations.ts, 8, 23), Decl(promisePermutations.ts, 9, 135), Decl(promisePermutations.ts, 10, 125), Decl(promisePermutations.ts, 11, 125))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations.ts, 35, 68), Decl(promisePermutations.ts, 37, 61))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations.ts, 35, 68), Decl(promisePermutations.ts, 37, 61))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations.ts, 35, 68), Decl(promisePermutations.ts, 37, 61))
 
-var s11: Promise<number>;
->s11 : Symbol(s11, Decl(promisePermutations.ts, 156, 3))
+declare var s11: Promise<number>;
+>s11 : Symbol(s11, Decl(promisePermutations.ts, 156, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations.ts, 0, 0))
 
 var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 >s11a : Symbol(s11a, Decl(promisePermutations.ts, 157, 3))
 >s11.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s11 : Symbol(s11, Decl(promisePermutations.ts, 156, 3))
+>s11 : Symbol(s11, Decl(promisePermutations.ts, 156, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations.ts, 35, 68), Decl(promisePermutations.ts, 37, 61))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations.ts, 35, 68), Decl(promisePermutations.ts, 37, 61))
@@ -1273,7 +1273,7 @@ var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // error
 >s11b : Symbol(s11b, Decl(promisePermutations.ts, 158, 3))
 >s11.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s11 : Symbol(s11, Decl(promisePermutations.ts, 156, 3))
+>s11 : Symbol(s11, Decl(promisePermutations.ts, 156, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction11P : Symbol(testFunction11P, Decl(promisePermutations.ts, 38, 61), Decl(promisePermutations.ts, 39, 61))
 >testFunction11P : Symbol(testFunction11P, Decl(promisePermutations.ts, 38, 61), Decl(promisePermutations.ts, 39, 61))
@@ -1282,7 +1282,7 @@ var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // error
 var s11c = s11.then(testFunction11P, testFunction11, testFunction11); // error
 >s11c : Symbol(s11c, Decl(promisePermutations.ts, 159, 3))
 >s11.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
->s11 : Symbol(s11, Decl(promisePermutations.ts, 156, 3))
+>s11 : Symbol(s11, Decl(promisePermutations.ts, 156, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations.ts, 0, 22), Decl(promisePermutations.ts, 1, 132), Decl(promisePermutations.ts, 2, 123), Decl(promisePermutations.ts, 3, 123))
 >testFunction11P : Symbol(testFunction11P, Decl(promisePermutations.ts, 38, 61), Decl(promisePermutations.ts, 39, 61))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations.ts, 35, 68), Decl(promisePermutations.ts, 37, 61))
diff --git a/tests/baselines/reference/promisePermutations.types b/tests/baselines/reference/promisePermutations.types
index 0c000ea24f39e..505469d6abe85 100644
--- a/tests/baselines/reference/promisePermutations.types
+++ b/tests/baselines/reference/promisePermutations.types
@@ -381,7 +381,7 @@ declare function testFunction12P<T>(x: T, y: T): Promise<T>;
 >y : T
 >  : ^
 
-var r1: IPromise<number>;
+declare var r1: IPromise<number>;
 >r1 : IPromise<number>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -451,7 +451,7 @@ var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
 >testFunctionP : () => Promise<number>
 >              : ^^^^^^               
 
-var s1: Promise<number>;
+declare var s1: Promise<number>;
 >s1 : Promise<number>
 >   : ^^^^^^^^^^^^^^^
 
@@ -539,7 +539,7 @@ var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction,
 >testFunction : () => IPromise<number>
 >             : ^^^^^^                
 
-var r2: IPromise<{ x: number; }>;
+declare var r2: IPromise<{ x: number; }>;
 >r2 : IPromise<{ x: number; }>
 >   : ^^^^^^^^^^^^^^      ^^^^
 >x : number
@@ -593,7 +593,7 @@ var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction
 >testFunction2 : () => IPromise<{ x: number; }>
 >              : ^^^^^^                        
 
-var s2: Promise<{ x: number; }>;
+declare var s2: Promise<{ x: number; }>;
 >s2 : Promise<{ x: number; }>
 >   : ^^^^^^^^^^^^^      ^^^^
 >x : number
@@ -683,7 +683,7 @@ var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunctio
 >testFunction2 : () => IPromise<{ x: number; }>
 >              : ^^^^^^                        
 
-var r3: IPromise<number>;
+declare var r3: IPromise<number>;
 >r3 : IPromise<number>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -735,7 +735,7 @@ var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction
 >testFunction3 : (x: number) => IPromise<number>
 >              : ^ ^^      ^^^^^                
 
-var s3: Promise<number>;
+declare var s3: Promise<number>;
 >s3 : Promise<number>
 >   : ^^^^^^^^^^^^^^^
 
@@ -823,17 +823,17 @@ var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunctio
 >testFunction3 : (x: number) => IPromise<number>
 >              : ^ ^^      ^^^^^                
 
-var r4: IPromise<string>;
+declare var r4: IPromise<string>;
 >r4 : IPromise<string>
 >   : ^^^^^^^^^^^^^^^^
 
-var sIPromise: (x: any) => IPromise<string>;
+declare var sIPromise: (x: any) => IPromise<string>;
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 >x : any
 >  : ^^^
 
-var sPromise: (x: any) => Promise<string>;
+declare var sPromise: (x: any) => Promise<string>;
 >sPromise : (x: any) => Promise<string>
 >         : ^ ^^   ^^^^^               
 >x : any
@@ -887,7 +887,7 @@ var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testF
 >testFunction4 : (x: number, y?: string) => IPromise<string>
 >              : ^ ^^      ^^ ^^^      ^^^^^                
 
-var s4: Promise<string>;
+declare var s4: Promise<string>;
 >s4 : Promise<string>
 >   : ^^^^^^^^^^^^^^^
 
@@ -975,7 +975,7 @@ var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, test
 >testFunction4 : (x: number, y?: string) => IPromise<string>
 >              : ^ ^^      ^^ ^^^      ^^^^^                
 
-var r5: IPromise<string>;
+declare var r5: IPromise<string>;
 >r5 : IPromise<string>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -1027,7 +1027,7 @@ var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var s5: Promise<string>;
+declare var s5: Promise<string>;
 >s5 : Promise<string>
 >   : ^^^^^^^^^^^^^^^
 
@@ -1115,7 +1115,7 @@ var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var r6: IPromise<string>;
+declare var r6: IPromise<string>;
 >r6 : IPromise<string>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -1167,7 +1167,7 @@ var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var s6: Promise<string>;
+declare var s6: Promise<string>;
 >s6 : Promise<string>
 >   : ^^^^^^^^^^^^^^^
 
@@ -1255,7 +1255,7 @@ var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var r7: IPromise<string>;
+declare var r7: IPromise<string>;
 >r7 : IPromise<string>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -1307,7 +1307,7 @@ var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var s7: Promise<string>;
+declare var s7: Promise<string>;
 >s7 : Promise<string>
 >   : ^^^^^^^^^^^^^^^
 
@@ -1395,17 +1395,17 @@ var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromis
 >sPromise : (x: any) => Promise<string>
 >         : ^ ^^   ^^^^^               
 
-var r8: IPromise<number>;
+declare var r8: IPromise<number>;
 >r8 : IPromise<number>
 >   : ^^^^^^^^^^^^^^^^
 
-var nIPromise: (x: any) => IPromise<number>;
+declare var nIPromise: (x: any) => IPromise<number>;
 >nIPromise : (x: any) => IPromise<number>
 >          : ^ ^^   ^^^^^                
 >x : any
 >  : ^^^
 
-var nPromise: (x: any) => Promise<number>;
+declare var nPromise: (x: any) => Promise<number>;
 >nPromise : (x: any) => Promise<number>
 >         : ^ ^^   ^^^^^               
 >x : any
@@ -1547,7 +1547,7 @@ var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nI
 >nIPromise : (x: any) => IPromise<number>
 >          : ^ ^^   ^^^^^                
 
-var r9: IPromise<number>;
+declare var r9: IPromise<number>;
 >r9 : IPromise<number>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -1653,7 +1653,7 @@ var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise,
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var s9: Promise<number>;
+declare var s9: Promise<number>;
 >s9 : Promise<number>
 >   : ^^^^^^^^^^^^^^^
 
@@ -2063,7 +2063,7 @@ var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromis
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var r11: IPromise<number>;
+declare var r11: IPromise<number>;
 >r11 : IPromise<number>
 >    : ^^^^^^^^^^^^^^^^
 
@@ -2085,7 +2085,7 @@ var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
 >testFunction11 : { (x: number): IPromise<number>; (x: string): IPromise<string>; }
 >               : ^^^ ^^      ^^^                ^^^ ^^      ^^^                ^^^
 
-var s11: Promise<number>;
+declare var s11: Promise<number>;
 >s11 : Promise<number>
 >    : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/promisePermutations2.errors.txt b/tests/baselines/reference/promisePermutations2.errors.txt
index 58a0f5855326b..19e7803058b7d 100644
--- a/tests/baselines/reference/promisePermutations2.errors.txt
+++ b/tests/baselines/reference/promisePermutations2.errors.txt
@@ -157,29 +157,29 @@ promisePermutations2.ts(159,21): error TS2345: Argument of type '{ (x: number):
     declare function testFunction12P<T>(x: T): IPromise<T>;
     declare function testFunction12P<T>(x: T, y: T): Promise<T>;
     
-    var r1: IPromise<number>;
+    declare var r1: IPromise<number>;
     var r1a = r1.then(testFunction, testFunction, testFunction);
     var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, testFunction, testFunction);
     var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
-    var s1: Promise<number>;
+    declare var s1: Promise<number>;
     var s1a = s1.then(testFunction, testFunction, testFunction);
     var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
     var s1c = s1.then(testFunctionP, testFunction, testFunction);
     var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction, testFunction, testFunction);
     
-    var r2: IPromise<{ x: number; }>;
+    declare var r2: IPromise<{ x: number; }>;
     var r2a = r2.then(testFunction2, testFunction2, testFunction2);
     var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
-    var s2: Promise<{ x: number; }>;
+    declare var s2: Promise<{ x: number; }>;
     var s2a = s2.then(testFunction2, testFunction2, testFunction2);
     var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
     var s2c = s2.then(testFunction2P, testFunction2, testFunction2);
     var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
     
-    var r3: IPromise<number>;
+    declare var r3: IPromise<number>;
     var r3a = r3.then(testFunction3, testFunction3, testFunction3);
     var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3);
-    var s3: Promise<number>;
+    declare var s3: Promise<number>;
     var s3a = s3.then(testFunction3, testFunction3, testFunction3);
     var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
     var s3c = s3.then(testFunction3P, testFunction3, testFunction3);
@@ -189,9 +189,9 @@ promisePermutations2.ts(159,21): error TS2345: Argument of type '{ (x: number):
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
 !!! error TS2345:     Type 'IPromise<number>' is not assignable to type 'number'.
     
-    var r4: IPromise<string>;
-    var sIPromise: (x: any) => IPromise<string>;
-    var sPromise: (x: any) => Promise<string>;
+    declare var r4: IPromise<string>;
+    declare var sIPromise: (x: any) => IPromise<string>;
+    declare var sPromise: (x: any) => Promise<string>;
     var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -201,7 +201,7 @@ promisePermutations2.ts(159,21): error TS2345: Argument of type '{ (x: number):
 !!! error TS2769:         Type 'string' is not assignable to type 'number'.
 !!! related TS2771 promisePermutations2.ts:12:5: The last overload is declared here.
     var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testFunction4, testFunction4); // ok
-    var s4: Promise<string>;
+    declare var s4: Promise<string>;
     var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y?: string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
@@ -219,7 +219,7 @@ promisePermutations2.ts(159,21): error TS2345: Argument of type '{ (x: number):
 !!! error TS2345:     Type 'string' is not assignable to type 'number'.
     var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, testFunction4P, testFunction4);
     
-    var r5: IPromise<string>;
+    declare var r5: IPromise<string>;
     var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -228,7 +228,7 @@ promisePermutations2.ts(159,21): error TS2345: Argument of type '{ (x: number):
 !!! error TS2769:       Target signature provides too few arguments. Expected 2 or more, but got 1.
 !!! related TS2771 promisePermutations2.ts:12:5: The last overload is declared here.
     var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-    var s5: Promise<string>;
+    declare var s5: Promise<string>;
     var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, cb: (a: string) => string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
@@ -243,7 +243,7 @@ promisePermutations2.ts(159,21): error TS2345: Argument of type '{ (x: number):
 !!! error TS2345:   Target signature provides too few arguments. Expected 2 or more, but got 1.
     var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
     
-    var r6: IPromise<string>;
+    declare var r6: IPromise<string>;
     var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -252,7 +252,7 @@ promisePermutations2.ts(159,21): error TS2345: Argument of type '{ (x: number):
 !!! error TS2769:       Target signature provides too few arguments. Expected 2 or more, but got 1.
 !!! related TS2771 promisePermutations2.ts:12:5: The last overload is declared here.
     var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-    var s6: Promise<string>;
+    declare var s6: Promise<string>;
     var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
@@ -267,7 +267,7 @@ promisePermutations2.ts(159,21): error TS2345: Argument of type '{ (x: number):
 !!! error TS2345:   Target signature provides too few arguments. Expected 2 or more, but got 1.
     var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
     
-    var r7: IPromise<string>;
+    declare var r7: IPromise<string>;
     var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -277,7 +277,7 @@ promisePermutations2.ts(159,21): error TS2345: Argument of type '{ (x: number):
 !!! error TS2769:         Type 'string' is not assignable to type '<T>(a: T) => T'.
 !!! related TS2771 promisePermutations2.ts:12:5: The last overload is declared here.
     var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-    var s7: Promise<string>;
+    declare var s7: Promise<string>;
     var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -304,9 +304,9 @@ promisePermutations2.ts(159,21): error TS2345: Argument of type '{ (x: number):
 !!! related TS2771 promisePermutations2.ts:12:5: The last overload is declared here.
     var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromise); // ok?
     
-    var r8: IPromise<number>;
-    var nIPromise: (x: any) => IPromise<number>;
-    var nPromise: (x: any) => Promise<number>;
+    declare var r8: IPromise<number>;
+    declare var nIPromise: (x: any) => IPromise<number>;
+    declare var nPromise: (x: any) => Promise<number>;
     var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -330,7 +330,7 @@ promisePermutations2.ts(159,21): error TS2345: Argument of type '{ (x: number):
 !!! error TS2345:   Target signature provides too few arguments. Expected 2 or more, but got 1.
     var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
     
-    var r9: IPromise<number>;
+    declare var r9: IPromise<number>;
     var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -349,7 +349,7 @@ promisePermutations2.ts(159,21): error TS2345: Argument of type '{ (x: number):
 !!! error TS2769:         Type 'string' is not assignable to type 'number'.
 !!! related TS2771 promisePermutations2.ts:12:5: The last overload is declared here.
     var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-    var s9: Promise<number>;
+    declare var s9: Promise<number>;
     var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '<T>(x: T, cb: <U>(a: U) => U) => IPromise<T>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
@@ -396,7 +396,7 @@ promisePermutations2.ts(159,21): error TS2345: Argument of type '{ (x: number):
 !!! error TS2345:   Type 'IPromise<string>' is missing the following properties from type 'Promise<number>': catch, [Symbol.toStringTag]
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
     
-    var r11: IPromise<number>;
+    declare var r11: IPromise<number>;
     var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
                         ~~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -405,7 +405,7 @@ promisePermutations2.ts(159,21): error TS2345: Argument of type '{ (x: number):
 !!! error TS2769:       Type 'IPromise<number>' is not assignable to type 'IPromise<string>'.
 !!! error TS2769:         Type 'number' is not assignable to type 'string'.
 !!! related TS2771 promisePermutations2.ts:12:5: The last overload is declared here.
-    var s11: Promise<number>;
+    declare var s11: Promise<number>;
     var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
                         ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '{ (x: number): IPromise<number>; (x: string): IPromise<string>; }' is not assignable to parameter of type '(value: number) => IPromise<string>'.
diff --git a/tests/baselines/reference/promisePermutations2.js b/tests/baselines/reference/promisePermutations2.js
index 714ea70283ca9..649571b76aa50 100644
--- a/tests/baselines/reference/promisePermutations2.js
+++ b/tests/baselines/reference/promisePermutations2.js
@@ -47,75 +47,75 @@ declare function testFunction12<T>(x: T, y: T): IPromise<T>;
 declare function testFunction12P<T>(x: T): IPromise<T>;
 declare function testFunction12P<T>(x: T, y: T): Promise<T>;
 
-var r1: IPromise<number>;
+declare var r1: IPromise<number>;
 var r1a = r1.then(testFunction, testFunction, testFunction);
 var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, testFunction, testFunction);
 var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
-var s1: Promise<number>;
+declare var s1: Promise<number>;
 var s1a = s1.then(testFunction, testFunction, testFunction);
 var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
 var s1c = s1.then(testFunctionP, testFunction, testFunction);
 var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction, testFunction, testFunction);
 
-var r2: IPromise<{ x: number; }>;
+declare var r2: IPromise<{ x: number; }>;
 var r2a = r2.then(testFunction2, testFunction2, testFunction2);
 var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
-var s2: Promise<{ x: number; }>;
+declare var s2: Promise<{ x: number; }>;
 var s2a = s2.then(testFunction2, testFunction2, testFunction2);
 var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
 var s2c = s2.then(testFunction2P, testFunction2, testFunction2);
 var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
 
-var r3: IPromise<number>;
+declare var r3: IPromise<number>;
 var r3a = r3.then(testFunction3, testFunction3, testFunction3);
 var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3);
-var s3: Promise<number>;
+declare var s3: Promise<number>;
 var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
 var s3c = s3.then(testFunction3P, testFunction3, testFunction3);
 var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3); // Should error
 
-var r4: IPromise<string>;
-var sIPromise: (x: any) => IPromise<string>;
-var sPromise: (x: any) => Promise<string>;
+declare var r4: IPromise<string>;
+declare var sIPromise: (x: any) => IPromise<string>;
+declare var sPromise: (x: any) => Promise<string>;
 var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
 var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testFunction4, testFunction4); // ok
-var s4: Promise<string>;
+declare var s4: Promise<string>;
 var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error 
 var s4c = s4.then(testFunction4P, testFunction4, testFunction4); // error
 var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, testFunction4P, testFunction4);
 
-var r5: IPromise<string>;
+declare var r5: IPromise<string>;
 var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
 var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s5: Promise<string>;
+declare var s5: Promise<string>;
 var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 var s5b = s5.then(testFunction5P, testFunction5P, testFunction5P); // error
 var s5c = s5.then(testFunction5P, testFunction5, testFunction5); // error
 var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
 
-var r6: IPromise<string>;
+declare var r6: IPromise<string>;
 var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
 var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s6: Promise<string>;
+declare var s6: Promise<string>;
 var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 var s6b = s6.then(testFunction6P, testFunction6P, testFunction6P); // error
 var s6c = s6.then(testFunction6P, testFunction6, testFunction6); // error
 var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
 
-var r7: IPromise<string>;
+declare var r7: IPromise<string>;
 var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s7: Promise<string>;
+declare var s7: Promise<string>;
 var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
 var s7c = r7.then(testFunction7P, testFunction7, testFunction7); // error
 var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromise); // ok?
 
-var r8: IPromise<number>;
-var nIPromise: (x: any) => IPromise<number>;
-var nPromise: (x: any) => Promise<number>;
+declare var r8: IPromise<number>;
+declare var nIPromise: (x: any) => IPromise<number>;
+declare var nPromise: (x: any) => Promise<number>;
 var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
 var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 var s8: Promise<number>;
@@ -124,13 +124,13 @@ var s8b = s8.then(testFunction8P, testFunction8P, testFunction8P); // error
 var s8c = s8.then(testFunction8P, testFunction8, testFunction8); // error
 var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 
-var r9: IPromise<number>;
+declare var r9: IPromise<number>;
 var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 var r9b = r9.then(sIPromise, sIPromise, sIPromise); // ok
 var r9c = r9.then(nIPromise, nIPromise, nIPromise); // ok
 var r9d = r9.then(testFunction, sIPromise, nIPromise); // error
 var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s9: Promise<number>;
+declare var s9: Promise<number>;
 var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
 var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
@@ -154,9 +154,9 @@ var s10e = s10.then(nIPromise, nPromise, nIPromise); // ok
 var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
 var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
 
-var r11: IPromise<number>;
+declare var r11: IPromise<number>;
 var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
-var s11: Promise<number>;
+declare var s11: Promise<number>;
 var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // ok
 var s11c = s11.then(testFunction11P, testFunction11, testFunction11); // ok
@@ -170,68 +170,49 @@ var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok
 
 //// [promisePermutations2.js]
 // same as promisePermutations but without the same overloads in Promise<T>
-var r1;
 var r1a = r1.then(testFunction, testFunction, testFunction);
 var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, testFunction, testFunction);
 var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
-var s1;
 var s1a = s1.then(testFunction, testFunction, testFunction);
 var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
 var s1c = s1.then(testFunctionP, testFunction, testFunction);
 var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction, testFunction, testFunction);
-var r2;
 var r2a = r2.then(testFunction2, testFunction2, testFunction2);
 var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
-var s2;
 var s2a = s2.then(testFunction2, testFunction2, testFunction2);
 var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
 var s2c = s2.then(testFunction2P, testFunction2, testFunction2);
 var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
-var r3;
 var r3a = r3.then(testFunction3, testFunction3, testFunction3);
 var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3);
-var s3;
 var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
 var s3c = s3.then(testFunction3P, testFunction3, testFunction3);
 var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3); // Should error
-var r4;
-var sIPromise;
-var sPromise;
 var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
 var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testFunction4, testFunction4); // ok
-var s4;
 var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error 
 var s4c = s4.then(testFunction4P, testFunction4, testFunction4); // error
 var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, testFunction4P, testFunction4);
-var r5;
 var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
 var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s5;
 var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 var s5b = s5.then(testFunction5P, testFunction5P, testFunction5P); // error
 var s5c = s5.then(testFunction5P, testFunction5, testFunction5); // error
 var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var r6;
 var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
 var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s6;
 var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 var s6b = s6.then(testFunction6P, testFunction6P, testFunction6P); // error
 var s6c = s6.then(testFunction6P, testFunction6, testFunction6); // error
 var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var r7;
 var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s7;
 var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
 var s7c = r7.then(testFunction7P, testFunction7, testFunction7); // error
 var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromise); // ok?
-var r8;
-var nIPromise;
-var nPromise;
 var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
 var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 var s8;
@@ -239,13 +220,11 @@ var s8a = s8.then(testFunction8, testFunction8, testFunction8); // error
 var s8b = s8.then(testFunction8P, testFunction8P, testFunction8P); // error
 var s8c = s8.then(testFunction8P, testFunction8, testFunction8); // error
 var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
-var r9;
 var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 var r9b = r9.then(sIPromise, sIPromise, sIPromise); // ok
 var r9c = r9.then(nIPromise, nIPromise, nIPromise); // ok
 var r9d = r9.then(testFunction, sIPromise, nIPromise); // error
 var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s9;
 var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
 var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
@@ -267,9 +246,7 @@ var s10d = s10.then(sPromise, sPromise, sPromise); // ok
 var s10e = s10.then(nIPromise, nPromise, nIPromise); // ok
 var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
 var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
-var r11;
 var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
-var s11;
 var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // ok
 var s11c = s11.then(testFunction11P, testFunction11, testFunction11); // ok
diff --git a/tests/baselines/reference/promisePermutations2.symbols b/tests/baselines/reference/promisePermutations2.symbols
index ff1fc4f344fc4..ca906ed9c4828 100644
--- a/tests/baselines/reference/promisePermutations2.symbols
+++ b/tests/baselines/reference/promisePermutations2.symbols
@@ -334,14 +334,14 @@ declare function testFunction12P<T>(x: T, y: T): Promise<T>;
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations2.ts, 0, 0))
 >T : Symbol(T, Decl(promisePermutations2.ts, 44, 33))
 
-var r1: IPromise<number>;
->r1 : Symbol(r1, Decl(promisePermutations2.ts, 46, 3))
+declare var r1: IPromise<number>;
+>r1 : Symbol(r1, Decl(promisePermutations2.ts, 46, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations2.ts, 5, 1))
 
 var r1a = r1.then(testFunction, testFunction, testFunction);
 >r1a : Symbol(r1a, Decl(promisePermutations2.ts, 47, 3))
 >r1.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r1 : Symbol(r1, Decl(promisePermutations2.ts, 46, 3))
+>r1 : Symbol(r1, Decl(promisePermutations2.ts, 46, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
@@ -351,7 +351,7 @@ var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, t
 >r1b : Symbol(r1b, Decl(promisePermutations2.ts, 48, 3))
 >r1.then(testFunction, testFunction, testFunction).then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >r1.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r1 : Symbol(r1, Decl(promisePermutations2.ts, 46, 3))
+>r1 : Symbol(r1, Decl(promisePermutations2.ts, 46, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
@@ -364,20 +364,20 @@ var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, t
 var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
 >r1c : Symbol(r1c, Decl(promisePermutations2.ts, 49, 3))
 >r1.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r1 : Symbol(r1, Decl(promisePermutations2.ts, 46, 3))
+>r1 : Symbol(r1, Decl(promisePermutations2.ts, 46, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations2.ts, 15, 50))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations2.ts, 15, 50))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations2.ts, 15, 50))
 
-var s1: Promise<number>;
->s1 : Symbol(s1, Decl(promisePermutations2.ts, 50, 3))
+declare var s1: Promise<number>;
+>s1 : Symbol(s1, Decl(promisePermutations2.ts, 50, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations2.ts, 0, 0))
 
 var s1a = s1.then(testFunction, testFunction, testFunction);
 >s1a : Symbol(s1a, Decl(promisePermutations2.ts, 51, 3))
 >s1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s1 : Symbol(s1, Decl(promisePermutations2.ts, 50, 3))
+>s1 : Symbol(s1, Decl(promisePermutations2.ts, 50, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
@@ -386,7 +386,7 @@ var s1a = s1.then(testFunction, testFunction, testFunction);
 var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
 >s1b : Symbol(s1b, Decl(promisePermutations2.ts, 52, 3))
 >s1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s1 : Symbol(s1, Decl(promisePermutations2.ts, 50, 3))
+>s1 : Symbol(s1, Decl(promisePermutations2.ts, 50, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations2.ts, 15, 50))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations2.ts, 15, 50))
@@ -395,7 +395,7 @@ var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
 var s1c = s1.then(testFunctionP, testFunction, testFunction);
 >s1c : Symbol(s1c, Decl(promisePermutations2.ts, 53, 3))
 >s1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s1 : Symbol(s1, Decl(promisePermutations2.ts, 50, 3))
+>s1 : Symbol(s1, Decl(promisePermutations2.ts, 50, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations2.ts, 15, 50))
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
@@ -405,7 +405,7 @@ var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction,
 >s1d : Symbol(s1d, Decl(promisePermutations2.ts, 54, 3))
 >s1.then(testFunctionP, testFunction, testFunction).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >s1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s1 : Symbol(s1, Decl(promisePermutations2.ts, 50, 3))
+>s1 : Symbol(s1, Decl(promisePermutations2.ts, 50, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations2.ts, 15, 50))
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
@@ -415,15 +415,15 @@ var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction,
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
 
-var r2: IPromise<{ x: number; }>;
->r2 : Symbol(r2, Decl(promisePermutations2.ts, 56, 3))
+declare var r2: IPromise<{ x: number; }>;
+>r2 : Symbol(r2, Decl(promisePermutations2.ts, 56, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations2.ts, 5, 1))
->x : Symbol(x, Decl(promisePermutations2.ts, 56, 18))
+>x : Symbol(x, Decl(promisePermutations2.ts, 56, 26))
 
 var r2a = r2.then(testFunction2, testFunction2, testFunction2);
 >r2a : Symbol(r2a, Decl(promisePermutations2.ts, 57, 3))
 >r2.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r2 : Symbol(r2, Decl(promisePermutations2.ts, 56, 3))
+>r2 : Symbol(r2, Decl(promisePermutations2.ts, 56, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations2.ts, 16, 50))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations2.ts, 16, 50))
@@ -433,7 +433,7 @@ var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction
 >r2b : Symbol(r2b, Decl(promisePermutations2.ts, 58, 3))
 >r2.then(testFunction2, testFunction2, testFunction2).then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >r2.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r2 : Symbol(r2, Decl(promisePermutations2.ts, 56, 3))
+>r2 : Symbol(r2, Decl(promisePermutations2.ts, 56, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations2.ts, 16, 50))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations2.ts, 16, 50))
@@ -443,15 +443,15 @@ var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations2.ts, 16, 50))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations2.ts, 16, 50))
 
-var s2: Promise<{ x: number; }>;
->s2 : Symbol(s2, Decl(promisePermutations2.ts, 59, 3))
+declare var s2: Promise<{ x: number; }>;
+>s2 : Symbol(s2, Decl(promisePermutations2.ts, 59, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations2.ts, 0, 0))
->x : Symbol(x, Decl(promisePermutations2.ts, 59, 17))
+>x : Symbol(x, Decl(promisePermutations2.ts, 59, 25))
 
 var s2a = s2.then(testFunction2, testFunction2, testFunction2);
 >s2a : Symbol(s2a, Decl(promisePermutations2.ts, 60, 3))
 >s2.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s2 : Symbol(s2, Decl(promisePermutations2.ts, 59, 3))
+>s2 : Symbol(s2, Decl(promisePermutations2.ts, 59, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations2.ts, 16, 50))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations2.ts, 16, 50))
@@ -460,7 +460,7 @@ var s2a = s2.then(testFunction2, testFunction2, testFunction2);
 var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
 >s2b : Symbol(s2b, Decl(promisePermutations2.ts, 61, 3))
 >s2.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s2 : Symbol(s2, Decl(promisePermutations2.ts, 59, 3))
+>s2 : Symbol(s2, Decl(promisePermutations2.ts, 59, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction2P : Symbol(testFunction2P, Decl(promisePermutations2.ts, 17, 58))
 >testFunction2P : Symbol(testFunction2P, Decl(promisePermutations2.ts, 17, 58))
@@ -469,7 +469,7 @@ var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
 var s2c = s2.then(testFunction2P, testFunction2, testFunction2);
 >s2c : Symbol(s2c, Decl(promisePermutations2.ts, 62, 3))
 >s2.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s2 : Symbol(s2, Decl(promisePermutations2.ts, 59, 3))
+>s2 : Symbol(s2, Decl(promisePermutations2.ts, 59, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction2P : Symbol(testFunction2P, Decl(promisePermutations2.ts, 17, 58))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations2.ts, 16, 50))
@@ -479,7 +479,7 @@ var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunctio
 >s2d : Symbol(s2d, Decl(promisePermutations2.ts, 63, 3))
 >s2.then(testFunction2P, testFunction2, testFunction2).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >s2.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s2 : Symbol(s2, Decl(promisePermutations2.ts, 59, 3))
+>s2 : Symbol(s2, Decl(promisePermutations2.ts, 59, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction2P : Symbol(testFunction2P, Decl(promisePermutations2.ts, 17, 58))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations2.ts, 16, 50))
@@ -489,14 +489,14 @@ var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunctio
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations2.ts, 16, 50))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations2.ts, 16, 50))
 
-var r3: IPromise<number>;
->r3 : Symbol(r3, Decl(promisePermutations2.ts, 65, 3))
+declare var r3: IPromise<number>;
+>r3 : Symbol(r3, Decl(promisePermutations2.ts, 65, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations2.ts, 5, 1))
 
 var r3a = r3.then(testFunction3, testFunction3, testFunction3);
 >r3a : Symbol(r3a, Decl(promisePermutations2.ts, 66, 3))
 >r3.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r3 : Symbol(r3, Decl(promisePermutations2.ts, 65, 3))
+>r3 : Symbol(r3, Decl(promisePermutations2.ts, 65, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations2.ts, 18, 58))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations2.ts, 18, 58))
@@ -506,7 +506,7 @@ var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction
 >r3b : Symbol(r3b, Decl(promisePermutations2.ts, 67, 3))
 >r3.then(testFunction3, testFunction3, testFunction3).then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >r3.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r3 : Symbol(r3, Decl(promisePermutations2.ts, 65, 3))
+>r3 : Symbol(r3, Decl(promisePermutations2.ts, 65, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations2.ts, 18, 58))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations2.ts, 18, 58))
@@ -516,14 +516,14 @@ var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations2.ts, 18, 58))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations2.ts, 18, 58))
 
-var s3: Promise<number>;
->s3 : Symbol(s3, Decl(promisePermutations2.ts, 68, 3))
+declare var s3: Promise<number>;
+>s3 : Symbol(s3, Decl(promisePermutations2.ts, 68, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations2.ts, 0, 0))
 
 var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 >s3a : Symbol(s3a, Decl(promisePermutations2.ts, 69, 3))
 >s3.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s3 : Symbol(s3, Decl(promisePermutations2.ts, 68, 3))
+>s3 : Symbol(s3, Decl(promisePermutations2.ts, 68, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations2.ts, 18, 58))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations2.ts, 18, 58))
@@ -532,7 +532,7 @@ var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
 >s3b : Symbol(s3b, Decl(promisePermutations2.ts, 70, 3))
 >s3.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s3 : Symbol(s3, Decl(promisePermutations2.ts, 68, 3))
+>s3 : Symbol(s3, Decl(promisePermutations2.ts, 68, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction3P : Symbol(testFunction3P, Decl(promisePermutations2.ts, 19, 60))
 >testFunction3P : Symbol(testFunction3P, Decl(promisePermutations2.ts, 19, 60))
@@ -541,7 +541,7 @@ var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
 var s3c = s3.then(testFunction3P, testFunction3, testFunction3);
 >s3c : Symbol(s3c, Decl(promisePermutations2.ts, 71, 3))
 >s3.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s3 : Symbol(s3, Decl(promisePermutations2.ts, 68, 3))
+>s3 : Symbol(s3, Decl(promisePermutations2.ts, 68, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction3P : Symbol(testFunction3P, Decl(promisePermutations2.ts, 19, 60))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations2.ts, 18, 58))
@@ -551,7 +551,7 @@ var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunctio
 >s3d : Symbol(s3d, Decl(promisePermutations2.ts, 72, 3))
 >s3.then(testFunction3P, testFunction3, testFunction3).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >s3.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s3 : Symbol(s3, Decl(promisePermutations2.ts, 68, 3))
+>s3 : Symbol(s3, Decl(promisePermutations2.ts, 68, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction3P : Symbol(testFunction3P, Decl(promisePermutations2.ts, 19, 60))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations2.ts, 18, 58))
@@ -561,24 +561,24 @@ var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunctio
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations2.ts, 18, 58))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations2.ts, 18, 58))
 
-var r4: IPromise<string>;
->r4 : Symbol(r4, Decl(promisePermutations2.ts, 74, 3))
+declare var r4: IPromise<string>;
+>r4 : Symbol(r4, Decl(promisePermutations2.ts, 74, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations2.ts, 5, 1))
 
-var sIPromise: (x: any) => IPromise<string>;
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->x : Symbol(x, Decl(promisePermutations2.ts, 75, 16))
+declare var sIPromise: (x: any) => IPromise<string>;
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>x : Symbol(x, Decl(promisePermutations2.ts, 75, 24))
 >IPromise : Symbol(IPromise, Decl(promisePermutations2.ts, 5, 1))
 
-var sPromise: (x: any) => Promise<string>;
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
->x : Symbol(x, Decl(promisePermutations2.ts, 76, 15))
+declare var sPromise: (x: any) => Promise<string>;
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
+>x : Symbol(x, Decl(promisePermutations2.ts, 76, 23))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations2.ts, 0, 0))
 
 var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
 >r4a : Symbol(r4a, Decl(promisePermutations2.ts, 77, 3))
 >r4.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r4 : Symbol(r4, Decl(promisePermutations2.ts, 74, 3))
+>r4 : Symbol(r4, Decl(promisePermutations2.ts, 74, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations2.ts, 20, 60))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations2.ts, 20, 60))
@@ -588,24 +588,24 @@ var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testF
 >r4b : Symbol(r4b, Decl(promisePermutations2.ts, 78, 3))
 >r4.then(sIPromise, testFunction4, testFunction4).then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >r4.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r4 : Symbol(r4, Decl(promisePermutations2.ts, 74, 3))
+>r4 : Symbol(r4, Decl(promisePermutations2.ts, 74, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations2.ts, 20, 60))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations2.ts, 20, 60))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations2.ts, 20, 60))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations2.ts, 20, 60))
 
-var s4: Promise<string>;
->s4 : Symbol(s4, Decl(promisePermutations2.ts, 79, 3))
+declare var s4: Promise<string>;
+>s4 : Symbol(s4, Decl(promisePermutations2.ts, 79, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations2.ts, 0, 0))
 
 var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 >s4a : Symbol(s4a, Decl(promisePermutations2.ts, 80, 3))
 >s4.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s4 : Symbol(s4, Decl(promisePermutations2.ts, 79, 3))
+>s4 : Symbol(s4, Decl(promisePermutations2.ts, 79, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations2.ts, 20, 60))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations2.ts, 20, 60))
@@ -614,7 +614,7 @@ var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error 
 >s4b : Symbol(s4b, Decl(promisePermutations2.ts, 81, 3))
 >s4.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s4 : Symbol(s4, Decl(promisePermutations2.ts, 79, 3))
+>s4 : Symbol(s4, Decl(promisePermutations2.ts, 79, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction4P : Symbol(testFunction4P, Decl(promisePermutations2.ts, 21, 72))
 >testFunction4P : Symbol(testFunction4P, Decl(promisePermutations2.ts, 21, 72))
@@ -623,7 +623,7 @@ var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error
 var s4c = s4.then(testFunction4P, testFunction4, testFunction4); // error
 >s4c : Symbol(s4c, Decl(promisePermutations2.ts, 82, 3))
 >s4.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s4 : Symbol(s4, Decl(promisePermutations2.ts, 79, 3))
+>s4 : Symbol(s4, Decl(promisePermutations2.ts, 79, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction4P : Symbol(testFunction4P, Decl(promisePermutations2.ts, 21, 72))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations2.ts, 20, 60))
@@ -633,24 +633,24 @@ var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, test
 >s4d : Symbol(s4d, Decl(promisePermutations2.ts, 83, 3))
 >s4.then(sIPromise, testFunction4P, testFunction4).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >s4.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s4 : Symbol(s4, Decl(promisePermutations2.ts, 79, 3))
+>s4 : Symbol(s4, Decl(promisePermutations2.ts, 79, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 >testFunction4P : Symbol(testFunction4P, Decl(promisePermutations2.ts, 21, 72))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations2.ts, 20, 60))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 >testFunction4P : Symbol(testFunction4P, Decl(promisePermutations2.ts, 21, 72))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations2.ts, 20, 60))
 
-var r5: IPromise<string>;
->r5 : Symbol(r5, Decl(promisePermutations2.ts, 85, 3))
+declare var r5: IPromise<string>;
+>r5 : Symbol(r5, Decl(promisePermutations2.ts, 85, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations2.ts, 5, 1))
 
 var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
 >r5a : Symbol(r5a, Decl(promisePermutations2.ts, 86, 3))
 >r5.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r5 : Symbol(r5, Decl(promisePermutations2.ts, 85, 3))
+>r5 : Symbol(r5, Decl(promisePermutations2.ts, 85, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction5 : Symbol(testFunction5, Decl(promisePermutations2.ts, 22, 72))
 >testFunction5 : Symbol(testFunction5, Decl(promisePermutations2.ts, 22, 72))
@@ -660,24 +660,24 @@ var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >r5b : Symbol(r5b, Decl(promisePermutations2.ts, 87, 3))
 >r5.then(sIPromise, sIPromise, sIPromise).then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >r5.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r5 : Symbol(r5, Decl(promisePermutations2.ts, 85, 3))
+>r5 : Symbol(r5, Decl(promisePermutations2.ts, 85, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 
-var s5: Promise<string>;
->s5 : Symbol(s5, Decl(promisePermutations2.ts, 88, 3))
+declare var s5: Promise<string>;
+>s5 : Symbol(s5, Decl(promisePermutations2.ts, 88, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations2.ts, 0, 0))
 
 var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 >s5a : Symbol(s5a, Decl(promisePermutations2.ts, 89, 3))
 >s5.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s5 : Symbol(s5, Decl(promisePermutations2.ts, 88, 3))
+>s5 : Symbol(s5, Decl(promisePermutations2.ts, 88, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction5 : Symbol(testFunction5, Decl(promisePermutations2.ts, 22, 72))
 >testFunction5 : Symbol(testFunction5, Decl(promisePermutations2.ts, 22, 72))
@@ -686,7 +686,7 @@ var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 var s5b = s5.then(testFunction5P, testFunction5P, testFunction5P); // error
 >s5b : Symbol(s5b, Decl(promisePermutations2.ts, 90, 3))
 >s5.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s5 : Symbol(s5, Decl(promisePermutations2.ts, 88, 3))
+>s5 : Symbol(s5, Decl(promisePermutations2.ts, 88, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction5P : Symbol(testFunction5P, Decl(promisePermutations2.ts, 23, 87))
 >testFunction5P : Symbol(testFunction5P, Decl(promisePermutations2.ts, 23, 87))
@@ -695,7 +695,7 @@ var s5b = s5.then(testFunction5P, testFunction5P, testFunction5P); // error
 var s5c = s5.then(testFunction5P, testFunction5, testFunction5); // error
 >s5c : Symbol(s5c, Decl(promisePermutations2.ts, 91, 3))
 >s5.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s5 : Symbol(s5, Decl(promisePermutations2.ts, 88, 3))
+>s5 : Symbol(s5, Decl(promisePermutations2.ts, 88, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction5P : Symbol(testFunction5P, Decl(promisePermutations2.ts, 23, 87))
 >testFunction5 : Symbol(testFunction5, Decl(promisePermutations2.ts, 22, 72))
@@ -705,24 +705,24 @@ var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 >s5d : Symbol(s5d, Decl(promisePermutations2.ts, 92, 3))
 >s5.then(sPromise, sPromise, sPromise).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >s5.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s5 : Symbol(s5, Decl(promisePermutations2.ts, 88, 3))
+>s5 : Symbol(s5, Decl(promisePermutations2.ts, 88, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 
-var r6: IPromise<string>;
->r6 : Symbol(r6, Decl(promisePermutations2.ts, 94, 3))
+declare var r6: IPromise<string>;
+>r6 : Symbol(r6, Decl(promisePermutations2.ts, 94, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations2.ts, 5, 1))
 
 var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
 >r6a : Symbol(r6a, Decl(promisePermutations2.ts, 95, 3))
 >r6.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r6 : Symbol(r6, Decl(promisePermutations2.ts, 94, 3))
+>r6 : Symbol(r6, Decl(promisePermutations2.ts, 94, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction6 : Symbol(testFunction6, Decl(promisePermutations2.ts, 24, 87))
 >testFunction6 : Symbol(testFunction6, Decl(promisePermutations2.ts, 24, 87))
@@ -732,24 +732,24 @@ var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >r6b : Symbol(r6b, Decl(promisePermutations2.ts, 96, 3))
 >r6.then(sIPromise, sIPromise, sIPromise).then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >r6.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r6 : Symbol(r6, Decl(promisePermutations2.ts, 94, 3))
+>r6 : Symbol(r6, Decl(promisePermutations2.ts, 94, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 
-var s6: Promise<string>;
->s6 : Symbol(s6, Decl(promisePermutations2.ts, 97, 3))
+declare var s6: Promise<string>;
+>s6 : Symbol(s6, Decl(promisePermutations2.ts, 97, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations2.ts, 0, 0))
 
 var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 >s6a : Symbol(s6a, Decl(promisePermutations2.ts, 98, 3))
 >s6.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s6 : Symbol(s6, Decl(promisePermutations2.ts, 97, 3))
+>s6 : Symbol(s6, Decl(promisePermutations2.ts, 97, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction6 : Symbol(testFunction6, Decl(promisePermutations2.ts, 24, 87))
 >testFunction6 : Symbol(testFunction6, Decl(promisePermutations2.ts, 24, 87))
@@ -758,7 +758,7 @@ var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 var s6b = s6.then(testFunction6P, testFunction6P, testFunction6P); // error
 >s6b : Symbol(s6b, Decl(promisePermutations2.ts, 99, 3))
 >s6.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s6 : Symbol(s6, Decl(promisePermutations2.ts, 97, 3))
+>s6 : Symbol(s6, Decl(promisePermutations2.ts, 97, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction6P : Symbol(testFunction6P, Decl(promisePermutations2.ts, 25, 80))
 >testFunction6P : Symbol(testFunction6P, Decl(promisePermutations2.ts, 25, 80))
@@ -767,7 +767,7 @@ var s6b = s6.then(testFunction6P, testFunction6P, testFunction6P); // error
 var s6c = s6.then(testFunction6P, testFunction6, testFunction6); // error
 >s6c : Symbol(s6c, Decl(promisePermutations2.ts, 100, 3))
 >s6.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s6 : Symbol(s6, Decl(promisePermutations2.ts, 97, 3))
+>s6 : Symbol(s6, Decl(promisePermutations2.ts, 97, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction6P : Symbol(testFunction6P, Decl(promisePermutations2.ts, 25, 80))
 >testFunction6 : Symbol(testFunction6, Decl(promisePermutations2.ts, 24, 87))
@@ -777,24 +777,24 @@ var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 >s6d : Symbol(s6d, Decl(promisePermutations2.ts, 101, 3))
 >s6.then(sPromise, sPromise, sPromise).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >s6.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s6 : Symbol(s6, Decl(promisePermutations2.ts, 97, 3))
+>s6 : Symbol(s6, Decl(promisePermutations2.ts, 97, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 
-var r7: IPromise<string>;
->r7 : Symbol(r7, Decl(promisePermutations2.ts, 103, 3))
+declare var r7: IPromise<string>;
+>r7 : Symbol(r7, Decl(promisePermutations2.ts, 103, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations2.ts, 5, 1))
 
 var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 >r7a : Symbol(r7a, Decl(promisePermutations2.ts, 104, 3))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r7 : Symbol(r7, Decl(promisePermutations2.ts, 103, 3))
+>r7 : Symbol(r7, Decl(promisePermutations2.ts, 103, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction7 : Symbol(testFunction7, Decl(promisePermutations2.ts, 26, 80))
 >testFunction7 : Symbol(testFunction7, Decl(promisePermutations2.ts, 26, 80))
@@ -804,24 +804,24 @@ var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >r7b : Symbol(r7b, Decl(promisePermutations2.ts, 105, 3))
 >r7.then(sIPromise, sIPromise, sIPromise).then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r7 : Symbol(r7, Decl(promisePermutations2.ts, 103, 3))
+>r7 : Symbol(r7, Decl(promisePermutations2.ts, 103, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 
-var s7: Promise<string>;
->s7 : Symbol(s7, Decl(promisePermutations2.ts, 106, 3))
+declare var s7: Promise<string>;
+>s7 : Symbol(s7, Decl(promisePermutations2.ts, 106, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations2.ts, 0, 0))
 
 var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 >s7a : Symbol(s7a, Decl(promisePermutations2.ts, 107, 3))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r7 : Symbol(r7, Decl(promisePermutations2.ts, 103, 3))
+>r7 : Symbol(r7, Decl(promisePermutations2.ts, 103, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction7 : Symbol(testFunction7, Decl(promisePermutations2.ts, 26, 80))
 >testFunction7 : Symbol(testFunction7, Decl(promisePermutations2.ts, 26, 80))
@@ -830,7 +830,7 @@ var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
 >s7b : Symbol(s7b, Decl(promisePermutations2.ts, 108, 3))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r7 : Symbol(r7, Decl(promisePermutations2.ts, 103, 3))
+>r7 : Symbol(r7, Decl(promisePermutations2.ts, 103, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction7P : Symbol(testFunction7P, Decl(promisePermutations2.ts, 27, 69))
 >testFunction7P : Symbol(testFunction7P, Decl(promisePermutations2.ts, 27, 69))
@@ -839,7 +839,7 @@ var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
 var s7c = r7.then(testFunction7P, testFunction7, testFunction7); // error
 >s7c : Symbol(s7c, Decl(promisePermutations2.ts, 109, 3))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r7 : Symbol(r7, Decl(promisePermutations2.ts, 103, 3))
+>r7 : Symbol(r7, Decl(promisePermutations2.ts, 103, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction7P : Symbol(testFunction7P, Decl(promisePermutations2.ts, 27, 69))
 >testFunction7 : Symbol(testFunction7, Decl(promisePermutations2.ts, 26, 80))
@@ -849,34 +849,34 @@ var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromis
 >s7d : Symbol(s7d, Decl(promisePermutations2.ts, 110, 3))
 >r7.then(sPromise, sPromise, sPromise).then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r7 : Symbol(r7, Decl(promisePermutations2.ts, 103, 3))
+>r7 : Symbol(r7, Decl(promisePermutations2.ts, 103, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
 
-var r8: IPromise<number>;
->r8 : Symbol(r8, Decl(promisePermutations2.ts, 112, 3))
+declare var r8: IPromise<number>;
+>r8 : Symbol(r8, Decl(promisePermutations2.ts, 112, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations2.ts, 5, 1))
 
-var nIPromise: (x: any) => IPromise<number>;
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->x : Symbol(x, Decl(promisePermutations2.ts, 113, 16))
+declare var nIPromise: (x: any) => IPromise<number>;
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>x : Symbol(x, Decl(promisePermutations2.ts, 113, 24))
 >IPromise : Symbol(IPromise, Decl(promisePermutations2.ts, 5, 1))
 
-var nPromise: (x: any) => Promise<number>;
->nPromise : Symbol(nPromise, Decl(promisePermutations2.ts, 114, 3))
->x : Symbol(x, Decl(promisePermutations2.ts, 114, 15))
+declare var nPromise: (x: any) => Promise<number>;
+>nPromise : Symbol(nPromise, Decl(promisePermutations2.ts, 114, 11))
+>x : Symbol(x, Decl(promisePermutations2.ts, 114, 23))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations2.ts, 0, 0))
 
 var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
 >r8a : Symbol(r8a, Decl(promisePermutations2.ts, 115, 3))
 >r8.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r8 : Symbol(r8, Decl(promisePermutations2.ts, 112, 3))
+>r8 : Symbol(r8, Decl(promisePermutations2.ts, 112, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction8 : Symbol(testFunction8, Decl(promisePermutations2.ts, 28, 69))
 >testFunction8 : Symbol(testFunction8, Decl(promisePermutations2.ts, 28, 69))
@@ -886,15 +886,15 @@ var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nI
 >r8b : Symbol(r8b, Decl(promisePermutations2.ts, 116, 3))
 >r8.then(nIPromise, nIPromise, nIPromise).then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >r8.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r8 : Symbol(r8, Decl(promisePermutations2.ts, 112, 3))
+>r8 : Symbol(r8, Decl(promisePermutations2.ts, 112, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
 
 var s8: Promise<number>;
 >s8 : Symbol(s8, Decl(promisePermutations2.ts, 117, 3))
@@ -933,22 +933,22 @@ var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nI
 >s8.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >s8 : Symbol(s8, Decl(promisePermutations2.ts, 117, 3))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
 
-var r9: IPromise<number>;
->r9 : Symbol(r9, Decl(promisePermutations2.ts, 123, 3))
+declare var r9: IPromise<number>;
+>r9 : Symbol(r9, Decl(promisePermutations2.ts, 123, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations2.ts, 5, 1))
 
 var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 >r9a : Symbol(r9a, Decl(promisePermutations2.ts, 124, 3))
 >r9.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r9 : Symbol(r9, Decl(promisePermutations2.ts, 123, 3))
+>r9 : Symbol(r9, Decl(promisePermutations2.ts, 123, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction9 : Symbol(testFunction9, Decl(promisePermutations2.ts, 30, 70))
 >testFunction9 : Symbol(testFunction9, Decl(promisePermutations2.ts, 30, 70))
@@ -957,52 +957,52 @@ var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 var r9b = r9.then(sIPromise, sIPromise, sIPromise); // ok
 >r9b : Symbol(r9b, Decl(promisePermutations2.ts, 125, 3))
 >r9.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r9 : Symbol(r9, Decl(promisePermutations2.ts, 123, 3))
+>r9 : Symbol(r9, Decl(promisePermutations2.ts, 123, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 
 var r9c = r9.then(nIPromise, nIPromise, nIPromise); // ok
 >r9c : Symbol(r9c, Decl(promisePermutations2.ts, 126, 3))
 >r9.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r9 : Symbol(r9, Decl(promisePermutations2.ts, 123, 3))
+>r9 : Symbol(r9, Decl(promisePermutations2.ts, 123, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
 
 var r9d = r9.then(testFunction, sIPromise, nIPromise); // error
 >r9d : Symbol(r9d, Decl(promisePermutations2.ts, 127, 3))
 >r9.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r9 : Symbol(r9, Decl(promisePermutations2.ts, 123, 3))
+>r9 : Symbol(r9, Decl(promisePermutations2.ts, 123, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
 
 var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
 >r9e : Symbol(r9e, Decl(promisePermutations2.ts, 128, 3))
 >r9.then(testFunction, nIPromise, sIPromise).then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >r9.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r9 : Symbol(r9, Decl(promisePermutations2.ts, 123, 3))
+>r9 : Symbol(r9, Decl(promisePermutations2.ts, 123, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 
-var s9: Promise<number>;
->s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 3))
+declare var s9: Promise<number>;
+>s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations2.ts, 0, 0))
 
 var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 >s9a : Symbol(s9a, Decl(promisePermutations2.ts, 130, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 3))
+>s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction9 : Symbol(testFunction9, Decl(promisePermutations2.ts, 30, 70))
 >testFunction9 : Symbol(testFunction9, Decl(promisePermutations2.ts, 30, 70))
@@ -1011,7 +1011,7 @@ var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
 >s9b : Symbol(s9b, Decl(promisePermutations2.ts, 131, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 3))
+>s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction9P : Symbol(testFunction9P, Decl(promisePermutations2.ts, 31, 73))
 >testFunction9P : Symbol(testFunction9P, Decl(promisePermutations2.ts, 31, 73))
@@ -1020,7 +1020,7 @@ var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
 var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
 >s9c : Symbol(s9c, Decl(promisePermutations2.ts, 132, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 3))
+>s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction9P : Symbol(testFunction9P, Decl(promisePermutations2.ts, 31, 73))
 >testFunction9 : Symbol(testFunction9, Decl(promisePermutations2.ts, 30, 70))
@@ -1029,43 +1029,43 @@ var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
 var s9d = s9.then(sPromise, sPromise, sPromise); // ok
 >s9d : Symbol(s9d, Decl(promisePermutations2.ts, 133, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 3))
+>s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
 
 var s9e = s9.then(nPromise, nPromise, nPromise); // ok
 >s9e : Symbol(s9e, Decl(promisePermutations2.ts, 134, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 3))
+>s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->nPromise : Symbol(nPromise, Decl(promisePermutations2.ts, 114, 3))
->nPromise : Symbol(nPromise, Decl(promisePermutations2.ts, 114, 3))
->nPromise : Symbol(nPromise, Decl(promisePermutations2.ts, 114, 3))
+>nPromise : Symbol(nPromise, Decl(promisePermutations2.ts, 114, 11))
+>nPromise : Symbol(nPromise, Decl(promisePermutations2.ts, 114, 11))
+>nPromise : Symbol(nPromise, Decl(promisePermutations2.ts, 114, 11))
 
 var s9f = s9.then(testFunction, sIPromise, nIPromise); // error
 >s9f : Symbol(s9f, Decl(promisePermutations2.ts, 135, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 3))
+>s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
 
 var s9g = s9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
 >s9g : Symbol(s9g, Decl(promisePermutations2.ts, 136, 3))
 >s9.then(testFunction, nIPromise, sIPromise).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 3))
+>s9 : Symbol(s9, Decl(promisePermutations2.ts, 129, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 
 var r10 = testFunction10(x => x);
 >r10 : Symbol(r10, Decl(promisePermutations2.ts, 138, 3))
@@ -1087,18 +1087,18 @@ var r10b = r10.then(sIPromise, sIPromise, sIPromise); // ok
 >r10.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >r10 : Symbol(r10, Decl(promisePermutations2.ts, 138, 3))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 
 var r10c = r10.then(nIPromise, nIPromise, nIPromise); // ok
 >r10c : Symbol(r10c, Decl(promisePermutations2.ts, 141, 3))
 >r10.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >r10 : Symbol(r10, Decl(promisePermutations2.ts, 138, 3))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
 
 var r10d = r10.then(testFunction, sIPromise, nIPromise); // error
 >r10d : Symbol(r10d, Decl(promisePermutations2.ts, 142, 3))
@@ -1106,8 +1106,8 @@ var r10d = r10.then(testFunction, sIPromise, nIPromise); // error
 >r10 : Symbol(r10, Decl(promisePermutations2.ts, 138, 3))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
 
 var r10e = r10.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
 >r10e : Symbol(r10e, Decl(promisePermutations2.ts, 143, 3))
@@ -1116,12 +1116,12 @@ var r10e = r10.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromis
 >r10 : Symbol(r10, Decl(promisePermutations2.ts, 138, 3))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction : Symbol(testFunction, Decl(promisePermutations2.ts, 13, 1))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 
 var s10 = testFunction10P(x => x);
 >s10 : Symbol(s10, Decl(promisePermutations2.ts, 144, 3))
@@ -1161,18 +1161,18 @@ var s10d = s10.then(sPromise, sPromise, sPromise); // ok
 >s10.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >s10 : Symbol(s10, Decl(promisePermutations2.ts, 144, 3))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
 
 var s10e = s10.then(nIPromise, nPromise, nIPromise); // ok
 >s10e : Symbol(s10e, Decl(promisePermutations2.ts, 149, 3))
 >s10.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >s10 : Symbol(s10, Decl(promisePermutations2.ts, 144, 3))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->nPromise : Symbol(nPromise, Decl(promisePermutations2.ts, 114, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>nPromise : Symbol(nPromise, Decl(promisePermutations2.ts, 114, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
 
 var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
 >s10f : Symbol(s10f, Decl(promisePermutations2.ts, 150, 3))
@@ -1180,8 +1180,8 @@ var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
 >s10 : Symbol(s10, Decl(promisePermutations2.ts, 144, 3))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations2.ts, 15, 50))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
 
 var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
 >s10g : Symbol(s10g, Decl(promisePermutations2.ts, 151, 3))
@@ -1190,34 +1190,34 @@ var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromis
 >s10 : Symbol(s10, Decl(promisePermutations2.ts, 144, 3))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations2.ts, 15, 50))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations2.ts, 113, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations2.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations2.ts, 75, 11))
 
-var r11: IPromise<number>;
->r11 : Symbol(r11, Decl(promisePermutations2.ts, 153, 3))
+declare var r11: IPromise<number>;
+>r11 : Symbol(r11, Decl(promisePermutations2.ts, 153, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations2.ts, 5, 1))
 
 var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
 >r11a : Symbol(r11a, Decl(promisePermutations2.ts, 154, 3))
 >r11.then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
->r11 : Symbol(r11, Decl(promisePermutations2.ts, 153, 3))
+>r11 : Symbol(r11, Decl(promisePermutations2.ts, 153, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations2.ts, 7, 23), Decl(promisePermutations2.ts, 8, 135), Decl(promisePermutations2.ts, 9, 125), Decl(promisePermutations2.ts, 10, 125))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations2.ts, 34, 68), Decl(promisePermutations2.ts, 36, 61))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations2.ts, 34, 68), Decl(promisePermutations2.ts, 36, 61))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations2.ts, 34, 68), Decl(promisePermutations2.ts, 36, 61))
 
-var s11: Promise<number>;
->s11 : Symbol(s11, Decl(promisePermutations2.ts, 155, 3))
+declare var s11: Promise<number>;
+>s11 : Symbol(s11, Decl(promisePermutations2.ts, 155, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations2.ts, 0, 0))
 
 var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 >s11a : Symbol(s11a, Decl(promisePermutations2.ts, 156, 3))
 >s11.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s11 : Symbol(s11, Decl(promisePermutations2.ts, 155, 3))
+>s11 : Symbol(s11, Decl(promisePermutations2.ts, 155, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations2.ts, 34, 68), Decl(promisePermutations2.ts, 36, 61))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations2.ts, 34, 68), Decl(promisePermutations2.ts, 36, 61))
@@ -1226,7 +1226,7 @@ var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // ok
 >s11b : Symbol(s11b, Decl(promisePermutations2.ts, 157, 3))
 >s11.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s11 : Symbol(s11, Decl(promisePermutations2.ts, 155, 3))
+>s11 : Symbol(s11, Decl(promisePermutations2.ts, 155, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction11P : Symbol(testFunction11P, Decl(promisePermutations2.ts, 37, 61), Decl(promisePermutations2.ts, 38, 61))
 >testFunction11P : Symbol(testFunction11P, Decl(promisePermutations2.ts, 37, 61), Decl(promisePermutations2.ts, 38, 61))
@@ -1235,7 +1235,7 @@ var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // ok
 var s11c = s11.then(testFunction11P, testFunction11, testFunction11); // ok
 >s11c : Symbol(s11c, Decl(promisePermutations2.ts, 158, 3))
 >s11.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
->s11 : Symbol(s11, Decl(promisePermutations2.ts, 155, 3))
+>s11 : Symbol(s11, Decl(promisePermutations2.ts, 155, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations2.ts, 2, 22))
 >testFunction11P : Symbol(testFunction11P, Decl(promisePermutations2.ts, 37, 61), Decl(promisePermutations2.ts, 38, 61))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations2.ts, 34, 68), Decl(promisePermutations2.ts, 36, 61))
diff --git a/tests/baselines/reference/promisePermutations2.types b/tests/baselines/reference/promisePermutations2.types
index 5509ed1e8cf36..5149065c6dee3 100644
--- a/tests/baselines/reference/promisePermutations2.types
+++ b/tests/baselines/reference/promisePermutations2.types
@@ -334,7 +334,7 @@ declare function testFunction12P<T>(x: T, y: T): Promise<T>;
 >y : T
 >  : ^
 
-var r1: IPromise<number>;
+declare var r1: IPromise<number>;
 >r1 : IPromise<number>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -404,7 +404,7 @@ var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
 >testFunctionP : () => Promise<number>
 >              : ^^^^^^               
 
-var s1: Promise<number>;
+declare var s1: Promise<number>;
 >s1 : Promise<number>
 >   : ^^^^^^^^^^^^^^^
 
@@ -492,7 +492,7 @@ var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction,
 >testFunction : () => IPromise<number>
 >             : ^^^^^^                
 
-var r2: IPromise<{ x: number; }>;
+declare var r2: IPromise<{ x: number; }>;
 >r2 : IPromise<{ x: number; }>
 >   : ^^^^^^^^^^^^^^      ^^^^
 >x : number
@@ -546,7 +546,7 @@ var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction
 >testFunction2 : () => IPromise<{ x: number; }>
 >              : ^^^^^^                        
 
-var s2: Promise<{ x: number; }>;
+declare var s2: Promise<{ x: number; }>;
 >s2 : Promise<{ x: number; }>
 >   : ^^^^^^^^^^^^^      ^^^^
 >x : number
@@ -636,7 +636,7 @@ var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunctio
 >testFunction2 : () => IPromise<{ x: number; }>
 >              : ^^^^^^                        
 
-var r3: IPromise<number>;
+declare var r3: IPromise<number>;
 >r3 : IPromise<number>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -688,7 +688,7 @@ var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction
 >testFunction3 : (x: number) => IPromise<number>
 >              : ^ ^^      ^^^^^                
 
-var s3: Promise<number>;
+declare var s3: Promise<number>;
 >s3 : Promise<number>
 >   : ^^^^^^^^^^^^^^^
 
@@ -776,17 +776,17 @@ var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunctio
 >testFunction3 : (x: number) => IPromise<number>
 >              : ^ ^^      ^^^^^                
 
-var r4: IPromise<string>;
+declare var r4: IPromise<string>;
 >r4 : IPromise<string>
 >   : ^^^^^^^^^^^^^^^^
 
-var sIPromise: (x: any) => IPromise<string>;
+declare var sIPromise: (x: any) => IPromise<string>;
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 >x : any
 >  : ^^^
 
-var sPromise: (x: any) => Promise<string>;
+declare var sPromise: (x: any) => Promise<string>;
 >sPromise : (x: any) => Promise<string>
 >         : ^ ^^   ^^^^^               
 >x : any
@@ -840,7 +840,7 @@ var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testF
 >testFunction4 : (x: number, y?: string) => IPromise<string>
 >              : ^ ^^      ^^ ^^^      ^^^^^                
 
-var s4: Promise<string>;
+declare var s4: Promise<string>;
 >s4 : Promise<string>
 >   : ^^^^^^^^^^^^^^^
 
@@ -928,7 +928,7 @@ var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, test
 >testFunction4 : (x: number, y?: string) => IPromise<string>
 >              : ^ ^^      ^^ ^^^      ^^^^^                
 
-var r5: IPromise<string>;
+declare var r5: IPromise<string>;
 >r5 : IPromise<string>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -980,7 +980,7 @@ var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var s5: Promise<string>;
+declare var s5: Promise<string>;
 >s5 : Promise<string>
 >   : ^^^^^^^^^^^^^^^
 
@@ -1068,7 +1068,7 @@ var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var r6: IPromise<string>;
+declare var r6: IPromise<string>;
 >r6 : IPromise<string>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -1120,7 +1120,7 @@ var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var s6: Promise<string>;
+declare var s6: Promise<string>;
 >s6 : Promise<string>
 >   : ^^^^^^^^^^^^^^^
 
@@ -1208,7 +1208,7 @@ var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var r7: IPromise<string>;
+declare var r7: IPromise<string>;
 >r7 : IPromise<string>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -1260,7 +1260,7 @@ var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var s7: Promise<string>;
+declare var s7: Promise<string>;
 >s7 : Promise<string>
 >   : ^^^^^^^^^^^^^^^
 
@@ -1348,17 +1348,17 @@ var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromis
 >sPromise : (x: any) => Promise<string>
 >         : ^ ^^   ^^^^^               
 
-var r8: IPromise<number>;
+declare var r8: IPromise<number>;
 >r8 : IPromise<number>
 >   : ^^^^^^^^^^^^^^^^
 
-var nIPromise: (x: any) => IPromise<number>;
+declare var nIPromise: (x: any) => IPromise<number>;
 >nIPromise : (x: any) => IPromise<number>
 >          : ^ ^^   ^^^^^                
 >x : any
 >  : ^^^
 
-var nPromise: (x: any) => Promise<number>;
+declare var nPromise: (x: any) => Promise<number>;
 >nPromise : (x: any) => Promise<number>
 >         : ^ ^^   ^^^^^               
 >x : any
@@ -1500,7 +1500,7 @@ var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nI
 >nIPromise : (x: any) => IPromise<number>
 >          : ^ ^^   ^^^^^                
 
-var r9: IPromise<number>;
+declare var r9: IPromise<number>;
 >r9 : IPromise<number>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -1606,7 +1606,7 @@ var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise,
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var s9: Promise<number>;
+declare var s9: Promise<number>;
 >s9 : Promise<number>
 >   : ^^^^^^^^^^^^^^^
 
@@ -2016,7 +2016,7 @@ var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromis
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var r11: IPromise<number>;
+declare var r11: IPromise<number>;
 >r11 : IPromise<number>
 >    : ^^^^^^^^^^^^^^^^
 
@@ -2038,7 +2038,7 @@ var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
 >testFunction11 : { (x: number): IPromise<number>; (x: string): IPromise<string>; }
 >               : ^^^ ^^      ^^^                ^^^ ^^      ^^^                ^^^
 
-var s11: Promise<number>;
+declare var s11: Promise<number>;
 >s11 : Promise<number>
 >    : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/promisePermutations3.errors.txt b/tests/baselines/reference/promisePermutations3.errors.txt
index 1ed7b2c29d581..dd337244a58a6 100644
--- a/tests/baselines/reference/promisePermutations3.errors.txt
+++ b/tests/baselines/reference/promisePermutations3.errors.txt
@@ -180,33 +180,33 @@ promisePermutations3.ts(165,21): error TS2345: Argument of type '{ <T>(x: T): IP
     declare function testFunction12P<T>(x: T): IPromise<T>;
     declare function testFunction12P<T>(x: T, y: T): Promise<T>;
     
-    var r1: IPromise<number>;
+    declare var r1: IPromise<number>;
     var r1a = r1.then(testFunction, testFunction, testFunction);
     var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, testFunction, testFunction);
     var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
-    var s1: Promise<number>;
+    declare var s1: Promise<number>;
     var s1a = s1.then(testFunction, testFunction, testFunction);
     var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
     var s1c = s1.then(testFunctionP, testFunction, testFunction);
     var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction, testFunction, testFunction);
     
-    var r2: IPromise<{ x: number; }>;
+    declare var r2: IPromise<{ x: number; }>;
     var r2a = r2.then(testFunction2, testFunction2, testFunction2);
     var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
-    var s2: Promise<{ x: number; }>;
+    declare var s2: Promise<{ x: number; }>;
     var s2a = s2.then(testFunction2, testFunction2, testFunction2);
     var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
     var s2c = s2.then(testFunction2P, testFunction2, testFunction2);
     var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
     
-    var r3: IPromise<number>;
+    declare var r3: IPromise<number>;
     var r3a = r3.then(testFunction3, testFunction3, testFunction3);
     var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3);
                                                                         ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number) => IPromise<number>' is not assignable to parameter of type '(value: IPromise<number>) => IPromise<number>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
 !!! error TS2345:     Type 'IPromise<number>' is not assignable to type 'number'.
-    var s3: Promise<number>;
+    declare var s3: Promise<number>;
     var s3a = s3.then(testFunction3, testFunction3, testFunction3);
     var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
     var s3c = s3.then(testFunction3P, testFunction3, testFunction3);
@@ -219,16 +219,16 @@ promisePermutations3.ts(165,21): error TS2345: Argument of type '{ <T>(x: T): IP
 !!! error TS2769:         Type 'IPromise<number>' is not assignable to type 'number'.
 !!! related TS2771 promisePermutations3.ts:7:5: The last overload is declared here.
     
-    var r4: IPromise<string>;
-    var sIPromise: (x: any) => IPromise<string>;
-    var sPromise: (x: any) => Promise<string>;
+    declare var r4: IPromise<string>;
+    declare var sIPromise: (x: any) => IPromise<string>;
+    declare var sPromise: (x: any) => Promise<string>;
     var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y?: string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
 !!! error TS2345:     Type 'string' is not assignable to type 'number'.
     var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testFunction4, testFunction4); // ok
-    var s4: Promise<string>;
+    declare var s4: Promise<string>;
     var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -255,13 +255,13 @@ promisePermutations3.ts(165,21): error TS2345: Argument of type '{ <T>(x: T): IP
 !!! related TS2771 promisePermutations3.ts:7:5: The last overload is declared here.
     var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, testFunction4P, testFunction4);
     
-    var r5: IPromise<string>;
+    declare var r5: IPromise<string>;
     var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, cb: (a: string) => string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Target signature provides too few arguments. Expected 2 or more, but got 1.
     var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-    var s5: Promise<string>;
+    declare var s5: Promise<string>;
     var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -285,13 +285,13 @@ promisePermutations3.ts(165,21): error TS2345: Argument of type '{ <T>(x: T): IP
 !!! related TS2771 promisePermutations3.ts:7:5: The last overload is declared here.
     var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
     
-    var r6: IPromise<string>;
+    declare var r6: IPromise<string>;
     var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Target signature provides too few arguments. Expected 2 or more, but got 1.
     var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-    var s6: Promise<string>;
+    declare var s6: Promise<string>;
     var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -315,14 +315,14 @@ promisePermutations3.ts(165,21): error TS2345: Argument of type '{ <T>(x: T): IP
 !!! related TS2771 promisePermutations3.ts:7:5: The last overload is declared here.
     var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
     
-    var r7: IPromise<string>;
+    declare var r7: IPromise<string>;
     var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
 !!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-    var s7: Promise<string>;
+    declare var s7: Promise<string>;
     var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
@@ -340,9 +340,9 @@ promisePermutations3.ts(165,21): error TS2345: Argument of type '{ <T>(x: T): IP
 !!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromise); // ok?
     
-    var r8: IPromise<number>;
-    var nIPromise: (x: any) => IPromise<number>;
-    var nPromise: (x: any) => Promise<number>;
+    declare var r8: IPromise<number>;
+    declare var nIPromise: (x: any) => IPromise<number>;
+    declare var nPromise: (x: any) => Promise<number>;
     var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '<T>(x: T, cb: (a: T) => T) => IPromise<T>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
@@ -372,7 +372,7 @@ promisePermutations3.ts(165,21): error TS2345: Argument of type '{ <T>(x: T): IP
 !!! related TS2771 promisePermutations3.ts:7:5: The last overload is declared here.
     var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
     
-    var r9: IPromise<number>;
+    declare var r9: IPromise<number>;
     var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '<T>(x: T, cb: <U>(a: U) => U) => IPromise<T>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
@@ -385,7 +385,7 @@ promisePermutations3.ts(165,21): error TS2345: Argument of type '{ <T>(x: T): IP
 !!! error TS2345:   Type 'IPromise<string>' is not assignable to type 'IPromise<number>'.
 !!! error TS2345:     Type 'string' is not assignable to type 'number'.
     var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-    var s9: Promise<number>;
+    declare var s9: Promise<number>;
     var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
                       ~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -444,13 +444,13 @@ promisePermutations3.ts(165,21): error TS2345: Argument of type '{ <T>(x: T): IP
 !!! related TS2771 promisePermutations3.ts:7:5: The last overload is declared here.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
     
-    var r11: IPromise<number>;
+    declare var r11: IPromise<number>;
     var r11a = r11.then(testFunction11, testFunction11, testFunction11); // ok
                         ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '{ (x: number): IPromise<number>; (x: string): IPromise<string>; }' is not assignable to parameter of type '(value: number) => IPromise<string>'.
 !!! error TS2345:   Type 'IPromise<number>' is not assignable to type 'IPromise<string>'.
 !!! error TS2345:     Type 'number' is not assignable to type 'string'.
-    var s11: Promise<number>;
+    declare var s11: Promise<number>;
     var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
                         ~~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
diff --git a/tests/baselines/reference/promisePermutations3.js b/tests/baselines/reference/promisePermutations3.js
index 64099ddb0dcdb..7751609bd9a9f 100644
--- a/tests/baselines/reference/promisePermutations3.js
+++ b/tests/baselines/reference/promisePermutations3.js
@@ -47,75 +47,75 @@ declare function testFunction12<T>(x: T, y: T): IPromise<T>;
 declare function testFunction12P<T>(x: T): IPromise<T>;
 declare function testFunction12P<T>(x: T, y: T): Promise<T>;
 
-var r1: IPromise<number>;
+declare var r1: IPromise<number>;
 var r1a = r1.then(testFunction, testFunction, testFunction);
 var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, testFunction, testFunction);
 var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
-var s1: Promise<number>;
+declare var s1: Promise<number>;
 var s1a = s1.then(testFunction, testFunction, testFunction);
 var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
 var s1c = s1.then(testFunctionP, testFunction, testFunction);
 var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction, testFunction, testFunction);
 
-var r2: IPromise<{ x: number; }>;
+declare var r2: IPromise<{ x: number; }>;
 var r2a = r2.then(testFunction2, testFunction2, testFunction2);
 var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
-var s2: Promise<{ x: number; }>;
+declare var s2: Promise<{ x: number; }>;
 var s2a = s2.then(testFunction2, testFunction2, testFunction2);
 var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
 var s2c = s2.then(testFunction2P, testFunction2, testFunction2);
 var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
 
-var r3: IPromise<number>;
+declare var r3: IPromise<number>;
 var r3a = r3.then(testFunction3, testFunction3, testFunction3);
 var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3);
-var s3: Promise<number>;
+declare var s3: Promise<number>;
 var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
 var s3c = s3.then(testFunction3P, testFunction3, testFunction3);
 var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3);
 
-var r4: IPromise<string>;
-var sIPromise: (x: any) => IPromise<string>;
-var sPromise: (x: any) => Promise<string>;
+declare var r4: IPromise<string>;
+declare var sIPromise: (x: any) => IPromise<string>;
+declare var sPromise: (x: any) => Promise<string>;
 var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
 var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testFunction4, testFunction4); // ok
-var s4: Promise<string>;
+declare var s4: Promise<string>;
 var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error 
 var s4c = s4.then(testFunction4P, testFunction4, testFunction4); // error
 var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, testFunction4P, testFunction4);
 
-var r5: IPromise<string>;
+declare var r5: IPromise<string>;
 var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
 var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s5: Promise<string>;
+declare var s5: Promise<string>;
 var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 var s5b = s5.then(testFunction5P, testFunction5P, testFunction5P); // error
 var s5c = s5.then(testFunction5P, testFunction5, testFunction5); // error
 var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
 
-var r6: IPromise<string>;
+declare var r6: IPromise<string>;
 var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
 var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s6: Promise<string>;
+declare var s6: Promise<string>;
 var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 var s6b = s6.then(testFunction6P, testFunction6P, testFunction6P); // error
 var s6c = s6.then(testFunction6P, testFunction6, testFunction6); // error
 var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
 
-var r7: IPromise<string>;
+declare var r7: IPromise<string>;
 var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s7: Promise<string>;
+declare var s7: Promise<string>;
 var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
 var s7c = r7.then(testFunction7P, testFunction7, testFunction7); // error
 var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromise); // ok?
 
-var r8: IPromise<number>;
-var nIPromise: (x: any) => IPromise<number>;
-var nPromise: (x: any) => Promise<number>;
+declare var r8: IPromise<number>;
+declare var nIPromise: (x: any) => IPromise<number>;
+declare var nPromise: (x: any) => Promise<number>;
 var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
 var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 var s8: Promise<number>;
@@ -124,13 +124,13 @@ var s8b = s8.then(testFunction8P, testFunction8P, testFunction8P); // error
 var s8c = s8.then(testFunction8P, testFunction8, testFunction8); // error
 var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 
-var r9: IPromise<number>;
+declare var r9: IPromise<number>;
 var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 var r9b = r9.then(sIPromise, sIPromise, sIPromise); // ok
 var r9c = r9.then(nIPromise, nIPromise, nIPromise); // ok
 var r9d = r9.then(testFunction, sIPromise, nIPromise); // error
 var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s9: Promise<number>;
+declare var s9: Promise<number>;
 var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
 var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
@@ -154,9 +154,9 @@ var s10e = s10.then(nIPromise, nPromise, nIPromise); // ok
 var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
 var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
 
-var r11: IPromise<number>;
+declare var r11: IPromise<number>;
 var r11a = r11.then(testFunction11, testFunction11, testFunction11); // ok
-var s11: Promise<number>;
+declare var s11: Promise<number>;
 var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // error
 var s11c = s11.then(testFunction11P, testFunction11, testFunction11); // error
@@ -170,68 +170,49 @@ var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok
 
 //// [promisePermutations3.js]
 // same as promisePermutations but without the same overloads in IPromise<T>
-var r1;
 var r1a = r1.then(testFunction, testFunction, testFunction);
 var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, testFunction, testFunction);
 var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
-var s1;
 var s1a = s1.then(testFunction, testFunction, testFunction);
 var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
 var s1c = s1.then(testFunctionP, testFunction, testFunction);
 var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction, testFunction, testFunction);
-var r2;
 var r2a = r2.then(testFunction2, testFunction2, testFunction2);
 var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
-var s2;
 var s2a = s2.then(testFunction2, testFunction2, testFunction2);
 var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
 var s2c = s2.then(testFunction2P, testFunction2, testFunction2);
 var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
-var r3;
 var r3a = r3.then(testFunction3, testFunction3, testFunction3);
 var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3);
-var s3;
 var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
 var s3c = s3.then(testFunction3P, testFunction3, testFunction3);
 var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3);
-var r4;
-var sIPromise;
-var sPromise;
 var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
 var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testFunction4, testFunction4); // ok
-var s4;
 var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error 
 var s4c = s4.then(testFunction4P, testFunction4, testFunction4); // error
 var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, testFunction4P, testFunction4);
-var r5;
 var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
 var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s5;
 var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 var s5b = s5.then(testFunction5P, testFunction5P, testFunction5P); // error
 var s5c = s5.then(testFunction5P, testFunction5, testFunction5); // error
 var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var r6;
 var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
 var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s6;
 var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 var s6b = s6.then(testFunction6P, testFunction6P, testFunction6P); // error
 var s6c = s6.then(testFunction6P, testFunction6, testFunction6); // error
 var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var r7;
 var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s7;
 var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
 var s7c = r7.then(testFunction7P, testFunction7, testFunction7); // error
 var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromise); // ok?
-var r8;
-var nIPromise;
-var nPromise;
 var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
 var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 var s8;
@@ -239,13 +220,11 @@ var s8a = s8.then(testFunction8, testFunction8, testFunction8); // error
 var s8b = s8.then(testFunction8P, testFunction8P, testFunction8P); // error
 var s8c = s8.then(testFunction8P, testFunction8, testFunction8); // error
 var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
-var r9;
 var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 var r9b = r9.then(sIPromise, sIPromise, sIPromise); // ok
 var r9c = r9.then(nIPromise, nIPromise, nIPromise); // ok
 var r9d = r9.then(testFunction, sIPromise, nIPromise); // error
 var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s9;
 var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
 var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
@@ -267,9 +246,7 @@ var s10d = s10.then(sPromise, sPromise, sPromise); // ok
 var s10e = s10.then(nIPromise, nPromise, nIPromise); // ok
 var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
 var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
-var r11;
 var r11a = r11.then(testFunction11, testFunction11, testFunction11); // ok
-var s11;
 var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // error
 var s11c = s11.then(testFunction11P, testFunction11, testFunction11); // error
diff --git a/tests/baselines/reference/promisePermutations3.symbols b/tests/baselines/reference/promisePermutations3.symbols
index 4f1cb28145f68..f67f54f002026 100644
--- a/tests/baselines/reference/promisePermutations3.symbols
+++ b/tests/baselines/reference/promisePermutations3.symbols
@@ -334,14 +334,14 @@ declare function testFunction12P<T>(x: T, y: T): Promise<T>;
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations3.ts, 0, 0))
 >T : Symbol(T, Decl(promisePermutations3.ts, 44, 33))
 
-var r1: IPromise<number>;
->r1 : Symbol(r1, Decl(promisePermutations3.ts, 46, 3))
+declare var r1: IPromise<number>;
+>r1 : Symbol(r1, Decl(promisePermutations3.ts, 46, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations3.ts, 8, 1))
 
 var r1a = r1.then(testFunction, testFunction, testFunction);
 >r1a : Symbol(r1a, Decl(promisePermutations3.ts, 47, 3))
 >r1.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r1 : Symbol(r1, Decl(promisePermutations3.ts, 46, 3))
+>r1 : Symbol(r1, Decl(promisePermutations3.ts, 46, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
@@ -351,7 +351,7 @@ var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, t
 >r1b : Symbol(r1b, Decl(promisePermutations3.ts, 48, 3))
 >r1.then(testFunction, testFunction, testFunction).then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >r1.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r1 : Symbol(r1, Decl(promisePermutations3.ts, 46, 3))
+>r1 : Symbol(r1, Decl(promisePermutations3.ts, 46, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
@@ -364,20 +364,20 @@ var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, t
 var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
 >r1c : Symbol(r1c, Decl(promisePermutations3.ts, 49, 3))
 >r1.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r1 : Symbol(r1, Decl(promisePermutations3.ts, 46, 3))
+>r1 : Symbol(r1, Decl(promisePermutations3.ts, 46, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations3.ts, 15, 50))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations3.ts, 15, 50))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations3.ts, 15, 50))
 
-var s1: Promise<number>;
->s1 : Symbol(s1, Decl(promisePermutations3.ts, 50, 3))
+declare var s1: Promise<number>;
+>s1 : Symbol(s1, Decl(promisePermutations3.ts, 50, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations3.ts, 0, 0))
 
 var s1a = s1.then(testFunction, testFunction, testFunction);
 >s1a : Symbol(s1a, Decl(promisePermutations3.ts, 51, 3))
 >s1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s1 : Symbol(s1, Decl(promisePermutations3.ts, 50, 3))
+>s1 : Symbol(s1, Decl(promisePermutations3.ts, 50, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
@@ -386,7 +386,7 @@ var s1a = s1.then(testFunction, testFunction, testFunction);
 var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
 >s1b : Symbol(s1b, Decl(promisePermutations3.ts, 52, 3))
 >s1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s1 : Symbol(s1, Decl(promisePermutations3.ts, 50, 3))
+>s1 : Symbol(s1, Decl(promisePermutations3.ts, 50, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations3.ts, 15, 50))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations3.ts, 15, 50))
@@ -395,7 +395,7 @@ var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
 var s1c = s1.then(testFunctionP, testFunction, testFunction);
 >s1c : Symbol(s1c, Decl(promisePermutations3.ts, 53, 3))
 >s1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s1 : Symbol(s1, Decl(promisePermutations3.ts, 50, 3))
+>s1 : Symbol(s1, Decl(promisePermutations3.ts, 50, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations3.ts, 15, 50))
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
@@ -405,7 +405,7 @@ var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction,
 >s1d : Symbol(s1d, Decl(promisePermutations3.ts, 54, 3))
 >s1.then(testFunctionP, testFunction, testFunction).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >s1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s1 : Symbol(s1, Decl(promisePermutations3.ts, 50, 3))
+>s1 : Symbol(s1, Decl(promisePermutations3.ts, 50, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations3.ts, 15, 50))
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
@@ -415,15 +415,15 @@ var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction,
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
 
-var r2: IPromise<{ x: number; }>;
->r2 : Symbol(r2, Decl(promisePermutations3.ts, 56, 3))
+declare var r2: IPromise<{ x: number; }>;
+>r2 : Symbol(r2, Decl(promisePermutations3.ts, 56, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations3.ts, 8, 1))
->x : Symbol(x, Decl(promisePermutations3.ts, 56, 18))
+>x : Symbol(x, Decl(promisePermutations3.ts, 56, 26))
 
 var r2a = r2.then(testFunction2, testFunction2, testFunction2);
 >r2a : Symbol(r2a, Decl(promisePermutations3.ts, 57, 3))
 >r2.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r2 : Symbol(r2, Decl(promisePermutations3.ts, 56, 3))
+>r2 : Symbol(r2, Decl(promisePermutations3.ts, 56, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations3.ts, 16, 50))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations3.ts, 16, 50))
@@ -433,7 +433,7 @@ var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction
 >r2b : Symbol(r2b, Decl(promisePermutations3.ts, 58, 3))
 >r2.then(testFunction2, testFunction2, testFunction2).then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >r2.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r2 : Symbol(r2, Decl(promisePermutations3.ts, 56, 3))
+>r2 : Symbol(r2, Decl(promisePermutations3.ts, 56, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations3.ts, 16, 50))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations3.ts, 16, 50))
@@ -443,15 +443,15 @@ var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations3.ts, 16, 50))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations3.ts, 16, 50))
 
-var s2: Promise<{ x: number; }>;
->s2 : Symbol(s2, Decl(promisePermutations3.ts, 59, 3))
+declare var s2: Promise<{ x: number; }>;
+>s2 : Symbol(s2, Decl(promisePermutations3.ts, 59, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations3.ts, 0, 0))
->x : Symbol(x, Decl(promisePermutations3.ts, 59, 17))
+>x : Symbol(x, Decl(promisePermutations3.ts, 59, 25))
 
 var s2a = s2.then(testFunction2, testFunction2, testFunction2);
 >s2a : Symbol(s2a, Decl(promisePermutations3.ts, 60, 3))
 >s2.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s2 : Symbol(s2, Decl(promisePermutations3.ts, 59, 3))
+>s2 : Symbol(s2, Decl(promisePermutations3.ts, 59, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations3.ts, 16, 50))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations3.ts, 16, 50))
@@ -460,7 +460,7 @@ var s2a = s2.then(testFunction2, testFunction2, testFunction2);
 var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
 >s2b : Symbol(s2b, Decl(promisePermutations3.ts, 61, 3))
 >s2.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s2 : Symbol(s2, Decl(promisePermutations3.ts, 59, 3))
+>s2 : Symbol(s2, Decl(promisePermutations3.ts, 59, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction2P : Symbol(testFunction2P, Decl(promisePermutations3.ts, 17, 58))
 >testFunction2P : Symbol(testFunction2P, Decl(promisePermutations3.ts, 17, 58))
@@ -469,7 +469,7 @@ var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
 var s2c = s2.then(testFunction2P, testFunction2, testFunction2);
 >s2c : Symbol(s2c, Decl(promisePermutations3.ts, 62, 3))
 >s2.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s2 : Symbol(s2, Decl(promisePermutations3.ts, 59, 3))
+>s2 : Symbol(s2, Decl(promisePermutations3.ts, 59, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction2P : Symbol(testFunction2P, Decl(promisePermutations3.ts, 17, 58))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations3.ts, 16, 50))
@@ -479,7 +479,7 @@ var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunctio
 >s2d : Symbol(s2d, Decl(promisePermutations3.ts, 63, 3))
 >s2.then(testFunction2P, testFunction2, testFunction2).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >s2.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s2 : Symbol(s2, Decl(promisePermutations3.ts, 59, 3))
+>s2 : Symbol(s2, Decl(promisePermutations3.ts, 59, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction2P : Symbol(testFunction2P, Decl(promisePermutations3.ts, 17, 58))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations3.ts, 16, 50))
@@ -489,14 +489,14 @@ var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunctio
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations3.ts, 16, 50))
 >testFunction2 : Symbol(testFunction2, Decl(promisePermutations3.ts, 16, 50))
 
-var r3: IPromise<number>;
->r3 : Symbol(r3, Decl(promisePermutations3.ts, 65, 3))
+declare var r3: IPromise<number>;
+>r3 : Symbol(r3, Decl(promisePermutations3.ts, 65, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations3.ts, 8, 1))
 
 var r3a = r3.then(testFunction3, testFunction3, testFunction3);
 >r3a : Symbol(r3a, Decl(promisePermutations3.ts, 66, 3))
 >r3.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r3 : Symbol(r3, Decl(promisePermutations3.ts, 65, 3))
+>r3 : Symbol(r3, Decl(promisePermutations3.ts, 65, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations3.ts, 18, 58))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations3.ts, 18, 58))
@@ -506,7 +506,7 @@ var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction
 >r3b : Symbol(r3b, Decl(promisePermutations3.ts, 67, 3))
 >r3.then(testFunction3, testFunction3, testFunction3).then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >r3.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r3 : Symbol(r3, Decl(promisePermutations3.ts, 65, 3))
+>r3 : Symbol(r3, Decl(promisePermutations3.ts, 65, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations3.ts, 18, 58))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations3.ts, 18, 58))
@@ -516,14 +516,14 @@ var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations3.ts, 18, 58))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations3.ts, 18, 58))
 
-var s3: Promise<number>;
->s3 : Symbol(s3, Decl(promisePermutations3.ts, 68, 3))
+declare var s3: Promise<number>;
+>s3 : Symbol(s3, Decl(promisePermutations3.ts, 68, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations3.ts, 0, 0))
 
 var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 >s3a : Symbol(s3a, Decl(promisePermutations3.ts, 69, 3))
 >s3.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s3 : Symbol(s3, Decl(promisePermutations3.ts, 68, 3))
+>s3 : Symbol(s3, Decl(promisePermutations3.ts, 68, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations3.ts, 18, 58))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations3.ts, 18, 58))
@@ -532,7 +532,7 @@ var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
 >s3b : Symbol(s3b, Decl(promisePermutations3.ts, 70, 3))
 >s3.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s3 : Symbol(s3, Decl(promisePermutations3.ts, 68, 3))
+>s3 : Symbol(s3, Decl(promisePermutations3.ts, 68, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction3P : Symbol(testFunction3P, Decl(promisePermutations3.ts, 19, 60))
 >testFunction3P : Symbol(testFunction3P, Decl(promisePermutations3.ts, 19, 60))
@@ -541,7 +541,7 @@ var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
 var s3c = s3.then(testFunction3P, testFunction3, testFunction3);
 >s3c : Symbol(s3c, Decl(promisePermutations3.ts, 71, 3))
 >s3.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s3 : Symbol(s3, Decl(promisePermutations3.ts, 68, 3))
+>s3 : Symbol(s3, Decl(promisePermutations3.ts, 68, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction3P : Symbol(testFunction3P, Decl(promisePermutations3.ts, 19, 60))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations3.ts, 18, 58))
@@ -551,7 +551,7 @@ var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunctio
 >s3d : Symbol(s3d, Decl(promisePermutations3.ts, 72, 3))
 >s3.then(testFunction3P, testFunction3, testFunction3).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >s3.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s3 : Symbol(s3, Decl(promisePermutations3.ts, 68, 3))
+>s3 : Symbol(s3, Decl(promisePermutations3.ts, 68, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction3P : Symbol(testFunction3P, Decl(promisePermutations3.ts, 19, 60))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations3.ts, 18, 58))
@@ -561,24 +561,24 @@ var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunctio
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations3.ts, 18, 58))
 >testFunction3 : Symbol(testFunction3, Decl(promisePermutations3.ts, 18, 58))
 
-var r4: IPromise<string>;
->r4 : Symbol(r4, Decl(promisePermutations3.ts, 74, 3))
+declare var r4: IPromise<string>;
+>r4 : Symbol(r4, Decl(promisePermutations3.ts, 74, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations3.ts, 8, 1))
 
-var sIPromise: (x: any) => IPromise<string>;
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->x : Symbol(x, Decl(promisePermutations3.ts, 75, 16))
+declare var sIPromise: (x: any) => IPromise<string>;
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>x : Symbol(x, Decl(promisePermutations3.ts, 75, 24))
 >IPromise : Symbol(IPromise, Decl(promisePermutations3.ts, 8, 1))
 
-var sPromise: (x: any) => Promise<string>;
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
->x : Symbol(x, Decl(promisePermutations3.ts, 76, 15))
+declare var sPromise: (x: any) => Promise<string>;
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
+>x : Symbol(x, Decl(promisePermutations3.ts, 76, 23))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations3.ts, 0, 0))
 
 var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
 >r4a : Symbol(r4a, Decl(promisePermutations3.ts, 77, 3))
 >r4.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r4 : Symbol(r4, Decl(promisePermutations3.ts, 74, 3))
+>r4 : Symbol(r4, Decl(promisePermutations3.ts, 74, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations3.ts, 20, 60))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations3.ts, 20, 60))
@@ -588,24 +588,24 @@ var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testF
 >r4b : Symbol(r4b, Decl(promisePermutations3.ts, 78, 3))
 >r4.then(sIPromise, testFunction4, testFunction4).then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >r4.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r4 : Symbol(r4, Decl(promisePermutations3.ts, 74, 3))
+>r4 : Symbol(r4, Decl(promisePermutations3.ts, 74, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations3.ts, 20, 60))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations3.ts, 20, 60))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations3.ts, 20, 60))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations3.ts, 20, 60))
 
-var s4: Promise<string>;
->s4 : Symbol(s4, Decl(promisePermutations3.ts, 79, 3))
+declare var s4: Promise<string>;
+>s4 : Symbol(s4, Decl(promisePermutations3.ts, 79, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations3.ts, 0, 0))
 
 var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 >s4a : Symbol(s4a, Decl(promisePermutations3.ts, 80, 3))
 >s4.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s4 : Symbol(s4, Decl(promisePermutations3.ts, 79, 3))
+>s4 : Symbol(s4, Decl(promisePermutations3.ts, 79, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations3.ts, 20, 60))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations3.ts, 20, 60))
@@ -614,7 +614,7 @@ var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error 
 >s4b : Symbol(s4b, Decl(promisePermutations3.ts, 81, 3))
 >s4.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s4 : Symbol(s4, Decl(promisePermutations3.ts, 79, 3))
+>s4 : Symbol(s4, Decl(promisePermutations3.ts, 79, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction4P : Symbol(testFunction4P, Decl(promisePermutations3.ts, 21, 72))
 >testFunction4P : Symbol(testFunction4P, Decl(promisePermutations3.ts, 21, 72))
@@ -623,7 +623,7 @@ var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error
 var s4c = s4.then(testFunction4P, testFunction4, testFunction4); // error
 >s4c : Symbol(s4c, Decl(promisePermutations3.ts, 82, 3))
 >s4.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s4 : Symbol(s4, Decl(promisePermutations3.ts, 79, 3))
+>s4 : Symbol(s4, Decl(promisePermutations3.ts, 79, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction4P : Symbol(testFunction4P, Decl(promisePermutations3.ts, 21, 72))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations3.ts, 20, 60))
@@ -633,24 +633,24 @@ var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, test
 >s4d : Symbol(s4d, Decl(promisePermutations3.ts, 83, 3))
 >s4.then(sIPromise, testFunction4P, testFunction4).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >s4.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s4 : Symbol(s4, Decl(promisePermutations3.ts, 79, 3))
+>s4 : Symbol(s4, Decl(promisePermutations3.ts, 79, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 >testFunction4P : Symbol(testFunction4P, Decl(promisePermutations3.ts, 21, 72))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations3.ts, 20, 60))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 >testFunction4P : Symbol(testFunction4P, Decl(promisePermutations3.ts, 21, 72))
 >testFunction4 : Symbol(testFunction4, Decl(promisePermutations3.ts, 20, 60))
 
-var r5: IPromise<string>;
->r5 : Symbol(r5, Decl(promisePermutations3.ts, 85, 3))
+declare var r5: IPromise<string>;
+>r5 : Symbol(r5, Decl(promisePermutations3.ts, 85, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations3.ts, 8, 1))
 
 var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
 >r5a : Symbol(r5a, Decl(promisePermutations3.ts, 86, 3))
 >r5.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r5 : Symbol(r5, Decl(promisePermutations3.ts, 85, 3))
+>r5 : Symbol(r5, Decl(promisePermutations3.ts, 85, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction5 : Symbol(testFunction5, Decl(promisePermutations3.ts, 22, 72))
 >testFunction5 : Symbol(testFunction5, Decl(promisePermutations3.ts, 22, 72))
@@ -660,24 +660,24 @@ var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >r5b : Symbol(r5b, Decl(promisePermutations3.ts, 87, 3))
 >r5.then(sIPromise, sIPromise, sIPromise).then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >r5.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r5 : Symbol(r5, Decl(promisePermutations3.ts, 85, 3))
+>r5 : Symbol(r5, Decl(promisePermutations3.ts, 85, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 
-var s5: Promise<string>;
->s5 : Symbol(s5, Decl(promisePermutations3.ts, 88, 3))
+declare var s5: Promise<string>;
+>s5 : Symbol(s5, Decl(promisePermutations3.ts, 88, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations3.ts, 0, 0))
 
 var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 >s5a : Symbol(s5a, Decl(promisePermutations3.ts, 89, 3))
 >s5.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s5 : Symbol(s5, Decl(promisePermutations3.ts, 88, 3))
+>s5 : Symbol(s5, Decl(promisePermutations3.ts, 88, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction5 : Symbol(testFunction5, Decl(promisePermutations3.ts, 22, 72))
 >testFunction5 : Symbol(testFunction5, Decl(promisePermutations3.ts, 22, 72))
@@ -686,7 +686,7 @@ var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 var s5b = s5.then(testFunction5P, testFunction5P, testFunction5P); // error
 >s5b : Symbol(s5b, Decl(promisePermutations3.ts, 90, 3))
 >s5.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s5 : Symbol(s5, Decl(promisePermutations3.ts, 88, 3))
+>s5 : Symbol(s5, Decl(promisePermutations3.ts, 88, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction5P : Symbol(testFunction5P, Decl(promisePermutations3.ts, 23, 87))
 >testFunction5P : Symbol(testFunction5P, Decl(promisePermutations3.ts, 23, 87))
@@ -695,7 +695,7 @@ var s5b = s5.then(testFunction5P, testFunction5P, testFunction5P); // error
 var s5c = s5.then(testFunction5P, testFunction5, testFunction5); // error
 >s5c : Symbol(s5c, Decl(promisePermutations3.ts, 91, 3))
 >s5.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s5 : Symbol(s5, Decl(promisePermutations3.ts, 88, 3))
+>s5 : Symbol(s5, Decl(promisePermutations3.ts, 88, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction5P : Symbol(testFunction5P, Decl(promisePermutations3.ts, 23, 87))
 >testFunction5 : Symbol(testFunction5, Decl(promisePermutations3.ts, 22, 72))
@@ -705,24 +705,24 @@ var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 >s5d : Symbol(s5d, Decl(promisePermutations3.ts, 92, 3))
 >s5.then(sPromise, sPromise, sPromise).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >s5.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s5 : Symbol(s5, Decl(promisePermutations3.ts, 88, 3))
+>s5 : Symbol(s5, Decl(promisePermutations3.ts, 88, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 
-var r6: IPromise<string>;
->r6 : Symbol(r6, Decl(promisePermutations3.ts, 94, 3))
+declare var r6: IPromise<string>;
+>r6 : Symbol(r6, Decl(promisePermutations3.ts, 94, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations3.ts, 8, 1))
 
 var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
 >r6a : Symbol(r6a, Decl(promisePermutations3.ts, 95, 3))
 >r6.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r6 : Symbol(r6, Decl(promisePermutations3.ts, 94, 3))
+>r6 : Symbol(r6, Decl(promisePermutations3.ts, 94, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction6 : Symbol(testFunction6, Decl(promisePermutations3.ts, 24, 87))
 >testFunction6 : Symbol(testFunction6, Decl(promisePermutations3.ts, 24, 87))
@@ -732,24 +732,24 @@ var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >r6b : Symbol(r6b, Decl(promisePermutations3.ts, 96, 3))
 >r6.then(sIPromise, sIPromise, sIPromise).then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >r6.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r6 : Symbol(r6, Decl(promisePermutations3.ts, 94, 3))
+>r6 : Symbol(r6, Decl(promisePermutations3.ts, 94, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 
-var s6: Promise<string>;
->s6 : Symbol(s6, Decl(promisePermutations3.ts, 97, 3))
+declare var s6: Promise<string>;
+>s6 : Symbol(s6, Decl(promisePermutations3.ts, 97, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations3.ts, 0, 0))
 
 var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 >s6a : Symbol(s6a, Decl(promisePermutations3.ts, 98, 3))
 >s6.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s6 : Symbol(s6, Decl(promisePermutations3.ts, 97, 3))
+>s6 : Symbol(s6, Decl(promisePermutations3.ts, 97, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction6 : Symbol(testFunction6, Decl(promisePermutations3.ts, 24, 87))
 >testFunction6 : Symbol(testFunction6, Decl(promisePermutations3.ts, 24, 87))
@@ -758,7 +758,7 @@ var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 var s6b = s6.then(testFunction6P, testFunction6P, testFunction6P); // error
 >s6b : Symbol(s6b, Decl(promisePermutations3.ts, 99, 3))
 >s6.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s6 : Symbol(s6, Decl(promisePermutations3.ts, 97, 3))
+>s6 : Symbol(s6, Decl(promisePermutations3.ts, 97, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction6P : Symbol(testFunction6P, Decl(promisePermutations3.ts, 25, 80))
 >testFunction6P : Symbol(testFunction6P, Decl(promisePermutations3.ts, 25, 80))
@@ -767,7 +767,7 @@ var s6b = s6.then(testFunction6P, testFunction6P, testFunction6P); // error
 var s6c = s6.then(testFunction6P, testFunction6, testFunction6); // error
 >s6c : Symbol(s6c, Decl(promisePermutations3.ts, 100, 3))
 >s6.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s6 : Symbol(s6, Decl(promisePermutations3.ts, 97, 3))
+>s6 : Symbol(s6, Decl(promisePermutations3.ts, 97, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction6P : Symbol(testFunction6P, Decl(promisePermutations3.ts, 25, 80))
 >testFunction6 : Symbol(testFunction6, Decl(promisePermutations3.ts, 24, 87))
@@ -777,24 +777,24 @@ var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 >s6d : Symbol(s6d, Decl(promisePermutations3.ts, 101, 3))
 >s6.then(sPromise, sPromise, sPromise).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >s6.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s6 : Symbol(s6, Decl(promisePermutations3.ts, 97, 3))
+>s6 : Symbol(s6, Decl(promisePermutations3.ts, 97, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 
-var r7: IPromise<string>;
->r7 : Symbol(r7, Decl(promisePermutations3.ts, 103, 3))
+declare var r7: IPromise<string>;
+>r7 : Symbol(r7, Decl(promisePermutations3.ts, 103, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations3.ts, 8, 1))
 
 var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 >r7a : Symbol(r7a, Decl(promisePermutations3.ts, 104, 3))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r7 : Symbol(r7, Decl(promisePermutations3.ts, 103, 3))
+>r7 : Symbol(r7, Decl(promisePermutations3.ts, 103, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction7 : Symbol(testFunction7, Decl(promisePermutations3.ts, 26, 80))
 >testFunction7 : Symbol(testFunction7, Decl(promisePermutations3.ts, 26, 80))
@@ -804,24 +804,24 @@ var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >r7b : Symbol(r7b, Decl(promisePermutations3.ts, 105, 3))
 >r7.then(sIPromise, sIPromise, sIPromise).then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r7 : Symbol(r7, Decl(promisePermutations3.ts, 103, 3))
+>r7 : Symbol(r7, Decl(promisePermutations3.ts, 103, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 
-var s7: Promise<string>;
->s7 : Symbol(s7, Decl(promisePermutations3.ts, 106, 3))
+declare var s7: Promise<string>;
+>s7 : Symbol(s7, Decl(promisePermutations3.ts, 106, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations3.ts, 0, 0))
 
 var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 >s7a : Symbol(s7a, Decl(promisePermutations3.ts, 107, 3))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r7 : Symbol(r7, Decl(promisePermutations3.ts, 103, 3))
+>r7 : Symbol(r7, Decl(promisePermutations3.ts, 103, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction7 : Symbol(testFunction7, Decl(promisePermutations3.ts, 26, 80))
 >testFunction7 : Symbol(testFunction7, Decl(promisePermutations3.ts, 26, 80))
@@ -830,7 +830,7 @@ var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
 >s7b : Symbol(s7b, Decl(promisePermutations3.ts, 108, 3))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r7 : Symbol(r7, Decl(promisePermutations3.ts, 103, 3))
+>r7 : Symbol(r7, Decl(promisePermutations3.ts, 103, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction7P : Symbol(testFunction7P, Decl(promisePermutations3.ts, 27, 69))
 >testFunction7P : Symbol(testFunction7P, Decl(promisePermutations3.ts, 27, 69))
@@ -839,7 +839,7 @@ var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
 var s7c = r7.then(testFunction7P, testFunction7, testFunction7); // error
 >s7c : Symbol(s7c, Decl(promisePermutations3.ts, 109, 3))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r7 : Symbol(r7, Decl(promisePermutations3.ts, 103, 3))
+>r7 : Symbol(r7, Decl(promisePermutations3.ts, 103, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction7P : Symbol(testFunction7P, Decl(promisePermutations3.ts, 27, 69))
 >testFunction7 : Symbol(testFunction7, Decl(promisePermutations3.ts, 26, 80))
@@ -849,34 +849,34 @@ var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromis
 >s7d : Symbol(s7d, Decl(promisePermutations3.ts, 110, 3))
 >r7.then(sPromise, sPromise, sPromise).then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >r7.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r7 : Symbol(r7, Decl(promisePermutations3.ts, 103, 3))
+>r7 : Symbol(r7, Decl(promisePermutations3.ts, 103, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
 
-var r8: IPromise<number>;
->r8 : Symbol(r8, Decl(promisePermutations3.ts, 112, 3))
+declare var r8: IPromise<number>;
+>r8 : Symbol(r8, Decl(promisePermutations3.ts, 112, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations3.ts, 8, 1))
 
-var nIPromise: (x: any) => IPromise<number>;
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->x : Symbol(x, Decl(promisePermutations3.ts, 113, 16))
+declare var nIPromise: (x: any) => IPromise<number>;
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>x : Symbol(x, Decl(promisePermutations3.ts, 113, 24))
 >IPromise : Symbol(IPromise, Decl(promisePermutations3.ts, 8, 1))
 
-var nPromise: (x: any) => Promise<number>;
->nPromise : Symbol(nPromise, Decl(promisePermutations3.ts, 114, 3))
->x : Symbol(x, Decl(promisePermutations3.ts, 114, 15))
+declare var nPromise: (x: any) => Promise<number>;
+>nPromise : Symbol(nPromise, Decl(promisePermutations3.ts, 114, 11))
+>x : Symbol(x, Decl(promisePermutations3.ts, 114, 23))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations3.ts, 0, 0))
 
 var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
 >r8a : Symbol(r8a, Decl(promisePermutations3.ts, 115, 3))
 >r8.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r8 : Symbol(r8, Decl(promisePermutations3.ts, 112, 3))
+>r8 : Symbol(r8, Decl(promisePermutations3.ts, 112, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction8 : Symbol(testFunction8, Decl(promisePermutations3.ts, 28, 69))
 >testFunction8 : Symbol(testFunction8, Decl(promisePermutations3.ts, 28, 69))
@@ -886,15 +886,15 @@ var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nI
 >r8b : Symbol(r8b, Decl(promisePermutations3.ts, 116, 3))
 >r8.then(nIPromise, nIPromise, nIPromise).then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >r8.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r8 : Symbol(r8, Decl(promisePermutations3.ts, 112, 3))
+>r8 : Symbol(r8, Decl(promisePermutations3.ts, 112, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
 
 var s8: Promise<number>;
 >s8 : Symbol(s8, Decl(promisePermutations3.ts, 117, 3))
@@ -933,22 +933,22 @@ var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nI
 >s8.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >s8 : Symbol(s8, Decl(promisePermutations3.ts, 117, 3))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
 
-var r9: IPromise<number>;
->r9 : Symbol(r9, Decl(promisePermutations3.ts, 123, 3))
+declare var r9: IPromise<number>;
+>r9 : Symbol(r9, Decl(promisePermutations3.ts, 123, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations3.ts, 8, 1))
 
 var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 >r9a : Symbol(r9a, Decl(promisePermutations3.ts, 124, 3))
 >r9.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r9 : Symbol(r9, Decl(promisePermutations3.ts, 123, 3))
+>r9 : Symbol(r9, Decl(promisePermutations3.ts, 123, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction9 : Symbol(testFunction9, Decl(promisePermutations3.ts, 30, 70))
 >testFunction9 : Symbol(testFunction9, Decl(promisePermutations3.ts, 30, 70))
@@ -957,52 +957,52 @@ var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 var r9b = r9.then(sIPromise, sIPromise, sIPromise); // ok
 >r9b : Symbol(r9b, Decl(promisePermutations3.ts, 125, 3))
 >r9.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r9 : Symbol(r9, Decl(promisePermutations3.ts, 123, 3))
+>r9 : Symbol(r9, Decl(promisePermutations3.ts, 123, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 
 var r9c = r9.then(nIPromise, nIPromise, nIPromise); // ok
 >r9c : Symbol(r9c, Decl(promisePermutations3.ts, 126, 3))
 >r9.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r9 : Symbol(r9, Decl(promisePermutations3.ts, 123, 3))
+>r9 : Symbol(r9, Decl(promisePermutations3.ts, 123, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
 
 var r9d = r9.then(testFunction, sIPromise, nIPromise); // error
 >r9d : Symbol(r9d, Decl(promisePermutations3.ts, 127, 3))
 >r9.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r9 : Symbol(r9, Decl(promisePermutations3.ts, 123, 3))
+>r9 : Symbol(r9, Decl(promisePermutations3.ts, 123, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
 
 var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
 >r9e : Symbol(r9e, Decl(promisePermutations3.ts, 128, 3))
 >r9.then(testFunction, nIPromise, sIPromise).then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >r9.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r9 : Symbol(r9, Decl(promisePermutations3.ts, 123, 3))
+>r9 : Symbol(r9, Decl(promisePermutations3.ts, 123, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 
-var s9: Promise<number>;
->s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 3))
+declare var s9: Promise<number>;
+>s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations3.ts, 0, 0))
 
 var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 >s9a : Symbol(s9a, Decl(promisePermutations3.ts, 130, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 3))
+>s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction9 : Symbol(testFunction9, Decl(promisePermutations3.ts, 30, 70))
 >testFunction9 : Symbol(testFunction9, Decl(promisePermutations3.ts, 30, 70))
@@ -1011,7 +1011,7 @@ var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
 >s9b : Symbol(s9b, Decl(promisePermutations3.ts, 131, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 3))
+>s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction9P : Symbol(testFunction9P, Decl(promisePermutations3.ts, 31, 73))
 >testFunction9P : Symbol(testFunction9P, Decl(promisePermutations3.ts, 31, 73))
@@ -1020,7 +1020,7 @@ var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
 var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
 >s9c : Symbol(s9c, Decl(promisePermutations3.ts, 132, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 3))
+>s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction9P : Symbol(testFunction9P, Decl(promisePermutations3.ts, 31, 73))
 >testFunction9 : Symbol(testFunction9, Decl(promisePermutations3.ts, 30, 70))
@@ -1029,43 +1029,43 @@ var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
 var s9d = s9.then(sPromise, sPromise, sPromise); // ok
 >s9d : Symbol(s9d, Decl(promisePermutations3.ts, 133, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 3))
+>s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
 
 var s9e = s9.then(nPromise, nPromise, nPromise); // ok
 >s9e : Symbol(s9e, Decl(promisePermutations3.ts, 134, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 3))
+>s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->nPromise : Symbol(nPromise, Decl(promisePermutations3.ts, 114, 3))
->nPromise : Symbol(nPromise, Decl(promisePermutations3.ts, 114, 3))
->nPromise : Symbol(nPromise, Decl(promisePermutations3.ts, 114, 3))
+>nPromise : Symbol(nPromise, Decl(promisePermutations3.ts, 114, 11))
+>nPromise : Symbol(nPromise, Decl(promisePermutations3.ts, 114, 11))
+>nPromise : Symbol(nPromise, Decl(promisePermutations3.ts, 114, 11))
 
 var s9f = s9.then(testFunction, sIPromise, nIPromise); // error
 >s9f : Symbol(s9f, Decl(promisePermutations3.ts, 135, 3))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 3))
+>s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
 
 var s9g = s9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
 >s9g : Symbol(s9g, Decl(promisePermutations3.ts, 136, 3))
 >s9.then(testFunction, nIPromise, sIPromise).then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >s9.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 3))
+>s9 : Symbol(s9, Decl(promisePermutations3.ts, 129, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 
 var r10 = testFunction10(x => x);
 >r10 : Symbol(r10, Decl(promisePermutations3.ts, 138, 3))
@@ -1087,18 +1087,18 @@ var r10b = r10.then(sIPromise, sIPromise, sIPromise); // ok
 >r10.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >r10 : Symbol(r10, Decl(promisePermutations3.ts, 138, 3))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 
 var r10c = r10.then(nIPromise, nIPromise, nIPromise); // ok
 >r10c : Symbol(r10c, Decl(promisePermutations3.ts, 141, 3))
 >r10.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >r10 : Symbol(r10, Decl(promisePermutations3.ts, 138, 3))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
 
 var r10d = r10.then(testFunction, sIPromise, nIPromise); // error
 >r10d : Symbol(r10d, Decl(promisePermutations3.ts, 142, 3))
@@ -1106,8 +1106,8 @@ var r10d = r10.then(testFunction, sIPromise, nIPromise); // error
 >r10 : Symbol(r10, Decl(promisePermutations3.ts, 138, 3))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
 
 var r10e = r10.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
 >r10e : Symbol(r10e, Decl(promisePermutations3.ts, 143, 3))
@@ -1116,12 +1116,12 @@ var r10e = r10.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromis
 >r10 : Symbol(r10, Decl(promisePermutations3.ts, 138, 3))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction : Symbol(testFunction, Decl(promisePermutations3.ts, 13, 1))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 
 var s10 = testFunction10P(x => x);
 >s10 : Symbol(s10, Decl(promisePermutations3.ts, 144, 3))
@@ -1161,18 +1161,18 @@ var s10d = s10.then(sPromise, sPromise, sPromise); // ok
 >s10.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >s10 : Symbol(s10, Decl(promisePermutations3.ts, 144, 3))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
 
 var s10e = s10.then(nIPromise, nPromise, nIPromise); // ok
 >s10e : Symbol(s10e, Decl(promisePermutations3.ts, 149, 3))
 >s10.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >s10 : Symbol(s10, Decl(promisePermutations3.ts, 144, 3))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->nPromise : Symbol(nPromise, Decl(promisePermutations3.ts, 114, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>nPromise : Symbol(nPromise, Decl(promisePermutations3.ts, 114, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
 
 var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
 >s10f : Symbol(s10f, Decl(promisePermutations3.ts, 150, 3))
@@ -1180,8 +1180,8 @@ var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
 >s10 : Symbol(s10, Decl(promisePermutations3.ts, 144, 3))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations3.ts, 15, 50))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
 
 var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
 >s10g : Symbol(s10g, Decl(promisePermutations3.ts, 151, 3))
@@ -1190,34 +1190,34 @@ var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromis
 >s10 : Symbol(s10, Decl(promisePermutations3.ts, 144, 3))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunctionP : Symbol(testFunctionP, Decl(promisePermutations3.ts, 15, 50))
->nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>nIPromise : Symbol(nIPromise, Decl(promisePermutations3.ts, 113, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
->sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 3))
+>sPromise : Symbol(sPromise, Decl(promisePermutations3.ts, 76, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
+>sIPromise : Symbol(sIPromise, Decl(promisePermutations3.ts, 75, 11))
 
-var r11: IPromise<number>;
->r11 : Symbol(r11, Decl(promisePermutations3.ts, 153, 3))
+declare var r11: IPromise<number>;
+>r11 : Symbol(r11, Decl(promisePermutations3.ts, 153, 11))
 >IPromise : Symbol(IPromise, Decl(promisePermutations3.ts, 8, 1))
 
 var r11a = r11.then(testFunction11, testFunction11, testFunction11); // ok
 >r11a : Symbol(r11a, Decl(promisePermutations3.ts, 154, 3))
 >r11.then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
->r11 : Symbol(r11, Decl(promisePermutations3.ts, 153, 3))
+>r11 : Symbol(r11, Decl(promisePermutations3.ts, 153, 11))
 >then : Symbol(IPromise.then, Decl(promisePermutations3.ts, 10, 23))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations3.ts, 34, 68), Decl(promisePermutations3.ts, 36, 61))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations3.ts, 34, 68), Decl(promisePermutations3.ts, 36, 61))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations3.ts, 34, 68), Decl(promisePermutations3.ts, 36, 61))
 
-var s11: Promise<number>;
->s11 : Symbol(s11, Decl(promisePermutations3.ts, 155, 3))
+declare var s11: Promise<number>;
+>s11 : Symbol(s11, Decl(promisePermutations3.ts, 155, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisePermutations3.ts, 0, 0))
 
 var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 >s11a : Symbol(s11a, Decl(promisePermutations3.ts, 156, 3))
 >s11.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s11 : Symbol(s11, Decl(promisePermutations3.ts, 155, 3))
+>s11 : Symbol(s11, Decl(promisePermutations3.ts, 155, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations3.ts, 34, 68), Decl(promisePermutations3.ts, 36, 61))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations3.ts, 34, 68), Decl(promisePermutations3.ts, 36, 61))
@@ -1226,7 +1226,7 @@ var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // error
 >s11b : Symbol(s11b, Decl(promisePermutations3.ts, 157, 3))
 >s11.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s11 : Symbol(s11, Decl(promisePermutations3.ts, 155, 3))
+>s11 : Symbol(s11, Decl(promisePermutations3.ts, 155, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction11P : Symbol(testFunction11P, Decl(promisePermutations3.ts, 37, 61), Decl(promisePermutations3.ts, 38, 61))
 >testFunction11P : Symbol(testFunction11P, Decl(promisePermutations3.ts, 37, 61), Decl(promisePermutations3.ts, 38, 61))
@@ -1235,7 +1235,7 @@ var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // error
 var s11c = s11.then(testFunction11P, testFunction11, testFunction11); // error
 >s11c : Symbol(s11c, Decl(promisePermutations3.ts, 158, 3))
 >s11.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
->s11 : Symbol(s11, Decl(promisePermutations3.ts, 155, 3))
+>s11 : Symbol(s11, Decl(promisePermutations3.ts, 155, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(promisePermutations3.ts, 2, 22), Decl(promisePermutations3.ts, 3, 132), Decl(promisePermutations3.ts, 4, 123), Decl(promisePermutations3.ts, 5, 123))
 >testFunction11P : Symbol(testFunction11P, Decl(promisePermutations3.ts, 37, 61), Decl(promisePermutations3.ts, 38, 61))
 >testFunction11 : Symbol(testFunction11, Decl(promisePermutations3.ts, 34, 68), Decl(promisePermutations3.ts, 36, 61))
diff --git a/tests/baselines/reference/promisePermutations3.types b/tests/baselines/reference/promisePermutations3.types
index 80b307742233b..ab29e06e8f1f8 100644
--- a/tests/baselines/reference/promisePermutations3.types
+++ b/tests/baselines/reference/promisePermutations3.types
@@ -335,7 +335,7 @@ declare function testFunction12P<T>(x: T, y: T): Promise<T>;
 >y : T
 >  : ^
 
-var r1: IPromise<number>;
+declare var r1: IPromise<number>;
 >r1 : IPromise<number>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -405,7 +405,7 @@ var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
 >testFunctionP : () => Promise<number>
 >              : ^^^^^^               
 
-var s1: Promise<number>;
+declare var s1: Promise<number>;
 >s1 : Promise<number>
 >   : ^^^^^^^^^^^^^^^
 
@@ -493,7 +493,7 @@ var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction,
 >testFunction : () => IPromise<number>
 >             : ^^^^^^                
 
-var r2: IPromise<{ x: number; }>;
+declare var r2: IPromise<{ x: number; }>;
 >r2 : IPromise<{ x: number; }>
 >   : ^^^^^^^^^^^^^^      ^^^^
 >x : number
@@ -547,7 +547,7 @@ var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction
 >testFunction2 : () => IPromise<{ x: number; }>
 >              : ^^^^^^                        
 
-var s2: Promise<{ x: number; }>;
+declare var s2: Promise<{ x: number; }>;
 >s2 : Promise<{ x: number; }>
 >   : ^^^^^^^^^^^^^      ^^^^
 >x : number
@@ -637,7 +637,7 @@ var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunctio
 >testFunction2 : () => IPromise<{ x: number; }>
 >              : ^^^^^^                        
 
-var r3: IPromise<number>;
+declare var r3: IPromise<number>;
 >r3 : IPromise<number>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -689,7 +689,7 @@ var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction
 >testFunction3 : (x: number) => IPromise<number>
 >              : ^ ^^      ^^^^^                
 
-var s3: Promise<number>;
+declare var s3: Promise<number>;
 >s3 : Promise<number>
 >   : ^^^^^^^^^^^^^^^
 
@@ -777,17 +777,17 @@ var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunctio
 >testFunction3 : (x: number) => IPromise<number>
 >              : ^ ^^      ^^^^^                
 
-var r4: IPromise<string>;
+declare var r4: IPromise<string>;
 >r4 : IPromise<string>
 >   : ^^^^^^^^^^^^^^^^
 
-var sIPromise: (x: any) => IPromise<string>;
+declare var sIPromise: (x: any) => IPromise<string>;
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 >x : any
 >  : ^^^
 
-var sPromise: (x: any) => Promise<string>;
+declare var sPromise: (x: any) => Promise<string>;
 >sPromise : (x: any) => Promise<string>
 >         : ^ ^^   ^^^^^               
 >x : any
@@ -841,7 +841,7 @@ var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testF
 >testFunction4 : (x: number, y?: string) => IPromise<string>
 >              : ^ ^^      ^^ ^^^      ^^^^^                
 
-var s4: Promise<string>;
+declare var s4: Promise<string>;
 >s4 : Promise<string>
 >   : ^^^^^^^^^^^^^^^
 
@@ -929,7 +929,7 @@ var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, test
 >testFunction4 : (x: number, y?: string) => IPromise<string>
 >              : ^ ^^      ^^ ^^^      ^^^^^                
 
-var r5: IPromise<string>;
+declare var r5: IPromise<string>;
 >r5 : IPromise<string>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -981,7 +981,7 @@ var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var s5: Promise<string>;
+declare var s5: Promise<string>;
 >s5 : Promise<string>
 >   : ^^^^^^^^^^^^^^^
 
@@ -1069,7 +1069,7 @@ var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var r6: IPromise<string>;
+declare var r6: IPromise<string>;
 >r6 : IPromise<string>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -1121,7 +1121,7 @@ var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var s6: Promise<string>;
+declare var s6: Promise<string>;
 >s6 : Promise<string>
 >   : ^^^^^^^^^^^^^^^
 
@@ -1209,7 +1209,7 @@ var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var r7: IPromise<string>;
+declare var r7: IPromise<string>;
 >r7 : IPromise<string>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -1261,7 +1261,7 @@ var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var s7: Promise<string>;
+declare var s7: Promise<string>;
 >s7 : Promise<string>
 >   : ^^^^^^^^^^^^^^^
 
@@ -1349,17 +1349,17 @@ var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromis
 >sPromise : (x: any) => Promise<string>
 >         : ^ ^^   ^^^^^               
 
-var r8: IPromise<number>;
+declare var r8: IPromise<number>;
 >r8 : IPromise<number>
 >   : ^^^^^^^^^^^^^^^^
 
-var nIPromise: (x: any) => IPromise<number>;
+declare var nIPromise: (x: any) => IPromise<number>;
 >nIPromise : (x: any) => IPromise<number>
 >          : ^ ^^   ^^^^^                
 >x : any
 >  : ^^^
 
-var nPromise: (x: any) => Promise<number>;
+declare var nPromise: (x: any) => Promise<number>;
 >nPromise : (x: any) => Promise<number>
 >         : ^ ^^   ^^^^^               
 >x : any
@@ -1501,7 +1501,7 @@ var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nI
 >nIPromise : (x: any) => IPromise<number>
 >          : ^ ^^   ^^^^^                
 
-var r9: IPromise<number>;
+declare var r9: IPromise<number>;
 >r9 : IPromise<number>
 >   : ^^^^^^^^^^^^^^^^
 
@@ -1607,7 +1607,7 @@ var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise,
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var s9: Promise<number>;
+declare var s9: Promise<number>;
 >s9 : Promise<number>
 >   : ^^^^^^^^^^^^^^^
 
@@ -2017,7 +2017,7 @@ var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromis
 >sIPromise : (x: any) => IPromise<string>
 >          : ^ ^^   ^^^^^                
 
-var r11: IPromise<number>;
+declare var r11: IPromise<number>;
 >r11 : IPromise<number>
 >    : ^^^^^^^^^^^^^^^^
 
@@ -2039,7 +2039,7 @@ var r11a = r11.then(testFunction11, testFunction11, testFunction11); // ok
 >testFunction11 : { (x: number): IPromise<number>; (x: string): IPromise<string>; }
 >               : ^^^ ^^      ^^^                ^^^ ^^      ^^^                ^^^
 
-var s11: Promise<number>;
+declare var s11: Promise<number>;
 >s11 : Promise<number>
 >    : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/promisesWithConstraints.errors.txt b/tests/baselines/reference/promisesWithConstraints.errors.txt
index 45d3e8e057bba..91e9f8dfaf6d5 100644
--- a/tests/baselines/reference/promisesWithConstraints.errors.txt
+++ b/tests/baselines/reference/promisesWithConstraints.errors.txt
@@ -13,24 +13,24 @@ promisesWithConstraints.ts(20,1): error TS2322: Type 'CPromise<Foo>' is not assi
         then<U extends { x: any; }>(cb: (x: T) => Promise<U>): Promise<U>;
     }
     
-    interface Foo { x; }
-    interface Bar { x; y; }
+    interface Foo { x: any; }
+    interface Bar { x: any; y: any; }
     
     var a: Promise<Foo>;
-    var b: Promise<Bar>;
+    declare var b: Promise<Bar>;
     a = b; // ok
     b = a; // ok
     ~
 !!! error TS2322: Type 'Promise<Foo>' is not assignable to type 'Promise<Bar>'.
 !!! error TS2322:   Property 'y' is missing in type 'Foo' but required in type 'Bar'.
-!!! related TS2728 promisesWithConstraints.ts:10:20: 'y' is declared here.
+!!! related TS2728 promisesWithConstraints.ts:10:25: 'y' is declared here.
     
     var a2: CPromise<Foo>;
-    var b2: CPromise<Bar>;
+    declare var b2: CPromise<Bar>;
     a2 = b2; // ok
     b2 = a2; // was error
     ~~
 !!! error TS2322: Type 'CPromise<Foo>' is not assignable to type 'CPromise<Bar>'.
 !!! error TS2322:   Property 'y' is missing in type 'Foo' but required in type 'Bar'.
-!!! related TS2728 promisesWithConstraints.ts:10:20: 'y' is declared here.
+!!! related TS2728 promisesWithConstraints.ts:10:25: 'y' is declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/promisesWithConstraints.js b/tests/baselines/reference/promisesWithConstraints.js
index c69f2db96bd07..1fe964e28b8a7 100644
--- a/tests/baselines/reference/promisesWithConstraints.js
+++ b/tests/baselines/reference/promisesWithConstraints.js
@@ -9,26 +9,24 @@ interface CPromise<T extends { x: any; }> {
     then<U extends { x: any; }>(cb: (x: T) => Promise<U>): Promise<U>;
 }
 
-interface Foo { x; }
-interface Bar { x; y; }
+interface Foo { x: any; }
+interface Bar { x: any; y: any; }
 
 var a: Promise<Foo>;
-var b: Promise<Bar>;
+declare var b: Promise<Bar>;
 a = b; // ok
 b = a; // ok
 
 var a2: CPromise<Foo>;
-var b2: CPromise<Bar>;
+declare var b2: CPromise<Bar>;
 a2 = b2; // ok
 b2 = a2; // was error
 
 
 //// [promisesWithConstraints.js]
 var a;
-var b;
 a = b; // ok
 b = a; // ok
 var a2;
-var b2;
 a2 = b2; // ok
 b2 = a2; // was error
diff --git a/tests/baselines/reference/promisesWithConstraints.symbols b/tests/baselines/reference/promisesWithConstraints.symbols
index b7783ddc806f8..80cdb2382d63b 100644
--- a/tests/baselines/reference/promisesWithConstraints.symbols
+++ b/tests/baselines/reference/promisesWithConstraints.symbols
@@ -35,31 +35,31 @@ interface CPromise<T extends { x: any; }> {
 >U : Symbol(U, Decl(promisesWithConstraints.ts, 5, 9))
 }
 
-interface Foo { x; }
+interface Foo { x: any; }
 >Foo : Symbol(Foo, Decl(promisesWithConstraints.ts, 6, 1))
 >x : Symbol(Foo.x, Decl(promisesWithConstraints.ts, 8, 15))
 
-interface Bar { x; y; }
->Bar : Symbol(Bar, Decl(promisesWithConstraints.ts, 8, 20))
+interface Bar { x: any; y: any; }
+>Bar : Symbol(Bar, Decl(promisesWithConstraints.ts, 8, 25))
 >x : Symbol(Bar.x, Decl(promisesWithConstraints.ts, 9, 15))
->y : Symbol(Bar.y, Decl(promisesWithConstraints.ts, 9, 18))
+>y : Symbol(Bar.y, Decl(promisesWithConstraints.ts, 9, 23))
 
 var a: Promise<Foo>;
 >a : Symbol(a, Decl(promisesWithConstraints.ts, 11, 3))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisesWithConstraints.ts, 0, 0))
 >Foo : Symbol(Foo, Decl(promisesWithConstraints.ts, 6, 1))
 
-var b: Promise<Bar>;
->b : Symbol(b, Decl(promisesWithConstraints.ts, 12, 3))
+declare var b: Promise<Bar>;
+>b : Symbol(b, Decl(promisesWithConstraints.ts, 12, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(promisesWithConstraints.ts, 0, 0))
->Bar : Symbol(Bar, Decl(promisesWithConstraints.ts, 8, 20))
+>Bar : Symbol(Bar, Decl(promisesWithConstraints.ts, 8, 25))
 
 a = b; // ok
 >a : Symbol(a, Decl(promisesWithConstraints.ts, 11, 3))
->b : Symbol(b, Decl(promisesWithConstraints.ts, 12, 3))
+>b : Symbol(b, Decl(promisesWithConstraints.ts, 12, 11))
 
 b = a; // ok
->b : Symbol(b, Decl(promisesWithConstraints.ts, 12, 3))
+>b : Symbol(b, Decl(promisesWithConstraints.ts, 12, 11))
 >a : Symbol(a, Decl(promisesWithConstraints.ts, 11, 3))
 
 var a2: CPromise<Foo>;
@@ -67,16 +67,16 @@ var a2: CPromise<Foo>;
 >CPromise : Symbol(CPromise, Decl(promisesWithConstraints.ts, 2, 1))
 >Foo : Symbol(Foo, Decl(promisesWithConstraints.ts, 6, 1))
 
-var b2: CPromise<Bar>;
->b2 : Symbol(b2, Decl(promisesWithConstraints.ts, 17, 3))
+declare var b2: CPromise<Bar>;
+>b2 : Symbol(b2, Decl(promisesWithConstraints.ts, 17, 11))
 >CPromise : Symbol(CPromise, Decl(promisesWithConstraints.ts, 2, 1))
->Bar : Symbol(Bar, Decl(promisesWithConstraints.ts, 8, 20))
+>Bar : Symbol(Bar, Decl(promisesWithConstraints.ts, 8, 25))
 
 a2 = b2; // ok
 >a2 : Symbol(a2, Decl(promisesWithConstraints.ts, 16, 3))
->b2 : Symbol(b2, Decl(promisesWithConstraints.ts, 17, 3))
+>b2 : Symbol(b2, Decl(promisesWithConstraints.ts, 17, 11))
 
 b2 = a2; // was error
->b2 : Symbol(b2, Decl(promisesWithConstraints.ts, 17, 3))
+>b2 : Symbol(b2, Decl(promisesWithConstraints.ts, 17, 11))
 >a2 : Symbol(a2, Decl(promisesWithConstraints.ts, 16, 3))
 
diff --git a/tests/baselines/reference/promisesWithConstraints.types b/tests/baselines/reference/promisesWithConstraints.types
index 2ea111f3c24e2..8aac83bdfae3b 100644
--- a/tests/baselines/reference/promisesWithConstraints.types
+++ b/tests/baselines/reference/promisesWithConstraints.types
@@ -26,11 +26,11 @@ interface CPromise<T extends { x: any; }> {
 >  : ^
 }
 
-interface Foo { x; }
+interface Foo { x: any; }
 >x : any
 >  : ^^^
 
-interface Bar { x; y; }
+interface Bar { x: any; y: any; }
 >x : any
 >  : ^^^
 >y : any
@@ -40,7 +40,7 @@ var a: Promise<Foo>;
 >a : Promise<Foo>
 >  : ^^^^^^^^^^^^
 
-var b: Promise<Bar>;
+declare var b: Promise<Bar>;
 >b : Promise<Bar>
 >  : ^^^^^^^^^^^^
 
@@ -64,7 +64,7 @@ var a2: CPromise<Foo>;
 >a2 : CPromise<Foo>
 >   : ^^^^^^^^^^^^^
 
-var b2: CPromise<Bar>;
+declare var b2: CPromise<Bar>;
 >b2 : CPromise<Bar>
 >   : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/propertyAccess.errors.txt b/tests/baselines/reference/propertyAccess.errors.txt
index 344a5571d72ae..76df8200b5faf 100644
--- a/tests/baselines/reference/propertyAccess.errors.txt
+++ b/tests/baselines/reference/propertyAccess.errors.txt
@@ -8,10 +8,10 @@ propertyAccess.ts(149,5): error TS2403: Subsequent variable declarations must ha
 
 ==== propertyAccess.ts (6 errors) ====
     class A {
-        a: number;
+        a!: number;
     }
     class B extends A {
-        b: number;
+        b!: number;
     }
     enum Compass {
         North, South, East, West
@@ -21,7 +21,7 @@ propertyAccess.ts(149,5): error TS2403: Subsequent variable declarations must ha
                                                           ~~~~~~~
 !!! error TS2353: Object literal may only specify known properties, and ''three'' does not exist in type '{ [n: number]: string; }'.
     var strIndex: { [n: string]: Compass } = { 'N': Compass.North, 'E': Compass.East };
-    var bothIndex:
+    declare var bothIndex:
         {
             [n: string]: A;
             [m: number]: B;
@@ -37,8 +37,8 @@ propertyAccess.ts(149,5): error TS2403: Subsequent variable declarations must ha
         'literal property': 100
     };
     var anyVar: any = {};
-    var stringOrNumber: string | number;
-    var someObject: { name: string };
+    declare var stringOrNumber: string | number;
+    declare var someObject: { name: string };
     
     // Assign to a property access
     obj.y = 4;
diff --git a/tests/baselines/reference/propertyAccess.js b/tests/baselines/reference/propertyAccess.js
index aa1c453124e9a..eff404ad3514d 100644
--- a/tests/baselines/reference/propertyAccess.js
+++ b/tests/baselines/reference/propertyAccess.js
@@ -2,10 +2,10 @@
 
 //// [propertyAccess.ts]
 class A {
-    a: number;
+    a!: number;
 }
 class B extends A {
-    b: number;
+    b!: number;
 }
 enum Compass {
     North, South, East, West
@@ -13,7 +13,7 @@ enum Compass {
 
 var numIndex: { [n: number]: string } = { 3: 'three', 'three': 'three' };
 var strIndex: { [n: string]: Compass } = { 'N': Compass.North, 'E': Compass.East };
-var bothIndex:
+declare var bothIndex:
     {
         [n: string]: A;
         [m: number]: B;
@@ -29,8 +29,8 @@ var obj = {
     'literal property': 100
 };
 var anyVar: any = {};
-var stringOrNumber: string | number;
-var someObject: { name: string };
+declare var stringOrNumber: string | number;
+declare var someObject: { name: string };
 
 // Assign to a property access
 obj.y = 4;
@@ -189,7 +189,6 @@ var Compass;
 })(Compass || (Compass = {}));
 var numIndex = { 3: 'three', 'three': 'three' };
 var strIndex = { 'N': Compass.North, 'E': Compass.East };
-var bothIndex;
 function noIndex() { }
 var obj = {
     10: 'ten',
@@ -199,8 +198,6 @@ var obj = {
     'literal property': 100
 };
 var anyVar = {};
-var stringOrNumber;
-var someObject;
 // Assign to a property access
 obj.y = 4;
 // Property access on value of type 'any'
diff --git a/tests/baselines/reference/propertyAccess.symbols b/tests/baselines/reference/propertyAccess.symbols
index 27b2304b43993..0a48554698d3f 100644
--- a/tests/baselines/reference/propertyAccess.symbols
+++ b/tests/baselines/reference/propertyAccess.symbols
@@ -4,14 +4,14 @@
 class A {
 >A : Symbol(A, Decl(propertyAccess.ts, 0, 0))
 
-    a: number;
+    a!: number;
 >a : Symbol(A.a, Decl(propertyAccess.ts, 0, 9))
 }
 class B extends A {
 >B : Symbol(B, Decl(propertyAccess.ts, 2, 1))
 >A : Symbol(A, Decl(propertyAccess.ts, 0, 0))
 
-    b: number;
+    b!: number;
 >b : Symbol(B.b, Decl(propertyAccess.ts, 3, 19))
 }
 enum Compass {
@@ -43,8 +43,8 @@ var strIndex: { [n: string]: Compass } = { 'N': Compass.North, 'E': Compass.East
 >Compass : Symbol(Compass, Decl(propertyAccess.ts, 5, 1))
 >East : Symbol(Compass.East, Decl(propertyAccess.ts, 7, 17))
 
-var bothIndex:
->bothIndex : Symbol(bothIndex, Decl(propertyAccess.ts, 12, 3))
+declare var bothIndex:
+>bothIndex : Symbol(bothIndex, Decl(propertyAccess.ts, 12, 11))
     {
         [n: string]: A;
 >n : Symbol(n, Decl(propertyAccess.ts, 14, 9))
@@ -84,12 +84,12 @@ var obj = {
 var anyVar: any = {};
 >anyVar : Symbol(anyVar, Decl(propertyAccess.ts, 27, 3))
 
-var stringOrNumber: string | number;
->stringOrNumber : Symbol(stringOrNumber, Decl(propertyAccess.ts, 28, 3))
+declare var stringOrNumber: string | number;
+>stringOrNumber : Symbol(stringOrNumber, Decl(propertyAccess.ts, 28, 11))
 
-var someObject: { name: string };
->someObject : Symbol(someObject, Decl(propertyAccess.ts, 29, 3))
->name : Symbol(name, Decl(propertyAccess.ts, 29, 17))
+declare var someObject: { name: string };
+>someObject : Symbol(someObject, Decl(propertyAccess.ts, 29, 11))
+>name : Symbol(name, Decl(propertyAccess.ts, 29, 25))
 
 // Assign to a property access
 obj.y = 4;
@@ -199,7 +199,7 @@ var kk: any;
 var ll = numIndex[someObject]; // Error
 >ll : Symbol(ll, Decl(propertyAccess.ts, 79, 3))
 >numIndex : Symbol(numIndex, Decl(propertyAccess.ts, 10, 3))
->someObject : Symbol(someObject, Decl(propertyAccess.ts, 29, 3))
+>someObject : Symbol(someObject, Decl(propertyAccess.ts, 29, 11))
 
 // Bracket notation property access using string value on type with string index signature and no numeric index signature
 var mm = strIndex['N'];
@@ -287,7 +287,7 @@ var tt: any;
 var uu = noIndex[someObject]; // Error
 >uu : Symbol(uu, Decl(propertyAccess.ts, 116, 3))
 >noIndex : Symbol(noIndex, Decl(propertyAccess.ts, 16, 6))
->someObject : Symbol(someObject, Decl(propertyAccess.ts, 29, 3))
+>someObject : Symbol(someObject, Decl(propertyAccess.ts, 29, 11))
 
 // Bracket notation property access using numeric value on type with numeric index signature and string index signature
 var vv = noIndex[32];
@@ -300,7 +300,7 @@ var vv: any;
 // Bracket notation property access using enum value on type with numeric index signature and string index signature
 var ww = bothIndex[Compass.East];
 >ww : Symbol(ww, Decl(propertyAccess.ts, 123, 3), Decl(propertyAccess.ts, 124, 3))
->bothIndex : Symbol(bothIndex, Decl(propertyAccess.ts, 12, 3))
+>bothIndex : Symbol(bothIndex, Decl(propertyAccess.ts, 12, 11))
 >Compass.East : Symbol(Compass.East, Decl(propertyAccess.ts, 7, 17))
 >Compass : Symbol(Compass, Decl(propertyAccess.ts, 5, 1))
 >East : Symbol(Compass.East, Decl(propertyAccess.ts, 7, 17))
@@ -312,7 +312,7 @@ var ww: B;
 // Bracket notation property access using value of type 'any' on type with numeric index signature and string index signature
 var xx = bothIndex[<any>null];
 >xx : Symbol(xx, Decl(propertyAccess.ts, 127, 3), Decl(propertyAccess.ts, 128, 3))
->bothIndex : Symbol(bothIndex, Decl(propertyAccess.ts, 12, 3))
+>bothIndex : Symbol(bothIndex, Decl(propertyAccess.ts, 12, 11))
 
 var xx: B;
 >xx : Symbol(xx, Decl(propertyAccess.ts, 127, 3), Decl(propertyAccess.ts, 128, 3))
@@ -321,7 +321,7 @@ var xx: B;
 // Bracket notation property access using string value on type with numeric index signature and string index signature
 var yy = bothIndex['foo'];
 >yy : Symbol(yy, Decl(propertyAccess.ts, 131, 3), Decl(propertyAccess.ts, 132, 3))
->bothIndex : Symbol(bothIndex, Decl(propertyAccess.ts, 12, 3))
+>bothIndex : Symbol(bothIndex, Decl(propertyAccess.ts, 12, 11))
 
 var yy: A;
 >yy : Symbol(yy, Decl(propertyAccess.ts, 131, 3), Decl(propertyAccess.ts, 132, 3))
@@ -330,7 +330,7 @@ var yy: A;
 // Bracket notation property access using numeric string value on type with numeric index signature and string index signature
 var zz = bothIndex['1.0'];
 >zz : Symbol(zz, Decl(propertyAccess.ts, 135, 3), Decl(propertyAccess.ts, 136, 3))
->bothIndex : Symbol(bothIndex, Decl(propertyAccess.ts, 12, 3))
+>bothIndex : Symbol(bothIndex, Decl(propertyAccess.ts, 12, 11))
 
 var zz: A;
 >zz : Symbol(zz, Decl(propertyAccess.ts, 135, 3), Decl(propertyAccess.ts, 136, 3))
@@ -339,13 +339,13 @@ var zz: A;
 // Bracket notation property access using value of other type on type with numeric index signature and no string index signature and string index signature
 var zzzz = bothIndex[someObject]; // Error
 >zzzz : Symbol(zzzz, Decl(propertyAccess.ts, 139, 3))
->bothIndex : Symbol(bothIndex, Decl(propertyAccess.ts, 12, 3))
->someObject : Symbol(someObject, Decl(propertyAccess.ts, 29, 3))
+>bothIndex : Symbol(bothIndex, Decl(propertyAccess.ts, 12, 11))
+>someObject : Symbol(someObject, Decl(propertyAccess.ts, 29, 11))
 
 var x1 = numIndex[stringOrNumber];
 >x1 : Symbol(x1, Decl(propertyAccess.ts, 141, 3), Decl(propertyAccess.ts, 142, 3))
 >numIndex : Symbol(numIndex, Decl(propertyAccess.ts, 10, 3))
->stringOrNumber : Symbol(stringOrNumber, Decl(propertyAccess.ts, 28, 3))
+>stringOrNumber : Symbol(stringOrNumber, Decl(propertyAccess.ts, 28, 11))
 
 var x1: any;
 >x1 : Symbol(x1, Decl(propertyAccess.ts, 141, 3), Decl(propertyAccess.ts, 142, 3))
@@ -353,7 +353,7 @@ var x1: any;
 var x2 = strIndex[stringOrNumber];
 >x2 : Symbol(x2, Decl(propertyAccess.ts, 144, 3), Decl(propertyAccess.ts, 145, 3))
 >strIndex : Symbol(strIndex, Decl(propertyAccess.ts, 11, 3))
->stringOrNumber : Symbol(stringOrNumber, Decl(propertyAccess.ts, 28, 3))
+>stringOrNumber : Symbol(stringOrNumber, Decl(propertyAccess.ts, 28, 11))
 
 var x2: Compass;
 >x2 : Symbol(x2, Decl(propertyAccess.ts, 144, 3), Decl(propertyAccess.ts, 145, 3))
@@ -361,8 +361,8 @@ var x2: Compass;
 
 var x3 = bothIndex[stringOrNumber];
 >x3 : Symbol(x3, Decl(propertyAccess.ts, 147, 3), Decl(propertyAccess.ts, 148, 3))
->bothIndex : Symbol(bothIndex, Decl(propertyAccess.ts, 12, 3))
->stringOrNumber : Symbol(stringOrNumber, Decl(propertyAccess.ts, 28, 3))
+>bothIndex : Symbol(bothIndex, Decl(propertyAccess.ts, 12, 11))
+>stringOrNumber : Symbol(stringOrNumber, Decl(propertyAccess.ts, 28, 11))
 
 var x3: A;
 >x3 : Symbol(x3, Decl(propertyAccess.ts, 147, 3), Decl(propertyAccess.ts, 148, 3))
diff --git a/tests/baselines/reference/propertyAccess.types b/tests/baselines/reference/propertyAccess.types
index 4d8b083563337..78a64412dbbf8 100644
--- a/tests/baselines/reference/propertyAccess.types
+++ b/tests/baselines/reference/propertyAccess.types
@@ -5,7 +5,7 @@ class A {
 >A : A
 >  : ^
 
-    a: number;
+    a!: number;
 >a : number
 >  : ^^^^^^
 }
@@ -15,7 +15,7 @@ class B extends A {
 >A : A
 >  : ^
 
-    b: number;
+    b!: number;
 >b : number
 >  : ^^^^^^
 }
@@ -74,7 +74,7 @@ var strIndex: { [n: string]: Compass } = { 'N': Compass.North, 'E': Compass.East
 >East : Compass.East
 >     : ^^^^^^^^^^^^
 
-var bothIndex:
+declare var bothIndex:
 >bothIndex : { [n: string]: A; [m: number]: B; }
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     {
@@ -149,11 +149,11 @@ var anyVar: any = {};
 >{} : {}
 >   : ^^
 
-var stringOrNumber: string | number;
+declare var stringOrNumber: string | number;
 >stringOrNumber : string | number
 >               : ^^^^^^^^^^^^^^^
 
-var someObject: { name: string };
+declare var someObject: { name: string };
 >someObject : { name: string; }
 >           : ^^^^^^^^      ^^^
 >name : string
diff --git a/tests/baselines/reference/propertyAccess1.errors.txt b/tests/baselines/reference/propertyAccess1.errors.txt
index e894082ad2333..ea9700146da43 100644
--- a/tests/baselines/reference/propertyAccess1.errors.txt
+++ b/tests/baselines/reference/propertyAccess1.errors.txt
@@ -2,7 +2,7 @@ propertyAccess1.ts(3,5): error TS2339: Property 'b' does not exist on type '{ a:
 
 
 ==== propertyAccess1.ts (1 errors) ====
-    var foo: { a: number; };
+    declare var foo: { a: number; };
     foo.a = 4;
     foo.b = 5;
         ~
diff --git a/tests/baselines/reference/propertyAccess1.js b/tests/baselines/reference/propertyAccess1.js
index 613f67cd0fa0e..c0d87e45058d9 100644
--- a/tests/baselines/reference/propertyAccess1.js
+++ b/tests/baselines/reference/propertyAccess1.js
@@ -1,11 +1,10 @@
 //// [tests/cases/compiler/propertyAccess1.ts] ////
 
 //// [propertyAccess1.ts]
-var foo: { a: number; };
+declare var foo: { a: number; };
 foo.a = 4;
 foo.b = 5;
 
 //// [propertyAccess1.js]
-var foo;
 foo.a = 4;
 foo.b = 5;
diff --git a/tests/baselines/reference/propertyAccess1.symbols b/tests/baselines/reference/propertyAccess1.symbols
index bf6fa77c3b8fd..87cf4d3935f21 100644
--- a/tests/baselines/reference/propertyAccess1.symbols
+++ b/tests/baselines/reference/propertyAccess1.symbols
@@ -1,15 +1,15 @@
 //// [tests/cases/compiler/propertyAccess1.ts] ////
 
 === propertyAccess1.ts ===
-var foo: { a: number; };
->foo : Symbol(foo, Decl(propertyAccess1.ts, 0, 3))
->a : Symbol(a, Decl(propertyAccess1.ts, 0, 10))
+declare var foo: { a: number; };
+>foo : Symbol(foo, Decl(propertyAccess1.ts, 0, 11))
+>a : Symbol(a, Decl(propertyAccess1.ts, 0, 18))
 
 foo.a = 4;
->foo.a : Symbol(a, Decl(propertyAccess1.ts, 0, 10))
->foo : Symbol(foo, Decl(propertyAccess1.ts, 0, 3))
->a : Symbol(a, Decl(propertyAccess1.ts, 0, 10))
+>foo.a : Symbol(a, Decl(propertyAccess1.ts, 0, 18))
+>foo : Symbol(foo, Decl(propertyAccess1.ts, 0, 11))
+>a : Symbol(a, Decl(propertyAccess1.ts, 0, 18))
 
 foo.b = 5;
->foo : Symbol(foo, Decl(propertyAccess1.ts, 0, 3))
+>foo : Symbol(foo, Decl(propertyAccess1.ts, 0, 11))
 
diff --git a/tests/baselines/reference/propertyAccess1.types b/tests/baselines/reference/propertyAccess1.types
index 28dae6b3507bd..b98119844263a 100644
--- a/tests/baselines/reference/propertyAccess1.types
+++ b/tests/baselines/reference/propertyAccess1.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/propertyAccess1.ts] ////
 
 === propertyAccess1.ts ===
-var foo: { a: number; };
+declare var foo: { a: number; };
 >foo : { a: number; }
 >    : ^^^^^      ^^^
 >a : number
diff --git a/tests/baselines/reference/propertyAccess2.errors.txt b/tests/baselines/reference/propertyAccess2.errors.txt
index 7a26a36975154..c3878649219a5 100644
--- a/tests/baselines/reference/propertyAccess2.errors.txt
+++ b/tests/baselines/reference/propertyAccess2.errors.txt
@@ -2,7 +2,7 @@ propertyAccess2.ts(2,5): error TS2339: Property 'toBAZ' does not exist on type '
 
 
 ==== propertyAccess2.ts (1 errors) ====
-    var foo: number;
+    declare var foo: number;
     foo.toBAZ();
         ~~~~~
 !!! error TS2339: Property 'toBAZ' does not exist on type 'number'.
\ No newline at end of file
diff --git a/tests/baselines/reference/propertyAccess2.js b/tests/baselines/reference/propertyAccess2.js
index 61f0dd39c9f70..42cb441eed23e 100644
--- a/tests/baselines/reference/propertyAccess2.js
+++ b/tests/baselines/reference/propertyAccess2.js
@@ -1,9 +1,8 @@
 //// [tests/cases/compiler/propertyAccess2.ts] ////
 
 //// [propertyAccess2.ts]
-var foo: number;
+declare var foo: number;
 foo.toBAZ();
 
 //// [propertyAccess2.js]
-var foo;
 foo.toBAZ();
diff --git a/tests/baselines/reference/propertyAccess2.symbols b/tests/baselines/reference/propertyAccess2.symbols
index 03cc4c3a0dba5..34983c725c355 100644
--- a/tests/baselines/reference/propertyAccess2.symbols
+++ b/tests/baselines/reference/propertyAccess2.symbols
@@ -1,9 +1,9 @@
 //// [tests/cases/compiler/propertyAccess2.ts] ////
 
 === propertyAccess2.ts ===
-var foo: number;
->foo : Symbol(foo, Decl(propertyAccess2.ts, 0, 3))
+declare var foo: number;
+>foo : Symbol(foo, Decl(propertyAccess2.ts, 0, 11))
 
 foo.toBAZ();
->foo : Symbol(foo, Decl(propertyAccess2.ts, 0, 3))
+>foo : Symbol(foo, Decl(propertyAccess2.ts, 0, 11))
 
diff --git a/tests/baselines/reference/propertyAccess2.types b/tests/baselines/reference/propertyAccess2.types
index e5f36d218f4f3..2c73c7e5f3ab9 100644
--- a/tests/baselines/reference/propertyAccess2.types
+++ b/tests/baselines/reference/propertyAccess2.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/propertyAccess2.ts] ////
 
 === propertyAccess2.ts ===
-var foo: number;
+declare var foo: number;
 >foo : number
 >    : ^^^^^^
 
diff --git a/tests/baselines/reference/propertyAccess3.errors.txt b/tests/baselines/reference/propertyAccess3.errors.txt
index 116ecd3d760df..cf6325b178e72 100644
--- a/tests/baselines/reference/propertyAccess3.errors.txt
+++ b/tests/baselines/reference/propertyAccess3.errors.txt
@@ -2,7 +2,7 @@ propertyAccess3.ts(2,5): error TS2339: Property 'toBAZ' does not exist on type '
 
 
 ==== propertyAccess3.ts (1 errors) ====
-    var foo: boolean;
+    declare var foo: boolean;
     foo.toBAZ();
         ~~~~~
 !!! error TS2339: Property 'toBAZ' does not exist on type 'boolean'.
\ No newline at end of file
diff --git a/tests/baselines/reference/propertyAccess3.js b/tests/baselines/reference/propertyAccess3.js
index 0a7be4ceb32f6..5a1ab127cb250 100644
--- a/tests/baselines/reference/propertyAccess3.js
+++ b/tests/baselines/reference/propertyAccess3.js
@@ -1,9 +1,8 @@
 //// [tests/cases/compiler/propertyAccess3.ts] ////
 
 //// [propertyAccess3.ts]
-var foo: boolean;
+declare var foo: boolean;
 foo.toBAZ();
 
 //// [propertyAccess3.js]
-var foo;
 foo.toBAZ();
diff --git a/tests/baselines/reference/propertyAccess3.symbols b/tests/baselines/reference/propertyAccess3.symbols
index 38a26e1be8f13..2db9e9865f871 100644
--- a/tests/baselines/reference/propertyAccess3.symbols
+++ b/tests/baselines/reference/propertyAccess3.symbols
@@ -1,9 +1,9 @@
 //// [tests/cases/compiler/propertyAccess3.ts] ////
 
 === propertyAccess3.ts ===
-var foo: boolean;
->foo : Symbol(foo, Decl(propertyAccess3.ts, 0, 3))
+declare var foo: boolean;
+>foo : Symbol(foo, Decl(propertyAccess3.ts, 0, 11))
 
 foo.toBAZ();
->foo : Symbol(foo, Decl(propertyAccess3.ts, 0, 3))
+>foo : Symbol(foo, Decl(propertyAccess3.ts, 0, 11))
 
diff --git a/tests/baselines/reference/propertyAccess3.types b/tests/baselines/reference/propertyAccess3.types
index 66cc54e4851b7..4456ec58fb48c 100644
--- a/tests/baselines/reference/propertyAccess3.types
+++ b/tests/baselines/reference/propertyAccess3.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/propertyAccess3.ts] ////
 
 === propertyAccess3.ts ===
-var foo: boolean;
+declare var foo: boolean;
 >foo : boolean
 >    : ^^^^^^^
 
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.errors.txt b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.errors.txt
index 5d71453a7f4a1..d6b8616782f64 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.errors.txt
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.errors.txt
@@ -7,7 +7,7 @@ propertyAccessOnTypeParameterWithConstraints4.ts(27,22): error TS2339: Property
 ==== propertyAccessOnTypeParameterWithConstraints4.ts (4 errors) ====
     class C<T extends Date> {
         f() {
-            var x: T;
+            var x: T = {} as any;
             var a = x['notHere'](); // should be string
             return a + x.notHere();
                          ~~~~~~~
@@ -20,13 +20,13 @@ propertyAccessOnTypeParameterWithConstraints4.ts(27,22): error TS2339: Property
     interface I<T extends Date> {
         foo: T;
     }
-    var i: I<Date>;
+    declare var i: I<Date>;
     var r2 = i.foo.notHere();
                    ~~~~~~~
 !!! error TS2339: Property 'notHere' does not exist on type 'Date'.
     var r2b = i.foo['notHere']();
     
-    var a: {
+    declare var a: {
         <T extends Date>(): T;
     }
     var r3: string = a().notHere();
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.js
index e559eb372cd11..7fdfc918ee7c9 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.js
@@ -3,7 +3,7 @@
 //// [propertyAccessOnTypeParameterWithConstraints4.ts]
 class C<T extends Date> {
     f() {
-        var x: T;
+        var x: T = {} as any;
         var a = x['notHere'](); // should be string
         return a + x.notHere();
     }
@@ -14,11 +14,11 @@ var r = (new C<Date>()).f();
 interface I<T extends Date> {
     foo: T;
 }
-var i: I<Date>;
+declare var i: I<Date>;
 var r2 = i.foo.notHere();
 var r2b = i.foo['notHere']();
 
-var a: {
+declare var a: {
     <T extends Date>(): T;
 }
 var r3: string = a().notHere();
@@ -39,17 +39,15 @@ var C = /** @class */ (function () {
     function C() {
     }
     C.prototype.f = function () {
-        var x;
+        var x = {};
         var a = x['notHere'](); // should be string
         return a + x.notHere();
     };
     return C;
 }());
 var r = (new C()).f();
-var i;
 var r2 = i.foo.notHere();
 var r2b = i.foo['notHere']();
-var a;
 var r3 = a().notHere();
 var r3b = a()['notHere']();
 var b = {
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.symbols b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.symbols
index 0e7c455dc3186..5dc106075f534 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.symbols
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.symbols
@@ -9,7 +9,7 @@ class C<T extends Date> {
     f() {
 >f : Symbol(C.f, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 0, 25))
 
-        var x: T;
+        var x: T = {} as any;
 >x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 2, 11))
 >T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 0, 8))
 
@@ -39,25 +39,25 @@ interface I<T extends Date> {
 >foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 10, 29))
 >T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 10, 12))
 }
-var i: I<Date>;
->i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 13, 3))
+declare var i: I<Date>;
+>i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 13, 11))
 >I : Symbol(I, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 8, 28))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 var r2 = i.foo.notHere();
 >r2 : Symbol(r2, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 14, 3))
 >i.foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 10, 29))
->i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 13, 3))
+>i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 13, 11))
 >foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 10, 29))
 
 var r2b = i.foo['notHere']();
 >r2b : Symbol(r2b, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 15, 3))
 >i.foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 10, 29))
->i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 13, 3))
+>i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 13, 11))
 >foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 10, 29))
 
-var a: {
->a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 17, 3))
+declare var a: {
+>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 17, 11))
 
     <T extends Date>(): T;
 >T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 18, 5))
@@ -66,11 +66,11 @@ var a: {
 }
 var r3: string = a().notHere();
 >r3 : Symbol(r3, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 20, 3))
->a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 17, 3))
+>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 17, 11))
 
 var r3b: string = a()['notHere']();
 >r3b : Symbol(r3b, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 21, 3))
->a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 17, 3))
+>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 17, 11))
 
 var b = {
 >b : Symbol(b, Decl(propertyAccessOnTypeParameterWithConstraints4.ts, 23, 3))
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.types
index 001aa437a7eaf..d328c4a28fc47 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.types
@@ -9,9 +9,13 @@ class C<T extends Date> {
 >f : () => any
 >  : ^^^^^^^^^
 
-        var x: T;
+        var x: T = {} as any;
 >x : T
 >  : ^
+>{} as any : any
+>          : ^^^
+>{} : {}
+>   : ^^
 
         var a = x['notHere'](); // should be string
 >a : any
@@ -62,7 +66,7 @@ interface I<T extends Date> {
 >foo : T
 >    : ^
 }
-var i: I<Date>;
+declare var i: I<Date>;
 >i : I<Date>
 >  : ^^^^^^^
 
@@ -98,7 +102,7 @@ var r2b = i.foo['notHere']();
 >'notHere' : "notHere"
 >          : ^^^^^^^^^
 
-var a: {
+declare var a: {
 >a : <T extends Date>() => T
 >  : ^ ^^^^^^^^^    ^^^^^^^ 
 
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.errors.txt b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.errors.txt
index faa4cabcd5cc6..b3d1c5227ea7a 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.errors.txt
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.errors.txt
@@ -19,7 +19,7 @@ propertyAccessOnTypeParameterWithConstraints5.ts(38,22): error TS2339: Property
     
     class C<U extends T, T extends A> {
         f() {
-            var x: U;
+            var x: U = {} as any;
             var a = x['foo'](); // should be string
             return a + x.foo() + x.notHere();
                                    ~~~~~~~
@@ -32,13 +32,13 @@ propertyAccessOnTypeParameterWithConstraints5.ts(38,22): error TS2339: Property
     interface I<U extends T, T extends A> {
         foo: U;
     }
-    var i: I<B, A>;
+    declare var i: I<B, A>;
     var r2 = i.foo.notHere();
                    ~~~~~~~
 !!! error TS2339: Property 'notHere' does not exist on type 'B'.
     var r2b = i.foo['foo']();
     
-    var a: {
+    declare var a: {
         <U extends T, T extends A>(): U;
     }
     // BUG 794164
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
index 67e75e1575d72..ce4594ad4bc44 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
@@ -13,7 +13,7 @@ class B extends A {
 
 class C<U extends T, T extends A> {
     f() {
-        var x: U;
+        var x: U = {} as any;
         var a = x['foo'](); // should be string
         return a + x.foo() + x.notHere();
     }
@@ -24,11 +24,11 @@ var r = (new C<B, A>()).f();
 interface I<U extends T, T extends A> {
     foo: U;
 }
-var i: I<B, A>;
+declare var i: I<B, A>;
 var r2 = i.foo.notHere();
 var r2b = i.foo['foo']();
 
-var a: {
+declare var a: {
     <U extends T, T extends A>(): U;
 }
 // BUG 794164
@@ -82,17 +82,15 @@ var C = /** @class */ (function () {
     function C() {
     }
     C.prototype.f = function () {
-        var x;
+        var x = {};
         var a = x['foo'](); // should be string
         return a + x.foo() + x.notHere();
     };
     return C;
 }());
 var r = (new C()).f();
-var i;
 var r2 = i.foo.notHere();
 var r2b = i.foo['foo']();
-var a;
 // BUG 794164
 var r3 = a().notHere();
 var r3b = a()['foo']();
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.symbols b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.symbols
index 18f7c90e968ea..e53ed6e789d63 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.symbols
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.symbols
@@ -29,7 +29,7 @@ class C<U extends T, T extends A> {
     f() {
 >f : Symbol(C.f, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 10, 35))
 
-        var x: U;
+        var x: U = {} as any;
 >x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 12, 11))
 >U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 10, 8))
 
@@ -66,8 +66,8 @@ interface I<U extends T, T extends A> {
 >foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 20, 39))
 >U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 20, 12))
 }
-var i: I<B, A>;
->i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 23, 3))
+declare var i: I<B, A>;
+>i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 23, 11))
 >I : Symbol(I, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 18, 28))
 >B : Symbol(B, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 2, 1))
 >A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 0, 0))
@@ -75,18 +75,18 @@ var i: I<B, A>;
 var r2 = i.foo.notHere();
 >r2 : Symbol(r2, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 24, 3))
 >i.foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 20, 39))
->i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 23, 3))
+>i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 23, 11))
 >foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 20, 39))
 
 var r2b = i.foo['foo']();
 >r2b : Symbol(r2b, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 25, 3))
 >i.foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 20, 39))
->i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 23, 3))
+>i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 23, 11))
 >foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 20, 39))
 >'foo' : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 0, 9))
 
-var a: {
->a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 27, 3))
+declare var a: {
+>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 27, 11))
 
     <U extends T, T extends A>(): U;
 >U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 28, 5))
@@ -98,11 +98,11 @@ var a: {
 // BUG 794164
 var r3: string = a().notHere();
 >r3 : Symbol(r3, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 31, 3))
->a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 27, 3))
+>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 27, 11))
 
 var r3b: string = a()['foo']();
 >r3b : Symbol(r3b, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 32, 3))
->a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 27, 3))
+>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 27, 11))
 >'foo' : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints5.ts, 0, 9))
 
 var b = {
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.types
index 57655018bed08..4efc66f35eb11 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.types
@@ -36,9 +36,13 @@ class C<U extends T, T extends A> {
 >f : () => string
 >  : ^^^^^^^^^^^^
 
-        var x: U;
+        var x: U = {} as any;
 >x : U
 >  : ^
+>{} as any : any
+>          : ^^^
+>{} : {}
+>   : ^^
 
         var a = x['foo'](); // should be string
 >a : string
@@ -99,7 +103,7 @@ interface I<U extends T, T extends A> {
 >foo : U
 >    : ^
 }
-var i: I<B, A>;
+declare var i: I<B, A>;
 >i : I<B, A>
 >  : ^^^^^^^
 
@@ -135,7 +139,7 @@ var r2b = i.foo['foo']();
 >'foo' : "foo"
 >      : ^^^^^
 
-var a: {
+declare var a: {
 >a : <U extends T, T extends A>() => U
 >  : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^ 
 
diff --git a/tests/baselines/reference/propertyAccessStringIndexSignature.errors.txt b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=false).errors.txt
similarity index 85%
rename from tests/baselines/reference/propertyAccessStringIndexSignature.errors.txt
rename to tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=false).errors.txt
index ce41d05b060ed..b2b8b9331a6b8 100644
--- a/tests/baselines/reference/propertyAccessStringIndexSignature.errors.txt
+++ b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=false).errors.txt
@@ -3,14 +3,14 @@ propertyAccessStringIndexSignature.ts(10,7): error TS2339: Property 'nope' does
 
 ==== propertyAccessStringIndexSignature.ts (1 errors) ====
     interface Flags { [name: string]: boolean };
-    let flags: Flags;
+    declare let flags: Flags;
     flags.b;
     flags.f;
     flags.isNotNecessarilyNeverFalse;
     flags['this is fine'];
     
     interface Empty { }
-    let empty: Empty;
+    declare let empty: Empty;
     empty.nope;
           ~~~~
 !!! error TS2339: Property 'nope' does not exist on type 'Empty'.
diff --git a/tests/baselines/reference/propertyAccessStringIndexSignature.js b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=false).js
similarity index 86%
rename from tests/baselines/reference/propertyAccessStringIndexSignature.js
rename to tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=false).js
index eebe198bfcf14..ce91647b40586 100644
--- a/tests/baselines/reference/propertyAccessStringIndexSignature.js
+++ b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=false).js
@@ -2,25 +2,23 @@
 
 //// [propertyAccessStringIndexSignature.ts]
 interface Flags { [name: string]: boolean };
-let flags: Flags;
+declare let flags: Flags;
 flags.b;
 flags.f;
 flags.isNotNecessarilyNeverFalse;
 flags['this is fine'];
 
 interface Empty { }
-let empty: Empty;
+declare let empty: Empty;
 empty.nope;
 empty["that's ok"];
 
 
 //// [propertyAccessStringIndexSignature.js]
 ;
-var flags;
 flags.b;
 flags.f;
 flags.isNotNecessarilyNeverFalse;
 flags['this is fine'];
-var empty;
 empty.nope;
 empty["that's ok"];
diff --git a/tests/baselines/reference/propertyAccessStringIndexSignature.symbols b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=false).symbols
similarity index 90%
rename from tests/baselines/reference/propertyAccessStringIndexSignature.symbols
rename to tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=false).symbols
index 68b5dbe722981..be371f5ff5080 100644
--- a/tests/baselines/reference/propertyAccessStringIndexSignature.symbols
+++ b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=false).symbols
@@ -5,38 +5,38 @@ interface Flags { [name: string]: boolean };
 >Flags : Symbol(Flags, Decl(propertyAccessStringIndexSignature.ts, 0, 0))
 >name : Symbol(name, Decl(propertyAccessStringIndexSignature.ts, 0, 19))
 
-let flags: Flags;
->flags : Symbol(flags, Decl(propertyAccessStringIndexSignature.ts, 1, 3))
+declare let flags: Flags;
+>flags : Symbol(flags, Decl(propertyAccessStringIndexSignature.ts, 1, 11))
 >Flags : Symbol(Flags, Decl(propertyAccessStringIndexSignature.ts, 0, 0))
 
 flags.b;
 >flags.b : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignature.ts, 0, 17))
->flags : Symbol(flags, Decl(propertyAccessStringIndexSignature.ts, 1, 3))
+>flags : Symbol(flags, Decl(propertyAccessStringIndexSignature.ts, 1, 11))
 >b : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignature.ts, 0, 17))
 
 flags.f;
 >flags.f : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignature.ts, 0, 17))
->flags : Symbol(flags, Decl(propertyAccessStringIndexSignature.ts, 1, 3))
+>flags : Symbol(flags, Decl(propertyAccessStringIndexSignature.ts, 1, 11))
 >f : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignature.ts, 0, 17))
 
 flags.isNotNecessarilyNeverFalse;
 >flags.isNotNecessarilyNeverFalse : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignature.ts, 0, 17))
->flags : Symbol(flags, Decl(propertyAccessStringIndexSignature.ts, 1, 3))
+>flags : Symbol(flags, Decl(propertyAccessStringIndexSignature.ts, 1, 11))
 >isNotNecessarilyNeverFalse : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignature.ts, 0, 17))
 
 flags['this is fine'];
->flags : Symbol(flags, Decl(propertyAccessStringIndexSignature.ts, 1, 3))
+>flags : Symbol(flags, Decl(propertyAccessStringIndexSignature.ts, 1, 11))
 
 interface Empty { }
 >Empty : Symbol(Empty, Decl(propertyAccessStringIndexSignature.ts, 5, 22))
 
-let empty: Empty;
->empty : Symbol(empty, Decl(propertyAccessStringIndexSignature.ts, 8, 3))
+declare let empty: Empty;
+>empty : Symbol(empty, Decl(propertyAccessStringIndexSignature.ts, 8, 11))
 >Empty : Symbol(Empty, Decl(propertyAccessStringIndexSignature.ts, 5, 22))
 
 empty.nope;
->empty : Symbol(empty, Decl(propertyAccessStringIndexSignature.ts, 8, 3))
+>empty : Symbol(empty, Decl(propertyAccessStringIndexSignature.ts, 8, 11))
 
 empty["that's ok"];
->empty : Symbol(empty, Decl(propertyAccessStringIndexSignature.ts, 8, 3))
+>empty : Symbol(empty, Decl(propertyAccessStringIndexSignature.ts, 8, 11))
 
diff --git a/tests/baselines/reference/propertyAccessStringIndexSignature.types b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=false).types
similarity index 91%
rename from tests/baselines/reference/propertyAccessStringIndexSignature.types
rename to tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=false).types
index 54359ada73b5a..c264509660b90 100644
--- a/tests/baselines/reference/propertyAccessStringIndexSignature.types
+++ b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=false).types
@@ -5,7 +5,7 @@ interface Flags { [name: string]: boolean };
 >name : string
 >     : ^^^^^^
 
-let flags: Flags;
+declare let flags: Flags;
 >flags : Flags
 >      : ^^^^^
 
@@ -42,7 +42,7 @@ flags['this is fine'];
 >               : ^^^^^^^^^^^^^^
 
 interface Empty { }
-let empty: Empty;
+declare let empty: Empty;
 >empty : Empty
 >      : ^^^^^
 
diff --git a/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=true).errors.txt b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=true).errors.txt
new file mode 100644
index 0000000000000..dd26953ddf4fe
--- /dev/null
+++ b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=true).errors.txt
@@ -0,0 +1,23 @@
+propertyAccessStringIndexSignature.ts(10,7): error TS2339: Property 'nope' does not exist on type 'Empty'.
+propertyAccessStringIndexSignature.ts(11,1): error TS7053: Element implicitly has an 'any' type because expression of type '"that's ok"' can't be used to index type 'Empty'.
+  Property 'that's ok' does not exist on type 'Empty'.
+
+
+==== propertyAccessStringIndexSignature.ts (2 errors) ====
+    interface Flags { [name: string]: boolean };
+    declare let flags: Flags;
+    flags.b;
+    flags.f;
+    flags.isNotNecessarilyNeverFalse;
+    flags['this is fine'];
+    
+    interface Empty { }
+    declare let empty: Empty;
+    empty.nope;
+          ~~~~
+!!! error TS2339: Property 'nope' does not exist on type 'Empty'.
+    empty["that's ok"];
+    ~~~~~~~~~~~~~~~~~~
+!!! error TS7053: Element implicitly has an 'any' type because expression of type '"that's ok"' can't be used to index type 'Empty'.
+!!! error TS7053:   Property 'that's ok' does not exist on type 'Empty'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=true).js b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=true).js
new file mode 100644
index 0000000000000..ce91647b40586
--- /dev/null
+++ b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=true).js
@@ -0,0 +1,24 @@
+//// [tests/cases/conformance/expressions/propertyAccess/propertyAccessStringIndexSignature.ts] ////
+
+//// [propertyAccessStringIndexSignature.ts]
+interface Flags { [name: string]: boolean };
+declare let flags: Flags;
+flags.b;
+flags.f;
+flags.isNotNecessarilyNeverFalse;
+flags['this is fine'];
+
+interface Empty { }
+declare let empty: Empty;
+empty.nope;
+empty["that's ok"];
+
+
+//// [propertyAccessStringIndexSignature.js]
+;
+flags.b;
+flags.f;
+flags.isNotNecessarilyNeverFalse;
+flags['this is fine'];
+empty.nope;
+empty["that's ok"];
diff --git a/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=true).symbols b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=true).symbols
new file mode 100644
index 0000000000000..be371f5ff5080
--- /dev/null
+++ b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=true).symbols
@@ -0,0 +1,42 @@
+//// [tests/cases/conformance/expressions/propertyAccess/propertyAccessStringIndexSignature.ts] ////
+
+=== propertyAccessStringIndexSignature.ts ===
+interface Flags { [name: string]: boolean };
+>Flags : Symbol(Flags, Decl(propertyAccessStringIndexSignature.ts, 0, 0))
+>name : Symbol(name, Decl(propertyAccessStringIndexSignature.ts, 0, 19))
+
+declare let flags: Flags;
+>flags : Symbol(flags, Decl(propertyAccessStringIndexSignature.ts, 1, 11))
+>Flags : Symbol(Flags, Decl(propertyAccessStringIndexSignature.ts, 0, 0))
+
+flags.b;
+>flags.b : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignature.ts, 0, 17))
+>flags : Symbol(flags, Decl(propertyAccessStringIndexSignature.ts, 1, 11))
+>b : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignature.ts, 0, 17))
+
+flags.f;
+>flags.f : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignature.ts, 0, 17))
+>flags : Symbol(flags, Decl(propertyAccessStringIndexSignature.ts, 1, 11))
+>f : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignature.ts, 0, 17))
+
+flags.isNotNecessarilyNeverFalse;
+>flags.isNotNecessarilyNeverFalse : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignature.ts, 0, 17))
+>flags : Symbol(flags, Decl(propertyAccessStringIndexSignature.ts, 1, 11))
+>isNotNecessarilyNeverFalse : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignature.ts, 0, 17))
+
+flags['this is fine'];
+>flags : Symbol(flags, Decl(propertyAccessStringIndexSignature.ts, 1, 11))
+
+interface Empty { }
+>Empty : Symbol(Empty, Decl(propertyAccessStringIndexSignature.ts, 5, 22))
+
+declare let empty: Empty;
+>empty : Symbol(empty, Decl(propertyAccessStringIndexSignature.ts, 8, 11))
+>Empty : Symbol(Empty, Decl(propertyAccessStringIndexSignature.ts, 5, 22))
+
+empty.nope;
+>empty : Symbol(empty, Decl(propertyAccessStringIndexSignature.ts, 8, 11))
+
+empty["that's ok"];
+>empty : Symbol(empty, Decl(propertyAccessStringIndexSignature.ts, 8, 11))
+
diff --git a/tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.types b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=true).types
similarity index 67%
rename from tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.types
rename to tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=true).types
index 543f2de8b161f..c264509660b90 100644
--- a/tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.types
+++ b/tests/baselines/reference/propertyAccessStringIndexSignature(noimplicitany=true).types
@@ -1,11 +1,11 @@
-//// [tests/cases/conformance/expressions/propertyAccess/propertyAccessStringIndexSignatureNoImplicitAny.ts] ////
+//// [tests/cases/conformance/expressions/propertyAccess/propertyAccessStringIndexSignature.ts] ////
 
-=== propertyAccessStringIndexSignatureNoImplicitAny.ts ===
-interface Flags { [name: string]: boolean }
+=== propertyAccessStringIndexSignature.ts ===
+interface Flags { [name: string]: boolean };
 >name : string
 >     : ^^^^^^
 
-let flags: Flags;
+declare let flags: Flags;
 >flags : Flags
 >      : ^^^^^
 
@@ -42,7 +42,7 @@ flags['this is fine'];
 >               : ^^^^^^^^^^^^^^
 
 interface Empty { }
-let empty: Empty;
+declare let empty: Empty;
 >empty : Empty
 >      : ^^^^^
 
@@ -54,11 +54,11 @@ empty.nope;
 >nope : any
 >     : ^^^
 
-empty["not allowed either"];
->empty["not allowed either"] : any
->                            : ^^^
+empty["that's ok"];
+>empty["that's ok"] : any
+>                   : ^^^
 >empty : Empty
 >      : ^^^^^
->"not allowed either" : "not allowed either"
->                     : ^^^^^^^^^^^^^^^^^^^^
+>"that's ok" : "that's ok"
+>            : ^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.errors.txt b/tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.errors.txt
deleted file mode 100644
index 9dc7860b58d84..0000000000000
--- a/tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.errors.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-propertyAccessStringIndexSignatureNoImplicitAny.ts(10,7): error TS2339: Property 'nope' does not exist on type 'Empty'.
-propertyAccessStringIndexSignatureNoImplicitAny.ts(11,1): error TS7053: Element implicitly has an 'any' type because expression of type '"not allowed either"' can't be used to index type 'Empty'.
-  Property 'not allowed either' does not exist on type 'Empty'.
-
-
-==== propertyAccessStringIndexSignatureNoImplicitAny.ts (2 errors) ====
-    interface Flags { [name: string]: boolean }
-    let flags: Flags;
-    flags.b;
-    flags.f;
-    flags.isNotNecessarilyNeverFalse;
-    flags['this is fine'];
-    
-    interface Empty { }
-    let empty: Empty;
-    empty.nope;
-          ~~~~
-!!! error TS2339: Property 'nope' does not exist on type 'Empty'.
-    empty["not allowed either"];
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS7053: Element implicitly has an 'any' type because expression of type '"not allowed either"' can't be used to index type 'Empty'.
-!!! error TS7053:   Property 'not allowed either' does not exist on type 'Empty'.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.js b/tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.js
deleted file mode 100644
index 4bc9607fd5f8f..0000000000000
--- a/tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.js
+++ /dev/null
@@ -1,25 +0,0 @@
-//// [tests/cases/conformance/expressions/propertyAccess/propertyAccessStringIndexSignatureNoImplicitAny.ts] ////
-
-//// [propertyAccessStringIndexSignatureNoImplicitAny.ts]
-interface Flags { [name: string]: boolean }
-let flags: Flags;
-flags.b;
-flags.f;
-flags.isNotNecessarilyNeverFalse;
-flags['this is fine'];
-
-interface Empty { }
-let empty: Empty;
-empty.nope;
-empty["not allowed either"];
-
-
-//// [propertyAccessStringIndexSignatureNoImplicitAny.js]
-var flags;
-flags.b;
-flags.f;
-flags.isNotNecessarilyNeverFalse;
-flags['this is fine'];
-var empty;
-empty.nope;
-empty["not allowed either"];
diff --git a/tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.symbols b/tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.symbols
deleted file mode 100644
index 9a2eedca27055..0000000000000
--- a/tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.symbols
+++ /dev/null
@@ -1,42 +0,0 @@
-//// [tests/cases/conformance/expressions/propertyAccess/propertyAccessStringIndexSignatureNoImplicitAny.ts] ////
-
-=== propertyAccessStringIndexSignatureNoImplicitAny.ts ===
-interface Flags { [name: string]: boolean }
->Flags : Symbol(Flags, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 0, 0))
->name : Symbol(name, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 0, 19))
-
-let flags: Flags;
->flags : Symbol(flags, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 1, 3))
->Flags : Symbol(Flags, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 0, 0))
-
-flags.b;
->flags.b : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 0, 17))
->flags : Symbol(flags, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 1, 3))
->b : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 0, 17))
-
-flags.f;
->flags.f : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 0, 17))
->flags : Symbol(flags, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 1, 3))
->f : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 0, 17))
-
-flags.isNotNecessarilyNeverFalse;
->flags.isNotNecessarilyNeverFalse : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 0, 17))
->flags : Symbol(flags, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 1, 3))
->isNotNecessarilyNeverFalse : Symbol(Flags.__index, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 0, 17))
-
-flags['this is fine'];
->flags : Symbol(flags, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 1, 3))
-
-interface Empty { }
->Empty : Symbol(Empty, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 5, 22))
-
-let empty: Empty;
->empty : Symbol(empty, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 8, 3))
->Empty : Symbol(Empty, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 5, 22))
-
-empty.nope;
->empty : Symbol(empty, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 8, 3))
-
-empty["not allowed either"];
->empty : Symbol(empty, Decl(propertyAccessStringIndexSignatureNoImplicitAny.ts, 8, 3))
-
diff --git a/tests/baselines/reference/propertyAssignment.errors.txt b/tests/baselines/reference/propertyAssignment.errors.txt
index fd64c78a5b3d2..7e7ff9c4c36bb 100644
--- a/tests/baselines/reference/propertyAssignment.errors.txt
+++ b/tests/baselines/reference/propertyAssignment.errors.txt
@@ -1,4 +1,4 @@
-propertyAssignment.ts(4,14): error TS2304: Cannot find name 'index'.
+propertyAssignment.ts(4,22): error TS2304: Cannot find name 'index'.
 propertyAssignment.ts(12,1): error TS2322: Type '{ x: number; }' is not assignable to type 'new () => any'.
   Type '{ x: number; }' provides no match for the signature 'new (): any'.
 propertyAssignment.ts(14,1): error TS2322: Type '{ x: number; }' is not assignable to type '() => void'.
@@ -6,16 +6,16 @@ propertyAssignment.ts(14,1): error TS2322: Type '{ x: number; }' is not assignab
 
 
 ==== propertyAssignment.ts (3 errors) ====
-    var foo1: { new ():any; }   
-    var bar1: { x : number; }
+    declare var foo1: { new ():any; }   
+    declare var bar1: { x : number; }
     
-    var foo2: { [index]; } // should be an error, used to be indexer, now it is a computed property
-                 ~~~~~
+    declare var foo2: { [index]; } // should be an error, used to be indexer, now it is a computed property
+                         ~~~~~
 !!! error TS2304: Cannot find name 'index'.
-    var bar2: { x : number; }
+    declare var bar2: { x : number; }
     
-    var foo3: { ():void; }
-    var bar3: { x : number; }
+    declare var foo3: { ():void; }
+    declare var bar3: { x : number; }
     
     
     
diff --git a/tests/baselines/reference/propertyAssignment.js b/tests/baselines/reference/propertyAssignment.js
index 61006d3524e62..aa78c04bddc37 100644
--- a/tests/baselines/reference/propertyAssignment.js
+++ b/tests/baselines/reference/propertyAssignment.js
@@ -1,14 +1,14 @@
 //// [tests/cases/compiler/propertyAssignment.ts] ////
 
 //// [propertyAssignment.ts]
-var foo1: { new ():any; }   
-var bar1: { x : number; }
+declare var foo1: { new ():any; }   
+declare var bar1: { x : number; }
 
-var foo2: { [index]; } // should be an error, used to be indexer, now it is a computed property
-var bar2: { x : number; }
+declare var foo2: { [index]; } // should be an error, used to be indexer, now it is a computed property
+declare var bar2: { x : number; }
 
-var foo3: { ():void; }
-var bar3: { x : number; }
+declare var foo3: { ():void; }
+declare var bar3: { x : number; }
 
 
 
@@ -17,12 +17,6 @@ foo2 = bar2;
 foo3 = bar3; // should be an error
 
 //// [propertyAssignment.js]
-var foo1;
-var bar1;
-var foo2; // should be an error, used to be indexer, now it is a computed property
-var bar2;
-var foo3;
-var bar3;
 foo1 = bar1; // should be an error
 foo2 = bar2;
 foo3 = bar3; // should be an error
diff --git a/tests/baselines/reference/propertyAssignment.symbols b/tests/baselines/reference/propertyAssignment.symbols
index b40378559193c..1a71729bafbc3 100644
--- a/tests/baselines/reference/propertyAssignment.symbols
+++ b/tests/baselines/reference/propertyAssignment.symbols
@@ -1,39 +1,39 @@
 //// [tests/cases/compiler/propertyAssignment.ts] ////
 
 === propertyAssignment.ts ===
-var foo1: { new ():any; }   
->foo1 : Symbol(foo1, Decl(propertyAssignment.ts, 0, 3))
+declare var foo1: { new ():any; }   
+>foo1 : Symbol(foo1, Decl(propertyAssignment.ts, 0, 11))
 
-var bar1: { x : number; }
->bar1 : Symbol(bar1, Decl(propertyAssignment.ts, 1, 3))
->x : Symbol(x, Decl(propertyAssignment.ts, 1, 11))
+declare var bar1: { x : number; }
+>bar1 : Symbol(bar1, Decl(propertyAssignment.ts, 1, 11))
+>x : Symbol(x, Decl(propertyAssignment.ts, 1, 19))
 
-var foo2: { [index]; } // should be an error, used to be indexer, now it is a computed property
->foo2 : Symbol(foo2, Decl(propertyAssignment.ts, 3, 3))
->[index] : Symbol([index], Decl(propertyAssignment.ts, 3, 11))
+declare var foo2: { [index]; } // should be an error, used to be indexer, now it is a computed property
+>foo2 : Symbol(foo2, Decl(propertyAssignment.ts, 3, 11))
+>[index] : Symbol([index], Decl(propertyAssignment.ts, 3, 19))
 
-var bar2: { x : number; }
->bar2 : Symbol(bar2, Decl(propertyAssignment.ts, 4, 3))
->x : Symbol(x, Decl(propertyAssignment.ts, 4, 11))
+declare var bar2: { x : number; }
+>bar2 : Symbol(bar2, Decl(propertyAssignment.ts, 4, 11))
+>x : Symbol(x, Decl(propertyAssignment.ts, 4, 19))
 
-var foo3: { ():void; }
->foo3 : Symbol(foo3, Decl(propertyAssignment.ts, 6, 3))
+declare var foo3: { ():void; }
+>foo3 : Symbol(foo3, Decl(propertyAssignment.ts, 6, 11))
 
-var bar3: { x : number; }
->bar3 : Symbol(bar3, Decl(propertyAssignment.ts, 7, 3))
->x : Symbol(x, Decl(propertyAssignment.ts, 7, 11))
+declare var bar3: { x : number; }
+>bar3 : Symbol(bar3, Decl(propertyAssignment.ts, 7, 11))
+>x : Symbol(x, Decl(propertyAssignment.ts, 7, 19))
 
 
 
 foo1 = bar1; // should be an error
->foo1 : Symbol(foo1, Decl(propertyAssignment.ts, 0, 3))
->bar1 : Symbol(bar1, Decl(propertyAssignment.ts, 1, 3))
+>foo1 : Symbol(foo1, Decl(propertyAssignment.ts, 0, 11))
+>bar1 : Symbol(bar1, Decl(propertyAssignment.ts, 1, 11))
 
 foo2 = bar2; 
->foo2 : Symbol(foo2, Decl(propertyAssignment.ts, 3, 3))
->bar2 : Symbol(bar2, Decl(propertyAssignment.ts, 4, 3))
+>foo2 : Symbol(foo2, Decl(propertyAssignment.ts, 3, 11))
+>bar2 : Symbol(bar2, Decl(propertyAssignment.ts, 4, 11))
 
 foo3 = bar3; // should be an error
->foo3 : Symbol(foo3, Decl(propertyAssignment.ts, 6, 3))
->bar3 : Symbol(bar3, Decl(propertyAssignment.ts, 7, 3))
+>foo3 : Symbol(foo3, Decl(propertyAssignment.ts, 6, 11))
+>bar3 : Symbol(bar3, Decl(propertyAssignment.ts, 7, 11))
 
diff --git a/tests/baselines/reference/propertyAssignment.types b/tests/baselines/reference/propertyAssignment.types
index f9f2a8bc55128..b525d1d0d88ee 100644
--- a/tests/baselines/reference/propertyAssignment.types
+++ b/tests/baselines/reference/propertyAssignment.types
@@ -1,17 +1,17 @@
 //// [tests/cases/compiler/propertyAssignment.ts] ////
 
 === propertyAssignment.ts ===
-var foo1: { new ():any; }   
+declare var foo1: { new ():any; }   
 >foo1 : new () => any
 >     : ^^^^^^^^^^   
 
-var bar1: { x : number; }
+declare var bar1: { x : number; }
 >bar1 : { x: number; }
 >     : ^^^^^      ^^^
 >x : number
 >  : ^^^^^^
 
-var foo2: { [index]; } // should be an error, used to be indexer, now it is a computed property
+declare var foo2: { [index]; } // should be an error, used to be indexer, now it is a computed property
 >foo2 : { [x: number]: any; }
 >     : ^^^^^^^^^^^^^^^^^^^^^
 >[index] : any
@@ -19,17 +19,17 @@ var foo2: { [index]; } // should be an error, used to be indexer, now it is a co
 >index : any
 >      : ^^^
 
-var bar2: { x : number; }
+declare var bar2: { x : number; }
 >bar2 : { x: number; }
 >     : ^^^^^      ^^^
 >x : number
 >  : ^^^^^^
 
-var foo3: { ():void; }
+declare var foo3: { ():void; }
 >foo3 : () => void
 >     : ^^^^^^    
 
-var bar3: { x : number; }
+declare var bar3: { x : number; }
 >bar3 : { x: number; }
 >     : ^^^^^      ^^^
 >x : number
diff --git a/tests/baselines/reference/propertyParameterWithQuestionMark.errors.txt b/tests/baselines/reference/propertyParameterWithQuestionMark.errors.txt
index fb4e795e5ff62..0b614f3b10cba 100644
--- a/tests/baselines/reference/propertyParameterWithQuestionMark.errors.txt
+++ b/tests/baselines/reference/propertyParameterWithQuestionMark.errors.txt
@@ -9,7 +9,7 @@ propertyParameterWithQuestionMark.ts(9,5): error TS2322: Type 'C' is not assigna
     
     // x should be an optional property
     var v: C = {}; // Should succeed
-    var v2: { x? }
+    declare var v2: { x? }
     v = v2; // Should succeed
     var v3: { x } = new C; // Should fail
         ~~
diff --git a/tests/baselines/reference/propertyParameterWithQuestionMark.js b/tests/baselines/reference/propertyParameterWithQuestionMark.js
index 7366e8e9075bf..e63bd77cf5f2c 100644
--- a/tests/baselines/reference/propertyParameterWithQuestionMark.js
+++ b/tests/baselines/reference/propertyParameterWithQuestionMark.js
@@ -7,7 +7,7 @@ class C {
 
 // x should be an optional property
 var v: C = {}; // Should succeed
-var v2: { x? }
+declare var v2: { x? }
 v = v2; // Should succeed
 var v3: { x } = new C; // Should fail
 
@@ -20,6 +20,5 @@ var C = /** @class */ (function () {
 }());
 // x should be an optional property
 var v = {}; // Should succeed
-var v2;
 v = v2; // Should succeed
 var v3 = new C; // Should fail
diff --git a/tests/baselines/reference/propertyParameterWithQuestionMark.symbols b/tests/baselines/reference/propertyParameterWithQuestionMark.symbols
index fd4a6a19ec280..c8d5d60ae1483 100644
--- a/tests/baselines/reference/propertyParameterWithQuestionMark.symbols
+++ b/tests/baselines/reference/propertyParameterWithQuestionMark.symbols
@@ -13,13 +13,13 @@ var v: C = {}; // Should succeed
 >v : Symbol(v, Decl(propertyParameterWithQuestionMark.ts, 5, 3))
 >C : Symbol(C, Decl(propertyParameterWithQuestionMark.ts, 0, 0))
 
-var v2: { x? }
->v2 : Symbol(v2, Decl(propertyParameterWithQuestionMark.ts, 6, 3))
->x : Symbol(x, Decl(propertyParameterWithQuestionMark.ts, 6, 9))
+declare var v2: { x? }
+>v2 : Symbol(v2, Decl(propertyParameterWithQuestionMark.ts, 6, 11))
+>x : Symbol(x, Decl(propertyParameterWithQuestionMark.ts, 6, 17))
 
 v = v2; // Should succeed
 >v : Symbol(v, Decl(propertyParameterWithQuestionMark.ts, 5, 3))
->v2 : Symbol(v2, Decl(propertyParameterWithQuestionMark.ts, 6, 3))
+>v2 : Symbol(v2, Decl(propertyParameterWithQuestionMark.ts, 6, 11))
 
 var v3: { x } = new C; // Should fail
 >v3 : Symbol(v3, Decl(propertyParameterWithQuestionMark.ts, 8, 3))
diff --git a/tests/baselines/reference/propertyParameterWithQuestionMark.types b/tests/baselines/reference/propertyParameterWithQuestionMark.types
index 7d3d223d1ce6c..035237b38811f 100644
--- a/tests/baselines/reference/propertyParameterWithQuestionMark.types
+++ b/tests/baselines/reference/propertyParameterWithQuestionMark.types
@@ -17,7 +17,7 @@ var v: C = {}; // Should succeed
 >{} : {}
 >   : ^^
 
-var v2: { x? }
+declare var v2: { x? }
 >v2 : { x?: any; }
 >   : ^^^^^^^^^^^^
 >x : any
diff --git a/tests/baselines/reference/propertySignatures.errors.txt b/tests/baselines/reference/propertySignatures.errors.txt
index 5dd08b83f44cc..684202c0f4896 100644
--- a/tests/baselines/reference/propertySignatures.errors.txt
+++ b/tests/baselines/reference/propertySignatures.errors.txt
@@ -1,33 +1,33 @@
-propertySignatures.ts(2,13): error TS2300: Duplicate identifier 'a'.
-propertySignatures.ts(2,23): error TS2300: Duplicate identifier 'a'.
+propertySignatures.ts(2,21): error TS2300: Duplicate identifier 'a'.
+propertySignatures.ts(2,31): error TS2300: Duplicate identifier 'a'.
 propertySignatures.ts(14,12): error TS2552: Cannot find name 'foo'. Did you mean 'foo1'?
 
 
 ==== propertySignatures.ts (3 errors) ====
     // Should be error - duplicate identifiers
-    var foo1: { a:string; a: string; };
-                ~
+    declare var foo1: { a:string; a: string; };
+                        ~
 !!! error TS2300: Duplicate identifier 'a'.
-                          ~
+                                  ~
 !!! error TS2300: Duplicate identifier 'a'.
     
     // Should be OK
-    var foo2: { a; };
+    declare var foo2: { a; };
     foo2.a = 2;
     foo2.a = "0";
     
     // Should be error
-    var foo3: { (): string; (): string; };
+    declare var foo3: { (): string; (): string; };
     
     // Should be OK
-    var foo4: { (): void; };
+    declare var foo4: { (): void; };
     var test = foo();
                ~~~
 !!! error TS2552: Cannot find name 'foo'. Did you mean 'foo1'?
-!!! related TS2728 propertySignatures.ts:2:5: 'foo1' is declared here.
+!!! related TS2728 propertySignatures.ts:2:13: 'foo1' is declared here.
     
     // Should be OK
-    var foo5: {();};
+    declare var foo5: {();};
     var test = foo5();
     test.bar = 2;
     
\ No newline at end of file
diff --git a/tests/baselines/reference/propertySignatures.js b/tests/baselines/reference/propertySignatures.js
index 96ed2a82ff137..74125b73b471f 100644
--- a/tests/baselines/reference/propertySignatures.js
+++ b/tests/baselines/reference/propertySignatures.js
@@ -2,39 +2,29 @@
 
 //// [propertySignatures.ts]
 // Should be error - duplicate identifiers
-var foo1: { a:string; a: string; };
+declare var foo1: { a:string; a: string; };
 
 // Should be OK
-var foo2: { a; };
+declare var foo2: { a; };
 foo2.a = 2;
 foo2.a = "0";
 
 // Should be error
-var foo3: { (): string; (): string; };
+declare var foo3: { (): string; (): string; };
 
 // Should be OK
-var foo4: { (): void; };
+declare var foo4: { (): void; };
 var test = foo();
 
 // Should be OK
-var foo5: {();};
+declare var foo5: {();};
 var test = foo5();
 test.bar = 2;
 
 
 //// [propertySignatures.js]
-// Should be error - duplicate identifiers
-var foo1;
-// Should be OK
-var foo2;
 foo2.a = 2;
 foo2.a = "0";
-// Should be error
-var foo3;
-// Should be OK
-var foo4;
 var test = foo();
-// Should be OK
-var foo5;
 var test = foo5();
 test.bar = 2;
diff --git a/tests/baselines/reference/propertySignatures.symbols b/tests/baselines/reference/propertySignatures.symbols
index 4a5434eaf6f5c..d75a38345a321 100644
--- a/tests/baselines/reference/propertySignatures.symbols
+++ b/tests/baselines/reference/propertySignatures.symbols
@@ -2,44 +2,44 @@
 
 === propertySignatures.ts ===
 // Should be error - duplicate identifiers
-var foo1: { a:string; a: string; };
->foo1 : Symbol(foo1, Decl(propertySignatures.ts, 1, 3))
->a : Symbol(a, Decl(propertySignatures.ts, 1, 11), Decl(propertySignatures.ts, 1, 21))
->a : Symbol(a, Decl(propertySignatures.ts, 1, 11), Decl(propertySignatures.ts, 1, 21))
+declare var foo1: { a:string; a: string; };
+>foo1 : Symbol(foo1, Decl(propertySignatures.ts, 1, 11))
+>a : Symbol(a, Decl(propertySignatures.ts, 1, 19), Decl(propertySignatures.ts, 1, 29))
+>a : Symbol(a, Decl(propertySignatures.ts, 1, 19), Decl(propertySignatures.ts, 1, 29))
 
 // Should be OK
-var foo2: { a; };
->foo2 : Symbol(foo2, Decl(propertySignatures.ts, 4, 3))
->a : Symbol(a, Decl(propertySignatures.ts, 4, 11))
+declare var foo2: { a; };
+>foo2 : Symbol(foo2, Decl(propertySignatures.ts, 4, 11))
+>a : Symbol(a, Decl(propertySignatures.ts, 4, 19))
 
 foo2.a = 2;
->foo2.a : Symbol(a, Decl(propertySignatures.ts, 4, 11))
->foo2 : Symbol(foo2, Decl(propertySignatures.ts, 4, 3))
->a : Symbol(a, Decl(propertySignatures.ts, 4, 11))
+>foo2.a : Symbol(a, Decl(propertySignatures.ts, 4, 19))
+>foo2 : Symbol(foo2, Decl(propertySignatures.ts, 4, 11))
+>a : Symbol(a, Decl(propertySignatures.ts, 4, 19))
 
 foo2.a = "0";
->foo2.a : Symbol(a, Decl(propertySignatures.ts, 4, 11))
->foo2 : Symbol(foo2, Decl(propertySignatures.ts, 4, 3))
->a : Symbol(a, Decl(propertySignatures.ts, 4, 11))
+>foo2.a : Symbol(a, Decl(propertySignatures.ts, 4, 19))
+>foo2 : Symbol(foo2, Decl(propertySignatures.ts, 4, 11))
+>a : Symbol(a, Decl(propertySignatures.ts, 4, 19))
 
 // Should be error
-var foo3: { (): string; (): string; };
->foo3 : Symbol(foo3, Decl(propertySignatures.ts, 9, 3))
+declare var foo3: { (): string; (): string; };
+>foo3 : Symbol(foo3, Decl(propertySignatures.ts, 9, 11))
 
 // Should be OK
-var foo4: { (): void; };
->foo4 : Symbol(foo4, Decl(propertySignatures.ts, 12, 3))
+declare var foo4: { (): void; };
+>foo4 : Symbol(foo4, Decl(propertySignatures.ts, 12, 11))
 
 var test = foo();
 >test : Symbol(test, Decl(propertySignatures.ts, 13, 3), Decl(propertySignatures.ts, 17, 3))
 
 // Should be OK
-var foo5: {();};
->foo5 : Symbol(foo5, Decl(propertySignatures.ts, 16, 3))
+declare var foo5: {();};
+>foo5 : Symbol(foo5, Decl(propertySignatures.ts, 16, 11))
 
 var test = foo5();
 >test : Symbol(test, Decl(propertySignatures.ts, 13, 3), Decl(propertySignatures.ts, 17, 3))
->foo5 : Symbol(foo5, Decl(propertySignatures.ts, 16, 3))
+>foo5 : Symbol(foo5, Decl(propertySignatures.ts, 16, 11))
 
 test.bar = 2;
 >test : Symbol(test, Decl(propertySignatures.ts, 13, 3), Decl(propertySignatures.ts, 17, 3))
diff --git a/tests/baselines/reference/propertySignatures.types b/tests/baselines/reference/propertySignatures.types
index f975e1042e444..5b51eb9ebe3c8 100644
--- a/tests/baselines/reference/propertySignatures.types
+++ b/tests/baselines/reference/propertySignatures.types
@@ -2,7 +2,7 @@
 
 === propertySignatures.ts ===
 // Should be error - duplicate identifiers
-var foo1: { a:string; a: string; };
+declare var foo1: { a:string; a: string; };
 >foo1 : { a: string; }
 >     : ^^^^^      ^^^
 >a : string
@@ -11,7 +11,7 @@ var foo1: { a:string; a: string; };
 >  : ^^^^^^
 
 // Should be OK
-var foo2: { a; };
+declare var foo2: { a; };
 >foo2 : { a: any; }
 >     : ^^^^^^^^^^^
 >a : any
@@ -42,12 +42,12 @@ foo2.a = "0";
 >    : ^^^
 
 // Should be error
-var foo3: { (): string; (): string; };
+declare var foo3: { (): string; (): string; };
 >foo3 : { (): string; (): string; }
 >     : ^^^^^^      ^^^^^^      ^^^
 
 // Should be OK
-var foo4: { (): void; };
+declare var foo4: { (): void; };
 >foo4 : () => void
 >     : ^^^^^^    
 
@@ -60,7 +60,7 @@ var test = foo();
 >    : ^^^
 
 // Should be OK
-var foo5: {();};
+declare var foo5: {();};
 >foo5 : () => any
 >     : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.errors.txt b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.errors.txt
index 341e7a7190c35..bf27e7ab55dc3 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.errors.txt
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.errors.txt
@@ -23,15 +23,15 @@ protectedClassPropertyAccessibleWithinNestedSubclass1.ts(114,4): error TS2445: P
 
 ==== protectedClassPropertyAccessibleWithinNestedSubclass1.ts (21 errors) ====
     class Base {
-        protected x: string;
+        protected x!: string;
         method() {
             class A {
                 methoda() {
-                    var b: Base;
-                    var d1: Derived1;
-                    var d2: Derived2;
-                    var d3: Derived3;
-                    var d4: Derived4;
+                    var b: Base = undefined as any;
+                    var d1: Derived1 = undefined as any;
+                    var d2: Derived2 = undefined as any;
+                    var d3: Derived3 = undefined as any;
+                    var d4: Derived4 = undefined as any;
     
                     b.x;            // OK, accessed within their declaring class
                     d1.x;           // OK, accessed within their declaring class
@@ -49,11 +49,11 @@ protectedClassPropertyAccessibleWithinNestedSubclass1.ts(114,4): error TS2445: P
         method1() {
             class B {
                 method1b() {
-                    var b: Base;
-                    var d1: Derived1;
-                    var d2: Derived2;
-                    var d3: Derived3;
-                    var d4: Derived4;
+                    var b: Base = undefined as any;
+                    var d1: Derived1 = undefined as any;
+                    var d2: Derived2 = undefined as any;
+                    var d3: Derived3 = undefined as any;
+                    var d4: Derived4 = undefined as any;
     
                     b.x;            // Error, isn't accessed through an instance of the enclosing class
                       ~
@@ -77,11 +77,11 @@ protectedClassPropertyAccessibleWithinNestedSubclass1.ts(114,4): error TS2445: P
         method2() {
             class C {
                 method2c() {
-                    var b: Base;
-                    var d1: Derived1;
-                    var d2: Derived2;
-                    var d3: Derived3;
-                    var d4: Derived4;
+                    var b: Base = undefined as any;
+                    var d1: Derived1 = undefined as any;
+                    var d2: Derived2 = undefined as any;
+                    var d3: Derived3 = undefined as any;
+                    var d4: Derived4 = undefined as any;
     
                     b.x;            // Error, isn't accessed through an instance of the enclosing class
                       ~
@@ -100,15 +100,15 @@ protectedClassPropertyAccessibleWithinNestedSubclass1.ts(114,4): error TS2445: P
     }
     
     class Derived3 extends Derived1 {
-        protected x: string;
+        protected x!: string;
         method3() {
             class D {
                 method3d() {
-                    var b: Base;
-                    var d1: Derived1;
-                    var d2: Derived2;
-                    var d3: Derived3;
-                    var d4: Derived4;
+                    var b: Base = undefined as any;
+                    var d1: Derived1 = undefined as any;
+                    var d2: Derived2 = undefined as any;
+                    var d3: Derived3 = undefined as any;
+                    var d4: Derived4 = undefined as any;
     
                     b.x;            // Error, isn't accessed through an instance of the enclosing class
                       ~
@@ -132,11 +132,11 @@ protectedClassPropertyAccessibleWithinNestedSubclass1.ts(114,4): error TS2445: P
         method4() {
             class E {
                 method4e() {
-                    var b: Base;
-                    var d1: Derived1;
-                    var d2: Derived2;
-                    var d3: Derived3;
-                    var d4: Derived4;
+                    var b: Base = undefined as any;
+                    var d1: Derived1 = undefined as any;
+                    var d2: Derived2 = undefined as any;
+                    var d3: Derived3 = undefined as any;
+                    var d4: Derived4 = undefined as any;
     
                     b.x;            // Error, isn't accessed through an instance of the enclosing class
                       ~
@@ -157,11 +157,11 @@ protectedClassPropertyAccessibleWithinNestedSubclass1.ts(114,4): error TS2445: P
     }
     
     
-    var b: Base;
-    var d1: Derived1;
-    var d2: Derived2;
-    var d3: Derived3;
-    var d4: Derived4;
+    var b: Base = undefined as any;
+    var d1: Derived1 = undefined as any;
+    var d2: Derived2 = undefined as any;
+    var d3: Derived3 = undefined as any;
+    var d4: Derived4 = undefined as any;
     
     b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
       ~
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
index 934f9d61e7f8c..743afeacc22d2 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
@@ -2,15 +2,15 @@
 
 //// [protectedClassPropertyAccessibleWithinNestedSubclass1.ts]
 class Base {
-    protected x: string;
+    protected x!: string;
     method() {
         class A {
             methoda() {
-                var b: Base;
-                var d1: Derived1;
-                var d2: Derived2;
-                var d3: Derived3;
-                var d4: Derived4;
+                var b: Base = undefined as any;
+                var d1: Derived1 = undefined as any;
+                var d2: Derived2 = undefined as any;
+                var d3: Derived3 = undefined as any;
+                var d4: Derived4 = undefined as any;
 
                 b.x;            // OK, accessed within their declaring class
                 d1.x;           // OK, accessed within their declaring class
@@ -26,11 +26,11 @@ class Derived1 extends Base {
     method1() {
         class B {
             method1b() {
-                var b: Base;
-                var d1: Derived1;
-                var d2: Derived2;
-                var d3: Derived3;
-                var d4: Derived4;
+                var b: Base = undefined as any;
+                var d1: Derived1 = undefined as any;
+                var d2: Derived2 = undefined as any;
+                var d3: Derived3 = undefined as any;
+                var d4: Derived4 = undefined as any;
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
                 d1.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
@@ -46,11 +46,11 @@ class Derived2 extends Base {
     method2() {
         class C {
             method2c() {
-                var b: Base;
-                var d1: Derived1;
-                var d2: Derived2;
-                var d3: Derived3;
-                var d4: Derived4;
+                var b: Base = undefined as any;
+                var d1: Derived1 = undefined as any;
+                var d2: Derived2 = undefined as any;
+                var d3: Derived3 = undefined as any;
+                var d4: Derived4 = undefined as any;
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
                 d1.x;           // Error, isn't accessed through an instance of the enclosing class
@@ -63,15 +63,15 @@ class Derived2 extends Base {
 }
 
 class Derived3 extends Derived1 {
-    protected x: string;
+    protected x!: string;
     method3() {
         class D {
             method3d() {
-                var b: Base;
-                var d1: Derived1;
-                var d2: Derived2;
-                var d3: Derived3;
-                var d4: Derived4;
+                var b: Base = undefined as any;
+                var d1: Derived1 = undefined as any;
+                var d2: Derived2 = undefined as any;
+                var d3: Derived3 = undefined as any;
+                var d4: Derived4 = undefined as any;
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
                 d1.x;           // Error, isn't accessed through an instance of the enclosing class
@@ -87,11 +87,11 @@ class Derived4 extends Derived2 {
     method4() {
         class E {
             method4e() {
-                var b: Base;
-                var d1: Derived1;
-                var d2: Derived2;
-                var d3: Derived3;
-                var d4: Derived4;
+                var b: Base = undefined as any;
+                var d1: Derived1 = undefined as any;
+                var d2: Derived2 = undefined as any;
+                var d3: Derived3 = undefined as any;
+                var d4: Derived4 = undefined as any;
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
                 d1.x;           // Error, isn't accessed through an instance of the enclosing class
@@ -104,11 +104,11 @@ class Derived4 extends Derived2 {
 }
 
 
-var b: Base;
-var d1: Derived1;
-var d2: Derived2;
-var d3: Derived3;
-var d4: Derived4;
+var b: Base = undefined as any;
+var d1: Derived1 = undefined as any;
+var d2: Derived2 = undefined as any;
+var d3: Derived3 = undefined as any;
+var d4: Derived4 = undefined as any;
 
 b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
 d1.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
@@ -140,11 +140,11 @@ var Base = /** @class */ (function () {
             function A() {
             }
             A.prototype.methoda = function () {
-                var b;
-                var d1;
-                var d2;
-                var d3;
-                var d4;
+                var b = undefined;
+                var d1 = undefined;
+                var d2 = undefined;
+                var d3 = undefined;
+                var d4 = undefined;
                 b.x; // OK, accessed within their declaring class
                 d1.x; // OK, accessed within their declaring class
                 d2.x; // OK, accessed within their declaring class
@@ -166,11 +166,11 @@ var Derived1 = /** @class */ (function (_super) {
             function B() {
             }
             B.prototype.method1b = function () {
-                var b;
-                var d1;
-                var d2;
-                var d3;
-                var d4;
+                var b = undefined;
+                var d1 = undefined;
+                var d2 = undefined;
+                var d3 = undefined;
+                var d4 = undefined;
                 b.x; // Error, isn't accessed through an instance of the enclosing class
                 d1.x; // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
                 d2.x; // Error, isn't accessed through an instance of the enclosing class
@@ -192,11 +192,11 @@ var Derived2 = /** @class */ (function (_super) {
             function C() {
             }
             C.prototype.method2c = function () {
-                var b;
-                var d1;
-                var d2;
-                var d3;
-                var d4;
+                var b = undefined;
+                var d1 = undefined;
+                var d2 = undefined;
+                var d3 = undefined;
+                var d4 = undefined;
                 b.x; // Error, isn't accessed through an instance of the enclosing class
                 d1.x; // Error, isn't accessed through an instance of the enclosing class
                 d2.x; // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
@@ -218,11 +218,11 @@ var Derived3 = /** @class */ (function (_super) {
             function D() {
             }
             D.prototype.method3d = function () {
-                var b;
-                var d1;
-                var d2;
-                var d3;
-                var d4;
+                var b = undefined;
+                var d1 = undefined;
+                var d2 = undefined;
+                var d3 = undefined;
+                var d4 = undefined;
                 b.x; // Error, isn't accessed through an instance of the enclosing class
                 d1.x; // Error, isn't accessed through an instance of the enclosing class
                 d2.x; // Error, isn't accessed through an instance of the enclosing class
@@ -244,11 +244,11 @@ var Derived4 = /** @class */ (function (_super) {
             function E() {
             }
             E.prototype.method4e = function () {
-                var b;
-                var d1;
-                var d2;
-                var d3;
-                var d4;
+                var b = undefined;
+                var d1 = undefined;
+                var d2 = undefined;
+                var d3 = undefined;
+                var d4 = undefined;
                 b.x; // Error, isn't accessed through an instance of the enclosing class
                 d1.x; // Error, isn't accessed through an instance of the enclosing class
                 d2.x; // Error, isn't accessed through an instance of the enclosing class
@@ -260,11 +260,11 @@ var Derived4 = /** @class */ (function (_super) {
     };
     return Derived4;
 }(Derived2));
-var b;
-var d1;
-var d2;
-var d3;
-var d4;
+var b = undefined;
+var d1 = undefined;
+var d2 = undefined;
+var d3 = undefined;
+var d4 = undefined;
 b.x; // Error, neither within their declaring class nor classes derived from their declaring class
 d1.x; // Error, neither within their declaring class nor classes derived from their declaring class
 d2.x; // Error, neither within their declaring class nor classes derived from their declaring class
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.symbols b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.symbols
index 4d0a122b90b3a..d59f393ed0677 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.symbols
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.symbols
@@ -4,11 +4,11 @@
 class Base {
 >Base : Symbol(Base, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 0, 0))
 
-    protected x: string;
+    protected x!: string;
 >x : Symbol(Base.x, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 0, 12))
 
     method() {
->method : Symbol(Base.method, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 1, 24))
+>method : Symbol(Base.method, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 1, 25))
 
         class A {
 >A : Symbol(A, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 2, 14))
@@ -16,25 +16,30 @@ class Base {
             methoda() {
 >methoda : Symbol(A.methoda, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 3, 17))
 
-                var b: Base;
+                var b: Base = undefined as any;
 >b : Symbol(b, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 5, 19))
 >Base : Symbol(Base, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 0, 0))
+>undefined : Symbol(undefined)
 
-                var d1: Derived1;
+                var d1: Derived1 = undefined as any;
 >d1 : Symbol(d1, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 6, 19))
 >Derived1 : Symbol(Derived1, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 19, 1))
+>undefined : Symbol(undefined)
 
-                var d2: Derived2;
+                var d2: Derived2 = undefined as any;
 >d2 : Symbol(d2, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 7, 19))
 >Derived2 : Symbol(Derived2, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 39, 1))
+>undefined : Symbol(undefined)
 
-                var d3: Derived3;
+                var d3: Derived3 = undefined as any;
 >d3 : Symbol(d3, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 8, 19))
 >Derived3 : Symbol(Derived3, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 59, 1))
+>undefined : Symbol(undefined)
 
-                var d4: Derived4;
+                var d4: Derived4 = undefined as any;
 >d4 : Symbol(d4, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 9, 19))
 >Derived4 : Symbol(Derived4, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 80, 1))
+>undefined : Symbol(undefined)
 
                 b.x;            // OK, accessed within their declaring class
 >b.x : Symbol(Base.x, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 0, 12))
@@ -78,25 +83,30 @@ class Derived1 extends Base {
             method1b() {
 >method1b : Symbol(B.method1b, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 23, 17))
 
-                var b: Base;
+                var b: Base = undefined as any;
 >b : Symbol(b, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 25, 19))
 >Base : Symbol(Base, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 0, 0))
+>undefined : Symbol(undefined)
 
-                var d1: Derived1;
+                var d1: Derived1 = undefined as any;
 >d1 : Symbol(d1, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 26, 19))
 >Derived1 : Symbol(Derived1, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 19, 1))
+>undefined : Symbol(undefined)
 
-                var d2: Derived2;
+                var d2: Derived2 = undefined as any;
 >d2 : Symbol(d2, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 27, 19))
 >Derived2 : Symbol(Derived2, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 39, 1))
+>undefined : Symbol(undefined)
 
-                var d3: Derived3;
+                var d3: Derived3 = undefined as any;
 >d3 : Symbol(d3, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 28, 19))
 >Derived3 : Symbol(Derived3, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 59, 1))
+>undefined : Symbol(undefined)
 
-                var d4: Derived4;
+                var d4: Derived4 = undefined as any;
 >d4 : Symbol(d4, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 29, 19))
 >Derived4 : Symbol(Derived4, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 80, 1))
+>undefined : Symbol(undefined)
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : Symbol(Base.x, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 0, 12))
@@ -140,25 +150,30 @@ class Derived2 extends Base {
             method2c() {
 >method2c : Symbol(C.method2c, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 43, 17))
 
-                var b: Base;
+                var b: Base = undefined as any;
 >b : Symbol(b, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 45, 19))
 >Base : Symbol(Base, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 0, 0))
+>undefined : Symbol(undefined)
 
-                var d1: Derived1;
+                var d1: Derived1 = undefined as any;
 >d1 : Symbol(d1, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 46, 19))
 >Derived1 : Symbol(Derived1, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 19, 1))
+>undefined : Symbol(undefined)
 
-                var d2: Derived2;
+                var d2: Derived2 = undefined as any;
 >d2 : Symbol(d2, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 47, 19))
 >Derived2 : Symbol(Derived2, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 39, 1))
+>undefined : Symbol(undefined)
 
-                var d3: Derived3;
+                var d3: Derived3 = undefined as any;
 >d3 : Symbol(d3, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 48, 19))
 >Derived3 : Symbol(Derived3, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 59, 1))
+>undefined : Symbol(undefined)
 
-                var d4: Derived4;
+                var d4: Derived4 = undefined as any;
 >d4 : Symbol(d4, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 49, 19))
 >Derived4 : Symbol(Derived4, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 80, 1))
+>undefined : Symbol(undefined)
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : Symbol(Base.x, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 0, 12))
@@ -193,11 +208,11 @@ class Derived3 extends Derived1 {
 >Derived3 : Symbol(Derived3, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 59, 1))
 >Derived1 : Symbol(Derived1, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 19, 1))
 
-    protected x: string;
+    protected x!: string;
 >x : Symbol(Derived3.x, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 61, 33))
 
     method3() {
->method3 : Symbol(Derived3.method3, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 62, 24))
+>method3 : Symbol(Derived3.method3, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 62, 25))
 
         class D {
 >D : Symbol(D, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 63, 15))
@@ -205,25 +220,30 @@ class Derived3 extends Derived1 {
             method3d() {
 >method3d : Symbol(D.method3d, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 64, 17))
 
-                var b: Base;
+                var b: Base = undefined as any;
 >b : Symbol(b, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 66, 19))
 >Base : Symbol(Base, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 0, 0))
+>undefined : Symbol(undefined)
 
-                var d1: Derived1;
+                var d1: Derived1 = undefined as any;
 >d1 : Symbol(d1, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 67, 19))
 >Derived1 : Symbol(Derived1, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 19, 1))
+>undefined : Symbol(undefined)
 
-                var d2: Derived2;
+                var d2: Derived2 = undefined as any;
 >d2 : Symbol(d2, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 68, 19))
 >Derived2 : Symbol(Derived2, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 39, 1))
+>undefined : Symbol(undefined)
 
-                var d3: Derived3;
+                var d3: Derived3 = undefined as any;
 >d3 : Symbol(d3, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 69, 19))
 >Derived3 : Symbol(Derived3, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 59, 1))
+>undefined : Symbol(undefined)
 
-                var d4: Derived4;
+                var d4: Derived4 = undefined as any;
 >d4 : Symbol(d4, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 70, 19))
 >Derived4 : Symbol(Derived4, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 80, 1))
+>undefined : Symbol(undefined)
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : Symbol(Base.x, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 0, 12))
@@ -267,25 +287,30 @@ class Derived4 extends Derived2 {
             method4e() {
 >method4e : Symbol(E.method4e, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 84, 17))
 
-                var b: Base;
+                var b: Base = undefined as any;
 >b : Symbol(b, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 86, 19))
 >Base : Symbol(Base, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 0, 0))
+>undefined : Symbol(undefined)
 
-                var d1: Derived1;
+                var d1: Derived1 = undefined as any;
 >d1 : Symbol(d1, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 87, 19))
 >Derived1 : Symbol(Derived1, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 19, 1))
+>undefined : Symbol(undefined)
 
-                var d2: Derived2;
+                var d2: Derived2 = undefined as any;
 >d2 : Symbol(d2, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 88, 19))
 >Derived2 : Symbol(Derived2, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 39, 1))
+>undefined : Symbol(undefined)
 
-                var d3: Derived3;
+                var d3: Derived3 = undefined as any;
 >d3 : Symbol(d3, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 89, 19))
 >Derived3 : Symbol(Derived3, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 59, 1))
+>undefined : Symbol(undefined)
 
-                var d4: Derived4;
+                var d4: Derived4 = undefined as any;
 >d4 : Symbol(d4, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 90, 19))
 >Derived4 : Symbol(Derived4, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 80, 1))
+>undefined : Symbol(undefined)
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : Symbol(Base.x, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 0, 12))
@@ -317,25 +342,30 @@ class Derived4 extends Derived2 {
 }
 
 
-var b: Base;
+var b: Base = undefined as any;
 >b : Symbol(b, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 103, 3))
 >Base : Symbol(Base, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 0, 0))
+>undefined : Symbol(undefined)
 
-var d1: Derived1;
+var d1: Derived1 = undefined as any;
 >d1 : Symbol(d1, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 104, 3))
 >Derived1 : Symbol(Derived1, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 19, 1))
+>undefined : Symbol(undefined)
 
-var d2: Derived2;
+var d2: Derived2 = undefined as any;
 >d2 : Symbol(d2, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 105, 3))
 >Derived2 : Symbol(Derived2, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 39, 1))
+>undefined : Symbol(undefined)
 
-var d3: Derived3;
+var d3: Derived3 = undefined as any;
 >d3 : Symbol(d3, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 106, 3))
 >Derived3 : Symbol(Derived3, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 59, 1))
+>undefined : Symbol(undefined)
 
-var d4: Derived4;
+var d4: Derived4 = undefined as any;
 >d4 : Symbol(d4, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 107, 3))
 >Derived4 : Symbol(Derived4, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 80, 1))
+>undefined : Symbol(undefined)
 
 b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
 >b.x : Symbol(Base.x, Decl(protectedClassPropertyAccessibleWithinNestedSubclass1.ts, 0, 12))
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.types b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.types
index 3077571ba7b89..4d4a372edb34d 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.types
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.types
@@ -5,7 +5,7 @@ class Base {
 >Base : Base
 >     : ^^^^
 
-    protected x: string;
+    protected x!: string;
 >x : string
 >  : ^^^^^^
 
@@ -21,25 +21,45 @@ class Base {
 >methoda : () => void
 >        : ^^^^^^^^^^
 
-                var b: Base;
+                var b: Base = undefined as any;
 >b : Base
 >  : ^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d1: Derived1;
+                var d1: Derived1 = undefined as any;
 >d1 : Derived1
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d2: Derived2;
+                var d2: Derived2 = undefined as any;
 >d2 : Derived2
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d3: Derived3;
+                var d3: Derived3 = undefined as any;
 >d3 : Derived3
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d4: Derived4;
+                var d4: Derived4 = undefined as any;
 >d4 : Derived4
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
                 b.x;            // OK, accessed within their declaring class
 >b.x : string
@@ -103,25 +123,45 @@ class Derived1 extends Base {
 >method1b : () => void
 >         : ^^^^^^^^^^
 
-                var b: Base;
+                var b: Base = undefined as any;
 >b : Base
 >  : ^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d1: Derived1;
+                var d1: Derived1 = undefined as any;
 >d1 : Derived1
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d2: Derived2;
+                var d2: Derived2 = undefined as any;
 >d2 : Derived2
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d3: Derived3;
+                var d3: Derived3 = undefined as any;
 >d3 : Derived3
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d4: Derived4;
+                var d4: Derived4 = undefined as any;
 >d4 : Derived4
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -185,25 +225,45 @@ class Derived2 extends Base {
 >method2c : () => void
 >         : ^^^^^^^^^^
 
-                var b: Base;
+                var b: Base = undefined as any;
 >b : Base
 >  : ^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d1: Derived1;
+                var d1: Derived1 = undefined as any;
 >d1 : Derived1
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d2: Derived2;
+                var d2: Derived2 = undefined as any;
 >d2 : Derived2
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d3: Derived3;
+                var d3: Derived3 = undefined as any;
 >d3 : Derived3
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d4: Derived4;
+                var d4: Derived4 = undefined as any;
 >d4 : Derived4
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -255,7 +315,7 @@ class Derived3 extends Derived1 {
 >Derived1 : Derived1
 >         : ^^^^^^^^
 
-    protected x: string;
+    protected x!: string;
 >x : string
 >  : ^^^^^^
 
@@ -271,25 +331,45 @@ class Derived3 extends Derived1 {
 >method3d : () => void
 >         : ^^^^^^^^^^
 
-                var b: Base;
+                var b: Base = undefined as any;
 >b : Base
 >  : ^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d1: Derived1;
+                var d1: Derived1 = undefined as any;
 >d1 : Derived1
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d2: Derived2;
+                var d2: Derived2 = undefined as any;
 >d2 : Derived2
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d3: Derived3;
+                var d3: Derived3 = undefined as any;
 >d3 : Derived3
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d4: Derived4;
+                var d4: Derived4 = undefined as any;
 >d4 : Derived4
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -353,25 +433,45 @@ class Derived4 extends Derived2 {
 >method4e : () => void
 >         : ^^^^^^^^^^
 
-                var b: Base;
+                var b: Base = undefined as any;
 >b : Base
 >  : ^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d1: Derived1;
+                var d1: Derived1 = undefined as any;
 >d1 : Derived1
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d2: Derived2;
+                var d2: Derived2 = undefined as any;
 >d2 : Derived2
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d3: Derived3;
+                var d3: Derived3 = undefined as any;
 >d3 : Derived3
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-                var d4: Derived4;
+                var d4: Derived4 = undefined as any;
 >d4 : Derived4
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -418,25 +518,45 @@ class Derived4 extends Derived2 {
 }
 
 
-var b: Base;
+var b: Base = undefined as any;
 >b : Base
 >  : ^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-var d1: Derived1;
+var d1: Derived1 = undefined as any;
 >d1 : Derived1
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-var d2: Derived2;
+var d2: Derived2 = undefined as any;
 >d2 : Derived2
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-var d3: Derived3;
+var d3: Derived3 = undefined as any;
 >d3 : Derived3
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-var d4: Derived4;
+var d4: Derived4 = undefined as any;
 >d4 : Derived4
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
 b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
 >b.x : string
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.errors.txt b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.errors.txt
index a3379a36d4b5c..a968fec8896a3 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.errors.txt
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.errors.txt
@@ -23,13 +23,13 @@ protectedClassPropertyAccessibleWithinSubclass2.ts(94,4): error TS2445: Property
 
 ==== protectedClassPropertyAccessibleWithinSubclass2.ts (21 errors) ====
     class Base {
-        protected x: string;
+        protected x!: string;
         method() {
-            var b: Base;
-            var d1: Derived1;
-            var d2: Derived2;
-            var d3: Derived3;
-            var d4: Derived4;
+            var b: Base = undefined as any;
+            var d1: Derived1 = undefined as any;
+            var d2: Derived2 = undefined as any;
+            var d3: Derived3 = undefined as any;
+            var d4: Derived4 = undefined as any;
     
             b.x;            // OK, accessed within their declaring class
             d1.x;           // OK, accessed within their declaring class
@@ -43,11 +43,11 @@ protectedClassPropertyAccessibleWithinSubclass2.ts(94,4): error TS2445: Property
     
     class Derived1 extends Base {
         method1() {
-            var b: Base;
-            var d1: Derived1;
-            var d2: Derived2;
-            var d3: Derived3;
-            var d4: Derived4;
+            var b: Base = undefined as any;
+            var d1: Derived1 = undefined as any;
+            var d2: Derived2 = undefined as any;
+            var d3: Derived3 = undefined as any;
+            var d4: Derived4 = undefined as any;
     
             b.x;            // Error, isn't accessed through an instance of the enclosing class
               ~
@@ -67,11 +67,11 @@ protectedClassPropertyAccessibleWithinSubclass2.ts(94,4): error TS2445: Property
     
     class Derived2 extends Base {
         method2() {
-            var b: Base;
-            var d1: Derived1;
-            var d2: Derived2;
-            var d3: Derived3;
-            var d4: Derived4;
+            var b: Base = undefined as any;
+            var d1: Derived1 = undefined as any;
+            var d2: Derived2 = undefined as any;
+            var d3: Derived3 = undefined as any;
+            var d4: Derived4 = undefined as any;
     
             b.x;            // Error, isn't accessed through an instance of the enclosing class
               ~
@@ -88,13 +88,13 @@ protectedClassPropertyAccessibleWithinSubclass2.ts(94,4): error TS2445: Property
     }
     
     class Derived3 extends Derived1 {
-        protected x: string;
+        protected x!: string;
         method3() {
-            var b: Base;
-            var d1: Derived1;
-            var d2: Derived2;
-            var d3: Derived3;
-            var d4: Derived4;
+            var b: Base = undefined as any;
+            var d1: Derived1 = undefined as any;
+            var d2: Derived2 = undefined as any;
+            var d3: Derived3 = undefined as any;
+            var d4: Derived4 = undefined as any;
     
             b.x;            // Error, isn't accessed through an instance of the enclosing class
               ~
@@ -114,11 +114,11 @@ protectedClassPropertyAccessibleWithinSubclass2.ts(94,4): error TS2445: Property
     
     class Derived4 extends Derived2 {
         method4() {
-            var b: Base;
-            var d1: Derived1;
-            var d2: Derived2;
-            var d3: Derived3;
-            var d4: Derived4;
+            var b: Base = undefined as any;
+            var d1: Derived1 = undefined as any;
+            var d2: Derived2 = undefined as any;
+            var d3: Derived3 = undefined as any;
+            var d4: Derived4 = undefined as any;
     
             b.x;            // Error, isn't accessed through an instance of the enclosing class
               ~
@@ -137,11 +137,11 @@ protectedClassPropertyAccessibleWithinSubclass2.ts(94,4): error TS2445: Property
     }
     
     
-    var b: Base;
-    var d1: Derived1;
-    var d2: Derived2;
-    var d3: Derived3;
-    var d4: Derived4;
+    var b: Base = undefined as any;
+    var d1: Derived1 = undefined as any;
+    var d2: Derived2 = undefined as any;
+    var d3: Derived3 = undefined as any;
+    var d4: Derived4 = undefined as any;
     
     b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
       ~
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
index fe0cb7db83e42..c1be36eb3d1d7 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
@@ -2,13 +2,13 @@
 
 //// [protectedClassPropertyAccessibleWithinSubclass2.ts]
 class Base {
-    protected x: string;
+    protected x!: string;
     method() {
-        var b: Base;
-        var d1: Derived1;
-        var d2: Derived2;
-        var d3: Derived3;
-        var d4: Derived4;
+        var b: Base = undefined as any;
+        var d1: Derived1 = undefined as any;
+        var d2: Derived2 = undefined as any;
+        var d3: Derived3 = undefined as any;
+        var d4: Derived4 = undefined as any;
 
         b.x;            // OK, accessed within their declaring class
         d1.x;           // OK, accessed within their declaring class
@@ -20,11 +20,11 @@ class Base {
 
 class Derived1 extends Base {
     method1() {
-        var b: Base;
-        var d1: Derived1;
-        var d2: Derived2;
-        var d3: Derived3;
-        var d4: Derived4;
+        var b: Base = undefined as any;
+        var d1: Derived1 = undefined as any;
+        var d2: Derived2 = undefined as any;
+        var d3: Derived3 = undefined as any;
+        var d4: Derived4 = undefined as any;
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
         d1.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
@@ -36,11 +36,11 @@ class Derived1 extends Base {
 
 class Derived2 extends Base {
     method2() {
-        var b: Base;
-        var d1: Derived1;
-        var d2: Derived2;
-        var d3: Derived3;
-        var d4: Derived4;
+        var b: Base = undefined as any;
+        var d1: Derived1 = undefined as any;
+        var d2: Derived2 = undefined as any;
+        var d3: Derived3 = undefined as any;
+        var d4: Derived4 = undefined as any;
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
         d1.x;           // Error, isn't accessed through an instance of the enclosing class
@@ -51,13 +51,13 @@ class Derived2 extends Base {
 }
 
 class Derived3 extends Derived1 {
-    protected x: string;
+    protected x!: string;
     method3() {
-        var b: Base;
-        var d1: Derived1;
-        var d2: Derived2;
-        var d3: Derived3;
-        var d4: Derived4;
+        var b: Base = undefined as any;
+        var d1: Derived1 = undefined as any;
+        var d2: Derived2 = undefined as any;
+        var d3: Derived3 = undefined as any;
+        var d4: Derived4 = undefined as any;
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
         d1.x;           // Error, isn't accessed through an instance of the enclosing class
@@ -69,11 +69,11 @@ class Derived3 extends Derived1 {
 
 class Derived4 extends Derived2 {
     method4() {
-        var b: Base;
-        var d1: Derived1;
-        var d2: Derived2;
-        var d3: Derived3;
-        var d4: Derived4;
+        var b: Base = undefined as any;
+        var d1: Derived1 = undefined as any;
+        var d2: Derived2 = undefined as any;
+        var d3: Derived3 = undefined as any;
+        var d4: Derived4 = undefined as any;
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
         d1.x;           // Error, isn't accessed through an instance of the enclosing class
@@ -84,11 +84,11 @@ class Derived4 extends Derived2 {
 }
 
 
-var b: Base;
-var d1: Derived1;
-var d2: Derived2;
-var d3: Derived3;
-var d4: Derived4;
+var b: Base = undefined as any;
+var d1: Derived1 = undefined as any;
+var d2: Derived2 = undefined as any;
+var d3: Derived3 = undefined as any;
+var d4: Derived4 = undefined as any;
 
 b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
 d1.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
@@ -116,11 +116,11 @@ var Base = /** @class */ (function () {
     function Base() {
     }
     Base.prototype.method = function () {
-        var b;
-        var d1;
-        var d2;
-        var d3;
-        var d4;
+        var b = undefined;
+        var d1 = undefined;
+        var d2 = undefined;
+        var d3 = undefined;
+        var d4 = undefined;
         b.x; // OK, accessed within their declaring class
         d1.x; // OK, accessed within their declaring class
         d2.x; // OK, accessed within their declaring class
@@ -135,11 +135,11 @@ var Derived1 = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     Derived1.prototype.method1 = function () {
-        var b;
-        var d1;
-        var d2;
-        var d3;
-        var d4;
+        var b = undefined;
+        var d1 = undefined;
+        var d2 = undefined;
+        var d3 = undefined;
+        var d4 = undefined;
         b.x; // Error, isn't accessed through an instance of the enclosing class
         d1.x; // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
         d2.x; // Error, isn't accessed through an instance of the enclosing class
@@ -154,11 +154,11 @@ var Derived2 = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     Derived2.prototype.method2 = function () {
-        var b;
-        var d1;
-        var d2;
-        var d3;
-        var d4;
+        var b = undefined;
+        var d1 = undefined;
+        var d2 = undefined;
+        var d3 = undefined;
+        var d4 = undefined;
         b.x; // Error, isn't accessed through an instance of the enclosing class
         d1.x; // Error, isn't accessed through an instance of the enclosing class
         d2.x; // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
@@ -173,11 +173,11 @@ var Derived3 = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     Derived3.prototype.method3 = function () {
-        var b;
-        var d1;
-        var d2;
-        var d3;
-        var d4;
+        var b = undefined;
+        var d1 = undefined;
+        var d2 = undefined;
+        var d3 = undefined;
+        var d4 = undefined;
         b.x; // Error, isn't accessed through an instance of the enclosing class
         d1.x; // Error, isn't accessed through an instance of the enclosing class
         d2.x; // Error, isn't accessed through an instance of the enclosing class
@@ -192,11 +192,11 @@ var Derived4 = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     Derived4.prototype.method4 = function () {
-        var b;
-        var d1;
-        var d2;
-        var d3;
-        var d4;
+        var b = undefined;
+        var d1 = undefined;
+        var d2 = undefined;
+        var d3 = undefined;
+        var d4 = undefined;
         b.x; // Error, isn't accessed through an instance of the enclosing class
         d1.x; // Error, isn't accessed through an instance of the enclosing class
         d2.x; // Error, isn't accessed through an instance of the enclosing class
@@ -205,11 +205,11 @@ var Derived4 = /** @class */ (function (_super) {
     };
     return Derived4;
 }(Derived2));
-var b;
-var d1;
-var d2;
-var d3;
-var d4;
+var b = undefined;
+var d1 = undefined;
+var d2 = undefined;
+var d3 = undefined;
+var d4 = undefined;
 b.x; // Error, neither within their declaring class nor classes derived from their declaring class
 d1.x; // Error, neither within their declaring class nor classes derived from their declaring class
 d2.x; // Error, neither within their declaring class nor classes derived from their declaring class
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.symbols b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.symbols
index 37fe52e62f63f..04cbf53815981 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.symbols
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.symbols
@@ -4,31 +4,36 @@
 class Base {
 >Base : Symbol(Base, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 0, 0))
 
-    protected x: string;
+    protected x!: string;
 >x : Symbol(Base.x, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 0, 12))
 
     method() {
->method : Symbol(Base.method, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 1, 24))
+>method : Symbol(Base.method, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 1, 25))
 
-        var b: Base;
+        var b: Base = undefined as any;
 >b : Symbol(b, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 3, 11))
 >Base : Symbol(Base, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 0, 0))
+>undefined : Symbol(undefined)
 
-        var d1: Derived1;
+        var d1: Derived1 = undefined as any;
 >d1 : Symbol(d1, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 4, 11))
 >Derived1 : Symbol(Derived1, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 15, 1))
+>undefined : Symbol(undefined)
 
-        var d2: Derived2;
+        var d2: Derived2 = undefined as any;
 >d2 : Symbol(d2, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 5, 11))
 >Derived2 : Symbol(Derived2, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 31, 1))
+>undefined : Symbol(undefined)
 
-        var d3: Derived3;
+        var d3: Derived3 = undefined as any;
 >d3 : Symbol(d3, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 6, 11))
 >Derived3 : Symbol(Derived3, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 47, 1))
+>undefined : Symbol(undefined)
 
-        var d4: Derived4;
+        var d4: Derived4 = undefined as any;
 >d4 : Symbol(d4, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 7, 11))
 >Derived4 : Symbol(Derived4, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 64, 1))
+>undefined : Symbol(undefined)
 
         b.x;            // OK, accessed within their declaring class
 >b.x : Symbol(Base.x, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 0, 12))
@@ -64,25 +69,30 @@ class Derived1 extends Base {
     method1() {
 >method1 : Symbol(Derived1.method1, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 17, 29))
 
-        var b: Base;
+        var b: Base = undefined as any;
 >b : Symbol(b, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 19, 11))
 >Base : Symbol(Base, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 0, 0))
+>undefined : Symbol(undefined)
 
-        var d1: Derived1;
+        var d1: Derived1 = undefined as any;
 >d1 : Symbol(d1, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 20, 11))
 >Derived1 : Symbol(Derived1, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 15, 1))
+>undefined : Symbol(undefined)
 
-        var d2: Derived2;
+        var d2: Derived2 = undefined as any;
 >d2 : Symbol(d2, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 21, 11))
 >Derived2 : Symbol(Derived2, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 31, 1))
+>undefined : Symbol(undefined)
 
-        var d3: Derived3;
+        var d3: Derived3 = undefined as any;
 >d3 : Symbol(d3, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 22, 11))
 >Derived3 : Symbol(Derived3, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 47, 1))
+>undefined : Symbol(undefined)
 
-        var d4: Derived4;
+        var d4: Derived4 = undefined as any;
 >d4 : Symbol(d4, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 23, 11))
 >Derived4 : Symbol(Derived4, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 64, 1))
+>undefined : Symbol(undefined)
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : Symbol(Base.x, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 0, 12))
@@ -118,25 +128,30 @@ class Derived2 extends Base {
     method2() {
 >method2 : Symbol(Derived2.method2, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 33, 29))
 
-        var b: Base;
+        var b: Base = undefined as any;
 >b : Symbol(b, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 35, 11))
 >Base : Symbol(Base, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 0, 0))
+>undefined : Symbol(undefined)
 
-        var d1: Derived1;
+        var d1: Derived1 = undefined as any;
 >d1 : Symbol(d1, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 36, 11))
 >Derived1 : Symbol(Derived1, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 15, 1))
+>undefined : Symbol(undefined)
 
-        var d2: Derived2;
+        var d2: Derived2 = undefined as any;
 >d2 : Symbol(d2, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 37, 11))
 >Derived2 : Symbol(Derived2, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 31, 1))
+>undefined : Symbol(undefined)
 
-        var d3: Derived3;
+        var d3: Derived3 = undefined as any;
 >d3 : Symbol(d3, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 38, 11))
 >Derived3 : Symbol(Derived3, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 47, 1))
+>undefined : Symbol(undefined)
 
-        var d4: Derived4;
+        var d4: Derived4 = undefined as any;
 >d4 : Symbol(d4, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 39, 11))
 >Derived4 : Symbol(Derived4, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 64, 1))
+>undefined : Symbol(undefined)
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : Symbol(Base.x, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 0, 12))
@@ -169,31 +184,36 @@ class Derived3 extends Derived1 {
 >Derived3 : Symbol(Derived3, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 47, 1))
 >Derived1 : Symbol(Derived1, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 15, 1))
 
-    protected x: string;
+    protected x!: string;
 >x : Symbol(Derived3.x, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 49, 33))
 
     method3() {
->method3 : Symbol(Derived3.method3, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 50, 24))
+>method3 : Symbol(Derived3.method3, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 50, 25))
 
-        var b: Base;
+        var b: Base = undefined as any;
 >b : Symbol(b, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 52, 11))
 >Base : Symbol(Base, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 0, 0))
+>undefined : Symbol(undefined)
 
-        var d1: Derived1;
+        var d1: Derived1 = undefined as any;
 >d1 : Symbol(d1, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 53, 11))
 >Derived1 : Symbol(Derived1, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 15, 1))
+>undefined : Symbol(undefined)
 
-        var d2: Derived2;
+        var d2: Derived2 = undefined as any;
 >d2 : Symbol(d2, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 54, 11))
 >Derived2 : Symbol(Derived2, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 31, 1))
+>undefined : Symbol(undefined)
 
-        var d3: Derived3;
+        var d3: Derived3 = undefined as any;
 >d3 : Symbol(d3, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 55, 11))
 >Derived3 : Symbol(Derived3, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 47, 1))
+>undefined : Symbol(undefined)
 
-        var d4: Derived4;
+        var d4: Derived4 = undefined as any;
 >d4 : Symbol(d4, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 56, 11))
 >Derived4 : Symbol(Derived4, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 64, 1))
+>undefined : Symbol(undefined)
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : Symbol(Base.x, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 0, 12))
@@ -229,25 +249,30 @@ class Derived4 extends Derived2 {
     method4() {
 >method4 : Symbol(Derived4.method4, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 66, 33))
 
-        var b: Base;
+        var b: Base = undefined as any;
 >b : Symbol(b, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 68, 11))
 >Base : Symbol(Base, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 0, 0))
+>undefined : Symbol(undefined)
 
-        var d1: Derived1;
+        var d1: Derived1 = undefined as any;
 >d1 : Symbol(d1, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 69, 11))
 >Derived1 : Symbol(Derived1, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 15, 1))
+>undefined : Symbol(undefined)
 
-        var d2: Derived2;
+        var d2: Derived2 = undefined as any;
 >d2 : Symbol(d2, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 70, 11))
 >Derived2 : Symbol(Derived2, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 31, 1))
+>undefined : Symbol(undefined)
 
-        var d3: Derived3;
+        var d3: Derived3 = undefined as any;
 >d3 : Symbol(d3, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 71, 11))
 >Derived3 : Symbol(Derived3, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 47, 1))
+>undefined : Symbol(undefined)
 
-        var d4: Derived4;
+        var d4: Derived4 = undefined as any;
 >d4 : Symbol(d4, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 72, 11))
 >Derived4 : Symbol(Derived4, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 64, 1))
+>undefined : Symbol(undefined)
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : Symbol(Base.x, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 0, 12))
@@ -277,25 +302,30 @@ class Derived4 extends Derived2 {
 }
 
 
-var b: Base;
+var b: Base = undefined as any;
 >b : Symbol(b, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 83, 3))
 >Base : Symbol(Base, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 0, 0))
+>undefined : Symbol(undefined)
 
-var d1: Derived1;
+var d1: Derived1 = undefined as any;
 >d1 : Symbol(d1, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 84, 3))
 >Derived1 : Symbol(Derived1, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 15, 1))
+>undefined : Symbol(undefined)
 
-var d2: Derived2;
+var d2: Derived2 = undefined as any;
 >d2 : Symbol(d2, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 85, 3))
 >Derived2 : Symbol(Derived2, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 31, 1))
+>undefined : Symbol(undefined)
 
-var d3: Derived3;
+var d3: Derived3 = undefined as any;
 >d3 : Symbol(d3, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 86, 3))
 >Derived3 : Symbol(Derived3, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 47, 1))
+>undefined : Symbol(undefined)
 
-var d4: Derived4;
+var d4: Derived4 = undefined as any;
 >d4 : Symbol(d4, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 87, 3))
 >Derived4 : Symbol(Derived4, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 64, 1))
+>undefined : Symbol(undefined)
 
 b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
 >b.x : Symbol(Base.x, Decl(protectedClassPropertyAccessibleWithinSubclass2.ts, 0, 12))
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.types b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.types
index a12bc76e2cda5..a16c42195766f 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.types
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.types
@@ -5,7 +5,7 @@ class Base {
 >Base : Base
 >     : ^^^^
 
-    protected x: string;
+    protected x!: string;
 >x : string
 >  : ^^^^^^
 
@@ -13,25 +13,45 @@ class Base {
 >method : () => void
 >       : ^^^^^^^^^^
 
-        var b: Base;
+        var b: Base = undefined as any;
 >b : Base
 >  : ^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d1: Derived1;
+        var d1: Derived1 = undefined as any;
 >d1 : Derived1
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d2: Derived2;
+        var d2: Derived2 = undefined as any;
 >d2 : Derived2
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d3: Derived3;
+        var d3: Derived3 = undefined as any;
 >d3 : Derived3
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d4: Derived4;
+        var d4: Derived4 = undefined as any;
 >d4 : Derived4
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
         b.x;            // OK, accessed within their declaring class
 >b.x : string
@@ -85,25 +105,45 @@ class Derived1 extends Base {
 >method1 : () => void
 >        : ^^^^^^^^^^
 
-        var b: Base;
+        var b: Base = undefined as any;
 >b : Base
 >  : ^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d1: Derived1;
+        var d1: Derived1 = undefined as any;
 >d1 : Derived1
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d2: Derived2;
+        var d2: Derived2 = undefined as any;
 >d2 : Derived2
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d3: Derived3;
+        var d3: Derived3 = undefined as any;
 >d3 : Derived3
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d4: Derived4;
+        var d4: Derived4 = undefined as any;
 >d4 : Derived4
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -157,25 +197,45 @@ class Derived2 extends Base {
 >method2 : () => void
 >        : ^^^^^^^^^^
 
-        var b: Base;
+        var b: Base = undefined as any;
 >b : Base
 >  : ^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d1: Derived1;
+        var d1: Derived1 = undefined as any;
 >d1 : Derived1
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d2: Derived2;
+        var d2: Derived2 = undefined as any;
 >d2 : Derived2
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d3: Derived3;
+        var d3: Derived3 = undefined as any;
 >d3 : Derived3
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d4: Derived4;
+        var d4: Derived4 = undefined as any;
 >d4 : Derived4
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -225,7 +285,7 @@ class Derived3 extends Derived1 {
 >Derived1 : Derived1
 >         : ^^^^^^^^
 
-    protected x: string;
+    protected x!: string;
 >x : string
 >  : ^^^^^^
 
@@ -233,25 +293,45 @@ class Derived3 extends Derived1 {
 >method3 : () => void
 >        : ^^^^^^^^^^
 
-        var b: Base;
+        var b: Base = undefined as any;
 >b : Base
 >  : ^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d1: Derived1;
+        var d1: Derived1 = undefined as any;
 >d1 : Derived1
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d2: Derived2;
+        var d2: Derived2 = undefined as any;
 >d2 : Derived2
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d3: Derived3;
+        var d3: Derived3 = undefined as any;
 >d3 : Derived3
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d4: Derived4;
+        var d4: Derived4 = undefined as any;
 >d4 : Derived4
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -305,25 +385,45 @@ class Derived4 extends Derived2 {
 >method4 : () => void
 >        : ^^^^^^^^^^
 
-        var b: Base;
+        var b: Base = undefined as any;
 >b : Base
 >  : ^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d1: Derived1;
+        var d1: Derived1 = undefined as any;
 >d1 : Derived1
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d2: Derived2;
+        var d2: Derived2 = undefined as any;
 >d2 : Derived2
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d3: Derived3;
+        var d3: Derived3 = undefined as any;
 >d3 : Derived3
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-        var d4: Derived4;
+        var d4: Derived4 = undefined as any;
 >d4 : Derived4
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -368,25 +468,45 @@ class Derived4 extends Derived2 {
 }
 
 
-var b: Base;
+var b: Base = undefined as any;
 >b : Base
 >  : ^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-var d1: Derived1;
+var d1: Derived1 = undefined as any;
 >d1 : Derived1
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-var d2: Derived2;
+var d2: Derived2 = undefined as any;
 >d2 : Derived2
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-var d3: Derived3;
+var d3: Derived3 = undefined as any;
 >d3 : Derived3
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-var d4: Derived4;
+var d4: Derived4 = undefined as any;
 >d4 : Derived4
 >   : ^^^^^^^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
 b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
 >b.x : string
diff --git a/tests/baselines/reference/protectedInstanceMemberAccessibility.errors.txt b/tests/baselines/reference/protectedInstanceMemberAccessibility.errors.txt
index 4afd3abfa9b07..cd156c346a917 100644
--- a/tests/baselines/reference/protectedInstanceMemberAccessibility.errors.txt
+++ b/tests/baselines/reference/protectedInstanceMemberAccessibility.errors.txt
@@ -15,14 +15,14 @@ protectedInstanceMemberAccessibility.ts(37,20): error TS2445: Property 'z' is pr
 
 ==== protectedInstanceMemberAccessibility.ts (13 errors) ====
     class A {
-        protected x: string;
+        protected x!: string;
         protected f(): string {
             return "hello";
         }
     }
     
     class B extends A {
-        protected y: string;
+        protected y!: string;
         g() {
             var t1 = this.x;
             var t2 = this.f();
@@ -42,7 +42,7 @@ protectedInstanceMemberAccessibility.ts(37,20): error TS2445: Property 'z' is pr
                            ~
 !!! error TS2339: Property 'z' does not exist on type 'A'.
     
-            var a: A;
+            var a: A = undefined as any;
             var a1 = a.x;    // error
                        ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'B'. This is an instance of class 'A'.
@@ -56,7 +56,7 @@ protectedInstanceMemberAccessibility.ts(37,20): error TS2445: Property 'z' is pr
                        ~
 !!! error TS2339: Property 'z' does not exist on type 'A'.
     
-            var b: B;
+            var b: B = undefined as any;
             var b1 = b.x;
             var b2 = b.f();
             var b3 = b.y;
@@ -64,7 +64,7 @@ protectedInstanceMemberAccessibility.ts(37,20): error TS2445: Property 'z' is pr
                        ~
 !!! error TS2339: Property 'z' does not exist on type 'B'.
     
-            var c: C;
+            var c: C = undefined as any;
             var c1 = c.x;    // error
                        ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'B'. This is an instance of class 'C'.
@@ -81,6 +81,6 @@ protectedInstanceMemberAccessibility.ts(37,20): error TS2445: Property 'z' is pr
     }
     
     class C extends A {
-        protected z: string;
+        protected z!: string;
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/protectedInstanceMemberAccessibility.js b/tests/baselines/reference/protectedInstanceMemberAccessibility.js
index 88e94acf42785..6306972a76f16 100644
--- a/tests/baselines/reference/protectedInstanceMemberAccessibility.js
+++ b/tests/baselines/reference/protectedInstanceMemberAccessibility.js
@@ -2,14 +2,14 @@
 
 //// [protectedInstanceMemberAccessibility.ts]
 class A {
-    protected x: string;
+    protected x!: string;
     protected f(): string {
         return "hello";
     }
 }
 
 class B extends A {
-    protected y: string;
+    protected y!: string;
     g() {
         var t1 = this.x;
         var t2 = this.f();
@@ -21,19 +21,19 @@ class B extends A {
         var s3 = super.y;    // error
         var s4 = super.z;    // error
 
-        var a: A;
+        var a: A = undefined as any;
         var a1 = a.x;    // error
         var a2 = a.f();  // error
         var a3 = a.y;    // error
         var a4 = a.z;    // error
 
-        var b: B;
+        var b: B = undefined as any;
         var b1 = b.x;
         var b2 = b.f();
         var b3 = b.y;
         var b4 = b.z;    // error
 
-        var c: C;
+        var c: C = undefined as any;
         var c1 = c.x;    // error
         var c2 = c.f();  // error
         var c3 = c.y;    // error
@@ -42,7 +42,7 @@ class B extends A {
 }
 
 class C extends A {
-    protected z: string;
+    protected z!: string;
 }
 
 
@@ -84,17 +84,17 @@ var B = /** @class */ (function (_super) {
         var s2 = _super.prototype.f.call(this);
         var s3 = _super.prototype.y; // error
         var s4 = _super.prototype.z; // error
-        var a;
+        var a = undefined;
         var a1 = a.x; // error
         var a2 = a.f(); // error
         var a3 = a.y; // error
         var a4 = a.z; // error
-        var b;
+        var b = undefined;
         var b1 = b.x;
         var b2 = b.f();
         var b3 = b.y;
         var b4 = b.z; // error
-        var c;
+        var c = undefined;
         var c1 = c.x; // error
         var c2 = c.f(); // error
         var c3 = c.y; // error
diff --git a/tests/baselines/reference/protectedInstanceMemberAccessibility.symbols b/tests/baselines/reference/protectedInstanceMemberAccessibility.symbols
index bce0eb9e57df4..20b6677d09d9b 100644
--- a/tests/baselines/reference/protectedInstanceMemberAccessibility.symbols
+++ b/tests/baselines/reference/protectedInstanceMemberAccessibility.symbols
@@ -4,11 +4,11 @@
 class A {
 >A : Symbol(A, Decl(protectedInstanceMemberAccessibility.ts, 0, 0))
 
-    protected x: string;
+    protected x!: string;
 >x : Symbol(A.x, Decl(protectedInstanceMemberAccessibility.ts, 0, 9))
 
     protected f(): string {
->f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 24))
+>f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 25))
 
         return "hello";
     }
@@ -18,11 +18,11 @@ class B extends A {
 >B : Symbol(B, Decl(protectedInstanceMemberAccessibility.ts, 5, 1))
 >A : Symbol(A, Decl(protectedInstanceMemberAccessibility.ts, 0, 0))
 
-    protected y: string;
+    protected y!: string;
 >y : Symbol(B.y, Decl(protectedInstanceMemberAccessibility.ts, 7, 19))
 
     g() {
->g : Symbol(B.g, Decl(protectedInstanceMemberAccessibility.ts, 8, 24))
+>g : Symbol(B.g, Decl(protectedInstanceMemberAccessibility.ts, 8, 25))
 
         var t1 = this.x;
 >t1 : Symbol(t1, Decl(protectedInstanceMemberAccessibility.ts, 10, 11))
@@ -32,9 +32,9 @@ class B extends A {
 
         var t2 = this.f();
 >t2 : Symbol(t2, Decl(protectedInstanceMemberAccessibility.ts, 11, 11))
->this.f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 24))
+>this.f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 25))
 >this : Symbol(B, Decl(protectedInstanceMemberAccessibility.ts, 5, 1))
->f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 24))
+>f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 25))
 
         var t3 = this.y;
 >t3 : Symbol(t3, Decl(protectedInstanceMemberAccessibility.ts, 12, 11))
@@ -54,9 +54,9 @@ class B extends A {
 
         var s2 = super.f();
 >s2 : Symbol(s2, Decl(protectedInstanceMemberAccessibility.ts, 16, 11))
->super.f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 24))
+>super.f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 25))
 >super : Symbol(A, Decl(protectedInstanceMemberAccessibility.ts, 0, 0))
->f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 24))
+>f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 25))
 
         var s3 = super.y;    // error
 >s3 : Symbol(s3, Decl(protectedInstanceMemberAccessibility.ts, 17, 11))
@@ -66,9 +66,10 @@ class B extends A {
 >s4 : Symbol(s4, Decl(protectedInstanceMemberAccessibility.ts, 18, 11))
 >super : Symbol(A, Decl(protectedInstanceMemberAccessibility.ts, 0, 0))
 
-        var a: A;
+        var a: A = undefined as any;
 >a : Symbol(a, Decl(protectedInstanceMemberAccessibility.ts, 20, 11))
 >A : Symbol(A, Decl(protectedInstanceMemberAccessibility.ts, 0, 0))
+>undefined : Symbol(undefined)
 
         var a1 = a.x;    // error
 >a1 : Symbol(a1, Decl(protectedInstanceMemberAccessibility.ts, 21, 11))
@@ -78,9 +79,9 @@ class B extends A {
 
         var a2 = a.f();  // error
 >a2 : Symbol(a2, Decl(protectedInstanceMemberAccessibility.ts, 22, 11))
->a.f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 24))
+>a.f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 25))
 >a : Symbol(a, Decl(protectedInstanceMemberAccessibility.ts, 20, 11))
->f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 24))
+>f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 25))
 
         var a3 = a.y;    // error
 >a3 : Symbol(a3, Decl(protectedInstanceMemberAccessibility.ts, 23, 11))
@@ -90,9 +91,10 @@ class B extends A {
 >a4 : Symbol(a4, Decl(protectedInstanceMemberAccessibility.ts, 24, 11))
 >a : Symbol(a, Decl(protectedInstanceMemberAccessibility.ts, 20, 11))
 
-        var b: B;
+        var b: B = undefined as any;
 >b : Symbol(b, Decl(protectedInstanceMemberAccessibility.ts, 26, 11))
 >B : Symbol(B, Decl(protectedInstanceMemberAccessibility.ts, 5, 1))
+>undefined : Symbol(undefined)
 
         var b1 = b.x;
 >b1 : Symbol(b1, Decl(protectedInstanceMemberAccessibility.ts, 27, 11))
@@ -102,9 +104,9 @@ class B extends A {
 
         var b2 = b.f();
 >b2 : Symbol(b2, Decl(protectedInstanceMemberAccessibility.ts, 28, 11))
->b.f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 24))
+>b.f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 25))
 >b : Symbol(b, Decl(protectedInstanceMemberAccessibility.ts, 26, 11))
->f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 24))
+>f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 25))
 
         var b3 = b.y;
 >b3 : Symbol(b3, Decl(protectedInstanceMemberAccessibility.ts, 29, 11))
@@ -116,9 +118,10 @@ class B extends A {
 >b4 : Symbol(b4, Decl(protectedInstanceMemberAccessibility.ts, 30, 11))
 >b : Symbol(b, Decl(protectedInstanceMemberAccessibility.ts, 26, 11))
 
-        var c: C;
+        var c: C = undefined as any;
 >c : Symbol(c, Decl(protectedInstanceMemberAccessibility.ts, 32, 11))
 >C : Symbol(C, Decl(protectedInstanceMemberAccessibility.ts, 38, 1))
+>undefined : Symbol(undefined)
 
         var c1 = c.x;    // error
 >c1 : Symbol(c1, Decl(protectedInstanceMemberAccessibility.ts, 33, 11))
@@ -128,9 +131,9 @@ class B extends A {
 
         var c2 = c.f();  // error
 >c2 : Symbol(c2, Decl(protectedInstanceMemberAccessibility.ts, 34, 11))
->c.f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 24))
+>c.f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 25))
 >c : Symbol(c, Decl(protectedInstanceMemberAccessibility.ts, 32, 11))
->f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 24))
+>f : Symbol(A.f, Decl(protectedInstanceMemberAccessibility.ts, 1, 25))
 
         var c3 = c.y;    // error
 >c3 : Symbol(c3, Decl(protectedInstanceMemberAccessibility.ts, 35, 11))
@@ -148,7 +151,7 @@ class C extends A {
 >C : Symbol(C, Decl(protectedInstanceMemberAccessibility.ts, 38, 1))
 >A : Symbol(A, Decl(protectedInstanceMemberAccessibility.ts, 0, 0))
 
-    protected z: string;
+    protected z!: string;
 >z : Symbol(C.z, Decl(protectedInstanceMemberAccessibility.ts, 40, 19))
 }
 
diff --git a/tests/baselines/reference/protectedInstanceMemberAccessibility.types b/tests/baselines/reference/protectedInstanceMemberAccessibility.types
index 90b3aae30efa3..c7a260d018dc6 100644
--- a/tests/baselines/reference/protectedInstanceMemberAccessibility.types
+++ b/tests/baselines/reference/protectedInstanceMemberAccessibility.types
@@ -5,7 +5,7 @@ class A {
 >A : A
 >  : ^
 
-    protected x: string;
+    protected x!: string;
 >x : string
 >  : ^^^^^^
 
@@ -25,7 +25,7 @@ class B extends A {
 >A : A
 >  : ^
 
-    protected y: string;
+    protected y!: string;
 >y : string
 >  : ^^^^^^
 
@@ -117,9 +117,13 @@ class B extends A {
 >z : any
 >  : ^^^
 
-        var a: A;
+        var a: A = undefined as any;
 >a : A
 >  : ^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
         var a1 = a.x;    // error
 >a1 : string
@@ -163,9 +167,13 @@ class B extends A {
 >z : any
 >  : ^^^
 
-        var b: B;
+        var b: B = undefined as any;
 >b : B
 >  : ^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
         var b1 = b.x;
 >b1 : string
@@ -209,9 +217,13 @@ class B extends A {
 >z : any
 >  : ^^^
 
-        var c: C;
+        var c: C = undefined as any;
 >c : C
 >  : ^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
         var c1 = c.x;    // error
 >c1 : string
@@ -263,7 +275,7 @@ class C extends A {
 >A : A
 >  : ^
 
-    protected z: string;
+    protected z!: string;
 >z : string
 >  : ^^^^^^
 }
diff --git a/tests/baselines/reference/protectedMembers.errors.txt b/tests/baselines/reference/protectedMembers.errors.txt
index 0c56276d9199b..fcada609a6a01 100644
--- a/tests/baselines/reference/protectedMembers.errors.txt
+++ b/tests/baselines/reference/protectedMembers.errors.txt
@@ -19,7 +19,7 @@ protectedMembers.ts(111,7): error TS2415: Class 'B3' incorrectly extends base cl
 ==== protectedMembers.ts (13 errors) ====
     // Class with protected members
     class C1 {
-        protected x: number;
+        protected x!: number;
         protected static sx: number;
         protected f() {
             return this.x;
@@ -41,8 +41,8 @@ protectedMembers.ts(111,7): error TS2415: Class 'B3' incorrectly extends base cl
     
     // Derived class making protected members public
     class C3 extends C2 {
-        x: number;
-        static sx: number;
+        x!: number;
+        static sx: number
         f() {
             return super.f();
         }
@@ -51,9 +51,9 @@ protectedMembers.ts(111,7): error TS2415: Class 'B3' incorrectly extends base cl
         }
     }
     
-    var c1: C1;
-    var c2: C2;
-    var c3: C3;
+    declare var c1: C1;
+    declare var c2: C2;
+    declare var c3: C3;
     
     // All of these should be errors
     c1.x;
@@ -131,8 +131,8 @@ protectedMembers.ts(111,7): error TS2415: Class 'B3' incorrectly extends base cl
     class B1 {
         x;
     }
-    var a1: A1;
-    var b1: B1;
+    declare var a1: A1;
+    declare var b1: B1;
     a1 = b1;  // Error, B1 doesn't derive from A1
     ~~
 !!! error TS2322: Type 'B1' is not assignable to type 'A1'.
diff --git a/tests/baselines/reference/protectedMembers.js b/tests/baselines/reference/protectedMembers.js
index b46e400e2747f..30ecf1d59d8dd 100644
--- a/tests/baselines/reference/protectedMembers.js
+++ b/tests/baselines/reference/protectedMembers.js
@@ -3,7 +3,7 @@
 //// [protectedMembers.ts]
 // Class with protected members
 class C1 {
-    protected x: number;
+    protected x!: number;
     protected static sx: number;
     protected f() {
         return this.x;
@@ -25,8 +25,8 @@ class C2 extends C1 {
 
 // Derived class making protected members public
 class C3 extends C2 {
-    x: number;
-    static sx: number;
+    x!: number;
+    static sx: number
     f() {
         return super.f();
     }
@@ -35,9 +35,9 @@ class C3 extends C2 {
     }
 }
 
-var c1: C1;
-var c2: C2;
-var c3: C3;
+declare var c1: C1;
+declare var c2: C2;
+declare var c3: C3;
 
 // All of these should be errors
 c1.x;
@@ -95,8 +95,8 @@ class A1 {
 class B1 {
     x;
 }
-var a1: A1;
-var b1: B1;
+declare var a1: A1;
+declare var b1: B1;
 a1 = b1;  // Error, B1 doesn't derive from A1
 b1 = a1;  // Error, x is protected in A1 but public in B1
 
@@ -173,9 +173,6 @@ var C3 = /** @class */ (function (_super) {
     };
     return C3;
 }(C2));
-var c1;
-var c2;
-var c3;
 // All of these should be errors
 c1.x;
 c1.f();
@@ -239,8 +236,6 @@ var B1 = /** @class */ (function () {
     }
     return B1;
 }());
-var a1;
-var b1;
 a1 = b1; // Error, B1 doesn't derive from A1
 b1 = a1; // Error, x is protected in A1 but public in B1
 var A2 = /** @class */ (function () {
diff --git a/tests/baselines/reference/protectedMembers.symbols b/tests/baselines/reference/protectedMembers.symbols
index 3173452bce693..581d7afafad0f 100644
--- a/tests/baselines/reference/protectedMembers.symbols
+++ b/tests/baselines/reference/protectedMembers.symbols
@@ -5,11 +5,11 @@
 class C1 {
 >C1 : Symbol(C1, Decl(protectedMembers.ts, 0, 0))
 
-    protected x: number;
+    protected x!: number;
 >x : Symbol(C1.x, Decl(protectedMembers.ts, 1, 10))
 
     protected static sx: number;
->sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 24))
+>sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 25))
 
     protected f() {
 >f : Symbol(C1.f, Decl(protectedMembers.ts, 3, 32))
@@ -23,9 +23,9 @@ class C1 {
 >sf : Symbol(C1.sf, Decl(protectedMembers.ts, 6, 5))
 
         return this.sx;
->this.sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 24))
+>this.sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 25))
 >this : Symbol(C1, Decl(protectedMembers.ts, 0, 0))
->sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 24))
+>sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 25))
     }
 }
 
@@ -52,9 +52,9 @@ class C2 extends C1 {
 >super.sf : Symbol(C1.sf, Decl(protectedMembers.ts, 6, 5))
 >super : Symbol(C1, Decl(protectedMembers.ts, 0, 0))
 >sf : Symbol(C1.sf, Decl(protectedMembers.ts, 6, 5))
->this.sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 24))
+>this.sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 25))
 >this : Symbol(C2, Decl(protectedMembers.ts, 10, 1))
->sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 24))
+>sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 25))
     }
 }
 
@@ -63,14 +63,14 @@ class C3 extends C2 {
 >C3 : Symbol(C3, Decl(protectedMembers.ts, 20, 1))
 >C2 : Symbol(C2, Decl(protectedMembers.ts, 10, 1))
 
-    x: number;
+    x!: number;
 >x : Symbol(C3.x, Decl(protectedMembers.ts, 23, 21))
 
-    static sx: number;
->sx : Symbol(C3.sx, Decl(protectedMembers.ts, 24, 14))
+    static sx: number
+>sx : Symbol(C3.sx, Decl(protectedMembers.ts, 24, 15))
 
     f() {
->f : Symbol(C3.f, Decl(protectedMembers.ts, 25, 22))
+>f : Symbol(C3.f, Decl(protectedMembers.ts, 25, 21))
 
         return super.f();
 >super.f : Symbol(C2.f, Decl(protectedMembers.ts, 13, 21))
@@ -87,33 +87,33 @@ class C3 extends C2 {
     }
 }
 
-var c1: C1;
->c1 : Symbol(c1, Decl(protectedMembers.ts, 34, 3))
+declare var c1: C1;
+>c1 : Symbol(c1, Decl(protectedMembers.ts, 34, 11))
 >C1 : Symbol(C1, Decl(protectedMembers.ts, 0, 0))
 
-var c2: C2;
->c2 : Symbol(c2, Decl(protectedMembers.ts, 35, 3))
+declare var c2: C2;
+>c2 : Symbol(c2, Decl(protectedMembers.ts, 35, 11))
 >C2 : Symbol(C2, Decl(protectedMembers.ts, 10, 1))
 
-var c3: C3;
->c3 : Symbol(c3, Decl(protectedMembers.ts, 36, 3))
+declare var c3: C3;
+>c3 : Symbol(c3, Decl(protectedMembers.ts, 36, 11))
 >C3 : Symbol(C3, Decl(protectedMembers.ts, 20, 1))
 
 // All of these should be errors
 c1.x;
 >c1.x : Symbol(C1.x, Decl(protectedMembers.ts, 1, 10))
->c1 : Symbol(c1, Decl(protectedMembers.ts, 34, 3))
+>c1 : Symbol(c1, Decl(protectedMembers.ts, 34, 11))
 >x : Symbol(C1.x, Decl(protectedMembers.ts, 1, 10))
 
 c1.f();
 >c1.f : Symbol(C1.f, Decl(protectedMembers.ts, 3, 32))
->c1 : Symbol(c1, Decl(protectedMembers.ts, 34, 3))
+>c1 : Symbol(c1, Decl(protectedMembers.ts, 34, 11))
 >f : Symbol(C1.f, Decl(protectedMembers.ts, 3, 32))
 
 C1.sx;
->C1.sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 24))
+>C1.sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 25))
 >C1 : Symbol(C1, Decl(protectedMembers.ts, 0, 0))
->sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 24))
+>sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 25))
 
 C1.sf();
 >C1.sf : Symbol(C1.sf, Decl(protectedMembers.ts, 6, 5))
@@ -123,18 +123,18 @@ C1.sf();
 // All of these should be errors
 c2.x;
 >c2.x : Symbol(C1.x, Decl(protectedMembers.ts, 1, 10))
->c2 : Symbol(c2, Decl(protectedMembers.ts, 35, 3))
+>c2 : Symbol(c2, Decl(protectedMembers.ts, 35, 11))
 >x : Symbol(C1.x, Decl(protectedMembers.ts, 1, 10))
 
 c2.f();
 >c2.f : Symbol(C2.f, Decl(protectedMembers.ts, 13, 21))
->c2 : Symbol(c2, Decl(protectedMembers.ts, 35, 3))
+>c2 : Symbol(c2, Decl(protectedMembers.ts, 35, 11))
 >f : Symbol(C2.f, Decl(protectedMembers.ts, 13, 21))
 
 C2.sx;
->C2.sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 24))
+>C2.sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 25))
 >C2 : Symbol(C2, Decl(protectedMembers.ts, 10, 1))
->sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 24))
+>sx : Symbol(C1.sx, Decl(protectedMembers.ts, 2, 25))
 
 C2.sf();
 >C2.sf : Symbol(C2.sf, Decl(protectedMembers.ts, 16, 5))
@@ -144,18 +144,18 @@ C2.sf();
 // All of these should be ok
 c3.x;
 >c3.x : Symbol(C3.x, Decl(protectedMembers.ts, 23, 21))
->c3 : Symbol(c3, Decl(protectedMembers.ts, 36, 3))
+>c3 : Symbol(c3, Decl(protectedMembers.ts, 36, 11))
 >x : Symbol(C3.x, Decl(protectedMembers.ts, 23, 21))
 
 c3.f();
->c3.f : Symbol(C3.f, Decl(protectedMembers.ts, 25, 22))
->c3 : Symbol(c3, Decl(protectedMembers.ts, 36, 3))
->f : Symbol(C3.f, Decl(protectedMembers.ts, 25, 22))
+>c3.f : Symbol(C3.f, Decl(protectedMembers.ts, 25, 21))
+>c3 : Symbol(c3, Decl(protectedMembers.ts, 36, 11))
+>f : Symbol(C3.f, Decl(protectedMembers.ts, 25, 21))
 
 C3.sx;
->C3.sx : Symbol(C3.sx, Decl(protectedMembers.ts, 24, 14))
+>C3.sx : Symbol(C3.sx, Decl(protectedMembers.ts, 24, 15))
 >C3 : Symbol(C3, Decl(protectedMembers.ts, 20, 1))
->sx : Symbol(C3.sx, Decl(protectedMembers.ts, 24, 14))
+>sx : Symbol(C3.sx, Decl(protectedMembers.ts, 24, 15))
 
 C3.sf();
 >C3.sf : Symbol(C3.sf, Decl(protectedMembers.ts, 28, 5))
@@ -259,21 +259,21 @@ class B1 {
     x;
 >x : Symbol(B1.x, Decl(protectedMembers.ts, 91, 10))
 }
-var a1: A1;
->a1 : Symbol(a1, Decl(protectedMembers.ts, 94, 3))
+declare var a1: A1;
+>a1 : Symbol(a1, Decl(protectedMembers.ts, 94, 11))
 >A1 : Symbol(A1, Decl(protectedMembers.ts, 86, 1))
 
-var b1: B1;
->b1 : Symbol(b1, Decl(protectedMembers.ts, 95, 3))
+declare var b1: B1;
+>b1 : Symbol(b1, Decl(protectedMembers.ts, 95, 11))
 >B1 : Symbol(B1, Decl(protectedMembers.ts, 90, 1))
 
 a1 = b1;  // Error, B1 doesn't derive from A1
->a1 : Symbol(a1, Decl(protectedMembers.ts, 94, 3))
->b1 : Symbol(b1, Decl(protectedMembers.ts, 95, 3))
+>a1 : Symbol(a1, Decl(protectedMembers.ts, 94, 11))
+>b1 : Symbol(b1, Decl(protectedMembers.ts, 95, 11))
 
 b1 = a1;  // Error, x is protected in A1 but public in B1
->b1 : Symbol(b1, Decl(protectedMembers.ts, 95, 3))
->a1 : Symbol(a1, Decl(protectedMembers.ts, 94, 3))
+>b1 : Symbol(b1, Decl(protectedMembers.ts, 95, 11))
+>a1 : Symbol(a1, Decl(protectedMembers.ts, 94, 11))
 
 class A2 {
 >A2 : Symbol(A2, Decl(protectedMembers.ts, 97, 8))
diff --git a/tests/baselines/reference/protectedMembers.types b/tests/baselines/reference/protectedMembers.types
index 371782c0d2c1a..7732d79875641 100644
--- a/tests/baselines/reference/protectedMembers.types
+++ b/tests/baselines/reference/protectedMembers.types
@@ -6,7 +6,7 @@ class C1 {
 >C1 : C1
 >   : ^^
 
-    protected x: number;
+    protected x!: number;
 >x : number
 >  : ^^^^^^
 
@@ -100,11 +100,11 @@ class C3 extends C2 {
 >C2 : C2
 >   : ^^
 
-    x: number;
+    x!: number;
 >x : number
 >  : ^^^^^^
 
-    static sx: number;
+    static sx: number
 >sx : number
 >   : ^^^^^^
 
@@ -138,15 +138,15 @@ class C3 extends C2 {
     }
 }
 
-var c1: C1;
+declare var c1: C1;
 >c1 : C1
 >   : ^^
 
-var c2: C2;
+declare var c2: C2;
 >c2 : C2
 >   : ^^
 
-var c3: C3;
+declare var c3: C3;
 >c3 : C3
 >   : ^^
 
@@ -408,11 +408,11 @@ class B1 {
 >x : any
 >  : ^^^
 }
-var a1: A1;
+declare var a1: A1;
 >a1 : A1
 >   : ^^
 
-var b1: B1;
+declare var b1: B1;
 >b1 : B1
 >   : ^^
 
diff --git a/tests/baselines/reference/prototypePropertyAssignmentMergeAcrossFiles2.errors.txt b/tests/baselines/reference/prototypePropertyAssignmentMergeAcrossFiles2.errors.txt
index 6a32b80aa3585..066cb84549db8 100644
--- a/tests/baselines/reference/prototypePropertyAssignmentMergeAcrossFiles2.errors.txt
+++ b/tests/baselines/reference/prototypePropertyAssignmentMergeAcrossFiles2.errors.txt
@@ -17,14 +17,14 @@ other.js(10,5): error TS2339: Property 'wat' does not exist on type 'Two'.
     /**
      * @type {Ns.One}
      */
-    var one;
+    var one = undefined;
     one.wat;
         ~~~
 !!! error TS2339: Property 'wat' does not exist on type 'One'.
     /**
      * @type {Ns.Two}
      */
-    var two;
+    var two = undefined;
     two.wat;
         ~~~
 !!! error TS2339: Property 'wat' does not exist on type 'Two'.
diff --git a/tests/baselines/reference/prototypePropertyAssignmentMergeAcrossFiles2.symbols b/tests/baselines/reference/prototypePropertyAssignmentMergeAcrossFiles2.symbols
index 9e7f500e97b5b..85767b6fb44b7 100644
--- a/tests/baselines/reference/prototypePropertyAssignmentMergeAcrossFiles2.symbols
+++ b/tests/baselines/reference/prototypePropertyAssignmentMergeAcrossFiles2.symbols
@@ -37,8 +37,9 @@ Ns.Two.prototype = {
 /**
  * @type {Ns.One}
  */
-var one;
+var one = undefined;
 >one : Symbol(one, Decl(other.js, 3, 3))
+>undefined : Symbol(undefined)
 
 one.wat;
 >one : Symbol(one, Decl(other.js, 3, 3))
@@ -46,8 +47,9 @@ one.wat;
 /**
  * @type {Ns.Two}
  */
-var two;
+var two = undefined;
 >two : Symbol(two, Decl(other.js, 8, 3))
+>undefined : Symbol(undefined)
 
 two.wat;
 >two : Symbol(two, Decl(other.js, 8, 3))
diff --git a/tests/baselines/reference/prototypePropertyAssignmentMergeAcrossFiles2.types b/tests/baselines/reference/prototypePropertyAssignmentMergeAcrossFiles2.types
index f4ec12eab9efb..20cb59511f378 100644
--- a/tests/baselines/reference/prototypePropertyAssignmentMergeAcrossFiles2.types
+++ b/tests/baselines/reference/prototypePropertyAssignmentMergeAcrossFiles2.types
@@ -73,9 +73,11 @@ Ns.Two.prototype = {
 /**
  * @type {Ns.One}
  */
-var one;
+var one = undefined;
 >one : One
 >    : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
 one.wat;
 >one.wat : any
@@ -88,9 +90,11 @@ one.wat;
 /**
  * @type {Ns.Two}
  */
-var two;
+var two = undefined;
 >two : Two
 >    : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
 two.wat;
 >two.wat : any
diff --git a/tests/baselines/reference/qualify.errors.txt b/tests/baselines/reference/qualify.errors.txt
index d3ab0a3258308..07eb3813f2181 100644
--- a/tests/baselines/reference/qualify.errors.txt
+++ b/tests/baselines/reference/qualify.errors.txt
@@ -58,7 +58,7 @@ qualify.ts(58,5): error TS2741: Property 'p' is missing in type 'I' but required
             export interface I4 {
                 z;
             }
-            var v1:I4;
+            var v1:I4 = undefined as any;
             var v2:K1.I3=v1;
                 ~~
 !!! error TS2741: Property 'zeep' is missing in type 'I4' but required in type 'I3'.
@@ -85,7 +85,7 @@ qualify.ts(58,5): error TS2741: Property 'p' is missing in type 'I' but required
         k;
     }
     
-    var y:I;
+    var y:I = undefined as any;
     var x:T.I=y;
         ~
 !!! error TS2741: Property 'p' is missing in type 'I' but required in type 'T.I'.
diff --git a/tests/baselines/reference/qualify.js b/tests/baselines/reference/qualify.js
index 8b9c2249b1f13..ac4d781b88f43 100644
--- a/tests/baselines/reference/qualify.js
+++ b/tests/baselines/reference/qualify.js
@@ -44,7 +44,7 @@ namespace Everest {
         export interface I4 {
             z;
         }
-        var v1:I4;
+        var v1:I4 = undefined as any;
         var v2:K1.I3=v1;
         var v3:K1.I3[]=v1;
         var v4:()=>K1.I3=v1;
@@ -57,7 +57,7 @@ interface I {
     k;
 }
 
-var y:I;
+var y:I = undefined as any;
 var x:T.I=y;
 
 
@@ -96,7 +96,7 @@ var Everest;
 (function (Everest) {
     var K2;
     (function (K2) {
-        var v1;
+        var v1 = undefined;
         var v2 = v1;
         var v3 = v1;
         var v4 = v1;
@@ -104,5 +104,5 @@ var Everest;
         var v6 = v1;
     })(K2 = Everest.K2 || (Everest.K2 = {}));
 })(Everest || (Everest = {}));
-var y;
+var y = undefined;
 var x = y;
diff --git a/tests/baselines/reference/qualify.symbols b/tests/baselines/reference/qualify.symbols
index 078425a3152d4..181d9d9af9539 100644
--- a/tests/baselines/reference/qualify.symbols
+++ b/tests/baselines/reference/qualify.symbols
@@ -94,9 +94,10 @@ namespace Everest {
             z;
 >z : Symbol(I4.z, Decl(qualify.ts, 40, 29))
         }
-        var v1:I4;
+        var v1:I4 = undefined as any;
 >v1 : Symbol(v1, Decl(qualify.ts, 43, 11))
 >I4 : Symbol(I4, Decl(qualify.ts, 39, 25))
+>undefined : Symbol(undefined)
 
         var v2:K1.I3=v1;
 >v2 : Symbol(v2, Decl(qualify.ts, 44, 11))
@@ -139,9 +140,10 @@ interface I {
 >k : Symbol(I.k, Decl(qualify.ts, 52, 13))
 }
 
-var y:I;
+var y:I = undefined as any;
 >y : Symbol(y, Decl(qualify.ts, 56, 3))
 >I : Symbol(I, Decl(qualify.ts, 50, 1))
+>undefined : Symbol(undefined)
 
 var x:T.I=y;
 >x : Symbol(x, Decl(qualify.ts, 57, 3))
diff --git a/tests/baselines/reference/qualify.types b/tests/baselines/reference/qualify.types
index 4e4198308e632..6ea8ae639994c 100644
--- a/tests/baselines/reference/qualify.types
+++ b/tests/baselines/reference/qualify.types
@@ -117,9 +117,13 @@ namespace Everest {
 >z : any
 >  : ^^^
         }
-        var v1:I4;
+        var v1:I4 = undefined as any;
 >v1 : I4
 >   : ^^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
         var v2:K1.I3=v1;
 >v2 : K1.I3
@@ -173,9 +177,13 @@ interface I {
 >  : ^^^
 }
 
-var y:I;
+var y:I = undefined as any;
 >y : I
 >  : ^
+>undefined as any : any
+>                 : ^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
 var x:T.I=y;
 >x : T.I
diff --git a/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js b/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js
index 512cfe440f660..20bc1ce09f44c 100644
--- a/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js
+++ b/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js
@@ -72,7 +72,7 @@ const Test5 = () => <FieldFeedback2 />;
 
 //// [reactDefaultPropsInferenceSuccess.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/reactHOCSpreadprops.js b/tests/baselines/reference/reactHOCSpreadprops.js
index 7e367e95205c2..b0e0236013e47 100644
--- a/tests/baselines/reference/reactHOCSpreadprops.js
+++ b/tests/baselines/reference/reactHOCSpreadprops.js
@@ -41,7 +41,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var React = require("react");
 function f(App) {
     var C = /** @class */ (function (_super) {
diff --git a/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js b/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
index 1263b13d2bdf7..020ad83b5e2bb 100644
--- a/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
+++ b/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
@@ -74,7 +74,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var React = __importStar(require("react"));
 function myHigherOrderComponent(Inner) {
     return /** @class */ (function (_super) {
diff --git a/tests/baselines/reference/reactSFCAndFunctionResolvable.js b/tests/baselines/reference/reactSFCAndFunctionResolvable.js
index f94bcb741c506..3b52968e6ed2e 100644
--- a/tests/baselines/reference/reactSFCAndFunctionResolvable.js
+++ b/tests/baselines/reference/reactSFCAndFunctionResolvable.js
@@ -29,7 +29,7 @@ const RandomComponent: React.SFC = () => {
 
 //// [reactSFCAndFunctionResolvable.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
diff --git a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.js b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.js
index 2a4d1956ef323..ef3bbc535082c 100644
--- a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.js
+++ b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.js
@@ -15,7 +15,7 @@ const children: any[] = [];
 
 //// [reactTagNameComponentWithPropsNoOOM.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
diff --git a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js
index 02ed32721483c..b2cec05cc687b 100644
--- a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js
+++ b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js
@@ -15,7 +15,7 @@ const children: any[] = [];
 
 //// [reactTagNameComponentWithPropsNoOOM2.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
diff --git a/tests/baselines/reference/readonlyMembers.errors.txt b/tests/baselines/reference/readonlyMembers.errors.txt
index c3ac0ac353e01..4d1793bda4fd2 100644
--- a/tests/baselines/reference/readonlyMembers.errors.txt
+++ b/tests/baselines/reference/readonlyMembers.errors.txt
@@ -108,13 +108,13 @@ readonlyMembers.ts(69,1): error TS2542: Index signature in type '{ readonly [x:
     N.b = 1;
     N.c = 1;
     
-    let xx: { readonly [x: string]: string };
+    declare let xx: { readonly [x: string]: string };
     let s = xx["foo"];
     xx["foo"] = "abc";  // Error
     ~~~~~~~~~
 !!! error TS2542: Index signature in type '{ readonly [x: string]: string; }' only permits reading.
     
-    let yy: { readonly [x: number]: string, [x: string]: string };
+    declare let yy: { readonly [x: number]: string, [x: string]: string };
     yy[1] = "abc";  // Error
     ~~~~~
 !!! error TS2542: Index signature in type '{ readonly [x: number]: string; [x: string]: string; }' only permits reading.
diff --git a/tests/baselines/reference/readonlyMembers.js b/tests/baselines/reference/readonlyMembers.js
index d17cc430b7e35..230e235925b44 100644
--- a/tests/baselines/reference/readonlyMembers.js
+++ b/tests/baselines/reference/readonlyMembers.js
@@ -64,11 +64,11 @@ N.a = 1;  // Error
 N.b = 1;
 N.c = 1;
 
-let xx: { readonly [x: string]: string };
+declare let xx: { readonly [x: string]: string };
 let s = xx["foo"];
 xx["foo"] = "abc";  // Error
 
-let yy: { readonly [x: number]: string, [x: string]: string };
+declare let yy: { readonly [x: number]: string, [x: string]: string };
 yy[1] = "abc";  // Error
 yy["foo"] = "abc";
 
@@ -135,9 +135,7 @@ var N;
 N.a = 1; // Error
 N.b = 1;
 N.c = 1;
-var xx;
 var s = xx["foo"];
 xx["foo"] = "abc"; // Error
-var yy;
 yy[1] = "abc"; // Error
 yy["foo"] = "abc";
diff --git a/tests/baselines/reference/readonlyMembers.symbols b/tests/baselines/reference/readonlyMembers.symbols
index a7e051096527e..1b44f766817d1 100644
--- a/tests/baselines/reference/readonlyMembers.symbols
+++ b/tests/baselines/reference/readonlyMembers.symbols
@@ -207,25 +207,25 @@ N.c = 1;
 >N : Symbol(N, Decl(readonlyMembers.ts, 52, 8))
 >c : Symbol(N.c, Decl(readonlyMembers.ts, 57, 14))
 
-let xx: { readonly [x: string]: string };
->xx : Symbol(xx, Decl(readonlyMembers.ts, 63, 3))
->x : Symbol(x, Decl(readonlyMembers.ts, 63, 20))
+declare let xx: { readonly [x: string]: string };
+>xx : Symbol(xx, Decl(readonlyMembers.ts, 63, 11))
+>x : Symbol(x, Decl(readonlyMembers.ts, 63, 28))
 
 let s = xx["foo"];
 >s : Symbol(s, Decl(readonlyMembers.ts, 64, 3))
->xx : Symbol(xx, Decl(readonlyMembers.ts, 63, 3))
+>xx : Symbol(xx, Decl(readonlyMembers.ts, 63, 11))
 
 xx["foo"] = "abc";  // Error
->xx : Symbol(xx, Decl(readonlyMembers.ts, 63, 3))
+>xx : Symbol(xx, Decl(readonlyMembers.ts, 63, 11))
 
-let yy: { readonly [x: number]: string, [x: string]: string };
->yy : Symbol(yy, Decl(readonlyMembers.ts, 67, 3))
->x : Symbol(x, Decl(readonlyMembers.ts, 67, 20))
->x : Symbol(x, Decl(readonlyMembers.ts, 67, 41))
+declare let yy: { readonly [x: number]: string, [x: string]: string };
+>yy : Symbol(yy, Decl(readonlyMembers.ts, 67, 11))
+>x : Symbol(x, Decl(readonlyMembers.ts, 67, 28))
+>x : Symbol(x, Decl(readonlyMembers.ts, 67, 49))
 
 yy[1] = "abc";  // Error
->yy : Symbol(yy, Decl(readonlyMembers.ts, 67, 3))
+>yy : Symbol(yy, Decl(readonlyMembers.ts, 67, 11))
 
 yy["foo"] = "abc";
->yy : Symbol(yy, Decl(readonlyMembers.ts, 67, 3))
+>yy : Symbol(yy, Decl(readonlyMembers.ts, 67, 11))
 
diff --git a/tests/baselines/reference/readonlyMembers.types b/tests/baselines/reference/readonlyMembers.types
index 852ed3e69251c..de4e18aa81f4b 100644
--- a/tests/baselines/reference/readonlyMembers.types
+++ b/tests/baselines/reference/readonlyMembers.types
@@ -439,7 +439,7 @@ N.c = 1;
 >1 : 1
 >  : ^
 
-let xx: { readonly [x: string]: string };
+declare let xx: { readonly [x: string]: string };
 >xx : { readonly [x: string]: string; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : string
@@ -467,7 +467,7 @@ xx["foo"] = "abc";  // Error
 >"abc" : "abc"
 >      : ^^^^^
 
-let yy: { readonly [x: number]: string, [x: string]: string };
+declare let yy: { readonly [x: number]: string, [x: string]: string };
 >yy : { readonly [x: number]: string; [x: string]: string; }
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : number
diff --git a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmdOutFile.errors.txt b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmdOutFile.errors.txt
index 8c407e1b674c1..6eda865ff38ec 100644
--- a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmdOutFile.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmdOutFile.errors.txt
@@ -1,8 +1,10 @@
 error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file1.ts (0 errors) ====
     import * as b from './b.json';
diff --git a/tests/baselines/reference/restElementWithInitializer1.errors.txt b/tests/baselines/reference/restElementWithInitializer1.errors.txt
index 4926f338202da..b26e68e6631c6 100644
--- a/tests/baselines/reference/restElementWithInitializer1.errors.txt
+++ b/tests/baselines/reference/restElementWithInitializer1.errors.txt
@@ -2,7 +2,7 @@ restElementWithInitializer1.ts(2,11): error TS1186: A rest element cannot have a
 
 
 ==== restElementWithInitializer1.ts (1 errors) ====
-    var a: number[];
+    declare var a: number[];
     var [...x = a] = a;  // Error, rest element cannot have initializer
               ~
 !!! error TS1186: A rest element cannot have an initializer.
diff --git a/tests/baselines/reference/restElementWithInitializer1.js b/tests/baselines/reference/restElementWithInitializer1.js
index e93bb91d4616f..90dc3b2a5ae05 100644
--- a/tests/baselines/reference/restElementWithInitializer1.js
+++ b/tests/baselines/reference/restElementWithInitializer1.js
@@ -1,10 +1,9 @@
 //// [tests/cases/conformance/es6/destructuring/restElementWithInitializer1.ts] ////
 
 //// [restElementWithInitializer1.ts]
-var a: number[];
+declare var a: number[];
 var [...x = a] = a;  // Error, rest element cannot have initializer
 
 
 //// [restElementWithInitializer1.js]
-var a;
 var _a = a.slice(0), x = _a === void 0 ? a : _a; // Error, rest element cannot have initializer
diff --git a/tests/baselines/reference/restElementWithInitializer1.symbols b/tests/baselines/reference/restElementWithInitializer1.symbols
index de186d89e1847..ddca98823cd11 100644
--- a/tests/baselines/reference/restElementWithInitializer1.symbols
+++ b/tests/baselines/reference/restElementWithInitializer1.symbols
@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/es6/destructuring/restElementWithInitializer1.ts] ////
 
 === restElementWithInitializer1.ts ===
-var a: number[];
->a : Symbol(a, Decl(restElementWithInitializer1.ts, 0, 3))
+declare var a: number[];
+>a : Symbol(a, Decl(restElementWithInitializer1.ts, 0, 11))
 
 var [...x = a] = a;  // Error, rest element cannot have initializer
 >x : Symbol(x, Decl(restElementWithInitializer1.ts, 1, 5))
->a : Symbol(a, Decl(restElementWithInitializer1.ts, 0, 3))
->a : Symbol(a, Decl(restElementWithInitializer1.ts, 0, 3))
+>a : Symbol(a, Decl(restElementWithInitializer1.ts, 0, 11))
+>a : Symbol(a, Decl(restElementWithInitializer1.ts, 0, 11))
 
diff --git a/tests/baselines/reference/restElementWithInitializer1.types b/tests/baselines/reference/restElementWithInitializer1.types
index 91818a4f926da..c0581528c7d18 100644
--- a/tests/baselines/reference/restElementWithInitializer1.types
+++ b/tests/baselines/reference/restElementWithInitializer1.types
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/es6/destructuring/restElementWithInitializer1.ts] ////
 
 === restElementWithInitializer1.ts ===
-var a: number[];
+declare var a: number[];
 >a : number[]
 >  : ^^^^^^^^
 
diff --git a/tests/baselines/reference/restElementWithInitializer2.errors.txt b/tests/baselines/reference/restElementWithInitializer2.errors.txt
index 83fbdea3dcb7e..ccd69cd7e1307 100644
--- a/tests/baselines/reference/restElementWithInitializer2.errors.txt
+++ b/tests/baselines/reference/restElementWithInitializer2.errors.txt
@@ -2,7 +2,7 @@ restElementWithInitializer2.ts(3,7): error TS1186: A rest element cannot have an
 
 
 ==== restElementWithInitializer2.ts (1 errors) ====
-    var a: number[];
+    declare var a: number[];
     var x: number[];
     [...x = a] = a;  // Error, rest element cannot have initializer
           ~
diff --git a/tests/baselines/reference/restElementWithInitializer2.js b/tests/baselines/reference/restElementWithInitializer2.js
index 08c74a201e493..04fdd63627d70 100644
--- a/tests/baselines/reference/restElementWithInitializer2.js
+++ b/tests/baselines/reference/restElementWithInitializer2.js
@@ -1,13 +1,12 @@
 //// [tests/cases/conformance/es6/destructuring/restElementWithInitializer2.ts] ////
 
 //// [restElementWithInitializer2.ts]
-var a: number[];
+declare var a: number[];
 var x: number[];
 [...x = a] = a;  // Error, rest element cannot have initializer
 
 
 //// [restElementWithInitializer2.js]
 var _a;
-var a;
 var x;
 _a = a.slice(0), x = _a === void 0 ? a : _a; // Error, rest element cannot have initializer
diff --git a/tests/baselines/reference/restElementWithInitializer2.symbols b/tests/baselines/reference/restElementWithInitializer2.symbols
index 45d4875ba3277..91a8bf2ed6ffb 100644
--- a/tests/baselines/reference/restElementWithInitializer2.symbols
+++ b/tests/baselines/reference/restElementWithInitializer2.symbols
@@ -1,14 +1,14 @@
 //// [tests/cases/conformance/es6/destructuring/restElementWithInitializer2.ts] ////
 
 === restElementWithInitializer2.ts ===
-var a: number[];
->a : Symbol(a, Decl(restElementWithInitializer2.ts, 0, 3))
+declare var a: number[];
+>a : Symbol(a, Decl(restElementWithInitializer2.ts, 0, 11))
 
 var x: number[];
 >x : Symbol(x, Decl(restElementWithInitializer2.ts, 1, 3))
 
 [...x = a] = a;  // Error, rest element cannot have initializer
 >x : Symbol(x, Decl(restElementWithInitializer2.ts, 1, 3))
->a : Symbol(a, Decl(restElementWithInitializer2.ts, 0, 3))
->a : Symbol(a, Decl(restElementWithInitializer2.ts, 0, 3))
+>a : Symbol(a, Decl(restElementWithInitializer2.ts, 0, 11))
+>a : Symbol(a, Decl(restElementWithInitializer2.ts, 0, 11))
 
diff --git a/tests/baselines/reference/restElementWithInitializer2.types b/tests/baselines/reference/restElementWithInitializer2.types
index d1aa46984e472..20637a40da56b 100644
--- a/tests/baselines/reference/restElementWithInitializer2.types
+++ b/tests/baselines/reference/restElementWithInitializer2.types
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/es6/destructuring/restElementWithInitializer2.ts] ////
 
 === restElementWithInitializer2.ts ===
-var a: number[];
+declare var a: number[];
 >a : number[]
 >  : ^^^^^^^^
 
diff --git a/tests/baselines/reference/restInvalidArgumentType.errors.txt b/tests/baselines/reference/restInvalidArgumentType.errors.txt
index 9f6f76fcffc8a..ca70ceb7ebb50 100644
--- a/tests/baselines/reference/restInvalidArgumentType.errors.txt
+++ b/tests/baselines/reference/restInvalidArgumentType.errors.txt
@@ -15,28 +15,28 @@ restInvalidArgumentType.ts(53,13): error TS2700: Rest types may only be created
     enum E { v1, v2 };
     
     function f<T extends { b: string }>(p1: T, p2: T[]) {
-        var t: T;
+        var t!: T;
     
-        var i: T["b"];
-        var k: keyof T;
+        var i!: T["b"];
+        var k!: keyof T;
     
-        var mapped_generic: {[P in keyof T]: T[P]};
-        var mapped: {[P in "b"]: T[P]};
+        var mapped_generic!: {[P in keyof T]: T[P]};
+        var mapped!: {[P in "b"]: T[P]};
     
-        var union_generic: T | { a: number };
-        var union_primitive: { a: number } | number;
-        var intersection_generic: T & { a: number };
-        var intersection_primitive: { a: number } & string;
-        var num: number;
-        var str: string;
-        var literal_string: "string";
-        var literal_number: 42;
+        var union_generic!: T | { a: number };
+        var union_primitive!: { a: number } | number;
+        var intersection_generic!: T & { a: number };
+        var intersection_primitive!: { a: number } & string;
+        var num!: number;
+        var str!: string;
+        var literal_string: "string" = "string";
+        var literal_number: 42 = 42;
         var e: E;
     
-        var u: undefined;
-        var n: null;
+        var u: undefined = undefined;
+        var n: null = null;
     
-        var a: any;
+        var a: any = 0;
     
         var {...r1} = p1;   // Error, generic type paramterre
         var {...r2} = p2;   // OK
diff --git a/tests/baselines/reference/restInvalidArgumentType.js b/tests/baselines/reference/restInvalidArgumentType.js
index 2254315815fe3..c8ec563936439 100644
--- a/tests/baselines/reference/restInvalidArgumentType.js
+++ b/tests/baselines/reference/restInvalidArgumentType.js
@@ -4,28 +4,28 @@
 enum E { v1, v2 };
 
 function f<T extends { b: string }>(p1: T, p2: T[]) {
-    var t: T;
+    var t!: T;
 
-    var i: T["b"];
-    var k: keyof T;
+    var i!: T["b"];
+    var k!: keyof T;
 
-    var mapped_generic: {[P in keyof T]: T[P]};
-    var mapped: {[P in "b"]: T[P]};
+    var mapped_generic!: {[P in keyof T]: T[P]};
+    var mapped!: {[P in "b"]: T[P]};
 
-    var union_generic: T | { a: number };
-    var union_primitive: { a: number } | number;
-    var intersection_generic: T & { a: number };
-    var intersection_primitive: { a: number } & string;
-    var num: number;
-    var str: string;
-    var literal_string: "string";
-    var literal_number: 42;
+    var union_generic!: T | { a: number };
+    var union_primitive!: { a: number } | number;
+    var intersection_generic!: T & { a: number };
+    var intersection_primitive!: { a: number } & string;
+    var num!: number;
+    var str!: string;
+    var literal_string: "string" = "string";
+    var literal_number: 42 = 42;
     var e: E;
 
-    var u: undefined;
-    var n: null;
+    var u: undefined = undefined;
+    var n: null = null;
 
-    var a: any;
+    var a: any = 0;
 
     var {...r1} = p1;   // Error, generic type paramterre
     var {...r2} = p2;   // OK
@@ -87,12 +87,12 @@ function f(p1, p2) {
     var intersection_primitive;
     var num;
     var str;
-    var literal_string;
-    var literal_number;
+    var literal_string = "string";
+    var literal_number = 42;
     var e;
-    var u;
-    var n;
-    var a;
+    var u = undefined;
+    var n = null;
+    var a = 0;
     var r1 = __rest(p1, []); // Error, generic type paramterre
     var r2 = __rest(p2, []); // OK
     var r3 = __rest(t, []); // Error, generic type paramter
diff --git a/tests/baselines/reference/restInvalidArgumentType.symbols b/tests/baselines/reference/restInvalidArgumentType.symbols
index 2bcc58e42db58..30087943effbe 100644
--- a/tests/baselines/reference/restInvalidArgumentType.symbols
+++ b/tests/baselines/reference/restInvalidArgumentType.symbols
@@ -15,72 +15,73 @@ function f<T extends { b: string }>(p1: T, p2: T[]) {
 >p2 : Symbol(p2, Decl(restInvalidArgumentType.ts, 2, 42))
 >T : Symbol(T, Decl(restInvalidArgumentType.ts, 2, 11))
 
-    var t: T;
+    var t!: T;
 >t : Symbol(t, Decl(restInvalidArgumentType.ts, 3, 7))
 >T : Symbol(T, Decl(restInvalidArgumentType.ts, 2, 11))
 
-    var i: T["b"];
+    var i!: T["b"];
 >i : Symbol(i, Decl(restInvalidArgumentType.ts, 5, 7))
 >T : Symbol(T, Decl(restInvalidArgumentType.ts, 2, 11))
 
-    var k: keyof T;
+    var k!: keyof T;
 >k : Symbol(k, Decl(restInvalidArgumentType.ts, 6, 7))
 >T : Symbol(T, Decl(restInvalidArgumentType.ts, 2, 11))
 
-    var mapped_generic: {[P in keyof T]: T[P]};
+    var mapped_generic!: {[P in keyof T]: T[P]};
 >mapped_generic : Symbol(mapped_generic, Decl(restInvalidArgumentType.ts, 8, 7))
->P : Symbol(P, Decl(restInvalidArgumentType.ts, 8, 26))
+>P : Symbol(P, Decl(restInvalidArgumentType.ts, 8, 27))
 >T : Symbol(T, Decl(restInvalidArgumentType.ts, 2, 11))
 >T : Symbol(T, Decl(restInvalidArgumentType.ts, 2, 11))
->P : Symbol(P, Decl(restInvalidArgumentType.ts, 8, 26))
+>P : Symbol(P, Decl(restInvalidArgumentType.ts, 8, 27))
 
-    var mapped: {[P in "b"]: T[P]};
+    var mapped!: {[P in "b"]: T[P]};
 >mapped : Symbol(mapped, Decl(restInvalidArgumentType.ts, 9, 7))
->P : Symbol(P, Decl(restInvalidArgumentType.ts, 9, 18))
+>P : Symbol(P, Decl(restInvalidArgumentType.ts, 9, 19))
 >T : Symbol(T, Decl(restInvalidArgumentType.ts, 2, 11))
->P : Symbol(P, Decl(restInvalidArgumentType.ts, 9, 18))
+>P : Symbol(P, Decl(restInvalidArgumentType.ts, 9, 19))
 
-    var union_generic: T | { a: number };
+    var union_generic!: T | { a: number };
 >union_generic : Symbol(union_generic, Decl(restInvalidArgumentType.ts, 11, 7))
 >T : Symbol(T, Decl(restInvalidArgumentType.ts, 2, 11))
->a : Symbol(a, Decl(restInvalidArgumentType.ts, 11, 28))
+>a : Symbol(a, Decl(restInvalidArgumentType.ts, 11, 29))
 
-    var union_primitive: { a: number } | number;
+    var union_primitive!: { a: number } | number;
 >union_primitive : Symbol(union_primitive, Decl(restInvalidArgumentType.ts, 12, 7))
->a : Symbol(a, Decl(restInvalidArgumentType.ts, 12, 26))
+>a : Symbol(a, Decl(restInvalidArgumentType.ts, 12, 27))
 
-    var intersection_generic: T & { a: number };
+    var intersection_generic!: T & { a: number };
 >intersection_generic : Symbol(intersection_generic, Decl(restInvalidArgumentType.ts, 13, 7))
 >T : Symbol(T, Decl(restInvalidArgumentType.ts, 2, 11))
->a : Symbol(a, Decl(restInvalidArgumentType.ts, 13, 35))
+>a : Symbol(a, Decl(restInvalidArgumentType.ts, 13, 36))
 
-    var intersection_primitive: { a: number } & string;
+    var intersection_primitive!: { a: number } & string;
 >intersection_primitive : Symbol(intersection_primitive, Decl(restInvalidArgumentType.ts, 14, 7))
->a : Symbol(a, Decl(restInvalidArgumentType.ts, 14, 33))
+>a : Symbol(a, Decl(restInvalidArgumentType.ts, 14, 34))
 
-    var num: number;
+    var num!: number;
 >num : Symbol(num, Decl(restInvalidArgumentType.ts, 15, 7))
 
-    var str: string;
+    var str!: string;
 >str : Symbol(str, Decl(restInvalidArgumentType.ts, 16, 7))
 
-    var literal_string: "string";
+    var literal_string: "string" = "string";
 >literal_string : Symbol(literal_string, Decl(restInvalidArgumentType.ts, 17, 7))
 
-    var literal_number: 42;
+    var literal_number: 42 = 42;
 >literal_number : Symbol(literal_number, Decl(restInvalidArgumentType.ts, 18, 7))
 
     var e: E;
 >e : Symbol(e, Decl(restInvalidArgumentType.ts, 19, 7))
 >E : Symbol(E, Decl(restInvalidArgumentType.ts, 0, 0))
 
-    var u: undefined;
+    var u: undefined = undefined;
 >u : Symbol(u, Decl(restInvalidArgumentType.ts, 21, 7))
+>undefined : Symbol(undefined)
 
-    var n: null;
+    var n: null = null;
 >n : Symbol(n, Decl(restInvalidArgumentType.ts, 22, 7))
 
-    var a: any;
+    var a: any = 0;
 >a : Symbol(a, Decl(restInvalidArgumentType.ts, 24, 7))
 
     var {...r1} = p1;   // Error, generic type paramterre
diff --git a/tests/baselines/reference/restInvalidArgumentType.types b/tests/baselines/reference/restInvalidArgumentType.types
index 74c23b3e0f1d5..c0d89447670a7 100644
--- a/tests/baselines/reference/restInvalidArgumentType.types
+++ b/tests/baselines/reference/restInvalidArgumentType.types
@@ -19,81 +19,89 @@ function f<T extends { b: string }>(p1: T, p2: T[]) {
 >p2 : T[]
 >   : ^^^
 
-    var t: T;
+    var t!: T;
 >t : T
 >  : ^
 
-    var i: T["b"];
+    var i!: T["b"];
 >i : T["b"]
 >  : ^^^^^^
 
-    var k: keyof T;
+    var k!: keyof T;
 >k : keyof T
 >  : ^^^^^^^
 
-    var mapped_generic: {[P in keyof T]: T[P]};
+    var mapped_generic!: {[P in keyof T]: T[P]};
 >mapped_generic : { [P in keyof T]: T[P]; }
 >               : ^^^ ^^^^^^^^^^^^^^^^^^^^^
 
-    var mapped: {[P in "b"]: T[P]};
+    var mapped!: {[P in "b"]: T[P]};
 >mapped : { b: T["b"]; }
 >       : ^^^^^^^^^^^^^^
 
-    var union_generic: T | { a: number };
+    var union_generic!: T | { a: number };
 >union_generic : T | { a: number; }
 >              : ^^^^^^^^^      ^^^
 >a : number
 >  : ^^^^^^
 
-    var union_primitive: { a: number } | number;
+    var union_primitive!: { a: number } | number;
 >union_primitive : number | { a: number; }
 >                : ^^^^^^^^^^^^^^      ^^^
 >a : number
 >  : ^^^^^^
 
-    var intersection_generic: T & { a: number };
+    var intersection_generic!: T & { a: number };
 >intersection_generic : T & { a: number; }
 >                     : ^^^^^^^^^      ^^^
 >a : number
 >  : ^^^^^^
 
-    var intersection_primitive: { a: number } & string;
+    var intersection_primitive!: { a: number } & string;
 >intersection_primitive : { a: number; } & string
 >                       : ^^^^^      ^^^^^^^^^^^^
 >a : number
 >  : ^^^^^^
 
-    var num: number;
+    var num!: number;
 >num : number
 >    : ^^^^^^
 
-    var str: string;
+    var str!: string;
 >str : string
 >    : ^^^^^^
 
-    var literal_string: "string";
+    var literal_string: "string" = "string";
 >literal_string : "string"
 >               : ^^^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
-    var literal_number: 42;
+    var literal_number: 42 = 42;
 >literal_number : 42
 >               : ^^
+>42 : 42
+>   : ^^
 
     var e: E;
 >e : E
 >  : ^
 
-    var u: undefined;
+    var u: undefined = undefined;
 >u : undefined
 >  : ^^^^^^^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-    var n: null;
+    var n: null = null;
 >n : null
 >  : ^^^^
 
-    var a: any;
+    var a: any = 0;
 >a : any
 >  : ^^^
+>0 : 0
+>  : ^
 
     var {...r1} = p1;   // Error, generic type paramterre
 >r1 : T
diff --git a/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js b/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
index 2abf6e9510631..913679a2957ee 100644
--- a/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
+++ b/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
@@ -67,7 +67,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var React = __importStar(require("react"));
 var TestComponent = /** @class */ (function (_super) {
     __extends(TestComponent, _super);
diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.errors.txt b/tests/baselines/reference/scopeResolutionIdentifiers.errors.txt
deleted file mode 100644
index eb24d90ea53ed..0000000000000
--- a/tests/baselines/reference/scopeResolutionIdentifiers.errors.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-scopeResolutionIdentifiers.ts(24,14): error TS2729: Property 's' is used before its initialization.
-
-
-==== scopeResolutionIdentifiers.ts (1 errors) ====
-    // EveryType used in a nested scope of a different EveryType with the same name, type of the identifier is the one defined in the inner scope
-    
-    var s: string;
-    namespace M1 {
-        export var s: number;
-        var n = s;
-        var n: number;
-    }
-    
-    namespace M2 {
-        var s: number;
-        var n = s;
-        var n: number;
-    }
-    
-    function fn() {
-        var s: boolean;
-        var n = s;
-        var n: boolean;
-    }
-    
-    class C {
-        s: Date;
-        n = this.s;
-                 ~
-!!! error TS2729: Property 's' is used before its initialization.
-!!! related TS2728 scopeResolutionIdentifiers.ts:23:5: 's' is declared here.
-        x() {
-            var p = this.n;
-            var p: Date;
-        }
-    }
-    
-    namespace M3 {
-        var s: any;
-        namespace M4 {
-            var n = s;
-            var n: any;
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.js b/tests/baselines/reference/scopeResolutionIdentifiers.js
index 477e84ced134f..fff1f3ba20217 100644
--- a/tests/baselines/reference/scopeResolutionIdentifiers.js
+++ b/tests/baselines/reference/scopeResolutionIdentifiers.js
@@ -5,25 +5,25 @@
 
 var s: string;
 namespace M1 {
-    export var s: number;
+    export var s: number = 0;
     var n = s;
     var n: number;
 }
 
 namespace M2 {
-    var s: number;
+    var s: number = 0;
     var n = s;
     var n: number;
 }
 
 function fn() {
-    var s: boolean;
+    var s: boolean = false;
     var n = s;
     var n: boolean;
 }
 
 class C {
-    s: Date;
+    s!: Date;
     n = this.s;
     x() {
         var p = this.n;
@@ -45,17 +45,18 @@ namespace M3 {
 var s;
 var M1;
 (function (M1) {
+    M1.s = 0;
     var n = M1.s;
     var n;
 })(M1 || (M1 = {}));
 var M2;
 (function (M2) {
-    var s;
+    var s = 0;
     var n = s;
     var n;
 })(M2 || (M2 = {}));
 function fn() {
-    var s;
+    var s = false;
     var n = s;
     var n;
 }
diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.symbols b/tests/baselines/reference/scopeResolutionIdentifiers.symbols
index b1f1bd9f52e9c..d534b39cd2236 100644
--- a/tests/baselines/reference/scopeResolutionIdentifiers.symbols
+++ b/tests/baselines/reference/scopeResolutionIdentifiers.symbols
@@ -9,7 +9,7 @@ var s: string;
 namespace M1 {
 >M1 : Symbol(M1, Decl(scopeResolutionIdentifiers.ts, 2, 14))
 
-    export var s: number;
+    export var s: number = 0;
 >s : Symbol(s, Decl(scopeResolutionIdentifiers.ts, 4, 14))
 
     var n = s;
@@ -23,7 +23,7 @@ namespace M1 {
 namespace M2 {
 >M2 : Symbol(M2, Decl(scopeResolutionIdentifiers.ts, 7, 1))
 
-    var s: number;
+    var s: number = 0;
 >s : Symbol(s, Decl(scopeResolutionIdentifiers.ts, 10, 7))
 
     var n = s;
@@ -37,7 +37,7 @@ namespace M2 {
 function fn() {
 >fn : Symbol(fn, Decl(scopeResolutionIdentifiers.ts, 13, 1))
 
-    var s: boolean;
+    var s: boolean = false;
 >s : Symbol(s, Decl(scopeResolutionIdentifiers.ts, 16, 7))
 
     var n = s;
@@ -51,12 +51,12 @@ function fn() {
 class C {
 >C : Symbol(C, Decl(scopeResolutionIdentifiers.ts, 19, 1))
 
-    s: Date;
+    s!: Date;
 >s : Symbol(C.s, Decl(scopeResolutionIdentifiers.ts, 21, 9))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     n = this.s;
->n : Symbol(C.n, Decl(scopeResolutionIdentifiers.ts, 22, 12))
+>n : Symbol(C.n, Decl(scopeResolutionIdentifiers.ts, 22, 13))
 >this.s : Symbol(C.s, Decl(scopeResolutionIdentifiers.ts, 21, 9))
 >this : Symbol(C, Decl(scopeResolutionIdentifiers.ts, 19, 1))
 >s : Symbol(C.s, Decl(scopeResolutionIdentifiers.ts, 21, 9))
@@ -66,9 +66,9 @@ class C {
 
         var p = this.n;
 >p : Symbol(p, Decl(scopeResolutionIdentifiers.ts, 25, 11), Decl(scopeResolutionIdentifiers.ts, 26, 11))
->this.n : Symbol(C.n, Decl(scopeResolutionIdentifiers.ts, 22, 12))
+>this.n : Symbol(C.n, Decl(scopeResolutionIdentifiers.ts, 22, 13))
 >this : Symbol(C, Decl(scopeResolutionIdentifiers.ts, 19, 1))
->n : Symbol(C.n, Decl(scopeResolutionIdentifiers.ts, 22, 12))
+>n : Symbol(C.n, Decl(scopeResolutionIdentifiers.ts, 22, 13))
 
         var p: Date;
 >p : Symbol(p, Decl(scopeResolutionIdentifiers.ts, 25, 11), Decl(scopeResolutionIdentifiers.ts, 26, 11))
diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.types b/tests/baselines/reference/scopeResolutionIdentifiers.types
index 6e147efb1ec8c..3147149caf260 100644
--- a/tests/baselines/reference/scopeResolutionIdentifiers.types
+++ b/tests/baselines/reference/scopeResolutionIdentifiers.types
@@ -11,9 +11,11 @@ namespace M1 {
 >M1 : typeof M1
 >   : ^^^^^^^^^
 
-    export var s: number;
+    export var s: number = 0;
 >s : number
 >  : ^^^^^^
+>0 : 0
+>  : ^
 
     var n = s;
 >n : number
@@ -30,9 +32,11 @@ namespace M2 {
 >M2 : typeof M2
 >   : ^^^^^^^^^
 
-    var s: number;
+    var s: number = 0;
 >s : number
 >  : ^^^^^^
+>0 : 0
+>  : ^
 
     var n = s;
 >n : number
@@ -49,15 +53,17 @@ function fn() {
 >fn : () => void
 >   : ^^^^^^^^^^
 
-    var s: boolean;
+    var s: boolean = false;
 >s : boolean
 >  : ^^^^^^^
+>false : false
+>      : ^^^^^
 
     var n = s;
 >n : boolean
 >  : ^^^^^^^
->s : boolean
->  : ^^^^^^^
+>s : false
+>  : ^^^^^
 
     var n: boolean;
 >n : boolean
@@ -68,7 +74,7 @@ class C {
 >C : C
 >  : ^
 
-    s: Date;
+    s!: Date;
 >s : Date
 >  : ^^^^
 
@@ -108,7 +114,6 @@ namespace M3 {
 
     var s: any;
 >s : any
->  : ^^^
 
     namespace M4 {
 >M4 : typeof M4
@@ -116,13 +121,10 @@ namespace M3 {
 
         var n = s;
 >n : any
->  : ^^^
 >s : any
->  : ^^^
 
         var n: any;
 >n : any
->  : ^^^
     }
 }
 
diff --git a/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.errors.txt b/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.errors.txt
new file mode 100644
index 0000000000000..d130c106d247e
--- /dev/null
+++ b/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.errors.txt
@@ -0,0 +1,20 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== jsDocOptionality.js (0 errors) ====
+    function MyClass() {
+      this.prop = null;
+    }
+    /**
+     * @param  {string} required
+     * @param  {string} [notRequired]
+     * @returns {MyClass}
+     */
+    MyClass.prototype.optionalParam = function(required, notRequired) {
+        return this;
+    };
+    let pInst = new MyClass();
+    let c1 = pInst.optionalParam('hello')
+    let c2 = pInst.optionalParam('hello', null)
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types b/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types
index 1058363a7df61..f3b0d2bdf9d59 100644
--- a/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types
+++ b/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types
@@ -9,6 +9,7 @@ function MyClass() {
 >this.prop = null : null
 >                 : ^^^^
 >this.prop : any
+>          : ^^^
 >this : this
 >     : ^^^^
 >prop : any
@@ -23,6 +24,7 @@ MyClass.prototype.optionalParam = function(required, notRequired) {
 >MyClass.prototype.optionalParam = function(required, notRequired) {    return this;} : (required: string, notRequired?: string) => MyClass
 >                                                                                     : ^        ^^      ^^           ^^^      ^^^^^       
 >MyClass.prototype.optionalParam : any
+>                                : ^^^
 >MyClass.prototype : any
 >                  : ^^^
 >MyClass : typeof MyClass
diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.errors.txt b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.errors.txt
new file mode 100644
index 0000000000000..77593edcc4140
--- /dev/null
+++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.errors.txt
@@ -0,0 +1,14 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== testFiles/app.ts (0 errors) ====
+    // Note in the out result we are using same folder name only different in casing
+    // Since this is case sensitive, the folders are different and hence the relative paths in sourcemap shouldn't be just app.ts or app2.ts
+    class c {
+    }
+    
+==== testFiles/app2.ts (0 errors) ====
+    class d {
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.errors.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.errors.txt
new file mode 100644
index 0000000000000..e2a69e291be62
--- /dev/null
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.errors.txt
@@ -0,0 +1,22 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== b.ts (0 errors) ====
+    /*--------------------------------------------------------------------------
+    Copyright 
+    ---------------------------------------------------------------------------*/
+    
+    ///<reference path="a.ts"/>
+    var y = x;
+    
+==== a.ts (0 errors) ====
+    /*--------------------------------------------------------------------------
+    Copyright 
+    ---------------------------------------------------------------------------*/
+    
+    var x = {
+        a: 10,
+        b: 20
+    };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.errors.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.errors.txt
new file mode 100644
index 0000000000000..92a900c2f0d07
--- /dev/null
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.errors.txt
@@ -0,0 +1,21 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.ts (0 errors) ====
+    namespace M {
+        export var X = 1;
+    }
+    interface Navigator {
+        getGamepads(func?: any): any;
+        webkitGetGamepads(func?: any): any
+        msGetGamepads(func?: any): any;
+        webkitGamepads(func?: any): any;
+    }
+    
+==== b.ts (0 errors) ====
+    namespace m1 {
+        export class c1 {
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
index 82bcd5200afca..acae73ea6e1cd 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
@@ -16,21 +16,25 @@ interface Navigator {
 >getGamepads : { (): (Gamepad | null)[]; (func?: any): any; }
 >            : ^^^^^^                  ^^^    ^^^   ^^^   ^^^
 >func : any
+>     : ^^^
 
     webkitGetGamepads(func?: any): any
 >webkitGetGamepads : (func?: any) => any
 >                  : ^    ^^^   ^^^^^   
 >func : any
+>     : ^^^
 
     msGetGamepads(func?: any): any;
 >msGetGamepads : (func?: any) => any
 >              : ^    ^^^   ^^^^^   
 >func : any
+>     : ^^^
 
     webkitGamepads(func?: any): any;
 >webkitGamepads : (func?: any) => any
 >               : ^    ^^^   ^^^^^   
 >func : any
+>     : ^^^
 }
 
 === b.ts ===
diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.errors.txt b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.errors.txt
new file mode 100644
index 0000000000000..79c379e345b84
--- /dev/null
+++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.errors.txt
@@ -0,0 +1,14 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== testFiles/app.ts (0 errors) ====
+    // Note in the out result we are using same folder name only different in casing
+    // Since this is non case sensitive, the relative paths should be just app.ts and app2.ts in the sourcemap
+    class c {
+    }
+    
+==== testFiles/app2.ts (0 errors) ====
+    class d {
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/spellingSuggestionJSXAttribute.js b/tests/baselines/reference/spellingSuggestionJSXAttribute.js
index 2fcc65228a5b2..08d7f2d093aa9 100644
--- a/tests/baselines/reference/spellingSuggestionJSXAttribute.js
+++ b/tests/baselines/reference/spellingSuggestionJSXAttribute.js
@@ -69,7 +69,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var React = __importStar(require("react"));
 function MyComp2(props) {
     return null;
diff --git a/tests/baselines/reference/spreadInvalidArgumentType.errors.txt b/tests/baselines/reference/spreadInvalidArgumentType.errors.txt
index e6d971fd6fc01..a134c8d1a012d 100644
--- a/tests/baselines/reference/spreadInvalidArgumentType.errors.txt
+++ b/tests/baselines/reference/spreadInvalidArgumentType.errors.txt
@@ -1,45 +1,44 @@
+spreadInvalidArgumentType.ts(32,16): error TS2698: Spread types may only be created from object types.
 spreadInvalidArgumentType.ts(33,16): error TS2698: Spread types may only be created from object types.
-spreadInvalidArgumentType.ts(34,16): error TS2698: Spread types may only be created from object types.
-spreadInvalidArgumentType.ts(39,16): error TS2698: Spread types may only be created from object types.
-spreadInvalidArgumentType.ts(42,17): error TS2698: Spread types may only be created from object types.
+spreadInvalidArgumentType.ts(38,16): error TS2698: Spread types may only be created from object types.
+spreadInvalidArgumentType.ts(41,17): error TS2698: Spread types may only be created from object types.
+spreadInvalidArgumentType.ts(43,17): error TS2698: Spread types may only be created from object types.
 spreadInvalidArgumentType.ts(44,17): error TS2698: Spread types may only be created from object types.
-spreadInvalidArgumentType.ts(45,17): error TS2698: Spread types may only be created from object types.
+spreadInvalidArgumentType.ts(46,17): error TS2698: Spread types may only be created from object types.
 spreadInvalidArgumentType.ts(47,17): error TS2698: Spread types may only be created from object types.
-spreadInvalidArgumentType.ts(48,17): error TS2698: Spread types may only be created from object types.
+spreadInvalidArgumentType.ts(51,17): error TS2698: Spread types may only be created from object types.
 spreadInvalidArgumentType.ts(52,17): error TS2698: Spread types may only be created from object types.
-spreadInvalidArgumentType.ts(53,17): error TS2698: Spread types may only be created from object types.
-spreadInvalidArgumentType.ts(55,17): error TS2698: Spread types may only be created from object types.
+spreadInvalidArgumentType.ts(54,17): error TS2698: Spread types may only be created from object types.
 
 
 ==== spreadInvalidArgumentType.ts (11 errors) ====
     enum E { v1, v2 };
     
     function f<T extends { b: string }>(p1: T, p2: T[]) {
-        var t: T;
+        var t!: T;
     
-        var i: T["b"];
-        var k: keyof T;
+        var i!: T["b"];
+        var k!: keyof T;
     
-        var mapped_generic: {[P in keyof T]: T[P]};
-        var mapped: {[P in "b"]: T[P]};
+        var mapped_generic!: {[P in keyof T]: T[P]};
+        var mapped!: {[P in "b"]: T[P]};
     
-        var union_generic: T | { a: number };
-        var union_primitive: { a: number } | number;
+        var union_generic!: T | { a: number };
+        var union_primitive!: { a: number } | number;
+        var intersection_generic!: T & { a: number };
+        var intersection_primitive!: { a: number } | string;
     
-        var intersection_generic: T & { a: number };
-        var intersection_primitive: { a: number } | string;
+        var num!: number;
+        var str!: number;
+        var literal_string: "string" = "string";
+        var literal_number: 42 = 42;
     
-        var num: number;
-        var str: number;
-        var literal_string: "string";
-        var literal_number: 42;
+        var u: undefined = undefined;
+        var n: null = null;
+        var a: any = 0;
     
-        var u: undefined;
-        var n: null;
-        var a: any;
     
-    
-        var e: E;
+        var e!: E;
     
         var o1 = { ...p1 };  // OK, generic type paramterre
         var o2 = { ...p2 };  // OK
diff --git a/tests/baselines/reference/spreadInvalidArgumentType.js b/tests/baselines/reference/spreadInvalidArgumentType.js
index 9bb5ccfb9545b..cb176bb0f2c76 100644
--- a/tests/baselines/reference/spreadInvalidArgumentType.js
+++ b/tests/baselines/reference/spreadInvalidArgumentType.js
@@ -4,31 +4,30 @@
 enum E { v1, v2 };
 
 function f<T extends { b: string }>(p1: T, p2: T[]) {
-    var t: T;
+    var t!: T;
 
-    var i: T["b"];
-    var k: keyof T;
+    var i!: T["b"];
+    var k!: keyof T;
 
-    var mapped_generic: {[P in keyof T]: T[P]};
-    var mapped: {[P in "b"]: T[P]};
+    var mapped_generic!: {[P in keyof T]: T[P]};
+    var mapped!: {[P in "b"]: T[P]};
 
-    var union_generic: T | { a: number };
-    var union_primitive: { a: number } | number;
+    var union_generic!: T | { a: number };
+    var union_primitive!: { a: number } | number;
+    var intersection_generic!: T & { a: number };
+    var intersection_primitive!: { a: number } | string;
 
-    var intersection_generic: T & { a: number };
-    var intersection_primitive: { a: number } | string;
+    var num!: number;
+    var str!: number;
+    var literal_string: "string" = "string";
+    var literal_number: 42 = 42;
 
-    var num: number;
-    var str: number;
-    var literal_string: "string";
-    var literal_number: 42;
+    var u: undefined = undefined;
+    var n: null = null;
+    var a: any = 0;
 
-    var u: undefined;
-    var n: null;
-    var a: any;
 
-
-    var e: E;
+    var e!: E;
 
     var o1 = { ...p1 };  // OK, generic type paramterre
     var o2 = { ...p2 };  // OK
@@ -89,11 +88,11 @@ function f(p1, p2) {
     var intersection_primitive;
     var num;
     var str;
-    var literal_string;
-    var literal_number;
-    var u;
-    var n;
-    var a;
+    var literal_string = "string";
+    var literal_number = 42;
+    var u = undefined;
+    var n = null;
+    var a = 0;
     var e;
     var o1 = __assign({}, p1); // OK, generic type paramterre
     var o2 = __assign({}, p2); // OK
diff --git a/tests/baselines/reference/spreadInvalidArgumentType.symbols b/tests/baselines/reference/spreadInvalidArgumentType.symbols
index fb3cc0fdbb997..dda678d72db2b 100644
--- a/tests/baselines/reference/spreadInvalidArgumentType.symbols
+++ b/tests/baselines/reference/spreadInvalidArgumentType.symbols
@@ -15,149 +15,150 @@ function f<T extends { b: string }>(p1: T, p2: T[]) {
 >p2 : Symbol(p2, Decl(spreadInvalidArgumentType.ts, 2, 42))
 >T : Symbol(T, Decl(spreadInvalidArgumentType.ts, 2, 11))
 
-    var t: T;
+    var t!: T;
 >t : Symbol(t, Decl(spreadInvalidArgumentType.ts, 3, 7))
 >T : Symbol(T, Decl(spreadInvalidArgumentType.ts, 2, 11))
 
-    var i: T["b"];
+    var i!: T["b"];
 >i : Symbol(i, Decl(spreadInvalidArgumentType.ts, 5, 7))
 >T : Symbol(T, Decl(spreadInvalidArgumentType.ts, 2, 11))
 
-    var k: keyof T;
+    var k!: keyof T;
 >k : Symbol(k, Decl(spreadInvalidArgumentType.ts, 6, 7))
 >T : Symbol(T, Decl(spreadInvalidArgumentType.ts, 2, 11))
 
-    var mapped_generic: {[P in keyof T]: T[P]};
+    var mapped_generic!: {[P in keyof T]: T[P]};
 >mapped_generic : Symbol(mapped_generic, Decl(spreadInvalidArgumentType.ts, 8, 7))
->P : Symbol(P, Decl(spreadInvalidArgumentType.ts, 8, 26))
+>P : Symbol(P, Decl(spreadInvalidArgumentType.ts, 8, 27))
 >T : Symbol(T, Decl(spreadInvalidArgumentType.ts, 2, 11))
 >T : Symbol(T, Decl(spreadInvalidArgumentType.ts, 2, 11))
->P : Symbol(P, Decl(spreadInvalidArgumentType.ts, 8, 26))
+>P : Symbol(P, Decl(spreadInvalidArgumentType.ts, 8, 27))
 
-    var mapped: {[P in "b"]: T[P]};
+    var mapped!: {[P in "b"]: T[P]};
 >mapped : Symbol(mapped, Decl(spreadInvalidArgumentType.ts, 9, 7))
->P : Symbol(P, Decl(spreadInvalidArgumentType.ts, 9, 18))
+>P : Symbol(P, Decl(spreadInvalidArgumentType.ts, 9, 19))
 >T : Symbol(T, Decl(spreadInvalidArgumentType.ts, 2, 11))
->P : Symbol(P, Decl(spreadInvalidArgumentType.ts, 9, 18))
+>P : Symbol(P, Decl(spreadInvalidArgumentType.ts, 9, 19))
 
-    var union_generic: T | { a: number };
+    var union_generic!: T | { a: number };
 >union_generic : Symbol(union_generic, Decl(spreadInvalidArgumentType.ts, 11, 7))
 >T : Symbol(T, Decl(spreadInvalidArgumentType.ts, 2, 11))
->a : Symbol(a, Decl(spreadInvalidArgumentType.ts, 11, 28))
+>a : Symbol(a, Decl(spreadInvalidArgumentType.ts, 11, 29))
 
-    var union_primitive: { a: number } | number;
+    var union_primitive!: { a: number } | number;
 >union_primitive : Symbol(union_primitive, Decl(spreadInvalidArgumentType.ts, 12, 7))
->a : Symbol(a, Decl(spreadInvalidArgumentType.ts, 12, 26))
+>a : Symbol(a, Decl(spreadInvalidArgumentType.ts, 12, 27))
 
-    var intersection_generic: T & { a: number };
->intersection_generic : Symbol(intersection_generic, Decl(spreadInvalidArgumentType.ts, 14, 7))
+    var intersection_generic!: T & { a: number };
+>intersection_generic : Symbol(intersection_generic, Decl(spreadInvalidArgumentType.ts, 13, 7))
 >T : Symbol(T, Decl(spreadInvalidArgumentType.ts, 2, 11))
->a : Symbol(a, Decl(spreadInvalidArgumentType.ts, 14, 35))
+>a : Symbol(a, Decl(spreadInvalidArgumentType.ts, 13, 36))
 
-    var intersection_primitive: { a: number } | string;
->intersection_primitive : Symbol(intersection_primitive, Decl(spreadInvalidArgumentType.ts, 15, 7))
->a : Symbol(a, Decl(spreadInvalidArgumentType.ts, 15, 33))
+    var intersection_primitive!: { a: number } | string;
+>intersection_primitive : Symbol(intersection_primitive, Decl(spreadInvalidArgumentType.ts, 14, 7))
+>a : Symbol(a, Decl(spreadInvalidArgumentType.ts, 14, 34))
 
-    var num: number;
->num : Symbol(num, Decl(spreadInvalidArgumentType.ts, 17, 7))
+    var num!: number;
+>num : Symbol(num, Decl(spreadInvalidArgumentType.ts, 16, 7))
 
-    var str: number;
->str : Symbol(str, Decl(spreadInvalidArgumentType.ts, 18, 7))
+    var str!: number;
+>str : Symbol(str, Decl(spreadInvalidArgumentType.ts, 17, 7))
 
-    var literal_string: "string";
->literal_string : Symbol(literal_string, Decl(spreadInvalidArgumentType.ts, 19, 7))
+    var literal_string: "string" = "string";
+>literal_string : Symbol(literal_string, Decl(spreadInvalidArgumentType.ts, 18, 7))
 
-    var literal_number: 42;
->literal_number : Symbol(literal_number, Decl(spreadInvalidArgumentType.ts, 20, 7))
+    var literal_number: 42 = 42;
+>literal_number : Symbol(literal_number, Decl(spreadInvalidArgumentType.ts, 19, 7))
 
-    var u: undefined;
->u : Symbol(u, Decl(spreadInvalidArgumentType.ts, 22, 7))
+    var u: undefined = undefined;
+>u : Symbol(u, Decl(spreadInvalidArgumentType.ts, 21, 7))
+>undefined : Symbol(undefined)
 
-    var n: null;
->n : Symbol(n, Decl(spreadInvalidArgumentType.ts, 23, 7))
+    var n: null = null;
+>n : Symbol(n, Decl(spreadInvalidArgumentType.ts, 22, 7))
 
-    var a: any;
->a : Symbol(a, Decl(spreadInvalidArgumentType.ts, 24, 7))
+    var a: any = 0;
+>a : Symbol(a, Decl(spreadInvalidArgumentType.ts, 23, 7))
 
 
-    var e: E;
->e : Symbol(e, Decl(spreadInvalidArgumentType.ts, 27, 7))
+    var e!: E;
+>e : Symbol(e, Decl(spreadInvalidArgumentType.ts, 26, 7))
 >E : Symbol(E, Decl(spreadInvalidArgumentType.ts, 0, 0))
 
     var o1 = { ...p1 };  // OK, generic type paramterre
->o1 : Symbol(o1, Decl(spreadInvalidArgumentType.ts, 29, 7))
+>o1 : Symbol(o1, Decl(spreadInvalidArgumentType.ts, 28, 7))
 >p1 : Symbol(p1, Decl(spreadInvalidArgumentType.ts, 2, 36))
 
     var o2 = { ...p2 };  // OK
->o2 : Symbol(o2, Decl(spreadInvalidArgumentType.ts, 30, 7))
+>o2 : Symbol(o2, Decl(spreadInvalidArgumentType.ts, 29, 7))
 >p2 : Symbol(p2, Decl(spreadInvalidArgumentType.ts, 2, 42))
 
     var o3 = { ...t };   // OK, generic type paramter
->o3 : Symbol(o3, Decl(spreadInvalidArgumentType.ts, 31, 7))
+>o3 : Symbol(o3, Decl(spreadInvalidArgumentType.ts, 30, 7))
 >t : Symbol(t, Decl(spreadInvalidArgumentType.ts, 3, 7))
 
     var o4 = { ...i };   // Error, index access
->o4 : Symbol(o4, Decl(spreadInvalidArgumentType.ts, 32, 7))
+>o4 : Symbol(o4, Decl(spreadInvalidArgumentType.ts, 31, 7))
 >i : Symbol(i, Decl(spreadInvalidArgumentType.ts, 5, 7))
 
     var o5 = { ...k };   // Error, index
->o5 : Symbol(o5, Decl(spreadInvalidArgumentType.ts, 33, 7))
+>o5 : Symbol(o5, Decl(spreadInvalidArgumentType.ts, 32, 7))
 >k : Symbol(k, Decl(spreadInvalidArgumentType.ts, 6, 7))
 
     var o6 = { ...mapped_generic }; // OK, generic mapped object type
->o6 : Symbol(o6, Decl(spreadInvalidArgumentType.ts, 34, 7))
+>o6 : Symbol(o6, Decl(spreadInvalidArgumentType.ts, 33, 7))
 >mapped_generic : Symbol(mapped_generic, Decl(spreadInvalidArgumentType.ts, 8, 7))
 
     var o7 = { ...mapped };  // OK, non-generic mapped type
->o7 : Symbol(o7, Decl(spreadInvalidArgumentType.ts, 35, 7))
+>o7 : Symbol(o7, Decl(spreadInvalidArgumentType.ts, 34, 7))
 >mapped : Symbol(mapped, Decl(spreadInvalidArgumentType.ts, 9, 7))
 
     var o8 = { ...union_generic };  // OK, union with generic type parameter
->o8 : Symbol(o8, Decl(spreadInvalidArgumentType.ts, 37, 7))
+>o8 : Symbol(o8, Decl(spreadInvalidArgumentType.ts, 36, 7))
 >union_generic : Symbol(union_generic, Decl(spreadInvalidArgumentType.ts, 11, 7))
 
     var o9 = { ...union_primitive };  // Error, union with generic type parameter
->o9 : Symbol(o9, Decl(spreadInvalidArgumentType.ts, 38, 7))
+>o9 : Symbol(o9, Decl(spreadInvalidArgumentType.ts, 37, 7))
 >union_primitive : Symbol(union_primitive, Decl(spreadInvalidArgumentType.ts, 12, 7))
 
     var o10 = { ...intersection_generic };  // OK, intersection with generic type parameter
->o10 : Symbol(o10, Decl(spreadInvalidArgumentType.ts, 40, 7))
->intersection_generic : Symbol(intersection_generic, Decl(spreadInvalidArgumentType.ts, 14, 7))
+>o10 : Symbol(o10, Decl(spreadInvalidArgumentType.ts, 39, 7))
+>intersection_generic : Symbol(intersection_generic, Decl(spreadInvalidArgumentType.ts, 13, 7))
 
     var o11 = { ...intersection_primitive };  // Error, intersection with generic type parameter
->o11 : Symbol(o11, Decl(spreadInvalidArgumentType.ts, 41, 7))
->intersection_primitive : Symbol(intersection_primitive, Decl(spreadInvalidArgumentType.ts, 15, 7))
+>o11 : Symbol(o11, Decl(spreadInvalidArgumentType.ts, 40, 7))
+>intersection_primitive : Symbol(intersection_primitive, Decl(spreadInvalidArgumentType.ts, 14, 7))
 
     var o12 = { ...num };  // Error
->o12 : Symbol(o12, Decl(spreadInvalidArgumentType.ts, 43, 7))
->num : Symbol(num, Decl(spreadInvalidArgumentType.ts, 17, 7))
+>o12 : Symbol(o12, Decl(spreadInvalidArgumentType.ts, 42, 7))
+>num : Symbol(num, Decl(spreadInvalidArgumentType.ts, 16, 7))
 
     var o13 = { ...str };  // Error
->o13 : Symbol(o13, Decl(spreadInvalidArgumentType.ts, 44, 7))
->str : Symbol(str, Decl(spreadInvalidArgumentType.ts, 18, 7))
+>o13 : Symbol(o13, Decl(spreadInvalidArgumentType.ts, 43, 7))
+>str : Symbol(str, Decl(spreadInvalidArgumentType.ts, 17, 7))
 
     var o14 = { ...u };  // error, undefined-only not allowed
->o14 : Symbol(o14, Decl(spreadInvalidArgumentType.ts, 46, 7))
->u : Symbol(u, Decl(spreadInvalidArgumentType.ts, 22, 7))
+>o14 : Symbol(o14, Decl(spreadInvalidArgumentType.ts, 45, 7))
+>u : Symbol(u, Decl(spreadInvalidArgumentType.ts, 21, 7))
 
     var o15 = { ...n };  // error, null-only not allowed
->o15 : Symbol(o15, Decl(spreadInvalidArgumentType.ts, 47, 7))
->n : Symbol(n, Decl(spreadInvalidArgumentType.ts, 23, 7))
+>o15 : Symbol(o15, Decl(spreadInvalidArgumentType.ts, 46, 7))
+>n : Symbol(n, Decl(spreadInvalidArgumentType.ts, 22, 7))
 
     var o16 = { ...a };  // OK
->o16 : Symbol(o16, Decl(spreadInvalidArgumentType.ts, 49, 7))
->a : Symbol(a, Decl(spreadInvalidArgumentType.ts, 24, 7))
+>o16 : Symbol(o16, Decl(spreadInvalidArgumentType.ts, 48, 7))
+>a : Symbol(a, Decl(spreadInvalidArgumentType.ts, 23, 7))
 
     var o17 = { ...literal_string };  // Error
->o17 : Symbol(o17, Decl(spreadInvalidArgumentType.ts, 51, 7))
->literal_string : Symbol(literal_string, Decl(spreadInvalidArgumentType.ts, 19, 7))
+>o17 : Symbol(o17, Decl(spreadInvalidArgumentType.ts, 50, 7))
+>literal_string : Symbol(literal_string, Decl(spreadInvalidArgumentType.ts, 18, 7))
 
     var o18 = { ...literal_number };  // Error
->o18 : Symbol(o18, Decl(spreadInvalidArgumentType.ts, 52, 7))
->literal_number : Symbol(literal_number, Decl(spreadInvalidArgumentType.ts, 20, 7))
+>o18 : Symbol(o18, Decl(spreadInvalidArgumentType.ts, 51, 7))
+>literal_number : Symbol(literal_number, Decl(spreadInvalidArgumentType.ts, 19, 7))
 
     var o19 = { ...e };  // Error, enum
->o19 : Symbol(o19, Decl(spreadInvalidArgumentType.ts, 54, 7))
->e : Symbol(e, Decl(spreadInvalidArgumentType.ts, 27, 7))
+>o19 : Symbol(o19, Decl(spreadInvalidArgumentType.ts, 53, 7))
+>e : Symbol(e, Decl(spreadInvalidArgumentType.ts, 26, 7))
 }
 
diff --git a/tests/baselines/reference/spreadInvalidArgumentType.types b/tests/baselines/reference/spreadInvalidArgumentType.types
index 581c8542ecef1..af9018f7bb7bf 100644
--- a/tests/baselines/reference/spreadInvalidArgumentType.types
+++ b/tests/baselines/reference/spreadInvalidArgumentType.types
@@ -19,80 +19,88 @@ function f<T extends { b: string }>(p1: T, p2: T[]) {
 >p2 : T[]
 >   : ^^^
 
-    var t: T;
+    var t!: T;
 >t : T
 >  : ^
 
-    var i: T["b"];
+    var i!: T["b"];
 >i : T["b"]
 >  : ^^^^^^
 
-    var k: keyof T;
+    var k!: keyof T;
 >k : keyof T
 >  : ^^^^^^^
 
-    var mapped_generic: {[P in keyof T]: T[P]};
+    var mapped_generic!: {[P in keyof T]: T[P]};
 >mapped_generic : { [P in keyof T]: T[P]; }
 >               : ^^^ ^^^^^^^^^^^^^^^^^^^^^
 
-    var mapped: {[P in "b"]: T[P]};
+    var mapped!: {[P in "b"]: T[P]};
 >mapped : { b: T["b"]; }
 >       : ^^^^^^^^^^^^^^
 
-    var union_generic: T | { a: number };
+    var union_generic!: T | { a: number };
 >union_generic : T | { a: number; }
 >              : ^^^^^^^^^      ^^^
 >a : number
 >  : ^^^^^^
 
-    var union_primitive: { a: number } | number;
+    var union_primitive!: { a: number } | number;
 >union_primitive : number | { a: number; }
 >                : ^^^^^^^^^^^^^^      ^^^
 >a : number
 >  : ^^^^^^
 
-    var intersection_generic: T & { a: number };
+    var intersection_generic!: T & { a: number };
 >intersection_generic : T & { a: number; }
 >                     : ^^^^^^^^^      ^^^
 >a : number
 >  : ^^^^^^
 
-    var intersection_primitive: { a: number } | string;
+    var intersection_primitive!: { a: number } | string;
 >intersection_primitive : string | { a: number; }
 >                       : ^^^^^^^^^^^^^^      ^^^
 >a : number
 >  : ^^^^^^
 
-    var num: number;
+    var num!: number;
 >num : number
 >    : ^^^^^^
 
-    var str: number;
+    var str!: number;
 >str : number
 >    : ^^^^^^
 
-    var literal_string: "string";
+    var literal_string: "string" = "string";
 >literal_string : "string"
 >               : ^^^^^^^^
+>"string" : "string"
+>         : ^^^^^^^^
 
-    var literal_number: 42;
+    var literal_number: 42 = 42;
 >literal_number : 42
 >               : ^^
+>42 : 42
+>   : ^^
 
-    var u: undefined;
+    var u: undefined = undefined;
 >u : undefined
 >  : ^^^^^^^^^
+>undefined : undefined
+>          : ^^^^^^^^^
 
-    var n: null;
+    var n: null = null;
 >n : null
 >  : ^^^^
 
-    var a: any;
+    var a: any = 0;
 >a : any
 >  : ^^^
+>0 : 0
+>  : ^
 
 
-    var e: E;
+    var e!: E;
 >e : E
 >  : ^
 
diff --git a/tests/baselines/reference/staticMemberExportAccess.errors.txt b/tests/baselines/reference/staticMemberExportAccess.errors.txt
index 645af2a68a319..7e36acb02ed76 100644
--- a/tests/baselines/reference/staticMemberExportAccess.errors.txt
+++ b/tests/baselines/reference/staticMemberExportAccess.errors.txt
@@ -17,7 +17,7 @@ staticMemberExportAccess.ts(18,18): error TS2339: Property 'x' does not exist on
     interface JQueryStatic {
         sammy: Sammy; // class instance
     }
-    var $: JQueryStatic;
+    declare var $: JQueryStatic;
     var instanceOfClassSammy: Sammy = new $.sammy(); // should be error
                                           ~~~~~~~
 !!! error TS2351: This expression is not constructable.
diff --git a/tests/baselines/reference/staticMemberExportAccess.js b/tests/baselines/reference/staticMemberExportAccess.js
index a7211bedacbc3..00b93d6c88463 100644
--- a/tests/baselines/reference/staticMemberExportAccess.js
+++ b/tests/baselines/reference/staticMemberExportAccess.js
@@ -13,7 +13,7 @@ namespace Sammy {
 interface JQueryStatic {
     sammy: Sammy; // class instance
 }
-var $: JQueryStatic;
+declare var $: JQueryStatic;
 var instanceOfClassSammy: Sammy = new $.sammy(); // should be error
 var r1 = instanceOfClassSammy.foo(); // r1 is string
 var r2 = $.sammy.foo();
@@ -35,7 +35,6 @@ var Sammy = /** @class */ (function () {
 (function (Sammy) {
     Sammy.x = 1;
 })(Sammy || (Sammy = {}));
-var $;
 var instanceOfClassSammy = new $.sammy(); // should be error
 var r1 = instanceOfClassSammy.foo(); // r1 is string
 var r2 = $.sammy.foo();
diff --git a/tests/baselines/reference/staticMemberExportAccess.symbols b/tests/baselines/reference/staticMemberExportAccess.symbols
index 877c2d7400543..e346c4daf6762 100644
--- a/tests/baselines/reference/staticMemberExportAccess.symbols
+++ b/tests/baselines/reference/staticMemberExportAccess.symbols
@@ -26,15 +26,15 @@ interface JQueryStatic {
 >sammy : Symbol(JQueryStatic.sammy, Decl(staticMemberExportAccess.ts, 9, 24))
 >Sammy : Symbol(Sammy, Decl(staticMemberExportAccess.ts, 0, 0), Decl(staticMemberExportAccess.ts, 5, 1))
 }
-var $: JQueryStatic;
->$ : Symbol($, Decl(staticMemberExportAccess.ts, 12, 3))
+declare var $: JQueryStatic;
+>$ : Symbol($, Decl(staticMemberExportAccess.ts, 12, 11))
 >JQueryStatic : Symbol(JQueryStatic, Decl(staticMemberExportAccess.ts, 8, 1))
 
 var instanceOfClassSammy: Sammy = new $.sammy(); // should be error
 >instanceOfClassSammy : Symbol(instanceOfClassSammy, Decl(staticMemberExportAccess.ts, 13, 3))
 >Sammy : Symbol(Sammy, Decl(staticMemberExportAccess.ts, 0, 0), Decl(staticMemberExportAccess.ts, 5, 1))
 >$.sammy : Symbol(JQueryStatic.sammy, Decl(staticMemberExportAccess.ts, 9, 24))
->$ : Symbol($, Decl(staticMemberExportAccess.ts, 12, 3))
+>$ : Symbol($, Decl(staticMemberExportAccess.ts, 12, 11))
 >sammy : Symbol(JQueryStatic.sammy, Decl(staticMemberExportAccess.ts, 9, 24))
 
 var r1 = instanceOfClassSammy.foo(); // r1 is string
@@ -47,20 +47,20 @@ var r2 = $.sammy.foo();
 >r2 : Symbol(r2, Decl(staticMemberExportAccess.ts, 15, 3))
 >$.sammy.foo : Symbol(Sammy.foo, Decl(staticMemberExportAccess.ts, 0, 13))
 >$.sammy : Symbol(JQueryStatic.sammy, Decl(staticMemberExportAccess.ts, 9, 24))
->$ : Symbol($, Decl(staticMemberExportAccess.ts, 12, 3))
+>$ : Symbol($, Decl(staticMemberExportAccess.ts, 12, 11))
 >sammy : Symbol(JQueryStatic.sammy, Decl(staticMemberExportAccess.ts, 9, 24))
 >foo : Symbol(Sammy.foo, Decl(staticMemberExportAccess.ts, 0, 13))
 
 var r3 = $.sammy.bar(); // error
 >r3 : Symbol(r3, Decl(staticMemberExportAccess.ts, 16, 3))
 >$.sammy : Symbol(JQueryStatic.sammy, Decl(staticMemberExportAccess.ts, 9, 24))
->$ : Symbol($, Decl(staticMemberExportAccess.ts, 12, 3))
+>$ : Symbol($, Decl(staticMemberExportAccess.ts, 12, 11))
 >sammy : Symbol(JQueryStatic.sammy, Decl(staticMemberExportAccess.ts, 9, 24))
 
 var r4 = $.sammy.x; // error
 >r4 : Symbol(r4, Decl(staticMemberExportAccess.ts, 17, 3))
 >$.sammy : Symbol(JQueryStatic.sammy, Decl(staticMemberExportAccess.ts, 9, 24))
->$ : Symbol($, Decl(staticMemberExportAccess.ts, 12, 3))
+>$ : Symbol($, Decl(staticMemberExportAccess.ts, 12, 11))
 >sammy : Symbol(JQueryStatic.sammy, Decl(staticMemberExportAccess.ts, 9, 24))
 
 Sammy.bar();
diff --git a/tests/baselines/reference/staticMemberExportAccess.types b/tests/baselines/reference/staticMemberExportAccess.types
index 91add29a4129a..1989320f62f1c 100644
--- a/tests/baselines/reference/staticMemberExportAccess.types
+++ b/tests/baselines/reference/staticMemberExportAccess.types
@@ -37,7 +37,7 @@ interface JQueryStatic {
 >sammy : Sammy
 >      : ^^^^^
 }
-var $: JQueryStatic;
+declare var $: JQueryStatic;
 >$ : JQueryStatic
 >  : ^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/strictTupleLength.errors.txt b/tests/baselines/reference/strictTupleLength.errors.txt
index 181b2e04fdc76..1076a42b454b2 100644
--- a/tests/baselines/reference/strictTupleLength.errors.txt
+++ b/tests/baselines/reference/strictTupleLength.errors.txt
@@ -5,10 +5,10 @@ strictTupleLength.ts(18,1): error TS2322: Type 'number[]' is not assignable to t
 
 
 ==== strictTupleLength.ts (3 errors) ====
-    var t0: [];
-    var t1: [number];
-    var t2: [number, number];
-    var arr: number[];
+    declare var t0: [];
+    declare var t1: [number];
+    declare var t2: [number, number];
+    declare var arr: number[];
     
     var len0: 0 = t0.length;
     var len1: 1 = t1.length;
@@ -18,14 +18,14 @@ strictTupleLength.ts(18,1): error TS2322: Type 'number[]' is not assignable to t
     var t1 = t2; // error
         ~~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 't1' must be of type '[number]', but here has type '[number, number]'.
-!!! related TS6203 strictTupleLength.ts:2:5: 't1' was also declared here.
+!!! related TS6203 strictTupleLength.ts:2:13: 't1' was also declared here.
     var t2 = t1; // error
         ~~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 't2' must be of type '[number, number]', but here has type '[number]'.
-!!! related TS6203 strictTupleLength.ts:3:5: 't2' was also declared here.
+!!! related TS6203 strictTupleLength.ts:3:13: 't2' was also declared here.
     
     type A<T extends any[]> = T['length'];
-    var b: A<[boolean]>;
+    declare var b: A<[boolean]>;
     var c: 1 = b;
     
     t1 = arr; // error with or without strict
diff --git a/tests/baselines/reference/strictTupleLength.js b/tests/baselines/reference/strictTupleLength.js
index 90b78e6beecf8..f57fc62e3935a 100644
--- a/tests/baselines/reference/strictTupleLength.js
+++ b/tests/baselines/reference/strictTupleLength.js
@@ -1,10 +1,10 @@
 //// [tests/cases/conformance/types/tuple/strictTupleLength.ts] ////
 
 //// [strictTupleLength.ts]
-var t0: [];
-var t1: [number];
-var t2: [number, number];
-var arr: number[];
+declare var t0: [];
+declare var t1: [number];
+declare var t2: [number, number];
+declare var arr: number[];
 
 var len0: 0 = t0.length;
 var len1: 1 = t1.length;
@@ -15,7 +15,7 @@ var t1 = t2; // error
 var t2 = t1; // error
 
 type A<T extends any[]> = T['length'];
-var b: A<[boolean]>;
+declare var b: A<[boolean]>;
 var c: 1 = b;
 
 t1 = arr; // error with or without strict
@@ -23,17 +23,12 @@ arr = t1; // ok with or without strict
 
 
 //// [strictTupleLength.js]
-var t0;
-var t1;
-var t2;
-var arr;
 var len0 = t0.length;
 var len1 = t1.length;
 var len2 = t2.length;
 var lena = arr.length;
 var t1 = t2; // error
 var t2 = t1; // error
-var b;
 var c = b;
 t1 = arr; // error with or without strict
 arr = t1; // ok with or without strict
diff --git a/tests/baselines/reference/strictTupleLength.symbols b/tests/baselines/reference/strictTupleLength.symbols
index a8d86010dba56..72394755904c5 100644
--- a/tests/baselines/reference/strictTupleLength.symbols
+++ b/tests/baselines/reference/strictTupleLength.symbols
@@ -1,68 +1,68 @@
 //// [tests/cases/conformance/types/tuple/strictTupleLength.ts] ////
 
 === strictTupleLength.ts ===
-var t0: [];
->t0 : Symbol(t0, Decl(strictTupleLength.ts, 0, 3))
+declare var t0: [];
+>t0 : Symbol(t0, Decl(strictTupleLength.ts, 0, 11))
 
-var t1: [number];
->t1 : Symbol(t1, Decl(strictTupleLength.ts, 1, 3), Decl(strictTupleLength.ts, 10, 3))
+declare var t1: [number];
+>t1 : Symbol(t1, Decl(strictTupleLength.ts, 1, 11), Decl(strictTupleLength.ts, 10, 3))
 
-var t2: [number, number];
->t2 : Symbol(t2, Decl(strictTupleLength.ts, 2, 3), Decl(strictTupleLength.ts, 11, 3))
+declare var t2: [number, number];
+>t2 : Symbol(t2, Decl(strictTupleLength.ts, 2, 11), Decl(strictTupleLength.ts, 11, 3))
 
-var arr: number[];
->arr : Symbol(arr, Decl(strictTupleLength.ts, 3, 3))
+declare var arr: number[];
+>arr : Symbol(arr, Decl(strictTupleLength.ts, 3, 11))
 
 var len0: 0 = t0.length;
 >len0 : Symbol(len0, Decl(strictTupleLength.ts, 5, 3))
 >t0.length : Symbol(length)
->t0 : Symbol(t0, Decl(strictTupleLength.ts, 0, 3))
+>t0 : Symbol(t0, Decl(strictTupleLength.ts, 0, 11))
 >length : Symbol(length)
 
 var len1: 1 = t1.length;
 >len1 : Symbol(len1, Decl(strictTupleLength.ts, 6, 3))
 >t1.length : Symbol(length)
->t1 : Symbol(t1, Decl(strictTupleLength.ts, 1, 3), Decl(strictTupleLength.ts, 10, 3))
+>t1 : Symbol(t1, Decl(strictTupleLength.ts, 1, 11), Decl(strictTupleLength.ts, 10, 3))
 >length : Symbol(length)
 
 var len2: 2 = t2.length;
 >len2 : Symbol(len2, Decl(strictTupleLength.ts, 7, 3))
 >t2.length : Symbol(length)
->t2 : Symbol(t2, Decl(strictTupleLength.ts, 2, 3), Decl(strictTupleLength.ts, 11, 3))
+>t2 : Symbol(t2, Decl(strictTupleLength.ts, 2, 11), Decl(strictTupleLength.ts, 11, 3))
 >length : Symbol(length)
 
 var lena: number = arr.length;
 >lena : Symbol(lena, Decl(strictTupleLength.ts, 8, 3))
 >arr.length : Symbol(Array.length, Decl(lib.es5.d.ts, --, --))
->arr : Symbol(arr, Decl(strictTupleLength.ts, 3, 3))
+>arr : Symbol(arr, Decl(strictTupleLength.ts, 3, 11))
 >length : Symbol(Array.length, Decl(lib.es5.d.ts, --, --))
 
 var t1 = t2; // error
->t1 : Symbol(t1, Decl(strictTupleLength.ts, 1, 3), Decl(strictTupleLength.ts, 10, 3))
->t2 : Symbol(t2, Decl(strictTupleLength.ts, 2, 3), Decl(strictTupleLength.ts, 11, 3))
+>t1 : Symbol(t1, Decl(strictTupleLength.ts, 1, 11), Decl(strictTupleLength.ts, 10, 3))
+>t2 : Symbol(t2, Decl(strictTupleLength.ts, 2, 11), Decl(strictTupleLength.ts, 11, 3))
 
 var t2 = t1; // error
->t2 : Symbol(t2, Decl(strictTupleLength.ts, 2, 3), Decl(strictTupleLength.ts, 11, 3))
->t1 : Symbol(t1, Decl(strictTupleLength.ts, 1, 3), Decl(strictTupleLength.ts, 10, 3))
+>t2 : Symbol(t2, Decl(strictTupleLength.ts, 2, 11), Decl(strictTupleLength.ts, 11, 3))
+>t1 : Symbol(t1, Decl(strictTupleLength.ts, 1, 11), Decl(strictTupleLength.ts, 10, 3))
 
 type A<T extends any[]> = T['length'];
 >A : Symbol(A, Decl(strictTupleLength.ts, 11, 12))
 >T : Symbol(T, Decl(strictTupleLength.ts, 13, 7))
 >T : Symbol(T, Decl(strictTupleLength.ts, 13, 7))
 
-var b: A<[boolean]>;
->b : Symbol(b, Decl(strictTupleLength.ts, 14, 3))
+declare var b: A<[boolean]>;
+>b : Symbol(b, Decl(strictTupleLength.ts, 14, 11))
 >A : Symbol(A, Decl(strictTupleLength.ts, 11, 12))
 
 var c: 1 = b;
 >c : Symbol(c, Decl(strictTupleLength.ts, 15, 3))
->b : Symbol(b, Decl(strictTupleLength.ts, 14, 3))
+>b : Symbol(b, Decl(strictTupleLength.ts, 14, 11))
 
 t1 = arr; // error with or without strict
->t1 : Symbol(t1, Decl(strictTupleLength.ts, 1, 3), Decl(strictTupleLength.ts, 10, 3))
->arr : Symbol(arr, Decl(strictTupleLength.ts, 3, 3))
+>t1 : Symbol(t1, Decl(strictTupleLength.ts, 1, 11), Decl(strictTupleLength.ts, 10, 3))
+>arr : Symbol(arr, Decl(strictTupleLength.ts, 3, 11))
 
 arr = t1; // ok with or without strict
->arr : Symbol(arr, Decl(strictTupleLength.ts, 3, 3))
->t1 : Symbol(t1, Decl(strictTupleLength.ts, 1, 3), Decl(strictTupleLength.ts, 10, 3))
+>arr : Symbol(arr, Decl(strictTupleLength.ts, 3, 11))
+>t1 : Symbol(t1, Decl(strictTupleLength.ts, 1, 11), Decl(strictTupleLength.ts, 10, 3))
 
diff --git a/tests/baselines/reference/strictTupleLength.types b/tests/baselines/reference/strictTupleLength.types
index 9af6321b518bf..baeefa3cb24d5 100644
--- a/tests/baselines/reference/strictTupleLength.types
+++ b/tests/baselines/reference/strictTupleLength.types
@@ -1,19 +1,19 @@
 //// [tests/cases/conformance/types/tuple/strictTupleLength.ts] ////
 
 === strictTupleLength.ts ===
-var t0: [];
+declare var t0: [];
 >t0 : []
 >   : ^^
 
-var t1: [number];
+declare var t1: [number];
 >t1 : [number]
 >   : ^^^^^^^^
 
-var t2: [number, number];
+declare var t2: [number, number];
 >t2 : [number, number]
 >   : ^^^^^^^^^^^^^^^^
 
-var arr: number[];
+declare var arr: number[];
 >arr : number[]
 >    : ^^^^^^^^
 
@@ -73,7 +73,7 @@ type A<T extends any[]> = T['length'];
 >A : A<T>
 >  : ^^^^
 
-var b: A<[boolean]>;
+declare var b: A<[boolean]>;
 >b : 1
 >  : ^
 
diff --git a/tests/baselines/reference/stringIndexerAssignments1.errors.txt b/tests/baselines/reference/stringIndexerAssignments1.errors.txt
index 7ff519aebebdc..4c3e1d1e8837e 100644
--- a/tests/baselines/reference/stringIndexerAssignments1.errors.txt
+++ b/tests/baselines/reference/stringIndexerAssignments1.errors.txt
@@ -5,8 +5,8 @@ stringIndexerAssignments1.ts(5,1): error TS2322: Type '{ one: number; two: strin
 
 ==== stringIndexerAssignments1.ts (1 errors) ====
     var x: { [index: string]: string; one: string; };
-    var a: { one: string; };
-    var b: { one: number; two: string; };
+    declare var a: { one: string; };
+    declare var b: { one: number; two: string; };
     x = a;
     x = b; // error
     ~
diff --git a/tests/baselines/reference/stringIndexerAssignments1.js b/tests/baselines/reference/stringIndexerAssignments1.js
index 3e48d3649670a..047d10d391a8d 100644
--- a/tests/baselines/reference/stringIndexerAssignments1.js
+++ b/tests/baselines/reference/stringIndexerAssignments1.js
@@ -2,15 +2,13 @@
 
 //// [stringIndexerAssignments1.ts]
 var x: { [index: string]: string; one: string; };
-var a: { one: string; };
-var b: { one: number; two: string; };
+declare var a: { one: string; };
+declare var b: { one: number; two: string; };
 x = a;
 x = b; // error
 
 
 //// [stringIndexerAssignments1.js]
 var x;
-var a;
-var b;
 x = a;
 x = b; // error
diff --git a/tests/baselines/reference/stringIndexerAssignments1.symbols b/tests/baselines/reference/stringIndexerAssignments1.symbols
index 1dc82fa75ef3b..6133837b88177 100644
--- a/tests/baselines/reference/stringIndexerAssignments1.symbols
+++ b/tests/baselines/reference/stringIndexerAssignments1.symbols
@@ -6,20 +6,20 @@ var x: { [index: string]: string; one: string; };
 >index : Symbol(index, Decl(stringIndexerAssignments1.ts, 0, 10))
 >one : Symbol(one, Decl(stringIndexerAssignments1.ts, 0, 33))
 
-var a: { one: string; };
->a : Symbol(a, Decl(stringIndexerAssignments1.ts, 1, 3))
->one : Symbol(one, Decl(stringIndexerAssignments1.ts, 1, 8))
+declare var a: { one: string; };
+>a : Symbol(a, Decl(stringIndexerAssignments1.ts, 1, 11))
+>one : Symbol(one, Decl(stringIndexerAssignments1.ts, 1, 16))
 
-var b: { one: number; two: string; };
->b : Symbol(b, Decl(stringIndexerAssignments1.ts, 2, 3))
->one : Symbol(one, Decl(stringIndexerAssignments1.ts, 2, 8))
->two : Symbol(two, Decl(stringIndexerAssignments1.ts, 2, 21))
+declare var b: { one: number; two: string; };
+>b : Symbol(b, Decl(stringIndexerAssignments1.ts, 2, 11))
+>one : Symbol(one, Decl(stringIndexerAssignments1.ts, 2, 16))
+>two : Symbol(two, Decl(stringIndexerAssignments1.ts, 2, 29))
 
 x = a;
 >x : Symbol(x, Decl(stringIndexerAssignments1.ts, 0, 3))
->a : Symbol(a, Decl(stringIndexerAssignments1.ts, 1, 3))
+>a : Symbol(a, Decl(stringIndexerAssignments1.ts, 1, 11))
 
 x = b; // error
 >x : Symbol(x, Decl(stringIndexerAssignments1.ts, 0, 3))
->b : Symbol(b, Decl(stringIndexerAssignments1.ts, 2, 3))
+>b : Symbol(b, Decl(stringIndexerAssignments1.ts, 2, 11))
 
diff --git a/tests/baselines/reference/stringIndexerAssignments1.types b/tests/baselines/reference/stringIndexerAssignments1.types
index 3493b46f237c3..cd6a2ff0e2727 100644
--- a/tests/baselines/reference/stringIndexerAssignments1.types
+++ b/tests/baselines/reference/stringIndexerAssignments1.types
@@ -9,13 +9,13 @@ var x: { [index: string]: string; one: string; };
 >one : string
 >    : ^^^^^^
 
-var a: { one: string; };
+declare var a: { one: string; };
 >a : { one: string; }
 >  : ^^^^^^^      ^^^
 >one : string
 >    : ^^^^^^
 
-var b: { one: number; two: string; };
+declare var b: { one: number; two: string; };
 >b : { one: number; two: string; }
 >  : ^^^^^^^      ^^^^^^^      ^^^
 >one : number
diff --git a/tests/baselines/reference/stringIndexerAssignments2.errors.txt b/tests/baselines/reference/stringIndexerAssignments2.errors.txt
index 4f6d99f05f123..16f3ea2e4170c 100644
--- a/tests/baselines/reference/stringIndexerAssignments2.errors.txt
+++ b/tests/baselines/reference/stringIndexerAssignments2.errors.txt
@@ -8,21 +8,21 @@ stringIndexerAssignments2.ts(20,1): error TS2322: Type 'C3' is not assignable to
 ==== stringIndexerAssignments2.ts (2 errors) ====
     class C1 {
         [index: string]: string
-        one: string;
+        one!: string;
     }
     
     class C2 {
-        one: string;
+        one!: string;
     }
     
     class C3 {
-        one: number;
-        two: string;
+        one!: number;
+        two!: string;
     }
     
-    var x: C1;
-    var a: C2;
-    var b: C3;
+    declare var x: C1;
+    declare var a: C2;
+    declare var b: C3;
     
     x = a;
     ~
diff --git a/tests/baselines/reference/stringIndexerAssignments2.js b/tests/baselines/reference/stringIndexerAssignments2.js
index f5c7405366c3b..5e68b061e2748 100644
--- a/tests/baselines/reference/stringIndexerAssignments2.js
+++ b/tests/baselines/reference/stringIndexerAssignments2.js
@@ -3,21 +3,21 @@
 //// [stringIndexerAssignments2.ts]
 class C1 {
     [index: string]: string
-    one: string;
+    one!: string;
 }
 
 class C2 {
-    one: string;
+    one!: string;
 }
 
 class C3 {
-    one: number;
-    two: string;
+    one!: number;
+    two!: string;
 }
 
-var x: C1;
-var a: C2;
-var b: C3;
+declare var x: C1;
+declare var a: C2;
+declare var b: C3;
 
 x = a;
 x = b;
@@ -38,8 +38,5 @@ var C3 = /** @class */ (function () {
     }
     return C3;
 }());
-var x;
-var a;
-var b;
 x = a;
 x = b;
diff --git a/tests/baselines/reference/stringIndexerAssignments2.symbols b/tests/baselines/reference/stringIndexerAssignments2.symbols
index e76ebb3b7b84c..01cf61b33578b 100644
--- a/tests/baselines/reference/stringIndexerAssignments2.symbols
+++ b/tests/baselines/reference/stringIndexerAssignments2.symbols
@@ -7,44 +7,44 @@ class C1 {
     [index: string]: string
 >index : Symbol(index, Decl(stringIndexerAssignments2.ts, 1, 5))
 
-    one: string;
+    one!: string;
 >one : Symbol(C1.one, Decl(stringIndexerAssignments2.ts, 1, 27))
 }
 
 class C2 {
 >C2 : Symbol(C2, Decl(stringIndexerAssignments2.ts, 3, 1))
 
-    one: string;
+    one!: string;
 >one : Symbol(C2.one, Decl(stringIndexerAssignments2.ts, 5, 10))
 }
 
 class C3 {
 >C3 : Symbol(C3, Decl(stringIndexerAssignments2.ts, 7, 1))
 
-    one: number;
+    one!: number;
 >one : Symbol(C3.one, Decl(stringIndexerAssignments2.ts, 9, 10))
 
-    two: string;
->two : Symbol(C3.two, Decl(stringIndexerAssignments2.ts, 10, 16))
+    two!: string;
+>two : Symbol(C3.two, Decl(stringIndexerAssignments2.ts, 10, 17))
 }
 
-var x: C1;
->x : Symbol(x, Decl(stringIndexerAssignments2.ts, 14, 3))
+declare var x: C1;
+>x : Symbol(x, Decl(stringIndexerAssignments2.ts, 14, 11))
 >C1 : Symbol(C1, Decl(stringIndexerAssignments2.ts, 0, 0))
 
-var a: C2;
->a : Symbol(a, Decl(stringIndexerAssignments2.ts, 15, 3))
+declare var a: C2;
+>a : Symbol(a, Decl(stringIndexerAssignments2.ts, 15, 11))
 >C2 : Symbol(C2, Decl(stringIndexerAssignments2.ts, 3, 1))
 
-var b: C3;
->b : Symbol(b, Decl(stringIndexerAssignments2.ts, 16, 3))
+declare var b: C3;
+>b : Symbol(b, Decl(stringIndexerAssignments2.ts, 16, 11))
 >C3 : Symbol(C3, Decl(stringIndexerAssignments2.ts, 7, 1))
 
 x = a;
->x : Symbol(x, Decl(stringIndexerAssignments2.ts, 14, 3))
->a : Symbol(a, Decl(stringIndexerAssignments2.ts, 15, 3))
+>x : Symbol(x, Decl(stringIndexerAssignments2.ts, 14, 11))
+>a : Symbol(a, Decl(stringIndexerAssignments2.ts, 15, 11))
 
 x = b;
->x : Symbol(x, Decl(stringIndexerAssignments2.ts, 14, 3))
->b : Symbol(b, Decl(stringIndexerAssignments2.ts, 16, 3))
+>x : Symbol(x, Decl(stringIndexerAssignments2.ts, 14, 11))
+>b : Symbol(b, Decl(stringIndexerAssignments2.ts, 16, 11))
 
diff --git a/tests/baselines/reference/stringIndexerAssignments2.types b/tests/baselines/reference/stringIndexerAssignments2.types
index df1e9af81d05b..7d3848fdbbb54 100644
--- a/tests/baselines/reference/stringIndexerAssignments2.types
+++ b/tests/baselines/reference/stringIndexerAssignments2.types
@@ -9,7 +9,7 @@ class C1 {
 >index : string
 >      : ^^^^^^
 
-    one: string;
+    one!: string;
 >one : string
 >    : ^^^^^^
 }
@@ -18,7 +18,7 @@ class C2 {
 >C2 : C2
 >   : ^^
 
-    one: string;
+    one!: string;
 >one : string
 >    : ^^^^^^
 }
@@ -27,24 +27,24 @@ class C3 {
 >C3 : C3
 >   : ^^
 
-    one: number;
+    one!: number;
 >one : number
 >    : ^^^^^^
 
-    two: string;
+    two!: string;
 >two : string
 >    : ^^^^^^
 }
 
-var x: C1;
+declare var x: C1;
 >x : C1
 >  : ^^
 
-var a: C2;
+declare var a: C2;
 >a : C2
 >  : ^^
 
-var b: C3;
+declare var b: C3;
 >b : C3
 >  : ^^
 
diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.js b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.js
index e59b01fe5942c..9b5358315fc09 100644
--- a/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.js
+++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.js
@@ -1,10 +1,10 @@
 //// [tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts] ////
 
 //// [stringLiteralTypesWithVariousOperators01.ts]
-let abc: "ABC" = "ABC";
-let xyz: "XYZ" = "XYZ";
-let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
-let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
+declare let abc: "ABC";
+declare let xyz: "XYZ";
+declare let abcOrXyz: "ABC" | "XYZ";
+declare let abcOrXyzOrNumber: "ABC" | "XYZ" | number;
 
 let a = "" + abc;
 let b = abc + "";
@@ -30,10 +30,6 @@ let u = abc === abcOrXyz;
 let v = abcOrXyz === abcOrXyzOrNumber;
 
 //// [stringLiteralTypesWithVariousOperators01.js]
-var abc = "ABC";
-var xyz = "XYZ";
-var abcOrXyz = abc || xyz;
-var abcOrXyzOrNumber = abcOrXyz || 100;
 var a = "" + abc;
 var b = abc + "";
 var c = 10 + abc;
diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.symbols b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.symbols
index 7b8bc0d327ee3..d0732c46c9983 100644
--- a/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.symbols
+++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.symbols
@@ -1,117 +1,114 @@
 //// [tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts] ////
 
 === stringLiteralTypesWithVariousOperators01.ts ===
-let abc: "ABC" = "ABC";
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 3))
+declare let abc: "ABC";
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 11))
 
-let xyz: "XYZ" = "XYZ";
->xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+declare let xyz: "XYZ";
+>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 11))
 
-let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
->abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 3))
->xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+declare let abcOrXyz: "ABC" | "XYZ";
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 11))
 
-let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
->abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
+declare let abcOrXyzOrNumber: "ABC" | "XYZ" | number;
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 11))
 
 let a = "" + abc;
 >a : Symbol(a, Decl(stringLiteralTypesWithVariousOperators01.ts, 5, 3))
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 11))
 
 let b = abc + "";
 >b : Symbol(b, Decl(stringLiteralTypesWithVariousOperators01.ts, 6, 3))
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 11))
 
 let c = 10 + abc;
 >c : Symbol(c, Decl(stringLiteralTypesWithVariousOperators01.ts, 7, 3))
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 11))
 
 let d = abc + 10;
 >d : Symbol(d, Decl(stringLiteralTypesWithVariousOperators01.ts, 8, 3))
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 11))
 
 let e = xyz + abc;
 >e : Symbol(e, Decl(stringLiteralTypesWithVariousOperators01.ts, 9, 3))
->xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 3))
+>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 11))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 11))
 
 let f = abc + xyz;
 >f : Symbol(f, Decl(stringLiteralTypesWithVariousOperators01.ts, 10, 3))
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 3))
->xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 11))
+>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 11))
 
 let g = true + abc;
 >g : Symbol(g, Decl(stringLiteralTypesWithVariousOperators01.ts, 11, 3))
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 11))
 
 let h = abc + true;
 >h : Symbol(h, Decl(stringLiteralTypesWithVariousOperators01.ts, 12, 3))
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 11))
 
 let i = abc + abcOrXyz + xyz;
 >i : Symbol(i, Decl(stringLiteralTypesWithVariousOperators01.ts, 13, 3))
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 3))
->abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
->xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 11))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 11))
+>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 11))
 
 let j = abcOrXyz + abcOrXyz;
 >j : Symbol(j, Decl(stringLiteralTypesWithVariousOperators01.ts, 14, 3))
->abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
->abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 11))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 11))
 
 let k = +abcOrXyz;
 >k : Symbol(k, Decl(stringLiteralTypesWithVariousOperators01.ts, 15, 3))
->abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 11))
 
 let l = -abcOrXyz;
 >l : Symbol(l, Decl(stringLiteralTypesWithVariousOperators01.ts, 16, 3))
->abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 11))
 
 let m = abcOrXyzOrNumber + "";
 >m : Symbol(m, Decl(stringLiteralTypesWithVariousOperators01.ts, 17, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 11))
 
 let n = "" + abcOrXyzOrNumber;
 >n : Symbol(n, Decl(stringLiteralTypesWithVariousOperators01.ts, 18, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 11))
 
 let o = abcOrXyzOrNumber + abcOrXyz;
 >o : Symbol(o, Decl(stringLiteralTypesWithVariousOperators01.ts, 19, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
->abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 11))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 11))
 
 let p = abcOrXyz + abcOrXyzOrNumber;
 >p : Symbol(p, Decl(stringLiteralTypesWithVariousOperators01.ts, 20, 3))
->abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 11))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 11))
 
 let q = !abcOrXyzOrNumber;
 >q : Symbol(q, Decl(stringLiteralTypesWithVariousOperators01.ts, 21, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 11))
 
 let r = ~abcOrXyzOrNumber;
 >r : Symbol(r, Decl(stringLiteralTypesWithVariousOperators01.ts, 22, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 11))
 
 let s = abcOrXyzOrNumber < abcOrXyzOrNumber;
 >s : Symbol(s, Decl(stringLiteralTypesWithVariousOperators01.ts, 23, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 11))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 11))
 
 let t = abcOrXyzOrNumber >= abcOrXyz;
 >t : Symbol(t, Decl(stringLiteralTypesWithVariousOperators01.ts, 24, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
->abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 11))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 11))
 
 let u = abc === abcOrXyz;
 >u : Symbol(u, Decl(stringLiteralTypesWithVariousOperators01.ts, 25, 3))
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 3))
->abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 0, 11))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 11))
 
 let v = abcOrXyz === abcOrXyzOrNumber;
 >v : Symbol(v, Decl(stringLiteralTypesWithVariousOperators01.ts, 26, 3))
->abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3))
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 11))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 11))
 
diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.types b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.types
index 8fce260189917..eef777c98e7ba 100644
--- a/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.types
+++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.types
@@ -1,37 +1,21 @@
 //// [tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts] ////
 
 === stringLiteralTypesWithVariousOperators01.ts ===
-let abc: "ABC" = "ABC";
+declare let abc: "ABC";
 >abc : "ABC"
 >    : ^^^^^
->"ABC" : "ABC"
->      : ^^^^^
 
-let xyz: "XYZ" = "XYZ";
+declare let xyz: "XYZ";
 >xyz : "XYZ"
 >    : ^^^^^
->"XYZ" : "XYZ"
->      : ^^^^^
 
-let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
+declare let abcOrXyz: "ABC" | "XYZ";
 >abcOrXyz : "ABC" | "XYZ"
 >         : ^^^^^^^^^^^^^
->abc || xyz : "ABC" | "XYZ"
->           : ^^^^^^^^^^^^^
->abc : "ABC"
->    : ^^^^^
->xyz : "XYZ"
->    : ^^^^^
 
-let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
+declare let abcOrXyzOrNumber: "ABC" | "XYZ" | number;
 >abcOrXyzOrNumber : number | "ABC" | "XYZ"
 >                 : ^^^^^^^^^^^^^^^^^^^^^^
->abcOrXyz || 100 : "ABC" | "XYZ" | 100
->                : ^^^^^^^^^^^^^^^^^^^
->abcOrXyz : "ABC" | "XYZ"
->         : ^^^^^^^^^^^^^
->100 : 100
->    : ^^^
 
 let a = "" + abc;
 >a : string
diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt
index 0cb00b42c8def..7dc532acbbb4c 100644
--- a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt
+++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt
@@ -12,10 +12,10 @@ stringLiteralTypesWithVariousOperators02.ts(17,9): error TS2367: This comparison
 
 
 ==== stringLiteralTypesWithVariousOperators02.ts (11 errors) ====
-    let abc: "ABC" = "ABC";
-    let xyz: "XYZ" = "XYZ";
-    let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
-    let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
+    declare let abc: "ABC";
+    declare let xyz: "XYZ";
+    declare let abcOrXyz: "ABC" | "XYZ";
+    declare let abcOrXyzOrNumber: "ABC" | "XYZ" | number;
     
     let a = abcOrXyzOrNumber + 100;
             ~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.js b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.js
index bd7879c241983..6c1dd120c5ece 100644
--- a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.js
+++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.js
@@ -1,10 +1,10 @@
 //// [tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts] ////
 
 //// [stringLiteralTypesWithVariousOperators02.ts]
-let abc: "ABC" = "ABC";
-let xyz: "XYZ" = "XYZ";
-let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
-let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
+declare let abc: "ABC";
+declare let xyz: "XYZ";
+declare let abcOrXyz: "ABC" | "XYZ";
+declare let abcOrXyzOrNumber: "ABC" | "XYZ" | number;
 
 let a = abcOrXyzOrNumber + 100;
 let b = 100 + abcOrXyzOrNumber;
@@ -20,10 +20,6 @@ let k = abc === xyz;
 let l = abc != xyz;
 
 //// [stringLiteralTypesWithVariousOperators02.js]
-var abc = "ABC";
-var xyz = "XYZ";
-var abcOrXyz = abc || xyz;
-var abcOrXyzOrNumber = abcOrXyz || 100;
 var a = abcOrXyzOrNumber + 100;
 var b = 100 + abcOrXyzOrNumber;
 var c = abcOrXyzOrNumber + abcOrXyzOrNumber;
diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.symbols b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.symbols
index 42e0524f2cf28..438da13b8bebe 100644
--- a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.symbols
+++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.symbols
@@ -1,70 +1,67 @@
 //// [tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts] ////
 
 === stringLiteralTypesWithVariousOperators02.ts ===
-let abc: "ABC" = "ABC";
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators02.ts, 0, 3))
+declare let abc: "ABC";
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators02.ts, 0, 11))
 
-let xyz: "XYZ" = "XYZ";
->xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators02.ts, 1, 3))
+declare let xyz: "XYZ";
+>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators02.ts, 1, 11))
 
-let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
->abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators02.ts, 2, 3))
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators02.ts, 0, 3))
->xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators02.ts, 1, 3))
+declare let abcOrXyz: "ABC" | "XYZ";
+>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators02.ts, 2, 11))
 
-let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 3))
->abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators02.ts, 2, 3))
+declare let abcOrXyzOrNumber: "ABC" | "XYZ" | number;
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 11))
 
 let a = abcOrXyzOrNumber + 100;
 >a : Symbol(a, Decl(stringLiteralTypesWithVariousOperators02.ts, 5, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 11))
 
 let b = 100 + abcOrXyzOrNumber;
 >b : Symbol(b, Decl(stringLiteralTypesWithVariousOperators02.ts, 6, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 11))
 
 let c = abcOrXyzOrNumber + abcOrXyzOrNumber;
 >c : Symbol(c, Decl(stringLiteralTypesWithVariousOperators02.ts, 7, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 11))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 11))
 
 let d = abcOrXyzOrNumber + true;
 >d : Symbol(d, Decl(stringLiteralTypesWithVariousOperators02.ts, 8, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 11))
 
 let e = false + abcOrXyzOrNumber;
 >e : Symbol(e, Decl(stringLiteralTypesWithVariousOperators02.ts, 9, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 11))
 
 let f = abcOrXyzOrNumber++;
 >f : Symbol(f, Decl(stringLiteralTypesWithVariousOperators02.ts, 10, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 11))
 
 let g = --abcOrXyzOrNumber;
 >g : Symbol(g, Decl(stringLiteralTypesWithVariousOperators02.ts, 11, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 11))
 
 let h = abcOrXyzOrNumber ^ 10;
 >h : Symbol(h, Decl(stringLiteralTypesWithVariousOperators02.ts, 12, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 11))
 
 let i = abcOrXyzOrNumber | 10;
 >i : Symbol(i, Decl(stringLiteralTypesWithVariousOperators02.ts, 13, 3))
->abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 3))
+>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators02.ts, 3, 11))
 
 let j = abc < xyz;
 >j : Symbol(j, Decl(stringLiteralTypesWithVariousOperators02.ts, 14, 3))
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators02.ts, 0, 3))
->xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators02.ts, 1, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators02.ts, 0, 11))
+>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators02.ts, 1, 11))
 
 let k = abc === xyz;
 >k : Symbol(k, Decl(stringLiteralTypesWithVariousOperators02.ts, 15, 3))
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators02.ts, 0, 3))
->xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators02.ts, 1, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators02.ts, 0, 11))
+>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators02.ts, 1, 11))
 
 let l = abc != xyz;
 >l : Symbol(l, Decl(stringLiteralTypesWithVariousOperators02.ts, 16, 3))
->abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators02.ts, 0, 3))
->xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators02.ts, 1, 3))
+>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators02.ts, 0, 11))
+>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators02.ts, 1, 11))
 
diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.types b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.types
index 4e2a7456fa6c5..bb2a0477239ce 100644
--- a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.types
+++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.types
@@ -1,37 +1,21 @@
 //// [tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts] ////
 
 === stringLiteralTypesWithVariousOperators02.ts ===
-let abc: "ABC" = "ABC";
+declare let abc: "ABC";
 >abc : "ABC"
 >    : ^^^^^
->"ABC" : "ABC"
->      : ^^^^^
 
-let xyz: "XYZ" = "XYZ";
+declare let xyz: "XYZ";
 >xyz : "XYZ"
 >    : ^^^^^
->"XYZ" : "XYZ"
->      : ^^^^^
 
-let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
+declare let abcOrXyz: "ABC" | "XYZ";
 >abcOrXyz : "ABC" | "XYZ"
 >         : ^^^^^^^^^^^^^
->abc || xyz : "ABC" | "XYZ"
->           : ^^^^^^^^^^^^^
->abc : "ABC"
->    : ^^^^^
->xyz : "XYZ"
->    : ^^^^^
 
-let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
+declare let abcOrXyzOrNumber: "ABC" | "XYZ" | number;
 >abcOrXyzOrNumber : number | "ABC" | "XYZ"
 >                 : ^^^^^^^^^^^^^^^^^^^^^^
->abcOrXyz || 100 : "ABC" | "XYZ" | 100
->                : ^^^^^^^^^^^^^^^^^^^
->abcOrXyz : "ABC" | "XYZ"
->         : ^^^^^^^^^^^^^
->100 : 100
->    : ^^^
 
 let a = abcOrXyzOrNumber + 100;
 >a : any
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks01.errors.txt b/tests/baselines/reference/stringLiteralsWithEqualityChecks01.errors.txt
index 2dbd0fa028dd9..1072c393f7a1a 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks01.errors.txt
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks01.errors.txt
@@ -7,8 +7,8 @@ stringLiteralsWithEqualityChecks01.ts(19,5): error TS2367: This comparison appea
 
 
 ==== stringLiteralsWithEqualityChecks01.ts (6 errors) ====
-    let x: "foo";
-    let y: "foo" | "bar";
+    declare let x: "foo";
+    declare let y: "foo" | "bar";
     
     let b: boolean;
     b = x === y;
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks01.js b/tests/baselines/reference/stringLiteralsWithEqualityChecks01.js
index 5c753d9a0111a..7073347e51b1d 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks01.js
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks01.js
@@ -1,8 +1,8 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks01.ts] ////
 
 //// [stringLiteralsWithEqualityChecks01.ts]
-let x: "foo";
-let y: "foo" | "bar";
+declare let x: "foo";
+declare let y: "foo" | "bar";
 
 let b: boolean;
 b = x === y;
@@ -26,8 +26,6 @@ b = "bar" !== y;
 
 
 //// [stringLiteralsWithEqualityChecks01.js]
-var x;
-var y;
 var b;
 b = x === y;
 b = "foo" === y;
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks01.symbols b/tests/baselines/reference/stringLiteralsWithEqualityChecks01.symbols
index 3ac1d9c124f42..175fa4382a44c 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks01.symbols
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks01.symbols
@@ -1,77 +1,77 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks01.ts] ////
 
 === stringLiteralsWithEqualityChecks01.ts ===
-let x: "foo";
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks01.ts, 0, 3))
+declare let x: "foo";
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks01.ts, 0, 11))
 
-let y: "foo" | "bar";
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 3))
+declare let y: "foo" | "bar";
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 11))
 
 let b: boolean;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
 
 b = x === y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks01.ts, 0, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks01.ts, 0, 11))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 11))
 
 b = "foo" === y
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 11))
 
 b = y === "foo";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 11))
 
 b = "foo" === "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
 
 b = "bar" === x;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks01.ts, 0, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks01.ts, 0, 11))
 
 b = x === "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks01.ts, 0, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks01.ts, 0, 11))
 
 b = y === "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 11))
 
 b = "bar" === y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 11))
 
 b = x !== y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks01.ts, 0, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks01.ts, 0, 11))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 11))
 
 b = "foo" !== y
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 11))
 
 b = y !== "foo";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 11))
 
 b = "foo" !== "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
 
 b = "bar" !== x;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks01.ts, 0, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks01.ts, 0, 11))
 
 b = x !== "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks01.ts, 0, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks01.ts, 0, 11))
 
 b = y !== "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 11))
 
 b = "bar" !== y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks01.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks01.ts, 1, 11))
 
 
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks01.types b/tests/baselines/reference/stringLiteralsWithEqualityChecks01.types
index e8e3824abd276..b2516d784e002 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks01.types
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks01.types
@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks01.ts] ////
 
 === stringLiteralsWithEqualityChecks01.ts ===
-let x: "foo";
+declare let x: "foo";
 >x : "foo"
 >  : ^^^^^
 
-let y: "foo" | "bar";
+declare let y: "foo" | "bar";
 >y : "foo" | "bar"
 >  : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks02.errors.txt b/tests/baselines/reference/stringLiteralsWithEqualityChecks02.errors.txt
index 41ce210666527..12eb4bc8469bf 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks02.errors.txt
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks02.errors.txt
@@ -7,8 +7,8 @@ stringLiteralsWithEqualityChecks02.ts(19,5): error TS2367: This comparison appea
 
 
 ==== stringLiteralsWithEqualityChecks02.ts (6 errors) ====
-    let x: "foo";
-    let y: "foo" | "bar";
+    declare let x: "foo";
+    declare let y: "foo" | "bar";
     
     let b: boolean;
     b = x == y;
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks02.js b/tests/baselines/reference/stringLiteralsWithEqualityChecks02.js
index 4140277599e36..e0292ff14627e 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks02.js
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks02.js
@@ -1,8 +1,8 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks02.ts] ////
 
 //// [stringLiteralsWithEqualityChecks02.ts]
-let x: "foo";
-let y: "foo" | "bar";
+declare let x: "foo";
+declare let y: "foo" | "bar";
 
 let b: boolean;
 b = x == y;
@@ -26,8 +26,6 @@ b = "bar" != y;
 
 
 //// [stringLiteralsWithEqualityChecks02.js]
-var x;
-var y;
 var b;
 b = x == y;
 b = "foo" == y;
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks02.symbols b/tests/baselines/reference/stringLiteralsWithEqualityChecks02.symbols
index 940543341f531..79b2afb2d15b1 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks02.symbols
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks02.symbols
@@ -1,77 +1,77 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks02.ts] ////
 
 === stringLiteralsWithEqualityChecks02.ts ===
-let x: "foo";
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks02.ts, 0, 3))
+declare let x: "foo";
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks02.ts, 0, 11))
 
-let y: "foo" | "bar";
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 3))
+declare let y: "foo" | "bar";
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 11))
 
 let b: boolean;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
 
 b = x == y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks02.ts, 0, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks02.ts, 0, 11))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 11))
 
 b = "foo" == y
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 11))
 
 b = y == "foo";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 11))
 
 b = "foo" == "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
 
 b = "bar" == x;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks02.ts, 0, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks02.ts, 0, 11))
 
 b = x == "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks02.ts, 0, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks02.ts, 0, 11))
 
 b = y == "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 11))
 
 b = "bar" == y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 11))
 
 b = x != y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks02.ts, 0, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks02.ts, 0, 11))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 11))
 
 b = "foo" != y
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 11))
 
 b = y != "foo";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 11))
 
 b = "foo" != "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
 
 b = "bar" != x;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks02.ts, 0, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks02.ts, 0, 11))
 
 b = x != "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks02.ts, 0, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks02.ts, 0, 11))
 
 b = y != "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 11))
 
 b = "bar" != y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks02.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks02.ts, 1, 11))
 
 
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks02.types b/tests/baselines/reference/stringLiteralsWithEqualityChecks02.types
index fd2522494b61b..b06b6809427c3 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks02.types
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks02.types
@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks02.ts] ////
 
 === stringLiteralsWithEqualityChecks02.ts ===
-let x: "foo";
+declare let x: "foo";
 >x : "foo"
 >  : ^^^^^
 
-let y: "foo" | "bar";
+declare let y: "foo" | "bar";
 >y : "foo" | "bar"
 >  : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks03.errors.txt b/tests/baselines/reference/stringLiteralsWithEqualityChecks03.errors.txt
index f1a2dfa68d414..4672122d405ee 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks03.errors.txt
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks03.errors.txt
@@ -15,8 +15,8 @@ stringLiteralsWithEqualityChecks03.ts(29,5): error TS2367: This comparison appea
         makesFoodGoBrrr: boolean;
     }
     
-    let x: string;
-    let y: "foo" | Refrigerator;
+    declare let x: string;
+    declare let y: "foo" | Refrigerator;
     
     let b: boolean;
     b = x === y;
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks03.js b/tests/baselines/reference/stringLiteralsWithEqualityChecks03.js
index 5cece6a4fb404..3081dc95b8b6e 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks03.js
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks03.js
@@ -9,8 +9,8 @@ interface Refrigerator extends Runnable {
     makesFoodGoBrrr: boolean;
 }
 
-let x: string;
-let y: "foo" | Refrigerator;
+declare let x: string;
+declare let y: "foo" | Refrigerator;
 
 let b: boolean;
 b = x === y;
@@ -33,8 +33,6 @@ b = "bar" !== y;
 
 
 //// [stringLiteralsWithEqualityChecks03.js]
-var x;
-var y;
 var b;
 b = x === y;
 b = "foo" === y;
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks03.symbols b/tests/baselines/reference/stringLiteralsWithEqualityChecks03.symbols
index c1693b4adb053..700f0217d1154 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks03.symbols
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks03.symbols
@@ -16,11 +16,11 @@ interface Refrigerator extends Runnable {
 >makesFoodGoBrrr : Symbol(Refrigerator.makesFoodGoBrrr, Decl(stringLiteralsWithEqualityChecks03.ts, 4, 41))
 }
 
-let x: string;
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks03.ts, 8, 3))
+declare let x: string;
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks03.ts, 8, 11))
 
-let y: "foo" | Refrigerator;
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 3))
+declare let y: "foo" | Refrigerator;
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 11))
 >Refrigerator : Symbol(Refrigerator, Decl(stringLiteralsWithEqualityChecks03.ts, 2, 1))
 
 let b: boolean;
@@ -28,65 +28,65 @@ let b: boolean;
 
 b = x === y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks03.ts, 8, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks03.ts, 8, 11))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 11))
 
 b = "foo" === y
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 11))
 
 b = y === "foo";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 11))
 
 b = "foo" === "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
 
 b = "bar" === x;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks03.ts, 8, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks03.ts, 8, 11))
 
 b = x === "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks03.ts, 8, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks03.ts, 8, 11))
 
 b = y === "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 11))
 
 b = "bar" === y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 11))
 
 b = x !== y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks03.ts, 8, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks03.ts, 8, 11))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 11))
 
 b = "foo" !== y
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 11))
 
 b = y !== "foo";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 11))
 
 b = "foo" !== "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
 
 b = "bar" !== x;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks03.ts, 8, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks03.ts, 8, 11))
 
 b = x !== "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks03.ts, 8, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks03.ts, 8, 11))
 
 b = y !== "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 11))
 
 b = "bar" !== y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks03.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks03.ts, 9, 11))
 
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks03.types b/tests/baselines/reference/stringLiteralsWithEqualityChecks03.types
index 02c798b5a6eed..f9ac121f9c837 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks03.types
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks03.types
@@ -13,11 +13,11 @@ interface Refrigerator extends Runnable {
 >                : ^^^^^^^
 }
 
-let x: string;
+declare let x: string;
 >x : string
 >  : ^^^^^^
 
-let y: "foo" | Refrigerator;
+declare let y: "foo" | Refrigerator;
 >y : Refrigerator | "foo"
 >  : ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks04.errors.txt b/tests/baselines/reference/stringLiteralsWithEqualityChecks04.errors.txt
index 2a3bd12024eaa..ddb6418eeeab2 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks04.errors.txt
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks04.errors.txt
@@ -15,8 +15,8 @@ stringLiteralsWithEqualityChecks04.ts(29,5): error TS2367: This comparison appea
         makesFoodGoBrrr: boolean;
     }
     
-    let x: string;
-    let y: "foo" | Refrigerator;
+    declare let x: string;
+    declare let y: "foo" | Refrigerator;
     
     let b: boolean;
     b = x == y;
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks04.js b/tests/baselines/reference/stringLiteralsWithEqualityChecks04.js
index 3cb7f45cbf946..e278ce69af1cb 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks04.js
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks04.js
@@ -9,8 +9,8 @@ interface Refrigerator extends Runnable {
     makesFoodGoBrrr: boolean;
 }
 
-let x: string;
-let y: "foo" | Refrigerator;
+declare let x: string;
+declare let y: "foo" | Refrigerator;
 
 let b: boolean;
 b = x == y;
@@ -33,8 +33,6 @@ b = "bar" != y;
 
 
 //// [stringLiteralsWithEqualityChecks04.js]
-var x;
-var y;
 var b;
 b = x == y;
 b = "foo" == y;
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks04.symbols b/tests/baselines/reference/stringLiteralsWithEqualityChecks04.symbols
index 5f843e7985b11..d787558acbb18 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks04.symbols
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks04.symbols
@@ -16,11 +16,11 @@ interface Refrigerator extends Runnable {
 >makesFoodGoBrrr : Symbol(Refrigerator.makesFoodGoBrrr, Decl(stringLiteralsWithEqualityChecks04.ts, 4, 41))
 }
 
-let x: string;
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks04.ts, 8, 3))
+declare let x: string;
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks04.ts, 8, 11))
 
-let y: "foo" | Refrigerator;
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 3))
+declare let y: "foo" | Refrigerator;
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 11))
 >Refrigerator : Symbol(Refrigerator, Decl(stringLiteralsWithEqualityChecks04.ts, 2, 1))
 
 let b: boolean;
@@ -28,65 +28,65 @@ let b: boolean;
 
 b = x == y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks04.ts, 8, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks04.ts, 8, 11))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 11))
 
 b = "foo" == y
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 11))
 
 b = y == "foo";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 11))
 
 b = "foo" == "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
 
 b = "bar" == x;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks04.ts, 8, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks04.ts, 8, 11))
 
 b = x == "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks04.ts, 8, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks04.ts, 8, 11))
 
 b = y == "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 11))
 
 b = "bar" == y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 11))
 
 b = x != y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks04.ts, 8, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks04.ts, 8, 11))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 11))
 
 b = "foo" != y
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 11))
 
 b = y != "foo";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 11))
 
 b = "foo" != "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
 
 b = "bar" != x;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks04.ts, 8, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks04.ts, 8, 11))
 
 b = x != "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
->x : Symbol(x, Decl(stringLiteralsWithEqualityChecks04.ts, 8, 3))
+>x : Symbol(x, Decl(stringLiteralsWithEqualityChecks04.ts, 8, 11))
 
 b = y != "bar";
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 11))
 
 b = "bar" != y;
 >b : Symbol(b, Decl(stringLiteralsWithEqualityChecks04.ts, 11, 3))
->y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 3))
+>y : Symbol(y, Decl(stringLiteralsWithEqualityChecks04.ts, 9, 11))
 
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks04.types b/tests/baselines/reference/stringLiteralsWithEqualityChecks04.types
index 89a4132f426e5..c66074ac0f265 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks04.types
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks04.types
@@ -13,11 +13,11 @@ interface Refrigerator extends Runnable {
 >                : ^^^^^^^
 }
 
-let x: string;
+declare let x: string;
 >x : string
 >  : ^^^^^^
 
-let y: "foo" | Refrigerator;
+declare let y: "foo" | Refrigerator;
 >y : Refrigerator | "foo"
 >  : ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements01.errors.txt b/tests/baselines/reference/stringLiteralsWithSwitchStatements01.errors.txt
index 23fad591c83fd..5bbe909df69ef 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements01.errors.txt
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements01.errors.txt
@@ -2,8 +2,8 @@ stringLiteralsWithSwitchStatements01.ts(7,10): error TS2678: Type '"bar"' is not
 
 
 ==== stringLiteralsWithSwitchStatements01.ts (1 errors) ====
-    let x: "foo";
-    let y: "foo" | "bar"; 
+    declare let x: "foo";
+    declare let y: "foo" | "bar";
     
     switch (x) {
         case "foo":
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements01.js b/tests/baselines/reference/stringLiteralsWithSwitchStatements01.js
index f0349c1dad3eb..e21e08fc715d8 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements01.js
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements01.js
@@ -1,8 +1,8 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements01.ts] ////
 
 //// [stringLiteralsWithSwitchStatements01.ts]
-let x: "foo";
-let y: "foo" | "bar"; 
+declare let x: "foo";
+declare let y: "foo" | "bar";
 
 switch (x) {
     case "foo":
@@ -16,8 +16,6 @@ switch (x) {
 
 
 //// [stringLiteralsWithSwitchStatements01.js]
-var x;
-var y;
 switch (x) {
     case "foo":
         break;
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements01.symbols b/tests/baselines/reference/stringLiteralsWithSwitchStatements01.symbols
index 428178f557989..b1d745e581db2 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements01.symbols
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements01.symbols
@@ -1,24 +1,24 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements01.ts] ////
 
 === stringLiteralsWithSwitchStatements01.ts ===
-let x: "foo";
->x : Symbol(x, Decl(stringLiteralsWithSwitchStatements01.ts, 0, 3))
+declare let x: "foo";
+>x : Symbol(x, Decl(stringLiteralsWithSwitchStatements01.ts, 0, 11))
 
-let y: "foo" | "bar"; 
->y : Symbol(y, Decl(stringLiteralsWithSwitchStatements01.ts, 1, 3))
+declare let y: "foo" | "bar";
+>y : Symbol(y, Decl(stringLiteralsWithSwitchStatements01.ts, 1, 11))
 
 switch (x) {
->x : Symbol(x, Decl(stringLiteralsWithSwitchStatements01.ts, 0, 3))
+>x : Symbol(x, Decl(stringLiteralsWithSwitchStatements01.ts, 0, 11))
 
     case "foo":
         break;
     case "bar":
         break;
     case y:
->y : Symbol(y, Decl(stringLiteralsWithSwitchStatements01.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithSwitchStatements01.ts, 1, 11))
 
         y;
->y : Symbol(y, Decl(stringLiteralsWithSwitchStatements01.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithSwitchStatements01.ts, 1, 11))
 
         break;
 }
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements01.types b/tests/baselines/reference/stringLiteralsWithSwitchStatements01.types
index aa17c481c17bd..42ba0797c538e 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements01.types
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements01.types
@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements01.ts] ////
 
 === stringLiteralsWithSwitchStatements01.ts ===
-let x: "foo";
+declare let x: "foo";
 >x : "foo"
 >  : ^^^^^
 
-let y: "foo" | "bar"; 
+declare let y: "foo" | "bar";
 >y : "foo" | "bar"
 >  : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements02.errors.txt b/tests/baselines/reference/stringLiteralsWithSwitchStatements02.errors.txt
index 2979b3109f702..1428b51895815 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements02.errors.txt
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements02.errors.txt
@@ -3,8 +3,8 @@ stringLiteralsWithSwitchStatements02.ts(13,5): error TS2367: This comparison app
 
 
 ==== stringLiteralsWithSwitchStatements02.ts (2 errors) ====
-    let x: "foo";
-    let y: "foo" | "bar";
+    declare let x: "foo";
+    declare let y: "foo" | "bar";
     
     let b: boolean;
     b = x == y;
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements02.js b/tests/baselines/reference/stringLiteralsWithSwitchStatements02.js
index 1d0ddccb59b49..4f1917f77e389 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements02.js
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements02.js
@@ -1,8 +1,8 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements02.ts] ////
 
 //// [stringLiteralsWithSwitchStatements02.ts]
-let x: "foo";
-let y: "foo" | "bar";
+declare let x: "foo";
+declare let y: "foo" | "bar";
 
 let b: boolean;
 b = x == y;
@@ -18,8 +18,6 @@ b = "foo" != "bar";
 
 
 //// [stringLiteralsWithSwitchStatements02.js]
-var x;
-var y;
 var b;
 b = x == y;
 b = "foo" == y;
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements02.symbols b/tests/baselines/reference/stringLiteralsWithSwitchStatements02.symbols
index 7a9e9429c4367..c94a696f79ca2 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements02.symbols
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements02.symbols
@@ -1,43 +1,43 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements02.ts] ////
 
 === stringLiteralsWithSwitchStatements02.ts ===
-let x: "foo";
->x : Symbol(x, Decl(stringLiteralsWithSwitchStatements02.ts, 0, 3))
+declare let x: "foo";
+>x : Symbol(x, Decl(stringLiteralsWithSwitchStatements02.ts, 0, 11))
 
-let y: "foo" | "bar";
->y : Symbol(y, Decl(stringLiteralsWithSwitchStatements02.ts, 1, 3))
+declare let y: "foo" | "bar";
+>y : Symbol(y, Decl(stringLiteralsWithSwitchStatements02.ts, 1, 11))
 
 let b: boolean;
 >b : Symbol(b, Decl(stringLiteralsWithSwitchStatements02.ts, 3, 3))
 
 b = x == y;
 >b : Symbol(b, Decl(stringLiteralsWithSwitchStatements02.ts, 3, 3))
->x : Symbol(x, Decl(stringLiteralsWithSwitchStatements02.ts, 0, 3))
->y : Symbol(y, Decl(stringLiteralsWithSwitchStatements02.ts, 1, 3))
+>x : Symbol(x, Decl(stringLiteralsWithSwitchStatements02.ts, 0, 11))
+>y : Symbol(y, Decl(stringLiteralsWithSwitchStatements02.ts, 1, 11))
 
 b = "foo" == y
 >b : Symbol(b, Decl(stringLiteralsWithSwitchStatements02.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithSwitchStatements02.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithSwitchStatements02.ts, 1, 11))
 
 b = y == "foo";
 >b : Symbol(b, Decl(stringLiteralsWithSwitchStatements02.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithSwitchStatements02.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithSwitchStatements02.ts, 1, 11))
 
 b = "foo" == "bar";
 >b : Symbol(b, Decl(stringLiteralsWithSwitchStatements02.ts, 3, 3))
 
 b = x != y;
 >b : Symbol(b, Decl(stringLiteralsWithSwitchStatements02.ts, 3, 3))
->x : Symbol(x, Decl(stringLiteralsWithSwitchStatements02.ts, 0, 3))
->y : Symbol(y, Decl(stringLiteralsWithSwitchStatements02.ts, 1, 3))
+>x : Symbol(x, Decl(stringLiteralsWithSwitchStatements02.ts, 0, 11))
+>y : Symbol(y, Decl(stringLiteralsWithSwitchStatements02.ts, 1, 11))
 
 b = "foo" != y
 >b : Symbol(b, Decl(stringLiteralsWithSwitchStatements02.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithSwitchStatements02.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithSwitchStatements02.ts, 1, 11))
 
 b = y != "foo";
 >b : Symbol(b, Decl(stringLiteralsWithSwitchStatements02.ts, 3, 3))
->y : Symbol(y, Decl(stringLiteralsWithSwitchStatements02.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithSwitchStatements02.ts, 1, 11))
 
 b = "foo" != "bar";
 >b : Symbol(b, Decl(stringLiteralsWithSwitchStatements02.ts, 3, 3))
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements02.types b/tests/baselines/reference/stringLiteralsWithSwitchStatements02.types
index 52f474e2298f9..32172ac09514b 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements02.types
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements02.types
@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements02.ts] ////
 
 === stringLiteralsWithSwitchStatements02.ts ===
-let x: "foo";
+declare let x: "foo";
 >x : "foo"
 >  : ^^^^^
 
-let y: "foo" | "bar";
+declare let y: "foo" | "bar";
 >y : "foo" | "bar"
 >  : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements03.errors.txt b/tests/baselines/reference/stringLiteralsWithSwitchStatements03.errors.txt
index cf9ca906d7fa5..bf6dc9a6c2421 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements03.errors.txt
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements03.errors.txt
@@ -17,9 +17,9 @@ stringLiteralsWithSwitchStatements03.ts(23,10): error TS2678: Type '"bar" | "baz
 
 
 ==== stringLiteralsWithSwitchStatements03.ts (12 errors) ====
-    let x: "foo";
-    let y: "foo" | "bar"; 
-    let z: "bar";
+    declare let x: "foo";
+    declare let y: "foo" | "bar";
+    declare let z: "bar";
     
     declare function randBool(): boolean;
     
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements03.js b/tests/baselines/reference/stringLiteralsWithSwitchStatements03.js
index 8659357941cf8..74c04cb1c480b 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements03.js
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements03.js
@@ -1,9 +1,9 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements03.ts] ////
 
 //// [stringLiteralsWithSwitchStatements03.ts]
-let x: "foo";
-let y: "foo" | "bar"; 
-let z: "bar";
+declare let x: "foo";
+declare let y: "foo" | "bar";
+declare let z: "bar";
 
 declare function randBool(): boolean;
 
@@ -30,9 +30,6 @@ switch (x) {
 
 
 //// [stringLiteralsWithSwitchStatements03.js]
-var x;
-var y;
-var z;
 switch (x) {
     case randBool() ? "foo" : "baz":
         break;
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements03.symbols b/tests/baselines/reference/stringLiteralsWithSwitchStatements03.symbols
index cfa9aca1d7df2..b80d6c2e19840 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements03.symbols
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements03.symbols
@@ -1,40 +1,40 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements03.ts] ////
 
 === stringLiteralsWithSwitchStatements03.ts ===
-let x: "foo";
->x : Symbol(x, Decl(stringLiteralsWithSwitchStatements03.ts, 0, 3))
+declare let x: "foo";
+>x : Symbol(x, Decl(stringLiteralsWithSwitchStatements03.ts, 0, 11))
 
-let y: "foo" | "bar"; 
->y : Symbol(y, Decl(stringLiteralsWithSwitchStatements03.ts, 1, 3))
+declare let y: "foo" | "bar";
+>y : Symbol(y, Decl(stringLiteralsWithSwitchStatements03.ts, 1, 11))
 
-let z: "bar";
->z : Symbol(z, Decl(stringLiteralsWithSwitchStatements03.ts, 2, 3))
+declare let z: "bar";
+>z : Symbol(z, Decl(stringLiteralsWithSwitchStatements03.ts, 2, 11))
 
 declare function randBool(): boolean;
->randBool : Symbol(randBool, Decl(stringLiteralsWithSwitchStatements03.ts, 2, 13))
+>randBool : Symbol(randBool, Decl(stringLiteralsWithSwitchStatements03.ts, 2, 21))
 
 switch (x) {
->x : Symbol(x, Decl(stringLiteralsWithSwitchStatements03.ts, 0, 3))
+>x : Symbol(x, Decl(stringLiteralsWithSwitchStatements03.ts, 0, 11))
 
     case randBool() ? "foo" : "baz":
->randBool : Symbol(randBool, Decl(stringLiteralsWithSwitchStatements03.ts, 2, 13))
+>randBool : Symbol(randBool, Decl(stringLiteralsWithSwitchStatements03.ts, 2, 21))
 
         break;
     case (randBool() ? ("bar") : "baz" ? "bar" : "baz"):
->randBool : Symbol(randBool, Decl(stringLiteralsWithSwitchStatements03.ts, 2, 13))
+>randBool : Symbol(randBool, Decl(stringLiteralsWithSwitchStatements03.ts, 2, 21))
 
         break;
     case (("bar")):
         break;
     case (x, y, ("baz")):
->x : Symbol(x, Decl(stringLiteralsWithSwitchStatements03.ts, 0, 3))
->y : Symbol(y, Decl(stringLiteralsWithSwitchStatements03.ts, 1, 3))
+>x : Symbol(x, Decl(stringLiteralsWithSwitchStatements03.ts, 0, 11))
+>y : Symbol(y, Decl(stringLiteralsWithSwitchStatements03.ts, 1, 11))
 
         x;
->x : Symbol(x, Decl(stringLiteralsWithSwitchStatements03.ts, 0, 3))
+>x : Symbol(x, Decl(stringLiteralsWithSwitchStatements03.ts, 0, 11))
 
         y;
->y : Symbol(y, Decl(stringLiteralsWithSwitchStatements03.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithSwitchStatements03.ts, 1, 11))
 
         break;
     case (("foo" || ("bar"))):
@@ -42,13 +42,13 @@ switch (x) {
     case (("bar" || ("baz"))):
         break;
     case z || "baz":
->z : Symbol(z, Decl(stringLiteralsWithSwitchStatements03.ts, 2, 3))
+>z : Symbol(z, Decl(stringLiteralsWithSwitchStatements03.ts, 2, 11))
 
     case "baz" || z:
->z : Symbol(z, Decl(stringLiteralsWithSwitchStatements03.ts, 2, 3))
+>z : Symbol(z, Decl(stringLiteralsWithSwitchStatements03.ts, 2, 11))
 
         z;
->z : Symbol(z, Decl(stringLiteralsWithSwitchStatements03.ts, 2, 3))
+>z : Symbol(z, Decl(stringLiteralsWithSwitchStatements03.ts, 2, 11))
 
         break;
 }
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements03.types b/tests/baselines/reference/stringLiteralsWithSwitchStatements03.types
index bbf7fa3584a83..40d65dba39b9b 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements03.types
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements03.types
@@ -1,15 +1,15 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements03.ts] ////
 
 === stringLiteralsWithSwitchStatements03.ts ===
-let x: "foo";
+declare let x: "foo";
 >x : "foo"
 >  : ^^^^^
 
-let y: "foo" | "bar"; 
+declare let y: "foo" | "bar";
 >y : "foo" | "bar"
 >  : ^^^^^^^^^^^^^
 
-let z: "bar";
+declare let z: "bar";
 >z : "bar"
 >  : ^^^^^
 
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements04.errors.txt b/tests/baselines/reference/stringLiteralsWithSwitchStatements04.errors.txt
index 981a8cdea647b..3d32dbe2e2670 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements04.errors.txt
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements04.errors.txt
@@ -11,8 +11,8 @@ stringLiteralsWithSwitchStatements04.ts(19,20): error TS2872: This kind of expre
 
 
 ==== stringLiteralsWithSwitchStatements04.ts (10 errors) ====
-    let x: "foo";
-    let y: "foo" | "bar"; 
+    declare let x: "foo";
+    declare let y: "foo" | "bar";
     
     declare function randBool(): boolean;
     
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements04.js b/tests/baselines/reference/stringLiteralsWithSwitchStatements04.js
index c3dbb3ae47925..d3e2e42d7cff9 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements04.js
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements04.js
@@ -1,8 +1,8 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements04.ts] ////
 
 //// [stringLiteralsWithSwitchStatements04.ts]
-let x: "foo";
-let y: "foo" | "bar"; 
+declare let x: "foo";
+declare let y: "foo" | "bar";
 
 declare function randBool(): boolean;
 
@@ -25,8 +25,6 @@ switch (y) {
 
 
 //// [stringLiteralsWithSwitchStatements04.js]
-var x;
-var y;
 switch (y) {
     case "foo", x:
         break;
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements04.symbols b/tests/baselines/reference/stringLiteralsWithSwitchStatements04.symbols
index 17ecf547fc6e7..ab008d52d2885 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements04.symbols
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements04.symbols
@@ -1,32 +1,32 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements04.ts] ////
 
 === stringLiteralsWithSwitchStatements04.ts ===
-let x: "foo";
->x : Symbol(x, Decl(stringLiteralsWithSwitchStatements04.ts, 0, 3))
+declare let x: "foo";
+>x : Symbol(x, Decl(stringLiteralsWithSwitchStatements04.ts, 0, 11))
 
-let y: "foo" | "bar"; 
->y : Symbol(y, Decl(stringLiteralsWithSwitchStatements04.ts, 1, 3))
+declare let y: "foo" | "bar";
+>y : Symbol(y, Decl(stringLiteralsWithSwitchStatements04.ts, 1, 11))
 
 declare function randBool(): boolean;
->randBool : Symbol(randBool, Decl(stringLiteralsWithSwitchStatements04.ts, 1, 21))
+>randBool : Symbol(randBool, Decl(stringLiteralsWithSwitchStatements04.ts, 1, 29))
 
 switch (y) {
->y : Symbol(y, Decl(stringLiteralsWithSwitchStatements04.ts, 1, 3))
+>y : Symbol(y, Decl(stringLiteralsWithSwitchStatements04.ts, 1, 11))
 
     case "foo", x:
->x : Symbol(x, Decl(stringLiteralsWithSwitchStatements04.ts, 0, 3))
+>x : Symbol(x, Decl(stringLiteralsWithSwitchStatements04.ts, 0, 11))
 
         break;
     case x, "foo":
->x : Symbol(x, Decl(stringLiteralsWithSwitchStatements04.ts, 0, 3))
+>x : Symbol(x, Decl(stringLiteralsWithSwitchStatements04.ts, 0, 11))
 
         break;
     case x, "baz":
->x : Symbol(x, Decl(stringLiteralsWithSwitchStatements04.ts, 0, 3))
+>x : Symbol(x, Decl(stringLiteralsWithSwitchStatements04.ts, 0, 11))
 
         break;
     case "baz", x:
->x : Symbol(x, Decl(stringLiteralsWithSwitchStatements04.ts, 0, 3))
+>x : Symbol(x, Decl(stringLiteralsWithSwitchStatements04.ts, 0, 11))
 
         break;
     case "baz" && "bar":
diff --git a/tests/baselines/reference/stringLiteralsWithSwitchStatements04.types b/tests/baselines/reference/stringLiteralsWithSwitchStatements04.types
index db37672daf355..46e901e77f668 100644
--- a/tests/baselines/reference/stringLiteralsWithSwitchStatements04.types
+++ b/tests/baselines/reference/stringLiteralsWithSwitchStatements04.types
@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements04.ts] ////
 
 === stringLiteralsWithSwitchStatements04.ts ===
-let x: "foo";
+declare let x: "foo";
 >x : "foo"
 >  : ^^^^^
 
-let y: "foo" | "bar"; 
+declare let y: "foo" | "bar";
 >y : "foo" | "bar"
 >  : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/substitutionTypeForIndexedAccessType2.js b/tests/baselines/reference/substitutionTypeForIndexedAccessType2.js
index a73af0b42ab1f..ff8728571aa47 100644
--- a/tests/baselines/reference/substitutionTypeForIndexedAccessType2.js
+++ b/tests/baselines/reference/substitutionTypeForIndexedAccessType2.js
@@ -10,9 +10,6 @@ type Str<T extends string> = T
 type Bar<T> = 
   T extends Foo
     ? T['foo'] extends string
-      // Type 'T["foo"]' does not satisfy the constraint 'string'.
-      //  Type 'string | undefined' is not assignable to type 'string'.
-      //   Type 'undefined' is not assignable to type 'string'.(2344)
       ? Str<T['foo']>
       : never
     : never
diff --git a/tests/baselines/reference/substitutionTypeForIndexedAccessType2.symbols b/tests/baselines/reference/substitutionTypeForIndexedAccessType2.symbols
index fc2995682b466..f9e6e9a2ce0fa 100644
--- a/tests/baselines/reference/substitutionTypeForIndexedAccessType2.symbols
+++ b/tests/baselines/reference/substitutionTypeForIndexedAccessType2.symbols
@@ -24,9 +24,6 @@ type Bar<T> =
     ? T['foo'] extends string
 >T : Symbol(T, Decl(substitutionTypeForIndexedAccessType2.ts, 6, 9))
 
-      // Type 'T["foo"]' does not satisfy the constraint 'string'.
-      //  Type 'string | undefined' is not assignable to type 'string'.
-      //   Type 'undefined' is not assignable to type 'string'.(2344)
       ? Str<T['foo']>
 >Str : Symbol(Str, Decl(substitutionTypeForIndexedAccessType2.ts, 2, 1))
 >T : Symbol(T, Decl(substitutionTypeForIndexedAccessType2.ts, 6, 9))
diff --git a/tests/baselines/reference/substitutionTypeForIndexedAccessType2.types b/tests/baselines/reference/substitutionTypeForIndexedAccessType2.types
index 4567d59489a15..d303e54936727 100644
--- a/tests/baselines/reference/substitutionTypeForIndexedAccessType2.types
+++ b/tests/baselines/reference/substitutionTypeForIndexedAccessType2.types
@@ -17,9 +17,6 @@ type Bar<T> =
 
   T extends Foo
     ? T['foo'] extends string
-      // Type 'T["foo"]' does not satisfy the constraint 'string'.
-      //  Type 'string | undefined' is not assignable to type 'string'.
-      //   Type 'undefined' is not assignable to type 'string'.(2344)
       ? Str<T['foo']>
       : never
     : never
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.errors.txt b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.errors.txt
index f1da945fefdee..df8b57e726188 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.errors.txt
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.errors.txt
@@ -46,6 +46,6 @@ subtypingWithObjectMembersOptionality2.ts(26,11): error TS2430: Interface 'S3' i
     }
     
     // object literal case
-    var a: { Foo: Base; }
-    var b: { Foo?: Derived; }
+    declare var a: { Foo: Base; }
+    declare var b: { Foo?: Derived; }
     var r = true ? a : b; // ok
\ No newline at end of file
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.js b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.js
index 5f8b6c99e7621..a477085c49c6e 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.js
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.js
@@ -31,13 +31,10 @@ interface S3 extends T3 {
 }
 
 // object literal case
-var a: { Foo: Base; }
-var b: { Foo?: Derived; }
+declare var a: { Foo: Base; }
+declare var b: { Foo?: Derived; }
 var r = true ? a : b; // ok
 
 //// [subtypingWithObjectMembersOptionality2.js]
 // Derived member is optional but base member is not, should be an error
-// object literal case
-var a;
-var b;
 var r = true ? a : b; // ok
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.symbols b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.symbols
index 9d2c1380ebd2d..b4bdc8caaf99e 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.symbols
@@ -64,18 +64,18 @@ interface S3 extends T3 {
 }
 
 // object literal case
-var a: { Foo: Base; }
->a : Symbol(a, Decl(subtypingWithObjectMembersOptionality2.ts, 30, 3))
->Foo : Symbol(Foo, Decl(subtypingWithObjectMembersOptionality2.ts, 30, 8))
+declare var a: { Foo: Base; }
+>a : Symbol(a, Decl(subtypingWithObjectMembersOptionality2.ts, 30, 11))
+>Foo : Symbol(Foo, Decl(subtypingWithObjectMembersOptionality2.ts, 30, 16))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality2.ts, 0, 0))
 
-var b: { Foo?: Derived; }
->b : Symbol(b, Decl(subtypingWithObjectMembersOptionality2.ts, 31, 3))
->Foo : Symbol(Foo, Decl(subtypingWithObjectMembersOptionality2.ts, 31, 8))
+declare var b: { Foo?: Derived; }
+>b : Symbol(b, Decl(subtypingWithObjectMembersOptionality2.ts, 31, 11))
+>Foo : Symbol(Foo, Decl(subtypingWithObjectMembersOptionality2.ts, 31, 16))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality2.ts, 2, 31))
 
 var r = true ? a : b; // ok
 >r : Symbol(r, Decl(subtypingWithObjectMembersOptionality2.ts, 32, 3))
->a : Symbol(a, Decl(subtypingWithObjectMembersOptionality2.ts, 30, 3))
->b : Symbol(b, Decl(subtypingWithObjectMembersOptionality2.ts, 31, 3))
+>a : Symbol(a, Decl(subtypingWithObjectMembersOptionality2.ts, 30, 11))
+>b : Symbol(b, Decl(subtypingWithObjectMembersOptionality2.ts, 31, 11))
 
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.types b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.types
index 3d378d6eeb933..d0713d0420242 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.types
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.types
@@ -48,13 +48,13 @@ interface S3 extends T3 {
 }
 
 // object literal case
-var a: { Foo: Base; }
+declare var a: { Foo: Base; }
 >a : { Foo: Base; }
 >  : ^^^^^^^    ^^^
 >Foo : Base
 >    : ^^^^
 
-var b: { Foo?: Derived; }
+declare var b: { Foo?: Derived; }
 >b : { Foo?: Derived; }
 >  : ^^^^^^^^       ^^^
 >Foo : Derived
diff --git a/tests/baselines/reference/symbolProperty17.errors.txt b/tests/baselines/reference/symbolProperty17.errors.txt
index 4a65909f6c102..e8cdbab79425c 100644
--- a/tests/baselines/reference/symbolProperty17.errors.txt
+++ b/tests/baselines/reference/symbolProperty17.errors.txt
@@ -10,5 +10,5 @@ symbolProperty17.ts(2,5): error TS2411: Property '[Symbol.iterator]' of type 'nu
         "__@iterator": string;
     }
     
-    var i: I;
+    declare var i: I;
     var it = i[Symbol.iterator];
\ No newline at end of file
diff --git a/tests/baselines/reference/symbolProperty17.js b/tests/baselines/reference/symbolProperty17.js
index bf9463eeaf808..35e9a0ea244ba 100644
--- a/tests/baselines/reference/symbolProperty17.js
+++ b/tests/baselines/reference/symbolProperty17.js
@@ -7,9 +7,8 @@ interface I {
     "__@iterator": string;
 }
 
-var i: I;
+declare var i: I;
 var it = i[Symbol.iterator];
 
 //// [symbolProperty17.js]
-var i;
 var it = i[Symbol.iterator];
diff --git a/tests/baselines/reference/symbolProperty17.symbols b/tests/baselines/reference/symbolProperty17.symbols
index 327c57d39ffb9..445d6af1cea96 100644
--- a/tests/baselines/reference/symbolProperty17.symbols
+++ b/tests/baselines/reference/symbolProperty17.symbols
@@ -17,13 +17,13 @@ interface I {
 >"__@iterator" : Symbol(I["__@iterator"], Decl(symbolProperty17.ts, 2, 24))
 }
 
-var i: I;
->i : Symbol(i, Decl(symbolProperty17.ts, 6, 3))
+declare var i: I;
+>i : Symbol(i, Decl(symbolProperty17.ts, 6, 11))
 >I : Symbol(I, Decl(symbolProperty17.ts, 0, 0))
 
 var it = i[Symbol.iterator];
 >it : Symbol(it, Decl(symbolProperty17.ts, 7, 3))
->i : Symbol(i, Decl(symbolProperty17.ts, 6, 3))
+>i : Symbol(i, Decl(symbolProperty17.ts, 6, 11))
 >Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --))
 >Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --))
diff --git a/tests/baselines/reference/symbolProperty17.types b/tests/baselines/reference/symbolProperty17.types
index 8e00cacfdecd4..1e029c5e12394 100644
--- a/tests/baselines/reference/symbolProperty17.types
+++ b/tests/baselines/reference/symbolProperty17.types
@@ -21,7 +21,7 @@ interface I {
 >              : ^^^^^^
 }
 
-var i: I;
+declare var i: I;
 >i : I
 >  : ^
 
diff --git a/tests/baselines/reference/symbolType15.errors.txt b/tests/baselines/reference/symbolType15.errors.txt
index c73f407225ff7..a8966792fe4dd 100644
--- a/tests/baselines/reference/symbolType15.errors.txt
+++ b/tests/baselines/reference/symbolType15.errors.txt
@@ -3,7 +3,7 @@ symbolType15.ts(5,1): error TS2322: Type 'Symbol' is not assignable to type 'sym
 
 
 ==== symbolType15.ts (1 errors) ====
-    var sym: symbol;
+    declare var sym: symbol;
     var symObj: Symbol;
     
     symObj = sym;
diff --git a/tests/baselines/reference/symbolType15.js b/tests/baselines/reference/symbolType15.js
index f4d052aad1335..b5c43f6f55f10 100644
--- a/tests/baselines/reference/symbolType15.js
+++ b/tests/baselines/reference/symbolType15.js
@@ -1,14 +1,13 @@
 //// [tests/cases/conformance/es6/Symbols/symbolType15.ts] ////
 
 //// [symbolType15.ts]
-var sym: symbol;
+declare var sym: symbol;
 var symObj: Symbol;
 
 symObj = sym;
 sym = symObj;
 
 //// [symbolType15.js]
-var sym;
 var symObj;
 symObj = sym;
 sym = symObj;
diff --git a/tests/baselines/reference/symbolType15.symbols b/tests/baselines/reference/symbolType15.symbols
index 3beb332034292..ca54490f3a298 100644
--- a/tests/baselines/reference/symbolType15.symbols
+++ b/tests/baselines/reference/symbolType15.symbols
@@ -1,8 +1,8 @@
 //// [tests/cases/conformance/es6/Symbols/symbolType15.ts] ////
 
 === symbolType15.ts ===
-var sym: symbol;
->sym : Symbol(sym, Decl(symbolType15.ts, 0, 3))
+declare var sym: symbol;
+>sym : Symbol(sym, Decl(symbolType15.ts, 0, 11))
 
 var symObj: Symbol;
 >symObj : Symbol(symObj, Decl(symbolType15.ts, 1, 3))
@@ -10,9 +10,9 @@ var symObj: Symbol;
 
 symObj = sym;
 >symObj : Symbol(symObj, Decl(symbolType15.ts, 1, 3))
->sym : Symbol(sym, Decl(symbolType15.ts, 0, 3))
+>sym : Symbol(sym, Decl(symbolType15.ts, 0, 11))
 
 sym = symObj;
->sym : Symbol(sym, Decl(symbolType15.ts, 0, 3))
+>sym : Symbol(sym, Decl(symbolType15.ts, 0, 11))
 >symObj : Symbol(symObj, Decl(symbolType15.ts, 1, 3))
 
diff --git a/tests/baselines/reference/symbolType15.types b/tests/baselines/reference/symbolType15.types
index 6a94dd96a3dfc..3521a8a5a1814 100644
--- a/tests/baselines/reference/symbolType15.types
+++ b/tests/baselines/reference/symbolType15.types
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/es6/Symbols/symbolType15.ts] ////
 
 === symbolType15.ts ===
-var sym: symbol;
+declare var sym: symbol;
 >sym : symbol
 >    : ^^^^^^
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.errors.txt b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.errors.txt
index 4f3e390d24ed8..3238c61946422 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.errors.txt
+++ b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.errors.txt
@@ -17,7 +17,7 @@ taggedTemplateStringsWithIncompatibleTypedTags.ts(28,57): error TS2345: Argument
         [x: number]: I;
     }
     
-    var f: I;
+    declare var f: I;
     
     f `abc`
     
diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js
index 54725211e1976..ad59a8e3f7efe 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js
@@ -10,7 +10,7 @@ interface I {
     [x: number]: I;
 }
 
-var f: I;
+declare var f: I;
 
 f `abc`
 
@@ -40,7 +40,6 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
     if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
     return cooked;
 };
-var f;
 f(__makeTemplateObject(["abc"], ["abc"]));
 f(__makeTemplateObject(["abc", "def", "ghi"], ["abc", "def", "ghi"]), 1, 2);
 f(__makeTemplateObject(["abc"], ["abc"])).member;
diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.symbols b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.symbols
index f7c5950f9ecd0..fb20084ca7493 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.symbols
+++ b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.symbols
@@ -31,58 +31,58 @@ interface I {
 >I : Symbol(I, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 0, 0))
 }
 
-var f: I;
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 3))
+declare var f: I;
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 11))
 >I : Symbol(I, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 0, 0))
 
 f `abc`
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 11))
 
 f `abc${1}def${2}ghi`;
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 11))
 
 f `abc`.member
 >f `abc`.member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 3, 9))
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 11))
 >member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 3, 9))
 
 f `abc${1}def${2}ghi`.member;
 >f `abc${1}def${2}ghi`.member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 3, 9))
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 11))
 >member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 3, 9))
 
 f `abc`["member"];
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 11))
 >"member" : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 3, 9))
 
 f `abc${1}def${2}ghi`["member"];
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 11))
 >"member" : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 3, 9))
 
 f `abc`[0].member `abc${1}def${2}ghi`;
 >f `abc`[0].member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 3, 9))
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 11))
 >member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 3, 9))
 
 f `abc${1}def${2}ghi`["member"].member `abc${1}def${2}ghi`;
 >f `abc${1}def${2}ghi`["member"].member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 3, 9))
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 11))
 >"member" : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 3, 9))
 >member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 3, 9))
 
 f `abc${ true }def${ true }ghi`["member"].member `abc${ 1 }def${ 2 }ghi`;
 >f `abc${ true }def${ true }ghi`["member"].member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 3, 9))
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 11))
 >"member" : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 3, 9))
 >member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 3, 9))
 
 f.thisIsNotATag(`abc`);
 >f.thisIsNotATag : Symbol(I.thisIsNotATag, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 4, 14))
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 11))
 >thisIsNotATag : Symbol(I.thisIsNotATag, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 4, 14))
 
 f.thisIsNotATag(`abc${1}def${2}ghi`);
 >f.thisIsNotATag : Symbol(I.thisIsNotATag, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 4, 14))
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 9, 11))
 >thisIsNotATag : Symbol(I.thisIsNotATag, Decl(taggedTemplateStringsWithIncompatibleTypedTags.ts, 4, 14))
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.types b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.types
index 9c9367a4c7a5d..84078ffcbae01 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.types
@@ -31,7 +31,7 @@ interface I {
 >  : ^^^^^^
 }
 
-var f: I;
+declare var f: I;
 >f : I
 >  : ^
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.errors.txt b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.errors.txt
index 3b9a9c7b6d9e7..4d2ce0abfe257 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.errors.txt
+++ b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.errors.txt
@@ -17,7 +17,7 @@ taggedTemplateStringsWithIncompatibleTypedTagsES6.ts(28,57): error TS2345: Argum
         [x: number]: I;
     }
     
-    var f: I;
+    declare var f: I;
     
     f `abc`
     
diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.js b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.js
index 32ba201c349d3..44e41fbf1de46 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.js
@@ -10,7 +10,7 @@ interface I {
     [x: number]: I;
 }
 
-var f: I;
+declare var f: I;
 
 f `abc`
 
@@ -35,7 +35,6 @@ f.thisIsNotATag(`abc`);
 f.thisIsNotATag(`abc${1}def${2}ghi`);
 
 //// [taggedTemplateStringsWithIncompatibleTypedTagsES6.js]
-var f;
 f `abc`;
 f `abc${1}def${2}ghi`;
 f `abc`.member;
diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.symbols b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.symbols
index 3ce39aef58af6..9b95c7da52f60 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.symbols
+++ b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.symbols
@@ -31,58 +31,58 @@ interface I {
 >I : Symbol(I, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 0, 0))
 }
 
-var f: I;
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 3))
+declare var f: I;
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 11))
 >I : Symbol(I, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 0, 0))
 
 f `abc`
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 11))
 
 f `abc${1}def${2}ghi`;
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 11))
 
 f `abc`.member
 >f `abc`.member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 3, 9))
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 11))
 >member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 3, 9))
 
 f `abc${1}def${2}ghi`.member;
 >f `abc${1}def${2}ghi`.member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 3, 9))
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 11))
 >member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 3, 9))
 
 f `abc`["member"];
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 11))
 >"member" : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 3, 9))
 
 f `abc${1}def${2}ghi`["member"];
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 11))
 >"member" : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 3, 9))
 
 f `abc`[0].member `abc${1}def${2}ghi`;
 >f `abc`[0].member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 3, 9))
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 11))
 >member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 3, 9))
 
 f `abc${1}def${2}ghi`["member"].member `abc${1}def${2}ghi`;
 >f `abc${1}def${2}ghi`["member"].member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 3, 9))
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 11))
 >"member" : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 3, 9))
 >member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 3, 9))
 
 f `abc${ true }def${ true }ghi`["member"].member `abc${ 1 }def${ 2 }ghi`;
 >f `abc${ true }def${ true }ghi`["member"].member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 3, 9))
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 11))
 >"member" : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 3, 9))
 >member : Symbol(I.member, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 3, 9))
 
 f.thisIsNotATag(`abc`);
 >f.thisIsNotATag : Symbol(I.thisIsNotATag, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 4, 14))
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 11))
 >thisIsNotATag : Symbol(I.thisIsNotATag, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 4, 14))
 
 f.thisIsNotATag(`abc${1}def${2}ghi`);
 >f.thisIsNotATag : Symbol(I.thisIsNotATag, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 4, 14))
->f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 3))
+>f : Symbol(f, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 9, 11))
 >thisIsNotATag : Symbol(I.thisIsNotATag, Decl(taggedTemplateStringsWithIncompatibleTypedTagsES6.ts, 4, 14))
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.types b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.types
index 1a9e3c90a65e2..b297f088fe7f8 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.types
@@ -31,7 +31,7 @@ interface I {
 >  : ^^^^^^
 }
 
-var f: I;
+declare var f: I;
 >f : I
 >  : ^
 
diff --git a/tests/baselines/reference/taggedTemplateWithConstructableTag02.errors.txt b/tests/baselines/reference/taggedTemplateWithConstructableTag02.errors.txt
index fd1a9ed9635fc..e429873b95eec 100644
--- a/tests/baselines/reference/taggedTemplateWithConstructableTag02.errors.txt
+++ b/tests/baselines/reference/taggedTemplateWithConstructableTag02.errors.txt
@@ -7,7 +7,7 @@ taggedTemplateWithConstructableTag02.ts(6,1): error TS2349: This expression is n
         new (...args: any[]): string;
         new (): number;
     }
-    var tag: I;
+    declare var tag: I;
     tag `Hello world!`;
     ~~~
 !!! error TS2349: This expression is not callable.
diff --git a/tests/baselines/reference/taggedTemplateWithConstructableTag02.js b/tests/baselines/reference/taggedTemplateWithConstructableTag02.js
index 7160f0be107c1..9ff8f04dc1700 100644
--- a/tests/baselines/reference/taggedTemplateWithConstructableTag02.js
+++ b/tests/baselines/reference/taggedTemplateWithConstructableTag02.js
@@ -5,7 +5,7 @@ interface I {
     new (...args: any[]): string;
     new (): number;
 }
-var tag: I;
+declare var tag: I;
 tag `Hello world!`;
 
 //// [taggedTemplateWithConstructableTag02.js]
@@ -13,5 +13,4 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
     if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
     return cooked;
 };
-var tag;
 tag(__makeTemplateObject(["Hello world!"], ["Hello world!"]));
diff --git a/tests/baselines/reference/taggedTemplateWithConstructableTag02.symbols b/tests/baselines/reference/taggedTemplateWithConstructableTag02.symbols
index 370d2e81c5d06..5333d0a73bd4d 100644
--- a/tests/baselines/reference/taggedTemplateWithConstructableTag02.symbols
+++ b/tests/baselines/reference/taggedTemplateWithConstructableTag02.symbols
@@ -9,10 +9,10 @@ interface I {
 
     new (): number;
 }
-var tag: I;
->tag : Symbol(tag, Decl(taggedTemplateWithConstructableTag02.ts, 4, 3))
+declare var tag: I;
+>tag : Symbol(tag, Decl(taggedTemplateWithConstructableTag02.ts, 4, 11))
 >I : Symbol(I, Decl(taggedTemplateWithConstructableTag02.ts, 0, 0))
 
 tag `Hello world!`;
->tag : Symbol(tag, Decl(taggedTemplateWithConstructableTag02.ts, 4, 3))
+>tag : Symbol(tag, Decl(taggedTemplateWithConstructableTag02.ts, 4, 11))
 
diff --git a/tests/baselines/reference/taggedTemplateWithConstructableTag02.types b/tests/baselines/reference/taggedTemplateWithConstructableTag02.types
index bc86b976b8157..fa9fc27e47cc1 100644
--- a/tests/baselines/reference/taggedTemplateWithConstructableTag02.types
+++ b/tests/baselines/reference/taggedTemplateWithConstructableTag02.types
@@ -8,7 +8,7 @@ interface I {
 
     new (): number;
 }
-var tag: I;
+declare var tag: I;
 >tag : I
 >    : ^
 
diff --git a/tests/baselines/reference/templateStringMultiline3.js b/tests/baselines/reference/templateStringMultiline3.js
index dfc198fcdd736..b565f6006a337 100644
--- a/tests/baselines/reference/templateStringMultiline3.js
+++ b/tests/baselines/reference/templateStringMultiline3.js
@@ -1,10 +1,7 @@
 //// [tests/cases/conformance/es6/templates/templateStringMultiline3.ts] ////
 
 //// [templateStringMultiline3.ts]
-// newlines are <CR>
-`
-\
-`
+

// newlines are <CR>
`
\
`
 
 //// [templateStringMultiline3.js]
 // newlines are <CR>
diff --git a/tests/baselines/reference/templateStringMultiline3.symbols b/tests/baselines/reference/templateStringMultiline3.symbols
index 7c687d9c91d8f..7d5d6a0b20ec2 100644
--- a/tests/baselines/reference/templateStringMultiline3.symbols
+++ b/tests/baselines/reference/templateStringMultiline3.symbols
@@ -2,6 +2,7 @@
 
 === templateStringMultiline3.ts ===
 
+
 // newlines are <CR>
 `
 \
diff --git a/tests/baselines/reference/templateStringMultiline3.types b/tests/baselines/reference/templateStringMultiline3.types
index 57d5ea088ef2b..c6ce0adfa27b9 100644
--- a/tests/baselines/reference/templateStringMultiline3.types
+++ b/tests/baselines/reference/templateStringMultiline3.types
@@ -1,10 +1,12 @@
 //// [tests/cases/conformance/es6/templates/templateStringMultiline3.ts] ////
 
 === templateStringMultiline3.ts ===
+
+
 // newlines are <CR>
 `
->`\` : "\n"
->    : ^^^^
+>`
\
` : "\n"
+>      : ^^^^
 
 \
 `
diff --git a/tests/baselines/reference/templateStringMultiline3_ES6.js b/tests/baselines/reference/templateStringMultiline3_ES6.js
index 8d8f80c654f0a..ef2552a932fc3 100644
--- a/tests/baselines/reference/templateStringMultiline3_ES6.js
+++ b/tests/baselines/reference/templateStringMultiline3_ES6.js
@@ -1,13 +1,6 @@
 //// [tests/cases/conformance/es6/templates/templateStringMultiline3_ES6.ts] ////
 
 //// [templateStringMultiline3_ES6.ts]
-// newlines are <CR>
-`
-\
-`
+
 
 //// [templateStringMultiline3_ES6.js]
-// newlines are <CR>
-`
-\
-`;
diff --git a/tests/baselines/reference/templateStringMultiline3_ES6.symbols b/tests/baselines/reference/templateStringMultiline3_ES6.symbols
index 0ba6c719beba4..fddb618384aff 100644
--- a/tests/baselines/reference/templateStringMultiline3_ES6.symbols
+++ b/tests/baselines/reference/templateStringMultiline3_ES6.symbols
@@ -2,7 +2,3 @@
 
 === templateStringMultiline3_ES6.ts ===
 
-// newlines are <CR>
-`
-\
-`
diff --git a/tests/baselines/reference/templateStringMultiline3_ES6.types b/tests/baselines/reference/templateStringMultiline3_ES6.types
index d24a6ace43c6f..fddb618384aff 100644
--- a/tests/baselines/reference/templateStringMultiline3_ES6.types
+++ b/tests/baselines/reference/templateStringMultiline3_ES6.types
@@ -1,10 +1,4 @@
 //// [tests/cases/conformance/es6/templates/templateStringMultiline3_ES6.ts] ////
 
 === templateStringMultiline3_ES6.ts ===
-// newlines are <CR>
-`
->`\` : "\n"
->    : ^^^^
 
-\
-`
diff --git a/tests/baselines/reference/thisBinding2.errors.txt b/tests/baselines/reference/thisBinding2.errors.txt
index de057f97fe372..6ff6e154b9cea 100644
--- a/tests/baselines/reference/thisBinding2.errors.txt
+++ b/tests/baselines/reference/thisBinding2.errors.txt
@@ -3,7 +3,7 @@ thisBinding2.ts(10,11): error TS2683: 'this' implicitly has type 'any' because i
 
 ==== thisBinding2.ts (1 errors) ====
     class C {
-     x: number;
+     x!: number;
         constructor() {
             this.x = (() => {
        var x = 1;
diff --git a/tests/baselines/reference/thisBinding2.js b/tests/baselines/reference/thisBinding2.js
index c7c06acd4bcb3..98f07c8526398 100644
--- a/tests/baselines/reference/thisBinding2.js
+++ b/tests/baselines/reference/thisBinding2.js
@@ -2,7 +2,7 @@
 
 //// [thisBinding2.ts]
 class C {
- x: number;
+ x!: number;
     constructor() {
         this.x = (() => {
    var x = 1;
diff --git a/tests/baselines/reference/thisBinding2.symbols b/tests/baselines/reference/thisBinding2.symbols
index cfe84e127bf8b..1be549ca84c8b 100644
--- a/tests/baselines/reference/thisBinding2.symbols
+++ b/tests/baselines/reference/thisBinding2.symbols
@@ -4,7 +4,7 @@
 class C {
 >C : Symbol(C, Decl(thisBinding2.ts, 0, 0))
 
- x: number;
+ x!: number;
 >x : Symbol(C.x, Decl(thisBinding2.ts, 0, 9))
 
     constructor() {
diff --git a/tests/baselines/reference/thisBinding2.types b/tests/baselines/reference/thisBinding2.types
index 040dd5f9ce06f..948f26ba74d0e 100644
--- a/tests/baselines/reference/thisBinding2.types
+++ b/tests/baselines/reference/thisBinding2.types
@@ -5,7 +5,7 @@ class C {
 >C : C
 >  : ^
 
- x: number;
+ x!: number;
 >x : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/thisTypeInFunctions.errors.txt b/tests/baselines/reference/thisTypeInFunctions.errors.txt
index dc85c3f3fa391..866d6ce8832ee 100644
--- a/tests/baselines/reference/thisTypeInFunctions.errors.txt
+++ b/tests/baselines/reference/thisTypeInFunctions.errors.txt
@@ -106,8 +106,8 @@ thisTypeInFunctions.ts(120,36): error TS2339: Property 'n' does not exist on typ
     let specifiedLambdaToSpecified: (this: {y: number}, x: number) => number = specifiedLambda;
     
     
-    let explicitCFunction: (this: C, m: number) => number;
-    let explicitPropertyFunction: (this: {n: number}, m: number) => number;
+    declare let explicitCFunction: (this: C, m: number) => number;
+    declare let explicitPropertyFunction: (this: {n: number}, m: number) => number;
     c.explicitC = explicitCFunction;
     c.explicitC = function(this: C, m: number) { return this.n + m };
     c.explicitProperty = explicitPropertyFunction;
diff --git a/tests/baselines/reference/thisTypeInFunctions.js b/tests/baselines/reference/thisTypeInFunctions.js
index a2c963743348e..65153645005e8 100644
--- a/tests/baselines/reference/thisTypeInFunctions.js
+++ b/tests/baselines/reference/thisTypeInFunctions.js
@@ -103,8 +103,8 @@ let unspecifiedLambdaToSpecified: (this: {y: number}, x: number) => number = uns
 let specifiedLambdaToSpecified: (this: {y: number}, x: number) => number = specifiedLambda;
 
 
-let explicitCFunction: (this: C, m: number) => number;
-let explicitPropertyFunction: (this: {n: number}, m: number) => number;
+declare let explicitCFunction: (this: C, m: number) => number;
+declare let explicitPropertyFunction: (this: {n: number}, m: number) => number;
 c.explicitC = explicitCFunction;
 c.explicitC = function(this: C, m: number) { return this.n + m };
 c.explicitProperty = explicitPropertyFunction;
@@ -307,8 +307,6 @@ var unspecifiedLambda = function (x) { return x + 12; };
 var specifiedLambda = function (x) { return x + 12; };
 var unspecifiedLambdaToSpecified = unspecifiedLambda;
 var specifiedLambdaToSpecified = specifiedLambda;
-var explicitCFunction;
-var explicitPropertyFunction;
 c.explicitC = explicitCFunction;
 c.explicitC = function (m) { return this.n + m; };
 c.explicitProperty = explicitPropertyFunction;
diff --git a/tests/baselines/reference/thisTypeInFunctions.symbols b/tests/baselines/reference/thisTypeInFunctions.symbols
index be926211ed0cc..72f7f0b911501 100644
--- a/tests/baselines/reference/thisTypeInFunctions.symbols
+++ b/tests/baselines/reference/thisTypeInFunctions.symbols
@@ -413,23 +413,23 @@ let specifiedLambdaToSpecified: (this: {y: number}, x: number) => number = speci
 >specifiedLambda : Symbol(specifiedLambda, Decl(thisTypeInFunctions.ts, 97, 3))
 
 
-let explicitCFunction: (this: C, m: number) => number;
->explicitCFunction : Symbol(explicitCFunction, Decl(thisTypeInFunctions.ts, 102, 3))
->this : Symbol(this, Decl(thisTypeInFunctions.ts, 102, 24))
+declare let explicitCFunction: (this: C, m: number) => number;
+>explicitCFunction : Symbol(explicitCFunction, Decl(thisTypeInFunctions.ts, 102, 11))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 102, 32))
 >C : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
->m : Symbol(m, Decl(thisTypeInFunctions.ts, 102, 32))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 102, 40))
 
-let explicitPropertyFunction: (this: {n: number}, m: number) => number;
->explicitPropertyFunction : Symbol(explicitPropertyFunction, Decl(thisTypeInFunctions.ts, 103, 3))
->this : Symbol(this, Decl(thisTypeInFunctions.ts, 103, 31))
->n : Symbol(n, Decl(thisTypeInFunctions.ts, 103, 38))
->m : Symbol(m, Decl(thisTypeInFunctions.ts, 103, 49))
+declare let explicitPropertyFunction: (this: {n: number}, m: number) => number;
+>explicitPropertyFunction : Symbol(explicitPropertyFunction, Decl(thisTypeInFunctions.ts, 103, 11))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 103, 39))
+>n : Symbol(n, Decl(thisTypeInFunctions.ts, 103, 46))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 103, 57))
 
 c.explicitC = explicitCFunction;
 >c.explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
 >c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
 >explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
->explicitCFunction : Symbol(explicitCFunction, Decl(thisTypeInFunctions.ts, 102, 3))
+>explicitCFunction : Symbol(explicitCFunction, Decl(thisTypeInFunctions.ts, 102, 11))
 
 c.explicitC = function(this: C, m: number) { return this.n + m };
 >c.explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
@@ -447,7 +447,7 @@ c.explicitProperty = explicitPropertyFunction;
 >c.explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
 >c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
 >explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
->explicitPropertyFunction : Symbol(explicitPropertyFunction, Decl(thisTypeInFunctions.ts, 103, 3))
+>explicitPropertyFunction : Symbol(explicitPropertyFunction, Decl(thisTypeInFunctions.ts, 103, 11))
 
 c.explicitProperty = function(this: {n: number}, m: number) { return this.n + m };
 >c.explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
@@ -522,7 +522,7 @@ c.explicitThis = explicitCFunction;
 >c.explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
 >c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
 >explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
->explicitCFunction : Symbol(explicitCFunction, Decl(thisTypeInFunctions.ts, 102, 3))
+>explicitCFunction : Symbol(explicitCFunction, Decl(thisTypeInFunctions.ts, 102, 11))
 
 c.explicitThis = function(this: C, m: number) { return this.n + m };
 >c.explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
diff --git a/tests/baselines/reference/thisTypeInFunctions.types b/tests/baselines/reference/thisTypeInFunctions.types
index 26dbe2202d918..bab4b7f4cfe35 100644
--- a/tests/baselines/reference/thisTypeInFunctions.types
+++ b/tests/baselines/reference/thisTypeInFunctions.types
@@ -806,7 +806,7 @@ let specifiedLambdaToSpecified: (this: {y: number}, x: number) => number = speci
 >                : ^    ^^    ^^ ^^      ^^^^^      
 
 
-let explicitCFunction: (this: C, m: number) => number;
+declare let explicitCFunction: (this: C, m: number) => number;
 >explicitCFunction : (this: C, m: number) => number
 >                  : ^    ^^ ^^ ^^      ^^^^^      
 >this : C
@@ -814,7 +814,7 @@ let explicitCFunction: (this: C, m: number) => number;
 >m : number
 >  : ^^^^^^
 
-let explicitPropertyFunction: (this: {n: number}, m: number) => number;
+declare let explicitPropertyFunction: (this: {n: number}, m: number) => number;
 >explicitPropertyFunction : (this: { n: number; }, m: number) => number
 >                         : ^    ^^              ^^ ^^      ^^^^^      
 >this : { n: number; }
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
index 5ce0e368dcd30..0e4b5810a9a48 100644
--- a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
+++ b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
@@ -263,7 +263,7 @@ thisTypeInFunctionsNegative.ts(178,22): error TS2730: An arrow function cannot h
     
     // lambdas have this: void for assignability purposes (and this unbound (free) for body checking)
     let d = new D();
-    let explicitXProperty: (this: { x: number }, m: number) => number;
+    declare let explicitXProperty: (this: { x: number }, m: number) => number;
     
     // from differing object types
     c.explicitC = function(this: D, m: number) { return this.x + m };
@@ -276,7 +276,7 @@ thisTypeInFunctionsNegative.ts(178,22): error TS2730: An arrow function cannot h
 !!! error TS2322: Type '(this: { x: number; }, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
 !!! error TS2322:   The 'this' types of each signature are incompatible.
 !!! error TS2322:     Property 'x' is missing in type '{ n: number; }' but required in type '{ x: number; }'.
-!!! related TS2728 thisTypeInFunctionsNegative.ts:104:33: 'x' is declared here.
+!!! related TS2728 thisTypeInFunctionsNegative.ts:104:41: 'x' is declared here.
     
     c.explicitC = d.explicitD;
     ~~~~~~~~~~~
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.js b/tests/baselines/reference/thisTypeInFunctionsNegative.js
index 15163fcf27ad2..5dae6fa5b53ce 100644
--- a/tests/baselines/reference/thisTypeInFunctionsNegative.js
+++ b/tests/baselines/reference/thisTypeInFunctionsNegative.js
@@ -104,7 +104,7 @@ let reconstructed: {
 
 // lambdas have this: void for assignability purposes (and this unbound (free) for body checking)
 let d = new D();
-let explicitXProperty: (this: { x: number }, m: number) => number;
+declare let explicitXProperty: (this: { x: number }, m: number) => number;
 
 // from differing object types
 c.explicitC = function(this: D, m: number) { return this.x + m };
@@ -280,7 +280,6 @@ let reconstructed = {
 ;
 // lambdas have this: void for assignability purposes (and this unbound (free) for body checking)
 let d = new D();
-let explicitXProperty;
 // from differing object types
 c.explicitC = function (m) { return this.x + m; };
 c.explicitProperty = explicitXProperty;
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.symbols b/tests/baselines/reference/thisTypeInFunctionsNegative.symbols
index 150dfa888afa3..b4128c8c53461 100644
--- a/tests/baselines/reference/thisTypeInFunctionsNegative.symbols
+++ b/tests/baselines/reference/thisTypeInFunctionsNegative.symbols
@@ -393,11 +393,11 @@ let d = new D();
 >d : Symbol(d, Decl(thisTypeInFunctionsNegative.ts, 102, 3))
 >D : Symbol(D, Decl(thisTypeInFunctionsNegative.ts, 17, 1))
 
-let explicitXProperty: (this: { x: number }, m: number) => number;
->explicitXProperty : Symbol(explicitXProperty, Decl(thisTypeInFunctionsNegative.ts, 103, 3))
->this : Symbol(this, Decl(thisTypeInFunctionsNegative.ts, 103, 24))
->x : Symbol(x, Decl(thisTypeInFunctionsNegative.ts, 103, 31))
->m : Symbol(m, Decl(thisTypeInFunctionsNegative.ts, 103, 44))
+declare let explicitXProperty: (this: { x: number }, m: number) => number;
+>explicitXProperty : Symbol(explicitXProperty, Decl(thisTypeInFunctionsNegative.ts, 103, 11))
+>this : Symbol(this, Decl(thisTypeInFunctionsNegative.ts, 103, 32))
+>x : Symbol(x, Decl(thisTypeInFunctionsNegative.ts, 103, 39))
+>m : Symbol(m, Decl(thisTypeInFunctionsNegative.ts, 103, 52))
 
 // from differing object types
 c.explicitC = function(this: D, m: number) { return this.x + m };
@@ -416,7 +416,7 @@ c.explicitProperty = explicitXProperty;
 >c.explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctionsNegative.ts, 10, 5))
 >c : Symbol(c, Decl(thisTypeInFunctionsNegative.ts, 70, 3))
 >explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctionsNegative.ts, 10, 5))
->explicitXProperty : Symbol(explicitXProperty, Decl(thisTypeInFunctionsNegative.ts, 103, 3))
+>explicitXProperty : Symbol(explicitXProperty, Decl(thisTypeInFunctionsNegative.ts, 103, 11))
 
 c.explicitC = d.explicitD;
 >c.explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctionsNegative.ts, 7, 5))
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.types b/tests/baselines/reference/thisTypeInFunctionsNegative.types
index 83e099ead1640..ca9f97e6f5189 100644
--- a/tests/baselines/reference/thisTypeInFunctionsNegative.types
+++ b/tests/baselines/reference/thisTypeInFunctionsNegative.types
@@ -751,7 +751,7 @@ let d = new D();
 >D : typeof D
 >  : ^^^^^^^^
 
-let explicitXProperty: (this: { x: number }, m: number) => number;
+declare let explicitXProperty: (this: { x: number }, m: number) => number;
 >explicitXProperty : (this: { x: number; }, m: number) => number
 >                  : ^    ^^              ^^ ^^      ^^^^^      
 >this : { x: number; }
diff --git a/tests/baselines/reference/topLevelThisAssignment.errors.txt b/tests/baselines/reference/topLevelThisAssignment.errors.txt
new file mode 100644
index 0000000000000..1ff33aa63944a
--- /dev/null
+++ b/tests/baselines/reference/topLevelThisAssignment.errors.txt
@@ -0,0 +1,13 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== a.js (0 errors) ====
+    this.a = 10;
+    this.a;
+    a;
+    
+==== b.js (0 errors) ====
+    this.a;
+    a;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/modules-and-globals-mixed-in-amd.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/modules-and-globals-mixed-in-amd.js
index 6f4321710bfa2..22487ede7b739 100644
--- a/tests/baselines/reference/tsbuild/amdModulesWithOut/modules-and-globals-mixed-in-amd.js
+++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/modules-and-globals-mixed-in-amd.js
@@ -87,6 +87,11 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+lib/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "module.js"
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'app/tsconfig.json' is out of date because output file 'app/module.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/soltion/app/tsconfig.json'...
@@ -96,8 +101,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+app/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "module.js"
+      ~~~~~~~~~
+
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -672,6 +682,11 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+lib/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "module.js"
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'app/tsconfig.json' is out of date because buildinfo file 'app/module.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/soltion/app/tsconfig.json'...
@@ -681,8 +696,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+app/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "module.js"
+      ~~~~~~~~~
+
 
-Found 2 errors.
+Found 4 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js
index 22235dcc05e4d..98bef9901008b 100644
--- a/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js
+++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js
@@ -88,6 +88,11 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+lib/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "module.js"
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'app/tsconfig.json' is out of date because output file 'app/module.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/soltion/app/tsconfig.json'...
@@ -97,6 +102,11 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+app/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "module.js"
+      ~~~~~~~~~
+
 app/tsconfig.json:15:5 - error TS5102: Option 'prepend' has been removed. Please remove it from your configuration.
 
 15     {
@@ -109,7 +119,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -684,6 +694,11 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+lib/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "module.js"
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'app/tsconfig.json' is out of date because buildinfo file 'app/module.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/soltion/app/tsconfig.json'...
@@ -693,6 +708,11 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+app/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "module.js"
+      ~~~~~~~~~
+
 app/tsconfig.json:15:5 - error TS5102: Option 'prepend' has been removed. Please remove it from your configuration.
 
 15     {
@@ -705,7 +725,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/when-the-module-resolution-finds-original-source-file.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/when-the-module-resolution-finds-original-source-file.js
index de4af543d4a6b..dd29029253ac5 100644
--- a/tests/baselines/reference/tsbuild/amdModulesWithOut/when-the-module-resolution-finds-original-source-file.js
+++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/when-the-module-resolution-finds-original-source-file.js
@@ -87,6 +87,11 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+lib/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "../module.js", "rootDir": "../"
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'app/tsconfig.json' is out of date because output file 'app/module.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/soltion/app/tsconfig.json'...
@@ -96,8 +101,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+app/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "module.js"
+      ~~~~~~~~~
+
 
-Found 2 errors.
+Found 4 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/different-options-with-incremental.js b/tests/baselines/reference/tsbuild/commandLine/outFile/different-options-with-incremental.js
index 8b78ce9f0633b..df084ccd3f4cc 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/different-options-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/different-options-with-incremental.js
@@ -45,13 +45,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -188,13 +193,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -336,13 +346,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -479,13 +494,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -610,13 +630,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -746,13 +771,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -800,13 +830,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -943,13 +978,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1063,13 +1103,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1114,13 +1159,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1259,13 +1309,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1407,13 +1462,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1550,13 +1610,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1670,13 +1735,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js b/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js
index cd667d402a4a0..fb9f0732876c4 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js
@@ -45,13 +45,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -206,13 +211,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -357,13 +367,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -503,13 +518,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -555,13 +575,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -606,13 +631,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -745,13 +775,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -877,13 +912,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -929,13 +969,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -983,13 +1028,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1129,13 +1179,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1181,13 +1236,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1329,13 +1389,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration-and-incremental.js b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration-and-incremental.js
index 9a4063ef8cb37..a500899c6b6ac 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration-and-incremental.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration-and-incremental.js
@@ -73,6 +73,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd",
@@ -82,6 +87,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd",
@@ -97,7 +107,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -327,6 +337,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd",
@@ -336,6 +351,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd",
@@ -351,7 +371,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -428,6 +448,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd",
@@ -437,6 +462,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd",
@@ -452,7 +482,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -592,6 +622,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd",
@@ -601,6 +636,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd",
@@ -616,7 +656,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -870,6 +910,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd",
@@ -879,6 +924,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd",
@@ -894,7 +944,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -968,6 +1018,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd",
@@ -977,6 +1032,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd",
@@ -992,7 +1052,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -1069,6 +1129,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd",
@@ -1078,6 +1143,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd",
@@ -1093,7 +1163,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration.js b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration.js
index 544aff866e2af..59e3a82a7fea1 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration.js
@@ -71,6 +71,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -80,6 +85,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -95,7 +105,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -225,6 +235,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -234,6 +249,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -249,7 +269,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -330,6 +350,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -339,6 +364,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -354,7 +384,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -432,6 +462,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -441,6 +476,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -456,7 +496,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -585,6 +625,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -594,6 +639,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -609,7 +659,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -687,6 +737,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -696,6 +751,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -711,7 +771,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -794,6 +854,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -803,6 +868,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -818,7 +888,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline.js b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline.js
index eab8ed7331472..2658d09332b86 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline.js
@@ -71,6 +71,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
@@ -80,13 +85,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -318,6 +328,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
@@ -327,13 +342,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -408,6 +428,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
@@ -417,13 +442,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -562,6 +592,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
@@ -571,13 +606,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -833,6 +873,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
@@ -842,13 +887,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -920,6 +970,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
@@ -929,13 +984,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -1010,6 +1070,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
@@ -1019,13 +1084,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration-and-incremental.js b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration-and-incremental.js
index 3aa93da46bb56..99a2abbe62330 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration-and-incremental.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration-and-incremental.js
@@ -71,6 +71,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -80,6 +85,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -95,7 +105,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -325,6 +335,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -334,6 +349,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -349,7 +369,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -426,6 +446,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -435,6 +460,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -450,7 +480,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -593,6 +623,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -602,6 +637,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -617,7 +657,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -837,6 +877,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -846,6 +891,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -861,7 +911,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -1112,6 +1162,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -1121,6 +1176,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -1136,7 +1196,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -1213,6 +1273,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -1222,6 +1287,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -1237,7 +1307,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -1409,6 +1479,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -1418,6 +1493,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -1433,7 +1513,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -1576,6 +1656,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -1585,6 +1670,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -1600,7 +1690,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -1824,6 +1914,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -1833,6 +1928,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
@@ -1848,7 +1948,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration.js b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration.js
index 261f974a69333..6d7fc5e1bba59 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration.js
@@ -69,6 +69,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -78,6 +83,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -93,7 +103,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -223,6 +233,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -232,6 +247,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -247,7 +267,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -328,6 +348,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -337,6 +362,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -352,7 +382,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -433,6 +463,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -442,6 +477,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -457,7 +497,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -550,6 +590,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -559,6 +604,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -574,7 +624,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -702,6 +752,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -711,6 +766,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -726,7 +786,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -807,6 +867,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -816,6 +881,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -831,7 +901,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -943,6 +1013,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -952,6 +1027,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -967,7 +1047,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -1048,6 +1128,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -1057,6 +1142,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -1072,7 +1162,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
@@ -1169,6 +1259,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -1178,6 +1273,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -1193,7 +1293,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 5 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline.js b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline.js
index 3a649d5537421..63a674d058e6b 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline.js
@@ -69,6 +69,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -78,13 +83,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -316,6 +326,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -325,13 +340,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -406,6 +426,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -415,13 +440,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -563,6 +593,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -572,13 +607,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -799,6 +839,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -808,13 +853,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -1067,6 +1117,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -1076,13 +1131,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -1157,6 +1217,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -1166,13 +1231,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -1343,6 +1413,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -1352,13 +1427,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -1500,6 +1580,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -1509,13 +1594,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -1740,6 +1830,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
+project1/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -1749,13 +1844,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
+project2/src/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/configFileErrors/outFile/reports-syntax-errors-in-config-file.js b/tests/baselines/reference/tsbuild/configFileErrors/outFile/reports-syntax-errors-in-config-file.js
index 7da423b2683d2..57db1041e4a5e 100644
--- a/tests/baselines/reference/tsbuild/configFileErrors/outFile/reports-syntax-errors-in-config-file.js
+++ b/tests/baselines/reference/tsbuild/configFileErrors/outFile/reports-syntax-errors-in-config-file.js
@@ -37,6 +37,11 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --b
 Output::
+tsconfig.json:4:3 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4   "outFile": "../outFile.js",
+    ~~~~~~~~~
+
 tsconfig.json:5:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5   "module": "amd"
@@ -48,7 +53,7 @@ Output::
            ~~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -150,6 +155,11 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --b
 Output::
+tsconfig.json:5:3 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5   "outFile": "../outFile.js",
+    ~~~~~~~~~
+
 tsconfig.json:6:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6   "module": "amd"
@@ -161,7 +171,7 @@ Output::
            ~~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -177,6 +187,11 @@ export function foo() { }export function fooBar() { }
 
 /home/src/tslibs/TS/Lib/tsc.js --b
 Output::
+tsconfig.json:5:3 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5   "outFile": "../outFile.js",
+    ~~~~~~~~~
+
 tsconfig.json:6:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6   "module": "amd"
@@ -188,7 +203,7 @@ Output::
            ~~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -279,6 +294,11 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --b
 Output::
+tsconfig.json:5:3 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5   "outFile": "../outFile.js",
+    ~~~~~~~~~
+
 tsconfig.json:6:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6   "module": "amd"
@@ -290,7 +310,7 @@ Output::
            ~~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -317,13 +337,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --b
 Output::
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js b/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js
index a16c343766c08..066310c598e95 100644
--- a/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js
@@ -62,6 +62,17 @@ Output::
 3     "module": "amd",
                 ~~~~~
 
+tsconfig.json:8:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+8     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
+tsconfig.json:8:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+8     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
 TSFILE: /home/src/workspaces/project/outFile.js
 TSFILE: /home/src/workspaces/project/outFile.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
@@ -71,7 +82,7 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -79,7 +90,7 @@ Found 2 errors.
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-define("index", ["require", "exports", "ky"], function (require, exports, ky_1) {
+define("src/index", ["require", "exports", "ky"], function (require, exports, ky_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.api = void 0;
@@ -174,6 +185,17 @@ Output::
 3     "module": "amd",
                 ~~~~~
 
+tsconfig.json:8:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+8     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
+tsconfig.json:8:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+8     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 ky.d.ts
@@ -181,7 +203,7 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors.
+Found 4 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors.js b/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors.js
index 91dc0a9777687..a0d9bf9018fd7 100644
--- a/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors.js
+++ b/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors.js
@@ -61,6 +61,17 @@ Output::
 3     "module": "amd",
                 ~~~~~
 
+tsconfig.json:7:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+7     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
+tsconfig.json:7:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+7     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
 TSFILE: /home/src/workspaces/project/outFile.js
 TSFILE: /home/src/workspaces/project/outFile.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
@@ -72,7 +83,7 @@ src/index.ts
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -80,7 +91,7 @@ Found 2 errors.
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-define("index", ["require", "exports", "ky"], function (require, exports, ky_1) {
+define("src/index", ["require", "exports", "ky"], function (require, exports, ky_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.api = void 0;
@@ -128,6 +139,17 @@ Output::
 3     "module": "amd",
                 ~~~~~
 
+tsconfig.json:7:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+7     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
+tsconfig.json:7:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+7     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
 TSFILE: /home/src/workspaces/project/outFile.js
 TSFILE: /home/src/workspaces/project/outFile.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
@@ -139,7 +161,7 @@ src/index.ts
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/fileDelete/outFile/deleted-file-without-composite.js b/tests/baselines/reference/tsbuild/fileDelete/outFile/deleted-file-without-composite.js
index 4672a8a05ce02..589ef057404d7 100644
--- a/tests/baselines/reference/tsbuild/fileDelete/outFile/deleted-file-without-composite.js
+++ b/tests/baselines/reference/tsbuild/fileDelete/outFile/deleted-file-without-composite.js
@@ -48,6 +48,11 @@ Output::
 Module resolution kind is not specified, using 'Classic'.
 File '/home/src/workspaces/solution/child/child2.ts' exists - use it as a name resolution result.
 ======== Module name '../child/child2' was successfully resolved to '/home/src/workspaces/solution/child/child2.ts'. ========
+child/tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../childResult.js",
+      ~~~~~~~~~
+
 child/tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd"
@@ -61,7 +66,7 @@ child/child2.ts
 child/child.ts
   Matched by default include pattern '**/*'
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -122,6 +127,11 @@ File '/home/src/workspaces/solution/child/child2.d.ts' does not exist.
 File '/home/src/workspaces/solution/child/child2.js' does not exist.
 File '/home/src/workspaces/solution/child/child2.jsx' does not exist.
 ======== Module name '../child/child2' was not resolved. ========
+child/tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../childResult.js",
+      ~~~~~~~~~
+
 child/tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd"
@@ -132,7 +142,7 @@ File '/home/src/workspaces/solution/child/child2.jsx' does not exist.
 child/child.ts
   Matched by default include pattern '**/*'
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/fileDelete/outFile/detects-deleted-file.js b/tests/baselines/reference/tsbuild/fileDelete/outFile/detects-deleted-file.js
index c0459fea5a1ea..e46aa983a25b3 100644
--- a/tests/baselines/reference/tsbuild/fileDelete/outFile/detects-deleted-file.js
+++ b/tests/baselines/reference/tsbuild/fileDelete/outFile/detects-deleted-file.js
@@ -71,6 +71,11 @@ Output::
 Module resolution kind is not specified, using 'Classic'.
 File '/home/src/workspaces/solution/child/child2.ts' exists - use it as a name resolution result.
 ======== Module name '../child/child2' was successfully resolved to '/home/src/workspaces/solution/child/child2.ts'. ========
+child/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../childResult.js",
+      ~~~~~~~~~
+
 child/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -127,6 +132,11 @@ File '/home/child.jsx' does not exist.
 File '/child.js' does not exist.
 File '/child.jsx' does not exist.
 ======== Module name 'child' was not resolved. ========
+main/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../mainResult.js",
+      ~~~~~~~~~
+
 main/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -139,7 +149,7 @@ childResult.d.ts
 main/main.ts
   Matched by default include pattern '**/*'
 
-Found 2 errors.
+Found 4 errors.
 
 
 
@@ -309,6 +319,11 @@ File '/home/src/workspaces/solution/child/child2.d.ts' does not exist.
 File '/home/src/workspaces/solution/child/child2.js' does not exist.
 File '/home/src/workspaces/solution/child/child2.jsx' does not exist.
 ======== Module name '../child/child2' was not resolved. ========
+child/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../childResult.js",
+      ~~~~~~~~~
+
 child/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -362,6 +377,11 @@ File '/home/child.jsx' does not exist.
 File '/child.js' does not exist.
 File '/child.jsx' does not exist.
 ======== Module name 'child' was not resolved. ========
+main/tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../mainResult.js",
+      ~~~~~~~~~
+
 main/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
@@ -374,7 +394,7 @@ childResult.d.ts
 main/main.ts
   Matched by default include pattern '**/*'
 
-Found 2 errors.
+Found 4 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-with-incremental.js
index 6ccf068c0fb44..89fa4d559c78c 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-with-incremental.js
@@ -55,8 +55,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 2 errors.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
@@ -215,8 +220,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -353,8 +363,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -449,8 +464,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -526,8 +546,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 2 errors.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
@@ -693,8 +718,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 2 errors.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
@@ -815,8 +845,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -929,8 +964,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -1028,8 +1068,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -1181,8 +1226,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 2 errors.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
@@ -1342,8 +1392,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -1473,8 +1528,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -1596,8 +1656,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors.js b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors.js
index 5d554bd98bff9..1ab891c870575 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors.js
@@ -54,10 +54,15 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -149,10 +154,15 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -205,8 +215,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -295,8 +310,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -358,8 +378,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -438,10 +463,15 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -550,10 +580,15 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -618,8 +653,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -697,8 +737,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -763,8 +808,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -873,10 +923,15 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -971,8 +1026,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -1045,8 +1105,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -1127,8 +1192,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-with-incremental.js
index 272860dfe5d74..daa04897d2af2 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-with-incremental.js
@@ -45,8 +45,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -186,8 +191,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -310,8 +320,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -406,8 +421,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -473,8 +493,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -597,8 +622,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -696,8 +726,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -804,8 +839,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -903,8 +943,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -1046,8 +1091,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1171,8 +1221,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -1293,8 +1348,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -1416,8 +1476,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors.js b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors.js
index b6360482a8884..e8cd1e21ad7f9 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors.js
@@ -44,8 +44,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -150,8 +155,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -226,8 +236,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -289,8 +304,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -359,8 +379,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -448,8 +473,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -514,8 +544,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -587,8 +622,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -653,8 +693,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -753,8 +798,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -835,8 +885,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -900,8 +955,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -982,8 +1042,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-with-incremental.js
index 2eba32763e7a9..1af603fb1f81d 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-with-incremental.js
@@ -186,8 +186,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -316,8 +321,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -412,8 +422,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -708,8 +723,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -822,8 +842,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -921,8 +946,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -1198,8 +1228,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -1329,8 +1364,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -1452,8 +1492,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors.js b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors.js
index bfb5962318e77..95a100db4e85d 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors.js
@@ -150,8 +150,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -232,8 +237,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -295,8 +305,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -526,8 +541,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -605,8 +625,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
@@ -671,8 +696,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -862,8 +892,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -936,8 +971,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -1018,8 +1058,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-composite.js b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-composite.js
index aca35ce903e0d..d3f116793fafe 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-composite.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-composite.js
@@ -60,13 +60,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -236,13 +241,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -262,13 +272,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -293,13 +308,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -377,13 +397,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -484,13 +509,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -510,13 +540,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -536,13 +571,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -562,13 +602,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -593,13 +638,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -769,13 +819,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -795,13 +850,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -821,13 +881,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -847,13 +912,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -878,13 +948,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -957,13 +1032,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1133,13 +1213,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1159,13 +1244,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1185,13 +1275,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental-declaration.js b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental-declaration.js
index e3b8cfca0d7e1..2c866005e9eba 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental-declaration.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental-declaration.js
@@ -61,18 +61,29 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -84,7 +95,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -96,17 +107,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -122,20 +133,20 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.d.ts]
-declare module "class" {
+declare module "src/class" {
     export class classC {
         prop: number;
     }
 }
-declare module "indirectClass" {
-    import { classC } from "class";
+declare module "src/indirectClass" {
+    import { classC } from "src/class";
     export class indirectClass {
         classC: classC;
     }
 }
-declare module "directUse" { }
-declare module "indirectUse" { }
-declare module "noChangeFile" {
+declare module "src/directUse" { }
+declare module "src/indirectUse" { }
+declare module "src/noChangeFile" {
     export function writeLog(s: string): void;
 }
 declare function someFunc(arguments: boolean, ...rest: any[]): void;
@@ -235,13 +246,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -261,13 +277,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -292,13 +313,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -374,13 +400,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -480,13 +517,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -506,13 +554,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -532,13 +585,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -558,13 +616,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -589,18 +658,29 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -612,7 +692,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -624,17 +704,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -650,20 +730,20 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.d.ts]
-declare module "class" {
+declare module "src/class" {
     export class classC {
         prop1: number;
     }
 }
-declare module "indirectClass" {
-    import { classC } from "class";
+declare module "src/indirectClass" {
+    import { classC } from "src/class";
     export class indirectClass {
         classC: classC;
     }
 }
-declare module "directUse" { }
-declare module "indirectUse" { }
-declare module "noChangeFile" {
+declare module "src/directUse" { }
+declare module "src/indirectUse" { }
+declare module "src/noChangeFile" {
     export function writeLog(s: string): void;
 }
 declare function someFunc(arguments: boolean, ...rest: any[]): void;
@@ -763,13 +843,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -789,13 +880,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -815,13 +911,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -841,13 +942,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -872,13 +984,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -949,18 +1066,29 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -972,7 +1100,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -984,17 +1112,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -1010,20 +1138,20 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.d.ts]
-declare module "class" {
+declare module "src/class" {
     export class classC {
         prop: number;
     }
 }
-declare module "indirectClass" {
-    import { classC } from "class";
+declare module "src/indirectClass" {
+    import { classC } from "src/class";
     export class indirectClass {
         classC: classC;
     }
 }
-declare module "directUse" { }
-declare module "indirectUse" { }
-declare module "noChangeFile" {
+declare module "src/directUse" { }
+declare module "src/indirectUse" { }
+declare module "src/noChangeFile" {
     export function writeLog(s: string): void;
 }
 declare function someFunc(arguments: boolean, ...rest: any[]): void;
@@ -1123,13 +1251,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1149,13 +1282,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1175,13 +1313,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental.js b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental.js
index 10dac7542edd4..ed6be5054fd9b 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental.js
@@ -60,18 +60,29 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -83,7 +94,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -95,17 +106,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -213,13 +224,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -239,13 +255,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -270,13 +291,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -351,13 +377,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -455,13 +492,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -481,13 +529,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -507,13 +560,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -533,13 +591,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -564,18 +633,29 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -587,7 +667,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -599,17 +679,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -717,13 +797,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -743,13 +834,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -769,13 +865,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -795,13 +896,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -826,13 +938,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -902,18 +1019,29 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -925,7 +1053,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -937,17 +1065,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -1055,13 +1183,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1081,13 +1214,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1107,13 +1245,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-composite.js b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-composite.js
index cba73748f6d41..265c54ce47dc5 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-composite.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-composite.js
@@ -60,13 +60,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -143,13 +148,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -324,13 +334,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -505,13 +520,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -584,13 +604,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js
index ff4b44068dc7d..c8c96a3aa41c8 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js
@@ -61,13 +61,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -144,13 +149,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -233,7 +249,7 @@ Found 1 error.
 }
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -245,7 +261,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -257,17 +273,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -283,20 +299,20 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.d.ts]
-declare module "class" {
+declare module "src/class" {
     export class classC {
         prop: number;
     }
 }
-declare module "indirectClass" {
-    import { classC } from "class";
+declare module "src/indirectClass" {
+    import { classC } from "src/class";
     export class indirectClass {
         classC: classC;
     }
 }
-declare module "directUse" { }
-declare module "indirectUse" { }
-declare module "noChangeFile" {
+declare module "src/directUse" { }
+declare module "src/indirectUse" { }
+declare module "src/noChangeFile" {
     export function writeLog(s: string): void;
 }
 declare function someFunc(arguments: boolean, ...rest: any[]): void;
@@ -323,13 +339,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -412,7 +439,7 @@ Found 1 error.
 }
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -424,7 +451,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -436,17 +463,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -462,20 +489,20 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.d.ts]
-declare module "class" {
+declare module "src/class" {
     export class classC {
         prop1: number;
     }
 }
-declare module "indirectClass" {
-    import { classC } from "class";
+declare module "src/indirectClass" {
+    import { classC } from "src/class";
     export class indirectClass {
         classC: classC;
     }
 }
-declare module "directUse" { }
-declare module "indirectUse" { }
-declare module "noChangeFile" {
+declare module "src/directUse" { }
+declare module "src/indirectUse" { }
+declare module "src/noChangeFile" {
     export function writeLog(s: string): void;
 }
 declare function someFunc(arguments: boolean, ...rest: any[]): void;
@@ -502,13 +529,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -579,13 +611,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -668,7 +711,7 @@ Found 1 error.
 }
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -680,7 +723,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -692,17 +735,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -718,20 +761,20 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.d.ts]
-declare module "class" {
+declare module "src/class" {
     export class classC {
         prop: number;
     }
 }
-declare module "indirectClass" {
-    import { classC } from "class";
+declare module "src/indirectClass" {
+    import { classC } from "src/class";
     export class indirectClass {
         classC: classC;
     }
 }
-declare module "directUse" { }
-declare module "indirectUse" { }
-declare module "noChangeFile" {
+declare module "src/directUse" { }
+declare module "src/indirectUse" { }
+declare module "src/noChangeFile" {
     export function writeLog(s: string): void;
 }
 declare function someFunc(arguments: boolean, ...rest: any[]): void;
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental.js b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental.js
index c03f1c0eed7f8..17c73b43f2055 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental.js
@@ -60,13 +60,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -142,13 +147,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -230,7 +246,7 @@ Found 1 error.
 }
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -242,7 +258,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -254,17 +270,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -300,13 +316,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -388,7 +415,7 @@ Found 1 error.
 }
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -400,7 +427,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -412,17 +439,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -458,13 +485,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -534,13 +566,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -622,7 +665,7 @@ Found 1 error.
 }
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -634,7 +677,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -646,17 +689,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules.js
index 5919e2af67c87..26ade643379c1 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules.js
@@ -39,13 +39,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -125,13 +130,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -173,13 +183,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -261,13 +276,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -351,13 +371,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -409,13 +434,18 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -551,13 +581,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -635,13 +670,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -721,13 +761,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-discrepancies.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-discrepancies.js
index 14daa5f6604f9..081a74d7b0a56 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-discrepancies.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-discrepancies.js
@@ -41,41 +41,4 @@ IncrementalBuild:
 7:: With declaration and declarationMap noEmit
 Clean build will have declaration and declarationMap
 Incremental build will have previous buildInfo so will have declaration and declarationMap
-TsBuild info text without affectedFilesPendingEmit:: /home/src/projects/outfile.tsbuildinfo.readable.baseline.txt::
-CleanBuild:
-{
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "9520728827-const a = class { public p = 10; };"
-  },
-  "root": [
-    [
-      2,
-      "./project/a.ts"
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "declarationMap": true,
-    "outFile": "./outFile.js"
-  },
-  "version": "FakeTSVersion"
-}
-IncrementalBuild:
-{
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "9520728827-const a = class { public p = 10; };"
-  },
-  "root": [
-    [
-      2,
-      "./project/a.ts"
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "outFile": "./outFile.js"
-  },
-  "version": "FakeTSVersion"
-}
\ No newline at end of file
+*** Supplied discrepancy explanation but didnt find any difference
\ No newline at end of file
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental.js
index edae96aabe77b..020d52163065f 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental.js
@@ -35,10 +35,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -59,12 +67,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 619
+  "size": 621
 }
 
 
@@ -83,13 +91,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -100,12 +106,41 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
+
+Found 1 error.
+
+
+
+
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "incremental": true,
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
 
+No cached semantic diagnostics in the builder::
 
+No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: With declaration enabled noEmit - Should report errors
 
@@ -116,19 +151,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
-
-1 const a = class { private p = 10; };
-        ~
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -136,7 +166,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -158,35 +188,12 @@ Found 1 error.
     "declaration": true,
     "outFile": "./outFile.js"
   },
-  "emitDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
-          "category": 1,
-          "code": 4094,
-          "relatedInformation": [
-            {
-              "start": 6,
-              "length": 1,
-              "messageText": "Add a type annotation to the variable a.",
-              "category": 1,
-              "code": 9027
-            }
-          ]
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 939
+  "size": 640
 }
 
 
@@ -206,7 +213,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -225,15 +232,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
-
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -241,7 +243,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"declarationMap":true,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":49,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"declarationMap":true,"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -264,35 +266,12 @@ Found 1 error.
     "declarationMap": true,
     "outFile": "./outFile.js"
   },
-  "emitDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
-          "category": 1,
-          "code": 4094,
-          "relatedInformation": [
-            {
-              "start": 6,
-              "length": 1,
-              "messageText": "Add a type annotation to the variable a.",
-              "category": 1,
-              "code": 9027
-            }
-          ]
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js | DtsEmit | DtsMap",
-    49
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 961
+  "size": 662
 }
 
 
@@ -313,7 +292,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -328,12 +307,41 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 
+Found 1 error.
+
+
+
+
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "incremental": true,
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
 
+No cached semantic diagnostics in the builder::
 
+No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Dts Emit with error
 
@@ -358,13 +366,18 @@ Output::
             ~
     Add a type annotation to the variable a.
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -386,6 +399,16 @@ Found 1 error.
     "declaration": true,
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -410,7 +433,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 922
+  "size": 957
 }
 
 //// [/home/src/projects/outFile.js]
@@ -438,7 +461,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -456,14 +479,22 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","9520728827-const a = class { public p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","9520728827-const a = class { public p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -484,9 +515,8 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
   "size": 618
@@ -508,13 +538,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: With declaration enabled noEmit
 
@@ -525,14 +553,22 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","9520728827-const a = class { public p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"pendingEmit":17,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","9520728827-const a = class { public p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -554,12 +590,11 @@ Output::
     "declaration": true,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 634
+  "size": 637
 }
 
 
@@ -579,11 +614,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: With declaration and declarationMap noEmit
 
@@ -594,9 +629,71 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
+
+Found 1 error.
+
+
+
+//// [/home/src/projects/outFile.tsbuildinfo]
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","9520728827-const a = class { public p = 10; };"],"root":[2],"options":{"declaration":true,"declarationMap":true,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
+{
+  "fileNames": [
+    "../tslibs/ts/lib/lib.d.ts",
+    "./project/a.ts"
+  ],
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "9520728827-const a = class { public p = 10; };"
+  },
+  "root": [
+    [
+      2,
+      "./project/a.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "declarationMap": true,
+    "outFile": "./outFile.js"
+  },
+  "changeFileSet": [
+    "./project/a.ts"
+  ],
+  "version": "FakeTSVersion",
+  "size": 659
+}
+
+
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "incremental": true,
+  "declaration": true,
+  "declarationMap": true,
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
 
+No cached semantic diagnostics in the builder::
 
+No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js
index 063b9b86b1cb9..c691a6a26e7c0 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js
@@ -45,13 +45,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -145,13 +150,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -197,13 +207,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -299,13 +314,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -403,13 +423,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -485,13 +510,18 @@ Output::
                    ~
     Add a type annotation to the variable d.
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 4 errors.
+Found 5 errors.
 
 
 
@@ -711,13 +741,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -807,13 +842,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -905,13 +945,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -1008,13 +1053,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes.js
index 354d3ae0433fb..ddb56267d229e 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes.js
@@ -34,18 +34,27 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"version":"FakeTSVersion"}
+{"root":["./project/a.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "./project/a.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 53
+  "size": 67
 }
 
 
@@ -63,13 +72,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -80,10 +87,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
@@ -103,13 +118,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: With declaration enabled noEmit - Should report errors
 
@@ -120,38 +133,22 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
-
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
 
 Found 1 error.
 
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"errors":true,"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "errors": true,
-  "version": "FakeTSVersion",
-  "size": 67
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
 Program root files: [
   "/home/src/projects/project/a.ts"
@@ -168,9 +165,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -189,15 +184,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
-
-1 const a = class { private p = 10; };
-        ~
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -223,9 +213,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -244,20 +232,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 53
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
 Program root files: [
   "/home/src/projects/project/a.ts"
@@ -273,13 +259,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Dts Emit with error
 
@@ -290,7 +274,7 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
@@ -304,26 +288,20 @@ Output::
             ~
     Add a type annotation to the variable a.
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/projects/project/tsconfig.json'...
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"errors":true,"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "errors": true,
-  "version": "FakeTSVersion",
-  "size": 67
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 //// [/home/src/projects/outFile.js]
 var a = /** @class */ (function () {
     function class_1() {
@@ -348,9 +326,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -372,20 +348,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 53
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
 Program root files: [
   "/home/src/projects/project/a.ts"
@@ -401,13 +375,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: With declaration enabled noEmit
 
@@ -418,10 +390,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.js' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
@@ -442,13 +422,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: With declaration and declarationMap noEmit
 
@@ -459,10 +437,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.js' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
@@ -484,10 +470,8 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-as-modules.js
index fddf6ae22e533..dd0446789b1b6 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-as-modules.js
@@ -40,13 +40,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -128,13 +133,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -180,13 +190,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -268,13 +283,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -317,13 +337,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -437,13 +462,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -489,13 +519,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -585,13 +620,18 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -724,13 +764,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-discrepancies.js
new file mode 100644
index 0000000000000..66153cdb54a8b
--- /dev/null
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-discrepancies.js
@@ -0,0 +1,84 @@
+7:: no-change-run
+*** Needs explanation
+Incremental build contains ./project/a.ts file has emit errors, clean build does not have errors or does not mark is as pending emit: /home/src/projects/outfile.tsbuildinfo.readable.baseline.txt::
+Incremental buildInfoText:: {
+  "fileNames": [
+    "../tslibs/ts/lib/lib.d.ts",
+    "./project/a.ts"
+  ],
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "7752727223-const a = class { private p = 10; };"
+  },
+  "root": [
+    [
+      2,
+      "./project/a.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "outFile": "./outFile.js"
+  },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 6,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 6,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "version": "FakeTSVersion",
+  "size": 957
+}
+Clean buildInfoText:: {
+  "fileNames": [
+    "../tslibs/ts/lib/lib.d.ts",
+    "./project/a.ts"
+  ],
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "7752727223-const a = class { private p = 10; };"
+  },
+  "root": [
+    [
+      2,
+      "./project/a.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "outFile": "./outFile.js"
+  },
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
+  ],
+  "version": "FakeTSVersion",
+  "size": 640
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental.js
index e9afeb5e78bbd..f2d69f3dc3087 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental.js
@@ -36,15 +36,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
-
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -52,7 +47,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -74,35 +69,12 @@ Found 1 error.
     "declaration": true,
     "outFile": "./outFile.js"
   },
-  "emitDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
-          "category": 1,
-          "code": 4094,
-          "relatedInformation": [
-            {
-              "start": 6,
-              "length": 1,
-              "messageText": "Add a type annotation to the variable a.",
-              "category": 1,
-              "code": 9027
-            }
-          ]
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 939
+  "size": 640
 }
 
 
@@ -122,9 +94,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -143,15 +113,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
-
-1 const a = class { private p = 10; };
-        ~
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -175,7 +140,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -197,10 +162,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"pendingEmit":17,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -222,12 +195,12 @@ Output::
     "declaration": true,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 619
+  "size": 624
 }
 
 
@@ -247,13 +220,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -264,12 +235,42 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
+
+
+
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "incremental": true,
+  "declaration": true,
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
 
+No cached semantic diagnostics in the builder::
 
+No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -280,14 +281,22 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -309,8 +318,18 @@ Output::
     "declaration": true,
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 602
+  "size": 637
 }
 
 //// [/home/src/projects/outFile.js]
@@ -337,11 +356,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -352,12 +371,42 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 
+Found 1 error.
+
+
+
+
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "incremental": true,
+  "declaration": true,
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
 
+No cached semantic diagnostics in the builder::
 
+No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -371,19 +420,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
-
-1 const a = class { private p = 10; };
-        ~
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -391,7 +435,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -413,35 +457,11 @@ Found 1 error.
     "declaration": true,
     "outFile": "./outFile.js"
   },
-  "emitDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
-          "category": 1,
-          "code": 4094,
-          "relatedInformation": [
-            {
-              "start": 6,
-              "length": 1,
-              "messageText": "Add a type annotation to the variable a.",
-              "category": 1,
-              "code": 9027
-            }
-          ]
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 939
+  "size": 638
 }
 
 
@@ -461,9 +481,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -492,13 +510,18 @@ Output::
             ~
     Add a type annotation to the variable a.
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 2 errors.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -520,6 +543,16 @@ Found 1 error.
     "declaration": true,
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -544,7 +577,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 922
+  "size": 957
 }
 
 //// [/home/src/projects/outFile.js]
@@ -572,7 +605,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -591,15 +624,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
-
-1 const a = class { private p = 10; };
-        ~
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -623,7 +651,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
index 74533959dac20..b643a2cdac0a3 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
@@ -39,13 +39,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -125,13 +130,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -176,13 +186,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -262,13 +277,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -310,13 +330,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -419,13 +444,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -470,13 +500,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -554,13 +589,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -668,13 +708,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js
index c8b94b100679c..e94a304888a25 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js
@@ -35,10 +35,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -59,12 +67,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 619
+  "size": 621
 }
 
 
@@ -83,13 +91,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -100,12 +106,41 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
 
 
 
 
-exitCode:: ExitStatus.Success
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "incremental": true,
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+
+No cached semantic diagnostics in the builder::
+
+No shapes updated in the builder::
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Fix error
 
@@ -119,14 +154,22 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -147,12 +190,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 603
+  "size": 605
 }
 
 
@@ -171,13 +214,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -188,12 +229,41 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
 
 
 
 
-exitCode:: ExitStatus.Success
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "incremental": true,
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+
+No cached semantic diagnostics in the builder::
+
+No shapes updated in the builder::
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -204,14 +274,22 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -232,8 +310,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 583
+  "size": 618
 }
 
 //// [/home/src/projects/outFile.js]
@@ -255,11 +343,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -270,12 +358,41 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
 
 
 
 
-exitCode:: ExitStatus.Success
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "incremental": true,
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+
+No cached semantic diagnostics in the builder::
+
+No shapes updated in the builder::
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -289,14 +406,22 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -317,9 +442,8 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
   "size": 619
@@ -341,13 +465,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit when error
 
@@ -358,14 +480,22 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -386,8 +516,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 599
+  "size": 634
 }
 
 //// [/home/src/projects/outFile.js]
@@ -414,11 +554,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -429,9 +569,38 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
 
 
 
 
-exitCode:: ExitStatus.Success
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "incremental": true,
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+
+No cached semantic diagnostics in the builder::
+
+No shapes updated in the builder::
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled.js
index 6bf5b0eb464e8..526b18fe060b3 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled.js
@@ -34,18 +34,27 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"version":"FakeTSVersion"}
+{"root":["./project/a.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "./project/a.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 53
+  "size": 67
 }
 
 
@@ -63,13 +72,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -80,10 +87,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
@@ -103,13 +118,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Fix error
 
@@ -123,10 +136,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
@@ -146,13 +167,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -163,10 +182,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
@@ -186,13 +213,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -203,10 +228,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
@@ -229,13 +262,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -246,12 +277,42 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.js'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
+Found 1 error.
+
+
+
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
+
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
 
+No cached semantic diagnostics in the builder::
 
+No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -265,10 +326,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
@@ -288,13 +357,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit when error
 
@@ -305,10 +372,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.js' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
@@ -336,13 +411,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -353,9 +426,39 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.js'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
+Found 1 error.
+
+
 
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+
+No cached semantic diagnostics in the builder::
+
+No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors.js
index a40245fb101f7..6dc24a6d845ec 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors.js
@@ -35,15 +35,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
-
-1 const a = class { private p = 10; };
-        ~
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -79,9 +74,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -100,15 +93,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
-
-1 const a = class { private p = 10; };
-        ~
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -133,9 +121,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -157,20 +143,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 53
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
 Program root files: [
   "/home/src/projects/project/a.ts"
@@ -187,13 +171,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -204,10 +186,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
@@ -228,13 +218,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -245,10 +233,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
@@ -276,13 +272,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -293,12 +287,43 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.js'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 
+Found 1 error.
+
+
+
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
+
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "declaration": true,
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
 
+No cached semantic diagnostics in the builder::
 
+No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -312,38 +337,22 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
-
-1 const a = class { private p = 10; };
-        ~
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
 Found 1 error.
 
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"errors":true,"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "errors": true,
-  "version": "FakeTSVersion",
-  "size": 67
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
 Program root files: [
   "/home/src/projects/project/a.ts"
@@ -360,9 +369,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -391,10 +398,15 @@ Output::
             ~
     Add a type annotation to the variable a.
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/projects/project/tsconfig.json'...
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -425,9 +437,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -446,15 +456,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
-
-1 const a = class { private p = 10; };
-        ~
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -479,9 +484,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
index f16f138b4c510..2af3574f27a74 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
@@ -39,13 +39,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -125,13 +130,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -176,13 +186,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -262,13 +277,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -310,13 +330,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -419,13 +444,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -470,13 +500,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -554,13 +589,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -649,13 +689,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors-with-incremental.js
index 3debb7b7a6519..5985796bf2ec8 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors-with-incremental.js
@@ -35,10 +35,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -46,7 +46,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":6,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -67,26 +67,12 @@ Found 1 error.
   "options": {
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 761
+  "size": 612
 }
 
 
@@ -105,9 +91,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -126,10 +110,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -152,7 +136,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -174,10 +158,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -198,12 +190,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 603
+  "size": 605
 }
 
 
@@ -222,13 +214,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -239,12 +229,41 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
 
 
 
 
-exitCode:: ExitStatus.Success
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "incremental": true,
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+
+No cached semantic diagnostics in the builder::
+
+No shapes updated in the builder::
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -255,14 +274,22 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -283,8 +310,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 583
+  "size": 618
 }
 
 //// [/home/src/projects/outFile.js]
@@ -306,11 +343,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -321,12 +358,41 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
+
+
+
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "incremental": true,
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
 
+No cached semantic diagnostics in the builder::
 
+No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -340,14 +406,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -355,7 +421,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":6,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -376,26 +442,11 @@ Found 1 error.
   "options": {
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 761
+  "size": 610
 }
 
 
@@ -414,9 +465,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -435,10 +484,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -446,7 +495,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":6,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -468,21 +517,17 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
     [
       "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 741
+  "size": 625
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
@@ -501,7 +546,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -520,10 +565,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -546,7 +591,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors.js b/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors.js
index 0165ecc652cf8..d2bf5b8024622 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors.js
@@ -34,10 +34,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -72,9 +72,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -93,10 +91,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -120,9 +118,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -144,20 +140,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 53
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
 Program root files: [
   "/home/src/projects/project/a.ts"
@@ -173,13 +167,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -190,10 +182,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
@@ -213,13 +213,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -230,10 +228,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
@@ -256,13 +262,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -273,12 +277,42 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.js'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
+
 
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+
+No cached semantic diagnostics in the builder::
+
+No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -292,33 +326,22 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
 
 Found 1 error.
 
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"errors":true,"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "errors": true,
-  "version": "FakeTSVersion",
-  "size": 67
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
 Program root files: [
   "/home/src/projects/project/a.ts"
@@ -334,9 +357,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -355,10 +376,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -382,9 +403,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -403,10 +422,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
 
 Found 1 error.
@@ -430,9 +449,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
index 1057c3a035d98..02a5d82842ea7 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
@@ -176,13 +176,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -262,13 +267,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -310,13 +320,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -419,13 +434,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors-with-incremental.js
index 7c690529f95f2..cd3d94682ef05 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors-with-incremental.js
@@ -158,10 +158,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -182,12 +190,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 603
+  "size": 605
 }
 
 
@@ -206,13 +214,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -223,12 +229,41 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
+
+Found 1 error.
+
+
+
 
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "incremental": true,
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
 
+No cached semantic diagnostics in the builder::
 
-exitCode:: ExitStatus.Success
+No shapes updated in the builder::
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -239,14 +274,22 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -267,8 +310,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 583
+  "size": 618
 }
 
 //// [/home/src/projects/outFile.js]
@@ -290,11 +343,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -305,12 +358,41 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error.
 
 
 
 
-exitCode:: ExitStatus.Success
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "incremental": true,
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+
+No cached semantic diagnostics in the builder::
+
+No shapes updated in the builder::
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -324,7 +406,7 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors.js b/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors.js
index 2eab5dc0d22e6..f15bf8c13b527 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors.js
@@ -140,20 +140,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 53
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
 Program root files: [
   "/home/src/projects/project/a.ts"
@@ -169,13 +167,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -186,10 +182,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
@@ -209,13 +213,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -226,10 +228,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
@@ -252,13 +262,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -269,12 +277,42 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.js'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error.
 
 
 
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
-exitCode:: ExitStatus.Success
+Program root files: [
+  "/home/src/projects/project/a.ts"
+]
+Program options: {
+  "outFile": "/home/src/projects/outFile.js",
+  "noEmit": true,
+  "tscBuild": true,
+  "configFilePath": "/home/src/projects/project/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+
+No cached semantic diagnostics in the builder::
+
+No shapes updated in the builder::
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -288,7 +326,7 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
@@ -302,19 +340,8 @@ Found 1 error.
 
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"errors":true,"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "errors": true,
-  "version": "FakeTSVersion",
-  "size": 67
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
 Program root files: [
   "/home/src/projects/project/a.ts"
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js
index 6d65f93f39b08..994d32036782a 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js
@@ -51,13 +51,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -151,13 +156,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -207,13 +217,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -307,13 +322,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration.js
index 38c1815b13046..2be925ecb127f 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration.js
@@ -50,13 +50,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -119,13 +124,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -180,13 +190,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -236,13 +251,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-incremental.js
index 9ef1c63913944..5264416734cb8 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-incremental.js
@@ -50,13 +50,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -148,13 +153,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -203,13 +213,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -301,13 +316,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js
index 82d4752d1bba9..57be6bf61faf5 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js
@@ -49,13 +49,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -117,13 +122,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -177,13 +187,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -232,13 +247,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js
index 955fc8f9629b9..f9a895c718cb3 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js
@@ -55,13 +55,18 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -173,13 +178,18 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -228,13 +238,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -328,13 +343,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration.js
index fbd78fb48c6a9..247b4ecfff1e8 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration.js
@@ -54,13 +54,18 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -128,13 +133,18 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -188,13 +198,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -244,13 +259,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-incremental.js
index 0d80588b62c85..f14f2440a6178 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-incremental.js
@@ -54,13 +54,18 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -170,13 +175,18 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -224,13 +234,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -322,13 +337,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js
index 278dd2b2ff77c..3d46e17b85781 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js
@@ -53,13 +53,18 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -126,13 +131,18 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -185,13 +195,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -240,13 +255,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js
index 1b2399b57b703..d599ed33c650f 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js
@@ -58,13 +58,18 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -163,13 +168,18 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -220,13 +230,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -320,13 +335,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration.js
index 0a6ade00a5341..09d1fa72123dc 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration.js
@@ -57,13 +57,18 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -131,13 +136,18 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -193,13 +203,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -249,13 +264,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-incremental.js
index 5a7b166e6b876..d6ffc777b8f17 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-incremental.js
@@ -57,13 +57,18 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -160,13 +165,18 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -216,13 +226,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -314,13 +329,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js
index 09b9aff40858d..b3052ef1c41b1 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js
@@ -56,13 +56,18 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -129,13 +134,18 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors.
+Found 3 errors.
 
 
 
@@ -190,13 +200,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -245,13 +260,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/outFile/baseline-sectioned-sourcemaps.js b/tests/baselines/reference/tsbuild/outFile/baseline-sectioned-sourcemaps.js
index 51d114c5a9e24..b07ce361eb4ca 100644
--- a/tests/baselines/reference/tsbuild/outFile/baseline-sectioned-sourcemaps.js
+++ b/tests/baselines/reference/tsbuild/outFile/baseline-sectioned-sourcemaps.js
@@ -139,6 +139,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
 
+first/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "./bin/first-output.js",
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 first/first_PART1.ts
@@ -151,6 +156,11 @@ first/first_part3.ts
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
 
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 second/second_part1.ts
@@ -161,6 +171,11 @@ second/second_part2.ts
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/third/tsconfig.json'...
 
+third/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "./thirdjs/output/third-output.js",
+       ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 first/bin/first-output.d.ts
@@ -169,6 +184,9 @@ first/bin/first-output.d.ts
   Output from referenced project 'second/tsconfig.json' included because '--outFile' specified
 third/third_part1.ts
   Part of 'files' list in tsconfig.json
+
+Found 3 errors.
+
 
 
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map]
@@ -198,7 +216,7 @@ declare function f(): string;
 //# sourceMappingURL=first-output.d.ts.map
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -237,10 +255,28 @@ declare function f(): string;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1233
+  "size": 1272
 }
 
 //// [/home/src/workspaces/solution/2/second-output.js.map]
@@ -278,7 +314,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -313,10 +349,24 @@ declare class C {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part2.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
   "latestChangedDtsFile": "./second-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1177
+  "size": 1214
 }
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map]
@@ -335,7 +385,7 @@ declare var c: C;
 //# sourceMappingURL=third-output.d.ts.map
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo]
-{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -368,10 +418,28 @@ declare var c: C;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../first/bin/first-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../2/second-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../third_part1.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "1894672131-declare var c: C;\n",
   "latestChangedDtsFile": "./third-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1226
+  "size": 1265
 }
 
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map.baseline.txt]
@@ -1095,7 +1163,7 @@ sourceFile:../../third_part1.ts
 >>>//# sourceMappingURL=third-output.d.ts.map
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 readFiles:: {
   "/home/src/workspaces/solution/third/tsconfig.json": 1,
@@ -1135,10 +1203,15 @@ Output::
     * second/tsconfig.json
     * third/tsconfig.json
 
-[HH:MM:SS AM] Project 'first/tsconfig.json' is out of date because output 'first/bin/first-output.tsbuildinfo' is older than input 'first/first_PART1.ts'
+[HH:MM:SS AM] Project 'first/tsconfig.json' is out of date because buildinfo file 'first/bin/first-output.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
 
+first/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "./bin/first-output.js",
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 first/first_PART1.ts
@@ -1147,12 +1220,30 @@ first/first_part2.ts
   Part of 'files' list in tsconfig.json
 first/first_part3.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Project 'second/tsconfig.json' is up to date because newest input 'second/second_part2.ts' is older than output '2/second-output.tsbuildinfo'
+[HH:MM:SS AM] Project 'second/tsconfig.json' is out of date because buildinfo file '2/second-output.tsbuildinfo' indicates that program needs to report errors.
 
-[HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because output 'third/thirdjs/output/third-output.tsbuildinfo' is older than input 'first'
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
+
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
+
+../../tslibs/TS/Lib/lib.d.ts
+  Default library for target 'es5'
+second/second_part1.ts
+  Matched by default include pattern '**/*'
+second/second_part2.ts
+  Matched by default include pattern '**/*'
+[HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because buildinfo file 'third/thirdjs/output/third-output.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/third/tsconfig.json'...
 
+third/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "./thirdjs/output/third-output.js",
+       ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 first/bin/first-output.d.ts
@@ -1161,6 +1252,9 @@ first/bin/first-output.d.ts
   Output from referenced project 'second/tsconfig.json' included because '--outFile' specified
 third/third_part1.ts
   Part of 'files' list in tsconfig.json
+
+Found 3 errors.
+
 
 
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map]
@@ -1190,7 +1284,7 @@ declare function f(): string;
 //# sourceMappingURL=first-output.d.ts.map
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-21189362626-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hola, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-14566027737-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hola, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-21189362626-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hola, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-14566027737-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hola, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -1229,17 +1323,35 @@ declare function f(): string;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-14566027737-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hola, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1231
+  "size": 1270
 }
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map] file written with same contents
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js] file written with same contents
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.d.ts.map] file written with same contents
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo]
-{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14566027737-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hola, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14566027737-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hola, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -1272,10 +1384,28 @@ declare function f(): string;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../first/bin/first-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../2/second-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../third_part1.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "1894672131-declare var c: C;\n",
   "latestChangedDtsFile": "./third-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1225
+  "size": 1264
 }
 
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map.baseline.txt]
@@ -1555,7 +1685,7 @@ sourceFile:../first_part3.ts
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map.baseline.txt] file written with same contents
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.d.ts.map.baseline.txt] file written with same contents
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 readFiles:: {
   "/home/src/workspaces/solution/third/tsconfig.json": 1,
@@ -1566,6 +1696,8 @@ readFiles:: {
   "/home/src/workspaces/solution/first/first_part2.ts": 1,
   "/home/src/workspaces/solution/first/first_part3.ts": 1,
   "/home/src/workspaces/solution/2/second-output.tsbuildinfo": 1,
+  "/home/src/workspaces/solution/second/second_part1.ts": 1,
+  "/home/src/workspaces/solution/second/second_part2.ts": 1,
   "/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo": 1,
   "/home/src/workspaces/solution/first/bin/first-output.d.ts": 1,
   "/home/src/workspaces/solution/2/second-output.d.ts": 1,
@@ -1596,10 +1728,15 @@ Output::
     * second/tsconfig.json
     * third/tsconfig.json
 
-[HH:MM:SS AM] Project 'first/tsconfig.json' is out of date because output 'first/bin/first-output.tsbuildinfo' is older than input 'first/first_PART1.ts'
+[HH:MM:SS AM] Project 'first/tsconfig.json' is out of date because buildinfo file 'first/bin/first-output.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
 
+first/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "./bin/first-output.js",
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 first/first_PART1.ts
@@ -1608,11 +1745,40 @@ first/first_part2.ts
   Part of 'files' list in tsconfig.json
 first/first_part3.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Project 'second/tsconfig.json' is up to date because newest input 'second/second_part2.ts' is older than output '2/second-output.tsbuildinfo'
+[HH:MM:SS AM] Project 'second/tsconfig.json' is out of date because buildinfo file '2/second-output.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
+
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
+
+../../tslibs/TS/Lib/lib.d.ts
+  Default library for target 'es5'
+second/second_part1.ts
+  Matched by default include pattern '**/*'
+second/second_part2.ts
+  Matched by default include pattern '**/*'
+[HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because buildinfo file 'third/thirdjs/output/third-output.tsbuildinfo' indicates that program needs to report errors.
 
-[HH:MM:SS AM] Project 'third/tsconfig.json' is up to date with .d.ts files from its dependencies
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/third/tsconfig.json'...
+
+third/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "./thirdjs/output/third-output.js",
+       ~~~~~~~~~
+
+../../tslibs/TS/Lib/lib.d.ts
+  Default library for target 'es5'
+first/bin/first-output.d.ts
+  Output from referenced project 'first/tsconfig.json' included because '--outFile' specified
+2/second-output.d.ts
+  Output from referenced project 'second/tsconfig.json' included because '--outFile' specified
+third/third_part1.ts
+  Part of 'files' list in tsconfig.json
 
-[HH:MM:SS AM] Updating output timestamps of project '/home/src/workspaces/solution/third/tsconfig.json'...
+Found 3 errors.
 
 
 
@@ -1631,7 +1797,7 @@ function f() {
 
 //// [/home/src/workspaces/solution/first/bin/first-output.d.ts.map] file written with same contents
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-21292400928-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hola, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\nconsole.log(s);","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-14566027737-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hola, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-21292400928-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hola, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\nconsole.log(s);","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-14566027737-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hola, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -1670,13 +1836,30 @@ function f() {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-14566027737-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hola, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1246
+  "size": 1285
 }
 
-//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo] file changed its modified time
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map.baseline.txt]
 ===================================================================
 JsFile: first-output.js
@@ -1850,7 +2033,7 @@ sourceFile:../first_part3.ts
 
 //// [/home/src/workspaces/solution/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 readFiles:: {
   "/home/src/workspaces/solution/third/tsconfig.json": 1,
@@ -1861,5 +2044,10 @@ readFiles:: {
   "/home/src/workspaces/solution/first/first_part2.ts": 1,
   "/home/src/workspaces/solution/first/first_part3.ts": 1,
   "/home/src/workspaces/solution/2/second-output.tsbuildinfo": 1,
-  "/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo": 1
+  "/home/src/workspaces/solution/second/second_part1.ts": 1,
+  "/home/src/workspaces/solution/second/second_part2.ts": 1,
+  "/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo": 1,
+  "/home/src/workspaces/solution/first/bin/first-output.d.ts": 1,
+  "/home/src/workspaces/solution/2/second-output.d.ts": 1,
+  "/home/src/workspaces/solution/third/third_part1.ts": 1
 } 
\ No newline at end of file
diff --git a/tests/baselines/reference/tsbuild/outFile/builds-till-project-specified.js b/tests/baselines/reference/tsbuild/outFile/builds-till-project-specified.js
index 5d3f001424e4b..91764e6095ba3 100644
--- a/tests/baselines/reference/tsbuild/outFile/builds-till-project-specified.js
+++ b/tests/baselines/reference/tsbuild/outFile/builds-till-project-specified.js
@@ -129,6 +129,14 @@ declare const console: { log(msg: any): void; };
 
 
 /home/src/tslibs/TS/Lib/tsc.js --build second/tsconfig.json
+Output::
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
+
+
+
 //// [/home/src/workspaces/solution/2/second-output.js.map]
 {"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"}
 
@@ -164,7 +172,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -199,11 +207,25 @@ declare class C {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part2.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
   "latestChangedDtsFile": "./second-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1177
+  "size": 1214
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/outFile/clean-projects.js b/tests/baselines/reference/tsbuild/outFile/clean-projects.js
index a3166915c0f5e..ff2c554508859 100644
--- a/tests/baselines/reference/tsbuild/outFile/clean-projects.js
+++ b/tests/baselines/reference/tsbuild/outFile/clean-projects.js
@@ -154,7 +154,7 @@ declare function f(): string;
 //# sourceMappingURL=first-output.d.ts.map
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -193,10 +193,28 @@ declare function f(): string;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1233
+  "size": 1272
 }
 
 //// [/home/src/workspaces/solution/2/second-output.js.map]
@@ -234,7 +252,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -269,10 +287,24 @@ declare class C {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part2.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
   "latestChangedDtsFile": "./second-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1177
+  "size": 1214
 }
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map]
@@ -291,7 +323,7 @@ declare var c: C;
 //# sourceMappingURL=third-output.d.ts.map
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo]
-{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -324,10 +356,28 @@ declare var c: C;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../first/bin/first-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../2/second-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../third_part1.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "1894672131-declare var c: C;\n",
   "latestChangedDtsFile": "./third-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1226
+  "size": 1265
 }
 
 
diff --git a/tests/baselines/reference/tsbuild/outFile/cleans-till-project-specified.js b/tests/baselines/reference/tsbuild/outFile/cleans-till-project-specified.js
index 0ba6089d2fac8..73b33cee9ae93 100644
--- a/tests/baselines/reference/tsbuild/outFile/cleans-till-project-specified.js
+++ b/tests/baselines/reference/tsbuild/outFile/cleans-till-project-specified.js
@@ -154,7 +154,7 @@ declare function f(): string;
 //# sourceMappingURL=first-output.d.ts.map
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -193,10 +193,28 @@ declare function f(): string;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1233
+  "size": 1272
 }
 
 //// [/home/src/workspaces/solution/2/second-output.js.map]
@@ -234,7 +252,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -269,10 +287,24 @@ declare class C {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part2.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
   "latestChangedDtsFile": "./second-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1177
+  "size": 1214
 }
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map]
@@ -291,7 +323,7 @@ declare var c: C;
 //# sourceMappingURL=third-output.d.ts.map
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo]
-{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -324,10 +356,28 @@ declare var c: C;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../first/bin/first-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../2/second-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../third_part1.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "1894672131-declare var c: C;\n",
   "latestChangedDtsFile": "./third-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1226
+  "size": 1265
 }
 
 
diff --git a/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-command-line-incremental-flag-changes-between-non-dts-changes-discrepancies.js b/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-command-line-incremental-flag-changes-between-non-dts-changes-discrepancies.js
index 8f0a1cedeb2ab..cb19b4be1c277 100644
--- a/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-command-line-incremental-flag-changes-between-non-dts-changes-discrepancies.js
+++ b/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-command-line-incremental-flag-changes-between-non-dts-changes-discrepancies.js
@@ -7,6 +7,7 @@ CleanBuild:
   "root": [
     "../../third_part1.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion"
 }
 IncrementalBuild:
@@ -44,4 +45,240 @@ IncrementalBuild:
   "../../../first/bin/first-output.d.ts": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "../../../2/second-output.d.ts": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
   "../../third_part1.ts": "7305100057-var c = new C();\nc.doSomething();\n"
+}
+Incremental build contains ../../../../../tslibs/ts/lib/lib.d.ts file does not have semantic errors, it does not match with clean build: /home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt::
+Incremental buildInfoText:: {
+  "fileNames": [
+    "../../../../../tslibs/ts/lib/lib.d.ts",
+    "../../../first/bin/first-output.d.ts",
+    "../../../2/second-output.d.ts",
+    "../../third_part1.ts"
+  ],
+  "fileInfos": {
+    "../../../../../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "../../../first/bin/first-output.d.ts": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
+    "../../../2/second-output.d.ts": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
+    "../../third_part1.ts": "7305100057-var c = new C();\nc.doSomething();\n"
+  },
+  "root": [
+    [
+      4,
+      "../../third_part1.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "declarationMap": true,
+    "outFile": "./third-output.js",
+    "removeComments": true,
+    "skipDefaultLibCheck": true,
+    "sourceMap": true,
+    "strict": false,
+    "target": 1
+  },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../first/bin/first-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../2/second-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../third_part1.ts",
+      "not cached or not changed"
+    ]
+  ],
+  "version": "FakeTSVersion",
+  "size": 1155
+}
+Clean buildInfoText:: {
+  "root": [
+    "../../third_part1.ts"
+  ],
+  "errors": true,
+  "version": "FakeTSVersion",
+  "size": 73
+}
+Incremental build contains ../../../first/bin/first-output.d.ts file does not have semantic errors, it does not match with clean build: /home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt::
+Incremental buildInfoText:: {
+  "fileNames": [
+    "../../../../../tslibs/ts/lib/lib.d.ts",
+    "../../../first/bin/first-output.d.ts",
+    "../../../2/second-output.d.ts",
+    "../../third_part1.ts"
+  ],
+  "fileInfos": {
+    "../../../../../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "../../../first/bin/first-output.d.ts": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
+    "../../../2/second-output.d.ts": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
+    "../../third_part1.ts": "7305100057-var c = new C();\nc.doSomething();\n"
+  },
+  "root": [
+    [
+      4,
+      "../../third_part1.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "declarationMap": true,
+    "outFile": "./third-output.js",
+    "removeComments": true,
+    "skipDefaultLibCheck": true,
+    "sourceMap": true,
+    "strict": false,
+    "target": 1
+  },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../first/bin/first-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../2/second-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../third_part1.ts",
+      "not cached or not changed"
+    ]
+  ],
+  "version": "FakeTSVersion",
+  "size": 1155
+}
+Clean buildInfoText:: {
+  "root": [
+    "../../third_part1.ts"
+  ],
+  "errors": true,
+  "version": "FakeTSVersion",
+  "size": 73
+}
+Incremental build contains ../../../2/second-output.d.ts file does not have semantic errors, it does not match with clean build: /home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt::
+Incremental buildInfoText:: {
+  "fileNames": [
+    "../../../../../tslibs/ts/lib/lib.d.ts",
+    "../../../first/bin/first-output.d.ts",
+    "../../../2/second-output.d.ts",
+    "../../third_part1.ts"
+  ],
+  "fileInfos": {
+    "../../../../../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "../../../first/bin/first-output.d.ts": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
+    "../../../2/second-output.d.ts": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
+    "../../third_part1.ts": "7305100057-var c = new C();\nc.doSomething();\n"
+  },
+  "root": [
+    [
+      4,
+      "../../third_part1.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "declarationMap": true,
+    "outFile": "./third-output.js",
+    "removeComments": true,
+    "skipDefaultLibCheck": true,
+    "sourceMap": true,
+    "strict": false,
+    "target": 1
+  },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../first/bin/first-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../2/second-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../third_part1.ts",
+      "not cached or not changed"
+    ]
+  ],
+  "version": "FakeTSVersion",
+  "size": 1155
+}
+Clean buildInfoText:: {
+  "root": [
+    "../../third_part1.ts"
+  ],
+  "errors": true,
+  "version": "FakeTSVersion",
+  "size": 73
+}
+Incremental build contains ../../third_part1.ts file does not have semantic errors, it does not match with clean build: /home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt::
+Incremental buildInfoText:: {
+  "fileNames": [
+    "../../../../../tslibs/ts/lib/lib.d.ts",
+    "../../../first/bin/first-output.d.ts",
+    "../../../2/second-output.d.ts",
+    "../../third_part1.ts"
+  ],
+  "fileInfos": {
+    "../../../../../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "../../../first/bin/first-output.d.ts": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
+    "../../../2/second-output.d.ts": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
+    "../../third_part1.ts": "7305100057-var c = new C();\nc.doSomething();\n"
+  },
+  "root": [
+    [
+      4,
+      "../../third_part1.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "declarationMap": true,
+    "outFile": "./third-output.js",
+    "removeComments": true,
+    "skipDefaultLibCheck": true,
+    "sourceMap": true,
+    "strict": false,
+    "target": 1
+  },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../first/bin/first-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../2/second-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../third_part1.ts",
+      "not cached or not changed"
+    ]
+  ],
+  "version": "FakeTSVersion",
+  "size": 1155
+}
+Clean buildInfoText:: {
+  "root": [
+    "../../third_part1.ts"
+  ],
+  "errors": true,
+  "version": "FakeTSVersion",
+  "size": 73
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-command-line-incremental-flag-changes-between-non-dts-changes.js b/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-command-line-incremental-flag-changes-between-non-dts-changes.js
index 39f7ee234c5ce..e6e5adb4d5cf7 100644
--- a/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-command-line-incremental-flag-changes-between-non-dts-changes.js
+++ b/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-command-line-incremental-flag-changes-between-non-dts-changes.js
@@ -139,14 +139,32 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
 
+first/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "./bin/first-output.js",
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'second/tsconfig.json' is out of date because output file '2/second-output.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
 
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because output file 'third/thirdjs/output/third-output.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/third/tsconfig.json'...
 
+third/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "./thirdjs/output/third-output.js",
+       ~~~~~~~~~
+
+
+Found 3 errors.
+
 
 
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map]
@@ -176,7 +194,7 @@ declare function f(): string;
 //# sourceMappingURL=first-output.d.ts.map
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -215,10 +233,28 @@ declare function f(): string;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1233
+  "size": 1272
 }
 
 //// [/home/src/workspaces/solution/2/second-output.js.map]
@@ -256,7 +292,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -291,10 +327,24 @@ declare class C {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part2.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
   "latestChangedDtsFile": "./second-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1177
+  "size": 1214
 }
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map]
@@ -313,7 +363,7 @@ declare var c: C;
 //# sourceMappingURL=third-output.d.ts.map
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo]
-{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"version":"FakeTSVersion"}
+{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -345,12 +395,30 @@ declare var c: C;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../first/bin/first-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../2/second-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../third_part1.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1116
+  "size": 1155
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Make non incremental build with change in file that doesnt affect dts
 
@@ -377,16 +445,31 @@ Output::
     * second/tsconfig.json
     * third/tsconfig.json
 
-[HH:MM:SS AM] Project 'first/tsconfig.json' is out of date because output 'first/bin/first-output.tsbuildinfo' is older than input 'first/first_PART1.ts'
+[HH:MM:SS AM] Project 'first/tsconfig.json' is out of date because buildinfo file 'first/bin/first-output.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
 
-[HH:MM:SS AM] Project 'second/tsconfig.json' is up to date because newest input 'second/second_part2.ts' is older than output '2/second-output.tsbuildinfo'
+first/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "./bin/first-output.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Project 'second/tsconfig.json' is out of date because buildinfo file '2/second-output.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
+
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
 
 [HH:MM:SS AM] Project 'third/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [HH:MM:SS AM] Updating output timestamps of project '/home/src/workspaces/solution/third/tsconfig.json'...
 
+
+Found 2 errors.
+
 
 
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map]
@@ -404,7 +487,7 @@ function f() {
 
 //// [/home/src/workspaces/solution/first/bin/first-output.d.ts.map] file written with same contents
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-20304251376-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\nconsole.log(s);","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-20304251376-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\nconsole.log(s);","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -443,10 +526,28 @@ function f() {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1248
+  "size": 1287
 }
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map] file changed its modified time
@@ -455,7 +556,7 @@ function f() {
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.d.ts] file changed its modified time
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo] file changed its modified time
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Make incremental build with change in file that doesnt affect dts
 
@@ -482,15 +583,35 @@ Output::
     * second/tsconfig.json
     * third/tsconfig.json
 
-[HH:MM:SS AM] Project 'first/tsconfig.json' is out of date because output 'first/bin/first-output.tsbuildinfo' is older than input 'first/first_PART1.ts'
+[HH:MM:SS AM] Project 'first/tsconfig.json' is out of date because buildinfo file 'first/bin/first-output.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
 
-[HH:MM:SS AM] Project 'second/tsconfig.json' is up to date because newest input 'second/second_part2.ts' is older than output '2/second-output.tsbuildinfo'
+first/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-[HH:MM:SS AM] Project 'third/tsconfig.json' is up to date with .d.ts files from its dependencies
+9     "outFile": "./bin/first-output.js",
+      ~~~~~~~~~
 
-[HH:MM:SS AM] Updating output timestamps of project '/home/src/workspaces/solution/third/tsconfig.json'...
+[HH:MM:SS AM] Project 'second/tsconfig.json' is out of date because buildinfo file '2/second-output.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
+
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
+
+[HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because buildinfo file 'third/thirdjs/output/third-output.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/third/tsconfig.json'...
+
+third/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "./thirdjs/output/third-output.js",
+       ~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
@@ -510,7 +631,7 @@ function f() {
 
 //// [/home/src/workspaces/solution/first/bin/first-output.d.ts.map] file written with same contents
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22658061710-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\nconsole.log(s);console.log(s);","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22658061710-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\nconsole.log(s);console.log(s);","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -549,12 +670,29 @@ function f() {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1263
+  "size": 1302
 }
 
-//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo] file changed its modified time
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js b/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js
index be7a9278db13a..97a64e0dfd689 100644
--- a/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js
+++ b/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js
@@ -154,7 +154,7 @@ declare function f(): string;
 //# sourceMappingURL=first-output.d.ts.map
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -193,10 +193,28 @@ declare function f(): string;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1233
+  "size": 1272
 }
 
 //// [/home/src/workspaces/solution/2/second-output.js.map]
@@ -234,7 +252,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -269,10 +287,24 @@ declare class C {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part2.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
   "latestChangedDtsFile": "./second-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1177
+  "size": 1214
 }
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map]
@@ -291,7 +323,7 @@ declare var c: C;
 //# sourceMappingURL=third-output.d.ts.map
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo]
-{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -324,10 +356,28 @@ declare var c: C;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../first/bin/first-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../2/second-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../third_part1.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "1894672131-declare var c: C;\n",
   "latestChangedDtsFile": "./third-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1226
+  "size": 1265
 }
 
 
@@ -342,14 +392,29 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
 
+first/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "./bin/first-output.js",
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'second/tsconfig.json' is out of date because output for it was generated with version 'FakeTSVersion' that differs with current version 'FakeTSCurrentVersion'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
 
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because output for it was generated with version 'FakeTSVersion' that differs with current version 'FakeTSCurrentVersion'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/third/tsconfig.json'...
 
+third/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "./thirdjs/output/third-output.js",
+       ~~~~~~~~~
+
 
 
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map] file written with same contents
@@ -357,7 +422,7 @@ Output::
 //// [/home/src/workspaces/solution/first/bin/first-output.d.ts.map] file written with same contents
 //// [/home/src/workspaces/solution/first/bin/first-output.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSCurrentVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSCurrentVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -396,10 +461,28 @@ Output::
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSCurrentVersion",
-  "size": 1240
+  "size": 1279
 }
 
 //// [/home/src/workspaces/solution/2/second-output.js.map] file written with same contents
@@ -407,7 +490,7 @@ Output::
 //// [/home/src/workspaces/solution/2/second-output.d.ts.map] file written with same contents
 //// [/home/src/workspaces/solution/2/second-output.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSCurrentVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSCurrentVersion"}
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -442,10 +525,24 @@ Output::
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part2.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
   "latestChangedDtsFile": "./second-output.d.ts",
   "version": "FakeTSCurrentVersion",
-  "size": 1184
+  "size": 1221
 }
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map] file written with same contents
@@ -453,7 +550,7 @@ Output::
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.d.ts.map] file written with same contents
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo]
-{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSCurrentVersion"}
+{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSCurrentVersion"}
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -486,11 +583,29 @@ Output::
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../first/bin/first-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../2/second-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../third_part1.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "1894672131-declare var c: C;\n",
   "latestChangedDtsFile": "./third-output.d.ts",
   "version": "FakeTSCurrentVersion",
-  "size": 1233
+  "size": 1272
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/outFile/tsbuildinfo-is-not-generated-when-incremental-is-set-to-false.js b/tests/baselines/reference/tsbuild/outFile/tsbuildinfo-is-not-generated-when-incremental-is-set-to-false.js
index 8ea9ffce93382..f7f4bb6953e83 100644
--- a/tests/baselines/reference/tsbuild/outFile/tsbuildinfo-is-not-generated-when-incremental-is-set-to-false.js
+++ b/tests/baselines/reference/tsbuild/outFile/tsbuildinfo-is-not-generated-when-incremental-is-set-to-false.js
@@ -139,14 +139,32 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
 
+first/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "./bin/first-output.js",
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'second/tsconfig.json' is out of date because output file '2/second-output.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
 
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because output file 'third/thirdjs/output/third-output.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/third/tsconfig.json'...
 
+third/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "./thirdjs/output/third-output.js",
+       ~~~~~~~~~
+
+
+Found 3 errors.
+
 
 
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map]
@@ -176,7 +194,7 @@ declare function f(): string;
 //# sourceMappingURL=first-output.d.ts.map
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -215,10 +233,28 @@ declare function f(): string;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1233
+  "size": 1272
 }
 
 //// [/home/src/workspaces/solution/2/second-output.js.map]
@@ -256,7 +292,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -291,10 +327,24 @@ declare class C {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part2.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
   "latestChangedDtsFile": "./second-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1177
+  "size": 1214
 }
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map]
@@ -313,16 +363,17 @@ declare var c: C;
 //# sourceMappingURL=third-output.d.ts.map
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo]
-{"root":["../../third_part1.ts"],"version":"FakeTSVersion"}
+{"root":["../../third_part1.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "../../third_part1.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 59
+  "size": 73
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/outFile/verify-buildInfo-absence-results-in-new-build.js b/tests/baselines/reference/tsbuild/outFile/verify-buildInfo-absence-results-in-new-build.js
index ea2bc590604e0..a961831dce855 100644
--- a/tests/baselines/reference/tsbuild/outFile/verify-buildInfo-absence-results-in-new-build.js
+++ b/tests/baselines/reference/tsbuild/outFile/verify-buildInfo-absence-results-in-new-build.js
@@ -190,10 +190,28 @@ declare function f(): string;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1233
+  "size": 1272
 }
 
 //// [/home/src/workspaces/solution/2/second-output.js.map]
@@ -231,7 +249,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -266,10 +284,24 @@ declare class C {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part2.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
   "latestChangedDtsFile": "./second-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1177
+  "size": 1214
 }
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map]
@@ -288,7 +320,7 @@ declare var c: C;
 //# sourceMappingURL=third-output.d.ts.map
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo]
-{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -321,10 +353,28 @@ declare var c: C;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../first/bin/first-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../2/second-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../third_part1.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "1894672131-declare var c: C;\n",
   "latestChangedDtsFile": "./third-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1226
+  "size": 1265
 }
 
 
@@ -339,13 +389,31 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
 
-[HH:MM:SS AM] Project 'second/tsconfig.json' is up to date because newest input 'second/second_part2.ts' is older than output '2/second-output.tsbuildinfo'
+first/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-[HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because output 'third/thirdjs/output/third-output.tsbuildinfo' is older than input 'first'
+9     "outFile": "./bin/first-output.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Project 'second/tsconfig.json' is out of date because buildinfo file '2/second-output.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
+
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
+
+[HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because buildinfo file 'third/thirdjs/output/third-output.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/third/tsconfig.json'...
 
-[HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/solution/third/tsconfig.json'...
+third/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "./thirdjs/output/third-output.js",
+       ~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
@@ -354,9 +422,8 @@ Output::
 //// [/home/src/workspaces/solution/first/bin/first-output.d.ts.map] file written with same contents
 //// [/home/src/workspaces/solution/first/bin/first-output.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt] file written with same contents
-//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo] file changed its modified time
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-incremental.js b/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-incremental.js
index 38e231c18371f..1820c3295a23b 100644
--- a/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-incremental.js
+++ b/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-incremental.js
@@ -139,14 +139,32 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
 
+first/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "./bin/first-output.js",
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'second/tsconfig.json' is out of date because output file '2/second-output.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
 
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because output file 'third/thirdjs/output/third-output.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/third/tsconfig.json'...
 
+third/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "./thirdjs/output/third-output.js",
+       ~~~~~~~~~
+
+
+Found 3 errors.
+
 
 
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map]
@@ -176,7 +194,7 @@ declare function f(): string;
 //# sourceMappingURL=first-output.d.ts.map
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -215,10 +233,28 @@ declare function f(): string;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1233
+  "size": 1272
 }
 
 //// [/home/src/workspaces/solution/2/second-output.js.map]
@@ -256,7 +292,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -291,10 +327,24 @@ declare class C {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part2.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
   "latestChangedDtsFile": "./second-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1177
+  "size": 1214
 }
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map]
@@ -313,7 +363,7 @@ declare var c: C;
 //# sourceMappingURL=third-output.d.ts.map
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo]
-{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"version":"FakeTSVersion"}
+{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -345,8 +395,26 @@ declare var c: C;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../first/bin/first-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../2/second-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../third_part1.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1116
+  "size": 1155
 }
 
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map.baseline.txt]
@@ -1070,4 +1138,4 @@ sourceFile:../../third_part1.ts
 >>>//# sourceMappingURL=third-output.d.ts.map
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-uses-project-references.js b/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-uses-project-references.js
index 29811ff8b920a..7187eb8cdd2f9 100644
--- a/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-uses-project-references.js
+++ b/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-uses-project-references.js
@@ -139,14 +139,32 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
 
+first/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "./bin/first-output.js",
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'second/tsconfig.json' is out of date because output file '2/second-output.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
 
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because output file 'third/thirdjs/output/third-output.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/third/tsconfig.json'...
 
+third/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "./thirdjs/output/third-output.js",
+       ~~~~~~~~~
+
+
+Found 3 errors.
+
 
 
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map]
@@ -176,7 +194,7 @@ declare function f(): string;
 //# sourceMappingURL=first-output.d.ts.map
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -215,10 +233,28 @@ declare function f(): string;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1233
+  "size": 1272
 }
 
 //// [/home/src/workspaces/solution/2/second-output.js.map]
@@ -256,7 +292,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -291,10 +327,24 @@ declare class C {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part2.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
   "latestChangedDtsFile": "./second-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1177
+  "size": 1214
 }
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map]
@@ -313,15 +363,16 @@ declare var c: C;
 //# sourceMappingURL=third-output.d.ts.map
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo]
-{"root":["../../third_part1.ts"],"version":"FakeTSVersion"}
+{"root":["../../third_part1.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "../../third_part1.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 59
+  "size": 73
 }
 
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map.baseline.txt]
@@ -1045,7 +1096,7 @@ sourceFile:../../third_part1.ts
 >>>//# sourceMappingURL=third-output.d.ts.map
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: incremental-declaration-doesnt-change
 
@@ -1072,15 +1123,35 @@ Output::
     * second/tsconfig.json
     * third/tsconfig.json
 
-[HH:MM:SS AM] Project 'first/tsconfig.json' is out of date because output 'first/bin/first-output.tsbuildinfo' is older than input 'first/first_PART1.ts'
+[HH:MM:SS AM] Project 'first/tsconfig.json' is out of date because buildinfo file 'first/bin/first-output.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
 
-[HH:MM:SS AM] Project 'second/tsconfig.json' is up to date because newest input 'second/second_part2.ts' is older than output '2/second-output.tsbuildinfo'
+first/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "./bin/first-output.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Project 'second/tsconfig.json' is out of date because buildinfo file '2/second-output.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
+
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
+
+[HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because buildinfo file 'third/thirdjs/output/third-output.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/third/tsconfig.json'...
+
+third/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "./thirdjs/output/third-output.js",
+       ~~~~~~~~~
 
-[HH:MM:SS AM] Project 'third/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[HH:MM:SS AM] Updating output timestamps of project '/home/src/workspaces/solution/third/tsconfig.json'...
+Found 3 errors.
 
 
 
@@ -1099,7 +1170,7 @@ function f() {
 
 //// [/home/src/workspaces/solution/first/bin/first-output.d.ts.map] file written with same contents
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-20304251376-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\nconsole.log(s);","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-20304251376-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\nconsole.log(s);","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -1138,17 +1209,36 @@ function f() {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1248
+  "size": 1287
 }
 
-//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map] file changed its modified time
-//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js] file changed its modified time
-//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.d.ts.map] file changed its modified time
-//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.d.ts] file changed its modified time
-//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo] file changed its modified time
+//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map] file written with same contents
+//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js] file written with same contents
+//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.d.ts.map] file written with same contents
+//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.d.ts] file written with same contents
+//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo] file written with same contents
+//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt] file written with same contents
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map.baseline.txt]
 ===================================================================
 JsFile: first-output.js
@@ -1321,5 +1411,7 @@ sourceFile:../first_part3.ts
 >>>//# sourceMappingURL=first-output.js.map
 
 //// [/home/src/workspaces/solution/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents
+//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map.baseline.txt] file written with same contents
+//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.d.ts.map.baseline.txt] file written with same contents
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/outFile/when-final-project-specifies-tsBuildInfoFile.js b/tests/baselines/reference/tsbuild/outFile/when-final-project-specifies-tsBuildInfoFile.js
index 25031dea4c7fd..0961072bacee6 100644
--- a/tests/baselines/reference/tsbuild/outFile/when-final-project-specifies-tsBuildInfoFile.js
+++ b/tests/baselines/reference/tsbuild/outFile/when-final-project-specifies-tsBuildInfoFile.js
@@ -140,14 +140,32 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
 
+first/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "./bin/first-output.js",
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'second/tsconfig.json' is out of date because output file '2/second-output.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
 
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because output file 'third/thirdjs/output/third.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/third/tsconfig.json'...
 
+third/tsconfig.json:11:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+11     "outFile": "./thirdjs/output/third-output.js",
+       ~~~~~~~~~
+
+
+Found 3 errors.
+
 
 
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map]
@@ -177,7 +195,7 @@ declare function f(): string;
 //# sourceMappingURL=first-output.d.ts.map
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -216,10 +234,28 @@ declare function f(): string;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1233
+  "size": 1272
 }
 
 //// [/home/src/workspaces/solution/2/second-output.js.map]
@@ -257,7 +293,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -292,10 +328,24 @@ declare class C {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part2.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
   "latestChangedDtsFile": "./second-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1177
+  "size": 1214
 }
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map]
@@ -314,7 +364,7 @@ declare var c: C;
 //# sourceMappingURL=third-output.d.ts.map
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third.tsbuildinfo]
-{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1,"tsBuildInfoFile":"./third.tsbuildinfo"},"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1,"tsBuildInfoFile":"./third.tsbuildinfo"},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third.tsbuildinfo.readable.baseline.txt]
 {
@@ -348,10 +398,28 @@ declare var c: C;
     "target": 1,
     "tsBuildInfoFile": "./third.tsbuildinfo"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../first/bin/first-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../2/second-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../third_part1.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "1894672131-declare var c: C;\n",
   "latestChangedDtsFile": "./third-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1266
+  "size": 1305
 }
 
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map.baseline.txt]
@@ -1075,4 +1143,4 @@ sourceFile:../../third_part1.ts
 >>>//# sourceMappingURL=third-output.d.ts.map
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/outFile/when-input-file-text-does-not-change-but-its-modified-time-changes.js b/tests/baselines/reference/tsbuild/outFile/when-input-file-text-does-not-change-but-its-modified-time-changes.js
index dbe63c8ce37e1..d34331c964ac3 100644
--- a/tests/baselines/reference/tsbuild/outFile/when-input-file-text-does-not-change-but-its-modified-time-changes.js
+++ b/tests/baselines/reference/tsbuild/outFile/when-input-file-text-does-not-change-but-its-modified-time-changes.js
@@ -139,14 +139,32 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
 
+first/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "./bin/first-output.js",
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'second/tsconfig.json' is out of date because output file '2/second-output.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
 
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because output file 'third/thirdjs/output/third-output.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/third/tsconfig.json'...
 
+third/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "./thirdjs/output/third-output.js",
+       ~~~~~~~~~
+
+
+Found 3 errors.
+
 
 
 //// [/home/src/workspaces/solution/first/bin/first-output.js.map]
@@ -176,7 +194,7 @@ declare function f(): string;
 //# sourceMappingURL=first-output.d.ts.map
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../first_part1.ts","../first_part2.ts","../first_part3.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","6007494133-console.log(f());\n","4357625305-function f() {\n    return \"JS does hoists\";\n}\n"],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"outFile":"./first-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","latestChangedDtsFile":"./first-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -215,10 +233,28 @@ declare function f(): string;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../first_part3.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n",
   "latestChangedDtsFile": "./first-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1233
+  "size": 1272
 }
 
 //// [/home/src/workspaces/solution/2/second-output.js.map]
@@ -256,7 +292,7 @@ declare class C {
 //# sourceMappingURL=second-output.d.ts.map
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../second/second_part1.ts","../second/second_part2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./second-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","latestChangedDtsFile":"./second-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/2/second-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -291,10 +327,24 @@ declare class C {
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../second/second_part2.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n",
   "latestChangedDtsFile": "./second-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1177
+  "size": 1214
 }
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.js.map]
@@ -313,7 +363,7 @@ declare var c: C;
 //# sourceMappingURL=third-output.d.ts.map
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo]
-{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../../first/bin/first-output.d.ts","../../../2/second-output.d.ts","../../third_part1.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-15957783529-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\ndeclare function f(): string;\n","-2513601205-declare namespace N {\n}\ndeclare namespace N {\n}\ndeclare class C {\n    doSomething(): void;\n}\n","7305100057-var c = new C();\nc.doSomething();\n"],"root":[4],"options":{"composite":true,"declaration":true,"declarationMap":true,"outFile":"./third-output.js","removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"1894672131-declare var c: C;\n","latestChangedDtsFile":"./third-output.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo.readable.baseline.txt]
 {
@@ -346,14 +396,32 @@ declare var c: C;
     "strict": false,
     "target": 1
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../first/bin/first-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../2/second-output.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../third_part1.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "1894672131-declare var c: C;\n",
   "latestChangedDtsFile": "./third-output.d.ts",
   "version": "FakeTSVersion",
-  "size": 1226
+  "size": 1265
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: upstream project changes without changing file text
 
@@ -367,19 +435,37 @@ Output::
     * second/tsconfig.json
     * third/tsconfig.json
 
-[HH:MM:SS AM] Project 'first/tsconfig.json' is up to date but needs to update timestamps of output files that are older than input files
+[HH:MM:SS AM] Project 'first/tsconfig.json' is out of date because buildinfo file 'first/bin/first-output.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
+
+first/tsconfig.json:9:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+9     "outFile": "./bin/first-output.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Project 'second/tsconfig.json' is out of date because buildinfo file '2/second-output.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
+
+second/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+10     "outFile": "../2/second-output.js",
+       ~~~~~~~~~
+
+[HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because buildinfo file 'third/thirdjs/output/third-output.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/third/tsconfig.json'...
 
-[HH:MM:SS AM] Updating output timestamps of project '/home/src/workspaces/solution/first/tsconfig.json'...
+third/tsconfig.json:10:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-[HH:MM:SS AM] Project 'second/tsconfig.json' is up to date because newest input 'second/second_part2.ts' is older than output '2/second-output.tsbuildinfo'
+10     "outFile": "./thirdjs/output/third-output.js",
+       ~~~~~~~~~
 
-[HH:MM:SS AM] Project 'third/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[HH:MM:SS AM] Updating output timestamps of project '/home/src/workspaces/solution/third/tsconfig.json'...
+Found 3 errors.
 
 
 
-//// [/home/src/workspaces/solution/first/bin/first-output.tsbuildinfo] file changed its modified time
-//// [/home/src/workspaces/solution/third/thirdjs/output/third-output.tsbuildinfo] file changed its modified time
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/outputPaths/when-rootDir-is-not-specified.js b/tests/baselines/reference/tsbuild/outputPaths/when-rootDir-is-not-specified.js
index a44a67f919819..1a27b5e868394 100644
--- a/tests/baselines/reference/tsbuild/outputPaths/when-rootDir-is-not-specified.js
+++ b/tests/baselines/reference/tsbuild/outputPaths/when-rootDir-is-not-specified.js
@@ -34,9 +34,18 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+3     "outDir": "dist"
+      ~~~~~~~~
+
+
+Found 1 error.
+
 
 
-//// [/home/src/workspaces/project/dist/index.js]
+//// [/home/src/workspaces/project/dist/src/index.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = void 0;
@@ -44,19 +53,20 @@ exports.x = 10;
 
 
 //// [/home/src/workspaces/project/dist/tsconfig.tsbuildinfo]
-{"root":["../src/index.ts"],"version":"FakeTSVersion"}
+{"root":["../src/index.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/project/dist/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "../src/index.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 54
+  "size": 68
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -67,12 +77,26 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/index.ts' is older than output 'dist/index.js'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file 'dist/tsconfig.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
+
+tsconfig.json:3:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+3     "outDir": "dist"
+      ~~~~~~~~
+
+
+Found 1 error.
 
 
 
+//// [/home/src/workspaces/project/dist/src/index.js] file written with same contents
+//// [/home/src/workspaces/project/dist/tsconfig.tsbuildinfo] file written with same contents
+//// [/home/src/workspaces/project/dist/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Normal build without change, that does not block emit on error to show files that get emitted
 
@@ -80,8 +104,17 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p /home/src/workspaces/project/tsconfig.json
 Output::
+tsconfig.json:3:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+3     "outDir": "dist"
+      ~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
-//// [/home/src/workspaces/project/dist/index.js] file written with same contents
+//// [/home/src/workspaces/project/dist/src/index.js] file written with same contents
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file-non-composite.js
index 48b7f0bf6918a..2e79c0efce892 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file-non-composite.js
@@ -57,8 +57,14 @@ Output::
 3     "moduleResolution": "node",
                           ~~~~~~
 
-TSFILE: /home/src/workspaces/solution/project/dist/hello.json
-TSFILE: /home/src/workspaces/solution/project/dist/index.js
+project/tsconfig.json:8:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+8     "outDir": "dist",
+      ~~~~~~~~
+
+TSFILE: /home/src/workspaces/solution/project/dist/src/hello.json
+TSFILE: /home/src/workspaces/solution/project/dist/src/index.js
 TSFILE: /home/src/workspaces/solution/project/dist/tsconfig.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -68,17 +74,17 @@ project/src/hello.json
 project/src/index.ts
   Part of 'files' list in tsconfig.json
 
-Found 1 error.
+Found 2 errors.
 
 
 
-//// [/home/src/workspaces/solution/project/dist/hello.json]
+//// [/home/src/workspaces/solution/project/dist/src/hello.json]
 {
     "hello": "world"
 }
 
 
-//// [/home/src/workspaces/solution/project/dist/index.js]
+//// [/home/src/workspaces/solution/project/dist/src/index.js]
 "use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files-non-composite.js
index dbc124145bbae..00f8d22fddcea 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files-non-composite.js
@@ -59,8 +59,14 @@ Output::
 3     "moduleResolution": "node",
                           ~~~~~~
 
-TSFILE: /home/src/workspaces/solution/project/dist/hello.json
-TSFILE: /home/src/workspaces/solution/project/dist/index.js
+project/tsconfig.json:8:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+8     "outDir": "dist",
+      ~~~~~~~~
+
+TSFILE: /home/src/workspaces/solution/project/dist/src/hello.json
+TSFILE: /home/src/workspaces/solution/project/dist/src/index.js
 TSFILE: /home/src/workspaces/solution/project/dist/tsconfig.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -70,17 +76,17 @@ project/src/hello.json
 project/src/index.ts
   Matched by include pattern 'src/**/*' in 'project/tsconfig.json'
 
-Found 1 error.
+Found 2 errors.
 
 
 
-//// [/home/src/workspaces/solution/project/dist/hello.json]
+//// [/home/src/workspaces/solution/project/dist/src/hello.json]
 {
     "hello": "world"
 }
 
 
-//// [/home/src/workspaces/solution/project/dist/index.js]
+//// [/home/src/workspaces/solution/project/dist/src/index.js]
 "use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file-non-composite.js
index ac1efff10a590..0f31737d5482d 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file-non-composite.js
@@ -57,8 +57,14 @@ Output::
 3     "moduleResolution": "node",
                           ~~~~~~
 
-TSFILE: /home/src/workspaces/solution/project/dist/index.json
-TSFILE: /home/src/workspaces/solution/project/dist/index.js
+project/tsconfig.json:8:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+8     "outDir": "dist",
+      ~~~~~~~~
+
+TSFILE: /home/src/workspaces/solution/project/dist/src/index.json
+TSFILE: /home/src/workspaces/solution/project/dist/src/index.js
 TSFILE: /home/src/workspaces/solution/project/dist/tsconfig.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -68,17 +74,17 @@ project/src/index.json
 project/src/index.ts
   Matched by include pattern 'src/**/*' in 'project/tsconfig.json'
 
-Found 1 error.
+Found 2 errors.
 
 
 
-//// [/home/src/workspaces/solution/project/dist/index.json]
+//// [/home/src/workspaces/solution/project/dist/src/index.json]
 {
     "hello": "world"
 }
 
 
-//// [/home/src/workspaces/solution/project/dist/index.js]
+//// [/home/src/workspaces/solution/project/dist/src/index.js]
 "use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-non-composite.js
index 8a9c4344dc91e..c727680dcfcbf 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-non-composite.js
@@ -57,8 +57,14 @@ Output::
 3     "moduleResolution": "node",
                           ~~~~~~
 
-TSFILE: /home/src/workspaces/solution/project/dist/hello.json
-TSFILE: /home/src/workspaces/solution/project/dist/index.js
+project/tsconfig.json:8:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+8     "outDir": "dist",
+      ~~~~~~~~
+
+TSFILE: /home/src/workspaces/solution/project/dist/src/hello.json
+TSFILE: /home/src/workspaces/solution/project/dist/src/index.js
 TSFILE: /home/src/workspaces/solution/project/dist/tsconfig.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -68,17 +74,17 @@ project/src/hello.json
 project/src/index.ts
   Matched by include pattern 'src/**/*' in 'project/tsconfig.json'
 
-Found 1 error.
+Found 2 errors.
 
 
 
-//// [/home/src/workspaces/solution/project/dist/hello.json]
+//// [/home/src/workspaces/solution/project/dist/src/hello.json]
 {
     "hello": "world"
 }
 
 
-//// [/home/src/workspaces/solution/project/dist/index.js]
+//// [/home/src/workspaces/solution/project/dist/src/index.js]
 "use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-non-composite.js
index eb86a24df8e31..66ae25243b56e 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-non-composite.js
@@ -56,8 +56,14 @@ Output::
 3     "moduleResolution": "node",
                           ~~~~~~
 
-TSFILE: /home/src/workspaces/solution/project/dist/hello.json
-TSFILE: /home/src/workspaces/solution/project/dist/index.js
+project/tsconfig.json:8:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+8     "outDir": "dist",
+      ~~~~~~~~
+
+TSFILE: /home/src/workspaces/solution/project/dist/src/hello.json
+TSFILE: /home/src/workspaces/solution/project/dist/src/index.js
 TSFILE: /home/src/workspaces/solution/project/dist/tsconfig.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -66,17 +72,17 @@ project/src/hello.json
 project/src/index.ts
   Matched by include pattern 'src/**/*' in 'project/tsconfig.json'
 
-Found 1 error.
+Found 2 errors.
 
 
 
-//// [/home/src/workspaces/solution/project/dist/hello.json]
+//// [/home/src/workspaces/solution/project/dist/src/hello.json]
 {
     "hello": "world"
 }
 
 
-//// [/home/src/workspaces/solution/project/dist/index.js]
+//// [/home/src/workspaces/solution/project/dist/src/index.js]
 "use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory-non-composite.js
index f87ba26ad09b3..957b959131c5f 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory-non-composite.js
@@ -56,8 +56,13 @@ Output::
 3     "moduleResolution": "node",
                           ~~~~~~
 
-TSFILE: /home/src/workspaces/solution/project/dist/hello.json
-TSFILE: /home/src/workspaces/solution/project/dist/project/src/index.js
+project/tsconfig.json:8:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+8     "outDir": "dist",
+      ~~~~~~~~
+
+TSFILE: /home/src/workspaces/solution/project/dist/src/index.js
 TSFILE: /home/src/workspaces/solution/project/dist/tsconfig.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -65,20 +70,12 @@ hello.json
   Imported via "../../hello.json" from file 'project/src/index.ts'
 project/src/index.ts
   Matched by include pattern 'src/**/*' in 'project/tsconfig.json'
-[HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/solution/project/tsconfig.json'...
-
 
-Found 1 error.
+Found 2 errors.
 
 
 
-//// [/home/src/workspaces/solution/project/dist/hello.json]
-{
-    "hello": "world"
-}
-
-
-//// [/home/src/workspaces/solution/project/dist/project/src/index.js]
+//// [/home/src/workspaces/solution/project/dist/src/index.js]
 "use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap-non-composite.js
index 2f84aaa75577b..5e4b9284008a7 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap-non-composite.js
@@ -58,9 +58,15 @@ Output::
 3     "moduleResolution": "node",
                           ~~~~~~
 
-TSFILE: /home/src/workspaces/solution/project/dist/hello.json
-TSFILE: /home/src/workspaces/solution/project/dist/index.js
-TSFILE: /home/src/workspaces/solution/project/dist/index.js.map
+project/tsconfig.json:8:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+8     "outDir": "dist",
+      ~~~~~~~~
+
+TSFILE: /home/src/workspaces/solution/project/dist/src/hello.json
+TSFILE: /home/src/workspaces/solution/project/dist/src/index.js
+TSFILE: /home/src/workspaces/solution/project/dist/src/index.js.map
 TSFILE: /home/src/workspaces/solution/project/dist/tsconfig.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -70,20 +76,20 @@ project/src/hello.json
 project/src/index.ts
   Part of 'files' list in tsconfig.json
 
-Found 1 error.
+Found 2 errors.
 
 
 
-//// [/home/src/workspaces/solution/project/dist/hello.json]
+//// [/home/src/workspaces/solution/project/dist/src/hello.json]
 {
     "hello": "world"
 }
 
 
-//// [/home/src/workspaces/solution/project/dist/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;AAAA,4DAAgC;AAChC,kBAAe,oBAAK,CAAC,KAAK,CAAA"}
+//// [/home/src/workspaces/solution/project/dist/src/index.js.map]
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;AAAA,4DAAgC;AAChC,kBAAe,oBAAK,CAAC,KAAK,CAAA"}
 
-//// [/home/src/workspaces/solution/project/dist/index.js]
+//// [/home/src/workspaces/solution/project/dist/src/index.js]
 "use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -129,9 +135,15 @@ Output::
 3     "moduleResolution": "node",
                           ~~~~~~
 
-TSFILE: /home/src/workspaces/solution/project/dist/hello.json
-TSFILE: /home/src/workspaces/solution/project/dist/index.js
-TSFILE: /home/src/workspaces/solution/project/dist/index.js.map
+project/tsconfig.json:8:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+8     "outDir": "dist",
+      ~~~~~~~~
+
+TSFILE: /home/src/workspaces/solution/project/dist/src/hello.json
+TSFILE: /home/src/workspaces/solution/project/dist/src/index.js
+TSFILE: /home/src/workspaces/solution/project/dist/src/index.js.map
 TSFILE: /home/src/workspaces/solution/project/dist/tsconfig.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -141,13 +153,13 @@ project/src/hello.json
 project/src/index.ts
   Part of 'files' list in tsconfig.json
 
-Found 1 error.
+Found 2 errors.
 
 
 
-//// [/home/src/workspaces/solution/project/dist/hello.json] file written with same contents
-//// [/home/src/workspaces/solution/project/dist/index.js.map] file written with same contents
-//// [/home/src/workspaces/solution/project/dist/index.js] file written with same contents
+//// [/home/src/workspaces/solution/project/dist/src/hello.json] file written with same contents
+//// [/home/src/workspaces/solution/project/dist/src/index.js.map] file written with same contents
+//// [/home/src/workspaces/solution/project/dist/src/index.js] file written with same contents
 //// [/home/src/workspaces/solution/project/dist/tsconfig.tsbuildinfo] file written with same contents
 //// [/home/src/workspaces/solution/project/dist/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents
 
diff --git a/tests/baselines/reference/tsbuildWatch/configFileErrors/outFile/reports-syntax-errors-in-config-file.js b/tests/baselines/reference/tsbuildWatch/configFileErrors/outFile/reports-syntax-errors-in-config-file.js
index b619dce91dc8f..f1c5eefb8d828 100644
--- a/tests/baselines/reference/tsbuildWatch/configFileErrors/outFile/reports-syntax-errors-in-config-file.js
+++ b/tests/baselines/reference/tsbuildWatch/configFileErrors/outFile/reports-syntax-errors-in-config-file.js
@@ -40,6 +40,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:4:3 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4   "outFile": "../outFile.js",
+    ~~~~~~~~~
+
 tsconfig.json:5:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5   "module": "amd"
@@ -50,7 +55,7 @@ Output::
 10         "b.ts"
            ~~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -192,6 +197,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:5:3 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5   "outFile": "../outFile.js",
+    ~~~~~~~~~
+
 tsconfig.json:6:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6   "module": "amd"
@@ -202,7 +212,7 @@ Output::
 11         "b.ts"
            ~~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -252,6 +262,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:5:3 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5   "outFile": "../outFile.js",
+    ~~~~~~~~~
+
 tsconfig.json:6:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6   "module": "amd"
@@ -262,7 +277,7 @@ Output::
 11         "b.ts"
            ~~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -385,6 +400,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:5:3 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5   "outFile": "../outFile.js",
+    ~~~~~~~~~
+
 tsconfig.json:6:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6   "module": "amd"
@@ -395,7 +415,7 @@ Output::
 11         "b.ts"
            ~~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -456,12 +476,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
index 78bd1cd226772..04e83e413f79b 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
@@ -42,12 +42,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../out.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/user/username/projects/out.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.js","./myproject/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5381-","5381-"],"root":[2,3],"options":{"allowJs":true,"outFile":"./out.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.js","./myproject/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5381-","5381-"],"root":[2,3],"options":{"allowJs":true,"outFile":"./out.js"},"changeFileSet":[1,2,3],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/out.tsbuildinfo.readable.baseline.txt]
 {
@@ -75,12 +80,13 @@ Output::
     "allowJs": true,
     "outFile": "./out.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "../../../home/src/tslibs/ts/lib/lib.d.ts",
+    "./myproject/a.js",
+    "./myproject/b.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 634
+  "size": 638
 }
 
 
@@ -115,10 +121,7 @@ Program files::
 /user/username/projects/myproject/a.js
 /user/username/projects/myproject/b.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/a.js
-/user/username/projects/myproject/b.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -141,13 +144,43 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date but needs to update timestamps of output files that are older than input files
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../out.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/user/username/projects/myproject/tsconfig.json'...
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+5     "outFile": "../out.js"
+      ~~~~~~~~~
 
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
+
+
+
 
 
+Program root files: [
+  "/user/username/projects/myproject/a.js",
+  "/user/username/projects/myproject/b.ts"
+]
+Program options: {
+  "allowJs": true,
+  "noEmit": true,
+  "outFile": "/user/username/projects/out.js",
+  "watch": true,
+  "incremental": true,
+  "tscBuild": true,
+  "configFilePath": "/user/username/projects/myproject/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/a.js
+/user/username/projects/myproject/b.ts
+
+No cached semantic diagnostics in the builder::
 
+No shapes updated in the builder::
 
 exitCode:: ExitStatus.undefined
 
@@ -170,16 +203,21 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../out.tsbuildinfo' is older than input 'a.js'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../out.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../out.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/user/username/projects/out.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.js","./myproject/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5029505981-const x = 10;","5381-"],"root":[2,3],"options":{"allowJs":true,"outFile":"./out.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.js","./myproject/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5029505981-const x = 10;","5381-"],"root":[2,3],"options":{"allowJs":true,"outFile":"./out.js"},"changeFileSet":[1,2,3],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/out.tsbuildinfo.readable.baseline.txt]
 {
@@ -207,12 +245,13 @@ Output::
     "allowJs": true,
     "outFile": "./out.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "../../../home/src/tslibs/ts/lib/lib.d.ts",
+    "./myproject/a.js",
+    "./myproject/b.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 653
+  "size": 657
 }
 
 
@@ -236,10 +275,7 @@ Program files::
 /user/username/projects/myproject/a.js
 /user/username/projects/myproject/b.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/a.js
-/user/username/projects/myproject/b.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
index 959cb778844ba..90311c88e3750 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
@@ -42,12 +42,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../out.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/user/username/projects/out.tsbuildinfo]
-{"root":["./myproject/a.js","./myproject/b.ts"],"version":"FakeTSVersion"}
+{"root":["./myproject/a.js","./myproject/b.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/out.tsbuildinfo.readable.baseline.txt]
 {
@@ -55,8 +60,9 @@ Output::
     "./myproject/a.js",
     "./myproject/b.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 74
+  "size": 88
 }
 
 
@@ -90,10 +96,7 @@ Program files::
 /user/username/projects/myproject/a.js
 /user/username/projects/myproject/b.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/a.js
-/user/username/projects/myproject/b.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -116,11 +119,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../out.tsbuildinfo' is older than input 'a.js'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../out.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../out.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -144,7 +152,7 @@ Program files::
 /user/username/projects/myproject/a.js
 /user/username/projects/myproject/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -169,11 +177,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../out.tsbuildinfo' is older than input 'a.js'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../out.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../out.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -199,10 +212,7 @@ Program files::
 /user/username/projects/myproject/a.js
 /user/username/projects/myproject/b.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/a.js
-/user/username/projects/myproject/b.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js
index bf543dca91868..bb41749b27833 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js
@@ -44,12 +44,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -154,12 +159,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -260,12 +270,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -399,12 +414,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -459,12 +479,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -573,12 +598,17 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -731,12 +761,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-with-incremental.js
index 213a90080ba05..e9f064f8835a9 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-with-incremental.js
@@ -40,22 +40,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
-
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -77,35 +72,12 @@ Output::
     "declaration": true,
     "outFile": "./outFile.js"
   },
-  "emitDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
-          "category": 1,
-          "code": 4094,
-          "relatedInformation": [
-            {
-              "start": 6,
-              "length": 1,
-              "messageText": "Add a type annotation to the variable a.",
-              "category": 1,
-              "code": 9027
-            }
-          ]
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 939
+  "size": 640
 }
 
 
@@ -136,9 +108,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -167,12 +137,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"pendingEmit":17,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -194,12 +169,12 @@ Output::
     "declaration": true,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 619
+  "size": 624
 }
 
 
@@ -221,9 +196,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -254,16 +227,21 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -285,8 +263,18 @@ Output::
     "declaration": true,
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 602
+  "size": 637
 }
 
 //// [/home/src/projects/outFile.js]
@@ -315,7 +303,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -347,11 +335,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'tsconfig.json'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -374,7 +367,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -399,26 +392,21 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
-
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -440,35 +428,11 @@ Output::
     "declaration": true,
     "outFile": "./outFile.js"
   },
-  "emitDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
-          "category": 1,
-          "code": 4094,
-          "relatedInformation": [
-            {
-              "start": 6,
-              "length": 1,
-              "messageText": "Add a type annotation to the variable a.",
-              "category": 1,
-              "code": 9027
-            }
-          ]
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 939
+  "size": 638
 }
 
 
@@ -490,9 +454,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -537,12 +499,17 @@ Output::
             ~
     Add a type annotation to the variable a.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -564,6 +531,16 @@ Output::
     "declaration": true,
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -588,7 +565,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 922
+  "size": 957
 }
 
 //// [/home/src/projects/outFile.js]
@@ -618,7 +595,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -654,15 +631,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
-
-1 const a = class { private p = 10; };
-        ~
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -687,7 +659,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
index 1e1d7f21d4db6..4036280adaba3 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
@@ -43,12 +43,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -151,12 +156,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -254,12 +264,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -381,12 +396,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -440,12 +460,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -541,12 +566,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -673,12 +703,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js
index fe8e947946bca..7fb7c72bd2cfc 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js
@@ -39,12 +39,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -65,12 +70,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 619
+  "size": 621
 }
 
 
@@ -100,9 +105,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -127,16 +130,21 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -157,12 +165,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 603
+  "size": 605
 }
 
 
@@ -183,9 +191,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -215,16 +221,21 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -245,8 +256,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 583
+  "size": 618
 }
 
 //// [/home/src/projects/outFile.js]
@@ -270,7 +291,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -301,11 +322,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'tsconfig.json'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -327,7 +353,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -352,16 +378,21 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -382,9 +413,8 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
   "size": 619
@@ -408,9 +438,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -440,16 +468,21 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -470,8 +503,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 599
+  "size": 634
 }
 
 //// [/home/src/projects/outFile.js]
@@ -500,7 +543,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -531,11 +574,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'tsconfig.json'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -557,7 +605,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled.js
index c6cdbd91fb645..ac2c86429352a 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled.js
@@ -38,20 +38,26 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"version":"FakeTSVersion"}
+{"root":["./project/a.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "./project/a.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 53
+  "size": 67
 }
 
 
@@ -80,9 +86,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -107,11 +111,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -134,9 +143,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -165,11 +172,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -195,7 +207,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -225,11 +237,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'tsconfig.json'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -250,7 +267,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -275,11 +292,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -302,9 +324,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -333,11 +353,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.js' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -368,7 +393,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -398,11 +423,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'tsconfig.json'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -423,7 +453,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors.js
index 53863fb96bde4..0059841fd9d41 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors.js
@@ -39,15 +39,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
-
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -93,9 +88,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -124,22 +117,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 53
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
 
 Program root files: [
@@ -158,9 +146,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -190,11 +176,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -225,7 +216,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -256,11 +247,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'tsconfig.json'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -282,7 +278,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -307,37 +303,21 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
-
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"errors":true,"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "errors": true,
-  "version": "FakeTSVersion",
-  "size": 67
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
 
 Program root files: [
@@ -356,9 +336,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -402,9 +380,14 @@ Output::
             ~
     Add a type annotation to the variable a.
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -437,7 +420,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -472,15 +455,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
-
-1 const a = class { private p = 10; };
-        ~
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -504,7 +482,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
index cf431ef204fb3..eff098df4a817 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
@@ -43,12 +43,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -151,12 +156,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -254,12 +264,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -381,12 +396,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -440,12 +460,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -541,12 +566,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -654,12 +684,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors-with-incremental.js
index 8137c90c59915..50dd988ff4862 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors-with-incremental.js
@@ -39,17 +39,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":6,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -70,26 +70,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 761
+  "size": 612
 }
 
 
@@ -119,9 +105,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -150,12 +134,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -176,12 +165,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 603
+  "size": 605
 }
 
 
@@ -202,9 +191,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -234,16 +221,21 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -264,8 +256,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 583
+  "size": 618
 }
 
 //// [/home/src/projects/outFile.js]
@@ -289,7 +291,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -320,11 +322,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'tsconfig.json'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -346,7 +353,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -371,21 +378,21 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":6,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -406,26 +413,11 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 761
+  "size": 610
 }
 
 
@@ -446,9 +438,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -482,17 +472,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":6,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -514,21 +504,17 @@ Output::
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
     [
       "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 741
+  "size": 625
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
@@ -549,7 +535,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -584,10 +570,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -611,7 +597,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors.js
index d24fa1a85c4a9..b3fba3fddb143 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors.js
@@ -38,10 +38,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -86,9 +86,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -117,22 +115,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 53
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
 
 Program root files: [
@@ -150,9 +143,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -181,11 +172,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -211,7 +207,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -241,11 +237,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'tsconfig.json'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -266,7 +267,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -291,32 +292,21 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"errors":true,"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "errors": true,
-  "version": "FakeTSVersion",
-  "size": 67
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
 
 Program root files: [
@@ -334,9 +324,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -369,10 +357,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -397,7 +385,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -431,10 +419,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -457,7 +445,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
index 0116597087301..76425e70cead2 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
@@ -151,12 +151,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -254,12 +259,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -381,12 +391,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors-with-incremental.js
index ed95ef242a99f..1da1f7f877411 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors-with-incremental.js
@@ -134,12 +134,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -160,12 +165,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 603
+  "size": 605
 }
 
 
@@ -186,9 +191,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -218,16 +221,21 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -248,8 +256,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 583
+  "size": 618
 }
 
 //// [/home/src/projects/outFile.js]
@@ -273,7 +291,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -304,11 +322,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'tsconfig.json'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -330,7 +353,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -355,7 +378,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors.js
index e116c4f6d1d9f..008cd87df2e58 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors.js
@@ -115,22 +115,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 53
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
 
 Program root files: [
@@ -148,9 +143,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -179,11 +172,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output file '../outFile.js' does not exist
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -209,7 +207,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -239,11 +237,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'tsconfig.json'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -264,7 +267,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -289,7 +292,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
@@ -302,19 +305,8 @@ Output::
 
 
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"root":["./project/a.ts"],"errors":true,"version":"FakeTSVersion"}
-
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "./project/a.ts"
-  ],
-  "errors": true,
-  "version": "FakeTSVersion",
-  "size": 67
-}
-
+//// [/home/src/projects/outFile.tsbuildinfo] file written with same contents
+//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
 
 Program root files: [
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js
index c97ebe2a69001..4f360cee97449 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js
@@ -61,12 +61,17 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -188,12 +193,17 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -253,12 +263,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -362,12 +377,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -430,12 +450,17 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -557,12 +582,17 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -620,12 +650,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -729,12 +764,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -793,12 +833,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -902,12 +947,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -966,12 +1016,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -1075,12 +1130,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
index 0b2fa97983ea0..d90d1bebdd4d5 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
@@ -60,12 +60,17 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -156,12 +161,17 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -220,12 +230,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -285,12 +300,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -352,12 +372,17 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -422,12 +447,17 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -484,12 +514,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -549,12 +584,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -612,12 +652,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -677,12 +722,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -740,12 +790,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -805,12 +860,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
index d8b66df7dd8de..9d90adca29d41 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
@@ -60,12 +60,17 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -185,12 +190,17 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -249,12 +259,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -356,12 +371,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -423,12 +443,17 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -548,12 +573,17 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -610,12 +640,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -717,12 +752,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -780,12 +820,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -887,12 +932,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -950,12 +1000,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -1057,12 +1112,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError.js
index f9a370379ea4a..217af9c06486c 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError.js
@@ -59,12 +59,17 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -154,12 +159,17 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -217,12 +227,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -281,12 +296,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -347,12 +367,17 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -416,12 +441,17 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -477,12 +507,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -541,12 +576,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -603,12 +643,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -667,12 +712,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -729,12 +779,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -793,12 +848,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-outFile-and-non-local-change.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-outFile-and-non-local-change.js
index 7ac19420e040c..f06a250a0ebcf 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-outFile-and-non-local-change.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-outFile-and-non-local-change.js
@@ -49,7 +49,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+sample1/core/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "index.js"
+      ~~~~~~~~~
+
+sample1/logic/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "index.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -62,7 +72,7 @@ declare function foo(): number;
 
 
 //// [/user/username/workspaces/solution/sample1/core/index.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","./index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5450201652-function foo() { return 10; }"],"root":[2],"options":{"composite":true,"declaration":true,"outFile":"./index.js"},"outSignature":"517738360-declare function foo(): number;\n","latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","./index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5450201652-function foo() { return 10; }"],"root":[2],"options":{"composite":true,"declaration":true,"outFile":"./index.js"},"semanticDiagnosticsPerFile":[1,2],"outSignature":"517738360-declare function foo(): number;\n","latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/workspaces/solution/sample1/core/index.tsbuildinfo.readable.baseline.txt]
 {
@@ -85,10 +95,20 @@ declare function foo(): number;
     "declaration": true,
     "outFile": "./index.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "517738360-declare function foo(): number;\n",
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 745
+  "size": 780
 }
 
 //// [/user/username/workspaces/solution/sample1/logic/index.js]
@@ -101,7 +121,7 @@ declare function bar(): number;
 
 
 //// [/user/username/workspaces/solution/sample1/logic/index.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../core/index.d.ts","./index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","517738360-declare function foo(): number;\n","5542925109-function bar() { return foo() + 1 };"],"root":[3],"options":{"composite":true,"declaration":true,"outFile":"./index.js"},"outSignature":"1113083433-declare function bar(): number;\n","latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../core/index.d.ts","./index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","517738360-declare function foo(): number;\n","5542925109-function bar() { return foo() + 1 };"],"root":[3],"options":{"composite":true,"declaration":true,"outFile":"./index.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"1113083433-declare function bar(): number;\n","latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/workspaces/solution/sample1/logic/index.tsbuildinfo.readable.baseline.txt]
 {
@@ -126,10 +146,24 @@ declare function bar(): number;
     "declaration": true,
     "outFile": "./index.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../core/index.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "1113083433-declare function bar(): number;\n",
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 820
+  "size": 857
 }
 
 
@@ -165,9 +199,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /user/username/workspaces/solution/sample1/core/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/workspaces/solution/sample1/core/index.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -188,10 +220,7 @@ Program files::
 /user/username/workspaces/solution/sample1/core/index.d.ts
 /user/username/workspaces/solution/sample1/logic/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/workspaces/solution/sample1/core/index.d.ts
-/user/username/workspaces/solution/sample1/logic/index.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -217,6 +246,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+sample1/core/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "index.js"
+      ~~~~~~~~~
+
 
 
 //// [/user/username/workspaces/solution/sample1/core/index.js]
@@ -230,7 +264,7 @@ declare function myFunc(): number;
 
 
 //// [/user/username/workspaces/solution/sample1/core/index.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","./index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-3957203077-function foo() { return 10; }\nfunction myFunc() { return 10; }"],"root":[2],"options":{"composite":true,"declaration":true,"outFile":"./index.js"},"outSignature":"2172043225-declare function foo(): number;\ndeclare function myFunc(): number;\n","latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","./index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-3957203077-function foo() { return 10; }\nfunction myFunc() { return 10; }"],"root":[2],"options":{"composite":true,"declaration":true,"outFile":"./index.js"},"semanticDiagnosticsPerFile":[1,2],"outSignature":"2172043225-declare function foo(): number;\ndeclare function myFunc(): number;\n","latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/workspaces/solution/sample1/core/index.tsbuildinfo.readable.baseline.txt]
 {
@@ -253,10 +287,20 @@ declare function myFunc(): number;
     "declaration": true,
     "outFile": "./index.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "2172043225-declare function foo(): number;\ndeclare function myFunc(): number;\n",
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 817
+  "size": 852
 }
 
 
@@ -280,9 +324,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /user/username/workspaces/solution/sample1/core/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/workspaces/solution/sample1/core/index.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -298,13 +340,18 @@ Before running Timeout callback:: count: 1
 Host is moving to new time
 After running Timeout callback:: count: 0
 Output::
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+sample1/logic/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "index.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
 //// [/user/username/workspaces/solution/sample1/logic/index.js] file written with same contents
 //// [/user/username/workspaces/solution/sample1/logic/index.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../core/index.d.ts","./index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","2172043225-declare function foo(): number;\ndeclare function myFunc(): number;\n","5542925109-function bar() { return foo() + 1 };"],"root":[3],"options":{"composite":true,"declaration":true,"outFile":"./index.js"},"outSignature":"1113083433-declare function bar(): number;\n","latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../core/index.d.ts","./index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","2172043225-declare function foo(): number;\ndeclare function myFunc(): number;\n","5542925109-function bar() { return foo() + 1 };"],"root":[3],"options":{"composite":true,"declaration":true,"outFile":"./index.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"1113083433-declare function bar(): number;\n","latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/workspaces/solution/sample1/logic/index.tsbuildinfo.readable.baseline.txt]
 {
@@ -329,10 +376,24 @@ Output::
     "declaration": true,
     "outFile": "./index.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../core/index.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "1113083433-declare function bar(): number;\n",
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 857
+  "size": 894
 }
 
 
@@ -354,10 +415,7 @@ Program files::
 /user/username/workspaces/solution/sample1/core/index.d.ts
 /user/username/workspaces/solution/sample1/logic/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/workspaces/solution/sample1/core/index.d.ts
-/user/username/workspaces/solution/sample1/logic/index.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -378,12 +436,15 @@ Before running Timeout callback:: count: 1
 3: timerToBuildInvalidatedProject
 
 Host is moving to new time
-After running Timeout callback:: count: 0
+After running Timeout callback:: count: 1
 Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+sample1/core/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "index.js"
+      ~~~~~~~~~
 
 
 
@@ -393,7 +454,7 @@ function myFunc() { return 100; }
 
 
 //// [/user/username/workspaces/solution/sample1/core/index.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","./index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6034018805-function foo() { return 10; }\nfunction myFunc() { return 100; }"],"root":[2],"options":{"composite":true,"declaration":true,"outFile":"./index.js"},"outSignature":"2172043225-declare function foo(): number;\ndeclare function myFunc(): number;\n","latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","./index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6034018805-function foo() { return 10; }\nfunction myFunc() { return 100; }"],"root":[2],"options":{"composite":true,"declaration":true,"outFile":"./index.js"},"semanticDiagnosticsPerFile":[1,2],"outSignature":"2172043225-declare function foo(): number;\ndeclare function myFunc(): number;\n","latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/workspaces/solution/sample1/core/index.tsbuildinfo.readable.baseline.txt]
 {
@@ -416,13 +477,25 @@ function myFunc() { return 100; }
     "declaration": true,
     "outFile": "./index.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "2172043225-declare function foo(): number;\ndeclare function myFunc(): number;\n",
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 818
+  "size": 853
 }
 
-//// [/user/username/workspaces/solution/sample1/logic/index.tsbuildinfo] file changed its modified time
+
+Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject *new*
 
 
 Program root files: [
@@ -441,9 +514,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /user/username/workspaces/solution/sample1/core/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/workspaces/solution/sample1/core/index.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -453,9 +524,43 @@ Change:: Build logic
 
 Input::
 
-Before running Timeout callback:: count: 0
+Before running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
 
+Host is moving to new time
 After running Timeout callback:: count: 0
+Output::
+sample1/logic/tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "index.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+
+
+
+//// [/user/username/workspaces/solution/sample1/logic/index.tsbuildinfo] file changed its modified time
+
 
+Program root files: [
+  "/user/username/workspaces/solution/sample1/logic/index.ts"
+]
+Program options: {
+  "composite": true,
+  "declaration": true,
+  "outFile": "/user/username/workspaces/solution/sample1/logic/index.js",
+  "watch": true,
+  "tscBuild": true,
+  "configFilePath": "/user/username/workspaces/solution/sample1/logic/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/workspaces/solution/sample1/core/index.d.ts
+/user/username/workspaces/solution/sample1/logic/index.ts
+
+No cached semantic diagnostics in the builder::
+
+No shapes updated in the builder::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tsc/commandLine/adds-color-when-FORCE_COLOR-is-set.js b/tests/baselines/reference/tsc/commandLine/adds-color-when-FORCE_COLOR-is-set.js
new file mode 100644
index 0000000000000..6341254d3e748
--- /dev/null
+++ b/tests/baselines/reference/tsc/commandLine/adds-color-when-FORCE_COLOR-is-set.js
@@ -0,0 +1,167 @@
+currentDirectory:: /home/src/workspaces/project useCaseSensitiveFileNames:: false
+Input::
+//// [/home/src/tslibs/TS/Lib/lib.d.ts]
+interface Boolean {}
+interface Function {}
+interface CallableFunction {}
+interface NewableFunction {}
+interface IArguments {}
+interface Number { toExponential: any; }
+interface Object {}
+interface RegExp {}
+interface String { charAt: any; }
+interface Array<T> { length: number; [n: number]: T; }
+interface ReadonlyArray<T> {}
+declare const console: { log(msg: any): void; };
+
+
+/home/src/tslibs/TS/Lib/tsc.js 
+Output::
+Version FakeTSVersion
+tsc: The TypeScript Compiler - Version FakeTSVersion
+
+COMMON COMMANDS
+
+  tsc
+  Compiles the current project (tsconfig.json in the working directory.)
+
+  tsc app.ts util.ts
+  Ignoring tsconfig.json, compiles the specified files with default compiler options.
+
+  tsc -b
+  Build a composite project in the working directory.
+
+  tsc --init
+  Creates a tsconfig.json with the recommended settings in the working directory.
+
+  tsc -p ./path/to/tsconfig.json
+  Compiles the TypeScript project located at the specified path.
+
+  tsc --help --all
+  An expanded version of this information, showing all possible compiler options
+
+  tsc --noEmit
+  tsc --target esnext
+  Compiles the current project, with additional settings.
+
+COMMAND LINE FLAGS
+
+--help, -h
+Print this message.
+
+--watch, -w
+Watch input files.
+
+--all
+Show all compiler options.
+
+--version, -v
+Print the compiler's version.
+
+--init
+Initializes a TypeScript project and creates a tsconfig.json file.
+
+--project, -p
+Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.
+
+--showConfig
+Print the final configuration instead of building.
+
+--ignoreConfig
+Ignore the tsconfig found and build with commandline options and files.
+
+--build, -b
+Build one or more projects and their dependencies, if out of date
+
+COMMON COMPILER OPTIONS
+
+--pretty
+Enable color and formatting in TypeScript's output to make compiler errors easier to read.
+type: boolean
+default: true
+
+--declaration, -d
+Generate .d.ts files from TypeScript and JavaScript files in your project.
+type: boolean
+default: `false`, unless `composite` is set
+
+--declarationMap
+Create sourcemaps for d.ts files.
+type: boolean
+default: false
+
+--emitDeclarationOnly
+Only output d.ts files and not JavaScript files.
+type: boolean
+default: false
+
+--sourceMap
+Create source map files for emitted JavaScript files.
+type: boolean
+default: false
+
+--noEmit
+Disable emitting files from a compilation.
+type: boolean
+default: false
+
+--target, -t
+Set the JavaScript language version for emitted JavaScript and include compatible library declarations.
+one of: es5, es6/es2015, es2016, es2017, es2018, es2019, es2020, es2021, es2022, es2023, es2024, esnext
+default: es5
+
+--module, -m
+Specify what module code is generated.
+one of: commonjs, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
+default: undefined
+
+--lib
+Specify a set of bundled library declaration files that describe the target runtime environment.
+one or more: es5, es6/es2015, es7/es2016, es2017, es2018, es2019, es2020, es2021, es2022, es2023, es2024, esnext, dom, dom.iterable, dom.asynciterable, webworker, webworker.importscripts, webworker.iterable, webworker.asynciterable, scripthost, es2015.core, es2015.collection, es2015.generator, es2015.iterable, es2015.promise, es2015.proxy, es2015.reflect, es2015.symbol, es2015.symbol.wellknown, es2016.array.include, es2016.intl, es2017.arraybuffer, es2017.date, es2017.object, es2017.sharedmemory, es2017.string, es2017.intl, es2017.typedarrays, es2018.asyncgenerator, es2018.asynciterable/esnext.asynciterable, es2018.intl, es2018.promise, es2018.regexp, es2019.array, es2019.object, es2019.string, es2019.symbol/esnext.symbol, es2019.intl, es2020.bigint/esnext.bigint, es2020.date, es2020.promise, es2020.sharedmemory, es2020.string, es2020.symbol.wellknown, es2020.intl, es2020.number, es2021.promise, es2021.string, es2021.weakref/esnext.weakref, es2021.intl, es2022.array, es2022.error, es2022.intl, es2022.object, es2022.string, es2022.regexp, es2023.array, es2023.collection, es2023.intl, es2024.arraybuffer, es2024.collection, es2024.object/esnext.object, es2024.promise, es2024.regexp/esnext.regexp, es2024.sharedmemory, es2024.string/esnext.string, esnext.array, esnext.collection, esnext.intl, esnext.disposable, esnext.promise, esnext.decorators, esnext.iterator, esnext.float16, esnext.typedarrays, esnext.error, esnext.sharedmemory, decorators, decorators.legacy
+default: undefined
+
+--allowJs
+Allow JavaScript files to be a part of your program. Use the 'checkJs' option to get errors from these files.
+type: boolean
+default: `false`, unless `checkJs` is set
+
+--checkJs
+Enable error reporting in type-checked JavaScript files.
+type: boolean
+default: false
+
+--jsx
+Specify what JSX code is generated.
+one of: preserve, react, react-native, react-jsx, react-jsxdev
+default: undefined
+
+--outFile
+Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output.
+
+--outDir
+Specify an output folder for all emitted files.
+
+--removeComments
+Disable emitting comments.
+type: boolean
+default: false
+
+--strict
+Enable all strict type-checking options.
+type: boolean
+default: false
+
+--types
+Specify type package names to be included without being referenced in a source file.
+
+--esModuleInterop
+Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility.
+type: boolean
+default: true
+
+You can learn about all of the compiler options at https://aka.ms/tsc
+
+
+
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsc/commandLine/does-not-add-color-when-NO_COLOR-is-set-even-if-FORCE_COLOR-is-set.js b/tests/baselines/reference/tsc/commandLine/does-not-add-color-when-NO_COLOR-is-set-even-if-FORCE_COLOR-is-set.js
new file mode 100644
index 0000000000000..12729b55ad4fe
--- /dev/null
+++ b/tests/baselines/reference/tsc/commandLine/does-not-add-color-when-NO_COLOR-is-set-even-if-FORCE_COLOR-is-set.js
@@ -0,0 +1,167 @@
+currentDirectory:: /home/src/workspaces/project useCaseSensitiveFileNames:: false
+Input::
+//// [/home/src/tslibs/TS/Lib/lib.d.ts]
+interface Boolean {}
+interface Function {}
+interface CallableFunction {}
+interface NewableFunction {}
+interface IArguments {}
+interface Number { toExponential: any; }
+interface Object {}
+interface RegExp {}
+interface String { charAt: any; }
+interface Array<T> { length: number; [n: number]: T; }
+interface ReadonlyArray<T> {}
+declare const console: { log(msg: any): void; };
+
+
+/home/src/tslibs/TS/Lib/tsc.js 
+Output::
+Version FakeTSVersion
+tsc: The TypeScript Compiler - Version FakeTSVersion
+
+COMMON COMMANDS
+
+  tsc
+  Compiles the current project (tsconfig.json in the working directory.)
+
+  tsc app.ts util.ts
+  Ignoring tsconfig.json, compiles the specified files with default compiler options.
+
+  tsc -b
+  Build a composite project in the working directory.
+
+  tsc --init
+  Creates a tsconfig.json with the recommended settings in the working directory.
+
+  tsc -p ./path/to/tsconfig.json
+  Compiles the TypeScript project located at the specified path.
+
+  tsc --help --all
+  An expanded version of this information, showing all possible compiler options
+
+  tsc --noEmit
+  tsc --target esnext
+  Compiles the current project, with additional settings.
+
+COMMAND LINE FLAGS
+
+--help, -h
+Print this message.
+
+--watch, -w
+Watch input files.
+
+--all
+Show all compiler options.
+
+--version, -v
+Print the compiler's version.
+
+--init
+Initializes a TypeScript project and creates a tsconfig.json file.
+
+--project, -p
+Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.
+
+--showConfig
+Print the final configuration instead of building.
+
+--ignoreConfig
+Ignore the tsconfig found and build with commandline options and files.
+
+--build, -b
+Build one or more projects and their dependencies, if out of date
+
+COMMON COMPILER OPTIONS
+
+--pretty
+Enable color and formatting in TypeScript's output to make compiler errors easier to read.
+type: boolean
+default: true
+
+--declaration, -d
+Generate .d.ts files from TypeScript and JavaScript files in your project.
+type: boolean
+default: `false`, unless `composite` is set
+
+--declarationMap
+Create sourcemaps for d.ts files.
+type: boolean
+default: false
+
+--emitDeclarationOnly
+Only output d.ts files and not JavaScript files.
+type: boolean
+default: false
+
+--sourceMap
+Create source map files for emitted JavaScript files.
+type: boolean
+default: false
+
+--noEmit
+Disable emitting files from a compilation.
+type: boolean
+default: false
+
+--target, -t
+Set the JavaScript language version for emitted JavaScript and include compatible library declarations.
+one of: es5, es6/es2015, es2016, es2017, es2018, es2019, es2020, es2021, es2022, es2023, es2024, esnext
+default: es5
+
+--module, -m
+Specify what module code is generated.
+one of: commonjs, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
+default: undefined
+
+--lib
+Specify a set of bundled library declaration files that describe the target runtime environment.
+one or more: es5, es6/es2015, es7/es2016, es2017, es2018, es2019, es2020, es2021, es2022, es2023, es2024, esnext, dom, dom.iterable, dom.asynciterable, webworker, webworker.importscripts, webworker.iterable, webworker.asynciterable, scripthost, es2015.core, es2015.collection, es2015.generator, es2015.iterable, es2015.promise, es2015.proxy, es2015.reflect, es2015.symbol, es2015.symbol.wellknown, es2016.array.include, es2016.intl, es2017.arraybuffer, es2017.date, es2017.object, es2017.sharedmemory, es2017.string, es2017.intl, es2017.typedarrays, es2018.asyncgenerator, es2018.asynciterable/esnext.asynciterable, es2018.intl, es2018.promise, es2018.regexp, es2019.array, es2019.object, es2019.string, es2019.symbol/esnext.symbol, es2019.intl, es2020.bigint/esnext.bigint, es2020.date, es2020.promise, es2020.sharedmemory, es2020.string, es2020.symbol.wellknown, es2020.intl, es2020.number, es2021.promise, es2021.string, es2021.weakref/esnext.weakref, es2021.intl, es2022.array, es2022.error, es2022.intl, es2022.object, es2022.string, es2022.regexp, es2023.array, es2023.collection, es2023.intl, es2024.arraybuffer, es2024.collection, es2024.object/esnext.object, es2024.promise, es2024.regexp/esnext.regexp, es2024.sharedmemory, es2024.string/esnext.string, esnext.array, esnext.collection, esnext.intl, esnext.disposable, esnext.promise, esnext.decorators, esnext.iterator, esnext.float16, esnext.typedarrays, esnext.error, esnext.sharedmemory, decorators, decorators.legacy
+default: undefined
+
+--allowJs
+Allow JavaScript files to be a part of your program. Use the 'checkJs' option to get errors from these files.
+type: boolean
+default: `false`, unless `checkJs` is set
+
+--checkJs
+Enable error reporting in type-checked JavaScript files.
+type: boolean
+default: false
+
+--jsx
+Specify what JSX code is generated.
+one of: preserve, react, react-native, react-jsx, react-jsxdev
+default: undefined
+
+--outFile
+Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output.
+
+--outDir
+Specify an output folder for all emitted files.
+
+--removeComments
+Disable emitting comments.
+type: boolean
+default: false
+
+--strict
+Enable all strict type-checking options.
+type: boolean
+default: false
+
+--types
+Specify type package names to be included without being referenced in a source file.
+
+--esModuleInterop
+Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility.
+type: boolean
+default: true
+
+You can learn about all of the compiler options at https://aka.ms/tsc
+
+
+
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js b/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js
index bc60471054c50..61fa0184eb915 100644
--- a/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js
@@ -55,6 +55,11 @@ Output::
 3     "module": "amd",
                 ~~~~~
 
+tsconfig.json:8:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+8     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
 TSFILE: /home/src/workspaces/project/outFile.js
 TSFILE: /home/src/workspaces/project/outFile.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
@@ -64,11 +69,11 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/index.ts:2
-     1  tsconfig.json:3
+     2  tsconfig.json:3
 
 
 //// [/home/src/workspaces/project/outFile.js]
@@ -163,6 +168,11 @@ Output::
 3     "module": "amd",
                 ~~~~~
 
+tsconfig.json:8:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+8     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 ky.d.ts
@@ -170,11 +180,11 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/index.ts:2
-     1  tsconfig.json:3
+     2  tsconfig.json:3
 
 
 
@@ -203,6 +213,11 @@ Output::
 3     "module": "amd",
                 ~~~~~
 
+tsconfig.json:8:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+8     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 ky.d.ts
@@ -210,7 +225,7 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors.
+Found 3 errors.
 
 
 
diff --git a/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors.js b/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors.js
index c09c0c85bc8de..b914d2cb2e9ff 100644
--- a/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors.js
+++ b/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors.js
@@ -54,6 +54,17 @@ Output::
 3     "module": "amd",
                 ~~~~~
 
+tsconfig.json:7:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+7     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
+tsconfig.json:7:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+7     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
 TSFILE: /home/src/workspaces/project/outFile.js
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -62,18 +73,18 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors in 2 files.
+Found 4 errors in 2 files.
 
 Errors  Files
      1  src/index.ts:2
-     1  tsconfig.json:3
+     3  tsconfig.json:3
 
 
 //// [/home/src/workspaces/project/outFile.js]
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-define("index", ["require", "exports", "ky"], function (require, exports, ky_1) {
+define("src/index", ["require", "exports", "ky"], function (require, exports, ky_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.api = void 0;
@@ -101,6 +112,17 @@ Output::
 3     "module": "amd",
                 ~~~~~
 
+tsconfig.json:7:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+7     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
+tsconfig.json:7:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+7     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
 TSFILE: /home/src/workspaces/project/outFile.js
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -109,11 +131,11 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors in 2 files.
+Found 4 errors in 2 files.
 
 Errors  Files
      1  src/index.ts:2
-     1  tsconfig.json:3
+     3  tsconfig.json:3
 
 
 //// [/home/src/workspaces/project/outFile.js] file written with same contents
@@ -143,6 +165,17 @@ Output::
 3     "module": "amd",
                 ~~~~~
 
+tsconfig.json:7:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+7     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
+tsconfig.json:7:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+7     "outFile": "./outFile.js"
+      ~~~~~~~~~
+
 TSFILE: /home/src/workspaces/project/outFile.js
 TSFILE: /home/src/workspaces/project/outFile.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
@@ -154,7 +187,7 @@ src/index.ts
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 4 errors.
 
 
 
diff --git a/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js b/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js
index e525ab98ee276..35ed22da004f8 100644
--- a/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js
+++ b/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js
@@ -95,6 +95,12 @@ declare const console: { log(msg: any): void; };
 
 D:\home\src\tslibs\TS\Lib\tsc.js -p D:\Work\pkg1 --explainFiles
 Output::
+tsconfig.json:13:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+13     "outDir": "./dist",
+       ~~~~~~~~
+
 tsconfig.json:14:5 - error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
 
@@ -118,21 +124,21 @@ src/utils/index.ts
 src/main.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors in the same file, starting at: tsconfig.json:14
+Found 3 errors in the same file, starting at: tsconfig.json:13
 
 
 
 //// [D:/home/src/tslibs/TS/Lib/lib.es2017.full.d.ts] *Lib*
 
-//// [D:/Work/pkg1/dist/utils/type-helpers.js.map]
-{"version":3,"file":"type-helpers.js","sourceRoot":"","sources":["../../src/utils/type-helpers.ts"],"names":[],"mappings":""}
+//// [D:/Work/pkg1/dist/src/utils/type-helpers.js.map]
+{"version":3,"file":"type-helpers.js","sourceRoot":"","sources":["../../../src/utils/type-helpers.ts"],"names":[],"mappings":""}
 
-//// [D:/Work/pkg1/dist/utils/type-helpers.js]
+//// [D:/Work/pkg1/dist/src/utils/type-helpers.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=type-helpers.js.map
 
-//// [D:/Work/pkg1/dist/utils/type-helpers.d.ts]
+//// [D:/Work/pkg1/dist/src/utils/type-helpers.d.ts]
 export type MyReturnType = {
     new (...args: any[]): any;
 };
@@ -141,10 +147,10 @@ export interface MyType<T = any> extends Function {
 }
 
 
-//// [D:/Work/pkg1/dist/utils/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;AAEA,kCAMC;AAND,SAAgB,WAAW,CAAI,QAAmB;IAC9C,MAAe,gBAAgB;QAC3B,gBAAe,CAAC;KACnB;IAED,OAAO,gBAAgC,CAAC;AAC5C,CAAC"}
+//// [D:/Work/pkg1/dist/src/utils/index.js.map]
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;AAEA,kCAMC;AAND,SAAgB,WAAW,CAAI,QAAmB;IAC9C,MAAe,gBAAgB;QAC3B,gBAAe,CAAC;KACnB;IAED,OAAO,gBAAgC,CAAC;AAC5C,CAAC"}
 
-//// [D:/Work/pkg1/dist/utils/index.js]
+//// [D:/Work/pkg1/dist/src/utils/index.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PartialType = PartialType;
@@ -156,15 +162,15 @@ function PartialType(classRef) {
 }
 //# sourceMappingURL=index.js.map
 
-//// [D:/Work/pkg1/dist/utils/index.d.ts]
+//// [D:/Work/pkg1/dist/src/utils/index.d.ts]
 import { MyType, MyReturnType } from './type-helpers';
 export declare function PartialType<T>(classRef: MyType<T>): MyReturnType;
 
 
-//// [D:/Work/pkg1/dist/main.js.map]
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC,MAAM,MAAM;CAAG;AAEf,MAAa,GAAI,SAAQ,IAAA,mBAAW,EAAC,MAAM,CAAC;CAE3C;AAFD,kBAEC"}
+//// [D:/Work/pkg1/dist/src/main.js.map]
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC,MAAM,MAAM;CAAG;AAEf,MAAa,GAAI,SAAQ,IAAA,mBAAW,EAAC,MAAM,CAAC;CAE3C;AAFD,kBAEC"}
 
-//// [D:/Work/pkg1/dist/main.js]
+//// [D:/Work/pkg1/dist/src/main.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Sub = void 0;
@@ -176,7 +182,7 @@ class Sub extends (0, utils_1.PartialType)(Common) {
 exports.Sub = Sub;
 //# sourceMappingURL=main.js.map
 
-//// [D:/Work/pkg1/dist/main.d.ts]
+//// [D:/Work/pkg1/dist/src/main.d.ts]
 declare const Sub_base: import("./utils/type-helpers").MyReturnType;
 export declare class Sub extends Sub_base {
     id: string;
diff --git a/tests/baselines/reference/tsc/incremental/outFile/different-options-with-incremental.js b/tests/baselines/reference/tsc/incremental/outFile/different-options-with-incremental.js
index c2498be43deb2..3760aa1194cc5 100644
--- a/tests/baselines/reference/tsc/incremental/outFile/different-options-with-incremental.js
+++ b/tests/baselines/reference/tsc/incremental/outFile/different-options-with-incremental.js
@@ -38,13 +38,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -173,13 +178,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --sourceMap
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -313,13 +323,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -448,13 +463,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -571,13 +591,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration --declarationMap
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -699,13 +724,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -745,13 +775,18 @@ export const a = 10;const aLocal = 100;
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -880,13 +915,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration --declarationMap
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -992,13 +1032,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -1035,13 +1080,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --inlineSourceMap
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -1172,13 +1222,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --sourceMap
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -1312,13 +1367,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -1447,13 +1507,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration --declarationMap
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -1559,13 +1624,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration --declarationMap
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
diff --git a/tests/baselines/reference/tsc/incremental/outFile/different-options.js b/tests/baselines/reference/tsc/incremental/outFile/different-options.js
index f99fe7b6c4423..71295b12474f1 100644
--- a/tests/baselines/reference/tsc/incremental/outFile/different-options.js
+++ b/tests/baselines/reference/tsc/incremental/outFile/different-options.js
@@ -38,13 +38,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -191,13 +196,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --sourceMap
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -334,13 +344,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -472,13 +487,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -516,13 +536,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -559,13 +584,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration --declarationMap
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -690,13 +720,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -814,13 +849,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --emitDeclarationOnly
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -858,13 +898,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -904,13 +949,18 @@ export const a = 10;const aLocal = 100;
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -1042,13 +1092,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -1086,13 +1141,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --inlineSourceMap
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -1226,13 +1286,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --sourceMap
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -1379,13 +1444,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -1535,13 +1605,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --sourceMap
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
diff --git a/tests/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js b/tests/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js
index a93277bc5447a..6d972b9cf3ee5 100644
--- a/tests/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js
+++ b/tests/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js
@@ -316,6 +316,12 @@ Found 'package.json' at '/home/src/projects/component-type-checker/node_modules/
 9     "baseUrl": ".",
       ~~~~~~~~~
 
+tsconfig.json:10:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+10     "outDir": "dist"
+       ~~~~~~~~
+
 ../../../../tslibs/TS/Lib/lib.es5.d.ts
   Library 'lib.es5.d.ts' specified in compilerOptions
 ../../node_modules/.pnpm/@component-type-checker+button@0.0.1/node_modules/@component-type-checker/button/src/index.ts
@@ -332,13 +338,13 @@ Found 'package.json' at '/home/src/projects/component-type-checker/node_modules/
 src/app.tsx
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors in the same file, starting at: tsconfig.json:8
+Found 3 errors in the same file, starting at: tsconfig.json:8
 
 
 
 //// [/home/src/tslibs/TS/Lib/lib.es5.d.ts] *Lib*
 
-//// [/home/src/projects/component-type-checker/packages/app/dist/app.js]
+//// [/home/src/projects/component-type-checker/packages/app/dist/src/app.js]
 import { createButton } from "@component-type-checker/button";
 var button = createButton();
 
diff --git a/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental.js b/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental.js
index 9cf2e8be15a3a..cd2409a31e826 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental.js
@@ -48,12 +48,17 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 2 errors in 2 files.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 3 errors in 2 files.
 
 Errors  Files
      1  a.ts:1
-     1  tsconfig.json:5
+     2  tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -194,12 +199,17 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 2 errors in 2 files.
+
+Found 3 errors in 2 files.
 
 Errors  Files
      1  a.ts:1
-     1  tsconfig.json:5
+     2  tsconfig.json:5
 
 
 
@@ -241,8 +251,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -355,8 +370,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -396,8 +416,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -484,8 +509,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -524,8 +554,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -627,12 +662,17 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 2 errors in 2 files.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 3 errors in 2 files.
 
 Errors  Files
      1  a.ts:1
-     1  tsconfig.json:5
+     2  tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -773,12 +813,17 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  a.ts:1
-     1  tsconfig.json:5
+     2  tsconfig.json:5
 
 
 
@@ -827,12 +872,17 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 2 errors in 2 files.
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 3 errors in 2 files.
 
 Errors  Files
      1  a.ts:1
-     1  tsconfig.json:5
+     2  tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
@@ -944,8 +994,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1050,8 +1105,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1141,8 +1201,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1286,12 +1351,17 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 2 errors in 2 files.
+
+Found 3 errors in 2 files.
 
 Errors  Files
      1  a.ts:1
-     1  tsconfig.json:5
+     2  tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1442,8 +1512,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1565,8 +1640,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1664,8 +1744,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:5
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1765,8 +1850,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
diff --git a/tests/baselines/reference/tsc/noCheck/outFile/dts-errors.js b/tests/baselines/reference/tsc/noCheck/outFile/dts-errors.js
index b36f651a0c5d9..9acd2c7349e3b 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/dts-errors.js
@@ -47,12 +47,17 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 2 errors in 2 files.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 3 errors in 2 files.
 
 Errors  Files
      1  a.ts:1
-     1  tsconfig.json:4
+     2  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -116,12 +121,17 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 2 errors in 2 files.
+
+Found 3 errors in 2 files.
 
 Errors  Files
      1  a.ts:1
-     1  tsconfig.json:4
+     2  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -159,8 +169,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -219,8 +234,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -257,8 +277,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -294,8 +319,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -331,8 +361,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -382,12 +417,17 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 2 errors in 2 files.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 3 errors in 2 files.
 
 Errors  Files
      1  a.ts:1
-     1  tsconfig.json:4
+     2  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -451,12 +491,17 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  a.ts:1
-     1  tsconfig.json:4
+     2  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -501,12 +546,17 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 2 errors in 2 files.
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 3 errors in 2 files.
 
 Errors  Files
      1  a.ts:1
-     1  tsconfig.json:4
+     2  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -543,8 +593,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -595,8 +650,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -635,8 +695,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -718,12 +783,17 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 2 errors in 2 files.
+
+Found 3 errors in 2 files.
 
 Errors  Files
      1  a.ts:1
-     1  tsconfig.json:4
+     2  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -788,8 +858,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -848,8 +923,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -887,8 +967,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:4
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -927,8 +1012,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
diff --git a/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental.js b/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental.js
index 330d3db3625c2..ba440986f58de 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental.js
@@ -38,8 +38,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:5
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -152,8 +157,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -196,8 +206,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -296,8 +311,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -337,8 +357,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -425,8 +450,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -465,8 +495,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -558,8 +593,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:5
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -658,8 +698,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -699,8 +744,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:5
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -790,8 +840,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -890,8 +945,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -981,8 +1041,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1116,8 +1181,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1233,8 +1303,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1347,8 +1422,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1446,8 +1526,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:5
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1547,8 +1632,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
diff --git a/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors.js b/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors.js
index 3d2ea9b5f3199..0cc3cb327199c 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors.js
@@ -37,8 +37,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:4
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -97,8 +102,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -138,8 +148,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -184,8 +199,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -222,8 +242,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -259,8 +284,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -296,8 +326,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -337,8 +372,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:4
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -383,8 +423,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -421,8 +466,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:4
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -461,8 +511,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -507,8 +562,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -547,8 +607,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -620,8 +685,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -674,8 +744,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -725,8 +800,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -764,8 +844,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:4
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -804,8 +889,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
diff --git a/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental.js b/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental.js
index 8f28da86ef503..f19b215f8af29 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental.js
@@ -196,8 +196,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:5
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -302,8 +307,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -343,8 +353,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -431,8 +446,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:5
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -471,8 +491,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -802,8 +827,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -908,8 +938,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:5
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -999,8 +1034,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1260,8 +1300,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1383,8 +1428,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:5
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1482,8 +1532,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:5
+
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1583,8 +1638,13 @@ Output::
 5     "module": "amd",
                 ~~~~~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
diff --git a/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors.js b/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors.js
index 025d3cef3fe85..8d0d095b788ea 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors.js
@@ -138,8 +138,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:4
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -190,8 +195,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -228,8 +238,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -265,8 +280,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:4
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -302,8 +322,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -473,8 +498,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -525,8 +555,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:4
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -565,8 +600,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -701,8 +741,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -761,8 +806,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-Found 1 error in tsconfig.json:4
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -800,8 +850,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in tsconfig.json:4
+
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -840,8 +895,13 @@ Output::
 4     "module": "amd",
                 ~~~~~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js
index afa0596ef022a..0425d3b6eba90 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js
@@ -53,13 +53,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -222,13 +227,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -241,13 +251,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -265,13 +280,18 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -342,13 +362,18 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -442,13 +467,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -461,13 +491,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -480,13 +515,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -499,13 +539,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -523,13 +568,18 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -692,13 +742,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -711,13 +766,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -730,13 +790,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -749,13 +814,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -773,13 +843,18 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -845,13 +920,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -1014,13 +1094,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -1033,13 +1118,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -1052,13 +1142,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental-declaration.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental-declaration.js
index acaa8542ac49b..55b93a47cf038 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental-declaration.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental-declaration.js
@@ -54,18 +54,29 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 3 errors in the same file, starting at: tsconfig.json:5
 
 
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -77,7 +88,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -89,17 +100,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -115,20 +126,20 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.d.ts]
-declare module "class" {
+declare module "src/class" {
     export class classC {
         prop: number;
     }
 }
-declare module "indirectClass" {
-    import { classC } from "class";
+declare module "src/indirectClass" {
+    import { classC } from "src/class";
     export class indirectClass {
         classC: classC;
     }
 }
-declare module "directUse" { }
-declare module "indirectUse" { }
-declare module "noChangeFile" {
+declare module "src/directUse" { }
+declare module "src/indirectUse" { }
+declare module "src/noChangeFile" {
     export function writeLog(s: string): void;
 }
 declare function someFunc(arguments: boolean, ...rest: any[]): void;
@@ -221,13 +232,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -240,13 +256,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -264,13 +285,18 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -339,13 +365,24 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 3 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -438,13 +475,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 3 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -457,13 +505,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -476,13 +529,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -495,13 +553,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 3 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -519,18 +588,29 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 3 errors in the same file, starting at: tsconfig.json:5
 
 
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -542,7 +622,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -554,17 +634,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -580,20 +660,20 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.d.ts]
-declare module "class" {
+declare module "src/class" {
     export class classC {
         prop1: number;
     }
 }
-declare module "indirectClass" {
-    import { classC } from "class";
+declare module "src/indirectClass" {
+    import { classC } from "src/class";
     export class indirectClass {
         classC: classC;
     }
 }
-declare module "directUse" { }
-declare module "indirectUse" { }
-declare module "noChangeFile" {
+declare module "src/directUse" { }
+declare module "src/indirectUse" { }
+declare module "src/noChangeFile" {
     export function writeLog(s: string): void;
 }
 declare function someFunc(arguments: boolean, ...rest: any[]): void;
@@ -686,13 +766,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 3 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -705,13 +796,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -724,13 +820,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -743,13 +844,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 3 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -767,13 +879,18 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -837,18 +954,29 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 3 errors in the same file, starting at: tsconfig.json:5
 
 
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -860,7 +988,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -872,17 +1000,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -898,20 +1026,20 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.d.ts]
-declare module "class" {
+declare module "src/class" {
     export class classC {
         prop: number;
     }
 }
-declare module "indirectClass" {
-    import { classC } from "class";
+declare module "src/indirectClass" {
+    import { classC } from "src/class";
     export class indirectClass {
         classC: classC;
     }
 }
-declare module "directUse" { }
-declare module "indirectUse" { }
-declare module "noChangeFile" {
+declare module "src/directUse" { }
+declare module "src/indirectUse" { }
+declare module "src/noChangeFile" {
     export function writeLog(s: string): void;
 }
 declare function someFunc(arguments: boolean, ...rest: any[]): void;
@@ -1004,13 +1132,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1023,13 +1156,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -1042,13 +1180,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 3 errors in the same file, starting at: tsconfig.json:5
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js
index 064e9ac8bedd8..11440b64b04da 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js
@@ -53,18 +53,29 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 3 errors in the same file, starting at: tsconfig.json:4
 
 
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -76,7 +87,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -88,17 +99,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -199,13 +210,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -218,13 +234,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -242,13 +263,18 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -316,13 +342,24 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 3 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -413,13 +450,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 3 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -432,13 +480,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -451,13 +504,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -470,13 +528,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 3 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -494,18 +563,29 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 3 errors in the same file, starting at: tsconfig.json:4
 
 
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -517,7 +597,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -529,17 +609,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -640,13 +720,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 3 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -659,13 +750,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -678,13 +774,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -697,13 +798,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 3 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -721,13 +833,18 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -790,18 +907,29 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 3 errors in the same file, starting at: tsconfig.json:4
 
 
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -813,7 +941,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -825,17 +953,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -936,13 +1064,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -955,13 +1088,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -974,13 +1112,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 3 errors in the same file, starting at: tsconfig.json:4
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-composite.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-composite.js
index 25dad0effd0b1..b49a67552a6dd 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-composite.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-composite.js
@@ -53,13 +53,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -129,13 +134,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -303,13 +313,18 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -477,13 +492,18 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -549,13 +569,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js
index 81a258dd5e22a..9cee96001d244 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js
@@ -54,13 +54,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -130,13 +135,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 3 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -219,7 +235,7 @@ Found 1 error in tsconfig.json:6
 }
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -231,7 +247,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -243,17 +259,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -269,20 +285,20 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.d.ts]
-declare module "class" {
+declare module "src/class" {
     export class classC {
         prop: number;
     }
 }
-declare module "indirectClass" {
-    import { classC } from "class";
+declare module "src/indirectClass" {
+    import { classC } from "src/class";
     export class indirectClass {
         classC: classC;
     }
 }
-declare module "directUse" { }
-declare module "indirectUse" { }
-declare module "noChangeFile" {
+declare module "src/directUse" { }
+declare module "src/indirectUse" { }
+declare module "src/noChangeFile" {
     export function writeLog(s: string): void;
 }
 declare function someFunc(arguments: boolean, ...rest: any[]): void;
@@ -302,13 +318,24 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 3 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -391,7 +418,7 @@ Found 1 error in tsconfig.json:6
 }
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -403,7 +430,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -415,17 +442,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -441,20 +468,20 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.d.ts]
-declare module "class" {
+declare module "src/class" {
     export class classC {
         prop1: number;
     }
 }
-declare module "indirectClass" {
-    import { classC } from "class";
+declare module "src/indirectClass" {
+    import { classC } from "src/class";
     export class indirectClass {
         classC: classC;
     }
 }
-declare module "directUse" { }
-declare module "indirectUse" { }
-declare module "noChangeFile" {
+declare module "src/directUse" { }
+declare module "src/indirectUse" { }
+declare module "src/noChangeFile" {
     export function writeLog(s: string): void;
 }
 declare function someFunc(arguments: boolean, ...rest: any[]): void;
@@ -474,13 +501,18 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 2 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -544,13 +576,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 3 errors in the same file, starting at: tsconfig.json:5
 
 
 
@@ -633,7 +676,7 @@ Found 1 error in tsconfig.json:6
 }
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -645,7 +688,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -657,17 +700,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -683,20 +726,20 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.d.ts]
-declare module "class" {
+declare module "src/class" {
     export class classC {
         prop: number;
     }
 }
-declare module "indirectClass" {
-    import { classC } from "class";
+declare module "src/indirectClass" {
+    import { classC } from "src/class";
     export class indirectClass {
         classC: classC;
     }
 }
-declare module "directUse" { }
-declare module "indirectUse" { }
-declare module "noChangeFile" {
+declare module "src/directUse" { }
+declare module "src/indirectUse" { }
+declare module "src/noChangeFile" {
     export function writeLog(s: string): void;
 }
 declare function someFunc(arguments: boolean, ...rest: any[]): void;
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental.js
index 0d69e1eeaad6a..aac5c60c12e28 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental.js
@@ -53,13 +53,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -128,13 +133,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 3 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -216,7 +232,7 @@ Found 1 error in tsconfig.json:5
 }
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -228,7 +244,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -240,17 +256,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -279,13 +295,24 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 3 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -367,7 +394,7 @@ Found 1 error in tsconfig.json:5
 }
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -379,7 +406,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -391,17 +418,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
@@ -430,13 +457,18 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -499,13 +531,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 3 errors in the same file, starting at: tsconfig.json:4
 
 
 
@@ -587,7 +630,7 @@ Found 1 error in tsconfig.json:5
 }
 
 //// [/home/src/workspaces/outFile.js]
-define("class", ["require", "exports"], function (require, exports) {
+define("src/class", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.classC = void 0;
@@ -599,7 +642,7 @@ define("class", ["require", "exports"], function (require, exports) {
     }());
     exports.classC = classC;
 });
-define("indirectClass", ["require", "exports", "class"], function (require, exports, class_1) {
+define("src/indirectClass", ["require", "exports", "src/class"], function (require, exports, class_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.indirectClass = void 0;
@@ -611,17 +654,17 @@ define("indirectClass", ["require", "exports", "class"], function (require, expo
     }());
     exports.indirectClass = indirectClass;
 });
-define("directUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_1) {
+define("src/directUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_1.indirectClass().classC.prop;
 });
-define("indirectUse", ["require", "exports", "indirectClass"], function (require, exports, indirectClass_2) {
+define("src/indirectUse", ["require", "exports", "src/indirectClass"], function (require, exports, indirectClass_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     new indirectClass_2.indirectClass().classC.prop;
 });
-define("noChangeFile", ["require", "exports"], function (require, exports) {
+define("src/noChangeFile", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.writeLog = writeLog;
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js
index 1d8d54232113c..0fa32e47e736d 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js
@@ -38,13 +38,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -131,13 +136,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -176,13 +186,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit --declaration
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -271,13 +286,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit --declaration --declarationMap
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -368,13 +388,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -443,19 +468,24 @@ Output::
                    ~
     Add a type annotation to the variable d.
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 4 errors in 4 files.
+Found 5 errors in 4 files.
 
 Errors  Files
      1  a.ts:1
      1  c.ts:1
      1  d.ts:1
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
@@ -667,13 +697,18 @@ export const a = class { public p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -756,13 +791,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit --declaration
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -847,13 +887,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit --declaration --declarationMap
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -943,13 +988,18 @@ export const c = class { public p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit --declaration --declarationMap
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-as-modules.js
index 09b5df0b9823f..9a08728112057 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-as-modules.js
@@ -33,13 +33,18 @@ export const b = 10;
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -114,13 +119,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -159,13 +169,18 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -240,13 +255,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -282,13 +302,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -395,13 +420,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -440,13 +470,18 @@ export const a = class { private p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -529,17 +564,22 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  a.ts:1
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
@@ -664,13 +704,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-discrepancies.js
new file mode 100644
index 0000000000000..66153cdb54a8b
--- /dev/null
+++ b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-discrepancies.js
@@ -0,0 +1,84 @@
+7:: no-change-run
+*** Needs explanation
+Incremental build contains ./project/a.ts file has emit errors, clean build does not have errors or does not mark is as pending emit: /home/src/projects/outfile.tsbuildinfo.readable.baseline.txt::
+Incremental buildInfoText:: {
+  "fileNames": [
+    "../tslibs/ts/lib/lib.d.ts",
+    "./project/a.ts"
+  ],
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "7752727223-const a = class { private p = 10; };"
+  },
+  "root": [
+    [
+      2,
+      "./project/a.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "outFile": "./outFile.js"
+  },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 6,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 6,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "version": "FakeTSVersion",
+  "size": 957
+}
+Clean buildInfoText:: {
+  "fileNames": [
+    "../tslibs/ts/lib/lib.d.ts",
+    "./project/a.ts"
+  ],
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "7752727223-const a = class { private p = 10; };"
+  },
+  "root": [
+    [
+      2,
+      "./project/a.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "outFile": "./outFile.js"
+  },
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
+  ],
+  "version": "FakeTSVersion",
+  "size": 640
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental.js b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental.js
index 7c24cb20ee94a..538924fc1b59c 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental.js
@@ -29,23 +29,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
-
-1 const a = class { private p = 10; };
-        ~
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -67,35 +62,12 @@ Found 1 error in a.ts:1
     "declaration": true,
     "outFile": "./outFile.js"
   },
-  "emitDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
-          "category": 1,
-          "code": 4094,
-          "relatedInformation": [
-            {
-              "start": 6,
-              "length": 1,
-              "messageText": "Add a type annotation to the variable a.",
-              "category": 1,
-              "code": 9027
-            }
-          ]
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 939
+  "size": 640
 }
 
 
@@ -115,9 +87,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -129,18 +99,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
 
-
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
@@ -161,7 +126,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -176,10 +141,18 @@ const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"pendingEmit":17,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -201,12 +174,12 @@ Output::
     "declaration": true,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 619
+  "size": 624
 }
 
 
@@ -226,13 +199,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -240,6 +211,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -259,11 +238,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -271,10 +250,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -296,8 +283,18 @@ Output::
     "declaration": true,
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 602
+  "size": 637
 }
 
 //// [/home/src/projects/outFile.js]
@@ -324,11 +321,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -336,6 +333,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -355,11 +360,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -370,23 +375,18 @@ const a = class { private p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
-
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -408,35 +408,11 @@ Found 1 error in a.ts:1
     "declaration": true,
     "outFile": "./outFile.js"
   },
-  "emitDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
-          "category": 1,
-          "code": 4094,
-          "relatedInformation": [
-            {
-              "start": 6,
-              "length": 1,
-              "messageText": "Add a type annotation to the variable a.",
-              "category": 1,
-              "code": 9027
-            }
-          ]
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 939
+  "size": 638
 }
 
 
@@ -456,9 +432,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -480,13 +454,21 @@ Output::
             ~
     Add a type annotation to the variable a.
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
-Found 1 error in a.ts:1
 
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  a.ts:1
+     1  tsconfig.json:3
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -508,6 +490,16 @@ Found 1 error in a.ts:1
     "declaration": true,
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -532,7 +524,7 @@ Found 1 error in a.ts:1
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 922
+  "size": 957
 }
 
 //// [/home/src/projects/outFile.js]
@@ -560,7 +552,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -572,18 +564,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
-
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
@@ -604,7 +591,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
index a98c258b41a4e..18140b6135fd2 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
@@ -32,13 +32,18 @@ export const b = 10;
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -111,13 +116,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -155,13 +165,18 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -234,13 +249,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -275,13 +295,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -377,13 +402,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -421,13 +451,18 @@ export const a = class { private p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -498,13 +533,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -605,13 +645,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js
index 85cd3efa69ce9..d869eac19b615 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js
@@ -28,10 +28,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -52,12 +60,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 619
+  "size": 621
 }
 
 
@@ -76,13 +84,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -90,6 +96,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -108,11 +122,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Fix error
 
@@ -123,10 +137,18 @@ const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -147,12 +169,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 603
+  "size": 605
 }
 
 
@@ -171,13 +193,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -185,6 +205,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -203,11 +231,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -215,10 +243,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -239,8 +275,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 583
+  "size": 618
 }
 
 //// [/home/src/projects/outFile.js]
@@ -262,11 +308,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -274,6 +320,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -292,11 +346,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -307,10 +361,18 @@ const a = class { private p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -331,9 +393,8 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
   "size": 619
@@ -355,13 +416,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Emit when error
 
@@ -369,10 +428,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -393,8 +460,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 599
+  "size": 634
 }
 
 //// [/home/src/projects/outFile.js]
@@ -421,11 +498,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -433,6 +510,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -451,8 +536,8 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled.js b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled.js
index 4aadaac87112b..344f1dcc9f7af 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled.js
@@ -27,6 +27,14 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -44,7 +52,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -52,6 +60,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -69,7 +85,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Fix error
 
@@ -80,6 +96,14 @@ const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -97,7 +121,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -105,6 +129,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -122,7 +154,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Emit after fixing error
 
@@ -130,6 +162,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.js]
@@ -150,7 +190,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -158,6 +198,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -175,7 +223,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Introduce error
 
@@ -186,6 +234,14 @@ const a = class { private p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -203,7 +259,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Emit when error
 
@@ -211,6 +267,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.js]
@@ -236,7 +300,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -244,6 +308,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -261,4 +333,4 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors.js b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors.js
index 2d49d763a5af4..502d7524f1e3e 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors.js
@@ -28,18 +28,13 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
-
-1 const a = class { private p = 10; };
-        ~
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
@@ -67,18 +62,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
-
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
@@ -109,6 +99,14 @@ const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -127,7 +125,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -135,6 +133,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -153,7 +159,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Emit after fixing error
 
@@ -161,6 +167,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.js]
@@ -186,7 +200,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -194,6 +208,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -212,7 +234,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Introduce error
 
@@ -223,18 +245,13 @@ const a = class { private p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
 
-
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
@@ -272,9 +289,17 @@ Output::
             ~
     Add a type annotation to the variable a.
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
-Found 1 error in a.ts:1
 
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  a.ts:1
+     1  tsconfig.json:3
 
 
 //// [/home/src/projects/outFile.js]
@@ -309,18 +334,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
-
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
index 64b42ff93e7dc..50bd2eaf7bd37 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
@@ -32,13 +32,18 @@ export const b = 10;
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -111,13 +116,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -155,13 +165,18 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -234,13 +249,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -275,13 +295,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -377,13 +402,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -421,13 +451,18 @@ export const a: number = "hello"
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -498,13 +533,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -586,13 +626,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors-with-incremental.js b/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors-with-incremental.js
index f644c982cd7a7..a9dac0db24b68 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors-with-incremental.js
@@ -28,18 +28,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":6,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -60,26 +60,12 @@ Found 1 error in a.ts:1
   "options": {
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 761
+  "size": 612
 }
 
 
@@ -98,9 +84,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -112,13 +96,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
@@ -138,7 +122,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -153,10 +137,18 @@ const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -177,12 +169,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 603
+  "size": 605
 }
 
 
@@ -201,13 +193,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -215,6 +205,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -233,11 +231,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -245,10 +243,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -269,8 +275,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 583
+  "size": 618
 }
 
 //// [/home/src/projects/outFile.js]
@@ -292,11 +308,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -304,6 +320,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -322,11 +346,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -337,18 +361,18 @@ const a: number = "hello"
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":6,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -369,26 +393,11 @@ Found 1 error in a.ts:1
   "options": {
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 761
+  "size": 610
 }
 
 
@@ -407,9 +416,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -421,18 +428,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":6,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -454,21 +461,17 @@ Found 1 error in a.ts:1
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
     [
       "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 741
+  "size": 625
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
@@ -487,7 +490,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -499,13 +502,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
@@ -525,7 +528,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors.js b/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors.js
index dffb5f21bcc27..495a86d724fea 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors.js
@@ -27,13 +27,13 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
@@ -60,13 +60,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
@@ -96,6 +96,14 @@ const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -113,7 +121,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -121,6 +129,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -138,7 +154,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Emit after fixing error
 
@@ -146,6 +162,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.js]
@@ -166,7 +190,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -174,6 +198,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -191,7 +223,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Introduce error
 
@@ -202,13 +234,13 @@ const a: number = "hello"
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
@@ -235,13 +267,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
@@ -268,13 +300,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
index deb0c973ee171..6b4736dfce12c 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
@@ -155,13 +155,18 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -234,13 +239,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -275,13 +285,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -377,13 +392,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors-with-incremental.js b/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors-with-incremental.js
index db92b40d0c281..7ea5c15d0f691 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors-with-incremental.js
@@ -137,10 +137,18 @@ const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -161,12 +169,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 603
+  "size": 605
 }
 
 
@@ -185,13 +193,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -199,6 +205,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -217,11 +231,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -229,10 +243,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -253,8 +275,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 583
+  "size": 618
 }
 
 //// [/home/src/projects/outFile.js]
@@ -276,11 +308,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -288,6 +320,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -306,11 +346,11 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors.js b/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors.js
index 67ed07480e635..f6d0cabb1dd6d 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors.js
@@ -96,6 +96,14 @@ const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -113,7 +121,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -121,6 +129,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -138,7 +154,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Emit after fixing error
 
@@ -146,6 +162,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/outFile.js]
@@ -166,7 +190,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -174,6 +198,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:3
+
 
 
 
@@ -191,7 +223,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Introduce error
 
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js
index 2c3c2f450fa64..01b777a07b2d6 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js
@@ -44,13 +44,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -136,13 +141,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -184,13 +194,18 @@ export const a = class { p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -276,13 +291,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration.js
index 58d5c80a6adf0..4291c68e26a93 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration.js
@@ -43,13 +43,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -81,13 +86,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -124,13 +134,18 @@ export const a = class { p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -162,13 +177,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-incremental.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-incremental.js
index 0c81f53526773..960dedb1b5123 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-incremental.js
@@ -43,13 +43,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -133,13 +138,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -180,13 +190,18 @@ export const a = class { p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -270,13 +285,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js
index ce30693e568a1..c990b34cea633 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js
@@ -42,13 +42,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -79,13 +84,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -121,13 +131,18 @@ export const a = class { p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -158,13 +173,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/file-deleted-before-fixing-error-with-noEmitOnError.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/file-deleted-before-fixing-error-with-noEmitOnError.js
index 12a40d19e6593..764446fe6354c 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/file-deleted-before-fixing-error-with-noEmitOnError.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/file-deleted-before-fixing-error-with-noEmitOnError.js
@@ -37,17 +37,22 @@ Output::
 1 export const x: 30 = "hello";
                ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  file1.ts:1
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
@@ -141,17 +146,22 @@ Output::
 1 export const x: 30 = "hello";
                ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  file1.ts:1
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js
index 0fc0fa59703bd..f3c080f753f80 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js
@@ -48,17 +48,22 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:2
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
@@ -161,17 +166,22 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:2
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 
@@ -211,13 +221,18 @@ const a: string = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -303,13 +318,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration.js
index 5f7d3d5068b43..634d8ab2e0b2f 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration.js
@@ -47,17 +47,22 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:2
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 
@@ -93,17 +98,22 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:2
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 
@@ -138,13 +148,18 @@ const a: string = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -176,13 +191,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-incremental.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-incremental.js
index f4f7798f30ec8..c9455d6f75b87 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-incremental.js
@@ -47,17 +47,22 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:2
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
@@ -158,17 +163,22 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:2
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 
@@ -207,13 +217,18 @@ const a: string = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -297,13 +312,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js
index 46ba04a0df3df..6301a4da78fb7 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js
@@ -46,17 +46,22 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:2
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 
@@ -91,17 +96,22 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:2
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 
@@ -135,13 +145,18 @@ const a: string = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -172,13 +187,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js
index 43e79a0e03d90..109607eb507a3 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js
@@ -51,17 +51,22 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:4
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
@@ -151,17 +156,22 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:4
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 
@@ -203,13 +213,18 @@ const a = {
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -295,13 +310,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration.js
index 99560ff0d1723..9fb8af9263de5 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration.js
@@ -50,17 +50,22 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:4
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 
@@ -96,17 +101,22 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:4
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 
@@ -143,13 +153,18 @@ const a = {
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -181,13 +196,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-incremental.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-incremental.js
index 576723c6e81f4..14d787115c908 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-incremental.js
@@ -50,17 +50,22 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:4
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
@@ -148,17 +153,22 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:4
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 
@@ -199,13 +209,18 @@ const a = {
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -289,13 +304,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js
index 22adb7f488664..e6bef01206a99 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js
@@ -49,17 +49,22 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:4
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 
@@ -94,17 +99,22 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 3 errors in 2 files.
 
 Errors  Files
      1  src/main.ts:4
-     1  tsconfig.json:4
+     2  tsconfig.json:3
 
 
 
@@ -140,13 +150,18 @@ const a = {
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
@@ -177,13 +192,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/when-declarationMap-changes-discrepancies.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/when-declarationMap-changes-discrepancies.js
index a5caaf5f45672..51aa64397a347 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/when-declarationMap-changes-discrepancies.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/when-declarationMap-changes-discrepancies.js
@@ -1,60 +1,4 @@
 0:: error and enable declarationMap
 Clean build does not emit any file so will not have outSignature
 Incremental build has outSignature from before
-TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
-CleanBuild:
-{
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "5515933561-const x: 20 = 10;",
-    "./project/b.ts": "2026006654-const y = 10;"
-  },
-  "root": [
-    [
-      2,
-      "./project/a.ts"
-    ],
-    [
-      3,
-      "./project/b.ts"
-    ]
-  ],
-  "options": {
-    "composite": true,
-    "declaration": true,
-    "declarationMap": true,
-    "noEmitOnError": true,
-    "outFile": "./outFile.js"
-  },
-  "version": "FakeTSVersion"
-}
-IncrementalBuild:
-{
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "5515933561-const x: 20 = 10;",
-    "./project/b.ts": "2026006654-const y = 10;"
-  },
-  "root": [
-    [
-      2,
-      "./project/a.ts"
-    ],
-    [
-      3,
-      "./project/b.ts"
-    ]
-  ],
-  "options": {
-    "composite": true,
-    "declaration": true,
-    "declarationMap": true,
-    "noEmitOnError": true,
-    "outFile": "./outFile.js"
-  },
-  "outSignature": [
-    "-2781996726-declare const x = 10;\ndeclare const y = 10;\n"
-  ],
-  "latestChangedDtsFile": "FakeFileName",
-  "version": "FakeTSVersion"
-}
\ No newline at end of file
+*** Supplied discrepancy explanation but didnt find any difference
\ No newline at end of file
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/when-declarationMap-changes.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/when-declarationMap-changes.js
index c09f0f798e639..24278c79834a3 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/when-declarationMap-changes.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/when-declarationMap-changes.js
@@ -33,20 +33,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-
-
-//// [/home/src/workspaces/outFile.js]
-var x = 10;
-var y = 10;
-
-
-//// [/home/src/workspaces/outFile.d.ts]
-declare const x = 10;
-declare const y = 10;
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:6
+
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5029505981-const x = 10;","2026006654-const y = 10;"],"root":[2,3],"options":{"composite":true,"declaration":true,"noEmitOnError":true,"outFile":"./outFile.js"},"outSignature":"-2781996726-declare const x = 10;\ndeclare const y = 10;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5029505981-const x = 10;","2026006654-const y = 10;"],"root":[2,3],"options":{"composite":true,"declaration":true,"noEmitOnError":true,"outFile":"./outFile.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -76,14 +74,17 @@ declare const y = 10;
     "noEmitOnError": true,
     "outFile": "./outFile.js"
   },
-  "outSignature": "-2781996726-declare const x = 10;\ndeclare const y = 10;\n",
-  "latestChangedDtsFile": "./outFile.d.ts",
+  "pendingEmit": [
+    "Js | Dts",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 795
+  "size": 713
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: error and enable declarationMap
 
@@ -99,13 +100,21 @@ Output::
 1 const x: 20 = 10;
         ~
 
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
-Found 1 error in a.ts:1
 
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  a.ts:1
+     1  tsconfig.json:6
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5515933561-const x: 20 = 10;","2026006654-const y = 10;"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"noEmitOnError":true,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":6,"length":1,"code":2322,"category":1,"messageText":"Type '10' is not assignable to type '20'."}]]],"outSignature":["-2781996726-declare const x = 10;\ndeclare const y = 10;\n"],"latestChangedDtsFile":"./outFile.d.ts","pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5515933561-const x: 20 = 10;","2026006654-const y = 10;"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"noEmitOnError":true,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":6,"length":1,"code":2322,"category":1,"messageText":"Type '10' is not assignable to type '20'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -150,16 +159,12 @@ Found 1 error in a.ts:1
       ]
     ]
   ],
-  "outSignature": [
-    "-2781996726-declare const x = 10;\ndeclare const y = 10;\n"
-  ],
-  "latestChangedDtsFile": "./outFile.d.ts",
   "pendingEmit": [
     "Js | Dts | DtsMap",
     false
   ],
   "version": "FakeTSVersion",
-  "size": 986
+  "size": 868
 }
 
 
@@ -174,16 +179,18 @@ const x = 10;
 
 /home/src/tslibs/TS/Lib/tsc.js --declarationMap
 Output::
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:6
+
 
 
-//// [/home/src/workspaces/outFile.js] file written with same contents
-//// [/home/src/workspaces/outFile.d.ts]
-declare const x = 10;
-declare const y = 10;
-//# sourceMappingURL=outFile.d.ts.map
-
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5029505981-const x = 10;","2026006654-const y = 10;"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"noEmitOnError":true,"outFile":"./outFile.js"},"outSignature":"-2781996726-declare const x = 10;\ndeclare const y = 10;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5029505981-const x = 10;","2026006654-const y = 10;"],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"noEmitOnError":true,"outFile":"./outFile.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -214,14 +221,14 @@ declare const y = 10;
     "noEmitOnError": true,
     "outFile": "./outFile.js"
   },
-  "outSignature": "-2781996726-declare const x = 10;\ndeclare const y = 10;\n",
-  "latestChangedDtsFile": "./outFile.d.ts",
+  "pendingEmit": [
+    "Js | Dts | DtsMap",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 817
+  "size": 735
 }
 
-//// [/home/src/workspaces/outFile.d.ts.map]
-{"version":3,"file":"outFile.d.ts","sourceRoot":"","sources":["project/a.ts","project/b.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,CAAC,KAAK,CAAC;ACAb,QAAA,MAAM,CAAC,KAAK,CAAC"}
-
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsc/projectReferences/default-import-interop-uses-referenced-project-settings.js b/tests/baselines/reference/tsc/projectReferences/default-import-interop-uses-referenced-project-settings.js
index bf990179392da..79610a168d1f0 100644
--- a/tests/baselines/reference/tsc/projectReferences/default-import-interop-uses-referenced-project-settings.js
+++ b/tests/baselines/reference/tsc/projectReferences/default-import-interop-uses-referenced-project-settings.js
@@ -86,6 +86,8 @@ declare const console: { log(msg: any): void; };
 Output::
 app/src/index.ts(2,28): error TS2613: Module '"/home/src/workspaces/project/app/src/local"' has no default export. Did you mean to use 'import { local } from "/home/src/workspaces/project/app/src/local"' instead?
 app/src/index.ts(3,28): error TS2613: Module '"/home/src/workspaces/project/node_modules/esm-package/index"' has no default export. Did you mean to use 'import { esm } from "/home/src/workspaces/project/node_modules/esm-package/index"' instead?
+app/src/index.ts(4,28): error TS1192: Module '"/home/src/workspaces/project/lib/dist/a"' has no default export.
+app/src/index.ts(5,28): error TS1192: Module '"/home/src/workspaces/project/lib/dist/a"' has no default export.
 
 
 //// [/home/src/workspaces/project/app/dist/local.js]
diff --git a/tests/baselines/reference/tsc/projectReferences/referenced-project-with-esnext-module-disallows-synthetic-default-imports.js b/tests/baselines/reference/tsc/projectReferences/referenced-project-with-esnext-module-disallows-synthetic-default-imports.js
new file mode 100644
index 0000000000000..a12b919163bc2
--- /dev/null
+++ b/tests/baselines/reference/tsc/projectReferences/referenced-project-with-esnext-module-disallows-synthetic-default-imports.js
@@ -0,0 +1,73 @@
+currentDirectory:: /home/src/workspaces/project useCaseSensitiveFileNames:: false
+Input::
+//// [/home/src/workspaces/project/lib/tsconfig.json]
+{
+  "compilerOptions": {
+    "composite": true,
+    "declaration": true,
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "rootDir": "src",
+    "outDir": "dist"
+  },
+  "include": [
+    "src"
+  ]
+}
+
+//// [/home/src/workspaces/project/lib/src/utils.ts]
+export const test = () => 'test';
+
+//// [/home/src/workspaces/project/lib/dist/utils.d.ts]
+export declare const test: () => string;
+
+//// [/home/src/workspaces/project/app/tsconfig.json]
+{
+  "compilerOptions": {
+    "module": "esnext",
+    "moduleResolution": "bundler"
+  },
+  "references": [
+    {
+      "path": "../lib"
+    }
+  ]
+}
+
+//// [/home/src/workspaces/project/app/index.ts]
+
+                    import TestSrc from '../lib/src/utils'; // Error
+                    import TestDecl from '../lib/dist/utils'; // Error
+                    console.log(TestSrc.test());
+                    console.log(TestDecl.test());
+
+//// [/home/src/tslibs/TS/Lib/lib.d.ts]
+interface Boolean {}
+interface Function {}
+interface CallableFunction {}
+interface NewableFunction {}
+interface IArguments {}
+interface Number { toExponential: any; }
+interface Object {}
+interface RegExp {}
+interface String { charAt: any; }
+interface Array<T> { length: number; [n: number]: T; }
+interface ReadonlyArray<T> {}
+declare const console: { log(msg: any): void; };
+
+
+/home/src/tslibs/TS/Lib/tsc.js --p app --pretty false
+Output::
+app/index.ts(2,28): error TS1192: Module '"/home/src/workspaces/project/lib/dist/utils"' has no default export.
+app/index.ts(3,28): error TS1192: Module '"/home/src/workspaces/project/lib/dist/utils"' has no default export.
+
+
+//// [/home/src/workspaces/project/app/index.js]
+import TestSrc from '../lib/src/utils'; // Error
+import TestDecl from '../lib/dist/utils'; // Error
+console.log(TestSrc.test());
+console.log(TestDecl.test());
+
+
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
diff --git a/tests/baselines/reference/tsc/projectReferences/when-project-contains-invalid-project-reference.js b/tests/baselines/reference/tsc/projectReferences/when-project-contains-invalid-project-reference.js
index 7df36960b23ac..87b0c038cffd3 100644
--- a/tests/baselines/reference/tsc/projectReferences/when-project-contains-invalid-project-reference.js
+++ b/tests/baselines/reference/tsc/projectReferences/when-project-contains-invalid-project-reference.js
@@ -38,6 +38,17 @@ Output::
 3     "module": "amd",
                 ~~~~~
 
+tsconfig.json:4:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+4     "outFile": "theApp.js"
+      ~~~~~~~~~
+
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "theApp.js"
+      ~~~~~~~~~
+
 tsconfig.json:7:5 - error TS6053: File '/home/src/workspaces/Util/Dates' not found.
 
 7     {
@@ -48,12 +59,12 @@ Output::
   ~~~~~
 
 
-Found 2 errors in the same file, starting at: tsconfig.json:3
+Found 4 errors in the same file, starting at: tsconfig.json:3
 
 
 
 //// [/home/src/workspaces/project/theApp.js]
-define("main", ["require", "exports"], function (require, exports) {
+define("src/main", ["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = void 0;
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
index f501d26c4111a..df9b06789260f 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
@@ -48,7 +48,12 @@ Output::
 3     "module": "system",
                 ~~~~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "/home/src/projects/a/b/out.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -181,7 +186,12 @@ Output::
 3     "module": "system",
                 ~~~~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "/home/src/projects/a/b/out.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
index 509cc5888fd1a..a49394eb25f02 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
@@ -34,7 +34,6 @@ Output::
 [HH:MM:SS AM] Starting compilation in watch mode...
 
 tsconfig.json:3:5 - error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 
 3     "out": "/home/src/projects/a/out.js"
       ~~~~~
@@ -117,7 +116,6 @@ Output::
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
 tsconfig.json:3:5 - error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 
 3     "out": "/home/src/projects/a/out.js"
       ~~~~~
@@ -178,7 +176,6 @@ Output::
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
 tsconfig.json:3:5 - error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 
 3     "out": "/home/src/projects/a/out.js"
       ~~~~~
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
index eac9777884b41..6a3e3a276ce0e 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
@@ -33,7 +33,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "/home/src/projects/a/out.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -79,10 +84,7 @@ Program files::
 /home/src/projects/a/a.ts
 /home/src/projects/a/b.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/a/a.ts
-/home/src/projects/a/b.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -107,7 +109,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "/home/src/projects/a/out.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -134,10 +141,7 @@ Program files::
 /home/src/projects/a/a.ts
 /home/src/projects/a/b.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/a/a.ts
-/home/src/projects/a/b.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -162,7 +166,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "/home/src/projects/a/out.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -189,10 +198,7 @@ Program files::
 /home/src/projects/a/a.ts
 /home/src/projects/a/b.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/a/a.ts
-/home/src/projects/a/b.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/with---outFile-and-multiple-declaration-files-in-the-program.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/with---outFile-and-multiple-declaration-files-in-the-program.js
index 27af645135385..b29b62c83eae2 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/with---outFile-and-multiple-declaration-files-in-the-program.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/with---outFile-and-multiple-declaration-files-in-the-program.js
@@ -46,12 +46,18 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-src/main2.ts:1:114 - error TS2724: 'Common.SomeComponent.DynamicMenu' has no exported member named 'z'. Did you mean 'Z'?
+tsconfig.json:3:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
 
-1 namespace main.file4 { import DynamicMenu = Common.SomeComponent.DynamicMenu; export function foo(a: DynamicMenu.z) {  } }
-                                                                                                                   ~
+3     "outFile": "../output/common.js",
+      ~~~~~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../output/common.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -116,12 +122,7 @@ Program files::
 /home/src/projects/a/b/project/src/main.ts
 /home/src/projects/a/b/project/src/main2.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/a/b/output/AnotherDependency/file1.d.ts
-/home/src/projects/a/b/dependencies/file2.d.ts
-/home/src/projects/a/b/project/src/main.ts
-/home/src/projects/a/b/project/src/main2.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js
index 806dead3ea782..9a8494af7b1d3 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js
@@ -46,16 +46,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-src/main2.ts:1:114 - error TS2724: 'Common.SomeComponent.DynamicMenu' has no exported member named 'z'. Did you mean 'Z'?
+tsconfig.json:3:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
 
-1 namespace main.file4 { import DynamicMenu = Common.SomeComponent.DynamicMenu; export function foo(a: DynamicMenu.z) {  } }
-                                                                                                                   ~
+3     "outDir": "../output",
+      ~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/home/src/projects/a/b/output/main.js]
+//// [/home/src/projects/a/b/output/src/main.js]
 var Main;
 (function (Main) {
     function fooBar() { }
@@ -63,7 +64,7 @@ var Main;
 })(Main || (Main = {}));
 
 
-//// [/home/src/projects/a/b/output/main2.js]
+//// [/home/src/projects/a/b/output/src/main2.js]
 var main;
 (function (main) {
     var file4;
@@ -119,12 +120,7 @@ Program files::
 /home/src/projects/a/b/project/src/main.ts
 /home/src/projects/a/b/project/src/main2.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/a/b/output/AnotherDependency/file1.d.ts
-/home/src/projects/a/b/dependencies/file2.d.ts
-/home/src/projects/a/b/project/src/main.ts
-/home/src/projects/a/b/project/src/main2.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
diff --git a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
index ee90c305f145e..8314d501dda0c 100644
--- a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
+++ b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
@@ -43,15 +43,21 @@ Output::
 3     "module": "none",
                 ~~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './Scripts'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outDir": "Static/scripts/"
+      ~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
-//// [/home/src/projects/a/rootFolder/project/Static/scripts/Javascript.js]
+//// [/home/src/projects/a/rootFolder/project/Static/scripts/Scripts/Javascript.js]
 var zz = 10;
 
 
-//// [/home/src/projects/a/rootFolder/project/Static/scripts/TypeScript.js]
+//// [/home/src/projects/a/rootFolder/project/Static/scripts/Scripts/TypeScript.js]
 var z = 10;
 
 
@@ -130,12 +136,18 @@ Output::
 3     "module": "none",
                 ~~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:5:5 - error TS5011: The common source directory of 'tsconfig.json' is './Scripts'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+5     "outDir": "Static/scripts/"
+      ~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
-//// [/home/src/projects/a/rootFolder/project/Static/scripts/Javascript.js] file written with same contents
-//// [/home/src/projects/a/rootFolder/project/Static/scripts/TypeScript.js]
+//// [/home/src/projects/a/rootFolder/project/Static/scripts/Scripts/Javascript.js] file written with same contents
+//// [/home/src/projects/a/rootFolder/project/Static/scripts/Scripts/TypeScript.js]
 var zz30 = 100;
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
index 98ac3ae0ec52e..c81806b816231 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
@@ -58,6 +58,11 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_mod
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "out.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "system"
@@ -72,7 +77,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
@@ -209,6 +214,11 @@ Synchronizing program
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/b.ts","/user/username/projects/myproject/XY/a.ts"]
   options: {"forceConsistentCasingInFileNames":true,"outFile":"/user/username/projects/myproject/out.js","module":4,"watch":true,"project":"/user/username/projects/myproject","explainFiles":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "out.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "system"
@@ -223,7 +233,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
index 44d4de5e70060..23fad125dc3d1 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
@@ -58,6 +58,11 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_mod
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "out.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "system"
@@ -72,7 +77,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
@@ -209,6 +214,11 @@ Synchronizing program
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/b.ts","/user/username/projects/myproject/XY/a.ts"]
   options: {"forceConsistentCasingInFileNames":true,"outFile":"/user/username/projects/myproject/out.js","module":4,"watch":true,"project":"/user/username/projects/myproject","explainFiles":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "out.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "system"
@@ -223,7 +233,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
index b34c4d9914ad0..ab2548d33f4bd 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
@@ -58,6 +58,11 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_mod
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "out.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "system"
@@ -72,7 +77,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
@@ -209,6 +214,11 @@ Synchronizing program
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/b.ts","/user/username/projects/myproject/XY/a.ts"]
   options: {"forceConsistentCasingInFileNames":true,"outFile":"/user/username/projects/myproject/out.js","module":4,"watch":true,"project":"/user/username/projects/myproject","explainFiles":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "out.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "system"
@@ -223,7 +233,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
index f0db343a30fc1..07271e3d424a9 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
@@ -58,6 +58,11 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_mod
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "out.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "system"
@@ -72,7 +77,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
@@ -209,6 +214,11 @@ Synchronizing program
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/b.ts","/user/username/projects/myproject/XY/a.ts"]
   options: {"forceConsistentCasingInFileNames":true,"outFile":"/user/username/projects/myproject/out.js","module":4,"watch":true,"project":"/user/username/projects/myproject","explainFiles":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "out.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "system"
@@ -223,7 +233,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
index 950f873234a9a..5d1626f19b2f7 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
@@ -58,6 +58,11 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_mod
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "out.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "system"
@@ -72,7 +77,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
@@ -209,6 +214,11 @@ Synchronizing program
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/b.ts","/user/username/projects/myproject/XY/a.ts"]
   options: {"forceConsistentCasingInFileNames":true,"outFile":"/user/username/projects/myproject/out.js","module":4,"watch":true,"project":"/user/username/projects/myproject","explainFiles":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "out.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "system"
@@ -223,7 +233,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/with---out-incremental.js b/tests/baselines/reference/tscWatch/incremental/with---out-incremental.js
index 6d53c0034a293..14b7b3a530409 100644
--- a/tests/baselines/reference/tscWatch/incremental/with---out-incremental.js
+++ b/tests/baselines/reference/tscWatch/incremental/with---out-incremental.js
@@ -31,6 +31,14 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js -i
 Output::
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "out.js"
+      ~~~~~~~~~
+
+
+Found 1 error in tsconfig.json:4
+
 
 
 //// [/users/username/projects/project/out.js]
@@ -39,7 +47,7 @@ var y = 20;
 
 
 //// [/users/username/projects/project/out.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./file1.ts","./file2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5029505981-const x = 10;","2026007743-const y = 20;"],"root":[2,3],"options":{"outFile":"./out.js"},"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./file1.ts","./file2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5029505981-const x = 10;","2026007743-const y = 20;"],"root":[2,3],"options":{"outFile":"./out.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
 
 //// [/users/username/projects/project/out.tsbuildinfo.readable.baseline.txt]
 {
@@ -66,8 +74,22 @@ var y = 20;
   "options": {
     "outFile": "./out.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./file1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./file2.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 628
+  "size": 665
 }
 
 
@@ -86,11 +108,8 @@ Program files::
 /users/username/projects/project/file1.ts
 /users/username/projects/project/file2.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/users/username/projects/project/file1.ts
-/users/username/projects/project/file2.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
diff --git a/tests/baselines/reference/tscWatch/incremental/with---out-watch.js b/tests/baselines/reference/tscWatch/incremental/with---out-watch.js
index b7dd993dc1f36..e432fffc67124 100644
--- a/tests/baselines/reference/tscWatch/incremental/with---out-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/with---out-watch.js
@@ -34,7 +34,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "out.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -44,7 +49,7 @@ var y = 20;
 
 
 //// [/users/username/projects/project/out.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./file1.ts","./file2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5029505981-const x = 10;","2026007743-const y = 20;"],"root":[2,3],"options":{"outFile":"./out.js"},"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./file1.ts","./file2.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","5029505981-const x = 10;","2026007743-const y = 20;"],"root":[2,3],"options":{"outFile":"./out.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
 
 //// [/users/username/projects/project/out.tsbuildinfo.readable.baseline.txt]
 {
@@ -71,8 +76,22 @@ var y = 20;
   "options": {
     "outFile": "./out.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./file1.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./file2.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 628
+  "size": 665
 }
 
 
@@ -112,10 +131,7 @@ Program files::
 /users/username/projects/project/file1.ts
 /users/username/projects/project/file2.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/users/username/projects/project/file1.ts
-/users/username/projects/project/file2.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/diagnostics-from-cache.js b/tests/baselines/reference/tscWatch/moduleResolution/diagnostics-from-cache.js
index 84466037c8f5d..16d22909279f4 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/diagnostics-from-cache.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/diagnostics-from-cache.js
@@ -71,14 +71,12 @@ File '/home/src/tslibs/package.json' does not exist.
 File '/home/src/package.json' does not exist.
 File '/home/package.json' does not exist.
 File '/package.json' does not exist.
-error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file '/user/username/projects/myproject/package.json'. Supply the `rootDir` compiler option to disambiguate.
-
 tsconfig.json:2:3 - error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResolution' is set to 'NodeNext'.
 
 2   "compilerOptions": {
     ~~~~~~~~~~~~~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -201,14 +199,12 @@ File '/home/src/tslibs/package.json' does not exist according to earlier cached
 File '/home/src/package.json' does not exist according to earlier cached lookups.
 File '/home/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
-error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file '/user/username/projects/myproject/package.json'. Supply the `rootDir` compiler option to disambiguate.
-
 tsconfig.json:2:3 - error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResolution' is set to 'NodeNext'.
 
 2   "compilerOptions": {
     ~~~~~~~~~~~~~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js
index c346f07ce880c..259a7765bb6ac 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js
@@ -37,12 +37,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -150,12 +155,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -251,12 +261,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -385,12 +400,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -440,12 +460,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -549,12 +574,17 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -702,12 +732,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-with-incremental.js b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-with-incremental.js
index 1b494bae63df4..107a4e8c92915 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-with-incremental.js
@@ -33,22 +33,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
-
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -70,35 +65,12 @@ Output::
     "declaration": true,
     "outFile": "./outFile.js"
   },
-  "emitDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
-          "category": 1,
-          "code": 4094,
-          "relatedInformation": [
-            {
-              "start": 6,
-              "length": 1,
-              "messageText": "Add a type annotation to the variable a.",
-              "category": 1,
-              "code": 9027
-            }
-          ]
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 939
+  "size": 640
 }
 
 
@@ -136,9 +108,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -163,12 +133,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"pendingEmit":17,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -190,12 +165,12 @@ Output::
     "declaration": true,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 619
+  "size": 624
 }
 
 
@@ -216,9 +191,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -249,12 +222,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -276,8 +254,18 @@ Output::
     "declaration": true,
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 602
+  "size": 637
 }
 
 //// [/home/src/projects/outFile.js]
@@ -305,7 +293,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -337,7 +325,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -359,7 +352,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -384,22 +377,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
-
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -421,35 +409,11 @@ Output::
     "declaration": true,
     "outFile": "./outFile.js"
   },
-  "emitDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
-          "category": 1,
-          "code": 4094,
-          "relatedInformation": [
-            {
-              "start": 6,
-              "length": 1,
-              "messageText": "Add a type annotation to the variable a.",
-              "category": 1,
-              "code": 9027
-            }
-          ]
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 939
+  "size": 638
 }
 
 
@@ -470,9 +434,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -513,12 +475,17 @@ Output::
             ~
     Add a type annotation to the variable a.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"declaration":true,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"emitDiagnosticsPerFile":[[2,[{"start":6,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":6,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -540,6 +507,16 @@ Output::
     "declaration": true,
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -564,7 +541,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 922
+  "size": 957
 }
 
 //// [/home/src/projects/outFile.js]
@@ -593,7 +570,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -625,15 +602,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
-
-1 const a = class { private p = 10; };
-        ~
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -657,7 +629,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
index 8fce34a246c7a..135a26755f3b0 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
@@ -36,12 +36,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -147,12 +152,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -245,12 +255,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -367,12 +382,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -421,12 +441,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -517,12 +542,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -644,12 +674,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js
index e6e9e5c5bda23..375d2d4a0a80c 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental.js
@@ -32,12 +32,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -58,12 +63,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 619
+  "size": 621
 }
 
 
@@ -100,9 +105,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -127,12 +130,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -153,12 +161,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 603
+  "size": 605
 }
 
 
@@ -178,9 +186,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -210,12 +216,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -236,8 +247,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 583
+  "size": 618
 }
 
 //// [/home/src/projects/outFile.js]
@@ -260,7 +281,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -291,7 +312,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -312,7 +338,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -337,12 +363,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -363,9 +394,8 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
   "size": 619
@@ -388,9 +418,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -420,12 +448,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","7752727223-const a = class { private p = 10; };"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -446,8 +479,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 599
+  "size": 634
 }
 
 //// [/home/src/projects/outFile.js]
@@ -475,7 +518,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -506,7 +549,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -527,7 +575,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled.js b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled.js
index 3159c75afe21f..9392179e27821 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled.js
@@ -31,7 +31,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -68,9 +73,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -95,7 +98,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -115,9 +123,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -146,7 +152,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -169,7 +180,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -199,7 +210,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -219,7 +235,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -244,7 +260,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -264,9 +285,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -295,7 +314,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -323,7 +347,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -353,7 +377,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -373,7 +402,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors.js b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors.js
index 5e3ba223270bd..130930c168c32 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors.js
@@ -32,15 +32,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
-
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -80,9 +75,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -107,7 +100,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -128,9 +126,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -160,7 +156,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -188,7 +189,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -219,7 +220,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -240,7 +246,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -265,15 +271,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a = class { private p = 10; };
-        ~
-
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -296,9 +297,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -338,7 +337,12 @@ Output::
             ~
     Add a type annotation to the variable a.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -367,7 +371,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -398,15 +402,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-a.ts:1:7 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
-
-1 const a = class { private p = 10; };
-        ~
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-  a.ts:1:7
-    1 const a = class { private p = 10; };
-            ~
-    Add a type annotation to the variable a.
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -429,7 +428,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js b/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
index e0ed5489f40a1..2ad97fd4fbbee 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
@@ -36,12 +36,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -147,12 +152,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -245,12 +255,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -367,12 +382,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -421,12 +441,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -517,12 +542,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -625,12 +655,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors-with-incremental.js b/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors-with-incremental.js
index ff26fae42a351..e1f8946897287 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors-with-incremental.js
@@ -32,17 +32,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":6,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -63,26 +63,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 761
+  "size": 612
 }
 
 
@@ -119,9 +105,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -146,12 +130,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -172,12 +161,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 603
+  "size": 605
 }
 
 
@@ -197,9 +186,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -229,12 +216,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -255,8 +247,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 583
+  "size": 618
 }
 
 //// [/home/src/projects/outFile.js]
@@ -279,7 +281,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -310,7 +312,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -331,7 +338,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -356,17 +363,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":6,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -387,26 +394,11 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 761
+  "size": 610
 }
 
 
@@ -426,9 +418,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -458,17 +448,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":6,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1311033573-const a: number = \"hello\""],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -490,21 +480,17 @@ Output::
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
     [
       "./project/a.ts",
-      [
-        {
-          "start": 6,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 741
+  "size": 625
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
@@ -524,7 +510,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -555,10 +541,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -581,7 +567,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors.js b/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors.js
index 9913f6437a997..f3316fa424c6c 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors.js
@@ -31,10 +31,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -73,9 +73,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -100,7 +98,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -120,9 +123,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -151,7 +152,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -174,7 +180,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -204,7 +210,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -224,7 +235,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -249,10 +260,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -274,9 +285,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -305,10 +314,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -330,7 +339,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -360,10 +369,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-a.ts:1:7 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-1 const a: number = "hello"
-        ~
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -385,7 +394,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js b/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
index 1805c3fd022c1..79d78af1e47aa 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
@@ -147,12 +147,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -245,12 +250,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -367,12 +377,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors-with-incremental.js b/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors-with-incremental.js
index 66075616cbcb1..cb15b32072b8e 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors-with-incremental.js
@@ -130,12 +130,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"changeFileSet":[2,1],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -156,12 +161,12 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 603
+  "size": 605
 }
 
 
@@ -181,9 +186,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -213,12 +216,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3528887741-const a = \"hello\";"],"root":[2],"options":{"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -239,8 +247,18 @@ Output::
   "options": {
     "outFile": "./outFile.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/a.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 583
+  "size": 618
 }
 
 //// [/home/src/projects/outFile.js]
@@ -263,7 +281,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -294,7 +312,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -315,7 +338,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors.js b/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors.js
index 31c620f54aa81..33ab5fd13a0d1 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors.js
@@ -98,7 +98,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -118,9 +123,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -149,7 +152,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -172,7 +180,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -202,7 +210,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -222,7 +235,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /home/src/projects/project/a.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js
index 5582bd6b1c138..04a60d551f49f 100644
--- a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js
@@ -54,12 +54,17 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -201,12 +206,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -330,12 +340,17 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -467,12 +482,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -592,12 +612,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -717,12 +742,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
index 07dad3a8821ac..8cb03b741235b 100644
--- a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
+++ b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
@@ -53,12 +53,17 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -154,12 +159,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -237,12 +247,17 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -315,12 +330,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -394,12 +414,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -473,12 +498,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
index c43d23a19984e..89fdc5b062497 100644
--- a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
@@ -53,12 +53,17 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -198,12 +203,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -325,12 +335,17 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -460,12 +475,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -583,12 +603,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -706,12 +731,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError.js b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError.js
index 4ef5df0fcec3f..98d78b2066612 100644
--- a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError.js
@@ -52,12 +52,17 @@ Output::
 4 ;
   ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -152,12 +157,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -234,12 +244,17 @@ Output::
 2 const a: string = 10;
         ~
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -311,12 +326,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -389,12 +409,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -467,12 +492,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "../dev-build.js",
+      ~~~~~~~~~
+
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/nodeNextWatch/esm-mode-file-is-edited.js b/tests/baselines/reference/tscWatch/nodeNextWatch/esm-mode-file-is-edited.js
index c95f00791185e..eab8e23b0b7de 100644
--- a/tests/baselines/reference/tscWatch/nodeNextWatch/esm-mode-file-is-edited.js
+++ b/tests/baselines/reference/tscWatch/nodeNextWatch/esm-mode-file-is-edited.js
@@ -48,13 +48,19 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:7:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+7     "outDir": "../dist"
+      ~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib*
 
-//// [/home/src/projects/dist/index.js]
+//// [/home/src/projects/dist/src/index.js]
 import * as Thing from "thing";
 Thing.fn();
 
@@ -115,10 +121,7 @@ Program files::
 /home/src/projects/project/src/deps.d.ts
 /home/src/projects/project/src/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts
-/home/src/projects/project/src/deps.d.ts
-/home/src/projects/project/src/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.es2020.full.d.ts (used version)
@@ -147,11 +150,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:7:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+7     "outDir": "../dist"
+      ~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/home/src/projects/dist/index.js] file written with same contents
+//// [/home/src/projects/dist/src/index.js] file written with same contents
 
 
 Program root files: [
@@ -173,8 +182,7 @@ Program files::
 /home/src/projects/project/src/deps.d.ts
 /home/src/projects/project/src/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/projects/project/src/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/projects/project/src/index.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js b/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js
index 988a9db1bdf10..87f3f0633a451 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js
@@ -121,7 +121,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+3     "outFile": "out.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -147,10 +152,7 @@ Program files::
 /user/username/workspace/solution/projects/project/f1.ts
 /user/username/workspace/solution/projects/project/f2.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/workspace/solution/projects/project/f1.ts
-/user/username/workspace/solution/projects/project/f2.ts
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
index 90630a3685e48..8310e61cfceea 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
@@ -39,7 +39,12 @@ Output::
 3     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "build/outFile.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -137,7 +142,12 @@ Output::
 3     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "build/outFile.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js
index a6ff0220d8f39..cd5627ef2ac0e 100644
--- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js
+++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js
@@ -10,7 +10,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -39,7 +40,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -64,7 +66,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json] Inode:: 36
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -97,7 +100,7 @@ FileWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/tsconfig.json 2
 Synchronizing program
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 FileWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src/index.ts 250 undefined Source file
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
@@ -266,6 +269,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
@@ -362,17 +366,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 152
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] Inode:: 152
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 155
@@ -412,26 +416,27 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 159
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] Inode:: 159
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 160
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 160
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
 Timeout callback:: count: 1
-2: timerToUpdateChildWatches *new*
+6: timerToUpdateChildWatches *new*
 
 Before running Timeout callback:: count: 1
-2: timerToUpdateChildWatches
+6: timerToUpdateChildWatches
 
+Host is moving to new time
 After running Timeout callback:: count: 1
 Output::
 DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules 1 undefined Failed Lookup Locations
@@ -498,10 +503,10 @@ FsWatches::
   {"inode":42}
 
 Timeout callback:: count: 1
-4: timerToInvalidateFailedLookupResolutions *new*
+8: timerToInvalidateFailedLookupResolutions *new*
 
 Before running Timeout callback:: count: 1
-4: timerToInvalidateFailedLookupResolutions
+8: timerToInvalidateFailedLookupResolutions
 
 Host is moving to new time
 After running Timeout callback:: count: 1
@@ -511,10 +516,10 @@ Scheduling update
 
 
 Timeout callback:: count: 1
-5: timerToUpdateProgram *new*
+9: timerToUpdateProgram *new*
 
 Before running Timeout callback:: count: 1
-5: timerToUpdateProgram
+9: timerToUpdateProgram
 
 Host is moving to new time
 After running Timeout callback:: count: 0
@@ -524,7 +529,7 @@ Synchronizing program
 
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
@@ -705,6 +710,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
@@ -780,14 +786,10 @@ Input::
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 Output::
 FileWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/c.d.ts 2:: WatchInfo: /home/src/projects/c/3/c-impl/c/lib/c.d.ts 250 undefined Source file
@@ -810,12 +812,6 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/
 DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
 DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
@@ -840,12 +836,6 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/
 DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
 DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
@@ -921,11 +911,11 @@ FsWatches *deleted*::
   {"inode":151}
 
 Timeout callback:: count: 2
-18: timerToUpdateProgram *new*
+20: timerToUpdateProgram *new*
 23: timerToInvalidateFailedLookupResolutions *new*
 
 Before running Timeout callback:: count: 2
-18: timerToUpdateProgram
+20: timerToUpdateProgram
 23: timerToInvalidateFailedLookupResolutions
 
 After running Timeout callback:: count: 0
@@ -935,7 +925,7 @@ Synchronizing program
 
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 FileWatcher:: Close:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 250 undefined Source file
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
@@ -1105,6 +1095,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
@@ -1147,6 +1138,10 @@ exitCode:: ExitStatus.undefined
 Change:: Build dependencies
 
 Input::
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents Inode:: 152
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 153
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents Inode:: 159
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 160
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 164
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1182,31 +1177,18 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 168
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 169
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 171
+//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 169
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
 exports.a = 'test';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 172
+//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 170
 export declare const a: string;
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 173
+//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 171
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -1227,24 +1209,11 @@ __exportStar(require("./a"), exports);
 __exportStar(require("c"), exports);
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 174
+//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 172
 export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 175
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 176
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 Timeout callback:: count: 1
 25: timerToUpdateChildWatches *new*
@@ -1289,7 +1258,7 @@ FsWatches::
 /home/src/projects/a/1/a-impl/a:
   {"inode":19}
 /home/src/projects/a/1/a-impl/a/lib: *new*
-  {"inode":170}
+  {"inode":168}
 /home/src/projects/a/1/a-impl/a/node_modules:
   {"inode":25}
 /home/src/projects/a/1/a-impl/a/package.json:
@@ -1344,7 +1313,7 @@ Synchronizing program
 
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
@@ -1473,11 +1442,11 @@ FsWatches::
 /home/src/projects:
   {"inode":3}
 /home/src/projects/a/1/a-impl/a/lib:
-  {"inode":170}
+  {"inode":168}
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new*
-  {"inode":172}
+  {"inode":170}
 /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new*
-  {"inode":174}
+  {"inode":172}
 /home/src/projects/a/1/a-impl/a/node_modules:
   {"inode":25}
 /home/src/projects/a/1/a-impl/a/package.json:
@@ -1523,6 +1492,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js
index 6deef5d471e4b..77df5648182a8 100644
--- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js
+++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js
@@ -10,7 +10,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -39,7 +40,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -64,7 +66,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json] Inode:: 36
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -97,7 +100,7 @@ FileWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/tsconfig.json 2
 Synchronizing program
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 FileWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src/index.ts 250 undefined Source file
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
@@ -262,6 +265,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
@@ -358,17 +362,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 152
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] Inode:: 152
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 155
@@ -408,17 +412,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 159
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] Inode:: 159
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 160
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 160
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -438,12 +442,12 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/
 DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
+DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
+DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 
 
 Timeout callback:: count: 1
@@ -473,7 +477,7 @@ Synchronizing program
 
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
@@ -656,6 +660,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
@@ -753,14 +758,10 @@ Input::
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 Output::
 FileWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/c.d.ts 2:: WatchInfo: /home/src/projects/c/3/c-impl/c/lib/c.d.ts 250 undefined Source file
@@ -783,12 +784,6 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/
 DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
 DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
@@ -812,12 +807,6 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/
 DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
 DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
@@ -890,12 +879,12 @@ FsWatchesRecursive::
   {"inode":4}
 
 Timeout callback:: count: 2
-23: timerToUpdateProgram *new*
-28: timerToInvalidateFailedLookupResolutions *new*
+21: timerToUpdateProgram *new*
+24: timerToInvalidateFailedLookupResolutions *new*
 
 Before running Timeout callback:: count: 2
-23: timerToUpdateProgram
-28: timerToInvalidateFailedLookupResolutions
+21: timerToUpdateProgram
+24: timerToInvalidateFailedLookupResolutions
 
 After running Timeout callback:: count: 0
 Output::
@@ -904,7 +893,7 @@ Synchronizing program
 
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 FileWatcher:: Close:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 250 undefined Source file
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
@@ -1066,7 +1055,7 @@ FsWatchesRecursive *deleted*::
   {"inode":4}
 
 Timeout callback:: count: 0
-28: timerToInvalidateFailedLookupResolutions *deleted*
+24: timerToInvalidateFailedLookupResolutions *deleted*
 
 
 Program root files: [
@@ -1074,6 +1063,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
@@ -1097,6 +1087,10 @@ exitCode:: ExitStatus.undefined
 Change:: Build dependencies
 
 Input::
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents Inode:: 152
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 153
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents Inode:: 159
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 160
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 164
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1132,31 +1126,18 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 168
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 169
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 171
+//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 169
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
 exports.a = 'test';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 172
+//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 170
 export declare const a: string;
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 173
+//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 171
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -1177,24 +1158,11 @@ __exportStar(require("./a"), exports);
 __exportStar(require("c"), exports);
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 174
+//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 172
 export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 175
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 176
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 Output::
 DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
@@ -1212,21 +1180,14 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/
 DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 
 
 Timeout callback:: count: 1
-35: timerToInvalidateFailedLookupResolutions *new*
+29: timerToInvalidateFailedLookupResolutions *new*
 
 Before running Timeout callback:: count: 1
-35: timerToInvalidateFailedLookupResolutions
+29: timerToInvalidateFailedLookupResolutions
 
-Host is moving to new time
 After running Timeout callback:: count: 1
 Output::
 Scheduling update
@@ -1234,10 +1195,10 @@ Scheduling update
 
 
 Timeout callback:: count: 1
-36: timerToUpdateProgram *new*
+30: timerToUpdateProgram *new*
 
 Before running Timeout callback:: count: 1
-36: timerToUpdateProgram
+30: timerToUpdateProgram
 
 Host is moving to new time
 After running Timeout callback:: count: 0
@@ -1247,7 +1208,7 @@ Synchronizing program
 
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
@@ -1376,9 +1337,9 @@ FsWatches::
 /home/src/projects:
   {"inode":3}
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new*
-  {"inode":172}
+  {"inode":170}
 /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new*
-  {"inode":174}
+  {"inode":172}
 /home/src/projects/a/1/a-impl/a/package.json:
   {"inode":24}
 /home/src/projects/b:
@@ -1428,6 +1389,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Windows.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Windows.js
index 51342c5ae753a..aea02e592d5fb 100644
--- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Windows.js
+++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Windows.js
@@ -10,7 +10,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -39,7 +40,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -64,7 +66,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json]
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -97,7 +100,7 @@ FileWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/tsconfig.json 2
 Synchronizing program
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 FileWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src/index.ts 250 undefined Source file
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
@@ -262,6 +265,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
@@ -358,17 +362,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo]
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo]
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js]
@@ -408,17 +412,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo]
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo]
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -438,12 +442,12 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/
 DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
+DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
+DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 
 
 Timeout callback:: count: 1
@@ -473,7 +477,7 @@ Synchronizing program
 
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
@@ -656,6 +660,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
@@ -753,14 +758,10 @@ Input::
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 Output::
 FileWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/c.d.ts 2:: WatchInfo: /home/src/projects/c/3/c-impl/c/lib/c.d.ts 250 undefined Source file
@@ -781,12 +782,6 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/
 DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
 DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
@@ -808,24 +803,18 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/
 DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
 DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
 
 
 Timeout callback:: count: 2
-23: timerToUpdateProgram *new*
-28: timerToInvalidateFailedLookupResolutions *new*
+21: timerToUpdateProgram *new*
+24: timerToInvalidateFailedLookupResolutions *new*
 
 Before running Timeout callback:: count: 2
-23: timerToUpdateProgram
-28: timerToInvalidateFailedLookupResolutions
+21: timerToUpdateProgram
+24: timerToInvalidateFailedLookupResolutions
 
 After running Timeout callback:: count: 0
 Output::
@@ -834,7 +823,7 @@ Synchronizing program
 
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 FileWatcher:: Close:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 250 undefined Source file
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
@@ -996,7 +985,7 @@ FsWatchesRecursive *deleted*::
   {}
 
 Timeout callback:: count: 0
-28: timerToInvalidateFailedLookupResolutions *deleted*
+24: timerToInvalidateFailedLookupResolutions *deleted*
 
 
 Program root files: [
@@ -1004,6 +993,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
@@ -1027,6 +1017,10 @@ exitCode:: ExitStatus.undefined
 Change:: Build dependencies
 
 Input::
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1062,19 +1056,6 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo]
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1112,19 +1093,6 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo]
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 Output::
 DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
@@ -1142,21 +1110,14 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/
 DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 
 
 Timeout callback:: count: 1
-35: timerToInvalidateFailedLookupResolutions *new*
+29: timerToInvalidateFailedLookupResolutions *new*
 
 Before running Timeout callback:: count: 1
-35: timerToInvalidateFailedLookupResolutions
+29: timerToInvalidateFailedLookupResolutions
 
-Host is moving to new time
 After running Timeout callback:: count: 1
 Output::
 Scheduling update
@@ -1164,10 +1125,10 @@ Scheduling update
 
 
 Timeout callback:: count: 1
-36: timerToUpdateProgram *new*
+30: timerToUpdateProgram *new*
 
 Before running Timeout callback:: count: 1
-36: timerToUpdateProgram
+30: timerToUpdateProgram
 
 Host is moving to new time
 After running Timeout callback:: count: 0
@@ -1177,7 +1138,7 @@ Synchronizing program
 
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
@@ -1358,6 +1319,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js
index ebe2c84ced5f2..06c0744b64b8b 100644
--- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js
+++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js
@@ -10,7 +10,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -39,7 +40,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -64,7 +66,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json] Inode:: 36
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -122,17 +125,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 148
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] Inode:: 148
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 151
@@ -172,17 +175,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 155
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] Inode:: 155
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -195,7 +198,7 @@ FileWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/tsconfig.json 2
 Synchronizing program
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 FileWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src/index.ts 250 undefined Source file
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
@@ -382,6 +385,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
@@ -495,14 +499,10 @@ Input::
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 Output::
 FileWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/c.d.ts 2:: WatchInfo: /home/src/projects/c/3/c-impl/c/lib/c.d.ts 250 undefined Source file
@@ -525,12 +525,6 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/
 DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
 DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Failed Lookup Locations
@@ -555,12 +549,6 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/
 DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
 DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Failed Lookup Locations
@@ -636,12 +624,12 @@ FsWatches *deleted*::
   {"inode":147}
 
 Timeout callback:: count: 2
-13: timerToUpdateProgram *new*
-18: timerToInvalidateFailedLookupResolutions *new*
+11: timerToUpdateProgram *new*
+14: timerToInvalidateFailedLookupResolutions *new*
 
 Before running Timeout callback:: count: 2
-13: timerToUpdateProgram
-18: timerToInvalidateFailedLookupResolutions
+11: timerToUpdateProgram
+14: timerToInvalidateFailedLookupResolutions
 
 After running Timeout callback:: count: 0
 Output::
@@ -650,7 +638,7 @@ Synchronizing program
 
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 FileWatcher:: Close:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 250 undefined Source file
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
@@ -812,7 +800,7 @@ FsWatches *deleted*::
   {"inode":12}
 
 Timeout callback:: count: 0
-18: timerToInvalidateFailedLookupResolutions *deleted*
+14: timerToInvalidateFailedLookupResolutions *deleted*
 
 
 Program root files: [
@@ -820,6 +808,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
@@ -862,6 +851,10 @@ exitCode:: ExitStatus.undefined
 Change:: Build dependencies
 
 Input::
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents Inode:: 148
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 149
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents Inode:: 155
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 156
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 164
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -897,31 +890,18 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 168
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 169
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 171
+//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 169
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
 exports.a = 'test';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 172
+//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 170
 export declare const a: string;
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 173
+//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 171
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -942,30 +922,17 @@ __exportStar(require("./a"), exports);
 __exportStar(require("c"), exports);
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 174
+//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 172
 export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 175
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 176
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 Timeout callback:: count: 1
-20: timerToUpdateChildWatches *new*
+16: timerToUpdateChildWatches *new*
 
 Before running Timeout callback:: count: 1
-20: timerToUpdateChildWatches
+16: timerToUpdateChildWatches
 
 After running Timeout callback:: count: 1
 Output::
@@ -1004,7 +971,7 @@ FsWatches::
 /home/src/projects/a/1/a-impl/a:
   {"inode":19}
 /home/src/projects/a/1/a-impl/a/lib: *new*
-  {"inode":170}
+  {"inode":168}
 /home/src/projects/a/1/a-impl/a/node_modules:
   {"inode":25}
 /home/src/projects/a/1/a-impl/a/package.json:
@@ -1033,10 +1000,10 @@ FsWatches::
   {"inode":42}
 
 Timeout callback:: count: 1
-22: timerToInvalidateFailedLookupResolutions *new*
+18: timerToInvalidateFailedLookupResolutions *new*
 
 Before running Timeout callback:: count: 1
-22: timerToInvalidateFailedLookupResolutions
+18: timerToInvalidateFailedLookupResolutions
 
 Host is moving to new time
 After running Timeout callback:: count: 1
@@ -1046,10 +1013,10 @@ Scheduling update
 
 
 Timeout callback:: count: 1
-23: timerToUpdateProgram *new*
+19: timerToUpdateProgram *new*
 
 Before running Timeout callback:: count: 1
-23: timerToUpdateProgram
+19: timerToUpdateProgram
 
 Host is moving to new time
 After running Timeout callback:: count: 0
@@ -1059,7 +1026,7 @@ Synchronizing program
 
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
@@ -1188,11 +1155,11 @@ FsWatches::
 /home/src/projects:
   {"inode":3}
 /home/src/projects/a/1/a-impl/a/lib:
-  {"inode":170}
+  {"inode":168}
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new*
-  {"inode":172}
+  {"inode":170}
 /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new*
-  {"inode":174}
+  {"inode":172}
 /home/src/projects/a/1/a-impl/a/node_modules:
   {"inode":25}
 /home/src/projects/a/1/a-impl/a/package.json:
@@ -1238,6 +1205,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js
index b471f04a17c72..c4eada03fabfb 100644
--- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js
+++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js
@@ -10,7 +10,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -39,7 +40,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -64,7 +66,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json] Inode:: 36
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -122,17 +125,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 148
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] Inode:: 148
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 151
@@ -172,17 +175,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 155
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] Inode:: 155
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -195,7 +198,7 @@ FileWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/tsconfig.json 2
 Synchronizing program
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 FileWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src/index.ts 250 undefined Source file
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
@@ -384,6 +387,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
@@ -541,14 +545,10 @@ Input::
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 Output::
 FileWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/c.d.ts 2:: WatchInfo: /home/src/projects/c/3/c-impl/c/lib/c.d.ts 250 undefined Source file
@@ -571,12 +571,6 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/
 DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
 DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
@@ -600,12 +594,6 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/
 DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
 DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
@@ -678,12 +666,12 @@ FsWatchesRecursive::
   {"inode":4}
 
 Timeout callback:: count: 2
-17: timerToUpdateProgram *new*
-22: timerToInvalidateFailedLookupResolutions *new*
+15: timerToUpdateProgram *new*
+18: timerToInvalidateFailedLookupResolutions *new*
 
 Before running Timeout callback:: count: 2
-17: timerToUpdateProgram
-22: timerToInvalidateFailedLookupResolutions
+15: timerToUpdateProgram
+18: timerToInvalidateFailedLookupResolutions
 
 After running Timeout callback:: count: 0
 Output::
@@ -692,7 +680,7 @@ Synchronizing program
 
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 FileWatcher:: Close:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 250 undefined Source file
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
@@ -854,7 +842,7 @@ FsWatchesRecursive *deleted*::
   {"inode":4}
 
 Timeout callback:: count: 0
-22: timerToInvalidateFailedLookupResolutions *deleted*
+18: timerToInvalidateFailedLookupResolutions *deleted*
 
 
 Program root files: [
@@ -862,6 +850,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
@@ -885,6 +874,10 @@ exitCode:: ExitStatus.undefined
 Change:: Build dependencies
 
 Input::
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents Inode:: 148
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 149
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents Inode:: 155
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 156
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 164
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -920,31 +913,18 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 168
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 169
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 171
+//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 169
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
 exports.a = 'test';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 172
+//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 170
 export declare const a: string;
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 173
+//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 171
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -965,24 +945,11 @@ __exportStar(require("./a"), exports);
 __exportStar(require("c"), exports);
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 174
+//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 172
 export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 175
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 176
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 Output::
 DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
@@ -1000,21 +967,14 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/
 DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 
 
 Timeout callback:: count: 1
-29: timerToInvalidateFailedLookupResolutions *new*
+23: timerToInvalidateFailedLookupResolutions *new*
 
 Before running Timeout callback:: count: 1
-29: timerToInvalidateFailedLookupResolutions
+23: timerToInvalidateFailedLookupResolutions
 
-Host is moving to new time
 After running Timeout callback:: count: 1
 Output::
 Scheduling update
@@ -1022,10 +982,10 @@ Scheduling update
 
 
 Timeout callback:: count: 1
-30: timerToUpdateProgram *new*
+24: timerToUpdateProgram *new*
 
 Before running Timeout callback:: count: 1
-30: timerToUpdateProgram
+24: timerToUpdateProgram
 
 Host is moving to new time
 After running Timeout callback:: count: 0
@@ -1035,7 +995,7 @@ Synchronizing program
 
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
@@ -1164,9 +1124,9 @@ FsWatches::
 /home/src/projects:
   {"inode":3}
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new*
-  {"inode":172}
+  {"inode":170}
 /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new*
-  {"inode":174}
+  {"inode":172}
 /home/src/projects/a/1/a-impl/a/package.json:
   {"inode":24}
 /home/src/projects/b:
@@ -1216,6 +1176,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Windows.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Windows.js
index f108753600eef..3c9461653e570 100644
--- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Windows.js
+++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Windows.js
@@ -10,7 +10,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -39,7 +40,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -64,7 +66,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json]
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -122,17 +125,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo]
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo]
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js]
@@ -172,17 +175,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo]
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo]
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -195,7 +198,7 @@ FileWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/tsconfig.json 2
 Synchronizing program
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 FileWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src/index.ts 250 undefined Source file
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
@@ -384,6 +387,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
@@ -541,14 +545,10 @@ Input::
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 Output::
 FileWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/c.d.ts 2:: WatchInfo: /home/src/projects/c/3/c-impl/c/lib/c.d.ts 250 undefined Source file
@@ -569,12 +569,6 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/
 DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
 DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Failed Lookup Locations
@@ -596,24 +590,18 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/
 DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
 DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Failed Lookup Locations
 
 
 Timeout callback:: count: 2
-17: timerToUpdateProgram *new*
-22: timerToInvalidateFailedLookupResolutions *new*
+15: timerToUpdateProgram *new*
+18: timerToInvalidateFailedLookupResolutions *new*
 
 Before running Timeout callback:: count: 2
-17: timerToUpdateProgram
-22: timerToInvalidateFailedLookupResolutions
+15: timerToUpdateProgram
+18: timerToInvalidateFailedLookupResolutions
 
 After running Timeout callback:: count: 0
 Output::
@@ -622,7 +610,7 @@ Synchronizing program
 
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 FileWatcher:: Close:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 250 undefined Source file
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
@@ -784,7 +772,7 @@ FsWatchesRecursive *deleted*::
   {}
 
 Timeout callback:: count: 0
-22: timerToInvalidateFailedLookupResolutions *deleted*
+18: timerToInvalidateFailedLookupResolutions *deleted*
 
 
 Program root files: [
@@ -792,6 +780,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
@@ -815,6 +804,10 @@ exitCode:: ExitStatus.undefined
 Change:: Build dependencies
 
 Input::
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -850,19 +843,6 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo]
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -900,19 +880,6 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo]
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 Output::
 DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
@@ -930,21 +897,14 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/
 DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
-Scheduling invalidateFailedLookup, Cancelled earlier one
-Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Failed Lookup Locations
 
 
 Timeout callback:: count: 1
-29: timerToInvalidateFailedLookupResolutions *new*
+23: timerToInvalidateFailedLookupResolutions *new*
 
 Before running Timeout callback:: count: 1
-29: timerToInvalidateFailedLookupResolutions
+23: timerToInvalidateFailedLookupResolutions
 
-Host is moving to new time
 After running Timeout callback:: count: 1
 Output::
 Scheduling update
@@ -952,10 +912,10 @@ Scheduling update
 
 
 Timeout callback:: count: 1
-30: timerToUpdateProgram *new*
+24: timerToUpdateProgram *new*
 
 Before running Timeout callback:: count: 1
-30: timerToUpdateProgram
+24: timerToUpdateProgram
 
 Host is moving to new time
 After running Timeout callback:: count: 0
@@ -965,7 +925,7 @@ Synchronizing program
 
 CreatingProgramWith::
   roots: ["/home/src/projects/b/2/b-impl/b/src/index.ts"]
-  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
+  options: {"outDir":"/home/src/projects/b/2/b-impl/b/lib","rootDir":"/home/src/projects/b/2/b-impl/b/src","watch":true,"project":"/home/src/projects/b/2/b-impl/b","extendedDiagnostics":true,"explainFiles":true,"traceResolution":true,"configFilePath":"/home/src/projects/b/2/b-impl/b/tsconfig.json"}
 ======== Resolving module 'a' from '/home/src/projects/b/2/b-impl/b/src/index.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
@@ -1146,6 +1106,7 @@ Program root files: [
 ]
 Program options: {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "watch": true,
   "project": "/home/src/projects/b/2/b-impl/b",
   "extendedDiagnostics": true,
diff --git a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-emit-builder.js b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-emit-builder.js
index 5cc53012604a4..3a6d766986106 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-emit-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-emit-builder.js
@@ -35,12 +35,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -132,12 +137,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -311,12 +321,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -408,12 +423,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -580,12 +600,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-semantic-builder.js b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-semantic-builder.js
index 289174f4c4713..c0ab852fc83ec 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-semantic-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-semantic-builder.js
@@ -35,12 +35,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -139,12 +144,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -325,12 +335,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -429,12 +444,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -608,12 +628,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:4:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+4     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 5     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-emit-builder.js b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-emit-builder.js
index 1b0b9d5cade2f..a2e2289dd8ef7 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-emit-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-emit-builder.js
@@ -41,12 +41,17 @@ Output::
 1 export const x: string = 10;
                ~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -188,12 +193,17 @@ Output::
 1 export const x: string = 10;
                ~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -329,12 +339,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-semantic-builder.js b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-semantic-builder.js
index 00ca73cd83108..614f4c173579e 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-semantic-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-semantic-builder.js
@@ -41,12 +41,17 @@ Output::
 1 export const x: string = 10;
                ~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -195,12 +200,17 @@ Output::
 1 export const x: string = 10;
                ~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -343,12 +353,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/outFile/semantic-builder-emitOnlyDts.js b/tests/baselines/reference/tscWatch/watchApi/outFile/semantic-builder-emitOnlyDts.js
index b90e4923c2e5d..e04c6439794c2 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/semantic-builder-emitOnlyDts.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/semantic-builder-emitOnlyDts.js
@@ -41,12 +41,17 @@ Output::
 1 export const x: string = 10;
                ~
 
+tsconfig.json:5:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+5     "outFile": "../outFile.js",
+      ~~~~~~~~~
+
 tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 6     "module": "amd"
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/outFile/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js b/tests/baselines/reference/tscWatch/watchApi/outFile/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
index b0a16703507c7..d7303e7ba4425 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
@@ -29,9 +29,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -98,9 +100,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/outFile/when-emitting-with-emitOnlyDtsFiles.js b/tests/baselines/reference/tscWatch/watchApi/outFile/when-emitting-with-emitOnlyDtsFiles.js
index c793ba7e4951f..4097c813ca761 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/when-emitting-with-emitOnlyDtsFiles.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/when-emitting-with-emitOnlyDtsFiles.js
@@ -62,7 +62,12 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node
 5     "module": "amd",
                 ~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+tsconfig.json:6:5 - error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+6     "outFile": "outFile.js"
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
index 1edcadc5543e6..dd47731c44d5d 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
@@ -33,18 +33,24 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+3     "outDir": "dist"
+      ~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/user/username/projects/myproject/dist/file2.js] Inode:: 116
+//// [/user/username/projects/myproject/dist/src/file2.js] Inode:: 117
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = void 0;
 exports.x = 10;
 
 
-//// [/user/username/projects/myproject/dist/file1.js] Inode:: 117
+//// [/user/username/projects/myproject/dist/src/file1.js] Inode:: 118
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 
@@ -63,6 +69,8 @@ FsWatches::
   {"inode":4}
 /user/username/projects/myproject/dist: *new*
   {"inode":115}
+/user/username/projects/myproject/dist/src: *new*
+  {"inode":116}
 /user/username/projects/myproject/src: *new*
   {"inode":5}
 /user/username/projects/myproject/src/file1.ts: *new*
@@ -87,10 +95,7 @@ Program files::
 /user/username/projects/myproject/src/file2.ts
 /user/username/projects/myproject/src/file1.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/src/file2.ts
-/user/username/projects/myproject/src/file1.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -109,7 +114,7 @@ exitCode:: ExitStatus.undefined
 Change:: rename the file
 
 Input::
-//// [/user/username/projects/myproject/src/renamed.ts] Inode:: 118
+//// [/user/username/projects/myproject/src/renamed.ts] Inode:: 119
 export const x = 10;
 
 //// [/user/username/projects/myproject/src/file2.ts] deleted
@@ -133,6 +138,8 @@ FsWatches::
   {"inode":4}
 /user/username/projects/myproject/dist:
   {"inode":115}
+/user/username/projects/myproject/dist/src:
+  {"inode":116}
 /user/username/projects/myproject/src:
   {"inode":5}
 /user/username/projects/myproject/src/file1.ts:
@@ -162,11 +169,17 @@ Output::
   The file is in the program because:
     Matched by default include pattern '**/*'
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:3:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+3     "outDir": "dist"
+      ~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
-//// [/user/username/projects/myproject/dist/file1.js] file written with same contents Inode:: 117
+//// [/user/username/projects/myproject/dist/src/file1.js] file written with same contents Inode:: 118
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
@@ -187,6 +200,8 @@ FsWatches::
   {"inode":4}
 /user/username/projects/myproject/dist:
   {"inode":115}
+/user/username/projects/myproject/dist/src:
+  {"inode":116}
 /user/username/projects/myproject/src:
   {"inode":5}
 /user/username/projects/myproject/src/file1.ts:
@@ -209,8 +224,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /user/username/projects/myproject/src/file1.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/src/file1.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/src/file1.ts (computed .d.ts)
@@ -240,16 +254,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-src/file1.ts:1:19 - error TS2307: Cannot find module './file2' or its corresponding type declarations.
+tsconfig.json:3:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
 
-1 import { x } from "./file2";
-                    ~~~~~~~~~
+3     "outDir": "dist"
+      ~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/user/username/projects/myproject/dist/renamed.js] Inode:: 119
+//// [/user/username/projects/myproject/dist/src/renamed.js] Inode:: 120
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = void 0;
@@ -274,12 +289,14 @@ FsWatches::
   {"inode":4}
 /user/username/projects/myproject/dist:
   {"inode":115}
+/user/username/projects/myproject/dist/src:
+  {"inode":116}
 /user/username/projects/myproject/src:
   {"inode":5}
 /user/username/projects/myproject/src/file1.ts:
   {"inode":6}
 /user/username/projects/myproject/src/renamed.ts: *new*
-  {"inode":118}
+  {"inode":119}
 /user/username/projects/myproject/tsconfig.json:
   {"inode":8}
 
@@ -308,9 +325,7 @@ Program files::
 /user/username/projects/myproject/src/file1.ts
 /user/username/projects/myproject/src/renamed.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/src/file1.ts
-/user/username/projects/myproject/src/renamed.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/src/renamed.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
index cf3ec378910ca..9df674f0435f9 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
@@ -34,16 +34,22 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+3     "outDir": "dist",
+      ~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/user/username/projects/myproject/dist/file1.js] Inode:: 118
+//// [/user/username/projects/myproject/dist/src/file1.js] Inode:: 119
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 
 
-//// [/user/username/projects/myproject/dist/file1.d.ts] Inode:: 119
+//// [/user/username/projects/myproject/dist/src/file1.d.ts] Inode:: 120
 export {};
 
 
@@ -71,6 +77,8 @@ FsWatches::
   {"inode":4}
 /user/username/projects/myproject/dist: *new*
   {"inode":117}
+/user/username/projects/myproject/dist/src: *new*
+  {"inode":118}
 /user/username/projects/myproject/node_modules: *new*
   {"inode":7}
 /user/username/projects/myproject/node_modules/file2: *new*
@@ -99,10 +107,7 @@ Program files::
 /user/username/projects/myproject/node_modules/file2/index.d.ts
 /user/username/projects/myproject/src/file1.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/node_modules/file2/index.d.ts
-/user/username/projects/myproject/src/file1.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -121,7 +126,7 @@ exitCode:: ExitStatus.undefined
 Change:: Add new file, should schedule and run timeout to update directory watcher
 
 Input::
-//// [/user/username/projects/myproject/src/file3.ts] Inode:: 120
+//// [/user/username/projects/myproject/src/file3.ts] Inode:: 121
 export const y = 10;
 
 
@@ -155,18 +160,24 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - error TS5011: The common source directory of 'tsconfig.json' is './src'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.
+  Visit https://aka.ms/ts6 for migration information.
+
+3     "outDir": "dist",
+      ~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/user/username/projects/myproject/dist/file3.js] Inode:: 121
+//// [/user/username/projects/myproject/dist/src/file3.js] Inode:: 122
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.y = void 0;
 exports.y = 10;
 
 
-//// [/user/username/projects/myproject/dist/file3.d.ts] Inode:: 122
+//// [/user/username/projects/myproject/dist/src/file3.d.ts] Inode:: 123
 export declare const y = 10;
 
 
@@ -194,6 +205,8 @@ FsWatches::
   {"inode":4}
 /user/username/projects/myproject/dist:
   {"inode":117}
+/user/username/projects/myproject/dist/src:
+  {"inode":118}
 /user/username/projects/myproject/node_modules:
   {"inode":7}
 /user/username/projects/myproject/node_modules/file2:
@@ -205,7 +218,7 @@ FsWatches::
 /user/username/projects/myproject/src/file1.ts:
   {"inode":6}
 /user/username/projects/myproject/src/file3.ts: *new*
-  {"inode":120}
+  {"inode":121}
 /user/username/projects/myproject/tsconfig.json:
   {"inode":10}
 
@@ -230,8 +243,7 @@ Program files::
 /user/username/projects/myproject/src/file1.ts
 /user/username/projects/myproject/src/file3.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/src/file3.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/src/file3.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js
index 9b43bfb4fd4a3..1de7900c526be 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js
@@ -285,6 +285,20 @@ Info seq  [hh:mm:ss:mss] event:
             "category": "error",
             "fileName": "/Users/someuser/work/applications/frontend/tsconfig.json"
           },
+          {
+            "start": {
+              "line": 17,
+              "offset": 5
+            },
+            "end": {
+              "line": 17,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './src/app'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/Users/someuser/work/applications/frontend/tsconfig.json"
+          },
           {
             "start": {
               "line": 22,
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js
index 00cfba80758c6..ff3e9afad346e 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js
@@ -285,6 +285,20 @@ Info seq  [hh:mm:ss:mss] event:
             "category": "error",
             "fileName": "/Users/someuser/work/applications/frontend/tsconfig.json"
           },
+          {
+            "start": {
+              "line": 17,
+              "offset": 5
+            },
+            "end": {
+              "line": 17,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './src/app'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/Users/someuser/work/applications/frontend/tsconfig.json"
+          },
           {
             "start": {
               "line": 22,
diff --git a/tests/baselines/reference/tsserver/compileOnSave/CompileOnSaveAffectedFileListRequest-when-projectFile-is-not-specified.js b/tests/baselines/reference/tsserver/compileOnSave/CompileOnSaveAffectedFileListRequest-when-projectFile-is-not-specified.js
index 8562406544be1..17b0c9edbf954 100644
--- a/tests/baselines/reference/tsserver/compileOnSave/CompileOnSaveAffectedFileListRequest-when-projectFile-is-not-specified.js
+++ b/tests/baselines/reference/tsserver/compileOnSave/CompileOnSaveAffectedFileListRequest-when-projectFile-is-not-specified.js
@@ -168,7 +168,59 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/app1/app.ts",
         "configFile": "/user/username/projects/myproject/app1/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "text": "File '/user/username/projects/myproject/core/core.ts' is not under 'rootDir' '/user/username/projects/myproject/app1'. 'rootDir' is expected to contain all source files.\n  The file is in the program because:\n    Part of 'files' list in tsconfig.json",
+            "code": 6059,
+            "category": "error",
+            "relatedInformation": [
+              {
+                "span": {
+                  "start": {
+                    "line": 4,
+                    "offset": 5
+                  },
+                  "end": {
+                    "line": 4,
+                    "offset": 22
+                  },
+                  "file": "/user/username/projects/myproject/app1/tsconfig.json"
+                },
+                "message": "File is matched by 'files' list specified here.",
+                "category": "message",
+                "code": 1410
+              }
+            ]
+          },
+          {
+            "start": {
+              "line": 7,
+              "offset": 5
+            },
+            "end": {
+              "line": 7,
+              "offset": 14
+            },
+            "text": "The common source directory of 'tsconfig.json' is '..'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/app1/tsconfig.json"
+          },
+          {
+            "start": {
+              "line": 7,
+              "offset": 5
+            },
+            "end": {
+              "line": 7,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/app1/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/app1/tsconfig.json' (Configured)
@@ -344,7 +396,59 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/app2/app.ts",
         "configFile": "/user/username/projects/myproject/app2/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "text": "File '/user/username/projects/myproject/core/core.ts' is not under 'rootDir' '/user/username/projects/myproject/app2'. 'rootDir' is expected to contain all source files.\n  The file is in the program because:\n    Part of 'files' list in tsconfig.json",
+            "code": 6059,
+            "category": "error",
+            "relatedInformation": [
+              {
+                "span": {
+                  "start": {
+                    "line": 4,
+                    "offset": 5
+                  },
+                  "end": {
+                    "line": 4,
+                    "offset": 22
+                  },
+                  "file": "/user/username/projects/myproject/app2/tsconfig.json"
+                },
+                "message": "File is matched by 'files' list specified here.",
+                "category": "message",
+                "code": 1410
+              }
+            ]
+          },
+          {
+            "start": {
+              "line": 7,
+              "offset": 5
+            },
+            "end": {
+              "line": 7,
+              "offset": 14
+            },
+            "text": "The common source directory of 'tsconfig.json' is '..'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/app2/tsconfig.json"
+          },
+          {
+            "start": {
+              "line": 7,
+              "offset": 5
+            },
+            "end": {
+              "line": 7,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/app2/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/app1/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/compileOnSave/CompileOnSaveAffectedFileListRequest-when-projectFile-is-specified.js b/tests/baselines/reference/tsserver/compileOnSave/CompileOnSaveAffectedFileListRequest-when-projectFile-is-specified.js
index b34f833cabc78..78be97bc1e6f4 100644
--- a/tests/baselines/reference/tsserver/compileOnSave/CompileOnSaveAffectedFileListRequest-when-projectFile-is-specified.js
+++ b/tests/baselines/reference/tsserver/compileOnSave/CompileOnSaveAffectedFileListRequest-when-projectFile-is-specified.js
@@ -168,7 +168,59 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/app1/app.ts",
         "configFile": "/user/username/projects/myproject/app1/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "text": "File '/user/username/projects/myproject/core/core.ts' is not under 'rootDir' '/user/username/projects/myproject/app1'. 'rootDir' is expected to contain all source files.\n  The file is in the program because:\n    Part of 'files' list in tsconfig.json",
+            "code": 6059,
+            "category": "error",
+            "relatedInformation": [
+              {
+                "span": {
+                  "start": {
+                    "line": 4,
+                    "offset": 5
+                  },
+                  "end": {
+                    "line": 4,
+                    "offset": 22
+                  },
+                  "file": "/user/username/projects/myproject/app1/tsconfig.json"
+                },
+                "message": "File is matched by 'files' list specified here.",
+                "category": "message",
+                "code": 1410
+              }
+            ]
+          },
+          {
+            "start": {
+              "line": 7,
+              "offset": 5
+            },
+            "end": {
+              "line": 7,
+              "offset": 14
+            },
+            "text": "The common source directory of 'tsconfig.json' is '..'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/app1/tsconfig.json"
+          },
+          {
+            "start": {
+              "line": 7,
+              "offset": 5
+            },
+            "end": {
+              "line": 7,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/app1/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/app1/tsconfig.json' (Configured)
@@ -344,7 +396,59 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/app2/app.ts",
         "configFile": "/user/username/projects/myproject/app2/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "text": "File '/user/username/projects/myproject/core/core.ts' is not under 'rootDir' '/user/username/projects/myproject/app2'. 'rootDir' is expected to contain all source files.\n  The file is in the program because:\n    Part of 'files' list in tsconfig.json",
+            "code": 6059,
+            "category": "error",
+            "relatedInformation": [
+              {
+                "span": {
+                  "start": {
+                    "line": 4,
+                    "offset": 5
+                  },
+                  "end": {
+                    "line": 4,
+                    "offset": 22
+                  },
+                  "file": "/user/username/projects/myproject/app2/tsconfig.json"
+                },
+                "message": "File is matched by 'files' list specified here.",
+                "category": "message",
+                "code": 1410
+              }
+            ]
+          },
+          {
+            "start": {
+              "line": 7,
+              "offset": 5
+            },
+            "end": {
+              "line": 7,
+              "offset": 14
+            },
+            "text": "The common source directory of 'tsconfig.json' is '..'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/app2/tsconfig.json"
+          },
+          {
+            "start": {
+              "line": 7,
+              "offset": 5
+            },
+            "end": {
+              "line": 7,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/app2/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/app1/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/compileOnSave/compileOnSaveAffectedFileList-projectUsesOutFile-should-be-true-if-outFile-is-set.js b/tests/baselines/reference/tsserver/compileOnSave/compileOnSaveAffectedFileList-projectUsesOutFile-should-be-true-if-outFile-is-set.js
index 4026d53599894..75e3f03e1197d 100644
--- a/tests/baselines/reference/tsserver/compileOnSave/compileOnSaveAffectedFileList-projectUsesOutFile-should-be-true-if-outFile-is-set.js
+++ b/tests/baselines/reference/tsserver/compileOnSave/compileOnSaveAffectedFileList-projectUsesOutFile-should-be-true-if-outFile-is-set.js
@@ -151,7 +151,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspace/projects/project/a.ts",
         "configFile": "/home/src/workspace/projects/project/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/workspace/projects/project/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspace/projects/project/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-outFile.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-outFile.js
index fd1ed7a41b7a9..a54808e722601 100644
--- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-outFile.js
+++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-outFile.js
@@ -169,6 +169,20 @@ Info seq  [hh:mm:ss:mss] event:
             "code": 5107,
             "category": "error",
             "fileName": "/home/src/workspace/projects/b/tsconfig.json"
+          },
+          {
+            "start": {
+              "line": 5,
+              "offset": 29
+            },
+            "end": {
+              "line": 5,
+              "offset": 38
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/workspace/projects/b/tsconfig.json"
           }
         ]
       }
diff --git a/tests/baselines/reference/tsserver/configuredProjects/can-update-configured-project-when-set-of-root-files-was-not-changed.js b/tests/baselines/reference/tsserver/configuredProjects/can-update-configured-project-when-set-of-root-files-was-not-changed.js
index 109f9fc1f0663..54ce31ae73413 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/can-update-configured-project-when-set-of-root-files-was-not-changed.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/can-update-configured-project-when-set-of-root-files-was-not-changed.js
@@ -280,7 +280,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/project/tsconfig.json",
         "configFile": "/user/username/projects/project/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/project/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/configuredProjects/should-not-close-configured-project-after-closing-last-open-file,-but-should-be-closed-on-next-file-open-if-its-not-the-file-from-same-project.js b/tests/baselines/reference/tsserver/configuredProjects/should-not-close-configured-project-after-closing-last-open-file,-but-should-be-closed-on-next-file-open-if-its-not-the-file-from-same-project.js
index 90e88f46d0e88..c2b3e5fd12c18 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/should-not-close-configured-project-after-closing-last-open-file,-but-should-be-closed-on-next-file-open-if-its-not-the-file-from-same-project.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/should-not-close-configured-project-after-closing-last-open-file,-but-should-be-closed-on-next-file-open-if-its-not-the-file-from-same-project.js
@@ -271,12 +271,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Li
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (1)
@@ -291,12 +285,6 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 TI:: Creating typing installer
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/tslibs/TS/Lib/tsconfig.json: *new*
@@ -404,10 +392,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject1*",
@@ -493,16 +477,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/tslibs/TS/Lib/tsconfig.json:
diff --git a/tests/baselines/reference/tsserver/declarationFileMaps/findAllReferencesFull-definition-is-in-mapped-file.js b/tests/baselines/reference/tsserver/declarationFileMaps/findAllReferencesFull-definition-is-in-mapped-file.js
index da98d662076dc..d6230e2825d9b 100644
--- a/tests/baselines/reference/tsserver/declarationFileMaps/findAllReferencesFull-definition-is-in-mapped-file.js
+++ b/tests/baselines/reference/tsserver/declarationFileMaps/findAllReferencesFull-definition-is-in-mapped-file.js
@@ -176,7 +176,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/projects/project/a/a.ts",
         "configFile": "/home/src/projects/project/a/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/projects/project/a/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/home/src/projects/project/a/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/documentRegistry/works-when-reusing-orphan-script-info-with-different-scriptKind.js b/tests/baselines/reference/tsserver/documentRegistry/works-when-reusing-orphan-script-info-with-different-scriptKind.js
index feea8aef885f0..209db89b26ae0 100644
--- a/tests/baselines/reference/tsserver/documentRegistry/works-when-reusing-orphan-script-info-with-different-scriptKind.js
+++ b/tests/baselines/reference/tsserver/documentRegistry/works-when-reusing-orphan-script-info-with-different-scriptKind.js
@@ -34,16 +34,6 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: ^/inmemory/model/6 Pro
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /users/user/projects/san
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/san/^ 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/san/^ 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/user/projects 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/user/projects 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/san/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/san/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/san 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/san 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/san/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/san/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -82,18 +72,8 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/users/user/projects: *new*
-  {"pollingInterval":500}
-/users/user/projects/node_modules: *new*
-  {"pollingInterval":500}
 /users/user/projects/node_modules/@types: *new*
   {"pollingInterval":500}
-/users/user/projects/san: *new*
-  {"pollingInterval":500}
-/users/user/projects/san/^: *new*
-  {"pollingInterval":500}
-/users/user/projects/san/node_modules: *new*
-  {"pollingInterval":500}
 /users/user/projects/san/node_modules/@types: *new*
   {"pollingInterval":500}
 
diff --git a/tests/baselines/reference/tsserver/dynamicFiles/chat-block-with-imports.js b/tests/baselines/reference/tsserver/dynamicFiles/chat-block-with-imports.js
new file mode 100644
index 0000000000000..b34d41684e7d1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/dynamicFiles/chat-block-with-imports.js
@@ -0,0 +1,366 @@
+Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
+Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
+Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
+Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
+Before request
+//// [/user/username/projects/myproject/a.ts]
+
+
+//// [/user/username/projects/myproject/tsconfig.json]
+{}
+
+//// [/home/src/tslibs/TS/Lib/lib.d.ts]
+interface Boolean {}
+interface Function {}
+interface CallableFunction {}
+interface NewableFunction {}
+interface IArguments {}
+interface Number { toExponential: any; }
+interface Object {}
+interface RegExp {}
+interface String { charAt: any; }
+interface Array<T> { length: number; [n: number]: T; }
+interface ReadonlyArray<T> {}
+declare const console: { log(msg: any): void; };
+
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "open",
+      "arguments": {
+        "file": "/user/username/projects/myproject/a.ts",
+        "projectRootPath": "/user/username/projects/myproject"
+      },
+      "seq": 1,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/a.ts ProjectRootPath: /user/username/projects/myproject:: Result: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig.json, currentDirectory: /user/username/projects/myproject
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Config file
+Info seq  [hh:mm:ss:mss] Config: /user/username/projects/myproject/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/tsconfig.json"
+ }
+}
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "projectLoadingStart",
+      "body": {
+        "projectName": "/user/username/projects/myproject/tsconfig.json",
+        "reason": "Creating possible configured project for /user/username/projects/myproject/a.ts to open"
+      }
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (2)
+	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 "interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };"
+	/user/username/projects/myproject/a.ts SVC-1-0 ""
+
+
+	../../../../home/src/tslibs/TS/Lib/lib.d.ts
+	  Default library for target 'es5'
+	a.ts
+	  Matched by default include pattern '**/*'
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "projectLoadingFinish",
+      "body": {
+        "projectName": "/user/username/projects/myproject/tsconfig.json"
+      }
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "telemetry",
+      "body": {
+        "telemetryEventName": "projectInfo",
+        "payload": {
+          "projectId": "4a33d78ee40d836c4f4e64c59aed976628aea0013be9585c5ff171dfc41baf98",
+          "fileStats": {
+            "js": 0,
+            "jsSize": 0,
+            "jsx": 0,
+            "jsxSize": 0,
+            "ts": 1,
+            "tsSize": 0,
+            "tsx": 0,
+            "tsxSize": 0,
+            "dts": 1,
+            "dtsSize": 374,
+            "deferred": 0,
+            "deferredSize": 0
+          },
+          "compilerOptions": {},
+          "typeAcquisition": {
+            "enable": false,
+            "include": false,
+            "exclude": false
+          },
+          "extends": false,
+          "files": false,
+          "include": false,
+          "exclude": false,
+          "compileOnSave": false,
+          "configFileName": "tsconfig.json",
+          "projectType": "configured",
+          "languageServiceEnabled": true,
+          "version": "FakeVersion"
+        }
+      }
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "configFileDiag",
+      "body": {
+        "triggerFile": "/user/username/projects/myproject/a.ts",
+        "configFile": "/user/username/projects/myproject/tsconfig.json",
+        "diagnostics": []
+      }
+    }
+Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (2)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: /user/username/projects/myproject
+Info seq  [hh:mm:ss:mss] 		Projects: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "open",
+      "request_seq": 1,
+      "success": true,
+      "performanceData": {
+        "updateGraphDurationMs": *
+      }
+    }
+After request
+
+PolledWatches::
+/user/username/projects/myproject/node_modules/@types: *new*
+  {"pollingInterval":500}
+/user/username/projects/node_modules/@types: *new*
+  {"pollingInterval":500}
+
+FsWatches::
+/home/src/tslibs/TS/Lib/lib.d.ts: *new*
+  {}
+/user/username/projects/myproject/tsconfig.json: *new*
+  {}
+
+FsWatchesRecursive::
+/user/username/projects/myproject: *new*
+  {}
+
+Projects::
+/user/username/projects/myproject/tsconfig.json (Configured) *new*
+    projectStateVersion: 1
+    projectProgramVersion: 1
+    autoImportProviderHost: false
+
+ScriptInfos::
+/home/src/tslibs/TS/Lib/lib.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/a.ts (Open) *new*
+    version: SVC-1-0
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json *default*
+
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "open",
+      "arguments": {
+        "file": "^/chat-editing-snapshot-text-model/ts-nul-authority/c/temp/codeRepo/src/services/user.service.ts",
+        "fileContent": "",
+        "scriptKindName": "TS"
+      },
+      "seq": 2,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: ^/chat-editing-snapshot-text-model/ts-nul-authority/c/temp/codeRepo/src/services/user.service.ts ProjectRootPath: undefined:: Result: undefined
+Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/Vscode/Projects/bin
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
+Info seq  [hh:mm:ss:mss] 	Files (2)
+	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 "interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };"
+	^/chat-editing-snapshot-text-model/ts-nul-authority/c/temp/codeRepo/src/services/user.service.ts SVC-1-0 ""
+
+
+	../../../tslibs/TS/Lib/lib.d.ts
+	  Default library for target 'es5'
+	^/chat-editing-snapshot-text-model/ts-nul-authority/c/temp/codeRepo/src/services/user.service.ts
+	  Root file specified for compilation
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (2)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
+Info seq  [hh:mm:ss:mss] 	Files (2)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: /user/username/projects/myproject
+Info seq  [hh:mm:ss:mss] 		Projects: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] 	FileName: ^/chat-editing-snapshot-text-model/ts-nul-authority/c/temp/codeRepo/src/services/user.service.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: /dev/null/inferredProject1*
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "open",
+      "request_seq": 2,
+      "success": true,
+      "performanceData": {
+        "updateGraphDurationMs": *
+      }
+    }
+After request
+
+Projects::
+/dev/null/inferredProject1* (Inferred) *new*
+    projectStateVersion: 1
+    projectProgramVersion: 1
+    autoImportProviderHost: false
+/user/username/projects/myproject/tsconfig.json (Configured)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+    autoImportProviderHost: false
+
+ScriptInfos::
+/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+    version: Text-1
+    containingProjects: 2 *changed*
+        /user/username/projects/myproject/tsconfig.json
+        /dev/null/inferredProject1* *new*
+/user/username/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json *default*
+^/chat-editing-snapshot-text-model/ts-nul-authority/c/temp/codeRepo/src/services/user.service.ts (Dynamic) (Open) *new*
+    version: SVC-1-0
+    containingProjects: 1
+        /dev/null/inferredProject1* *default*
+
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "open",
+      "arguments": {
+        "file": "^/vscode-chat-code-block/dnnjb2rllwnoyxqtc2vzc2lvbjovl2xvy2fsl1peag1oelv6tkdvde9uvtvnuzawtxpbnuxxstrare10tvrobfpuvtbpvgmytudwaq/response_6b1244f1-9aca-4b8b-8f65-0ff7ed4e6b4e/2#{\"references\":[]}",
+        "projectRootPath": "/",
+        "fileContent": "import { UserService from './src/services/user.service';}",
+        "scriptKindName": "TS"
+      },
+      "seq": 3,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: ^/vscode-chat-code-block/dnnjb2rllwnoyxqtc2vzc2lvbjovl2xvy2fsl1peag1oelv6tkdvde9uvtvnuzawtxpbnuxxstrare10tvrobfpuvtbpvgmytudwaq/response_6b1244f1-9aca-4b8b-8f65-0ff7ed4e6b4e/2#{"references":[]} ProjectRootPath: /:: Result: undefined
+Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject2*, currentDirectory: /
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject2*
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
+Info seq  [hh:mm:ss:mss] 	Files (2)
+	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 "interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };"
+	^/vscode-chat-code-block/dnnjb2rllwnoyxqtc2vzc2lvbjovl2xvy2fsl1peag1oelv6tkdvde9uvtvnuzawtxpbnuxxstrare10tvrobfpuvtbpvgmytudwaq/response_6b1244f1-9aca-4b8b-8f65-0ff7ed4e6b4e/2#{"references":[]} SVC-1-0 "import { UserService from './src/services/user.service';}"
+
+
+	home/src/tslibs/TS/Lib/lib.d.ts
+	  Default library for target 'es5'
+	^/vscode-chat-code-block/dnnjb2rllwnoyxqtc2vzc2lvbjovl2xvy2fsl1peag1oelv6tkdvde9uvtvnuzawtxpbnuxxstrare10tvrobfpuvtbpvgmytudwaq/response_6b1244f1-9aca-4b8b-8f65-0ff7ed4e6b4e/2#{"references":[]}
+	  Root file specified for compilation
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (2)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
+Info seq  [hh:mm:ss:mss] 	Files (2)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
+Info seq  [hh:mm:ss:mss] 	Files (2)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: /user/username/projects/myproject
+Info seq  [hh:mm:ss:mss] 		Projects: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] 	FileName: ^/chat-editing-snapshot-text-model/ts-nul-authority/c/temp/codeRepo/src/services/user.service.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: /dev/null/inferredProject1*
+Info seq  [hh:mm:ss:mss] 	FileName: ^/vscode-chat-code-block/dnnjb2rllwnoyxqtc2vzc2lvbjovl2xvy2fsl1peag1oelv6tkdvde9uvtvnuzawtxpbnuxxstrare10tvrobfpuvtbpvgmytudwaq/response_6b1244f1-9aca-4b8b-8f65-0ff7ed4e6b4e/2#{"references":[]} ProjectRootPath: /
+Info seq  [hh:mm:ss:mss] 		Projects: /dev/null/inferredProject2*
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "open",
+      "request_seq": 3,
+      "success": true,
+      "performanceData": {
+        "updateGraphDurationMs": *
+      }
+    }
+After request
+
+Projects::
+/dev/null/inferredProject1* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+    autoImportProviderHost: false
+/dev/null/inferredProject2* (Inferred) *new*
+    projectStateVersion: 1
+    projectProgramVersion: 1
+    autoImportProviderHost: false
+/user/username/projects/myproject/tsconfig.json (Configured)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+    autoImportProviderHost: false
+
+ScriptInfos::
+/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+    version: Text-1
+    containingProjects: 3 *changed*
+        /user/username/projects/myproject/tsconfig.json
+        /dev/null/inferredProject1*
+        /dev/null/inferredProject2* *new*
+/user/username/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json *default*
+^/chat-editing-snapshot-text-model/ts-nul-authority/c/temp/codeRepo/src/services/user.service.ts (Dynamic) (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        /dev/null/inferredProject1* *default*
+^/vscode-chat-code-block/dnnjb2rllwnoyxqtc2vzc2lvbjovl2xvy2fsl1peag1oelv6tkdvde9uvtvnuzawtxpbnuxxstrare10tvrobfpuvtbpvgmytudwaq/response_6b1244f1-9aca-4b8b-8f65-0ff7ed4e6b4e/2#{"references":[]} (Dynamic) (Open) *new*
+    version: SVC-1-0
+    containingProjects: 1
+        /dev/null/inferredProject2* *default*
diff --git a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-fails-when-useInferredProjectPerProjectRoot-is-false.js b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-fails-when-useInferredProjectPerProjectRoot-is-false.js
index 7b1e7fcbda43d..22dc86672d8a9 100644
--- a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-fails-when-useInferredProjectPerProjectRoot-is-false.js
+++ b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-fails-when-useInferredProjectPerProjectRoot-is-false.js
@@ -54,12 +54,6 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: ^walkThroughSnippet:/U
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/Vscode/Projects/bin
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -75,14 +69,6 @@ Info seq  [hh:mm:ss:mss] 	Files (2)
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 TI:: Creating typing installer
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
-
 FsWatches::
 /home/src/tslibs/TS/Lib/lib.d.ts: *new*
   {}
@@ -170,12 +156,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: ^walkThroughSnippet:/Users/UserName 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: ^walkThroughSnippet:/Users/UserName 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject1*",
@@ -242,24 +222,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/^walkThroughSnippet:/Users/UserName: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-
 Projects::
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-with-useInferredProjectPerProjectRoot.js b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-with-useInferredProjectPerProjectRoot.js
index 72b3ea1ec392e..532b37cc7857c 100644
--- a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-with-useInferredProjectPerProjectRoot.js
+++ b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-with-useInferredProjectPerProjectRoot.js
@@ -277,12 +277,6 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: ^walkThroughSnippet:/Users/UserName/projects/someProject/out/someFile#2.js ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject2*, currentDirectory: /home/src/Vscode/Projects/bin
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject2*
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject2* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject2* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject2* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject2* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject2* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject2* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -344,12 +338,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: ^walkThroughSnippet:/Users/UserName 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: ^walkThroughSnippet:/Users/UserName 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject2*",
@@ -422,32 +410,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/^walkThroughSnippet:/Users/UserName:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
-/user/username/projects/myproject/bower_components:
-  {"pollingInterval":500}
-/user/username/projects/myproject/node_modules:
-  {"pollingInterval":500}
-/user/username/projects/myproject/node_modules/@types:
-  {"pollingInterval":500}
-/user/username/projects/node_modules/@types:
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-
 Projects::
 /dev/null/inferredProject1* (Inferred)
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-reference-paths-without-external-project.js b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-reference-paths-without-external-project.js
index 9649da0b7c326..88f424048d3df 100644
--- a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-reference-paths-without-external-project.js
+++ b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-reference-paths-without-external-project.js
@@ -34,12 +34,6 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferred
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/typings/@epic/Core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/typings/@epic/Shell.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -56,16 +50,10 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 TI:: Creating typing installer
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
 /home/src/Vscode/Projects/bin/typings/@epic/Core.d.ts: *new*
   {"pollingInterval":500}
 /home/src/Vscode/Projects/bin/typings/@epic/Shell.d.ts: *new*
   {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 
 FsWatches::
 /home/src/tslibs/TS/Lib/lib.d.ts: *new*
@@ -154,12 +142,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: ^walkThroughSnippet:/Users/UserName 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: ^walkThroughSnippet:/Users/UserName 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject1*",
@@ -226,28 +208,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/^walkThroughSnippet:/Users/UserName: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/typings/@epic/Core.d.ts:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/typings/@epic/Shell.d.ts:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-
 Projects::
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-without-external-project.js b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-without-external-project.js
index bfe565400133c..212ae5eca57d9 100644
--- a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-without-external-project.js
+++ b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-without-external-project.js
@@ -55,12 +55,6 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: ^walkThroughSnippet:/U
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/Vscode/Projects/bin
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -76,14 +70,6 @@ Info seq  [hh:mm:ss:mss] 	Files (2)
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 TI:: Creating typing installer
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
-
 FsWatches::
 /home/src/tslibs/TS/Lib/lib.d.ts: *new*
   {}
@@ -171,12 +157,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: ^walkThroughSnippet:/Users/UserName 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: ^walkThroughSnippet:/Users/UserName 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject1*",
@@ -243,24 +223,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/^walkThroughSnippet:/Users/UserName: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-
 Projects::
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/dynamicFiles/untitled.js b/tests/baselines/reference/tsserver/dynamicFiles/untitled.js
index b130fd9a10ee1..a89a607206d43 100644
--- a/tests/baselines/reference/tsserver/dynamicFiles/untitled.js
+++ b/tests/baselines/reference/tsserver/dynamicFiles/untitled.js
@@ -34,12 +34,6 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferred
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/typings/@epic/Core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/typings/@epic/Shell.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -74,16 +68,10 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
 /home/src/Vscode/Projects/typings/@epic/Core.d.ts: *new*
   {"pollingInterval":500}
 /home/src/Vscode/Projects/typings/@epic/Shell.d.ts: *new*
   {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 
 FsWatches::
 /home/src/tslibs/TS/Lib/lib.d.ts: *new*
diff --git a/tests/baselines/reference/tsserver/dynamicFiles/walkThroughSnippet.js b/tests/baselines/reference/tsserver/dynamicFiles/walkThroughSnippet.js
index 764d2ab441b50..5c0343ea82bb6 100644
--- a/tests/baselines/reference/tsserver/dynamicFiles/walkThroughSnippet.js
+++ b/tests/baselines/reference/tsserver/dynamicFiles/walkThroughSnippet.js
@@ -34,12 +34,6 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferred
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/walkThroughSnippet:/usr/share/code/resources/app/out/vs/typings/@epic/Core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/walkThroughSnippet:/usr/share/code/resources/app/out/vs/typings/@epic/Shell.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -74,16 +68,10 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
 /home/src/Vscode/Projects/bin/walkThroughSnippet:/usr/share/code/resources/app/out/vs/typings/@epic/Core.d.ts: *new*
   {"pollingInterval":500}
 /home/src/Vscode/Projects/bin/walkThroughSnippet:/usr/share/code/resources/app/out/vs/typings/@epic/Shell.d.ts: *new*
   {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 
 FsWatches::
 /home/src/tslibs/TS/Lib/lib.d.ts: *new*
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
index e0d888ed9e83f..170f68fdf88ca 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
@@ -155,6 +155,20 @@ Info seq  [hh:mm:ss:mss] event:
             "code": 5107,
             "category": "error",
             "fileName": "/users/username/projects/project/tsconfig.json"
+          },
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/users/username/projects/project/tsconfig.json"
           }
         ],
         "triggerFile": "/users/username/projects/project/file1Consumer1.ts"
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when---outFile-is-set.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when---outFile-is-set.js
index d614cb85c8307..ddec9469f706d 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when---outFile-is-set.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when---outFile-is-set.js
@@ -136,7 +136,22 @@ Info seq  [hh:mm:ss:mss] event:
       "event": "CustomHandler::configFileDiag",
       "body": {
         "configFileName": "/users/username/projects/project/tsconfig.json",
-        "diagnostics": [],
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/users/username/projects/project/tsconfig.json"
+          }
+        ],
         "triggerFile": "/users/username/projects/project/a.ts"
       }
     }
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
index 00e07b7023cf2..79a7835ad13b5 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
@@ -159,6 +159,20 @@ Info seq  [hh:mm:ss:mss] event:
             "code": 5107,
             "category": "error",
             "fileName": "/users/username/projects/project/tsconfig.json"
+          },
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/users/username/projects/project/tsconfig.json"
           }
         ]
       }
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js
index 88b30f277cfb8..c4825063626c8 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js
@@ -140,7 +140,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/users/username/projects/project/a.ts",
         "configFile": "/users/username/projects/project/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/users/username/projects/project/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/users/username/projects/project/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
index f46dd9c93fd23..fc19c57e20edf 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
@@ -159,6 +159,20 @@ Info seq  [hh:mm:ss:mss] event:
             "code": 5107,
             "category": "error",
             "fileName": "/users/username/projects/project/tsconfig.json"
+          },
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/users/username/projects/project/tsconfig.json"
           }
         ]
       }
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js
index 60fa2e32effc1..2c68688466f9c 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js
@@ -140,7 +140,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/users/username/projects/project/a.ts",
         "configFile": "/users/username/projects/project/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/users/username/projects/project/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/users/username/projects/project/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-link-open.js
index f2064f9ecbe4e..0a210a8b6d400 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-link-open.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-and-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-and-link-open.js
index 8f3f4a459ffc4..91d605a937170 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-and-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-and-link-open.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-open.js
index 33ad72ed0d7ca..b8fe55c5c1578 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-open.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
index 78e2373e73353..df86c265d3bfe 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-link-open.js
index 19be3c19c5ac1..bd6a056b54f8e 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-link-open.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-and-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-and-link-open.js
index 3743c940b5812..52b36ca07b192 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-and-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-and-link-open.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-open.js
index f66efe02c9425..822b8f00665e2 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-open.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
index 62ee167cd3ee3..99c18810c479d 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-link-open.js
index bdf42c352f2c1..7da3485f87ecc 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-link-open.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-and-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-and-link-open.js
index d306783327b8c..0a23adc84770c 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-and-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-and-link-open.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-open.js
index 7516c616f5e1f..2740772d819fd 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-open.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
index ecce46211a5a8..5da3fd56338ac 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-link-open.js
index d2b72c17b3b26..af90468d95ef0 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-link-open.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-and-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-and-link-open.js
index c71e5a72b17ba..265c35c664733 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-and-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-and-link-open.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-open.js
index b614e6e5adf0d..c0cfe24f4ba96 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-open.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
index 83f20dd96586e..6a204271bcf54 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-link-open.js
index 80994ab9a2cfd..e90600a46c5a4 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-link-open.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-and-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-and-link-open.js
index c954c89aad037..5e30023469447 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-and-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-and-link-open.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-open.js
index 84d53553177ea..873b0eab69cd4 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-open.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
index f9e53a60573c5..abcbfc0bfe981 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 5,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossPackage_pathsAndSymlink.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossPackage_pathsAndSymlink.js
index 043975add877e..c9b1e1130b781 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossPackage_pathsAndSymlink.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossPackage_pathsAndSymlink.js
@@ -1,16 +1,39 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "composite": true,
+          "lib": [
+            "es5"
+          ],
+          "module": "esnext",
+          "moduleResolution": "bundler",
+          "paths": {
+            "@/*": [
+              "./*"
+            ]
+          },
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/node_modules/@company/common] symlink(/home/src/workspaces/project/packages/common)
 //// [/home/src/workspaces/project/packages/app/lib/index.ts]
 Tooltip
@@ -28,6 +51,7 @@ Tooltip
 {
   "compilerOptions": {
     "composite": true,
+    "lib": ["es5"],
     "module": "esnext",
     "moduleResolution": "bundler",
     "paths": {
@@ -49,7 +73,7 @@ export function Tooltip {};
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/common/package.json"
@@ -65,7 +89,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/common/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -79,18 +103,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/common/package.json SVC-1-0 "{\n  \"name\": \"@company/common\",\n  \"version\": \"1.0.0\",\n  \"main\": \"./lib/index.tsx\"\n}"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -108,7 +132,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -116,12 +140,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/common/jsconfig.json: *new*
@@ -154,15 +178,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -173,7 +197,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/lib/index.ts"
@@ -189,6 +213,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/app/tscon
  ],
  "options": {
   "composite": true,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 99,
   "moduleResolution": 100,
   "paths": {
@@ -224,18 +251,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/app/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/app/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/app/lib/index.ts SVC-1-0 "Tooltip"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	lib/index.ts
 	  Matched by default include pattern '**/*'
 
@@ -298,7 +325,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -307,12 +334,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/package.json: *new*
@@ -365,17 +392,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/app/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/app/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -395,7 +422,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -410,7 +437,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -430,7 +457,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/lib/index.ts",
@@ -443,13 +470,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/lib/index.ts",
@@ -462,7 +489,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -484,7 +511,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/lib/index.ts",
@@ -497,13 +524,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/lib/index.ts",
@@ -529,7 +556,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -561,12 +588,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/package.json:
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_baseUrl_toDist.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_baseUrl_toDist.js
index bd18dd1d7f18a..c29b44e3c4f5d 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_baseUrl_toDist.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_baseUrl_toDist.js
@@ -1,16 +1,37 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "esnext",
+          "moduleResolution": "node10",
+          "noEmit": true,
+          "baseUrl": "/home/src/workspaces/project/web",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true,
+          "outDir": "/home/src/workspaces/project/common/dist",
+          "composite": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/common/src/MyModule.ts]
 export function square(n: number) {
   return n * 2;
@@ -19,6 +40,7 @@ export function square(n: number) {
 //// [/home/src/workspaces/project/common/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "commonjs",
     "outDir": "dist",
     "composite": true
@@ -37,6 +59,7 @@ import { square } from "../../common/dist/src/MyModule";
 //// [/home/src/workspaces/project/web/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "esnext",
     "moduleResolution": "node",
     "noEmit": true,
@@ -49,7 +72,7 @@ import { square } from "../../common/dist/src/MyModule";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/common/tsconfig.json"
@@ -64,6 +87,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/common/tsconfig.js
   "/home/src/workspaces/project/common/src/MyModule.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 1,
   "outDir": "/home/src/workspaces/project/common/dist",
   "composite": true,
@@ -78,7 +104,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/common/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -90,18 +116,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/common/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"commonjs\",\n    \"outDir\": \"dist\",\n    \"composite\": true\n  },\n  \"include\": [\"src\"]\n}"
+	/home/src/workspaces/project/common/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"lib\": [\"es5\"],\n    \"module\": \"commonjs\",\n    \"outDir\": \"dist\",\n    \"composite\": true\n  },\n  \"include\": [\"src\"]\n}"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -122,7 +148,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -130,12 +156,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/common/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/common/tsconfig.json: *new*
@@ -168,15 +194,15 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -187,7 +213,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/web/src/Helper.ts"
@@ -203,6 +229,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/web/tsconfig.json
   "/home/src/workspaces/project/web/src/MyApp.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 99,
   "moduleResolution": 2,
   "noEmit": true,
@@ -242,7 +271,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/web/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/web/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/web/src/Helper.ts SVC-1-0 "export function saveMe() {\n  square(2);\n}"
@@ -250,12 +279,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/web/src/MyApp.ts Text-1 "import { square } from \"../../common/dist/src/MyModule\";"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/Helper.ts
 	  Matched by include pattern 'src' in 'tsconfig.json'
 	../common/src/MyModule.ts
@@ -284,11 +313,11 @@ Info seq  [hh:mm:ss:mss] event:
         "diagnostics": [
           {
             "start": {
-              "line": 4,
+              "line": 5,
               "offset": 25
             },
             "end": {
-              "line": 4,
+              "line": 5,
               "offset": 31
             },
             "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
@@ -298,11 +327,11 @@ Info seq  [hh:mm:ss:mss] event:
           },
           {
             "start": {
-              "line": 6,
+              "line": 7,
               "offset": 5
             },
             "end": {
-              "line": 6,
+              "line": 7,
               "offset": 14
             },
             "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
@@ -335,7 +364,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -343,12 +372,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/common/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/common/src/MyModule.ts: *new*
@@ -399,17 +428,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/web/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/web/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -433,7 +462,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -449,7 +478,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -470,7 +499,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/web/src/Helper.ts",
@@ -483,13 +512,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/web/src/Helper.ts",
@@ -502,7 +531,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -524,7 +553,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/web/src/Helper.ts",
@@ -537,13 +566,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/web/src/Helper.ts",
@@ -562,7 +591,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_sharedOutDir.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_sharedOutDir.js
index f766b160265aa..be34de951cd47 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_sharedOutDir.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_sharedOutDir.js
@@ -1,16 +1,39 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "commonjs",
+          "baseUrl": "/home/src/workspaces/project",
+          "paths": {
+            "packages/*": [
+              "./packages/*"
+            ]
+          },
+          "outDir": "/home/src/workspaces/project/dist/packages/dep",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/packages/app/index.ts]
 dep
 
@@ -39,6 +62,7 @@ export const dep = 0;
 //// [/home/src/workspaces/project/tsconfig.base.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "commonjs",
     "baseUrl": ".",
     "paths": {
@@ -50,7 +74,7 @@ export const dep = 0;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.base.json"
@@ -62,7 +86,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -72,18 +96,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.base.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"commonjs\",\n    \"baseUrl\": \".\",\n    \"paths\": {\n      \"packages/*\": [\"./packages/*\"]\n    }\n  }\n}"
+	/home/src/workspaces/project/tsconfig.base.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"lib\": [\"es5\"],\n    \"module\": \"commonjs\",\n    \"baseUrl\": \".\",\n    \"paths\": {\n      \"packages/*\": [\"./packages/*\"]\n    }\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.base.json
 	  Root file specified for compilation
 
@@ -100,7 +124,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -108,12 +132,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -132,15 +156,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -151,7 +175,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/index.ts"
@@ -167,6 +191,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/app/tscon
   "/home/src/workspaces/project/packages/app/utils.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 1,
   "baseUrl": "/home/src/workspaces/project",
   "paths": {
@@ -206,6 +233,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/dep/tscon
   "/home/src/workspaces/project/packages/dep/sub/folder/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 1,
   "baseUrl": "/home/src/workspaces/project",
   "paths": {
@@ -238,7 +268,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/app/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/app/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (7)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/app/index.ts SVC-1-0 "dep"
@@ -247,12 +277,12 @@ Info seq  [hh:mm:ss:mss] 	Files (7)
 	/home/src/workspaces/project/packages/app/utils.ts Text-1 "import \"packages/dep\";"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 	../dep/sub/folder/index.ts
@@ -330,7 +360,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -338,12 +368,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/tsconfig.json: *new*
@@ -393,17 +423,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/app/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/app/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -431,7 +461,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -443,12 +473,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/index.ts",
@@ -461,13 +491,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/index.ts",
@@ -480,7 +510,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -502,7 +532,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/index.ts",
@@ -515,13 +545,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/index.ts",
@@ -540,7 +570,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -569,7 +599,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/index.ts",
@@ -586,7 +616,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -602,17 +632,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/app/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/app/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
@@ -640,7 +670,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/index.ts",
@@ -657,22 +687,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/app/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/app/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_stripSrc.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_stripSrc.js
index 29608533f69ec..53ed3b9c967b2 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_stripSrc.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_stripSrc.js
@@ -1,16 +1,43 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "outDir": "/home/src/workspaces/project/packages/dep/dist",
+          "rootDir": "/home/src/workspaces/project/packages/dep/src",
+          "module": "commonjs",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true,
+          "baseUrl": "/home/src/workspaces/project/packages/app",
+          "paths": {
+            "dep": [
+              "../dep/src/main"
+            ],
+            "dep/*": [
+              "../dep/src/*"
+            ]
+          }
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/packages/app/package.json]
 { "name": "app", "dependencies": { "dep": "*" } }
 
@@ -26,6 +53,7 @@ dep2;
 //// [/home/src/workspaces/project/packages/app/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "commonjs",
     "outDir": "dist",
     "rootDir": "src",
@@ -50,13 +78,13 @@ export const dep2 = 0;
 
 //// [/home/src/workspaces/project/packages/dep/tsconfig.json]
 {
-  "compilerOptions": { "outDir": "dist", "rootDir": "src", "module": "commonjs" }
+  "compilerOptions": { "lib": ["es5"], "outDir": "dist", "rootDir": "src", "module": "commonjs" }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/package.json"
@@ -73,6 +101,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/app/tscon
   "/home/src/workspaces/project/packages/app/src/utils.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 1,
   "outDir": "/home/src/workspaces/project/packages/app/dist",
   "rootDir": "/home/src/workspaces/project/packages/app/src",
@@ -117,6 +148,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/dep/tscon
   "/home/src/workspaces/project/packages/dep/src/sub/folder/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "outDir": "/home/src/workspaces/project/packages/dep/dist",
   "rootDir": "/home/src/workspaces/project/packages/dep/src",
   "module": 1,
@@ -130,7 +164,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep 1 undefined Project: /home/src/workspaces/project/packages/app/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep 1 undefined Project: /home/src/workspaces/project/packages/app/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep/src/sub/folder/index.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/app/node_modules/@types 1 undefined Project: /home/src/workspaces/project/packages/app/tsconfig.json WatchType: Type roots
@@ -144,7 +178,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/app/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/app/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/dep/src/sub/folder/index.ts Text-1 "export const dep2 = 0;"
@@ -154,12 +188,12 @@ Info seq  [hh:mm:ss:mss] 	Files (8)
 	/home/src/workspaces/project/packages/app/src/utils.ts Text-1 "dep2;"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../dep/src/sub/folder/index.ts
 	  Imported via "./sub/folder" from file '../dep/src/main.ts'
 	../dep/src/main.ts
@@ -192,11 +226,11 @@ Info seq  [hh:mm:ss:mss] event:
         "diagnostics": [
           {
             "start": {
-              "line": 6,
+              "line": 7,
               "offset": 5
             },
             "end": {
-              "line": 6,
+              "line": 7,
               "offset": 14
             },
             "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
@@ -206,11 +240,11 @@ Info seq  [hh:mm:ss:mss] event:
           },
           {
             "start": {
-              "line": 12,
+              "line": 13,
               "offset": 18
             },
             "end": {
-              "line": 12,
+              "line": 13,
               "offset": 38
             },
             "text": "Referenced project '/home/src/workspaces/project/packages/dep' must have setting \"composite\": true.",
@@ -220,11 +254,11 @@ Info seq  [hh:mm:ss:mss] event:
           },
           {
             "start": {
-              "line": 12,
+              "line": 13,
               "offset": 3
             },
             "end": {
-              "line": 12,
+              "line": 13,
               "offset": 15
             },
             "text": "',' expected.",
@@ -254,18 +288,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/app/package.json SVC-1-0 "{ \"name\": \"app\", \"dependencies\": { \"dep\": \"*\" } }"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -287,7 +321,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -295,12 +329,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json: *new*
@@ -358,17 +392,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -400,7 +434,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts"
@@ -427,17 +461,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json:
@@ -497,17 +531,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -540,7 +574,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -552,12 +586,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -570,13 +604,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -589,7 +623,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -611,7 +645,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -624,13 +658,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -649,7 +683,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -689,7 +723,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -706,7 +740,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -722,17 +756,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -764,7 +798,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -781,22 +815,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -828,7 +862,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts"
@@ -841,7 +875,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/app/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/app/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/dep/src/sub/folder/index.ts Text-1 "export const dep2 = 0;"
@@ -871,7 +905,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -879,12 +913,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json:
@@ -943,17 +977,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -986,7 +1020,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -998,12 +1032,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1016,13 +1050,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1035,7 +1069,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true,
       "body": [
         {
@@ -1057,7 +1091,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1070,13 +1104,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1095,7 +1129,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true,
       "body": [
         {
@@ -1124,7 +1158,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1141,7 +1175,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true
     }
 After Request
@@ -1157,17 +1191,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -1199,7 +1233,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1216,22 +1250,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist.js
index 8b89f06a8933b..d10578139e936 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist.js
@@ -1,16 +1,43 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "outDir": "/home/src/workspaces/project/packages/dep/dist",
+          "rootDir": "/home/src/workspaces/project/packages/dep/src",
+          "module": "commonjs",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true,
+          "baseUrl": "/home/src/workspaces/project/packages/app",
+          "paths": {
+            "dep": [
+              "../dep/src/main"
+            ],
+            "dep/dist/*": [
+              "../dep/src/*"
+            ]
+          }
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/packages/app/package.json]
 { "name": "app", "dependencies": { "dep": "*" } }
 
@@ -26,6 +53,7 @@ dep2;
 //// [/home/src/workspaces/project/packages/app/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "commonjs",
     "outDir": "dist",
     "rootDir": "src",
@@ -50,13 +78,13 @@ export const dep2 = 0;
 
 //// [/home/src/workspaces/project/packages/dep/tsconfig.json]
 {
-  "compilerOptions": { "outDir": "dist", "rootDir": "src", "module": "commonjs" }
+  "compilerOptions": { "lib": ["es5"], "outDir": "dist", "rootDir": "src", "module": "commonjs" }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/package.json"
@@ -73,6 +101,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/app/tscon
   "/home/src/workspaces/project/packages/app/src/utils.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 1,
   "outDir": "/home/src/workspaces/project/packages/app/dist",
   "rootDir": "/home/src/workspaces/project/packages/app/src",
@@ -117,6 +148,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/dep/tscon
   "/home/src/workspaces/project/packages/dep/src/sub/folder/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "outDir": "/home/src/workspaces/project/packages/dep/dist",
   "rootDir": "/home/src/workspaces/project/packages/dep/src",
   "module": 1,
@@ -130,7 +164,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep 1 undefined Project: /home/src/workspaces/project/packages/app/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep 1 undefined Project: /home/src/workspaces/project/packages/app/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep/src/sub/folder/index.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/app/node_modules/@types 1 undefined Project: /home/src/workspaces/project/packages/app/tsconfig.json WatchType: Type roots
@@ -144,7 +178,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/app/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/app/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/dep/src/sub/folder/index.ts Text-1 "export const dep2 = 0;"
@@ -154,12 +188,12 @@ Info seq  [hh:mm:ss:mss] 	Files (8)
 	/home/src/workspaces/project/packages/app/src/utils.ts Text-1 "dep2;"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../dep/src/sub/folder/index.ts
 	  Imported via "./sub/folder" from file '../dep/src/main.ts'
 	../dep/src/main.ts
@@ -192,11 +226,11 @@ Info seq  [hh:mm:ss:mss] event:
         "diagnostics": [
           {
             "start": {
-              "line": 6,
+              "line": 7,
               "offset": 5
             },
             "end": {
-              "line": 6,
+              "line": 7,
               "offset": 14
             },
             "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
@@ -206,11 +240,11 @@ Info seq  [hh:mm:ss:mss] event:
           },
           {
             "start": {
-              "line": 12,
+              "line": 13,
               "offset": 18
             },
             "end": {
-              "line": 12,
+              "line": 13,
               "offset": 38
             },
             "text": "Referenced project '/home/src/workspaces/project/packages/dep' must have setting \"composite\": true.",
@@ -220,11 +254,11 @@ Info seq  [hh:mm:ss:mss] event:
           },
           {
             "start": {
-              "line": 12,
+              "line": 13,
               "offset": 3
             },
             "end": {
-              "line": 12,
+              "line": 13,
               "offset": 15
             },
             "text": "',' expected.",
@@ -254,18 +288,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/app/package.json SVC-1-0 "{ \"name\": \"app\", \"dependencies\": { \"dep\": \"*\" } }"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -287,7 +321,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -295,12 +329,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json: *new*
@@ -358,17 +392,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -400,7 +434,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts"
@@ -427,17 +461,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json:
@@ -497,17 +531,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -540,7 +574,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -552,12 +586,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -570,13 +604,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -589,7 +623,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -611,7 +645,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -624,13 +658,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -649,7 +683,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -689,7 +723,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -706,7 +740,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -722,17 +756,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -764,7 +798,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -781,22 +815,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -828,7 +862,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts"
@@ -841,7 +875,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/app/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/app/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/dep/src/sub/folder/index.ts Text-1 "export const dep2 = 0;"
@@ -871,7 +905,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -879,12 +913,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json:
@@ -943,17 +977,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -986,7 +1020,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -998,12 +1032,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1016,13 +1050,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1035,7 +1069,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true,
       "body": [
         {
@@ -1057,7 +1091,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1070,13 +1104,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1095,7 +1129,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true,
       "body": [
         {
@@ -1124,7 +1158,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1141,7 +1175,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true
     }
 After Request
@@ -1157,17 +1191,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -1199,7 +1233,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1216,22 +1250,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist2.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist2.js
index 121c1708b8567..4d16c41d8d809 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist2.js
@@ -1,16 +1,41 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "esnext",
+          "moduleResolution": "node10",
+          "noEmit": true,
+          "paths": {
+            "@common/*": [
+              "../common/dist/src/*"
+            ]
+          },
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true,
+          "outDir": "/home/src/workspaces/project/common/dist",
+          "composite": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/common/src/MyModule.ts]
 export function square(n: number) {
   return n * 2;
@@ -19,6 +44,7 @@ export function square(n: number) {
 //// [/home/src/workspaces/project/common/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "commonjs",
     "outDir": "dist",
     "composite": true
@@ -37,6 +63,7 @@ import { square } from "@common/MyModule";
 //// [/home/src/workspaces/project/web/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "esnext",
     "moduleResolution": "node",
     "noEmit": true,
@@ -51,7 +78,7 @@ import { square } from "@common/MyModule";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/common/tsconfig.json"
@@ -66,6 +93,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/common/tsconfig.js
   "/home/src/workspaces/project/common/src/MyModule.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 1,
   "outDir": "/home/src/workspaces/project/common/dist",
   "composite": true,
@@ -80,7 +110,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/common/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -92,18 +122,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/common/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"commonjs\",\n    \"outDir\": \"dist\",\n    \"composite\": true\n  },\n  \"include\": [\"src\"]\n}"
+	/home/src/workspaces/project/common/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"lib\": [\"es5\"],\n    \"module\": \"commonjs\",\n    \"outDir\": \"dist\",\n    \"composite\": true\n  },\n  \"include\": [\"src\"]\n}"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -124,7 +154,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -132,12 +162,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/common/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/common/tsconfig.json: *new*
@@ -170,15 +200,15 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -189,7 +219,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/web/src/Helper.ts"
@@ -205,6 +235,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/web/tsconfig.json
   "/home/src/workspaces/project/web/src/MyApp.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 99,
   "moduleResolution": 2,
   "noEmit": true,
@@ -249,7 +282,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/web/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/web/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/web/src/Helper.ts SVC-1-0 "export function saveMe() {\n  square(2);\n}"
@@ -257,12 +290,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/web/src/MyApp.ts Text-1 "import { square } from \"@common/MyModule\";"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/Helper.ts
 	  Matched by include pattern 'src' in 'tsconfig.json'
 	../common/src/MyModule.ts
@@ -291,11 +324,11 @@ Info seq  [hh:mm:ss:mss] event:
         "diagnostics": [
           {
             "start": {
-              "line": 4,
+              "line": 5,
               "offset": 25
             },
             "end": {
-              "line": 4,
+              "line": 5,
               "offset": 31
             },
             "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
@@ -328,7 +361,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -336,12 +369,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/common/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/common/src/MyModule.ts: *new*
@@ -392,17 +425,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/web/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/web/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -426,7 +459,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -442,7 +475,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -463,7 +496,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/web/src/Helper.ts",
@@ -476,13 +509,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/web/src/Helper.ts",
@@ -495,7 +528,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -517,7 +550,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/web/src/Helper.ts",
@@ -530,13 +563,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/web/src/Helper.ts",
@@ -555,7 +588,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toSrc.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toSrc.js
index 24d32776119cf..b08e6f2618b64 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toSrc.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toSrc.js
@@ -1,16 +1,43 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "outDir": "/home/src/workspaces/project/packages/dep/dist",
+          "rootDir": "/home/src/workspaces/project/packages/dep/src",
+          "module": "commonjs",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true,
+          "baseUrl": "/home/src/workspaces/project/packages/app",
+          "paths": {
+            "dep": [
+              "../dep/src/main"
+            ],
+            "dep/*": [
+              "../dep/*"
+            ]
+          }
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/packages/app/package.json]
 { "name": "app", "dependencies": { "dep": "*" } }
 
@@ -26,6 +53,7 @@ dep2;
 //// [/home/src/workspaces/project/packages/app/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "commonjs",
     "outDir": "dist",
     "rootDir": "src",
@@ -50,13 +78,13 @@ export const dep2 = 0;
 
 //// [/home/src/workspaces/project/packages/dep/tsconfig.json]
 {
-  "compilerOptions": { "outDir": "dist", "rootDir": "src", "module": "commonjs" }
+  "compilerOptions": { "lib": ["es5"], "outDir": "dist", "rootDir": "src", "module": "commonjs" }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/package.json"
@@ -73,6 +101,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/app/tscon
   "/home/src/workspaces/project/packages/app/src/utils.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 1,
   "outDir": "/home/src/workspaces/project/packages/app/dist",
   "rootDir": "/home/src/workspaces/project/packages/app/src",
@@ -117,6 +148,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/dep/tscon
   "/home/src/workspaces/project/packages/dep/src/sub/folder/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "outDir": "/home/src/workspaces/project/packages/dep/dist",
   "rootDir": "/home/src/workspaces/project/packages/dep/src",
   "module": 1,
@@ -130,7 +164,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep 1 undefined Project: /home/src/workspaces/project/packages/app/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep 1 undefined Project: /home/src/workspaces/project/packages/app/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep/src/sub/folder/index.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/app/node_modules/@types 1 undefined Project: /home/src/workspaces/project/packages/app/tsconfig.json WatchType: Type roots
@@ -144,7 +178,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/app/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/app/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/dep/src/sub/folder/index.ts Text-1 "export const dep2 = 0;"
@@ -154,12 +188,12 @@ Info seq  [hh:mm:ss:mss] 	Files (8)
 	/home/src/workspaces/project/packages/app/src/utils.ts Text-1 "dep2;"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../dep/src/sub/folder/index.ts
 	  Imported via "./sub/folder" from file '../dep/src/main.ts'
 	../dep/src/main.ts
@@ -192,11 +226,11 @@ Info seq  [hh:mm:ss:mss] event:
         "diagnostics": [
           {
             "start": {
-              "line": 6,
+              "line": 7,
               "offset": 5
             },
             "end": {
-              "line": 6,
+              "line": 7,
               "offset": 14
             },
             "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
@@ -206,11 +240,11 @@ Info seq  [hh:mm:ss:mss] event:
           },
           {
             "start": {
-              "line": 12,
+              "line": 13,
               "offset": 18
             },
             "end": {
-              "line": 12,
+              "line": 13,
               "offset": 38
             },
             "text": "Referenced project '/home/src/workspaces/project/packages/dep' must have setting \"composite\": true.",
@@ -220,11 +254,11 @@ Info seq  [hh:mm:ss:mss] event:
           },
           {
             "start": {
-              "line": 12,
+              "line": 13,
               "offset": 3
             },
             "end": {
-              "line": 12,
+              "line": 13,
               "offset": 15
             },
             "text": "',' expected.",
@@ -254,18 +288,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/app/package.json SVC-1-0 "{ \"name\": \"app\", \"dependencies\": { \"dep\": \"*\" } }"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -287,7 +321,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -295,12 +329,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json: *new*
@@ -358,17 +392,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -400,7 +434,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts"
@@ -427,17 +461,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json:
@@ -497,17 +531,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -540,7 +574,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -552,12 +586,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -570,13 +604,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -589,7 +623,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -611,7 +645,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -624,13 +658,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -649,7 +683,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -689,7 +723,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -706,7 +740,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -722,17 +756,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -764,7 +798,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -781,22 +815,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -828,7 +862,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts"
@@ -841,7 +875,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/app/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/app/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/dep/src/sub/folder/index.ts Text-1 "export const dep2 = 0;"
@@ -871,7 +905,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -879,12 +913,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json:
@@ -943,17 +977,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -986,7 +1020,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -998,12 +1032,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1016,13 +1050,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1035,7 +1069,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true,
       "body": [
         {
@@ -1057,7 +1091,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1070,13 +1104,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1095,7 +1129,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true,
       "body": [
         {
@@ -1124,7 +1158,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1141,7 +1175,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true
     }
 After Request
@@ -1157,17 +1191,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -1199,7 +1233,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/utils.ts",
@@ -1216,22 +1250,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_stripSrc.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_stripSrc.js
index e99ed631c5507..fcaee63a3340e 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_stripSrc.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_stripSrc.js
@@ -1,16 +1,40 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "outDir": "/home/src/workspaces/project/packages/dep/dist",
+          "rootDir": "/home/src/workspaces/project/packages/dep/src",
+          "module": "commonjs",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true,
+          "baseUrl": "/home/src/workspaces/project/packages/app",
+          "paths": {
+            "dep/*": [
+              "../dep/src/*"
+            ]
+          }
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/packages/app/node_modules/dep] symlink(/home/src/workspaces/project/packages/dep)
 //// [/home/src/workspaces/project/packages/app/package.json]
 { "name": "app", "dependencies": { "dep": "*" } }
@@ -21,6 +45,7 @@ dep
 //// [/home/src/workspaces/project/packages/app/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "commonjs",
     "outDir": "dist",
     "rootDir": "src",
@@ -43,13 +68,13 @@ export const dep = 0;
 
 //// [/home/src/workspaces/project/packages/dep/tsconfig.json]
 {
-  "compilerOptions": { "outDir": "dist", "rootDir": "src", "module": "commonjs" }
+  "compilerOptions": { "lib": ["es5"], "outDir": "dist", "rootDir": "src", "module": "commonjs" }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/package.json"
@@ -64,6 +89,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/app/tscon
   "/home/src/workspaces/project/packages/app/src/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 1,
   "outDir": "/home/src/workspaces/project/packages/app/dist",
   "rootDir": "/home/src/workspaces/project/packages/app/src",
@@ -103,6 +131,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/dep/tscon
   "/home/src/workspaces/project/packages/dep/src/sub/folder/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "outDir": "/home/src/workspaces/project/packages/dep/dist",
   "rootDir": "/home/src/workspaces/project/packages/dep/src",
   "module": 1,
@@ -112,7 +143,7 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/dep/tscon
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep/tsconfig.json 2000 undefined Project: /home/src/workspaces/project/packages/app/tsconfig.json WatchType: Config file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep 1 undefined Config: /home/src/workspaces/project/packages/dep/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep 1 undefined Config: /home/src/workspaces/project/packages/dep/tsconfig.json WatchType: Wild card directory
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/app/node_modules/@types 1 undefined Project: /home/src/workspaces/project/packages/app/tsconfig.json WatchType: Type roots
@@ -126,18 +157,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/app/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/app/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/app/src/index.ts Text-1 "dep"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/index.ts
 	  Matched by default include pattern '**/*'
 
@@ -162,11 +193,11 @@ Info seq  [hh:mm:ss:mss] event:
         "diagnostics": [
           {
             "start": {
-              "line": 6,
+              "line": 7,
               "offset": 5
             },
             "end": {
-              "line": 6,
+              "line": 7,
               "offset": 14
             },
             "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
@@ -176,11 +207,11 @@ Info seq  [hh:mm:ss:mss] event:
           },
           {
             "start": {
-              "line": 11,
+              "line": 12,
               "offset": 18
             },
             "end": {
-              "line": 11,
+              "line": 12,
               "offset": 38
             },
             "text": "Referenced project '/home/src/workspaces/project/packages/dep' must have setting \"composite\": true.",
@@ -190,11 +221,11 @@ Info seq  [hh:mm:ss:mss] event:
           },
           {
             "start": {
-              "line": 11,
+              "line": 12,
               "offset": 3
             },
             "end": {
-              "line": 11,
+              "line": 12,
               "offset": 15
             },
             "text": "',' expected.",
@@ -224,18 +255,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/app/package.json SVC-1-0 "{ \"name\": \"app\", \"dependencies\": { \"dep\": \"*\" } }"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -257,7 +288,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -265,12 +296,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json: *new*
@@ -319,17 +350,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -345,7 +376,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts"
@@ -372,17 +403,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json:
@@ -433,17 +464,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -460,7 +491,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -472,12 +503,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -490,13 +521,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -509,7 +540,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -531,7 +562,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -544,13 +575,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -592,7 +623,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -625,12 +656,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json:
@@ -687,17 +718,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -721,7 +752,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -738,7 +769,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -757,17 +788,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -791,7 +822,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -808,22 +839,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toDist.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toDist.js
index e5bb5e2b106fc..47717fd5b1dae 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toDist.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toDist.js
@@ -1,16 +1,40 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "outDir": "/home/src/workspaces/project/packages/dep/dist",
+          "rootDir": "/home/src/workspaces/project/packages/dep/src",
+          "module": "commonjs",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true,
+          "baseUrl": "/home/src/workspaces/project/packages/app",
+          "paths": {
+            "dep/dist/*": [
+              "../dep/src/*"
+            ]
+          }
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/packages/app/node_modules/dep] symlink(/home/src/workspaces/project/packages/dep)
 //// [/home/src/workspaces/project/packages/app/package.json]
 { "name": "app", "dependencies": { "dep": "*" } }
@@ -21,6 +45,7 @@ dep
 //// [/home/src/workspaces/project/packages/app/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "commonjs",
     "outDir": "dist",
     "rootDir": "src",
@@ -43,13 +68,13 @@ export const dep = 0;
 
 //// [/home/src/workspaces/project/packages/dep/tsconfig.json]
 {
-  "compilerOptions": { "outDir": "dist", "rootDir": "src", "module": "commonjs" }
+  "compilerOptions": { "lib": ["es5"], "outDir": "dist", "rootDir": "src", "module": "commonjs" }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/package.json"
@@ -64,6 +89,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/app/tscon
   "/home/src/workspaces/project/packages/app/src/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 1,
   "outDir": "/home/src/workspaces/project/packages/app/dist",
   "rootDir": "/home/src/workspaces/project/packages/app/src",
@@ -103,6 +131,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/dep/tscon
   "/home/src/workspaces/project/packages/dep/src/sub/folder/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "outDir": "/home/src/workspaces/project/packages/dep/dist",
   "rootDir": "/home/src/workspaces/project/packages/dep/src",
   "module": 1,
@@ -112,7 +143,7 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/dep/tscon
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep/tsconfig.json 2000 undefined Project: /home/src/workspaces/project/packages/app/tsconfig.json WatchType: Config file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep 1 undefined Config: /home/src/workspaces/project/packages/dep/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep 1 undefined Config: /home/src/workspaces/project/packages/dep/tsconfig.json WatchType: Wild card directory
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/app/node_modules/@types 1 undefined Project: /home/src/workspaces/project/packages/app/tsconfig.json WatchType: Type roots
@@ -126,18 +157,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/app/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/app/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/app/src/index.ts Text-1 "dep"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/index.ts
 	  Matched by default include pattern '**/*'
 
@@ -162,11 +193,11 @@ Info seq  [hh:mm:ss:mss] event:
         "diagnostics": [
           {
             "start": {
-              "line": 6,
+              "line": 7,
               "offset": 5
             },
             "end": {
-              "line": 6,
+              "line": 7,
               "offset": 14
             },
             "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
@@ -176,11 +207,11 @@ Info seq  [hh:mm:ss:mss] event:
           },
           {
             "start": {
-              "line": 11,
+              "line": 12,
               "offset": 18
             },
             "end": {
-              "line": 11,
+              "line": 12,
               "offset": 38
             },
             "text": "Referenced project '/home/src/workspaces/project/packages/dep' must have setting \"composite\": true.",
@@ -190,11 +221,11 @@ Info seq  [hh:mm:ss:mss] event:
           },
           {
             "start": {
-              "line": 11,
+              "line": 12,
               "offset": 3
             },
             "end": {
-              "line": 11,
+              "line": 12,
               "offset": 15
             },
             "text": "',' expected.",
@@ -224,18 +255,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/app/package.json SVC-1-0 "{ \"name\": \"app\", \"dependencies\": { \"dep\": \"*\" } }"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -257,7 +288,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -265,12 +296,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json: *new*
@@ -319,17 +350,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -345,7 +376,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts"
@@ -372,17 +403,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json:
@@ -433,17 +464,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -460,7 +491,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -472,12 +503,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -490,13 +521,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -509,7 +540,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -531,7 +562,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -544,13 +575,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -592,7 +623,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -625,12 +656,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json:
@@ -687,17 +718,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -721,7 +752,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -738,7 +769,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -757,17 +788,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -791,7 +822,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -808,22 +839,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toSrc.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toSrc.js
index 6c1f1073b3220..1ab2f97f123f2 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toSrc.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toSrc.js
@@ -1,16 +1,35 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "outDir": "/home/src/workspaces/project/packages/dep/dist",
+          "rootDir": "/home/src/workspaces/project/packages/dep/src",
+          "module": "commonjs",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true,
+          "baseUrl": "/home/src/workspaces/project/packages/app"
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/packages/app/node_modules/dep] symlink(/home/src/workspaces/project/packages/dep)
 //// [/home/src/workspaces/project/packages/app/package.json]
 { "name": "app", "dependencies": { "dep": "*" } }
@@ -21,6 +40,7 @@ dep
 //// [/home/src/workspaces/project/packages/app/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "commonjs",
     "outDir": "dist",
     "rootDir": "src",
@@ -40,13 +60,13 @@ export const dep = 0;
 
 //// [/home/src/workspaces/project/packages/dep/tsconfig.json]
 {
-  "compilerOptions": { "outDir": "dist", "rootDir": "src", "module": "commonjs" }
+  "compilerOptions": { "lib": ["es5"], "outDir": "dist", "rootDir": "src", "module": "commonjs" }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/package.json"
@@ -61,6 +81,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/app/tscon
   "/home/src/workspaces/project/packages/app/src/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 1,
   "outDir": "/home/src/workspaces/project/packages/app/dist",
   "rootDir": "/home/src/workspaces/project/packages/app/src",
@@ -94,6 +117,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/dep/tscon
   "/home/src/workspaces/project/packages/dep/src/sub/folder/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "outDir": "/home/src/workspaces/project/packages/dep/dist",
   "rootDir": "/home/src/workspaces/project/packages/dep/src",
   "module": 1,
@@ -103,7 +129,7 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/dep/tscon
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep/tsconfig.json 2000 undefined Project: /home/src/workspaces/project/packages/app/tsconfig.json WatchType: Config file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep 1 undefined Config: /home/src/workspaces/project/packages/dep/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/dep 1 undefined Config: /home/src/workspaces/project/packages/dep/tsconfig.json WatchType: Wild card directory
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/app/node_modules/@types 1 undefined Project: /home/src/workspaces/project/packages/app/tsconfig.json WatchType: Type roots
@@ -117,18 +143,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/app/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/app/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/app/src/index.ts Text-1 "dep"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/index.ts
 	  Matched by default include pattern '**/*'
 
@@ -153,11 +179,11 @@ Info seq  [hh:mm:ss:mss] event:
         "diagnostics": [
           {
             "start": {
-              "line": 6,
+              "line": 7,
               "offset": 5
             },
             "end": {
-              "line": 6,
+              "line": 7,
               "offset": 14
             },
             "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
@@ -167,11 +193,11 @@ Info seq  [hh:mm:ss:mss] event:
           },
           {
             "start": {
-              "line": 8,
+              "line": 9,
               "offset": 18
             },
             "end": {
-              "line": 8,
+              "line": 9,
               "offset": 38
             },
             "text": "Referenced project '/home/src/workspaces/project/packages/dep' must have setting \"composite\": true.",
@@ -181,11 +207,11 @@ Info seq  [hh:mm:ss:mss] event:
           },
           {
             "start": {
-              "line": 8,
+              "line": 9,
               "offset": 3
             },
             "end": {
-              "line": 8,
+              "line": 9,
               "offset": 15
             },
             "text": "',' expected.",
@@ -215,18 +241,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/app/package.json SVC-1-0 "{ \"name\": \"app\", \"dependencies\": { \"dep\": \"*\" } }"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -248,7 +274,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -256,12 +282,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json: *new*
@@ -310,17 +336,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -336,7 +362,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts"
@@ -363,17 +389,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json:
@@ -424,17 +450,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -451,7 +477,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -463,12 +489,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -481,13 +507,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -500,7 +526,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -522,7 +548,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -535,13 +561,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -583,7 +609,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -616,12 +642,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/app/jsconfig.json:
@@ -678,17 +704,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -712,7 +738,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -729,7 +755,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -748,17 +774,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
@@ -782,7 +808,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/app/src/index.ts",
@@ -799,22 +825,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/packages/app/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns1.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns1.js
index 05bbb9a3acfef..b0a878209a656 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns1.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "module": "commonjs",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 S3
 
@@ -29,7 +45,7 @@ export * from "./clients/s3";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/aws-sdk/package.json"
@@ -43,7 +59,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/aws-sdk/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -57,18 +73,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/aws-sdk/package.json SVC-1-0 "{ \"name\": \"aws-sdk\", \"version\": \"2.0.0\", \"main\": \"index.js\" }"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -85,7 +101,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -93,12 +109,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/aws-sdk/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/aws-sdk/tsconfig.json: *new*
@@ -124,15 +140,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -143,7 +159,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -162,18 +178,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-1-0 "S3"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Root file specified for compilation
 
@@ -223,7 +239,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -232,12 +248,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/aws-sdk/clients/package.json: *new*
@@ -288,17 +304,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -322,7 +338,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -339,7 +355,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -358,7 +374,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -370,6 +386,16 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] getCompletionData: Get current token: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Is inside comment: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Get previous token: *
+Info seq  [hh:mm:ss:mss] AutoImportProviderProject: found 1 root files in 1 dependencies 0 referenced projects in * ms
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/autoImportProviderProject1*
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/autoImportProviderProject1* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Same program as before
+Info seq  [hh:mm:ss:mss] getExportInfoMap: cache miss or empty; calculating new results
+Info seq  [hh:mm:ss:mss] forEachExternalModuleToImportFrom autoImportProvider: *
+Info seq  [hh:mm:ss:mss] getExportInfoMap: done in * ms
+Info seq  [hh:mm:ss:mss] collectAutoImports: resolved 0 module specifiers, plus 0 ambient and 0 from cache
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
+Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
 Info seq  [hh:mm:ss:mss] response:
@@ -377,10 +403,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
+      "performanceData": {
+        "updateGraphDurationMs": *
+      },
       "body": {
-        "flags": 0,
+        "flags": 1,
         "isGlobalCompletion": true,
         "isMemberCompletion": false,
         "isNewIdentifierLocation": false,
@@ -1057,9 +1086,23 @@ Info seq  [hh:mm:ss:mss] response:
         ]
       }
     }
+After Request
+Projects::
+/dev/null/autoImportProviderProject1* (AutoImportProvider) *changed*
+    projectStateVersion: 2
+    projectProgramVersion: 1
+    dirty: false *changed*
+/dev/null/inferredProject1* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+/dev/null/inferredProject2* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+    autoImportProviderHost: /dev/null/autoImportProviderProject1*
+
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1075,12 +1118,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
+After Request
+Projects::
+/dev/null/autoImportProviderProject1* (AutoImportProvider) *changed*
+    projectStateVersion: 3 *changed*
+    projectProgramVersion: 1
+    dirty: true *changed*
+/dev/null/inferredProject1* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+/dev/null/inferredProject2* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+    autoImportProviderHost: /dev/null/autoImportProviderProject1*
+
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1096,12 +1153,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1114,13 +1171,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1133,7 +1190,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
@@ -1155,7 +1212,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1168,13 +1225,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1190,7 +1247,7 @@ Info seq  [hh:mm:ss:mss] request:
     }
 Info seq  [hh:mm:ss:mss] AutoImportProviderProject: found 1 root files in 1 dependencies 0 referenced projects in * ms
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/autoImportProviderProject1*
-Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/autoImportProviderProject1* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/autoImportProviderProject1* projectStateVersion: 3 projectProgramVersion: 1 structureChanged: false structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Same program as before
 Info seq  [hh:mm:ss:mss] forEachExternalModuleToImportFrom autoImportProvider: *
 Info seq  [hh:mm:ss:mss] response:
@@ -1198,7 +1255,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1208,7 +1265,7 @@ Info seq  [hh:mm:ss:mss] response:
 After Request
 Projects::
 /dev/null/autoImportProviderProject1* (AutoImportProvider) *changed*
-    projectStateVersion: 2
+    projectStateVersion: 3
     projectProgramVersion: 1
     dirty: false *changed*
 /dev/null/inferredProject1* (Inferred)
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns2.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns2.js
index 13f24f69708ce..0715d6f2e8775 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns2.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "module": "commonjs",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 S3
 
@@ -29,7 +45,7 @@ export * from "./clients/s3";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/aws-sdk/package.json"
@@ -43,7 +59,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/aws-sdk/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -57,18 +73,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/aws-sdk/package.json SVC-1-0 "{ \"name\": \"aws-sdk\", \"version\": \"2.0.0\", \"main\": \"index.js\" }"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -85,7 +101,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -93,12 +109,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/aws-sdk/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/aws-sdk/tsconfig.json: *new*
@@ -124,15 +140,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -143,7 +159,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -162,18 +178,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-1-0 "S3"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Root file specified for compilation
 
@@ -223,7 +239,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -232,12 +248,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/aws-sdk/clients/package.json: *new*
@@ -288,17 +304,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -322,7 +338,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -339,7 +355,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -358,7 +374,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -370,6 +386,16 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] getCompletionData: Get current token: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Is inside comment: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Get previous token: *
+Info seq  [hh:mm:ss:mss] AutoImportProviderProject: found 1 root files in 1 dependencies 0 referenced projects in * ms
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/autoImportProviderProject1*
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/autoImportProviderProject1* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Same program as before
+Info seq  [hh:mm:ss:mss] getExportInfoMap: cache miss or empty; calculating new results
+Info seq  [hh:mm:ss:mss] forEachExternalModuleToImportFrom autoImportProvider: *
+Info seq  [hh:mm:ss:mss] getExportInfoMap: done in * ms
+Info seq  [hh:mm:ss:mss] collectAutoImports: resolved 0 module specifiers, plus 0 ambient and 0 from cache
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
+Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
 Info seq  [hh:mm:ss:mss] response:
@@ -377,10 +403,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
+      "performanceData": {
+        "updateGraphDurationMs": *
+      },
       "body": {
-        "flags": 0,
+        "flags": 1,
         "isGlobalCompletion": true,
         "isMemberCompletion": false,
         "isNewIdentifierLocation": false,
@@ -1057,9 +1086,23 @@ Info seq  [hh:mm:ss:mss] response:
         ]
       }
     }
+After Request
+Projects::
+/dev/null/autoImportProviderProject1* (AutoImportProvider) *changed*
+    projectStateVersion: 2
+    projectProgramVersion: 1
+    dirty: false *changed*
+/dev/null/inferredProject1* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+/dev/null/inferredProject2* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+    autoImportProviderHost: /dev/null/autoImportProviderProject1*
+
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1075,12 +1118,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
+After Request
+Projects::
+/dev/null/autoImportProviderProject1* (AutoImportProvider) *changed*
+    projectStateVersion: 3 *changed*
+    projectProgramVersion: 1
+    dirty: true *changed*
+/dev/null/inferredProject1* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+/dev/null/inferredProject2* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+    autoImportProviderHost: /dev/null/autoImportProviderProject1*
+
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1096,12 +1153,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1114,13 +1171,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1133,7 +1190,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
@@ -1155,7 +1212,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1168,13 +1225,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1190,7 +1247,7 @@ Info seq  [hh:mm:ss:mss] request:
     }
 Info seq  [hh:mm:ss:mss] AutoImportProviderProject: found 1 root files in 1 dependencies 0 referenced projects in * ms
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/autoImportProviderProject1*
-Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/autoImportProviderProject1* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/autoImportProviderProject1* projectStateVersion: 3 projectProgramVersion: 1 structureChanged: false structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Same program as before
 Info seq  [hh:mm:ss:mss] forEachExternalModuleToImportFrom autoImportProvider: *
 Info seq  [hh:mm:ss:mss] response:
@@ -1198,7 +1255,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1208,7 +1265,7 @@ Info seq  [hh:mm:ss:mss] response:
 After Request
 Projects::
 /dev/null/autoImportProviderProject1* (AutoImportProvider) *changed*
-    projectStateVersion: 2
+    projectStateVersion: 3
     projectProgramVersion: 1
     dirty: false *changed*
 /dev/null/inferredProject1* (Inferred)
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_networkPaths.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_networkPaths.js
index 96bd598d171f9..d7bd8816227fe 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_networkPaths.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_networkPaths.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "module": "commonjs",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [//tsclient/home/src/solution/project/index.ts]
 S3
 
@@ -29,7 +45,7 @@ export * from "./clients/s3";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "//tsclient/home/src/solution/project/node_modules/aws-sdk/package.json"
@@ -43,7 +59,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: //tsclient/home/src/so
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: //tsclient/home/src/solution/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: //tsclient/home/src/solution/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: //tsclient/home/src/solution/project/node_modules/aws-sdk/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -57,18 +73,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: //t
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	//tsclient/home/src/solution/project/node_modules/aws-sdk/package.json SVC-1-0 "{ \"name\": \"aws-sdk\", \"version\": \"2.0.0\", \"main\": \"index.js\" }"
 
 
-	/home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '/home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '/home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '/home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '/home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -85,7 +101,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -101,12 +117,12 @@ watchedFiles::
   {"pollingInterval":2000}
 //tsclient/home/src/solution/project/node_modules/tsconfig.json: *new*
   {"pollingInterval":2000}
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 
 watchedDirectoriesRecursive::
 //tsclient/home/src/solution/node_modules/@types: *new*
@@ -128,22 +144,22 @@ ScriptInfos::
     version: SVC-1-0
     containingProjects: 1
         /dev/null/inferredProject1* *default*
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "//tsclient/home/src/solution/project/index.ts"
@@ -162,18 +178,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: //t
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	//tsclient/home/src/solution/project/index.ts SVC-1-0 "S3"
 
 
-	/home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '/home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '/home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '/home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '/home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Root file specified for compilation
 
@@ -223,7 +239,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -254,12 +270,12 @@ watchedFiles::
   {"pollingInterval":250}
 //tsclient/home/src/solution/project/tsconfig.json: *new*
   {"pollingInterval":2000}
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 
 watchedDirectoriesRecursive::
 //tsclient/home/src/solution/node_modules/@types:
@@ -304,17 +320,17 @@ ScriptInfos::
     version: SVC-1-0
     containingProjects: 1
         /dev/null/inferredProject1* *default*
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -322,7 +338,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -339,7 +355,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -358,7 +374,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "//tsclient/home/src/solution/project/index.ts",
@@ -370,6 +386,16 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] getCompletionData: Get current token: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Is inside comment: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Get previous token: *
+Info seq  [hh:mm:ss:mss] AutoImportProviderProject: found 1 root files in 1 dependencies 0 referenced projects in * ms
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/autoImportProviderProject1*
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/autoImportProviderProject1* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Same program as before
+Info seq  [hh:mm:ss:mss] getExportInfoMap: cache miss or empty; calculating new results
+Info seq  [hh:mm:ss:mss] forEachExternalModuleToImportFrom autoImportProvider: *
+Info seq  [hh:mm:ss:mss] getExportInfoMap: done in * ms
+Info seq  [hh:mm:ss:mss] collectAutoImports: resolved 0 module specifiers, plus 0 ambient and 0 from cache
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
+Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
 Info seq  [hh:mm:ss:mss] response:
@@ -377,10 +403,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
+      "performanceData": {
+        "updateGraphDurationMs": *
+      },
       "body": {
-        "flags": 0,
+        "flags": 1,
         "isGlobalCompletion": true,
         "isMemberCompletion": false,
         "isNewIdentifierLocation": false,
@@ -1057,9 +1086,23 @@ Info seq  [hh:mm:ss:mss] response:
         ]
       }
     }
+After Request
+Projects::
+/dev/null/autoImportProviderProject1* (AutoImportProvider) *changed*
+    projectStateVersion: 2
+    projectProgramVersion: 1
+    dirty: false *changed*
+/dev/null/inferredProject1* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+/dev/null/inferredProject2* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+    autoImportProviderHost: /dev/null/autoImportProviderProject1*
+
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1075,12 +1118,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
+After Request
+Projects::
+/dev/null/autoImportProviderProject1* (AutoImportProvider) *changed*
+    projectStateVersion: 3 *changed*
+    projectProgramVersion: 1
+    dirty: true *changed*
+/dev/null/inferredProject1* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+/dev/null/inferredProject2* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+    autoImportProviderHost: /dev/null/autoImportProviderProject1*
+
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1096,12 +1153,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "//tsclient/home/src/solution/project/index.ts",
@@ -1114,13 +1171,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "//tsclient/home/src/solution/project/index.ts",
@@ -1133,7 +1190,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
@@ -1155,7 +1212,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "//tsclient/home/src/solution/project/index.ts",
@@ -1168,13 +1225,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "//tsclient/home/src/solution/project/index.ts",
@@ -1190,7 +1247,7 @@ Info seq  [hh:mm:ss:mss] request:
     }
 Info seq  [hh:mm:ss:mss] AutoImportProviderProject: found 1 root files in 1 dependencies 0 referenced projects in * ms
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/autoImportProviderProject1*
-Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/autoImportProviderProject1* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/autoImportProviderProject1* projectStateVersion: 3 projectProgramVersion: 1 structureChanged: false structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Same program as before
 Info seq  [hh:mm:ss:mss] forEachExternalModuleToImportFrom autoImportProvider: *
 Info seq  [hh:mm:ss:mss] response:
@@ -1198,7 +1255,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1208,7 +1265,7 @@ Info seq  [hh:mm:ss:mss] response:
 After Request
 Projects::
 /dev/null/autoImportProviderProject1* (AutoImportProvider) *changed*
-    projectStateVersion: 2
+    projectStateVersion: 3
     projectProgramVersion: 1
     dirty: false *changed*
 /dev/null/inferredProject1* (Inferred)
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_symlinks.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_symlinks.js
index dc7b19a5fa6fe..23671218b35ea 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_symlinks.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_symlinks.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "module": "commonjs",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 ServerRuntimeMetaFunction
 
@@ -31,7 +47,7 @@ export declare function ServerRuntimeMetaFunction(): void;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/.store/@remix-run-server-runtime-virtual-c72daf0d/package/package.json"
@@ -49,7 +65,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/.store/@remix-run-server-runtime-virtual-c72daf0d/package/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -67,18 +83,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/.store/@remix-run-server-runtime-virtual-c72daf0d/package/package.json SVC-1-0 "{\n  \"name\": \"@remix-run/server-runtime\",\n  \"version\": \"0.0.0\",\n  \"main\": \"index.js\"\n}"
 
 
-	../../../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -95,7 +111,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -103,12 +119,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/.store/@remix-run-server-runtime-virtual-c72daf0d/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/.store/@remix-run-server-runtime-virtual-c72daf0d/package/jsconfig.json: *new*
@@ -146,15 +162,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -165,7 +181,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -184,18 +200,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-1-0 "ServerRuntimeMetaFunction"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Root file specified for compilation
 
@@ -238,7 +254,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -247,12 +263,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/.store/@remix-run-server-runtime-virtual-c72daf0d/jsconfig.json:
@@ -309,17 +325,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -339,7 +355,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -356,7 +372,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -375,7 +391,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -404,7 +420,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1103,7 +1119,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1119,7 +1135,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
@@ -1138,7 +1154,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1154,12 +1170,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1172,13 +1188,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1191,7 +1207,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
@@ -1213,7 +1229,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1226,13 +1242,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1256,7 +1272,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_symlinks2.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_symlinks2.js
index 7f279606fe0a6..5307025442ca7 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_symlinks2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_symlinks2.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "module": "commonjs",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [c:/workspaces/project/index.ts]
 ServerRuntimeMetaFunction
 
@@ -37,7 +53,7 @@ export declare function ServerRuntimeMetaFunction(): void;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "c:/workspaces/project/node_modules/.store/aws-sdk-virtual-adfe098/package/package.json"
@@ -55,7 +71,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/workspaces/project/
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/workspaces/project/node_modules/.store/aws-sdk-virtual-adfe098/package/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -73,18 +89,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	c:/workspaces/project/node_modules/.store/aws-sdk-virtual-adfe098/package/package.json SVC-1-0 "{ \"name\": \"aws-sdk\", \"version\": \"2.0.0\", \"main\": \"index.js\" }"
 
 
-	/home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '/home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '/home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '/home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '/home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -101,7 +117,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -109,12 +125,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 c:/workspaces/project/node_modules/.store/aws-sdk-virtual-adfe098/jsconfig.json: *new*
   {"pollingInterval":2000}
 c:/workspaces/project/node_modules/.store/aws-sdk-virtual-adfe098/package/jsconfig.json: *new*
@@ -152,15 +168,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -171,7 +187,7 @@ c:/workspaces/project/node_modules/.store/aws-sdk-virtual-adfe098/package/packag
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "c:/workspaces/project/index.ts"
@@ -190,18 +206,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	c:/workspaces/project/index.ts SVC-1-0 "ServerRuntimeMetaFunction"
 
 
-	/home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '/home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '/home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '/home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '/home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Root file specified for compilation
 
@@ -249,7 +265,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -258,12 +274,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 c:/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 c:/workspaces/project/node_modules/.store/aws-sdk-virtual-adfe098/jsconfig.json:
@@ -324,17 +340,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -358,7 +374,7 @@ c:/workspaces/project/node_modules/@remix-run/server-runtime/index.d.ts *new*
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -375,7 +391,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -394,7 +410,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "c:/workspaces/project/index.ts",
@@ -423,7 +439,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1122,7 +1138,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1138,7 +1154,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
@@ -1157,7 +1173,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1173,12 +1189,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "c:/workspaces/project/index.ts",
@@ -1191,13 +1207,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "c:/workspaces/project/index.ts",
@@ -1210,7 +1226,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
@@ -1232,7 +1248,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "c:/workspaces/project/index.ts",
@@ -1245,13 +1261,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "c:/workspaces/project/index.ts",
@@ -1275,7 +1291,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_windowsPaths.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_windowsPaths.js
index 8ff7f33f15033..43153bf698f0e 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_windowsPaths.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportFileExcludePatterns_windowsPaths.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "module": "commonjs",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [c:/workspaces/project/index.ts]
 S3
 
@@ -29,7 +45,7 @@ export * from "./clients/s3";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "c:/workspaces/project/node_modules/aws-sdk/package.json"
@@ -43,7 +59,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/workspaces/project/
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/workspaces/project/node_modules/aws-sdk/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -57,18 +73,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	c:/workspaces/project/node_modules/aws-sdk/package.json SVC-1-0 "{ \"name\": \"aws-sdk\", \"version\": \"2.0.0\", \"main\": \"index.js\" }"
 
 
-	/home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '/home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '/home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '/home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '/home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -85,7 +101,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -93,12 +109,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 c:/workspaces/project/node_modules/aws-sdk/jsconfig.json: *new*
   {"pollingInterval":2000}
 c:/workspaces/project/node_modules/aws-sdk/tsconfig.json: *new*
@@ -124,15 +140,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -143,7 +159,7 @@ c:/workspaces/project/node_modules/aws-sdk/package.json (Open) *new*
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "c:/workspaces/project/index.ts"
@@ -162,18 +178,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	c:/workspaces/project/index.ts SVC-1-0 "S3"
 
 
-	/home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '/home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '/home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '/home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '/home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Root file specified for compilation
 
@@ -223,7 +239,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -232,12 +248,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 c:/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 c:/workspaces/project/node_modules/aws-sdk/clients/package.json: *new*
@@ -288,17 +304,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -322,7 +338,7 @@ c:/workspaces/project/node_modules/aws-sdk/package.json (Open)
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -339,7 +355,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -358,7 +374,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "c:/workspaces/project/index.ts",
@@ -370,6 +386,16 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] getCompletionData: Get current token: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Is inside comment: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Get previous token: *
+Info seq  [hh:mm:ss:mss] AutoImportProviderProject: found 1 root files in 1 dependencies 0 referenced projects in * ms
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/autoImportProviderProject1*
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/autoImportProviderProject1* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Same program as before
+Info seq  [hh:mm:ss:mss] getExportInfoMap: cache miss or empty; calculating new results
+Info seq  [hh:mm:ss:mss] forEachExternalModuleToImportFrom autoImportProvider: *
+Info seq  [hh:mm:ss:mss] getExportInfoMap: done in * ms
+Info seq  [hh:mm:ss:mss] collectAutoImports: resolved 0 module specifiers, plus 0 ambient and 0 from cache
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
+Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
 Info seq  [hh:mm:ss:mss] response:
@@ -377,10 +403,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
+      "performanceData": {
+        "updateGraphDurationMs": *
+      },
       "body": {
-        "flags": 0,
+        "flags": 1,
         "isGlobalCompletion": true,
         "isMemberCompletion": false,
         "isNewIdentifierLocation": false,
@@ -1057,9 +1086,23 @@ Info seq  [hh:mm:ss:mss] response:
         ]
       }
     }
+After Request
+Projects::
+/dev/null/autoImportProviderProject1* (AutoImportProvider) *changed*
+    projectStateVersion: 2
+    projectProgramVersion: 1
+    dirty: false *changed*
+/dev/null/inferredProject1* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+/dev/null/inferredProject2* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+    autoImportProviderHost: /dev/null/autoImportProviderProject1*
+
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1075,12 +1118,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
+After Request
+Projects::
+/dev/null/autoImportProviderProject1* (AutoImportProvider) *changed*
+    projectStateVersion: 3 *changed*
+    projectProgramVersion: 1
+    dirty: true *changed*
+/dev/null/inferredProject1* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+/dev/null/inferredProject2* (Inferred)
+    projectStateVersion: 1
+    projectProgramVersion: 1
+    autoImportProviderHost: /dev/null/autoImportProviderProject1*
+
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1096,12 +1153,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "c:/workspaces/project/index.ts",
@@ -1114,13 +1171,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "c:/workspaces/project/index.ts",
@@ -1133,7 +1190,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
@@ -1155,7 +1212,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "c:/workspaces/project/index.ts",
@@ -1168,13 +1225,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "c:/workspaces/project/index.ts",
@@ -1190,7 +1247,7 @@ Info seq  [hh:mm:ss:mss] request:
     }
 Info seq  [hh:mm:ss:mss] AutoImportProviderProject: found 1 root files in 1 dependencies 0 referenced projects in * ms
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/autoImportProviderProject1*
-Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/autoImportProviderProject1* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/autoImportProviderProject1* projectStateVersion: 3 projectProgramVersion: 1 structureChanged: false structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Same program as before
 Info seq  [hh:mm:ss:mss] forEachExternalModuleToImportFrom autoImportProvider: *
 Info seq  [hh:mm:ss:mss] response:
@@ -1198,7 +1255,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1208,7 +1265,7 @@ Info seq  [hh:mm:ss:mss] response:
 After Request
 Projects::
 /dev/null/autoImportProviderProject1* (AutoImportProvider) *changed*
-    projectStateVersion: 2
+    projectStateVersion: 3
     projectProgramVersion: 1
     dirty: false *changed*
 /dev/null/inferredProject1* (Inferred)
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportNodeModuleSymlinkRenamed.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportNodeModuleSymlinkRenamed.js
index fdb0a266e5f60..fd63a30c7d5ba 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportNodeModuleSymlinkRenamed.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportNodeModuleSymlinkRenamed.js
@@ -1,16 +1,37 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "composite": true,
+          "module": "esnext",
+          "moduleResolution": "bundler",
+          "rootDir": "/home/src/workspaces/solution/packages/web/src",
+          "outDir": "/home/src/workspaces/solution/packages/web/dist",
+          "emitDeclarationOnly": true,
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/solution/node_modules/@monorepo/utils] symlink(/home/src/workspaces/solution/packages/utils)
 //// [/home/src/workspaces/solution/node_modules/utils] symlink(/home/src/workspaces/solution/packages/utils)
 //// [/home/src/workspaces/solution/node_modules/web] symlink(/home/src/workspaces/solution/packages/web)
@@ -33,6 +54,7 @@ export function gainUtility() { return 0; }
 //// [/home/src/workspaces/solution/packages/utils/tsconfig.json]
 {
     "compilerOptions": {
+        "lib": ["es5"],
         "composite": true,
         "module": "nodenext",
         "rootDir": "src",
@@ -56,6 +78,7 @@ gainUtility
 //// [/home/src/workspaces/solution/packages/web/tsconfig.json]
 {
     "compilerOptions": {
+        "lib": ["es5"],
         "composite": true,
         "module": "esnext",
         "moduleResolution": "bundler",
@@ -72,7 +95,7 @@ gainUtility
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/solution/package.json"
@@ -84,7 +107,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/solution/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/solution/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/solution/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -94,18 +117,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/solution/package.json SVC-1-0 "{\n    \"name\": \"monorepo\",\n    \"workspaces\": [\"packages/*\"]\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -123,7 +146,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -131,12 +154,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/solution/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/solution/package.json: *new*
@@ -157,15 +180,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -176,7 +199,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/solution/packages/web/src/index.ts"
@@ -191,6 +214,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/solution/packages/web/tsco
   "/home/src/workspaces/solution/packages/web/src/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "composite": true,
   "module": 99,
   "moduleResolution": 100,
@@ -224,6 +250,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/solution/packages/utils/ts
   "/home/src/workspaces/solution/packages/utils/src/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "composite": true,
   "module": 199,
   "rootDir": "/home/src/workspaces/solution/packages/utils/src",
@@ -245,18 +274,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/solution/packages/web/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/solution/packages/web/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/solution/packages/web/src/index.ts SVC-1-0 "gainUtility"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/index.ts
 	  Matched by include pattern 'src' in 'tsconfig.json'
 
@@ -319,7 +348,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -328,12 +357,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/solution/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/solution/package.json:
@@ -379,17 +408,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/solution/packages/web/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/solution/packages/web/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -409,7 +438,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -424,7 +453,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -444,7 +473,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/solution/packages/web/src/index.ts",
@@ -457,13 +486,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/solution/packages/web/src/index.ts",
@@ -476,7 +505,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -498,7 +527,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/solution/packages/web/src/index.ts",
@@ -511,13 +540,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/solution/packages/web/src/index.ts",
@@ -543,7 +572,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -575,12 +604,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/solution/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/solution/package.json:
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportPackageJsonFilterExistingImport1.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportPackageJsonFilterExistingImport1.js
index d93c56426aa81..b7bdaec3ac074 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportPackageJsonFilterExistingImport1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportPackageJsonFilterExistingImport1.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "module": "preserve",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import { useState } from "react";
 useMemo
@@ -25,7 +41,7 @@ export declare function useState(): void;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/@types/react/index.d.ts"
@@ -47,7 +63,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/react 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/react 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/react/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
@@ -67,18 +83,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/react/index.d.ts SVC-1-0 "export declare function useMemo(): void;\nexport declare function useState(): void;"
 
 
-	../../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.d.ts
 	  Root file specified for compilation
 	  Entry point for implicit type library 'react'
@@ -96,7 +112,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -104,12 +120,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@types/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/package.json: *new*
@@ -157,15 +173,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -176,7 +192,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -201,19 +217,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/react/index.d.ts SVC-1-0 "export declare function useMemo(): void;\nexport declare function useState(): void;"
 	/home/src/workspaces/project/index.ts SVC-1-0 "import { useState } from \"react\";\nuseMemo"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/@types/react/index.d.ts
 	  Imported via "react" from file 'index.ts'
 	  Entry point for implicit type library 'react'
@@ -231,18 +247,18 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
 	/home/src/workspaces/project/node_modules/@types/react/index.d.ts
 
 
-	../../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.d.ts
 	  Root file specified for compilation
 	  Entry point for implicit type library 'react'
@@ -282,7 +298,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -290,12 +306,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/package.json:
@@ -373,17 +389,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
@@ -400,7 +416,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -412,12 +428,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -430,13 +446,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -449,7 +465,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -471,7 +487,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -484,7 +500,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
@@ -507,7 +523,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -526,7 +542,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -555,7 +571,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -574,7 +590,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
@@ -603,7 +619,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -620,7 +636,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
@@ -632,15 +648,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -655,7 +671,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -672,20 +688,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -700,7 +716,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -717,20 +733,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -745,7 +761,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -757,12 +773,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -774,7 +790,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferred
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-1-3 "useMemo"
@@ -786,7 +802,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -803,7 +819,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -816,7 +832,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true,
       "body": [
         {
@@ -838,7 +854,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -851,13 +867,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -876,7 +892,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportPackageJsonFilterExistingImport2.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportPackageJsonFilterExistingImport2.js
index a38c6d2ce17cd..9dd42fb32254d 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportPackageJsonFilterExistingImport2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportPackageJsonFilterExistingImport2.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "module": "preserve",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 useMemo
 
@@ -24,7 +40,7 @@ export declare function useState(): void;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/@types/react/index.d.ts"
@@ -46,7 +62,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/react 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/react 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/react/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
@@ -66,18 +82,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/react/index.d.ts SVC-1-0 "export declare function useMemo(): void;\nexport declare function useState(): void;"
 
 
-	../../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.d.ts
 	  Root file specified for compilation
 	  Entry point for implicit type library 'react'
@@ -95,7 +111,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -103,12 +119,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@types/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/package.json: *new*
@@ -156,15 +172,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -175,7 +191,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -200,19 +216,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-1-0 "useMemo"
 	/home/src/workspaces/project/node_modules/@types/react/index.d.ts SVC-1-0 "export declare function useMemo(): void;\nexport declare function useState(): void;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Root file specified for compilation
 	node_modules/@types/react/index.d.ts
@@ -229,18 +245,18 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
 	/home/src/workspaces/project/node_modules/@types/react/index.d.ts
 
 
-	../../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.d.ts
 	  Root file specified for compilation
 	  Entry point for implicit type library 'react'
@@ -280,7 +296,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -288,12 +304,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/package.json:
@@ -371,17 +387,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
@@ -398,7 +414,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -410,12 +426,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -428,13 +444,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -447,7 +463,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -469,7 +485,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -482,13 +498,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -507,13 +523,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -530,7 +546,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -542,15 +558,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -565,7 +581,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -582,20 +598,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -610,7 +626,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -625,13 +641,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -648,20 +664,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -676,7 +692,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -691,13 +707,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -714,20 +730,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -742,7 +758,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -757,13 +773,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -780,20 +796,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -808,7 +824,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -823,13 +839,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -846,20 +862,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -874,7 +890,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -889,13 +905,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -912,20 +928,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -940,7 +956,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -955,13 +971,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 20,
+      "seq": 21,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -978,20 +994,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 20,
+      "request_seq": 21,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1006,7 +1022,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 21,
+      "seq": 22,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1021,13 +1037,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 21,
+      "request_seq": 22,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 22,
+      "seq": 23,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1044,20 +1060,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 22,
+      "request_seq": 23,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1072,7 +1088,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 23,
+      "seq": 24,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1087,13 +1103,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 23,
+      "request_seq": 24,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 24,
+      "seq": 25,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1110,20 +1126,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 24,
+      "request_seq": 25,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1138,7 +1154,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 25,
+      "seq": 26,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1153,13 +1169,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 25,
+      "request_seq": 26,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 26,
+      "seq": 27,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1176,20 +1192,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 26,
+      "request_seq": 27,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1204,7 +1220,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 27,
+      "seq": 28,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1219,13 +1235,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 27,
+      "request_seq": 28,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 28,
+      "seq": 29,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1242,20 +1258,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 28,
+      "request_seq": 29,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1270,7 +1286,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 29,
+      "seq": 30,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1285,13 +1301,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 29,
+      "request_seq": 30,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 30,
+      "seq": 31,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1308,20 +1324,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 30,
+      "request_seq": 31,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1336,7 +1352,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 31,
+      "seq": 32,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1351,13 +1367,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 31,
+      "request_seq": 32,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 32,
+      "seq": 33,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1374,20 +1390,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 32,
+      "request_seq": 33,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1402,7 +1418,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 33,
+      "seq": 34,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1417,13 +1433,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 33,
+      "request_seq": 34,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 34,
+      "seq": 35,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1440,20 +1456,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 34,
+      "request_seq": 35,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1468,7 +1484,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 35,
+      "seq": 36,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1483,13 +1499,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 35,
+      "request_seq": 36,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 36,
+      "seq": 37,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1506,20 +1522,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 36,
+      "request_seq": 37,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1534,7 +1550,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 37,
+      "seq": 38,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1549,13 +1565,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 37,
+      "request_seq": 38,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 38,
+      "seq": 39,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1572,20 +1588,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 38,
+      "request_seq": 39,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1600,7 +1616,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 39,
+      "seq": 40,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1615,13 +1631,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 39,
+      "request_seq": 40,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 40,
+      "seq": 41,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1638,20 +1654,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 40,
+      "request_seq": 41,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1666,7 +1682,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 41,
+      "seq": 42,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1681,13 +1697,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 41,
+      "request_seq": 42,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 42,
+      "seq": 43,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1704,20 +1720,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 42,
+      "request_seq": 43,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1732,7 +1748,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 43,
+      "seq": 44,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1747,13 +1763,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 43,
+      "request_seq": 44,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 44,
+      "seq": 45,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1770,20 +1786,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 44,
+      "request_seq": 45,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1798,7 +1814,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 45,
+      "seq": 46,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1813,13 +1829,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 45,
+      "request_seq": 46,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 46,
+      "seq": 47,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1836,20 +1852,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 46,
+      "request_seq": 47,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1864,7 +1880,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 47,
+      "seq": 48,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1879,13 +1895,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 47,
+      "request_seq": 48,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 48,
+      "seq": 49,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1902,20 +1918,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 48,
+      "request_seq": 49,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1930,7 +1946,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 49,
+      "seq": 50,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1945,13 +1961,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 49,
+      "request_seq": 50,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 50,
+      "seq": 51,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1968,20 +1984,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 50,
+      "request_seq": 51,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1996,7 +2012,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 51,
+      "seq": 52,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2011,13 +2027,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 51,
+      "request_seq": 52,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 52,
+      "seq": 53,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2034,20 +2050,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 52,
+      "request_seq": 53,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2062,7 +2078,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 53,
+      "seq": 54,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2077,13 +2093,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 53,
+      "request_seq": 54,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 54,
+      "seq": 55,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2100,20 +2116,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 54,
+      "request_seq": 55,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2128,7 +2144,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 55,
+      "seq": 56,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2143,13 +2159,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 55,
+      "request_seq": 56,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 56,
+      "seq": 57,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2166,20 +2182,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 56,
+      "request_seq": 57,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2194,7 +2210,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 57,
+      "seq": 58,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2209,13 +2225,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 57,
+      "request_seq": 58,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 58,
+      "seq": 59,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2232,20 +2248,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 58,
+      "request_seq": 59,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2260,7 +2276,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 59,
+      "seq": 60,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2275,13 +2291,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 59,
+      "request_seq": 60,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 60,
+      "seq": 61,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2298,20 +2314,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 60,
+      "request_seq": 61,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2326,7 +2342,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 61,
+      "seq": 62,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2341,13 +2357,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 61,
+      "request_seq": 62,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 62,
+      "seq": 63,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2364,20 +2380,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 62,
+      "request_seq": 63,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2392,7 +2408,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 63,
+      "seq": 64,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2407,13 +2423,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 63,
+      "request_seq": 64,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 64,
+      "seq": 65,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2430,20 +2446,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 64,
+      "request_seq": 65,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2458,7 +2474,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 65,
+      "seq": 66,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2473,13 +2489,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 65,
+      "request_seq": 66,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 66,
+      "seq": 67,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2496,20 +2512,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 66,
+      "request_seq": 67,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2524,7 +2540,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 67,
+      "seq": 68,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2539,13 +2555,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 67,
+      "request_seq": 68,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 68,
+      "seq": 69,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2562,20 +2578,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 68,
+      "request_seq": 69,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2590,7 +2606,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 69,
+      "seq": 70,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2605,13 +2621,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 69,
+      "request_seq": 70,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 70,
+      "seq": 71,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2628,20 +2644,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 70,
+      "request_seq": 71,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2656,7 +2672,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 71,
+      "seq": 72,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2671,13 +2687,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 71,
+      "request_seq": 72,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 72,
+      "seq": 73,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2694,20 +2710,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 72,
+      "request_seq": 73,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2722,7 +2738,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 73,
+      "seq": 74,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2737,7 +2753,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 73,
+      "request_seq": 74,
       "success": true,
       "body": [
         {
@@ -2755,7 +2771,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 74,
+      "seq": 75,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2772,20 +2788,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 74,
+      "request_seq": 75,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2800,7 +2816,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 75,
+      "seq": 76,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2817,20 +2833,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 75,
+      "request_seq": 76,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2845,7 +2861,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 76,
+      "seq": 77,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2860,7 +2876,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 76,
+      "request_seq": 77,
       "success": true,
       "body": [
         {
@@ -2878,7 +2894,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 77,
+      "seq": 78,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2895,20 +2911,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 77,
+      "request_seq": 78,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2923,7 +2939,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 78,
+      "seq": 79,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -2935,12 +2951,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 78,
+      "request_seq": 79,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 79,
+      "seq": 80,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2952,7 +2968,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferred
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/react/index.d.ts SVC-1-0 "export declare function useMemo(): void;\nexport declare function useState(): void;"
@@ -2964,7 +2980,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 79,
+      "request_seq": 80,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -2981,7 +2997,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 80,
+      "seq": 81,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2994,7 +3010,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 80,
+      "request_seq": 81,
       "success": true,
       "body": [
         {
@@ -3016,7 +3032,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 81,
+      "seq": 82,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -3029,7 +3045,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 81,
+      "request_seq": 82,
       "success": true,
       "body": [
         {
@@ -3052,7 +3068,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 82,
+      "seq": 83,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -3071,7 +3087,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 82,
+      "request_seq": 83,
       "success": true,
       "body": [
         {
@@ -3100,7 +3116,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 83,
+      "seq": 84,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -3119,7 +3135,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 83,
+      "request_seq": 84,
       "success": true,
       "body": [
         {
@@ -3148,7 +3164,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 84,
+      "seq": 85,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -3165,7 +3181,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 84,
+      "request_seq": 85,
       "success": true
     }
 After Request
@@ -3177,15 +3193,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -3200,7 +3216,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 85,
+      "seq": 86,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -3217,20 +3233,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 85,
+      "request_seq": 86,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportPackageJsonFilterExistingImport3.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportPackageJsonFilterExistingImport3.js
index 57bde7a5e8e22..f08f7bdce74f8 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportPackageJsonFilterExistingImport3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportPackageJsonFilterExistingImport3.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "module": "preserve",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 readFile
 
@@ -26,7 +42,7 @@ declare module "node:fs" {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/@types/node/index.d.ts"
@@ -48,7 +64,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/node 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/node 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/node/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
@@ -68,18 +84,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/node/index.d.ts SVC-1-0 "declare module \"node:fs\" {\n    export function readFile(): void;\n    export function writeFile(): void;\n}"
 
 
-	../../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.d.ts
 	  Root file specified for compilation
 	  Entry point for implicit type library 'node'
@@ -97,7 +113,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -105,12 +121,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@types/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/node/jsconfig.json: *new*
@@ -158,15 +174,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -177,7 +193,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -202,19 +218,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-1-0 "readFile"
 	/home/src/workspaces/project/node_modules/@types/node/index.d.ts SVC-1-0 "declare module \"node:fs\" {\n    export function readFile(): void;\n    export function writeFile(): void;\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Root file specified for compilation
 	node_modules/@types/node/index.d.ts
@@ -231,18 +247,18 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
 	/home/src/workspaces/project/node_modules/@types/node/index.d.ts
 
 
-	../../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.d.ts
 	  Root file specified for compilation
 	  Entry point for implicit type library 'node'
@@ -282,7 +298,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -290,12 +306,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/node/package.json:
@@ -373,17 +389,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
@@ -400,7 +416,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -412,12 +428,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -430,13 +446,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -449,7 +465,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -471,7 +487,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -484,13 +500,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -509,13 +525,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -532,7 +548,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -544,15 +560,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -567,7 +583,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -584,20 +600,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -612,7 +628,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -627,13 +643,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -650,20 +666,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -678,7 +694,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -693,13 +709,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -716,20 +732,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -744,7 +760,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -759,13 +775,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -782,20 +798,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -810,7 +826,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -825,13 +841,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -848,20 +864,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -876,7 +892,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -891,13 +907,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -914,20 +930,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -942,7 +958,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -957,13 +973,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 20,
+      "seq": 21,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -980,20 +996,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 20,
+      "request_seq": 21,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1008,7 +1024,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 21,
+      "seq": 22,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1023,13 +1039,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 21,
+      "request_seq": 22,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 22,
+      "seq": 23,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1046,20 +1062,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 22,
+      "request_seq": 23,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1074,7 +1090,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 23,
+      "seq": 24,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1089,13 +1105,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 23,
+      "request_seq": 24,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 24,
+      "seq": 25,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1112,20 +1128,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 24,
+      "request_seq": 25,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1140,7 +1156,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 25,
+      "seq": 26,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1155,13 +1171,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 25,
+      "request_seq": 26,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 26,
+      "seq": 27,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1178,20 +1194,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 26,
+      "request_seq": 27,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1206,7 +1222,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 27,
+      "seq": 28,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1221,13 +1237,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 27,
+      "request_seq": 28,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 28,
+      "seq": 29,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1244,20 +1260,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 28,
+      "request_seq": 29,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1272,7 +1288,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 29,
+      "seq": 30,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1287,13 +1303,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 29,
+      "request_seq": 30,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 30,
+      "seq": 31,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1310,20 +1326,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 30,
+      "request_seq": 31,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1338,7 +1354,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 31,
+      "seq": 32,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1353,13 +1369,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 31,
+      "request_seq": 32,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 32,
+      "seq": 33,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1376,20 +1392,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 32,
+      "request_seq": 33,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1404,7 +1420,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 33,
+      "seq": 34,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1419,13 +1435,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 33,
+      "request_seq": 34,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 34,
+      "seq": 35,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1442,20 +1458,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 34,
+      "request_seq": 35,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1470,7 +1486,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 35,
+      "seq": 36,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1485,13 +1501,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 35,
+      "request_seq": 36,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 36,
+      "seq": 37,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1508,20 +1524,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 36,
+      "request_seq": 37,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1536,7 +1552,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 37,
+      "seq": 38,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1551,13 +1567,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 37,
+      "request_seq": 38,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 38,
+      "seq": 39,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1574,20 +1590,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 38,
+      "request_seq": 39,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1602,7 +1618,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 39,
+      "seq": 40,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1617,13 +1633,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 39,
+      "request_seq": 40,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 40,
+      "seq": 41,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1640,20 +1656,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 40,
+      "request_seq": 41,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1668,7 +1684,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 41,
+      "seq": 42,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1683,13 +1699,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 41,
+      "request_seq": 42,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 42,
+      "seq": 43,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1706,20 +1722,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 42,
+      "request_seq": 43,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1734,7 +1750,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 43,
+      "seq": 44,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1749,13 +1765,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 43,
+      "request_seq": 44,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 44,
+      "seq": 45,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1772,20 +1788,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 44,
+      "request_seq": 45,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1800,7 +1816,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 45,
+      "seq": 46,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1815,13 +1831,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 45,
+      "request_seq": 46,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 46,
+      "seq": 47,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1838,20 +1854,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 46,
+      "request_seq": 47,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1866,7 +1882,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 47,
+      "seq": 48,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1881,13 +1897,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 47,
+      "request_seq": 48,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 48,
+      "seq": 49,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1904,20 +1920,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 48,
+      "request_seq": 49,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1932,7 +1948,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 49,
+      "seq": 50,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1947,13 +1963,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 49,
+      "request_seq": 50,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 50,
+      "seq": 51,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1970,20 +1986,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 50,
+      "request_seq": 51,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -1998,7 +2014,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 51,
+      "seq": 52,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2013,13 +2029,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 51,
+      "request_seq": 52,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 52,
+      "seq": 53,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2036,20 +2052,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 52,
+      "request_seq": 53,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2064,7 +2080,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 53,
+      "seq": 54,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2079,13 +2095,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 53,
+      "request_seq": 54,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 54,
+      "seq": 55,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2102,20 +2118,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 54,
+      "request_seq": 55,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2130,7 +2146,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 55,
+      "seq": 56,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2145,13 +2161,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 55,
+      "request_seq": 56,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 56,
+      "seq": 57,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2168,20 +2184,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 56,
+      "request_seq": 57,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2196,7 +2212,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 57,
+      "seq": 58,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2211,13 +2227,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 57,
+      "request_seq": 58,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 58,
+      "seq": 59,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2234,20 +2250,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 58,
+      "request_seq": 59,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2262,7 +2278,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 59,
+      "seq": 60,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2277,13 +2293,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 59,
+      "request_seq": 60,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 60,
+      "seq": 61,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2300,20 +2316,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 60,
+      "request_seq": 61,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2328,7 +2344,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 61,
+      "seq": 62,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2343,13 +2359,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 61,
+      "request_seq": 62,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 62,
+      "seq": 63,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2366,20 +2382,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 62,
+      "request_seq": 63,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2394,7 +2410,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 63,
+      "seq": 64,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2409,13 +2425,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 63,
+      "request_seq": 64,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 64,
+      "seq": 65,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2432,20 +2448,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 64,
+      "request_seq": 65,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2460,7 +2476,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 65,
+      "seq": 66,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2475,13 +2491,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 65,
+      "request_seq": 66,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 66,
+      "seq": 67,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2498,20 +2514,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 66,
+      "request_seq": 67,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2526,7 +2542,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 67,
+      "seq": 68,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2541,13 +2557,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 67,
+      "request_seq": 68,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 68,
+      "seq": 69,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2564,20 +2580,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 68,
+      "request_seq": 69,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2592,7 +2608,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 69,
+      "seq": 70,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2607,13 +2623,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 69,
+      "request_seq": 70,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 70,
+      "seq": 71,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2630,20 +2646,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 70,
+      "request_seq": 71,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2658,7 +2674,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 71,
+      "seq": 72,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2673,13 +2689,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 71,
+      "request_seq": 72,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 72,
+      "seq": 73,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2696,20 +2712,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 72,
+      "request_seq": 73,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2724,7 +2740,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 73,
+      "seq": 74,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2739,13 +2755,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 73,
+      "request_seq": 74,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 74,
+      "seq": 75,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2762,20 +2778,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 74,
+      "request_seq": 75,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2790,7 +2806,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 75,
+      "seq": 76,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2805,13 +2821,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 75,
+      "request_seq": 76,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 76,
+      "seq": 77,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2828,20 +2844,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 76,
+      "request_seq": 77,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2856,7 +2872,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 77,
+      "seq": 78,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2871,13 +2887,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 77,
+      "request_seq": 78,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 78,
+      "seq": 79,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2894,20 +2910,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 78,
+      "request_seq": 79,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -2922,7 +2938,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 79,
+      "seq": 80,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2937,7 +2953,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 79,
+      "request_seq": 80,
       "success": true,
       "body": [
         {
@@ -2955,7 +2971,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 80,
+      "seq": 81,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2972,20 +2988,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 80,
+      "request_seq": 81,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -3000,7 +3016,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 81,
+      "seq": 82,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -3017,20 +3033,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 81,
+      "request_seq": 82,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -3045,7 +3061,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 82,
+      "seq": 83,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -3060,7 +3076,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 82,
+      "request_seq": 83,
       "success": true,
       "body": [
         {
@@ -3078,7 +3094,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 83,
+      "seq": 84,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -3095,20 +3111,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 83,
+      "request_seq": 84,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -3123,7 +3139,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 84,
+      "seq": 85,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -3135,12 +3151,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 84,
+      "request_seq": 85,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 85,
+      "seq": 86,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -3152,7 +3168,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferred
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-1-40 "import { writeFile } from \"node:fs\";\nreadFile"
@@ -3164,7 +3180,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 85,
+      "request_seq": 86,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -3181,7 +3197,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 86,
+      "seq": 87,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -3194,7 +3210,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 86,
+      "request_seq": 87,
       "success": true,
       "body": [
         {
@@ -3216,7 +3232,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 87,
+      "seq": 88,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -3229,7 +3245,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 87,
+      "request_seq": 88,
       "success": true,
       "body": [
         {
@@ -3252,7 +3268,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 88,
+      "seq": 89,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -3271,7 +3287,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 88,
+      "request_seq": 89,
       "success": true,
       "body": [
         {
@@ -3300,7 +3316,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 89,
+      "seq": 90,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -3319,7 +3335,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 89,
+      "request_seq": 90,
       "success": true,
       "body": [
         {
@@ -3348,7 +3364,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 90,
+      "seq": 91,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -3365,7 +3381,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 90,
+      "request_seq": 91,
       "success": true
     }
 After Request
@@ -3377,15 +3393,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
@@ -3400,7 +3416,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 91,
+      "seq": 92,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -3417,20 +3433,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 91,
+      "request_seq": 92,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider1.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider1.js
index d5339918129ac..f71b3dc6247c4 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider1.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 PatternValidator
 
@@ -24,12 +39,12 @@ export class PatternValidator {}
 { "dependencies": { "@angular/forms": "*" } }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{}
+{ "compilerOptions": { "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/@angular/forms/package.json"
@@ -45,7 +60,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@angular/forms/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -61,18 +76,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@angular/forms/package.json SVC-1-0 "{ \"name\": \"@angular/forms\", \"typings\": \"./forms.d.ts\" }"
 
 
-	../../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -89,7 +104,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -97,12 +112,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@angular/forms/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@angular/forms/tsconfig.json: *new*
@@ -134,15 +149,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -153,7 +168,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -168,6 +183,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -191,18 +209,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-1-0 "PatternValidator"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 
@@ -265,7 +283,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -274,12 +292,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@angular/forms/forms.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@angular/forms/jsconfig.json:
@@ -330,17 +348,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -360,7 +378,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -396,12 +414,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -413,12 +431,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -431,13 +449,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -450,7 +468,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
@@ -472,7 +490,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -485,13 +503,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -513,7 +531,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
@@ -542,12 +560,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@angular/forms/forms.d.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@angular/forms/jsconfig.json:
@@ -589,7 +607,7 @@ watchedDirectoriesRecursive::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -606,7 +624,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
@@ -624,17 +642,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
@@ -654,7 +672,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -671,22 +689,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider2.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider2.js
index 1077a0e0db1ca..d6acfc0e1a874 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider2.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 IndirectDependency
 
@@ -31,12 +46,12 @@ export declare class IndirectDependency
 { "dependencies": { "direct-dependency": "*" } }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{}
+{ "compilerOptions": { "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/direct-dependency/package.json"
@@ -50,7 +65,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/direct-dependency/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -64,18 +79,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/direct-dependency/package.json SVC-1-0 "{ \"name\": \"direct-dependency\", \"dependencies\": { \"indirect-dependency\": \"*\" } }"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -92,7 +107,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -100,12 +115,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/direct-dependency/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/direct-dependency/tsconfig.json: *new*
@@ -131,15 +146,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -150,7 +165,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -165,6 +180,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -188,18 +206,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-1-0 "IndirectDependency"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 
@@ -269,7 +287,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -278,12 +296,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/direct-dependency/index.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/direct-dependency/jsconfig.json:
@@ -334,17 +352,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -368,7 +386,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -404,12 +422,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -421,12 +439,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -439,13 +457,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -458,7 +476,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
@@ -480,7 +498,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -493,13 +511,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -519,7 +537,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider3.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider3.js
index 4cc1786037d63..2a2bb02c5b031 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider3.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "esnext",
+          "composite": true,
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/node_modules/common-dependency/index.d.ts]
 export declare class CommonDependency {}
 
@@ -33,15 +49,15 @@ export declare class PackageDependency
 { "peerDependencies": { "package-dependency": "*" } }
 
 //// [/home/src/workspaces/project/packages/a/tsconfig.json]
-{ "compilerOptions": { "target": "esnext", "composite": true } }
+{ "compilerOptions": { "lib": ["es5"], "target": "esnext", "composite": true } }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": [], "references": [{ "path": "packages/a" }] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": [], "references": [{ "path": "packages/a" }] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/common-dependency/package.json"
@@ -55,7 +71,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/common-dependency/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -69,18 +85,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/common-dependency/package.json SVC-1-0 "{ \"name\": \"common-dependency\" }"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -97,7 +113,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -105,12 +121,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/common-dependency/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/common-dependency/tsconfig.json: *new*
@@ -136,15 +152,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -155,7 +171,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/a/index.ts"
@@ -170,6 +186,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/a/tsconfi
   "/home/src/workspaces/project/packages/a/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "target": 99,
   "composite": true,
   "configFilePath": "/home/src/workspaces/project/packages/a/tsconfig.json"
@@ -188,7 +207,6 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/a 1 undefined Config: /home/src/workspaces/project/packages/a/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/a 1 undefined Config: /home/src/workspaces/project/packages/a/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/packages/a/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/packages/a/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/a/node_modules/@types 1 undefined Project: /home/src/workspaces/project/packages/a/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/a/node_modules/@types 1 undefined Project: /home/src/workspaces/project/packages/a/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/node_modules/@types 1 undefined Project: /home/src/workspaces/project/packages/a/tsconfig.json WatchType: Type roots
@@ -199,10 +217,19 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/packages/a/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/a/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/a/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/a/index.ts SVC-1-0 ""
 
 
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 
@@ -246,71 +273,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/packages/a/index.ts",
         "configFile": "/home/src/workspaces/project/packages/a/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error",
-            "relatedInformation": [
-              {
-                "span": {
-                  "start": {
-                    "line": 1,
-                    "offset": 34
-                  },
-                  "end": {
-                    "line": 1,
-                    "offset": 42
-                  },
-                  "file": "/home/src/workspaces/project/packages/a/tsconfig.json"
-                },
-                "message": "File is default library for target specified here.",
-                "category": "message",
-                "code": 1426
-              }
-            ]
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/packages/a/tsconfig.json ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
@@ -318,7 +281,7 @@ Info seq  [hh:mm:ss:mss] Creating ConfiguredProject: /home/src/workspaces/projec
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Config file
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/a/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/autoImportProviderProject1*' (AutoImportProvider)
@@ -343,7 +306,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -352,13 +315,11 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/common-dependency/index.d.ts: *new*
   {"pollingInterval":500}
@@ -421,18 +382,21 @@ Projects::
     initialLoadPending: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+        /home/src/workspaces/project/packages/a/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+        /home/src/workspaces/project/packages/a/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/packages/a/tsconfig.json *new*
 /home/src/workspaces/project/node_modules/common-dependency/index.d.ts *new*
     version: Text-1
     containingProjects: 1
@@ -452,7 +416,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -466,7 +430,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -490,7 +454,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/a/index.ts",
@@ -521,7 +485,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -544,6 +508,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "ArrayBuffer",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "as",
             "kind": "keyword",
@@ -580,6 +556,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Boolean",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "break",
             "kind": "keyword",
@@ -616,6 +598,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "DataView",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Date",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "debugger",
             "kind": "keyword",
@@ -628,6 +622,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "decodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "decodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "default",
             "kind": "keyword",
@@ -652,12 +658,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "encodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "encodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "enum",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Error",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "eval",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "EvalError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "export",
             "kind": "keyword",
@@ -682,6 +718,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Float32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Float64Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "for",
             "kind": "keyword",
@@ -694,6 +742,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Function",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "globalThis",
             "kind": "module",
@@ -730,18 +784,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Infinity",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "instanceof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Int8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "interface",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Intl",
+            "kind": "module",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isFinite",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isNaN",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "JSON",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "keyof",
             "kind": "keyword",
@@ -754,6 +856,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Math",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "module",
             "kind": "keyword",
@@ -766,6 +874,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "NaN",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "never",
             "kind": "keyword",
@@ -790,24 +904,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Number",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "object",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Object",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "package",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "parseFloat",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "parseInt",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RangeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "readonly",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "ReferenceError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RegExp",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "return",
             "kind": "keyword",
@@ -826,6 +982,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "String",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "super",
             "kind": "keyword",
@@ -844,6 +1006,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "SyntaxError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "this",
             "kind": "keyword",
@@ -874,12 +1042,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "TypeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "typeof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Uint8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint8ClampedArray",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "undefined",
             "kind": "var",
@@ -898,6 +1096,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "URIError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "using",
             "kind": "keyword",
@@ -977,6 +1181,18 @@ Info seq  [hh:mm:ss:mss] response:
               "fileName": "/home/src/workspaces/project/node_modules/package-dependency/index.d.ts",
               "isPackageJsonImport": true
             }
+          },
+          {
+            "name": "escape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
+          },
+          {
+            "name": "unescape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
           }
         ],
         "defaultCommitCharacters": [
@@ -988,13 +1204,11 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/common-dependency/index.d.ts:
   {"pollingInterval":500}
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider4.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider4.js
index 6c66566c62e37..74d2ec446c1be 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider4.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider4.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "outDir": "/home/src/workspaces/project/b/out",
+          "composite": true,
+          "target": "esnext",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true,
+          "module": "commonjs"
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a/index.ts]
 new Shape
 
@@ -19,7 +37,7 @@ new Shape
 { "dependencies": { "b": "*" } }
 
 //// [/home/src/workspaces/project/a/tsconfig.json]
-{ "compilerOptions": { "module": "commonjs", "target": "esnext" }, "references": [{ "path": "../b" }] }
+{ "compilerOptions": { "lib": ["es5"], "module": "commonjs", "target": "esnext" }, "references": [{ "path": "../b" }] }
 
 //// [/home/src/workspaces/project/b/index.ts]
 export class Shape {}
@@ -28,12 +46,12 @@ export class Shape {}
 { "types": "out/index.d.ts" }
 
 //// [/home/src/workspaces/project/b/tsconfig.json]
-{ "compilerOptions": { "outDir": "out", "composite": true } }
+{ "compilerOptions": { "lib": ["es5"], "outDir": "out", "composite": true } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/package.json"
@@ -48,6 +66,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/a/tsconfig.json :
   "/home/src/workspaces/project/a/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 1,
   "target": 99,
   "configFilePath": "/home/src/workspaces/project/a/tsconfig.json"
@@ -78,6 +99,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/b/tsconfig.json :
   "/home/src/workspaces/project/b/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "outDir": "/home/src/workspaces/project/b/out",
   "composite": true,
   "configFilePath": "/home/src/workspaces/project/b/tsconfig.json"
@@ -86,7 +110,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/b/tsconfig.json :
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b/tsconfig.json 2000 undefined Project: /home/src/workspaces/project/a/tsconfig.json WatchType: Config file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b 1 undefined Config: /home/src/workspaces/project/b/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b 1 undefined Config: /home/src/workspaces/project/b/tsconfig.json WatchType: Wild card directory
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/a/tsconfig.json WatchType: Missing file
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a/node_modules/@types 1 undefined Project: /home/src/workspaces/project/a/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a/node_modules/@types 1 undefined Project: /home/src/workspaces/project/a/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/a/tsconfig.json WatchType: Type roots
@@ -95,10 +121,19 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/a/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/a/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/a/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a/index.ts Text-1 "new Shape"
 
 
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 
@@ -120,71 +155,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/a/package.json",
         "configFile": "/home/src/workspaces/project/a/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error",
-            "relatedInformation": [
-              {
-                "span": {
-                  "start": {
-                    "line": 1,
-                    "offset": 56
-                  },
-                  "end": {
-                    "line": 1,
-                    "offset": 64
-                  },
-                  "file": "/home/src/workspaces/project/a/tsconfig.json"
-                },
-                "message": "File is default library for target specified here.",
-                "category": "message",
-                "code": 1426
-              }
-            ]
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/a/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -193,9 +164,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -205,18 +173,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a/package.json SVC-1-0 "{ \"dependencies\": { \"b\": \"*\" } }"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -237,7 +205,7 @@ Info seq  [hh:mm:ss:mss] 	Files (1)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/a/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -256,7 +224,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -265,13 +233,11 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/a/index.ts: *new*
   {"pollingInterval":500}
@@ -319,17 +285,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/a/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/a/index.ts *new*
     version: Text-1
@@ -346,7 +315,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/index.ts"
@@ -356,7 +325,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/a/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/a/index.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/a/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/a/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -377,18 +346,16 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/a/jsconfig.json:
   {"pollingInterval":2000}
@@ -438,17 +405,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/a/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/a/index.ts (Open) *changed*
     open: true *changed*
@@ -466,7 +436,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -478,12 +448,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/index.ts",
@@ -496,13 +466,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/index.ts",
@@ -515,7 +485,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -537,7 +507,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/index.ts",
@@ -550,13 +520,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/index.ts",
@@ -591,7 +561,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -624,13 +594,11 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/a/jsconfig.json:
   {"pollingInterval":2000}
@@ -681,17 +649,20 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/a/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/a/index.ts (Open)
     version: Text-1
@@ -709,7 +680,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/index.ts",
@@ -726,7 +697,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -748,17 +719,20 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/a/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/a/index.ts (Open) *changed*
     version: SVC-2-1 *changed*
@@ -776,7 +750,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/index.ts",
@@ -793,22 +767,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/a/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/a/index.ts (Open) *changed*
     version: SVC-2-2 *changed*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider5.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider5.js
index 94ad6bd3029b6..5124dfe711500 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider5.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider5.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 useForm
 
@@ -29,7 +44,7 @@ export declare function useForm(): void;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/package.json"
@@ -41,7 +56,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -51,18 +66,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/package.json SVC-1-0 "{ \"dependencies\": { \"react-hook-form\": \"*\" } }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -106,7 +121,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -115,12 +130,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/react-hook-form/dist/index.d.ts: *new*
@@ -154,15 +169,15 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -181,7 +196,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -198,18 +213,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-1-0 "useForm"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Root file specified for compilation
 
@@ -260,7 +275,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -269,12 +284,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/react-hook-form/dist/index.d.ts:
@@ -320,17 +335,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -356,7 +371,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -368,12 +383,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -386,13 +401,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -405,7 +420,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -427,7 +442,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -440,13 +455,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -468,7 +483,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -519,12 +534,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/react-hook-form/dist/index.d.ts:
@@ -556,7 +571,7 @@ watchedDirectoriesRecursive::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -573,7 +588,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -595,17 +610,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
@@ -631,7 +646,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -648,22 +663,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
@@ -689,7 +704,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -706,22 +721,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
@@ -747,7 +762,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -764,22 +779,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider6.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider6.js
index fc1f1e830fc31..e4b496c20cd32 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider6.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider6.js
@@ -1,118 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2015.collection.d.ts]
-lib.es2015.collection.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2015.core.d.ts]
-lib.es2015.core.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2015.d.ts]
-lib.es2015.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2015.generator.d.ts]
-lib.es2015.generator.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2015.iterable.d.ts]
-lib.es2015.iterable.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2015.promise.d.ts]
-lib.es2015.promise.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2015.proxy.d.ts]
-lib.es2015.proxy.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2015.reflect.d.ts]
-lib.es2015.reflect.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2015.symbol.d.ts]
-lib.es2015.symbol.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2015.symbol.wellknown.d.ts]
-lib.es2015.symbol.wellknown.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2016.array.include.d.ts]
-lib.es2016.array.include.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2016.d.ts]
-lib.es2016.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2016.intl.d.ts]
-lib.es2016.intl.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2017.arraybuffer.d.ts]
-lib.es2017.arraybuffer.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2017.d.ts]
-lib.es2017.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2017.date.d.ts]
-lib.es2017.date.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2017.intl.d.ts]
-lib.es2017.intl.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2017.object.d.ts]
-lib.es2017.object.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2017.sharedmemory.d.ts]
-lib.es2017.sharedmemory.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2017.string.d.ts]
-lib.es2017.string.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2017.typedarrays.d.ts]
-lib.es2017.typedarrays.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2018.asyncgenerator.d.ts]
-lib.es2018.asyncgenerator.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2018.asynciterable.d.ts]
-lib.es2018.asynciterable.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2018.d.ts]
-lib.es2018.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2018.intl.d.ts]
-lib.es2018.intl.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2018.promise.d.ts]
-lib.es2018.promise.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2018.regexp.d.ts]
-lib.es2018.regexp.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2019.array.d.ts]
-lib.es2019.array.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2019.d.ts]
-lib.es2019.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2019.intl.d.ts]
-lib.es2019.intl.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2019.object.d.ts]
-lib.es2019.object.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2019.string.d.ts]
-lib.es2019.string.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es2019.symbol.d.ts]
-lib.es2019.symbol.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.es5.d.ts]
-lib.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "commonjs",
+          "lib": [
+            "es2019"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 Component
 
@@ -131,7 +45,7 @@ import "react";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -217,7 +131,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (38)
-	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.es2015.d.ts Text-1 lib.es2015.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.es2016.d.ts Text-1 lib.es2016.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.es2017.d.ts Text-1 lib.es2017.d.ts-Text
@@ -370,7 +284,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/react/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
@@ -381,20 +294,128 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
-Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+Info seq  [hh:mm:ss:mss] 	Files (38)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.d.ts Text-1 lib.es2015.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2016.d.ts Text-1 lib.es2016.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2017.d.ts Text-1 lib.es2017.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2018.d.ts Text-1 lib.es2018.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2019.d.ts Text-1 lib.es2019.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.core.d.ts Text-1 lib.es2015.core.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.collection.d.ts Text-1 lib.es2015.collection.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.generator.d.ts Text-1 lib.es2015.generator.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.iterable.d.ts Text-1 lib.es2015.iterable.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.promise.d.ts Text-1 lib.es2015.promise.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.proxy.d.ts Text-1 lib.es2015.proxy.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.reflect.d.ts Text-1 lib.es2015.reflect.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.symbol.d.ts Text-1 lib.es2015.symbol.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.symbol.wellknown.d.ts Text-1 lib.es2015.symbol.wellknown.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2016.array.include.d.ts Text-1 lib.es2016.array.include.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2016.intl.d.ts Text-1 lib.es2016.intl.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2017.arraybuffer.d.ts Text-1 lib.es2017.arraybuffer.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2017.date.d.ts Text-1 lib.es2017.date.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2017.object.d.ts Text-1 lib.es2017.object.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2017.sharedmemory.d.ts Text-1 lib.es2017.sharedmemory.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2017.string.d.ts Text-1 lib.es2017.string.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2017.intl.d.ts Text-1 lib.es2017.intl.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2017.typedarrays.d.ts Text-1 lib.es2017.typedarrays.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2018.asyncgenerator.d.ts Text-1 lib.es2018.asyncgenerator.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2018.asynciterable.d.ts Text-1 lib.es2018.asynciterable.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2018.intl.d.ts Text-1 lib.es2018.intl.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2018.promise.d.ts Text-1 lib.es2018.promise.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2018.regexp.d.ts Text-1 lib.es2018.regexp.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2019.array.d.ts Text-1 lib.es2019.array.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2019.object.d.ts Text-1 lib.es2019.object.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2019.string.d.ts Text-1 lib.es2019.string.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2019.symbol.d.ts Text-1 lib.es2019.symbol.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2019.intl.d.ts Text-1 lib.es2019.intl.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\", \"lib\": [\"es2019\"] } }"
 	/home/src/workspaces/project/node_modules/@types/react/index.d.ts Text-1 "export declare function Component(): void;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library referenced via 'es5' from file '../../tslibs/TS/Lib/lib.es2015.d.ts'
+	../../tslibs/TS/Lib/lib.es2015.d.ts
+	  Library referenced via 'es2015' from file '../../tslibs/TS/Lib/lib.es2016.d.ts'
+	../../tslibs/TS/Lib/lib.es2016.d.ts
+	  Library referenced via 'es2016' from file '../../tslibs/TS/Lib/lib.es2017.d.ts'
+	../../tslibs/TS/Lib/lib.es2017.d.ts
+	  Library referenced via 'es2017' from file '../../tslibs/TS/Lib/lib.es2018.d.ts'
+	../../tslibs/TS/Lib/lib.es2018.d.ts
+	  Library referenced via 'es2018' from file '../../tslibs/TS/Lib/lib.es2019.d.ts'
+	../../tslibs/TS/Lib/lib.es2019.d.ts
+	  Library 'lib.es2019.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.es2015.core.d.ts
+	  Library referenced via 'es2015.core' from file '../../tslibs/TS/Lib/lib.es2015.d.ts'
+	../../tslibs/TS/Lib/lib.es2015.collection.d.ts
+	  Library referenced via 'es2015.collection' from file '../../tslibs/TS/Lib/lib.es2015.d.ts'
+	../../tslibs/TS/Lib/lib.es2015.generator.d.ts
+	  Library referenced via 'es2015.generator' from file '../../tslibs/TS/Lib/lib.es2015.d.ts'
+	../../tslibs/TS/Lib/lib.es2015.iterable.d.ts
+	  Library referenced via 'es2015.iterable' from file '../../tslibs/TS/Lib/lib.es2015.d.ts'
+	  Library referenced via 'es2015.iterable' from file '../../tslibs/TS/Lib/lib.es2015.generator.d.ts'
+	  Library referenced via 'es2015.iterable' from file '../../tslibs/TS/Lib/lib.es2018.asynciterable.d.ts'
+	  Library referenced via 'es2015.iterable' from file '../../tslibs/TS/Lib/lib.es2019.object.d.ts'
+	../../tslibs/TS/Lib/lib.es2015.promise.d.ts
+	  Library referenced via 'es2015.promise' from file '../../tslibs/TS/Lib/lib.es2015.d.ts'
+	../../tslibs/TS/Lib/lib.es2015.proxy.d.ts
+	  Library referenced via 'es2015.proxy' from file '../../tslibs/TS/Lib/lib.es2015.d.ts'
+	../../tslibs/TS/Lib/lib.es2015.reflect.d.ts
+	  Library referenced via 'es2015.reflect' from file '../../tslibs/TS/Lib/lib.es2015.d.ts'
+	../../tslibs/TS/Lib/lib.es2015.symbol.d.ts
+	  Library referenced via 'es2015.symbol' from file '../../tslibs/TS/Lib/lib.es2015.iterable.d.ts'
+	  Library referenced via 'es2015.symbol' from file '../../tslibs/TS/Lib/lib.es2015.d.ts'
+	  Library referenced via 'es2015.symbol' from file '../../tslibs/TS/Lib/lib.es2015.symbol.wellknown.d.ts'
+	  Library referenced via 'es2015.symbol' from file '../../tslibs/TS/Lib/lib.es2017.sharedmemory.d.ts'
+	  Library referenced via 'es2015.symbol' from file '../../tslibs/TS/Lib/lib.es2018.asynciterable.d.ts'
+	../../tslibs/TS/Lib/lib.es2015.symbol.wellknown.d.ts
+	  Library referenced via 'es2015.symbol.wellknown' from file '../../tslibs/TS/Lib/lib.es2015.d.ts'
+	  Library referenced via 'es2015.symbol.wellknown' from file '../../tslibs/TS/Lib/lib.es2017.sharedmemory.d.ts'
+	../../tslibs/TS/Lib/lib.es2016.array.include.d.ts
+	  Library referenced via 'es2016.array.include' from file '../../tslibs/TS/Lib/lib.es2016.d.ts'
+	../../tslibs/TS/Lib/lib.es2016.intl.d.ts
+	  Library referenced via 'es2016.intl' from file '../../tslibs/TS/Lib/lib.es2016.d.ts'
+	../../tslibs/TS/Lib/lib.es2017.arraybuffer.d.ts
+	  Library referenced via 'es2017.arraybuffer' from file '../../tslibs/TS/Lib/lib.es2017.d.ts'
+	../../tslibs/TS/Lib/lib.es2017.date.d.ts
+	  Library referenced via 'es2017.date' from file '../../tslibs/TS/Lib/lib.es2017.d.ts'
+	../../tslibs/TS/Lib/lib.es2017.object.d.ts
+	  Library referenced via 'es2017.object' from file '../../tslibs/TS/Lib/lib.es2017.d.ts'
+	../../tslibs/TS/Lib/lib.es2017.sharedmemory.d.ts
+	  Library referenced via 'es2017.sharedmemory' from file '../../tslibs/TS/Lib/lib.es2017.d.ts'
+	../../tslibs/TS/Lib/lib.es2017.string.d.ts
+	  Library referenced via 'es2017.string' from file '../../tslibs/TS/Lib/lib.es2017.d.ts'
+	../../tslibs/TS/Lib/lib.es2017.intl.d.ts
+	  Library referenced via 'es2017.intl' from file '../../tslibs/TS/Lib/lib.es2017.d.ts'
+	../../tslibs/TS/Lib/lib.es2017.typedarrays.d.ts
+	  Library referenced via 'es2017.typedarrays' from file '../../tslibs/TS/Lib/lib.es2017.d.ts'
+	../../tslibs/TS/Lib/lib.es2018.asyncgenerator.d.ts
+	  Library referenced via 'es2018.asyncgenerator' from file '../../tslibs/TS/Lib/lib.es2018.d.ts'
+	../../tslibs/TS/Lib/lib.es2018.asynciterable.d.ts
+	  Library referenced via 'es2018.asynciterable' from file '../../tslibs/TS/Lib/lib.es2018.d.ts'
+	  Library referenced via 'es2018.asynciterable' from file '../../tslibs/TS/Lib/lib.es2018.asyncgenerator.d.ts'
+	../../tslibs/TS/Lib/lib.es2018.intl.d.ts
+	  Library referenced via 'es2018.intl' from file '../../tslibs/TS/Lib/lib.es2018.d.ts'
+	../../tslibs/TS/Lib/lib.es2018.promise.d.ts
+	  Library referenced via 'es2018.promise' from file '../../tslibs/TS/Lib/lib.es2018.d.ts'
+	../../tslibs/TS/Lib/lib.es2018.regexp.d.ts
+	  Library referenced via 'es2018.regexp' from file '../../tslibs/TS/Lib/lib.es2018.d.ts'
+	../../tslibs/TS/Lib/lib.es2019.array.d.ts
+	  Library referenced via 'es2019.array' from file '../../tslibs/TS/Lib/lib.es2019.d.ts'
+	../../tslibs/TS/Lib/lib.es2019.object.d.ts
+	  Library referenced via 'es2019.object' from file '../../tslibs/TS/Lib/lib.es2019.d.ts'
+	../../tslibs/TS/Lib/lib.es2019.string.d.ts
+	  Library referenced via 'es2019.string' from file '../../tslibs/TS/Lib/lib.es2019.d.ts'
+	../../tslibs/TS/Lib/lib.es2019.symbol.d.ts
+	  Library referenced via 'es2019.symbol' from file '../../tslibs/TS/Lib/lib.es2019.d.ts'
+	../../tslibs/TS/Lib/lib.es2019.intl.d.ts
+	  Library referenced via 'es2019.intl' from file '../../tslibs/TS/Lib/lib.es2019.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 	node_modules/@types/react/index.d.ts
@@ -407,7 +428,7 @@ Info seq  [hh:mm:ss:mss] 	Files (38)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
-Info seq  [hh:mm:ss:mss] 	Files (5)
+Info seq  [hh:mm:ss:mss] 	Files (38)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -418,7 +439,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -426,8 +447,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
@@ -546,10 +565,6 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
@@ -562,140 +577,174 @@ ScriptInfos::
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.collection.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.core.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.generator.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.iterable.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.promise.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.proxy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.reflect.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.symbol.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.symbol.wellknown.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2016.array.include.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2016.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2016.intl.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.arraybuffer.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.date.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.intl.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.object.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.sharedmemory.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.string.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.typedarrays.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2018.asyncgenerator.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2018.asynciterable.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2018.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2018.intl.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2018.promise.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2018.regexp.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2019.array.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2019.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2019.intl.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2019.object.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2019.string.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2019.symbol.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/workspaces/project/index.ts *new*
     version: Text-1
     containingProjects: 1
@@ -712,7 +761,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -726,7 +775,7 @@ Info seq  [hh:mm:ss:mss] 	Files (38)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
-Info seq  [hh:mm:ss:mss] 	Files (5)
+Info seq  [hh:mm:ss:mss] 	Files (38)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -739,13 +788,11 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
@@ -866,10 +913,6 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
@@ -882,140 +925,174 @@ ScriptInfos::
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.collection.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.core.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.generator.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.iterable.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.promise.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.proxy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.reflect.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.symbol.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2015.symbol.wellknown.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2016.array.include.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2016.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2016.intl.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.arraybuffer.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.date.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.intl.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.object.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.sharedmemory.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.string.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2017.typedarrays.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2018.asyncgenerator.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2018.asynciterable.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2018.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2018.intl.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2018.promise.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2018.regexp.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2019.array.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2019.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2019.intl.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2019.object.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2019.string.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es2019.symbol.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
 /home/src/workspaces/project/index.ts (Open) *changed*
     open: true *changed*
     version: Text-1
@@ -1033,7 +1110,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1047,7 +1124,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -1062,7 +1139,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1088,7 +1165,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "flags": 9,
@@ -1850,8 +1927,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider7.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider7.js
index 9a3af305fcc0b..bd84019d4ce1b 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider7.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider7.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "commonjs",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/node_modules/mylib] symlink(/home/src/workspaces/project/packages/mylib)
 //// [/home/src/workspaces/project/package.json]
 { "dependencies": { "mylib": "file:packages/mylib" } }
@@ -37,12 +53,12 @@ const a = new MyClass();
 const b = new MyClass2();
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "commonjs" } }
+{ "compilerOptions": { "lib": ["es5"], "module": "commonjs" } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -61,6 +77,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 1,
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
@@ -85,7 +104,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -95,7 +114,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/mylib/mySubDir/myClass.ts Text-1 "export class MyClass {}"
@@ -105,12 +124,12 @@ Info seq  [hh:mm:ss:mss] 	Files (8)
 	/home/src/workspaces/project/src/index.ts Text-1 "\nconst a = new MyClass();\nconst b = new MyClass2();"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	packages/mylib/mySubDir/myClass.ts
 	  Imported via "./myClass" from file 'packages/mylib/mySubDir/index.ts'
 	  Matched by default include pattern '**/*'
@@ -157,18 +176,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\" } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"lib\": [\"es5\"], \"module\": \"commonjs\" } }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -218,7 +237,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -227,12 +246,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -277,17 +296,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -323,7 +342,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts"
@@ -354,17 +373,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -411,17 +430,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -458,7 +477,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -494,12 +513,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -515,7 +534,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 After Request
@@ -534,7 +553,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -561,7 +580,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": {
         "flags": 9,
@@ -1289,12 +1308,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -1341,7 +1360,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1357,12 +1376,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1387,7 +1406,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -1466,7 +1485,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1483,7 +1502,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -1503,17 +1522,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider8.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider8.js
index e79a94b48d009..68d607fd94c05 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider8.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider8.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "commonjs",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/node_modules/mylib] symlink(/home/src/workspaces/project/packages/mylib)
 //// [/home/src/workspaces/project/package.json]
 { "dependencies": { "mylib": "file:packages/mylib" } }
@@ -37,12 +53,12 @@ const a = new MyClass();
 const b = new MyClass2();
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "commonjs" } }
+{ "compilerOptions": { "lib": ["es5"], "module": "commonjs" } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -61,6 +77,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 1,
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
@@ -85,7 +104,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -95,7 +114,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/mylib/mySubDir/myClass.ts Text-1 "export class MyClass {}"
@@ -105,12 +124,12 @@ Info seq  [hh:mm:ss:mss] 	Files (8)
 	/home/src/workspaces/project/src/index.ts Text-1 "\nconst a = new MyClass();\nconst b = new MyClass2();"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	packages/mylib/mySubDir/myClass.ts
 	  Imported via "./myClass" from file 'packages/mylib/mySubDir/index.ts'
 	  Matched by default include pattern '**/*'
@@ -157,18 +176,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\" } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"lib\": [\"es5\"], \"module\": \"commonjs\" } }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -218,7 +237,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -227,12 +246,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -277,17 +296,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -323,7 +342,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts"
@@ -354,17 +373,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -411,17 +430,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -458,7 +477,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -494,12 +513,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -515,7 +534,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 After Request
@@ -534,7 +553,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -561,7 +580,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": {
         "flags": 9,
@@ -1289,12 +1308,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -1341,7 +1360,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1357,12 +1376,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1387,7 +1406,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -1466,7 +1485,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1483,7 +1502,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -1503,17 +1522,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider9.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider9.js
index e9f2cf7a10cae..61cc65c7f23f5 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider9.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider9.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "module": "preserve",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 Lib1
 
@@ -100,7 +116,7 @@ export class Lib9 {}
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -112,7 +128,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -122,18 +138,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-1-0 "Lib1"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Root file specified for compilation
 
@@ -152,7 +168,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -160,12 +176,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -186,15 +202,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -205,7 +221,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -220,7 +236,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
@@ -232,7 +248,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -245,13 +261,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -264,7 +280,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -286,7 +302,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -299,13 +315,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -325,7 +341,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
@@ -338,7 +354,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -353,12 +369,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -371,13 +387,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -390,7 +406,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": [
         {
@@ -412,7 +428,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -425,13 +441,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -450,13 +466,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -473,7 +489,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true
     }
 After Request
@@ -485,15 +501,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -504,7 +520,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -521,20 +537,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -545,7 +561,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -560,13 +576,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -583,20 +599,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -607,7 +623,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -622,13 +638,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -645,20 +661,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -669,7 +685,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -684,13 +700,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -707,20 +723,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -731,7 +747,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -746,13 +762,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 20,
+      "seq": 21,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -769,20 +785,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 20,
+      "request_seq": 21,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -793,7 +809,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 21,
+      "seq": 22,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -808,13 +824,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 21,
+      "request_seq": 22,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 22,
+      "seq": 23,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -831,20 +847,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 22,
+      "request_seq": 23,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -855,7 +871,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 23,
+      "seq": 24,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -870,13 +886,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 23,
+      "request_seq": 24,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 24,
+      "seq": 25,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -893,20 +909,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 24,
+      "request_seq": 25,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -917,7 +933,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 25,
+      "seq": 26,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -932,13 +948,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 25,
+      "request_seq": 26,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 26,
+      "seq": 27,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -955,20 +971,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 26,
+      "request_seq": 27,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -979,7 +995,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 27,
+      "seq": 28,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -994,13 +1010,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 27,
+      "request_seq": 28,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 28,
+      "seq": 29,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1017,20 +1033,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 28,
+      "request_seq": 29,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1041,7 +1057,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 29,
+      "seq": 30,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1056,7 +1072,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 29,
+      "request_seq": 30,
       "success": true,
       "body": [
         {
@@ -1074,7 +1090,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 30,
+      "seq": 31,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1091,20 +1107,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 30,
+      "request_seq": 31,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1115,7 +1131,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 31,
+      "seq": 32,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1132,20 +1148,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 31,
+      "request_seq": 32,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1156,7 +1172,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 32,
+      "seq": 33,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1171,13 +1187,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 32,
+      "request_seq": 33,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 33,
+      "seq": 34,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1194,20 +1210,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 33,
+      "request_seq": 34,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1218,7 +1234,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 34,
+      "seq": 35,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1233,13 +1249,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 34,
+      "request_seq": 35,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 35,
+      "seq": 36,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1256,20 +1272,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 35,
+      "request_seq": 36,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1280,7 +1296,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 36,
+      "seq": 37,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1295,13 +1311,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 36,
+      "request_seq": 37,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 37,
+      "seq": 38,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1318,20 +1334,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 37,
+      "request_seq": 38,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1342,7 +1358,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 38,
+      "seq": 39,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1357,13 +1373,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 38,
+      "request_seq": 39,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 39,
+      "seq": 40,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1380,20 +1396,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 39,
+      "request_seq": 40,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1404,7 +1420,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 40,
+      "seq": 41,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1419,13 +1435,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 40,
+      "request_seq": 41,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 41,
+      "seq": 42,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1442,20 +1458,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 41,
+      "request_seq": 42,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1466,7 +1482,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 42,
+      "seq": 43,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1481,13 +1497,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 42,
+      "request_seq": 43,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 43,
+      "seq": 44,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1504,20 +1520,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 43,
+      "request_seq": 44,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1528,7 +1544,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 44,
+      "seq": 45,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1543,13 +1559,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 44,
+      "request_seq": 45,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 45,
+      "seq": 46,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1566,20 +1582,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 45,
+      "request_seq": 46,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1590,7 +1606,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 46,
+      "seq": 47,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1605,13 +1621,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 46,
+      "request_seq": 47,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 47,
+      "seq": 48,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1628,20 +1644,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 47,
+      "request_seq": 48,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1652,7 +1668,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 48,
+      "seq": 49,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1667,13 +1683,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 48,
+      "request_seq": 49,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 49,
+      "seq": 50,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1690,20 +1706,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 49,
+      "request_seq": 50,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1714,7 +1730,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 50,
+      "seq": 51,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1729,13 +1745,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 50,
+      "request_seq": 51,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 51,
+      "seq": 52,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1752,20 +1768,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 51,
+      "request_seq": 52,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1776,7 +1792,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 52,
+      "seq": 53,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1791,13 +1807,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 52,
+      "request_seq": 53,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 53,
+      "seq": 54,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1814,20 +1830,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 53,
+      "request_seq": 54,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1838,7 +1854,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 54,
+      "seq": 55,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1853,13 +1869,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 54,
+      "request_seq": 55,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 55,
+      "seq": 56,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1876,20 +1892,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 55,
+      "request_seq": 56,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1900,7 +1916,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 56,
+      "seq": 57,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1915,7 +1931,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 56,
+      "request_seq": 57,
       "success": true,
       "body": [
         {
@@ -1933,7 +1949,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 57,
+      "seq": 58,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1950,20 +1966,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 57,
+      "request_seq": 58,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1974,7 +1990,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 58,
+      "seq": 59,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1991,20 +2007,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 58,
+      "request_seq": 59,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -2015,7 +2031,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 59,
+      "seq": 60,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2030,7 +2046,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 59,
+      "request_seq": 60,
       "success": true,
       "body": [
         {
@@ -2048,7 +2064,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 60,
+      "seq": 61,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2065,20 +2081,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 60,
+      "request_seq": 61,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -2089,7 +2105,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 61,
+      "seq": 62,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -2104,12 +2120,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 61,
+      "request_seq": 62,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 62,
+      "seq": 63,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2126,19 +2142,19 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/lib2/index.d.ts Text-1 "export class Lib2 {}"
 	/home/src/workspaces/project/index.ts SVC-1-27 "import { } from 'lib2';\nLib1"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/lib2/index.d.ts
 	  Imported via 'lib2' from file 'index.ts'
 	index.ts
@@ -2150,7 +2166,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 62,
+      "request_seq": 63,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -2159,12 +2175,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/lib2/index.d.ts: *new*
@@ -2193,15 +2209,15 @@ Projects::
     autoImportProviderHost: undefined *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -2216,7 +2232,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 63,
+      "seq": 64,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2229,7 +2245,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 63,
+      "request_seq": 64,
       "success": true,
       "body": [
         {
@@ -2251,7 +2267,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 64,
+      "seq": 65,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2264,13 +2280,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 64,
+      "request_seq": 65,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 65,
+      "seq": 66,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2352,7 +2368,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 65,
+      "request_seq": 66,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -2385,12 +2401,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/lib1/index.d.ts: *new*
@@ -2462,15 +2478,15 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap1.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap1.js
index ff12c948516ec..cc7bd0dd0d6ec 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap1.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts]
 export function fooFromIndex(): void;
 
@@ -46,6 +62,7 @@ fooFrom
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "nodenext"
   }
 }
@@ -53,7 +70,7 @@ fooFrom
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -68,6 +85,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/foo.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
@@ -86,19 +106,33 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 1 undefined Config: /home/src/workspaces/project/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/foo.ts Text-1 "fooFrom"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/foo.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -121,62 +155,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -184,18 +172,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"lib\": [\"es5\"],\n    \"module\": \"nodenext\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -224,7 +212,7 @@ Info seq  [hh:mm:ss:mss] 	Files (2)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -243,7 +231,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -252,14 +240,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts: *new*
@@ -304,17 +299,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts *new*
     version: Text-1
@@ -335,7 +333,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts"
@@ -345,7 +343,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/foo.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -366,19 +364,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
@@ -425,17 +430,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
@@ -457,7 +465,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -473,7 +481,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -492,7 +500,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -539,7 +547,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -573,6 +581,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "ArrayBuffer",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "as",
             "kind": "keyword",
@@ -609,6 +629,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Boolean",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "break",
             "kind": "keyword",
@@ -645,6 +671,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "DataView",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Date",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "debugger",
             "kind": "keyword",
@@ -657,6 +695,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "decodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "decodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "default",
             "kind": "keyword",
@@ -681,12 +731,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "encodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "encodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "enum",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Error",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "eval",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "EvalError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "export",
             "kind": "keyword",
@@ -711,6 +791,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Float32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Float64Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "for",
             "kind": "keyword",
@@ -723,6 +815,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Function",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "globalThis",
             "kind": "module",
@@ -759,18 +857,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Infinity",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "instanceof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Int8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "interface",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Intl",
+            "kind": "module",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isFinite",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isNaN",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "JSON",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "keyof",
             "kind": "keyword",
@@ -783,6 +929,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Math",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "module",
             "kind": "keyword",
@@ -795,6 +947,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "NaN",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "never",
             "kind": "keyword",
@@ -819,24 +977,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Number",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "object",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Object",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "package",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "parseFloat",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "parseInt",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RangeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "readonly",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "ReferenceError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RegExp",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "return",
             "kind": "keyword",
@@ -855,6 +1055,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "String",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "super",
             "kind": "keyword",
@@ -873,6 +1079,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "SyntaxError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "this",
             "kind": "keyword",
@@ -903,12 +1115,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "TypeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "typeof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Uint8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint8ClampedArray",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "undefined",
             "kind": "var",
@@ -927,6 +1169,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "URIError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "using",
             "kind": "keyword",
@@ -1006,6 +1254,18 @@ Info seq  [hh:mm:ss:mss] response:
               "fileName": "/home/src/workspaces/project/node_modules/dependency/lib/lol.d.ts",
               "isPackageJsonImport": true
             }
+          },
+          {
+            "name": "escape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
+          },
+          {
+            "name": "unescape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
           }
         ],
         "defaultCommitCharacters": [
@@ -1017,14 +1277,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
@@ -1075,17 +1342,20 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts *changed*
     version: Text-1
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap2.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap2.js
index 1829d3fe26653..b684e889c9729 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap2.js
@@ -1,16 +1,33 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "commonjs",
+          "moduleResolution": "node10",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts]
 export function fooFromIndex(): void;
 
@@ -47,15 +64,16 @@ fooFrom
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
-    "module": "commonjs"
-    "moduleResolution": "node10",
+    "lib": ["es5"],
+    "module": "commonjs",
+    "moduleResolution": "node10"
   }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -70,6 +88,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/foo.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 1,
   "moduleResolution": 2,
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
@@ -89,7 +110,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 1 undefined Config: /home/src/workspaces/project/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -99,18 +120,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/foo.ts Text-1 "fooFrom"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/foo.ts
 	  Matched by default include pattern '**/*'
 
@@ -135,31 +156,17 @@ Info seq  [hh:mm:ss:mss] event:
         "diagnostics": [
           {
             "start": {
-              "line": 4,
+              "line": 5,
               "offset": 25
             },
             "end": {
-              "line": 4,
+              "line": 5,
               "offset": 33
             },
             "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
             "code": 5107,
             "category": "error",
             "fileName": "/home/src/workspaces/project/tsconfig.json"
-          },
-          {
-            "start": {
-              "line": 4,
-              "offset": 5
-            },
-            "end": {
-              "line": 4,
-              "offset": 23
-            },
-            "text": "',' expected.",
-            "code": 1005,
-            "category": "error",
-            "fileName": "/home/src/workspaces/project/tsconfig.json"
           }
         ]
       }
@@ -175,43 +182,38 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"commonjs\"\n    \"moduleResolution\": \"node10\",\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"lib\": [\"es5\"],\n    \"module\": \"commonjs\",\n    \"moduleResolution\": \"node10\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
-Info seq  [hh:mm:ss:mss] AutoImportProviderProject: found 2 root files in 1 dependencies 0 referenced projects in * ms
+Info seq  [hh:mm:ss:mss] AutoImportProviderProject: found 1 root files in 1 dependencies 0 referenced projects in * ms
 Info seq  [hh:mm:ss:mss] Creating AutoImportProviderProject: /dev/null/autoImportProviderProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/lib/lol.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/autoImportProviderProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/lib/package.json 2000 undefined Project: /dev/null/autoImportProviderProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/package.json 2000 undefined Project: /dev/null/autoImportProviderProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/autoImportProviderProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/autoImportProviderProject1*' (AutoImportProvider)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (1)
 	/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts Text-1 "export function fooFromIndex(): void;"
-	/home/src/workspaces/project/node_modules/dependency/lib/lol.d.ts Text-1 "export function fooFromLol(): void;"
 
 
 	node_modules/dependency/lib/index.d.ts
 	  Root file specified for compilation
 	  File is ECMAScript module because 'node_modules/dependency/package.json' has field "type" with value "module"
-	node_modules/dependency/lib/lol.d.ts
-	  Root file specified for compilation
-	  File is ECMAScript module because 'node_modules/dependency/package.json' has field "type" with value "module"
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
@@ -223,7 +225,7 @@ Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/autoImportProviderProject1*' (AutoImportProvider)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (1)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -234,7 +236,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -243,18 +245,16 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts: *new*
   {"pollingInterval":500}
-/home/src/workspaces/project/node_modules/dependency/lib/lol.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/dependency/lib/package.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/package.json: *new*
@@ -290,17 +290,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -309,10 +309,6 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /dev/null/autoImportProviderProject1*
-/home/src/workspaces/project/node_modules/dependency/lib/lol.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/autoImportProviderProject1*
 /home/src/workspaces/project/src/foo.ts *new*
     version: Text-1
     containingProjects: 1
@@ -324,7 +320,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts"
@@ -342,7 +338,7 @@ Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/autoImportProviderProject1*' (AutoImportProvider)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (1)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -355,23 +351,21 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
   {"pollingInterval":500}
-/home/src/workspaces/project/node_modules/dependency/lib/lol.d.ts:
-  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/dependency/lib/package.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/package.json:
@@ -409,17 +403,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -428,10 +422,6 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /dev/null/autoImportProviderProject1*
-/home/src/workspaces/project/node_modules/dependency/lib/lol.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/autoImportProviderProject1*
 /home/src/workspaces/project/src/foo.ts (Open) *changed*
     open: true *changed*
     version: Text-1
@@ -444,7 +434,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -460,7 +450,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -479,7 +469,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -522,7 +512,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -1230,18 +1220,16 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
   {"pollingInterval":500}
-/home/src/workspaces/project/node_modules/dependency/lib/lol.d.ts:
-  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/dependency/lib/package.json:
   {"pollingInterval":2000}
   {"pollingInterval":2000} *new*
@@ -1283,17 +1271,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1303,10 +1291,6 @@ ScriptInfos::
     containingProjects: 2 *changed*
         /dev/null/autoImportProviderProject1*
         /dev/null/autoImportProviderProject2* *new*
-/home/src/workspaces/project/node_modules/dependency/lib/lol.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/autoImportProviderProject1*
 /home/src/workspaces/project/src/foo.ts (Open)
     version: Text-1
     containingProjects: 1
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap3.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap3.js
index cc00f6b1f0e15..5704f08a5b000 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap3.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts]
 export function fooFromIndex(): void;
 
@@ -39,14 +55,15 @@ fooFrom
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
-    "module": "nodenext"
+    "module": "nodenext",
+    "lib": ["es5"]
   }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -62,6 +79,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -79,19 +99,33 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 1 undefined Config: /home/src/workspaces/project/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/foo.ts Text-1 "fooFrom"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/foo.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -114,62 +148,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -177,18 +165,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"]\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -210,12 +198,14 @@ Info seq  [hh:mm:ss:mss] 	Files (2)
 
 	node_modules/dependency/lib/index.d.ts
 	  Root file specified for compilation
+	  File is CommonJS module because 'node_modules/dependency/package.json' does not have field "type"
 	node_modules/dependency/lib/lol.d.ts
 	  Root file specified for compilation
+	  File is CommonJS module because 'node_modules/dependency/package.json' does not have field "type"
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -234,7 +224,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -243,14 +233,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts: *new*
@@ -295,17 +292,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts *new*
     version: Text-1
@@ -326,7 +326,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts"
@@ -336,7 +336,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/foo.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -357,19 +357,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
@@ -416,17 +423,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
@@ -448,7 +458,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -464,7 +474,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -483,7 +493,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -530,7 +540,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -564,6 +574,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "ArrayBuffer",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "as",
             "kind": "keyword",
@@ -600,6 +622,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Boolean",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "break",
             "kind": "keyword",
@@ -636,6 +664,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "DataView",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Date",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "debugger",
             "kind": "keyword",
@@ -648,6 +688,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "decodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "decodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "default",
             "kind": "keyword",
@@ -672,12 +724,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "encodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "encodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "enum",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Error",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "eval",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "EvalError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "export",
             "kind": "keyword",
@@ -702,6 +784,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Float32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Float64Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "for",
             "kind": "keyword",
@@ -714,6 +808,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Function",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "globalThis",
             "kind": "module",
@@ -750,18 +850,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Infinity",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "instanceof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Int8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "interface",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Intl",
+            "kind": "module",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isFinite",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isNaN",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "JSON",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "keyof",
             "kind": "keyword",
@@ -774,6 +922,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Math",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "module",
             "kind": "keyword",
@@ -786,6 +940,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "NaN",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "never",
             "kind": "keyword",
@@ -810,24 +970,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Number",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "object",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Object",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "package",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "parseFloat",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "parseInt",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RangeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "readonly",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "ReferenceError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RegExp",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "return",
             "kind": "keyword",
@@ -846,6 +1048,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "String",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "super",
             "kind": "keyword",
@@ -864,6 +1072,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "SyntaxError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "this",
             "kind": "keyword",
@@ -894,12 +1108,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "TypeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "typeof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Uint8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint8ClampedArray",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "undefined",
             "kind": "var",
@@ -918,6 +1162,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "URIError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "using",
             "kind": "keyword",
@@ -975,6 +1225,18 @@ Info seq  [hh:mm:ss:mss] response:
               "fileName": "/home/src/workspaces/project/node_modules/dependency/lib/lol.d.ts",
               "isPackageJsonImport": true
             }
+          },
+          {
+            "name": "escape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
+          },
+          {
+            "name": "unescape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
           }
         ],
         "defaultCommitCharacters": [
@@ -986,14 +1248,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
@@ -1044,17 +1313,20 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts *changed*
     version: Text-1
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap4.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap4.js
index 1e7affe612b50..efc0516a838a7 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap4.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap4.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts]
 export function fooFromIndex(): void;
 
@@ -42,14 +58,15 @@ fooFrom
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
-    "module": "nodenext"
+    "module": "nodenext",
+    "lib": ["es5"]
   }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -65,6 +82,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -82,19 +102,33 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 1 undefined Config: /home/src/workspaces/project/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/foo.ts Text-1 "fooFrom"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/foo.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -117,62 +151,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -180,18 +168,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"]\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -215,7 +203,7 @@ Info seq  [hh:mm:ss:mss] 	Files (1)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -234,7 +222,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -243,14 +231,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts: *new*
@@ -293,17 +288,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts *new*
     version: Text-1
@@ -320,7 +318,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts"
@@ -330,7 +328,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/foo.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -351,19 +349,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
@@ -408,17 +413,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
@@ -436,7 +444,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -452,7 +460,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -471,7 +479,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -514,7 +522,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -548,6 +556,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "ArrayBuffer",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "as",
             "kind": "keyword",
@@ -584,6 +604,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Boolean",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "break",
             "kind": "keyword",
@@ -620,6 +646,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "DataView",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Date",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "debugger",
             "kind": "keyword",
@@ -632,6 +670,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "decodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "decodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "default",
             "kind": "keyword",
@@ -656,12 +706,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "encodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "encodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "enum",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Error",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "eval",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "EvalError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "export",
             "kind": "keyword",
@@ -686,6 +766,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Float32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Float64Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "for",
             "kind": "keyword",
@@ -698,6 +790,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Function",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "globalThis",
             "kind": "module",
@@ -734,18 +832,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Infinity",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "instanceof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Int8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "interface",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Intl",
+            "kind": "module",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isFinite",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isNaN",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "JSON",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "keyof",
             "kind": "keyword",
@@ -758,6 +904,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Math",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "module",
             "kind": "keyword",
@@ -770,6 +922,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "NaN",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "never",
             "kind": "keyword",
@@ -794,24 +952,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Number",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "object",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Object",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "package",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "parseFloat",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "parseInt",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RangeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "readonly",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "ReferenceError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RegExp",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "return",
             "kind": "keyword",
@@ -830,6 +1030,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "String",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "super",
             "kind": "keyword",
@@ -848,6 +1054,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "SyntaxError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "this",
             "kind": "keyword",
@@ -878,12 +1090,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "TypeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "typeof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Uint8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint8ClampedArray",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "undefined",
             "kind": "var",
@@ -902,6 +1144,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "URIError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "using",
             "kind": "keyword",
@@ -959,6 +1207,18 @@ Info seq  [hh:mm:ss:mss] response:
               "fileName": "/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts",
               "isPackageJsonImport": true
             }
+          },
+          {
+            "name": "escape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
+          },
+          {
+            "name": "unescape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
           }
         ],
         "defaultCommitCharacters": [
@@ -970,14 +1230,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
@@ -1026,17 +1293,20 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts *changed*
     version: Text-1
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap5.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap5.js
index 43856a8a56f67..ef412e6267976 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap5.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap5.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/node_modules/@types/dependency/lib/index.d.ts]
 export declare function fooFromIndex(): void;
 
@@ -59,14 +75,15 @@ fooFrom
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
-    "module": "nodenext"
+    "module": "nodenext",
+    "lib": ["es5"]
   }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -82,6 +99,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -106,21 +126,35 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/dependency/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/dependency/lib/index.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/dependency/lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/foo.ts Text-1 "fooFrom"
 	/home/src/workspaces/project/node_modules/@types/dependency/lib/index.d.ts Text-1 "export declare function fooFromIndex(): void;"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/foo.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -146,53 +180,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -205,9 +193,9 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/dependency/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/dependency/lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -216,19 +204,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"]\n  }\n}"
 	/home/src/workspaces/project/node_modules/@types/dependency/lib/index.d.ts Text-1 "export declare function fooFromIndex(): void;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 	node_modules/@types/dependency/lib/index.d.ts
@@ -255,7 +243,7 @@ Info seq  [hh:mm:ss:mss] 	Files (1)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -274,7 +262,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -283,14 +271,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/dependency/lib/index.d.ts: *new*
@@ -348,17 +343,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/@types/dependency/lib/index.d.ts *new*
     version: Text-1
@@ -380,7 +378,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts"
@@ -390,7 +388,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/foo.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -411,19 +409,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/dependency/lib/index.d.ts:
@@ -483,17 +488,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/@types/dependency/lib/index.d.ts
     version: Text-1
@@ -516,7 +524,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -532,7 +540,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -551,7 +559,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -594,7 +602,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -628,6 +636,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "ArrayBuffer",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "as",
             "kind": "keyword",
@@ -664,6 +684,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Boolean",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "break",
             "kind": "keyword",
@@ -700,6 +726,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "DataView",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Date",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "debugger",
             "kind": "keyword",
@@ -712,6 +750,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "decodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "decodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "default",
             "kind": "keyword",
@@ -736,12 +786,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "encodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "encodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "enum",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Error",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "eval",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "EvalError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "export",
             "kind": "keyword",
@@ -766,6 +846,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Float32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Float64Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "for",
             "kind": "keyword",
@@ -778,6 +870,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Function",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "globalThis",
             "kind": "module",
@@ -814,18 +912,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Infinity",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "instanceof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Int8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "interface",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Intl",
+            "kind": "module",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isFinite",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isNaN",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "JSON",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "keyof",
             "kind": "keyword",
@@ -838,6 +984,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Math",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "module",
             "kind": "keyword",
@@ -850,6 +1002,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "NaN",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "never",
             "kind": "keyword",
@@ -874,24 +1032,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Number",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "object",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Object",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "package",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "parseFloat",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "parseInt",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RangeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "readonly",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "ReferenceError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RegExp",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "return",
             "kind": "keyword",
@@ -910,6 +1110,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "String",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "super",
             "kind": "keyword",
@@ -928,6 +1134,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "SyntaxError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "this",
             "kind": "keyword",
@@ -958,12 +1170,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "TypeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "typeof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Uint8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint8ClampedArray",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "undefined",
             "kind": "var",
@@ -982,6 +1224,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "URIError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "using",
             "kind": "keyword",
@@ -1059,6 +1307,18 @@ Info seq  [hh:mm:ss:mss] response:
               "fileName": "/home/src/workspaces/project/node_modules/@types/dependency/lib/lol.d.ts",
               "isPackageJsonImport": true
             }
+          },
+          {
+            "name": "escape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
+          },
+          {
+            "name": "unescape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
           }
         ],
         "defaultCommitCharacters": [
@@ -1070,14 +1330,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/dependency/lib/index.d.ts:
@@ -1140,17 +1407,20 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/@types/dependency/lib/index.d.ts
     version: Text-1
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap6.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap6.js
index 154badd241e75..031ea9a272579 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap6.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap6.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/node_modules/@types/dependency/lib/index.d.ts]
 export declare function fooFromAtTypesIndex(): void;
 
@@ -68,14 +84,15 @@ fooFrom
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
-    "module": "nodenext"
+    "module": "nodenext",
+    "lib": ["es5"]
   }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -91,6 +108,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -115,21 +135,35 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/dependency/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/foo.ts Text-1 "fooFrom"
 	/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts Text-1 "export declare function fooFromIndex(): void"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/foo.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -155,53 +189,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -214,9 +202,9 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/dependency/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -225,19 +213,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"]\n  }\n}"
 	/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts Text-1 "export declare function fooFromIndex(): void"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 	node_modules/dependency/lib/index.d.ts
@@ -264,7 +252,7 @@ Info seq  [hh:mm:ss:mss] 	Files (1)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -283,7 +271,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -292,14 +280,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/dependency/package.json: *new*
@@ -357,17 +352,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts *new*
     version: Text-1
@@ -389,7 +387,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts"
@@ -399,7 +397,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/foo.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -420,19 +418,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/dependency/package.json:
@@ -492,17 +497,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
@@ -525,7 +533,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -541,7 +549,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -560,7 +568,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -603,7 +611,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -637,6 +645,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "ArrayBuffer",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "as",
             "kind": "keyword",
@@ -673,6 +693,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Boolean",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "break",
             "kind": "keyword",
@@ -709,6 +735,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "DataView",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Date",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "debugger",
             "kind": "keyword",
@@ -721,6 +759,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "decodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "decodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "default",
             "kind": "keyword",
@@ -745,12 +795,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "encodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "encodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "enum",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Error",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "eval",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "EvalError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "export",
             "kind": "keyword",
@@ -775,6 +855,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Float32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Float64Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "for",
             "kind": "keyword",
@@ -787,6 +879,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Function",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "globalThis",
             "kind": "module",
@@ -823,18 +921,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Infinity",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "instanceof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Int8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "interface",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Intl",
+            "kind": "module",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isFinite",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isNaN",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "JSON",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "keyof",
             "kind": "keyword",
@@ -847,6 +993,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Math",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "module",
             "kind": "keyword",
@@ -859,6 +1011,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "NaN",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "never",
             "kind": "keyword",
@@ -883,24 +1041,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Number",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "object",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Object",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "package",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "parseFloat",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "parseInt",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RangeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "readonly",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "ReferenceError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RegExp",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "return",
             "kind": "keyword",
@@ -919,6 +1119,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "String",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "super",
             "kind": "keyword",
@@ -937,6 +1143,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "SyntaxError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "this",
             "kind": "keyword",
@@ -967,12 +1179,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "TypeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "typeof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Uint8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint8ClampedArray",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "undefined",
             "kind": "var",
@@ -991,6 +1233,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "URIError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "using",
             "kind": "keyword",
@@ -1068,6 +1316,18 @@ Info seq  [hh:mm:ss:mss] response:
               "fileName": "/home/src/workspaces/project/node_modules/dependency/lib/lol.d.ts",
               "isPackageJsonImport": true
             }
+          },
+          {
+            "name": "escape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
+          },
+          {
+            "name": "unescape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
           }
         ],
         "defaultCommitCharacters": [
@@ -1079,14 +1339,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/dependency/package.json:
@@ -1149,17 +1416,20 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap7.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap7.js
index 73d58713fe1ef..6733226ba1f9a 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap7.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap7.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts]
 export function fooFromIndex(): void;
 
@@ -49,14 +65,15 @@ fooFrom
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
-    "module": "nodenext"
+    "module": "nodenext",
+    "lib": ["es5"]
   }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -73,6 +90,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -92,25 +112,39 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts Text-1 "export function fooFromIndex(): void;"
 	/home/src/workspaces/project/src/bar.ts Text-1 "import { fooFromIndex } from \"dependency\";"
 	/home/src/workspaces/project/src/foo.ts Text-1 "fooFrom"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/dependency/lib/index.d.ts
 	  Imported via "dependency" from file 'src/bar.ts' with packageId 'dependency/lib/index.d.ts@1.0.0'
 	  File is ECMAScript module because 'node_modules/dependency/package.json' has field "type" with value "module"
@@ -139,62 +173,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -202,18 +190,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"]\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -241,7 +229,7 @@ Info seq  [hh:mm:ss:mss] 	Files (2)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -260,7 +248,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -269,14 +257,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts: *new*
@@ -327,17 +322,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts *new*
     version: Text-1
@@ -363,7 +361,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts"
@@ -373,7 +371,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/foo.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -394,19 +392,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
@@ -459,17 +464,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
@@ -496,7 +504,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -512,7 +520,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -531,7 +539,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -574,7 +582,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -608,6 +616,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "ArrayBuffer",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "as",
             "kind": "keyword",
@@ -644,6 +664,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Boolean",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "break",
             "kind": "keyword",
@@ -680,6 +706,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "DataView",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Date",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "debugger",
             "kind": "keyword",
@@ -692,6 +730,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "decodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "decodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "default",
             "kind": "keyword",
@@ -716,12 +766,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "encodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "encodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "enum",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Error",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "eval",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "EvalError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "export",
             "kind": "keyword",
@@ -746,6 +826,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Float32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Float64Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "for",
             "kind": "keyword",
@@ -758,6 +850,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Function",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "globalThis",
             "kind": "module",
@@ -794,18 +892,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Infinity",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "instanceof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Int8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "interface",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Intl",
+            "kind": "module",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isFinite",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isNaN",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "JSON",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "keyof",
             "kind": "keyword",
@@ -818,6 +964,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Math",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "module",
             "kind": "keyword",
@@ -830,6 +982,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "NaN",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "never",
             "kind": "keyword",
@@ -854,24 +1012,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Number",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "object",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Object",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "package",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "parseFloat",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "parseInt",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RangeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "readonly",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "ReferenceError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RegExp",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "return",
             "kind": "keyword",
@@ -890,6 +1090,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "String",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "super",
             "kind": "keyword",
@@ -908,6 +1114,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "SyntaxError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "this",
             "kind": "keyword",
@@ -938,12 +1150,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "TypeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "typeof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Uint8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint8ClampedArray",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "undefined",
             "kind": "var",
@@ -962,6 +1204,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "URIError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "using",
             "kind": "keyword",
@@ -1039,6 +1287,18 @@ Info seq  [hh:mm:ss:mss] response:
               "fileName": "/home/src/workspaces/project/node_modules/dependency/lib/lol.d.ts",
               "isPackageJsonImport": true
             }
+          },
+          {
+            "name": "escape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
+          },
+          {
+            "name": "unescape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
           }
         ],
         "defaultCommitCharacters": [
@@ -1050,14 +1310,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
@@ -1114,17 +1381,20 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap8.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap8.js
index e67c941839ed3..298b9bfa33888 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap8.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap8.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts]
 export function fooFromIndex(): void;
 
@@ -50,14 +66,15 @@ fooFrom
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
-    "module": "nodenext"
+    "module": "nodenext",
+    "lib": ["es5"]
   }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -75,6 +92,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -94,6 +114,9 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/foo.cts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/foo.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
@@ -102,20 +125,31 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/bar.ts Text-1 "import { fooFromIndex } from \"dependency\";"
 	/home/src/workspaces/project/src/foo.cts Text-1 "fooFrom"
 	/home/src/workspaces/project/src/foo.mts Text-1 "fooFrom"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/bar.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -142,62 +176,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -205,18 +193,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"]\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -245,7 +233,7 @@ Info seq  [hh:mm:ss:mss] 	Files (2)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -264,7 +252,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -273,14 +261,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts: *new*
@@ -336,17 +331,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts *new*
     version: Text-1
@@ -375,7 +373,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.cts"
@@ -385,7 +383,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/foo.cts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/foo.cts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -406,19 +404,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
@@ -476,17 +481,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
@@ -516,7 +524,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -532,7 +540,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -551,7 +559,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.cts",
@@ -598,7 +606,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -632,6 +640,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "ArrayBuffer",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "as",
             "kind": "keyword",
@@ -668,6 +688,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Boolean",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "break",
             "kind": "keyword",
@@ -704,6 +730,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "DataView",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Date",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "debugger",
             "kind": "keyword",
@@ -716,6 +754,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "decodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "decodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "default",
             "kind": "keyword",
@@ -740,12 +790,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "encodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "encodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "enum",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Error",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "eval",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "EvalError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "export",
             "kind": "keyword",
@@ -770,6 +850,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Float32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Float64Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "for",
             "kind": "keyword",
@@ -782,6 +874,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Function",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "globalThis",
             "kind": "module",
@@ -818,18 +916,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Infinity",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "instanceof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Int8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "interface",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Intl",
+            "kind": "module",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isFinite",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isNaN",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "JSON",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "keyof",
             "kind": "keyword",
@@ -842,6 +988,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Math",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "module",
             "kind": "keyword",
@@ -854,6 +1006,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "NaN",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "never",
             "kind": "keyword",
@@ -878,24 +1036,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Number",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "object",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Object",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "package",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "parseFloat",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "parseInt",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RangeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "readonly",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "ReferenceError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RegExp",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "return",
             "kind": "keyword",
@@ -914,6 +1114,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "String",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "super",
             "kind": "keyword",
@@ -932,6 +1138,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "SyntaxError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "this",
             "kind": "keyword",
@@ -962,12 +1174,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "TypeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "typeof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Uint8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint8ClampedArray",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "undefined",
             "kind": "var",
@@ -986,6 +1228,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "URIError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "using",
             "kind": "keyword",
@@ -1043,6 +1291,18 @@ Info seq  [hh:mm:ss:mss] response:
               "fileName": "/home/src/workspaces/project/node_modules/dependency/lib/lol.d.ts",
               "isPackageJsonImport": true
             }
+          },
+          {
+            "name": "escape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
+          },
+          {
+            "name": "unescape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
           }
         ],
         "defaultCommitCharacters": [
@@ -1054,14 +1314,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
@@ -1122,17 +1389,20 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts *changed*
     version: Text-1
@@ -1163,7 +1433,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.mts"
@@ -1173,7 +1443,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/foo.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/foo.mts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/autoImportProviderProject2*' (AutoImportProvider)
@@ -1200,19 +1470,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
@@ -1258,17 +1535,20 @@ watchedDirectoriesRecursive::
   {}
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
@@ -1300,7 +1580,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1316,12 +1596,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.mts",
@@ -1350,7 +1630,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": {
         "flags": 9,
@@ -1380,6 +1660,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "ArrayBuffer",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "as",
             "kind": "keyword",
@@ -1416,6 +1708,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Boolean",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "break",
             "kind": "keyword",
@@ -1452,6 +1750,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "DataView",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Date",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "debugger",
             "kind": "keyword",
@@ -1464,6 +1774,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "decodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "decodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "default",
             "kind": "keyword",
@@ -1488,12 +1810,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "encodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "encodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "enum",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Error",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "eval",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "EvalError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "export",
             "kind": "keyword",
@@ -1518,6 +1870,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Float32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Float64Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "for",
             "kind": "keyword",
@@ -1530,6 +1894,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Function",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "globalThis",
             "kind": "module",
@@ -1566,18 +1936,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Infinity",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "instanceof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Int8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "interface",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Intl",
+            "kind": "module",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isFinite",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isNaN",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "JSON",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "keyof",
             "kind": "keyword",
@@ -1590,6 +2008,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Math",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "module",
             "kind": "keyword",
@@ -1602,6 +2026,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "NaN",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "never",
             "kind": "keyword",
@@ -1626,24 +2056,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Number",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "object",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Object",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "package",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "parseFloat",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "parseInt",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RangeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "readonly",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "ReferenceError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RegExp",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "return",
             "kind": "keyword",
@@ -1662,6 +2134,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "String",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "super",
             "kind": "keyword",
@@ -1680,6 +2158,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "SyntaxError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "this",
             "kind": "keyword",
@@ -1710,12 +2194,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "TypeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "typeof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Uint8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint8ClampedArray",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "undefined",
             "kind": "var",
@@ -1734,6 +2248,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "URIError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "using",
             "kind": "keyword",
@@ -1791,6 +2311,18 @@ Info seq  [hh:mm:ss:mss] response:
               "fileName": "/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts",
               "isPackageJsonImport": true
             }
+          },
+          {
+            "name": "escape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
+          },
+          {
+            "name": "unescape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
           }
         ],
         "defaultCommitCharacters": [
@@ -1802,14 +2334,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap9.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap9.js
index 05aab220f1f85..1d9ea1fd039ff 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap9.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap9.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts]
 export function fooFromIndex(): void;
 
@@ -44,14 +60,15 @@ fooFrom
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
-    "module": "nodenext"
+    "module": "nodenext",
+    "lib": ["es5"]
   }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -68,6 +85,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -86,6 +106,9 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/bar.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
@@ -94,19 +117,30 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/bar.ts Text-1 "import { fooFromIndex } from \"dependency\";"
 	/home/src/workspaces/project/src/foo.ts Text-1 "fooFrom"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/bar.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -132,62 +166,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -195,18 +183,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"]\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -230,7 +218,7 @@ Info seq  [hh:mm:ss:mss] 	Files (1)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -249,7 +237,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -258,14 +246,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts: *new*
@@ -317,17 +312,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts *new*
     version: Text-1
@@ -348,7 +346,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts"
@@ -358,7 +356,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/foo.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -379,19 +377,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
@@ -445,17 +450,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
@@ -477,7 +485,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -493,7 +501,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -512,7 +520,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -555,7 +563,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -589,6 +597,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "ArrayBuffer",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "as",
             "kind": "keyword",
@@ -625,6 +645,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Boolean",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "break",
             "kind": "keyword",
@@ -661,6 +687,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "DataView",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Date",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "debugger",
             "kind": "keyword",
@@ -673,6 +711,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "decodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "decodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "default",
             "kind": "keyword",
@@ -697,12 +747,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "encodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "encodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "enum",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Error",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "eval",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "EvalError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "export",
             "kind": "keyword",
@@ -727,6 +807,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Float32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Float64Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "for",
             "kind": "keyword",
@@ -739,6 +831,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Function",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "globalThis",
             "kind": "module",
@@ -775,18 +873,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Infinity",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "instanceof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Int8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "interface",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Intl",
+            "kind": "module",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isFinite",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isNaN",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "JSON",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "keyof",
             "kind": "keyword",
@@ -799,6 +945,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Math",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "module",
             "kind": "keyword",
@@ -811,6 +963,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "NaN",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "never",
             "kind": "keyword",
@@ -835,24 +993,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Number",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "object",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Object",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "package",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "parseFloat",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "parseInt",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RangeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "readonly",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "ReferenceError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RegExp",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "return",
             "kind": "keyword",
@@ -871,6 +1071,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "String",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "super",
             "kind": "keyword",
@@ -889,6 +1095,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "SyntaxError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "this",
             "kind": "keyword",
@@ -919,12 +1131,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "TypeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "typeof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Uint8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint8ClampedArray",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "undefined",
             "kind": "var",
@@ -943,6 +1185,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "URIError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "using",
             "kind": "keyword",
@@ -1000,6 +1248,18 @@ Info seq  [hh:mm:ss:mss] response:
               "fileName": "/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts",
               "isPackageJsonImport": true
             }
+          },
+          {
+            "name": "escape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
+          },
+          {
+            "name": "unescape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
           }
         ],
         "defaultCommitCharacters": [
@@ -1011,14 +1271,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
@@ -1075,17 +1342,20 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts *changed*
     version: Text-1
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_globalTypingsCache.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_globalTypingsCache.js
index 7153321a3af9b..aed8fbb45b0a8 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_globalTypingsCache.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_globalTypingsCache.js
@@ -1,22 +1,41 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "commonjs",
+          "lib": [
+            "es5"
+          ],
+          "allowJs": true,
+          "checkJs": true,
+          "maxNodeModuleJsDepth": 2,
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/Library/Caches/typescript/node_modules/@types/react-router-dom/index.d.ts]
 export class BrowserRouterFromDts {}
 
 //// [/home/src/Library/Caches/typescript/node_modules/@types/react-router-dom/package.json]
 { "name": "@types/react-router-dom", "version": "16.8.4", "types": "index.d.ts" }
 
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
 //// [/home/src/workspaces/project/index.js]
 BrowserRouter
 
@@ -34,12 +53,12 @@ export {};
 { "dependencies": { "react-router-dom": "*" } }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "commonjs", "allowJs": true, "checkJs": true, "maxNodeModuleJsDepth": 2 }, "typeAcquisition": { "enable": true } }
+{ "compilerOptions": { "module": "commonjs", "lib": ["es5"], "allowJs": true, "checkJs": true, "maxNodeModuleJsDepth": 2 }, "typeAcquisition": { "enable": true } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/Library/Caches/typescript/node_modules/@types/react-router-dom/package.json"
@@ -60,7 +79,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules/@types/react-router-dom/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules/@types/react-router-dom/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -78,19 +97,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/Library/Caches/typescript/node_modules/@types/react-router-dom/package.json SVC-1-0 "{ \"name\": \"@types/react-router-dom\", \"version\": \"16.8.4\", \"types\": \"index.d.ts\" }"
 	/home/src/Library/Caches/typescript/node_modules/@types/react-router-dom/index.d.ts Text-1 "export class BrowserRouterFromDts {}"
 
 
-	../../../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 	index.d.ts
@@ -109,7 +128,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -131,12 +150,12 @@ watchedFiles::
   {"pollingInterval":2000}
 /home/src/Library/Caches/typescript/node_modules/tsconfig.json: *new*
   {"pollingInterval":2000}
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 
 watchedDirectoriesRecursive::
 /home/src/Library/Caches/node_modules/@types: *new*
@@ -170,22 +189,22 @@ ScriptInfos::
     version: SVC-1-0
     containingProjects: 1
         /dev/null/inferredProject1* *default*
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.js"
@@ -201,6 +220,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "allowJs": true,
   "checkJs": true,
   "maxNodeModuleJsDepth": 2,
@@ -227,18 +249,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.js SVC-1-0 "BrowserRouter"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.js
 	  Matched by default include pattern '**/*'
 
@@ -306,7 +328,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -330,12 +352,12 @@ watchedFiles::
   {"pollingInterval":2000}
 /home/src/Library/Caches/typescript/node_modules/tsconfig.json:
   {"pollingInterval":2000}
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/package.json: *new*
   {"pollingInterval":250}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -387,17 +409,17 @@ ScriptInfos::
     version: SVC-1-0
     containingProjects: 1
         /dev/null/inferredProject1* *default*
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -409,7 +431,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -424,7 +446,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -443,7 +465,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.js",
@@ -474,7 +496,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1070,12 +1092,12 @@ watchedFiles::
   {"pollingInterval":2000}
 /home/src/Library/Caches/typescript/node_modules/tsconfig.json:
   {"pollingInterval":2000}
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/package.json:
   {"pollingInterval":250}
 /home/src/workspaces/project/tsconfig.json:
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap1.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap1.js
index 6d6a827fa7538..734173e144a2b 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap1.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "type": "module",
@@ -35,6 +53,7 @@ export const isBrowser = false;
 {
   "compilerOptions": {
     "module": "nodenext",
+    "lib": ["es5"],
     "rootDir": "src",
     "outDir": "dist"
   }
@@ -43,7 +62,7 @@ export const isBrowser = false;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -61,6 +80,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
@@ -82,22 +104,36 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/env/browser.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/env/node.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/env/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/a.ts Text-1 "isBrowser"
 	/home/src/workspaces/project/src/env/browser.ts Text-1 "export const isBrowser = true;"
 	/home/src/workspaces/project/src/env/node.ts Text-1 "export const isBrowser = false;"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/a.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -126,62 +162,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -189,25 +179,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"],\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -222,7 +212,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -230,14 +220,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -277,17 +274,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/a.ts *new*
     version: Text-1
@@ -308,7 +308,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -323,7 +323,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
@@ -339,7 +339,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -352,13 +352,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -371,7 +371,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -393,7 +393,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -406,13 +406,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -431,7 +431,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap2.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap2.js
index 128c4bb8fd06d..7ad6e0d6deeac 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap2.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "type": "module",
@@ -29,6 +47,7 @@ export function something(name: string) {}
 {
   "compilerOptions": {
     "module": "nodenext",
+    "lib": ["es5"],
     "rootDir": "src",
     "outDir": "dist"
   }
@@ -37,7 +56,7 @@ export function something(name: string) {}
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -54,6 +73,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
@@ -74,21 +96,35 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/internal/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/internal/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/a.ts Text-1 "something"
 	/home/src/workspaces/project/src/internal/foo.ts Text-1 "export function something(name: string) {}"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/a.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -114,62 +150,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -177,25 +167,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"],\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -210,7 +200,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -218,14 +208,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -263,17 +260,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/a.ts *new*
     version: Text-1
@@ -290,7 +290,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -305,7 +305,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
@@ -321,7 +321,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -334,13 +334,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -353,7 +353,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -375,7 +375,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -388,13 +388,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -413,7 +413,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap3.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap3.js
index a00c375a4b2b5..aa1b6be70d05f 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap3.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "type": "module",
@@ -29,6 +47,7 @@ export function something(name: string) {}
 {
   "compilerOptions": {
     "module": "nodenext",
+    "lib": ["es5"],
     "rootDir": "src",
     "outDir": "dist"
   }
@@ -37,7 +56,7 @@ export function something(name: string) {}
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -54,6 +73,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
@@ -74,21 +96,35 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/internal/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/internal/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/a.ts Text-1 "something"
 	/home/src/workspaces/project/src/internal/foo.ts Text-1 "export function something(name: string) {}"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/a.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -114,62 +150,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -177,25 +167,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"],\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -210,7 +200,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -218,14 +208,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -263,17 +260,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/a.ts *new*
     version: Text-1
@@ -290,7 +290,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -305,7 +305,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
@@ -321,7 +321,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -334,13 +334,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -353,7 +353,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -375,7 +375,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -388,13 +388,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -413,7 +413,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap4.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap4.js
index f792e3a8d8792..394edb564c5bf 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap4.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap4.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "type": "module",
@@ -32,6 +50,7 @@ export const isBrowser = true;
 {
   "compilerOptions": {
     "module": "nodenext",
+    "lib": ["es5"],
     "rootDir": "src",
     "outDir": "dist"
   }
@@ -40,7 +59,7 @@ export const isBrowser = true;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -57,6 +76,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
@@ -77,21 +99,35 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/env/browser.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/env/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/a.ts Text-1 "isBrowser"
 	/home/src/workspaces/project/src/env/browser.ts Text-1 "export const isBrowser = true;"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/a.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -117,62 +153,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -180,25 +170,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"],\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -213,7 +203,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -221,14 +211,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -266,17 +263,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/a.ts *new*
     version: Text-1
@@ -293,7 +293,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -308,7 +308,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
@@ -324,7 +324,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -337,13 +337,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -356,7 +356,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -378,7 +378,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -391,13 +391,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -416,7 +416,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap5.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap5.js
index ac5f80ab9cf14..7b5ef1252c8e4 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap5.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_importsMap5.js
@@ -1,16 +1,35 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "declarationDir": "/home/src/workspaces/project/types",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "type": "module",
@@ -32,6 +51,7 @@ export const isBrowser = true;
 {
   "compilerOptions": {
     "module": "nodenext",
+    "lib": ["es5"],
     "rootDir": "src",
     "outDir": "dist",
     "declarationDir": "types",
@@ -41,7 +61,7 @@ export const isBrowser = true;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -58,6 +78,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
   "declarationDir": "/home/src/workspaces/project/types",
@@ -79,21 +102,35 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/env/browser.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/env/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/a.ts Text-1 "isBrowser"
 	/home/src/workspaces/project/src/env/browser.ts Text-1 "export const isBrowser = true;"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/a.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -120,64 +157,19 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
         "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
           {
             "start": {
-              "line": 6,
+              "line": 7,
               "offset": 5
             },
             "end": {
-              "line": 6,
+              "line": 7,
               "offset": 21
             },
             "text": "Option 'declarationDir' cannot be specified without specifying option 'declaration' or option 'composite'.",
             "code": 5069,
             "category": "error",
             "fileName": "/home/src/workspaces/project/tsconfig.json"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
           }
         ]
       }
@@ -186,9 +178,9 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -196,25 +188,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\",\n    \"declarationDir\": \"types\",\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"],\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\",\n    \"declarationDir\": \"types\",\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -229,7 +221,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -237,14 +229,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -282,17 +281,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/a.ts *new*
     version: Text-1
@@ -309,7 +311,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -324,7 +326,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
@@ -340,7 +342,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -353,13 +355,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -372,7 +374,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -394,7 +396,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -407,13 +409,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -432,7 +434,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_namespaceSameNameAsIntrinsic.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_namespaceSameNameAsIntrinsic.js
index 494bff29d8f01..5cdbae30bd005 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_namespaceSameNameAsIntrinsic.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_namespaceSameNameAsIntrinsic.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "commonjs",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 type A = { name: string }
 
@@ -28,12 +44,12 @@ export type SafeString = string;
 { "dependencies": { "fp-ts": "^0.10.4" } }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "commonjs" } }
+{ "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/fp-ts/package.json"
@@ -47,7 +63,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/fp-ts/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -61,18 +77,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/fp-ts/package.json SVC-1-0 "{ \"name\": \"fp-ts\", \"version\": \"0.10.4\" }"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -89,7 +105,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -97,12 +113,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/fp-ts/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/fp-ts/tsconfig.json: *new*
@@ -128,15 +144,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -147,7 +163,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -163,6 +179,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -186,18 +205,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-1-0 "type A = { name: string }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 
@@ -267,7 +286,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -276,12 +295,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/fp-ts/index.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/fp-ts/jsconfig.json:
@@ -332,17 +351,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -366,7 +385,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -381,7 +400,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -400,7 +419,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -432,7 +451,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1343,12 +1362,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/fp-ts/index.d.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/fp-ts/jsconfig.json:
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_pnpm.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_pnpm.js
index 4e2f75866d226..5855fc63777ac 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_pnpm.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_pnpm.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "commonjs",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 autorun
 
@@ -25,12 +41,12 @@ export declare function autorun(): void;
 { "dependencies": { "mobx": "*" } }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "commonjs" } }
+{ "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -46,6 +62,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -63,7 +82,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 1 undefined Config: /home/src/workspaces/project/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -73,18 +92,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 "autorun"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 
@@ -120,18 +139,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\" } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\", \"lib\": [\"es5\"] } }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -173,7 +192,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -182,12 +201,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -227,17 +246,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -257,7 +276,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -288,17 +307,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/.pnpm/mobx@6.0.4/node_modules/mobx/dist/mobx.d.ts:
@@ -340,17 +359,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -371,7 +390,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -383,12 +402,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -401,13 +420,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -420,7 +439,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -442,7 +461,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -455,13 +474,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -498,7 +517,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -531,12 +550,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/.pnpm/mobx@6.0.4/node_modules/mobx/dist/mobx.d.ts:
@@ -581,17 +600,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -612,7 +631,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -629,7 +648,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -651,17 +670,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -682,7 +701,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -699,22 +718,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_referencesCrash.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_referencesCrash.js
index 15537121285e3..e6bcc8f9af6ad 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_referencesCrash.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_referencesCrash.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true,
+          "disableSourceOfProjectReferenceRedirect": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a/index.d.ts]
 declare class A {
 }
@@ -26,7 +42,7 @@ class A {}
 {}
 
 //// [/home/src/workspaces/project/a/tsconfig.json]
-{}
+{ "compilerOptions": { "lib": ["es5"] } }
 
 //// [/home/src/workspaces/project/b/b.ts]
 /// <reference path="../a/index.d.ts" />
@@ -34,7 +50,7 @@ new A();
 
 //// [/home/src/workspaces/project/b/tsconfig.json]
 {
-  "compilerOptions": { "disableSourceOfProjectReferenceRedirect": true },
+  "compilerOptions": { "disableSourceOfProjectReferenceRedirect": true, "lib": ["es5"] },
   "references": [{ "path": "../a" }]
 }
 
@@ -46,12 +62,12 @@ export {};
 { "dependencies": { "a": "*" } }
 
 //// [/home/src/workspaces/project/c/tsconfig.json]
-{ "references" [{ "path": "../a" }] }
+{ "compilerOptions": { "lib": ["es5"] }, "references" [{ "path": "../a" }] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/package.json"
@@ -66,6 +82,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/a/tsconfig.json :
   "/home/src/workspaces/project/a/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/a/tsconfig.json"
  }
 }
@@ -83,7 +102,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a 1 undefined Config: /home/src/workspaces/project/a/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/a/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a/node_modules/@types 1 undefined Project: /home/src/workspaces/project/a/tsconfig.json WatchType: Type roots
@@ -95,18 +114,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/a/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/a/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a/index.ts Text-1 "class A {}"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 
@@ -146,18 +165,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a/package.json SVC-1-0 "{}"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -179,7 +198,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -187,12 +206,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/a/jsconfig.json: *new*
@@ -230,17 +249,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/a/tsconfig.json
@@ -256,7 +275,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/c/index.ts"
@@ -271,6 +290,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/c/tsconfig.json :
   "/home/src/workspaces/project/c/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/c/tsconfig.json"
  },
  "projectReferences": [
@@ -302,18 +324,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/c/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/c/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/c/index.ts SVC-1-0 "export {};"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 
@@ -353,11 +375,11 @@ Info seq  [hh:mm:ss:mss] event:
           {
             "start": {
               "line": 1,
-              "offset": 17
+              "offset": 56
             },
             "end": {
               "line": 1,
-              "offset": 35
+              "offset": 74
             },
             "text": "Referenced project '/home/src/workspaces/project/a' must have setting \"composite\": true.",
             "code": 6306,
@@ -367,11 +389,11 @@ Info seq  [hh:mm:ss:mss] event:
           {
             "start": {
               "line": 1,
-              "offset": 16
+              "offset": 55
             },
             "end": {
               "line": 1,
-              "offset": 17
+              "offset": 56
             },
             "text": "':' expected.",
             "code": 1005,
@@ -407,7 +429,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -416,12 +438,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/a/jsconfig.json:
@@ -476,19 +498,19 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/c/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/c/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/a/tsconfig.json
@@ -510,7 +532,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b/b.ts"
@@ -526,6 +548,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/b/tsconfig.json :
  ],
  "options": {
   "disableSourceOfProjectReferenceRedirect": true,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/b/tsconfig.json"
  },
  "projectReferences": [
@@ -558,19 +583,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/b/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/b/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a/index.d.ts Text-1 "declare class A {\n}\n//# sourceMappingURL=index.d.ts.map"
 	/home/src/workspaces/project/b/b.ts SVC-1-0 "/// <reference path=\"../a/index.d.ts\" />\nnew A();"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../a/index.d.ts
 	  Referenced via '../a/index.d.ts' from file 'b.ts'
 	b.ts
@@ -644,7 +669,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -652,12 +677,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/a/index.ts:
@@ -725,21 +750,21 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 4 *changed*
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/c/tsconfig.json
         /home/src/workspaces/project/b/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 4 *changed*
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/c/tsconfig.json
         /home/src/workspaces/project/b/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 4 *changed*
         /home/src/workspaces/project/a/tsconfig.json
@@ -770,7 +795,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b/b.ts",
@@ -789,7 +814,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -837,12 +862,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts.map: *new*
@@ -916,21 +941,21 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 4
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/c/tsconfig.json
         /home/src/workspaces/project/b/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 4
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/c/tsconfig.json
         /home/src/workspaces/project/b/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 4
         /home/src/workspaces/project/a/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_wildcardExports1.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_wildcardExports1.js
index 0c7d26f2f47e7..dd2d0a1f22567 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_wildcardExports1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_wildcardExports1.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/main.ts]
 
 
@@ -57,14 +73,15 @@ export const d1: number;
 //// [/home/src/workspaces/project/tsconfig.json]
 {
     "compilerOptions": {
-        "module": "nodenext"
+        "module": "nodenext",
+        "lib": ["es5"]
     }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/pkg/package.json"
@@ -78,9 +95,12 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/pkg/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/pkg/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -92,18 +112,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/pkg/package.json SVC-1-0 "{\n    \"name\": \"pkg\",\n    \"version\": \"1.0.0\",\n    \"exports\": {\n        \"./*\": \"./a/*.js\",\n        \"./b/*.js\": \"./b/*.js\",\n        \"./c/*\": \"./c/*\",\n        \"./d/*\": {\n            \"import\": \"./d/*.mjs\"\n        }\n    }\n}"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -120,7 +140,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -128,12 +148,18 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/pkg/jsconfig.json: *new*
@@ -159,15 +185,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -178,7 +204,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/main.ts"
@@ -194,6 +220,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -210,18 +239,29 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 1 undefined Config: /home/src/workspaces/project/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 1 undefined Config: /home/src/workspaces/project/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/main.ts SVC-1-0 ""
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	main.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -286,57 +326,11 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/main.ts",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/autoImportProviderProject1*' (AutoImportProvider)
@@ -357,7 +351,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -366,14 +360,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
 /home/src/workspaces/project/node_modules/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/pkg/a/a1.d.ts: *new*
@@ -435,18 +436,21 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+        /home/src/workspaces/project/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+        /home/src/workspaces/project/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json *new*
 /home/src/workspaces/project/main.ts (Open) *new*
     version: SVC-1-0
     containingProjects: 1
@@ -482,7 +486,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -497,7 +501,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -516,7 +520,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/main.ts",
@@ -547,7 +551,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -570,6 +574,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "ArrayBuffer",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "as",
             "kind": "keyword",
@@ -606,6 +622,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Boolean",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "break",
             "kind": "keyword",
@@ -642,6 +664,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "DataView",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Date",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "debugger",
             "kind": "keyword",
@@ -654,6 +688,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "decodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "decodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "default",
             "kind": "keyword",
@@ -678,12 +724,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "encodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "encodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "enum",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Error",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "eval",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "EvalError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "export",
             "kind": "keyword",
@@ -708,6 +784,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Float32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Float64Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "for",
             "kind": "keyword",
@@ -720,6 +808,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Function",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "globalThis",
             "kind": "module",
@@ -756,18 +850,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Infinity",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "instanceof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Int8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "interface",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Intl",
+            "kind": "module",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isFinite",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isNaN",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "JSON",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "keyof",
             "kind": "keyword",
@@ -780,6 +922,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Math",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "module",
             "kind": "keyword",
@@ -792,6 +940,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "NaN",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "never",
             "kind": "keyword",
@@ -816,24 +970,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Number",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "object",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Object",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "package",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "parseFloat",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "parseInt",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RangeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "readonly",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "ReferenceError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RegExp",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "return",
             "kind": "keyword",
@@ -852,6 +1048,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "String",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "super",
             "kind": "keyword",
@@ -870,6 +1072,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "SyntaxError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "this",
             "kind": "keyword",
@@ -900,12 +1108,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "TypeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "typeof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Uint8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint8ClampedArray",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "undefined",
             "kind": "var",
@@ -924,6 +1162,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "URIError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "using",
             "kind": "keyword",
@@ -1069,6 +1313,18 @@ Info seq  [hh:mm:ss:mss] response:
               "fileName": "/home/src/workspaces/project/node_modules/pkg/d/d1.d.mts",
               "isPackageJsonImport": true
             }
+          },
+          {
+            "name": "escape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
+          },
+          {
+            "name": "unescape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
           }
         ],
         "defaultCommitCharacters": [
@@ -1080,14 +1336,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/pkg/a/a1.d.ts:
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_wildcardExports2.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_wildcardExports2.js
index 4e3313f2ffd06..4ab18d7585a47 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_wildcardExports2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_wildcardExports2.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/main.ts]
 
 
@@ -40,14 +56,15 @@ export function test(): void;
 //// [/home/src/workspaces/project/tsconfig.json]
 {
     "compilerOptions": {
-        "module": "nodenext"
+        "module": "nodenext",
+        "lib": ["es5"]
     }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/pkg/package.json"
@@ -61,9 +78,12 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/pkg/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/pkg/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -75,18 +95,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/pkg/package.json SVC-1-0 "{\n    \"name\": \"pkg\",\n    \"version\": \"1.0.0\",\n    \"exports\": {\n        \"./core/*\": {\n            \"types\": \"./lib/core/*.d.ts\",\n            \"default\": \"./lib/core/*.js\"\n        }\n    }\n}"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -103,7 +123,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -111,12 +131,18 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/pkg/jsconfig.json: *new*
@@ -142,15 +168,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -161,7 +187,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/main.ts"
@@ -177,6 +203,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -193,18 +222,29 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 1 undefined Config: /home/src/workspaces/project/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 1 undefined Config: /home/src/workspaces/project/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/main.ts SVC-1-0 ""
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	main.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -246,57 +286,11 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/main.ts",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/autoImportProviderProject1*' (AutoImportProvider)
@@ -317,7 +311,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -326,14 +320,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
 /home/src/workspaces/project/node_modules/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/pkg/jsconfig.json:
@@ -383,18 +384,21 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+        /home/src/workspaces/project/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+        /home/src/workspaces/project/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json *new*
 /home/src/workspaces/project/main.ts (Open) *new*
     version: SVC-1-0
     containingProjects: 1
@@ -410,7 +414,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -425,7 +429,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -444,7 +448,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/main.ts",
@@ -475,7 +479,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -498,6 +502,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "ArrayBuffer",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "as",
             "kind": "keyword",
@@ -534,6 +550,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Boolean",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "break",
             "kind": "keyword",
@@ -570,6 +592,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "DataView",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Date",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "debugger",
             "kind": "keyword",
@@ -582,6 +616,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "decodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "decodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "default",
             "kind": "keyword",
@@ -606,12 +652,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "encodeURI",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "encodeURIComponent",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "enum",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Error",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "eval",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "EvalError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "export",
             "kind": "keyword",
@@ -636,6 +712,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Float32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Float64Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "for",
             "kind": "keyword",
@@ -648,6 +736,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Function",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "globalThis",
             "kind": "module",
@@ -684,18 +778,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Infinity",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "instanceof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Int8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Int32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "interface",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Intl",
+            "kind": "module",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isFinite",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "isNaN",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "JSON",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "keyof",
             "kind": "keyword",
@@ -708,6 +850,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Math",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "module",
             "kind": "keyword",
@@ -720,6 +868,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "NaN",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "never",
             "kind": "keyword",
@@ -744,24 +898,66 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Number",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "object",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Object",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "package",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "parseFloat",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "parseInt",
+            "kind": "function",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RangeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "readonly",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "ReferenceError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "RegExp",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "return",
             "kind": "keyword",
@@ -780,6 +976,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "String",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "super",
             "kind": "keyword",
@@ -798,6 +1000,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "SyntaxError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "this",
             "kind": "keyword",
@@ -828,12 +1036,42 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "TypeError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "typeof",
             "kind": "keyword",
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "Uint8Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint8ClampedArray",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint16Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
+          {
+            "name": "Uint32Array",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "undefined",
             "kind": "var",
@@ -852,6 +1090,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "",
             "sortText": "15"
           },
+          {
+            "name": "URIError",
+            "kind": "var",
+            "kindModifiers": "declare",
+            "sortText": "15"
+          },
           {
             "name": "using",
             "kind": "keyword",
@@ -909,6 +1153,18 @@ Info seq  [hh:mm:ss:mss] response:
               "fileName": "/home/src/workspaces/project/node_modules/pkg/lib/core/test.d.ts",
               "isPackageJsonImport": true
             }
+          },
+          {
+            "name": "escape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
+          },
+          {
+            "name": "unescape",
+            "kind": "function",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z15"
           }
         ],
         "defaultCommitCharacters": [
@@ -920,14 +1176,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/pkg/jsconfig.json:
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_wildcardExports3.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_wildcardExports3.js
index 7a40c8f301940..8af7a28c59ee6 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_wildcardExports3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_wildcardExports3.js
@@ -1,16 +1,35 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "esnext",
+          "moduleResolution": "bundler",
+          "noEmit": true,
+          "jsx": "preserve",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/apps/web/app/index.tsx]
 (<Card />);
 
@@ -30,7 +49,8 @@ lib.decorators.legacy.d.ts-Text
     "module": "esnext",
     "moduleResolution": "bundler",
     "noEmit": true,
-    "jsx": "preserve"
+    "jsx": "preserve",
+    "lib": ["es5"]
   },
  "include": ["app"]
 }
@@ -50,7 +70,7 @@ export const Card = () => null;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/ui/package.json"
@@ -66,7 +86,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/ui/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -80,18 +100,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/ui/package.json SVC-1-0 "{\n  \"name\": \"@repo/ui\",\n  \"version\": \"1.0.0\",\n  \"exports\": {\n    \"./*\": \"./src/*.tsx\"\n  }\n}"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -109,7 +129,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -117,12 +137,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/jsconfig.json: *new*
@@ -155,15 +175,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -174,7 +194,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/web/app/index.tsx"
@@ -193,6 +213,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/apps/web/tsconfig.
   "moduleResolution": 100,
   "noEmit": true,
   "jsx": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/apps/web/tsconfig.json"
  }
 }
@@ -220,18 +243,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/apps/web/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/apps/web/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/apps/web/app/index.tsx SVC-1-0 "(<Card />);"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	app/index.tsx
 	  Matched by include pattern 'app' in 'tsconfig.json'
 
@@ -293,7 +316,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -302,12 +325,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/apps/web/package.json: *new*
   {"pollingInterval":250}
 /home/src/workspaces/project/apps/web/tsconfig.json: *new*
@@ -361,17 +384,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/apps/web/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/apps/web/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -391,7 +414,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -406,7 +429,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -426,7 +449,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/web/app/index.tsx",
@@ -458,7 +481,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -765,12 +788,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/apps/web/package.json:
   {"pollingInterval":250}
 /home/src/workspaces/project/apps/web/tsconfig.json:
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportReExportFromAmbientModule.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportReExportFromAmbientModule.js
index 3132a95dd584a..37fc767326061 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportReExportFromAmbientModule.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportReExportFromAmbientModule.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "commonjs",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 access
 
@@ -25,14 +41,15 @@ declare module "fs" {
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
-    "module": "commonjs"
+    "module": "commonjs",
+    "lib": ["es5"]
   }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -48,6 +65,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -69,7 +89,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/fs-extra/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/node/index.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
@@ -91,7 +111,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 "access"
@@ -99,12 +119,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/node_modules/@types/node/index.d.ts Text-1 "declare module \"fs\" {\n  export function accessSync(path: string): void;\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 	node_modules/@types/fs-extra/index.d.ts
@@ -158,20 +178,20 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"commonjs\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"commonjs\",\n    \"lib\": [\"es5\"]\n  }\n}"
 	/home/src/workspaces/project/node_modules/@types/fs-extra/index.d.ts Text-1 "export * from \"fs\";"
 	/home/src/workspaces/project/node_modules/@types/node/index.d.ts Text-1 "declare module \"fs\" {\n  export function accessSync(path: string): void;\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 	node_modules/@types/fs-extra/index.d.ts
@@ -196,7 +216,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -204,12 +224,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/package.json: *new*
   {"pollingInterval":2000}
   {"pollingInterval":2000}
@@ -274,17 +294,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -310,7 +330,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -337,17 +357,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/package.json:
   {"pollingInterval":2000}
   {"pollingInterval":2000}
@@ -414,17 +434,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -451,7 +471,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -466,7 +486,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -481,7 +501,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -507,7 +527,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "flags": 9,
@@ -1229,12 +1249,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/package.json:
   {"pollingInterval":2000}
   {"pollingInterval":2000}
@@ -1298,7 +1318,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1324,7 +1344,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -1419,7 +1439,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1436,7 +1456,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 After Request
@@ -1451,17 +1471,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportRelativePathToMonorepoPackage.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportRelativePathToMonorepoPackage.js
index e0f4017166aca..b6f456bbe64cb 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportRelativePathToMonorepoPackage.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportRelativePathToMonorepoPackage.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/packages/app/dist/index.d.ts]
 import {} from "utils";
 export const app: number;
@@ -29,14 +45,15 @@ x
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
-    "module": "nodenext"
+    "module": "nodenext",
+    "lib": ["es5"]
   }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -54,6 +71,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -75,6 +95,9 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/app/node_modules/utils 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
@@ -82,25 +105,36 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/utils/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/utils/dist/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/app/dist/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/app/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/utils/dist/index.d.ts Text-1 "export const x: number;"
 	/home/src/workspaces/project/packages/app/dist/index.d.ts Text-1 "import {} from \"utils\";\nexport const app: number;"
 	/home/src/workspaces/project/script.ts Text-1 "import {} from \"./packages/app/dist/index.js\";\nx"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	packages/utils/dist/index.d.ts
 	  Imported via "utils" from file 'packages/app/dist/index.d.ts' with packageId 'utils/dist/index.d.ts@1.0.0'
 	  Matched by default include pattern '**/*'
@@ -131,62 +165,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -194,24 +182,24 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"]\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -226,7 +214,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -234,14 +222,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/package.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -298,17 +293,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/packages/app/dist/index.d.ts *new*
     version: Text-1
@@ -329,7 +327,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/script.ts"
@@ -339,7 +337,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/script.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/script.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -356,19 +354,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/package.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
@@ -427,17 +432,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/packages/app/dist/index.d.ts
     version: Text-1
@@ -459,7 +467,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -474,7 +482,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -489,7 +497,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/script.ts",
@@ -502,13 +510,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/script.ts",
@@ -521,7 +529,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -543,7 +551,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/script.ts",
@@ -556,13 +564,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/script.ts",
@@ -583,7 +591,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -612,14 +620,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/package.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportSymlinkedJsPackages.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportSymlinkedJsPackages.js
index 0d7c2751f6347..9fc1e3ce90836 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportSymlinkedJsPackages.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportSymlinkedJsPackages.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/packages/a/index.js]
 packageB
 
@@ -32,7 +47,7 @@ export const packageB = "package-b";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/a/package.json"
@@ -48,7 +63,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages/a/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -62,18 +77,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/a/package.json SVC-1-0 "{\n  \"name\": \"package-a\",\n  \"dependencies\": {\n    \"package-b\": \"*\"\n  }\n}"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -91,7 +106,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -99,12 +114,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/a/jsconfig.json: *new*
@@ -137,15 +152,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -156,11 +171,14 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "options": {
           "module": "commonjs",
+          "lib": [
+            "es5"
+          ],
           "allowJs": true,
           "maxNodeModulesJsDepth": 2
         }
@@ -174,7 +192,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "compilerOptionsForInferredProjects",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": true
     }
@@ -188,7 +206,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/a/index.js"
@@ -209,18 +227,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/a/index.js SVC-1-0 "packageB"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.js
 	  Root file specified for compilation
 
@@ -261,7 +279,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -270,12 +288,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/a/jsconfig.json:
@@ -322,17 +340,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -352,7 +370,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -367,7 +385,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 After Request
@@ -388,7 +406,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/a/index.js",
@@ -419,7 +437,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1000,12 +1018,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/a/jsconfig.json:
diff --git a/tests/baselines/reference/tsserver/fourslashServer/brace01.js b/tests/baselines/reference/tsserver/fourslashServer/brace01.js
index d67ea1912b97b..2bfc45f07518a 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/brace01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/brace01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/brace01.ts]
 //curly braces
 module Foo {
@@ -52,7 +67,7 @@ class TemplateTest <T1, T2 extends Array> {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts"
@@ -64,7 +79,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -74,18 +89,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/brace01.ts SVC-1-0 "//curly braces\nmodule Foo {\n    class Bar {\n        private f() {\n        }\n\n        private f2() {\n            if (true) { } { };\n        }\n    }\n}\n\n//parenthesis\nclass FooBar {\n    private f() {\n        return ((1 + 1));\n    }\n\n    private f2() {\n        if (true) { }\n    }\n}\n\n//square brackets\nclass Baz {\n    private f() {\n        var a: any[] = [[1, 2], [3, 4], 5];\n    }\n}\n\n// angular brackets\nclass TemplateTest <T1, T2 extends Array> {\n    public foo(a, b) {\n        return <any> a;\n    }\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	brace01.ts
 	  Root file specified for compilation
 
@@ -102,7 +117,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -110,12 +125,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -134,15 +149,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -153,7 +168,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -167,7 +182,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
@@ -194,7 +209,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -208,7 +223,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
@@ -235,7 +250,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -249,7 +264,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -276,7 +291,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -290,7 +305,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -317,7 +332,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -331,7 +346,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
@@ -358,7 +373,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -372,7 +387,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -399,7 +414,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -413,7 +428,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
@@ -440,7 +455,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -454,7 +469,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": [
         {
@@ -481,7 +496,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -495,7 +510,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "body": [
         {
@@ -522,7 +537,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -536,7 +551,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true,
       "body": [
         {
@@ -563,7 +578,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -577,7 +592,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "body": [
         {
@@ -604,7 +619,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -618,7 +633,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true,
       "body": [
         {
@@ -645,7 +660,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -659,7 +674,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true,
       "body": [
         {
@@ -686,7 +701,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -700,7 +715,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true,
       "body": [
         {
@@ -727,7 +742,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -741,7 +756,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true,
       "body": [
         {
@@ -768,7 +783,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -782,7 +797,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true,
       "body": [
         {
@@ -809,7 +824,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -823,7 +838,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true,
       "body": [
         {
@@ -850,7 +865,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -864,7 +879,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true,
       "body": [
         {
@@ -891,7 +906,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -905,7 +920,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true,
       "body": [
         {
@@ -932,7 +947,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 20,
+      "seq": 21,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -946,7 +961,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 20,
+      "request_seq": 21,
       "success": true,
       "body": [
         {
@@ -973,7 +988,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 21,
+      "seq": 22,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -987,7 +1002,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 21,
+      "request_seq": 22,
       "success": true,
       "body": [
         {
@@ -1014,7 +1029,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 22,
+      "seq": 23,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -1028,7 +1043,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 22,
+      "request_seq": 23,
       "success": true,
       "body": [
         {
@@ -1055,7 +1070,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 23,
+      "seq": 24,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -1069,7 +1084,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 23,
+      "request_seq": 24,
       "success": true,
       "body": [
         {
@@ -1096,7 +1111,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 24,
+      "seq": 25,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -1110,7 +1125,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 24,
+      "request_seq": 25,
       "success": true,
       "body": [
         {
@@ -1137,7 +1152,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 25,
+      "seq": 26,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -1151,7 +1166,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 25,
+      "request_seq": 26,
       "success": true,
       "body": [
         {
@@ -1178,7 +1193,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 26,
+      "seq": 27,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -1192,7 +1207,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 26,
+      "request_seq": 27,
       "success": true,
       "body": [
         {
@@ -1219,7 +1234,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 27,
+      "seq": 28,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -1233,7 +1248,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 27,
+      "request_seq": 28,
       "success": true,
       "body": [
         {
@@ -1260,7 +1275,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 28,
+      "seq": 29,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -1274,7 +1289,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 28,
+      "request_seq": 29,
       "success": true,
       "body": [
         {
@@ -1301,7 +1316,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 29,
+      "seq": 30,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -1315,7 +1330,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 29,
+      "request_seq": 30,
       "success": true,
       "body": [
         {
@@ -1342,7 +1357,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 30,
+      "seq": 31,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -1356,7 +1371,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 30,
+      "request_seq": 31,
       "success": true,
       "body": [
         {
@@ -1383,7 +1398,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 31,
+      "seq": 32,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -1397,7 +1412,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 31,
+      "request_seq": 32,
       "success": true,
       "body": [
         {
@@ -1424,7 +1439,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 32,
+      "seq": 33,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -1438,7 +1453,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 32,
+      "request_seq": 33,
       "success": true,
       "body": [
         {
@@ -1465,7 +1480,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 33,
+      "seq": 34,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -1479,7 +1494,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 33,
+      "request_seq": 34,
       "success": true,
       "body": [
         {
@@ -1506,7 +1521,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 34,
+      "seq": 35,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/brace01.ts",
@@ -1520,7 +1535,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "brace",
-      "request_seq": 34,
+      "request_seq": 35,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/callHierarchyContainerNameServer.js b/tests/baselines/reference/tsserver/fourslashServer/callHierarchyContainerNameServer.js
index 878a209219723..86d4f8aed3be1 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/callHierarchyContainerNameServer.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/callHierarchyContainerNameServer.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts]
 function f() {}
 
@@ -51,7 +66,7 @@ namespace Foo.Bar {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts"
@@ -63,7 +78,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -73,18 +88,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts SVC-1-0 "function f() {}\n\nclass A {\n  static sameName() {\n    f();\n  }\n}\n\nclass B {\n  sameName() {\n    A.sameName();\n  }\n}\n\nconst Obj = {\n  get sameName() {\n    return new B().sameName;\n  }\n};\n\nnamespace Foo {\n  function sameName() {\n    return Obj.sameName;\n  }\n\n  export class C {\n    constructor() {\n      sameName();\n    }\n  }\n}\n\nnamespace Foo.Bar {\n  const sameName = () => new Foo.C();\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	callHierarchyContainerNameServer.ts
 	  Root file specified for compilation
 
@@ -101,7 +116,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -109,12 +124,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -133,15 +148,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -152,7 +167,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts",
@@ -166,7 +181,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "prepareCallHierarchy",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": {
         "name": "f",
@@ -197,7 +212,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts",
@@ -211,7 +226,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "provideCallHierarchyIncomingCalls",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
@@ -259,7 +274,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts",
@@ -273,13 +288,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "provideCallHierarchyOutgoingCalls",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts",
@@ -293,7 +308,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "provideCallHierarchyIncomingCalls",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -341,7 +356,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts",
@@ -355,7 +370,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "provideCallHierarchyIncomingCalls",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
@@ -403,7 +418,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts",
@@ -417,7 +432,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "provideCallHierarchyIncomingCalls",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -465,7 +480,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts",
@@ -479,7 +494,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "provideCallHierarchyIncomingCalls",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
@@ -527,7 +542,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts",
@@ -541,7 +556,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "provideCallHierarchyIncomingCalls",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": [
         {
@@ -589,7 +604,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts",
@@ -603,7 +618,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "provideCallHierarchyIncomingCalls",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/completionEntryDetailAcrossFiles01.js b/tests/baselines/reference/tsserver/fourslashServer/completionEntryDetailAcrossFiles01.js
index 16e2c28187ece..6debeccda1a05 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/completionEntryDetailAcrossFiles01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/completionEntryDetailAcrossFiles01.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "allowJs": true,
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/a.js]
 /**
  * Modify the parameter
@@ -27,7 +43,7 @@ a.fo
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.js"
@@ -39,7 +55,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -49,18 +65,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.js SVC-1-0 "/**\n * Modify the parameter\n * @param {string} p1\n */\nvar foo = function (p1) { }\nexports.foo = foo;\nfo"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.js
 	  Root file specified for compilation
 
@@ -77,7 +93,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -85,12 +101,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -109,15 +125,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -128,7 +144,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -140,12 +156,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.js",
@@ -165,7 +181,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "flags": 0,
@@ -743,7 +759,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.js",
@@ -767,7 +783,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -853,7 +869,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.ts"
@@ -872,19 +888,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.js SVC-1-0 "/**\n * Modify the parameter\n * @param {string} p1\n */\nvar foo = function (p1) { }\nexports.foo = foo;\nfo"
 	/tests/cases/fourslash/server/b.ts SVC-1-0 "import a = require(\"./a\");\na.fo"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.js
 	  Imported via "./a" from file 'b.ts'
 	b.ts
@@ -894,18 +910,18 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
 	/tests/cases/fourslash/server/a.js
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.js
 	  Root file specified for compilation
 
@@ -928,7 +944,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -936,12 +952,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json:
@@ -977,17 +993,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
@@ -1004,7 +1020,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -1016,12 +1032,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.ts",
@@ -1041,7 +1057,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": {
         "flags": 0,
@@ -1075,7 +1091,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.ts",
@@ -1099,7 +1115,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/completionEntryDetailAcrossFiles02.js b/tests/baselines/reference/tsserver/fourslashServer/completionEntryDetailAcrossFiles02.js
index 46bf26de4097e..e7355b5548ec9 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/completionEntryDetailAcrossFiles02.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/completionEntryDetailAcrossFiles02.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "allowJs": true,
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/a.js]
 /**
  * Modify the parameter
@@ -27,7 +43,7 @@ a.fo
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.js"
@@ -39,7 +55,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -49,18 +65,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.js SVC-1-0 "/**\n * Modify the parameter\n * @param {string} p1\n */\nvar foo = function (p1) { }\nmodule.exports.foo = foo;\nfo"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.js
 	  Root file specified for compilation
 
@@ -77,7 +93,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -85,12 +101,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -109,15 +125,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -128,7 +144,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -140,12 +156,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.js",
@@ -165,7 +181,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "flags": 0,
@@ -749,7 +765,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.js",
@@ -773,7 +789,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -859,7 +875,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.ts"
@@ -878,19 +894,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.js SVC-1-0 "/**\n * Modify the parameter\n * @param {string} p1\n */\nvar foo = function (p1) { }\nmodule.exports.foo = foo;\nfo"
 	/tests/cases/fourslash/server/b.ts SVC-1-0 "import a = require(\"./a\");\na.fo"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.js
 	  Imported via "./a" from file 'b.ts'
 	b.ts
@@ -900,18 +916,18 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
 	/tests/cases/fourslash/server/a.js
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.js
 	  Root file specified for compilation
 
@@ -934,7 +950,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -942,12 +958,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json:
@@ -983,17 +999,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
@@ -1010,7 +1026,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -1022,12 +1038,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.ts",
@@ -1047,7 +1063,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": {
         "flags": 0,
@@ -1081,7 +1097,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.ts",
@@ -1105,7 +1121,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/completions01.js b/tests/baselines/reference/tsserver/fourslashServer/completions01.js
index 75fce95d5e3a3..ce384ccc99a29 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/completions01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/completions01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/completions01.ts]
 var x: string[] = [];
 x.forEach(function (y) { y
@@ -19,7 +34,7 @@ x.forEach(y => y
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts"
@@ -31,7 +46,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -41,18 +56,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/completions01.ts SVC-1-0 "var x: string[] = [];\nx.forEach(function (y) { y\nx.forEach(y => y"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	completions01.ts
 	  Root file specified for compilation
 
@@ -69,7 +84,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -77,12 +92,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -101,15 +116,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -120,7 +135,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -137,7 +152,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
@@ -149,15 +164,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -168,7 +183,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -185,20 +200,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -209,7 +224,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -224,13 +239,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -242,12 +257,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -260,7 +275,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferred
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/completions01.ts SVC-1-2 "var x: string[] = [];\nx.forEach(function (y) { y.\nx.forEach(y => y"
@@ -277,7 +292,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -432,7 +447,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -449,7 +464,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true
     }
 After Request
@@ -461,15 +476,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -480,7 +495,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -497,20 +512,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -521,7 +536,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -536,7 +551,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": [
         {
@@ -554,7 +569,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -571,20 +586,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -595,7 +610,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -612,20 +627,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -636,7 +651,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -651,13 +666,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -674,20 +689,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -698,7 +713,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -713,13 +728,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -736,20 +751,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -760,7 +775,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -777,20 +792,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -801,7 +816,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -816,13 +831,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -834,12 +849,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions01.ts",
@@ -852,7 +867,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferred
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 3 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/completions01.ts SVC-1-9 "var x: string[] = [];\nx.forEach(function(y) { y.});\nx.forEach(y => y."
@@ -869,7 +884,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
diff --git a/tests/baselines/reference/tsserver/fourslashServer/completions02.js b/tests/baselines/reference/tsserver/fourslashServer/completions02.js
index e07f734c91104..03c1a938758d9 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/completions02.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/completions02.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/completions02.ts]
 class Foo {
 }
@@ -22,7 +37,7 @@ Foo.
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions02.ts"
@@ -34,7 +49,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -44,18 +59,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/completions02.ts SVC-1-0 "class Foo {\n}\nnamespace Foo {\n    export var x: number;\n}\nFoo."
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	completions02.ts
 	  Root file specified for compilation
 
@@ -72,7 +87,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -80,12 +95,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -104,15 +119,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -123,7 +138,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -135,12 +150,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions02.ts",
@@ -160,7 +175,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "flags": 0,
@@ -232,7 +247,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions02.ts",
@@ -256,7 +271,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -312,7 +327,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions02.ts",
@@ -336,7 +351,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -384,7 +399,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions02.ts",
@@ -401,7 +416,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 After Request
@@ -413,15 +428,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -432,7 +447,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions02.ts",
@@ -449,20 +464,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -473,7 +488,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions02.ts",
@@ -488,13 +503,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions02.ts",
@@ -511,20 +526,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -535,7 +550,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -547,12 +562,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions02.ts",
@@ -565,7 +580,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferred
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/completions02.ts SVC-1-3 "class Foo {\n}\nnamespace Foo {\n    export var x: number;\n}\nFoo."
@@ -582,7 +597,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -665,7 +680,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions02.ts",
@@ -689,7 +704,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "body": [
         {
@@ -745,7 +760,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions02.ts",
@@ -769,7 +784,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/completions03.js b/tests/baselines/reference/tsserver/fourslashServer/completions03.js
index 7fd7b64c6c24c..0991ea367f398 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/completions03.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/completions03.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/completions03.ts]
 interface Foo {
    one: any;
@@ -27,7 +42,7 @@ let x: Foo = {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions03.ts"
@@ -39,7 +54,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -49,18 +64,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/completions03.ts SVC-1-0 "interface Foo {\n   one: any;\n   two: any;\n   three: any;\n}\n\nlet x: Foo = {\n    get one() { return \"\" },\n    set two(t) {},\n    \n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	completions03.ts
 	  Root file specified for compilation
 
@@ -77,7 +92,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -85,12 +100,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -109,15 +124,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -128,7 +143,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -140,12 +155,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/completions03.ts",
@@ -165,7 +180,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "flags": 0,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/completionsImport_addToNamedWithDifferentCacheValue.js b/tests/baselines/reference/tsserver/fourslashServer/completionsImport_addToNamedWithDifferentCacheValue.js
index b5987f4c99680..e311dcc59a96a 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/completionsImport_addToNamedWithDifferentCacheValue.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/completionsImport_addToNamedWithDifferentCacheValue.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "commonjs",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/node_modules/mylib] symlink(/home/src/workspaces/project/packages/mylib)
 //// [/home/src/workspaces/project/packages/mylib/index.ts]
 export * from "./mySubDir";
@@ -34,12 +50,12 @@ const a = new MyClass();
 const b = new MyClass2();
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "commonjs" } }
+{ "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -59,6 +75,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -82,7 +101,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/packages 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -92,7 +111,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/mylib/mySubDir/myClass.ts Text-1 "export class MyClass {}"
@@ -102,12 +121,12 @@ Info seq  [hh:mm:ss:mss] 	Files (8)
 	/home/src/workspaces/project/src/index.ts Text-1 "\nconst a = new MyClass();\nconst b = new MyClass2();"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	packages/mylib/mySubDir/myClass.ts
 	  Imported via "./myClass" from file 'packages/mylib/mySubDir/index.ts'
 	  Matched by default include pattern '**/*'
@@ -154,18 +173,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\" } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\", \"lib\": [\"es5\"] } }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -186,7 +205,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -194,12 +213,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/mylib/index.ts: *new*
@@ -238,17 +257,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -280,7 +299,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts"
@@ -307,17 +326,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/mylib/index.ts:
@@ -358,17 +377,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -401,7 +420,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -437,12 +456,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -458,7 +477,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 After Request
@@ -473,7 +492,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -498,7 +517,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": {
         "flags": 9,
@@ -1236,7 +1255,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1252,12 +1271,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1282,7 +1301,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -1361,7 +1380,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1378,7 +1397,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -1393,17 +1412,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1435,7 +1454,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts"
@@ -1447,7 +1466,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/mylib/mySubDir/myClass.ts Text-1 "export class MyClass {}"
@@ -1475,7 +1494,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1483,12 +1502,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/mylib/index.ts:
@@ -1528,7 +1547,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1545,7 +1564,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 After Request
@@ -1560,17 +1579,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1602,7 +1621,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1619,22 +1638,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1666,7 +1685,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1681,13 +1700,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1704,22 +1723,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1751,7 +1770,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1766,13 +1785,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1789,22 +1808,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1836,7 +1855,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1851,13 +1870,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1874,22 +1893,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1921,7 +1940,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1936,13 +1955,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -1959,22 +1978,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2006,7 +2025,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2021,13 +2040,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 20,
+      "seq": 21,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2044,22 +2063,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 20,
+      "request_seq": 21,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2091,7 +2110,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 21,
+      "seq": 22,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2106,13 +2125,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 21,
+      "request_seq": 22,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 22,
+      "seq": 23,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2129,22 +2148,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 22,
+      "request_seq": 23,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2176,7 +2195,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 23,
+      "seq": 24,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2191,13 +2210,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 23,
+      "request_seq": 24,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 24,
+      "seq": 25,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2214,22 +2233,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 24,
+      "request_seq": 25,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2261,7 +2280,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 25,
+      "seq": 26,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2276,13 +2295,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 25,
+      "request_seq": 26,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 26,
+      "seq": 27,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2299,22 +2318,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 26,
+      "request_seq": 27,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2346,7 +2365,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 27,
+      "seq": 28,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2361,13 +2380,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 27,
+      "request_seq": 28,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 28,
+      "seq": 29,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2384,22 +2403,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 28,
+      "request_seq": 29,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2431,7 +2450,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 29,
+      "seq": 30,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2446,13 +2465,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 29,
+      "request_seq": 30,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 30,
+      "seq": 31,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2469,22 +2488,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 30,
+      "request_seq": 31,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2516,7 +2535,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 31,
+      "seq": 32,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2531,13 +2550,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 31,
+      "request_seq": 32,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 32,
+      "seq": 33,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2554,22 +2573,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 32,
+      "request_seq": 33,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2601,7 +2620,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 33,
+      "seq": 34,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2616,13 +2635,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 33,
+      "request_seq": 34,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 34,
+      "seq": 35,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2639,22 +2658,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 34,
+      "request_seq": 35,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2686,7 +2705,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 35,
+      "seq": 36,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2701,13 +2720,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 35,
+      "request_seq": 36,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 36,
+      "seq": 37,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2724,22 +2743,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 36,
+      "request_seq": 37,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2771,7 +2790,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 37,
+      "seq": 38,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2786,13 +2805,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 37,
+      "request_seq": 38,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 38,
+      "seq": 39,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2809,22 +2828,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 38,
+      "request_seq": 39,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2856,7 +2875,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 39,
+      "seq": 40,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2871,13 +2890,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 39,
+      "request_seq": 40,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 40,
+      "seq": 41,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2894,22 +2913,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 40,
+      "request_seq": 41,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2941,7 +2960,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 41,
+      "seq": 42,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2956,13 +2975,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 41,
+      "request_seq": 42,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 42,
+      "seq": 43,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -2979,22 +2998,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 42,
+      "request_seq": 43,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3026,7 +3045,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 43,
+      "seq": 44,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3041,13 +3060,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 43,
+      "request_seq": 44,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 44,
+      "seq": 45,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3064,22 +3083,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 44,
+      "request_seq": 45,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3111,7 +3130,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 45,
+      "seq": 46,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3126,13 +3145,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 45,
+      "request_seq": 46,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 46,
+      "seq": 47,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3149,22 +3168,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 46,
+      "request_seq": 47,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3196,7 +3215,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 47,
+      "seq": 48,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3211,13 +3230,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 47,
+      "request_seq": 48,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 48,
+      "seq": 49,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3234,22 +3253,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 48,
+      "request_seq": 49,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3281,7 +3300,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 49,
+      "seq": 50,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3296,13 +3315,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 49,
+      "request_seq": 50,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 50,
+      "seq": 51,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3319,22 +3338,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 50,
+      "request_seq": 51,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3366,7 +3385,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 51,
+      "seq": 52,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3381,13 +3400,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 51,
+      "request_seq": 52,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 52,
+      "seq": 53,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3404,22 +3423,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 52,
+      "request_seq": 53,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3451,7 +3470,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 53,
+      "seq": 54,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3466,13 +3485,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 53,
+      "request_seq": 54,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 54,
+      "seq": 55,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3489,22 +3508,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 54,
+      "request_seq": 55,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3536,7 +3555,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 55,
+      "seq": 56,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3551,13 +3570,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 55,
+      "request_seq": 56,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 56,
+      "seq": 57,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3574,22 +3593,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 56,
+      "request_seq": 57,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3621,7 +3640,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 57,
+      "seq": 58,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3636,13 +3655,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 57,
+      "request_seq": 58,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 58,
+      "seq": 59,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3659,22 +3678,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 58,
+      "request_seq": 59,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3706,7 +3725,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 59,
+      "seq": 60,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3721,13 +3740,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 59,
+      "request_seq": 60,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 60,
+      "seq": 61,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3744,22 +3763,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 60,
+      "request_seq": 61,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3791,7 +3810,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 61,
+      "seq": 62,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3806,13 +3825,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 61,
+      "request_seq": 62,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 62,
+      "seq": 63,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3829,22 +3848,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 62,
+      "request_seq": 63,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3876,7 +3895,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 63,
+      "seq": 64,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3891,13 +3910,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 63,
+      "request_seq": 64,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 64,
+      "seq": 65,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3914,22 +3933,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 64,
+      "request_seq": 65,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3961,7 +3980,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 65,
+      "seq": 66,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3976,13 +3995,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 65,
+      "request_seq": 66,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 66,
+      "seq": 67,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -3999,22 +4018,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 66,
+      "request_seq": 67,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4046,7 +4065,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 67,
+      "seq": 68,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -4061,13 +4080,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 67,
+      "request_seq": 68,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 68,
+      "seq": 69,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -4084,22 +4103,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 68,
+      "request_seq": 69,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4131,7 +4150,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 69,
+      "seq": 70,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -4146,13 +4165,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 69,
+      "request_seq": 70,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 70,
+      "seq": 71,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -4169,22 +4188,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 70,
+      "request_seq": 71,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4216,7 +4235,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 71,
+      "seq": 72,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -4231,13 +4250,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 71,
+      "request_seq": 72,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 72,
+      "seq": 73,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -4254,22 +4273,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 72,
+      "request_seq": 73,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4301,7 +4320,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 73,
+      "seq": 74,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -4316,13 +4335,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 73,
+      "request_seq": 74,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 74,
+      "seq": 75,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -4338,12 +4357,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 74,
+      "request_seq": 75,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 75,
+      "seq": 76,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -4364,7 +4383,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 3 projectProgramVersion: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/mylib/mySubDir/myClass.ts Text-1 "export class MyClass {}"
@@ -4389,7 +4408,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 75,
+      "request_seq": 76,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -5106,12 +5125,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/mylib/index.ts:
diff --git a/tests/baselines/reference/tsserver/fourslashServer/completionsImport_computedSymbolName.js b/tests/baselines/reference/tsserver/fourslashServer/completionsImport_computedSymbolName.js
index d39e38c7b40c9..594553cbfc619 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/completionsImport_computedSymbolName.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/completionsImport_computedSymbolName.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "commonjs",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 I
 
@@ -39,12 +55,12 @@ declare global {
 }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "commonjs" } }
+{ "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -60,6 +76,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -81,7 +100,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/node/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/ts-node/index.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/node/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
@@ -97,7 +116,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 "I"
@@ -105,12 +124,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/node_modules/@types/ts-node/index.d.ts Text-1 "export {};\ndeclare const REGISTER_INSTANCE: unique symbol;\ndeclare global {\n    namespace NodeJS {\n      interface Process {\n          [REGISTER_INSTANCE]?: Service;\n      }\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 	node_modules/@types/node/index.d.ts
@@ -158,20 +177,20 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\" } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\", \"lib\": [\"es5\"] } }"
 	/home/src/workspaces/project/node_modules/@types/node/index.d.ts Text-1 "declare module \"process\" {\n    global {\n        var process: NodeJS.Process;\n        namespace NodeJS {\n            interface Process {\n                argv: string[];\n            }\n        }\n    }\n    export = process;\n}"
 	/home/src/workspaces/project/node_modules/@types/ts-node/index.d.ts Text-1 "export {};\ndeclare const REGISTER_INSTANCE: unique symbol;\ndeclare global {\n    namespace NodeJS {\n      interface Process {\n          [REGISTER_INSTANCE]?: Service;\n      }\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 	node_modules/@types/node/index.d.ts
@@ -196,7 +215,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -204,12 +223,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/package.json: *new*
   {"pollingInterval":2000}
   {"pollingInterval":2000}
@@ -263,17 +282,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -299,7 +318,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -326,17 +345,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/package.json:
   {"pollingInterval":2000}
   {"pollingInterval":2000}
@@ -392,17 +411,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -429,7 +448,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -443,7 +462,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -458,7 +477,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -482,7 +501,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "flags": 1,
@@ -1180,7 +1199,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1197,7 +1216,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
@@ -1212,17 +1231,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1248,7 +1267,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1265,22 +1284,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1306,7 +1325,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1321,13 +1340,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1341,12 +1360,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1359,7 +1378,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-2-2 "IN"
@@ -1381,7 +1400,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
diff --git a/tests/baselines/reference/tsserver/fourslashServer/completionsImport_defaultAndNamedConflict_server.js b/tests/baselines/reference/tsserver/fourslashServer/completionsImport_defaultAndNamedConflict_server.js
index 80623b14792d7..706be5fdb702e 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/completionsImport_defaultAndNamedConflict_server.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/completionsImport_defaultAndNamedConflict_server.js
@@ -1,7 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "noLib": true,
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 someMo
 
@@ -10,12 +35,12 @@ export const someModule = 0;
 export default 1;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "noLib": true } }
+{ "compilerOptions": { "noLib": true, "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -32,6 +57,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "noLib": true,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -85,6 +113,34 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 1,
+              "offset": 24
+            },
+            "end": {
+              "line": 1,
+              "offset": 31
+            },
+            "text": "Option 'lib' cannot be specified with option 'noLib'.",
+            "code": 5053,
+            "category": "error",
+            "fileName": "/home/src/workspaces/project/tsconfig.json"
+          },
+          {
+            "start": {
+              "line": 1,
+              "offset": 39
+            },
+            "end": {
+              "line": 1,
+              "offset": 44
+            },
+            "text": "Option 'lib' cannot be specified with option 'noLib'.",
+            "code": 5053,
+            "category": "error",
+            "fileName": "/home/src/workspaces/project/tsconfig.json"
+          },
           {
             "text": "Cannot find global type 'Array'.",
             "code": 2318,
@@ -132,7 +188,6 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -140,7 +195,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (1)
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"noLib\": true } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"noLib\": true, \"lib\": [\"es5\"] } }"
 
 
 	tsconfig.json
@@ -163,7 +218,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -171,8 +226,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/workspaces/project/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -218,7 +271,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -245,13 +298,11 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/someModule.ts:
@@ -300,7 +351,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -314,7 +365,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -329,7 +380,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -353,7 +404,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "flags": 9,
@@ -833,7 +884,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -860,7 +911,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -939,7 +990,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -966,7 +1017,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
@@ -1037,7 +1088,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1063,7 +1114,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -1142,7 +1193,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1159,7 +1210,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
diff --git a/tests/baselines/reference/tsserver/fourslashServer/completionsImport_jsModuleExportsAssignment.js b/tests/baselines/reference/tsserver/fourslashServer/completionsImport_jsModuleExportsAssignment.js
index 6290a00befbb1..8148bb2c2d2cb 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/completionsImport_jsModuleExportsAssignment.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/completionsImport_jsModuleExportsAssignment.js
@@ -1,16 +1,33 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "commonjs",
+          "allowJs": true,
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 
 
@@ -32,12 +49,12 @@ module.exports = {
 };
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "commonjs", "allowJs": true } }
+{ "compilerOptions": { "module": "commonjs", "allowJs": true, "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -55,6 +72,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  "options": {
   "module": 1,
   "allowJs": true,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -73,7 +93,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/third_party/marked/src/defaults.js 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -83,19 +103,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 ""
 	/home/src/workspaces/project/third_party/marked/src/defaults.js Text-1 "function getDefaults() {\n  return {\n    baseUrl: null,\n  };\n}\n\nfunction changeDefaults(newDefaults) {\n  module.exports.defaults = newDefaults;\n}\n\nmodule.exports = {\n  defaults: getDefaults(),\n  getDefaults,\n  changeDefaults\n};"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 	third_party/marked/src/defaults.js
@@ -139,18 +159,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\", \"allowJs\": true } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\", \"allowJs\": true, \"lib\": [\"es5\"] } }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -171,7 +191,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -179,12 +199,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -215,17 +235,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -245,7 +265,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -281,12 +301,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -313,17 +333,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/third_party/marked/src/defaults.js:
@@ -356,17 +376,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -387,7 +407,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -401,7 +421,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 After Request
@@ -416,7 +436,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -440,7 +460,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": {
         "flags": 9,
@@ -1202,7 +1222,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1219,7 +1239,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 After Request
@@ -1234,17 +1254,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1264,7 +1284,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1281,22 +1301,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1316,7 +1336,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1331,13 +1351,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1351,12 +1371,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1369,7 +1389,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-2-2 "d"
@@ -1390,7 +1410,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -2166,7 +2186,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2192,7 +2212,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true,
       "body": [
         {
@@ -2303,7 +2323,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -2320,7 +2340,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true
     }
 After Request
@@ -2335,17 +2355,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/completionsImport_mergedReExport.js b/tests/baselines/reference/tsserver/fourslashServer/completionsImport_mergedReExport.js
index d7061a333aedb..e1635f7ab1d67 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/completionsImport_mergedReExport.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/completionsImport_mergedReExport.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "commonjs",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 C
 
@@ -40,12 +56,12 @@ declare module "@jest/types" {
 { "dependencies": { "@jest/types": "*", "ts-jest": "*" } }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "commonjs" } }
+{ "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -61,6 +77,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -78,7 +97,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 1 undefined Config: /home/src/workspaces/project/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -88,18 +107,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 "C"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 
@@ -135,18 +154,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\" } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\", \"lib\": [\"es5\"] } }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -193,7 +212,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -202,12 +221,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -249,17 +268,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -283,7 +302,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -314,17 +333,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@jest/types/Config.d.ts:
@@ -368,17 +387,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -403,7 +422,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -417,7 +436,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -436,7 +455,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -482,7 +501,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -1190,12 +1209,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@jest/types/Config.d.ts:
@@ -1242,17 +1261,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1278,7 +1297,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1295,7 +1314,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
@@ -1318,17 +1337,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject2*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1354,7 +1373,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1371,22 +1390,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1412,7 +1431,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1427,13 +1446,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1448,12 +1467,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1466,7 +1485,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-2-2 "Co"
@@ -1490,7 +1509,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
diff --git a/tests/baselines/reference/tsserver/fourslashServer/completionsImport_sortingModuleSpecifiers.js b/tests/baselines/reference/tsserver/fourslashServer/completionsImport_sortingModuleSpecifiers.js
index 0105579bfd066..ffc3ab849fe80 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/completionsImport_sortingModuleSpecifiers.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/completionsImport_sortingModuleSpecifiers.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "commonjs",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/main.ts]
 normalize
 
@@ -26,12 +42,12 @@ declare module "path" {
 }
 
 //// [/tests/cases/fourslash/server/tsconfig.json]
-{ "compilerOptions": { "module": "commonjs" } }
+{ "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsconfig.json"
@@ -48,6 +64,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/tsconfig.json : {
  ],
  "options": {
   "module": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/tests/cases/fourslash/server/tsconfig.json"
  }
 }
@@ -66,7 +85,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/main.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/path.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Type roots
@@ -76,19 +95,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/main.ts Text-1 "normalize"
 	/tests/cases/fourslash/server/path.d.ts Text-1 "declare module \"path/posix\" {\n    export function normalize(p: string): string;\n}\ndeclare module \"path/win32\" {\n    export function normalize(p: string): string;\n}\ndeclare module \"path\" {\n    export function normalize(p: string): string;\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	main.ts
 	  Matched by default include pattern '**/*'
 	path.d.ts
@@ -126,18 +145,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\" } }"
+	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\", \"lib\": [\"es5\"] } }"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -158,7 +177,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -166,12 +185,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/main.ts: *new*
@@ -202,17 +221,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
@@ -232,7 +251,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/main.ts"
@@ -259,17 +278,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/path.d.ts:
@@ -302,17 +321,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
@@ -333,7 +352,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -349,7 +368,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -364,7 +383,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/main.ts",
@@ -388,7 +407,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "flags": 1,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/completionsOverridingMethodCrash2.js b/tests/baselines/reference/tsserver/fourslashServer/completionsOverridingMethodCrash2.js
index e59ccb75def06..32ee12f0ff712 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/completionsOverridingMethodCrash2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/completionsOverridingMethodCrash2.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/classes.ts]
 import { Component } from "./utils.js";
 
@@ -21,7 +37,8 @@ export class MyComponent extends Component {
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
-    "module": "nodenext"
+    "module": "nodenext",
+    "lib": ["es5"]
   }
 }
 
@@ -37,7 +54,7 @@ export abstract class Component {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -54,6 +71,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -72,20 +92,34 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/classes.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/utils.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/utils.ts Text-1 "export class Element {\n    // ...\n}\n\nexport abstract class Component {\n    abstract render(): Element;\n}"
 	/home/src/workspaces/project/classes.ts Text-1 "import { Component } from \"./utils.js\";\n\nexport class MyComponent extends Component {\n    render\n}"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	utils.ts
 	  Imported via "./utils.js" from file 'classes.ts'
 	  Matched by default include pattern '**/*'
@@ -112,62 +146,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -175,24 +163,24 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"]\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -207,7 +195,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -215,14 +203,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/package.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/classes.ts: *new*
@@ -257,17 +252,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/classes.ts *new*
     version: Text-1
@@ -284,7 +282,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/classes.ts"
@@ -294,7 +292,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/classes.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/classes.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -311,19 +309,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/package.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
@@ -360,17 +365,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/classes.ts (Open) *changed*
     open: true *changed*
@@ -388,7 +396,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -404,12 +412,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/classes.ts",
@@ -431,7 +439,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "flags": 0,
@@ -555,7 +563,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/utils.ts"
@@ -565,7 +573,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/utils.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/utils.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -584,19 +592,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/package.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
@@ -621,17 +636,20 @@ watchedDirectoriesRecursive::
   {}
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/classes.ts (Open)
     version: Text-1
@@ -649,7 +667,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/classes.ts"
@@ -657,7 +675,7 @@ Info seq  [hh:mm:ss:mss] request:
       "command": "open"
     }
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -676,12 +694,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/classes.ts",
@@ -698,7 +716,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true
     }
 After Request
@@ -714,17 +732,20 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/classes.ts (Open) *changed*
     version: SVC-2-1 *changed*
@@ -741,7 +762,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -757,12 +778,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/classes.ts",
@@ -774,7 +795,10 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/utils.ts Text-1 "export class Element {\n    // ...\n}\n\nexport abstract class Component {\n    abstract render(): Element;\n}"
 	/home/src/workspaces/project/classes.ts SVC-2-1 "import { Component } from \"./utils.js\";\n\nexport class MyComponent extends Component {\n    rende\n}"
 
@@ -791,7 +815,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
diff --git a/tests/baselines/reference/tsserver/fourslashServer/completionsServerCommitCharacters.js b/tests/baselines/reference/tsserver/fourslashServer/completionsServerCommitCharacters.js
index 1e726828f1a4b..556e1165ce834 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/completionsServerCommitCharacters.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/completionsServerCommitCharacters.js
@@ -1,23 +1,38 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/src/index.ts]
 const a: "aa" | "bb" = "";
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts"
@@ -31,7 +46,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -43,18 +58,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/index.ts SVC-1-0 "const a: \"aa\" | \"bb\" = \"\";"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Root file specified for compilation
 
@@ -71,7 +86,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -79,12 +94,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/src/jsconfig.json: *new*
@@ -109,15 +124,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -128,7 +143,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -142,7 +157,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
@@ -203,7 +218,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -222,7 +237,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
@@ -241,7 +256,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -260,7 +275,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/configurePlugin.js b/tests/baselines/reference/tsserver/fourslashServer/configurePlugin.js
index 8f307815b46c3..607d6086718a1 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/configurePlugin.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/configurePlugin.js
@@ -1,16 +1,37 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "plugins": [
+            {
+              "name": "configurable-diagnostic-adder",
+              "message": "configured error"
+            }
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/a.ts]
 let x = [1, 2];
 
@@ -19,6 +40,7 @@ let x = [1, 2];
 //// [/tests/cases/fourslash/server/tsconfig.json]
 {
     "compilerOptions": {
+        "lib": ["es5"],
         "plugins": [
             { "name": "configurable-diagnostic-adder" , "message": "configured error" }
         ]
@@ -29,7 +51,7 @@ let x = [1, 2];
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsconfig.json"
@@ -44,6 +66,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/tsconfig.json : {
   "/tests/cases/fourslash/server/a.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "plugins": [
    {
     "name": "configurable-diagnostic-adder",
@@ -68,7 +93,7 @@ Info seq  [hh:mm:ss:mss] Loading configurable-diagnostic-adder from /home/src/ts
 Info seq  [hh:mm:ss:mss] Plugin validation succeeded
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Type roots
@@ -78,18 +103,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.ts Text-1 "let x = [1, 2];\n\n"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -125,18 +150,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"plugins\": [\n            { \"name\": \"configurable-diagnostic-adder\" , \"message\": \"configured error\" }\n        ]\n    },\n    \"files\": [\"a.ts\"]\n}"
+	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"lib\": [\"es5\"],\n        \"plugins\": [\n            { \"name\": \"configurable-diagnostic-adder\" , \"message\": \"configured error\" }\n        ]\n    },\n    \"files\": [\"a.ts\"]\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -157,7 +182,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -165,12 +190,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/a.ts: *new*
   {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
@@ -197,17 +222,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
@@ -223,7 +248,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -250,17 +275,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json:
@@ -289,17 +314,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
@@ -316,7 +341,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -329,7 +354,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
@@ -351,7 +376,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "pluginName": "configurable-diagnostic-adder",
@@ -366,12 +391,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configurePlugin",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -384,7 +409,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/convertFunctionToEs6Class-server1.js b/tests/baselines/reference/tsserver/fourslashServer/convertFunctionToEs6Class-server1.js
index 418fdeeeb4d8f..c4dee583299e1 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/convertFunctionToEs6Class-server1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/convertFunctionToEs6Class-server1.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/test123.js]
 // Comment
 function fn() {
@@ -23,7 +38,7 @@ fn.prototype.bar = function () {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test123.js"
@@ -35,7 +50,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -45,18 +60,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/test123.js SVC-1-0 "// Comment\nfunction fn() {\n    this.baz = 10;\n}\nfn.prototype.bar = function () {\n    console.log('hello world');\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	test123.js
 	  Root file specified for compilation
 
@@ -73,7 +88,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -81,12 +96,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -105,15 +120,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -124,7 +139,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -136,12 +151,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test123.js",
@@ -154,13 +169,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test123.js",
@@ -173,13 +188,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test123.js",
@@ -192,7 +207,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -214,7 +229,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test123.js",
@@ -233,7 +248,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/convertFunctionToEs6Class-server2.js b/tests/baselines/reference/tsserver/fourslashServer/convertFunctionToEs6Class-server2.js
index 67ab7511affce..bc86fd7da4e74 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/convertFunctionToEs6Class-server2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/convertFunctionToEs6Class-server2.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/test123.js]
 /**
  * JSDoc Comment
@@ -25,7 +40,7 @@ fn.prototype.bar = function () {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test123.js"
@@ -37,7 +52,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -47,18 +62,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/test123.js SVC-1-0 "/**\n * JSDoc Comment\n */\nfunction fn() {\n    this.baz = 10;\n}\nfn.prototype.bar = function () {\n    console.log('hello world');\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	test123.js
 	  Root file specified for compilation
 
@@ -75,7 +90,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -83,12 +98,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -107,15 +122,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -126,7 +141,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -138,12 +153,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test123.js",
@@ -156,13 +171,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test123.js",
@@ -175,13 +190,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test123.js",
@@ -194,7 +209,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -216,7 +231,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test123.js",
@@ -235,7 +250,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/declarationMapGoToDefinition.js b/tests/baselines/reference/tsserver/fourslashServer/declarationMapGoToDefinition.js
index 2492cc267ee51..88ee8ee972a3f 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/declarationMapGoToDefinition.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/declarationMapGoToDefinition.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/index.ts]
 export class Foo {
     member: string;
@@ -55,7 +70,7 @@ instance.methodName({member: 12});
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/index.ts"
@@ -67,7 +82,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -77,18 +92,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/index.ts SVC-1-0 "export class Foo {\n    member: string;\n    methodName(propName: SomeType): void {}\n    otherMethod() {\n        if (Math.random() > 0.5) {\n            return {x: 42};\n        }\n        return {y: \"yes\"};\n    }\n}\n\nexport interface SomeType {\n    member: number;\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Root file specified for compilation
 
@@ -105,7 +120,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -113,12 +128,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -137,15 +152,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -156,7 +171,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/mymodule.ts"
@@ -176,19 +191,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/indexdef.d.ts Text-1 "export declare class Foo {\n    member: string;\n    methodName(propName: SomeType): void;\n    otherMethod(): {\n        x: number;\n        y?: undefined;\n    } | {\n        y: string;\n        x?: undefined;\n    };\n}\nexport interface SomeType {\n    member: number;\n}\n//# sourceMappingURL=indexdef.d.ts.map"
 	/tests/cases/fourslash/server/mymodule.ts SVC-1-0 "import * as mod from \"./indexdef\";\nconst instance = new mod.Foo();\ninstance.methodName({member: 12});"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	indexdef.d.ts
 	  Imported via "./indexdef" from file 'mymodule.ts'
 	mymodule.ts
@@ -213,7 +228,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -221,12 +236,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/indexdef.d.ts: *new*
   {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
@@ -257,17 +272,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -287,7 +302,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/mymodule.ts",
@@ -302,7 +317,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "definitions": [
@@ -340,12 +355,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/indexdef.d.ts:
   {"pollingInterval":500}
 /tests/cases/fourslash/server/indexdef.d.ts.map: *new*
@@ -380,17 +395,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsEnableMapping_NoInline.js b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsEnableMapping_NoInline.js
index eb07ac59aa336..288cf415f5053 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsEnableMapping_NoInline.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsEnableMapping_NoInline.js
@@ -1,16 +1,36 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "strict": false,
+          "outDir": "/home/src/workspaces/project/dist",
+          "inlineSourceMap": true,
+          "declaration": true,
+          "declarationMap": true,
+          "newLine": "lf",
+          "target": "es5",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/dist/index.d.ts]
 export declare class Foo {
     member: string;
@@ -74,6 +94,8 @@ instance.methodName({member: 12});
 //// [/home/src/workspaces/project/tsconfig.json]
 {
     "compilerOptions": {
+        "lib": ["es5"],
+        "strict": false,
         "outDir": "./dist",
         "inlineSourceMap": true,
         "declaration": true,
@@ -86,7 +108,7 @@ instance.methodName({member: 12});
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -101,6 +123,10 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
+  "strict": false,
   "outDir": "/home/src/workspaces/project/dist",
   "inlineSourceMap": true,
   "declaration": true,
@@ -121,7 +147,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -131,18 +157,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 "export class Foo {\n    member: string;\n    methodName(propName: SomeType): SomeType { return propName; }\n    otherMethod() {\n        if (Math.random() > 0.5) {\n            return {x: 42};\n        }\n        return {y: \"yes\"};\n    }\n}\n\nexport interface SomeType {\n    member: number;\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -178,18 +204,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"outDir\": \"./dist\",\n        \"inlineSourceMap\": true,\n        \"declaration\": true,\n        \"declarationMap\": true,\n        \"newLine\": \"lf\",\n    },\n    \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"lib\": [\"es5\"],\n        \"strict\": false,\n        \"outDir\": \"./dist\",\n        \"inlineSourceMap\": true,\n        \"declaration\": true,\n        \"declarationMap\": true,\n        \"newLine\": \"lf\",\n    },\n    \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -210,7 +236,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -218,12 +244,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -250,17 +276,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -276,7 +302,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -303,17 +329,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json:
@@ -342,17 +368,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -369,7 +395,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -381,7 +407,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "emit-output",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "outputFiles": [
@@ -407,7 +433,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts"
@@ -439,19 +465,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/dist/index.d.ts Text-1 "export declare class Foo {\n    member: string;\n    methodName(propName: SomeType): SomeType;\n    otherMethod(): {\n        x: number;\n        y?: undefined;\n    } | {\n        y: string;\n        x?: undefined;\n    };\n}\nexport interface SomeType {\n    member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
 	/home/src/workspaces/project/mymodule.ts SVC-1-0 "import * as mod from \"/home/src/workspaces/project/dist/index\";\nconst instance = new mod.Foo();\ninstance.methodName({member: 12});"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	dist/index.d.ts
 	  Imported via "/home/src/workspaces/project/dist/index" from file 'mymodule.ts'
 	mymodule.ts
@@ -482,7 +508,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -490,12 +516,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/dist/index.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
@@ -529,19 +555,19 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/tsconfig.json
@@ -566,7 +592,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -581,7 +607,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "implementation",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -607,12 +633,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/dist/index.d.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/dist/index.d.ts.map: *new*
@@ -650,19 +676,19 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/tsconfig.json
@@ -698,7 +724,7 @@ DocumentPositionMapper1 *new*
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -712,7 +738,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "typeDefinition",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
@@ -738,7 +764,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -752,7 +778,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": {
         "definitions": [
@@ -790,7 +816,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -804,7 +830,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definition",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsEnableMapping_NoInlineSources.js b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsEnableMapping_NoInlineSources.js
index 480e1e508a840..504e4b2a287d6 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsEnableMapping_NoInlineSources.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsEnableMapping_NoInlineSources.js
@@ -1,16 +1,37 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "strict": false,
+          "outDir": "/home/src/workspaces/project/dist",
+          "inlineSourceMap": true,
+          "inlineSources": true,
+          "declaration": true,
+          "declarationMap": true,
+          "newLine": "lf",
+          "target": "es5",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/dist/index.d.ts]
 export declare class Foo {
     member: string;
@@ -74,6 +95,8 @@ instance.methodName({member: 12});
 //// [/home/src/workspaces/project/tsconfig.json]
 {
     "compilerOptions": {
+        "lib": ["es5"],
+        "strict": false,
         "outDir": "./dist",
         "inlineSourceMap": true,
         "inlineSources": true,
@@ -87,7 +110,7 @@ instance.methodName({member: 12});
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -102,6 +125,10 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
+  "strict": false,
   "outDir": "/home/src/workspaces/project/dist",
   "inlineSourceMap": true,
   "inlineSources": true,
@@ -123,7 +150,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -133,18 +160,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 "export class Foo {\n    member: string;\n    methodName(propName: SomeType): SomeType { return propName; }\n    otherMethod() {\n        if (Math.random() > 0.5) {\n            return {x: 42};\n        }\n        return {y: \"yes\"};\n    }\n}\n\nexport interface SomeType {\n    member: number;\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -180,18 +207,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"outDir\": \"./dist\",\n        \"inlineSourceMap\": true,\n        \"inlineSources\": true,\n        \"declaration\": true,\n        \"declarationMap\": true,\n        \"newLine\": \"lf\",\n    },\n    \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"lib\": [\"es5\"],\n        \"strict\": false,\n        \"outDir\": \"./dist\",\n        \"inlineSourceMap\": true,\n        \"inlineSources\": true,\n        \"declaration\": true,\n        \"declarationMap\": true,\n        \"newLine\": \"lf\",\n    },\n    \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -212,7 +239,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -220,12 +247,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -252,17 +279,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -278,7 +305,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -305,17 +332,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json:
@@ -344,17 +371,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -371,7 +398,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -383,7 +410,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "emit-output",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "outputFiles": [
@@ -409,7 +436,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts"
@@ -441,19 +468,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/dist/index.d.ts Text-1 "export declare class Foo {\n    member: string;\n    methodName(propName: SomeType): SomeType;\n    otherMethod(): {\n        x: number;\n        y?: undefined;\n    } | {\n        y: string;\n        x?: undefined;\n    };\n}\nexport interface SomeType {\n    member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
 	/home/src/workspaces/project/mymodule.ts SVC-1-0 "import * as mod from \"/home/src/workspaces/project/dist/index\";\nconst instance = new mod.Foo();\ninstance.methodName({member: 12});"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	dist/index.d.ts
 	  Imported via "/home/src/workspaces/project/dist/index" from file 'mymodule.ts'
 	mymodule.ts
@@ -484,7 +511,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -492,12 +519,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/dist/index.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
@@ -531,19 +558,19 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/tsconfig.json
@@ -568,7 +595,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -583,7 +610,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "implementation",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -609,12 +636,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/dist/index.d.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/dist/index.d.ts.map: *new*
@@ -652,19 +679,19 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/tsconfig.json
@@ -700,7 +727,7 @@ DocumentPositionMapper1 *new*
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -714,7 +741,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "typeDefinition",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
@@ -740,7 +767,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -754,7 +781,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": {
         "definitions": [
@@ -792,7 +819,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -806,7 +833,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definition",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGeneratedMapsEnableMapping.js b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGeneratedMapsEnableMapping.js
index 0c52562888559..7ef3f61c69cfe 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGeneratedMapsEnableMapping.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGeneratedMapsEnableMapping.js
@@ -1,16 +1,35 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "strict": false,
+          "outDir": "/home/src/workspaces/project/dist",
+          "declaration": true,
+          "declarationMap": true,
+          "newLine": "lf",
+          "target": "es5",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/dist/index.d.ts]
 export declare class Foo {
     member: string;
@@ -74,6 +93,8 @@ instance.methodName({member: 12});
 //// [/home/src/workspaces/project/tsconfig.json]
 {
     "compilerOptions": {
+        "lib": ["es5"],
+        "strict": false,
         "outDir": "./dist",
         "declaration": true,
         "declarationMap": true,
@@ -85,7 +106,7 @@ instance.methodName({member: 12});
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -100,6 +121,10 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
+  "strict": false,
   "outDir": "/home/src/workspaces/project/dist",
   "declaration": true,
   "declarationMap": true,
@@ -119,7 +144,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -129,18 +154,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 "export class Foo {\n    member: string;\n    methodName(propName: SomeType): SomeType { return propName; }\n    otherMethod() {\n        if (Math.random() > 0.5) {\n            return {x: 42};\n        }\n        return {y: \"yes\"};\n    }\n}\n\nexport interface SomeType {\n    member: number;\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -176,18 +201,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"outDir\": \"./dist\",\n        \"declaration\": true,\n        \"declarationMap\": true,\n        \"newLine\": \"lf\",\n    },\n    \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"lib\": [\"es5\"],\n        \"strict\": false,\n        \"outDir\": \"./dist\",\n        \"declaration\": true,\n        \"declarationMap\": true,\n        \"newLine\": \"lf\",\n    },\n    \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -208,7 +233,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -216,12 +241,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -248,17 +273,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -274,7 +299,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -301,17 +326,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json:
@@ -340,17 +365,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -367,7 +392,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -379,7 +404,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "emit-output",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "outputFiles": [
@@ -405,7 +430,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts"
@@ -437,19 +462,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/dist/index.d.ts Text-1 "export declare class Foo {\n    member: string;\n    methodName(propName: SomeType): SomeType;\n    otherMethod(): {\n        x: number;\n        y?: undefined;\n    } | {\n        y: string;\n        x?: undefined;\n    };\n}\nexport interface SomeType {\n    member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
 	/home/src/workspaces/project/mymodule.ts SVC-1-0 "import * as mod from \"/home/src/workspaces/project/dist/index\";\nconst instance = new mod.Foo();\ninstance.methodName({member: 12});"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	dist/index.d.ts
 	  Imported via "/home/src/workspaces/project/dist/index" from file 'mymodule.ts'
 	mymodule.ts
@@ -480,7 +505,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -488,12 +513,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/dist/index.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
@@ -527,19 +552,19 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/tsconfig.json
@@ -564,7 +589,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -579,7 +604,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "implementation",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -605,12 +630,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/dist/index.d.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/dist/index.d.ts.map: *new*
@@ -648,19 +673,19 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/tsconfig.json
@@ -696,7 +721,7 @@ DocumentPositionMapper1 *new*
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -710,7 +735,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "typeDefinition",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
@@ -736,7 +761,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -750,7 +775,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": {
         "definitions": [
@@ -788,7 +813,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -802,7 +827,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definition",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGeneratedMapsEnableMapping2.js b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGeneratedMapsEnableMapping2.js
index 0a128672df8d2..c0ecbb94cf157 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGeneratedMapsEnableMapping2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGeneratedMapsEnableMapping2.js
@@ -1,16 +1,37 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "strict": false,
+          "outDir": "/home/src/workspaces/project/dist",
+          "sourceMap": true,
+          "sourceRoot": "/home/src/workspaces/project/",
+          "declaration": true,
+          "declarationMap": true,
+          "newLine": "lf",
+          "target": "es5",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/dist/index.d.ts]
 export declare class Foo {
     member: string;
@@ -77,6 +98,8 @@ instance.methodName({member: 12});
 //// [/home/src/workspaces/project/tsconfig.json]
 {
     "compilerOptions": {
+        "lib": ["es5"],
+        "strict": false,
         "outDir": "./dist",
         "sourceMap": true,
         "sourceRoot": "/home/src/workspaces/project/",
@@ -90,7 +113,7 @@ instance.methodName({member: 12});
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -105,6 +128,10 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
+  "strict": false,
   "outDir": "/home/src/workspaces/project/dist",
   "sourceMap": true,
   "sourceRoot": "/home/src/workspaces/project/",
@@ -126,7 +153,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -136,18 +163,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 "export class Foo {\n    member: string;\n    methodName(propName: SomeType): SomeType { return propName; }\n    otherMethod() {\n        if (Math.random() > 0.5) {\n            return {x: 42};\n        }\n        return {y: \"yes\"};\n    }\n}\n\nexport interface SomeType {\n    member: number;\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -183,18 +210,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"outDir\": \"./dist\",\n        \"sourceMap\": true,\n        \"sourceRoot\": \"/home/src/workspaces/project/\",\n        \"declaration\": true,\n        \"declarationMap\": true,\n        \"newLine\": \"lf\",\n    },\n    \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"lib\": [\"es5\"],\n        \"strict\": false,\n        \"outDir\": \"./dist\",\n        \"sourceMap\": true,\n        \"sourceRoot\": \"/home/src/workspaces/project/\",\n        \"declaration\": true,\n        \"declarationMap\": true,\n        \"newLine\": \"lf\",\n    },\n    \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -215,7 +242,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -223,12 +250,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -255,17 +282,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -281,7 +308,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -308,17 +335,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json:
@@ -347,17 +374,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -374,7 +401,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -386,7 +413,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "emit-output",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "outputFiles": [
@@ -417,7 +444,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts"
@@ -449,19 +476,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/dist/index.d.ts Text-1 "export declare class Foo {\n    member: string;\n    methodName(propName: SomeType): SomeType;\n    otherMethod(): {\n        x: number;\n        y?: undefined;\n    } | {\n        y: string;\n        x?: undefined;\n    };\n}\nexport interface SomeType {\n    member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
 	/home/src/workspaces/project/mymodule.ts SVC-1-0 "import * as mod from \"/home/src/workspaces/project/dist/index\";\nconst instance = new mod.Foo();\ninstance.methodName({member: 12});"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	dist/index.d.ts
 	  Imported via "/home/src/workspaces/project/dist/index" from file 'mymodule.ts'
 	mymodule.ts
@@ -492,7 +519,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -500,12 +527,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/dist/index.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
@@ -539,19 +566,19 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/tsconfig.json
@@ -576,7 +603,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -591,7 +618,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "implementation",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -617,12 +644,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/dist/index.d.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/dist/index.d.ts.map: *new*
@@ -660,19 +687,19 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/tsconfig.json
@@ -708,7 +735,7 @@ DocumentPositionMapper1 *new*
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -722,7 +749,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "typeDefinition",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
@@ -748,7 +775,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -762,7 +789,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": {
         "definitions": [
@@ -800,7 +827,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -814,7 +841,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definition",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGeneratedMapsEnableMapping3.js b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGeneratedMapsEnableMapping3.js
index f2510620bae4e..21f28e94ecfd3 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGeneratedMapsEnableMapping3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGeneratedMapsEnableMapping3.js
@@ -1,16 +1,36 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "strict": false,
+          "outDir": "/home/src/workspaces/project/dist",
+          "sourceRoot": "/home/src/workspaces/project/",
+          "declaration": true,
+          "declarationMap": true,
+          "newLine": "lf",
+          "target": "es5",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/dist/index.d.ts]
 export declare class Foo {
     member: string;
@@ -74,6 +94,8 @@ instance.methodName({member: 12});
 //// [/home/src/workspaces/project/tsconfig.json]
 {
     "compilerOptions": {
+        "lib": ["es5"],
+        "strict": false,
         "outDir": "./dist",
         "sourceRoot": "/home/src/workspaces/project/",
         "declaration": true,
@@ -86,7 +108,7 @@ instance.methodName({member: 12});
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -101,6 +123,10 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
+  "strict": false,
   "outDir": "/home/src/workspaces/project/dist",
   "sourceRoot": "/home/src/workspaces/project/",
   "declaration": true,
@@ -121,7 +147,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -131,18 +157,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 "export class Foo {\n    member: string;\n    methodName(propName: SomeType): SomeType { return propName; }\n    otherMethod() {\n        if (Math.random() > 0.5) {\n            return {x: 42};\n        }\n        return {y: \"yes\"};\n    }\n}\n\nexport interface SomeType {\n    member: number;\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -167,11 +193,11 @@ Info seq  [hh:mm:ss:mss] event:
         "diagnostics": [
           {
             "start": {
-              "line": 4,
+              "line": 6,
               "offset": 9
             },
             "end": {
-              "line": 4,
+              "line": 6,
               "offset": 21
             },
             "text": "Option 'sourceRoot can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.",
@@ -193,18 +219,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"outDir\": \"./dist\",\n        \"sourceRoot\": \"/home/src/workspaces/project/\",\n        \"declaration\": true,\n        \"declarationMap\": true,\n        \"newLine\": \"lf\",\n    },\n    \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"lib\": [\"es5\"],\n        \"strict\": false,\n        \"outDir\": \"./dist\",\n        \"sourceRoot\": \"/home/src/workspaces/project/\",\n        \"declaration\": true,\n        \"declarationMap\": true,\n        \"newLine\": \"lf\",\n    },\n    \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -225,7 +251,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -233,12 +259,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -265,17 +291,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -291,7 +317,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -318,17 +344,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json:
@@ -357,17 +383,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -384,7 +410,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -396,7 +422,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "emit-output",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "outputFiles": [
@@ -422,7 +448,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts"
@@ -442,11 +468,11 @@ Info seq  [hh:mm:ss:mss] event:
         "diagnostics": [
           {
             "start": {
-              "line": 4,
+              "line": 6,
               "offset": 9
             },
             "end": {
-              "line": 4,
+              "line": 6,
               "offset": 21
             },
             "text": "Option 'sourceRoot can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.",
@@ -469,19 +495,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/dist/index.d.ts Text-1 "export declare class Foo {\n    member: string;\n    methodName(propName: SomeType): SomeType;\n    otherMethod(): {\n        x: number;\n        y?: undefined;\n    } | {\n        y: string;\n        x?: undefined;\n    };\n}\nexport interface SomeType {\n    member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
 	/home/src/workspaces/project/mymodule.ts SVC-1-0 "import * as mod from \"/home/src/workspaces/project/dist/index\";\nconst instance = new mod.Foo();\ninstance.methodName({member: 12});"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	dist/index.d.ts
 	  Imported via "/home/src/workspaces/project/dist/index" from file 'mymodule.ts'
 	mymodule.ts
@@ -512,7 +538,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -520,12 +546,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/dist/index.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
@@ -559,19 +585,19 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/tsconfig.json
@@ -596,7 +622,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -611,7 +637,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "implementation",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -637,12 +663,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/dist/index.d.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/dist/index.d.ts.map: *new*
@@ -680,19 +706,19 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/tsconfig.json
@@ -728,7 +754,7 @@ DocumentPositionMapper1 *new*
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -742,7 +768,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "typeDefinition",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
@@ -768,7 +794,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -782,7 +808,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": {
         "definitions": [
@@ -820,7 +846,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mymodule.ts",
@@ -834,7 +860,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definition",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGoToDefinitionRelativeSourceRoot.js b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGoToDefinitionRelativeSourceRoot.js
index 9e71b7497f3cf..88e9b05ab1586 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGoToDefinitionRelativeSourceRoot.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGoToDefinitionRelativeSourceRoot.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/index.ts]
 export class Foo {
     member: string;
@@ -55,7 +70,7 @@ export interface SomeType {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/index.ts"
@@ -67,7 +82,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -77,18 +92,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/index.ts SVC-1-0 "export class Foo {\n    member: string;\n    methodName(propName: SomeType): void {}\n    otherMethod() {\n        if (Math.random() > 0.5) {\n            return {x: 42};\n        }\n        return {y: \"yes\"};\n    }\n}\n\nexport interface SomeType {\n    member: number;\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Root file specified for compilation
 
@@ -105,7 +120,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -113,12 +128,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -137,15 +152,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -156,7 +171,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/mymodule.ts"
@@ -176,19 +191,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/out/indexdef.d.ts Text-1 "export declare class Foo {\n    member: string;\n    methodName(propName: SomeType): void;\n    otherMethod(): {\n        x: number;\n        y?: undefined;\n    } | {\n        y: string;\n        x?: undefined;\n    };\n}\nexport interface SomeType {\n    member: number;\n}\n//# sourceMappingURL=out/indexdef.d.ts.map"
 	/tests/cases/fourslash/server/mymodule.ts SVC-1-0 "import * as mod from \"./out/indexdef\";\nconst instance = new mod.Foo();\ninstance.methodName({member: 12});"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	out/indexdef.d.ts
 	  Imported via "./out/indexdef" from file 'mymodule.ts'
 	mymodule.ts
@@ -213,7 +228,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -221,12 +236,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/out/indexdef.d.ts: *new*
@@ -255,17 +270,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -285,7 +300,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/mymodule.ts",
@@ -300,7 +315,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "definitions": [
@@ -338,12 +353,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/out/indexdef.d.ts:
@@ -376,17 +391,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGoToDefinitionSameNameDifferentDirectory.js b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGoToDefinitionSameNameDifferentDirectory.js
index d6592cc998a1a..9100e759cd784 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGoToDefinitionSameNameDifferentDirectory.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsGoToDefinitionSameNameDifferentDirectory.js
@@ -1,16 +1,36 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "strict": false,
+          "sourceMap": true,
+          "declaration": true,
+          "declarationMap": true,
+          "outFile": "/tests/cases/fourslash/server/buttonClass/Source.js",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/BaseClass/Source.d.ts]
 declare class Control {
     constructor();
@@ -65,6 +85,8 @@ class Button extends Control {
     "$schema": "http://json.schemastore.org/tsconfig",
     "compileOnSave": true,
     "compilerOptions": {
+      "lib": ["es5"],
+      "strict": false,
       "sourceMap": true,
       "declaration": true,
       "declarationMap": true
@@ -74,7 +96,7 @@ class Button extends Control {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/BaseClass/Source.d.ts"
@@ -88,7 +110,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/BaseClass/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -100,18 +122,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/BaseClass/Source.d.ts SVC-1-0 "declare class Control {\n    constructor();\n    /** this is a super var */\n    myVar: boolean | 'yeah';\n}\n//# sourceMappingURL=Source.d.ts.map"
 
 
-	../../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	Source.d.ts
 	  Root file specified for compilation
 
@@ -128,7 +150,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -136,12 +158,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/BaseClass/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/BaseClass/tsconfig.json: *new*
@@ -166,15 +188,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -185,7 +207,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/buttonClass/Source.ts"
@@ -201,6 +223,10 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/buttonClass/tscon
   "/tests/cases/fourslash/server/BaseClass/Source.d.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
+  "strict": false,
   "sourceMap": true,
   "declaration": true,
   "declarationMap": true,
@@ -233,19 +259,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/buttonClass/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/buttonClass/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/buttonClass/Source.ts SVC-1-0 "// I cannot F12 navigate to Control\n//                   vvvvvvv\nclass Button extends Control {\n    public myFunction() {\n        // I cannot F12 navigate to myVar\n        //              vvvvv\n        if (typeof this.myVar === 'boolean') {\n            this.myVar;\n        } else {\n            this.myVar.toLocaleUpperCase();\n        }\n    }\n}"
 	/tests/cases/fourslash/server/BaseClass/Source.d.ts SVC-1-0 "declare class Control {\n    constructor();\n    /** this is a super var */\n    myVar: boolean | 'yeah';\n}\n//# sourceMappingURL=Source.d.ts.map"
 
 
-	../../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	Source.ts
 	  Part of 'files' list in tsconfig.json
 	../BaseClass/Source.d.ts
@@ -269,24 +295,39 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/tests/cases/fourslash/server/buttonClass/Source.ts",
         "configFile": "/tests/cases/fourslash/server/buttonClass/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 7
+            },
+            "end": {
+              "line": 4,
+              "offset": 16
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/tests/cases/fourslash/server/buttonClass/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
 	/tests/cases/fourslash/server/BaseClass/Source.d.ts
 
 
-	../../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	Source.d.ts
 	  Root file specified for compilation
 
@@ -311,7 +352,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -319,12 +360,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/buttonClass/tsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsbase.json: *new*
@@ -370,17 +411,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /tests/cases/fourslash/server/buttonClass/tsconfig.json *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /tests/cases/fourslash/server/buttonClass/tsconfig.json *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /tests/cases/fourslash/server/buttonClass/tsconfig.json *new*
@@ -397,7 +438,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/buttonClass/Source.ts",
@@ -413,7 +454,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "definitions": [
@@ -451,12 +492,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/BaseClass/Source.d.ts.map: *new*
   {"pollingInterval":500}
 /tests/cases/fourslash/server/BaseClass/Source.ts: *new*
@@ -483,15 +524,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/buttonClass/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/buttonClass/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/buttonClass/tsconfig.json
@@ -520,7 +561,7 @@ DocumentPositionMapper1 *new*
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/buttonClass/Source.ts",
@@ -534,7 +575,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "definitions": [
diff --git a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsOutOfDateMapping.js b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsOutOfDateMapping.js
index 66d1410f3f0b0..2b8b444c8e9cd 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/declarationMapsOutOfDateMapping.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/declarationMapsOutOfDateMapping.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import { Foo } from "a";
 
@@ -40,7 +55,7 @@ export class Foo {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/a/dist/index.d.ts"
@@ -56,7 +71,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/a/dist/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
@@ -74,18 +89,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/a/dist/index.d.ts SVC-1-0 "export declare class Foo {\n    bar: any;\n}\n//# sourceMappingURL=index.d.ts.map"
 
 
-	../../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.d.ts
 	  Root file specified for compilation
 
@@ -102,7 +117,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -110,12 +125,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/a/dist/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/a/dist/package.json: *new*
@@ -151,15 +166,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -170,7 +185,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -197,19 +212,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/a/dist/index.d.ts SVC-1-0 "export declare class Foo {\n    bar: any;\n}\n//# sourceMappingURL=index.d.ts.map"
 	/home/src/workspaces/project/index.ts SVC-1-0 "import { Foo } from \"a\";"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/a/dist/index.d.ts
 	  Imported via "a" from file 'index.ts' with packageId 'a/dist/index.d.ts@0.0.0'
 	index.ts
@@ -225,18 +240,18 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
 	/home/src/workspaces/project/node_modules/a/dist/index.d.ts
 
 
-	../../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.d.ts
 	  Root file specified for compilation
 
@@ -267,7 +282,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -275,12 +290,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/a/dist/package.json:
@@ -347,17 +362,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
@@ -374,7 +389,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -390,7 +405,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
@@ -416,12 +431,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/a/dist/index.d.ts.map: *new*
@@ -458,15 +473,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject2*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/definition01.js b/tests/baselines/reference/tsserver/fourslashServer/definition01.js
index 6551f49fc06b4..232ec989d8a1c 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/definition01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/definition01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/a.ts]
 export class Foo {}
 
@@ -21,7 +36,7 @@ var x = new n.Foo();
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.ts"
@@ -34,7 +49,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/a.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -44,19 +59,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.ts Text-1 "export class Foo {}"
 	/tests/cases/fourslash/server/b.ts SVC-1-0 "import n = require('./a');\nvar x = new n.Foo();"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Imported via './a' from file 'b.ts'
 	b.ts
@@ -75,7 +90,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -83,12 +98,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/a.ts: *new*
   {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
@@ -109,15 +124,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -132,7 +147,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.ts",
@@ -146,7 +161,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": {
         "definitions": [
diff --git a/tests/baselines/reference/tsserver/fourslashServer/documentHighlights01.js b/tests/baselines/reference/tsserver/fourslashServer/documentHighlights01.js
index 0a78ad9b63f95..c91be08d66045 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/documentHighlights01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/documentHighlights01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/a.ts]
 function f(x: typeof f) {
     f(f);
@@ -19,7 +34,7 @@ function f(x: typeof f) {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -31,7 +46,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -41,18 +56,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.ts SVC-1-0 "function f(x: typeof f) {\n    f(f);\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Root file specified for compilation
 
@@ -69,7 +84,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -77,12 +92,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -101,15 +116,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -120,7 +135,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -139,12 +154,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -161,7 +176,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
@@ -225,7 +240,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -244,12 +259,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -266,7 +281,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -330,7 +345,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -349,12 +364,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -371,7 +386,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -435,7 +450,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -454,12 +469,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -476,7 +491,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/documentHighlights02.js b/tests/baselines/reference/tsserver/fourslashServer/documentHighlights02.js
index 1053e8f4d897e..c84ba9595bd3d 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/documentHighlights02.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/documentHighlights02.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/a.ts]
 function foo () {
 	return 1;
@@ -24,7 +39,7 @@ foo();
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -36,7 +51,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -46,18 +61,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.ts SVC-1-0 "function foo () {\n\treturn 1;\n}\nfoo();"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Root file specified for compilation
 
@@ -74,7 +89,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -82,12 +97,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -106,15 +121,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -125,7 +140,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -144,12 +159,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.ts"
@@ -166,19 +181,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.ts SVC-1-0 "function foo () {\n\treturn 1;\n}\nfoo();"
 	/tests/cases/fourslash/server/b.ts SVC-1-0 "/// <reference path=\"a.ts\"/>\nfoo();"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Referenced via 'a.ts' from file 'b.ts'
 	b.ts
@@ -188,18 +203,18 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
 	/tests/cases/fourslash/server/a.ts
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Root file specified for compilation
 
@@ -222,7 +237,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -230,12 +245,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json:
@@ -267,17 +282,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
@@ -294,7 +309,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -315,12 +330,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -338,7 +353,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -396,7 +411,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -417,12 +432,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -440,7 +455,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -498,7 +513,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.ts"
@@ -519,12 +534,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.ts",
@@ -542,7 +557,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/documentHighlightsTypeParameterInHeritageClause01.js b/tests/baselines/reference/tsserver/fourslashServer/documentHighlightsTypeParameterInHeritageClause01.js
index d06d6d05411d8..f75295244d1e4 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/documentHighlightsTypeParameterInHeritageClause01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/documentHighlightsTypeParameterInHeritageClause01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/documentHighlightsTypeParameterInHeritageClause01.ts]
 interface I<T> extends I<T>, T {
 }
@@ -18,7 +33,7 @@ interface I<T> extends I<T>, T {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/documentHighlightsTypeParameterInHeritageClause01.ts"
@@ -30,7 +45,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -40,18 +55,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/documentHighlightsTypeParameterInHeritageClause01.ts SVC-1-0 "interface I<T> extends I<T>, T {\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	documentHighlightsTypeParameterInHeritageClause01.ts
 	  Root file specified for compilation
 
@@ -68,7 +83,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -76,12 +91,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -100,15 +115,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -119,7 +134,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/documentHighlightsTypeParameterInHeritageClause01.ts"
@@ -138,12 +153,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/documentHighlightsTypeParameterInHeritageClause01.ts",
@@ -160,7 +175,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
@@ -205,7 +220,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/documentHighlightsTypeParameterInHeritageClause01.ts"
@@ -224,12 +239,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/documentHighlightsTypeParameterInHeritageClause01.ts",
@@ -246,7 +261,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -291,7 +306,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/documentHighlightsTypeParameterInHeritageClause01.ts"
@@ -310,12 +325,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/documentHighlightsTypeParameterInHeritageClause01.ts",
@@ -332,7 +347,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/fixExtractToInnerFunctionDuplicaton.js b/tests/baselines/reference/tsserver/fourslashServer/fixExtractToInnerFunctionDuplicaton.js
index bb3b935ab969a..745b9a866ef30 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/fixExtractToInnerFunctionDuplicaton.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/fixExtractToInnerFunctionDuplicaton.js
@@ -1,23 +1,38 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/fixExtractToInnerFunctionDuplicaton.ts]
 function foo(): void { console.log('a'); }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/fixExtractToInnerFunctionDuplicaton.ts"
@@ -29,7 +44,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -39,18 +54,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/fixExtractToInnerFunctionDuplicaton.ts SVC-1-0 "function foo(): void { console.log('a'); }"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	fixExtractToInnerFunctionDuplicaton.ts
 	  Root file specified for compilation
 
@@ -67,7 +82,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -75,12 +90,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -99,15 +114,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -118,7 +133,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -130,12 +145,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/fixExtractToInnerFunctionDuplicaton.ts",
@@ -152,7 +167,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getApplicableRefactors",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
@@ -231,7 +246,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -243,12 +258,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -260,12 +275,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/fixExtractToInnerFunctionDuplicaton.ts",
@@ -282,7 +297,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getApplicableRefactors",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
@@ -361,7 +376,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -373,12 +388,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -390,12 +405,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/fixExtractToInnerFunctionDuplicaton.ts",
@@ -412,7 +427,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getApplicableRefactors",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": [
         {
@@ -491,7 +506,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -503,12 +518,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -520,12 +535,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/fixExtractToInnerFunctionDuplicaton.ts",
@@ -542,7 +557,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getApplicableRefactors",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "body": [
         {
@@ -621,7 +636,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -633,12 +648,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -650,12 +665,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/fixExtractToInnerFunctionDuplicaton.ts",
@@ -672,7 +687,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getApplicableRefactors",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true,
       "body": [
         {
@@ -751,7 +766,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -763,12 +778,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -780,12 +795,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/fixExtractToInnerFunctionDuplicaton.ts",
@@ -802,7 +817,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getApplicableRefactors",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true,
       "body": [
         {
@@ -881,7 +896,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -893,6 +908,6 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/format01.js b/tests/baselines/reference/tsserver/fourslashServer/format01.js
index 6c44491954197..3da73cb579492 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/format01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/format01.js
@@ -1,23 +1,38 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/format01.ts]
 namespace Default{var x= ( { } ) ;}
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/format01.ts"
@@ -29,7 +44,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -39,18 +54,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/format01.ts SVC-1-0 "namespace Default{var x= ( { } ) ;}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	format01.ts
 	  Root file specified for compilation
 
@@ -67,7 +82,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -75,12 +90,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -99,15 +114,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -118,7 +133,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/format01.ts",
@@ -134,7 +149,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "format",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
@@ -229,7 +244,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/format01.ts",
@@ -246,7 +261,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -258,15 +273,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -277,7 +292,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/format01.ts",
@@ -294,20 +309,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -318,7 +333,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/format01.ts",
@@ -335,20 +350,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -359,7 +374,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/format01.ts",
@@ -376,20 +391,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -400,7 +415,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/format01.ts",
@@ -417,20 +432,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -441,7 +456,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/format01.ts",
@@ -458,20 +473,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -482,7 +497,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/format01.ts",
@@ -499,20 +514,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -523,7 +538,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/format01.ts",
@@ -540,20 +555,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/formatBracketInSwitchCase.js b/tests/baselines/reference/tsserver/fourslashServer/formatBracketInSwitchCase.js
index 3645d44459732..8ca19f8b1f564 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/formatBracketInSwitchCase.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/formatBracketInSwitchCase.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/formatBracketInSwitchCase.ts]
 switch (x) {
     case[]:
@@ -19,7 +34,7 @@ switch (x) {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatBracketInSwitchCase.ts"
@@ -31,7 +46,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -41,18 +56,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/formatBracketInSwitchCase.ts SVC-1-0 "switch (x) {\n    case[]:\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	formatBracketInSwitchCase.ts
 	  Root file specified for compilation
 
@@ -69,7 +84,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -77,12 +92,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -101,15 +116,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -120,7 +135,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatBracketInSwitchCase.ts",
@@ -136,7 +151,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "format",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
@@ -154,7 +169,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatBracketInSwitchCase.ts",
@@ -171,7 +186,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -183,15 +198,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/formatOnEnter.js b/tests/baselines/reference/tsserver/fourslashServer/formatOnEnter.js
index 44efb0d2f1c18..41f52077b19bf 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/formatOnEnter.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/formatOnEnter.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/formatOnEnter.ts]
 function listAPIFiles (path : string): string[] {
     
@@ -20,7 +35,7 @@ function listAPIFiles (path : string): string[] {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatOnEnter.ts"
@@ -32,7 +47,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -42,18 +57,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/formatOnEnter.ts SVC-1-0 "function listAPIFiles (path : string): string[] {\n    \n    \n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	formatOnEnter.ts
 	  Root file specified for compilation
 
@@ -70,7 +85,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -78,12 +93,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -102,15 +117,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -121,7 +136,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatOnEnter.ts",
@@ -138,7 +153,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
@@ -167,7 +182,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatOnEnter.ts",
@@ -184,7 +199,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -196,15 +211,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -215,7 +230,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatOnEnter.ts",
@@ -232,20 +247,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -256,7 +271,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatOnEnter.ts",
@@ -273,7 +288,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -291,7 +306,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatOnEnter.ts",
@@ -308,20 +323,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/formatSpaceBetweenFunctionAndArrayIndex.js b/tests/baselines/reference/tsserver/fourslashServer/formatSpaceBetweenFunctionAndArrayIndex.js
index d38f445f5b57d..b20ea826b140e 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/formatSpaceBetweenFunctionAndArrayIndex.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/formatSpaceBetweenFunctionAndArrayIndex.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/formatSpaceBetweenFunctionAndArrayIndex.ts]
 
 function test() {
@@ -23,7 +38,7 @@ test() [0]
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatSpaceBetweenFunctionAndArrayIndex.ts"
@@ -35,7 +50,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -45,18 +60,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/formatSpaceBetweenFunctionAndArrayIndex.ts SVC-1-0 "\nfunction test() {\n    return [];\n}\n\ntest() [0]\n"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	formatSpaceBetweenFunctionAndArrayIndex.ts
 	  Root file specified for compilation
 
@@ -73,7 +88,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -81,12 +96,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -105,15 +120,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -124,7 +139,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatSpaceBetweenFunctionAndArrayIndex.ts",
@@ -140,7 +155,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "format",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
@@ -158,7 +173,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatSpaceBetweenFunctionAndArrayIndex.ts",
@@ -175,7 +190,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -187,15 +202,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/formatTrimRemainingRange.js b/tests/baselines/reference/tsserver/fourslashServer/formatTrimRemainingRange.js
new file mode 100644
index 0000000000000..fe0b6d2ad0fb5
--- /dev/null
+++ b/tests/baselines/reference/tsserver/fourslashServer/formatTrimRemainingRange.js
@@ -0,0 +1,321 @@
+Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
+Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
+Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
+//// [/tests/cases/fourslash/server/formatTrimRemainingRange.ts]
+    ;
+    /*
+    
+*/
+
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 1,
+      "type": "request",
+      "arguments": {
+        "file": "/tests/cases/fourslash/server/formatTrimRemainingRange.ts"
+      },
+      "command": "open"
+    }
+Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /tests/cases/fourslash/server/formatTrimRemainingRange.ts ProjectRootPath: undefined:: Result: undefined
+Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /tests/cases/fourslash/server
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
+Info seq  [hh:mm:ss:mss] 	Files (4)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
+	/tests/cases/fourslash/server/formatTrimRemainingRange.ts SVC-1-0 "    ;\n    /*\n    \n*/"
+
+
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
+	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
+	formatTrimRemainingRange.ts
+	  Root file specified for compilation
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
+Info seq  [hh:mm:ss:mss] 	Files (4)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: /tests/cases/fourslash/server/formatTrimRemainingRange.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: /dev/null/inferredProject1*
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "open",
+      "request_seq": 1,
+      "success": true,
+      "performanceData": {
+        "updateGraphDurationMs": *
+      }
+    }
+After Request
+watchedFiles::
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
+/tests/cases/fourslash/server/jsconfig.json: *new*
+  {"pollingInterval":2000}
+/tests/cases/fourslash/server/tsconfig.json: *new*
+  {"pollingInterval":2000}
+
+watchedDirectoriesRecursive::
+/tests/cases/fourslash/node_modules/@types: *new*
+  {}
+/tests/cases/fourslash/server/node_modules/@types: *new*
+  {}
+
+Projects::
+/dev/null/inferredProject1* (Inferred) *new*
+    projectStateVersion: 1
+    projectProgramVersion: 1
+    autoImportProviderHost: false
+
+ScriptInfos::
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/tests/cases/fourslash/server/formatTrimRemainingRange.ts (Open) *new*
+    version: SVC-1-0
+    containingProjects: 1
+        /dev/null/inferredProject1* *default*
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 2,
+      "type": "request",
+      "arguments": {
+        "file": "/tests/cases/fourslash/server/formatTrimRemainingRange.ts",
+        "line": 1,
+        "offset": 1,
+        "endLine": 4,
+        "endOffset": 3
+      },
+      "command": "format"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "format",
+      "request_seq": 2,
+      "success": true,
+      "body": [
+        {
+          "start": {
+            "line": 1,
+            "offset": 1
+          },
+          "end": {
+            "line": 1,
+            "offset": 5
+          },
+          "newText": ""
+        },
+        {
+          "start": {
+            "line": 2,
+            "offset": 1
+          },
+          "end": {
+            "line": 2,
+            "offset": 5
+          },
+          "newText": ""
+        },
+        {
+          "start": {
+            "line": 3,
+            "offset": 1
+          },
+          "end": {
+            "line": 3,
+            "offset": 4
+          },
+          "newText": ""
+        }
+      ]
+    }
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 3,
+      "type": "request",
+      "arguments": {
+        "file": "/tests/cases/fourslash/server/formatTrimRemainingRange.ts",
+        "line": 1,
+        "offset": 1,
+        "endLine": 1,
+        "endOffset": 5,
+        "insertString": ""
+      },
+      "command": "change"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "change",
+      "request_seq": 3,
+      "success": true
+    }
+After Request
+Projects::
+/dev/null/inferredProject1* (Inferred) *changed*
+    projectStateVersion: 2 *changed*
+    projectProgramVersion: 1
+    dirty: true *changed*
+    autoImportProviderHost: false
+
+ScriptInfos::
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/tests/cases/fourslash/server/formatTrimRemainingRange.ts (Open) *changed*
+    version: SVC-1-1 *changed*
+    containingProjects: 1
+        /dev/null/inferredProject1* *default*
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 4,
+      "type": "request",
+      "arguments": {
+        "file": "/tests/cases/fourslash/server/formatTrimRemainingRange.ts",
+        "line": 2,
+        "offset": 1,
+        "endLine": 2,
+        "endOffset": 5,
+        "insertString": ""
+      },
+      "command": "change"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "change",
+      "request_seq": 4,
+      "success": true
+    }
+After Request
+ScriptInfos::
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/tests/cases/fourslash/server/formatTrimRemainingRange.ts (Open) *changed*
+    version: SVC-1-2 *changed*
+    containingProjects: 1
+        /dev/null/inferredProject1* *default*
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 5,
+      "type": "request",
+      "arguments": {
+        "file": "/tests/cases/fourslash/server/formatTrimRemainingRange.ts",
+        "line": 3,
+        "offset": 1,
+        "endLine": 3,
+        "endOffset": 4,
+        "insertString": ""
+      },
+      "command": "change"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "change",
+      "request_seq": 5,
+      "success": true
+    }
+After Request
+ScriptInfos::
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/tests/cases/fourslash/server/formatTrimRemainingRange.ts (Open) *changed*
+    version: SVC-1-3 *changed*
+    containingProjects: 1
+        /dev/null/inferredProject1* *default*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/formatonkey01.js b/tests/baselines/reference/tsserver/fourslashServer/formatonkey01.js
index b50641b64bf76..5473677c80833 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/formatonkey01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/formatonkey01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/formatonkey01.ts]
 switch (1) {
     case 1:
@@ -22,7 +37,7 @@ switch (1) {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatonkey01.ts"
@@ -34,7 +49,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -44,18 +59,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/formatonkey01.ts SVC-1-0 "switch (1) {\n    case 1:\n        {\n            \n        break;\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	formatonkey01.ts
 	  Root file specified for compilation
 
@@ -72,7 +87,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -80,12 +95,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -104,15 +119,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -123,7 +138,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatonkey01.ts",
@@ -140,7 +155,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
@@ -152,15 +167,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -171,7 +186,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatonkey01.ts",
@@ -188,20 +203,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -212,7 +227,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatonkey01.ts",
@@ -227,7 +242,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -245,7 +260,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/formatonkey01.ts",
@@ -262,20 +277,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/getFileReferences_deduplicate.js b/tests/baselines/reference/tsserver/fourslashServer/getFileReferences_deduplicate.js
index fb6984d8a960b..13e8011ff6614 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/getFileReferences_deduplicate.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/getFileReferences_deduplicate.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 export * from "./util";
 
@@ -18,16 +33,16 @@ export * from "./util";
 import "./util";
 
 //// [/home/src/workspaces/project/tsconfig.build.json]
-{ "compilerOptions": { "rootDir": "src", "outDir": "dist/build", "composite": true }, "files": ["index.ts"], "references": [{ "path": "tsconfig.utils.json" }] }
+{ "compilerOptions": { "lib": ["es5"], "rootDir": "src", "outDir": "dist/build", "composite": true }, "files": ["index.ts"], "references": [{ "path": "tsconfig.utils.json" }] }
 
 //// [/home/src/workspaces/project/tsconfig.json]
 { "files": [], "references": [{ "path": "tsconfig.build.json" }, { "path": "tsconfig.test.json" }] }
 
 //// [/home/src/workspaces/project/tsconfig.test.json]
-{ "compilerOptions": { "rootDir": "src", "outDir": "dist/test", "composite": true }, "files": ["test.ts", "index.ts"], "references": [{ "path": "tsconfig.utils.json" }] }
+{ "compilerOptions": { "lib": ["es5"], "rootDir": "src", "outDir": "dist/test", "composite": true }, "files": ["test.ts", "index.ts"], "references": [{ "path": "tsconfig.utils.json" }] }
 
 //// [/home/src/workspaces/project/tsconfig.utils.json]
-{ "compilerOptions": { "rootDir": "src", "outDir": "dist/utils", "composite": true }, "files": ["util.ts"] }
+{ "compilerOptions": { "lib": ["es5"], "rootDir": "src", "outDir": "dist/utils", "composite": true }, "files": ["util.ts"] }
 
 //// [/home/src/workspaces/project/util.ts]
 export {}
@@ -35,7 +50,7 @@ export {}
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -66,6 +81,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.build.jso
   "/home/src/workspaces/project/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist/build",
   "composite": true,
@@ -85,6 +103,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.test.json
   "/home/src/workspaces/project/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist/test",
   "composite": true,
@@ -103,6 +124,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.utils.jso
   "/home/src/workspaces/project/util.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist/utils",
   "composite": true,
@@ -114,7 +138,7 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -124,18 +148,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"files\": [], \"references\": [{ \"path\": \"tsconfig.build.json\" }, { \"path\": \"tsconfig.test.json\" }] }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -156,7 +180,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -164,12 +188,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.build.json: *new*
@@ -200,15 +224,15 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -219,7 +243,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/util.ts"
@@ -246,18 +270,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.utils.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.utils.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/util.ts SVC-1-0 "export {}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	util.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -289,11 +313,11 @@ Info seq  [hh:mm:ss:mss] event:
                 "span": {
                   "start": {
                     "line": 1,
-                    "offset": 97
+                    "offset": 113
                   },
                   "end": {
                     "line": 1,
-                    "offset": 106
+                    "offset": 122
                   },
                   "file": "/home/src/workspaces/project/tsconfig.utils.json"
                 },
@@ -328,7 +352,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -336,12 +360,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.build.json:
@@ -378,17 +402,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.utils.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.utils.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -404,7 +428,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/util.ts"
@@ -472,19 +496,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.build.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.build.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/util.ts SVC-1-0 "export {}"
 	/home/src/workspaces/project/index.ts Text-1 "export * from \"./util\";"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	util.ts
 	  Imported via "./util" from file 'index.ts'
 	index.ts
@@ -518,11 +542,11 @@ Info seq  [hh:mm:ss:mss] event:
                 "span": {
                   "start": {
                     "line": 1,
-                    "offset": 97
+                    "offset": 113
                   },
                   "end": {
                     "line": 1,
-                    "offset": 107
+                    "offset": 123
                   },
                   "file": "/home/src/workspaces/project/tsconfig.build.json"
                 },
@@ -555,7 +579,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.test.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.test.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/util.ts SVC-1-0 "export {}"
@@ -563,12 +587,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/index.ts Text-1 "export * from \"./util\";"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	util.ts
 	  Imported via "./util" from file 'test.ts'
 	  Imported via "./util" from file 'index.ts'
@@ -605,11 +629,11 @@ Info seq  [hh:mm:ss:mss] event:
                 "span": {
                   "start": {
                     "line": 1,
-                    "offset": 107
+                    "offset": 123
                   },
                   "end": {
                     "line": 1,
-                    "offset": 117
+                    "offset": 133
                   },
                   "file": "/home/src/workspaces/project/tsconfig.test.json"
                 },
@@ -628,11 +652,11 @@ Info seq  [hh:mm:ss:mss] event:
                 "span": {
                   "start": {
                     "line": 1,
-                    "offset": 96
+                    "offset": 112
                   },
                   "end": {
                     "line": 1,
-                    "offset": 105
+                    "offset": 121
                   },
                   "file": "/home/src/workspaces/project/tsconfig.test.json"
                 },
@@ -652,7 +676,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "fileReferences",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -707,12 +731,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
@@ -764,21 +788,21 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 4 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.utils.json
         /home/src/workspaces/project/tsconfig.build.json *new*
         /home/src/workspaces/project/tsconfig.test.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 4 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.utils.json
         /home/src/workspaces/project/tsconfig.build.json *new*
         /home/src/workspaces/project/tsconfig.test.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 4 *changed*
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/getFileReferences_server1.js b/tests/baselines/reference/tsserver/fourslashServer/getFileReferences_server1.js
index 4b91bd79ad2e8..82a8f0fb04a85 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/getFileReferences_server1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/getFileReferences_server1.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 export const a = 0;
 
@@ -25,12 +40,12 @@ import { a } from "/project/a";
 type T = typeof import("./a").a;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{}
+{ "compilerOptions": { "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -48,6 +63,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/d.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -68,7 +86,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/c.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -78,7 +96,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (7)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "export const a = 0;"
@@ -87,12 +105,12 @@ Info seq  [hh:mm:ss:mss] 	Files (7)
 	/home/src/workspaces/project/d.ts Text-1 "import { a } from \"/project/a\";\ntype T = typeof import(\"./a\").a;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Matched by default include pattern '**/*'
 	  Imported via "./a" from file 'b.ts'
@@ -137,18 +155,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"lib\": [\"es5\"] } }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -169,7 +187,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -177,12 +195,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/b.ts: *new*
@@ -217,17 +235,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -255,7 +273,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts"
@@ -282,17 +300,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/b.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/c.ts:
@@ -329,17 +347,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -368,7 +386,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts"
@@ -381,7 +399,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "fileReferences",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "refs": [
diff --git a/tests/baselines/reference/tsserver/fourslashServer/getFileReferences_server2.js b/tests/baselines/reference/tsserver/fourslashServer/getFileReferences_server2.js
index 2ea99609b227f..6670cefe3d901 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/getFileReferences_server2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/getFileReferences_server2.js
@@ -1,21 +1,45 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "paths": {
+            "@shared/*": [
+              "../shared/src/*"
+            ]
+          },
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true,
+          "rootDir": "/home/src/workspaces/project/packages/shared/src",
+          "outDir": "/home/src/workspaces/project/packages/shared/dist",
+          "composite": true,
+          "checkJs": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/packages/client/index.ts]
 import "@shared/referenced";
 
 //// [/home/src/workspaces/project/packages/client/tsconfig.json]
-{ "compilerOptions": { "paths": { "@shared/*": ["../shared/src/*"] } }, "references": [{ "path": "../shared" }] }
+{ "compilerOptions": { "lib": ["es5"], "paths": { "@shared/*": ["../shared/src/*"] } }, "references": [{ "path": "../shared" }] }
 
 //// [/home/src/workspaces/project/packages/server/index.js]
 const mod = require("../shared/src/referenced");
@@ -24,13 +48,13 @@ const mod = require("../shared/src/referenced");
 const blah = require("../shared/dist/referenced");
 
 //// [/home/src/workspaces/project/packages/server/tsconfig.json]
-{ "compilerOptions": { "checkJs": true }, "references": [{ "path": "../shared" }] }
+{ "compilerOptions": { "lib": ["es5"], "checkJs": true }, "references": [{ "path": "../shared" }] }
 
 //// [/home/src/workspaces/project/packages/shared/src/referenced.ts]
 export {};
 
 //// [/home/src/workspaces/project/packages/shared/tsconfig.json]
-{ "compilerOptions": { "rootDir": "src", "outDir": "dist", "composite": true } }
+{ "compilerOptions": { "lib": ["es5"], "rootDir": "src", "outDir": "dist", "composite": true } }
 
 //// [/home/src/workspaces/project/tsconfig.json]
 { "files": [], "references": [{ "path": "packages/server" }, { "path": "packages/client" }] }
@@ -38,7 +62,7 @@ export {};
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -70,6 +94,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/server/ts
   "/home/src/workspaces/project/packages/server/router.js"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "checkJs": true,
   "configFilePath": "/home/src/workspaces/project/packages/server/tsconfig.json"
  },
@@ -88,6 +115,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/client/ts
   "/home/src/workspaces/project/packages/client/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "paths": {
    "@shared/*": [
     "../shared/src/*"
@@ -111,6 +141,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/shared/ts
   "/home/src/workspaces/project/packages/shared/src/referenced.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/home/src/workspaces/project/packages/shared/src",
   "outDir": "/home/src/workspaces/project/packages/shared/dist",
   "composite": true,
@@ -124,7 +157,7 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -134,18 +167,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"files\": [], \"references\": [{ \"path\": \"packages/server\" }, { \"path\": \"packages/client\" }] }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -166,7 +199,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -174,12 +207,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/client/tsconfig.json: *new*
@@ -216,15 +249,15 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -235,7 +268,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/shared/src/referenced.ts"
@@ -266,18 +299,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/shared/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/shared/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/shared/src/referenced.ts SVC-1-0 "export {};"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/referenced.ts
 	  Matched by default include pattern '**/*'
 
@@ -325,7 +358,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -333,12 +366,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/client/tsconfig.json:
@@ -385,17 +418,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/shared/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/shared/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -411,7 +444,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/shared/src/referenced.ts"
@@ -486,7 +519,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/server/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/server/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/shared/src/referenced.ts SVC-1-0 "export {};"
@@ -494,12 +527,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/packages/server/router.js Text-1 "const blah = require(\"../shared/dist/referenced\");"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../shared/src/referenced.ts
 	  Imported via "../shared/src/referenced" from file 'index.js'
 	  Imported via "../shared/dist/referenced" from file 'router.js'
@@ -564,19 +597,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/client/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/client/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/shared/src/referenced.ts SVC-1-0 "export {};"
 	/home/src/workspaces/project/packages/client/index.ts Text-1 "import \"@shared/referenced\";"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../shared/src/referenced.ts
 	  Imported via "@shared/referenced" from file 'index.ts'
 	index.ts
@@ -610,7 +643,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "fileReferences",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -686,12 +719,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/client/index.ts: *new*
@@ -762,21 +795,21 @@ Projects::
     initialLoadPending: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 4 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/shared/tsconfig.json
         /home/src/workspaces/project/packages/server/tsconfig.json *new*
         /home/src/workspaces/project/packages/client/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 4 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/shared/tsconfig.json
         /home/src/workspaces/project/packages/server/tsconfig.json *new*
         /home/src/workspaces/project/packages/client/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 4 *changed*
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/getJavaScriptSyntacticDiagnostics01.js b/tests/baselines/reference/tsserver/fourslashServer/getJavaScriptSyntacticDiagnostics01.js
index 1b083ea4a6a17..daf070b961d55 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/getJavaScriptSyntacticDiagnostics01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/getJavaScriptSyntacticDiagnostics01.js
@@ -1,23 +1,39 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "allowJs": true,
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/a.js]
 var ===;
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.js"
@@ -29,7 +45,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -39,18 +55,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.js SVC-1-0 "var ===;"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.js
 	  Root file specified for compilation
 
@@ -67,7 +83,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -75,12 +91,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -99,15 +115,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -118,7 +134,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.js",
@@ -131,7 +147,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
@@ -168,7 +184,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.js",
@@ -181,7 +197,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/getJavaScriptSyntacticDiagnostics02.js b/tests/baselines/reference/tsserver/fourslashServer/getJavaScriptSyntacticDiagnostics02.js
index 2b358eb972466..05f51b3796587 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/getJavaScriptSyntacticDiagnostics02.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/getJavaScriptSyntacticDiagnostics02.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "allowJs": true,
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/b.js]
 var a = "a";
 var b: boolean = true;
@@ -20,7 +36,7 @@ var var = "c";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.js"
@@ -32,7 +48,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -42,18 +58,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/b.js SVC-1-0 "var a = \"a\";\nvar b: boolean = true;\nfunction foo(): string { }\nvar var = \"c\";"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	b.js
 	  Root file specified for compilation
 
@@ -70,7 +86,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -78,12 +94,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -102,15 +118,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -121,7 +137,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.js",
@@ -134,7 +150,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
@@ -216,7 +232,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.js",
@@ -229,7 +245,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/getOutliningSpansForComments.js b/tests/baselines/reference/tsserver/fourslashServer/getOutliningSpansForComments.js
index f7d69bc93932e..753a8ca6a1ceb 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/getOutliningSpansForComments.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/getOutliningSpansForComments.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/getOutliningSpansForComments.ts]
 /*
     Block comment at the beginning of the file before module:
@@ -30,7 +45,7 @@ declare module "n";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/getOutliningSpansForComments.ts"
@@ -42,7 +57,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -52,18 +67,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/getOutliningSpansForComments.ts SVC-1-0 "/*\n    Block comment at the beginning of the file before module:\n        line one of the comment\n        line two of the comment\n        line three\n        line four\n        line five\n*/\ndeclare module \"m\";\n// Single line comments at the start of the file\n// line 2\n// line 3\n// line 4\ndeclare module \"n\";"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	getOutliningSpansForComments.ts
 	  Root file specified for compilation
 
@@ -80,7 +95,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -88,12 +103,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -112,15 +127,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -131,7 +146,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/getOutliningSpansForComments.ts"
@@ -143,7 +158,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getOutliningSpans",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/getOutliningSpansForRegions.js b/tests/baselines/reference/tsserver/fourslashServer/getOutliningSpansForRegions.js
index 8d62fc1f3b67d..615fab3b571a6 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/getOutliningSpansForRegions.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/getOutliningSpansForRegions.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/getOutliningSpansForRegions.ts]
 // region without label
 // #region
@@ -63,7 +78,7 @@ test // #endregion
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/getOutliningSpansForRegions.ts"
@@ -75,7 +90,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -85,18 +100,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/getOutliningSpansForRegions.ts SVC-1-0 "// region without label\n// #region\n\n// #endregion\n\n// region without label with trailing spaces\n// #region\n\n// #endregion\n\n// region with label\n// #region label1\n\n// #endregion\n\n// region with extra whitespace in all valid locations\n             //              #region          label2    label3\n\n        //        #endregion\n\n// No space before directive\n//#region label4\n\n//#endregion\n\n// Nested regions\n// #region outer\n\n// #region inner\n\n// #endregion inner\n\n// #endregion outer\n\n// region delimiters not valid when there is preceding text on line\n test // #region invalid1\n\ntest // #endregion\n\n// region delimiters not valid when in multiline comment\n/*\n// #region invalid2\n*/\n\n/*\n// #endregion\n*/"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	getOutliningSpansForRegions.ts
 	  Root file specified for compilation
 
@@ -113,7 +128,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -121,12 +136,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -145,15 +160,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -164,7 +179,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/getOutliningSpansForRegions.ts"
@@ -176,7 +191,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getOutliningSpans",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/getOutliningSpansForRegionsNoSingleLineFolds.js b/tests/baselines/reference/tsserver/fourslashServer/getOutliningSpansForRegionsNoSingleLineFolds.js
index 7716aed6c7cbf..9f364893440be 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/getOutliningSpansForRegionsNoSingleLineFolds.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/getOutliningSpansForRegionsNoSingleLineFolds.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/getOutliningSpansForRegionsNoSingleLineFolds.ts]
 //#region
 function foo() {
@@ -31,7 +46,7 @@ function bar() { }
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/getOutliningSpansForRegionsNoSingleLineFolds.ts"
@@ -43,7 +58,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -53,18 +68,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/getOutliningSpansForRegionsNoSingleLineFolds.ts SVC-1-0 "//#region\nfunction foo() {\n\n}\n//these\n//should\n//#endregion not you\n// be\n// together\n\n//#region bla bla bla\n\nfunction bar() { }\n\n//#endregion"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	getOutliningSpansForRegionsNoSingleLineFolds.ts
 	  Root file specified for compilation
 
@@ -81,7 +96,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -89,12 +104,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -113,15 +128,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -132,7 +147,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/getOutliningSpansForRegionsNoSingleLineFolds.ts"
@@ -144,7 +159,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getOutliningSpans",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToDefinitionScriptImportServer.js b/tests/baselines/reference/tsserver/fourslashServer/goToDefinitionScriptImportServer.js
index 74d9ef1921891..8eaea46756c72 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToDefinitionScriptImportServer.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToDefinitionScriptImportServer.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/moduleThing.ts]
 import "./scriptThing";
 import "./stylez.css";
@@ -27,7 +42,7 @@ div {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/scriptThing.ts"
@@ -39,7 +54,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -49,18 +64,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/scriptThing.ts SVC-1-0 "console.log(\"woooo side effects\")"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	scriptThing.ts
 	  Root file specified for compilation
 
@@ -77,7 +92,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -85,12 +100,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -109,15 +124,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -128,7 +143,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/moduleThing.ts"
@@ -151,19 +166,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/scriptThing.ts SVC-1-0 "console.log(\"woooo side effects\")"
 	/home/src/workspaces/project/moduleThing.ts SVC-1-0 "import \"./scriptThing\";\nimport \"./stylez.css\";\nimport \"./foo.txt\";"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	scriptThing.ts
 	  Imported via "./scriptThing" from file 'moduleThing.ts'
 	moduleThing.ts
@@ -173,18 +188,18 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
 	/home/src/workspaces/project/scriptThing.ts
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	scriptThing.ts
 	  Root file specified for compilation
 
@@ -207,7 +222,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -215,12 +230,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json:
@@ -260,17 +275,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
@@ -287,7 +302,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/moduleThing.ts",
@@ -301,7 +316,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "definitions": [
@@ -331,7 +346,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/moduleThing.ts",
@@ -345,7 +360,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "definitions": [
@@ -376,7 +391,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/moduleThing.ts",
@@ -390,7 +405,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": {
         "definitions": [
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToImplementation_inDifferentFiles.js b/tests/baselines/reference/tsserver/fourslashServer/goToImplementation_inDifferentFiles.js
index 39e9bd280b2ba..4f9cbce4bdc57 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToImplementation_inDifferentFiles.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToImplementation_inDifferentFiles.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/bar.ts]
 import {Foo} from './foo'
 
@@ -30,7 +45,7 @@ export interface Foo {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/bar.ts"
@@ -43,7 +58,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/foo.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -53,19 +68,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/foo.ts Text-1 "export interface Foo {\n    func();\n}"
 	/home/src/workspaces/project/bar.ts SVC-1-0 "import {Foo} from './foo'\n\nclass A implements Foo {\n    func() {}\n}\n\nclass B implements Foo {\n    func() {}\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	foo.ts
 	  Imported via './foo' from file 'bar.ts'
 	bar.ts
@@ -84,7 +99,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -92,12 +107,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/foo.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -118,15 +133,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -141,7 +156,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/foo.ts"
@@ -164,17 +179,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json:
@@ -191,15 +206,15 @@ watchedDirectoriesRecursive::
   {}
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -215,7 +230,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/foo.ts",
@@ -229,7 +244,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "implementation",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource10_mapFromAtTypes3.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource10_mapFromAtTypes3.js
index fe827a9aab329..ba68abb160633 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource10_mapFromAtTypes3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource10_mapFromAtTypes3.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "moduleResolution": "bundler",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import { add } from 'lodash';
 
@@ -77,7 +93,7 @@ declare namespace _ {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/lodash/package.json"
@@ -97,7 +113,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/lodash/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/lodash/index.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/lodash/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -111,19 +127,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/lodash/package.json SVC-1-0 "{ \"name\": \"lodash\", \"version\": \"4.17.15\", \"main\": \"./lodash.js\" }"
 	/home/src/workspaces/project/node_modules/@types/lodash/index.d.ts Text-1 "export = _;\nexport as namespace _;\ndeclare const _: _.LoDashStatic;\ndeclare namespace _ {\n    interface LoDashStatic {}\n}"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 	../@types/lodash/index.d.ts
@@ -142,7 +158,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -150,12 +166,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@types/lodash/index.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@types/lodash/package.json: *new*
@@ -189,15 +205,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -212,7 +228,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -239,19 +255,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/lodash/index.d.ts Text-1 "export = _;\nexport as namespace _;\ndeclare const _: _.LoDashStatic;\ndeclare namespace _ {\n    interface LoDashStatic {}\n}"
 	/home/src/workspaces/project/index.ts SVC-1-0 "import { add } from 'lodash';"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/@types/lodash/index.d.ts
 	  Imported via 'lodash' from file 'index.ts' with packageId '@types/lodash/index.d.ts@4.14.97'
 	  Entry point for implicit type library 'lodash' with packageId '@types/lodash/index.d.ts@4.14.97'
@@ -277,7 +293,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -285,12 +301,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/lodash/index.d.ts:
@@ -344,17 +360,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -375,7 +391,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -414,7 +430,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -464,12 +480,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/lodash/index.d.ts:
@@ -535,17 +551,17 @@ Projects::
     noDtsResolutionProject: /dev/null/auxiliaryProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource11_propertyOfAlias.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource11_propertyOfAlias.js
index a91b67f47253d..0dfef2dd07190 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource11_propertyOfAlias.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource11_propertyOfAlias.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "moduleResolution": "bundler",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.d.ts]
 export declare const a: { a: string };
 
@@ -24,7 +40,7 @@ a.a
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js"
@@ -36,7 +52,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -46,18 +62,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.js SVC-1-0 "export const a = { a: 'a' };"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.js
 	  Root file specified for compilation
 
@@ -74,7 +90,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -82,12 +98,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -106,15 +122,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -125,7 +141,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b.ts"
@@ -145,19 +161,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.d.ts Text-1 "export declare const a: { a: string };"
 	/home/src/workspaces/project/b.ts SVC-1-0 "import { a } from './a';\na.a"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.d.ts
 	  Imported via './a' from file 'b.ts'
 	b.ts
@@ -182,7 +198,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -190,12 +206,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
@@ -226,17 +242,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -256,7 +272,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b.ts",
@@ -287,7 +303,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -316,12 +332,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.d.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
@@ -359,17 +375,17 @@ Projects::
     noDtsResolutionProject: /dev/null/auxiliaryProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource12_callbackParam.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource12_callbackParam.js
index 6e811309a4a17..54e8916a05dbb 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource12_callbackParam.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource12_callbackParam.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "moduleResolution": "bundler",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import { command } from "yargs";
 command("foo", yargs => {
@@ -41,7 +57,7 @@ export function command(cmd, cb) { cb({ positional: "This is obviously not even
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/@types/yargs/package.json"
@@ -63,7 +79,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/yargs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/yargs/index.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/yargs/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -79,19 +95,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/yargs/package.json SVC-1-0 "{\n    \"name\": \"@types/yargs\",\n    \"version\": \"1.0.0\",\n    \"types\": \"./index.d.ts\"\n}"
 	/home/src/workspaces/project/node_modules/@types/yargs/index.d.ts Text-1 "export interface Yargs { positional(): Yargs; }\nexport declare function command(command: string, cb: (yargs: Yargs) => void): void;"
 
 
-	../../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 	index.d.ts
@@ -110,7 +126,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -118,12 +134,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@types/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/tsconfig.json: *new*
@@ -163,15 +179,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -186,7 +202,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -213,19 +229,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/yargs/index.d.ts Text-1 "export interface Yargs { positional(): Yargs; }\nexport declare function command(command: string, cb: (yargs: Yargs) => void): void;"
 	/home/src/workspaces/project/index.ts SVC-1-0 "import { command } from \"yargs\";\ncommand(\"foo\", yargs => {\n    yargs.positional();\n});"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/@types/yargs/index.d.ts
 	  Imported via "yargs" from file 'index.ts' with packageId '@types/yargs/index.d.ts@1.0.0'
 	  Entry point for implicit type library 'yargs' with packageId '@types/yargs/index.d.ts@1.0.0'
@@ -251,7 +267,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -259,12 +275,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/jsconfig.json:
@@ -324,17 +340,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -355,7 +371,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -394,7 +410,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -424,12 +440,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/jsconfig.json:
@@ -503,17 +519,17 @@ Projects::
     noDtsResolutionProject: /dev/null/auxiliaryProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource13_nodenext.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource13_nodenext.js
index 037d5a050944e..213768f8a777b 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource13_nodenext.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource13_nodenext.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "node16",
+          "lib": [
+            "es5"
+          ],
+          "strict": true,
+          "outDir": "/home/src/workspaces/project/out",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.mts]
 import leftPad = require("left-pad");
 leftPad("", 4);
@@ -37,6 +55,7 @@ function leftPad(str, len, ch) {}
 {
   "compilerOptions": {
       "module": "node16",
+      "lib": ["es5"],
       "strict": true,
       "outDir": "./out",
 
@@ -46,7 +65,7 @@ function leftPad(str, len, ch) {}
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/left-pad/package.json"
@@ -60,9 +79,12 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/left-pad/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/left-pad/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -74,18 +96,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/left-pad/package.json SVC-1-0 "{\n  \"name\": \"left-pad\",\n  \"version\": \"1.3.0\",\n  \"description\": \"String left pad\",\n  \"main\": \"index.js\",\n  \"types\": \"index.d.ts\"\n}"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -102,7 +124,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -110,12 +132,18 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/left-pad/jsconfig.json: *new*
@@ -141,15 +169,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -160,7 +188,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.mts"
@@ -176,6 +204,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 100,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "strict": true,
   "outDir": "/home/src/workspaces/project/out",
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
@@ -202,18 +233,29 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/left-pad/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2022.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/left-pad/index.d.ts Text-1 "declare function leftPad(str: string|number, len: number, ch?: string|number): string;\ndeclare namespace leftPad { }\nexport = leftPad;"
 	/home/src/workspaces/project/index.mts SVC-1-0 "import leftPad = require(\"left-pad\");\nleftPad(\"\", 4);"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/left-pad/index.d.ts
 	  Imported via "left-pad" from file 'index.mts' with packageId 'left-pad/index.d.ts@1.3.0'
 	  File is CommonJS module because 'node_modules/left-pad/package.json' does not have field "type"
@@ -238,67 +280,11 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/index.mts",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.es2022.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'es2022'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'CallableFunction'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'NewableFunction'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -315,7 +301,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -323,14 +309,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.es2022.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
 /home/src/workspaces/project/node_modules/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/left-pad/index.d.ts: *new*
@@ -378,18 +371,21 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+        /home/src/workspaces/project/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+        /home/src/workspaces/project/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json *new*
 /home/src/workspaces/project/index.mts (Open) *new*
     version: SVC-1-0
     containingProjects: 1
@@ -405,7 +401,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.mts",
@@ -445,7 +441,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -474,14 +470,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.es2022.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/left-pad/index.d.ts:
@@ -543,18 +546,21 @@ Projects::
     noDtsResolutionProject: /dev/null/auxiliaryProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/index.mts (Open) *changed*
     version: SVC-1-0
     containingProjects: 2 *changed*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource14_unresolvedRequireDestructuring.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource14_unresolvedRequireDestructuring.js
index 31239bef4df9e..c842b54faf9ed 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource14_unresolvedRequireDestructuring.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource14_unresolvedRequireDestructuring.js
@@ -1,23 +1,39 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "allowJs": true,
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.js]
 const { blah } = require("unresolved");
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.js"
@@ -29,7 +45,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
@@ -47,18 +63,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.js SVC-1-0 "const { blah } = require(\"unresolved\");"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.js
 	  Root file specified for compilation
 
@@ -75,7 +91,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -83,12 +99,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -117,15 +133,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -136,7 +152,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.js",
@@ -170,7 +186,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -179,12 +195,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json:
@@ -221,15 +237,15 @@ Projects::
     noDtsResolutionProject: /dev/null/auxiliaryProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource15_bundler.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource15_bundler.js
index e961d89e64e3b..9b638c2d661e7 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource15_bundler.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource15_bundler.js
@@ -1,16 +1,33 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "esnext",
+          "moduleResolution": "bundler",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import { useState } from 'react';
 
@@ -40,12 +57,12 @@ if (process.env.NODE_ENV === 'production') {
 { "name": "react", "version": "16.8.6", "main": "index.js" }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "esnext", "moduleResolution": "bundler" } }
+{ "compilerOptions": { "module": "esnext", "moduleResolution": "bundler", "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -62,6 +79,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  "options": {
   "module": 99,
   "moduleResolution": 100,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -79,7 +99,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 1 undefined Config: /home/src/workspaces/project/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
@@ -98,18 +118,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 "import { useState } from 'react';"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 
@@ -145,18 +165,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"esnext\", \"moduleResolution\": \"bundler\" } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"esnext\", \"moduleResolution\": \"bundler\", \"lib\": [\"es5\"] } }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -177,7 +197,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -185,12 +205,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -231,17 +251,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -257,7 +277,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -284,17 +304,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/react/package.json:
@@ -337,17 +357,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -364,7 +384,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -412,7 +432,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -460,12 +480,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/react/cjs/package.json: *new*
@@ -520,17 +540,17 @@ Projects::
     noDtsResolutionProject: /dev/null/auxiliaryProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource16_callbackParamDifferentFile.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource16_callbackParamDifferentFile.js
index 77e8741440fe8..2b9fc46469345 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource16_callbackParamDifferentFile.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource16_callbackParamDifferentFile.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "moduleResolution": "bundler",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import { command } from "yargs";
 command("foo", yargs => {
@@ -48,7 +64,7 @@ export function command(cmd, cb) { cb(Yargs) }
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/@types/yargs/package.json"
@@ -73,7 +89,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/yargs 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/yargs 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/yargs/callback.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/yargs/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -89,7 +105,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/yargs/package.json SVC-1-0 "{\n    \"name\": \"@types/yargs\",\n    \"version\": \"1.0.0\",\n    \"types\": \"./index.d.ts\"\n}"
@@ -97,12 +113,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/node_modules/@types/yargs/index.d.ts Text-1 "import { Yargs } from \"./callback\";\nexport declare function command(command: string, cb: (yargs: Yargs) => void): void;"
 
 
-	../../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 	callback.d.ts
@@ -123,7 +139,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -131,12 +147,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@types/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/tsconfig.json: *new*
@@ -182,15 +198,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -209,7 +225,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -236,7 +252,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/yargs/callback.d.ts Text-1 "export declare class Yargs { positional(): Yargs; }"
@@ -244,12 +260,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/index.ts SVC-1-0 "import { command } from \"yargs\";\ncommand(\"foo\", yargs => {\n    yargs.positional();\n});"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/@types/yargs/callback.d.ts
 	  Imported via "./callback" from file 'node_modules/@types/yargs/index.d.ts' with packageId '@types/yargs/callback.d.ts@1.0.0'
 	node_modules/@types/yargs/index.d.ts
@@ -277,7 +293,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -285,12 +301,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/jsconfig.json:
@@ -354,17 +370,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -390,7 +406,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -433,7 +449,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -463,12 +479,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/jsconfig.json:
@@ -548,17 +564,17 @@ Projects::
     noDtsResolutionProject: /dev/null/auxiliaryProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource17_AddsFileToProject.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource17_AddsFileToProject.js
index 772ff2232cee2..bd94cf1d6afcc 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource17_AddsFileToProject.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource17_AddsFileToProject.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "moduleResolution": "bundler",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import { command } from "yargs";
 command("foo", yargs => {
@@ -48,7 +64,7 @@ export function command(cmd, cb) { cb(Yargs) }
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/@types/yargs/package.json"
@@ -73,7 +89,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/yargs 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/yargs 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/yargs/callback.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/yargs/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -89,7 +105,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/yargs/package.json SVC-1-0 "{\n    \"name\": \"@types/yargs\",\n    \"version\": \"1.0.0\",\n    \"types\": \"./index.d.ts\"\n}"
@@ -97,12 +113,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/node_modules/@types/yargs/index.d.ts Text-1 "import { Yargs } from \"./callback\";\nexport declare function command(command: string, cb: (yargs: Yargs) => void): void;"
 
 
-	../../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 	callback.d.ts
@@ -123,7 +139,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -131,12 +147,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@types/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/tsconfig.json: *new*
@@ -182,15 +198,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -209,7 +225,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -236,7 +252,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/yargs/callback.d.ts Text-1 "export declare class Yargs { positional(): Yargs; }"
@@ -244,12 +260,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/index.ts SVC-1-0 "import { command } from \"yargs\";\ncommand(\"foo\", yargs => {\n    yargs.positional();\n});"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/@types/yargs/callback.d.ts
 	  Imported via "./callback" from file 'node_modules/@types/yargs/index.d.ts' with packageId '@types/yargs/callback.d.ts@1.0.0'
 	node_modules/@types/yargs/index.d.ts
@@ -277,7 +293,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -285,12 +301,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/jsconfig.json:
@@ -354,17 +370,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -390,7 +406,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -447,7 +463,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -477,12 +493,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/jsconfig.json:
@@ -562,17 +578,17 @@ Projects::
     noDtsResolutionProject: /dev/null/auxiliaryProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource18_reusedFromDifferentFolder.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource18_reusedFromDifferentFolder.js
index c3a618a230cbe..2795969c5065c 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource18_reusedFromDifferentFolder.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource18_reusedFromDifferentFolder.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "moduleResolution": "bundler",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/folder/random.ts]
 import { Yargs } from "yargs/callback";
 
@@ -52,7 +68,7 @@ command("foo", yargs => {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/@types/yargs/package.json"
@@ -77,7 +93,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/yargs 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/yargs 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/yargs/callback.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/yargs/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -93,7 +109,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/yargs/package.json SVC-1-0 "{\n    \"name\": \"@types/yargs\",\n    \"version\": \"1.0.0\",\n    \"types\": \"./index.d.ts\"\n}"
@@ -101,12 +117,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/node_modules/@types/yargs/index.d.ts Text-1 "import { Yargs } from \"./callback\";\nexport declare function command(command: string, cb: (yargs: Yargs) => void): void;"
 
 
-	../../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 	callback.d.ts
@@ -127,7 +143,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -135,12 +151,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@types/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/tsconfig.json: *new*
@@ -186,15 +202,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -213,7 +229,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/some/index.ts"
@@ -253,7 +269,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (7)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/yargs/callback.d.ts Text-1 "export declare class Yargs { positional(): Yargs; }"
@@ -262,12 +278,12 @@ Info seq  [hh:mm:ss:mss] 	Files (7)
 	/home/src/workspaces/project/some/index.ts SVC-1-0 "import { random } from \"../folder/random\";\nimport { command } from \"yargs\";\ncommand(\"foo\", yargs => {\n    yargs.positional();\n});"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../node_modules/@types/yargs/callback.d.ts
 	  Imported via "yargs/callback" from file '../folder/random.ts' with packageId '@types/yargs/callback.d.ts@1.0.0'
 	  Imported via "./callback" from file '../node_modules/@types/yargs/index.d.ts' with packageId '@types/yargs/callback.d.ts@1.0.0'
@@ -298,7 +314,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -306,12 +322,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/folder/random.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -391,17 +407,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -431,7 +447,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/some/index.ts",
@@ -485,7 +501,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -515,12 +531,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/folder/random.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
@@ -620,17 +636,17 @@ Projects::
     noDtsResolutionProject: /dev/null/auxiliaryProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource1_localJsBesideDts.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource1_localJsBesideDts.js
index 94566e9457b07..2f68642628685 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource1_localJsBesideDts.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource1_localJsBesideDts.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.d.ts]
 export declare const a: string;
 
@@ -24,7 +39,7 @@ a
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js"
@@ -36,7 +51,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -46,18 +61,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.js SVC-1-0 "export const a = \"a\";"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.js
 	  Root file specified for compilation
 
@@ -74,7 +89,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -82,12 +97,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -106,15 +121,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -125,7 +140,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -145,19 +160,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.d.ts Text-1 "export declare const a: string;"
 	/home/src/workspaces/project/index.ts SVC-1-0 "import { a } from \"./a\";\na"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.d.ts
 	  Imported via "./a" from file 'index.ts'
 	index.ts
@@ -182,7 +197,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -190,12 +205,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
@@ -226,17 +241,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -256,7 +271,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -287,7 +302,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -316,12 +331,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.d.ts:
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
@@ -359,17 +374,17 @@ Projects::
     noDtsResolutionProject: /dev/null/auxiliaryProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
@@ -392,7 +407,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -406,7 +421,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource2_nodeModulesWithTypes.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource2_nodeModulesWithTypes.js
index d6dcd6be1bed8..8a9c4bc7d285c 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource2_nodeModulesWithTypes.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource2_nodeModulesWithTypes.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "moduleResolution": "bundler",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import { a } from "foo";
 a
@@ -27,7 +43,7 @@ export declare const a: string;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/foo/package.json"
@@ -41,7 +57,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/foo/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -55,18 +71,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/foo/package.json SVC-1-0 "{ \"name\": \"foo\", \"version\": \"1.0.0\", \"main\": \"./lib/main.js\", \"types\": \"./types/main.d.ts\" }"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -83,7 +99,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -91,12 +107,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/foo/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/foo/tsconfig.json: *new*
@@ -122,15 +138,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -141,7 +157,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -169,19 +185,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/foo/types/main.d.ts Text-1 "export declare const a: string;"
 	/home/src/workspaces/project/index.ts SVC-1-0 "import { a } from \"foo\";\na"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/foo/types/main.d.ts
 	  Imported via "foo" from file 'index.ts' with packageId 'foo/types/main.d.ts@1.0.0'
 	index.ts
@@ -206,7 +222,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -214,12 +230,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/foo/jsconfig.json:
@@ -269,17 +285,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -299,7 +315,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -339,7 +355,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -368,12 +384,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/foo/jsconfig.json:
@@ -439,17 +455,17 @@ Projects::
     noDtsResolutionProject: /dev/null/auxiliaryProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource3_nodeModulesAtTypes.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource3_nodeModulesAtTypes.js
index 2a98cead0cde4..6d54cf03585d2 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource3_nodeModulesAtTypes.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource3_nodeModulesAtTypes.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "moduleResolution": "bundler",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import { a } from "foo";
 a
@@ -30,7 +46,7 @@ export const a = "a";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/foo/package.json"
@@ -50,7 +66,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/foo/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/foo/index.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/foo/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -64,19 +80,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/foo/package.json SVC-1-0 "{ \"name\": \"foo\", \"version\": \"1.0.0\", \"main\": \"./lib/main.js\" }"
 	/home/src/workspaces/project/node_modules/@types/foo/index.d.ts Text-1 "export declare const a: string;"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 	../@types/foo/index.d.ts
@@ -95,7 +111,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -103,12 +119,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@types/foo/index.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@types/foo/package.json: *new*
@@ -142,15 +158,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -165,7 +181,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -192,19 +208,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/foo/index.d.ts Text-1 "export declare const a: string;"
 	/home/src/workspaces/project/index.ts SVC-1-0 "import { a } from \"foo\";\na"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/@types/foo/index.d.ts
 	  Imported via "foo" from file 'index.ts' with packageId '@types/foo/index.d.ts@1.0.0'
 	  Entry point for implicit type library 'foo' with packageId '@types/foo/index.d.ts@1.0.0'
@@ -230,7 +246,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -238,12 +254,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/foo/index.d.ts:
@@ -297,17 +313,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -328,7 +344,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -368,7 +384,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -397,12 +413,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/foo/index.d.ts:
@@ -472,17 +488,17 @@ Projects::
     noDtsResolutionProject: /dev/null/auxiliaryProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource5_sameAsGoToDef1.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource5_sameAsGoToDef1.js
index fdd2e6f6d3176..a1fab733071b0 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource5_sameAsGoToDef1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource5_sameAsGoToDef1.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.d.ts]
 export declare const a: string;
 
@@ -27,7 +42,7 @@ a
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts"
@@ -39,7 +54,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -49,18 +64,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-0 "export const a = 'a';"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Root file specified for compilation
 
@@ -77,7 +92,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -85,12 +100,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -109,15 +124,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -128,7 +143,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b.ts"
@@ -145,19 +160,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-0 "export const a = 'a';"
 	/home/src/workspaces/project/b.ts SVC-1-0 "import { a } from './a';\na"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Imported via './a' from file 'b.ts'
 	b.ts
@@ -167,18 +182,18 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
 	/home/src/workspaces/project/a.ts
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Root file specified for compilation
 
@@ -201,7 +216,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -209,12 +224,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json:
@@ -246,17 +261,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
@@ -273,7 +288,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b.ts",
@@ -287,7 +302,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
@@ -313,7 +328,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b.ts",
@@ -327,7 +342,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "definitions": [
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource6_sameAsGoToDef2.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource6_sameAsGoToDef2.js
index 387d155e16559..07a2d1183ab14 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource6_sameAsGoToDef2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource6_sameAsGoToDef2.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/b.ts]
 import { a } from 'foo/a';
 a
@@ -34,7 +49,7 @@ export declare const a: string;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/foo/package.json"
@@ -48,7 +63,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/foo/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -62,18 +77,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/foo/package.json SVC-1-0 "{ \"name\": \"foo\", \"version\": \"1.2.3\", \"typesVersions\": { \"*\": { \"*\": [\"./types/*\"] } } }"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -90,7 +105,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -98,12 +113,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/foo/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/foo/tsconfig.json: *new*
@@ -129,15 +144,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -148,7 +163,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b.ts"
@@ -176,19 +191,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/foo/types/a.d.ts Text-1 "export declare const a: string;\n//# sourceMappingURL=a.d.ts.map"
 	/home/src/workspaces/project/b.ts SVC-1-0 "import { a } from 'foo/a';\na"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/foo/types/a.d.ts
 	  Imported via 'foo/a' from file 'b.ts' with packageId 'foo/types/a.d.ts@1.2.3'
 	b.ts
@@ -213,7 +228,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -221,12 +236,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/foo/jsconfig.json:
@@ -276,17 +291,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -306,7 +321,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b.ts",
@@ -322,7 +337,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
@@ -348,12 +363,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/foo/jsconfig.json:
@@ -409,17 +424,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
@@ -453,7 +468,7 @@ DocumentPositionMapper1 *new*
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b.ts",
@@ -467,7 +482,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "definitions": [
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource7_conditionallyMinified.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource7_conditionallyMinified.js
index 007d17147f60e..d0f2c8155ef5a 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource7_conditionallyMinified.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource7_conditionallyMinified.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "moduleResolution": "bundler",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import { useState } from 'react';
 
@@ -42,7 +58,7 @@ if (process.env.NODE_ENV === 'production') {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/react/package.json"
@@ -56,7 +72,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/react/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -70,18 +86,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/react/package.json SVC-1-0 "{ \"name\": \"react\", \"version\": \"16.8.6\", \"main\": \"index.js\" }"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -98,7 +114,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -106,12 +122,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/react/jsconfig.json: *new*
@@ -137,15 +153,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -156,7 +172,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -184,18 +200,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts SVC-1-0 "import { useState } from 'react';"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Root file specified for compilation
 
@@ -218,7 +234,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -226,12 +242,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/jsconfig.json:
@@ -279,17 +295,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -305,7 +321,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -353,7 +369,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -401,12 +417,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/jsconfig.json:
@@ -471,17 +487,17 @@ Projects::
     noDtsResolutionProject: /dev/null/auxiliaryProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource8_mapFromAtTypes.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource8_mapFromAtTypes.js
index 598a8dfdc3b43..360cc189b3369 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource8_mapFromAtTypes.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource8_mapFromAtTypes.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "moduleResolution": "bundler",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import { add } from 'lodash';
 
@@ -86,7 +102,7 @@ declare namespace _ {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/lodash/package.json"
@@ -107,7 +123,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/lodash/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/lodash/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/lodash/common/math.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/lodash/common/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
@@ -122,7 +138,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/lodash/package.json SVC-1-0 "{ \"name\": \"lodash\", \"version\": \"4.17.15\", \"main\": \"./lodash.js\" }"
@@ -130,12 +146,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/node_modules/@types/lodash/index.d.ts Text-1 "/// <reference path=\"./common/math.d.ts\" />\nexport = _;\nexport as namespace _;\ndeclare const _: _.LoDashStatic;\ndeclare namespace _ {\n    interface LoDashStatic {}\n}"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 	../@types/lodash/common/math.d.ts
@@ -157,7 +173,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -165,12 +181,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@types/lodash/common/math.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@types/lodash/common/package.json: *new*
@@ -208,15 +224,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -235,7 +251,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -263,7 +279,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/lodash/common/math.d.ts Text-1 "import _ = require(\"../index\");\ndeclare module \"../index\" {\n    interface LoDashStatic {\n        add(augend: number, addend: number): number;\n    }\n}"
@@ -271,12 +287,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/index.ts SVC-1-0 "import { add } from 'lodash';"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/@types/lodash/common/math.d.ts
 	  Referenced via './common/math.d.ts' from file 'node_modules/@types/lodash/index.d.ts'
 	node_modules/@types/lodash/index.d.ts
@@ -305,7 +321,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -313,12 +329,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/lodash/common/math.d.ts:
@@ -377,17 +393,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -413,7 +429,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -452,7 +468,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -502,12 +518,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/lodash/common/math.d.ts:
@@ -580,17 +596,17 @@ Projects::
     noDtsResolutionProject: /dev/null/auxiliaryProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource9_mapFromAtTypes2.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource9_mapFromAtTypes2.js
index bb0674bb82a50..179414be7308e 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/goToSource9_mapFromAtTypes2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource9_mapFromAtTypes2.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "moduleResolution": "bundler",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import _, { foo } from 'lodash';
 _.add
@@ -87,7 +103,7 @@ declare namespace _ {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/lodash/package.json"
@@ -108,7 +124,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/lodash/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/lodash/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/lodash/common/math.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/lodash/common/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
@@ -123,7 +139,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/lodash/package.json SVC-1-0 "{ \"name\": \"lodash\", \"version\": \"4.17.15\", \"main\": \"./lodash.js\" }"
@@ -131,12 +147,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/node_modules/@types/lodash/index.d.ts Text-1 "/// <reference path=\"./common/math.d.ts\" />\nexport = _;\nexport as namespace _;\ndeclare const _: _.LoDashStatic;\ndeclare namespace _ {\n    interface LoDashStatic {}\n}"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 	../@types/lodash/common/math.d.ts
@@ -158,7 +174,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -166,12 +182,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@types/lodash/common/math.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/@types/lodash/common/package.json: *new*
@@ -209,15 +225,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -236,7 +252,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -264,7 +280,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/lodash/common/math.d.ts Text-1 "import _ = require(\"../index\");\ndeclare module \"../index\" {\n    interface LoDashStatic {\n        add(augend: number, addend: number): number;\n    }\n}"
@@ -272,12 +288,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/index.ts SVC-1-0 "import _, { foo } from 'lodash';\n_.add"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/@types/lodash/common/math.d.ts
 	  Referenced via './common/math.d.ts' from file 'node_modules/@types/lodash/index.d.ts'
 	node_modules/@types/lodash/index.d.ts
@@ -306,7 +322,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -314,12 +330,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/lodash/common/math.d.ts:
@@ -378,17 +394,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -414,7 +430,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -453,7 +469,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -475,12 +491,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/lodash/common/math.d.ts:
@@ -554,17 +570,17 @@ Projects::
     noDtsResolutionProject: /dev/null/auxiliaryProject1* *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /dev/null/inferredProject2*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
@@ -597,7 +613,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -611,7 +627,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -630,7 +646,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -644,7 +660,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "findSourceDefinition",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/implementation01.js b/tests/baselines/reference/tsserver/fourslashServer/implementation01.js
index 7eb74f1394a0c..4fdf4c33a7a60 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/implementation01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/implementation01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/implementation01.ts]
 interface Foo {}
 class Bar implements Foo {}
@@ -18,7 +33,7 @@ class Bar implements Foo {}
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/implementation01.ts"
@@ -30,7 +45,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -40,18 +55,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/implementation01.ts SVC-1-0 "interface Foo {}\nclass Bar implements Foo {}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	implementation01.ts
 	  Root file specified for compilation
 
@@ -68,7 +83,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -76,12 +91,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -100,15 +115,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -119,7 +134,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/implementation01.ts",
@@ -133,7 +148,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "implementation",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/impliedNodeFormat.js b/tests/baselines/reference/tsserver/fourslashServer/impliedNodeFormat.js
index e6a9699da40fb..39c43694f0733 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/impliedNodeFormat.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/impliedNodeFormat.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import {} from "foo";
 
@@ -21,12 +37,12 @@ export {};
 { "name": "foo", "type": "module", "exports": { ".": "./main.js" } }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "nodenext" } }
+{ "compilerOptions": { "module": "nodenext", "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -43,6 +59,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -61,19 +80,33 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/main.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/main.ts Text-1 "export {};"
 	/home/src/workspaces/project/index.ts Text-1 "import {} from \"foo\";"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	main.ts
 	  Imported via "foo" from file 'index.ts'
 	  Matched by default include pattern '**/*'
@@ -100,62 +133,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -163,25 +150,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"nodenext\" } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"nodenext\", \"lib\": [\"es5\"] } }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -196,7 +183,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -204,14 +191,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -245,17 +239,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/index.ts *new*
     version: Text-1
@@ -272,7 +269,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -282,7 +279,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/index.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -299,19 +296,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/main.ts:
@@ -347,17 +351,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/index.ts (Open) *changed*
     open: true *changed*
@@ -375,7 +382,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/main.ts",
@@ -388,13 +395,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/main.ts",
@@ -407,13 +414,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -426,13 +433,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -445,13 +452,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -468,7 +475,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true
     }
 After Request
@@ -483,17 +490,20 @@ Projects::
     dirty: true *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/index.ts (Open) *changed*
     version: SVC-2-1 *changed*
@@ -510,7 +520,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -526,7 +536,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "format",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
@@ -544,7 +554,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -561,22 +571,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/index.ts (Open) *changed*
     version: SVC-2-2 *changed*
@@ -593,7 +606,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/main.ts",
@@ -604,7 +617,10 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/main.ts Text-1 "export {};"
 	/home/src/workspaces/project/index.ts SVC-2-2 "\n\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"; import {} from \"foo\";"
 
@@ -614,7 +630,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -634,7 +650,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/main.ts",
@@ -647,13 +663,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -666,13 +682,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -685,7 +701,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap1.js b/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap1.js
index 6862fbfa14ca2..09bc34f33c3bb 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap1.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "type": "module",
@@ -35,6 +53,7 @@ export const isBrowser = false;
 {
   "compilerOptions": {
     "module": "nodenext",
+    "lib": ["es5"],
     "rootDir": "src",
     "outDir": "dist"
   }
@@ -43,7 +62,7 @@ export const isBrowser = false;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -61,6 +80,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
@@ -82,22 +104,36 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/env/browser.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/env/node.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/env/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/a.ts Text-1 "import {} from \"\";"
 	/home/src/workspaces/project/src/env/browser.ts Text-1 "export const isBrowser = true;"
 	/home/src/workspaces/project/src/env/node.ts Text-1 "export const isBrowser = false;"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/a.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -126,62 +162,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -189,25 +179,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"],\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -222,7 +212,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -230,14 +220,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -277,17 +274,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/a.ts *new*
     version: Text-1
@@ -308,7 +308,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts"
@@ -318,7 +318,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/a.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -335,19 +335,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -389,17 +396,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/a.ts (Open) *changed*
     open: true *changed*
@@ -421,7 +431,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -433,12 +443,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -452,7 +462,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap2.js b/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap2.js
index ed20d2a33a2ca..60c599b2f326c 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap2.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "type": "module",
@@ -30,6 +48,7 @@ export function something(name: string) {}
 {
   "compilerOptions": {
     "module": "nodenext",
+    "lib": ["es5"],
     "rootDir": "src",
     "outDir": "dist"
   }
@@ -38,7 +57,7 @@ export function something(name: string) {}
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -55,6 +74,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
@@ -75,6 +97,9 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/internal/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
@@ -82,20 +107,31 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/internal/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/a.ts Text-1 "import {} from \"\";\nimport {} from \"#internal/\";"
 	/home/src/workspaces/project/src/internal/foo.ts Text-1 "export function something(name: string) {}"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/a.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -121,62 +157,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -184,25 +174,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"],\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -217,7 +207,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -225,14 +215,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -276,17 +273,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/a.ts *new*
     version: Text-1
@@ -303,7 +303,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts"
@@ -313,7 +313,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/a.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -330,19 +330,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -388,17 +395,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/a.ts (Open) *changed*
     open: true *changed*
@@ -416,7 +426,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -428,12 +438,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -447,7 +457,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
@@ -466,7 +476,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -478,12 +488,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -497,7 +507,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap3.js b/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap3.js
index feb37e9e76127..3bcc9de631f0d 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap3.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "type": "module",
@@ -30,6 +48,7 @@ export function something(name: string) {}
 {
   "compilerOptions": {
     "module": "nodenext",
+    "lib": ["es5"],
     "rootDir": "src",
     "outDir": "dist"
   }
@@ -38,7 +57,7 @@ export function something(name: string) {}
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -55,6 +74,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
@@ -75,6 +97,9 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/internal/foo.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
@@ -82,20 +107,31 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/internal/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/a.ts Text-1 "import {} from \"\";\nimport {} from \"#internal/\";"
 	/home/src/workspaces/project/src/internal/foo.ts Text-1 "export function something(name: string) {}"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/a.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -121,62 +157,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -184,25 +174,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"],\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -217,7 +207,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -225,14 +215,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -276,17 +273,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/a.ts *new*
     version: Text-1
@@ -303,7 +303,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts"
@@ -313,7 +313,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/a.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -330,19 +330,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -388,17 +395,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/a.ts (Open) *changed*
     open: true *changed*
@@ -416,7 +426,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -428,12 +438,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -447,7 +457,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
@@ -466,7 +476,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -478,12 +488,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -497,7 +507,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap4.js b/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap4.js
index dce2fda4290f7..0895418841887 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap4.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap4.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "type": "module",
@@ -32,6 +50,7 @@ export const isBrowser = true;
 {
   "compilerOptions": {
     "module": "nodenext",
+    "lib": ["es5"],
     "rootDir": "src",
     "outDir": "dist"
   }
@@ -40,7 +59,7 @@ export const isBrowser = true;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -57,6 +76,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
@@ -77,21 +99,35 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/env/browser.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/env/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/a.ts Text-1 "import {} from \"\";"
 	/home/src/workspaces/project/src/env/browser.ts Text-1 "export const isBrowser = true;"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/a.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -117,62 +153,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -180,25 +170,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"],\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -213,7 +203,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -221,14 +211,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -266,17 +263,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/a.ts *new*
     version: Text-1
@@ -293,7 +293,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts"
@@ -303,7 +303,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/a.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -320,19 +320,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -372,17 +379,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/a.ts (Open) *changed*
     open: true *changed*
@@ -400,7 +410,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -412,12 +422,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -431,7 +441,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap5.js b/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap5.js
index f16e49bfafcd7..659eb3ddb9df9 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap5.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importCompletions_importsMap5.js
@@ -1,16 +1,35 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "lib": [
+            "es5"
+          ],
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "declarationDir": "/home/src/workspaces/project/types",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "type": "module",
@@ -32,6 +51,7 @@ export const isBrowser = true;
 {
   "compilerOptions": {
     "module": "nodenext",
+    "lib": ["es5"],
     "rootDir": "src",
     "outDir": "dist",
     "declarationDir": "types",
@@ -41,7 +61,7 @@ export const isBrowser = true;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -58,6 +78,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 199,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
   "declarationDir": "/home/src/workspaces/project/types",
@@ -79,21 +102,35 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/env/browser.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/env/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/a.ts Text-1 "import {} from \"\";"
 	/home/src/workspaces/project/src/env/browser.ts Text-1 "export const isBrowser = true;"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/a.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -120,64 +157,19 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
         "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
           {
             "start": {
-              "line": 6,
+              "line": 7,
               "offset": 5
             },
             "end": {
-              "line": 6,
+              "line": 7,
               "offset": 21
             },
             "text": "Option 'declarationDir' cannot be specified without specifying option 'declaration' or option 'composite'.",
             "code": 5069,
             "category": "error",
             "fileName": "/home/src/workspaces/project/tsconfig.json"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
           }
         ]
       }
@@ -186,9 +178,9 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -196,25 +188,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\",\n    \"declarationDir\": \"types\",\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"lib\": [\"es5\"],\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\",\n    \"declarationDir\": \"types\",\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -229,7 +221,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -237,14 +229,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -282,17 +281,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/a.ts *new*
     version: Text-1
@@ -309,7 +311,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts"
@@ -319,7 +321,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/a.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -336,19 +338,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -388,17 +397,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/a.ts (Open) *changed*
     open: true *changed*
@@ -416,7 +428,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -428,12 +440,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -447,7 +459,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importFixes_ambientCircularDefaultCrash.js b/tests/baselines/reference/tsserver/fourslashServer/importFixes_ambientCircularDefaultCrash.js
index 39bd2aca7882d..e93ab8dc35a65 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importFixes_ambientCircularDefaultCrash.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importFixes_ambientCircularDefaultCrash.js
@@ -1,23 +1,40 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "preserve",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 my
 
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
-    "module": "preserve"
+    "module": "preserve",
+    "lib": ["es5"]
   }
 }
 
@@ -30,7 +47,7 @@ declare module "mymod" {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -47,6 +64,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 200,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -65,7 +85,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/types.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -75,19 +95,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 "my"
 	/home/src/workspaces/project/types.d.ts Text-1 "declare module \"mymod\" {\n  import mymod from \"mymod\";\n  export default mymod;\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 	types.d.ts
@@ -125,18 +145,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"preserve\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"preserve\",\n    \"lib\": [\"es5\"]\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -157,7 +177,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -165,12 +185,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -201,17 +221,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -231,7 +251,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -246,7 +266,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
@@ -262,7 +282,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -275,13 +295,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -294,7 +314,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -316,7 +336,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -329,13 +349,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -354,7 +374,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importNameCodeFix_externalNonRelateive2.js b/tests/baselines/reference/tsserver/fourslashServer/importNameCodeFix_externalNonRelateive2.js
index 53e0cb3d6913e..dd014fa7297fe 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importNameCodeFix_externalNonRelateive2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importNameCodeFix_externalNonRelateive2.js
@@ -1,16 +1,37 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "commonjs",
+          "lib": [
+            "es5"
+          ],
+          "paths": {
+            "shared/*": [
+              "../../shared/*"
+            ]
+          },
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/apps/app1/src/app.ts]
 utils
 
@@ -24,6 +45,7 @@ export const utils = 0;
 {
   "compilerOptions": {
     "module": "commonjs",
+    "lib": ["es5"],
     "paths": {
       "shared/*": ["../../shared/*"]
     }
@@ -40,7 +62,7 @@ shared
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/app1/tsconfig.json"
@@ -60,6 +82,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/apps/app1/tsconfig
  ],
  "options": {
   "module": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "paths": {
    "shared/*": [
     "../../shared/*"
@@ -89,7 +114,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/shared/constants.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/shared/data.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/apps/app1/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/apps/app1/node_modules/@types 1 undefined Project: /home/src/workspaces/project/apps/app1/tsconfig.json WatchType: Type roots
@@ -103,7 +128,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/apps/app1/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/apps/app1/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/apps/app1/src/app.ts Text-1 "utils"
@@ -113,12 +138,12 @@ Info seq  [hh:mm:ss:mss] 	Files (8)
 	/home/src/workspaces/project/shared/data.ts Text-1 "shared"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/app.ts
 	  Matched by include pattern 'src' in 'tsconfig.json'
 	src/index.ts
@@ -170,18 +195,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/apps/app1/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"commonjs\",\n    \"paths\": {\n      \"shared/*\": [\"../../shared/*\"]\n    }\n  },\n  \"include\": [\"src\", \"../../shared\"]\n}"
+	/home/src/workspaces/project/apps/app1/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"commonjs\",\n    \"lib\": [\"es5\"],\n    \"paths\": {\n      \"shared/*\": [\"../../shared/*\"]\n    }\n  },\n  \"include\": [\"src\", \"../../shared\"]\n}"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -202,7 +227,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -210,12 +235,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/apps/app1/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/apps/app1/src/app.ts: *new*
@@ -268,17 +293,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
@@ -310,7 +335,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -347,12 +372,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/app1/src/index.ts"
@@ -379,17 +404,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/apps/app1/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/apps/app1/src/app.ts:
@@ -444,17 +469,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
@@ -487,7 +512,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -501,12 +526,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -520,12 +545,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/app1/src/index.ts",
@@ -538,13 +563,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/app1/src/index.ts",
@@ -557,7 +582,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -579,7 +604,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/app1/src/index.ts",
@@ -592,13 +617,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/app1/src/index.ts",
@@ -617,7 +642,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": [
         {
@@ -657,7 +682,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/app1/src/index.ts",
@@ -674,7 +699,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 After Request
@@ -690,17 +715,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
@@ -732,7 +757,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/app1/src/index.ts",
@@ -749,22 +774,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
@@ -796,7 +821,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/app1/src/app.ts"
@@ -809,7 +834,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/apps/app1/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/apps/app1/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/apps/app1/src/app.ts Text-1 "utils"
@@ -839,7 +864,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -847,12 +872,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/apps/app1/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/apps/app1/src/utils.ts:
@@ -906,17 +931,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
@@ -949,7 +974,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -963,12 +988,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -982,12 +1007,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/app1/src/app.ts",
@@ -1000,13 +1025,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/app1/src/app.ts",
@@ -1019,7 +1044,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true,
       "body": [
         {
@@ -1041,7 +1066,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/app1/src/app.ts",
@@ -1054,13 +1079,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/app1/src/app.ts",
@@ -1079,7 +1104,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true,
       "body": [
         {
@@ -1108,7 +1133,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/app1/src/app.ts",
@@ -1125,7 +1150,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true
     }
 After Request
@@ -1141,17 +1166,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
@@ -1183,7 +1208,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/apps/app1/src/app.ts",
@@ -1200,22 +1225,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
@@ -1247,7 +1272,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 20,
+      "seq": 21,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/shared/data.ts"
@@ -1260,7 +1285,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/apps/app1/tsconfig.json projectStateVersion: 3 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/apps/app1/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/apps/app1/src/app.ts SVC-2-2 "utils"
@@ -1292,7 +1317,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 20,
+      "request_seq": 21,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1300,12 +1325,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/apps/app1/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/apps/app1/src/utils.ts:
@@ -1357,17 +1382,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
@@ -1400,7 +1425,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 21,
+      "seq": 22,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1414,12 +1439,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 21,
+      "request_seq": 22,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 22,
+      "seq": 23,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1433,12 +1458,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 22,
+      "request_seq": 23,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 23,
+      "seq": 24,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/shared/data.ts",
@@ -1451,13 +1476,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 23,
+      "request_seq": 24,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 24,
+      "seq": 25,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/shared/data.ts",
@@ -1470,7 +1495,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 24,
+      "request_seq": 25,
       "success": true,
       "body": [
         {
@@ -1492,7 +1517,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 25,
+      "seq": 26,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/shared/data.ts",
@@ -1505,13 +1530,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 25,
+      "request_seq": 26,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 26,
+      "seq": 27,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/shared/data.ts",
@@ -1530,7 +1555,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 26,
+      "request_seq": 27,
       "success": true,
       "body": [
         {
@@ -1559,7 +1584,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 27,
+      "seq": 28,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/shared/data.ts",
@@ -1576,7 +1601,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 27,
+      "request_seq": 28,
       "success": true
     }
 After Request
@@ -1592,17 +1617,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
@@ -1634,7 +1659,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 28,
+      "seq": 29,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/shared/data.ts",
@@ -1651,22 +1676,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 28,
+      "request_seq": 29,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/apps/app1/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importNameCodeFix_externalNonRelative1.js b/tests/baselines/reference/tsserver/fourslashServer/importNameCodeFix_externalNonRelative1.js
index cfbfcb5bf21ec..21193e05b3f66 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importNameCodeFix_externalNonRelative1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importNameCodeFix_externalNonRelative1.js
@@ -1,16 +1,43 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "commonjs",
+          "lib": [
+            "es5"
+          ],
+          "paths": {
+            "pkg-1/*": [
+              "./packages/pkg-1/src/*"
+            ],
+            "pkg-2/*": [
+              "./packages/pkg-2/src/*"
+            ]
+          },
+          "outDir": "/home/src/workspaces/project/packages/pkg-2/dist",
+          "rootDir": "/home/src/workspaces/project/packages/pkg-2/src",
+          "composite": true,
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/packages/pkg-1/node_modules/pkg-2] symlink(/home/src/workspaces/project/packages/pkg-2)
 //// [/home/src/workspaces/project/packages/pkg-1/package.json]
 { "dependencies": { "pkg-2": "*" } }
@@ -41,13 +68,14 @@ export const Pkg2 = {};
 //// [/home/src/workspaces/project/packages/pkg-2/tsconfig.json]
 {
   "extends": "../../tsconfig.base.json",
-  "compilerOptions": { "outDir": "dist", "rootDir": "src", "composite": true }
+  "compilerOptions": { "outDir": "dist", "rootDir": "src", "composite": true, "lib": ["es5"] }
 }
 
 //// [/home/src/workspaces/project/tsconfig.base.json]
 {
   "compilerOptions": {
     "module": "commonjs",
+    "lib": ["es5"],
     "paths": {
       "pkg-1/*": ["./packages/pkg-1/src/*"],
       "pkg-2/*": ["./packages/pkg-2/src/*"]
@@ -58,7 +86,7 @@ export const Pkg2 = {};
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.base.json"
@@ -70,7 +98,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -80,18 +108,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.base.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"commonjs\",\n    \"paths\": {\n      \"pkg-1/*\": [\"./packages/pkg-1/src/*\"],\n      \"pkg-2/*\": [\"./packages/pkg-2/src/*\"]\n    }\n  }\n}"
+	/home/src/workspaces/project/tsconfig.base.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"commonjs\",\n    \"lib\": [\"es5\"],\n    \"paths\": {\n      \"pkg-1/*\": [\"./packages/pkg-1/src/*\"],\n      \"pkg-2/*\": [\"./packages/pkg-2/src/*\"]\n    }\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.base.json
 	  Root file specified for compilation
 
@@ -108,7 +136,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -116,12 +144,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -140,15 +168,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -159,7 +187,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -196,12 +224,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/pkg-1/src/index.ts"
@@ -217,6 +245,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/pkg-1/tsc
  ],
  "options": {
   "module": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "paths": {
    "pkg-1/*": [
     "./packages/pkg-1/src/*"
@@ -257,6 +288,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/packages/pkg-2/tsc
  ],
  "options": {
   "module": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "paths": {
    "pkg-1/*": [
     "./packages/pkg-1/src/*"
@@ -286,18 +320,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/pkg-1/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/pkg-1/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/pkg-1/src/index.ts SVC-1-0 "Pkg2"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/index.ts
 	  Matched by default include pattern '**/*'
 
@@ -363,7 +397,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -372,12 +406,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/pkg-1/package.json: *new*
@@ -425,17 +459,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/pkg-1/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/pkg-1/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -459,7 +493,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -473,12 +507,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -492,12 +526,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/pkg-1/src/index.ts",
@@ -510,13 +544,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/pkg-1/src/index.ts",
@@ -529,7 +563,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -551,7 +585,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/pkg-1/src/index.ts",
@@ -564,13 +598,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/pkg-1/src/index.ts",
@@ -592,7 +626,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": [
         {
@@ -621,12 +655,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/pkg-1/package.json:
@@ -664,7 +698,7 @@ watchedDirectoriesRecursive::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/pkg-1/src/index.ts",
@@ -681,7 +715,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 After Request
@@ -700,17 +734,17 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/pkg-1/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/pkg-1/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
@@ -734,7 +768,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/pkg-1/src/index.ts",
@@ -751,22 +785,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/pkg-1/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/pkg-1/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /dev/null/inferredProject1*
@@ -790,7 +824,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/pkg-2/src/blah/foo/data.ts"
@@ -821,7 +855,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/packages/pkg-2/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/packages/pkg-2/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/packages/pkg-2/src/utils.ts Text-1 "export const Pkg2 = {};"
@@ -829,12 +863,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/packages/pkg-2/src/blah/foo/data.ts SVC-1-0 "Pkg2"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/utils.ts
 	  Imported via "./utils" from file 'src/index.ts'
 	  Matched by default include pattern '**/*'
@@ -894,7 +928,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -902,12 +936,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/packages/pkg-1/package.json:
@@ -969,19 +1003,19 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/pkg-1/tsconfig.json
         /home/src/workspaces/project/packages/pkg-2/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/pkg-1/tsconfig.json
         /home/src/workspaces/project/packages/pkg-2/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /dev/null/inferredProject1*
@@ -1012,7 +1046,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1026,12 +1060,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1045,12 +1079,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/pkg-2/src/blah/foo/data.ts",
@@ -1063,13 +1097,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/pkg-2/src/blah/foo/data.ts",
@@ -1082,7 +1116,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true,
       "body": [
         {
@@ -1104,7 +1138,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/pkg-2/src/blah/foo/data.ts",
@@ -1117,13 +1151,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/pkg-2/src/blah/foo/data.ts",
@@ -1142,7 +1176,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true,
       "body": [
         {
@@ -1171,7 +1205,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/pkg-2/src/blah/foo/data.ts",
@@ -1188,7 +1222,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true
     }
 After Request
@@ -1212,19 +1246,19 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 3
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/pkg-1/tsconfig.json
         /home/src/workspaces/project/packages/pkg-2/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 3
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/pkg-1/tsconfig.json
         /home/src/workspaces/project/packages/pkg-2/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 3
         /dev/null/inferredProject1*
@@ -1255,7 +1289,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/packages/pkg-2/src/blah/foo/data.ts",
@@ -1272,24 +1306,24 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 3
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/pkg-1/tsconfig.json
         /home/src/workspaces/project/packages/pkg-2/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 3
         /dev/null/inferredProject1*
         /home/src/workspaces/project/packages/pkg-1/tsconfig.json
         /home/src/workspaces/project/packages/pkg-2/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 3
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importNameCodeFix_pnpm1.js b/tests/baselines/reference/tsserver/fourslashServer/importNameCodeFix_pnpm1.js
index 472204efd95f8..e7946f526923c 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importNameCodeFix_pnpm1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importNameCodeFix_pnpm1.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "commonjs",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 Component
 
@@ -19,12 +35,12 @@ export declare function Component(): void;
 
 //// [/home/src/workspaces/project/node_modules/@types/react] symlink(/home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react)
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "commonjs" } }
+{ "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -40,6 +56,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -60,7 +79,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/react 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/react 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
@@ -78,19 +97,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 "Component"
 	/home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts Text-1 "export declare function Component(): void;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 	node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts
@@ -138,19 +157,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\" } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\", \"lib\": [\"es5\"] } }"
 	/home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts Text-1 "export declare function Component(): void;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 	node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts
@@ -173,7 +192,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -181,12 +200,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/package.json: *new*
   {"pollingInterval":2000}
   {"pollingInterval":2000}
@@ -244,17 +263,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -275,7 +294,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -302,17 +321,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/package.json:
   {"pollingInterval":2000}
   {"pollingInterval":2000}
@@ -372,17 +391,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -404,7 +423,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -416,12 +435,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -434,13 +453,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -453,7 +472,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -475,7 +494,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -488,13 +507,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "suggestionDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -515,7 +534,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getCodeFixes",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -544,12 +563,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/package.json:
   {"pollingInterval":2000}
   {"pollingInterval":2000}
@@ -608,7 +627,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -625,7 +644,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -641,17 +660,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -672,7 +691,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -689,22 +708,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importStatementCompletions_pnpm1.js b/tests/baselines/reference/tsserver/fourslashServer/importStatementCompletions_pnpm1.js
index dbd6fbb636145..0cd4250d9bc8f 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importStatementCompletions_pnpm1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importStatementCompletions_pnpm1.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "commonjs",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import Com
 
@@ -19,12 +35,12 @@ export declare function Component(): void;
 
 //// [/home/src/workspaces/project/node_modules/@types/react] symlink(/home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react)
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "commonjs" } }
+{ "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -40,6 +56,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -60,7 +79,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/react 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/react 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
@@ -78,19 +97,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 "import Com"
 	/home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts Text-1 "export declare function Component(): void;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 	node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts
@@ -138,19 +157,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\" } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\", \"lib\": [\"es5\"] } }"
 	/home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts Text-1 "export declare function Component(): void;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 	node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts
@@ -173,7 +192,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -181,12 +200,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/package.json: *new*
   {"pollingInterval":2000}
   {"pollingInterval":2000}
@@ -244,17 +263,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -275,7 +294,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -302,17 +321,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/package.json:
   {"pollingInterval":2000}
   {"pollingInterval":2000}
@@ -372,17 +391,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -404,7 +423,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -420,12 +439,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -451,7 +470,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "flags": 11,
@@ -513,12 +532,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/package.json:
   {"pollingInterval":2000}
   {"pollingInterval":2000}
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importStatementCompletions_pnpmTransitive.js b/tests/baselines/reference/tsserver/fourslashServer/importStatementCompletions_pnpmTransitive.js
index 537136716c501..04215ab4645a2 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importStatementCompletions_pnpmTransitive.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importStatementCompletions_pnpmTransitive.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "commonjs",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import SvgProp
 
@@ -24,12 +40,12 @@ export interface SvgProperties {}
 
 //// [/home/src/workspaces/project/node_modules/@types/react] symlink(/home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react)
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "commonjs" } }
+{ "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -45,6 +61,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -66,7 +85,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/react 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/.pnpm/csstype@3.0.8/node_modules/csstype/index.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
@@ -95,7 +114,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 "import SvgProp"
@@ -103,12 +122,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts Text-1 "import \"csstype\";\nexport declare function Component(): void;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 	node_modules/.pnpm/csstype@3.0.8/node_modules/csstype/index.d.ts
@@ -169,20 +188,20 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\" } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"commonjs\", \"lib\": [\"es5\"] } }"
 	/home/src/workspaces/project/node_modules/.pnpm/csstype@3.0.8/node_modules/csstype/index.d.ts Text-1 "export interface SvgProperties {}"
 	/home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts Text-1 "import \"csstype\";\nexport declare function Component(): void;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 	node_modules/.pnpm/csstype@3.0.8/node_modules/csstype/index.d.ts
@@ -207,7 +226,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -215,12 +234,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/package.json: *new*
   {"pollingInterval":2000}
   {"pollingInterval":2000}
@@ -303,17 +322,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -339,7 +358,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -366,17 +385,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/package.json:
   {"pollingInterval":2000}
   {"pollingInterval":2000}
@@ -461,17 +480,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -498,7 +517,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -514,12 +533,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -543,7 +562,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "flags": 3,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_ambient.js b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_ambient.js
index 72a564e7da11d..daf91dd068274 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_ambient.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_ambient.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "esnext",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/ambient.d.ts]
 declare module 'ambient' {
   export const ambient = 0;
@@ -18,12 +34,12 @@ declare module 'ambient' {
 a
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "esnext" } }
+{ "compilerOptions": { "module": "esnext", "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -39,6 +55,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 99,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -56,7 +75,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 1 undefined Config: /home/src/workspaces/project/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/ambient.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -66,18 +85,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/ambient.d.ts Text-1 "declare module 'ambient' {\n  export const ambient = 0;\n}\na"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	ambient.d.ts
 	  Matched by default include pattern '**/*'
 
@@ -113,18 +132,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"esnext\" } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"esnext\", \"lib\": [\"es5\"] } }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -145,7 +164,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -153,12 +172,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/ambient.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -187,17 +206,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -213,7 +232,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts"
@@ -240,17 +259,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json:
@@ -281,17 +300,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -308,7 +327,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -323,7 +342,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -338,7 +357,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -363,7 +382,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "flags": 1,
@@ -1075,7 +1094,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -1092,7 +1111,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
@@ -1107,17 +1126,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1133,7 +1152,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1148,12 +1167,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -1166,7 +1185,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/ambient.d.ts SVC-2-1 "a"
@@ -1187,7 +1206,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1883,7 +1902,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -1900,7 +1919,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -1915,17 +1934,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1941,7 +1960,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -1958,22 +1977,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1989,7 +2008,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2006,22 +2025,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2037,7 +2056,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2054,22 +2073,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2085,7 +2104,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2102,22 +2121,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2133,7 +2152,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2150,22 +2169,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2181,7 +2200,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2198,22 +2217,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2229,7 +2248,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2246,22 +2265,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2277,7 +2296,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2294,22 +2313,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2325,7 +2344,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2342,22 +2361,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2373,7 +2392,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2390,22 +2409,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2421,7 +2440,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2438,22 +2457,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2469,7 +2488,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2486,22 +2505,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2517,7 +2536,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 20,
+      "seq": 21,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2534,22 +2553,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 20,
+      "request_seq": 21,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2565,7 +2584,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 21,
+      "seq": 22,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2582,22 +2601,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 21,
+      "request_seq": 22,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2613,7 +2632,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 22,
+      "seq": 23,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2630,22 +2649,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 22,
+      "request_seq": 23,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2661,7 +2680,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 23,
+      "seq": 24,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2678,22 +2697,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 23,
+      "request_seq": 24,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2709,7 +2728,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 24,
+      "seq": 25,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2726,22 +2745,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 24,
+      "request_seq": 25,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2757,7 +2776,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 25,
+      "seq": 26,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2774,22 +2793,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 25,
+      "request_seq": 26,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2805,7 +2824,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 26,
+      "seq": 27,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2822,22 +2841,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 26,
+      "request_seq": 27,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2853,7 +2872,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 27,
+      "seq": 28,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2870,22 +2889,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 27,
+      "request_seq": 28,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2901,7 +2920,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 28,
+      "seq": 29,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2918,22 +2937,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 28,
+      "request_seq": 29,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2949,7 +2968,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 29,
+      "seq": 30,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -2966,22 +2985,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 29,
+      "request_seq": 30,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2997,7 +3016,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 30,
+      "seq": 31,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3014,22 +3033,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 30,
+      "request_seq": 31,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3045,7 +3064,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 31,
+      "seq": 32,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3062,22 +3081,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 31,
+      "request_seq": 32,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3093,7 +3112,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 32,
+      "seq": 33,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3110,22 +3129,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 32,
+      "request_seq": 33,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3141,7 +3160,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 33,
+      "seq": 34,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3158,22 +3177,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 33,
+      "request_seq": 34,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3189,7 +3208,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 34,
+      "seq": 35,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3206,22 +3225,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 34,
+      "request_seq": 35,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3237,7 +3256,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 35,
+      "seq": 36,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3254,22 +3273,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 35,
+      "request_seq": 36,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3285,7 +3304,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 36,
+      "seq": 37,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3302,22 +3321,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 36,
+      "request_seq": 37,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3333,7 +3352,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 37,
+      "seq": 38,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3350,22 +3369,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 37,
+      "request_seq": 38,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3381,7 +3400,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 38,
+      "seq": 39,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3398,22 +3417,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 38,
+      "request_seq": 39,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3429,7 +3448,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 39,
+      "seq": 40,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3446,22 +3465,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 39,
+      "request_seq": 40,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3477,7 +3496,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 40,
+      "seq": 41,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3494,22 +3513,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 40,
+      "request_seq": 41,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3525,7 +3544,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 41,
+      "seq": 42,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3542,22 +3561,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 41,
+      "request_seq": 42,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3573,7 +3592,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 42,
+      "seq": 43,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3590,22 +3609,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 42,
+      "request_seq": 43,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3621,7 +3640,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 43,
+      "seq": 44,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3638,22 +3657,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 43,
+      "request_seq": 44,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3669,7 +3688,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 44,
+      "seq": 45,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3686,22 +3705,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 44,
+      "request_seq": 45,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3717,7 +3736,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 45,
+      "seq": 46,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3734,22 +3753,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 45,
+      "request_seq": 46,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3765,7 +3784,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 46,
+      "seq": 47,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3782,22 +3801,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 46,
+      "request_seq": 47,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3813,7 +3832,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 47,
+      "seq": 48,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3830,22 +3849,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 47,
+      "request_seq": 48,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3861,7 +3880,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 48,
+      "seq": 49,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3878,22 +3897,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 48,
+      "request_seq": 49,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3909,7 +3928,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 49,
+      "seq": 50,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3926,22 +3945,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 49,
+      "request_seq": 50,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3957,7 +3976,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 50,
+      "seq": 51,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -3974,22 +3993,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 50,
+      "request_seq": 51,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4005,7 +4024,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 51,
+      "seq": 52,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4022,22 +4041,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 51,
+      "request_seq": 52,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4053,7 +4072,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 52,
+      "seq": 53,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4070,22 +4089,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 52,
+      "request_seq": 53,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4101,7 +4120,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 53,
+      "seq": 54,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4118,22 +4137,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 53,
+      "request_seq": 54,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4149,7 +4168,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 54,
+      "seq": 55,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4166,22 +4185,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 54,
+      "request_seq": 55,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4197,7 +4216,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 55,
+      "seq": 56,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4214,22 +4233,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 55,
+      "request_seq": 56,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4245,7 +4264,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 56,
+      "seq": 57,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4262,22 +4281,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 56,
+      "request_seq": 57,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4293,7 +4312,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 57,
+      "seq": 58,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4310,22 +4329,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 57,
+      "request_seq": 58,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4341,7 +4360,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 58,
+      "seq": 59,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4358,22 +4377,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 58,
+      "request_seq": 59,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4389,7 +4408,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 59,
+      "seq": 60,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4406,22 +4425,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 59,
+      "request_seq": 60,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4437,7 +4456,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 60,
+      "seq": 61,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4454,22 +4473,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 60,
+      "request_seq": 61,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4485,7 +4504,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 61,
+      "seq": 62,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4502,22 +4521,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 61,
+      "request_seq": 62,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4533,7 +4552,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 62,
+      "seq": 63,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4550,22 +4569,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 62,
+      "request_seq": 63,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4581,7 +4600,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 63,
+      "seq": 64,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4598,22 +4617,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 63,
+      "request_seq": 64,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4629,7 +4648,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 64,
+      "seq": 65,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4646,22 +4665,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 64,
+      "request_seq": 65,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4677,7 +4696,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 65,
+      "seq": 66,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4694,22 +4713,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 65,
+      "request_seq": 66,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4725,7 +4744,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 66,
+      "seq": 67,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -4740,12 +4759,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 66,
+      "request_seq": 67,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 67,
+      "seq": 68,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -4758,7 +4777,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 3 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/ambient.d.ts SVC-2-60 "a\ndeclare module 'ambient' {\n  export const ambient2 = 0;\n}"
@@ -4779,7 +4798,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 67,
+      "request_seq": 68,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -5495,7 +5514,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 68,
+      "seq": 69,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts"
@@ -5520,12 +5539,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 68,
+      "request_seq": 69,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 69,
+      "seq": 70,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -5542,7 +5561,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 69,
+      "request_seq": 70,
       "success": true
     }
 After Request
@@ -5557,17 +5576,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -5583,7 +5602,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 70,
+      "seq": 71,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -5600,22 +5619,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 70,
+      "request_seq": 71,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -5631,7 +5650,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 71,
+      "seq": 72,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -5648,22 +5667,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 71,
+      "request_seq": 72,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -5679,7 +5698,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 72,
+      "seq": 73,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -5696,22 +5715,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 72,
+      "request_seq": 73,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -5727,7 +5746,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 73,
+      "seq": 74,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -5744,22 +5763,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 73,
+      "request_seq": 74,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -5775,7 +5794,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 74,
+      "seq": 75,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -5792,22 +5811,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 74,
+      "request_seq": 75,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -5823,7 +5842,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 75,
+      "seq": 76,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -5840,22 +5859,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 75,
+      "request_seq": 76,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -5871,7 +5890,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 76,
+      "seq": 77,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -5888,22 +5907,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 76,
+      "request_seq": 77,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -5919,7 +5938,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 77,
+      "seq": 78,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -5936,22 +5955,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 77,
+      "request_seq": 78,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -5967,7 +5986,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 78,
+      "seq": 79,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -5984,22 +6003,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 78,
+      "request_seq": 79,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6015,7 +6034,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 79,
+      "seq": 80,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6032,22 +6051,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 79,
+      "request_seq": 80,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6063,7 +6082,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 80,
+      "seq": 81,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6080,22 +6099,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 80,
+      "request_seq": 81,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6111,7 +6130,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 81,
+      "seq": 82,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6128,22 +6147,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 81,
+      "request_seq": 82,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6159,7 +6178,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 82,
+      "seq": 83,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6176,22 +6195,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 82,
+      "request_seq": 83,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6207,7 +6226,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 83,
+      "seq": 84,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6224,22 +6243,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 83,
+      "request_seq": 84,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6255,7 +6274,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 84,
+      "seq": 85,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6272,22 +6291,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 84,
+      "request_seq": 85,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6303,7 +6322,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 85,
+      "seq": 86,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6320,22 +6339,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 85,
+      "request_seq": 86,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6351,7 +6370,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 86,
+      "seq": 87,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6368,22 +6387,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 86,
+      "request_seq": 87,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6399,7 +6418,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 87,
+      "seq": 88,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6416,22 +6435,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 87,
+      "request_seq": 88,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6447,7 +6466,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 88,
+      "seq": 89,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6464,22 +6483,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 88,
+      "request_seq": 89,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6495,7 +6514,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 89,
+      "seq": 90,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6512,22 +6531,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 89,
+      "request_seq": 90,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6543,7 +6562,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 90,
+      "seq": 91,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6560,22 +6579,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 90,
+      "request_seq": 91,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6591,7 +6610,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 91,
+      "seq": 92,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6608,22 +6627,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 91,
+      "request_seq": 92,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6639,7 +6658,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 92,
+      "seq": 93,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6656,22 +6675,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 92,
+      "request_seq": 93,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6687,7 +6706,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 93,
+      "seq": 94,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6704,22 +6723,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 93,
+      "request_seq": 94,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6735,7 +6754,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 94,
+      "seq": 95,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6752,22 +6771,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 94,
+      "request_seq": 95,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6783,7 +6802,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 95,
+      "seq": 96,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6800,22 +6819,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 95,
+      "request_seq": 96,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6831,7 +6850,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 96,
+      "seq": 97,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6848,22 +6867,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 96,
+      "request_seq": 97,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -6879,7 +6898,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 97,
+      "seq": 98,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -6894,12 +6913,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 97,
+      "request_seq": 98,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 98,
+      "seq": 99,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -6912,7 +6931,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 4 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/ambient.d.ts SVC-2-88 "a\ndeclare module 'ambient' {\n  export const ambient3 = 0\n}"
@@ -6933,7 +6952,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 98,
+      "request_seq": 99,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -7649,7 +7668,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 99,
+      "seq": 100,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -7664,12 +7683,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 99,
+      "request_seq": 100,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 100,
+      "seq": 101,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/ambient.d.ts",
@@ -7692,7 +7711,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 100,
+      "request_seq": 101,
       "success": true,
       "body": {
         "flags": 1,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_coreNodeModules.js b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_coreNodeModules.js
index bd405d9cf0e5b..bdcf4b94dca91 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_coreNodeModules.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_coreNodeModules.js
@@ -1,16 +1,37 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "esnext",
+          "lib": [
+            "es5"
+          ],
+          "allowJs": true,
+          "checkJs": true,
+          "typeRoots": [
+            "/home/src/workspaces/project/node_modules/@types"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.js]
 
 readF
@@ -30,6 +51,7 @@ declare module 'util' {
 {
   "compilerOptions": {
     "module": "esnext",
+    "lib": ["es5"],
     "allowJs": true,
     "checkJs": true,
     "typeRoots": [
@@ -45,7 +67,7 @@ declare module 'util' {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -61,6 +83,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 99,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "allowJs": true,
   "checkJs": true,
   "typeRoots": [
@@ -86,7 +111,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/node/index.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/node/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
@@ -98,19 +123,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.js Text-1 "\nreadF"
 	/home/src/workspaces/project/node_modules/@types/node/index.d.ts Text-1 "declare module 'fs' {\n  export function readFile(): void;\n}\ndeclare module 'util' {\n  export function promisify(): void;\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.js
 	  Matched by include pattern '**/*' in 'tsconfig.json'
 	node_modules/@types/node/index.d.ts
@@ -155,24 +180,22 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"esnext\",\n    \"allowJs\": true,\n    \"checkJs\": true,\n    \"typeRoots\": [\n      \"node_modules/@types\"\n    ]\n  },\n  \"include\": [\"**/*\"],\n  \"typeAcquisition\": {\n    \"enable\": true\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"esnext\",\n    \"lib\": [\"es5\"],\n    \"allowJs\": true,\n    \"checkJs\": true,\n    \"typeRoots\": [\n      \"node_modules/@types\"\n    ]\n  },\n  \"include\": [\"**/*\"],\n  \"typeAcquisition\": {\n    \"enable\": true\n  }\n}"
 	/home/src/workspaces/project/node_modules/@types/node/index.d.ts Text-1 "declare module 'fs' {\n  export function readFile(): void;\n}\ndeclare module 'util' {\n  export function promisify(): void;\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 	node_modules/@types/node/index.d.ts
@@ -196,7 +219,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -204,12 +227,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.js: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -233,8 +256,6 @@ watchedFiles::
   {"pollingInterval":2000}
 
 watchedDirectoriesRecursive::
-/home/src/workspaces/node_modules/@types: *new*
-  {}
 /home/src/workspaces/project: *new*
   {}
 /home/src/workspaces/project/node_modules: *new*
@@ -255,17 +276,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -286,7 +307,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js"
@@ -313,17 +334,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/node/index.d.ts:
@@ -349,8 +370,6 @@ watchedFiles *deleted*::
   {"pollingInterval":500}
 
 watchedDirectoriesRecursive::
-/home/src/workspaces/node_modules/@types:
-  {}
 /home/src/workspaces/project:
   {}
 /home/src/workspaces/project/node_modules:
@@ -371,17 +390,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -403,7 +422,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -418,7 +437,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -433,7 +452,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -457,7 +476,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "flags": 1,
@@ -1023,7 +1042,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js"
@@ -1048,12 +1067,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1070,7 +1089,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 After Request
@@ -1085,17 +1104,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1116,7 +1135,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1133,22 +1152,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1169,7 +1188,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1184,13 +1203,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1207,22 +1226,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1243,7 +1262,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1258,13 +1277,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1281,22 +1300,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1317,7 +1336,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1332,13 +1351,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1355,22 +1374,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1391,7 +1410,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1406,13 +1425,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1429,22 +1448,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1465,7 +1484,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1480,13 +1499,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1503,22 +1522,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1539,7 +1558,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1554,13 +1573,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1577,22 +1596,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1613,7 +1632,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1628,13 +1647,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 20,
+      "seq": 21,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1651,22 +1670,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 20,
+      "request_seq": 21,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1687,7 +1706,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 21,
+      "seq": 22,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1702,13 +1721,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 21,
+      "request_seq": 22,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 22,
+      "seq": 23,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1725,22 +1744,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 22,
+      "request_seq": 23,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1761,7 +1780,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 23,
+      "seq": 24,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1776,13 +1795,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 23,
+      "request_seq": 24,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 24,
+      "seq": 25,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1799,22 +1818,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 24,
+      "request_seq": 25,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1835,7 +1854,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 25,
+      "seq": 26,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1850,13 +1869,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 25,
+      "request_seq": 26,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 26,
+      "seq": 27,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1873,22 +1892,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 26,
+      "request_seq": 27,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1909,7 +1928,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 27,
+      "seq": 28,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1924,13 +1943,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 27,
+      "request_seq": 28,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 28,
+      "seq": 29,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1947,22 +1966,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 28,
+      "request_seq": 29,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -1983,7 +2002,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 29,
+      "seq": 30,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -1998,13 +2017,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 29,
+      "request_seq": 30,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 30,
+      "seq": 31,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2021,22 +2040,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 30,
+      "request_seq": 31,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2057,7 +2076,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 31,
+      "seq": 32,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2072,13 +2091,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 31,
+      "request_seq": 32,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 32,
+      "seq": 33,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2095,22 +2114,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 32,
+      "request_seq": 33,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2131,7 +2150,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 33,
+      "seq": 34,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2146,13 +2165,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 33,
+      "request_seq": 34,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 34,
+      "seq": 35,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2169,22 +2188,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 34,
+      "request_seq": 35,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2205,7 +2224,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 35,
+      "seq": 36,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2220,13 +2239,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 35,
+      "request_seq": 36,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 36,
+      "seq": 37,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2243,22 +2262,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 36,
+      "request_seq": 37,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2279,7 +2298,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 37,
+      "seq": 38,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2294,13 +2313,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 37,
+      "request_seq": 38,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 38,
+      "seq": 39,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2317,22 +2336,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 38,
+      "request_seq": 39,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2353,7 +2372,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 39,
+      "seq": 40,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2368,13 +2387,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 39,
+      "request_seq": 40,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 40,
+      "seq": 41,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2391,22 +2410,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 40,
+      "request_seq": 41,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2427,7 +2446,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 41,
+      "seq": 42,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2442,13 +2461,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 41,
+      "request_seq": 42,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 42,
+      "seq": 43,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2465,22 +2484,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 42,
+      "request_seq": 43,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2501,7 +2520,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 43,
+      "seq": 44,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2516,13 +2535,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 43,
+      "request_seq": 44,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 44,
+      "seq": 45,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2539,22 +2558,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 44,
+      "request_seq": 45,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2575,7 +2594,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 45,
+      "seq": 46,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2590,13 +2609,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 45,
+      "request_seq": 46,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 46,
+      "seq": 47,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2613,22 +2632,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 46,
+      "request_seq": 47,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2649,7 +2668,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 47,
+      "seq": 48,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2664,13 +2683,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 47,
+      "request_seq": 48,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 48,
+      "seq": 49,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2687,22 +2706,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 48,
+      "request_seq": 49,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2723,7 +2742,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 49,
+      "seq": 50,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2738,13 +2757,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 49,
+      "request_seq": 50,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 50,
+      "seq": 51,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2761,22 +2780,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 50,
+      "request_seq": 51,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2797,7 +2816,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 51,
+      "seq": 52,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2812,13 +2831,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 51,
+      "request_seq": 52,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 52,
+      "seq": 53,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2835,22 +2854,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 52,
+      "request_seq": 53,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2871,7 +2890,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 53,
+      "seq": 54,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2886,13 +2905,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 53,
+      "request_seq": 54,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 54,
+      "seq": 55,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2909,22 +2928,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 54,
+      "request_seq": 55,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2945,7 +2964,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 55,
+      "seq": 56,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2960,13 +2979,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 55,
+      "request_seq": 56,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 56,
+      "seq": 57,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -2983,22 +3002,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 56,
+      "request_seq": 57,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3019,7 +3038,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 57,
+      "seq": 58,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3034,13 +3053,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 57,
+      "request_seq": 58,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 58,
+      "seq": 59,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3057,22 +3076,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 58,
+      "request_seq": 59,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3093,7 +3112,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 59,
+      "seq": 60,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3108,13 +3127,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 59,
+      "request_seq": 60,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 60,
+      "seq": 61,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3131,22 +3150,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 60,
+      "request_seq": 61,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3167,7 +3186,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 61,
+      "seq": 62,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3182,13 +3201,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 61,
+      "request_seq": 62,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 62,
+      "seq": 63,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3205,22 +3224,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 62,
+      "request_seq": 63,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3241,7 +3260,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 63,
+      "seq": 64,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3256,13 +3275,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 63,
+      "request_seq": 64,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 64,
+      "seq": 65,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3279,22 +3298,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 64,
+      "request_seq": 65,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3315,7 +3334,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 65,
+      "seq": 66,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3330,13 +3349,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 65,
+      "request_seq": 66,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 66,
+      "seq": 67,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3353,22 +3372,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 66,
+      "request_seq": 67,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3389,7 +3408,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 67,
+      "seq": 68,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3404,13 +3423,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 67,
+      "request_seq": 68,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 68,
+      "seq": 69,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3427,22 +3446,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 68,
+      "request_seq": 69,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3463,7 +3482,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 69,
+      "seq": 70,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3478,13 +3497,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 69,
+      "request_seq": 70,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 70,
+      "seq": 71,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3501,22 +3520,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 70,
+      "request_seq": 71,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3537,7 +3556,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 71,
+      "seq": 72,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3552,13 +3571,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 71,
+      "request_seq": 72,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 72,
+      "seq": 73,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -3573,12 +3592,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 72,
+      "request_seq": 73,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 73,
+      "seq": 74,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -3593,7 +3612,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.js SVC-2-34 "import { promisify } from 'util';\nreadF"
@@ -3616,7 +3635,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 73,
+      "request_seq": 74,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -4201,12 +4220,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/node/index.d.ts:
@@ -4230,8 +4249,6 @@ watchedFiles::
 watchedDirectoriesRecursive::
 /home/src/workspaces/node_modules: *new*
   {}
-/home/src/workspaces/node_modules/@types:
-  {}
 /home/src/workspaces/project:
   {}
 /home/src/workspaces/project/node_modules:
@@ -4253,7 +4270,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 74,
+      "seq": 75,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -4270,7 +4287,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 74,
+      "request_seq": 75,
       "success": true
     }
 After Request
@@ -4285,17 +4302,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4316,7 +4333,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 75,
+      "seq": 76,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -4331,12 +4348,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 75,
+      "request_seq": 76,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 76,
+      "seq": 77,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -4349,7 +4366,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 3 projectProgramVersion: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.js SVC-2-35 "readF"
@@ -4371,7 +4388,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 76,
+      "request_seq": 77,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_exportUndefined.js b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_exportUndefined.js
index d4a5624f2865d..2ffed88ecb790 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_exportUndefined.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_exportUndefined.js
@@ -1,21 +1,37 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "esnext",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "esnext" } }
+{ "compilerOptions": { "module": "esnext", "lib": ["es5"] } }
 
 //// [/home/src/workspaces/project/undefined.ts]
 export = undefined;
@@ -27,7 +43,7 @@ export = x;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -45,6 +61,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 99,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -64,7 +83,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/undefined.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/undefinedAlias.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -74,7 +93,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/index.ts Text-1 ""
@@ -82,12 +101,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/undefinedAlias.ts Text-1 "const x = undefined;\nexport = x;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 	undefined.ts
@@ -127,18 +146,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"esnext\" } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"esnext\", \"lib\": [\"es5\"] } }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -159,7 +178,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -167,12 +186,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -205,17 +224,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -239,7 +258,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -266,17 +285,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json:
@@ -311,17 +330,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -346,7 +365,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -361,7 +380,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -376,7 +395,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -400,7 +419,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "flags": 9,
@@ -1102,7 +1121,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1117,12 +1136,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -1145,7 +1164,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": {
         "flags": 1,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_invalidPackageJson.js b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_invalidPackageJson.js
index 455cd73846bd3..453e7727b69be 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_invalidPackageJson.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_invalidPackageJson.js
@@ -1,16 +1,37 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "allowJs": true,
+          "maxNodeModuleJsDepth": 2,
+          "allowSyntheticDefaultImports": true,
+          "skipLibCheck": true,
+          "noEmit": true,
+          "lib": [
+            "es5"
+          ],
+          "module": "commonjs",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.js]
 
 readF
@@ -18,6 +39,7 @@ readF
 //// [/home/src/workspaces/project/jsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "commonjs",
   },
 }
@@ -36,7 +58,7 @@ declare module 'util' {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/jsconfig.json"
@@ -56,6 +78,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/jsconfig.json : {
   "allowSyntheticDefaultImports": true,
   "skipLibCheck": true,
   "noEmit": true,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 1,
   "configFilePath": "/home/src/workspaces/project/jsconfig.json"
  }
@@ -77,7 +102,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /home/src/workspaces/project/jsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /home/src/workspaces/project/jsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/node/index.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/node/package.json 2000 undefined Project: /home/src/workspaces/project/jsconfig.json WatchType: File location affecting resolution
@@ -91,19 +116,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/jsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/jsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.js Text-1 "\nreadF"
 	/home/src/workspaces/project/node_modules/@types/node/index.d.ts Text-1 "declare module 'fs' {\n  export function readFile(): void;\n}\ndeclare module 'util' {\n  export function promisify(): void;\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.js
 	  Matched by default include pattern '**/*'
 	node_modules/@types/node/index.d.ts
@@ -147,19 +172,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/jsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"commonjs\",\n  },\n}"
+	/home/src/workspaces/project/jsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"lib\": [\"es5\"],\n    \"module\": \"commonjs\",\n  },\n}"
 	/home/src/workspaces/project/node_modules/@types/node/index.d.ts Text-1 "declare module 'fs' {\n  export function readFile(): void;\n}\ndeclare module 'util' {\n  export function promisify(): void;\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	jsconfig.json
 	  Root file specified for compilation
 	node_modules/@types/node/index.d.ts
@@ -183,7 +208,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -191,12 +216,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.js: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -243,17 +268,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/jsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/jsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/jsconfig.json
@@ -274,7 +299,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js"
@@ -301,17 +326,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/@types/node/index.d.ts:
@@ -360,17 +385,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/jsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/jsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/jsconfig.json
@@ -392,7 +417,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -407,7 +432,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -422,7 +447,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.js",
@@ -446,7 +471,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "flags": 1,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_moduleAugmentation.js b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_moduleAugmentation.js
index 3323b4222a6b6..9a00be6ec8d53 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_moduleAugmentation.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_moduleAugmentation.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "esnext",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 import 'react';
 declare module 'react' {
@@ -23,12 +39,12 @@ use
 export function useState(): void;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "esnext" } }
+{ "compilerOptions": { "module": "esnext", "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -44,6 +60,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "module": 99,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -64,7 +83,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types/react/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
@@ -83,19 +102,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/react/index.d.ts Text-1 "export function useState(): void;"
 	/home/src/workspaces/project/a.ts Text-1 "import 'react';\ndeclare module 'react' {\n  export function useBlah(): void;  \n}\n0;\nuse"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/@types/react/index.d.ts
 	  Imported via 'react' from file 'a.ts'
 	  Entry point for implicit type library 'react'
@@ -141,19 +160,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"esnext\" } }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"esnext\", \"lib\": [\"es5\"] } }"
 	/home/src/workspaces/project/node_modules/@types/react/index.d.ts Text-1 "export function useState(): void;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 	node_modules/@types/react/index.d.ts
@@ -176,7 +195,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -184,12 +203,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/package.json: *new*
   {"pollingInterval":2000}
   {"pollingInterval":2000}
@@ -244,17 +263,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -275,7 +294,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts"
@@ -302,17 +321,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/package.json:
   {"pollingInterval":2000}
   {"pollingInterval":2000}
@@ -369,17 +388,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -401,7 +420,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -416,7 +435,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -431,7 +450,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -456,7 +475,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "flags": 1,
@@ -1188,7 +1207,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -1203,12 +1222,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -1232,7 +1251,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": {
         "flags": 1,
@@ -1954,7 +1973,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts"
@@ -1979,12 +1998,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2001,7 +2020,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
@@ -2016,17 +2035,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2047,7 +2066,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2064,22 +2083,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2100,7 +2119,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2115,13 +2134,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2138,22 +2157,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2174,7 +2193,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2189,13 +2208,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2212,22 +2231,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2248,7 +2267,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2263,13 +2282,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2286,22 +2305,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2322,7 +2341,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2337,13 +2356,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2360,22 +2379,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2396,7 +2415,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2411,13 +2430,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2434,22 +2453,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2470,7 +2489,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2485,13 +2504,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 20,
+      "seq": 21,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2508,22 +2527,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 20,
+      "request_seq": 21,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2544,7 +2563,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 21,
+      "seq": 22,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2559,13 +2578,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 21,
+      "request_seq": 22,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 22,
+      "seq": 23,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2582,22 +2601,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 22,
+      "request_seq": 23,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2618,7 +2637,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 23,
+      "seq": 24,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2633,13 +2652,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 23,
+      "request_seq": 24,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 24,
+      "seq": 25,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2656,22 +2675,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 24,
+      "request_seq": 25,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2692,7 +2711,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 25,
+      "seq": 26,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2707,13 +2726,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 25,
+      "request_seq": 26,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 26,
+      "seq": 27,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2730,22 +2749,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 26,
+      "request_seq": 27,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2766,7 +2785,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 27,
+      "seq": 28,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2781,13 +2800,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 27,
+      "request_seq": 28,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 28,
+      "seq": 29,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2804,22 +2823,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 28,
+      "request_seq": 29,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2840,7 +2859,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 29,
+      "seq": 30,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2855,13 +2874,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 29,
+      "request_seq": 30,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 30,
+      "seq": 31,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2878,22 +2897,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 30,
+      "request_seq": 31,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2914,7 +2933,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 31,
+      "seq": 32,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2929,13 +2948,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 31,
+      "request_seq": 32,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 32,
+      "seq": 33,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -2952,22 +2971,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 32,
+      "request_seq": 33,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -2988,7 +3007,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 33,
+      "seq": 34,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3003,13 +3022,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 33,
+      "request_seq": 34,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 34,
+      "seq": 35,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3026,22 +3045,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 34,
+      "request_seq": 35,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3062,7 +3081,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 35,
+      "seq": 36,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3077,13 +3096,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 35,
+      "request_seq": 36,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 36,
+      "seq": 37,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3100,22 +3119,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 36,
+      "request_seq": 37,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3136,7 +3155,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 37,
+      "seq": 38,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3151,13 +3170,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 37,
+      "request_seq": 38,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 38,
+      "seq": 39,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3174,22 +3193,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 38,
+      "request_seq": 39,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3210,7 +3229,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 39,
+      "seq": 40,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3225,13 +3244,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 39,
+      "request_seq": 40,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 40,
+      "seq": 41,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3248,22 +3267,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 40,
+      "request_seq": 41,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3284,7 +3303,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 41,
+      "seq": 42,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3299,13 +3318,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 41,
+      "request_seq": 42,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 42,
+      "seq": 43,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3322,22 +3341,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 42,
+      "request_seq": 43,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3358,7 +3377,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 43,
+      "seq": 44,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3373,13 +3392,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 43,
+      "request_seq": 44,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 44,
+      "seq": 45,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3396,22 +3415,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 44,
+      "request_seq": 45,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3432,7 +3451,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 45,
+      "seq": 46,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3447,13 +3466,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 45,
+      "request_seq": 46,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 46,
+      "seq": 47,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3470,22 +3489,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 46,
+      "request_seq": 47,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3506,7 +3525,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 47,
+      "seq": 48,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3521,13 +3540,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 47,
+      "request_seq": 48,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 48,
+      "seq": 49,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3544,22 +3563,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 48,
+      "request_seq": 49,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3580,7 +3599,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 49,
+      "seq": 50,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3595,13 +3614,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 49,
+      "request_seq": 50,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 50,
+      "seq": 51,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3618,22 +3637,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 50,
+      "request_seq": 51,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3654,7 +3673,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 51,
+      "seq": 52,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3669,13 +3688,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 51,
+      "request_seq": 52,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 52,
+      "seq": 53,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3692,22 +3711,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 52,
+      "request_seq": 53,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3728,7 +3747,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 53,
+      "seq": 54,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3743,13 +3762,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 53,
+      "request_seq": 54,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 54,
+      "seq": 55,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3766,22 +3785,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 54,
+      "request_seq": 55,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3802,7 +3821,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 55,
+      "seq": 56,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3817,13 +3836,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 55,
+      "request_seq": 56,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 56,
+      "seq": 57,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3840,22 +3859,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 56,
+      "request_seq": 57,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3876,7 +3895,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 57,
+      "seq": 58,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3891,13 +3910,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 57,
+      "request_seq": 58,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 58,
+      "seq": 59,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3914,22 +3933,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 58,
+      "request_seq": 59,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -3950,7 +3969,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 59,
+      "seq": 60,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3965,13 +3984,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 59,
+      "request_seq": 60,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 60,
+      "seq": 61,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -3988,22 +4007,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 60,
+      "request_seq": 61,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4024,7 +4043,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 61,
+      "seq": 62,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -4039,13 +4058,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 61,
+      "request_seq": 62,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 62,
+      "seq": 63,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -4062,22 +4081,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 62,
+      "request_seq": 63,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4098,7 +4117,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 63,
+      "seq": 64,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -4113,13 +4132,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 63,
+      "request_seq": 64,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 64,
+      "seq": 65,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -4136,22 +4155,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 64,
+      "request_seq": 65,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4172,7 +4191,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 65,
+      "seq": 66,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -4187,13 +4206,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 65,
+      "request_seq": 66,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 66,
+      "seq": 67,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -4210,22 +4229,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 66,
+      "request_seq": 67,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4246,7 +4265,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 67,
+      "seq": 68,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -4261,13 +4280,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 67,
+      "request_seq": 68,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 68,
+      "seq": 69,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -4284,22 +4303,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 68,
+      "request_seq": 69,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4320,7 +4339,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 69,
+      "seq": 70,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -4335,13 +4354,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 69,
+      "request_seq": 70,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 70,
+      "seq": 71,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -4358,22 +4377,22 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 70,
+      "request_seq": 71,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/tsconfig.json
@@ -4394,7 +4413,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 71,
+      "seq": 72,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -4409,13 +4428,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 71,
+      "request_seq": 72,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 72,
+      "seq": 73,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -4430,12 +4449,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 72,
+      "request_seq": 73,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 73,
+      "seq": 74,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -4448,7 +4467,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/@types/react/index.d.ts Text-1 "export function useState(): void;"
@@ -4471,7 +4490,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 73,
+      "request_seq": 74,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -5207,7 +5226,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 74,
+      "seq": 75,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -5222,12 +5241,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 74,
+      "request_seq": 75,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 75,
+      "seq": 76,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -5251,7 +5270,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 75,
+      "request_seq": 76,
       "success": true,
       "body": {
         "flags": 1,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/isDefinitionAcrossGlobalProjects.js b/tests/baselines/reference/tsserver/fourslashServer/isDefinitionAcrossGlobalProjects.js
index 69968a6de6302..13e18e6fffbcb 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/isDefinitionAcrossGlobalProjects.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/isDefinitionAcrossGlobalProjects.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "composite": true,
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a/index.ts]
 namespace NS {
     export function FA() {
@@ -82,6 +98,7 @@ const ic: I = { FC() {} };
 {
     "compilerOptions": {
         "composite": true,
+        "lib": ["es5"],
     },
     "references": [
         { "path": "a" },
@@ -97,13 +114,14 @@ const ic: I = { FC() {} };
         "declarationMap": true,
         "module": "none",
         "emitDeclarationOnly": true,
+        "lib": ["es5"],
     }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/index.ts"
@@ -123,6 +141,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/a/tsconfig.json :
   "declarationMap": true,
   "module": 0,
   "emitDeclarationOnly": true,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/a/tsconfig.json"
  },
  "projectReferences": [
@@ -158,6 +179,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/b/tsconfig.json :
   "declarationMap": true,
   "module": 0,
   "emitDeclarationOnly": true,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/b/tsconfig.json"
  }
 }
@@ -172,13 +196,16 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/c/tsconfig.json :
   "declarationMap": true,
   "module": 0,
   "emitDeclarationOnly": true,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/c/tsconfig.json"
  }
 }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/c/tsconfig.json 2000 undefined Project: /home/src/workspaces/project/a/tsconfig.json WatchType: Config file
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/c/index.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a/node_modules/@types 1 undefined Project: /home/src/workspaces/project/a/tsconfig.json WatchType: Type roots
@@ -190,7 +217,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/a/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/a/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/b/index.ts Text-1 "namespace NS {\n    export function FB() {}\n}\n\ninterface I {\n    FB();\n}\n\nconst ib: I = { FB() {} };"
@@ -198,12 +225,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/a/index.ts SVC-1-0 "namespace NS {\n    export function FA() {\n        FB();\n    }\n}\n\ninterface I {\n    FA();\n}\n\nconst ia: I = {\n    FA() { },\n    FB() { },\n    FC() { },\n };"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../b/index.ts
 	  Source from referenced project '../b/tsconfig.json' included because '--module' is specified as 'none'
 	../c/index.ts
@@ -258,7 +285,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -266,12 +293,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/tsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/b/index.ts: *new*
@@ -307,15 +334,15 @@ Projects::
     initialLoadPending: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/a/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/a/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/a/tsconfig.json
@@ -334,7 +361,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/index.ts",
@@ -358,6 +385,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  "rootNames": [],
  "options": {
   "composite": true,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  },
  "projectReferences": [
@@ -403,7 +433,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -487,12 +517,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -535,7 +565,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/index.ts",
@@ -567,18 +597,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/b/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/b/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/b/index.ts Text-1 "namespace NS {\n    export function FB() {}\n}\n\ninterface I {\n    FB();\n}\n\nconst ib: I = { FB() {} };"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -633,18 +663,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/c/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/c/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/c/index.ts Text-1 "namespace NS {\n    export function FC() {}\n}\n\ninterface I {\n    FC();\n}\n\nconst ic: I = { FC() {} };"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -683,7 +713,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -792,12 +822,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -853,19 +883,19 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/a/tsconfig.json
         /home/src/workspaces/project/b/tsconfig.json *new*
         /home/src/workspaces/project/c/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/a/tsconfig.json
         /home/src/workspaces/project/b/tsconfig.json *new*
         /home/src/workspaces/project/c/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/a/tsconfig.json
@@ -888,7 +918,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/index.ts",
@@ -903,7 +933,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -1005,7 +1035,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b/index.ts"
@@ -1042,17 +1072,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -1091,19 +1121,19 @@ watchedDirectoriesRecursive::
   {}
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/a/tsconfig.json
         /home/src/workspaces/project/b/tsconfig.json
         /home/src/workspaces/project/c/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/a/tsconfig.json
         /home/src/workspaces/project/b/tsconfig.json
         /home/src/workspaces/project/c/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/a/tsconfig.json
@@ -1127,7 +1157,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b/index.ts",
@@ -1144,7 +1174,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
@@ -1234,12 +1264,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -1298,7 +1328,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b/index.ts",
@@ -1317,7 +1347,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -1423,7 +1453,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b/index.ts",
@@ -1439,7 +1469,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
@@ -1554,7 +1584,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/c/index.ts"
@@ -1593,17 +1623,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -1642,19 +1672,19 @@ watchedDirectoriesRecursive::
   {}
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/a/tsconfig.json
         /home/src/workspaces/project/b/tsconfig.json
         /home/src/workspaces/project/c/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/a/tsconfig.json
         /home/src/workspaces/project/b/tsconfig.json
         /home/src/workspaces/project/c/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/a/tsconfig.json
@@ -1678,7 +1708,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/c/index.ts",
@@ -1695,7 +1725,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "body": [
         {
@@ -1776,12 +1806,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -1840,7 +1870,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/c/index.ts",
@@ -1857,7 +1887,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true,
       "body": [
         {
@@ -1996,7 +2026,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/c/index.ts",
@@ -2012,7 +2042,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/isDefinitionAcrossModuleProjects.js b/tests/baselines/reference/tsserver/fourslashServer/isDefinitionAcrossModuleProjects.js
index 866f402b0e5b5..f29d4a783e2b8 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/isDefinitionAcrossModuleProjects.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/isDefinitionAcrossModuleProjects.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "composite": true,
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a/index.ts]
 import { NS } from "../b";
 import { I } from "../c";
@@ -123,6 +139,7 @@ const ic: I = { FC() {} };
 {
     "compilerOptions": {
         "composite": true,
+        "lib": ["es5"],
     },
     "references": [
         { "path": "a" },
@@ -139,13 +156,14 @@ const ic: I = { FC() {} };
         "declarationMap": true,
         "module": "CommonJS",
         "emitDeclarationOnly": true,
+        "lib": ["es5"],
     }
 }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/index.ts"
@@ -165,6 +183,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/a/tsconfig.json :
   "declarationMap": true,
   "module": 1,
   "emitDeclarationOnly": true,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/a/tsconfig.json"
  },
  "projectReferences": [
@@ -201,6 +222,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/b/tsconfig.json :
   "declarationMap": true,
   "module": 1,
   "emitDeclarationOnly": true,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/b/tsconfig.json"
  }
 }
@@ -215,6 +239,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/c/tsconfig.json :
   "declarationMap": true,
   "module": 1,
   "emitDeclarationOnly": true,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/c/tsconfig.json"
  }
 }
@@ -227,7 +254,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/c 1 undefined Project: /home/src/workspaces/project/a/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/c/index.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a/node_modules/@types 1 undefined Project: /home/src/workspaces/project/a/tsconfig.json WatchType: Type roots
@@ -239,7 +266,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/a/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/a/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/b/index.ts Text-1 "export namespace NS {\n    export function FB() {}\n}\n\nexport interface I {\n    FB();\n}\n\nconst ib: I = { FB() {} };"
@@ -247,12 +274,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/a/index.ts SVC-1-0 "import { NS } from \"../b\";\nimport { I } from \"../c\";\n\ndeclare module \"../b\" {\n    export namespace NS {\n        export function FA();\n    }\n}\n\ndeclare module \"../c\" {\n    export interface I {\n        FA();\n    }\n}\n\nconst ia: I = {\n    FA: NS.FA,\n    FC() { },\n};"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../b/index.ts
 	  Imported via "../b" from file 'index.ts'
 	../c/index.ts
@@ -301,7 +328,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -309,12 +336,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/tsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/b/index.ts: *new*
@@ -358,15 +385,15 @@ Projects::
     initialLoadPending: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/a/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/a/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/a/tsconfig.json
@@ -385,7 +412,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/index.ts",
@@ -409,6 +436,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  "rootNames": [],
  "options": {
   "composite": true,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  },
  "projectReferences": [
@@ -433,6 +463,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/a2/tsconfig.json :
   "declarationMap": true,
   "module": 1,
   "emitDeclarationOnly": true,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/a2/tsconfig.json"
  },
  "projectReferences": [
@@ -482,7 +515,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -575,12 +608,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -633,7 +666,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/index.ts",
@@ -665,18 +698,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/c/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/c/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/c/index.ts Text-1 "export namespace NS {\n    export function FC() {}\n}\n\nexport interface I {\n    FC();\n}\n\nconst ic: I = { FC() {} };"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -732,7 +765,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/a2/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/a2/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/b/index.ts Text-1 "export namespace NS {\n    export function FB() {}\n}\n\nexport interface I {\n    FB();\n}\n\nconst ib: I = { FB() {} };"
@@ -740,12 +773,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/a2/index.ts Text-1 "import { NS } from \"../b\";\nimport { I } from \"../c\";\n\ndeclare module \"../b\" {\n    export namespace NS {\n        export function FA();\n    }\n}\n\ndeclare module \"../c\" {\n    export interface I {\n        FA();\n    }\n}\n\nconst ia: I = {\n    FA: NS.FA,\n    FC() { },\n};"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../b/index.ts
 	  Imported via "../b" from file 'index.ts'
 	../c/index.ts
@@ -783,7 +816,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1048,12 +1081,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -1127,19 +1160,19 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/a/tsconfig.json
         /home/src/workspaces/project/c/tsconfig.json *new*
         /home/src/workspaces/project/a2/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/a/tsconfig.json
         /home/src/workspaces/project/c/tsconfig.json *new*
         /home/src/workspaces/project/a2/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/a/tsconfig.json
@@ -1167,7 +1200,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/index.ts",
@@ -1182,7 +1215,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -1284,7 +1317,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a2/index.ts"
@@ -1321,17 +1354,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -1385,19 +1418,19 @@ watchedDirectoriesRecursive::
   {}
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/a/tsconfig.json
         /home/src/workspaces/project/c/tsconfig.json
         /home/src/workspaces/project/a2/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/a/tsconfig.json
         /home/src/workspaces/project/c/tsconfig.json
         /home/src/workspaces/project/a2/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/a/tsconfig.json
@@ -1426,7 +1459,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a2/index.ts",
@@ -1442,7 +1475,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
@@ -1532,12 +1565,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -1614,7 +1647,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a2/index.ts",
@@ -1637,7 +1670,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -1923,7 +1956,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a2/index.ts",
@@ -1938,7 +1971,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "body": [
         {
@@ -2040,7 +2073,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b/index.ts"
@@ -2071,19 +2104,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/b/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/b/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/b/index.ts Text-1 "export namespace NS {\n    export function FB() {}\n}\n\nexport interface I {\n    FB();\n}\n\nconst ib: I = { FB() {} };"
 	/home/src/workspaces/project/b/other.ts Text-1 "export const Other = 1;"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Part of 'files' list in tsconfig.json
 	other.ts
@@ -2144,7 +2177,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -2152,12 +2185,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -2244,21 +2277,21 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 4 *changed*
         /home/src/workspaces/project/a/tsconfig.json
         /home/src/workspaces/project/c/tsconfig.json
         /home/src/workspaces/project/a2/tsconfig.json
         /home/src/workspaces/project/b/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 4 *changed*
         /home/src/workspaces/project/a/tsconfig.json
         /home/src/workspaces/project/c/tsconfig.json
         /home/src/workspaces/project/a2/tsconfig.json
         /home/src/workspaces/project/b/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 4 *changed*
         /home/src/workspaces/project/a/tsconfig.json
@@ -2293,7 +2326,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b/index.ts",
@@ -2311,7 +2344,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "body": [
         {
@@ -2392,12 +2425,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -2487,7 +2520,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b/index.ts",
@@ -2504,7 +2537,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true,
       "body": [
         {
@@ -2566,7 +2599,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b/index.ts",
@@ -2583,7 +2616,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true,
       "body": [
         {
@@ -2685,7 +2718,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/c/index.ts"
@@ -2730,17 +2763,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -2800,21 +2833,21 @@ watchedDirectoriesRecursive::
   {}
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 4
         /home/src/workspaces/project/a/tsconfig.json
         /home/src/workspaces/project/c/tsconfig.json
         /home/src/workspaces/project/a2/tsconfig.json
         /home/src/workspaces/project/b/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 4
         /home/src/workspaces/project/a/tsconfig.json
         /home/src/workspaces/project/c/tsconfig.json
         /home/src/workspaces/project/a2/tsconfig.json
         /home/src/workspaces/project/b/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 4
         /home/src/workspaces/project/a/tsconfig.json
@@ -2849,7 +2882,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/c/index.ts",
@@ -2867,7 +2900,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true,
       "body": [
         {
@@ -2948,12 +2981,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/index.d.ts:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -3043,7 +3076,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/c/index.ts",
@@ -3060,7 +3093,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true,
       "body": [
         {
@@ -3322,7 +3355,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/c/index.ts",
@@ -3339,7 +3372,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTag.js b/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTag.js
index 921b73d11702f..13fbebd6c6085 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTag.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTag.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "strict": false,
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/jsdocCallbackTag.js]
 /**
  * @callback FooHandler - A kind of magic
@@ -38,7 +54,7 @@ t("!", 12, false);
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCallbackTag.js"
@@ -50,7 +66,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -60,18 +76,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/jsdocCallbackTag.js SVC-1-0 "/**\n * @callback FooHandler - A kind of magic\n * @param {string} eventName - So many words\n * @param eventName2 {number | string} - Silence is golden\n * @param eventName3 - Osterreich mos def\n * @return {number} - DIVEKICK\n */\n/**\n * @type {FooHandler} callback\n */\nvar t;\n\n/**\n * @callback FooHandler2 - What, another one?\n * @param {string=} eventName - it keeps happening\n * @param {string} [eventName2] - i WARNED you dog\n */\n/**\n * @type {FooHandler2} callback\n */\nvar t2;\nt(\"!\", 12, false);"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	jsdocCallbackTag.js
 	  Root file specified for compilation
 
@@ -88,7 +104,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -96,12 +112,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -120,15 +136,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -139,7 +155,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCallbackTag.js",
@@ -153,7 +169,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": {
         "kind": "var",
@@ -178,7 +194,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCallbackTag.js",
@@ -192,7 +208,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "kind": "var",
@@ -217,7 +233,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCallbackTag.js",
@@ -231,7 +247,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "kind": "type",
@@ -251,7 +267,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCallbackTag.js",
@@ -265,7 +281,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": {
         "kind": "type",
diff --git a/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTagNavigateTo.js b/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTagNavigateTo.js
index 7893c5cf5f26f..22a5478770558 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTagNavigateTo.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTagNavigateTo.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/jsDocCallback.js]
 /**
  * @callback  FooCallback
@@ -22,7 +37,7 @@ var t;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocCallback.js"
@@ -34,7 +49,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -44,18 +59,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/jsDocCallback.js SVC-1-0 "/**\n * @callback  FooCallback\n * @param {string} eventName - What even is the navigation bar?\n */\n/** @type {FooCallback} */\nvar t;"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	jsDocCallback.js
 	  Root file specified for compilation
 
@@ -72,7 +87,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -80,12 +95,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -104,15 +119,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -123,7 +138,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocCallback.js"
@@ -135,7 +150,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "navbar",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTagRename01.js b/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTagRename01.js
index c686a36d6b9d6..706ea800aaebf 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTagRename01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTagRename01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/jsDocCallback.js]
 
 /**
@@ -24,7 +39,7 @@ var t;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocCallback.js"
@@ -36,7 +51,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -46,18 +61,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/jsDocCallback.js SVC-1-0 "\n/**\n * @callback FooCallback\n * @param {string} eventName - Rename should work\n */\n\n/** @type {FooCallback} */\nvar t;"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	jsDocCallback.js
 	  Root file specified for compilation
 
@@ -74,7 +89,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -82,12 +97,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -106,15 +121,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -125,7 +140,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -140,12 +155,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocCallback.js",
@@ -161,7 +176,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "rename",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "info": {
@@ -220,7 +235,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -232,6 +247,6 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/jsdocParamTagSpecialKeywords.js b/tests/baselines/reference/tsserver/fourslashServer/jsdocParamTagSpecialKeywords.js
index db368e95224c3..944111dec9639 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/jsdocParamTagSpecialKeywords.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/jsdocParamTagSpecialKeywords.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/test.js]
 /**
  * @param {string} type
@@ -22,7 +37,7 @@ function test(type) {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test.js"
@@ -34,7 +49,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -44,18 +59,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/test.js SVC-1-0 "/**\n * @param {string} type\n */\nfunction test(type) {\n    type.\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	test.js
 	  Root file specified for compilation
 
@@ -72,7 +87,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -80,12 +95,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -104,15 +119,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -123,7 +138,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -135,12 +150,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test.js",
@@ -160,7 +175,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "flags": 0,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTag.js b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTag.js
index f5c65c32ee3c1..0e717ab854598 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTag.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTag.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/jsdocCompletion_typedef.js]
 /** @typedef {(string | number)} NumberLike */
 
@@ -63,7 +78,7 @@ d.dogAge.;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js"
@@ -75,7 +90,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -85,18 +100,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/jsdocCompletion_typedef.js SVC-1-0 "/** @typedef {(string | number)} NumberLike */\n\n/**\n * @typedef Animal - think Giraffes\n * @type {Object}\n * @property {string} animalName\n * @property {number} animalAge\n */\n\n/**\n * @typedef {Object} Person\n * @property {string} personName\n * @property {number} personAge\n */\n\n/**\n * @typedef {Object}\n * @property {string} catName\n * @property {number} catAge\n */\nvar Cat;\n\n/** @typedef {{ dogName: string, dogAge: number }} */\nvar Dog;\n\n/** @type {NumberLike} */\nvar numberLike; numberLike.\n\n/** @type {Person} */\nvar p;p.;\np.personName.;\np.personAge.;\n\n/** @type {Animal} */\nvar a;a.;\na.animalName.;\na.animalAge.;\n\n/** @type {Cat} */\nvar c;c.;\nc.catName.;\nc.catAge.;\n\n/** @type {Dog} */\nvar d;d.;\nd.dogName.;\nd.dogAge.;"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	jsdocCompletion_typedef.js
 	  Root file specified for compilation
 
@@ -113,7 +128,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -121,12 +136,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -145,15 +160,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -164,7 +179,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -176,12 +191,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -201,7 +216,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "flags": 0,
@@ -513,7 +528,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -525,12 +540,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -550,7 +565,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": {
         "flags": 0,
@@ -708,7 +723,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -720,12 +735,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -745,7 +760,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": {
         "flags": 0,
@@ -1033,7 +1048,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -1045,12 +1060,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -1070,7 +1085,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": {
         "flags": 0,
@@ -1268,7 +1283,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -1280,12 +1295,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -1305,7 +1320,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true,
       "body": {
         "flags": 0,
@@ -1463,7 +1478,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -1475,12 +1490,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -1500,7 +1515,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true,
       "body": {
         "flags": 0,
@@ -1788,7 +1803,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -1800,12 +1815,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -1825,7 +1840,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true,
       "body": {
         "flags": 0,
@@ -2023,7 +2038,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -2035,12 +2050,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -2060,7 +2075,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true,
       "body": {
         "flags": 0,
@@ -2218,7 +2233,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -2230,12 +2245,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -2255,7 +2270,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true,
       "body": {
         "flags": 0,
@@ -2543,7 +2558,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -2555,12 +2570,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 20,
+      "seq": 21,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -2580,7 +2595,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 20,
+      "request_seq": 21,
       "success": true,
       "body": {
         "flags": 0,
@@ -2778,7 +2793,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 21,
+      "seq": 22,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -2790,12 +2805,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 21,
+      "request_seq": 22,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 22,
+      "seq": 23,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -2815,7 +2830,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 22,
+      "request_seq": 23,
       "success": true,
       "body": {
         "flags": 0,
@@ -2973,7 +2988,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 23,
+      "seq": 24,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -2985,12 +3000,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 23,
+      "request_seq": 24,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 24,
+      "seq": 25,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -3010,7 +3025,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 24,
+      "request_seq": 25,
       "success": true,
       "body": {
         "flags": 0,
@@ -3298,7 +3313,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 25,
+      "seq": 26,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -3310,12 +3325,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 25,
+      "request_seq": 26,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 26,
+      "seq": 27,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -3335,7 +3350,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 26,
+      "request_seq": 27,
       "success": true,
       "body": {
         "flags": 0,
@@ -3533,7 +3548,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 27,
+      "seq": 28,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -3547,7 +3562,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 27,
+      "request_seq": 28,
       "success": true,
       "body": {
         "kind": "type",
diff --git a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTag1.js b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTag1.js
index 74436fb6dfb0a..81a02af153d48 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTag1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTag1.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es6"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/jsdocCompletion_typedef.js]
 /**
  * @typedef {Object} MyType
@@ -27,7 +42,7 @@ function a(my) {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js"
@@ -39,34 +54,77 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2015.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2015.core.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2015.collection.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2015.iterable.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2015.symbol.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2015.generator.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2015.promise.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2015.proxy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2015.reflect.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2015.symbol.wellknown.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
-Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+Info seq  [hh:mm:ss:mss] 	Files (14)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.d.ts Text-1 lib.es2015.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.core.d.ts Text-1 lib.es2015.core.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.collection.d.ts Text-1 lib.es2015.collection.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.generator.d.ts Text-1 lib.es2015.generator.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.iterable.d.ts Text-1 lib.es2015.iterable.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.promise.d.ts Text-1 lib.es2015.promise.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.proxy.d.ts Text-1 lib.es2015.proxy.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.reflect.d.ts Text-1 lib.es2015.reflect.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.symbol.d.ts Text-1 lib.es2015.symbol.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es2015.symbol.wellknown.d.ts Text-1 lib.es2015.symbol.wellknown.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/jsdocCompletion_typedef.js SVC-1-0 "/**\n * @typedef {Object} MyType\n * @property {string} yes\n */\nfunction foo() { }\n/**\n * @param {MyType} my\n */\nfunction a(my) {\n    my.yes.\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library referenced via 'es5' from file '../../../../home/src/tslibs/TS/Lib/lib.es2015.d.ts'
+	../../../../home/src/tslibs/TS/Lib/lib.es2015.d.ts
+	  Library 'lib.es2015.d.ts' specified in compilerOptions
+	../../../../home/src/tslibs/TS/Lib/lib.es2015.core.d.ts
+	  Library referenced via 'es2015.core' from file '../../../../home/src/tslibs/TS/Lib/lib.es2015.d.ts'
+	../../../../home/src/tslibs/TS/Lib/lib.es2015.collection.d.ts
+	  Library referenced via 'es2015.collection' from file '../../../../home/src/tslibs/TS/Lib/lib.es2015.d.ts'
+	../../../../home/src/tslibs/TS/Lib/lib.es2015.generator.d.ts
+	  Library referenced via 'es2015.generator' from file '../../../../home/src/tslibs/TS/Lib/lib.es2015.d.ts'
+	../../../../home/src/tslibs/TS/Lib/lib.es2015.iterable.d.ts
+	  Library referenced via 'es2015.iterable' from file '../../../../home/src/tslibs/TS/Lib/lib.es2015.d.ts'
+	  Library referenced via 'es2015.iterable' from file '../../../../home/src/tslibs/TS/Lib/lib.es2015.generator.d.ts'
+	../../../../home/src/tslibs/TS/Lib/lib.es2015.promise.d.ts
+	  Library referenced via 'es2015.promise' from file '../../../../home/src/tslibs/TS/Lib/lib.es2015.d.ts'
+	../../../../home/src/tslibs/TS/Lib/lib.es2015.proxy.d.ts
+	  Library referenced via 'es2015.proxy' from file '../../../../home/src/tslibs/TS/Lib/lib.es2015.d.ts'
+	../../../../home/src/tslibs/TS/Lib/lib.es2015.reflect.d.ts
+	  Library referenced via 'es2015.reflect' from file '../../../../home/src/tslibs/TS/Lib/lib.es2015.d.ts'
+	../../../../home/src/tslibs/TS/Lib/lib.es2015.symbol.d.ts
+	  Library referenced via 'es2015.symbol' from file '../../../../home/src/tslibs/TS/Lib/lib.es2015.iterable.d.ts'
+	  Library referenced via 'es2015.symbol' from file '../../../../home/src/tslibs/TS/Lib/lib.es2015.d.ts'
+	  Library referenced via 'es2015.symbol' from file '../../../../home/src/tslibs/TS/Lib/lib.es2015.symbol.wellknown.d.ts'
+	../../../../home/src/tslibs/TS/Lib/lib.es2015.symbol.wellknown.d.ts
+	  Library referenced via 'es2015.symbol.wellknown' from file '../../../../home/src/tslibs/TS/Lib/lib.es2015.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	jsdocCompletion_typedef.js
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
-Info seq  [hh:mm:ss:mss] 	Files (4)
+Info seq  [hh:mm:ss:mss] 	Files (14)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -77,7 +135,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -85,12 +143,32 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es2015.collection.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es2015.core.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es2015.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es2015.generator.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es2015.iterable.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es2015.promise.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es2015.proxy.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es2015.reflect.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es2015.symbol.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es2015.symbol.wellknown.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -109,15 +187,55 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es2015.collection.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es2015.core.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es2015.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es2015.generator.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es2015.iterable.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es2015.promise.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es2015.proxy.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es2015.reflect.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es2015.symbol.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es2015.symbol.wellknown.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -128,7 +246,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -140,12 +258,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -165,7 +283,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "flags": 0,
@@ -185,12 +303,30 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "declare",
             "sortText": "11"
           },
+          {
+            "name": "codePointAt",
+            "kind": "method",
+            "kindModifiers": "declare",
+            "sortText": "11"
+          },
           {
             "name": "concat",
             "kind": "method",
             "kindModifiers": "declare",
             "sortText": "11"
           },
+          {
+            "name": "endsWith",
+            "kind": "method",
+            "kindModifiers": "declare",
+            "sortText": "11"
+          },
+          {
+            "name": "includes",
+            "kind": "method",
+            "kindModifiers": "declare",
+            "sortText": "11"
+          },
           {
             "name": "indexOf",
             "kind": "method",
@@ -221,6 +357,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "declare",
             "sortText": "11"
           },
+          {
+            "name": "normalize",
+            "kind": "method",
+            "kindModifiers": "declare",
+            "sortText": "11"
+          },
+          {
+            "name": "repeat",
+            "kind": "method",
+            "kindModifiers": "declare",
+            "sortText": "11"
+          },
           {
             "name": "replace",
             "kind": "method",
@@ -245,6 +393,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kindModifiers": "declare",
             "sortText": "11"
           },
+          {
+            "name": "startsWith",
+            "kind": "method",
+            "kindModifiers": "declare",
+            "sortText": "11"
+          },
           {
             "name": "substring",
             "kind": "method",
@@ -333,11 +487,89 @@ Info seq  [hh:mm:ss:mss] response:
             "isFromUncheckedFile": true,
             "commitCharacters": []
           },
+          {
+            "name": "anchor",
+            "kind": "method",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z11"
+          },
+          {
+            "name": "big",
+            "kind": "method",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z11"
+          },
+          {
+            "name": "blink",
+            "kind": "method",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z11"
+          },
+          {
+            "name": "bold",
+            "kind": "method",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z11"
+          },
+          {
+            "name": "fixed",
+            "kind": "method",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z11"
+          },
+          {
+            "name": "fontcolor",
+            "kind": "method",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z11"
+          },
+          {
+            "name": "fontsize",
+            "kind": "method",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z11"
+          },
+          {
+            "name": "italics",
+            "kind": "method",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z11"
+          },
+          {
+            "name": "link",
+            "kind": "method",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z11"
+          },
+          {
+            "name": "small",
+            "kind": "method",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z11"
+          },
+          {
+            "name": "strike",
+            "kind": "method",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z11"
+          },
+          {
+            "name": "sub",
+            "kind": "method",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z11"
+          },
           {
             "name": "substr",
             "kind": "method",
             "kindModifiers": "deprecated,declare",
             "sortText": "z11"
+          },
+          {
+            "name": "sup",
+            "kind": "method",
+            "kindModifiers": "deprecated,declare",
+            "sortText": "z11"
           }
         ],
         "defaultCommitCharacters": [
diff --git a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTag2.js b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTag2.js
index f107c1e2ba965..a5e60eaee34c5 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTag2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTag2.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/jsdocCompletion_typedef.js]
 /**
  * @typedef {Object} A.B.MyType
@@ -33,7 +48,7 @@ function b(my2) {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js"
@@ -45,7 +60,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -55,18 +70,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/jsdocCompletion_typedef.js SVC-1-0 "/**\n * @typedef {Object} A.B.MyType\n * @property {string} yes\n */\nfunction foo() {}\n/**\n * @param {A.B.MyType} my2\n */\nfunction a(my2) {\n    my2.yes.\n}\n/**\n * @param {MyType} my2\n */\nfunction b(my2) {\n    my2.yes.\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	jsdocCompletion_typedef.js
 	  Root file specified for compilation
 
@@ -83,7 +98,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -91,12 +106,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -115,15 +130,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -134,7 +149,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -146,12 +161,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -171,7 +186,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "flags": 0,
@@ -379,7 +394,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -391,12 +406,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -416,7 +431,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": {
         "flags": 0,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagGoToDefinition.js b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagGoToDefinition.js
index f9a4d6bc8d2ca..3948139d9a84f 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagGoToDefinition.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagGoToDefinition.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/jsdocCompletion_typedef.js]
 /**
  * @typedef {Object} Person
@@ -31,7 +46,7 @@ var animal; animal.animalName
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js"
@@ -43,7 +58,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -53,18 +68,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/jsdocCompletion_typedef.js SVC-1-0 "/**\n * @typedef {Object} Person\n * @property {string} personName\n * @property {number} personAge\n */\n\n/**\n * @typedef {{ animalName: string, animalAge: number }} Animal\n */\n\n/** @type {Person} */\nvar person; person.personName\n\n/** @type {Animal} */\nvar animal; animal.animalName"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	jsdocCompletion_typedef.js
 	  Root file specified for compilation
 
@@ -81,7 +96,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -89,12 +104,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -113,15 +128,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -132,7 +147,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -146,7 +161,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": {
         "definitions": [
@@ -184,7 +199,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -198,7 +213,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "definitionAndBoundSpan",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "definitions": [
diff --git a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagNamespace.js b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagNamespace.js
index 2cc8a802cd6ba..10136643f3cd6 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagNamespace.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagNamespace.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/jsdocCompletion_typedef.js]
 /**
  * @typedef {string | number} T.NumberLike
@@ -27,7 +42,7 @@ var x1; x1.;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js"
@@ -39,7 +54,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -49,18 +64,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/jsdocCompletion_typedef.js SVC-1-0 "/**\n * @typedef {string | number} T.NumberLike\n * @typedef {{age: number}} T.People\n * @typedef {string | number} T.O.Q.NumberLike\n * @type {T.NumberLike}\n */\nvar x; x.;\n/** @type {T.O.Q.NumberLike} */\nvar x1; x1.;\n/** @type {T.People} */\nvar x1; x1.;"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	jsdocCompletion_typedef.js
 	  Root file specified for compilation
 
@@ -77,7 +92,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -85,12 +100,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -109,15 +124,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -128,7 +143,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -140,12 +155,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -165,7 +180,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "flags": 0,
@@ -397,7 +412,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -409,12 +424,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -434,7 +449,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": {
         "flags": 0,
@@ -666,7 +681,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -678,12 +693,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCompletion_typedef.js",
@@ -703,7 +718,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": {
         "flags": 0,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagNavigateTo.js b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagNavigateTo.js
index 95a00d7613e70..a3b959e284740 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagNavigateTo.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagNavigateTo.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/jsDocTypedef_form2.js]
 
 /** @typedef {(string | number)} NumberLike */
@@ -23,7 +38,7 @@ var numberLike;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js"
@@ -35,7 +50,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -45,18 +60,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/jsDocTypedef_form2.js SVC-1-0 "\n/** @typedef {(string | number)} NumberLike */\n/** @typedef {(string | number | string[])} */\nvar NumberLike2;\n\n/** @type {NumberLike} */\nvar numberLike;"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	jsDocTypedef_form2.js
 	  Root file specified for compilation
 
@@ -73,7 +88,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -81,12 +96,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -105,15 +120,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -124,7 +139,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js"
@@ -136,7 +151,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "navtree",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": {
         "text": "<global>",
@@ -268,7 +283,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js"
@@ -280,7 +295,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "navbar",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename01.js b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename01.js
index 8c7ff40e506a6..ac97a83c87c8e 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/jsDocTypedef_form1.js]
 
 /** @typedef {(string | number)} */
@@ -24,7 +39,7 @@ var numberLike;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form1.js"
@@ -36,7 +51,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -46,18 +61,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/jsDocTypedef_form1.js SVC-1-0 "\n/** @typedef {(string | number)} */\nvar NumberLike;\n\nNumberLike = 10;\n\n/** @type {NumberLike} */\nvar numberLike;"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	jsDocTypedef_form1.js
 	  Root file specified for compilation
 
@@ -74,7 +89,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -82,12 +97,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -106,15 +121,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -125,7 +140,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -140,12 +155,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form1.js",
@@ -161,7 +176,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "rename",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "info": {
@@ -230,7 +245,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -242,12 +257,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -262,12 +277,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form1.js",
@@ -283,7 +298,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "rename",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": {
         "info": {
@@ -352,7 +367,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -364,12 +379,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -384,12 +399,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form1.js",
@@ -405,7 +420,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "rename",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": {
         "info": {
@@ -474,7 +489,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -486,6 +501,6 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename02.js b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename02.js
index d1c0c315c6c01..3cdba680e66a3 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename02.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename02.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/jsDocTypedef_form2.js]
 
 /** @typedef {(string | number)} NumberLike */
@@ -21,7 +36,7 @@ var numberLike;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js"
@@ -33,7 +48,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -43,18 +58,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/jsDocTypedef_form2.js SVC-1-0 "\n/** @typedef {(string | number)} NumberLike */\n\n/** @type {NumberLike} */\nvar numberLike;"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	jsDocTypedef_form2.js
 	  Root file specified for compilation
 
@@ -71,7 +86,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -79,12 +94,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -103,15 +118,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -122,7 +137,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -137,12 +152,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js",
@@ -158,7 +173,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "rename",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "info": {
@@ -217,7 +232,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -229,12 +244,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -249,12 +264,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js",
@@ -270,7 +285,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "rename",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": {
         "info": {
@@ -329,7 +344,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -341,6 +356,6 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename03.js b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename03.js
index f345e4fa4f0cd..09b3918d71165 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename03.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename03.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/jsDocTypedef_form3.js]
 
 /**
@@ -26,7 +41,7 @@ var person;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form3.js"
@@ -38,7 +53,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -48,18 +63,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/jsDocTypedef_form3.js SVC-1-0 "\n/**\n * @typedef Person\n * @type {Object}\n * @property {number} age\n * @property {string} name\n */\n\n/** @type {Person} */\nvar person;"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	jsDocTypedef_form3.js
 	  Root file specified for compilation
 
@@ -76,7 +91,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -84,12 +99,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -108,15 +123,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -127,7 +142,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form3.js"
@@ -146,12 +161,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -166,12 +181,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form3.js",
@@ -187,7 +202,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "rename",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "info": {
@@ -246,7 +261,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -258,12 +273,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -278,12 +293,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form3.js",
@@ -299,7 +314,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "rename",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": {
         "info": {
@@ -358,7 +373,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -370,6 +385,6 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename04.js b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename04.js
index a21011d7a9e74..a0f02aa0ac497 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename04.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/jsdocTypedefTagRename04.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/jsDocTypedef_form2.js]
 
 function test1() {
@@ -29,7 +44,7 @@ function test2() {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js"
@@ -41,7 +56,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -51,18 +66,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/jsDocTypedef_form2.js SVC-1-0 "\nfunction test1() {\n   /** @typedef {(string | number)} NumberLike */\n\n   /** @type {NumberLike} */\n   var numberLike;\n}\nfunction test2() {\n   /** @typedef {(string | number)} NumberLike2 */\n\n   /** @type {NumberLike2} */\n   var numberLike2;\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	jsDocTypedef_form2.js
 	  Root file specified for compilation
 
@@ -79,7 +94,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -87,12 +102,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -111,15 +126,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -130,7 +145,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js",
@@ -144,7 +159,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": {
         "kind": "local var",
@@ -169,7 +184,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js",
@@ -186,7 +201,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
@@ -198,15 +213,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -217,7 +232,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js",
@@ -234,20 +249,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -258,7 +273,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js",
@@ -273,13 +288,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js",
@@ -296,20 +311,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -320,7 +335,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js",
@@ -335,13 +350,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js",
@@ -358,20 +373,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -382,7 +397,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js",
@@ -397,13 +412,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsDocTypedef_form2.js",
@@ -416,7 +431,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferred
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/jsDocTypedef_form2.js SVC-1-4 "\nfunction test1() {\n   /** @typedef {(string | number)} NumberLike */\n\n   /** @type {111NumberLike} */\n   var numberLike;\n}\nfunction test2() {\n   /** @typedef {(string | number)} NumberLike2 */\n\n   /** @type {NumberLike2} */\n   var numberLike2;\n}"
@@ -427,7 +442,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
diff --git a/tests/baselines/reference/tsserver/fourslashServer/moveToFile_emptyTargetFile.js b/tests/baselines/reference/tsserver/fourslashServer/moveToFile_emptyTargetFile.js
index 0ada2ef5833a9..2ec47d92cf966 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/moveToFile_emptyTargetFile.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/moveToFile_emptyTargetFile.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "newLine": "lf",
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/source.ts]
 export const a = 1;
 const b = 2;
@@ -20,12 +35,12 @@ console.log(a, b);
 /** empty */
 
 //// [/home/src/workspaces/project/tsconfig.json]
-/ { "compilerOptions": { "newLine": "lf" } }
+/ { "compilerOptions": { "newLine": "lf", "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/source.ts"
@@ -42,6 +57,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
  ],
  "options": {
   "newLine": 1,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -59,7 +77,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 1 undefined Config: /home/src/workspaces/project/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/target.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -69,19 +87,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/source.ts SVC-1-0 "export const a = 1;\nconst b = 2;\nconsole.log(a, b);"
 	/home/src/workspaces/project/target.ts Text-1 "/** empty */"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	source.ts
 	  Matched by default include pattern '**/*'
 	target.ts
@@ -149,7 +167,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -157,12 +175,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/target.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -183,15 +201,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -206,7 +224,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -220,12 +238,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/source.ts",
@@ -243,7 +261,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getApplicableRefactors",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
@@ -345,7 +363,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -357,12 +375,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -374,12 +392,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/source.ts",
@@ -400,7 +418,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getEditsForRefactor",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": {
         "edits": [
@@ -452,7 +470,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -464,6 +482,6 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/navbar01.js b/tests/baselines/reference/tsserver/fourslashServer/navbar01.js
index e075c0c2f7138..cc529de84c58e 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/navbar01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/navbar01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/navbar01.ts]
 // Interface
 interface IPoint {
@@ -53,7 +68,7 @@ var dist = p.getDist();
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/navbar01.ts"
@@ -65,7 +80,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -75,18 +90,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/navbar01.ts SVC-1-0 "// Interface\ninterface IPoint {\n    getDist(): number;\n    new(): IPoint;\n    (): any;\n    [x:string]: number;\n    prop: string;\n}\n\n/// Module\nnamespace Shapes {\n    // Class\n    export class Point implements IPoint {\n        constructor (public x: number, public y: number) { }\n\n        // Instance member\n        getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); }\n\n        // Getter\n        get value(): number { return 0; }\n\n        // Setter\n        set value(newValue: number) { return; }\n\n        // Static member\n        static origin = new Point(0, 0);\n\n        // Static method\n        private static getOrigin() { return Point.origin;}\n    }\n\n    enum Values { value1, value2, value3 }\n}\n\n// Local variables\nvar p: IPoint = new Shapes.Point(3, 4);\nvar dist = p.getDist();"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	navbar01.ts
 	  Root file specified for compilation
 
@@ -103,7 +118,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -111,12 +126,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -135,15 +150,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -154,7 +169,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/navbar01.ts"
@@ -166,7 +181,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "navtree",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": {
         "text": "<global>",
@@ -752,7 +767,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/navbar01.ts"
@@ -764,7 +779,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "navbar",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/navto01.js b/tests/baselines/reference/tsserver/fourslashServer/navto01.js
index 79a9b6a7e532d..ba8bb1ed772e3 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/navto01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/navto01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/navto01.ts]
 /// Module
 namespace MyShapes {
@@ -31,7 +46,7 @@ var myXyz = new Shapes.Point();
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/navto01.ts"
@@ -43,7 +58,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -53,18 +68,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/navto01.ts SVC-1-0 "/// Module\nnamespace MyShapes {\n\n    // Class\n    export class MyPoint {\n        // Instance member\n        private MyoriginAttheHorizon = 0.0;\n\n        // Getter\n        get MydistanceFromOrigin(): number { return 0; }\n    }\n}\n\n// Local variables\nvar myXyz = new Shapes.Point();"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	navto01.ts
 	  Root file specified for compilation
 
@@ -81,7 +96,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -89,12 +104,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -113,15 +128,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -132,7 +147,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "searchValue": "Shapes",
@@ -145,7 +160,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "navto",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
@@ -168,7 +183,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "searchValue": "Point",
@@ -181,7 +196,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "navto",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
@@ -206,7 +221,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "searchValue": "originAttheHorizon",
@@ -219,7 +234,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "navto",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -244,7 +259,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "searchValue": "distanceFromOrigin",
@@ -257,7 +272,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "navto",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -282,7 +297,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "searchValue": "Xyz",
@@ -295,7 +310,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "navto",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/navto_serverExcludeLib.js b/tests/baselines/reference/tsserver/fourslashServer/navto_serverExcludeLib.js
index 82675f87cd0da..1a0132c0b9630 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/navto_serverExcludeLib.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/navto_serverExcludeLib.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 import { weirdName as otherName } from "bar";
 const weirdName: number = 1;
@@ -22,12 +37,12 @@ export const weirdName: number;
 {}
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{}
+{ "compilerOptions": { "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -42,6 +57,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -59,7 +77,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 1 undefined Config: /home/src/workspaces/project/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/bar/index.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
@@ -76,19 +94,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/bar/index.d.ts Text-1 "export const weirdName: number;"
 	/home/src/workspaces/project/index.ts SVC-1-0 "import { weirdName as otherName } from \"bar\";\nconst weirdName: number = 1;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/bar/index.d.ts
 	  Imported via "bar" from file 'index.ts'
 	index.ts
@@ -127,7 +145,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -135,12 +153,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/bar/index.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/node_modules/bar/package.json: *new*
@@ -171,15 +189,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -194,7 +212,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "searchValue": "weirdName",
@@ -207,7 +225,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "navto",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
@@ -254,15 +272,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -278,7 +296,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -292,12 +310,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "searchValue": "weirdName",
@@ -310,7 +328,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "navto",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -333,7 +351,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -345,6 +363,6 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/ngProxy1.js b/tests/baselines/reference/tsserver/fourslashServer/ngProxy1.js
index 8e4bbe9bbb4be..a93b79358e8ea 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/ngProxy1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/ngProxy1.js
@@ -1,16 +1,37 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "plugins": [
+            {
+              "name": "quickinfo-augmeneter",
+              "message": "hello world"
+            }
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/a.ts]
 let x = [1, 2];
 x
@@ -19,6 +40,7 @@ x
 //// [/tests/cases/fourslash/server/tsconfig.json]
 {
     "compilerOptions": {
+        "lib": ["es5"],
         "plugins": [
             { "name": "quickinfo-augmeneter", "message": "hello world" }
         ]
@@ -29,7 +51,7 @@ x
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsconfig.json"
@@ -44,6 +66,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/tsconfig.json : {
   "/tests/cases/fourslash/server/a.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "plugins": [
    {
     "name": "quickinfo-augmeneter",
@@ -68,7 +93,7 @@ Info seq  [hh:mm:ss:mss] Loading quickinfo-augmeneter from /home/src/tslibs/TS/L
 Info seq  [hh:mm:ss:mss] Plugin validation succeeded
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Type roots
@@ -78,18 +103,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.ts Text-1 "let x = [1, 2];\nx\n"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -125,18 +150,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"plugins\": [\n            { \"name\": \"quickinfo-augmeneter\", \"message\": \"hello world\" }\n        ]\n    },\n    \"files\": [\"a.ts\"]\n}"
+	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"lib\": [\"es5\"],\n        \"plugins\": [\n            { \"name\": \"quickinfo-augmeneter\", \"message\": \"hello world\" }\n        ]\n    },\n    \"files\": [\"a.ts\"]\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -157,7 +182,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -165,12 +190,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/a.ts: *new*
   {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
@@ -197,17 +222,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
@@ -223,7 +248,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -250,17 +275,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json:
@@ -289,17 +314,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
@@ -316,7 +341,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -330,7 +355,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "kind": "let",
diff --git a/tests/baselines/reference/tsserver/fourslashServer/ngProxy2.js b/tests/baselines/reference/tsserver/fourslashServer/ngProxy2.js
index f3c5e55bca3f2..d2e6fed132091 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/ngProxy2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/ngProxy2.js
@@ -1,16 +1,36 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "plugins": [
+            {
+              "name": "invalidmodulename"
+            }
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/a.ts]
 let x = [1, 2];
 x
@@ -19,6 +39,7 @@ x
 //// [/tests/cases/fourslash/server/tsconfig.json]
 {
     "compilerOptions": {
+        "lib": ["es5"],
         "plugins": [
             { "name": "invalidmodulename" }
         ]
@@ -29,7 +50,7 @@ x
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsconfig.json"
@@ -44,6 +65,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/tsconfig.json : {
   "/tests/cases/fourslash/server/a.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "plugins": [
    {
     "name": "invalidmodulename"
@@ -68,7 +92,7 @@ Info seq  [hh:mm:ss:mss] Failed to load module 'invalidmodulename' from /home/sr
 Info seq  [hh:mm:ss:mss] Couldn't find invalidmodulename
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Type roots
@@ -78,18 +102,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.ts Text-1 "let x = [1, 2];\nx\n"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -125,18 +149,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"plugins\": [\n            { \"name\": \"invalidmodulename\" }\n        ]\n    },\n    \"files\": [\"a.ts\"]\n}"
+	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"lib\": [\"es5\"],\n        \"plugins\": [\n            { \"name\": \"invalidmodulename\" }\n        ]\n    },\n    \"files\": [\"a.ts\"]\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -157,7 +181,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -165,12 +189,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/a.ts: *new*
   {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
@@ -197,17 +221,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
@@ -223,7 +247,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -250,17 +274,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json:
@@ -289,17 +313,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
@@ -316,7 +340,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -330,7 +354,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "kind": "let",
diff --git a/tests/baselines/reference/tsserver/fourslashServer/ngProxy3.js b/tests/baselines/reference/tsserver/fourslashServer/ngProxy3.js
index 9ff754c9f0ddb..171a2dc597190 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/ngProxy3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/ngProxy3.js
@@ -1,16 +1,36 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "plugins": [
+            {
+              "name": "create-thrower"
+            }
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/a.ts]
 let x = [1, 2];
 x
@@ -19,6 +39,7 @@ x
 //// [/tests/cases/fourslash/server/tsconfig.json]
 {
     "compilerOptions": {
+        "lib": ["es5"],
         "plugins": [
             { "name": "create-thrower" }
         ]
@@ -29,7 +50,7 @@ x
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsconfig.json"
@@ -44,6 +65,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/tsconfig.json : {
   "/tests/cases/fourslash/server/a.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "plugins": [
    {
     "name": "create-thrower"
@@ -67,7 +91,7 @@ Info seq  [hh:mm:ss:mss] Loading create-thrower from /home/src/tslibs/TS/Lib/tsc
 Info seq  [hh:mm:ss:mss] Plugin activation failed: Error: I am not a well-behaved plugin
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Type roots
@@ -77,18 +101,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.ts Text-1 "let x = [1, 2];\nx\n"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -124,18 +148,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"plugins\": [\n            { \"name\": \"create-thrower\" }\n        ]\n    },\n    \"files\": [\"a.ts\"]\n}"
+	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"lib\": [\"es5\"],\n        \"plugins\": [\n            { \"name\": \"create-thrower\" }\n        ]\n    },\n    \"files\": [\"a.ts\"]\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -156,7 +180,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -164,12 +188,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/a.ts: *new*
   {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
@@ -196,17 +220,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
@@ -222,7 +246,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -249,17 +273,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json:
@@ -288,17 +312,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
@@ -315,7 +339,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -329,7 +353,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "kind": "let",
diff --git a/tests/baselines/reference/tsserver/fourslashServer/ngProxy4.js b/tests/baselines/reference/tsserver/fourslashServer/ngProxy4.js
index 1872e649fe674..1b524010aff87 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/ngProxy4.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/ngProxy4.js
@@ -1,16 +1,36 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "plugins": [
+            {
+              "name": "diagnostic-adder"
+            }
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/a.ts]
 let x = [1, 2];
 x
@@ -19,6 +39,7 @@ x
 //// [/tests/cases/fourslash/server/tsconfig.json]
 {
     "compilerOptions": {
+        "lib": ["es5"],
         "plugins": [
             { "name": "diagnostic-adder" }
         ]
@@ -29,7 +50,7 @@ x
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsconfig.json"
@@ -44,6 +65,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/tsconfig.json : {
   "/tests/cases/fourslash/server/a.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "plugins": [
    {
     "name": "diagnostic-adder"
@@ -67,7 +91,7 @@ Info seq  [hh:mm:ss:mss] Loading diagnostic-adder from /home/src/tslibs/TS/Lib/t
 Info seq  [hh:mm:ss:mss] Plugin validation succeeded
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Type roots
@@ -77,18 +101,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.ts Text-1 "let x = [1, 2];\nx\n"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -124,18 +148,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"plugins\": [\n            { \"name\": \"diagnostic-adder\" }\n        ]\n    },\n    \"files\": [\"a.ts\"]\n}"
+	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"lib\": [\"es5\"],\n        \"plugins\": [\n            { \"name\": \"diagnostic-adder\" }\n        ]\n    },\n    \"files\": [\"a.ts\"]\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -156,7 +180,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -164,12 +188,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/a.ts: *new*
   {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
@@ -196,17 +220,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
@@ -222,7 +246,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -249,17 +273,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json:
@@ -288,17 +312,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
@@ -315,7 +339,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -328,13 +352,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -347,7 +371,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/nodeNextModuleKindCaching1.js b/tests/baselines/reference/tsserver/fourslashServer/nodeNextModuleKindCaching1.js
index 6cc20176372dc..b964f1bb4c98a 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/nodeNextModuleKindCaching1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/nodeNextModuleKindCaching1.js
@@ -1,16 +1,35 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "rootDir": "/tests/cases/fourslash/server/src",
+          "outDir": "/tests/cases/fourslash/server/dist",
+          "target": "es2020",
+          "module": "nodenext",
+          "strict": true,
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/package.json]
 {
     "type": "module",
@@ -33,6 +52,7 @@ helloWorld()
 //// [/tests/cases/fourslash/server/tsconfig.json]
 {
     "compilerOptions": {
+      "lib": ["es5"],
       "rootDir": "src",
       "outDir": "dist",
       "target": "ES2020",
@@ -45,7 +65,7 @@ helloWorld()
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsconfig.json"
@@ -61,6 +81,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/tsconfig.json : {
   "/tests/cases/fourslash/server/src/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/tests/cases/fourslash/server/src",
   "outDir": "/tests/cases/fourslash/server/dist",
   "target": 7,
@@ -84,20 +107,34 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/example.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/package.json 2000 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/package.json 2000 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts 500 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/src/example.ts Text-1 "export function helloWorld() {\n    console.log('Hello, world!')\n}"
 	/tests/cases/fourslash/server/src/index.ts Text-1 "// The line below should show a \"Relative import paths need explicit file\n// extensions...\" error in VS Code, but it doesn't. The error is only picked up\n// by `tsc` which seems to properly infer the module type.\nimport { helloWorld } from './example'\n\nhelloWorld()"
 
 
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
+	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	src/example.ts
 	  Matched by include pattern 'src\**\*.ts' in 'tsconfig.json'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -123,72 +160,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/tests/cases/fourslash/server/tsconfig.json",
         "configFile": "/tests/cases/fourslash/server/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'es2020'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'CallableFunction'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'NewableFunction'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /tests/cases/fourslash/server/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /tests/cases/fourslash/server
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -196,25 +177,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n      \"rootDir\": \"src\",\n      \"outDir\": \"dist\",\n      \"target\": \"ES2020\",\n      \"module\": \"NodeNext\",\n      \"strict\": true\n    },\n    \"include\": [\"src\\\\**\\\\*.ts\"]\n}"
+	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n      \"lib\": [\"es5\"],\n      \"rootDir\": \"src\",\n      \"outDir\": \"dist\",\n      \"target\": \"ES2020\",\n      \"module\": \"NodeNext\",\n      \"strict\": true\n    },\n    \"include\": [\"src\\\\**\\\\*.ts\"]\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -229,7 +210,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -237,14 +218,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/package.json: *new*
@@ -280,17 +268,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /tests/cases/fourslash/server/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
 /tests/cases/fourslash/server/src/example.ts *new*
     version: Text-1
@@ -307,7 +298,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/src/index.ts"
@@ -317,7 +308,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /tests/cases/fourslash/server/src/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /tests/cases/fourslash/server/src/index.ts ProjectRootPath: undefined:: Result: /tests/cases/fourslash/server/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -334,19 +325,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/package.json:
@@ -384,17 +382,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /tests/cases/fourslash/server/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
 /tests/cases/fourslash/server/src/example.ts
     version: Text-1
@@ -412,7 +413,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/src/index.ts",
@@ -425,13 +426,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/src/index.ts",
@@ -444,7 +445,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/nodeNextPathCompletions.js b/tests/baselines/reference/tsserver/fourslashServer/nodeNextPathCompletions.js
index 83f13593d0cea..a347001e0edba 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/nodeNextPathCompletions.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/nodeNextPathCompletions.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts]
 export function fooFromIndex(): void;
 
@@ -45,12 +61,12 @@ export function fooFromLol(): void;
 import { fooFromIndex } from "";
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "nodenext" }, "files": ["./src/foo.ts"] }
+{ "compilerOptions": { "lib": ["es5"], "module": "nodenext" }, "files": ["./src/foo.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/node_modules/dependency/package.json"
@@ -64,9 +80,12 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -78,18 +97,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/dependency/package.json SVC-1-0 "{\n    \"type\": \"module\",\n    \"name\": \"dependency\",\n    \"version\": \"1.0.0\",\n    \"exports\": {\n        \".\": {\n            \"types\": \"./lib/index.d.ts\"\n        },\n        \"./lol\": {\n            \"types\": \"./lib/lol.d.ts\"\n        },\n       \"./dir/*\": \"./lib/*\"\n    }\n}"
 
 
-	../../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../tslibs/TS/Lib/lib.es5.d.ts'
 	package.json
 	  Root file specified for compilation
 
@@ -106,7 +125,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -114,12 +133,18 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/tsconfig.json: *new*
@@ -145,15 +170,15 @@ Projects::
     projectProgramVersion: 1
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -164,7 +189,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts"
@@ -179,6 +204,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/foo.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
@@ -194,19 +222,30 @@ Info seq  [hh:mm:ss:mss] event:
       }
     }
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/foo.ts SVC-1-0 "import { fooFromIndex } from \"\";"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/foo.ts
 	  Part of 'files' list in tsconfig.json
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -252,57 +291,11 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/src/foo.ts",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/autoImportProviderProject1*' (AutoImportProvider)
@@ -323,7 +316,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *,
@@ -332,14 +325,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
 /home/src/workspaces/project/node_modules/dependency/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts: *new*
@@ -389,18 +389,21 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+        /home/src/workspaces/project/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+        /home/src/workspaces/project/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json *new*
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts *new*
     version: Text-1
     containingProjects: 1
@@ -420,7 +423,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -434,7 +437,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
@@ -453,7 +456,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -472,7 +475,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -491,7 +494,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -508,7 +511,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
@@ -526,18 +529,21 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
     containingProjects: 1
@@ -557,7 +563,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -574,23 +580,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
     containingProjects: 1
@@ -610,7 +619,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -625,13 +634,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -648,23 +657,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
     containingProjects: 1
@@ -684,7 +696,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -699,13 +711,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -722,23 +734,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
     containingProjects: 1
@@ -758,7 +773,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -773,13 +788,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -796,23 +811,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
     containingProjects: 1
@@ -832,7 +850,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -847,13 +865,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -870,23 +888,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
     containingProjects: 1
@@ -906,7 +927,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -921,13 +942,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -944,23 +965,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
     containingProjects: 1
@@ -980,7 +1004,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -995,13 +1019,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -1018,23 +1042,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
     containingProjects: 1
@@ -1054,7 +1081,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -1069,13 +1096,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -1092,23 +1119,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
     containingProjects: 1
@@ -1128,7 +1158,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 20,
+      "seq": 21,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -1143,13 +1173,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 20,
+      "request_seq": 21,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 21,
+      "seq": 22,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -1166,23 +1196,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 21,
+      "request_seq": 22,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
     containingProjects: 1
@@ -1202,7 +1235,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 22,
+      "seq": 23,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -1217,13 +1250,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 22,
+      "request_seq": 23,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 23,
+      "seq": 24,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -1240,23 +1273,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 23,
+      "request_seq": 24,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
     containingProjects: 1
@@ -1276,7 +1312,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 24,
+      "seq": 25,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -1291,13 +1327,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 24,
+      "request_seq": 25,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 25,
+      "seq": 26,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -1314,23 +1350,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 25,
+      "request_seq": 26,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
     containingProjects: 1
@@ -1350,7 +1389,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 26,
+      "seq": 27,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -1365,13 +1404,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 26,
+      "request_seq": 27,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 27,
+      "seq": 28,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -1383,12 +1422,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 27,
+      "request_seq": 28,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 28,
+      "seq": 29,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -1404,11 +1443,20 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/dependency/lib/index.d.ts Text-1 "export function fooFromIndex(): void;"
 	/home/src/workspaces/project/src/foo.ts SVC-1-12 "import { fooFromIndex } from \"dependency/\";"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/dependency/lib/index.d.ts
 	  Imported via "dependency/" from file 'src/foo.ts' with packageId 'dependency/ib/index.d.ts@1.0.0'
 	  File is ECMAScript module because 'node_modules/dependency/package.json' has field "type" with value "module"
@@ -1426,7 +1474,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 28,
+      "request_seq": 29,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1454,14 +1502,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
@@ -1517,18 +1572,21 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
@@ -1549,7 +1607,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 29,
+      "seq": 30,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -1566,7 +1624,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 29,
+      "request_seq": 30,
       "success": true
     }
 After Request
@@ -1585,18 +1643,21 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
     containingProjects: 2
@@ -1617,7 +1678,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 30,
+      "seq": 31,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -1634,23 +1695,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 30,
+      "request_seq": 31,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts
     version: Text-1
     containingProjects: 2
@@ -1671,7 +1735,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 31,
+      "seq": 32,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -1686,13 +1750,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 31,
+      "request_seq": 32,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 32,
+      "seq": 33,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -1704,12 +1768,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 32,
+      "request_seq": 33,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 33,
+      "seq": 34,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/foo.ts",
@@ -1726,10 +1790,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/node_modules/dependency/lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 3 projectProgramVersion: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/foo.ts SVC-1-14 "import { fooFromIndex } from \"dependency/l\";"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/foo.ts
 	  Part of 'files' list in tsconfig.json
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -1744,7 +1817,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 33,
+      "request_seq": 34,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1766,14 +1839,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts:
@@ -1836,18 +1916,21 @@ Projects::
     autoImportProviderHost: /dev/null/autoImportProviderProject1*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
         /dev/null/inferredProject1*
+        /home/src/workspaces/project/tsconfig.json
 /home/src/workspaces/project/node_modules/dependency/lib/index.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/nonJsDeclarationFilePathCompletions.js b/tests/baselines/reference/tsserver/fourslashServer/nonJsDeclarationFilePathCompletions.js
index 8f137d889c20f..79fe952d23bcb 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/nonJsDeclarationFilePathCompletions.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/nonJsDeclarationFilePathCompletions.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "allowArbitraryExtensions": true,
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/mod.d.html.ts]
 export declare class HtmlModuleThing {}
 
@@ -24,7 +40,7 @@ import { PackageHtmlModuleThing } from "package/";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/mod.d.html.ts"
@@ -36,7 +52,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -46,18 +62,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/mod.d.html.ts SVC-1-0 "export declare class HtmlModuleThing {}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	mod.d.html.ts
 	  Root file specified for compilation
 
@@ -74,7 +90,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -82,12 +98,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -106,15 +122,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -125,7 +141,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/usage.ts"
@@ -150,18 +166,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/usage.ts SVC-1-0 "import { HtmlModuleThing } from \"./\";\nimport { PackageHtmlModuleThing } from \"package/\";"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	usage.ts
 	  Root file specified for compilation
 
@@ -184,7 +200,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -192,12 +208,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json:
@@ -232,17 +248,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -258,7 +274,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/usage.ts",
@@ -272,7 +288,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
@@ -297,7 +313,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/usage.ts",
@@ -316,7 +332,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": [
         {
@@ -335,7 +351,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/usage.ts",
@@ -354,7 +370,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -373,7 +389,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/usage.ts",
@@ -387,7 +403,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
@@ -406,7 +422,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/usage.ts",
@@ -425,7 +441,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionEntryDetails-full",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/occurrences01.js b/tests/baselines/reference/tsserver/fourslashServer/occurrences01.js
index 09c15c9580e49..636eb51c80d49 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/occurrences01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/occurrences01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/occurrences01.ts]
 foo: switch (10) {
     case 1:
@@ -25,7 +40,7 @@ foo: switch (10) {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences01.ts"
@@ -37,7 +52,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -47,18 +62,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/occurrences01.ts SVC-1-0 "foo: switch (10) {\n    case 1:\n    case 2:\n    case 3:\n        break;\n        break foo;\n        continue;\n        continue foo;\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	occurrences01.ts
 	  Root file specified for compilation
 
@@ -75,7 +90,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -83,12 +98,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -107,15 +122,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -126,7 +141,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences01.ts"
@@ -145,12 +160,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences01.ts",
@@ -167,7 +182,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
@@ -245,7 +260,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences01.ts"
@@ -264,12 +279,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences01.ts",
@@ -286,7 +301,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -364,7 +379,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences01.ts"
@@ -383,12 +398,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences01.ts",
@@ -405,7 +420,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -483,7 +498,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences01.ts"
@@ -502,12 +517,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences01.ts",
@@ -524,7 +539,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": [
         {
@@ -602,7 +617,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences01.ts"
@@ -621,12 +636,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences01.ts",
@@ -643,7 +658,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true,
       "body": [
         {
@@ -721,7 +736,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences01.ts"
@@ -740,12 +755,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences01.ts",
@@ -762,7 +777,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/occurrences02.js b/tests/baselines/reference/tsserver/fourslashServer/occurrences02.js
index a43ea7e862003..bb1423606b851 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/occurrences02.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/occurrences02.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/occurrences02.ts]
 function f(x: typeof f) {
     f(f);
@@ -19,7 +34,7 @@ function f(x: typeof f) {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences02.ts"
@@ -31,7 +46,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -41,18 +56,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/occurrences02.ts SVC-1-0 "function f(x: typeof f) {\n    f(f);\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	occurrences02.ts
 	  Root file specified for compilation
 
@@ -69,7 +84,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -77,12 +92,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -101,15 +116,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -120,7 +135,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences02.ts"
@@ -139,12 +154,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences02.ts",
@@ -161,7 +176,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
@@ -225,7 +240,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences02.ts"
@@ -244,12 +259,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences02.ts",
@@ -266,7 +281,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": [
         {
@@ -330,7 +345,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences02.ts"
@@ -349,12 +364,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences02.ts",
@@ -371,7 +386,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": [
         {
@@ -435,7 +450,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences02.ts"
@@ -454,12 +469,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/occurrences02.ts",
@@ -476,7 +491,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "documentHighlights",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/openFile.js b/tests/baselines/reference/tsserver/fourslashServer/openFile.js
index e0e3ff9e4b83c..536445ae9ddbb 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/openFile.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/openFile.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/test.ts]
 var t = '10';
 
@@ -18,12 +33,12 @@ var t = '10';
 t.
 
 //// [/tests/cases/fourslash/server/tsconfig.json]
-{ "files": ["test.ts", "test1.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["test.ts", "test1.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test1.ts"
@@ -39,6 +54,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/tsconfig.json : {
   "/tests/cases/fourslash/server/test1.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/tests/cases/fourslash/server/tsconfig.json"
  }
 }
@@ -54,7 +72,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/test.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Type roots
@@ -64,19 +82,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/test.ts Text-1 "var t = '10';"
 	/tests/cases/fourslash/server/test1.ts SVC-1-0 "t."
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	test.ts
 	  Part of 'files' list in tsconfig.json
 	test1.ts
@@ -115,7 +133,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -123,12 +141,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/test.ts: *new*
   {"pollingInterval":500}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -147,15 +165,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/tsconfig.json
@@ -170,7 +188,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test.ts",
@@ -184,7 +202,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tests/cases/fours
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/test.ts SVC-2-0 "var t = 10; t."
@@ -205,7 +223,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -213,12 +231,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/tsconfig.json:
   {"pollingInterval":2000}
 
@@ -239,15 +257,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/tsconfig.json
@@ -263,7 +281,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test1.ts"
@@ -284,12 +302,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -301,12 +319,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test1.ts",
@@ -326,7 +344,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": {
         "flags": 0,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/openFileWithSyntaxKind.js b/tests/baselines/reference/tsserver/fourslashServer/openFileWithSyntaxKind.js
index b0b686e4ef79b..aafb01b644ef9 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/openFileWithSyntaxKind.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/openFileWithSyntaxKind.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "allowJs": true,
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/dumbFile.ts]
 var x;
 
@@ -24,7 +40,7 @@ t.
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/dumbFile.ts"
@@ -36,7 +52,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -46,18 +62,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/dumbFile.ts SVC-1-0 "var x;"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	dumbFile.ts
 	  Root file specified for compilation
 
@@ -74,7 +90,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -82,12 +98,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -106,15 +122,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -125,7 +141,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test.ts",
@@ -143,18 +159,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/test.ts SVC-1-0 "/**\n * @type {number}\n */\nvar t;\nt."
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	test.ts
 	  Root file specified for compilation
 
@@ -177,7 +193,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -185,12 +201,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json:
@@ -215,17 +231,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
         /dev/null/inferredProject2* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject1*
@@ -241,7 +257,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -253,12 +269,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/test.ts",
@@ -278,7 +294,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "flags": 0,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/packageJsonImportsFailedLookups.js b/tests/baselines/reference/tsserver/fourslashServer/packageJsonImportsFailedLookups.js
index bc42bf9dbd63c..6adf7a3010916 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/packageJsonImportsFailedLookups.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/packageJsonImportsFailedLookups.js
@@ -1,7 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/a/b/c/d/e/index.ts]
 import { add } from "#utils";
 
@@ -14,24 +39,15 @@ import { add } from "#utils";
 }
 
 //// [/a/b/c/d/e/tsconfig.json]
-{ "compilerOptions": { "module": "nodenext" } }
+{ "compilerOptions": { "lib": ["es5"], "module": "nodenext" } }
 
 //// [/a/b/node_modules/lodash/index.d.ts]
 export function add(a: number, b: number): number;
 
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/a/b/c/d/e/tsconfig.json"
@@ -46,6 +62,9 @@ Info seq  [hh:mm:ss:mss] Config: /a/b/c/d/e/tsconfig.json : {
   "/a/b/c/d/e/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "configFilePath": "/a/b/c/d/e/tsconfig.json"
  }
@@ -65,6 +84,9 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/c/d/e/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/b/c/d/e/tsconfig.json
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/node_modules/lodash/index.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/c/d/e/node_modules 1 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/c/d/e/node_modules 1 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/c/d/node_modules 1 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: Failed Lookup Locations
@@ -72,9 +94,11 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/c/node_modules 1 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/c/node_modules 1 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/c/d/e/package.json 2000 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/node_modules/lodash/package.json 2000 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/node_modules/package.json 2000 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/c/d/e/node_modules/@types 1 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/c/d/e/node_modules/@types 1 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/c/d/node_modules/@types 1 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: Type roots
@@ -83,11 +107,20 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/c/node_modul
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/c/node_modules/@types 1 undefined Project: /a/b/c/d/e/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/b/c/d/e/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/a/b/c/d/e/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/a/b/node_modules/lodash/index.d.ts Text-1 "export function add(a: number, b: number): number;"
 	/a/b/c/d/e/index.ts Text-1 "import { add } from \"#utils\";"
 
 
+	../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
+	../../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../node_modules/lodash/index.d.ts
 	  Imported via "#utils" from file 'index.ts'
 	  File is CommonJS module because 'package.json' was not found
@@ -113,53 +146,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/a/b/c/d/e/tsconfig.json",
         "configFile": "/a/b/c/d/e/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /a/b/c/d/e/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -168,9 +155,9 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/c/d/e/jsconfig.js
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/c/d/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/c/d/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/c/d/e/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/c/d/e/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/c/d/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -180,25 +167,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/a/b/c/d/e/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"nodenext\" } }"
+	/a/b/c/d/e/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"lib\": [\"es5\"], \"module\": \"nodenext\" } }"
 
 
-	../../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/c/d/e/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/a/b/c/d/e/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -213,7 +200,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -240,14 +227,21 @@ watchedFiles::
   {"pollingInterval":2000}
 /a/b/node_modules/package.json: *new*
   {"pollingInterval":2000}
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 
 watchedDirectoriesRecursive::
 /a/b/c/d/e: *new*
@@ -291,22 +285,25 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /a/b/c/d/e/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /a/b/c/d/e/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /a/b/c/d/e/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /a/b/c/d/e/tsconfig.json
         /dev/null/inferredProject1*
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/a/b/c/d/e/index.ts"
@@ -316,7 +313,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/b/c/d/e/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /a/b/c/d/e/index.ts ProjectRootPath: undefined:: Result: /a/b/c/d/e/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/a/b/c/d/e/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -333,7 +330,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
@@ -355,14 +352,21 @@ watchedFiles::
   {"pollingInterval":2000}
 /a/b/node_modules/package.json:
   {"pollingInterval":2000}
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 
 watchedFiles *deleted*::
 /a/b/c/d/e/index.ts:
@@ -411,15 +415,18 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /a/b/c/d/e/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /a/b/c/d/e/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /a/b/c/d/e/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /a/b/c/d/e/tsconfig.json
         /dev/null/inferredProject1*
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_addInNextLine.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_addInNextLine.js
index 33ec76ac213de..a5831e3e1a9b1 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_addInNextLine.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_addInNextLine.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 
 
@@ -27,12 +42,12 @@ export const foo: Foo = { };
 export const k = a+ t;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "b.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts"
@@ -48,6 +63,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/b.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -63,7 +81,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -73,19 +91,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-0 "\n\n\n\n"
 	/home/src/workspaces/project/b.ts Text-1 "export interface Foo { }\nexport const a = 1;\nexport const t = 1;\n\nexport const foo: Foo = { };\nexport const k = a+ t;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	b.ts
@@ -124,7 +142,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -132,12 +150,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/b.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -156,15 +174,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -179,7 +197,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -215,12 +233,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -261,7 +279,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-1 "\n\n\nexport const foo: Foo = {};\n"
@@ -273,7 +291,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -320,15 +338,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_blankTargetFile.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_blankTargetFile.js
index c9ef35dc40fa6..b9635ba601852 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_blankTargetFile.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_blankTargetFile.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 export const abc = 10;
 
@@ -26,12 +41,12 @@ console.log("abc");
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["folder/c.ts", "a.ts", "b.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["folder/c.ts", "a.ts", "b.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/c.ts"
@@ -48,6 +63,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/b.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -64,7 +82,7 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -74,7 +92,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/folder/c.ts SVC-1-0 ""
@@ -82,12 +100,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/b.ts Text-1 "import { abc } from \"./a\";\n\nconsole.log(abc);\n\n\nconsole.log(\"abc\");"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	folder/c.ts
 	  Part of 'files' list in tsconfig.json
 	a.ts
@@ -129,7 +147,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -137,12 +155,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/b.ts: *new*
@@ -163,15 +181,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -190,7 +208,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -226,12 +244,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/c.ts",
@@ -272,7 +290,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/folder/c.ts SVC-1-1 "console.log(abc);"
@@ -287,7 +305,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -334,15 +352,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_defaultExport1.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_defaultExport1.js
index 4d679c393a1c5..b2d99376c9bdd 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_defaultExport1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_defaultExport1.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 export default function foo(name: string): void {
     console.log(name);
@@ -24,12 +39,12 @@ const b = foo("bar");
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["folder/c.ts", "a.ts", "b.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["folder/c.ts", "a.ts", "b.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/c.ts"
@@ -46,6 +61,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/b.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -62,7 +80,7 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -72,7 +90,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/folder/c.ts SVC-1-0 ""
@@ -80,12 +98,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/b.ts Text-1 "import foo from \"./a\";\nconst b = foo(\"bar\");"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	folder/c.ts
 	  Part of 'files' list in tsconfig.json
 	a.ts
@@ -127,7 +145,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -135,12 +153,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/b.ts: *new*
@@ -161,15 +179,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -188,7 +206,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -224,12 +242,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/c.ts",
@@ -270,7 +288,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/folder/c.ts SVC-1-1 "const b = foo(\"bar\");"
@@ -285,7 +303,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -332,15 +350,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_defaultExport2.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_defaultExport2.js
index 0ee7f5d8d2990..7c37e9582de37 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_defaultExport2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_defaultExport2.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 const b = foo("bar");
  export default function foo(name: string): void {
@@ -21,12 +36,12 @@ const b = foo("bar");
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["folder/c.ts", "a.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["folder/c.ts", "a.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/c.ts"
@@ -42,6 +57,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/a.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -57,7 +75,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -67,19 +85,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/folder/c.ts SVC-1-0 ""
 	/home/src/workspaces/project/a.ts Text-1 "const b = foo(\"bar\");\n export default function foo(name: string): void {\n     console.log(name);\n }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	folder/c.ts
 	  Part of 'files' list in tsconfig.json
 	a.ts
@@ -118,7 +136,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -126,12 +144,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -150,15 +168,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -173,7 +191,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -209,12 +227,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/c.ts",
@@ -255,7 +273,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/folder/c.ts SVC-1-1 "const b = foo(\"bar\");"
@@ -267,7 +285,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -314,15 +332,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_defaultImport.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_defaultImport.js
index a3d38c09021da..35d0604c55bfe 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_defaultImport.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_defaultImport.js
@@ -1,16 +1,32 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/folder/a.ts]
 const abc = 10;
 const def = 20;
@@ -32,12 +48,12 @@ function foo(abc: test.testInterface, def: test.testInterface) {
 
 
 //// [/home/src/workspaces/project/folder/tsconfig.json]
-{ "compilerOptions": { "module": "nodenext" }, "files": ["folder/c.ts", "a.ts", "b.mts"] }
+{ "compilerOptions": { "lib": ["es5"], "module": "nodenext" }, "files": ["folder/c.ts", "a.ts", "b.mts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/folder/c.ts"
@@ -54,6 +70,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/folder/tsconfig.js
   "/home/src/workspaces/project/folder/b.mts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "configFilePath": "/home/src/workspaces/project/folder/tsconfig.json"
  }
@@ -71,11 +90,16 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/folder/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/folder/b.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/folder/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/folder/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/folder/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/folder/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/folder/folder/package.json 2000 undefined Project: /home/src/workspaces/project/folder/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/folder/package.json 2000 undefined Project: /home/src/workspaces/project/folder/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/folder/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/package.json 2000 undefined Project: /home/src/workspaces/project/folder/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/folder/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/folder/node_modules/@types 1 undefined Project: /home/src/workspaces/project/folder/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/folder/node_modules/@types 1 undefined Project: /home/src/workspaces/project/folder/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/folder/tsconfig.json WatchType: Type roots
@@ -84,12 +108,21 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/folder/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/folder/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/folder/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/folder/folder/c.ts SVC-1-0 ""
 	/home/src/workspaces/project/folder/a.ts Text-1 "const abc = 10;\nconst def = 20;\nexport interface testInterface {\n    abc: number;\n    def: number;\n}"
 	/home/src/workspaces/project/folder/b.mts Text-1 "import test from \"./a.js\";\n\nfunction foo(abc: test.testInterface, def: test.testInterface) {\n   console.log(abc);\n   console.log(def);\n}\n"
 
 
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	folder/c.ts
 	  Part of 'files' list in tsconfig.json
 	  File is CommonJS module because 'package.json' was not found
@@ -118,57 +151,11 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/folder/folder/c.ts",
         "configFile": "/home/src/workspaces/project/folder/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/folder/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -179,7 +166,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -187,8 +174,18 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
 /home/src/workspaces/package.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/folder/a.ts: *new*
@@ -219,6 +216,18 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /home/src/workspaces/project/folder/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /home/src/workspaces/project/folder/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /home/src/workspaces/project/folder/tsconfig.json
 /home/src/workspaces/project/folder/a.ts *new*
     version: Text-1
     containingProjects: 1
@@ -234,7 +243,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -270,12 +279,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/folder/c.ts",
@@ -315,7 +324,10 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/folder/tsconfig.json
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/folder/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/folder/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/folder/folder/c.ts SVC-1-1 "function foo(abc: test.abc, def: test.def) {\nconsole.log(abc);\nconsole.log(def);\n}"
 	/home/src/workspaces/project/folder/a.ts Text-1 "const abc = 10;\nconst def = 20;\nexport interface testInterface {\n    abc: number;\n    def: number;\n}"
 	/home/src/workspaces/project/folder/b.mts Text-1 "import test from \"./a.js\";\n\nfunction foo(abc: test.testInterface, def: test.testInterface) {\n   console.log(abc);\n   console.log(def);\n}\n"
@@ -326,7 +338,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -373,6 +385,18 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+    version: Text-1
+    containingProjects: 1
+        /home/src/workspaces/project/folder/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+    version: Text-1
+    containingProjects: 1
+        /home/src/workspaces/project/folder/tsconfig.json
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 1
+        /home/src/workspaces/project/folder/tsconfig.json
 /home/src/workspaces/project/folder/a.ts
     version: Text-1
     containingProjects: 1
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_existingImports1.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_existingImports1.js
index cc16e91b12f81..5d3e627f2ef11 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_existingImports1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_existingImports1.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/other.ts]
 export const t = 1;
 
@@ -28,12 +43,12 @@ const b = 10;
 const c = 10;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["target.ts", "other.ts", "other2.ts", "other3.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["target.ts", "other.ts", "other2.ts", "other3.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts"
@@ -51,6 +66,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/other3.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -68,7 +86,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/other2.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/other3.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -78,7 +96,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (7)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/other.ts Text-1 "export const t = 1;"
@@ -87,12 +105,12 @@ Info seq  [hh:mm:ss:mss] 	Files (7)
 	/home/src/workspaces/project/other2.ts Text-1 "export const t2 = 1;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	other.ts
 	  Imported via "./other" from file 'target.ts'
 	  Part of 'files' list in tsconfig.json
@@ -137,7 +155,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -145,12 +163,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/other.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/other2.ts: *new*
@@ -173,15 +191,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -204,7 +222,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -240,12 +258,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts",
@@ -271,7 +289,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (7)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/other.ts Text-1 "export const t = 1;"
@@ -285,7 +303,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -332,15 +350,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_existingImports2.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_existingImports2.js
index 05195d057d794..3c5aafb4655be 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_existingImports2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_existingImports2.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/originalFile.ts]
 import { t2 } from "./other2";
 import { t3 } from "./other3";
@@ -34,12 +49,12 @@ const b = 10;
 const c = 10;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["target.ts", "originalFile.ts", "other.ts", "other2.ts", "other3.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["target.ts", "originalFile.ts", "other.ts", "other2.ts", "other3.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts"
@@ -58,6 +73,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/other3.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -76,7 +94,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/other2.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/other3.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -86,7 +104,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/other.ts Text-1 "export const t = 1;"
@@ -96,12 +114,12 @@ Info seq  [hh:mm:ss:mss] 	Files (8)
 	/home/src/workspaces/project/originalFile.ts Text-1 "import { t2 } from \"./other2\";\nimport { t3 } from \"./other3\";\nexport const n = 10;\nexport const m = t3 + t2 + n;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	other.ts
 	  Imported via "./other" from file 'target.ts'
 	  Part of 'files' list in tsconfig.json
@@ -150,7 +168,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -158,12 +176,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/originalFile.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/other.ts: *new*
@@ -188,15 +206,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -223,7 +241,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -259,12 +277,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts",
@@ -305,7 +323,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (8)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/other.ts Text-1 "export const t = 1;"
@@ -322,7 +340,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -380,15 +398,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_globalAndLocal1.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_globalAndLocal1.js
index 9a9dc2c692487..2cd02601f56a1 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_globalAndLocal1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_globalAndLocal1.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/globals.d.ts]
 export {}; // Make this a module
 declare global {
@@ -29,12 +44,12 @@ export interface Disposable {
 export interface EditingService extends Disposable { }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["target.ts", "globals.d.ts", "test.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["target.ts", "globals.d.ts", "test.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts"
@@ -51,6 +66,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/test.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -67,7 +85,7 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/globals.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/test.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -77,7 +95,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/target.ts SVC-1-0 ""
@@ -85,12 +103,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/test.ts Text-1 "export interface Disposable {\n    (): string;\n}\nexport interface EditingService extends Disposable { }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	target.ts
 	  Part of 'files' list in tsconfig.json
 	globals.d.ts
@@ -131,7 +149,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -139,12 +157,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/globals.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/test.ts: *new*
@@ -165,15 +183,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -192,7 +210,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -228,12 +246,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts",
@@ -274,7 +292,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/target.ts SVC-1-1 "export interface EditingService extends Disposable { }"
@@ -287,7 +305,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -334,15 +352,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_globalAndLocal2.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_globalAndLocal2.js
index 37eb9ea350420..d90065720b43b 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_globalAndLocal2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_globalAndLocal2.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/globals.d.ts]
 export {}; // Make this a module
 declare global {
@@ -32,12 +47,12 @@ import { Disposable } from './lifecycle';
 export interface EditingService extends Disposable { }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["target.ts", "globals.d.ts", "test.ts", "lifecycle.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["target.ts", "globals.d.ts", "test.ts", "lifecycle.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts"
@@ -55,6 +70,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/lifecycle.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -72,7 +90,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/test.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/lifecycle.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -82,7 +100,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (7)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/target.ts SVC-1-0 ""
@@ -91,12 +109,12 @@ Info seq  [hh:mm:ss:mss] 	Files (7)
 	/home/src/workspaces/project/test.ts Text-1 "import { Disposable } from './lifecycle';\nexport interface EditingService extends Disposable { }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	target.ts
 	  Part of 'files' list in tsconfig.json
 	globals.d.ts
@@ -140,7 +158,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -148,12 +166,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/globals.d.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/lifecycle.ts: *new*
@@ -176,15 +194,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -207,7 +225,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -243,12 +261,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts",
@@ -289,7 +307,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (7)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/target.ts SVC-1-1 "export interface EditingService extends Disposable { }"
@@ -305,7 +323,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -352,15 +370,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_knownSourceFile.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_knownSourceFile.js
index 3d53d2ed85eb1..f7b26bfcea484 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_knownSourceFile.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_knownSourceFile.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/file1.ts]
 export const b = 2;
 
@@ -26,12 +41,12 @@ function f();
 const p = 1;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["file1.ts", "file2.ts", "target.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["file1.ts", "file2.ts", "target.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts"
@@ -48,6 +63,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/target.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -64,7 +82,7 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/file1.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/file2.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -74,7 +92,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/file1.ts Text-1 "export const b = 2;"
@@ -82,12 +100,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/target.ts SVC-1-0 "export const tt = 2;\nfunction f();\nconst p = 1;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	file1.ts
 	  Part of 'files' list in tsconfig.json
 	  Imported via './file1' from file 'file2.ts'
@@ -129,7 +147,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -137,12 +155,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/file1.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/file2.ts: *new*
@@ -163,15 +181,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -190,7 +208,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -226,12 +244,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts",
@@ -272,7 +290,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/file1.ts Text-1 "export const b = 2;"
@@ -287,7 +305,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -350,15 +368,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes1.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes1.js
index 9833db3b4f5eb..fc9b5a517e6ca 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes1.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/file1.ts]
 export const p = 10;
 export const q = 12;
@@ -28,12 +43,12 @@ const c = 3;
 const d = 4;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["file1.ts", "target.ts", "file3.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["file1.ts", "target.ts", "file3.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts"
@@ -50,6 +65,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/file3.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -66,7 +84,7 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/file1.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/file3.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -76,7 +94,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/file1.ts Text-1 "export const p = 10;\nexport const q = 12;"
@@ -84,12 +102,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/file3.ts Text-1 "export const r = 10;\nexport const s = 12;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	file1.ts
 	  Part of 'files' list in tsconfig.json
 	target.ts
@@ -130,7 +148,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -138,12 +156,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/file1.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/file3.ts: *new*
@@ -164,15 +182,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -191,7 +209,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -227,12 +245,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts",
@@ -268,7 +286,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/file1.ts Text-1 "export const p = 10;\nexport const q = 12;"
@@ -281,7 +299,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -339,15 +357,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes2.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes2.js
index 79818d3b6aec7..168c4a0007f65 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes2.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/file1.ts]
 import { aa, bb } from "./other";
 export const r = 10;
@@ -30,12 +45,12 @@ const c = 3;
 const d = 4;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["file1.ts", "target.ts", "other.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["file1.ts", "target.ts", "other.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts"
@@ -52,6 +67,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/other.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -68,7 +86,7 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/file1.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/other.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -78,7 +96,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/other.ts Text-1 "export const aa = 1;\nexport const bb = 2;"
@@ -86,12 +104,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/target.ts SVC-1-0 "const a = 1;\nconst b = 2;\nconst c = 3;\n\nconst d = 4;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	other.ts
 	  Imported via "./other" from file 'file1.ts'
 	  Part of 'files' list in tsconfig.json
@@ -133,7 +151,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -141,12 +159,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/file1.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/other.ts: *new*
@@ -167,15 +185,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -194,7 +212,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -230,12 +248,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts",
@@ -286,7 +304,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/other.ts Text-1 "export const aa = 1;\nexport const bb = 2;"
@@ -302,7 +320,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -360,15 +378,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes3.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes3.js
index c0ac11e5bf513..8e98dee983f31 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes3.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/file1.ts]
 import { aa, bb } from "./other";
 export const r = 10;
@@ -33,12 +48,12 @@ const c = 3;
 const d = 4;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["file1.ts", "target.ts", "other.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["file1.ts", "target.ts", "other.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts"
@@ -55,6 +70,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/other.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -71,7 +89,7 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/file1.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/other.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -81,7 +99,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/other.ts Text-1 "export const aa = 1;\nexport const bb = 2;"
@@ -89,12 +107,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/target.ts SVC-1-0 "import { r } from \"./file1\";\nconst a = r;\nconst b = 2;\nconst c = 3;\n\nconst d = 4;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	other.ts
 	  Imported via "./other" from file 'file1.ts'
 	  Part of 'files' list in tsconfig.json
@@ -137,7 +155,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -145,12 +163,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/file1.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/other.ts: *new*
@@ -171,15 +189,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -198,7 +216,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -234,12 +252,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts",
@@ -301,7 +319,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/other.ts Text-1 "export const aa = 1;\nexport const bb = 2;"
@@ -317,7 +335,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -413,15 +431,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes4.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes4.js
index 5dae36bae2dcc..678284b107227 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes4.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastes4.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/file1.ts]
 export const p = 10;
 export const q = 12;
@@ -28,12 +43,12 @@ const c = 3;
 const d = 4;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["file1.ts", "target.ts", "file3.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["file1.ts", "target.ts", "file3.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts"
@@ -50,6 +65,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/file3.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -66,7 +84,7 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/file1.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/file3.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -76,7 +94,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/file1.ts Text-1 "export const p = 10;\nexport const q = 12;"
@@ -84,12 +102,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/file3.ts Text-1 "export const r = 10;\nexport const s = 12;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	file1.ts
 	  Part of 'files' list in tsconfig.json
 	target.ts
@@ -130,7 +148,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -138,12 +156,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/file1.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/file3.ts: *new*
@@ -164,15 +182,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -191,7 +209,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -227,12 +245,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts",
@@ -279,7 +297,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/file1.ts Text-1 "export const p = 10;\nexport const q = 12;"
@@ -292,7 +310,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -361,15 +379,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesConsistentlyLargerInSize.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesConsistentlyLargerInSize.js
index 89a296a933e93..860b16d8d3f42 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesConsistentlyLargerInSize.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesConsistentlyLargerInSize.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() {
    const p = 1;
@@ -44,12 +59,12 @@ export const fig = 3;
 export const tomato = 4;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "b.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts"
@@ -65,6 +80,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/b.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -80,7 +98,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -90,19 +108,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-0 "function foo() {\n   const p = 1;\n   console.log(\"yes\");\n}\nclass bar {\n    constructor() {\n        function a() {\n            console.log(\"have a good day\");\n        }\n        a();\n        function b() {\n           function c() {\n               const test = 1 + 2 + 3;\n           }  \n        }\n        b();\n    }\n    c() {\n        console.log(\"hello again\");\n        function k() {\n            const happy = banana + avocados;\n        }\n    }\n}"
 	/home/src/workspaces/project/b.ts Text-1 "export const juice = 1;\nexport const sauce = 2;\nexport const fig = 3;\nexport const tomato = 4;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	b.ts
@@ -141,7 +159,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -149,12 +167,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/b.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -173,15 +191,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -196,7 +214,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -232,12 +250,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -296,7 +314,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-1 "function foo() {\n   const p = 1;\n   const t = 1 + juice + p;\n}\nclass bar {\n    constructor() {\n        function a() {\n            function avacado() { return sauce; }\n        }\n        a();\n        function b() {\n           function c() {\n               const test = fig + kiwi + 3;\n           }  \n        }\n        b();\n    }\n    c() {\n        console.log(\"hello again\");\n        function k() {\n            const cherry = 3 + tomato + cucumber;\n        }\n    }\n}"
@@ -308,7 +326,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -388,15 +406,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesConsistentlySmallerInSize.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesConsistentlySmallerInSize.js
index 9c4f4dabb6f17..28ebaf5c1631f 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesConsistentlySmallerInSize.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesConsistentlySmallerInSize.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() {
    const p = 1;
@@ -51,12 +66,12 @@ export const fig = 3;
 export const tomato = 4;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "b.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts"
@@ -72,6 +87,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/b.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -87,7 +105,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -97,19 +115,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-0 "function foo() {\n   const p = 1;\n   function bar() {\n       console.log(\"Testing\");\n   }\n   console.log(\"yes\");\n}\nclass bar {\n    constructor() {\n        function a() {\n           function aa() {\n               console.log(\"have a good day\");\n           }\n            \n        }\n        a();\n        function b() {\n           function c() {\n               export const testing = 1;\n               const test = 1 + testing + 3;\n           }\n        }\n        b();\n    }\n    c() {\n        console.log(\"hello again\");\n        function k() {\n            const happy = banana + avocados;\n        }\n    }\n}"
 	/home/src/workspaces/project/b.ts Text-1 "export const juice = 1;\nexport const sauce = 2;\nexport const fig = 3;\nexport const tomato = 4;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	b.ts
@@ -148,7 +166,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -156,12 +174,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/b.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -180,15 +198,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -203,7 +221,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -239,12 +257,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -303,7 +321,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-1 "function foo() {\n   const p = 1;\n   function bar() {\n       console.log(juice);\n   }\n   console.log(\"yes\");\n}\nclass bar {\n    constructor() {\n        function a() {\n           function aa() {\n               console.log(sauce + juice);\n           }\n            \n        }\n        a();\n        function b() {\n           function c() {\n               export const testing = 1;\n               const test = fig + kiwi3;\n           }\n        }\n        b();\n    }\n    c() {\n        console.log(\"hello again\");\n        function k() {\n            const cherry =tomato + kiwi;\n        }\n    }\n}"
@@ -315,7 +333,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -395,15 +413,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesEqualInSize.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesEqualInSize.js
index 88315021d358e..5ea694be07c15 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesEqualInSize.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesEqualInSize.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() {
     console.log("yes");
@@ -43,12 +58,12 @@ export const apple = 3;
 export const tomato = 4;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "b.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts"
@@ -64,6 +79,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/b.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -79,7 +97,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -89,19 +107,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-0 "function foo() {\n    console.log(\"yes\");\n}\nclass bar {\n    constructor() {\n        function a() {\n            console.log(\"have a good day\");\n        }\n        a();\n        function b() {\n           function c() {\n               const test = 1 + 2 + 3;\n           }\n        }\n        b();\n    }\n    c() {\n        console.log(\"hello again\");\n        function k() {\n             const happy = 1 + banana + avocados;\n        }\n    }\n}"
 	/home/src/workspaces/project/b.ts Text-1 "export const juice = 1;\nexport const sauce = 2;\nexport const apple = 3;\nexport const tomato = 4;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	b.ts
@@ -140,7 +158,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -148,12 +166,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/b.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -172,15 +190,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -195,7 +213,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -231,12 +249,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -295,7 +313,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-1 "function foo() {\n    console.log(juice);\n}\nclass bar {\n    constructor() {\n        function a() {\n            function kl() { return sauce; }\n        }\n        a();\n        function b() {\n           function c() {\n               const test = apple + 3;\n           }\n        }\n        b();\n    }\n    c() {\n        console.log(\"hello again\");\n        function k() {\n       const cherry = 3 + tomato + cucumber;\n        }\n    }\n}"
@@ -307,7 +325,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -387,15 +405,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesGrowingAndShrinkingInSize.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesGrowingAndShrinkingInSize.js
index 7fb1c5deeafd7..9fb0763664749 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesGrowingAndShrinkingInSize.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesGrowingAndShrinkingInSize.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() {
     console.log("Hello");
@@ -40,12 +55,12 @@ export const sauce = 2;
 export const tomato = 3;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "b.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts"
@@ -61,6 +76,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/b.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -76,7 +94,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -86,19 +104,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-0 "function foo() {\n    console.log(\"Hello\");\n}\nclass bar {\n    constructor() {\n        function a() {\n            console.log(\"hii\");\n        }\n        a();\n        function b() {\n           function c() {\n               console.log(\"hola\");\n           }\n        }\n        b();\n    }\n    c() {\n        console.log(\"hello again\");\n        \n    }\n}"
 	/home/src/workspaces/project/b.ts Text-1 "export const juice = 1;\nexport const sauce = 2;\nexport const tomato = 3;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	b.ts
@@ -137,7 +155,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -145,12 +163,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/b.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -169,15 +187,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -192,7 +210,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -228,12 +246,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -292,7 +310,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-1 "function foo() {\n    console.log(sauce);\n}\nclass bar {\n    const apple = 1 + juicector() {\n        function a() {\n            console.log(\"hii\");\n        }\n        a();\n        function b() {\n           function c() {\n               const kiwi = 1;\n           }\n        }\n        b();\n    }\n    c() {\n        console.log(\"hello again\");\n        function k() {\n                const cherry = 3 + tomato + cucumber;\n            }\n    }\n}"
@@ -304,7 +322,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -384,15 +402,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesGrowingInSize.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesGrowingInSize.js
index 73a79fe1ff852..ea8fe36699196 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesGrowingInSize.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesGrowingInSize.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() {
    const p = 1;
@@ -44,12 +59,12 @@ export const figs = 3;
 export const tomato = 4;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "b.ts", "c.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts", "c.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts"
@@ -66,6 +81,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/c.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -82,7 +100,7 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/c.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -92,7 +110,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-0 "function foo() {\n   const p = 1;\n}\nfunction too() {\n   function k(t: string) {\n       console.log(t);\n   }\n}\nclass bar {\n    constructor() {\n        function a() {\n            console.log(\"hello\");\n        }\n        a();\n    }\n    c() {\n        console.log(\"hello again\");\n        function k() {\n            const happy = banana + avocados;\n        }\n    }\n}"
@@ -100,12 +118,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/c.ts Text-1 "export const figs = 3;\nexport const tomato = 4;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	b.ts
@@ -146,7 +164,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -154,12 +172,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/b.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/c.ts: *new*
@@ -180,15 +198,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -207,7 +225,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -243,12 +261,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -307,7 +325,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-1 "function foo() {\n   const t = figs;\n}\nfunction too() {\n   function k(apples : number) {\n       console.log(t);\n   }\n}\nclass bar {\n    constructor() {\n        function a() {\n             console.log(sauce + tomato); \n        }\n        a();\n    }\n    c() {\n        console.log(\"hello again\");\n        //function k(i:string) {\n         const cherry = 3 + juices + cucumber;\n//      }\n    }\n}"
@@ -320,7 +338,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -400,15 +418,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesShrinkingInSize.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesShrinkingInSize.js
index 3c197d6e88d0a..fd4b1a4991033 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesShrinkingInSize.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesShrinkingInSize.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() {
    console.log("Good day");
@@ -44,12 +59,12 @@ export const figs = 3;
 export const tomato = 4;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "b.ts", "c.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts", "c.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts"
@@ -66,6 +81,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/c.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -82,7 +100,7 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/c.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -92,7 +110,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-0 "function foo() {\n   console.log(\"Good day\");\n}\nfunction too() {\n   function k(t: string) {\n       console.log(\"Happy Holidays\");\n   }\n}\nclass bar {\n    constructor() {\n        function a() {\n            console.log(\"hello\");\n        }\n        a();\n    }\n    c() {\n        console.log(\"hello again\");\n        function k() {\n            const happy = banana + avocados;\n        }\n    }\n}"
@@ -100,12 +118,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/c.ts Text-1 "export const figs = 3;\nexport const tomato = 4;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	b.ts
@@ -146,7 +164,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -154,12 +172,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/b.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/c.ts: *new*
@@ -180,15 +198,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -207,7 +225,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -243,12 +261,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -307,7 +325,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-1 "function foo() {\n   console.log(\"Good \");\n}\nfunction too() {\n   function k(t: string) {\n       const k = figs + juices;\n   }\n}\nclass bar {\n    constructor() {\n        function a() {\n    console.log(tomato);\n        }\n        a();\n    }\n    c() {\n        console.log(\"hello again\");\n        function k(kiwi: string) {\n            const cherry=tomato;\n        }\n    }\n}"
@@ -320,7 +338,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -400,15 +418,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_namespaceImport.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_namespaceImport.js
index 61fedaeab0815..f749e917fcefb 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_namespaceImport.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_namespaceImport.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 const abc = 10;
 const def = 20;
@@ -32,12 +47,12 @@ function foo(abc: test.abc, def: test.def) {
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["folder/c.ts", "a.ts", "b.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["folder/c.ts", "a.ts", "b.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/c.ts"
@@ -54,6 +69,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/b.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -70,7 +88,7 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -80,7 +98,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/folder/c.ts SVC-1-0 ""
@@ -88,12 +106,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/b.ts Text-1 "import * as test from \"./a\";\n\nfunction foo(abc: test.abc, def: test.def) {\n   console.log(abc);\n   console.log(def);\n}\n"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	folder/c.ts
 	  Part of 'files' list in tsconfig.json
 	a.ts
@@ -135,7 +153,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -143,12 +161,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/b.ts: *new*
@@ -169,15 +187,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -196,7 +214,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -232,12 +250,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/c.ts",
@@ -278,7 +296,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/folder/c.ts SVC-1-1 "function foo(abc: test.abc, def: test.def) {\nconsole.log(abc);\nconsole.log(def);\n}"
@@ -291,7 +309,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -338,15 +356,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_noImportNeeded.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_noImportNeeded.js
index bff3ec6a16f34..1037262c20223 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_noImportNeeded.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_noImportNeeded.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 export interface Foo { }
 
@@ -20,12 +35,12 @@ export const foo: Foo = {}
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "b.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b.ts"
@@ -41,6 +56,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/b.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -56,7 +74,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -66,19 +84,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "export interface Foo { }\n\nexport const foo: Foo = {}"
 	/home/src/workspaces/project/b.ts SVC-1-0 ""
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	b.ts
@@ -117,7 +135,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -125,12 +143,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -149,15 +167,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -172,7 +190,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -208,12 +226,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b.ts",
@@ -254,7 +272,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "export interface Foo { }\n\nexport const foo: Foo = {}"
@@ -266,7 +284,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -285,15 +303,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_noImportNeededInUpdatedProgram.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_noImportNeededInUpdatedProgram.js
index f1586b49c8ad3..80941a67bcbd5 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_noImportNeededInUpdatedProgram.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_noImportNeededInUpdatedProgram.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 
 
@@ -18,12 +33,12 @@ lib.decorators.legacy.d.ts-Text
 export const b = 10;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "b.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts"
@@ -39,6 +54,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/b.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -54,7 +72,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -64,19 +82,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-0 ""
 	/home/src/workspaces/project/b.ts Text-1 "export const b = 10;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	b.ts
@@ -115,7 +133,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -123,12 +141,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/b.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -147,15 +165,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -170,7 +188,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -206,12 +224,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a.ts",
@@ -237,7 +255,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts SVC-1-1 "const b = 1;\nconsole.log(b);"
@@ -249,7 +267,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -268,15 +286,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_pasteComments.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_pasteComments.js
index 2d17b537365de..b0fad00c37ec2 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_pasteComments.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_pasteComments.js
@@ -1,28 +1,43 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/target.ts]
 const a = 10;
 const b = 10;
 const c = 10;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["target.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["target.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts"
@@ -37,6 +52,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/target.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -51,7 +69,7 @@ Info seq  [hh:mm:ss:mss] event:
       }
     }
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -61,18 +79,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/target.ts SVC-1-0 "const a = 10;\nconst b = 10;\nconst c = 10;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	target.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -109,7 +127,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -117,12 +135,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
   {"pollingInterval":2000}
 
@@ -139,15 +157,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -158,7 +176,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -194,12 +212,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts",
@@ -225,7 +243,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/target.ts SVC-1-1 "const a = 10;\nconst b = 10;/**\n* Testing comment line 1\n* line 2\n* line 3\n* line 4\n*/\nconst c = 10;"
@@ -236,7 +254,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -255,15 +273,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_pasteIntoSameFile.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_pasteIntoSameFile.js
index 9893d3a138057..5135984ec5b93 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_pasteIntoSameFile.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_pasteIntoSameFile.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/target.ts]
 const k = 1;
 console.log(k);
@@ -19,12 +34,12 @@ console.log(k);
 console.log("test");
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["target.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["target.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts"
@@ -39,6 +54,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/target.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -53,7 +71,7 @@ Info seq  [hh:mm:ss:mss] event:
       }
     }
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -63,18 +81,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/target.ts SVC-1-0 "const k = 1;\nconsole.log(k);\n\n\nconsole.log(\"test\");"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	target.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -111,7 +129,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -119,12 +137,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
   {"pollingInterval":2000}
 
@@ -141,15 +159,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -160,7 +178,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -196,12 +214,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts",
@@ -242,7 +260,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/target.ts SVC-1-1 "const k = 1;\nconsole.log(k);\n\nconsole.log(k);\nconsole.log(\"test\");"
@@ -253,7 +271,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -272,15 +290,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection0.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection0.js
index 775a151962d36..898763eee81cc 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection0.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection0.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() { }
 const x = foo()
@@ -22,12 +37,12 @@ x
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "folder/target.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts"
@@ -43,6 +58,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/folder/target.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -58,7 +76,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -68,19 +86,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\nconst x = foo()\n\nfoo()\nx"
 	/home/src/workspaces/project/folder/target.ts SVC-1-0 ""
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	folder/target.ts
@@ -119,7 +137,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -127,12 +145,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -151,15 +169,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -174,7 +192,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -210,12 +228,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts",
@@ -256,7 +274,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\nconst x = foo()\n\nfoo()\nx"
@@ -268,7 +286,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -287,15 +305,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection1.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection1.js
index 33b5dbf19fc0c..4261168f52d35 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection1.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() { }
 const x = foo()
@@ -22,12 +37,12 @@ x
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "folder/target.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts"
@@ -43,6 +58,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/folder/target.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -58,7 +76,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -68,19 +86,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\nconst x = foo()\n\nfoo()\nx"
 	/home/src/workspaces/project/folder/target.ts SVC-1-0 ""
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	folder/target.ts
@@ -119,7 +137,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -127,12 +145,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -151,15 +169,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -174,7 +192,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -210,12 +228,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts",
@@ -256,7 +274,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\nconst x = foo()\n\nfoo()\nx"
@@ -268,7 +286,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -331,15 +349,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection2.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection2.js
index 1330ac12464dd..27d65f83c15e0 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection2.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() { }
 
@@ -21,12 +36,12 @@ foo()
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "folder/target.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts"
@@ -42,6 +57,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/folder/target.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -57,7 +75,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -67,19 +85,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\n\n// comment\nfoo()"
 	/home/src/workspaces/project/folder/target.ts SVC-1-0 ""
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	folder/target.ts
@@ -118,7 +136,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -126,12 +144,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -150,15 +168,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -173,7 +191,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -209,12 +227,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts",
@@ -255,7 +273,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\n\n// comment\nfoo()"
@@ -267,7 +285,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -330,15 +348,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection3.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection3.js
index 119277b14b73d..142fb9c546e2a 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection3.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() { }
 
@@ -21,12 +36,12 @@ foo()
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "folder/target.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts"
@@ -42,6 +57,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/folder/target.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -57,7 +75,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -67,19 +85,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\n\n/* comment */\nfoo()"
 	/home/src/workspaces/project/folder/target.ts SVC-1-0 ""
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	folder/target.ts
@@ -118,7 +136,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -126,12 +144,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -150,15 +168,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -173,7 +191,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -209,12 +227,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts",
@@ -255,7 +273,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\n\n/* comment */\nfoo()"
@@ -267,7 +285,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -330,15 +348,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection4.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection4.js
index 6c9f5c0e3e0ac..4cbf71f7f35c9 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection4.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection4.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() { }
 
@@ -24,12 +39,12 @@ foo()
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "folder/target.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts"
@@ -45,6 +60,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/folder/target.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -60,7 +78,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -70,19 +88,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\n\n/*\n  comment\n  more comment\n*/\nfoo()"
 	/home/src/workspaces/project/folder/target.ts SVC-1-0 ""
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	folder/target.ts
@@ -121,7 +139,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -129,12 +147,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -153,15 +171,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -176,7 +194,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -212,12 +230,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts",
@@ -258,7 +276,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\n\n/*\n  comment\n  more comment\n*/\nfoo()"
@@ -270,7 +288,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -333,15 +351,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection5.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection5.js
index 469122edafceb..e2d5c9eed7312 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection5.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection5.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() { }
 
@@ -21,12 +36,12 @@ foo()
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "folder/target.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts"
@@ -42,6 +57,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/folder/target.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -57,7 +75,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -67,19 +85,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\n\n// comment\nfoo()"
 	/home/src/workspaces/project/folder/target.ts SVC-1-0 ""
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	folder/target.ts
@@ -118,7 +136,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -126,12 +144,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -150,15 +168,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -173,7 +191,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -209,12 +227,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts",
@@ -255,7 +273,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\n\n// comment\nfoo()"
@@ -267,7 +285,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -330,15 +348,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection6.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection6.js
index 61ddc00927f02..5f9c82907b3c8 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection6.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection6.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() { }
 const x = foo()
@@ -24,12 +39,12 @@ x
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "folder/target.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts"
@@ -45,6 +60,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/folder/target.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -60,7 +78,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -70,19 +88,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\nconst x = foo()\n\n// comment\nfoo()\n/* another comment */\nx"
 	/home/src/workspaces/project/folder/target.ts SVC-1-0 ""
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	folder/target.ts
@@ -121,7 +139,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -129,12 +147,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -153,15 +171,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -176,7 +194,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -212,12 +230,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts",
@@ -258,7 +276,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\nconst x = foo()\n\n// comment\nfoo()\n/* another comment */\nx"
@@ -270,7 +288,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -344,15 +362,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection7.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection7.js
index 2dc5f7a6c9ec5..110b2b2cf8b2a 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection7.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection7.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() { }
 const x = foo()
@@ -24,12 +39,12 @@ x
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "folder/target.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts"
@@ -45,6 +60,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/folder/target.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -60,7 +78,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -70,19 +88,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\nconst x = foo()\n\n// comment\nfoo\n/* another comment */\nx"
 	/home/src/workspaces/project/folder/target.ts SVC-1-0 ""
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	folder/target.ts
@@ -121,7 +139,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -129,12 +147,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -153,15 +171,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -176,7 +194,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -212,12 +230,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts",
@@ -258,7 +276,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\nconst x = foo()\n\n// comment\nfoo\n/* another comment */\nx"
@@ -270,7 +288,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -333,15 +351,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection8.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection8.js
index 7032885f50e74..bc31004c2b15b 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection8.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection8.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() { }
 const aaaa = foo()
@@ -24,12 +39,12 @@ aaaa
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "folder/target.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts"
@@ -45,6 +60,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/folder/target.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -60,7 +78,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -70,19 +88,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\nconst aaaa = foo()\n\n// comment\nfoo\n/* another comment */\naaaa"
 	/home/src/workspaces/project/folder/target.ts SVC-1-0 ""
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	folder/target.ts
@@ -121,7 +139,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -129,12 +147,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -153,15 +171,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -176,7 +194,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -212,12 +230,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts",
@@ -258,7 +276,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\nconst aaaa = foo()\n\n// comment\nfoo\n/* another comment */\naaaa"
@@ -270,7 +288,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -333,15 +351,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection9.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection9.js
index f769b1e2c9537..8e8531aa8e2ce 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection9.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_rangeSelection9.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a.ts]
 function foo() { }
 
@@ -22,12 +37,12 @@ foo
 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["a.ts", "folder/target.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts"
@@ -43,6 +58,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/folder/target.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -58,7 +76,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -68,19 +86,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\n\n// comment\nfoo\n/* another comment */"
 	/home/src/workspaces/project/folder/target.ts SVC-1-0 ""
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	folder/target.ts
@@ -119,7 +137,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -127,12 +145,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -151,15 +169,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -174,7 +192,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -210,12 +228,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/target.ts",
@@ -256,7 +274,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/a.ts Text-1 "function foo() { }\n\n// comment\nfoo\n/* another comment */"
@@ -268,7 +286,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -331,15 +349,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_requireImportJsx.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_requireImportJsx.js
index 09a372ed9d899..2cd09ff3503bd 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_requireImportJsx.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_requireImportJsx.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/b.jsx]
 import React = require("./react");
 
@@ -31,12 +46,12 @@ declare namespace React {
 }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["folder/c.jsx", "react.d.ts", "b.jsx"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["folder/c.jsx", "react.d.ts", "b.jsx"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/c.jsx"
@@ -53,6 +68,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/b.jsx"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -71,7 +89,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -81,7 +99,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/folder/c.jsx SVC-1-0 ""
@@ -89,12 +107,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/b.jsx Text-1 "import React = require(\"./react\");\n\nclass MyComponent extends React.Component {\n    render() {\n        return <div />;\n    }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	folder/c.jsx
 	  Part of 'files' list in tsconfig.json
 	react.d.ts
@@ -136,7 +154,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -144,12 +162,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/b.jsx: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/react.d.ts: *new*
@@ -174,15 +192,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -201,7 +219,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -237,12 +255,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/folder/c.jsx",
@@ -283,7 +301,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/folder/c.jsx SVC-1-1 "class MyComponent extends React.Component {\n    render() {\n        return <div />;\n    }\n}"
@@ -296,7 +314,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -343,15 +361,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_revertUpdatedFile.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_revertUpdatedFile.js
index 05f9b333578ad..96cab361b0763 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_revertUpdatedFile.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_revertUpdatedFile.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/other.ts]
 export const t = 1;
 
@@ -26,12 +41,12 @@ var x;
 var y = x as 
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["target.ts", "other.ts", "other2.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["target.ts", "other.ts", "other2.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts"
@@ -48,6 +63,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/other2.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -64,7 +82,7 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/other.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/other2.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -74,7 +92,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/other.ts Text-1 "export const t = 1;"
@@ -82,12 +100,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/other2.ts Text-1 "export const t2 = 1;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	other.ts
 	  Imported via "./other" from file 'target.ts'
 	  Part of 'files' list in tsconfig.json
@@ -129,7 +147,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -137,12 +155,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/other.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/other2.ts: *new*
@@ -163,15 +181,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -190,7 +208,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -226,12 +244,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts",
@@ -257,7 +275,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/other.ts Text-1 "export const t = 1;"
@@ -270,7 +288,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -317,15 +335,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -344,7 +362,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -356,12 +374,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/target.ts",
@@ -374,7 +392,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 3 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/other.ts Text-1 "export const t = 1;"
@@ -393,7 +411,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_unknownSourceFile.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_unknownSourceFile.js
index 632c366dafabc..9d10484b34b73 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_unknownSourceFile.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_unknownSourceFile.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/file1.ts]
 export interface Test1 {}
 export interface Test2 {}
@@ -23,12 +38,12 @@ const b = 10;
 const c = 10;
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["file1.ts", "file2.ts"] }
+{ "compilerOptions": { "lib": ["es5"] }, "files": ["file1.ts", "file2.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/file2.ts"
@@ -44,6 +59,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/file2.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -59,7 +77,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/file1.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -69,19 +87,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/file1.ts Text-1 "export interface Test1 {}\nexport interface Test2 {}\nexport interface Test3 {}\nexport interface Test4 {}"
 	/home/src/workspaces/project/file2.ts SVC-1-0 "const a = 10;\nconst b = 10;\nconst c = 10;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	file1.ts
 	  Part of 'files' list in tsconfig.json
 	file2.ts
@@ -120,7 +138,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -128,12 +146,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/file1.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -152,15 +170,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -175,7 +193,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "formatOptions": {
@@ -211,12 +229,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/file2.ts",
@@ -242,7 +260,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspac
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/file1.ts Text-1 "export interface Test1 {}\nexport interface Test2 {}\nexport interface Test3 {}\nexport interface Test4 {}"
@@ -254,7 +272,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "getPasteEdits",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -301,15 +319,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard1.js b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard1.js
index 4ff1886d76c26..4f531e1754335 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard1.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "name": "foo",
@@ -46,6 +64,7 @@ import { } from "";
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "nodenext",
     "rootDir": "src",
     "outDir": "dist"
@@ -55,7 +74,7 @@ import { } from "";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -73,6 +92,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/arguments/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
@@ -96,23 +118,37 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/m.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/arguments/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/arguments/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (4)
+Info seq  [hh:mm:ss:mss] 	Files (7)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/blah.ts Text-1 "export const blah = 0;"
 	/home/src/workspaces/project/src/index.ts Text-1 "export const index = 0;"
 	/home/src/workspaces/project/src/m.mts Text-1 "import { } from \"\";"
 	/home/src/workspaces/project/src/arguments/index.ts Text-1 "export const arguments = 0;"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/blah.ts
 	  Matched by default include pattern '**/*'
 	  File is CommonJS module because 'package.json' does not have field "type"
@@ -143,62 +179,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -206,25 +196,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"lib\": [\"es5\"],\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (4)
+Info seq  [hh:mm:ss:mss] 	Files (7)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -239,7 +229,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -247,14 +237,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -296,17 +293,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/arguments/index.ts *new*
     version: Text-1
@@ -331,7 +331,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/m.mts"
@@ -341,7 +341,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/m.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/m.mts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (4)
+Info seq  [hh:mm:ss:mss] 	Files (7)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -358,19 +358,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -414,17 +421,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/arguments/index.ts
     version: Text-1
@@ -450,7 +460,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -462,12 +472,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/m.mts",
@@ -481,7 +491,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard2.js b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard2.js
index 153e074a54546..39a8ec8b768ca 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard2.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "name": "salesforce-pageobjects",
@@ -33,6 +51,7 @@ import { } from "";
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "nodenext",
     "rootDir": "src",
     "outDir": "dist"
@@ -42,7 +61,7 @@ import { } from "";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -58,6 +77,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
@@ -79,22 +101,36 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/index.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/action/pageObjects/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/action/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/index.mts Text-1 "import { } from \"\";"
 	/home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts Text-1 "export const actionRenderer = 0;"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/index.mts
 	  Matched by default include pattern '**/*'
 	src/action/pageObjects/actionRenderer.ts
@@ -119,62 +155,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -182,25 +172,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"lib\": [\"es5\"],\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -215,7 +205,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -223,14 +213,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -270,17 +267,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts *new*
     version: Text-1
@@ -297,7 +297,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts"
@@ -307,7 +307,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/index.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/index.mts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -324,19 +324,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -378,17 +385,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -406,7 +416,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -418,12 +428,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -437,7 +447,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
@@ -456,7 +466,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -473,7 +483,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
@@ -488,17 +498,20 @@ Projects::
     dirty: true *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -515,7 +528,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -532,22 +545,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -564,7 +580,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -579,13 +595,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -602,22 +618,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -634,7 +653,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -649,13 +668,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -672,22 +691,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -704,7 +726,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -719,13 +741,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -742,22 +764,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -774,7 +799,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -789,13 +814,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -812,22 +837,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -844,7 +872,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -859,13 +887,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -882,22 +910,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -914,7 +945,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -929,13 +960,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -952,22 +983,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -984,7 +1018,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -999,13 +1033,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1022,22 +1056,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -1054,7 +1091,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 20,
+      "seq": 21,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1069,13 +1106,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 20,
+      "request_seq": 21,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 21,
+      "seq": 22,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -1087,12 +1124,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 21,
+      "request_seq": 22,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 22,
+      "seq": 23,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1112,7 +1149,10 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/index.mts SVC-2-9 "import { } from \"#action/\";"
 	/home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts Text-1 "export const actionRenderer = 0;"
 
@@ -1122,7 +1162,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 22,
+      "request_seq": 23,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1144,14 +1184,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -1198,7 +1245,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 23,
+      "seq": 24,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1215,7 +1262,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 23,
+      "request_seq": 24,
       "success": true
     }
 After Request
@@ -1230,17 +1277,20 @@ Projects::
     dirty: true *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -1257,7 +1307,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 24,
+      "seq": 25,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1274,22 +1324,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 24,
+      "request_seq": 25,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -1306,7 +1359,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 25,
+      "seq": 26,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1321,13 +1374,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 25,
+      "request_seq": 26,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 26,
+      "seq": 27,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1344,22 +1397,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 26,
+      "request_seq": 27,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -1376,7 +1432,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 27,
+      "seq": 28,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1391,13 +1447,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 27,
+      "request_seq": 28,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 28,
+      "seq": 29,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1414,22 +1470,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 28,
+      "request_seq": 29,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -1446,7 +1505,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 29,
+      "seq": 30,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1461,13 +1520,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 29,
+      "request_seq": 30,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 30,
+      "seq": 31,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1484,22 +1543,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 30,
+      "request_seq": 31,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -1516,7 +1578,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 31,
+      "seq": 32,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1531,13 +1593,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 31,
+      "request_seq": 32,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 32,
+      "seq": 33,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1554,22 +1616,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 32,
+      "request_seq": 33,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -1586,7 +1651,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 33,
+      "seq": 34,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1601,13 +1666,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 33,
+      "request_seq": 34,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 34,
+      "seq": 35,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1624,22 +1689,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 34,
+      "request_seq": 35,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -1656,7 +1724,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 35,
+      "seq": 36,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1671,13 +1739,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 35,
+      "request_seq": 36,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 36,
+      "seq": 37,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1694,22 +1762,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 36,
+      "request_seq": 37,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -1726,7 +1797,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 37,
+      "seq": 38,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1741,13 +1812,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 37,
+      "request_seq": 38,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 38,
+      "seq": 39,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1764,22 +1835,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 38,
+      "request_seq": 39,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -1796,7 +1870,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 39,
+      "seq": 40,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1811,13 +1885,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 39,
+      "request_seq": 40,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 40,
+      "seq": 41,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1834,22 +1908,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 40,
+      "request_seq": 41,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -1866,7 +1943,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 41,
+      "seq": 42,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1881,13 +1958,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 41,
+      "request_seq": 42,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 42,
+      "seq": 43,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1904,22 +1981,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 42,
+      "request_seq": 43,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -1936,7 +2016,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 43,
+      "seq": 44,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1951,13 +2031,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 43,
+      "request_seq": 44,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 44,
+      "seq": 45,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -1974,22 +2054,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 44,
+      "request_seq": 45,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -2006,7 +2089,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 45,
+      "seq": 46,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -2021,13 +2104,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 45,
+      "request_seq": 46,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 46,
+      "seq": 47,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -2044,22 +2127,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 46,
+      "request_seq": 47,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts
     version: Text-1
@@ -2076,7 +2162,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 47,
+      "seq": 48,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -2091,13 +2177,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 47,
+      "request_seq": 48,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 48,
+      "seq": 49,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -2109,12 +2195,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 48,
+      "request_seq": 49,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 49,
+      "seq": 50,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -2126,7 +2212,10 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 3 projectProgramVersion: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/index.mts SVC-2-22 "import { } from \"#action/pageObjects/\";"
 	/home/src/workspaces/project/src/action/pageObjects/actionRenderer.ts Text-1 "export const actionRenderer = 0;"
 
@@ -2136,7 +2225,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 49,
+      "request_seq": 50,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard3.js b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard3.js
index d781a9725159a..c21aea873ff8e 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard3.js
@@ -1,16 +1,35 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "declarationDir": "/home/src/workspaces/project/types",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/nope.ts]
 export const nope = 0;
 
@@ -39,6 +58,7 @@ export const one = 0;
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "nodenext",
     "rootDir": "src",
     "outDir": "dist",
@@ -49,7 +69,7 @@ export const one = 0;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -68,6 +88,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/components/subfolder/one.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
@@ -93,18 +116,26 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/components/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/components/subfolder/one.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/components/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/components/subfolder/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (5)
+Info seq  [hh:mm:ss:mss] 	Files (8)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/nope.ts Text-1 "export const nope = 0;"
 	/home/src/workspaces/project/src/a.ts Text-1 "import { } from \"\";"
 	/home/src/workspaces/project/src/components/blah.ts Text-1 "export const blah = 0;"
@@ -112,6 +143,12 @@ Info seq  [hh:mm:ss:mss] 	Files (5)
 	/home/src/workspaces/project/src/components/subfolder/one.ts Text-1 "export const one = 0;"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	nope.ts
 	  Matched by default include pattern '**/*'
 	  File is CommonJS module because 'package.json' does not have field "type"
@@ -147,11 +184,6 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
         "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
           {
             "text": "File '/home/src/workspaces/project/nope.ts' is not under 'rootDir' '/home/src/workspaces/project/src'. 'rootDir' is expected to contain all source files.\n  The file is in the program because:\n    Matched by default include pattern '**/*'\n  File is CommonJS module because '/home/src/workspaces/project/package.json' does not have field \"type\"",
             "code": 6059,
@@ -159,57 +191,17 @@ Info seq  [hh:mm:ss:mss] event:
           },
           {
             "start": {
-              "line": 6,
+              "line": 7,
               "offset": 5
             },
             "end": {
-              "line": 6,
+              "line": 7,
               "offset": 21
             },
             "text": "Option 'declarationDir' cannot be specified without specifying option 'declaration' or option 'composite'.",
             "code": 5069,
             "category": "error",
             "fileName": "/home/src/workspaces/project/tsconfig.json"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
           }
         ]
       }
@@ -218,9 +210,9 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -228,25 +220,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\",\n    \"declarationDir\": \"types\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"lib\": [\"es5\"],\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\",\n    \"declarationDir\": \"types\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (5)
+Info seq  [hh:mm:ss:mss] 	Files (8)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -261,7 +253,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -269,14 +261,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/nope.ts: *new*
@@ -322,17 +321,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts *new*
     version: Text-1
@@ -361,7 +363,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts"
@@ -371,7 +373,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/a.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (5)
+Info seq  [hh:mm:ss:mss] 	Files (8)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -388,19 +390,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/nope.ts:
@@ -448,17 +457,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -488,7 +500,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -500,12 +512,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -519,7 +531,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
@@ -550,7 +562,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -567,7 +579,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
@@ -582,17 +594,20 @@ Projects::
     dirty: true *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -621,7 +636,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -638,22 +653,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -682,7 +700,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -697,13 +715,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -720,22 +738,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -764,7 +785,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -779,13 +800,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -802,22 +823,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -846,7 +870,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -861,13 +885,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -884,22 +908,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -928,7 +955,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -943,13 +970,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -966,22 +993,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1010,7 +1040,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1025,13 +1055,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1048,22 +1078,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1092,7 +1125,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1107,13 +1140,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1130,22 +1163,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1174,7 +1210,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1189,13 +1225,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1212,22 +1248,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1256,7 +1295,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 20,
+      "seq": 21,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1271,13 +1310,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 20,
+      "request_seq": 21,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 21,
+      "seq": 22,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1294,22 +1333,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 21,
+      "request_seq": 22,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1338,7 +1380,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 22,
+      "seq": 23,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1353,13 +1395,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 22,
+      "request_seq": 23,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 23,
+      "seq": 24,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1376,22 +1418,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 23,
+      "request_seq": 24,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1420,7 +1465,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 24,
+      "seq": 25,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1435,13 +1480,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 24,
+      "request_seq": 25,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 25,
+      "seq": 26,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1458,22 +1503,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 25,
+      "request_seq": 26,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1502,7 +1550,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 26,
+      "seq": 27,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1517,13 +1565,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 26,
+      "request_seq": 27,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 27,
+      "seq": 28,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1540,22 +1588,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 27,
+      "request_seq": 28,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1584,7 +1635,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 28,
+      "seq": 29,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1599,13 +1650,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 28,
+      "request_seq": 29,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 29,
+      "seq": 30,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1622,22 +1673,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 29,
+      "request_seq": 30,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1666,7 +1720,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 30,
+      "seq": 31,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1681,13 +1735,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 30,
+      "request_seq": 31,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 31,
+      "seq": 32,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1704,22 +1758,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 31,
+      "request_seq": 32,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1748,7 +1805,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 32,
+      "seq": 33,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1763,13 +1820,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 32,
+      "request_seq": 33,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 33,
+      "seq": 34,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1786,22 +1843,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 33,
+      "request_seq": 34,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1830,7 +1890,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 34,
+      "seq": 35,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1845,13 +1905,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 34,
+      "request_seq": 35,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 35,
+      "seq": 36,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1868,22 +1928,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 35,
+      "request_seq": 36,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1912,7 +1975,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 36,
+      "seq": 37,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1927,13 +1990,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 36,
+      "request_seq": 37,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 37,
+      "seq": 38,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -1950,22 +2013,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 37,
+      "request_seq": 38,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1994,7 +2060,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 38,
+      "seq": 39,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -2009,13 +2075,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 38,
+      "request_seq": 39,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 39,
+      "seq": 40,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -2032,22 +2098,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 39,
+      "request_seq": 40,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -2076,7 +2145,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 40,
+      "seq": 41,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -2091,13 +2160,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 40,
+      "request_seq": 41,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 41,
+      "seq": 42,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -2114,22 +2183,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 41,
+      "request_seq": 42,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -2158,7 +2230,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 42,
+      "seq": 43,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -2173,13 +2245,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 42,
+      "request_seq": 43,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 43,
+      "seq": 44,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -2196,22 +2268,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 43,
+      "request_seq": 44,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -2240,7 +2315,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 44,
+      "seq": 45,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -2255,13 +2330,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 44,
+      "request_seq": 45,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 45,
+      "seq": 46,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -2278,22 +2353,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 45,
+      "request_seq": 46,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -2322,7 +2400,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 46,
+      "seq": 47,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -2337,13 +2415,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 46,
+      "request_seq": 47,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 47,
+      "seq": 48,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -2355,12 +2433,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 47,
+      "request_seq": 48,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 48,
+      "seq": 49,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.ts",
@@ -2378,7 +2456,10 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (5)
+Info seq  [hh:mm:ss:mss] 	Files (8)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/nope.ts Text-1 "export const nope = 0;"
 	/home/src/workspaces/project/src/a.ts SVC-2-22 "import { } from \"#component-subfolder/\";"
 	/home/src/workspaces/project/src/components/blah.ts Text-1 "export const blah = 0;"
@@ -2391,7 +2472,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 48,
+      "request_seq": 49,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -2413,14 +2494,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/nope.ts:
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard4.js b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard4.js
index 2d30bc322561e..7b02cbe0aa110 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard4.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard4.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/nope.ts]
 export const nope = 0;
 
@@ -43,6 +61,7 @@ export const one = 0;
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "nodenext",
     "rootDir": "src",
     "outDir": "dist"
@@ -52,7 +71,7 @@ export const one = 0;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -72,6 +91,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/subfolder/one.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
@@ -97,18 +119,26 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/foo/onlyInFooFolder.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/subfolder/one.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/foo/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/subfolder/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (6)
+Info seq  [hh:mm:ss:mss] 	Files (9)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/nope.ts Text-1 "export const nope = 0;"
 	/home/src/workspaces/project/src/a.mts Text-1 "import { } from \"\";"
 	/home/src/workspaces/project/src/blah.ts Text-1 "export const blah = 0;"
@@ -117,6 +147,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/home/src/workspaces/project/src/subfolder/one.ts Text-1 "export const one = 0;"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	nope.ts
 	  Matched by default include pattern '**/*'
 	  File is CommonJS module because 'package.json' does not have field "type"
@@ -154,55 +190,10 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
         "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
           {
             "text": "File '/home/src/workspaces/project/nope.ts' is not under 'rootDir' '/home/src/workspaces/project/src'. 'rootDir' is expected to contain all source files.\n  The file is in the program because:\n    Matched by default include pattern '**/*'\n  File is CommonJS module because '/home/src/workspaces/project/package.json' does not have field \"type\"",
             "code": 6059,
             "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
           }
         ]
       }
@@ -211,9 +202,9 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -221,25 +212,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"lib\": [\"es5\"],\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (6)
+Info seq  [hh:mm:ss:mss] 	Files (9)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -254,7 +245,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -262,14 +253,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/nope.ts: *new*
@@ -317,17 +315,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts *new*
     version: Text-1
@@ -360,7 +361,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts"
@@ -370,7 +371,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/a.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/a.mts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (6)
+Info seq  [hh:mm:ss:mss] 	Files (9)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -387,19 +388,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/nope.ts:
@@ -449,17 +457,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -493,7 +504,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -505,12 +516,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -524,7 +535,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
@@ -579,7 +590,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -596,7 +607,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
@@ -611,17 +622,20 @@ Projects::
     dirty: true *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -654,7 +668,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -671,22 +685,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -719,7 +736,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -734,13 +751,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -757,22 +774,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -805,7 +825,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -820,13 +840,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -843,22 +863,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -891,7 +914,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -906,13 +929,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -929,22 +952,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -977,7 +1003,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -992,13 +1018,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -1015,22 +1041,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1063,7 +1092,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -1078,13 +1107,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -1096,12 +1125,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -1119,7 +1148,10 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (6)
+Info seq  [hh:mm:ss:mss] 	Files (9)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/nope.ts Text-1 "export const nope = 0;"
 	/home/src/workspaces/project/src/a.mts SVC-2-6 "import { } from \"#foo/\";"
 	/home/src/workspaces/project/src/blah.ts Text-1 "export const blah = 0;"
@@ -1133,7 +1165,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -1179,14 +1211,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/nope.ts:
@@ -1239,7 +1278,7 @@ Projects::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -1256,7 +1295,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true
     }
 After Request
@@ -1271,17 +1310,20 @@ Projects::
     dirty: true *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1314,7 +1356,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -1331,22 +1373,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1379,7 +1424,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -1394,13 +1439,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 20,
+      "seq": 21,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -1417,22 +1462,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 20,
+      "request_seq": 21,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1465,7 +1513,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 21,
+      "seq": 22,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -1480,13 +1528,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 21,
+      "request_seq": 22,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 22,
+      "seq": 23,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -1503,22 +1551,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 22,
+      "request_seq": 23,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1551,7 +1602,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 23,
+      "seq": 24,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -1566,13 +1617,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 23,
+      "request_seq": 24,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 24,
+      "seq": 25,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -1589,22 +1640,25 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 24,
+      "request_seq": 25,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/nope.ts
     version: Text-1
@@ -1637,7 +1691,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 25,
+      "seq": 26,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -1652,13 +1706,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 25,
+      "request_seq": 26,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 26,
+      "seq": 27,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -1670,12 +1724,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 26,
+      "request_seq": 27,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 27,
+      "seq": 28,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/a.mts",
@@ -1687,7 +1741,10 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 3 projectProgramVersion: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (6)
+Info seq  [hh:mm:ss:mss] 	Files (9)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/nope.ts Text-1 "export const nope = 0;"
 	/home/src/workspaces/project/src/a.mts SVC-2-11 "import { } from \"#foo/foo/\";"
 	/home/src/workspaces/project/src/blah.ts Text-1 "export const blah = 0;"
@@ -1701,7 +1758,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 27,
+      "request_seq": 28,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard5.js b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard5.js
index 3f998d706aa26..8e4a2f7c11596 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard5.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard5.js
@@ -1,16 +1,35 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist/esm",
+          "declarationDir": "/home/src/workspaces/project/dist/types",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "name": "foo",
@@ -55,6 +74,7 @@ export const onlyInCjs = 0;
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "nodenext",
     "rootDir": "src",
     "outDir": "dist/esm",
@@ -65,7 +85,7 @@ export const onlyInCjs = 0;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -84,6 +104,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/only-in-cjs/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist/esm",
@@ -109,17 +132,25 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/only-in-cjs/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/only-in-cjs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (5)
+Info seq  [hh:mm:ss:mss] 	Files (8)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/blah.mts Text-1 "export const blah = 0;"
 	/home/src/workspaces/project/src/blah.ts Text-1 "export const blah = 0;"
 	/home/src/workspaces/project/src/index.mts Text-1 "import { } from \"\";"
@@ -127,6 +158,12 @@ Info seq  [hh:mm:ss:mss] 	Files (5)
 	/home/src/workspaces/project/src/only-in-cjs/index.ts Text-1 "export const onlyInCjs = 0;"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/blah.mts
 	  Matched by default include pattern '**/*'
 	src/blah.ts
@@ -160,64 +197,19 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
         "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
           {
             "start": {
-              "line": 6,
+              "line": 7,
               "offset": 5
             },
             "end": {
-              "line": 6,
+              "line": 7,
               "offset": 21
             },
             "text": "Option 'declarationDir' cannot be specified without specifying option 'declaration' or option 'composite'.",
             "code": 5069,
             "category": "error",
             "fileName": "/home/src/workspaces/project/tsconfig.json"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
           }
         ]
       }
@@ -226,9 +218,9 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -236,25 +228,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist/esm\",\n    \"declarationDir\": \"dist/types\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"lib\": [\"es5\"],\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist/esm\",\n    \"declarationDir\": \"dist/types\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (5)
+Info seq  [hh:mm:ss:mss] 	Files (8)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -269,7 +261,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -277,14 +269,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -328,17 +327,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/blah.mts *new*
     version: Text-1
@@ -367,7 +369,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts"
@@ -377,7 +379,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/index.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/index.mts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (5)
+Info seq  [hh:mm:ss:mss] 	Files (8)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -394,19 +396,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -452,17 +461,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/blah.mts
     version: Text-1
@@ -492,7 +504,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -504,12 +516,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -523,7 +535,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard6.js b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard6.js
index 0ff27652de5f6..6fc7364c48bbc 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard6.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard6.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "name": "foo",
@@ -34,6 +52,7 @@ import { } from "";
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "nodenext",
     "rootDir": "src",
     "outDir": "dist"
@@ -43,7 +62,7 @@ import { } from "";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -60,6 +79,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/m.mts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
@@ -82,21 +104,35 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/m.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/blah?.ts Text-1 "export const blah = 0;"
 	/home/src/workspaces/project/src/index.ts Text-1 "export const index = 0;"
 	/home/src/workspaces/project/src/m.mts Text-1 "import { } from \"\";"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/blah?.ts
 	  Matched by default include pattern '**/*'
 	  File is CommonJS module because 'package.json' does not have field "type"
@@ -124,62 +160,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -187,25 +177,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"lib\": [\"es5\"],\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -220,7 +210,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -228,14 +218,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -273,17 +270,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/blah?.ts *new*
     version: Text-1
@@ -304,7 +304,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/m.mts"
@@ -314,7 +314,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/m.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/m.mts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -331,19 +331,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -383,17 +390,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/blah?.ts
     version: Text-1
@@ -415,7 +425,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -427,12 +437,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/m.mts",
@@ -446,7 +456,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard7.js b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard7.js
index c33d266816c75..68aea684fda12 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard7.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard7.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "name": "foo",
@@ -28,6 +46,7 @@ import { } from "";
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "nodenext",
     "rootDir": "src",
     "outDir": "dist"
@@ -37,7 +56,7 @@ import { } from "";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -53,6 +72,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/index.mts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
@@ -74,20 +96,34 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/blah.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/index.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/blah.ts Text-1 "export const blah = 0;"
 	/home/src/workspaces/project/src/index.mts Text-1 "import { } from \"\";"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/blah.ts
 	  Matched by default include pattern '**/*'
 	  File is CommonJS module because 'package.json' does not have field "type"
@@ -112,62 +148,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -175,25 +165,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"lib\": [\"es5\"],\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -208,7 +198,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -216,14 +206,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -259,17 +256,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/blah.ts *new*
     version: Text-1
@@ -286,7 +286,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts"
@@ -296,7 +296,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/index.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/index.mts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -313,19 +313,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -363,17 +370,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/blah.ts
     version: Text-1
@@ -391,7 +401,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -403,12 +413,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -422,7 +432,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard8.js b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard8.js
index c33d266816c75..68aea684fda12 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard8.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard8.js
@@ -1,16 +1,34 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "name": "foo",
@@ -28,6 +46,7 @@ import { } from "";
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "nodenext",
     "rootDir": "src",
     "outDir": "dist"
@@ -37,7 +56,7 @@ import { } from "";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -53,6 +72,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/index.mts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
@@ -74,20 +96,34 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/blah.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/index.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/blah.ts Text-1 "export const blah = 0;"
 	/home/src/workspaces/project/src/index.mts Text-1 "import { } from \"\";"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/blah.ts
 	  Matched by default include pattern '**/*'
 	  File is CommonJS module because 'package.json' does not have field "type"
@@ -112,62 +148,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -175,25 +165,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"lib\": [\"es5\"],\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\"\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -208,7 +198,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -216,14 +206,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -259,17 +256,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/blah.ts *new*
     version: Text-1
@@ -286,7 +286,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts"
@@ -296,7 +296,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/index.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/index.mts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -313,19 +313,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -363,17 +370,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/blah.ts
     version: Text-1
@@ -391,7 +401,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -403,12 +413,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -422,7 +432,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard9.js b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard9.js
index 805cc35df12c6..3d55cf7c1a658 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard9.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/pathCompletionsPackageJsonImportsSrcNoDistWildcard9.js
@@ -1,16 +1,35 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "rootDir": "/home/src/workspaces/project/src",
+          "outDir": "/home/src/workspaces/project/dist",
+          "allowJs": true,
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/package.json]
 {
   "name": "foo",
@@ -28,6 +47,7 @@ import { } from "";
 //// [/home/src/workspaces/project/tsconfig.json]
 {
   "compilerOptions": {
+    "lib": ["es5"],
     "module": "nodenext",
     "rootDir": "src",
     "outDir": "dist",
@@ -38,7 +58,7 @@ import { } from "";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -54,6 +74,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/index.mts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "rootDir": "/home/src/workspaces/project/src",
   "outDir": "/home/src/workspaces/project/dist",
@@ -76,20 +99,34 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/blah.js 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/index.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/src/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/src/blah.js Text-1 "export const blah = 0;"
 	/home/src/workspaces/project/src/index.mts Text-1 "import { } from \"\";"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	src/blah.js
 	  Matched by default include pattern '**/*'
 	  File is CommonJS module because 'package.json' does not have field "type"
@@ -114,62 +151,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -177,25 +168,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\",\n    \"allowJs\": true\n  }\n}"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n  \"compilerOptions\": {\n    \"lib\": [\"es5\"],\n    \"module\": \"nodenext\",\n    \"rootDir\": \"src\",\n    \"outDir\": \"dist\",\n    \"allowJs\": true\n  }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -210,7 +201,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -218,14 +209,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json: *new*
@@ -261,17 +259,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/blah.js *new*
     version: Text-1
@@ -288,7 +289,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts"
@@ -298,7 +299,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/src/index.mts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/src/index.mts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -315,19 +316,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/package.json:
@@ -365,17 +373,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/src/blah.js
     version: Text-1
@@ -393,7 +404,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -405,12 +416,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.mts",
@@ -424,7 +435,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "isGlobalCompletion": false,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/projectInfo01.js b/tests/baselines/reference/tsserver/fourslashServer/projectInfo01.js
index c5fc5fac75cd5..0c45a4c544d28 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/projectInfo01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/projectInfo01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/a.ts]
 export var test = "test String"
 
@@ -27,7 +42,7 @@ console.log("nothing");
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -39,7 +54,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -49,18 +64,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.ts SVC-1-0 "export var test = \"test String\""
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Root file specified for compilation
 
@@ -77,7 +92,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -85,12 +100,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -109,15 +124,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -128,7 +143,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -147,12 +162,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -165,13 +180,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "projectInfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "configFileName": "/dev/null/inferredProject1*",
         "languageServiceDisabled": false,
         "fileNames": [
-          "/home/src/tslibs/TS/Lib/lib.d.ts",
+          "/home/src/tslibs/TS/Lib/lib.es5.d.ts",
           "/home/src/tslibs/TS/Lib/lib.decorators.d.ts",
           "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts",
           "/tests/cases/fourslash/server/a.ts"
@@ -180,7 +195,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.ts"
@@ -197,19 +212,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.ts SVC-1-0 "export var test = \"test String\""
 	/tests/cases/fourslash/server/b.ts SVC-1-0 "import test from \"./a\""
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Imported via "./a" from file 'b.ts'
 	b.ts
@@ -219,18 +234,18 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
 	/tests/cases/fourslash/server/a.ts
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Root file specified for compilation
 
@@ -253,7 +268,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -261,12 +276,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json:
@@ -298,17 +313,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
@@ -325,7 +340,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.ts",
@@ -338,13 +353,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "projectInfo",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": {
         "configFileName": "/dev/null/inferredProject2*",
         "languageServiceDisabled": false,
         "fileNames": [
-          "/home/src/tslibs/TS/Lib/lib.d.ts",
+          "/home/src/tslibs/TS/Lib/lib.es5.d.ts",
           "/home/src/tslibs/TS/Lib/lib.decorators.d.ts",
           "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts",
           "/tests/cases/fourslash/server/a.ts",
@@ -354,7 +369,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/c.ts"
@@ -371,7 +386,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject3* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject3*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (6)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.ts SVC-1-0 "export var test = \"test String\""
@@ -379,12 +394,12 @@ Info seq  [hh:mm:ss:mss] 	Files (6)
 	/tests/cases/fourslash/server/c.ts SVC-1-0 "/// <reference path=\"a.ts\"/>\n/// <reference path=\"b.ts\"/>"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Referenced via 'a.ts' from file 'c.ts'
 	  Imported via "./a" from file 'b.ts'
@@ -397,19 +412,19 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
 	/tests/cases/fourslash/server/a.ts
 	/tests/cases/fourslash/server/b.ts
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Imported via "./a" from file 'b.ts'
 	b.ts
@@ -436,7 +451,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -444,12 +459,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json:
@@ -481,17 +496,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject3* *new*
         /dev/null/inferredProject2* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject3* *new*
         /dev/null/inferredProject2* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject3* *new*
@@ -513,7 +528,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/c.ts",
@@ -526,13 +541,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "projectInfo",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": {
         "configFileName": "/dev/null/inferredProject3*",
         "languageServiceDisabled": false,
         "fileNames": [
-          "/home/src/tslibs/TS/Lib/lib.d.ts",
+          "/home/src/tslibs/TS/Lib/lib.es5.d.ts",
           "/home/src/tslibs/TS/Lib/lib.decorators.d.ts",
           "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts",
           "/tests/cases/fourslash/server/a.ts",
@@ -543,7 +558,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/d.ts"
@@ -560,18 +575,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject4* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject4*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/d.ts SVC-1-0 "console.log(\"nothing\");"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	d.ts
 	  Root file specified for compilation
 
@@ -598,7 +613,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -606,12 +621,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json:
@@ -636,17 +651,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject3*
         /dev/null/inferredProject4* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject3*
         /dev/null/inferredProject4* *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /dev/null/inferredProject3*
@@ -670,7 +685,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/d.ts",
@@ -683,13 +698,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "projectInfo",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": {
         "configFileName": "/dev/null/inferredProject4*",
         "languageServiceDisabled": false,
         "fileNames": [
-          "/home/src/tslibs/TS/Lib/lib.d.ts",
+          "/home/src/tslibs/TS/Lib/lib.es5.d.ts",
           "/home/src/tslibs/TS/Lib/lib.decorators.d.ts",
           "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts",
           "/tests/cases/fourslash/server/d.ts"
diff --git a/tests/baselines/reference/tsserver/fourslashServer/projectInfo02.js b/tests/baselines/reference/tsserver/fourslashServer/projectInfo02.js
index 3fd9190378cf7..6615d7c124990 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/projectInfo02.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/projectInfo02.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/a.ts]
 export var test = "test String"
 
@@ -18,12 +33,12 @@ export var test = "test String"
 export var test2 = "test String"
 
 //// [/tests/cases/fourslash/server/tsconfig.json]
-{ "files": ["a.ts", "b.ts"] }
+{ "files": ["a.ts", "b.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -39,6 +54,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/tsconfig.json : {
   "/tests/cases/fourslash/server/b.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/tests/cases/fourslash/server/tsconfig.json"
  }
 }
@@ -54,7 +72,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Type roots
@@ -64,19 +82,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.ts SVC-1-0 "export var test = \"test String\""
 	/tests/cases/fourslash/server/b.ts Text-1 "export var test2 = \"test String\""
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	b.ts
@@ -115,7 +133,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -123,12 +141,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/b.ts: *new*
   {"pollingInterval":500}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -147,15 +165,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/tsconfig.json
@@ -170,7 +188,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -189,12 +207,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -207,13 +225,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "projectInfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "configFileName": "/tests/cases/fourslash/server/tsconfig.json",
         "languageServiceDisabled": false,
         "fileNames": [
-          "/home/src/tslibs/TS/Lib/lib.d.ts",
+          "/home/src/tslibs/TS/Lib/lib.es5.d.ts",
           "/home/src/tslibs/TS/Lib/lib.decorators.d.ts",
           "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts",
           "/tests/cases/fourslash/server/a.ts",
diff --git a/tests/baselines/reference/tsserver/fourslashServer/projectWithNonExistentFiles.js b/tests/baselines/reference/tsserver/fourslashServer/projectWithNonExistentFiles.js
index cb0dc9490e2d9..c6c46a54ed37c 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/projectWithNonExistentFiles.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/projectWithNonExistentFiles.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/a.ts]
 export var test = "test String"
 
@@ -18,12 +33,12 @@ export var test = "test String"
 export var test2 = "test String"
 
 //// [/tests/cases/fourslash/server/tsconfig.json]
-{ "files": ["a.ts", "c.ts", "b.ts"] }
+{ "files": ["a.ts", "c.ts", "b.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -40,6 +55,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/tsconfig.json : {
   "/tests/cases/fourslash/server/b.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/tests/cases/fourslash/server/tsconfig.json"
  }
 }
@@ -55,7 +73,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/c.ts 500 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Missing file
@@ -66,19 +84,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.ts SVC-1-0 "export var test = \"test String\""
 	/tests/cases/fourslash/server/b.ts Text-1 "export var test2 = \"test String\""
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Part of 'files' list in tsconfig.json
 	b.ts
@@ -141,7 +159,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -149,12 +167,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/b.ts: *new*
   {"pollingInterval":500}
 /tests/cases/fourslash/server/c.ts: *new*
@@ -175,15 +193,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/tsconfig.json
@@ -198,7 +216,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts"
@@ -217,12 +235,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/a.ts",
@@ -235,13 +253,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "projectInfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "configFileName": "/tests/cases/fourslash/server/tsconfig.json",
         "languageServiceDisabled": false,
         "fileNames": [
-          "/home/src/tslibs/TS/Lib/lib.d.ts",
+          "/home/src/tslibs/TS/Lib/lib.es5.d.ts",
           "/home/src/tslibs/TS/Lib/lib.decorators.d.ts",
           "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts",
           "/tests/cases/fourslash/server/a.ts",
diff --git a/tests/baselines/reference/tsserver/fourslashServer/quickinfo01.js b/tests/baselines/reference/tsserver/fourslashServer/quickinfo01.js
index e3aaefde8944d..f606c3a22ae4e 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/quickinfo01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/quickinfo01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/quickinfo01.ts]
 interface One {
     commonProperty: number;
@@ -30,7 +45,7 @@ x.commonFunction;
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/quickinfo01.ts"
@@ -42,7 +57,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -52,18 +67,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/quickinfo01.ts SVC-1-0 "interface One {\n    commonProperty: number;\n    commonFunction(): number;\n}\n\ninterface Two {\n    commonProperty: string\n    commonFunction(): number;\n}\n\nvar x : One | Two;\n\nx.commonProperty;\nx.commonFunction;"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	quickinfo01.ts
 	  Root file specified for compilation
 
@@ -80,7 +95,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -88,12 +103,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -112,15 +127,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -131,7 +146,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/quickinfo01.ts",
@@ -145,7 +160,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": {
         "kind": "var",
@@ -165,7 +180,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/quickinfo01.ts",
@@ -179,7 +194,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "kind": "property",
@@ -199,7 +214,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/quickinfo01.ts",
@@ -213,7 +228,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "kind": "method",
diff --git a/tests/baselines/reference/tsserver/fourslashServer/quickinfoVerbosityServer.js b/tests/baselines/reference/tsserver/fourslashServer/quickinfoVerbosityServer.js
index 0c9ff4dd1514b..83ccb793837d4 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/quickinfoVerbosityServer.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/quickinfoVerbosityServer.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/quickinfoVerbosityServer.ts]
 type FooType = string | number
 const foo: FooType = 1
@@ -18,7 +33,7 @@ const foo: FooType = 1
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/quickinfoVerbosityServer.ts"
@@ -30,7 +45,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -40,18 +55,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/quickinfoVerbosityServer.ts SVC-1-0 "type FooType = string | number\nconst foo: FooType = 1"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	quickinfoVerbosityServer.ts
 	  Root file specified for compilation
 
@@ -68,7 +83,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -76,12 +91,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -100,15 +115,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -119,7 +134,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/quickinfoVerbosityServer.ts",
@@ -134,7 +149,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": {
         "kind": "const",
@@ -155,7 +170,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/quickinfoVerbosityServer.ts",
@@ -170,7 +185,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "kind": "const",
diff --git a/tests/baselines/reference/tsserver/fourslashServer/quickinfoWrongComment.js b/tests/baselines/reference/tsserver/fourslashServer/quickinfoWrongComment.js
index 5f812edb64f71..f99f414deb1b4 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/quickinfoWrongComment.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/quickinfoWrongComment.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/quickinfoWrongComment.ts]
 interface I {
     /** The colour */
@@ -29,7 +44,7 @@ f.colour
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/quickinfoWrongComment.ts"
@@ -41,7 +56,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -51,18 +66,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/quickinfoWrongComment.ts SVC-1-0 "interface I {\n    /** The colour */\n    readonly colour: string\n}\ninterface A extends I {\n    readonly colour: \"red\" | \"green\";\n}\ninterface B extends I {\n    readonly colour: \"yellow\" | \"green\";\n}\ntype F = A | B\nconst f: F = { colour: \"green\" }\nf.colour"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	quickinfoWrongComment.ts
 	  Root file specified for compilation
 
@@ -79,7 +94,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -87,12 +102,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -111,15 +126,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -130,7 +145,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/quickinfoWrongComment.ts",
@@ -144,7 +159,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "quickinfo",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": {
         "kind": "property",
diff --git a/tests/baselines/reference/tsserver/fourslashServer/referenceToEmptyObject.js b/tests/baselines/reference/tsserver/fourslashServer/referenceToEmptyObject.js
index 83aac9d6ff92c..25736f0a59cce 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/referenceToEmptyObject.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/referenceToEmptyObject.js
@@ -1,23 +1,38 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/referenceToEmptyObject.ts]
 const obj = {};
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/referenceToEmptyObject.ts"
@@ -29,7 +44,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -39,18 +54,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/referenceToEmptyObject.ts SVC-1-0 "const obj = {};"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	referenceToEmptyObject.ts
 	  Root file specified for compilation
 
@@ -67,7 +82,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -75,12 +90,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -99,15 +114,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -118,7 +133,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/referenceToEmptyObject.ts",
@@ -133,7 +148,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/references01.js b/tests/baselines/reference/tsserver/fourslashServer/references01.js
index 5978cf2832f0b..6c5af381569da 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/references01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/references01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/referencesForGlobals_1.ts]
 class globalClass {
     public f() { }
@@ -23,7 +38,7 @@ var c = globalClass();
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/referencesForGlobals_1.ts"
@@ -35,7 +50,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -45,18 +60,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/referencesForGlobals_1.ts SVC-1-0 "class globalClass {\n    public f() { }\n}"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	referencesForGlobals_1.ts
 	  Root file specified for compilation
 
@@ -73,7 +88,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -81,12 +96,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -105,15 +120,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -124,7 +139,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/referencesForGlobals_2.ts"
@@ -141,19 +156,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/referencesForGlobals_1.ts SVC-1-0 "class globalClass {\n    public f() { }\n}"
 	/home/src/workspaces/project/referencesForGlobals_2.ts SVC-1-0 "///<reference path=\"referencesForGlobals_1.ts\" />\nvar c = globalClass();"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	referencesForGlobals_1.ts
 	  Referenced via 'referencesForGlobals_1.ts' from file 'referencesForGlobals_2.ts'
 	referencesForGlobals_2.ts
@@ -163,18 +178,18 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
 	/home/src/workspaces/project/referencesForGlobals_1.ts
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	referencesForGlobals_1.ts
 	  Root file specified for compilation
 
@@ -197,7 +212,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -205,12 +220,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/tsconfig.json:
@@ -242,17 +257,17 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
         /dev/null/inferredProject1* *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 1 *changed*
         /dev/null/inferredProject2* *new*
@@ -269,7 +284,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/referencesForGlobals_2.ts",
@@ -284,7 +299,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/referencesInConfiguredProject.js b/tests/baselines/reference/tsserver/fourslashServer/referencesInConfiguredProject.js
index 69c7be669be69..f38b84f83ff90 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/referencesInConfiguredProject.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/referencesInConfiguredProject.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/referencesForGlobals_1.ts]
 class globalClass {
     public f() { }
@@ -20,12 +35,12 @@ class globalClass {
 var c = globalClass();
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "files": ["referencesForGlobals_1.ts", "referencesForGlobals_2.ts"] }
+{ "files": ["referencesForGlobals_1.ts", "referencesForGlobals_2.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/referencesForGlobals_1.ts"
@@ -41,6 +56,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/referencesForGlobals_2.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -56,7 +74,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/referencesForGlobals_2.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
@@ -66,19 +84,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/referencesForGlobals_1.ts SVC-1-0 "class globalClass {\n    public f() { }\n}"
 	/home/src/workspaces/project/referencesForGlobals_2.ts Text-1 "var c = globalClass();"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	referencesForGlobals_1.ts
 	  Part of 'files' list in tsconfig.json
 	referencesForGlobals_2.ts
@@ -117,7 +135,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -125,12 +143,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/referencesForGlobals_2.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json: *new*
@@ -149,15 +167,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -172,7 +190,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/referencesForGlobals_2.ts"
@@ -195,17 +213,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/tsconfig.json:
   {"pollingInterval":2000}
 
@@ -220,15 +238,15 @@ watchedDirectoriesRecursive::
   {}
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /home/src/workspaces/project/tsconfig.json
@@ -244,7 +262,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/referencesForGlobals_2.ts",
@@ -259,7 +277,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/referencesInEmptyFile.js b/tests/baselines/reference/tsserver/fourslashServer/referencesInEmptyFile.js
index 7df39d76651f4..b6b7f2ffb4b08 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/referencesInEmptyFile.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/referencesInEmptyFile.js
@@ -1,23 +1,38 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/referencesInEmptyFile.ts]
 
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/referencesInEmptyFile.ts"
@@ -29,7 +44,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -39,18 +54,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/referencesInEmptyFile.ts SVC-1-0 ""
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	referencesInEmptyFile.ts
 	  Root file specified for compilation
 
@@ -67,7 +82,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -75,12 +90,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -99,15 +114,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -118,7 +133,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/referencesInEmptyFile.ts",
@@ -133,7 +148,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/referencesInEmptyFileWithMultipleProjects.js b/tests/baselines/reference/tsserver/fourslashServer/referencesInEmptyFileWithMultipleProjects.js
index e0845121c3ef5..eb3eaf1abb5ea 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/referencesInEmptyFileWithMultipleProjects.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/referencesInEmptyFileWithMultipleProjects.js
@@ -1,33 +1,48 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a/a.ts]
 /// <reference path="../b/b.ts" />
 ;
 
 //// [/home/src/workspaces/project/a/tsconfig.json]
-{ "files": ["a.ts"] }
+{ "files": ["a.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 //// [/home/src/workspaces/project/b/b.ts]
 ;
 
 //// [/home/src/workspaces/project/b/tsconfig.json]
-{ "files": ["b.ts"] }
+{ "files": ["b.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/tsconfig.json"
@@ -42,6 +57,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/a/tsconfig.json :
   "/home/src/workspaces/project/a/a.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/a/tsconfig.json"
  }
 }
@@ -58,7 +76,7 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/a/tsconfig.json
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b/b.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a/node_modules/@types 1 undefined Project: /home/src/workspaces/project/a/tsconfig.json WatchType: Type roots
@@ -70,19 +88,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/a/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/a/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/b/b.ts Text-1 ";"
 	/home/src/workspaces/project/a/a.ts Text-1 "/// <reference path=\"../b/b.ts\" />\n;"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../b/b.ts
 	  Referenced via '../b/b.ts' from file 'a.ts'
 	a.ts
@@ -124,18 +142,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/a/tsconfig.json SVC-1-0 "{ \"files\": [\"a.ts\"] }"
+	/home/src/workspaces/project/a/tsconfig.json SVC-1-0 "{ \"files\": [\"a.ts\"], \"compilerOptions\": { \"lib\": [\"es5\"] } }"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -156,7 +174,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -164,12 +182,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/a/jsconfig.json: *new*
@@ -205,17 +223,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/a/tsconfig.json
@@ -235,7 +253,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/a.ts"
@@ -262,17 +280,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -310,17 +328,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/a/tsconfig.json
@@ -341,7 +359,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/a.ts",
@@ -356,13 +374,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b/b.ts"
@@ -378,6 +396,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/b/tsconfig.json :
   "/home/src/workspaces/project/b/b.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/b/tsconfig.json"
  }
 }
@@ -401,18 +422,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/b/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/b/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/b/b.ts Text-1 ";"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	b.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -461,7 +482,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -469,12 +490,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -519,19 +540,19 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/b/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/b/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/a/tsconfig.json
@@ -554,7 +575,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b/b.ts",
@@ -570,7 +591,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/referencesInStringLiteralValueWithMultipleProjects.js b/tests/baselines/reference/tsserver/fourslashServer/referencesInStringLiteralValueWithMultipleProjects.js
index 18f08e4aedd22..f3ac8e5c07561 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/referencesInStringLiteralValueWithMultipleProjects.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/referencesInStringLiteralValueWithMultipleProjects.js
@@ -1,33 +1,48 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/a/a.ts]
 /// <reference path="../b/b.ts" />
 const str: string = "hello";
 
 //// [/home/src/workspaces/project/a/tsconfig.json]
-{ "files": ["a.ts"] }
+{ "files": ["a.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 //// [/home/src/workspaces/project/b/b.ts]
 const str2: string = "hello";
 
 //// [/home/src/workspaces/project/b/tsconfig.json]
-{ "files": ["b.ts"] }
+{ "files": ["b.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/tsconfig.json"
@@ -42,6 +57,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/a/tsconfig.json :
   "/home/src/workspaces/project/a/a.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/a/tsconfig.json"
  }
 }
@@ -58,7 +76,7 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a/a.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/a/tsconfig.json
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/b/b.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/a/node_modules/@types 1 undefined Project: /home/src/workspaces/project/a/tsconfig.json WatchType: Type roots
@@ -70,19 +88,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/a/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/a/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/b/b.ts Text-1 "const str2: string = \"hello\";"
 	/home/src/workspaces/project/a/a.ts Text-1 "/// <reference path=\"../b/b.ts\" />\nconst str: string = \"hello\";"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../b/b.ts
 	  Referenced via '../b/b.ts' from file 'a.ts'
 	a.ts
@@ -124,18 +142,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/a/tsconfig.json SVC-1-0 "{ \"files\": [\"a.ts\"] }"
+	/home/src/workspaces/project/a/tsconfig.json SVC-1-0 "{ \"files\": [\"a.ts\"], \"compilerOptions\": { \"lib\": [\"es5\"] } }"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -156,7 +174,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -164,12 +182,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/a.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/a/jsconfig.json: *new*
@@ -205,17 +223,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/a/tsconfig.json
@@ -235,7 +253,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/a.ts"
@@ -262,17 +280,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -310,17 +328,17 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 2
         /home/src/workspaces/project/a/tsconfig.json
@@ -341,7 +359,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/a/a.ts",
@@ -356,7 +374,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": [
         {
@@ -383,7 +401,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b/b.ts"
@@ -399,6 +417,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/b/tsconfig.json :
   "/home/src/workspaces/project/b/b.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/b/tsconfig.json"
  }
 }
@@ -422,18 +443,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/b/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/b/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/b/b.ts Text-1 "const str2: string = \"hello\";"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	b.ts
 	  Part of 'files' list in tsconfig.json
 
@@ -482,7 +503,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -490,12 +511,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/a/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/a/tsconfig.json:
@@ -540,19 +561,19 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/b/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/a/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/b/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/a/tsconfig.json
@@ -575,7 +596,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/b/b.ts",
@@ -591,7 +612,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/referencesToNonPropertyNameStringLiteral.js b/tests/baselines/reference/tsserver/fourslashServer/referencesToNonPropertyNameStringLiteral.js
index 3899c3750611c..636efc3b69d43 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/referencesToNonPropertyNameStringLiteral.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/referencesToNonPropertyNameStringLiteral.js
@@ -1,23 +1,38 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/referencesToNonPropertyNameStringLiteral.ts]
 const str: string = "hello";
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/referencesToNonPropertyNameStringLiteral.ts"
@@ -29,7 +44,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -39,18 +54,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/referencesToNonPropertyNameStringLiteral.ts SVC-1-0 "const str: string = \"hello\";"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	referencesToNonPropertyNameStringLiteral.ts
 	  Root file specified for compilation
 
@@ -67,7 +82,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -75,12 +90,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -99,15 +114,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -118,7 +133,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/referencesToNonPropertyNameStringLiteral.ts",
@@ -133,7 +148,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/referencesToStringLiteralValue.js b/tests/baselines/reference/tsserver/fourslashServer/referencesToStringLiteralValue.js
index c75411f38a4f6..58982442603ef 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/referencesToStringLiteralValue.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/referencesToStringLiteralValue.js
@@ -1,23 +1,38 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/referencesToStringLiteralValue.ts]
 const s: string = "some  string";
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/referencesToStringLiteralValue.ts"
@@ -29,7 +44,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -39,18 +54,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/referencesToStringLiteralValue.ts SVC-1-0 "const s: string = \"some  string\";"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	referencesToStringLiteralValue.ts
 	  Root file specified for compilation
 
@@ -67,7 +82,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -75,12 +90,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -99,15 +114,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -118,7 +133,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/referencesToStringLiteralValue.ts",
@@ -133,7 +148,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "references-full",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/rename01.js b/tests/baselines/reference/tsserver/fourslashServer/rename01.js
index 6694b777dedce..40d824cf7047f 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/rename01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/rename01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/rename01.ts]
 ///<reference path="./Bar.ts" />
 function Bar() {
@@ -21,7 +36,7 @@ function Bar() {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/rename01.ts"
@@ -33,7 +48,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/Bar.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file
@@ -44,18 +59,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/rename01.ts SVC-1-0 "///<reference path=\"./Bar.ts\" />\nfunction Bar() {\n    // This is a reference to Bar in a comment.\n    \"this is a reference to Bar in a string\"\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	rename01.ts
 	  Root file specified for compilation
 
@@ -72,7 +87,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -80,12 +95,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/Bar.ts: *new*
   {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
@@ -106,15 +121,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -125,7 +140,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -140,12 +155,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/rename01.ts",
@@ -161,7 +176,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "rename",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "info": {
@@ -230,7 +245,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -242,6 +257,6 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/renameInConfiguredProject.js b/tests/baselines/reference/tsserver/fourslashServer/renameInConfiguredProject.js
index 85c4ebef5aaaf..dd663f33d4a8c 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/renameInConfiguredProject.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/renameInConfiguredProject.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/referencesForGlobals_1.ts]
 var globalName = 0;
 
@@ -18,12 +33,12 @@ var globalName = 0;
 var y = globalName;
 
 //// [/tests/cases/fourslash/server/tsconfig.json]
-{ "files": ["referencesForGlobals_1.ts", "referencesForGlobals_2.ts"] }
+{ "files": ["referencesForGlobals_1.ts", "referencesForGlobals_2.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/referencesForGlobals_1.ts"
@@ -39,6 +54,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/tsconfig.json : {
   "/tests/cases/fourslash/server/referencesForGlobals_2.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/tests/cases/fourslash/server/tsconfig.json"
  }
 }
@@ -54,7 +72,7 @@ Info seq  [hh:mm:ss:mss] event:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/referencesForGlobals_2.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Type roots
@@ -64,19 +82,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/referencesForGlobals_1.ts SVC-1-0 "var globalName = 0;"
 	/tests/cases/fourslash/server/referencesForGlobals_2.ts Text-1 "var y = globalName;"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	referencesForGlobals_1.ts
 	  Part of 'files' list in tsconfig.json
 	referencesForGlobals_2.ts
@@ -115,7 +133,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -123,12 +141,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/referencesForGlobals_2.ts: *new*
   {"pollingInterval":500}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -147,15 +165,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/tsconfig.json
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /tests/cases/fourslash/server/tsconfig.json
@@ -170,7 +188,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -185,12 +203,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/referencesForGlobals_1.ts",
@@ -206,7 +224,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "rename",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "info": {
@@ -270,7 +288,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -282,12 +300,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -302,12 +320,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/referencesForGlobals_2.ts",
@@ -323,7 +341,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "rename",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": {
         "info": {
@@ -387,7 +405,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -399,6 +417,6 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/renameNamedImport.js b/tests/baselines/reference/tsserver/fourslashServer/renameNamedImport.js
index 1ce2f820d6daf..8a2860a5e817d 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/renameNamedImport.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/renameNamedImport.js
@@ -1,37 +1,52 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/lib/index.ts]
 const unrelatedLocalVariable = 123;
 export const someExportedVariable = unrelatedLocalVariable;
 
 //// [/home/src/workspaces/project/lib/tsconfig.json]
-{}
+{ "compilerOptions": { "lib": ["es5"] } }
 
 //// [/home/src/workspaces/project/src/index.ts]
 import { someExportedVariable } from '../lib/index';
 someExportedVariable;
 
 //// [/home/src/workspaces/project/src/tsconfig.json]
-{}
+{ "compilerOptions": { "lib": ["es5"] } }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{}
+{ "compilerOptions": { "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/lib/tsconfig.json"
@@ -46,6 +61,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/lib/tsconfig.json
   "/home/src/workspaces/project/lib/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/lib/tsconfig.json"
  }
 }
@@ -63,7 +81,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/lib 1 undefined Config: /home/src/workspaces/project/lib/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/lib/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/lib/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/lib/node_modules/@types 1 undefined Project: /home/src/workspaces/project/lib/tsconfig.json WatchType: Type roots
@@ -75,18 +93,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/lib/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/lib/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/lib/index.ts Text-1 "const unrelatedLocalVariable = 123;\nexport const someExportedVariable = unrelatedLocalVariable;"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 
@@ -120,6 +138,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -144,19 +165,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/lib/index.ts Text-1 "const unrelatedLocalVariable = 123;\nexport const someExportedVariable = unrelatedLocalVariable;"
 	/home/src/workspaces/project/src/index.ts Text-1 "import { someExportedVariable } from '../lib/index';\nsomeExportedVariable;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	lib/index.ts
 	  Matched by default include pattern '**/*'
 	  Imported via '../lib/index' from file 'src/index.ts'
@@ -198,18 +219,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/lib/tsconfig.json SVC-1-0 "{}"
+	/home/src/workspaces/project/lib/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"lib\": [\"es5\"] } }"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -234,7 +255,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -242,12 +263,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/lib/index.ts: *new*
@@ -293,19 +314,19 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/lib/tsconfig.json
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/lib/tsconfig.json
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/lib/tsconfig.json
@@ -327,7 +348,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/lib/index.ts"
@@ -339,19 +360,19 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
 	/home/src/workspaces/project/lib/index.ts
 	/home/src/workspaces/project/src/index.ts
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	lib/index.ts
 	  Matched by default include pattern '**/*'
 	  Imported via '../lib/index' from file 'src/index.ts'
@@ -384,17 +405,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/lib/jsconfig.json:
@@ -447,19 +468,19 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /home/src/workspaces/project/lib/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /home/src/workspaces/project/lib/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /home/src/workspaces/project/lib/tsconfig.json
@@ -482,7 +503,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts"
@@ -497,6 +518,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/src/tsconfig.json
   "/home/src/workspaces/project/src/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/src/tsconfig.json"
  }
 }
@@ -522,19 +546,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/src/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/src/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/lib/index.ts Text-1 "const unrelatedLocalVariable = 123;\nexport const someExportedVariable = unrelatedLocalVariable;"
 	/home/src/workspaces/project/src/index.ts SVC-2-0 "import { someExportedVariable } from '../lib/index';\nsomeExportedVariable;"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../lib/index.ts
 	  Imported via '../lib/index' from file 'index.ts'
 	index.ts
@@ -585,7 +609,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -593,12 +617,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/lib/jsconfig.json:
@@ -643,19 +667,19 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/lib/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/src/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/lib/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/src/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/lib/tsconfig.json
@@ -677,7 +701,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -692,12 +716,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -713,7 +737,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "rename",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": {
         "info": {
@@ -773,7 +797,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -785,6 +809,6 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/renameNamespaceImport.js b/tests/baselines/reference/tsserver/fourslashServer/renameNamespaceImport.js
index 7aff94b5bf9e8..a970fee343a7a 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/renameNamespaceImport.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/renameNamespaceImport.js
@@ -1,37 +1,52 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/lib/index.ts]
 const unrelatedLocalVariable = 123;
 export const someExportedVariable = unrelatedLocalVariable;
 
 //// [/home/src/workspaces/project/lib/tsconfig.json]
-{}
+{ "compilerOptions": { "lib": ["es5"] } }
 
 //// [/home/src/workspaces/project/src/index.ts]
 import * as lib from '../lib/index';
 lib.someExportedVariable;
 
 //// [/home/src/workspaces/project/src/tsconfig.json]
-{}
+{ "compilerOptions": { "lib": ["es5"] } }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{}
+{ "compilerOptions": { "lib": ["es5"] } }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/lib/tsconfig.json"
@@ -46,6 +61,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/lib/tsconfig.json
   "/home/src/workspaces/project/lib/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/lib/tsconfig.json"
  }
 }
@@ -63,7 +81,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/lib 1 undefined Config: /home/src/workspaces/project/lib/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/lib/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/lib/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/lib/node_modules/@types 1 undefined Project: /home/src/workspaces/project/lib/tsconfig.json WatchType: Type roots
@@ -75,18 +93,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/lib/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/lib/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/lib/index.ts Text-1 "const unrelatedLocalVariable = 123;\nexport const someExportedVariable = unrelatedLocalVariable;"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	index.ts
 	  Matched by default include pattern '**/*'
 
@@ -120,6 +138,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/src/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/tsconfig.json"
  }
 }
@@ -144,19 +165,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/lib/index.ts Text-1 "const unrelatedLocalVariable = 123;\nexport const someExportedVariable = unrelatedLocalVariable;"
 	/home/src/workspaces/project/src/index.ts Text-1 "import * as lib from '../lib/index';\nlib.someExportedVariable;"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	lib/index.ts
 	  Matched by default include pattern '**/*'
 	  Imported via '../lib/index' from file 'src/index.ts'
@@ -198,18 +219,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/lib/tsconfig.json SVC-1-0 "{}"
+	/home/src/workspaces/project/lib/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"lib\": [\"es5\"] } }"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -234,7 +255,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -242,12 +263,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/workspaces/project/lib/index.ts: *new*
@@ -293,19 +314,19 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/lib/tsconfig.json
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/lib/tsconfig.json
         /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 3
         /home/src/workspaces/project/lib/tsconfig.json
@@ -327,7 +348,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/lib/index.ts"
@@ -339,19 +360,19 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/p
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
 	/home/src/workspaces/project/lib/index.ts
 	/home/src/workspaces/project/src/index.ts
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	lib/index.ts
 	  Matched by default include pattern '**/*'
 	  Imported via '../lib/index' from file 'src/index.ts'
@@ -384,17 +405,17 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/lib/jsconfig.json:
@@ -447,19 +468,19 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /home/src/workspaces/project/lib/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /home/src/workspaces/project/lib/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/tsconfig.json *deleted*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
         /home/src/workspaces/project/lib/tsconfig.json
@@ -482,7 +503,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts"
@@ -497,6 +518,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/src/tsconfig.json
   "/home/src/workspaces/project/src/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/home/src/workspaces/project/src/tsconfig.json"
  }
 }
@@ -522,19 +546,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/src/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/src/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/lib/index.ts Text-1 "const unrelatedLocalVariable = 123;\nexport const someExportedVariable = unrelatedLocalVariable;"
 	/home/src/workspaces/project/src/index.ts SVC-2-0 "import * as lib from '../lib/index';\nlib.someExportedVariable;"
 
 
-	../../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../tslibs/TS/Lib/lib.es5.d.ts'
 	../lib/index.ts
 	  Imported via '../lib/index' from file 'index.ts'
 	index.ts
@@ -585,7 +609,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -593,12 +617,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
+  {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/lib/jsconfig.json:
@@ -643,19 +667,19 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/lib/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/src/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/lib/tsconfig.json
         /dev/null/inferredProject1*
         /home/src/workspaces/project/src/tsconfig.json *new*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
     containingProjects: 3 *changed*
         /home/src/workspaces/project/lib/tsconfig.json
@@ -677,7 +701,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "preferences": {
@@ -692,12 +716,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/src/index.ts",
@@ -713,7 +737,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "rename",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": {
         "info": {
@@ -772,7 +796,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -784,6 +808,6 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/rewriteRelativeImportExtensionsProjectReferences1.js b/tests/baselines/reference/tsserver/fourslashServer/rewriteRelativeImportExtensionsProjectReferences1.js
index 9dd6f3787cba0..b5ab5fab5ae28 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/rewriteRelativeImportExtensionsProjectReferences1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/rewriteRelativeImportExtensionsProjectReferences1.js
@@ -1,16 +1,37 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "module": "nodenext",
+          "rewriteRelativeImportExtensions": true,
+          "lib": [
+            "es5"
+          ],
+          "rootDir": "/tests/cases/fourslash/server/packages/main/src",
+          "outDir": "/tests/cases/fourslash/server/packages/main/dist",
+          "resolveJsonModule": false,
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true,
+          "composite": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/packages/common/package.json]
 {
     "name": "common",
@@ -30,6 +51,7 @@ export {};
 //// [/tests/cases/fourslash/server/packages/common/tsconfig.json]
 {
     "compilerOptions": {
+        "lib": ["es5"],
         "composite": true,
         "rootDir": "src",
         "outDir": "dist",
@@ -49,6 +71,7 @@ import {} from "../../common/src/index.ts";
     "compilerOptions": {
         "module": "nodenext",
         "rewriteRelativeImportExtensions": true,
+        "lib": ["es5"],
         "rootDir": "src",
         "outDir": "dist",
         "resolveJsonModule": false,
@@ -61,7 +84,7 @@ import {} from "../../common/src/index.ts";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/packages/common/tsconfig.json"
@@ -76,6 +99,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/packages/common/t
   "/tests/cases/fourslash/server/packages/common/src/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "composite": true,
   "rootDir": "/tests/cases/fourslash/server/packages/common/src",
   "outDir": "/tests/cases/fourslash/server/packages/common/dist",
@@ -98,9 +124,14 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/four
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/common 1 undefined Config: /tests/cases/fourslash/server/packages/common/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/common/src/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tests/cases/fourslash/server/packages/common/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /tests/cases/fourslash/server/packages/common/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /tests/cases/fourslash/server/packages/common/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /tests/cases/fourslash/server/packages/common/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/common/src/package.json 2000 undefined Project: /tests/cases/fourslash/server/packages/common/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/common/package.json 2000 undefined Project: /tests/cases/fourslash/server/packages/common/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /tests/cases/fourslash/server/packages/common/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/common/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/packages/common/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/common/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/packages/common/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/packages/common/tsconfig.json WatchType: Type roots
@@ -111,10 +142,19 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/four
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/packages/common/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/packages/common/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/packages/common/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/packages/common/src/index.ts Text-1 "export {};"
 
 
+	../../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
+	../../../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	src/index.ts
 	  Matched by default include pattern '**/*'
 	  File is ECMAScript module because 'package.json' has field "type" with value "module"
@@ -137,53 +177,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/tests/cases/fourslash/server/packages/common/tsconfig.json",
         "configFile": "/tests/cases/fourslash/server/packages/common/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /tests/cases/fourslash/server/packages/common/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -194,9 +188,9 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/common/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/common/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -208,25 +202,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/tests/cases/fourslash/server/packages/common/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"composite\": true,\n        \"rootDir\": \"src\",\n        \"outDir\": \"dist\",\n        \"module\": \"nodenext\",\n        \"resolveJsonModule\": false,\n    }\n}"
+	/tests/cases/fourslash/server/packages/common/tsconfig.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"lib\": [\"es5\"],\n        \"composite\": true,\n        \"rootDir\": \"src\",\n        \"outDir\": \"dist\",\n        \"module\": \"nodenext\",\n        \"resolveJsonModule\": false,\n    }\n}"
 
 
-	../../../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/common/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/packages/common/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -241,7 +235,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -249,14 +243,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/packages/common/jsconfig.json: *new*
@@ -304,17 +305,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /tests/cases/fourslash/server/packages/common/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /tests/cases/fourslash/server/packages/common/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /tests/cases/fourslash/server/packages/common/tsconfig.json
         /dev/null/inferredProject1*
 /tests/cases/fourslash/server/packages/common/src/index.ts *new*
     version: Text-1
@@ -327,7 +331,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/packages/main/src/index.ts"
@@ -344,6 +348,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/packages/main/tsc
  "options": {
   "module": 199,
   "rewriteRelativeImportExtensions": true,
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "rootDir": "/tests/cases/fourslash/server/packages/main/src",
   "outDir": "/tests/cases/fourslash/server/packages/main/dist",
   "resolveJsonModule": false,
@@ -369,11 +376,13 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/main 1 undefined Config: /tests/cases/fourslash/server/packages/main/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/main 1 undefined Config: /tests/cases/fourslash/server/packages/main/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tests/cases/fourslash/server/packages/main/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /tests/cases/fourslash/server/packages/main/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /tests/cases/fourslash/server/packages/main/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /tests/cases/fourslash/server/packages/main/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/common/src/package.json 2000 undefined Project: /tests/cases/fourslash/server/packages/main/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/common/package.json 2000 undefined Project: /tests/cases/fourslash/server/packages/main/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/main/src/package.json 2000 undefined Project: /tests/cases/fourslash/server/packages/main/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/main/package.json 2000 undefined Project: /tests/cases/fourslash/server/packages/main/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /tests/cases/fourslash/server/packages/main/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/main/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/packages/main/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/main/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/packages/main/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/packages/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/packages/main/tsconfig.json WatchType: Type roots
@@ -384,11 +393,20 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/four
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/packages/main/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/packages/main/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/packages/main/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/packages/common/src/index.ts Text-1 "export {};"
 	/tests/cases/fourslash/server/packages/main/src/index.ts SVC-1-0 "import {} from \"../../common/src/index.ts\";"
 
 
+	../../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
+	../../../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../common/src/index.ts
 	  Imported via "../../common/src/index.ts" from file 'src/index.ts'
 	  File is ECMAScript module because '../common/package.json' has field "type" with value "module"
@@ -415,61 +433,15 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/tests/cases/fourslash/server/packages/main/src/index.ts",
         "configFile": "/tests/cases/fourslash/server/packages/main/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/packages/common/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (1)
+Info seq  [hh:mm:ss:mss] 	Files (4)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/packages/main/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -486,7 +458,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -494,15 +466,24 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
-  {"pollingInterval":500} *new*
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
 /tests/cases/fourslash/server/jsconfig.json:
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/packages/common/jsconfig.json:
@@ -570,18 +551,24 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 3 *changed*
+        /tests/cases/fourslash/server/packages/common/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+        /tests/cases/fourslash/server/packages/main/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 3 *changed*
+        /tests/cases/fourslash/server/packages/common/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+        /tests/cases/fourslash/server/packages/main/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 3 *changed*
+        /tests/cases/fourslash/server/packages/common/tsconfig.json
         /dev/null/inferredProject1*
+        /tests/cases/fourslash/server/packages/main/tsconfig.json *new*
 /tests/cases/fourslash/server/packages/common/src/index.ts *changed*
     version: Text-1
     containingProjects: 2 *changed*
@@ -598,7 +585,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/packages/common/src/index.ts",
@@ -611,13 +598,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/packages/main/src/index.ts",
@@ -630,13 +617,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/packages/common/src/index.ts",
@@ -649,13 +636,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/packages/main/src/index.ts",
@@ -668,7 +655,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/fourslashServer/rewriteRelativeImportExtensionsProjectReferences2.js b/tests/baselines/reference/tsserver/fourslashServer/rewriteRelativeImportExtensionsProjectReferences2.js
index 84183dc9bc1c2..5c9d0783dc9ba 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/rewriteRelativeImportExtensionsProjectReferences2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/rewriteRelativeImportExtensionsProjectReferences2.js
@@ -1,23 +1,43 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "composite": true,
+          "rootDir": "/tests/cases/fourslash/server/src",
+          "outDir": "/tests/cases/fourslash/server/dist",
+          "rewriteRelativeImportExtensions": true,
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/src/compiler/parser.ts]
 export {};
 
 //// [/tests/cases/fourslash/server/src/compiler/tsconfig.json]
 {
     "extends": "../tsconfig-base.json",
-    "compilerOptions": {}
+    "compilerOptions": { "lib": ["es5"] }
 }
 
 //// [/tests/cases/fourslash/server/src/services/services.ts]
@@ -26,7 +46,7 @@ import {} from "../compiler/parser.ts";
 //// [/tests/cases/fourslash/server/src/services/tsconfig.json]
 {
     "extends": "../tsconfig-base.json",
-    "compilerOptions": {},
+    "compilerOptions": { "lib": ["es5"] },
     "references": [
         { "path": "../compiler" }
     ]
@@ -35,6 +55,7 @@ import {} from "../compiler/parser.ts";
 //// [/tests/cases/fourslash/server/src/tsconfig-base.json]
 {
     "compilerOptions": {
+        "lib": ["es5"],
         "module": "nodenext",
         "composite": true,
         "rootDir": ".",
@@ -46,7 +67,7 @@ import {} from "../compiler/parser.ts";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/src/tsconfig-base.json"
@@ -60,9 +81,12 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -72,18 +96,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/tests/cases/fourslash/server/src/tsconfig-base.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"module\": \"nodenext\",\n        \"composite\": true,\n        \"rootDir\": \".\",\n        \"outDir\": \"../dist\",\n        \"rewriteRelativeImportExtensions\": true,\n    }\n}"
+	/tests/cases/fourslash/server/src/tsconfig-base.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"lib\": [\"es5\"],\n        \"module\": \"nodenext\",\n        \"composite\": true,\n        \"rootDir\": \".\",\n        \"outDir\": \"../dist\",\n        \"rewriteRelativeImportExtensions\": true,\n    }\n}"
 
 
-	../../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig-base.json
 	  Root file specified for compilation
 
@@ -100,7 +124,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -108,12 +132,18 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/src/jsconfig.json: *new*
@@ -138,15 +168,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -157,7 +187,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/src/services/services.ts"
@@ -172,6 +202,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/src/services/tsco
   "/tests/cases/fourslash/server/src/services/services.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "composite": true,
   "rootDir": "/tests/cases/fourslash/server/src",
@@ -205,6 +238,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/src/compiler/tsco
   "/tests/cases/fourslash/server/src/compiler/parser.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "composite": true,
   "rootDir": "/tests/cases/fourslash/server/src",
@@ -217,12 +253,14 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/compiler 1 undefined Config: /tests/cases/fourslash/server/src/compiler/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/compiler 1 undefined Config: /tests/cases/fourslash/server/src/compiler/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/compiler/parser.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/compiler/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/services/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/services/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/services/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: Type roots
@@ -233,11 +271,20 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/four
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/src/services/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/src/services/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/src/compiler/parser.ts Text-1 "export {};"
 	/tests/cases/fourslash/server/src/services/services.ts SVC-1-0 "import {} from \"../compiler/parser.ts\";"
 
 
+	../../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
+	../../../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../compiler/parser.ts
 	  Imported via "../compiler/parser.ts" from file 'services.ts'
 	  File is CommonJS module because 'package.json' was not found
@@ -263,58 +310,12 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/tests/cases/fourslash/server/src/services/services.ts",
         "configFile": "/tests/cases/fourslash/server/src/services/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /tests/cases/fourslash/server/src/services/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/src/services/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -331,7 +332,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -339,14 +340,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
 /tests/cases/fourslash/package.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/jsconfig.json:
@@ -402,18 +410,21 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+        /tests/cases/fourslash/server/src/services/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+        /tests/cases/fourslash/server/src/services/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
+        /tests/cases/fourslash/server/src/services/tsconfig.json *new*
 /tests/cases/fourslash/server/src/compiler/parser.ts *new*
     version: Text-1
     containingProjects: 1
@@ -429,7 +440,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/src/compiler/parser.ts",
@@ -442,13 +453,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/src/services/services.ts",
@@ -461,13 +472,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/src/compiler/parser.ts",
@@ -480,13 +491,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/src/services/services.ts",
@@ -499,7 +510,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/rewriteRelativeImportExtensionsProjectReferences3.js b/tests/baselines/reference/tsserver/fourslashServer/rewriteRelativeImportExtensionsProjectReferences3.js
index 7febd75bed163..680858f1ff576 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/rewriteRelativeImportExtensionsProjectReferences3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/rewriteRelativeImportExtensionsProjectReferences3.js
@@ -1,16 +1,36 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "composite": true,
+          "rewriteRelativeImportExtensions": true,
+          "rootDir": "/tests/cases/fourslash/server/src/services",
+          "outDir": "/tests/cases/fourslash/server/dist/services",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/src/compiler/parser.ts]
 export {};
 
@@ -18,6 +38,7 @@ export {};
 {
     "extends": "../tsconfig-base.json",
     "compilerOptions": {
+        "lib": ["es5"],
         "rootDir": ".",
         "outDir": "../../dist/compiler",
 }
@@ -29,6 +50,7 @@ import {} from "../compiler/parser.ts";
 {
     "extends": "../tsconfig-base.json",
     "compilerOptions": {
+        "lib": ["es5"],
         "rootDir": ".",
         "outDir": "../../dist/services",
     },
@@ -40,6 +62,7 @@ import {} from "../compiler/parser.ts";
 //// [/tests/cases/fourslash/server/src/tsconfig-base.json]
 {
     "compilerOptions": {
+        "lib": ["es5"],
         "module": "nodenext",
         "composite": true,
         "rewriteRelativeImportExtensions": true,
@@ -49,7 +72,7 @@ import {} from "../compiler/parser.ts";
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/src/tsconfig-base.json"
@@ -63,9 +86,12 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -75,18 +101,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/tests/cases/fourslash/server/src/tsconfig-base.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"module\": \"nodenext\",\n        \"composite\": true,\n        \"rewriteRelativeImportExtensions\": true,\n    }\n}"
+	/tests/cases/fourslash/server/src/tsconfig-base.json SVC-1-0 "{\n    \"compilerOptions\": {\n        \"lib\": [\"es5\"],\n        \"module\": \"nodenext\",\n        \"composite\": true,\n        \"rewriteRelativeImportExtensions\": true,\n    }\n}"
 
 
-	../../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig-base.json
 	  Root file specified for compilation
 
@@ -103,7 +129,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -111,12 +137,18 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/src/jsconfig.json: *new*
@@ -141,15 +173,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -160,7 +192,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/src/services/services.ts"
@@ -175,6 +207,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/src/services/tsco
   "/tests/cases/fourslash/server/src/services/services.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "composite": true,
   "rewriteRelativeImportExtensions": true,
@@ -208,6 +243,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/src/compiler/tsco
   "/tests/cases/fourslash/server/src/compiler/parser.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "composite": true,
   "rewriteRelativeImportExtensions": true,
@@ -220,12 +258,14 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/compiler 1 undefined Config: /tests/cases/fourslash/server/src/compiler/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/compiler 1 undefined Config: /tests/cases/fourslash/server/src/compiler/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/compiler/parser.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/compiler/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/services/package.json 2000 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/services/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/services/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/src/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: Type roots
@@ -236,11 +276,20 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/four
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/node_modules/@types 1 undefined Project: /tests/cases/fourslash/server/src/services/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/src/services/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/src/services/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/src/compiler/parser.ts Text-1 "export {};"
 	/tests/cases/fourslash/server/src/services/services.ts SVC-1-0 "import {} from \"../compiler/parser.ts\";"
 
 
+	../../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
+	../../../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../compiler/parser.ts
 	  Imported via "../compiler/parser.ts" from file 'services.ts'
 	  File is CommonJS module because 'package.json' was not found
@@ -266,58 +315,12 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/tests/cases/fourslash/server/src/services/services.ts",
         "configFile": "/tests/cases/fourslash/server/src/services/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /tests/cases/fourslash/server/src/services/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/src/services/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -334,7 +337,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -342,14 +345,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000} *new*
 /tests/cases/fourslash/package.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/jsconfig.json:
@@ -405,18 +415,21 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+        /tests/cases/fourslash/server/src/services/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+        /tests/cases/fourslash/server/src/services/tsconfig.json *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *changed*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2 *changed*
         /dev/null/inferredProject1*
+        /tests/cases/fourslash/server/src/services/tsconfig.json *new*
 /tests/cases/fourslash/server/src/compiler/parser.ts *new*
     version: Text-1
     containingProjects: 1
@@ -432,7 +445,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/src/compiler/parser.ts",
@@ -445,13 +458,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/src/services/services.ts",
@@ -464,13 +477,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/src/compiler/parser.ts",
@@ -483,13 +496,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/src/services/services.ts",
@@ -502,7 +515,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/semanticClassificationJs1.js b/tests/baselines/reference/tsserver/fourslashServer/semanticClassificationJs1.js
index abf6b242689a8..3173c77fa5aa0 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/semanticClassificationJs1.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/semanticClassificationJs1.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/semanticClassificationJs1.ts]
 @Filename: index.js
 
@@ -20,7 +35,7 @@ Thing.toExponential();
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/semanticClassificationJs1.ts"
@@ -32,7 +47,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -42,18 +57,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/semanticClassificationJs1.ts SVC-1-0 "@Filename: index.js\n\nvar Thing = 0;\nThing.toExponential();"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	semanticClassificationJs1.ts
 	  Root file specified for compilation
 
@@ -70,7 +85,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -78,12 +93,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -102,15 +117,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -121,7 +136,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/semanticClassificationJs1.ts",
@@ -136,7 +151,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "encodedSemanticClassifications-full",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": {
         "spans": [
diff --git a/tests/baselines/reference/tsserver/fourslashServer/signatureHelp01.js b/tests/baselines/reference/tsserver/fourslashServer/signatureHelp01.js
index af75ed8879cbb..f33e71c9dceb6 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/signatureHelp01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/signatureHelp01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/signatureHelp01.ts]
 function foo(data: number) {
 }
@@ -22,7 +37,7 @@ function bar {
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/signatureHelp01.ts"
@@ -34,7 +49,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -44,18 +59,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/signatureHelp01.ts SVC-1-0 "function foo(data: number) {\n}\n\nfunction bar {\n    foo()\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	signatureHelp01.ts
 	  Root file specified for compilation
 
@@ -72,7 +87,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -80,12 +95,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -104,15 +119,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -123,7 +138,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/signatureHelp01.ts",
@@ -137,7 +152,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "signatureHelp",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": {
         "items": [
diff --git a/tests/baselines/reference/tsserver/fourslashServer/signatureHelpJSDocCallbackTag.js b/tests/baselines/reference/tsserver/fourslashServer/signatureHelpJSDocCallbackTag.js
index 6764cdff30d38..2bea8077916c4 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/signatureHelpJSDocCallbackTag.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/signatureHelpJSDocCallbackTag.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/jsdocCallbackTag.js]
 /**
  * @callback FooHandler - A kind of magic
@@ -38,7 +53,7 @@ t("!", 12, false);
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCallbackTag.js"
@@ -50,7 +65,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -60,18 +75,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/jsdocCallbackTag.js SVC-1-0 "/**\n * @callback FooHandler - A kind of magic\n * @param {string} eventName - So many words\n * @param eventName2 {number | string} - Silence is golden\n * @param eventName3 - Osterreich mos def\n * @return {number} - DIVEKICK\n */\n/**\n * @type {FooHandler} callback\n */\nvar t;\n\n/**\n * @callback FooHandler2 - What, another one?\n * @param {string=} eventName - it keeps happening\n * @param {string} [eventName2] - i WARNED you dog\n */\n/**\n * @type {FooHandler2} callback\n */\nvar t2;\nt(\"!\", 12, false);"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	jsdocCallbackTag.js
 	  Root file specified for compilation
 
@@ -88,7 +103,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -96,12 +111,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -120,15 +135,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -139,7 +154,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCallbackTag.js",
@@ -153,7 +168,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "signatureHelp",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": {
         "items": [
@@ -328,7 +343,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCallbackTag.js",
@@ -342,7 +357,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "signatureHelp",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "items": [
@@ -517,7 +532,7 @@ Info seq  [hh:mm:ss:mss] response:
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/jsdocCallbackTag.js",
@@ -531,7 +546,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "signatureHelp",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": {
         "items": [
diff --git a/tests/baselines/reference/tsserver/fourslashServer/tripleSlashReferenceResolutionMode.js b/tests/baselines/reference/tsserver/fourslashServer/tripleSlashReferenceResolutionMode.js
index 20984633ca8a1..e5cd01413e1d4 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/tripleSlashReferenceResolutionMode.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/tripleSlashReferenceResolutionMode.js
@@ -1,16 +1,35 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "module": "nodenext",
+          "declaration": true,
+          "strict": true,
+          "outDir": "/home/src/workspaces/project/out",
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/home/src/workspaces/project/index.ts]
 /// <reference types="pkg" resolution-mode="import" />
 pkgImportGlobal;
@@ -33,12 +52,12 @@ declare global { const pkgRequireGlobal: PkgRequireInterface; }
 { "private": true, "type": "commonjs" }
 
 //// [/home/src/workspaces/project/tsconfig.json]
-{ "compilerOptions": { "module": "nodenext", "declaration": true, "strict": true, "outDir": "out" }, "files": ["./index.ts"] }
+{ "compilerOptions": { "lib": ["es5"], "module": "nodenext", "declaration": true, "strict": true, "outDir": "out" }, "files": ["./index.ts"] }
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/tsconfig.json"
@@ -53,6 +72,9 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
   "/home/src/workspaces/project/index.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "module": 199,
   "declaration": true,
   "strict": true,
@@ -78,19 +100,33 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspa
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/pkg/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/pkg/import.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 2000 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.esnext.full.d.ts 500 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/home/src/workspaces/project/node_modules/pkg/import.d.ts Text-1 "export {};\nexport interface PkgImportInterface { field: any; }\ndeclare global { const pkgImportGlobal: PkgImportInterface; }"
 	/home/src/workspaces/project/index.ts Text-1 "/// <reference types=\"pkg\" resolution-mode=\"import\" />\npkgImportGlobal;\nexport {};"
 
 
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
+	../../tslibs/TS/Lib/lib.decorators.d.ts
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
+	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	node_modules/pkg/import.d.ts
 	  Type library referenced via 'pkg' from file 'index.ts' with packageId 'pkg/import.d.ts@0.0.1'
 	  File is ECMAScript module because 'node_modules/pkg/package.json' has field "type" with value "module"
@@ -116,72 +152,16 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/tsconfig.json",
         "configFile": "/home/src/workspaces/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'esnext'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'CallableFunction'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'NewableFunction'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/tsconfig.json ProjectRootPath: undefined:: Result: undefined
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/workspaces/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -189,25 +169,25 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /ho
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"module\": \"nodenext\", \"declaration\": true, \"strict\": true, \"outDir\": \"out\" }, \"files\": [\"./index.ts\"] }"
+	/home/src/workspaces/project/tsconfig.json SVC-1-0 "{ \"compilerOptions\": { \"lib\": [\"es5\"], \"module\": \"nodenext\", \"declaration\": true, \"strict\": true, \"outDir\": \"out\" }, \"files\": [\"./index.ts\"] }"
 
 
-	../../tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	../../tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/project/package.json 250 undefined WatchType: package.json file
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -222,7 +202,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -230,14 +210,21 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts: *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json: *new*
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/index.ts: *new*
   {"pollingInterval":500}
 /home/src/workspaces/project/jsconfig.json: *new*
@@ -275,17 +262,20 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/index.ts *new*
     version: Text-1
@@ -302,7 +292,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts"
@@ -312,7 +302,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /home/src/workspaces/project/index.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/index.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -329,19 +319,26 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts:
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
   {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
+/home/src/tslibs/TS/Lib/lib.es5.d.ts:
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/TS/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
+/home/src/tslibs/package.json:
+  {"pollingInterval":2000}
+  {"pollingInterval":2000}
 /home/src/workspaces/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/workspaces/project/node_modules/pkg/import.d.ts:
@@ -381,17 +378,20 @@ Projects::
     noOpenRef: false *changed*
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
-    version: Text-1
-    containingProjects: 1
-        /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
-    containingProjects: 1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
+        /dev/null/inferredProject1*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
+    version: Text-1
+    containingProjects: 2
+        /home/src/workspaces/project/tsconfig.json
         /dev/null/inferredProject1*
 /home/src/workspaces/project/index.ts (Open) *changed*
     open: true *changed*
@@ -409,7 +409,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -422,13 +422,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "syntacticDiagnosticsSync",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/home/src/workspaces/project/index.ts",
@@ -441,7 +441,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/tsconfigComputedPropertyError.js b/tests/baselines/reference/tsserver/fourslashServer/tsconfigComputedPropertyError.js
index 606d7a24a9b66..ae2bb33cc53b1 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/tsconfigComputedPropertyError.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/tsconfigComputedPropertyError.js
@@ -1,19 +1,35 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "lib": [
+            "es5"
+          ],
+          "target": "es5",
+          "newLine": "crlf",
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/tsconfig.json]
 {
     ["oops!" + 42]: "true",
+    "compilerOptions": { "lib": ["es5"] },
     "files": [
         "nonexistentfile.ts"
     ],
@@ -23,7 +39,7 @@ lib.decorators.legacy.d.ts-Text
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsconfig.json"
@@ -38,6 +54,9 @@ Info seq  [hh:mm:ss:mss] Config: /tests/cases/fourslash/server/tsconfig.json : {
   "/tests/cases/fourslash/server/nonexistentfile.ts"
  ],
  "options": {
+  "lib": [
+   "lib.es5.d.ts"
+  ],
   "configFilePath": "/tests/cases/fourslash/server/tsconfig.json"
  }
 }
@@ -52,7 +71,7 @@ Info seq  [hh:mm:ss:mss] event:
       }
     }
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/nonexistentfile.ts 500 undefined Project: /tests/cases/fourslash/server/tsconfig.json WatchType: Missing file
@@ -63,17 +82,17 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tests/cases/fourslash/server/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/tests/cases/fourslash/server/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (3)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] event:
@@ -102,11 +121,11 @@ Info seq  [hh:mm:ss:mss] event:
               {
                 "span": {
                   "start": {
-                    "line": 4,
+                    "line": 5,
                     "offset": 9
                   },
                   "end": {
-                    "line": 4,
+                    "line": 5,
                     "offset": 29
                   },
                   "file": "/tests/cases/fourslash/server/tsconfig.json"
@@ -145,18 +164,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
-	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{\n    [\"oops!\" + 42]: \"true\",\n    \"files\": [\n        \"nonexistentfile.ts\"\n    ],\n    \"compileOnSave\": true\n}"
+	/tests/cases/fourslash/server/tsconfig.json SVC-1-0 "{\n    [\"oops!\" + 42]: \"true\",\n    \"compilerOptions\": { \"lib\": [\"es5\"] },\n    \"files\": [\n        \"nonexistentfile.ts\"\n    ],\n    \"compileOnSave\": true\n}"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	tsconfig.json
 	  Root file specified for compilation
 
@@ -177,7 +196,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -185,12 +204,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/nonexistentfile.ts: *new*
@@ -217,17 +236,17 @@ Projects::
     noOpenRef: true
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 2
         /tests/cases/fourslash/server/tsconfig.json
@@ -239,7 +258,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsconfig.json",
@@ -252,7 +271,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "semanticDiagnosticsSync",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/tsxIncrementalServer.js b/tests/baselines/reference/tsserver/fourslashServer/tsxIncrementalServer.js
index 037ded42c7408..708f354378e9c 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/tsxIncrementalServer.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/tsxIncrementalServer.js
@@ -1,23 +1,38 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/tsxIncrementalServer.ts]
 
 
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts"
@@ -29,7 +44,7 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -39,18 +54,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/tsxIncrementalServer.ts SVC-1-0 ""
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	tsxIncrementalServer.ts
 	  Root file specified for compilation
 
@@ -67,7 +82,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -75,12 +90,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -99,15 +114,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -118,7 +133,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -135,7 +150,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 After Request
@@ -147,15 +162,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -166,7 +181,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -183,20 +198,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -207,7 +222,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 3,
+      "seq": 4,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -222,13 +237,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 3,
+      "request_seq": 4,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 4,
+      "seq": 5,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -245,20 +260,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 4,
+      "request_seq": 5,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -269,7 +284,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 5,
+      "seq": 6,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -286,20 +301,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 5,
+      "request_seq": 6,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -310,7 +325,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 6,
+      "seq": 7,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -325,13 +340,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 6,
+      "request_seq": 7,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 7,
+      "seq": 8,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -348,20 +363,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 7,
+      "request_seq": 8,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -372,7 +387,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 8,
+      "seq": 9,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -387,13 +402,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 8,
+      "request_seq": 9,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 9,
+      "seq": 10,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -410,20 +425,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 9,
+      "request_seq": 10,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -434,7 +449,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 10,
+      "seq": 11,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -449,13 +464,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 10,
+      "request_seq": 11,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 11,
+      "seq": 12,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -472,20 +487,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 11,
+      "request_seq": 12,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -496,7 +511,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 12,
+      "seq": 13,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -513,20 +528,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 12,
+      "request_seq": 13,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -537,7 +552,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 13,
+      "seq": 14,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -552,13 +567,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 13,
+      "request_seq": 14,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 14,
+      "seq": 15,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -575,20 +590,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 14,
+      "request_seq": 15,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -599,7 +614,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 15,
+      "seq": 16,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -616,20 +631,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 15,
+      "request_seq": 16,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -640,7 +655,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 16,
+      "seq": 17,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -655,13 +670,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 16,
+      "request_seq": 17,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 17,
+      "seq": 18,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -678,20 +693,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 17,
+      "request_seq": 18,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -702,7 +717,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 18,
+      "seq": 19,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -717,13 +732,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 18,
+      "request_seq": 19,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 19,
+      "seq": 20,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -740,20 +755,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 19,
+      "request_seq": 20,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -764,7 +779,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 20,
+      "seq": 21,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -779,13 +794,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 20,
+      "request_seq": 21,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 21,
+      "seq": 22,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -802,20 +817,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 21,
+      "request_seq": 22,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -826,7 +841,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 22,
+      "seq": 23,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -843,20 +858,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 22,
+      "request_seq": 23,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -867,7 +882,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 23,
+      "seq": 24,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -882,13 +897,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 23,
+      "request_seq": 24,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 24,
+      "seq": 25,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -905,20 +920,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 24,
+      "request_seq": 25,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -929,7 +944,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 25,
+      "seq": 26,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -946,20 +961,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 25,
+      "request_seq": 26,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -970,7 +985,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 26,
+      "seq": 27,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -985,13 +1000,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 26,
+      "request_seq": 27,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 27,
+      "seq": 28,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -1008,20 +1023,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 27,
+      "request_seq": 28,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1032,7 +1047,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 28,
+      "seq": 29,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -1047,13 +1062,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 28,
+      "request_seq": 29,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 29,
+      "seq": 30,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -1070,20 +1085,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 29,
+      "request_seq": 30,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1094,7 +1109,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 30,
+      "seq": 31,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -1109,13 +1124,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 30,
+      "request_seq": 31,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 31,
+      "seq": 32,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -1132,20 +1147,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 31,
+      "request_seq": 32,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1156,7 +1171,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 32,
+      "seq": 33,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -1171,13 +1186,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 32,
+      "request_seq": 33,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 33,
+      "seq": 34,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -1194,20 +1209,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 33,
+      "request_seq": 34,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1218,7 +1233,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 34,
+      "seq": 35,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -1235,20 +1250,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 34,
+      "request_seq": 35,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1259,7 +1274,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 35,
+      "seq": 36,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -1274,13 +1289,13 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 35,
+      "request_seq": 36,
       "success": true,
       "body": []
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 36,
+      "seq": 37,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -1297,20 +1312,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 36,
+      "request_seq": 37,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1321,7 +1336,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 37,
+      "seq": 38,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -1338,20 +1353,20 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "change",
-      "request_seq": 37,
+      "request_seq": 38,
       "success": true
     }
 After Request
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
+/home/src/tslibs/TS/Lib/lib.es5.d.ts
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -1362,7 +1377,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 38,
+      "seq": 39,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/tsxIncrementalServer.ts",
@@ -1377,7 +1392,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "formatonkey",
-      "request_seq": 38,
+      "request_seq": 39,
       "success": true,
       "body": []
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/fourslashServer/typeReferenceOnServer.js b/tests/baselines/reference/tsserver/fourslashServer/typeReferenceOnServer.js
index 8732c82a37018..31a7f12498df5 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/typeReferenceOnServer.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/typeReferenceOnServer.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/typeReferenceOnServer.ts]
 /// <reference types="foo" />
 var x: number;
@@ -19,7 +34,7 @@ x.
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/typeReferenceOnServer.ts"
@@ -35,7 +50,7 @@ Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/four
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -45,18 +60,18 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/typeReferenceOnServer.ts SVC-1-0 "/// <reference types=\"foo\" />\nvar x: number;\nx."
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	typeReferenceOnServer.ts
 	  Root file specified for compilation
 
@@ -73,7 +88,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -81,12 +96,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
   {"pollingInterval":2000}
 /tests/cases/fourslash/server/tsconfig.json: *new*
@@ -109,15 +124,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -128,7 +143,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "preferences": {}
@@ -140,12 +155,12 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "configure",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true
     }
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 2,
+      "seq": 3,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/typeReferenceOnServer.ts",
@@ -165,7 +180,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "completionInfo",
-      "request_seq": 2,
+      "request_seq": 3,
       "success": true,
       "body": {
         "flags": 0,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/typedefinition01.js b/tests/baselines/reference/tsserver/fourslashServer/typedefinition01.js
index 4384e8d39e7b7..e0c330f013e11 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/typedefinition01.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/typedefinition01.js
@@ -1,16 +1,31 @@
 Info seq  [hh:mm:ss:mss] currentDirectory:: /home/src/Vscode/Projects/bin useCaseSensitiveFileNames:: false
 Info seq  [hh:mm:ss:mss] libs Location:: /home/src/tslibs/TS/Lib
 Info seq  [hh:mm:ss:mss] globalTypingsCacheLocation:: /home/src/Library/Caches/typescript
-Info seq  [hh:mm:ss:mss] Provided types map file "/home/src/tslibs/TS/Lib/typesMap.json" doesn't exist
-//// [/home/src/tslibs/TS/Lib/lib.d.ts]
-lib.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.d.ts]
-lib.decorators.d.ts-Text
-
-//// [/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts]
-lib.decorators.legacy.d.ts-Text
-
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "seq": 0,
+      "type": "request",
+      "arguments": {
+        "options": {
+          "target": "es5",
+          "newLine": "crlf",
+          "lib": [
+            "es5"
+          ],
+          "skipDefaultLibCheck": true
+        }
+      },
+      "command": "compilerOptionsForInferredProjects"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "seq": 0,
+      "type": "response",
+      "command": "compilerOptionsForInferredProjects",
+      "request_seq": 0,
+      "success": true,
+      "body": true
+    }
 //// [/tests/cases/fourslash/server/a.ts]
 export class Foo {}
 
@@ -21,7 +36,7 @@ var x = new n.Foo();
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 0,
+      "seq": 1,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.ts"
@@ -34,7 +49,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/a.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es5.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /tests/cases/fourslash/server/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -44,19 +59,19 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /te
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 lib.d.ts-Text
+	/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
 	/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
 	/tests/cases/fourslash/server/a.ts Text-1 "export class Foo {}"
 	/tests/cases/fourslash/server/b.ts SVC-1-0 "import n = require('./a');\nvar x = new n.Foo();"
 
 
-	../../../../home/src/tslibs/TS/Lib/lib.d.ts
-	  Default library for target 'es5'
+	../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts
+	  Library 'lib.es5.d.ts' specified in compilerOptions
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.d.ts
-	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	../../../../home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts
-	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.d.ts'
+	  Library referenced via 'decorators.legacy' from file '../../../../home/src/tslibs/TS/Lib/lib.es5.d.ts'
 	a.ts
 	  Imported via './a' from file 'b.ts'
 	b.ts
@@ -75,7 +90,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "open",
-      "request_seq": 0,
+      "request_seq": 1,
       "success": true,
       "performanceData": {
         "updateGraphDurationMs": *
@@ -83,12 +98,12 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After Request
 watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts: *new*
-  {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.d.ts: *new*
   {"pollingInterval":500}
 /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts: *new*
   {"pollingInterval":500}
+/home/src/tslibs/TS/Lib/lib.es5.d.ts: *new*
+  {"pollingInterval":500}
 /tests/cases/fourslash/server/a.ts: *new*
   {"pollingInterval":500}
 /tests/cases/fourslash/server/jsconfig.json: *new*
@@ -109,15 +124,15 @@ Projects::
     autoImportProviderHost: false
 
 ScriptInfos::
-/home/src/tslibs/TS/Lib/lib.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts *new*
+/home/src/tslibs/TS/Lib/lib.es5.d.ts *new*
     version: Text-1
     containingProjects: 1
         /dev/null/inferredProject1*
@@ -132,7 +147,7 @@ ScriptInfos::
 
 Info seq  [hh:mm:ss:mss] request:
     {
-      "seq": 1,
+      "seq": 2,
       "type": "request",
       "arguments": {
         "file": "/tests/cases/fourslash/server/b.ts",
@@ -146,7 +161,7 @@ Info seq  [hh:mm:ss:mss] response:
       "seq": 0,
       "type": "response",
       "command": "typeDefinition",
-      "request_seq": 1,
+      "request_seq": 2,
       "success": true,
       "body": [
         {
diff --git a/tests/baselines/reference/tsserver/inconsistentErrorInEditor/should-not-error-2.js b/tests/baselines/reference/tsserver/inconsistentErrorInEditor/should-not-error-2.js
index 5b79406940674..8a23e1719c1b8 100644
--- a/tests/baselines/reference/tsserver/inconsistentErrorInEditor/should-not-error-2.js
+++ b/tests/baselines/reference/tsserver/inconsistentErrorInEditor/should-not-error-2.js
@@ -39,12 +39,6 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: ^/untitled/ts-nul-auth
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/Vscode/Projects/bin
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -75,14 +69,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
-
 FsWatches::
 /home/src/tslibs/TS/Lib/lib.d.ts: *new*
   {}
diff --git a/tests/baselines/reference/tsserver/inconsistentErrorInEditor/should-not-error.js b/tests/baselines/reference/tsserver/inconsistentErrorInEditor/should-not-error.js
index 5e7c9c87fbee7..a1d5bfd6b2f2f 100644
--- a/tests/baselines/reference/tsserver/inconsistentErrorInEditor/should-not-error.js
+++ b/tests/baselines/reference/tsserver/inconsistentErrorInEditor/should-not-error.js
@@ -39,12 +39,6 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: ^/untitled/ts-nul-auth
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/Vscode/Projects/bin
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -75,14 +69,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
-
 FsWatches::
 /home/src/tslibs/TS/Lib/lib.d.ts: *new*
   {}
diff --git a/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-insensitive-system.js b/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-insensitive-system.js
index 4f6fb9c1419b7..529e618cafa96 100644
--- a/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-insensitive-system.js
+++ b/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-insensitive-system.js
@@ -703,12 +703,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject3*
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject3* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject3*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -765,10 +759,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject3*",
@@ -848,16 +838,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -979,16 +959,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -1115,16 +1085,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -1254,16 +1214,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -1393,16 +1343,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -1627,17 +1567,7 @@ TI:: [hh:mm:ss:mss] Sending response:
       "projectName": "/dev/null/inferredProject3*",
       "files": []
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Closing file watchers for project '/dev/null/inferredProject3*' - done.
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -1710,16 +1640,6 @@ PolledWatches::
   {"pollingInterval":500}
 
 PolledWatches *deleted*::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/project/b/bower_components:
   {"pollingInterval":500}
 /user/username/projects/project/b/node_modules:
@@ -2191,12 +2111,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject5*
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject5* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject5* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject5* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject5* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject5* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject5* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject5* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject5*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -2253,10 +2167,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject5* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject5* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject5* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject5* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject5*",
@@ -2336,16 +2246,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -2467,16 +2367,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -2603,16 +2493,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -2742,16 +2622,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -2881,16 +2751,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -3142,17 +3002,7 @@ TI:: [hh:mm:ss:mss] Sending response:
       "projectName": "/dev/null/inferredProject5*",
       "files": []
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject5* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject5* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject5* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject5* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Closing file watchers for project '/dev/null/inferredProject5*' - done.
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject5* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject5* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject5* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject5* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject5* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject5* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject4*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -3228,16 +3078,6 @@ PolledWatches::
   {"pollingInterval":500}
 
 PolledWatches *deleted*::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/project/b/bower_components:
   {"pollingInterval":500}
 /user/username/projects/project/b/node_modules:
@@ -3715,12 +3555,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject7*
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject7* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject7* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject7* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject7* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject7* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject7* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject7* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject7*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -3777,10 +3611,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject7* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject7* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject7* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject7* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject7*",
@@ -3860,16 +3690,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -3991,16 +3811,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -4127,16 +3937,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -4266,16 +4066,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -4405,16 +4195,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -4639,17 +4419,7 @@ TI:: [hh:mm:ss:mss] Sending response:
       "projectName": "/dev/null/inferredProject7*",
       "files": []
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject7* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject7* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject7* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject7* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Closing file watchers for project '/dev/null/inferredProject7*' - done.
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject7* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject7* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject7* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject7* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject7* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject7* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject6*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -4722,16 +4492,6 @@ PolledWatches::
   {"pollingInterval":500}
 
 PolledWatches *deleted*::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/project/b/bower_components:
   {"pollingInterval":500}
 /user/username/projects/project/b/node_modules:
@@ -5203,12 +4963,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject9*
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject9* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject9* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject9* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject9* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject9* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject9* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject9* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject9*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -5265,10 +5019,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject9* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject9* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject9* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject9* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject9*",
@@ -5348,16 +5098,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -5479,16 +5219,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -5615,16 +5345,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -5754,16 +5474,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -5893,16 +5603,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
diff --git a/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-sensitive-system.js b/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-sensitive-system.js
index 2954990bccb1b..d24429426777c 100644
--- a/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-sensitive-system.js
+++ b/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-sensitive-system.js
@@ -741,12 +741,6 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject3*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/c/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/c/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject3*
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject3* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject3*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -803,10 +797,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject3*",
@@ -886,16 +876,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/A/jsconfig.json:
@@ -1023,16 +1003,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/A/jsconfig.json:
@@ -1165,16 +1135,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -1304,16 +1264,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -1443,16 +1393,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -1677,17 +1617,7 @@ TI:: [hh:mm:ss:mss] Sending response:
       "projectName": "/dev/null/inferredProject3*",
       "files": []
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Closing file watchers for project '/dev/null/inferredProject3*' - done.
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -1760,16 +1690,6 @@ PolledWatches::
   {"pollingInterval":500}
 
 PolledWatches *deleted*::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/project/b/bower_components:
   {"pollingInterval":500}
 /user/username/projects/project/b/node_modules:
@@ -2317,12 +2237,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject6*
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject6* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject6* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject6* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject6* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject6* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject6* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject6* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject6*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -2379,10 +2293,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject6* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject6* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject6* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject6* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject6*",
@@ -2466,16 +2376,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/A/bower_components:
@@ -2618,16 +2518,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/A/bower_components:
@@ -2776,16 +2666,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/A/bower_components:
@@ -2932,16 +2812,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/A/bower_components:
@@ -3088,16 +2958,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/A/bower_components:
@@ -3350,17 +3210,7 @@ TI:: [hh:mm:ss:mss] Sending response:
       "projectName": "/dev/null/inferredProject6*",
       "files": []
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject6* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject6* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject6* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject6* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Closing file watchers for project '/dev/null/inferredProject6*' - done.
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject6* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject6* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject6* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject6* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject6* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject6* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject4*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -3464,16 +3314,6 @@ PolledWatches::
   {"pollingInterval":500}
 
 PolledWatches *deleted*::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/project/A/bower_components:
   {"pollingInterval":500}
 /user/username/projects/project/A/node_modules:
@@ -3997,12 +3837,6 @@ Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject8*,
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/c/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/c/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject8*
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject8* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject8* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject8* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject8* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject8* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject8* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject8* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject8*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -4059,10 +3893,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject8* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject8* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject8* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject8* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject8*",
@@ -4142,16 +3972,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/A/jsconfig.json:
@@ -4279,16 +4099,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/A/jsconfig.json:
@@ -4421,16 +4231,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -4560,16 +4360,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -4699,16 +4489,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
@@ -4933,17 +4713,7 @@ TI:: [hh:mm:ss:mss] Sending response:
       "projectName": "/dev/null/inferredProject8*",
       "files": []
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject8* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject8* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject8* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject8* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Closing file watchers for project '/dev/null/inferredProject8*' - done.
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject8* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject8* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject8* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject8* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject8* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject8* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject7*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -5016,16 +4786,6 @@ PolledWatches::
   {"pollingInterval":500}
 
 PolledWatches *deleted*::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/project/b/bower_components:
   {"pollingInterval":500}
 /user/username/projects/project/b/node_modules:
@@ -5581,12 +5341,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject11*
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject11* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject11* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject11* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject11* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject11* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject11* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject11* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject11*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -5643,10 +5397,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject11* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject11* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject11* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject11* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject11*",
@@ -5730,16 +5480,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/A/bower_components:
@@ -5887,16 +5627,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/A/bower_components:
@@ -6050,16 +5780,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/A/bower_components:
@@ -6211,16 +5931,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/A/bower_components:
@@ -6372,16 +6082,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/A/bower_components:
diff --git a/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root.js b/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root.js
index b413072679309..2ddfafd6be595 100644
--- a/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root.js
+++ b/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root.js
@@ -703,12 +703,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject3*
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject3* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject3* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject3*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -765,10 +759,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject3*",
@@ -848,16 +838,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /user/username/projects/node_modules/@types:
   {"pollingInterval":500}
 /user/username/projects/project/a/bower_components:
diff --git a/tests/baselines/reference/tsserver/inferredProjects/should-use-only-one-inferred-project-if-useOneInferredProject-is-set.js b/tests/baselines/reference/tsserver/inferredProjects/should-use-only-one-inferred-project-if-useOneInferredProject-is-set.js
index 4d0c8595d04e1..fb349a097a71d 100644
--- a/tests/baselines/reference/tsserver/inferredProjects/should-use-only-one-inferred-project-if-useOneInferredProject-is-set.js
+++ b/tests/baselines/reference/tsserver/inferredProjects/should-use-only-one-inferred-project-if-useOneInferredProject-is-set.js
@@ -46,12 +46,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -86,12 +80,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /user/username/projects/myproject/a/b/jsconfig.json: *new*
   {"pollingInterval":2000}
 /user/username/projects/myproject/a/b/tsconfig.json: *new*
@@ -179,12 +167,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/myproject/a/b/jsconfig.json:
   {"pollingInterval":2000}
 /user/username/projects/myproject/a/b/tsconfig.json:
@@ -285,12 +267,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/myproject/a/b/jsconfig.json:
   {"pollingInterval":2000}
 /user/username/projects/myproject/a/b/tsconfig.json:
@@ -359,12 +335,6 @@ Before running Timeout callback:: count: 1
 
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/myproject/a/b/jsconfig.json:
   {"pollingInterval":2000}
 /user/username/projects/myproject/a/c/jsconfig.json:
@@ -570,12 +540,6 @@ After running Timeout callback:: count: 0
 
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /user/username/projects/myproject/a/b/node_modules/@types: *new*
   {"pollingInterval":500}
 /user/username/projects/myproject/a/c/jsconfig.json:
diff --git a/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/handles-resolutions-when-currentNodeModulesDepth-changes-when-referencing-file-from-another-file.js b/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/handles-resolutions-when-currentNodeModulesDepth-changes-when-referencing-file-from-another-file.js
index 6fce1d68c2020..fe362c45da0c2 100644
--- a/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/handles-resolutions-when-currentNodeModulesDepth-changes-when-referencing-file-from-another-file.js
+++ b/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/handles-resolutions-when-currentNodeModulesDepth-changes-when-referencing-file-from-another-file.js
@@ -71,12 +71,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project1/src/node_modules/glob/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project1/src/node_modules/path/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (5)
@@ -103,12 +97,6 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 TI:: Creating typing installer
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /user/username/projects/node_modules: *new*
   {"pollingInterval":500}
 /user/username/projects/package.json: *new*
@@ -251,14 +239,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project1/src/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project1/src/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project1/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project1/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Installing typings ["glob","minimatch","node"]
 TI:: [hh:mm:ss:mss] 'glob':: Entry for package 'glob' does not exist in local types registry - skipping...
 TI:: [hh:mm:ss:mss] 'minimatch':: Entry for package 'minimatch' does not exist in local types registry - skipping...
@@ -337,56 +317,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/user/username/projects/node_modules:
-  {"pollingInterval":500}
-/user/username/projects/package.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/jsconfig.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/node_modules:
-  {"pollingInterval":500}
-/user/username/projects/project1/package.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/src/bower_components: *new*
-  {"pollingInterval":500}
-/user/username/projects/project1/src/jsconfig.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/src/node_modules/glob/package.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/src/node_modules/minimatch/package.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/src/node_modules/package.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/src/node_modules/path/package.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/src/package.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/src/tsconfig.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/tsconfig.json:
-  {"pollingInterval":2000}
-
-FsWatches::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-
-FsWatchesRecursive::
-/user/username/projects:
-  {}
-/user/username/projects/project1/src/node_modules:
-  {}
-
 Projects::
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/should-return-to-normal-state-when-all-js-root-files-are-removed-from-project.js b/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/should-return-to-normal-state-when-all-js-root-files-are-removed-from-project.js
index e8b8870e312ec..1044381e83bb7 100644
--- a/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/should-return-to-normal-state-when-all-js-root-files-are-removed-from-project.js
+++ b/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/should-return-to-normal-state-when-all-js-root-files-are-removed-from-project.js
@@ -39,12 +39,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/projects/pro
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -79,12 +73,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /home/src/projects/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/projects/project/tsconfig.json: *new*
@@ -213,12 +201,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
 /home/src/projects/project/jsconfig.json:
   {"pollingInterval":2000}
 /home/src/projects/project/tsconfig.json:
diff --git a/tests/baselines/reference/tsserver/pasteEdits/should-not-error.js b/tests/baselines/reference/tsserver/pasteEdits/should-not-error.js
index 58c48c8ae9b84..8021fae99796a 100644
--- a/tests/baselines/reference/tsserver/pasteEdits/should-not-error.js
+++ b/tests/baselines/reference/tsserver/pasteEdits/should-not-error.js
@@ -46,12 +46,6 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: ^/untitled/ts-nul-auth
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /home/src/Vscode/Projects/bin
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -82,14 +76,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
-
 FsWatches::
 /home/src/tslibs/TS/Lib/lib.d.ts: *new*
   {}
diff --git a/tests/baselines/reference/tsserver/pluginsAsync/adds-external-files.js b/tests/baselines/reference/tsserver/pluginsAsync/adds-external-files.js
index 6b91def85f56b..9ec2b0e044d93 100644
--- a/tests/baselines/reference/tsserver/pluginsAsync/adds-external-files.js
+++ b/tests/baselines/reference/tsserver/pluginsAsync/adds-external-files.js
@@ -36,12 +36,6 @@ Info seq  [hh:mm:ss:mss] Dynamically importing plugin-a from /home/src/tslibs/TS
 request import plugin-a
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -75,14 +69,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
-
 FsWatches::
 /home/src/tslibs/TS/Lib/lib.d.ts: *new*
   {}
diff --git a/tests/baselines/reference/tsserver/pluginsAsync/plugins-are-not-loaded-immediately.js b/tests/baselines/reference/tsserver/pluginsAsync/plugins-are-not-loaded-immediately.js
index a0e90022ffd87..8ba2edda2473d 100644
--- a/tests/baselines/reference/tsserver/pluginsAsync/plugins-are-not-loaded-immediately.js
+++ b/tests/baselines/reference/tsserver/pluginsAsync/plugins-are-not-loaded-immediately.js
@@ -36,12 +36,6 @@ Info seq  [hh:mm:ss:mss] Dynamically importing plugin-a from /home/src/tslibs/TS
 request import plugin-a
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -75,14 +69,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
-
 FsWatches::
 /home/src/tslibs/TS/Lib/lib.d.ts: *new*
   {}
diff --git a/tests/baselines/reference/tsserver/pluginsAsync/plugins-evaluation-in-correct-order-even-if-imports-resolve-out-of-order.js b/tests/baselines/reference/tsserver/pluginsAsync/plugins-evaluation-in-correct-order-even-if-imports-resolve-out-of-order.js
index 27667c6363565..3e1cdb0f103f0 100644
--- a/tests/baselines/reference/tsserver/pluginsAsync/plugins-evaluation-in-correct-order-even-if-imports-resolve-out-of-order.js
+++ b/tests/baselines/reference/tsserver/pluginsAsync/plugins-evaluation-in-correct-order-even-if-imports-resolve-out-of-order.js
@@ -40,12 +40,6 @@ Info seq  [hh:mm:ss:mss] Dynamically importing plugin-b from /home/src/tslibs/TS
 request import plugin-b
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -79,14 +73,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
-
 FsWatches::
 /home/src/tslibs/TS/Lib/lib.d.ts: *new*
   {}
diff --git a/tests/baselines/reference/tsserver/pluginsAsync/project-is-closed-before-plugins-are-loaded.js b/tests/baselines/reference/tsserver/pluginsAsync/project-is-closed-before-plugins-are-loaded.js
index 28d10252231e8..4f17d50553b2d 100644
--- a/tests/baselines/reference/tsserver/pluginsAsync/project-is-closed-before-plugins-are-loaded.js
+++ b/tests/baselines/reference/tsserver/pluginsAsync/project-is-closed-before-plugins-are-loaded.js
@@ -37,12 +37,6 @@ request import plugin-a
 Awaiting project close
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -76,14 +70,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
-
 FsWatches::
 /home/src/tslibs/TS/Lib/lib.d.ts: *new*
   {}
@@ -195,12 +181,6 @@ Info seq  [hh:mm:ss:mss] 	Files (2)
 	  Root file specified for compilation
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
 
@@ -221,18 +201,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches *deleted*::
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-
 Projects::
 /dev/null/inferredProject1* (Inferred) *deleted*
     projectStateVersion: 2
diff --git a/tests/baselines/reference/tsserver/pluginsAsync/sends-projectsUpdatedInBackground-event.js b/tests/baselines/reference/tsserver/pluginsAsync/sends-projectsUpdatedInBackground-event.js
index cbd7c34355c78..784dcb7a9128a 100644
--- a/tests/baselines/reference/tsserver/pluginsAsync/sends-projectsUpdatedInBackground-event.js
+++ b/tests/baselines/reference/tsserver/pluginsAsync/sends-projectsUpdatedInBackground-event.js
@@ -36,12 +36,6 @@ Info seq  [hh:mm:ss:mss] Dynamically importing plugin-a from /home/src/tslibs/TS
 request import plugin-a
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -75,14 +69,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
-
 FsWatches::
 /home/src/tslibs/TS/Lib/lib.d.ts: *new*
   {}
diff --git a/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-without-projectRoot.js b/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-without-projectRoot.js
index 8fd3342ad515d..b772a827bd827 100644
--- a/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-without-projectRoot.js
+++ b/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-without-projectRoot.js
@@ -43,12 +43,6 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferred
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /typings/@epic/Core.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/src/somefile.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -85,16 +79,10 @@ After request
 PolledWatches::
 /home/src/Vscode/Projects/bin/jsconfig.json: *new*
   {"pollingInterval":2000}
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
 /home/src/Vscode/Projects/bin/src/somefile.d.ts: *new*
   {"pollingInterval":500}
 /home/src/Vscode/Projects/bin/tsconfig.json: *new*
   {"pollingInterval":2000}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /typings/@epic/Core.d.ts: *new*
   {"pollingInterval":500}
 
diff --git a/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js b/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js
index 466c87bc8a835..0a18d185a9b1b 100644
--- a/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js
+++ b/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js
@@ -353,6 +353,20 @@ Info seq  [hh:mm:ss:mss] event:
             "code": 5107,
             "category": "error",
             "fileName": "/user/username/projects/myproject/SiblingClass/tsconfig.json"
+          },
+          {
+            "start": {
+              "line": 9,
+              "offset": 5
+            },
+            "end": {
+              "line": 9,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/SiblingClass/tsconfig.json"
           }
         ]
       }
diff --git a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-gerErr-with-sync-commands.js b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-gerErr-with-sync-commands.js
index ae17229877f2a..26b8018846703 100644
--- a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-gerErr-with-sync-commands.js
+++ b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-gerErr-with-sync-commands.js
@@ -192,7 +192,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/usage/usage.ts",
         "configFile": "/user/username/projects/myproject/usage/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/usage/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/usage/tsconfig.json ProjectRootPath: undefined:: Result: undefined
diff --git a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-getErr.js b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-getErr.js
index 4c4356b88c7c6..0720a2114cf6e 100644
--- a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-getErr.js
+++ b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-getErr.js
@@ -192,7 +192,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/usage/usage.ts",
         "configFile": "/user/username/projects/myproject/usage/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/usage/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/usage/tsconfig.json ProjectRootPath: undefined:: Result: undefined
diff --git a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-geterrForProject.js b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-geterrForProject.js
index 28c1163610f49..b36bc4b37d663 100644
--- a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-geterrForProject.js
+++ b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-geterrForProject.js
@@ -192,7 +192,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/usage/usage.ts",
         "configFile": "/user/username/projects/myproject/usage/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/usage/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/usage/tsconfig.json ProjectRootPath: undefined:: Result: undefined
diff --git a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-gerErr-with-sync-commands.js b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-gerErr-with-sync-commands.js
index bde7d93fc187c..448a89b66a896 100644
--- a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-gerErr-with-sync-commands.js
+++ b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-gerErr-with-sync-commands.js
@@ -192,7 +192,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/usage/usage.ts",
         "configFile": "/user/username/projects/myproject/usage/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/usage/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/usage/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -365,7 +380,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/dependency/fns.ts",
         "configFile": "/user/username/projects/myproject/dependency/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/dependency/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/dependency/tsconfig.json ProjectRootPath: undefined:: Result: undefined
diff --git a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-getErr.js b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-getErr.js
index 97c1b5084b9c5..8da45bfc79fba 100644
--- a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-getErr.js
+++ b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-getErr.js
@@ -192,7 +192,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/usage/usage.ts",
         "configFile": "/user/username/projects/myproject/usage/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/usage/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/usage/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -365,7 +380,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/dependency/fns.ts",
         "configFile": "/user/username/projects/myproject/dependency/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/dependency/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/dependency/tsconfig.json ProjectRootPath: undefined:: Result: undefined
diff --git a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-geterrForProject.js b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-geterrForProject.js
index b9123e29be574..d9bfbab658f85 100644
--- a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-geterrForProject.js
+++ b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-geterrForProject.js
@@ -192,7 +192,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/usage/usage.ts",
         "configFile": "/user/username/projects/myproject/usage/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/usage/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/usage/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -365,7 +380,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/dependency/fns.ts",
         "configFile": "/user/username/projects/myproject/dependency/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/dependency/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/dependency/tsconfig.json ProjectRootPath: undefined:: Result: undefined
diff --git a/tests/baselines/reference/tsserver/projectReferences/ancestor-and-project-ref-management.js b/tests/baselines/reference/tsserver/projectReferences/ancestor-and-project-ref-management.js
index 7cd2d1c4e009a..7fd525dea8cd6 100644
--- a/tests/baselines/reference/tsserver/projectReferences/ancestor-and-project-ref-management.js
+++ b/tests/baselines/reference/tsserver/projectReferences/ancestor-and-project-ref-management.js
@@ -118,7 +118,7 @@ declare namespace container {
 //# sourceMappingURL=lib.d.ts.map
 
 //// [/user/username/projects/container/built/local/lib.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../../lib/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14968179652-namespace container {\n    export const myConst = 30;\n}\n"],"root":[2],"options":{"composite":true,"declarationMap":true,"outFile":"./lib.js"},"outSignature":"4250822250-declare namespace container {\n    const myConst = 30;\n}\n","latestChangedDtsFile":"./lib.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../../lib/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14968179652-namespace container {\n    export const myConst = 30;\n}\n"],"root":[2],"options":{"composite":true,"declarationMap":true,"outFile":"./lib.js"},"semanticDiagnosticsPerFile":[1,2],"outSignature":"4250822250-declare namespace container {\n    const myConst = 30;\n}\n","latestChangedDtsFile":"./lib.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/container/built/local/lib.tsbuildinfo.readable.baseline.txt]
 {
@@ -141,10 +141,20 @@ declare namespace container {
     "declarationMap": true,
     "outFile": "./lib.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../lib/index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "4250822250-declare namespace container {\n    const myConst = 30;\n}\n",
   "latestChangedDtsFile": "./lib.d.ts",
   "version": "FakeTSVersion",
-  "size": 810
+  "size": 845
 }
 
 //// [/user/username/projects/container/built/local/exec.js]
@@ -158,15 +168,16 @@ var container;
 
 
 //// [/user/username/projects/container/built/local/exec.tsbuildinfo]
-{"root":["../../exec/index.ts"],"version":"FakeTSVersion"}
+{"root":["../../exec/index.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/container/built/local/exec.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "../../exec/index.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 58
+  "size": 72
 }
 
 //// [/user/username/projects/container/built/local/compositeExec.js]
@@ -189,7 +200,7 @@ declare namespace container {
 //# sourceMappingURL=compositeExec.d.ts.map
 
 //// [/user/username/projects/container/built/local/compositeExec.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib.d.ts","../../compositeexec/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","4250822250-declare namespace container {\n    const myConst = 30;\n}\n","-4062145979-namespace container {\n    export function getMyConst() {\n        return myConst;\n    }\n}\n"],"root":[3],"options":{"composite":true,"declarationMap":true,"outFile":"./compositeExec.js"},"outSignature":"6546330589-declare namespace container {\n    function getMyConst(): number;\n}\n","latestChangedDtsFile":"./compositeExec.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib.d.ts","../../compositeexec/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","4250822250-declare namespace container {\n    const myConst = 30;\n}\n","-4062145979-namespace container {\n    export function getMyConst() {\n        return myConst;\n    }\n}\n"],"root":[3],"options":{"composite":true,"declarationMap":true,"outFile":"./compositeExec.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"6546330589-declare namespace container {\n    function getMyConst(): number;\n}\n","latestChangedDtsFile":"./compositeExec.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/container/built/local/compositeExec.tsbuildinfo.readable.baseline.txt]
 {
@@ -214,10 +225,24 @@ declare namespace container {
     "declarationMap": true,
     "outFile": "./compositeExec.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../compositeexec/index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "6546330589-declare namespace container {\n    function getMyConst(): number;\n}\n",
   "latestChangedDtsFile": "./compositeExec.d.ts",
   "version": "FakeTSVersion",
-  "size": 972
+  "size": 1009
 }
 
 
@@ -359,7 +384,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/container/compositeExec/index.ts",
         "configFile": "/user/username/projects/container/compositeExec/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/container/compositeExec/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/container/compositeExec/tsconfig.json ProjectRootPath: undefined:: Result: /user/username/projects/container/tsconfig.json
@@ -665,7 +705,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/container/lib/index.ts",
         "configFile": "/user/username/projects/container/lib/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/container/lib/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] event:
@@ -876,7 +931,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/container/exec/tsconfig.json",
         "configFile": "/user/username/projects/container/exec/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/container/exec/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/container/lib/index.ts ProjectRootPath: undefined:: Result: /user/username/projects/container/lib/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/projectReferences/can-successfully-find-references-with-out-option.js b/tests/baselines/reference/tsserver/projectReferences/can-successfully-find-references-with-out-option.js
index 98de9a0906a92..a92138cf247ab 100644
--- a/tests/baselines/reference/tsserver/projectReferences/can-successfully-find-references-with-out-option.js
+++ b/tests/baselines/reference/tsserver/projectReferences/can-successfully-find-references-with-out-option.js
@@ -115,7 +115,7 @@ declare namespace container {
 //# sourceMappingURL=lib.d.ts.map
 
 //// [/user/username/projects/container/built/local/lib.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../../lib/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14968179652-namespace container {\n    export const myConst = 30;\n}\n"],"root":[2],"options":{"composite":true,"declarationMap":true,"outFile":"./lib.js"},"outSignature":"4250822250-declare namespace container {\n    const myConst = 30;\n}\n","latestChangedDtsFile":"./lib.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../../lib/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14968179652-namespace container {\n    export const myConst = 30;\n}\n"],"root":[2],"options":{"composite":true,"declarationMap":true,"outFile":"./lib.js"},"semanticDiagnosticsPerFile":[1,2],"outSignature":"4250822250-declare namespace container {\n    const myConst = 30;\n}\n","latestChangedDtsFile":"./lib.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/container/built/local/lib.tsbuildinfo.readable.baseline.txt]
 {
@@ -138,10 +138,20 @@ declare namespace container {
     "declarationMap": true,
     "outFile": "./lib.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../lib/index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "4250822250-declare namespace container {\n    const myConst = 30;\n}\n",
   "latestChangedDtsFile": "./lib.d.ts",
   "version": "FakeTSVersion",
-  "size": 810
+  "size": 845
 }
 
 //// [/user/username/projects/container/built/local/exec.js]
@@ -155,15 +165,16 @@ var container;
 
 
 //// [/user/username/projects/container/built/local/exec.tsbuildinfo]
-{"root":["../../exec/index.ts"],"version":"FakeTSVersion"}
+{"root":["../../exec/index.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/container/built/local/exec.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "../../exec/index.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 58
+  "size": 72
 }
 
 //// [/user/username/projects/container/built/local/compositeExec.js]
@@ -186,7 +197,7 @@ declare namespace container {
 //# sourceMappingURL=compositeExec.d.ts.map
 
 //// [/user/username/projects/container/built/local/compositeExec.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib.d.ts","../../compositeexec/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","4250822250-declare namespace container {\n    const myConst = 30;\n}\n","-4062145979-namespace container {\n    export function getMyConst() {\n        return myConst;\n    }\n}\n"],"root":[3],"options":{"composite":true,"declarationMap":true,"outFile":"./compositeExec.js"},"outSignature":"6546330589-declare namespace container {\n    function getMyConst(): number;\n}\n","latestChangedDtsFile":"./compositeExec.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib.d.ts","../../compositeexec/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","4250822250-declare namespace container {\n    const myConst = 30;\n}\n","-4062145979-namespace container {\n    export function getMyConst() {\n        return myConst;\n    }\n}\n"],"root":[3],"options":{"composite":true,"declarationMap":true,"outFile":"./compositeExec.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"6546330589-declare namespace container {\n    function getMyConst(): number;\n}\n","latestChangedDtsFile":"./compositeExec.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/container/built/local/compositeExec.tsbuildinfo.readable.baseline.txt]
 {
@@ -211,10 +222,24 @@ declare namespace container {
     "declarationMap": true,
     "outFile": "./compositeExec.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../compositeexec/index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "6546330589-declare namespace container {\n    function getMyConst(): number;\n}\n",
   "latestChangedDtsFile": "./compositeExec.d.ts",
   "version": "FakeTSVersion",
-  "size": 972
+  "size": 1009
 }
 
 
@@ -356,7 +381,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/container/compositeExec/index.ts",
         "configFile": "/user/username/projects/container/compositeExec/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/container/compositeExec/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/container/compositeExec/tsconfig.json ProjectRootPath: undefined:: Result: /user/username/projects/container/tsconfig.json
@@ -539,7 +579,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/container/lib/index.ts",
         "configFile": "/user/username/projects/container/lib/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/container/lib/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] event:
@@ -750,7 +805,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/container/exec/tsconfig.json",
         "configFile": "/user/username/projects/container/exec/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/container/exec/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/container/lib/index.ts ProjectRootPath: undefined:: Result: /user/username/projects/container/lib/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/projectReferences/does-not-error-on-container-only-project.js b/tests/baselines/reference/tsserver/projectReferences/does-not-error-on-container-only-project.js
index 3b96fa117f95a..0ab75a719940e 100644
--- a/tests/baselines/reference/tsserver/projectReferences/does-not-error-on-container-only-project.js
+++ b/tests/baselines/reference/tsserver/projectReferences/does-not-error-on-container-only-project.js
@@ -115,7 +115,7 @@ declare namespace container {
 //# sourceMappingURL=lib.d.ts.map
 
 //// [/user/username/projects/container/built/local/lib.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../../lib/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14968179652-namespace container {\n    export const myConst = 30;\n}\n"],"root":[2],"options":{"composite":true,"declarationMap":true,"outFile":"./lib.js"},"outSignature":"4250822250-declare namespace container {\n    const myConst = 30;\n}\n","latestChangedDtsFile":"./lib.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../../lib/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14968179652-namespace container {\n    export const myConst = 30;\n}\n"],"root":[2],"options":{"composite":true,"declarationMap":true,"outFile":"./lib.js"},"semanticDiagnosticsPerFile":[1,2],"outSignature":"4250822250-declare namespace container {\n    const myConst = 30;\n}\n","latestChangedDtsFile":"./lib.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/container/built/local/lib.tsbuildinfo.readable.baseline.txt]
 {
@@ -138,10 +138,20 @@ declare namespace container {
     "declarationMap": true,
     "outFile": "./lib.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../lib/index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "4250822250-declare namespace container {\n    const myConst = 30;\n}\n",
   "latestChangedDtsFile": "./lib.d.ts",
   "version": "FakeTSVersion",
-  "size": 810
+  "size": 845
 }
 
 //// [/user/username/projects/container/built/local/exec.js]
@@ -155,15 +165,16 @@ var container;
 
 
 //// [/user/username/projects/container/built/local/exec.tsbuildinfo]
-{"root":["../../exec/index.ts"],"version":"FakeTSVersion"}
+{"root":["../../exec/index.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/container/built/local/exec.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "../../exec/index.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 58
+  "size": 72
 }
 
 //// [/user/username/projects/container/built/local/compositeExec.js]
@@ -186,7 +197,7 @@ declare namespace container {
 //# sourceMappingURL=compositeExec.d.ts.map
 
 //// [/user/username/projects/container/built/local/compositeExec.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib.d.ts","../../compositeexec/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","4250822250-declare namespace container {\n    const myConst = 30;\n}\n","-4062145979-namespace container {\n    export function getMyConst() {\n        return myConst;\n    }\n}\n"],"root":[3],"options":{"composite":true,"declarationMap":true,"outFile":"./compositeExec.js"},"outSignature":"6546330589-declare namespace container {\n    function getMyConst(): number;\n}\n","latestChangedDtsFile":"./compositeExec.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib.d.ts","../../compositeexec/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","4250822250-declare namespace container {\n    const myConst = 30;\n}\n","-4062145979-namespace container {\n    export function getMyConst() {\n        return myConst;\n    }\n}\n"],"root":[3],"options":{"composite":true,"declarationMap":true,"outFile":"./compositeExec.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"6546330589-declare namespace container {\n    function getMyConst(): number;\n}\n","latestChangedDtsFile":"./compositeExec.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/container/built/local/compositeExec.tsbuildinfo.readable.baseline.txt]
 {
@@ -211,10 +222,24 @@ declare namespace container {
     "declarationMap": true,
     "outFile": "./compositeExec.js"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../compositeexec/index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "outSignature": "6546330589-declare namespace container {\n    function getMyConst(): number;\n}\n",
   "latestChangedDtsFile": "./compositeExec.d.ts",
   "version": "FakeTSVersion",
-  "size": 972
+  "size": 1009
 }
 
 
@@ -362,7 +387,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/container/lib/tsconfig.json",
         "configFile": "/user/username/projects/container/lib/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/container/lib/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/container/exec/tsconfig.json, currentDirectory: /user/username/projects/container/exec
@@ -476,7 +516,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/container/exec/tsconfig.json",
         "configFile": "/user/username/projects/container/exec/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/container/exec/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/container/compositeExec/tsconfig.json, currentDirectory: /user/username/projects/container/compositeExec
@@ -594,7 +649,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/container/compositeExec/tsconfig.json",
         "configFile": "/user/username/projects/container/compositeExec/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/container/compositeExec/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/container/tsconfig.json, currentDirectory: /user/username/projects/container
@@ -822,7 +892,21 @@ Info seq  [hh:mm:ss:mss] request:
     }
 Info seq  [hh:mm:ss:mss] response:
     {
-      "response": [],
+      "response": [
+        {
+          "start": {
+            "line": 3,
+            "offset": 5
+          },
+          "end": {
+            "line": 3,
+            "offset": 14
+          },
+          "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+          "code": 5101,
+          "category": "error"
+        }
+      ],
       "responseRequired": true
     }
 After request
@@ -896,7 +980,21 @@ Info seq  [hh:mm:ss:mss] request:
     }
 Info seq  [hh:mm:ss:mss] response:
     {
-      "response": [],
+      "response": [
+        {
+          "start": {
+            "line": 3,
+            "offset": 5
+          },
+          "end": {
+            "line": 3,
+            "offset": 14
+          },
+          "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+          "code": 5101,
+          "category": "error"
+        }
+      ],
       "responseRequired": true
     }
 After request
@@ -970,7 +1068,21 @@ Info seq  [hh:mm:ss:mss] request:
     }
 Info seq  [hh:mm:ss:mss] response:
     {
-      "response": [],
+      "response": [
+        {
+          "start": {
+            "line": 3,
+            "offset": 5
+          },
+          "end": {
+            "line": 3,
+            "offset": 14
+          },
+          "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+          "code": 5101,
+          "category": "error"
+        }
+      ],
       "responseRequired": true
     }
 After request
diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js
index 058d2158c6014..447d6257bc183 100644
--- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js
+++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js
@@ -340,6 +340,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
@@ -1317,6 +1331,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
@@ -1659,6 +1687,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-indirect-project.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-indirect-project.js
index cddeae60cdf73..68ef913cc14f1 100644
--- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-indirect-project.js
+++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-indirect-project.js
@@ -293,6 +293,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
@@ -1045,6 +1059,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
@@ -1284,6 +1312,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set.js
index 1689113ad701f..c616f720ab29d 100644
--- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set.js
+++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set.js
@@ -251,6 +251,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
@@ -933,6 +947,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
@@ -1142,6 +1170,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js
index f7e8ec7f871be..5d57196390097 100644
--- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js
+++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js
@@ -248,6 +248,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
@@ -1209,6 +1223,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
@@ -1791,46 +1819,6 @@ Info seq  [hh:mm:ss:mss] 	Files (4)
 	/user/username/projects/myproject/own/main.ts Text-2 "import { foo } from 'main';\nfoo;\nexport function bar() {}"
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
-Info seq  [hh:mm:ss:mss] event:
-    {
-      "seq": 0,
-      "type": "event",
-      "event": "configFileDiag",
-      "body": {
-        "triggerFile": "/user/username/projects/myproject/tsconfig.json",
-        "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 4,
-              "offset": 5
-            },
-            "end": {
-              "line": 4,
-              "offset": 14
-            },
-            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
-            "code": 5101,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          },
-          {
-            "start": {
-              "line": 7,
-              "offset": 5
-            },
-            "end": {
-              "line": 9,
-              "offset": 6
-            },
-            "text": "File '/user/username/projects/myproject/tsconfig-src.json' not found.",
-            "code": 6053,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
-      }
-    }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
 Info seq  [hh:mm:ss:mss] Before ensureProjectForOpenFiles:
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
@@ -2027,32 +2015,6 @@ Info seq  [hh:mm:ss:mss] 	Files (4)
 	/user/username/projects/myproject/own/main.ts Text-2 "import { foo } from 'main';\nfoo;\nexport function bar() {}"
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
-Info seq  [hh:mm:ss:mss] event:
-    {
-      "seq": 0,
-      "type": "event",
-      "event": "configFileDiag",
-      "body": {
-        "triggerFile": "/user/username/projects/myproject/tsconfig.json",
-        "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 4,
-              "offset": 5
-            },
-            "end": {
-              "line": 4,
-              "offset": 14
-            },
-            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
-            "code": 5101,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
-      }
-    }
 Info seq  [hh:mm:ss:mss] Running: /user/username/projects/myproject/tsconfig-src.json
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -2640,6 +2602,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
@@ -3808,6 +3784,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js
index 1c4679efbafa6..44de74b7ba1b7 100644
--- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js
+++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js
@@ -338,6 +338,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
@@ -1403,6 +1417,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
@@ -2359,6 +2387,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
@@ -3065,6 +3107,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
@@ -4794,6 +4850,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './own'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
diff --git a/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change-with-file-open-before-revert.js b/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change-with-file-open-before-revert.js
index b07d55ef90802..4c1356ff72567 100644
--- a/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change-with-file-open-before-revert.js
+++ b/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change-with-file-open-before-revert.js
@@ -545,6 +545,32 @@ Info seq  [hh:mm:ss:mss] 	Files (4)
 	/home/src/projects/project/demos/helpers.ts Text-1 "export const foo = 1;\n"
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "configFileDiag",
+      "body": {
+        "triggerFile": "/home/src/projects/project/tsconfig.json",
+        "configFile": "/home/src/projects/project/tsconfig.json",
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './app'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/home/src/projects/project/tsconfig.json"
+          }
+        ]
+      }
+    }
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/project/demos/tsconfig.json
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -1231,6 +1257,17 @@ Info seq  [hh:mm:ss:mss] 	Files (4)
 	/home/src/projects/project/app/Component.ts Text-1 "export const Component = () => {}\n"
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "configFileDiag",
+      "body": {
+        "triggerFile": "/home/src/projects/project/tsconfig.json",
+        "configFile": "/home/src/projects/project/tsconfig.json",
+        "diagnostics": []
+      }
+    }
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/project/demos/tsconfig.json
 Info seq  [hh:mm:ss:mss] event:
     {
diff --git a/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change.js b/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change.js
index fbe69cb0549fd..3c7ed556daa65 100644
--- a/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change.js
+++ b/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change.js
@@ -545,6 +545,32 @@ Info seq  [hh:mm:ss:mss] 	Files (4)
 	/home/src/projects/project/demos/helpers.ts Text-1 "export const foo = 1;\n"
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "configFileDiag",
+      "body": {
+        "triggerFile": "/home/src/projects/project/tsconfig.json",
+        "configFile": "/home/src/projects/project/tsconfig.json",
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './app'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/home/src/projects/project/tsconfig.json"
+          }
+        ]
+      }
+    }
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/project/demos/tsconfig.json
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -831,6 +857,17 @@ Info seq  [hh:mm:ss:mss] 	Files (4)
 	/home/src/projects/project/app/Component.ts Text-1 "export const Component = () => {}\n"
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "configFileDiag",
+      "body": {
+        "triggerFile": "/home/src/projects/project/tsconfig.json",
+        "configFile": "/home/src/projects/project/tsconfig.json",
+        "diagnostics": []
+      }
+    }
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/project/demos/tsconfig.json
 Info seq  [hh:mm:ss:mss] event:
     {
diff --git a/tests/baselines/reference/tsserver/projects/file-with-name-constructor.js-doesnt-cause-issue-with-typeAcquisition-when-safe-type-list.js b/tests/baselines/reference/tsserver/projects/file-with-name-constructor.js-doesnt-cause-issue-with-typeAcquisition-when-safe-type-list.js
index 9a9f806bc065b..f8e18c2fd66ae 100644
--- a/tests/baselines/reference/tsserver/projects/file-with-name-constructor.js-doesnt-cause-issue-with-typeAcquisition-when-safe-type-list.js
+++ b/tests/baselines/reference/tsserver/projects/file-with-name-constructor.js-doesnt-cause-issue-with-typeAcquisition-when-safe-type-list.js
@@ -226,14 +226,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Installing typings ["blissfuljs","s"]
 TI:: [hh:mm:ss:mss] 'blissfuljs':: Entry for package 'blissfuljs' does not exist in local types registry - skipping...
 TI:: [hh:mm:ss:mss] 's':: Entry for package 's' does not exist in local types registry - skipping...
@@ -335,36 +327,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/user/username/projects/node_modules:
-  {"pollingInterval":500}
-/user/username/projects/project/bower_components: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/node_modules:
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-/user/username/projects/project/constructor.js:
-  {}
-/user/username/projects/project/f1.js:
-  {}
-
-FsWatchesRecursive::
-/user/username/projects:
-  {}
-
 Projects::
 project (External) *changed*
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/projects/files-with-mixed-content-are-handled-correctly.js b/tests/baselines/reference/tsserver/projects/files-with-mixed-content-are-handled-correctly.js
index 5181f33a2e555..df9b098c37325 100644
--- a/tests/baselines/reference/tsserver/projects/files-with-mixed-content-are-handled-correctly.js
+++ b/tests/baselines/reference/tsserver/projects/files-with-mixed-content-are-handled-correctly.js
@@ -149,10 +149,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: projectFileName WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: projectFileName WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: projectFileName WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: projectFileName WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "projectFileName",
@@ -243,22 +239,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-
 Projects::
 projectFileName (External) *changed*
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-custom-safe-type-list.js b/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-custom-safe-type-list.js
index ea4319fd41f2f..f8975890cbecf 100644
--- a/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-custom-safe-type-list.js
+++ b/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-custom-safe-type-list.js
@@ -195,18 +195,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/a/b/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/a/b/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/a/b/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/a/b/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/lib/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/lib/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/lib/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/lib/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Installing typings ["duck-types"]
 TI:: [hh:mm:ss:mss] 'duck-types':: Entry for package 'duck-types' does not exist in local types registry - skipping...
 TI:: [hh:mm:ss:mss] All typings are known to be missing or invalid - no need to install more typings
@@ -303,32 +291,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/user/username/projects/project/a/b/bower_components: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/a/b/node_modules: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/lib/bower_components: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/lib/node_modules: *new*
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-/user/username/projects/project/a/b/f1.js:
-  {}
-
 Projects::
 project (External) *changed*
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-legacy-safe-type-list.js b/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-legacy-safe-type-list.js
index 3ae390d65a309..1c0e91ecb9c70 100644
--- a/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-legacy-safe-type-list.js
+++ b/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-legacy-safe-type-list.js
@@ -198,14 +198,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Installing typings ["blissfuljs"]
 TI:: [hh:mm:ss:mss] 'blissfuljs':: Entry for package 'blissfuljs' does not exist in local types registry - skipping...
 TI:: [hh:mm:ss:mss] All typings are known to be missing or invalid - no need to install more typings
@@ -302,28 +294,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/user/username/projects/project/bower_components: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/node_modules: *new*
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-/user/username/projects/project/foo.js:
-  {}
-
 Projects::
 project (External) *changed*
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-the-default-type-list.js b/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-the-default-type-list.js
index 9b56029fdec97..3afa206befd63 100644
--- a/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-the-default-type-list.js
+++ b/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-the-default-type-list.js
@@ -221,30 +221,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/a/b/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/a/b/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/a/b/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/a/b/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/c/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/c/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/c/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/c/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/q/lib/kendo/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/q/lib/kendo/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/q/lib/kendo/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/q/lib/kendo/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/q/lib/kendo-ui/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/q/lib/kendo-ui/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/q/lib/kendo-ui/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/q/lib/kendo-ui/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/scripts/Office/1/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/scripts/Office/1/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/scripts/Office/1/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/scripts/Office/1/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: project WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Installing typings ["kendo-ui","office"]
 TI:: [hh:mm:ss:mss] 'kendo-ui':: Entry for package 'kendo-ui' does not exist in local types registry - skipping...
 TI:: [hh:mm:ss:mss] 'office':: Entry for package 'office' does not exist in local types registry - skipping...
@@ -344,44 +320,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/user/username/projects/project/a/b/bower_components: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/a/b/node_modules: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/c/bower_components: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/c/node_modules: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/q/lib/kendo-ui/bower_components: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/q/lib/kendo-ui/node_modules: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/q/lib/kendo/bower_components: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/q/lib/kendo/node_modules: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/scripts/Office/1/bower_components: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/scripts/Office/1/node_modules: *new*
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-/user/username/projects/project/a/b/f1.js:
-  {}
-
 Projects::
 project (External) *changed*
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/projects/should-disable-features-when-the-files-are-too-large.js b/tests/baselines/reference/tsserver/projects/should-disable-features-when-the-files-are-too-large.js
index 2ca7d391fb5c1..a0a7765a23f58 100644
--- a/tests/baselines/reference/tsserver/projects/should-disable-features-when-the-files-are-too-large.js
+++ b/tests/baselines/reference/tsserver/projects/should-disable-features-when-the-files-are-too-large.js
@@ -172,14 +172,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/bower_components 1 undefined Project: proj1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/bower_components 1 undefined Project: proj1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/node_modules 1 undefined Project: proj1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/node_modules 1 undefined Project: proj1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: proj1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: proj1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: proj1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: proj1 WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "proj1",
@@ -270,28 +262,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/user/username/projects/project/bower_components: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/node_modules: *new*
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-/user/username/projects/project/f1.js:
-  {}
-
 Projects::
 proj1 (External) *changed*
     projectStateVersion: 1
@@ -392,14 +362,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/bower_components 1 undefined Project: proj2 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/bower_components 1 undefined Project: proj2 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/node_modules 1 undefined Project: proj2 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/node_modules 1 undefined Project: proj2 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: proj2 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: proj2 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: proj2 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: proj2 WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "proj2",
@@ -495,20 +457,12 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
 /home/src/Vscode/Projects/bin/node_modules/@types:
   {"pollingInterval":500}
 /home/src/Vscode/Projects/node_modules/@types:
   {"pollingInterval":500}
 /home/src/Vscode/node_modules/@types:
   {"pollingInterval":500}
-/user/username/projects/project/bower_components:
-  {"pollingInterval":500}
-/user/username/projects/project/node_modules:
-  {"pollingInterval":500}
 
 FsWatches::
 /home/src/tslibs/TS/Lib/lib.d.ts:
@@ -652,20 +606,12 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
 /home/src/Vscode/Projects/bin/node_modules/@types:
   {"pollingInterval":500}
 /home/src/Vscode/Projects/node_modules/@types:
   {"pollingInterval":500}
 /home/src/Vscode/node_modules/@types:
   {"pollingInterval":500}
-/user/username/projects/project/bower_components:
-  {"pollingInterval":500}
-/user/username/projects/project/node_modules:
-  {"pollingInterval":500}
 
 FsWatches::
 /home/src/tslibs/TS/Lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/projects/syntax-tree-cache-handles-changes-in-project-settings.js b/tests/baselines/reference/tsserver/projects/syntax-tree-cache-handles-changes-in-project-settings.js
index 9424a455f66ba..9d2080af99643 100644
--- a/tests/baselines/reference/tsserver/projects/syntax-tree-cache-handles-changes-in-project-settings.js
+++ b/tests/baselines/reference/tsserver/projects/syntax-tree-cache-handles-changes-in-project-settings.js
@@ -57,12 +57,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -97,12 +91,6 @@ Info seq  [hh:mm:ss:mss] response:
 After request
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /user/username/projects/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /user/username/projects/project/tsconfig.json: *new*
@@ -320,14 +308,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-
 PolledWatches *deleted*::
 /user/username/projects/project/jsconfig.json:
   {"pollingInterval":2000}
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js
index e8c43ce051f64..c2c1aad124e19 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js
@@ -178,8 +178,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] Skipping watcher creation at /bower_components:: Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Skipping watcher creation at /node_modules:: Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Installing typings ["node"]
 TI:: [hh:mm:ss:mss] 'node':: Entry for package 'node' does not exist in local types registry - skipping...
 TI:: [hh:mm:ss:mss] All typings are known to be missing or invalid - no need to install more typings
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js
index 37651532a6c33..6b1109cd63b39 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js
@@ -87,26 +87,6 @@ Info seq  [hh:mm:ss:mss] ======== Module name 'worker_threads' was not resolved.
 Info seq  [hh:mm:ss:mss] Auto discovery for typings is enabled in project '/dev/null/inferredProject1*'. Running extra resolution pass for module 'node' using cache location '/home/src/Library/Caches/typescript'.
 Info seq  [hh:mm:ss:mss] Directory '/home/src/Library/Caches/typescript/node_modules' does not exist, skipping all lookups in it.
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/^ 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/^ 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -124,29 +104,7 @@ TI:: Creating typing installer
 //// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 15
 
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/^: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
-
 FsWatches::
-/home/src/Vscode: *new*
-  {"inode":3}
-/home/src/Vscode/Projects: *new*
-  {"inode":4}
-/home/src/Vscode/Projects/bin: *new*
-  {"inode":5}
 /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new*
   {"inode":15}
 
@@ -235,10 +193,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Installing typings ["node"]
 TI:: [hh:mm:ss:mss] 'node':: Entry for package 'node' does not exist in local types registry - skipping...
 TI:: [hh:mm:ss:mss] All typings are known to be missing or invalid - no need to install more typings
@@ -315,34 +269,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/^:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/Vscode:
-  {"inode":3}
-/home/src/Vscode/Projects:
-  {"inode":4}
-/home/src/Vscode/Projects/bin:
-  {"inode":5}
-/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts:
-  {"inode":15}
-
 Projects::
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js
index 746910b4f5cef..be4b01d26f7cb 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js
@@ -238,6 +238,20 @@ Info seq  [hh:mm:ss:mss] event:
             "category": "error",
             "fileName": "/user/username/projects/myproject/src/tsconfig.json"
           },
+          {
+            "start": {
+              "line": 6,
+              "offset": 5
+            },
+            "end": {
+              "line": 6,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './somefolder'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/src/tsconfig.json"
+          },
           {
             "start": {
               "line": 7,
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js
index b56f473343f03..920338ca5fcc8 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js
@@ -240,8 +240,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] Skipping watcher creation at /bower_components:: Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Skipping watcher creation at /node_modules:: Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Installing typings ["undici-types"]
 TI:: [hh:mm:ss:mss] 'undici-types':: Entry for package 'undici-types' does not exist in local types registry - skipping...
 TI:: [hh:mm:ss:mss] All typings are known to be missing or invalid - no need to install more typings
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js
index f905530b5b012..8ccd7380216e1 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js
@@ -131,32 +131,12 @@ Info seq  [hh:mm:ss:mss] Auto discovery for typings is enabled in project '/dev/
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/undici-types.d.ts' does not exist.
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/@types/undici-types.d.ts' does not exist.
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/^ 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/^ 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules/@types/node/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules/@types/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (3)
@@ -184,30 +164,10 @@ PolledWatches::
   {"pollingInterval":2000}
 /home/src/Library/Caches/typescript/node_modules/package.json: *new*
   {"pollingInterval":2000}
-/home/src/Vscode/Projects/bin/^: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 
 FsWatches::
 /home/src/Library/Caches/typescript/package.json: *new*
   {"inode":117}
-/home/src/Vscode: *new*
-  {"inode":10}
-/home/src/Vscode/Projects: *new*
-  {"inode":11}
-/home/src/Vscode/Projects/bin: *new*
-  {"inode":12}
 /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new*
   {"inode":22}
 
@@ -295,10 +255,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Installing typings ["undici-types"]
 TI:: [hh:mm:ss:mss] 'undici-types':: Entry for package 'undici-types' does not exist in local types registry - skipping...
 TI:: [hh:mm:ss:mss] All typings are known to be missing or invalid - no need to install more typings
@@ -375,46 +331,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Library/Caches/typescript/node_modules/@types/node/package.json:
-  {"pollingInterval":2000}
-/home/src/Library/Caches/typescript/node_modules/@types/package.json:
-  {"pollingInterval":2000}
-/home/src/Library/Caches/typescript/node_modules/package.json:
-  {"pollingInterval":2000}
-/home/src/Vscode/Projects/bin/^:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/Library/Caches/typescript/package.json:
-  {"inode":117}
-/home/src/Vscode:
-  {"inode":10}
-/home/src/Vscode/Projects:
-  {"inode":11}
-/home/src/Vscode/Projects/bin:
-  {"inode":12}
-/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts:
-  {"inode":22}
-
-FsWatchesRecursive::
-/home/src/Library/Caches/typescript/node_modules:
-  {"inode":6}
-
 Projects::
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js
index d6e561c2adccb..f4ed11e22a887 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js
@@ -249,8 +249,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] Skipping watcher creation at /bower_components:: Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Skipping watcher creation at /node_modules:: Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject1*",
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js
index c06a5ecae2c7e..e95e611fb0505 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js
@@ -134,33 +134,13 @@ Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/package.json' does not exist according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/package.json' exists according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/^ 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/^ 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules/@types/undici-types/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules/@types/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules/@types/node/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
@@ -193,30 +173,10 @@ PolledWatches::
   {"pollingInterval":2000}
 /home/src/Library/Caches/typescript/node_modules/package.json: *new*
   {"pollingInterval":2000}
-/home/src/Vscode/Projects/bin/^: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 
 FsWatches::
 /home/src/Library/Caches/typescript/package.json: *new*
   {"inode":119}
-/home/src/Vscode: *new*
-  {"inode":12}
-/home/src/Vscode/Projects: *new*
-  {"inode":13}
-/home/src/Vscode/Projects/bin: *new*
-  {"inode":14}
 /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new*
   {"inode":24}
 
@@ -304,10 +264,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject1*",
@@ -378,48 +334,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Library/Caches/typescript/node_modules/@types/node/package.json:
-  {"pollingInterval":2000}
-/home/src/Library/Caches/typescript/node_modules/@types/package.json:
-  {"pollingInterval":2000}
-/home/src/Library/Caches/typescript/node_modules/@types/undici-types/package.json:
-  {"pollingInterval":2000}
-/home/src/Library/Caches/typescript/node_modules/package.json:
-  {"pollingInterval":2000}
-/home/src/Vscode/Projects/bin/^:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/Library/Caches/typescript/package.json:
-  {"inode":119}
-/home/src/Vscode:
-  {"inode":12}
-/home/src/Vscode/Projects:
-  {"inode":13}
-/home/src/Vscode/Projects/bin:
-  {"inode":14}
-/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts:
-  {"inode":24}
-
-FsWatchesRecursive::
-/home/src/Library/Caches/typescript/node_modules:
-  {"inode":6}
-
 Projects::
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js
index 026a25dfed3cc..9d45f7563a662 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js
@@ -236,8 +236,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] Skipping watcher creation at /bower_components:: Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Skipping watcher creation at /node_modules:: Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject1*",
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js
index 7bbeef1b9eb4e..70db40837ab35 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js
@@ -126,30 +126,10 @@ Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/package.json' does not exist according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/package.json' exists according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/^ 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/^ 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules/@types/node/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules/@types/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/node_modules/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/Library/Caches/typescript/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (4)
@@ -180,30 +160,10 @@ PolledWatches::
   {"pollingInterval":2000}
 /home/src/Library/Caches/typescript/node_modules/package.json: *new*
   {"pollingInterval":2000}
-/home/src/Vscode/Projects/bin/^: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 
 FsWatches::
 /home/src/Library/Caches/typescript/package.json: *new*
   {"inode":118}
-/home/src/Vscode: *new*
-  {"inode":11}
-/home/src/Vscode/Projects: *new*
-  {"inode":12}
-/home/src/Vscode/Projects/bin: *new*
-  {"inode":13}
 /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new*
   {"inode":23}
 
@@ -291,10 +251,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject1*",
@@ -365,46 +321,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Library/Caches/typescript/node_modules/@types/node/package.json:
-  {"pollingInterval":2000}
-/home/src/Library/Caches/typescript/node_modules/@types/package.json:
-  {"pollingInterval":2000}
-/home/src/Library/Caches/typescript/node_modules/package.json:
-  {"pollingInterval":2000}
-/home/src/Vscode/Projects/bin/^:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/Library/Caches/typescript/package.json:
-  {"inode":118}
-/home/src/Vscode:
-  {"inode":11}
-/home/src/Vscode/Projects:
-  {"inode":12}
-/home/src/Vscode/Projects/bin:
-  {"inode":13}
-/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts:
-  {"inode":23}
-
-FsWatchesRecursive::
-/home/src/Library/Caches/typescript/node_modules:
-  {"inode":6}
-
 Projects::
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js
index b02e1aa0a682e..eb4aba0c6fb00 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js
@@ -250,6 +250,20 @@ Info seq  [hh:mm:ss:mss] event:
             "category": "error",
             "fileName": "/user/username/projects/myproject/src/tsconfig.json"
           },
+          {
+            "start": {
+              "line": 6,
+              "offset": 5
+            },
+            "end": {
+              "line": 6,
+              "offset": 13
+            },
+            "text": "The common source directory of 'tsconfig.json' is './somefolder'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5011,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/src/tsconfig.json"
+          },
           {
             "start": {
               "line": 7,
diff --git a/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project-with-skipLibCheck-as-false.js b/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project-with-skipLibCheck-as-false.js
index ae01d84621cec..a2935da88aa09 100644
--- a/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project-with-skipLibCheck-as-false.js
+++ b/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project-with-skipLibCheck-as-false.js
@@ -180,14 +180,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/a/b/bower_components 1 undefined Project: project1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/a/b/bower_components 1 undefined Project: project1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/a/b/node_modules 1 undefined Project: project1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/a/b/node_modules 1 undefined Project: project1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: project1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: project1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: project1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: project1 WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "project1",
@@ -282,30 +274,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/projects/project/a/b/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/projects/project/a/b/node_modules: *new*
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/projects/project/a/b/file1.js:
-  {}
-/home/src/projects/project/a/b/file2.d.ts:
-  {}
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-
 Projects::
 project1 (External) *changed*
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project.js b/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project.js
index df011f14d6c04..a02df529acc76 100644
--- a/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project.js
+++ b/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project.js
@@ -177,14 +177,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/a/b/bower_components 1 undefined Project: project1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/a/b/bower_components 1 undefined Project: project1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/a/b/node_modules 1 undefined Project: project1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/a/b/node_modules 1 undefined Project: project1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: project1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: project1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: project1 WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: project1 WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "project1",
@@ -275,30 +267,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/projects/project/a/b/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/projects/project/a/b/node_modules: *new*
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/projects/project/a/b/file1.js:
-  {}
-/home/src/projects/project/a/b/file2.d.ts:
-  {}
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-
 Projects::
 project1 (External) *changed*
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js
index 7dba2f4820933..6d13c547e5823 100644
--- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js
+++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js
@@ -13,7 +13,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -42,7 +43,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -67,7 +69,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json] Inode:: 36
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -120,6 +123,7 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/projects/b/2/b-impl/b/tsconfig.json :
  ],
  "options": {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "configFilePath": "/home/src/projects/b/2/b-impl/b/tsconfig.json"
  }
 }
@@ -456,7 +460,8 @@ Info seq  [hh:mm:ss:mss] event:
             "deferredSize": 0
           },
           "compilerOptions": {
-            "outDir": ""
+            "outDir": "",
+            "rootDir": ""
           },
           "typeAcquisition": {
             "enable": false,
@@ -961,12 +966,10 @@ Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b
 Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts created
 Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts updated
 Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
-Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created
-Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo updated
-Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
-Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created
-Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt updated
-Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
+Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo created
+Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo updated
+Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt created
+Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt updated
 Before request
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 149
 "use strict";
@@ -1003,17 +1006,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 153
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] Inode:: 153
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 156
@@ -1053,17 +1056,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 160
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] Inode:: 160
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 161
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 161
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -1078,8 +1081,8 @@ Info seq  [hh:mm:ss:mss] request:
           "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.d.ts",
           "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.js",
           "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts",
-          "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo",
-          "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+          "/home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo",
+          "/home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt"
         ]
       },
       "seq": 5,
@@ -1100,12 +1103,12 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 After request
 
 Timeout callback:: count: 1
@@ -1816,29 +1819,21 @@ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/
 Custom watchFile:: Triggered:: {"id":24,"path":"/home/src/projects/c/3/c-impl/c/lib/index.d.ts"}:: /home/src/projects/c/3/c-impl/c/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/index.js deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt deleted
 Custom watchFile:: Triggered:: {"id":23,"path":"/home/src/projects/a/1/a-impl/a/lib/a.d.ts"}:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/a.js deleted
 Custom watchFile:: Triggered:: {"id":21,"path":"/home/src/projects/a/1/a-impl/a/lib/index.d.ts"}:: /home/src/projects/a/1/a-impl/a/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/index.js deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt deleted
 Before request
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 Info seq  [hh:mm:ss:mss] request:
     {
@@ -1856,9 +1851,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/c/3/c-impl/c/lib/c.d.ts",
             "/home/src/projects/c/3/c-impl/c/lib/c.js",
             "/home/src/projects/c/3/c-impl/c/lib/index.d.ts",
-            "/home/src/projects/c/3/c-impl/c/lib/index.js",
-            "/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/c/3/c-impl/c/lib/index.js"
           ]
         },
         {
@@ -1879,9 +1872,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/a/1/a-impl/a/lib/a.d.ts",
             "/home/src/projects/a/1/a-impl/a/lib/a.js",
             "/home/src/projects/a/1/a-impl/a/lib/index.d.ts",
-            "/home/src/projects/a/1/a-impl/a/lib/index.js",
-            "/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/a/1/a-impl/a/lib/index.js"
           ]
         },
         {
@@ -1910,12 +1901,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.d.ts 2:: WatchInfo: /home/src/projects/c/3/c-impl/c/lib/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
@@ -1936,12 +1921,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 2:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
@@ -1949,9 +1928,9 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 After request
 
 Timeout callback:: count: 3
-33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
-34: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-35: *ensureProjectForOpenFiles* *new*
+29: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+30: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+31: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1994,9 +1973,9 @@ ScriptInfos::
         /home/src/projects/b/2/b-impl/b/tsconfig.json
 
 Before running Timeout callback:: count: 3
-33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
-34: /home/src/projects/b/2/b-impl/b/tsconfig.json
-35: *ensureProjectForOpenFiles*
+29: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+30: /home/src/projects/b/2/b-impl/b/tsconfig.json
+31: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2276,10 +2255,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-36: checkOne *new*
+32: checkOne *new*
 
 Before running Timeout callback:: count: 1
-36: checkOne
+32: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -2396,13 +2375,13 @@ Custom watchFile:: Triggered:: {"id":21,"path":"/home/src/projects/a/1/a-impl/a/
 Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts created
 Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts updated
 Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
-Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created
-Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo updated
-Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
-Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created
-Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt updated
-Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
+Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo updated
+Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt updated
 Before request
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents Inode:: 153
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 154
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents Inode:: 160
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 161
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 165
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -2438,31 +2417,18 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 169
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 172
+//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 170
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
 exports.a = 'test';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 173
+//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 171
 export declare const a: string;
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 174
+//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 172
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -2483,24 +2449,11 @@ __exportStar(require("./a"), exports);
 __exportStar(require("c"), exports);
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 175
+//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 173
 export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 176
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 177
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 Info seq  [hh:mm:ss:mss] request:
     {
@@ -2525,9 +2478,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.js",
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.d.ts",
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.js",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts"
           ]
         },
         {
@@ -2565,12 +2516,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/a.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/a.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info
@@ -2578,7 +2523,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 After request
 
 Timeout callback:: count: 1
-43: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+37: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 ScriptInfos::
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts *changed*
@@ -2611,7 +2556,7 @@ ScriptInfos::
         /home/src/projects/b/2/b-impl/b/tsconfig.json
 
 Before running Timeout callback:: count: 1
-43: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+37: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2619,8 +2564,8 @@ Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
 After running Timeout callback:: count: 2
 
 Timeout callback:: count: 2
-44: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-45: *ensureProjectForOpenFiles* *new*
+38: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+39: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -2629,8 +2574,8 @@ Projects::
     dirty: true *changed*
 
 Before running Timeout callback:: count: 2
-44: /home/src/projects/b/2/b-impl/b/tsconfig.json
-45: *ensureProjectForOpenFiles*
+38: /home/src/projects/b/2/b-impl/b/tsconfig.json
+39: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2943,10 +2888,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-46: checkOne *new*
+40: checkOne *new*
 
 Before running Timeout callback:: count: 1
-46: checkOne
+40: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js
index 1c42da9dbfb57..d37b0d073644b 100644
--- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js
+++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js
@@ -13,7 +13,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -42,7 +43,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -67,7 +69,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json] Inode:: 36
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -109,6 +112,7 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/projects/b/2/b-impl/b/tsconfig.json :
  ],
  "options": {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "configFilePath": "/home/src/projects/b/2/b-impl/b/tsconfig.json"
  }
 }
@@ -207,7 +211,8 @@ Info seq  [hh:mm:ss:mss] event:
             "deferredSize": 0
           },
           "compilerOptions": {
-            "outDir": ""
+            "outDir": "",
+            "rootDir": ""
           },
           "typeAcquisition": {
             "enable": false,
@@ -703,7 +708,7 @@ After running Immedidate callback:: count: 0
 
 Build dependencies
 Before running Timeout callback:: count: 1
-5: timerToUpdateChildWatches
+9: timerToUpdateChildWatches
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 149
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -739,17 +744,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 153
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] Inode:: 153
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 156
@@ -789,23 +794,24 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 160
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] Inode:: 160
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 161
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 161
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
 Timeout callback:: count: 1
-5: timerToUpdateChildWatches *new*
+9: timerToUpdateChildWatches *new*
 
+Host is moving to new time
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
@@ -867,10 +873,10 @@ FsWatches::
   {"inode":45}
 
 Timeout callback:: count: 1
-7: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+11: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 Before running Timeout callback:: count: 1
-7: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+11: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -878,8 +884,8 @@ Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
 After running Timeout callback:: count: 2
 
 Timeout callback:: count: 2
-8: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-9: *ensureProjectForOpenFiles* *new*
+12: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+13: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -889,8 +895,8 @@ Projects::
     autoImportProviderHost: false
 
 Before running Timeout callback:: count: 2
-8: /home/src/projects/b/2/b-impl/b/tsconfig.json
-9: *ensureProjectForOpenFiles*
+12: /home/src/projects/b/2/b-impl/b/tsconfig.json
+13: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -1093,10 +1099,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-10: checkOne *new*
+14: checkOne *new*
 
 Before running Timeout callback:: count: 1
-10: checkOne
+14: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -1209,10 +1215,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-11: checkOne *new*
+15: checkOne *new*
 
 Before running Timeout callback:: count: 1
-11: checkOne
+15: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -1325,10 +1331,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-12: checkOne *new*
+16: checkOne *new*
 
 Before running Timeout callback:: count: 1
-12: checkOne
+16: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -1433,12 +1439,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
@@ -1462,31 +1462,21 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Before running Timeout callback:: count: 3
-28: /home/src/projects/b/2/b-impl/b/tsconfig.json
-29: *ensureProjectForOpenFiles*
+30: /home/src/projects/b/2/b-impl/b/tsconfig.json
+31: *ensureProjectForOpenFiles*
 34: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 PolledWatches::
 /home/src/projects/a/1/a-impl/a/lib: *new*
@@ -1555,8 +1545,8 @@ FsWatches *deleted*::
   {"inode":152}
 
 Timeout callback:: count: 3
-28: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-29: *ensureProjectForOpenFiles* *new*
+30: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+31: *ensureProjectForOpenFiles* *new*
 34: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 Projects::
@@ -1888,6 +1878,10 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-i
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info
 Before running Timeout callback:: count: 1
 37: timerToUpdateChildWatches
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents Inode:: 153
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 154
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents Inode:: 160
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 161
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 165
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1923,31 +1917,18 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 169
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 172
+//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 170
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
 exports.a = 'test';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 173
+//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 171
 export declare const a: string;
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 174
+//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 172
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -1968,24 +1949,11 @@ __exportStar(require("./a"), exports);
 __exportStar(require("c"), exports);
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 175
+//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 173
 export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 176
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 177
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 PolledWatches::
 /home/src/projects/b/2/b-impl/b/node_modules/@types:
@@ -2023,9 +1991,9 @@ FsWatches::
 /home/src/projects/a/1/a-impl/a:
   {"inode":19}
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new*
-  {"inode":173}
+  {"inode":171}
 /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new*
-  {"inode":175}
+  {"inode":173}
 /home/src/projects/a/1/a-impl/a/node_modules:
   {"inode":25}
 /home/src/projects/a/1/a-impl/a/package.json:
@@ -2122,11 +2090,11 @@ FsWatches::
 /home/src/projects/a/1/a-impl/a:
   {"inode":19}
 /home/src/projects/a/1/a-impl/a/lib: *new*
-  {"inode":171}
+  {"inode":169}
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts:
-  {"inode":173}
+  {"inode":171}
 /home/src/projects/a/1/a-impl/a/lib/index.d.ts:
-  {"inode":175}
+  {"inode":173}
 /home/src/projects/a/1/a-impl/a/node_modules:
   {"inode":25}
 /home/src/projects/a/1/a-impl/a/package.json:
@@ -2286,11 +2254,11 @@ FsWatches::
 /home/src/projects:
   {"inode":3}
 /home/src/projects/a/1/a-impl/a/lib:
-  {"inode":171}
+  {"inode":169}
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts:
-  {"inode":173}
+  {"inode":171}
 /home/src/projects/a/1/a-impl/a/lib/index.d.ts:
-  {"inode":175}
+  {"inode":173}
 /home/src/projects/a/1/a-impl/a/node_modules:
   {"inode":25}
 /home/src/projects/a/1/a-impl/a/package.json:
diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js
index 5a4e918921212..9f6c66709d6fe 100644
--- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js
+++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js
@@ -13,7 +13,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -42,7 +43,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -67,7 +69,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json] Inode:: 36
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -120,6 +123,7 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/projects/b/2/b-impl/b/tsconfig.json :
  ],
  "options": {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "configFilePath": "/home/src/projects/b/2/b-impl/b/tsconfig.json"
  }
 }
@@ -456,7 +460,8 @@ Info seq  [hh:mm:ss:mss] event:
             "deferredSize": 0
           },
           "compilerOptions": {
-            "outDir": ""
+            "outDir": "",
+            "rootDir": ""
           },
           "typeAcquisition": {
             "enable": false,
@@ -952,8 +957,8 @@ Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b
 Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.d.ts created
 Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.js created
 Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts created
-Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created
-Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created
+Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo created
+Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt created
 Before request
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 149
 "use strict";
@@ -990,17 +995,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 153
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] Inode:: 153
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 156
@@ -1040,17 +1045,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 160
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] Inode:: 160
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 161
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 161
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -1065,8 +1070,8 @@ Info seq  [hh:mm:ss:mss] request:
           "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.d.ts",
           "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.js",
           "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts",
-          "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo",
-          "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+          "/home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo",
+          "/home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt"
         ]
       },
       "seq": 5,
@@ -1087,12 +1092,12 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 After request
 
 Timeout callback:: count: 1
@@ -1803,29 +1808,21 @@ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/
 Custom watchFile:: Triggered:: {"id":24,"path":"/home/src/projects/c/3/c-impl/c/lib/index.d.ts"}:: /home/src/projects/c/3/c-impl/c/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/index.js deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt deleted
 Custom watchFile:: Triggered:: {"id":23,"path":"/home/src/projects/a/1/a-impl/a/lib/a.d.ts"}:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/a.js deleted
 Custom watchFile:: Triggered:: {"id":21,"path":"/home/src/projects/a/1/a-impl/a/lib/index.d.ts"}:: /home/src/projects/a/1/a-impl/a/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/index.js deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt deleted
 Before request
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 Info seq  [hh:mm:ss:mss] request:
     {
@@ -1843,9 +1840,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/c/3/c-impl/c/lib/c.d.ts",
             "/home/src/projects/c/3/c-impl/c/lib/c.js",
             "/home/src/projects/c/3/c-impl/c/lib/index.d.ts",
-            "/home/src/projects/c/3/c-impl/c/lib/index.js",
-            "/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/c/3/c-impl/c/lib/index.js"
           ]
         },
         {
@@ -1866,9 +1861,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/a/1/a-impl/a/lib/a.d.ts",
             "/home/src/projects/a/1/a-impl/a/lib/a.js",
             "/home/src/projects/a/1/a-impl/a/lib/index.d.ts",
-            "/home/src/projects/a/1/a-impl/a/lib/index.js",
-            "/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/a/1/a-impl/a/lib/index.js"
           ]
         },
         {
@@ -1897,12 +1890,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.d.ts 2:: WatchInfo: /home/src/projects/c/3/c-impl/c/lib/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
@@ -1923,12 +1910,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 2:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
@@ -1936,9 +1917,9 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 After request
 
 Timeout callback:: count: 3
-33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
-34: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-35: *ensureProjectForOpenFiles* *new*
+29: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+30: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+31: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1981,9 +1962,9 @@ ScriptInfos::
         /home/src/projects/b/2/b-impl/b/tsconfig.json
 
 Before running Timeout callback:: count: 3
-33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
-34: /home/src/projects/b/2/b-impl/b/tsconfig.json
-35: *ensureProjectForOpenFiles*
+29: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+30: /home/src/projects/b/2/b-impl/b/tsconfig.json
+31: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2263,10 +2244,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-36: checkOne *new*
+32: checkOne *new*
 
 Before running Timeout callback:: count: 1
-36: checkOne
+32: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -2374,9 +2355,13 @@ Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/
 Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.js created
 Custom watchFile:: Triggered:: {"id":21,"path":"/home/src/projects/a/1/a-impl/a/lib/index.d.ts"}:: /home/src/projects/a/1/a-impl/a/lib/index.d.ts created
 Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts created
-Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created
-Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created
+Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo updated
+Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt updated
 Before request
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents Inode:: 153
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 154
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents Inode:: 160
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 161
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 165
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -2412,31 +2397,18 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 169
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 172
+//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 170
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
 exports.a = 'test';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 173
+//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 171
 export declare const a: string;
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 174
+//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 172
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -2457,24 +2429,11 @@ __exportStar(require("./a"), exports);
 __exportStar(require("c"), exports);
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 175
+//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 173
 export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 176
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 177
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 Info seq  [hh:mm:ss:mss] request:
     {
@@ -2499,9 +2458,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.js",
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.d.ts",
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.js",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts"
           ]
         },
         {
@@ -2539,12 +2496,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/a.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/a.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info
@@ -2552,7 +2503,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 After request
 
 Timeout callback:: count: 1
-43: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+37: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 ScriptInfos::
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts *changed*
@@ -2585,7 +2536,7 @@ ScriptInfos::
         /home/src/projects/b/2/b-impl/b/tsconfig.json
 
 Before running Timeout callback:: count: 1
-43: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+37: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2593,8 +2544,8 @@ Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
 After running Timeout callback:: count: 2
 
 Timeout callback:: count: 2
-44: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-45: *ensureProjectForOpenFiles* *new*
+38: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+39: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -2603,8 +2554,8 @@ Projects::
     dirty: true *changed*
 
 Before running Timeout callback:: count: 2
-44: /home/src/projects/b/2/b-impl/b/tsconfig.json
-45: *ensureProjectForOpenFiles*
+38: /home/src/projects/b/2/b-impl/b/tsconfig.json
+39: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2917,10 +2868,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-46: checkOne *new*
+40: checkOne *new*
 
 Before running Timeout callback:: count: 1
-46: checkOne
+40: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js
index e8af2d175ad79..e4554a8ce20e8 100644
--- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js
+++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js
@@ -13,7 +13,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -42,7 +43,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -67,7 +69,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json] Inode:: 36
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -109,6 +112,7 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/projects/b/2/b-impl/b/tsconfig.json :
  ],
  "options": {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "configFilePath": "/home/src/projects/b/2/b-impl/b/tsconfig.json"
  }
 }
@@ -207,7 +211,8 @@ Info seq  [hh:mm:ss:mss] event:
             "deferredSize": 0
           },
           "compilerOptions": {
-            "outDir": ""
+            "outDir": "",
+            "rootDir": ""
           },
           "typeAcquisition": {
             "enable": false,
@@ -713,12 +718,12 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Before running Timeout callback:: count: 1
 10: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 149
@@ -756,17 +761,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 153
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] Inode:: 153
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 156
@@ -806,17 +811,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 160
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] Inode:: 160
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 161
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 161
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -1402,12 +1407,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
@@ -1431,31 +1430,21 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Before running Timeout callback:: count: 3
-33: /home/src/projects/b/2/b-impl/b/tsconfig.json
-34: *ensureProjectForOpenFiles*
-39: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+31: /home/src/projects/b/2/b-impl/b/tsconfig.json
+32: *ensureProjectForOpenFiles*
+35: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 PolledWatches::
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new*
@@ -1522,9 +1511,9 @@ FsWatchesRecursive::
   {"inode":4}
 
 Timeout callback:: count: 3
-33: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-34: *ensureProjectForOpenFiles* *new*
-39: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+31: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+32: *ensureProjectForOpenFiles* *new*
+35: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1702,7 +1691,7 @@ FsWatchesRecursive *deleted*::
   {"inode":4}
 
 Timeout callback:: count: 0
-39: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *deleted*
+35: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *deleted*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1735,10 +1724,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-40: checkOne *new*
+36: checkOne *new*
 
 Before running Timeout callback:: count: 1
-40: checkOne
+36: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -1868,14 +1857,12 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Before running Timeout callback:: count: 1
-47: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+41: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents Inode:: 153
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 154
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents Inode:: 160
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 161
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 165
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1911,31 +1898,18 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 169
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 172
+//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 170
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
 exports.a = 'test';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 173
+//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 171
 export declare const a: string;
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 174
+//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 172
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -1956,24 +1930,11 @@ __exportStar(require("./a"), exports);
 __exportStar(require("c"), exports);
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 175
+//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 173
 export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 176
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 177
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 PolledWatches::
 /home/src/projects/b/2/b-impl/b/node_modules/@types:
@@ -2009,9 +1970,9 @@ FsWatches::
 /home/src/projects:
   {"inode":3}
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new*
-  {"inode":173}
+  {"inode":171}
 /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new*
-  {"inode":175}
+  {"inode":173}
 /home/src/projects/a/1/a-impl/a/package.json:
   {"inode":24}
 /home/src/projects/b:
@@ -2040,7 +2001,7 @@ FsWatchesRecursive::
   {"inode":34}
 
 Timeout callback:: count: 1
-47: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+41: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 ScriptInfos::
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts *changed*
@@ -2078,8 +2039,8 @@ Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
 After running Timeout callback:: count: 2
 
 Timeout callback:: count: 2
-48: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-49: *ensureProjectForOpenFiles* *new*
+42: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+43: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -2088,8 +2049,8 @@ Projects::
     dirty: true *changed*
 
 Before running Timeout callback:: count: 2
-48: /home/src/projects/b/2/b-impl/b/tsconfig.json
-49: *ensureProjectForOpenFiles*
+42: /home/src/projects/b/2/b-impl/b/tsconfig.json
+43: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2196,9 +2157,9 @@ FsWatches::
 /home/src/projects:
   {"inode":3}
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts:
-  {"inode":173}
+  {"inode":171}
 /home/src/projects/a/1/a-impl/a/lib/index.d.ts:
-  {"inode":175}
+  {"inode":173}
 /home/src/projects/a/1/a-impl/a/package.json:
   {"inode":24}
 /home/src/projects/b:
@@ -2293,10 +2254,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-50: checkOne *new*
+44: checkOne *new*
 
 Before running Timeout callback:: count: 1
-50: checkOne
+44: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Windows-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Windows-canUseWatchEvents.js
index f7d9e6df0b004..3f8c86d7d36b7 100644
--- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Windows-canUseWatchEvents.js
+++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Windows-canUseWatchEvents.js
@@ -13,7 +13,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -42,7 +43,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -67,7 +69,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json]
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -120,6 +123,7 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/projects/b/2/b-impl/b/tsconfig.json :
  ],
  "options": {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "configFilePath": "/home/src/projects/b/2/b-impl/b/tsconfig.json"
  }
 }
@@ -456,7 +460,8 @@ Info seq  [hh:mm:ss:mss] event:
             "deferredSize": 0
           },
           "compilerOptions": {
-            "outDir": ""
+            "outDir": "",
+            "rootDir": ""
           },
           "typeAcquisition": {
             "enable": false,
@@ -961,12 +966,10 @@ Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b
 Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts created
 Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts updated
 Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
-Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created
-Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo updated
-Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
-Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created
-Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt updated
-Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
+Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo created
+Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo updated
+Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt created
+Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt updated
 Before request
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js]
 "use strict";
@@ -1003,17 +1006,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo]
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo]
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js]
@@ -1053,17 +1056,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo]
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo]
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -1078,8 +1081,8 @@ Info seq  [hh:mm:ss:mss] request:
           "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.d.ts",
           "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.js",
           "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts",
-          "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo",
-          "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+          "/home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo",
+          "/home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt"
         ]
       },
       "seq": 5,
@@ -1100,12 +1103,12 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 After request
 
 Timeout callback:: count: 1
@@ -1816,29 +1819,21 @@ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/
 Custom watchFile:: Triggered:: {"id":24,"path":"/home/src/projects/c/3/c-impl/c/lib/index.d.ts"}:: /home/src/projects/c/3/c-impl/c/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/index.js deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt deleted
 Custom watchFile:: Triggered:: {"id":23,"path":"/home/src/projects/a/1/a-impl/a/lib/a.d.ts"}:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/a.js deleted
 Custom watchFile:: Triggered:: {"id":21,"path":"/home/src/projects/a/1/a-impl/a/lib/index.d.ts"}:: /home/src/projects/a/1/a-impl/a/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/index.js deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":22,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt deleted
 Before request
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 Info seq  [hh:mm:ss:mss] request:
     {
@@ -1856,9 +1851,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/c/3/c-impl/c/lib/c.d.ts",
             "/home/src/projects/c/3/c-impl/c/lib/c.js",
             "/home/src/projects/c/3/c-impl/c/lib/index.d.ts",
-            "/home/src/projects/c/3/c-impl/c/lib/index.js",
-            "/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/c/3/c-impl/c/lib/index.js"
           ]
         },
         {
@@ -1879,9 +1872,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/a/1/a-impl/a/lib/a.d.ts",
             "/home/src/projects/a/1/a-impl/a/lib/a.js",
             "/home/src/projects/a/1/a-impl/a/lib/index.d.ts",
-            "/home/src/projects/a/1/a-impl/a/lib/index.js",
-            "/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/a/1/a-impl/a/lib/index.js"
           ]
         },
         {
@@ -1910,12 +1901,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.d.ts 2:: WatchInfo: /home/src/projects/c/3/c-impl/c/lib/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
@@ -1936,12 +1921,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 2:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
@@ -1949,9 +1928,9 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 After request
 
 Timeout callback:: count: 3
-33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
-34: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-35: *ensureProjectForOpenFiles* *new*
+29: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+30: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+31: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1994,9 +1973,9 @@ ScriptInfos::
         /home/src/projects/b/2/b-impl/b/tsconfig.json
 
 Before running Timeout callback:: count: 3
-33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
-34: /home/src/projects/b/2/b-impl/b/tsconfig.json
-35: *ensureProjectForOpenFiles*
+29: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+30: /home/src/projects/b/2/b-impl/b/tsconfig.json
+31: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2276,10 +2255,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-36: checkOne *new*
+32: checkOne *new*
 
 Before running Timeout callback:: count: 1
-36: checkOne
+32: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -2396,13 +2375,13 @@ Custom watchFile:: Triggered:: {"id":21,"path":"/home/src/projects/a/1/a-impl/a/
 Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts created
 Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts updated
 Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
-Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created
-Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo updated
-Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
-Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created
-Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt updated
-Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
+Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo updated
+Custom watchDirectory:: Triggered Ignored:: {"id":30,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt updated
 Before request
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -2438,19 +2417,6 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo]
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -2488,19 +2454,6 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo]
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 Info seq  [hh:mm:ss:mss] request:
     {
@@ -2525,9 +2478,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.js",
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.d.ts",
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.js",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts"
           ]
         },
         {
@@ -2565,12 +2516,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/a.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/a.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info
@@ -2578,7 +2523,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 After request
 
 Timeout callback:: count: 1
-43: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+37: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 ScriptInfos::
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts *changed*
@@ -2611,7 +2556,7 @@ ScriptInfos::
         /home/src/projects/b/2/b-impl/b/tsconfig.json
 
 Before running Timeout callback:: count: 1
-43: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+37: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2619,8 +2564,8 @@ Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
 After running Timeout callback:: count: 2
 
 Timeout callback:: count: 2
-44: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-45: *ensureProjectForOpenFiles* *new*
+38: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+39: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -2629,8 +2574,8 @@ Projects::
     dirty: true *changed*
 
 Before running Timeout callback:: count: 2
-44: /home/src/projects/b/2/b-impl/b/tsconfig.json
-45: *ensureProjectForOpenFiles*
+38: /home/src/projects/b/2/b-impl/b/tsconfig.json
+39: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2943,10 +2888,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-46: checkOne *new*
+40: checkOne *new*
 
 Before running Timeout callback:: count: 1
-46: checkOne
+40: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Windows.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Windows.js
index 34be68855102f..a97b61bd6566e 100644
--- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Windows.js
+++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Windows.js
@@ -13,7 +13,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -42,7 +43,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -67,7 +69,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json]
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -109,6 +112,7 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/projects/b/2/b-impl/b/tsconfig.json :
  ],
  "options": {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "configFilePath": "/home/src/projects/b/2/b-impl/b/tsconfig.json"
  }
 }
@@ -207,7 +211,8 @@ Info seq  [hh:mm:ss:mss] event:
             "deferredSize": 0
           },
           "compilerOptions": {
-            "outDir": ""
+            "outDir": "",
+            "rootDir": ""
           },
           "typeAcquisition": {
             "enable": false,
@@ -713,12 +718,12 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Before running Timeout callback:: count: 1
 10: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js]
@@ -756,17 +761,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo]
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo]
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js]
@@ -806,17 +811,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo]
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo]
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -1402,12 +1407,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
@@ -1431,36 +1430,26 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Before running Timeout callback:: count: 3
-33: /home/src/projects/b/2/b-impl/b/tsconfig.json
-34: *ensureProjectForOpenFiles*
-39: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+31: /home/src/projects/b/2/b-impl/b/tsconfig.json
+32: *ensureProjectForOpenFiles*
+35: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 Timeout callback:: count: 3
-33: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-34: *ensureProjectForOpenFiles* *new*
-39: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+31: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+32: *ensureProjectForOpenFiles* *new*
+35: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1638,7 +1627,7 @@ FsWatchesRecursive *deleted*::
   {}
 
 Timeout callback:: count: 0
-39: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *deleted*
+35: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *deleted*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1671,10 +1660,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-40: checkOne *new*
+36: checkOne *new*
 
 Before running Timeout callback:: count: 1
-40: checkOne
+36: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -1796,14 +1785,12 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Before running Timeout callback:: count: 1
-47: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+41: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1839,19 +1826,6 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo]
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1889,22 +1863,9 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo]
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 Timeout callback:: count: 1
-47: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+41: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 ScriptInfos::
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts *changed*
@@ -1942,8 +1903,8 @@ Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
 After running Timeout callback:: count: 2
 
 Timeout callback:: count: 2
-48: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-49: *ensureProjectForOpenFiles* *new*
+42: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+43: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1952,8 +1913,8 @@ Projects::
     dirty: true *changed*
 
 Before running Timeout callback:: count: 2
-48: /home/src/projects/b/2/b-impl/b/tsconfig.json
-49: *ensureProjectForOpenFiles*
+42: /home/src/projects/b/2/b-impl/b/tsconfig.json
+43: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2157,10 +2118,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-50: checkOne *new*
+44: checkOne *new*
 
 Before running Timeout callback:: count: 1
-50: checkOne
+44: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js
index 7c86d75d0a3ea..78b29e615813e 100644
--- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js
+++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js
@@ -13,7 +13,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -42,7 +43,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -67,7 +69,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json] Inode:: 36
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -125,17 +128,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 151
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] Inode:: 151
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 152
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 152
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 154
@@ -175,17 +178,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 158
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] Inode:: 158
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 159
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 159
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -218,6 +221,7 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/projects/b/2/b-impl/b/tsconfig.json :
  ],
  "options": {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "configFilePath": "/home/src/projects/b/2/b-impl/b/tsconfig.json"
  }
 }
@@ -613,7 +617,8 @@ Info seq  [hh:mm:ss:mss] event:
             "deferredSize": 0
           },
           "compilerOptions": {
-            "outDir": ""
+            "outDir": "",
+            "rootDir": ""
           },
           "typeAcquisition": {
             "enable": false,
@@ -1324,29 +1329,21 @@ Custom watchDirectory:: Triggered Ignored:: {"id":7,"path":"/home/src/projects/c
 Custom watchFile:: Triggered:: {"id":6,"path":"/home/src/projects/c/3/c-impl/c/lib/index.d.ts"}:: /home/src/projects/c/3/c-impl/c/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":7,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":7,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/index.js deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":7,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":7,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt deleted
 Custom watchFile:: Triggered:: {"id":5,"path":"/home/src/projects/a/1/a-impl/a/lib/a.d.ts"}:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/a.js deleted
 Custom watchFile:: Triggered:: {"id":3,"path":"/home/src/projects/a/1/a-impl/a/lib/index.d.ts"}:: /home/src/projects/a/1/a-impl/a/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/index.js deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt deleted
 Before request
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 Info seq  [hh:mm:ss:mss] request:
     {
@@ -1364,9 +1361,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/c/3/c-impl/c/lib/c.d.ts",
             "/home/src/projects/c/3/c-impl/c/lib/c.js",
             "/home/src/projects/c/3/c-impl/c/lib/index.d.ts",
-            "/home/src/projects/c/3/c-impl/c/lib/index.js",
-            "/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/c/3/c-impl/c/lib/index.js"
           ]
         },
         {
@@ -1387,9 +1382,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/a/1/a-impl/a/lib/a.d.ts",
             "/home/src/projects/a/1/a-impl/a/lib/a.js",
             "/home/src/projects/a/1/a-impl/a/lib/index.d.ts",
-            "/home/src/projects/a/1/a-impl/a/lib/index.js",
-            "/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/a/1/a-impl/a/lib/index.js"
           ]
         },
         {
@@ -1418,12 +1411,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.d.ts 2:: WatchInfo: /home/src/projects/c/3/c-impl/c/lib/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
@@ -1444,12 +1431,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 2:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
@@ -1457,9 +1438,9 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 After request
 
 Timeout callback:: count: 3
-23: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
-24: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-25: *ensureProjectForOpenFiles* *new*
+19: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+20: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+21: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1503,9 +1484,9 @@ ScriptInfos::
         /home/src/projects/b/2/b-impl/b/tsconfig.json
 
 Before running Timeout callback:: count: 3
-23: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
-24: /home/src/projects/b/2/b-impl/b/tsconfig.json
-25: *ensureProjectForOpenFiles*
+19: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+20: /home/src/projects/b/2/b-impl/b/tsconfig.json
+21: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -1786,10 +1767,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-26: checkOne *new*
+22: checkOne *new*
 
 Before running Timeout callback:: count: 1
-26: checkOne
+22: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -1906,13 +1887,13 @@ Custom watchFile:: Triggered:: {"id":3,"path":"/home/src/projects/a/1/a-impl/a/l
 Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts created
 Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts updated
 Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo updated
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt updated
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
+Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo updated
+Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt updated
 Before request
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents Inode:: 151
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 152
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents Inode:: 158
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 159
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 165
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1948,31 +1929,18 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 169
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 172
+//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 170
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
 exports.a = 'test';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 173
+//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 171
 export declare const a: string;
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 174
+//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 172
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -1993,24 +1961,11 @@ __exportStar(require("./a"), exports);
 __exportStar(require("c"), exports);
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 175
+//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 173
 export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 176
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 177
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 Info seq  [hh:mm:ss:mss] request:
     {
@@ -2035,9 +1990,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.js",
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.d.ts",
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.js",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts"
           ]
         },
         {
@@ -2075,12 +2028,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/a.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/a.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info
@@ -2088,7 +2035,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 After request
 
 Timeout callback:: count: 1
-33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+27: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 ScriptInfos::
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts *changed*
@@ -2121,7 +2068,7 @@ ScriptInfos::
         /home/src/projects/b/2/b-impl/b/tsconfig.json
 
 Before running Timeout callback:: count: 1
-33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+27: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2129,8 +2076,8 @@ Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
 After running Timeout callback:: count: 2
 
 Timeout callback:: count: 2
-34: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-35: *ensureProjectForOpenFiles* *new*
+28: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+29: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -2139,8 +2086,8 @@ Projects::
     dirty: true *changed*
 
 Before running Timeout callback:: count: 2
-34: /home/src/projects/b/2/b-impl/b/tsconfig.json
-35: *ensureProjectForOpenFiles*
+28: /home/src/projects/b/2/b-impl/b/tsconfig.json
+29: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2453,10 +2400,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-36: checkOne *new*
+30: checkOne *new*
 
 Before running Timeout callback:: count: 1
-36: checkOne
+30: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js
index 83abd941c89bf..9ee5ba8371484 100644
--- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js
+++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js
@@ -13,7 +13,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -42,7 +43,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -67,7 +69,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json] Inode:: 36
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -125,17 +128,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 151
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] Inode:: 151
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 152
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 152
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 154
@@ -175,17 +178,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 158
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] Inode:: 158
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 159
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 159
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -207,6 +210,7 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/projects/b/2/b-impl/b/tsconfig.json :
  ],
  "options": {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "configFilePath": "/home/src/projects/b/2/b-impl/b/tsconfig.json"
  }
 }
@@ -320,7 +324,8 @@ Info seq  [hh:mm:ss:mss] event:
             "deferredSize": 0
           },
           "compilerOptions": {
-            "outDir": ""
+            "outDir": "",
+            "rootDir": ""
           },
           "typeAcquisition": {
             "enable": false,
@@ -1043,12 +1048,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
@@ -1072,31 +1071,21 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Before running Timeout callback:: count: 3
-21: /home/src/projects/b/2/b-impl/b/tsconfig.json
-22: *ensureProjectForOpenFiles*
-27: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+19: /home/src/projects/b/2/b-impl/b/tsconfig.json
+20: *ensureProjectForOpenFiles*
+23: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 PolledWatches::
 /home/src/projects/a/1/a-impl/a/lib: *new*
@@ -1165,9 +1154,9 @@ FsWatches *deleted*::
   {"inode":150}
 
 Timeout callback:: count: 3
-21: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-22: *ensureProjectForOpenFiles* *new*
-27: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+19: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+20: *ensureProjectForOpenFiles* *new*
+23: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1346,7 +1335,7 @@ FsWatches *deleted*::
   {"inode":12}
 
 Timeout callback:: count: 0
-27: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *deleted*
+23: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *deleted*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1380,10 +1369,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-28: checkOne *new*
+24: checkOne *new*
 
 Before running Timeout callback:: count: 1
-28: checkOne
+24: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -1499,7 +1488,11 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info
 Before running Timeout callback:: count: 1
-30: timerToUpdateChildWatches
+26: timerToUpdateChildWatches
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents Inode:: 151
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 152
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents Inode:: 158
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 159
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 165
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1535,31 +1528,18 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 169
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 172
+//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 170
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
 exports.a = 'test';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 173
+//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 171
 export declare const a: string;
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 174
+//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 172
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -1580,24 +1560,11 @@ __exportStar(require("./a"), exports);
 __exportStar(require("c"), exports);
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 175
+//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 173
 export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 176
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 177
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 PolledWatches::
 /home/src/projects/b/2/b-impl/b/node_modules/@types:
@@ -1635,9 +1602,9 @@ FsWatches::
 /home/src/projects/a/1/a-impl/a:
   {"inode":19}
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new*
-  {"inode":173}
+  {"inode":171}
 /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new*
-  {"inode":175}
+  {"inode":173}
 /home/src/projects/a/1/a-impl/a/node_modules:
   {"inode":25}
 /home/src/projects/a/1/a-impl/a/package.json:
@@ -1668,7 +1635,7 @@ FsWatches::
   {"inode":45}
 
 Timeout callback:: count: 1
-30: timerToUpdateChildWatches *new*
+26: timerToUpdateChildWatches *new*
 
 ScriptInfos::
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts *changed*
@@ -1734,11 +1701,11 @@ FsWatches::
 /home/src/projects/a/1/a-impl/a:
   {"inode":19}
 /home/src/projects/a/1/a-impl/a/lib: *new*
-  {"inode":171}
+  {"inode":169}
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts:
-  {"inode":173}
+  {"inode":171}
 /home/src/projects/a/1/a-impl/a/lib/index.d.ts:
-  {"inode":175}
+  {"inode":173}
 /home/src/projects/a/1/a-impl/a/node_modules:
   {"inode":25}
 /home/src/projects/a/1/a-impl/a/package.json:
@@ -1769,10 +1736,10 @@ FsWatches::
   {"inode":45}
 
 Timeout callback:: count: 1
-32: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+28: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 Before running Timeout callback:: count: 1
-32: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+28: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -1780,8 +1747,8 @@ Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
 After running Timeout callback:: count: 2
 
 Timeout callback:: count: 2
-33: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-34: *ensureProjectForOpenFiles* *new*
+29: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+30: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1790,8 +1757,8 @@ Projects::
     dirty: true *changed*
 
 Before running Timeout callback:: count: 2
-33: /home/src/projects/b/2/b-impl/b/tsconfig.json
-34: *ensureProjectForOpenFiles*
+29: /home/src/projects/b/2/b-impl/b/tsconfig.json
+30: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -1898,11 +1865,11 @@ FsWatches::
 /home/src/projects:
   {"inode":3}
 /home/src/projects/a/1/a-impl/a/lib:
-  {"inode":171}
+  {"inode":169}
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts:
-  {"inode":173}
+  {"inode":171}
 /home/src/projects/a/1/a-impl/a/lib/index.d.ts:
-  {"inode":175}
+  {"inode":173}
 /home/src/projects/a/1/a-impl/a/node_modules:
   {"inode":25}
 /home/src/projects/a/1/a-impl/a/package.json:
@@ -1993,10 +1960,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-35: checkOne *new*
+31: checkOne *new*
 
 Before running Timeout callback:: count: 1
-35: checkOne
+31: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js
index d5a3611394b71..e40098bfbd2cd 100644
--- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js
+++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js
@@ -13,7 +13,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -42,7 +43,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -67,7 +69,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json] Inode:: 36
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -125,17 +128,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 151
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] Inode:: 151
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 152
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 152
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 154
@@ -175,17 +178,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 158
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] Inode:: 158
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 159
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 159
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -218,6 +221,7 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/projects/b/2/b-impl/b/tsconfig.json :
  ],
  "options": {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "configFilePath": "/home/src/projects/b/2/b-impl/b/tsconfig.json"
  }
 }
@@ -613,7 +617,8 @@ Info seq  [hh:mm:ss:mss] event:
             "deferredSize": 0
           },
           "compilerOptions": {
-            "outDir": ""
+            "outDir": "",
+            "rootDir": ""
           },
           "typeAcquisition": {
             "enable": false,
@@ -1324,29 +1329,21 @@ Custom watchDirectory:: Triggered Ignored:: {"id":7,"path":"/home/src/projects/c
 Custom watchFile:: Triggered:: {"id":6,"path":"/home/src/projects/c/3/c-impl/c/lib/index.d.ts"}:: /home/src/projects/c/3/c-impl/c/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":7,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":7,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/index.js deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":7,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":7,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt deleted
 Custom watchFile:: Triggered:: {"id":5,"path":"/home/src/projects/a/1/a-impl/a/lib/a.d.ts"}:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/a.js deleted
 Custom watchFile:: Triggered:: {"id":3,"path":"/home/src/projects/a/1/a-impl/a/lib/index.d.ts"}:: /home/src/projects/a/1/a-impl/a/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/index.js deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt deleted
 Before request
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 Info seq  [hh:mm:ss:mss] request:
     {
@@ -1364,9 +1361,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/c/3/c-impl/c/lib/c.d.ts",
             "/home/src/projects/c/3/c-impl/c/lib/c.js",
             "/home/src/projects/c/3/c-impl/c/lib/index.d.ts",
-            "/home/src/projects/c/3/c-impl/c/lib/index.js",
-            "/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/c/3/c-impl/c/lib/index.js"
           ]
         },
         {
@@ -1387,9 +1382,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/a/1/a-impl/a/lib/a.d.ts",
             "/home/src/projects/a/1/a-impl/a/lib/a.js",
             "/home/src/projects/a/1/a-impl/a/lib/index.d.ts",
-            "/home/src/projects/a/1/a-impl/a/lib/index.js",
-            "/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/a/1/a-impl/a/lib/index.js"
           ]
         },
         {
@@ -1418,12 +1411,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.d.ts 2:: WatchInfo: /home/src/projects/c/3/c-impl/c/lib/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
@@ -1444,12 +1431,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 2:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
@@ -1457,9 +1438,9 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 After request
 
 Timeout callback:: count: 3
-23: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
-24: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-25: *ensureProjectForOpenFiles* *new*
+19: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+20: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+21: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1503,9 +1484,9 @@ ScriptInfos::
         /home/src/projects/b/2/b-impl/b/tsconfig.json
 
 Before running Timeout callback:: count: 3
-23: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
-24: /home/src/projects/b/2/b-impl/b/tsconfig.json
-25: *ensureProjectForOpenFiles*
+19: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+20: /home/src/projects/b/2/b-impl/b/tsconfig.json
+21: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -1786,10 +1767,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-26: checkOne *new*
+22: checkOne *new*
 
 Before running Timeout callback:: count: 1
-26: checkOne
+22: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -1897,9 +1878,13 @@ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/
 Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.js created
 Custom watchFile:: Triggered:: {"id":3,"path":"/home/src/projects/a/1/a-impl/a/lib/index.d.ts"}:: /home/src/projects/a/1/a-impl/a/lib/index.d.ts created
 Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts created
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created
+Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo updated
+Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt updated
 Before request
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents Inode:: 151
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 152
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents Inode:: 158
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 159
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 165
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1935,31 +1920,18 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 169
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 172
+//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 170
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
 exports.a = 'test';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 173
+//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 171
 export declare const a: string;
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 174
+//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 172
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -1980,24 +1952,11 @@ __exportStar(require("./a"), exports);
 __exportStar(require("c"), exports);
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 175
+//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 173
 export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 176
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 177
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 Info seq  [hh:mm:ss:mss] request:
     {
@@ -2022,9 +1981,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.js",
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.d.ts",
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.js",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts"
           ]
         },
         {
@@ -2062,12 +2019,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/a.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/a.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info
@@ -2075,7 +2026,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 After request
 
 Timeout callback:: count: 1
-33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+27: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 ScriptInfos::
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts *changed*
@@ -2108,7 +2059,7 @@ ScriptInfos::
         /home/src/projects/b/2/b-impl/b/tsconfig.json
 
 Before running Timeout callback:: count: 1
-33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+27: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2116,8 +2067,8 @@ Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
 After running Timeout callback:: count: 2
 
 Timeout callback:: count: 2
-34: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-35: *ensureProjectForOpenFiles* *new*
+28: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+29: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -2126,8 +2077,8 @@ Projects::
     dirty: true *changed*
 
 Before running Timeout callback:: count: 2
-34: /home/src/projects/b/2/b-impl/b/tsconfig.json
-35: *ensureProjectForOpenFiles*
+28: /home/src/projects/b/2/b-impl/b/tsconfig.json
+29: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2440,10 +2391,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-36: checkOne *new*
+30: checkOne *new*
 
 Before running Timeout callback:: count: 1
-36: checkOne
+30: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js
index c6303534c07eb..eaea2c10e3ab5 100644
--- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js
+++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js
@@ -13,7 +13,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -42,7 +43,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -67,7 +69,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json] Inode:: 36
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -125,17 +128,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 151
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] Inode:: 151
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 152
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 152
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 154
@@ -175,17 +178,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 158
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] Inode:: 158
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 159
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 159
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -207,6 +210,7 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/projects/b/2/b-impl/b/tsconfig.json :
  ],
  "options": {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "configFilePath": "/home/src/projects/b/2/b-impl/b/tsconfig.json"
  }
 }
@@ -320,7 +324,8 @@ Info seq  [hh:mm:ss:mss] event:
             "deferredSize": 0
           },
           "compilerOptions": {
-            "outDir": ""
+            "outDir": "",
+            "rootDir": ""
           },
           "typeAcquisition": {
             "enable": false,
@@ -1077,12 +1082,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
@@ -1106,31 +1105,21 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Before running Timeout callback:: count: 3
-25: /home/src/projects/b/2/b-impl/b/tsconfig.json
-26: *ensureProjectForOpenFiles*
-31: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+23: /home/src/projects/b/2/b-impl/b/tsconfig.json
+24: *ensureProjectForOpenFiles*
+27: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 PolledWatches::
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new*
@@ -1197,9 +1186,9 @@ FsWatchesRecursive::
   {"inode":4}
 
 Timeout callback:: count: 3
-25: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-26: *ensureProjectForOpenFiles* *new*
-31: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+23: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+24: *ensureProjectForOpenFiles* *new*
+27: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1378,7 +1367,7 @@ FsWatchesRecursive *deleted*::
   {"inode":4}
 
 Timeout callback:: count: 0
-31: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *deleted*
+27: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *deleted*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1412,10 +1401,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-32: checkOne *new*
+28: checkOne *new*
 
 Before running Timeout callback:: count: 1
-32: checkOne
+28: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -1545,14 +1534,12 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Before running Timeout callback:: count: 1
-39: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents Inode:: 151
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 152
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents Inode:: 158
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 159
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 165
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1588,31 +1575,18 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 169
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 172
+//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 170
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
 exports.a = 'test';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 173
+//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 171
 export declare const a: string;
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 174
+//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 172
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -1633,24 +1607,11 @@ __exportStar(require("./a"), exports);
 __exportStar(require("c"), exports);
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 175
+//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 173
 export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 176
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 177
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 PolledWatches::
 /home/src/projects/b/2/b-impl/b/node_modules/@types:
@@ -1686,9 +1647,9 @@ FsWatches::
 /home/src/projects:
   {"inode":3}
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new*
-  {"inode":173}
+  {"inode":171}
 /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new*
-  {"inode":175}
+  {"inode":173}
 /home/src/projects/a/1/a-impl/a/package.json:
   {"inode":24}
 /home/src/projects/b:
@@ -1717,7 +1678,7 @@ FsWatchesRecursive::
   {"inode":34}
 
 Timeout callback:: count: 1
-39: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 ScriptInfos::
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts *changed*
@@ -1755,8 +1716,8 @@ Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
 After running Timeout callback:: count: 2
 
 Timeout callback:: count: 2
-40: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-41: *ensureProjectForOpenFiles* *new*
+34: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+35: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1765,8 +1726,8 @@ Projects::
     dirty: true *changed*
 
 Before running Timeout callback:: count: 2
-40: /home/src/projects/b/2/b-impl/b/tsconfig.json
-41: *ensureProjectForOpenFiles*
+34: /home/src/projects/b/2/b-impl/b/tsconfig.json
+35: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -1873,9 +1834,9 @@ FsWatches::
 /home/src/projects:
   {"inode":3}
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts:
-  {"inode":173}
+  {"inode":171}
 /home/src/projects/a/1/a-impl/a/lib/index.d.ts:
-  {"inode":175}
+  {"inode":173}
 /home/src/projects/a/1/a-impl/a/package.json:
   {"inode":24}
 /home/src/projects/b:
@@ -1970,10 +1931,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-42: checkOne *new*
+36: checkOne *new*
 
 Before running Timeout callback:: count: 1
-42: checkOne
+36: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Windows-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Windows-canUseWatchEvents.js
index d2a429226c0cf..4853a4d8411e9 100644
--- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Windows-canUseWatchEvents.js
+++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Windows-canUseWatchEvents.js
@@ -13,7 +13,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -42,7 +43,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -67,7 +69,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json]
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -125,17 +128,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo]
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo]
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js]
@@ -175,17 +178,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo]
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo]
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -218,6 +221,7 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/projects/b/2/b-impl/b/tsconfig.json :
  ],
  "options": {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "configFilePath": "/home/src/projects/b/2/b-impl/b/tsconfig.json"
  }
 }
@@ -613,7 +617,8 @@ Info seq  [hh:mm:ss:mss] event:
             "deferredSize": 0
           },
           "compilerOptions": {
-            "outDir": ""
+            "outDir": "",
+            "rootDir": ""
           },
           "typeAcquisition": {
             "enable": false,
@@ -1324,29 +1329,21 @@ Custom watchDirectory:: Triggered Ignored:: {"id":7,"path":"/home/src/projects/c
 Custom watchFile:: Triggered:: {"id":6,"path":"/home/src/projects/c/3/c-impl/c/lib/index.d.ts"}:: /home/src/projects/c/3/c-impl/c/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":7,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":7,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/index.js deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":7,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":7,"path":"/home/src/projects/c/3/c-impl/c/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt deleted
 Custom watchFile:: Triggered:: {"id":5,"path":"/home/src/projects/a/1/a-impl/a/lib/a.d.ts"}:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/a.js deleted
 Custom watchFile:: Triggered:: {"id":3,"path":"/home/src/projects/a/1/a-impl/a/lib/index.d.ts"}:: /home/src/projects/a/1/a-impl/a/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/index.d.ts deleted
 Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/index.js deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo deleted
-Custom watchDirectory:: Triggered Ignored:: {"id":4,"path":"/home/src/projects/a/1/a-impl/a/lib","recursive":false,"ignoreUpdate":true}:: /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt deleted
 Before request
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 Info seq  [hh:mm:ss:mss] request:
     {
@@ -1364,9 +1361,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/c/3/c-impl/c/lib/c.d.ts",
             "/home/src/projects/c/3/c-impl/c/lib/c.js",
             "/home/src/projects/c/3/c-impl/c/lib/index.d.ts",
-            "/home/src/projects/c/3/c-impl/c/lib/index.js",
-            "/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/c/3/c-impl/c/lib/index.js"
           ]
         },
         {
@@ -1387,9 +1382,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/a/1/a-impl/a/lib/a.d.ts",
             "/home/src/projects/a/1/a-impl/a/lib/a.js",
             "/home/src/projects/a/1/a-impl/a/lib/index.d.ts",
-            "/home/src/projects/a/1/a-impl/a/lib/index.js",
-            "/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/a/1/a-impl/a/lib/index.js"
           ]
         },
         {
@@ -1418,12 +1411,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c/3/c-impl/c/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.d.ts 2:: WatchInfo: /home/src/projects/c/3/c-impl/c/lib/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
@@ -1444,12 +1431,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a/1/a-impl/a/lib 0 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 2:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
@@ -1457,9 +1438,9 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 After request
 
 Timeout callback:: count: 3
-23: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
-24: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-25: *ensureProjectForOpenFiles* *new*
+19: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+20: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+21: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1503,9 +1484,9 @@ ScriptInfos::
         /home/src/projects/b/2/b-impl/b/tsconfig.json
 
 Before running Timeout callback:: count: 3
-23: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
-24: /home/src/projects/b/2/b-impl/b/tsconfig.json
-25: *ensureProjectForOpenFiles*
+19: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+20: /home/src/projects/b/2/b-impl/b/tsconfig.json
+21: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -1786,10 +1767,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-26: checkOne *new*
+22: checkOne *new*
 
 Before running Timeout callback:: count: 1
-26: checkOne
+22: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -1906,13 +1887,13 @@ Custom watchFile:: Triggered:: {"id":3,"path":"/home/src/projects/a/1/a-impl/a/l
 Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts created
 Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts updated
 Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo updated
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt updated
-Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated
+Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo updated
+Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/tsconfig.tsbuildinfo.readable.baseline.txt updated
 Before request
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1948,19 +1929,6 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo]
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1998,19 +1966,6 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo]
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 Info seq  [hh:mm:ss:mss] request:
     {
@@ -2035,9 +1990,7 @@ Info seq  [hh:mm:ss:mss] request:
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.js",
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/a.d.ts",
             "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.js",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo",
-            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt"
+            "/home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts"
           ]
         },
         {
@@ -2075,12 +2028,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/a.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/a.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/a.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info
@@ -2088,7 +2035,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 After request
 
 Timeout callback:: count: 1
-33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+27: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 ScriptInfos::
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts *changed*
@@ -2121,7 +2068,7 @@ ScriptInfos::
         /home/src/projects/b/2/b-impl/b/tsconfig.json
 
 Before running Timeout callback:: count: 1
-33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+27: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2129,8 +2076,8 @@ Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
 After running Timeout callback:: count: 2
 
 Timeout callback:: count: 2
-34: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-35: *ensureProjectForOpenFiles* *new*
+28: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+29: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -2139,8 +2086,8 @@ Projects::
     dirty: true *changed*
 
 Before running Timeout callback:: count: 2
-34: /home/src/projects/b/2/b-impl/b/tsconfig.json
-35: *ensureProjectForOpenFiles*
+28: /home/src/projects/b/2/b-impl/b/tsconfig.json
+29: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -2453,10 +2400,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-36: checkOne *new*
+30: checkOne *new*
 
 Before running Timeout callback:: count: 1
-36: checkOne
+30: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Windows.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Windows.js
index 20890dfb5784b..70df05073173c 100644
--- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Windows.js
+++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Windows.js
@@ -13,7 +13,8 @@ export * from './c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -42,7 +43,8 @@ export * from 'c';
 {
   "compilerOptions": {
     "outDir": "lib",
-    "declaration": true
+    "declaration": true,
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -67,7 +69,8 @@ import { a } from 'a';
 //// [/home/src/projects/b/2/b-impl/b/tsconfig.json]
 {
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "include": [
     "src/**/*.ts"
@@ -125,17 +128,17 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo]
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo]
+{"root":["./src/c.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
-    "../src/c.ts",
-    "../src/index.ts"
+    "./src/c.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js]
@@ -175,17 +178,17 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo]
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo]
+{"root":["./src/a.ts","./src/index.ts"],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
-    "../src/a.ts",
-    "../src/index.ts"
+    "./src/a.ts",
+    "./src/index.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 68
+  "size": 66
 }
 
 
@@ -207,6 +210,7 @@ Info seq  [hh:mm:ss:mss] Config: /home/src/projects/b/2/b-impl/b/tsconfig.json :
  ],
  "options": {
   "outDir": "/home/src/projects/b/2/b-impl/b/lib",
+  "rootDir": "/home/src/projects/b/2/b-impl/b/src",
   "configFilePath": "/home/src/projects/b/2/b-impl/b/tsconfig.json"
  }
 }
@@ -320,7 +324,8 @@ Info seq  [hh:mm:ss:mss] event:
             "deferredSize": 0
           },
           "compilerOptions": {
-            "outDir": ""
+            "outDir": "",
+            "rootDir": ""
           },
           "typeAcquisition": {
             "enable": false,
@@ -1077,12 +1082,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/index.js :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/3/c-impl/c/lib :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
@@ -1106,36 +1105,26 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/s
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.js :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Before running Timeout callback:: count: 3
-25: /home/src/projects/b/2/b-impl/b/tsconfig.json
-26: *ensureProjectForOpenFiles*
-31: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+23: /home/src/projects/b/2/b-impl/b/tsconfig.json
+24: *ensureProjectForOpenFiles*
+27: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.js] deleted
 //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.js] deleted
 //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] deleted
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] deleted
 
 Timeout callback:: count: 3
-25: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-26: *ensureProjectForOpenFiles* *new*
-31: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+23: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+24: *ensureProjectForOpenFiles* *new*
+27: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1314,7 +1303,7 @@ FsWatchesRecursive *deleted*::
   {}
 
 Timeout callback:: count: 0
-31: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *deleted*
+27: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *deleted*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1348,10 +1337,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-32: checkOne *new*
+28: checkOne *new*
 
 Before running Timeout callback:: count: 1
-32: checkOne
+28: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -1473,14 +1462,12 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/pr
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/index.d.ts :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations
 Before running Timeout callback:: count: 1
-39: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo] file written with same contents
+//// [/home/src/projects/c/3/c-impl/c/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo] file written with same contents
+//// [/home/src/projects/a/1/a-impl/a/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents
 //// [/home/src/projects/c/3/c-impl/c/lib/c.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1516,19 +1503,6 @@ __exportStar(require("./c"), exports);
 export * from './c';
 
 
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo]
-{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "../src/c.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 //// [/home/src/projects/a/1/a-impl/a/lib/a.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1566,22 +1540,9 @@ export * from './a';
 export * from 'c';
 
 
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo]
-{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"}
-
-//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
-{
-  "root": [
-    "../src/a.ts",
-    "../src/index.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 68
-}
-
 
 Timeout callback:: count: 1
-39: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
+33: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation *new*
 
 ScriptInfos::
 /home/src/projects/a/1/a-impl/a/lib/a.d.ts *changed*
@@ -1619,8 +1580,8 @@ Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
 After running Timeout callback:: count: 2
 
 Timeout callback:: count: 2
-40: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
-41: *ensureProjectForOpenFiles* *new*
+34: /home/src/projects/b/2/b-impl/b/tsconfig.json *new*
+35: *ensureProjectForOpenFiles* *new*
 
 Projects::
 /home/src/projects/b/2/b-impl/b/tsconfig.json (Configured) *changed*
@@ -1629,8 +1590,8 @@ Projects::
     dirty: true *changed*
 
 Before running Timeout callback:: count: 2
-40: /home/src/projects/b/2/b-impl/b/tsconfig.json
-41: *ensureProjectForOpenFiles*
+34: /home/src/projects/b/2/b-impl/b/tsconfig.json
+35: *ensureProjectForOpenFiles*
 
 Info seq  [hh:mm:ss:mss] Running: /home/src/projects/b/2/b-impl/b/tsconfig.json
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/projects/b/2/b-impl/b/tsconfig.json
@@ -1834,10 +1795,10 @@ Info seq  [hh:mm:ss:mss] request:
 After request
 
 Timeout callback:: count: 1
-42: checkOne *new*
+36: checkOne *new*
 
 Before running Timeout callback:: count: 1
-42: checkOne
+36: checkOne
 
 Info seq  [hh:mm:ss:mss] event:
     {
diff --git a/tests/baselines/reference/tsserver/telemetry/does-not-expose-paths.js b/tests/baselines/reference/tsserver/telemetry/does-not-expose-paths.js
index b367c28fdafb8..2b16f38111d56 100644
--- a/tests/baselines/reference/tsserver/telemetry/does-not-expose-paths.js
+++ b/tests/baselines/reference/tsserver/telemetry/does-not-expose-paths.js
@@ -295,6 +295,20 @@ Info seq  [hh:mm:ss:mss] event:
             "category": "error",
             "fileName": "/home/src/projects/project/tsconfig.json"
           },
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/projects/project/tsconfig.json"
+          },
           {
             "start": {
               "line": 7,
@@ -360,7 +374,7 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 20,
               "offset": 10
             },
-            "text": "Option 'out' has been removed. Please remove it from your configuration.\n  Use 'outFile' instead.",
+            "text": "Option 'out' has been removed. Please remove it from your configuration.",
             "code": 5102,
             "category": "error",
             "fileName": "/home/src/projects/project/tsconfig.json"
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry-lockFile3.js b/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry-lockFile3.js
index 2339d0314c0db..0188505d036ed 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry-lockFile3.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry-lockFile3.js
@@ -83,12 +83,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/projects/pro
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -105,12 +99,6 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 TI:: Creating typing installer
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /home/src/projects/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/projects/project/tsconfig.json: *new*
@@ -217,15 +205,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/projects/project/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Installing typings ["jquery"]
 TI:: [hh:mm:ss:mss] Npm config file: /home/src/Library/Caches/typescript/package.json
 TI:: [hh:mm:ss:mss] Sending response:
@@ -267,32 +246,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/projects/project/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/projects/project/jsconfig.json:
-  {"pollingInterval":2000}
-/home/src/projects/project/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/projects/project/tsconfig.json:
-  {"pollingInterval":2000}
-
-FsWatches::
-/home/src/projects/project/package.json: *new*
-  {}
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-
 PendingInstalls callback:: count: 1
 1: #1 with arguments:: [
   "@types/jquery@tsFakeMajor.Minor"
@@ -564,30 +517,14 @@ PolledWatches::
   {"pollingInterval":2000}
 /home/src/Library/Caches/typescript/node_modules/package.json: *new*
   {"pollingInterval":2000}
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/projects/project/bower_components:
-  {"pollingInterval":500}
 /home/src/projects/project/jsconfig.json:
   {"pollingInterval":2000}
-/home/src/projects/project/node_modules:
-  {"pollingInterval":500}
 /home/src/projects/project/tsconfig.json:
   {"pollingInterval":2000}
 
 FsWatches::
 /home/src/Library/Caches/typescript/package.json: *new*
   {}
-/home/src/projects/project/package.json:
-  {}
 /home/src/tslibs/TS/Lib/lib.d.ts:
   {}
 
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry.js b/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry.js
index abf8f340c50f1..fd426632f9173 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry.js
@@ -83,12 +83,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/projects/pro
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -105,12 +99,6 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 TI:: Creating typing installer
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /home/src/projects/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/projects/project/tsconfig.json: *new*
@@ -217,15 +205,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/projects/project/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Installing typings ["jquery"]
 TI:: [hh:mm:ss:mss] Npm config file: /home/src/Library/Caches/typescript/package.json
 TI:: [hh:mm:ss:mss] Sending response:
@@ -267,32 +246,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/projects/project/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/projects/project/jsconfig.json:
-  {"pollingInterval":2000}
-/home/src/projects/project/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/projects/project/tsconfig.json:
-  {"pollingInterval":2000}
-
-FsWatches::
-/home/src/projects/project/package.json: *new*
-  {}
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-
 PendingInstalls callback:: count: 1
 1: #1 with arguments:: [
   "@types/jquery@tsFakeMajor.Minor"
@@ -564,30 +517,14 @@ PolledWatches::
   {"pollingInterval":2000}
 /home/src/Library/Caches/typescript/node_modules/package.json: *new*
   {"pollingInterval":2000}
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/projects/project/bower_components:
-  {"pollingInterval":500}
 /home/src/projects/project/jsconfig.json:
   {"pollingInterval":2000}
-/home/src/projects/project/node_modules:
-  {"pollingInterval":500}
 /home/src/projects/project/tsconfig.json:
   {"pollingInterval":2000}
 
 FsWatches::
 /home/src/Library/Caches/typescript/package.json: *new*
   {}
-/home/src/projects/project/package.json:
-  {}
 /home/src/tslibs/TS/Lib/lib.d.ts:
   {}
 
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects.js b/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects.js
index f333a0044c350..dd4ff569f0dc5 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects.js
@@ -44,12 +44,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/project
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -66,12 +60,6 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 TI:: Creating typing installer
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /user/username/projects/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /user/username/projects/project/tsconfig.json: *new*
@@ -181,15 +169,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/project/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Installing typings ["jquery"]
 TI:: [hh:mm:ss:mss] Npm config file: /home/src/Library/Caches/typescript/package.json
 TI:: [hh:mm:ss:mss] Sending response:
@@ -231,32 +210,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/user/username/projects/project/bower_components: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/jsconfig.json:
-  {"pollingInterval":2000}
-/user/username/projects/project/node_modules: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/tsconfig.json:
-  {"pollingInterval":2000}
-
-FsWatches::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-/user/username/projects/project/package.json: *new*
-  {}
-
 PendingInstalls callback:: count: 1
 1: #1 with arguments:: [
   "@types/jquery@tsFakeMajor.Minor"
@@ -531,22 +484,8 @@ PolledWatches::
   {"pollingInterval":2000}
 /home/src/Library/Caches/typescript/node_modules/package.json: *new*
   {"pollingInterval":2000}
-/home/src/Vscode/Projects/bin/bower_components:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/user/username/projects/project/bower_components:
-  {"pollingInterval":500}
 /user/username/projects/project/jsconfig.json:
   {"pollingInterval":2000}
-/user/username/projects/project/node_modules:
-  {"pollingInterval":500}
 /user/username/projects/project/tsconfig.json:
   {"pollingInterval":2000}
 
@@ -555,8 +494,6 @@ FsWatches::
   {}
 /home/src/tslibs/TS/Lib/lib.d.ts:
   {}
-/user/username/projects/project/package.json:
-  {}
 
 Projects::
 /dev/null/inferredProject1* (Inferred) *changed*
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/non-expired-cache-entry-lockFile3.js b/tests/baselines/reference/tsserver/typingsInstaller/non-expired-cache-entry-lockFile3.js
index 94f6a30ec60bd..ff2dd9a518a21 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/non-expired-cache-entry-lockFile3.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/non-expired-cache-entry-lockFile3.js
@@ -83,12 +83,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/projects/pro
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -105,12 +99,6 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 TI:: Creating typing installer
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /home/src/projects/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/projects/project/tsconfig.json: *new*
@@ -217,15 +205,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/projects/project/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject1*",
@@ -298,32 +277,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/projects/project/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/projects/project/jsconfig.json:
-  {"pollingInterval":2000}
-/home/src/projects/project/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/projects/project/tsconfig.json:
-  {"pollingInterval":2000}
-
-FsWatches::
-/home/src/projects/project/package.json: *new*
-  {}
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-
 Timeout callback:: count: 2
 1: /dev/null/inferredProject1* *new*
 2: *ensureProjectForOpenFiles* *new*
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/non-expired-cache-entry.js b/tests/baselines/reference/tsserver/typingsInstaller/non-expired-cache-entry.js
index 3dbd5825c083b..30bfa6338a1a4 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/non-expired-cache-entry.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/non-expired-cache-entry.js
@@ -83,12 +83,6 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/projects/pro
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
@@ -105,12 +99,6 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 TI:: Creating typing installer
 
 PolledWatches::
-/home/src/Vscode/Projects/bin/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types: *new*
-  {"pollingInterval":500}
 /home/src/projects/project/jsconfig.json: *new*
   {"pollingInterval":2000}
 /home/src/projects/project/tsconfig.json: *new*
@@ -217,15 +205,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "/home/src/Vscode/Projects/bin/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/projects/project/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/Vscode/Projects/bin/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject1*",
@@ -298,32 +277,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/projects/project/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/projects/project/jsconfig.json:
-  {"pollingInterval":2000}
-/home/src/projects/project/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/projects/project/tsconfig.json:
-  {"pollingInterval":2000}
-
-FsWatches::
-/home/src/projects/project/package.json: *new*
-  {}
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-
 Timeout callback:: count: 2
 1: /dev/null/inferredProject1* *new*
 2: *ensureProjectForOpenFiles* *new*
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/files-at-windows-style-root.js b/tests/baselines/reference/tsserver/watchEnvironment/files-at-windows-style-root.js
index cde5f70dc1641..052720edb323b 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/files-at-windows-style-root.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/files-at-windows-style-root.js
@@ -63,8 +63,6 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/project/file2.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: c:/project/tsconfig.json
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/project/node_modules/@types 1 undefined Project: c:/project/tsconfig.json WatchType: Type roots
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/project/node_modules/@types 1 undefined Project: c:/project/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: c:/project/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project 'c:/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (3)
@@ -162,10 +160,6 @@ Info seq  [hh:mm:ss:mss] response:
     }
 After request
 
-PolledWatches::
-c:/project/node_modules/@types: *new*
-  {"pollingInterval":500}
-
 FsWatches::
 c:/home/src/tslibs/TS/Lib/lib.d.ts: *new*
   {}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js b/tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js
index b18b1aac5665e..1ca0142fc1cc8 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js
@@ -378,8 +378,6 @@ TI:: [hh:mm:ss:mss] Sending response:
         "//vda1cs4850/myprojects/project/node_modules"
       ]
     }
-Info seq  [hh:mm:ss:mss] Skipping watcher creation at //vda1cs4850/myprojects/project/bower_components:: Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
-Info seq  [hh:mm:ss:mss] Skipping watcher creation at //vda1cs4850/myprojects/project/node_modules:: Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer
 TI:: [hh:mm:ss:mss] Sending response:
     {
       "projectName": "/dev/null/inferredProject1*",
diff --git a/tests/baselines/reference/tsxAttributeResolution15.errors.txt b/tests/baselines/reference/tsxAttributeResolution15.errors.txt
index b6da011b0d550..776fee47d10d3 100644
--- a/tests/baselines/reference/tsxAttributeResolution15.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution15.errors.txt
@@ -1,9 +1,11 @@
-file.tsx(11,21): error TS2322: Type '{ prop1: string; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<BigGreeter> & { children?: ReactNode; }'.
+file.tsx(13,21): error TS2322: Type '{ prop1: string; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<BigGreeter> & { children?: ReactNode; }'.
   Property 'prop1' does not exist on type 'IntrinsicAttributes & IntrinsicClassAttributes<BigGreeter> & { children?: ReactNode; }'.
-file.tsx(14,39): error TS2532: Object is possibly 'undefined'.
+file.tsx(16,39): error TS2532: Object is possibly 'undefined'.
 
 
 ==== file.tsx (2 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     class BigGreeter extends React.Component<{ }, {}> {
diff --git a/tests/baselines/reference/tsxAttributeResolution15.js b/tests/baselines/reference/tsxAttributeResolution15.js
index 2a61a4690fe5d..0d8aa0b34fb46 100644
--- a/tests/baselines/reference/tsxAttributeResolution15.js
+++ b/tests/baselines/reference/tsxAttributeResolution15.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxAttributeResolution15.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 class BigGreeter extends React.Component<{ }, {}> {
@@ -19,6 +21,7 @@ let c = <BigGreeter data-extra="hi" />
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxAttributeResolution15.symbols b/tests/baselines/reference/tsxAttributeResolution15.symbols
index 6430db70431e5..598b9ca29d962 100644
--- a/tests/baselines/reference/tsxAttributeResolution15.symbols
+++ b/tests/baselines/reference/tsxAttributeResolution15.symbols
@@ -1,42 +1,44 @@
 //// [tests/cases/conformance/jsx/tsxAttributeResolution15.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 class BigGreeter extends React.Component<{ }, {}> {
->BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 0, 32))
+>BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 2, 32))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 
     render() {
->render : Symbol(BigGreeter.render, Decl(file.tsx, 2, 51))
+>render : Symbol(BigGreeter.render, Decl(file.tsx, 4, 51))
 
         return <div>Default hi</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
     }
     greeting: string;
->greeting : Symbol(BigGreeter.greeting, Decl(file.tsx, 5, 5))
+>greeting : Symbol(BigGreeter.greeting, Decl(file.tsx, 7, 5))
 }
 
 // Error
 let a = <BigGreeter prop1="hello" />
->a : Symbol(a, Decl(file.tsx, 10, 3))
->BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 0, 32))
->prop1 : Symbol(prop1, Decl(file.tsx, 10, 19))
+>a : Symbol(a, Decl(file.tsx, 12, 3))
+>BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 2, 32))
+>prop1 : Symbol(prop1, Decl(file.tsx, 12, 19))
 
 // OK
 let b = <BigGreeter ref={(input) => { this.textInput = input; }} />
->b : Symbol(b, Decl(file.tsx, 13, 3))
->BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 0, 32))
->ref : Symbol(ref, Decl(file.tsx, 13, 19))
->input : Symbol(input, Decl(file.tsx, 13, 26))
->input : Symbol(input, Decl(file.tsx, 13, 26))
+>b : Symbol(b, Decl(file.tsx, 15, 3))
+>BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 2, 32))
+>ref : Symbol(ref, Decl(file.tsx, 15, 19))
+>input : Symbol(input, Decl(file.tsx, 15, 26))
+>input : Symbol(input, Decl(file.tsx, 15, 26))
 
 let c = <BigGreeter data-extra="hi" />
->c : Symbol(c, Decl(file.tsx, 14, 3))
->BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 0, 32))
->data-extra : Symbol(data-extra, Decl(file.tsx, 14, 19))
+>c : Symbol(c, Decl(file.tsx, 16, 3))
+>BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 2, 32))
+>data-extra : Symbol(data-extra, Decl(file.tsx, 16, 19))
 
diff --git a/tests/baselines/reference/tsxAttributeResolution15.types b/tests/baselines/reference/tsxAttributeResolution15.types
index 8d56963ea39b4..8cd713c95f37c 100644
--- a/tests/baselines/reference/tsxAttributeResolution15.types
+++ b/tests/baselines/reference/tsxAttributeResolution15.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxAttributeResolution15.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxAttributeResolution16.js b/tests/baselines/reference/tsxAttributeResolution16.js
index 6c350dbe3c944..219173b873c7d 100644
--- a/tests/baselines/reference/tsxAttributeResolution16.js
+++ b/tests/baselines/reference/tsxAttributeResolution16.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxAttributeResolution16.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Address {
@@ -28,6 +30,7 @@ let a = <AddressComp postalCode='T1B 0L3' street="vancouver" country="CA" />
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxAttributeResolution16.symbols b/tests/baselines/reference/tsxAttributeResolution16.symbols
index 656ebf568527d..7da8a05236bc5 100644
--- a/tests/baselines/reference/tsxAttributeResolution16.symbols
+++ b/tests/baselines/reference/tsxAttributeResolution16.symbols
@@ -1,58 +1,60 @@
 //// [tests/cases/conformance/jsx/tsxAttributeResolution16.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Address {
->Address : Symbol(Address, Decl(file.tsx, 0, 32))
+>Address : Symbol(Address, Decl(file.tsx, 2, 32))
 
   street: string;
->street : Symbol(Address.street, Decl(file.tsx, 2, 19))
+>street : Symbol(Address.street, Decl(file.tsx, 4, 19))
 
   country: string;
->country : Symbol(Address.country, Decl(file.tsx, 3, 17))
+>country : Symbol(Address.country, Decl(file.tsx, 5, 17))
 }
 
 interface CanadianAddress extends Address {
->CanadianAddress : Symbol(CanadianAddress, Decl(file.tsx, 5, 1))
->Address : Symbol(Address, Decl(file.tsx, 0, 32))
+>CanadianAddress : Symbol(CanadianAddress, Decl(file.tsx, 7, 1))
+>Address : Symbol(Address, Decl(file.tsx, 2, 32))
 
     postalCode: string;
->postalCode : Symbol(CanadianAddress.postalCode, Decl(file.tsx, 7, 43))
+>postalCode : Symbol(CanadianAddress.postalCode, Decl(file.tsx, 9, 43))
 }
 
 interface AmericanAddress extends Address {
->AmericanAddress : Symbol(AmericanAddress, Decl(file.tsx, 9, 1))
->Address : Symbol(Address, Decl(file.tsx, 0, 32))
+>AmericanAddress : Symbol(AmericanAddress, Decl(file.tsx, 11, 1))
+>Address : Symbol(Address, Decl(file.tsx, 2, 32))
 
     zipCode: string;
->zipCode : Symbol(AmericanAddress.zipCode, Decl(file.tsx, 11, 43))
+>zipCode : Symbol(AmericanAddress.zipCode, Decl(file.tsx, 13, 43))
 }
 
 type Properties = CanadianAddress | AmericanAddress;
->Properties : Symbol(Properties, Decl(file.tsx, 13, 1))
->CanadianAddress : Symbol(CanadianAddress, Decl(file.tsx, 5, 1))
->AmericanAddress : Symbol(AmericanAddress, Decl(file.tsx, 9, 1))
+>Properties : Symbol(Properties, Decl(file.tsx, 15, 1))
+>CanadianAddress : Symbol(CanadianAddress, Decl(file.tsx, 7, 1))
+>AmericanAddress : Symbol(AmericanAddress, Decl(file.tsx, 11, 1))
 
 export class AddressComp extends React.Component<Properties, void> {
->AddressComp : Symbol(AddressComp, Decl(file.tsx, 15, 52))
+>AddressComp : Symbol(AddressComp, Decl(file.tsx, 17, 52))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->Properties : Symbol(Properties, Decl(file.tsx, 13, 1))
+>Properties : Symbol(Properties, Decl(file.tsx, 15, 1))
 
   public render() {
->render : Symbol(AddressComp.render, Decl(file.tsx, 17, 68))
+>render : Symbol(AddressComp.render, Decl(file.tsx, 19, 68))
 
     return null;
   }
 }
 
 let a = <AddressComp postalCode='T1B 0L3' street="vancouver" country="CA" />
->a : Symbol(a, Decl(file.tsx, 23, 3))
->AddressComp : Symbol(AddressComp, Decl(file.tsx, 15, 52))
->postalCode : Symbol(postalCode, Decl(file.tsx, 23, 20))
->street : Symbol(street, Decl(file.tsx, 23, 41))
->country : Symbol(country, Decl(file.tsx, 23, 60))
+>a : Symbol(a, Decl(file.tsx, 25, 3))
+>AddressComp : Symbol(AddressComp, Decl(file.tsx, 17, 52))
+>postalCode : Symbol(postalCode, Decl(file.tsx, 25, 20))
+>street : Symbol(street, Decl(file.tsx, 25, 41))
+>country : Symbol(country, Decl(file.tsx, 25, 60))
 
diff --git a/tests/baselines/reference/tsxAttributeResolution16.types b/tests/baselines/reference/tsxAttributeResolution16.types
index 8c80744a26ba7..95774ce462ee9 100644
--- a/tests/baselines/reference/tsxAttributeResolution16.types
+++ b/tests/baselines/reference/tsxAttributeResolution16.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxAttributeResolution16.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.errors.txt b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.errors.txt
index fc2e988955272..fbc3431e48b3d 100644
--- a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.errors.txt
+++ b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.errors.txt
@@ -2,6 +2,7 @@ file1.tsx(5,5): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
 ==== my-component.tsx (0 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
     import * as React from 'react'
     
     interface MyProps {
@@ -25,6 +26,6 @@ file1.tsx(5,5): error TS2322: Type 'number' is not assignable to type 'string'.
         value: 42
         ~~~~~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
-!!! related TS6500 my-component.tsx:9:5: The expected type comes from property 'value' which is declared here on type 'MyInnerProps'
+!!! related TS6500 my-component.tsx:10:5: The expected type comes from property 'value' which is declared here on type 'MyInnerProps'
     }} />;
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.js b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.js
index 8e85e0774682e..df7de29dd41ed 100644
--- a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.js
+++ b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.js
@@ -1,6 +1,7 @@
 //// [tests/cases/compiler/tsxDeepAttributeAssignabilityError.tsx] ////
 
 //// [my-component.tsx]
+/// <reference path="/.lib/react.d.ts" />
 import * as React from 'react'
 
 interface MyProps {
@@ -62,6 +63,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyComponent = MyComponent;
+/// <reference path="/.lib/react.d.ts" />
 var React = __importStar(require("react"));
 function MyComponent(_props) {
     return React.createElement("span", null, "my component");
diff --git a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.symbols b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.symbols
index a7789e9860467..309cddf833895 100644
--- a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.symbols
+++ b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.symbols
@@ -1,31 +1,32 @@
 //// [tests/cases/compiler/tsxDeepAttributeAssignabilityError.tsx] ////
 
 === my-component.tsx ===
+/// <reference path="react.d.ts" />
 import * as React from 'react'
->React : Symbol(React, Decl(my-component.tsx, 0, 6))
+>React : Symbol(React, Decl(my-component.tsx, 1, 6))
 
 interface MyProps {
->MyProps : Symbol(MyProps, Decl(my-component.tsx, 0, 30))
+>MyProps : Symbol(MyProps, Decl(my-component.tsx, 1, 30))
 
     x: string;
->x : Symbol(MyProps.x, Decl(my-component.tsx, 2, 19))
+>x : Symbol(MyProps.x, Decl(my-component.tsx, 3, 19))
 
     y: MyInnerProps;
->y : Symbol(MyProps.y, Decl(my-component.tsx, 3, 14))
->MyInnerProps : Symbol(MyInnerProps, Decl(my-component.tsx, 5, 1))
+>y : Symbol(MyProps.y, Decl(my-component.tsx, 4, 14))
+>MyInnerProps : Symbol(MyInnerProps, Decl(my-component.tsx, 6, 1))
 }
 
 interface MyInnerProps {
->MyInnerProps : Symbol(MyInnerProps, Decl(my-component.tsx, 5, 1))
+>MyInnerProps : Symbol(MyInnerProps, Decl(my-component.tsx, 6, 1))
 
     value: string;
->value : Symbol(MyInnerProps.value, Decl(my-component.tsx, 7, 24))
+>value : Symbol(MyInnerProps.value, Decl(my-component.tsx, 8, 24))
 }
 
 export function MyComponent(_props: MyProps) {
->MyComponent : Symbol(MyComponent, Decl(my-component.tsx, 9, 1))
->_props : Symbol(_props, Decl(my-component.tsx, 11, 28))
->MyProps : Symbol(MyProps, Decl(my-component.tsx, 0, 30))
+>MyComponent : Symbol(MyComponent, Decl(my-component.tsx, 10, 1))
+>_props : Symbol(_props, Decl(my-component.tsx, 12, 28))
+>MyProps : Symbol(MyProps, Decl(my-component.tsx, 1, 30))
 
     return <span>my component</span>;
 >span : Symbol(JSX.IntrinsicElements.span, Decl(react.d.ts, 2461, 51))
diff --git a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.types b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.types
index 8c9d75160e1d2..f87a127c04759 100644
--- a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.types
+++ b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.types
@@ -1,6 +1,7 @@
 //// [tests/cases/compiler/tsxDeepAttributeAssignabilityError.tsx] ////
 
 === my-component.tsx ===
+/// <reference path="react.d.ts" />
 import * as React from 'react'
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution1.js b/tests/baselines/reference/tsxDefaultAttributesResolution1.js
index 7bcc1f4d5ed28..c590ca9425cb5 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution1.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution1.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxDefaultAttributesResolution1.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Prop {
@@ -17,6 +19,7 @@ let p = <Poisoned x/>;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution1.symbols b/tests/baselines/reference/tsxDefaultAttributesResolution1.symbols
index 271de82559ee3..18f8ac1bfe77b 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution1.symbols
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution1.symbols
@@ -1,24 +1,26 @@
 //// [tests/cases/conformance/jsx/tsxDefaultAttributesResolution1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     x: boolean;
->x : Symbol(Prop.x, Decl(file.tsx, 2, 16))
+>x : Symbol(Prop.x, Decl(file.tsx, 4, 16))
 }
 class Poisoned extends React.Component<Prop, {}> {
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 4, 1))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 6, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     render() {
->render : Symbol(Poisoned.render, Decl(file.tsx, 5, 50))
+>render : Symbol(Poisoned.render, Decl(file.tsx, 7, 50))
 
         return <div>Hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -28,7 +30,7 @@ class Poisoned extends React.Component<Prop, {}> {
 
 // OK
 let p = <Poisoned x/>;
->p : Symbol(p, Decl(file.tsx, 12, 3))
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 4, 1))
->x : Symbol(x, Decl(file.tsx, 12, 17))
+>p : Symbol(p, Decl(file.tsx, 14, 3))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 6, 1))
+>x : Symbol(x, Decl(file.tsx, 14, 17))
 
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution1.types b/tests/baselines/reference/tsxDefaultAttributesResolution1.types
index 134f6979a25d8..0bc31f5a7455c 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution1.types
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution1.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxDefaultAttributesResolution1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution2.js b/tests/baselines/reference/tsxDefaultAttributesResolution2.js
index ba1b8768f1bd7..723f8783e74f2 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution2.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution2.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxDefaultAttributesResolution2.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Prop {
@@ -17,6 +19,7 @@ let p = <Poisoned x/>;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution2.symbols b/tests/baselines/reference/tsxDefaultAttributesResolution2.symbols
index 41b948ce2dca3..e58172f76fec4 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution2.symbols
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution2.symbols
@@ -1,24 +1,26 @@
 //// [tests/cases/conformance/jsx/tsxDefaultAttributesResolution2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     x: true;
->x : Symbol(Prop.x, Decl(file.tsx, 2, 16))
+>x : Symbol(Prop.x, Decl(file.tsx, 4, 16))
 }
 class Poisoned extends React.Component<Prop, {}> {
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 4, 1))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 6, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     render() {
->render : Symbol(Poisoned.render, Decl(file.tsx, 5, 50))
+>render : Symbol(Poisoned.render, Decl(file.tsx, 7, 50))
 
         return <div>Hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -28,7 +30,7 @@ class Poisoned extends React.Component<Prop, {}> {
 
 // OK
 let p = <Poisoned x/>;
->p : Symbol(p, Decl(file.tsx, 12, 3))
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 4, 1))
->x : Symbol(x, Decl(file.tsx, 12, 17))
+>p : Symbol(p, Decl(file.tsx, 14, 3))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 6, 1))
+>x : Symbol(x, Decl(file.tsx, 14, 17))
 
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution2.types b/tests/baselines/reference/tsxDefaultAttributesResolution2.types
index bd3d999685b89..15a18c8a6d083 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution2.types
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution2.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxDefaultAttributesResolution2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution3.errors.txt b/tests/baselines/reference/tsxDefaultAttributesResolution3.errors.txt
index 71e18a1ba82b5..41a69a803ed09 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution3.errors.txt
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution3.errors.txt
@@ -1,7 +1,9 @@
-file.tsx(13,19): error TS2322: Type 'true' is not assignable to type 'false'.
+file.tsx(15,19): error TS2322: Type 'true' is not assignable to type 'false'.
 
 
 ==== file.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface Prop {
@@ -17,4 +19,4 @@ file.tsx(13,19): error TS2322: Type 'true' is not assignable to type 'false'.
     let p = <Poisoned x/>;
                       ~
 !!! error TS2322: Type 'true' is not assignable to type 'false'.
-!!! related TS6500 file.tsx:4:5: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Poisoned> & Prop & { children?: ReactNode; }'
\ No newline at end of file
+!!! related TS6500 file.tsx:6:5: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Poisoned> & Prop & { children?: ReactNode; }'
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution3.js b/tests/baselines/reference/tsxDefaultAttributesResolution3.js
index eb05b9d023aa9..49e27dca8d237 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution3.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution3.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxDefaultAttributesResolution3.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Prop {
@@ -17,6 +19,7 @@ let p = <Poisoned x/>;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution3.symbols b/tests/baselines/reference/tsxDefaultAttributesResolution3.symbols
index 618c54c7a94d1..6e295fe1709b5 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution3.symbols
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution3.symbols
@@ -1,24 +1,26 @@
 //// [tests/cases/conformance/jsx/tsxDefaultAttributesResolution3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     x: false;
->x : Symbol(Prop.x, Decl(file.tsx, 2, 16))
+>x : Symbol(Prop.x, Decl(file.tsx, 4, 16))
 }
 class Poisoned extends React.Component<Prop, {}> {
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 4, 1))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 6, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     render() {
->render : Symbol(Poisoned.render, Decl(file.tsx, 5, 50))
+>render : Symbol(Poisoned.render, Decl(file.tsx, 7, 50))
 
         return <div>Hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -28,7 +30,7 @@ class Poisoned extends React.Component<Prop, {}> {
 
 // Error
 let p = <Poisoned x/>;
->p : Symbol(p, Decl(file.tsx, 12, 3))
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 4, 1))
->x : Symbol(x, Decl(file.tsx, 12, 17))
+>p : Symbol(p, Decl(file.tsx, 14, 3))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 6, 1))
+>x : Symbol(x, Decl(file.tsx, 14, 17))
 
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution3.types b/tests/baselines/reference/tsxDefaultAttributesResolution3.types
index 7ded4a8bb5ff0..6af0d52eea627 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution3.types
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution3.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxDefaultAttributesResolution3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxElementResolution10.errors.txt b/tests/baselines/reference/tsxElementResolution10.errors.txt
index c439507ddf0b6..339739ddb119d 100644
--- a/tests/baselines/reference/tsxElementResolution10.errors.txt
+++ b/tests/baselines/reference/tsxElementResolution10.errors.txt
@@ -17,7 +17,7 @@ file.tsx(19,2): error TS2322: Type '{ x: number; render: number; }' is not assig
     interface Obj1type {
     	new(n: string): { x: number };
     }
-    var Obj1: Obj1type;
+    declare var Obj1: Obj1type;
     <Obj1 x={10} />; // Error, no render member
      ~~~~
 !!! error TS2322: Type '{ x: number; }' is not assignable to type 'string'.
@@ -30,7 +30,7 @@ file.tsx(19,2): error TS2322: Type '{ x: number; render: number; }' is not assig
     interface Obj2type {
     	(n: string): { x: number; render: any; };
     }
-    var Obj2: Obj2type;
+    declare var Obj2: Obj2type;
     <Obj2 x={32} render={100} />; // OK
      ~~~~
 !!! error TS2322: Type '{ x: number; render: number; }' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/tsxElementResolution10.js b/tests/baselines/reference/tsxElementResolution10.js
index 88aadd046fcc6..16cb7ef18971b 100644
--- a/tests/baselines/reference/tsxElementResolution10.js
+++ b/tests/baselines/reference/tsxElementResolution10.js
@@ -12,18 +12,16 @@ declare namespace JSX {
 interface Obj1type {
 	new(n: string): { x: number };
 }
-var Obj1: Obj1type;
+declare var Obj1: Obj1type;
 <Obj1 x={10} />; // Error, no render member
 
 interface Obj2type {
 	(n: string): { x: number; render: any; };
 }
-var Obj2: Obj2type;
+declare var Obj2: Obj2type;
 <Obj2 x={32} render={100} />; // OK
 
 
 //// [file.jsx]
-var Obj1;
 <Obj1 x={10}/>; // Error, no render member
-var Obj2;
 <Obj2 x={32} render={100}/>; // OK
diff --git a/tests/baselines/reference/tsxElementResolution10.symbols b/tests/baselines/reference/tsxElementResolution10.symbols
index 618ac0cb3c516..c6979d00a5af8 100644
--- a/tests/baselines/reference/tsxElementResolution10.symbols
+++ b/tests/baselines/reference/tsxElementResolution10.symbols
@@ -24,12 +24,12 @@ interface Obj1type {
 >n : Symbol(n, Decl(file.tsx, 9, 5))
 >x : Symbol(x, Decl(file.tsx, 9, 18))
 }
-var Obj1: Obj1type;
->Obj1 : Symbol(Obj1, Decl(file.tsx, 11, 3))
+declare var Obj1: Obj1type;
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 11, 11))
 >Obj1type : Symbol(Obj1type, Decl(file.tsx, 6, 1))
 
 <Obj1 x={10} />; // Error, no render member
->Obj1 : Symbol(Obj1, Decl(file.tsx, 11, 3))
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 11, 11))
 >x : Symbol(x, Decl(file.tsx, 12, 5))
 
 interface Obj2type {
@@ -40,12 +40,12 @@ interface Obj2type {
 >x : Symbol(x, Decl(file.tsx, 15, 15))
 >render : Symbol(render, Decl(file.tsx, 15, 26))
 }
-var Obj2: Obj2type;
->Obj2 : Symbol(Obj2, Decl(file.tsx, 17, 3))
+declare var Obj2: Obj2type;
+>Obj2 : Symbol(Obj2, Decl(file.tsx, 17, 11))
 >Obj2type : Symbol(Obj2type, Decl(file.tsx, 12, 16))
 
 <Obj2 x={32} render={100} />; // OK
->Obj2 : Symbol(Obj2, Decl(file.tsx, 17, 3))
+>Obj2 : Symbol(Obj2, Decl(file.tsx, 17, 11))
 >x : Symbol(x, Decl(file.tsx, 18, 5))
 >render : Symbol(render, Decl(file.tsx, 18, 12))
 
diff --git a/tests/baselines/reference/tsxElementResolution10.types b/tests/baselines/reference/tsxElementResolution10.types
index 2224ed0a89477..6af49f71ef81a 100644
--- a/tests/baselines/reference/tsxElementResolution10.types
+++ b/tests/baselines/reference/tsxElementResolution10.types
@@ -18,7 +18,7 @@ interface Obj1type {
 >x : number
 >  : ^^^^^^
 }
-var Obj1: Obj1type;
+declare var Obj1: Obj1type;
 >Obj1 : Obj1type
 >     : ^^^^^^^^
 
@@ -41,7 +41,7 @@ interface Obj2type {
 >render : any
 >       : ^^^
 }
-var Obj2: Obj2type;
+declare var Obj2: Obj2type;
 >Obj2 : Obj2type
 >     : ^^^^^^^^
 
diff --git a/tests/baselines/reference/tsxElementResolution11.errors.txt b/tests/baselines/reference/tsxElementResolution11.errors.txt
index a22a27b7887ed..8972bfe43fa12 100644
--- a/tests/baselines/reference/tsxElementResolution11.errors.txt
+++ b/tests/baselines/reference/tsxElementResolution11.errors.txt
@@ -12,13 +12,13 @@ file.tsx(17,7): error TS2322: Type '{ x: number; }' is not assignable to type '{
     interface Obj1type {
     	new(n: string): any;
     }
-    var Obj1: Obj1type;
+    declare var Obj1: Obj1type;
     <Obj1 x={10} />; // OK
     
     interface Obj2type {
     	new(n: string): { q?: number };
     }
-    var Obj2: Obj2type;
+    declare var Obj2: Obj2type;
     <Obj2 x={10} />; // Error
           ~
 !!! error TS2322: Type '{ x: number; }' is not assignable to type '{ q?: number; }'.
@@ -27,6 +27,6 @@ file.tsx(17,7): error TS2322: Type '{ x: number; }' is not assignable to type '{
     interface Obj3type {
     	new(n: string): { x: number; };
     }
-    var Obj3: Obj3type;
+    declare var Obj3: Obj3type;
     <Obj3 x={10} />; // OK
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxElementResolution11.js b/tests/baselines/reference/tsxElementResolution11.js
index 7672cf6716c9e..5dbe0aa063b8a 100644
--- a/tests/baselines/reference/tsxElementResolution11.js
+++ b/tests/baselines/reference/tsxElementResolution11.js
@@ -10,26 +10,23 @@ declare namespace JSX {
 interface Obj1type {
 	new(n: string): any;
 }
-var Obj1: Obj1type;
+declare var Obj1: Obj1type;
 <Obj1 x={10} />; // OK
 
 interface Obj2type {
 	new(n: string): { q?: number };
 }
-var Obj2: Obj2type;
+declare var Obj2: Obj2type;
 <Obj2 x={10} />; // Error
 
 interface Obj3type {
 	new(n: string): { x: number; };
 }
-var Obj3: Obj3type;
+declare var Obj3: Obj3type;
 <Obj3 x={10} />; // OK
 
 
 //// [file.jsx]
-var Obj1;
 <Obj1 x={10}/>; // OK
-var Obj2;
 <Obj2 x={10}/>; // Error
-var Obj3;
 <Obj3 x={10}/>; // OK
diff --git a/tests/baselines/reference/tsxElementResolution11.symbols b/tests/baselines/reference/tsxElementResolution11.symbols
index 905211d3d57b5..8cf07f54f62d5 100644
--- a/tests/baselines/reference/tsxElementResolution11.symbols
+++ b/tests/baselines/reference/tsxElementResolution11.symbols
@@ -20,12 +20,12 @@ interface Obj1type {
 	new(n: string): any;
 >n : Symbol(n, Decl(file.tsx, 7, 5))
 }
-var Obj1: Obj1type;
->Obj1 : Symbol(Obj1, Decl(file.tsx, 9, 3))
+declare var Obj1: Obj1type;
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 9, 11))
 >Obj1type : Symbol(Obj1type, Decl(file.tsx, 4, 1))
 
 <Obj1 x={10} />; // OK
->Obj1 : Symbol(Obj1, Decl(file.tsx, 9, 3))
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 9, 11))
 >x : Symbol(x, Decl(file.tsx, 10, 5))
 
 interface Obj2type {
@@ -35,12 +35,12 @@ interface Obj2type {
 >n : Symbol(n, Decl(file.tsx, 13, 5))
 >q : Symbol(q, Decl(file.tsx, 13, 18))
 }
-var Obj2: Obj2type;
->Obj2 : Symbol(Obj2, Decl(file.tsx, 15, 3))
+declare var Obj2: Obj2type;
+>Obj2 : Symbol(Obj2, Decl(file.tsx, 15, 11))
 >Obj2type : Symbol(Obj2type, Decl(file.tsx, 10, 16))
 
 <Obj2 x={10} />; // Error
->Obj2 : Symbol(Obj2, Decl(file.tsx, 15, 3))
+>Obj2 : Symbol(Obj2, Decl(file.tsx, 15, 11))
 >x : Symbol(x, Decl(file.tsx, 16, 5))
 
 interface Obj3type {
@@ -50,11 +50,11 @@ interface Obj3type {
 >n : Symbol(n, Decl(file.tsx, 19, 5))
 >x : Symbol(x, Decl(file.tsx, 19, 18))
 }
-var Obj3: Obj3type;
->Obj3 : Symbol(Obj3, Decl(file.tsx, 21, 3))
+declare var Obj3: Obj3type;
+>Obj3 : Symbol(Obj3, Decl(file.tsx, 21, 11))
 >Obj3type : Symbol(Obj3type, Decl(file.tsx, 16, 16))
 
 <Obj3 x={10} />; // OK
->Obj3 : Symbol(Obj3, Decl(file.tsx, 21, 3))
+>Obj3 : Symbol(Obj3, Decl(file.tsx, 21, 11))
 >x : Symbol(x, Decl(file.tsx, 22, 5))
 
diff --git a/tests/baselines/reference/tsxElementResolution11.types b/tests/baselines/reference/tsxElementResolution11.types
index 9f399334ee0ea..0c9889f23914e 100644
--- a/tests/baselines/reference/tsxElementResolution11.types
+++ b/tests/baselines/reference/tsxElementResolution11.types
@@ -12,7 +12,7 @@ interface Obj1type {
 >n : string
 >  : ^^^^^^
 }
-var Obj1: Obj1type;
+declare var Obj1: Obj1type;
 >Obj1 : Obj1type
 >     : ^^^^^^^^
 
@@ -33,7 +33,7 @@ interface Obj2type {
 >q : number
 >  : ^^^^^^
 }
-var Obj2: Obj2type;
+declare var Obj2: Obj2type;
 >Obj2 : Obj2type
 >     : ^^^^^^^^
 
@@ -54,7 +54,7 @@ interface Obj3type {
 >x : number
 >  : ^^^^^^
 }
-var Obj3: Obj3type;
+declare var Obj3: Obj3type;
 >Obj3 : Obj3type
 >     : ^^^^^^^^
 
diff --git a/tests/baselines/reference/tsxElementResolution12.errors.txt b/tests/baselines/reference/tsxElementResolution12.errors.txt
index fc0a630d0db0d..05cf5fd0380f2 100644
--- a/tests/baselines/reference/tsxElementResolution12.errors.txt
+++ b/tests/baselines/reference/tsxElementResolution12.errors.txt
@@ -14,19 +14,19 @@ file.tsx(33,7): error TS2322: Type 'string' is not assignable to type 'number'.
     interface Obj1type {
     	new(n: string): any;
     }
-    var Obj1: Obj1type;
+    declare var Obj1: Obj1type;
     <Obj1 x={10} />; // OK
     
     interface Obj2type {
     	new(n: string): { q?: number; pr: any };
     }
-    var Obj2: Obj2type;
+    declare var Obj2: Obj2type;
     <Obj2 x={10} />; // OK
     
     interface Obj3type {
     	new(n: string): { x: number; };
     }
-    var Obj3: Obj3type;
+    declare var Obj3: Obj3type;
     <Obj3 x={10} />; // Error
     ~~~~~~~~~~~~~~~
 !!! error TS2607: JSX element class does not support attributes because it does not have a 'pr' property.
@@ -41,7 +41,7 @@ file.tsx(33,7): error TS2322: Type 'string' is not assignable to type 'number'.
     interface Obj4type {
     	new(n: string): { x: number; pr: { x: number; } };
     }
-    var Obj4: Obj4type;
+    declare var Obj4: Obj4type;
     <Obj4 x={10} />; // OK
     <Obj4 x={'10'} />; // Error
           ~
diff --git a/tests/baselines/reference/tsxElementResolution12.js b/tests/baselines/reference/tsxElementResolution12.js
index c57c102a97dc2..0540378233ed9 100644
--- a/tests/baselines/reference/tsxElementResolution12.js
+++ b/tests/baselines/reference/tsxElementResolution12.js
@@ -10,19 +10,19 @@ declare namespace JSX {
 interface Obj1type {
 	new(n: string): any;
 }
-var Obj1: Obj1type;
+declare var Obj1: Obj1type;
 <Obj1 x={10} />; // OK
 
 interface Obj2type {
 	new(n: string): { q?: number; pr: any };
 }
-var Obj2: Obj2type;
+declare var Obj2: Obj2type;
 <Obj2 x={10} />; // OK
 
 interface Obj3type {
 	new(n: string): { x: number; };
 }
-var Obj3: Obj3type;
+declare var Obj3: Obj3type;
 <Obj3 x={10} />; // Error
 var attributes: any;
 <Obj3 {...attributes} />; // Error
@@ -31,21 +31,17 @@ var attributes: any;
 interface Obj4type {
 	new(n: string): { x: number; pr: { x: number; } };
 }
-var Obj4: Obj4type;
+declare var Obj4: Obj4type;
 <Obj4 x={10} />; // OK
 <Obj4 x={'10'} />; // Error
 
 
 //// [file.jsx]
-var Obj1;
 <Obj1 x={10}/>; // OK
-var Obj2;
 <Obj2 x={10}/>; // OK
-var Obj3;
 <Obj3 x={10}/>; // Error
 var attributes;
 <Obj3 {...attributes}/>; // Error
 <Obj3 {...{}}/>; // OK
-var Obj4;
 <Obj4 x={10}/>; // OK
 <Obj4 x={'10'}/>; // Error
diff --git a/tests/baselines/reference/tsxElementResolution12.symbols b/tests/baselines/reference/tsxElementResolution12.symbols
index 630ef2debbc05..3bd11517663af 100644
--- a/tests/baselines/reference/tsxElementResolution12.symbols
+++ b/tests/baselines/reference/tsxElementResolution12.symbols
@@ -21,12 +21,12 @@ interface Obj1type {
 	new(n: string): any;
 >n : Symbol(n, Decl(file.tsx, 7, 5))
 }
-var Obj1: Obj1type;
->Obj1 : Symbol(Obj1, Decl(file.tsx, 9, 3))
+declare var Obj1: Obj1type;
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 9, 11))
 >Obj1type : Symbol(Obj1type, Decl(file.tsx, 4, 1))
 
 <Obj1 x={10} />; // OK
->Obj1 : Symbol(Obj1, Decl(file.tsx, 9, 3))
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 9, 11))
 >x : Symbol(x, Decl(file.tsx, 10, 5))
 
 interface Obj2type {
@@ -37,12 +37,12 @@ interface Obj2type {
 >q : Symbol(q, Decl(file.tsx, 13, 18))
 >pr : Symbol(pr, Decl(file.tsx, 13, 30))
 }
-var Obj2: Obj2type;
->Obj2 : Symbol(Obj2, Decl(file.tsx, 15, 3))
+declare var Obj2: Obj2type;
+>Obj2 : Symbol(Obj2, Decl(file.tsx, 15, 11))
 >Obj2type : Symbol(Obj2type, Decl(file.tsx, 10, 16))
 
 <Obj2 x={10} />; // OK
->Obj2 : Symbol(Obj2, Decl(file.tsx, 15, 3))
+>Obj2 : Symbol(Obj2, Decl(file.tsx, 15, 11))
 >x : Symbol(x, Decl(file.tsx, 16, 5))
 
 interface Obj3type {
@@ -52,23 +52,23 @@ interface Obj3type {
 >n : Symbol(n, Decl(file.tsx, 19, 5))
 >x : Symbol(x, Decl(file.tsx, 19, 18))
 }
-var Obj3: Obj3type;
->Obj3 : Symbol(Obj3, Decl(file.tsx, 21, 3))
+declare var Obj3: Obj3type;
+>Obj3 : Symbol(Obj3, Decl(file.tsx, 21, 11))
 >Obj3type : Symbol(Obj3type, Decl(file.tsx, 16, 16))
 
 <Obj3 x={10} />; // Error
->Obj3 : Symbol(Obj3, Decl(file.tsx, 21, 3))
+>Obj3 : Symbol(Obj3, Decl(file.tsx, 21, 11))
 >x : Symbol(x, Decl(file.tsx, 22, 5))
 
 var attributes: any;
 >attributes : Symbol(attributes, Decl(file.tsx, 23, 3))
 
 <Obj3 {...attributes} />; // Error
->Obj3 : Symbol(Obj3, Decl(file.tsx, 21, 3))
+>Obj3 : Symbol(Obj3, Decl(file.tsx, 21, 11))
 >attributes : Symbol(attributes, Decl(file.tsx, 23, 3))
 
 <Obj3 {...{}} />; // OK
->Obj3 : Symbol(Obj3, Decl(file.tsx, 21, 3))
+>Obj3 : Symbol(Obj3, Decl(file.tsx, 21, 11))
 
 interface Obj4type {
 >Obj4type : Symbol(Obj4type, Decl(file.tsx, 25, 17))
@@ -79,15 +79,15 @@ interface Obj4type {
 >pr : Symbol(pr, Decl(file.tsx, 28, 29))
 >x : Symbol(x, Decl(file.tsx, 28, 35))
 }
-var Obj4: Obj4type;
->Obj4 : Symbol(Obj4, Decl(file.tsx, 30, 3))
+declare var Obj4: Obj4type;
+>Obj4 : Symbol(Obj4, Decl(file.tsx, 30, 11))
 >Obj4type : Symbol(Obj4type, Decl(file.tsx, 25, 17))
 
 <Obj4 x={10} />; // OK
->Obj4 : Symbol(Obj4, Decl(file.tsx, 30, 3))
+>Obj4 : Symbol(Obj4, Decl(file.tsx, 30, 11))
 >x : Symbol(x, Decl(file.tsx, 31, 5))
 
 <Obj4 x={'10'} />; // Error
->Obj4 : Symbol(Obj4, Decl(file.tsx, 30, 3))
+>Obj4 : Symbol(Obj4, Decl(file.tsx, 30, 11))
 >x : Symbol(x, Decl(file.tsx, 32, 5))
 
diff --git a/tests/baselines/reference/tsxElementResolution12.types b/tests/baselines/reference/tsxElementResolution12.types
index d3b010c0ad96c..1e8e83d57f015 100644
--- a/tests/baselines/reference/tsxElementResolution12.types
+++ b/tests/baselines/reference/tsxElementResolution12.types
@@ -15,7 +15,7 @@ interface Obj1type {
 >n : string
 >  : ^^^^^^
 }
-var Obj1: Obj1type;
+declare var Obj1: Obj1type;
 >Obj1 : Obj1type
 >     : ^^^^^^^^
 
@@ -38,7 +38,7 @@ interface Obj2type {
 >pr : any
 >   : ^^^
 }
-var Obj2: Obj2type;
+declare var Obj2: Obj2type;
 >Obj2 : Obj2type
 >     : ^^^^^^^^
 
@@ -59,7 +59,7 @@ interface Obj3type {
 >x : number
 >  : ^^^^^^
 }
-var Obj3: Obj3type;
+declare var Obj3: Obj3type;
 >Obj3 : Obj3type
 >     : ^^^^^^^^
 
@@ -104,7 +104,7 @@ interface Obj4type {
 >x : number
 >  : ^^^^^^
 }
-var Obj4: Obj4type;
+declare var Obj4: Obj4type;
 >Obj4 : Obj4type
 >     : ^^^^^^^^
 
diff --git a/tests/baselines/reference/tsxElementResolution15.errors.txt b/tests/baselines/reference/tsxElementResolution15.errors.txt
index c39d4b8e67f5a..52342e5da9c4b 100644
--- a/tests/baselines/reference/tsxElementResolution15.errors.txt
+++ b/tests/baselines/reference/tsxElementResolution15.errors.txt
@@ -14,7 +14,7 @@ file.tsx(11,2): error TS2322: Type '{ x: number; }' is not assignable to type 's
     interface Obj1type {
     	new(n: string): {};
     }
-    var Obj1: Obj1type;
+    declare var Obj1: Obj1type;
     <Obj1 x={10} />; // Error
      ~~~~
 !!! error TS2322: Type '{ x: number; }' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/tsxElementResolution15.js b/tests/baselines/reference/tsxElementResolution15.js
index c77ebba48047f..08e4960e46cf8 100644
--- a/tests/baselines/reference/tsxElementResolution15.js
+++ b/tests/baselines/reference/tsxElementResolution15.js
@@ -10,10 +10,9 @@ declare namespace JSX {
 interface Obj1type {
 	new(n: string): {};
 }
-var Obj1: Obj1type;
+declare var Obj1: Obj1type;
 <Obj1 x={10} />; // Error
 
 
 //// [file.jsx]
-var Obj1;
 <Obj1 x={10}/>; // Error
diff --git a/tests/baselines/reference/tsxElementResolution15.symbols b/tests/baselines/reference/tsxElementResolution15.symbols
index 3dbe483757215..c16e99bd3c929 100644
--- a/tests/baselines/reference/tsxElementResolution15.symbols
+++ b/tests/baselines/reference/tsxElementResolution15.symbols
@@ -22,11 +22,11 @@ interface Obj1type {
 	new(n: string): {};
 >n : Symbol(n, Decl(file.tsx, 7, 5))
 }
-var Obj1: Obj1type;
->Obj1 : Symbol(Obj1, Decl(file.tsx, 9, 3))
+declare var Obj1: Obj1type;
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 9, 11))
 >Obj1type : Symbol(Obj1type, Decl(file.tsx, 4, 1))
 
 <Obj1 x={10} />; // Error
->Obj1 : Symbol(Obj1, Decl(file.tsx, 9, 3))
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 9, 11))
 >x : Symbol(x, Decl(file.tsx, 10, 5))
 
diff --git a/tests/baselines/reference/tsxElementResolution15.types b/tests/baselines/reference/tsxElementResolution15.types
index 724773619483b..ff7498e57a986 100644
--- a/tests/baselines/reference/tsxElementResolution15.types
+++ b/tests/baselines/reference/tsxElementResolution15.types
@@ -17,7 +17,7 @@ interface Obj1type {
 >n : string
 >  : ^^^^^^
 }
-var Obj1: Obj1type;
+declare var Obj1: Obj1type;
 >Obj1 : Obj1type
 >     : ^^^^^^^^
 
diff --git a/tests/baselines/reference/tsxElementResolution8.errors.txt b/tests/baselines/reference/tsxElementResolution8.errors.txt
index 0da593c36005f..ae6fdc1a309a8 100644
--- a/tests/baselines/reference/tsxElementResolution8.errors.txt
+++ b/tests/baselines/reference/tsxElementResolution8.errors.txt
@@ -26,18 +26,18 @@ file.tsx(34,2): error TS2604: JSX element type 'Obj3' does not have any construc
     	new(): {};
     	(): number;
     }
-    var Obj1: Obj1;
+    declare var Obj1: Obj1;
     <Obj1 />; // OK, prefer construct signatures
     
     interface Obj2 {
     	(): number;
     }
-    var Obj2: Obj2;
+    declare var Obj2: Obj2;
     <Obj2 />; // Error
     
     interface Obj3 {
     }
-    var Obj3: Obj3;
+    declare var Obj3: Obj3;
     <Obj3 />; // Error
      ~~~~
 !!! error TS2604: JSX element type 'Obj3' does not have any construct or call signatures.
diff --git a/tests/baselines/reference/tsxElementResolution8.js b/tests/baselines/reference/tsxElementResolution8.js
index 7023eea9d89eb..746314fbf3ea7 100644
--- a/tests/baselines/reference/tsxElementResolution8.js
+++ b/tests/baselines/reference/tsxElementResolution8.js
@@ -22,18 +22,18 @@ interface Obj1 {
 	new(): {};
 	(): number;
 }
-var Obj1: Obj1;
+declare var Obj1: Obj1;
 <Obj1 />; // OK, prefer construct signatures
 
 interface Obj2 {
 	(): number;
 }
-var Obj2: Obj2;
+declare var Obj2: Obj2;
 <Obj2 />; // Error
 
 interface Obj3 {
 }
-var Obj3: Obj3;
+declare var Obj3: Obj3;
 <Obj3 />; // Error
 
 
@@ -47,9 +47,6 @@ function Fact() { return null; }
 // Error
 function Fnum() { return 42; }
 <Fnum />;
-var Obj1;
 <Obj1 />; // OK, prefer construct signatures
-var Obj2;
 <Obj2 />; // Error
-var Obj3;
 <Obj3 />; // Error
diff --git a/tests/baselines/reference/tsxElementResolution8.symbols b/tests/baselines/reference/tsxElementResolution8.symbols
index 7846b54c17664..e8c53bb93c336 100644
--- a/tests/baselines/reference/tsxElementResolution8.symbols
+++ b/tests/baselines/reference/tsxElementResolution8.symbols
@@ -33,37 +33,37 @@ function Fnum(): number{ return 42; }
 >Fnum : Symbol(Fnum, Decl(file.tsx, 11, 8))
 
 interface Obj1 {
->Obj1 : Symbol(Obj1, Decl(file.tsx, 15, 8), Decl(file.tsx, 21, 3))
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 15, 8), Decl(file.tsx, 21, 11))
 
 	new(): {};
 	(): number;
 }
-var Obj1: Obj1;
->Obj1 : Symbol(Obj1, Decl(file.tsx, 15, 8), Decl(file.tsx, 21, 3))
->Obj1 : Symbol(Obj1, Decl(file.tsx, 15, 8), Decl(file.tsx, 21, 3))
+declare var Obj1: Obj1;
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 15, 8), Decl(file.tsx, 21, 11))
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 15, 8), Decl(file.tsx, 21, 11))
 
 <Obj1 />; // OK, prefer construct signatures
->Obj1 : Symbol(Obj1, Decl(file.tsx, 15, 8), Decl(file.tsx, 21, 3))
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 15, 8), Decl(file.tsx, 21, 11))
 
 interface Obj2 {
->Obj2 : Symbol(Obj2, Decl(file.tsx, 22, 9), Decl(file.tsx, 27, 3))
+>Obj2 : Symbol(Obj2, Decl(file.tsx, 22, 9), Decl(file.tsx, 27, 11))
 
 	(): number;
 }
-var Obj2: Obj2;
->Obj2 : Symbol(Obj2, Decl(file.tsx, 22, 9), Decl(file.tsx, 27, 3))
->Obj2 : Symbol(Obj2, Decl(file.tsx, 22, 9), Decl(file.tsx, 27, 3))
+declare var Obj2: Obj2;
+>Obj2 : Symbol(Obj2, Decl(file.tsx, 22, 9), Decl(file.tsx, 27, 11))
+>Obj2 : Symbol(Obj2, Decl(file.tsx, 22, 9), Decl(file.tsx, 27, 11))
 
 <Obj2 />; // Error
->Obj2 : Symbol(Obj2, Decl(file.tsx, 22, 9), Decl(file.tsx, 27, 3))
+>Obj2 : Symbol(Obj2, Decl(file.tsx, 22, 9), Decl(file.tsx, 27, 11))
 
 interface Obj3 {
->Obj3 : Symbol(Obj3, Decl(file.tsx, 28, 9), Decl(file.tsx, 32, 3))
+>Obj3 : Symbol(Obj3, Decl(file.tsx, 28, 9), Decl(file.tsx, 32, 11))
 }
-var Obj3: Obj3;
->Obj3 : Symbol(Obj3, Decl(file.tsx, 28, 9), Decl(file.tsx, 32, 3))
->Obj3 : Symbol(Obj3, Decl(file.tsx, 28, 9), Decl(file.tsx, 32, 3))
+declare var Obj3: Obj3;
+>Obj3 : Symbol(Obj3, Decl(file.tsx, 28, 9), Decl(file.tsx, 32, 11))
+>Obj3 : Symbol(Obj3, Decl(file.tsx, 28, 9), Decl(file.tsx, 32, 11))
 
 <Obj3 />; // Error
->Obj3 : Symbol(Obj3, Decl(file.tsx, 28, 9), Decl(file.tsx, 32, 3))
+>Obj3 : Symbol(Obj3, Decl(file.tsx, 28, 9), Decl(file.tsx, 32, 11))
 
diff --git a/tests/baselines/reference/tsxElementResolution8.types b/tests/baselines/reference/tsxElementResolution8.types
index fda0f296f615d..fc23429c0785c 100644
--- a/tests/baselines/reference/tsxElementResolution8.types
+++ b/tests/baselines/reference/tsxElementResolution8.types
@@ -47,7 +47,7 @@ interface Obj1 {
 	new(): {};
 	(): number;
 }
-var Obj1: Obj1;
+declare var Obj1: Obj1;
 >Obj1 : Obj1
 >     : ^^^^
 
@@ -60,7 +60,7 @@ var Obj1: Obj1;
 interface Obj2 {
 	(): number;
 }
-var Obj2: Obj2;
+declare var Obj2: Obj2;
 >Obj2 : Obj2
 >     : ^^^^
 
@@ -72,7 +72,7 @@ var Obj2: Obj2;
 
 interface Obj3 {
 }
-var Obj3: Obj3;
+declare var Obj3: Obj3;
 >Obj3 : Obj3
 >     : ^^^^
 
diff --git a/tests/baselines/reference/tsxElementResolution9.errors.txt b/tests/baselines/reference/tsxElementResolution9.errors.txt
index efcda178e20d1..37275093a6c9f 100644
--- a/tests/baselines/reference/tsxElementResolution9.errors.txt
+++ b/tests/baselines/reference/tsxElementResolution9.errors.txt
@@ -31,7 +31,7 @@ file.tsx(25,2): error TS2786: 'Obj3' cannot be used as a JSX component.
     	new(n: string): { x: number };
     	new(n: number): { y: string };
     }
-    var Obj1: Obj1;
+    declare var Obj1: Obj1;
     <Obj1 />; // Error, return type is not an object type
      ~~~~
 !!! error TS2769: No overload matches this call.
@@ -44,7 +44,7 @@ file.tsx(25,2): error TS2786: 'Obj3' cannot be used as a JSX component.
     	(n: string): { x: number };
     	(n: number): { y: string };
     }
-    var Obj2: Obj2;
+    declare var Obj2: Obj2;
     <Obj2 />; // Error, return type is not an object type
      ~~~~
 !!! error TS2769: No overload matches this call.
@@ -62,7 +62,7 @@ file.tsx(25,2): error TS2786: 'Obj3' cannot be used as a JSX component.
     	(n: string): { x: number };
     	(n: number): { x: number; y: string };
     }
-    var Obj3: Obj3;
+    declare var Obj3: Obj3;
     <Obj3 x={42} />; // OK
      ~~~~
 !!! error TS2769: No overload matches this call.
diff --git a/tests/baselines/reference/tsxElementResolution9.js b/tests/baselines/reference/tsxElementResolution9.js
index 1a4787c1ef7df..d2b7aaf84402d 100644
--- a/tests/baselines/reference/tsxElementResolution9.js
+++ b/tests/baselines/reference/tsxElementResolution9.js
@@ -10,28 +10,25 @@ interface Obj1 {
 	new(n: string): { x: number };
 	new(n: number): { y: string };
 }
-var Obj1: Obj1;
+declare var Obj1: Obj1;
 <Obj1 />; // Error, return type is not an object type
 
 interface Obj2 {
 	(n: string): { x: number };
 	(n: number): { y: string };
 }
-var Obj2: Obj2;
+declare var Obj2: Obj2;
 <Obj2 />; // Error, return type is not an object type
 
 interface Obj3 {
 	(n: string): { x: number };
 	(n: number): { x: number; y: string };
 }
-var Obj3: Obj3;
+declare var Obj3: Obj3;
 <Obj3 x={42} />; // OK
 
 
 //// [file.jsx]
-var Obj1;
 <Obj1 />; // Error, return type is not an object type
-var Obj2;
 <Obj2 />; // Error, return type is not an object type
-var Obj3;
 <Obj3 x={42}/>; // OK
diff --git a/tests/baselines/reference/tsxElementResolution9.symbols b/tests/baselines/reference/tsxElementResolution9.symbols
index 715e39d598065..06ce4d41a6bff 100644
--- a/tests/baselines/reference/tsxElementResolution9.symbols
+++ b/tests/baselines/reference/tsxElementResolution9.symbols
@@ -13,7 +13,7 @@ declare namespace JSX {
 }
 
 interface Obj1 {
->Obj1 : Symbol(Obj1, Decl(file.tsx, 3, 1), Decl(file.tsx, 9, 3))
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 3, 1), Decl(file.tsx, 9, 11))
 
 	new(n: string): { x: number };
 >n : Symbol(n, Decl(file.tsx, 6, 5))
@@ -23,15 +23,15 @@ interface Obj1 {
 >n : Symbol(n, Decl(file.tsx, 7, 5))
 >y : Symbol(y, Decl(file.tsx, 7, 18))
 }
-var Obj1: Obj1;
->Obj1 : Symbol(Obj1, Decl(file.tsx, 3, 1), Decl(file.tsx, 9, 3))
->Obj1 : Symbol(Obj1, Decl(file.tsx, 3, 1), Decl(file.tsx, 9, 3))
+declare var Obj1: Obj1;
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 3, 1), Decl(file.tsx, 9, 11))
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 3, 1), Decl(file.tsx, 9, 11))
 
 <Obj1 />; // Error, return type is not an object type
->Obj1 : Symbol(Obj1, Decl(file.tsx, 3, 1), Decl(file.tsx, 9, 3))
+>Obj1 : Symbol(Obj1, Decl(file.tsx, 3, 1), Decl(file.tsx, 9, 11))
 
 interface Obj2 {
->Obj2 : Symbol(Obj2, Decl(file.tsx, 10, 9), Decl(file.tsx, 16, 3))
+>Obj2 : Symbol(Obj2, Decl(file.tsx, 10, 9), Decl(file.tsx, 16, 11))
 
 	(n: string): { x: number };
 >n : Symbol(n, Decl(file.tsx, 13, 2))
@@ -41,15 +41,15 @@ interface Obj2 {
 >n : Symbol(n, Decl(file.tsx, 14, 2))
 >y : Symbol(y, Decl(file.tsx, 14, 15))
 }
-var Obj2: Obj2;
->Obj2 : Symbol(Obj2, Decl(file.tsx, 10, 9), Decl(file.tsx, 16, 3))
->Obj2 : Symbol(Obj2, Decl(file.tsx, 10, 9), Decl(file.tsx, 16, 3))
+declare var Obj2: Obj2;
+>Obj2 : Symbol(Obj2, Decl(file.tsx, 10, 9), Decl(file.tsx, 16, 11))
+>Obj2 : Symbol(Obj2, Decl(file.tsx, 10, 9), Decl(file.tsx, 16, 11))
 
 <Obj2 />; // Error, return type is not an object type
->Obj2 : Symbol(Obj2, Decl(file.tsx, 10, 9), Decl(file.tsx, 16, 3))
+>Obj2 : Symbol(Obj2, Decl(file.tsx, 10, 9), Decl(file.tsx, 16, 11))
 
 interface Obj3 {
->Obj3 : Symbol(Obj3, Decl(file.tsx, 17, 9), Decl(file.tsx, 23, 3))
+>Obj3 : Symbol(Obj3, Decl(file.tsx, 17, 9), Decl(file.tsx, 23, 11))
 
 	(n: string): { x: number };
 >n : Symbol(n, Decl(file.tsx, 20, 2))
@@ -60,11 +60,11 @@ interface Obj3 {
 >x : Symbol(x, Decl(file.tsx, 21, 15))
 >y : Symbol(y, Decl(file.tsx, 21, 26))
 }
-var Obj3: Obj3;
->Obj3 : Symbol(Obj3, Decl(file.tsx, 17, 9), Decl(file.tsx, 23, 3))
->Obj3 : Symbol(Obj3, Decl(file.tsx, 17, 9), Decl(file.tsx, 23, 3))
+declare var Obj3: Obj3;
+>Obj3 : Symbol(Obj3, Decl(file.tsx, 17, 9), Decl(file.tsx, 23, 11))
+>Obj3 : Symbol(Obj3, Decl(file.tsx, 17, 9), Decl(file.tsx, 23, 11))
 
 <Obj3 x={42} />; // OK
->Obj3 : Symbol(Obj3, Decl(file.tsx, 17, 9), Decl(file.tsx, 23, 3))
+>Obj3 : Symbol(Obj3, Decl(file.tsx, 17, 9), Decl(file.tsx, 23, 11))
 >x : Symbol(x, Decl(file.tsx, 24, 5))
 
diff --git a/tests/baselines/reference/tsxElementResolution9.types b/tests/baselines/reference/tsxElementResolution9.types
index 6344b921ec088..2e49db56d8e58 100644
--- a/tests/baselines/reference/tsxElementResolution9.types
+++ b/tests/baselines/reference/tsxElementResolution9.types
@@ -22,7 +22,7 @@ interface Obj1 {
 >y : string
 >  : ^^^^^^
 }
-var Obj1: Obj1;
+declare var Obj1: Obj1;
 >Obj1 : Obj1
 >     : ^^^^
 
@@ -45,7 +45,7 @@ interface Obj2 {
 >y : string
 >  : ^^^^^^
 }
-var Obj2: Obj2;
+declare var Obj2: Obj2;
 >Obj2 : Obj2
 >     : ^^^^
 
@@ -70,7 +70,7 @@ interface Obj3 {
 >y : string
 >  : ^^^^^^
 }
-var Obj3: Obj3;
+declare var Obj3: Obj3;
 >Obj3 : Obj3
 >     : ^^^^
 
diff --git a/tests/baselines/reference/tsxFragmentChildrenCheck.js b/tests/baselines/reference/tsxFragmentChildrenCheck.js
index e54241f514295..a8a047ce6481d 100644
--- a/tests/baselines/reference/tsxFragmentChildrenCheck.js
+++ b/tests/baselines/reference/tsxFragmentChildrenCheck.js
@@ -1,6 +1,7 @@
 //// [tests/cases/compiler/tsxFragmentChildrenCheck.ts] ////
 
 //// [my-component.tsx]
+/// <reference path="/.lib/react.d.ts" />
 declare var React: any;
 
 export function MyComponent(props: any) {
@@ -32,6 +33,7 @@ export default RenderString
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyComponent = MyComponent;
+/// <reference path="/.lib/react.d.ts" />
 function MyComponent(props) {
     return React.createElement("span", null, "my component");
 }
diff --git a/tests/baselines/reference/tsxFragmentChildrenCheck.symbols b/tests/baselines/reference/tsxFragmentChildrenCheck.symbols
index 563cce0b17167..20391ffcc9d0d 100644
--- a/tests/baselines/reference/tsxFragmentChildrenCheck.symbols
+++ b/tests/baselines/reference/tsxFragmentChildrenCheck.symbols
@@ -1,12 +1,13 @@
 //// [tests/cases/compiler/tsxFragmentChildrenCheck.ts] ////
 
 === my-component.tsx ===
+/// <reference path="react.d.ts" />
 declare var React: any;
->React : Symbol(React, Decl(my-component.tsx, 0, 11))
+>React : Symbol(React, Decl(my-component.tsx, 1, 11))
 
 export function MyComponent(props: any) {
->MyComponent : Symbol(MyComponent, Decl(my-component.tsx, 0, 23))
->props : Symbol(props, Decl(my-component.tsx, 2, 28))
+>MyComponent : Symbol(MyComponent, Decl(my-component.tsx, 1, 23))
+>props : Symbol(props, Decl(my-component.tsx, 3, 28))
 
     return <span>my component</span>;
 >span : Symbol(JSX.IntrinsicElements.span, Decl(react.d.ts, 2461, 51))
diff --git a/tests/baselines/reference/tsxFragmentChildrenCheck.types b/tests/baselines/reference/tsxFragmentChildrenCheck.types
index 6f79111fba099..08e5f2b3e98ef 100644
--- a/tests/baselines/reference/tsxFragmentChildrenCheck.types
+++ b/tests/baselines/reference/tsxFragmentChildrenCheck.types
@@ -1,6 +1,7 @@
 //// [tests/cases/compiler/tsxFragmentChildrenCheck.ts] ////
 
 === my-component.tsx ===
+/// <reference path="react.d.ts" />
 declare var React: any;
 >React : any
 
diff --git a/tests/baselines/reference/tsxGenericAttributesType1.js b/tests/baselines/reference/tsxGenericAttributesType1.js
index c6b87260c1b14..b43c456575039 100644
--- a/tests/baselines/reference/tsxGenericAttributesType1.js
+++ b/tests/baselines/reference/tsxGenericAttributesType1.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType1.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 const decorator = function <T>(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {
@@ -17,6 +19,7 @@ const decorator3 = function <T extends { x: number }, U extends { x: number } >(
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 var decorator = function (Component) {
diff --git a/tests/baselines/reference/tsxGenericAttributesType1.symbols b/tests/baselines/reference/tsxGenericAttributesType1.symbols
index a4eb90ca2aa24..64aa6ece94fd8 100644
--- a/tests/baselines/reference/tsxGenericAttributesType1.symbols
+++ b/tests/baselines/reference/tsxGenericAttributesType1.symbols
@@ -1,68 +1,70 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 const decorator = function <T>(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {
->decorator : Symbol(decorator, Decl(file.tsx, 2, 5))
->T : Symbol(T, Decl(file.tsx, 2, 28))
->Component : Symbol(Component, Decl(file.tsx, 2, 31))
+>decorator : Symbol(decorator, Decl(file.tsx, 4, 5))
+>T : Symbol(T, Decl(file.tsx, 4, 28))
+>Component : Symbol(Component, Decl(file.tsx, 4, 31))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >StatelessComponent : Symbol(React.StatelessComponent, Decl(react.d.ts, 198, 40))
->T : Symbol(T, Decl(file.tsx, 2, 28))
+>T : Symbol(T, Decl(file.tsx, 4, 28))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >StatelessComponent : Symbol(React.StatelessComponent, Decl(react.d.ts, 198, 40))
->T : Symbol(T, Decl(file.tsx, 2, 28))
+>T : Symbol(T, Decl(file.tsx, 4, 28))
 
     return (props) => <Component {...props}></Component>
->props : Symbol(props, Decl(file.tsx, 3, 12))
->Component : Symbol(Component, Decl(file.tsx, 2, 31))
->props : Symbol(props, Decl(file.tsx, 3, 12))
->Component : Symbol(Component, Decl(file.tsx, 2, 31))
+>props : Symbol(props, Decl(file.tsx, 5, 12))
+>Component : Symbol(Component, Decl(file.tsx, 4, 31))
+>props : Symbol(props, Decl(file.tsx, 5, 12))
+>Component : Symbol(Component, Decl(file.tsx, 4, 31))
 
 };
 
 const decorator2 = function <T extends { x: number }>(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {
->decorator2 : Symbol(decorator2, Decl(file.tsx, 6, 5))
->T : Symbol(T, Decl(file.tsx, 6, 29))
->x : Symbol(x, Decl(file.tsx, 6, 40))
->Component : Symbol(Component, Decl(file.tsx, 6, 54))
+>decorator2 : Symbol(decorator2, Decl(file.tsx, 8, 5))
+>T : Symbol(T, Decl(file.tsx, 8, 29))
+>x : Symbol(x, Decl(file.tsx, 8, 40))
+>Component : Symbol(Component, Decl(file.tsx, 8, 54))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >StatelessComponent : Symbol(React.StatelessComponent, Decl(react.d.ts, 198, 40))
->T : Symbol(T, Decl(file.tsx, 6, 29))
+>T : Symbol(T, Decl(file.tsx, 8, 29))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >StatelessComponent : Symbol(React.StatelessComponent, Decl(react.d.ts, 198, 40))
->T : Symbol(T, Decl(file.tsx, 6, 29))
+>T : Symbol(T, Decl(file.tsx, 8, 29))
 
     return (props) => <Component {...props} x={2} ></Component>
->props : Symbol(props, Decl(file.tsx, 7, 12))
->Component : Symbol(Component, Decl(file.tsx, 6, 54))
->props : Symbol(props, Decl(file.tsx, 7, 12))
->x : Symbol(x, Decl(file.tsx, 7, 43))
->Component : Symbol(Component, Decl(file.tsx, 6, 54))
+>props : Symbol(props, Decl(file.tsx, 9, 12))
+>Component : Symbol(Component, Decl(file.tsx, 8, 54))
+>props : Symbol(props, Decl(file.tsx, 9, 12))
+>x : Symbol(x, Decl(file.tsx, 9, 43))
+>Component : Symbol(Component, Decl(file.tsx, 8, 54))
 
 };
 
 const decorator3 = function <T extends { x: number }, U extends { x: number } >(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {
->decorator3 : Symbol(decorator3, Decl(file.tsx, 10, 5))
->T : Symbol(T, Decl(file.tsx, 10, 29))
->x : Symbol(x, Decl(file.tsx, 10, 40))
->U : Symbol(U, Decl(file.tsx, 10, 53))
->x : Symbol(x, Decl(file.tsx, 10, 65))
->Component : Symbol(Component, Decl(file.tsx, 10, 80))
+>decorator3 : Symbol(decorator3, Decl(file.tsx, 12, 5))
+>T : Symbol(T, Decl(file.tsx, 12, 29))
+>x : Symbol(x, Decl(file.tsx, 12, 40))
+>U : Symbol(U, Decl(file.tsx, 12, 53))
+>x : Symbol(x, Decl(file.tsx, 12, 65))
+>Component : Symbol(Component, Decl(file.tsx, 12, 80))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >StatelessComponent : Symbol(React.StatelessComponent, Decl(react.d.ts, 198, 40))
->T : Symbol(T, Decl(file.tsx, 10, 29))
+>T : Symbol(T, Decl(file.tsx, 12, 29))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >StatelessComponent : Symbol(React.StatelessComponent, Decl(react.d.ts, 198, 40))
->T : Symbol(T, Decl(file.tsx, 10, 29))
+>T : Symbol(T, Decl(file.tsx, 12, 29))
 
     return (props) => <Component x={2} {...props} ></Component>
->props : Symbol(props, Decl(file.tsx, 11, 12))
->Component : Symbol(Component, Decl(file.tsx, 10, 80))
->x : Symbol(x, Decl(file.tsx, 11, 32))
->props : Symbol(props, Decl(file.tsx, 11, 12))
->Component : Symbol(Component, Decl(file.tsx, 10, 80))
+>props : Symbol(props, Decl(file.tsx, 13, 12))
+>Component : Symbol(Component, Decl(file.tsx, 12, 80))
+>x : Symbol(x, Decl(file.tsx, 13, 32))
+>props : Symbol(props, Decl(file.tsx, 13, 12))
+>Component : Symbol(Component, Decl(file.tsx, 12, 80))
 
 };
diff --git a/tests/baselines/reference/tsxGenericAttributesType1.types b/tests/baselines/reference/tsxGenericAttributesType1.types
index 5dbdb330b6346..586a0057d53a9 100644
--- a/tests/baselines/reference/tsxGenericAttributesType1.types
+++ b/tests/baselines/reference/tsxGenericAttributesType1.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxGenericAttributesType2.js b/tests/baselines/reference/tsxGenericAttributesType2.js
index 9378020d24573..88d2db8fbaa12 100644
--- a/tests/baselines/reference/tsxGenericAttributesType2.js
+++ b/tests/baselines/reference/tsxGenericAttributesType2.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType2.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 const decorator4 = function <T extends { x: number }>(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {
@@ -9,6 +11,7 @@ const decorator4 = function <T extends { x: number }>(Component: React.Stateless
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 var decorator4 = function (Component) {
diff --git a/tests/baselines/reference/tsxGenericAttributesType2.symbols b/tests/baselines/reference/tsxGenericAttributesType2.symbols
index bffdca678c6df..c53c4a61e7f50 100644
--- a/tests/baselines/reference/tsxGenericAttributesType2.symbols
+++ b/tests/baselines/reference/tsxGenericAttributesType2.symbols
@@ -1,26 +1,28 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 const decorator4 = function <T extends { x: number }>(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {
->decorator4 : Symbol(decorator4, Decl(file.tsx, 2, 5))
->T : Symbol(T, Decl(file.tsx, 2, 29))
->x : Symbol(x, Decl(file.tsx, 2, 40))
->Component : Symbol(Component, Decl(file.tsx, 2, 54))
+>decorator4 : Symbol(decorator4, Decl(file.tsx, 4, 5))
+>T : Symbol(T, Decl(file.tsx, 4, 29))
+>x : Symbol(x, Decl(file.tsx, 4, 40))
+>Component : Symbol(Component, Decl(file.tsx, 4, 54))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >StatelessComponent : Symbol(React.StatelessComponent, Decl(react.d.ts, 198, 40))
->T : Symbol(T, Decl(file.tsx, 2, 29))
+>T : Symbol(T, Decl(file.tsx, 4, 29))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >StatelessComponent : Symbol(React.StatelessComponent, Decl(react.d.ts, 198, 40))
->T : Symbol(T, Decl(file.tsx, 2, 29))
+>T : Symbol(T, Decl(file.tsx, 4, 29))
 
     return (props) => <Component {...props} y={"blah"} ></Component>
->props : Symbol(props, Decl(file.tsx, 3, 12))
->Component : Symbol(Component, Decl(file.tsx, 2, 54))
->props : Symbol(props, Decl(file.tsx, 3, 12))
->y : Symbol(y, Decl(file.tsx, 3, 43))
->Component : Symbol(Component, Decl(file.tsx, 2, 54))
+>props : Symbol(props, Decl(file.tsx, 5, 12))
+>Component : Symbol(Component, Decl(file.tsx, 4, 54))
+>props : Symbol(props, Decl(file.tsx, 5, 12))
+>y : Symbol(y, Decl(file.tsx, 5, 43))
+>Component : Symbol(Component, Decl(file.tsx, 4, 54))
 
 };
diff --git a/tests/baselines/reference/tsxGenericAttributesType2.types b/tests/baselines/reference/tsxGenericAttributesType2.types
index 7561217f00582..3e54063a3624c 100644
--- a/tests/baselines/reference/tsxGenericAttributesType2.types
+++ b/tests/baselines/reference/tsxGenericAttributesType2.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxGenericAttributesType3.js b/tests/baselines/reference/tsxGenericAttributesType3.js
index f2232eba8209d..5f8965e1bc637 100644
--- a/tests/baselines/reference/tsxGenericAttributesType3.js
+++ b/tests/baselines/reference/tsxGenericAttributesType3.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType3.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 class B1<T extends { x: string } = { x:string } > extends React.Component<T, {}> {
@@ -16,6 +18,7 @@ class B<U> extends React.Component<U, {}> {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxGenericAttributesType3.symbols b/tests/baselines/reference/tsxGenericAttributesType3.symbols
index f0d30777c4cbe..3e2e9d0d8e8f2 100644
--- a/tests/baselines/reference/tsxGenericAttributesType3.symbols
+++ b/tests/baselines/reference/tsxGenericAttributesType3.symbols
@@ -1,21 +1,23 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 class B1<T extends { x: string } = { x:string } > extends React.Component<T, {}> {
->B1 : Symbol(B1, Decl(file.tsx, 0, 32))
->T : Symbol(T, Decl(file.tsx, 2, 9))
->x : Symbol(x, Decl(file.tsx, 2, 20))
->x : Symbol(x, Decl(file.tsx, 2, 36))
+>B1 : Symbol(B1, Decl(file.tsx, 2, 32))
+>T : Symbol(T, Decl(file.tsx, 4, 9))
+>x : Symbol(x, Decl(file.tsx, 4, 20))
+>x : Symbol(x, Decl(file.tsx, 4, 36))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->T : Symbol(T, Decl(file.tsx, 2, 9))
+>T : Symbol(T, Decl(file.tsx, 4, 9))
 
     render() {
->render : Symbol(B1.render, Decl(file.tsx, 2, 82))
+>render : Symbol(B1.render, Decl(file.tsx, 4, 82))
 
         return <div>hi</div>; 
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -23,21 +25,21 @@ class B1<T extends { x: string } = { x:string } > extends React.Component<T, {}>
     }
 }
 class B<U> extends React.Component<U, {}> {
->B : Symbol(B, Decl(file.tsx, 6, 1))
->U : Symbol(U, Decl(file.tsx, 7, 8))
+>B : Symbol(B, Decl(file.tsx, 8, 1))
+>U : Symbol(U, Decl(file.tsx, 9, 8))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->U : Symbol(U, Decl(file.tsx, 7, 8))
+>U : Symbol(U, Decl(file.tsx, 9, 8))
 
     render() {
->render : Symbol(B.render, Decl(file.tsx, 7, 43))
+>render : Symbol(B.render, Decl(file.tsx, 9, 43))
 
         return <B1 {...this.props} x="hi" />;
->B1 : Symbol(B1, Decl(file.tsx, 0, 32))
+>B1 : Symbol(B1, Decl(file.tsx, 2, 32))
 >this.props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
->this : Symbol(B, Decl(file.tsx, 6, 1))
+>this : Symbol(B, Decl(file.tsx, 8, 1))
 >props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
->x : Symbol(x, Decl(file.tsx, 9, 34))
+>x : Symbol(x, Decl(file.tsx, 11, 34))
     }
 }
diff --git a/tests/baselines/reference/tsxGenericAttributesType3.types b/tests/baselines/reference/tsxGenericAttributesType3.types
index 1454a26907ceb..3399a76bcfbdf 100644
--- a/tests/baselines/reference/tsxGenericAttributesType3.types
+++ b/tests/baselines/reference/tsxGenericAttributesType3.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxGenericAttributesType4.js b/tests/baselines/reference/tsxGenericAttributesType4.js
index bf51d7bfcda65..d6e9be6283c29 100644
--- a/tests/baselines/reference/tsxGenericAttributesType4.js
+++ b/tests/baselines/reference/tsxGenericAttributesType4.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType4.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 class B1<T extends { x: string }> extends React.Component<T, {}> {
@@ -16,6 +18,7 @@ class B<U> extends React.Component<U, {}> {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxGenericAttributesType4.symbols b/tests/baselines/reference/tsxGenericAttributesType4.symbols
index d48fa5df69a73..fe00e689ba589 100644
--- a/tests/baselines/reference/tsxGenericAttributesType4.symbols
+++ b/tests/baselines/reference/tsxGenericAttributesType4.symbols
@@ -1,20 +1,22 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType4.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 class B1<T extends { x: string }> extends React.Component<T, {}> {
->B1 : Symbol(B1, Decl(file.tsx, 0, 32))
->T : Symbol(T, Decl(file.tsx, 2, 9))
->x : Symbol(x, Decl(file.tsx, 2, 20))
+>B1 : Symbol(B1, Decl(file.tsx, 2, 32))
+>T : Symbol(T, Decl(file.tsx, 4, 9))
+>x : Symbol(x, Decl(file.tsx, 4, 20))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->T : Symbol(T, Decl(file.tsx, 2, 9))
+>T : Symbol(T, Decl(file.tsx, 4, 9))
 
     render() {
->render : Symbol(B1.render, Decl(file.tsx, 2, 66))
+>render : Symbol(B1.render, Decl(file.tsx, 4, 66))
 
         return <div>hi</div>; 
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -22,21 +24,21 @@ class B1<T extends { x: string }> extends React.Component<T, {}> {
     }
 }
 class B<U> extends React.Component<U, {}> {
->B : Symbol(B, Decl(file.tsx, 6, 1))
->U : Symbol(U, Decl(file.tsx, 7, 8))
+>B : Symbol(B, Decl(file.tsx, 8, 1))
+>U : Symbol(U, Decl(file.tsx, 9, 8))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->U : Symbol(U, Decl(file.tsx, 7, 8))
+>U : Symbol(U, Decl(file.tsx, 9, 8))
 
     render() {
->render : Symbol(B.render, Decl(file.tsx, 7, 43))
+>render : Symbol(B.render, Decl(file.tsx, 9, 43))
 
         return <B1 {...this.props} x="hi" />;
->B1 : Symbol(B1, Decl(file.tsx, 0, 32))
+>B1 : Symbol(B1, Decl(file.tsx, 2, 32))
 >this.props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
->this : Symbol(B, Decl(file.tsx, 6, 1))
+>this : Symbol(B, Decl(file.tsx, 8, 1))
 >props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
->x : Symbol(x, Decl(file.tsx, 9, 34))
+>x : Symbol(x, Decl(file.tsx, 11, 34))
     }
 }
diff --git a/tests/baselines/reference/tsxGenericAttributesType4.types b/tests/baselines/reference/tsxGenericAttributesType4.types
index 8e036e07cb916..4fcf64a9c36f3 100644
--- a/tests/baselines/reference/tsxGenericAttributesType4.types
+++ b/tests/baselines/reference/tsxGenericAttributesType4.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType4.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxGenericAttributesType5.js b/tests/baselines/reference/tsxGenericAttributesType5.js
index 67e6d8e05088a..242b00ac67ae5 100644
--- a/tests/baselines/reference/tsxGenericAttributesType5.js
+++ b/tests/baselines/reference/tsxGenericAttributesType5.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType5.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 class B1<T extends { x: string }> extends React.Component<T, {}> {
@@ -17,6 +19,7 @@ class B<U> extends React.Component<U, {}> {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxGenericAttributesType5.symbols b/tests/baselines/reference/tsxGenericAttributesType5.symbols
index d0e55b6662f1b..4d0a66642afdc 100644
--- a/tests/baselines/reference/tsxGenericAttributesType5.symbols
+++ b/tests/baselines/reference/tsxGenericAttributesType5.symbols
@@ -1,20 +1,22 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType5.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 class B1<T extends { x: string }> extends React.Component<T, {}> {
->B1 : Symbol(B1, Decl(file.tsx, 0, 32))
->T : Symbol(T, Decl(file.tsx, 2, 9))
->x : Symbol(x, Decl(file.tsx, 2, 20))
+>B1 : Symbol(B1, Decl(file.tsx, 2, 32))
+>T : Symbol(T, Decl(file.tsx, 4, 9))
+>x : Symbol(x, Decl(file.tsx, 4, 20))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->T : Symbol(T, Decl(file.tsx, 2, 9))
+>T : Symbol(T, Decl(file.tsx, 4, 9))
 
     render() {
->render : Symbol(B1.render, Decl(file.tsx, 2, 66))
+>render : Symbol(B1.render, Decl(file.tsx, 4, 66))
 
         return <div>hi</div>; 
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -22,25 +24,25 @@ class B1<T extends { x: string }> extends React.Component<T, {}> {
     }
 }
 class B<U> extends React.Component<U, {}> {
->B : Symbol(B, Decl(file.tsx, 6, 1))
->U : Symbol(U, Decl(file.tsx, 7, 8))
+>B : Symbol(B, Decl(file.tsx, 8, 1))
+>U : Symbol(U, Decl(file.tsx, 9, 8))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->U : Symbol(U, Decl(file.tsx, 7, 8))
+>U : Symbol(U, Decl(file.tsx, 9, 8))
 
     props: U;
->props : Symbol(B.props, Decl(file.tsx, 7, 43))
->U : Symbol(U, Decl(file.tsx, 7, 8))
+>props : Symbol(B.props, Decl(file.tsx, 9, 43))
+>U : Symbol(U, Decl(file.tsx, 9, 8))
 
     render() {
->render : Symbol(B.render, Decl(file.tsx, 8, 13))
+>render : Symbol(B.render, Decl(file.tsx, 10, 13))
 
         return <B1 {...this.props} x="hi" />;
->B1 : Symbol(B1, Decl(file.tsx, 0, 32))
->this.props : Symbol(B.props, Decl(file.tsx, 7, 43))
->this : Symbol(B, Decl(file.tsx, 6, 1))
->props : Symbol(B.props, Decl(file.tsx, 7, 43))
->x : Symbol(x, Decl(file.tsx, 10, 34))
+>B1 : Symbol(B1, Decl(file.tsx, 2, 32))
+>this.props : Symbol(B.props, Decl(file.tsx, 9, 43))
+>this : Symbol(B, Decl(file.tsx, 8, 1))
+>props : Symbol(B.props, Decl(file.tsx, 9, 43))
+>x : Symbol(x, Decl(file.tsx, 12, 34))
     }
 }
diff --git a/tests/baselines/reference/tsxGenericAttributesType5.types b/tests/baselines/reference/tsxGenericAttributesType5.types
index afc5fb0fe273b..0e64cca2184f0 100644
--- a/tests/baselines/reference/tsxGenericAttributesType5.types
+++ b/tests/baselines/reference/tsxGenericAttributesType5.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType5.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxGenericAttributesType6.js b/tests/baselines/reference/tsxGenericAttributesType6.js
index 4d9a909b87c7e..0109230e20b70 100644
--- a/tests/baselines/reference/tsxGenericAttributesType6.js
+++ b/tests/baselines/reference/tsxGenericAttributesType6.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType6.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 class B1<T extends { x: string } = { x:string } > extends React.Component<T, {}> {
@@ -17,6 +19,7 @@ class B<U> extends React.Component<U, {}> {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxGenericAttributesType6.symbols b/tests/baselines/reference/tsxGenericAttributesType6.symbols
index a403caec38fce..f1171b510b708 100644
--- a/tests/baselines/reference/tsxGenericAttributesType6.symbols
+++ b/tests/baselines/reference/tsxGenericAttributesType6.symbols
@@ -1,21 +1,23 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType6.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 class B1<T extends { x: string } = { x:string } > extends React.Component<T, {}> {
->B1 : Symbol(B1, Decl(file.tsx, 0, 32))
->T : Symbol(T, Decl(file.tsx, 2, 9))
->x : Symbol(x, Decl(file.tsx, 2, 20))
->x : Symbol(x, Decl(file.tsx, 2, 36))
+>B1 : Symbol(B1, Decl(file.tsx, 2, 32))
+>T : Symbol(T, Decl(file.tsx, 4, 9))
+>x : Symbol(x, Decl(file.tsx, 4, 20))
+>x : Symbol(x, Decl(file.tsx, 4, 36))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->T : Symbol(T, Decl(file.tsx, 2, 9))
+>T : Symbol(T, Decl(file.tsx, 4, 9))
 
     render() {
->render : Symbol(B1.render, Decl(file.tsx, 2, 82))
+>render : Symbol(B1.render, Decl(file.tsx, 4, 82))
 
         return <div>hi</div>; 
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -23,25 +25,25 @@ class B1<T extends { x: string } = { x:string } > extends React.Component<T, {}>
     }
 }
 class B<U> extends React.Component<U, {}> {
->B : Symbol(B, Decl(file.tsx, 6, 1))
->U : Symbol(U, Decl(file.tsx, 7, 8))
+>B : Symbol(B, Decl(file.tsx, 8, 1))
+>U : Symbol(U, Decl(file.tsx, 9, 8))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->U : Symbol(U, Decl(file.tsx, 7, 8))
+>U : Symbol(U, Decl(file.tsx, 9, 8))
 
     props: U;
->props : Symbol(B.props, Decl(file.tsx, 7, 43))
->U : Symbol(U, Decl(file.tsx, 7, 8))
+>props : Symbol(B.props, Decl(file.tsx, 9, 43))
+>U : Symbol(U, Decl(file.tsx, 9, 8))
 
     render() {
->render : Symbol(B.render, Decl(file.tsx, 8, 13))
+>render : Symbol(B.render, Decl(file.tsx, 10, 13))
 
         return <B1 {...this.props} x="hi" />;
->B1 : Symbol(B1, Decl(file.tsx, 0, 32))
->this.props : Symbol(B.props, Decl(file.tsx, 7, 43))
->this : Symbol(B, Decl(file.tsx, 6, 1))
->props : Symbol(B.props, Decl(file.tsx, 7, 43))
->x : Symbol(x, Decl(file.tsx, 10, 34))
+>B1 : Symbol(B1, Decl(file.tsx, 2, 32))
+>this.props : Symbol(B.props, Decl(file.tsx, 9, 43))
+>this : Symbol(B, Decl(file.tsx, 8, 1))
+>props : Symbol(B.props, Decl(file.tsx, 9, 43))
+>x : Symbol(x, Decl(file.tsx, 12, 34))
     }
 }
diff --git a/tests/baselines/reference/tsxGenericAttributesType6.types b/tests/baselines/reference/tsxGenericAttributesType6.types
index 08eecd3c339ac..debed756c5297 100644
--- a/tests/baselines/reference/tsxGenericAttributesType6.types
+++ b/tests/baselines/reference/tsxGenericAttributesType6.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType6.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxGenericAttributesType7.js b/tests/baselines/reference/tsxGenericAttributesType7.js
index fdc394fbce913..c216038f5bb58 100644
--- a/tests/baselines/reference/tsxGenericAttributesType7.js
+++ b/tests/baselines/reference/tsxGenericAttributesType7.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType7.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 declare function Component<T>(props: T) : JSX.Element;
@@ -14,6 +16,7 @@ const decorator1 = function <U extends {x: string}>(props: U) {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 var decorator = function (props) {
diff --git a/tests/baselines/reference/tsxGenericAttributesType7.symbols b/tests/baselines/reference/tsxGenericAttributesType7.symbols
index 23bde3baf23ce..491fd285bcae6 100644
--- a/tests/baselines/reference/tsxGenericAttributesType7.symbols
+++ b/tests/baselines/reference/tsxGenericAttributesType7.symbols
@@ -1,37 +1,39 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType7.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 declare function Component<T>(props: T) : JSX.Element;
->Component : Symbol(Component, Decl(file.tsx, 0, 32))
->T : Symbol(T, Decl(file.tsx, 2, 27))
->props : Symbol(props, Decl(file.tsx, 2, 30))
->T : Symbol(T, Decl(file.tsx, 2, 27))
+>Component : Symbol(Component, Decl(file.tsx, 2, 32))
+>T : Symbol(T, Decl(file.tsx, 4, 27))
+>props : Symbol(props, Decl(file.tsx, 4, 30))
+>T : Symbol(T, Decl(file.tsx, 4, 27))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 const decorator = function <U>(props: U) {
->decorator : Symbol(decorator, Decl(file.tsx, 3, 5))
->U : Symbol(U, Decl(file.tsx, 3, 28))
->props : Symbol(props, Decl(file.tsx, 3, 31))
->U : Symbol(U, Decl(file.tsx, 3, 28))
+>decorator : Symbol(decorator, Decl(file.tsx, 5, 5))
+>U : Symbol(U, Decl(file.tsx, 5, 28))
+>props : Symbol(props, Decl(file.tsx, 5, 31))
+>U : Symbol(U, Decl(file.tsx, 5, 28))
 
     return <Component {...props} />;
->Component : Symbol(Component, Decl(file.tsx, 0, 32))
->props : Symbol(props, Decl(file.tsx, 3, 31))
+>Component : Symbol(Component, Decl(file.tsx, 2, 32))
+>props : Symbol(props, Decl(file.tsx, 5, 31))
 }
 
 const decorator1 = function <U extends {x: string}>(props: U) {
->decorator1 : Symbol(decorator1, Decl(file.tsx, 7, 5))
->U : Symbol(U, Decl(file.tsx, 7, 29))
->x : Symbol(x, Decl(file.tsx, 7, 40))
->props : Symbol(props, Decl(file.tsx, 7, 52))
->U : Symbol(U, Decl(file.tsx, 7, 29))
+>decorator1 : Symbol(decorator1, Decl(file.tsx, 9, 5))
+>U : Symbol(U, Decl(file.tsx, 9, 29))
+>x : Symbol(x, Decl(file.tsx, 9, 40))
+>props : Symbol(props, Decl(file.tsx, 9, 52))
+>U : Symbol(U, Decl(file.tsx, 9, 29))
 
     return <Component {...props} x="hi"/>;
->Component : Symbol(Component, Decl(file.tsx, 0, 32))
->props : Symbol(props, Decl(file.tsx, 7, 52))
->x : Symbol(x, Decl(file.tsx, 8, 32))
+>Component : Symbol(Component, Decl(file.tsx, 2, 32))
+>props : Symbol(props, Decl(file.tsx, 9, 52))
+>x : Symbol(x, Decl(file.tsx, 10, 32))
 }
diff --git a/tests/baselines/reference/tsxGenericAttributesType7.types b/tests/baselines/reference/tsxGenericAttributesType7.types
index 2b3f07619b249..6fd5ccbddc975 100644
--- a/tests/baselines/reference/tsxGenericAttributesType7.types
+++ b/tests/baselines/reference/tsxGenericAttributesType7.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType7.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxGenericAttributesType8.js b/tests/baselines/reference/tsxGenericAttributesType8.js
index 54f511b01d0dd..221766f37b560 100644
--- a/tests/baselines/reference/tsxGenericAttributesType8.js
+++ b/tests/baselines/reference/tsxGenericAttributesType8.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType8.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 declare function Component<T>(props: T) : JSX.Element;
@@ -14,6 +16,7 @@ const decorator1 = function <U extends {x: string}>(props: U) {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 var decorator = function (props) {
diff --git a/tests/baselines/reference/tsxGenericAttributesType8.symbols b/tests/baselines/reference/tsxGenericAttributesType8.symbols
index 8c64bc45626b8..fa8f6855bf820 100644
--- a/tests/baselines/reference/tsxGenericAttributesType8.symbols
+++ b/tests/baselines/reference/tsxGenericAttributesType8.symbols
@@ -1,36 +1,38 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType8.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 declare function Component<T>(props: T) : JSX.Element;
->Component : Symbol(Component, Decl(file.tsx, 0, 32))
->T : Symbol(T, Decl(file.tsx, 2, 27))
->props : Symbol(props, Decl(file.tsx, 2, 30))
->T : Symbol(T, Decl(file.tsx, 2, 27))
+>Component : Symbol(Component, Decl(file.tsx, 2, 32))
+>T : Symbol(T, Decl(file.tsx, 4, 27))
+>props : Symbol(props, Decl(file.tsx, 4, 30))
+>T : Symbol(T, Decl(file.tsx, 4, 27))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 const decorator = function <U>(props: U) {
->decorator : Symbol(decorator, Decl(file.tsx, 3, 5))
->U : Symbol(U, Decl(file.tsx, 3, 28))
->props : Symbol(props, Decl(file.tsx, 3, 31))
->U : Symbol(U, Decl(file.tsx, 3, 28))
+>decorator : Symbol(decorator, Decl(file.tsx, 5, 5))
+>U : Symbol(U, Decl(file.tsx, 5, 28))
+>props : Symbol(props, Decl(file.tsx, 5, 31))
+>U : Symbol(U, Decl(file.tsx, 5, 28))
 
     return <Component {...props} />;
->Component : Symbol(Component, Decl(file.tsx, 0, 32))
->props : Symbol(props, Decl(file.tsx, 3, 31))
+>Component : Symbol(Component, Decl(file.tsx, 2, 32))
+>props : Symbol(props, Decl(file.tsx, 5, 31))
 }
 
 const decorator1 = function <U extends {x: string}>(props: U) {
->decorator1 : Symbol(decorator1, Decl(file.tsx, 7, 5))
->U : Symbol(U, Decl(file.tsx, 7, 29))
->x : Symbol(x, Decl(file.tsx, 7, 40))
->props : Symbol(props, Decl(file.tsx, 7, 52))
->U : Symbol(U, Decl(file.tsx, 7, 29))
+>decorator1 : Symbol(decorator1, Decl(file.tsx, 9, 5))
+>U : Symbol(U, Decl(file.tsx, 9, 29))
+>x : Symbol(x, Decl(file.tsx, 9, 40))
+>props : Symbol(props, Decl(file.tsx, 9, 52))
+>U : Symbol(U, Decl(file.tsx, 9, 29))
 
     return <Component {...props} />;
->Component : Symbol(Component, Decl(file.tsx, 0, 32))
->props : Symbol(props, Decl(file.tsx, 7, 52))
+>Component : Symbol(Component, Decl(file.tsx, 2, 32))
+>props : Symbol(props, Decl(file.tsx, 9, 52))
 }
diff --git a/tests/baselines/reference/tsxGenericAttributesType8.types b/tests/baselines/reference/tsxGenericAttributesType8.types
index 5ac3eefd19be8..475aa907881fa 100644
--- a/tests/baselines/reference/tsxGenericAttributesType8.types
+++ b/tests/baselines/reference/tsxGenericAttributesType8.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType8.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxGenericAttributesType9.js b/tests/baselines/reference/tsxGenericAttributesType9.js
index 5d94e6f103b5d..41ac56528c077 100644
--- a/tests/baselines/reference/tsxGenericAttributesType9.js
+++ b/tests/baselines/reference/tsxGenericAttributesType9.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType9.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 export function makeP<P>(Ctor: React.ComponentClass<P>) {
@@ -17,6 +19,7 @@ export function makeP<P>(Ctor: React.ComponentClass<P>) {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxGenericAttributesType9.symbols b/tests/baselines/reference/tsxGenericAttributesType9.symbols
index 3e5a887d294dc..87bbf5a5a83bf 100644
--- a/tests/baselines/reference/tsxGenericAttributesType9.symbols
+++ b/tests/baselines/reference/tsxGenericAttributesType9.symbols
@@ -1,33 +1,35 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType9.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 export function makeP<P>(Ctor: React.ComponentClass<P>) {
->makeP : Symbol(makeP, Decl(file.tsx, 0, 32))
->P : Symbol(P, Decl(file.tsx, 2, 22))
->Ctor : Symbol(Ctor, Decl(file.tsx, 2, 25))
+>makeP : Symbol(makeP, Decl(file.tsx, 2, 32))
+>P : Symbol(P, Decl(file.tsx, 4, 22))
+>Ctor : Symbol(Ctor, Decl(file.tsx, 4, 25))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >ComponentClass : Symbol(React.ComponentClass, Decl(react.d.ts, 205, 5))
->P : Symbol(P, Decl(file.tsx, 2, 22))
+>P : Symbol(P, Decl(file.tsx, 4, 22))
 
 	return class extends React.PureComponent<P, void> {
 >React.PureComponent : Symbol(React.PureComponent, Decl(react.d.ts, 180, 5))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >PureComponent : Symbol(React.PureComponent, Decl(react.d.ts, 180, 5))
->P : Symbol(P, Decl(file.tsx, 2, 22))
+>P : Symbol(P, Decl(file.tsx, 4, 22))
 
 		public render(): JSX.Element {
->render : Symbol((Anonymous class).render, Decl(file.tsx, 3, 52))
+>render : Symbol((Anonymous class).render, Decl(file.tsx, 5, 52))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 			return (
 				<Ctor {...this.props } />
->Ctor : Symbol(Ctor, Decl(file.tsx, 2, 25))
+>Ctor : Symbol(Ctor, Decl(file.tsx, 4, 25))
 >this.props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
->this : Symbol((Anonymous class), Decl(file.tsx, 3, 7))
+>this : Symbol((Anonymous class), Decl(file.tsx, 5, 7))
 >props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
 
 			);
diff --git a/tests/baselines/reference/tsxGenericAttributesType9.types b/tests/baselines/reference/tsxGenericAttributesType9.types
index 44b6dd3720218..f0833d28c5d86 100644
--- a/tests/baselines/reference/tsxGenericAttributesType9.types
+++ b/tests/baselines/reference/tsxGenericAttributesType9.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxGenericAttributesType9.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxIntrinsicAttributeErrors.errors.txt b/tests/baselines/reference/tsxIntrinsicAttributeErrors.errors.txt
index 75c8c98e55ca4..2c2f39c193513 100644
--- a/tests/baselines/reference/tsxIntrinsicAttributeErrors.errors.txt
+++ b/tests/baselines/reference/tsxIntrinsicAttributeErrors.errors.txt
@@ -29,7 +29,7 @@ tsxIntrinsicAttributeErrors.tsx(29,2): error TS2741: Property 'key' is missing i
             render(): void
         }
     }
-    var E: I;
+    declare var E: I;
     <E x={10} />
      ~
 !!! error TS2741: Property 'key' is missing in type '{ x: number; }' but required in type 'IntrinsicAttributes'.
diff --git a/tests/baselines/reference/tsxIntrinsicAttributeErrors.js b/tests/baselines/reference/tsxIntrinsicAttributeErrors.js
index 6cd13f6291691..1186096983630 100644
--- a/tests/baselines/reference/tsxIntrinsicAttributeErrors.js
+++ b/tests/baselines/reference/tsxIntrinsicAttributeErrors.js
@@ -28,10 +28,9 @@ interface I {
         render(): void
     }
 }
-var E: I;
+declare var E: I;
 <E x={10} />
 
 
 //// [tsxIntrinsicAttributeErrors.jsx]
-var E;
 <E x={10}/>;
diff --git a/tests/baselines/reference/tsxIntrinsicAttributeErrors.symbols b/tests/baselines/reference/tsxIntrinsicAttributeErrors.symbols
index 399269e49ea28..5fdde691c6179 100644
--- a/tests/baselines/reference/tsxIntrinsicAttributeErrors.symbols
+++ b/tests/baselines/reference/tsxIntrinsicAttributeErrors.symbols
@@ -58,11 +58,11 @@ interface I {
 >render : Symbol(render, Decl(tsxIntrinsicAttributeErrors.tsx, 23, 17))
     }
 }
-var E: I;
->E : Symbol(E, Decl(tsxIntrinsicAttributeErrors.tsx, 27, 3))
+declare var E: I;
+>E : Symbol(E, Decl(tsxIntrinsicAttributeErrors.tsx, 27, 11))
 >I : Symbol(I, Decl(tsxIntrinsicAttributeErrors.tsx, 19, 1))
 
 <E x={10} />
->E : Symbol(E, Decl(tsxIntrinsicAttributeErrors.tsx, 27, 3))
+>E : Symbol(E, Decl(tsxIntrinsicAttributeErrors.tsx, 27, 11))
 >x : Symbol(x, Decl(tsxIntrinsicAttributeErrors.tsx, 28, 2))
 
diff --git a/tests/baselines/reference/tsxIntrinsicAttributeErrors.types b/tests/baselines/reference/tsxIntrinsicAttributeErrors.types
index 6b6f0c031dd35..f8153cc1b5804 100644
--- a/tests/baselines/reference/tsxIntrinsicAttributeErrors.types
+++ b/tests/baselines/reference/tsxIntrinsicAttributeErrors.types
@@ -52,7 +52,7 @@ interface I {
 >       : ^^^^^^    
     }
 }
-var E: I;
+declare var E: I;
 >E : I
 >  : ^
 
diff --git a/tests/baselines/reference/tsxInvokeComponentType.js b/tests/baselines/reference/tsxInvokeComponentType.js
index b83c7cb8e8260..cefe2fd7db332 100644
--- a/tests/baselines/reference/tsxInvokeComponentType.js
+++ b/tests/baselines/reference/tsxInvokeComponentType.js
@@ -20,7 +20,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var react_1 = __importDefault(require("react"));
 var bad = react_1.default.createElement(Elem, null);
 var good = react_1.default.createElement(Elem, { someKey: "ok" });
diff --git a/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js b/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
index b9e146103b770..219180544e7fd 100644
--- a/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
+++ b/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
@@ -23,7 +23,7 @@ function test<P>(wrappedProps: P) {
 
 //// [tsxNotUsingApparentTypeOfSFC.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.js b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.js
index 130b9c8410481..2aba365e5dd88 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.js
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter1.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Prop {
@@ -16,6 +18,7 @@ let x = <MyComp a={10} b="hi" />
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 var x = <MyComp a={10} b="hi"/>;
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.symbols b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.symbols
index 67f98e827f1c0..79988b40f67bf 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.symbols
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.symbols
@@ -1,36 +1,38 @@
 //// [tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     a: number,
->a : Symbol(Prop.a, Decl(file.tsx, 2, 16))
+>a : Symbol(Prop.a, Decl(file.tsx, 4, 16))
 
     b: string
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 }
 
 declare class MyComp<P = Prop> extends React.Component<P, {}> {
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->P : Symbol(P, Decl(file.tsx, 7, 21))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>P : Symbol(P, Decl(file.tsx, 9, 21))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->P : Symbol(P, Decl(file.tsx, 7, 21))
+>P : Symbol(P, Decl(file.tsx, 9, 21))
 
     internalProp: P;
->internalProp : Symbol(MyComp.internalProp, Decl(file.tsx, 7, 63))
->P : Symbol(P, Decl(file.tsx, 7, 21))
+>internalProp : Symbol(MyComp.internalProp, Decl(file.tsx, 9, 63))
+>P : Symbol(P, Decl(file.tsx, 9, 21))
 }
 
 let x = <MyComp a={10} b="hi" />
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->a : Symbol(a, Decl(file.tsx, 11, 15))
->b : Symbol(b, Decl(file.tsx, 11, 22))
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>a : Symbol(a, Decl(file.tsx, 13, 15))
+>b : Symbol(b, Decl(file.tsx, 13, 22))
 
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types
index d68d864afe651..666d6a054677a 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.js b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.js
index ec7a124d701ff..2a55f84d76dae 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.js
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter2.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Prop {
@@ -17,6 +19,7 @@ let x1 = <MyComp a="hi"/>
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 var x = <MyComp />;
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.symbols b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.symbols
index 0b74d243ae821..900c08d38793d 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.symbols
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.symbols
@@ -1,39 +1,41 @@
 //// [tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     a: number,
->a : Symbol(Prop.a, Decl(file.tsx, 2, 16))
+>a : Symbol(Prop.a, Decl(file.tsx, 4, 16))
 
     b: string
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 }
 
 declare class MyComp<P = Prop> extends React.Component<P, {}> {
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->P : Symbol(P, Decl(file.tsx, 7, 21))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>P : Symbol(P, Decl(file.tsx, 9, 21))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->P : Symbol(P, Decl(file.tsx, 7, 21))
+>P : Symbol(P, Decl(file.tsx, 9, 21))
 
     internalProp: P;
->internalProp : Symbol(MyComp.internalProp, Decl(file.tsx, 7, 63))
->P : Symbol(P, Decl(file.tsx, 7, 21))
+>internalProp : Symbol(MyComp.internalProp, Decl(file.tsx, 9, 63))
+>P : Symbol(P, Decl(file.tsx, 9, 21))
 }
 
 let x = <MyComp />
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
 
 let x1 = <MyComp a="hi"/>
->x1 : Symbol(x1, Decl(file.tsx, 12, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->a : Symbol(a, Decl(file.tsx, 12, 16))
+>x1 : Symbol(x1, Decl(file.tsx, 14, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>a : Symbol(a, Decl(file.tsx, 14, 16))
 
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types
index ac7d47d92f2b5..63ac8acbba1dc 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.errors.txt b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.errors.txt
index 6b64e564ce6d1..54f82ec391b7e 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.errors.txt
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.errors.txt
@@ -1,8 +1,10 @@
-file.tsx(13,11): error TS2739: Type '{}' is missing the following properties from type 'Prop': a, b
-file.tsx(19,18): error TS2322: Type 'string' is not assignable to type 'number'.
+file.tsx(15,11): error TS2739: Type '{}' is missing the following properties from type 'Prop': a, b
+file.tsx(21,18): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
 ==== file.tsx (2 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface Prop {
@@ -26,4 +28,4 @@ file.tsx(19,18): error TS2322: Type 'string' is not assignable to type 'number'.
     let x2 = <MyComp a="hi"/>
                      ~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
-!!! related TS6500 file.tsx:4:5: The expected type comes from property 'a' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComp<Prop>> & Prop & { children?: ReactNode; }'
\ No newline at end of file
+!!! related TS6500 file.tsx:6:5: The expected type comes from property 'a' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComp<Prop>> & Prop & { children?: ReactNode; }'
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.js b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.js
index ddcae6321975b..3bbe469e13d5d 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.js
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter3.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Prop {
@@ -23,6 +25,7 @@ let x2 = <MyComp a="hi"/>
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 // Error
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.symbols b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.symbols
index 1c159baae58f2..1f0cd7e6a93f8 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.symbols
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.symbols
@@ -1,48 +1,50 @@
 //// [tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     a: number,
->a : Symbol(Prop.a, Decl(file.tsx, 2, 16))
+>a : Symbol(Prop.a, Decl(file.tsx, 4, 16))
 
     b: string
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 }
 
 declare class MyComp<P extends Prop> extends React.Component<P, {}> {
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->P : Symbol(P, Decl(file.tsx, 7, 21))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>P : Symbol(P, Decl(file.tsx, 9, 21))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->P : Symbol(P, Decl(file.tsx, 7, 21))
+>P : Symbol(P, Decl(file.tsx, 9, 21))
 
     internalProp: P;
->internalProp : Symbol(MyComp.internalProp, Decl(file.tsx, 7, 69))
->P : Symbol(P, Decl(file.tsx, 7, 21))
+>internalProp : Symbol(MyComp.internalProp, Decl(file.tsx, 9, 69))
+>P : Symbol(P, Decl(file.tsx, 9, 21))
 }
 
 // Error
 let x1 = <MyComp />
->x1 : Symbol(x1, Decl(file.tsx, 12, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
+>x1 : Symbol(x1, Decl(file.tsx, 14, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
 
 // OK
 let x = <MyComp a={10} b="hi" />
->x : Symbol(x, Decl(file.tsx, 15, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->a : Symbol(a, Decl(file.tsx, 15, 15))
->b : Symbol(b, Decl(file.tsx, 15, 22))
+>x : Symbol(x, Decl(file.tsx, 17, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>a : Symbol(a, Decl(file.tsx, 17, 15))
+>b : Symbol(b, Decl(file.tsx, 17, 22))
 
 // Error
 let x2 = <MyComp a="hi"/>
->x2 : Symbol(x2, Decl(file.tsx, 18, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->a : Symbol(a, Decl(file.tsx, 18, 16))
+>x2 : Symbol(x2, Decl(file.tsx, 20, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>a : Symbol(a, Decl(file.tsx, 20, 16))
 
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types
index 4b4deb85c7dd5..6632dd17d1426 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxReactEmit8(jsx=react-jsx).js b/tests/baselines/reference/tsxReactEmit8(jsx=react-jsx).js
index 3fe1ea7733596..7fc951fb41dee 100644
--- a/tests/baselines/reference/tsxReactEmit8(jsx=react-jsx).js
+++ b/tests/baselines/reference/tsxReactEmit8(jsx=react-jsx).js
@@ -9,6 +9,6 @@
 
 //// [tsxReactEmit8.js]
 import { jsx as _jsx } from "react/jsx-runtime";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 _jsx("div", { children: "1" });
 _jsx("div", { children: "2" }, "key-attr");
diff --git a/tests/baselines/reference/tsxReactEmit8(jsx=react-jsxdev).js b/tests/baselines/reference/tsxReactEmit8(jsx=react-jsxdev).js
index 80091e84285a0..8219d0eb1ccd9 100644
--- a/tests/baselines/reference/tsxReactEmit8(jsx=react-jsxdev).js
+++ b/tests/baselines/reference/tsxReactEmit8(jsx=react-jsxdev).js
@@ -10,6 +10,6 @@
 //// [tsxReactEmit8.js]
 import { jsxDEV as _jsxDEV } from "react/jsx-dev-runtime";
 const _jsxFileName = "tsxReactEmit8.tsx";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 _jsxDEV("div", { children: "1" }, void 0, false, { fileName: _jsxFileName, lineNumber: 1, columnNumber: 1 }, this);
 _jsxDEV("div", { children: "2" }, "key-attr", false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 14 }, this);
diff --git a/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2015).js b/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2015).js
index 7fd95bd3d0729..5c2ac43497c2d 100644
--- a/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2015).js
+++ b/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2015).js
@@ -56,7 +56,7 @@ export function T12(a: any, b: any, c: any, d: any) {
 
 //// [test.js]
 import { jsx as _jsx } from "react/jsx-runtime";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 export function T1(a) {
     return _jsx("div", Object.assign({ className: "T1" }, a, { children: "T1" }));
 }
diff --git a/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2018).js b/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2018).js
index 87162bbccc6e6..ec251f3b9062f 100644
--- a/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2018).js
+++ b/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=es2018).js
@@ -56,7 +56,7 @@ export function T12(a: any, b: any, c: any, d: any) {
 
 //// [test.js]
 import { jsx as _jsx } from "react/jsx-runtime";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 export function T1(a) {
     return _jsx("div", { className: "T1", ...a, children: "T1" });
 }
diff --git a/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=esnext).js b/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=esnext).js
index 87162bbccc6e6..ec251f3b9062f 100644
--- a/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=esnext).js
+++ b/tests/baselines/reference/tsxReactEmitSpreadAttribute(target=esnext).js
@@ -56,7 +56,7 @@ export function T12(a: any, b: any, c: any, d: any) {
 
 //// [test.js]
 import { jsx as _jsx } from "react/jsx-runtime";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 export function T1(a) {
     return _jsx("div", { className: "T1", ...a, children: "T1" });
 }
diff --git a/tests/baselines/reference/tsxReactPropsInferenceSucceedsOnIntersections.js b/tests/baselines/reference/tsxReactPropsInferenceSucceedsOnIntersections.js
index d674dedcf28ea..d87e67de7a464 100644
--- a/tests/baselines/reference/tsxReactPropsInferenceSucceedsOnIntersections.js
+++ b/tests/baselines/reference/tsxReactPropsInferenceSucceedsOnIntersections.js
@@ -20,7 +20,7 @@ const CustomButton: React.SFC<CustomButtonProps> = props => <Button {...props} /
 
 //// [tsxReactPropsInferenceSucceedsOnIntersections.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
diff --git a/tests/baselines/reference/tsxResolveExternalModuleExportsTypes.js b/tests/baselines/reference/tsxResolveExternalModuleExportsTypes.js
index 97ec3b5aa6f46..843697dac4592 100644
--- a/tests/baselines/reference/tsxResolveExternalModuleExportsTypes.js
+++ b/tests/baselines/reference/tsxResolveExternalModuleExportsTypes.js
@@ -18,6 +18,7 @@ declare module 'a' {
 }
 
 //// [foo.tsx]
+/// <reference path="/.lib/react.d.ts" />
 import { Test } from 'a';
 const Foo = (<h1></h1>);
 
diff --git a/tests/baselines/reference/tsxResolveExternalModuleExportsTypes.symbols b/tests/baselines/reference/tsxResolveExternalModuleExportsTypes.symbols
index 903b04eac6c1e..a13e0c998f8fa 100644
--- a/tests/baselines/reference/tsxResolveExternalModuleExportsTypes.symbols
+++ b/tests/baselines/reference/tsxResolveExternalModuleExportsTypes.symbols
@@ -1,5 +1,15 @@
 //// [tests/cases/compiler/tsxResolveExternalModuleExportsTypes.ts] ////
 
+=== foo.tsx ===
+/// <reference path="react.d.ts" />
+import { Test } from 'a';
+>Test : Symbol(Test, Decl(foo.tsx, 1, 8))
+
+const Foo = (<h1></h1>);
+>Foo : Symbol(Foo, Decl(foo.tsx, 2, 5))
+>h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
+>h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
+
 === /node_modules/@types/a/index.d.ts ===
 declare var a: a.Foo;
 >a : Symbol(a, Decl(index.d.ts, 0, 11), Decl(index.d.ts, 0, 21), Decl(index.d.ts, 0, 23))
@@ -33,12 +43,3 @@ declare module 'a' {
     }
 }
 
-=== foo.tsx ===
-import { Test } from 'a';
->Test : Symbol(Test, Decl(foo.tsx, 0, 8))
-
-const Foo = (<h1></h1>);
->Foo : Symbol(Foo, Decl(foo.tsx, 1, 5))
->h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
->h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
-
diff --git a/tests/baselines/reference/tsxResolveExternalModuleExportsTypes.types b/tests/baselines/reference/tsxResolveExternalModuleExportsTypes.types
index ca2c5e47d5aad..851203a8c9f32 100644
--- a/tests/baselines/reference/tsxResolveExternalModuleExportsTypes.types
+++ b/tests/baselines/reference/tsxResolveExternalModuleExportsTypes.types
@@ -5,6 +5,24 @@ Assignability cache: 1,000
 Type Count: 5,000
 Instantiation count: 10,000
 
+=== foo.tsx ===
+/// <reference path="react.d.ts" />
+import { Test } from 'a';
+>Test : null
+>     : ^^^^
+
+const Foo = (<h1></h1>);
+>Foo : JSX.Element
+>    : ^^^^^^^^^^^
+>(<h1></h1>) : JSX.Element
+>            : ^^^^^^^^^^^
+><h1></h1> : JSX.Element
+>          : ^^^^^^^^^^^
+>h1 : any
+>   : ^^^
+>h1 : any
+>   : ^^^
+
 === /node_modules/@types/a/index.d.ts ===
 declare var a: a.Foo;
 >a : import("/node_modules/@types/a/index.d.ts").Foo
@@ -37,20 +55,3 @@ declare module 'a' {
     }
 }
 
-=== foo.tsx ===
-import { Test } from 'a';
->Test : null
->     : ^^^^
-
-const Foo = (<h1></h1>);
->Foo : JSX.Element
->    : ^^^^^^^^^^^
->(<h1></h1>) : JSX.Element
->            : ^^^^^^^^^^^
-><h1></h1> : JSX.Element
->          : ^^^^^^^^^^^
->h1 : any
->   : ^^^
->h1 : any
->   : ^^^
-
diff --git a/tests/baselines/reference/tsxSfcReturnNull.errors.txt b/tests/baselines/reference/tsxSfcReturnNull.errors.txt
index 028a9f04c0c5a..ae911c6de8eab 100644
--- a/tests/baselines/reference/tsxSfcReturnNull.errors.txt
+++ b/tests/baselines/reference/tsxSfcReturnNull.errors.txt
@@ -3,6 +3,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file.tsx (0 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     const Foo = (props: any) => null;
diff --git a/tests/baselines/reference/tsxSfcReturnNull.js b/tests/baselines/reference/tsxSfcReturnNull.js
index 32730a958a2ec..843acb41675ca 100644
--- a/tests/baselines/reference/tsxSfcReturnNull.js
+++ b/tests/baselines/reference/tsxSfcReturnNull.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSfcReturnNull.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 const Foo = (props: any) => null;
@@ -13,6 +15,7 @@ const foo = <Foo />;
 const G = <Greet />;
 
 //// [file.jsx]
+/// <reference path="/.lib/react.d.ts" />
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/tsxSfcReturnNull.symbols b/tests/baselines/reference/tsxSfcReturnNull.symbols
index 81906e68281d8..67872d09dcad9 100644
--- a/tests/baselines/reference/tsxSfcReturnNull.symbols
+++ b/tests/baselines/reference/tsxSfcReturnNull.symbols
@@ -1,26 +1,28 @@
 //// [tests/cases/conformance/jsx/tsxSfcReturnNull.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 const Foo = (props: any) => null;
->Foo : Symbol(Foo, Decl(file.tsx, 2, 5))
->props : Symbol(props, Decl(file.tsx, 2, 13))
+>Foo : Symbol(Foo, Decl(file.tsx, 4, 5))
+>props : Symbol(props, Decl(file.tsx, 4, 13))
 
 function Greet(x: {name?: string}) {
->Greet : Symbol(Greet, Decl(file.tsx, 2, 33))
->x : Symbol(x, Decl(file.tsx, 4, 15))
->name : Symbol(name, Decl(file.tsx, 4, 19))
+>Greet : Symbol(Greet, Decl(file.tsx, 4, 33))
+>x : Symbol(x, Decl(file.tsx, 6, 15))
+>name : Symbol(name, Decl(file.tsx, 6, 19))
 
 	return null;
 }
 
 const foo = <Foo />;
->foo : Symbol(foo, Decl(file.tsx, 8, 5))
->Foo : Symbol(Foo, Decl(file.tsx, 2, 5))
+>foo : Symbol(foo, Decl(file.tsx, 10, 5))
+>Foo : Symbol(Foo, Decl(file.tsx, 4, 5))
 
 const G = <Greet />;
->G : Symbol(G, Decl(file.tsx, 9, 5))
->Greet : Symbol(Greet, Decl(file.tsx, 2, 33))
+>G : Symbol(G, Decl(file.tsx, 11, 5))
+>Greet : Symbol(Greet, Decl(file.tsx, 4, 33))
 
diff --git a/tests/baselines/reference/tsxSfcReturnNull.types b/tests/baselines/reference/tsxSfcReturnNull.types
index d5019a32d4f2e..70ae79118b4f7 100644
--- a/tests/baselines/reference/tsxSfcReturnNull.types
+++ b/tests/baselines/reference/tsxSfcReturnNull.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSfcReturnNull.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.errors.txt b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.errors.txt
index 028a9f04c0c5a..ae911c6de8eab 100644
--- a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.errors.txt
+++ b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.errors.txt
@@ -3,6 +3,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file.tsx (0 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     const Foo = (props: any) => null;
diff --git a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.js b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.js
index 0d7c1a06e66f3..b6adb3fc9ed3e 100644
--- a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.js
+++ b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSfcReturnNullStrictNullChecks.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 const Foo = (props: any) => null;
@@ -13,6 +15,7 @@ const foo = <Foo />;
 const G = <Greet />;
 
 //// [file.jsx]
+/// <reference path="/.lib/react.d.ts" />
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.symbols b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.symbols
index 1f9852f77d64b..824e15c88a8ac 100644
--- a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.symbols
+++ b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.symbols
@@ -1,26 +1,28 @@
 //// [tests/cases/conformance/jsx/tsxSfcReturnNullStrictNullChecks.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 const Foo = (props: any) => null;
->Foo : Symbol(Foo, Decl(file.tsx, 2, 5))
->props : Symbol(props, Decl(file.tsx, 2, 13))
+>Foo : Symbol(Foo, Decl(file.tsx, 4, 5))
+>props : Symbol(props, Decl(file.tsx, 4, 13))
 
 function Greet(x: {name?: string}) {
->Greet : Symbol(Greet, Decl(file.tsx, 2, 33))
->x : Symbol(x, Decl(file.tsx, 4, 15))
->name : Symbol(name, Decl(file.tsx, 4, 19))
+>Greet : Symbol(Greet, Decl(file.tsx, 4, 33))
+>x : Symbol(x, Decl(file.tsx, 6, 15))
+>name : Symbol(name, Decl(file.tsx, 6, 19))
 
 	return null;
 }
 
 const foo = <Foo />;
->foo : Symbol(foo, Decl(file.tsx, 8, 5))
->Foo : Symbol(Foo, Decl(file.tsx, 2, 5))
+>foo : Symbol(foo, Decl(file.tsx, 10, 5))
+>Foo : Symbol(Foo, Decl(file.tsx, 4, 5))
 
 const G = <Greet />;
->G : Symbol(G, Decl(file.tsx, 9, 5))
->Greet : Symbol(Greet, Decl(file.tsx, 2, 33))
+>G : Symbol(G, Decl(file.tsx, 11, 5))
+>Greet : Symbol(Greet, Decl(file.tsx, 4, 33))
 
diff --git a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.types b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.types
index 810d031011a76..91bf14d3898b8 100644
--- a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.types
+++ b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSfcReturnNullStrictNullChecks.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.errors.txt b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.errors.txt
index 5826a14fcd667..1730c72a885a5 100644
--- a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.errors.txt
+++ b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.errors.txt
@@ -1,10 +1,12 @@
-file.tsx(9,14): error TS2786: 'Foo' cannot be used as a JSX component.
+file.tsx(11,14): error TS2786: 'Foo' cannot be used as a JSX component.
   Its return type 'undefined' is not a valid JSX element.
-file.tsx(10,12): error TS2786: 'Greet' cannot be used as a JSX component.
+file.tsx(12,12): error TS2786: 'Greet' cannot be used as a JSX component.
   Its return type 'undefined' is not a valid JSX element.
 
 
 ==== file.tsx (2 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     const Foo = (props: any) => undefined;
diff --git a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js
index 575c0bc7229e3..978cda214500d 100644
--- a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js
+++ b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 const Foo = (props: any) => undefined;
@@ -14,6 +16,7 @@ const G = <Greet />;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 var Foo = function (props) { return undefined; };
diff --git a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.symbols b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.symbols
index 91d7762217104..f77e020703359 100644
--- a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.symbols
+++ b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.symbols
@@ -1,18 +1,20 @@
 //// [tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 const Foo = (props: any) => undefined;
->Foo : Symbol(Foo, Decl(file.tsx, 2, 5))
->props : Symbol(props, Decl(file.tsx, 2, 13))
+>Foo : Symbol(Foo, Decl(file.tsx, 4, 5))
+>props : Symbol(props, Decl(file.tsx, 4, 13))
 >undefined : Symbol(undefined)
 
 function Greet(x: {name?: string}) {
->Greet : Symbol(Greet, Decl(file.tsx, 2, 38))
->x : Symbol(x, Decl(file.tsx, 3, 15))
->name : Symbol(name, Decl(file.tsx, 3, 19))
+>Greet : Symbol(Greet, Decl(file.tsx, 4, 38))
+>x : Symbol(x, Decl(file.tsx, 5, 15))
+>name : Symbol(name, Decl(file.tsx, 5, 19))
 
 	return undefined;
 >undefined : Symbol(undefined)
@@ -20,10 +22,10 @@ function Greet(x: {name?: string}) {
 
 // Error
 const foo = <Foo />;
->foo : Symbol(foo, Decl(file.tsx, 8, 5))
->Foo : Symbol(Foo, Decl(file.tsx, 2, 5))
+>foo : Symbol(foo, Decl(file.tsx, 10, 5))
+>Foo : Symbol(Foo, Decl(file.tsx, 4, 5))
 
 const G = <Greet />;
->G : Symbol(G, Decl(file.tsx, 9, 5))
->Greet : Symbol(Greet, Decl(file.tsx, 2, 38))
+>G : Symbol(G, Decl(file.tsx, 11, 5))
+>Greet : Symbol(Greet, Decl(file.tsx, 4, 38))
 
diff --git a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.types b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.types
index 1775cb845457b..e4a8da3a3a2c3 100644
--- a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.types
+++ b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution1.js b/tests/baselines/reference/tsxSpreadAttributesResolution1.js
index f623ffbb380f9..b6bce1c6bd262 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution1.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution1.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution1.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 class Poisoned extends React.Component<{}, {}> {
@@ -18,6 +20,7 @@ let y = <Poisoned />;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution1.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution1.symbols
index d216d3de00746..33ac26b83975f 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution1.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution1.symbols
@@ -1,17 +1,19 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 class Poisoned extends React.Component<{}, {}> {
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 0, 32))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 2, 32))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 
     render() {
->render : Symbol(Poisoned.render, Decl(file.tsx, 2, 48))
+>render : Symbol(Poisoned.render, Decl(file.tsx, 4, 48))
 
         return <div>Hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -20,15 +22,15 @@ class Poisoned extends React.Component<{}, {}> {
 }
 
 const obj = {};
->obj : Symbol(obj, Decl(file.tsx, 8, 5))
+>obj : Symbol(obj, Decl(file.tsx, 10, 5))
 
 // OK
 let p = <Poisoned {...obj} />;
->p : Symbol(p, Decl(file.tsx, 11, 3))
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 0, 32))
->obj : Symbol(obj, Decl(file.tsx, 8, 5))
+>p : Symbol(p, Decl(file.tsx, 13, 3))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 2, 32))
+>obj : Symbol(obj, Decl(file.tsx, 10, 5))
 
 let y = <Poisoned />;
->y : Symbol(y, Decl(file.tsx, 12, 3))
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 0, 32))
+>y : Symbol(y, Decl(file.tsx, 14, 3))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 2, 32))
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution1.types b/tests/baselines/reference/tsxSpreadAttributesResolution1.types
index 9e8b1f677acc9..c7cc40821e0a3 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution1.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution1.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution10.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution10.errors.txt
index c6bf7020ab844..2068dfacf2c04 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution10.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution10.errors.txt
@@ -1,10 +1,12 @@
-file.tsx(19,23): error TS2322: Type '3' is not assignable to type '2'.
-file.tsx(20,25): error TS2322: Type 'string' is not assignable to type '2'.
-file.tsx(21,25): error TS2322: Type '3' is not assignable to type '2'.
-file.tsx(22,15): error TS2322: Type 'true' is not assignable to type '2'.
+file.tsx(21,23): error TS2322: Type '3' is not assignable to type '2'.
+file.tsx(22,25): error TS2322: Type 'string' is not assignable to type '2'.
+file.tsx(23,25): error TS2322: Type '3' is not assignable to type '2'.
+file.tsx(24,15): error TS2322: Type 'true' is not assignable to type '2'.
 
 
 ==== file.tsx (4 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface OptionProp {
@@ -26,17 +28,17 @@ file.tsx(22,15): error TS2322: Type 'true' is not assignable to type '2'.
     let y = <Opt {...obj} x={3}/>;
                           ~
 !!! error TS2322: Type '3' is not assignable to type '2'.
-!!! related TS6500 file.tsx:4:5: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Opt> & OptionProp & { children?: ReactNode; }'
+!!! related TS6500 file.tsx:6:5: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Opt> & OptionProp & { children?: ReactNode; }'
     let y1 = <Opt {...obj1} x="Hi"/>;
                             ~
 !!! error TS2322: Type 'string' is not assignable to type '2'.
-!!! related TS6500 file.tsx:4:5: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Opt> & OptionProp & { children?: ReactNode; }'
+!!! related TS6500 file.tsx:6:5: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Opt> & OptionProp & { children?: ReactNode; }'
     let y2 = <Opt {...obj1} x={3}/>;
                             ~
 !!! error TS2322: Type '3' is not assignable to type '2'.
-!!! related TS6500 file.tsx:4:5: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Opt> & OptionProp & { children?: ReactNode; }'
+!!! related TS6500 file.tsx:6:5: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Opt> & OptionProp & { children?: ReactNode; }'
     let y3 = <Opt x />;
                   ~
 !!! error TS2322: Type 'true' is not assignable to type '2'.
-!!! related TS6500 file.tsx:4:5: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Opt> & OptionProp & { children?: ReactNode; }'
+!!! related TS6500 file.tsx:6:5: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Opt> & OptionProp & { children?: ReactNode; }'
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution10.js b/tests/baselines/reference/tsxSpreadAttributesResolution10.js
index 4a2d54524c214..aa01852476b13 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution10.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution10.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution10.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface OptionProp {
@@ -27,6 +29,7 @@ let y3 = <Opt x />;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution10.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution10.symbols
index b7a4f465da2ef..4bb191f1ffad5 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution10.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution10.symbols
@@ -1,25 +1,27 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution10.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface OptionProp {
->OptionProp : Symbol(OptionProp, Decl(file.tsx, 0, 32))
+>OptionProp : Symbol(OptionProp, Decl(file.tsx, 2, 32))
 
     x?: 2
->x : Symbol(OptionProp.x, Decl(file.tsx, 2, 22))
+>x : Symbol(OptionProp.x, Decl(file.tsx, 4, 22))
 }
 
 class Opt extends React.Component<OptionProp, {}> {
->Opt : Symbol(Opt, Decl(file.tsx, 4, 1))
+>Opt : Symbol(Opt, Decl(file.tsx, 6, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->OptionProp : Symbol(OptionProp, Decl(file.tsx, 0, 32))
+>OptionProp : Symbol(OptionProp, Decl(file.tsx, 2, 32))
 
     render() {
->render : Symbol(Opt.render, Decl(file.tsx, 6, 51))
+>render : Symbol(Opt.render, Decl(file.tsx, 8, 51))
 
         return <div>Hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -28,38 +30,38 @@ class Opt extends React.Component<OptionProp, {}> {
 }
 
 const obj: OptionProp = {};
->obj : Symbol(obj, Decl(file.tsx, 12, 5))
->OptionProp : Symbol(OptionProp, Decl(file.tsx, 0, 32))
+>obj : Symbol(obj, Decl(file.tsx, 14, 5))
+>OptionProp : Symbol(OptionProp, Decl(file.tsx, 2, 32))
 
 const obj1: OptionProp = {
->obj1 : Symbol(obj1, Decl(file.tsx, 13, 5))
->OptionProp : Symbol(OptionProp, Decl(file.tsx, 0, 32))
+>obj1 : Symbol(obj1, Decl(file.tsx, 15, 5))
+>OptionProp : Symbol(OptionProp, Decl(file.tsx, 2, 32))
 
     x: 2
->x : Symbol(x, Decl(file.tsx, 13, 26))
+>x : Symbol(x, Decl(file.tsx, 15, 26))
 }
 
 // Error
 let y = <Opt {...obj} x={3}/>;
->y : Symbol(y, Decl(file.tsx, 18, 3))
->Opt : Symbol(Opt, Decl(file.tsx, 4, 1))
->obj : Symbol(obj, Decl(file.tsx, 12, 5))
->x : Symbol(x, Decl(file.tsx, 18, 21))
+>y : Symbol(y, Decl(file.tsx, 20, 3))
+>Opt : Symbol(Opt, Decl(file.tsx, 6, 1))
+>obj : Symbol(obj, Decl(file.tsx, 14, 5))
+>x : Symbol(x, Decl(file.tsx, 20, 21))
 
 let y1 = <Opt {...obj1} x="Hi"/>;
->y1 : Symbol(y1, Decl(file.tsx, 19, 3))
->Opt : Symbol(Opt, Decl(file.tsx, 4, 1))
->obj1 : Symbol(obj1, Decl(file.tsx, 13, 5))
->x : Symbol(x, Decl(file.tsx, 19, 23))
+>y1 : Symbol(y1, Decl(file.tsx, 21, 3))
+>Opt : Symbol(Opt, Decl(file.tsx, 6, 1))
+>obj1 : Symbol(obj1, Decl(file.tsx, 15, 5))
+>x : Symbol(x, Decl(file.tsx, 21, 23))
 
 let y2 = <Opt {...obj1} x={3}/>;
->y2 : Symbol(y2, Decl(file.tsx, 20, 3))
->Opt : Symbol(Opt, Decl(file.tsx, 4, 1))
->obj1 : Symbol(obj1, Decl(file.tsx, 13, 5))
->x : Symbol(x, Decl(file.tsx, 20, 23))
+>y2 : Symbol(y2, Decl(file.tsx, 22, 3))
+>Opt : Symbol(Opt, Decl(file.tsx, 6, 1))
+>obj1 : Symbol(obj1, Decl(file.tsx, 15, 5))
+>x : Symbol(x, Decl(file.tsx, 22, 23))
 
 let y3 = <Opt x />;
->y3 : Symbol(y3, Decl(file.tsx, 21, 3))
->Opt : Symbol(Opt, Decl(file.tsx, 4, 1))
->x : Symbol(x, Decl(file.tsx, 21, 13))
+>y3 : Symbol(y3, Decl(file.tsx, 23, 3))
+>Opt : Symbol(Opt, Decl(file.tsx, 6, 1))
+>x : Symbol(x, Decl(file.tsx, 23, 13))
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution10.types b/tests/baselines/reference/tsxSpreadAttributesResolution10.types
index 63b45232ee158..728dd147d3d14 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution10.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution10.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution10.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution11.js b/tests/baselines/reference/tsxSpreadAttributesResolution11.js
index 917a5124b344d..7331b0128fa12 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution11.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution11.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution11.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 const obj = {};
@@ -35,6 +37,7 @@ let x5 = <OverWriteAttr {...anyobj} />
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution11.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution11.symbols
index b63cf8ff25225..5d32f6797bcb9 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution11.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution11.symbols
@@ -1,53 +1,55 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution11.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 const obj = {};
->obj : Symbol(obj, Decl(file.tsx, 2, 5))
+>obj : Symbol(obj, Decl(file.tsx, 4, 5))
 
 const obj1: { x: 2 } = {
->obj1 : Symbol(obj1, Decl(file.tsx, 3, 5))
->x : Symbol(x, Decl(file.tsx, 3, 13))
+>obj1 : Symbol(obj1, Decl(file.tsx, 5, 5))
+>x : Symbol(x, Decl(file.tsx, 5, 13))
 
     x: 2
->x : Symbol(x, Decl(file.tsx, 3, 24))
+>x : Symbol(x, Decl(file.tsx, 5, 24))
 }
 const obj3: {y: true, overwrite: string } = {
->obj3 : Symbol(obj3, Decl(file.tsx, 6, 5))
->y : Symbol(y, Decl(file.tsx, 6, 13))
->overwrite : Symbol(overwrite, Decl(file.tsx, 6, 21))
+>obj3 : Symbol(obj3, Decl(file.tsx, 8, 5))
+>y : Symbol(y, Decl(file.tsx, 8, 13))
+>overwrite : Symbol(overwrite, Decl(file.tsx, 8, 21))
 
     y: true,
->y : Symbol(y, Decl(file.tsx, 6, 45))
+>y : Symbol(y, Decl(file.tsx, 8, 45))
 
     overwrite: "hi"
->overwrite : Symbol(overwrite, Decl(file.tsx, 7, 12))
+>overwrite : Symbol(overwrite, Decl(file.tsx, 9, 12))
 }
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 9, 1))
+>Prop : Symbol(Prop, Decl(file.tsx, 11, 1))
 
     x: 2
->x : Symbol(Prop.x, Decl(file.tsx, 11, 16))
+>x : Symbol(Prop.x, Decl(file.tsx, 13, 16))
 
     y: true
->y : Symbol(Prop.y, Decl(file.tsx, 12, 8))
+>y : Symbol(Prop.y, Decl(file.tsx, 14, 8))
 
     overwrite: string
->overwrite : Symbol(Prop.overwrite, Decl(file.tsx, 13, 11))
+>overwrite : Symbol(Prop.overwrite, Decl(file.tsx, 15, 11))
 }
 
 class OverWriteAttr extends React.Component<Prop, {}> {
->OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 15, 1))
+>OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 17, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->Prop : Symbol(Prop, Decl(file.tsx, 9, 1))
+>Prop : Symbol(Prop, Decl(file.tsx, 11, 1))
 
     render() {
->render : Symbol(OverWriteAttr.render, Decl(file.tsx, 17, 55))
+>render : Symbol(OverWriteAttr.render, Decl(file.tsx, 19, 55))
 
         return <div>Hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -56,50 +58,50 @@ class OverWriteAttr extends React.Component<Prop, {}> {
 }
 
 let anyobj: any;
->anyobj : Symbol(anyobj, Decl(file.tsx, 23, 3))
+>anyobj : Symbol(anyobj, Decl(file.tsx, 25, 3))
 
 // OK
 let x = <OverWriteAttr {...obj} y overwrite="hi" {...obj1} />
->x : Symbol(x, Decl(file.tsx, 25, 3))
->OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 15, 1))
->obj : Symbol(obj, Decl(file.tsx, 2, 5))
->y : Symbol(y, Decl(file.tsx, 25, 31))
->overwrite : Symbol(overwrite, Decl(file.tsx, 25, 33))
->obj1 : Symbol(obj1, Decl(file.tsx, 3, 5))
+>x : Symbol(x, Decl(file.tsx, 27, 3))
+>OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 17, 1))
+>obj : Symbol(obj, Decl(file.tsx, 4, 5))
+>y : Symbol(y, Decl(file.tsx, 27, 31))
+>overwrite : Symbol(overwrite, Decl(file.tsx, 27, 33))
+>obj1 : Symbol(obj1, Decl(file.tsx, 5, 5))
 
 let x1 = <OverWriteAttr {...obj1} {...obj3} />
->x1 : Symbol(x1, Decl(file.tsx, 26, 3))
->OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 15, 1))
->obj1 : Symbol(obj1, Decl(file.tsx, 3, 5))
->obj3 : Symbol(obj3, Decl(file.tsx, 6, 5))
+>x1 : Symbol(x1, Decl(file.tsx, 28, 3))
+>OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 17, 1))
+>obj1 : Symbol(obj1, Decl(file.tsx, 5, 5))
+>obj3 : Symbol(obj3, Decl(file.tsx, 8, 5))
 
 let x2 = <OverWriteAttr x={3} overwrite="hi" {...obj1} {...{y: true}} />
->x2 : Symbol(x2, Decl(file.tsx, 27, 3))
->OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 15, 1))
->x : Symbol(x, Decl(file.tsx, 27, 23))
->overwrite : Symbol(overwrite, Decl(file.tsx, 27, 29))
->obj1 : Symbol(obj1, Decl(file.tsx, 3, 5))
->y : Symbol(y, Decl(file.tsx, 27, 60))
+>x2 : Symbol(x2, Decl(file.tsx, 29, 3))
+>OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 17, 1))
+>x : Symbol(x, Decl(file.tsx, 29, 23))
+>overwrite : Symbol(overwrite, Decl(file.tsx, 29, 29))
+>obj1 : Symbol(obj1, Decl(file.tsx, 5, 5))
+>y : Symbol(y, Decl(file.tsx, 29, 60))
 
 let x3 = <OverWriteAttr overwrite="hi" {...obj1} x={3} {...{y: true, x: 2, overwrite:"world"}} />
->x3 : Symbol(x3, Decl(file.tsx, 28, 3))
->OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 15, 1))
->overwrite : Symbol(overwrite, Decl(file.tsx, 28, 23))
->obj1 : Symbol(obj1, Decl(file.tsx, 3, 5))
->x : Symbol(x, Decl(file.tsx, 28, 48))
->y : Symbol(y, Decl(file.tsx, 28, 60))
->x : Symbol(x, Decl(file.tsx, 28, 68))
->overwrite : Symbol(overwrite, Decl(file.tsx, 28, 74))
+>x3 : Symbol(x3, Decl(file.tsx, 30, 3))
+>OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 17, 1))
+>overwrite : Symbol(overwrite, Decl(file.tsx, 30, 23))
+>obj1 : Symbol(obj1, Decl(file.tsx, 5, 5))
+>x : Symbol(x, Decl(file.tsx, 30, 48))
+>y : Symbol(y, Decl(file.tsx, 30, 60))
+>x : Symbol(x, Decl(file.tsx, 30, 68))
+>overwrite : Symbol(overwrite, Decl(file.tsx, 30, 74))
 
 let x4 = <OverWriteAttr {...{x: 2}} {...{overwrite: "world"}} {...{y: true}} />
->x4 : Symbol(x4, Decl(file.tsx, 29, 3))
->OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 15, 1))
->x : Symbol(x, Decl(file.tsx, 29, 29))
->overwrite : Symbol(overwrite, Decl(file.tsx, 29, 41))
->y : Symbol(y, Decl(file.tsx, 29, 67))
+>x4 : Symbol(x4, Decl(file.tsx, 31, 3))
+>OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 17, 1))
+>x : Symbol(x, Decl(file.tsx, 31, 29))
+>overwrite : Symbol(overwrite, Decl(file.tsx, 31, 41))
+>y : Symbol(y, Decl(file.tsx, 31, 67))
 
 let x5 = <OverWriteAttr {...anyobj} />
->x5 : Symbol(x5, Decl(file.tsx, 30, 3))
->OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 15, 1))
->anyobj : Symbol(anyobj, Decl(file.tsx, 23, 3))
+>x5 : Symbol(x5, Decl(file.tsx, 32, 3))
+>OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 17, 1))
+>anyobj : Symbol(anyobj, Decl(file.tsx, 25, 3))
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution11.types b/tests/baselines/reference/tsxSpreadAttributesResolution11.types
index 45f80b3765f92..5388518e211c0 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution11.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution11.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution11.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution12.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution12.errors.txt
index 1b31811de1f07..a5bbf5f1bb096 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution12.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution12.errors.txt
@@ -1,11 +1,13 @@
-file.tsx(27,33): error TS2322: Type 'true' is not assignable to type 'false'.
-file.tsx(28,50): error TS2322: Type '3' is not assignable to type '2'.
-file.tsx(30,11): error TS2322: Type '{ y: true; x: 2; overwrite: string; }' is not assignable to type 'Prop'.
+file.tsx(29,33): error TS2322: Type 'true' is not assignable to type 'false'.
+file.tsx(30,50): error TS2322: Type '3' is not assignable to type '2'.
+file.tsx(32,11): error TS2322: Type '{ y: true; x: 2; overwrite: string; }' is not assignable to type 'Prop'.
   Types of property 'y' are incompatible.
     Type 'true' is not assignable to type 'false'.
 
 
 ==== file.tsx (3 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     const obj = {};
@@ -35,11 +37,11 @@ file.tsx(30,11): error TS2322: Type '{ y: true; x: 2; overwrite: string; }' is n
     let x = <OverWriteAttr {...obj} y overwrite="hi" {...obj1} />
                                     ~
 !!! error TS2322: Type 'true' is not assignable to type 'false'.
-!!! related TS6500 file.tsx:14:5: The expected type comes from property 'y' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<OverWriteAttr> & Prop & { children?: ReactNode; }'
+!!! related TS6500 file.tsx:16:5: The expected type comes from property 'y' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<OverWriteAttr> & Prop & { children?: ReactNode; }'
     let x1 = <OverWriteAttr overwrite="hi" {...obj1} x={3} {...{y: true}} />
                                                      ~
 !!! error TS2322: Type '3' is not assignable to type '2'.
-!!! related TS6500 file.tsx:13:5: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<OverWriteAttr> & Prop & { children?: ReactNode; }'
+!!! related TS6500 file.tsx:15:5: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<OverWriteAttr> & Prop & { children?: ReactNode; }'
     let x2 = <OverWriteAttr {...anyobj} x={3} />
     let x3 = <OverWriteAttr overwrite="hi" {...obj1} {...{y: true}} />
               ~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution12.js b/tests/baselines/reference/tsxSpreadAttributesResolution12.js
index ea09198ca28e2..ae939a4008dd0 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution12.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution12.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution12.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 const obj = {};
@@ -36,6 +38,7 @@ let x3 = <OverWriteAttr overwrite="hi" {...obj1} {...{y: true}} />
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution12.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution12.symbols
index db84f351e907d..62da45ead4754 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution12.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution12.symbols
@@ -1,53 +1,55 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution12.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 const obj = {};
->obj : Symbol(obj, Decl(file.tsx, 2, 5))
+>obj : Symbol(obj, Decl(file.tsx, 4, 5))
 
 const obj1: {x: 2} = {
->obj1 : Symbol(obj1, Decl(file.tsx, 3, 5))
->x : Symbol(x, Decl(file.tsx, 3, 13))
+>obj1 : Symbol(obj1, Decl(file.tsx, 5, 5))
+>x : Symbol(x, Decl(file.tsx, 5, 13))
 
     x: 2
->x : Symbol(x, Decl(file.tsx, 3, 22))
+>x : Symbol(x, Decl(file.tsx, 5, 22))
 }
 const obj3: {y: false, overwrite: string} = {
->obj3 : Symbol(obj3, Decl(file.tsx, 6, 5))
->y : Symbol(y, Decl(file.tsx, 6, 13))
->overwrite : Symbol(overwrite, Decl(file.tsx, 6, 22))
+>obj3 : Symbol(obj3, Decl(file.tsx, 8, 5))
+>y : Symbol(y, Decl(file.tsx, 8, 13))
+>overwrite : Symbol(overwrite, Decl(file.tsx, 8, 22))
 
     y: false,
->y : Symbol(y, Decl(file.tsx, 6, 45))
+>y : Symbol(y, Decl(file.tsx, 8, 45))
 
     overwrite: "hi"
->overwrite : Symbol(overwrite, Decl(file.tsx, 7, 13))
+>overwrite : Symbol(overwrite, Decl(file.tsx, 9, 13))
 }
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 9, 1))
+>Prop : Symbol(Prop, Decl(file.tsx, 11, 1))
 
     x: 2
->x : Symbol(Prop.x, Decl(file.tsx, 11, 16))
+>x : Symbol(Prop.x, Decl(file.tsx, 13, 16))
 
     y: false
->y : Symbol(Prop.y, Decl(file.tsx, 12, 8))
+>y : Symbol(Prop.y, Decl(file.tsx, 14, 8))
 
     overwrite: string
->overwrite : Symbol(Prop.overwrite, Decl(file.tsx, 13, 12))
+>overwrite : Symbol(Prop.overwrite, Decl(file.tsx, 15, 12))
 }
 
 class OverWriteAttr extends React.Component<Prop, {}> {
->OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 15, 1))
+>OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 17, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->Prop : Symbol(Prop, Decl(file.tsx, 9, 1))
+>Prop : Symbol(Prop, Decl(file.tsx, 11, 1))
 
     render() {
->render : Symbol(OverWriteAttr.render, Decl(file.tsx, 17, 55))
+>render : Symbol(OverWriteAttr.render, Decl(file.tsx, 19, 55))
 
         return <div>Hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -56,36 +58,36 @@ class OverWriteAttr extends React.Component<Prop, {}> {
 }
 
 let anyobj: any;
->anyobj : Symbol(anyobj, Decl(file.tsx, 23, 3))
+>anyobj : Symbol(anyobj, Decl(file.tsx, 25, 3))
 
 // Error
 let x = <OverWriteAttr {...obj} y overwrite="hi" {...obj1} />
->x : Symbol(x, Decl(file.tsx, 26, 3))
->OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 15, 1))
->obj : Symbol(obj, Decl(file.tsx, 2, 5))
->y : Symbol(y, Decl(file.tsx, 26, 31))
->overwrite : Symbol(overwrite, Decl(file.tsx, 26, 33))
->obj1 : Symbol(obj1, Decl(file.tsx, 3, 5))
+>x : Symbol(x, Decl(file.tsx, 28, 3))
+>OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 17, 1))
+>obj : Symbol(obj, Decl(file.tsx, 4, 5))
+>y : Symbol(y, Decl(file.tsx, 28, 31))
+>overwrite : Symbol(overwrite, Decl(file.tsx, 28, 33))
+>obj1 : Symbol(obj1, Decl(file.tsx, 5, 5))
 
 let x1 = <OverWriteAttr overwrite="hi" {...obj1} x={3} {...{y: true}} />
->x1 : Symbol(x1, Decl(file.tsx, 27, 3))
->OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 15, 1))
->overwrite : Symbol(overwrite, Decl(file.tsx, 27, 23))
->obj1 : Symbol(obj1, Decl(file.tsx, 3, 5))
->x : Symbol(x, Decl(file.tsx, 27, 48))
->y : Symbol(y, Decl(file.tsx, 27, 60))
+>x1 : Symbol(x1, Decl(file.tsx, 29, 3))
+>OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 17, 1))
+>overwrite : Symbol(overwrite, Decl(file.tsx, 29, 23))
+>obj1 : Symbol(obj1, Decl(file.tsx, 5, 5))
+>x : Symbol(x, Decl(file.tsx, 29, 48))
+>y : Symbol(y, Decl(file.tsx, 29, 60))
 
 let x2 = <OverWriteAttr {...anyobj} x={3} />
->x2 : Symbol(x2, Decl(file.tsx, 28, 3))
->OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 15, 1))
->anyobj : Symbol(anyobj, Decl(file.tsx, 23, 3))
->x : Symbol(x, Decl(file.tsx, 28, 35))
+>x2 : Symbol(x2, Decl(file.tsx, 30, 3))
+>OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 17, 1))
+>anyobj : Symbol(anyobj, Decl(file.tsx, 25, 3))
+>x : Symbol(x, Decl(file.tsx, 30, 35))
 
 let x3 = <OverWriteAttr overwrite="hi" {...obj1} {...{y: true}} />
->x3 : Symbol(x3, Decl(file.tsx, 29, 3))
->OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 15, 1))
->overwrite : Symbol(overwrite, Decl(file.tsx, 29, 23))
->obj1 : Symbol(obj1, Decl(file.tsx, 3, 5))
->y : Symbol(y, Decl(file.tsx, 29, 54))
+>x3 : Symbol(x3, Decl(file.tsx, 31, 3))
+>OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 17, 1))
+>overwrite : Symbol(overwrite, Decl(file.tsx, 31, 23))
+>obj1 : Symbol(obj1, Decl(file.tsx, 5, 5))
+>y : Symbol(y, Decl(file.tsx, 31, 54))
 
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution12.types b/tests/baselines/reference/tsxSpreadAttributesResolution12.types
index f2417f01c7858..466efea632b06 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution12.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution12.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution12.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution13.js b/tests/baselines/reference/tsxSpreadAttributesResolution13.js
index 07a8f36984b22..697798c096ced 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution13.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution13.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution13.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface ComponentProps {
@@ -32,6 +34,7 @@ function ChildComponent({ property1 }: AnotherComponentProps) {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Component;
 var React = require("react");
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution13.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution13.symbols
index 64162f9a82321..6953c5b9b4477 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution13.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution13.symbols
@@ -1,61 +1,63 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution13.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface ComponentProps {
->ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 0, 32))
+>ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 2, 32))
 
     property1: string;
->property1 : Symbol(ComponentProps.property1, Decl(file.tsx, 2, 26))
+>property1 : Symbol(ComponentProps.property1, Decl(file.tsx, 4, 26))
 
     property2: number;
->property2 : Symbol(ComponentProps.property2, Decl(file.tsx, 3, 22))
+>property2 : Symbol(ComponentProps.property2, Decl(file.tsx, 5, 22))
 }
 
 export default function Component(props: ComponentProps) {
->Component : Symbol(Component, Decl(file.tsx, 5, 1))
->props : Symbol(props, Decl(file.tsx, 7, 34))
->ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 0, 32))
+>Component : Symbol(Component, Decl(file.tsx, 7, 1))
+>props : Symbol(props, Decl(file.tsx, 9, 34))
+>ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 2, 32))
 
     let condition1: boolean;
->condition1 : Symbol(condition1, Decl(file.tsx, 8, 7))
+>condition1 : Symbol(condition1, Decl(file.tsx, 10, 7))
 
     if (condition1) {
->condition1 : Symbol(condition1, Decl(file.tsx, 8, 7))
+>condition1 : Symbol(condition1, Decl(file.tsx, 10, 7))
 
         return (
             <ChildComponent {...props} />
->ChildComponent : Symbol(ChildComponent, Decl(file.tsx, 21, 1))
->props : Symbol(props, Decl(file.tsx, 7, 34))
+>ChildComponent : Symbol(ChildComponent, Decl(file.tsx, 23, 1))
+>props : Symbol(props, Decl(file.tsx, 9, 34))
 
         );
     }
     else {
         return (<ChildComponent {...props} property1="NewString" />);
->ChildComponent : Symbol(ChildComponent, Decl(file.tsx, 21, 1))
->props : Symbol(props, Decl(file.tsx, 7, 34))
->property1 : Symbol(property1, Decl(file.tsx, 15, 42))
+>ChildComponent : Symbol(ChildComponent, Decl(file.tsx, 23, 1))
+>props : Symbol(props, Decl(file.tsx, 9, 34))
+>property1 : Symbol(property1, Decl(file.tsx, 17, 42))
     }
 }
 
 interface AnotherComponentProps {
->AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 17, 1))
+>AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 19, 1))
 
     property1: string;
->property1 : Symbol(AnotherComponentProps.property1, Decl(file.tsx, 19, 33))
+>property1 : Symbol(AnotherComponentProps.property1, Decl(file.tsx, 21, 33))
 }
 
 function ChildComponent({ property1 }: AnotherComponentProps) {
->ChildComponent : Symbol(ChildComponent, Decl(file.tsx, 21, 1))
->property1 : Symbol(property1, Decl(file.tsx, 23, 25))
->AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 17, 1))
+>ChildComponent : Symbol(ChildComponent, Decl(file.tsx, 23, 1))
+>property1 : Symbol(property1, Decl(file.tsx, 25, 25))
+>AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 19, 1))
 
     return (
         <span>{property1}</span>
 >span : Symbol(JSX.IntrinsicElements.span, Decl(react.d.ts, 2461, 51))
->property1 : Symbol(property1, Decl(file.tsx, 23, 25))
+>property1 : Symbol(property1, Decl(file.tsx, 25, 25))
 >span : Symbol(JSX.IntrinsicElements.span, Decl(react.d.ts, 2461, 51))
 
     );
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution13.types b/tests/baselines/reference/tsxSpreadAttributesResolution13.types
index cc4ac513ee39c..5524402d29222 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution13.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution13.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution13.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution14.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution14.errors.txt
index c6e9b0a2fdde1..2f336ca0e23af 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution14.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution14.errors.txt
@@ -1,8 +1,10 @@
-file.tsx(11,38): error TS2322: Type '{ Property1: true; property1: string; property2: number; }' is not assignable to type 'IntrinsicAttributes & AnotherComponentProps'.
+file.tsx(13,38): error TS2322: Type '{ Property1: true; property1: string; property2: number; }' is not assignable to type 'IntrinsicAttributes & AnotherComponentProps'.
   Property 'Property1' does not exist on type 'IntrinsicAttributes & AnotherComponentProps'. Did you mean 'property1'?
 
 
 ==== file.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface ComponentProps {
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution14.js b/tests/baselines/reference/tsxSpreadAttributesResolution14.js
index 5e6b7a2fb3ef9..74beaadb9057a 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution14.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution14.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution14.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface ComponentProps {
@@ -27,6 +29,7 @@ function AnotherComponent({ property1 }: AnotherComponentProps) {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Component;
 var React = require("react");
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution14.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution14.symbols
index 12c5ce506729f..6cd6e8eb1400b 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution14.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution14.symbols
@@ -1,50 +1,52 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution14.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface ComponentProps {
->ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 0, 32))
+>ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 2, 32))
 
     property1: string;
->property1 : Symbol(ComponentProps.property1, Decl(file.tsx, 2, 26))
+>property1 : Symbol(ComponentProps.property1, Decl(file.tsx, 4, 26))
 
     property2: number;
->property2 : Symbol(ComponentProps.property2, Decl(file.tsx, 3, 22))
+>property2 : Symbol(ComponentProps.property2, Decl(file.tsx, 5, 22))
 }
 
 export default function Component(props: ComponentProps) {
->Component : Symbol(Component, Decl(file.tsx, 5, 1))
->props : Symbol(props, Decl(file.tsx, 7, 34))
->ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 0, 32))
+>Component : Symbol(Component, Decl(file.tsx, 7, 1))
+>props : Symbol(props, Decl(file.tsx, 9, 34))
+>ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 2, 32))
 
     return (
         // Error extra property
         <AnotherComponent {...props} Property1/>
->AnotherComponent : Symbol(AnotherComponent, Decl(file.tsx, 16, 1))
->props : Symbol(props, Decl(file.tsx, 7, 34))
->Property1 : Symbol(Property1, Decl(file.tsx, 10, 36))
+>AnotherComponent : Symbol(AnotherComponent, Decl(file.tsx, 18, 1))
+>props : Symbol(props, Decl(file.tsx, 9, 34))
+>Property1 : Symbol(Property1, Decl(file.tsx, 12, 36))
 
     );
 }
 
 interface AnotherComponentProps {
->AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 12, 1))
+>AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 14, 1))
 
     property1: string;
->property1 : Symbol(AnotherComponentProps.property1, Decl(file.tsx, 14, 33))
+>property1 : Symbol(AnotherComponentProps.property1, Decl(file.tsx, 16, 33))
 }
 
 function AnotherComponent({ property1 }: AnotherComponentProps) {
->AnotherComponent : Symbol(AnotherComponent, Decl(file.tsx, 16, 1))
->property1 : Symbol(property1, Decl(file.tsx, 18, 27))
->AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 12, 1))
+>AnotherComponent : Symbol(AnotherComponent, Decl(file.tsx, 18, 1))
+>property1 : Symbol(property1, Decl(file.tsx, 20, 27))
+>AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 14, 1))
 
     return (
         <span>{property1}</span>
 >span : Symbol(JSX.IntrinsicElements.span, Decl(react.d.ts, 2461, 51))
->property1 : Symbol(property1, Decl(file.tsx, 18, 27))
+>property1 : Symbol(property1, Decl(file.tsx, 20, 27))
 >span : Symbol(JSX.IntrinsicElements.span, Decl(react.d.ts, 2461, 51))
 
     );
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution14.types b/tests/baselines/reference/tsxSpreadAttributesResolution14.types
index 85ed528a3515b..b9654259ef992 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution14.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution14.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution14.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution15.js b/tests/baselines/reference/tsxSpreadAttributesResolution15.js
index 60c81bcbf00ba..7de266b7dccd3 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution15.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution15.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution15.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface ComponentProps {
@@ -28,6 +30,7 @@ function AnotherComponent({ property1 }: AnotherComponentProps) {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Component;
 var React = require("react");
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution15.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution15.symbols
index 0de5e96677cd1..732367838446a 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution15.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution15.symbols
@@ -1,56 +1,58 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution15.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface ComponentProps {
->ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 0, 32))
+>ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 2, 32))
 
     property1: string;
->property1 : Symbol(ComponentProps.property1, Decl(file.tsx, 2, 26))
+>property1 : Symbol(ComponentProps.property1, Decl(file.tsx, 4, 26))
 
     property2: number;
->property2 : Symbol(ComponentProps.property2, Decl(file.tsx, 3, 22))
+>property2 : Symbol(ComponentProps.property2, Decl(file.tsx, 5, 22))
 }
 
 export default function Component(props: ComponentProps) {
->Component : Symbol(Component, Decl(file.tsx, 5, 1))
->props : Symbol(props, Decl(file.tsx, 7, 34))
->ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 0, 32))
+>Component : Symbol(Component, Decl(file.tsx, 7, 1))
+>props : Symbol(props, Decl(file.tsx, 9, 34))
+>ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 2, 32))
 
     return (
         <AnotherComponent {...props} property2 AnotherProperty1="hi"/>
->AnotherComponent : Symbol(AnotherComponent, Decl(file.tsx, 17, 1))
->props : Symbol(props, Decl(file.tsx, 7, 34))
->property2 : Symbol(property2, Decl(file.tsx, 9, 36))
->AnotherProperty1 : Symbol(AnotherProperty1, Decl(file.tsx, 9, 46))
+>AnotherComponent : Symbol(AnotherComponent, Decl(file.tsx, 19, 1))
+>props : Symbol(props, Decl(file.tsx, 9, 34))
+>property2 : Symbol(property2, Decl(file.tsx, 11, 36))
+>AnotherProperty1 : Symbol(AnotherProperty1, Decl(file.tsx, 11, 46))
 
     );
 }
 
 interface AnotherComponentProps {
->AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 11, 1))
+>AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 13, 1))
 
     property1: string;
->property1 : Symbol(AnotherComponentProps.property1, Decl(file.tsx, 13, 33))
+>property1 : Symbol(AnotherComponentProps.property1, Decl(file.tsx, 15, 33))
 
     AnotherProperty1: string;
->AnotherProperty1 : Symbol(AnotherComponentProps.AnotherProperty1, Decl(file.tsx, 14, 22))
+>AnotherProperty1 : Symbol(AnotherComponentProps.AnotherProperty1, Decl(file.tsx, 16, 22))
 
     property2: boolean;
->property2 : Symbol(AnotherComponentProps.property2, Decl(file.tsx, 15, 29))
+>property2 : Symbol(AnotherComponentProps.property2, Decl(file.tsx, 17, 29))
 }
 
 function AnotherComponent({ property1 }: AnotherComponentProps) {
->AnotherComponent : Symbol(AnotherComponent, Decl(file.tsx, 17, 1))
->property1 : Symbol(property1, Decl(file.tsx, 19, 27))
->AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 11, 1))
+>AnotherComponent : Symbol(AnotherComponent, Decl(file.tsx, 19, 1))
+>property1 : Symbol(property1, Decl(file.tsx, 21, 27))
+>AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 13, 1))
 
     return (
         <span>{property1}</span>
 >span : Symbol(JSX.IntrinsicElements.span, Decl(react.d.ts, 2461, 51))
->property1 : Symbol(property1, Decl(file.tsx, 19, 27))
+>property1 : Symbol(property1, Decl(file.tsx, 21, 27))
 >span : Symbol(JSX.IntrinsicElements.span, Decl(react.d.ts, 2461, 51))
 
     );
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution15.types b/tests/baselines/reference/tsxSpreadAttributesResolution15.types
index d56dc6a442a31..f3dfd1def96a7 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution15.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution15.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution15.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt
index 53f0dfe2e97ba..06dade4a3f077 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution16.errors.txt
@@ -1,7 +1,9 @@
-file.tsx(11,10): error TS2741: Property 'AnotherProperty1' is missing in type '{ property1: string; property2: number; }' but required in type 'AnotherComponentProps'.
+file.tsx(13,10): error TS2741: Property 'AnotherProperty1' is missing in type '{ property1: string; property2: number; }' but required in type 'AnotherComponentProps'.
 
 
 ==== file.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface ComponentProps {
@@ -15,7 +17,7 @@ file.tsx(11,10): error TS2741: Property 'AnotherProperty1' is missing in type '{
             <AnotherComponent {...props} />
              ~~~~~~~~~~~~~~~~
 !!! error TS2741: Property 'AnotherProperty1' is missing in type '{ property1: string; property2: number; }' but required in type 'AnotherComponentProps'.
-!!! related TS2728 file.tsx:17:5: 'AnotherProperty1' is declared here.
+!!! related TS2728 file.tsx:19:5: 'AnotherProperty1' is declared here.
         );
     }
     
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution16.js b/tests/baselines/reference/tsxSpreadAttributesResolution16.js
index e0f180c9ae2fc..17600872fc5ef 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution16.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution16.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution16.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface ComponentProps {
@@ -29,6 +31,7 @@ function AnotherComponent({ property1 }: AnotherComponentProps) {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Component;
 var React = require("react");
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution16.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution16.symbols
index 90ac07a8a7815..a059ae4292789 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution16.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution16.symbols
@@ -1,55 +1,57 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution16.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface ComponentProps {
->ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 0, 32))
+>ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 2, 32))
 
     property1: string;
->property1 : Symbol(ComponentProps.property1, Decl(file.tsx, 2, 26))
+>property1 : Symbol(ComponentProps.property1, Decl(file.tsx, 4, 26))
 
     property2: number;
->property2 : Symbol(ComponentProps.property2, Decl(file.tsx, 3, 22))
+>property2 : Symbol(ComponentProps.property2, Decl(file.tsx, 5, 22))
 }
 
 export default function Component(props: ComponentProps) {
->Component : Symbol(Component, Decl(file.tsx, 5, 1))
->props : Symbol(props, Decl(file.tsx, 7, 34))
->ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 0, 32))
+>Component : Symbol(Component, Decl(file.tsx, 7, 1))
+>props : Symbol(props, Decl(file.tsx, 9, 34))
+>ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 2, 32))
 
     return (
         // Error: missing property
         <AnotherComponent {...props} />
->AnotherComponent : Symbol(AnotherComponent, Decl(file.tsx, 18, 1))
->props : Symbol(props, Decl(file.tsx, 7, 34))
+>AnotherComponent : Symbol(AnotherComponent, Decl(file.tsx, 20, 1))
+>props : Symbol(props, Decl(file.tsx, 9, 34))
 
     );
 }
 
 interface AnotherComponentProps {
->AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 12, 1))
+>AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 14, 1))
 
     property1: string;
->property1 : Symbol(AnotherComponentProps.property1, Decl(file.tsx, 14, 33))
+>property1 : Symbol(AnotherComponentProps.property1, Decl(file.tsx, 16, 33))
 
     AnotherProperty1: string;
->AnotherProperty1 : Symbol(AnotherComponentProps.AnotherProperty1, Decl(file.tsx, 15, 22))
+>AnotherProperty1 : Symbol(AnotherComponentProps.AnotherProperty1, Decl(file.tsx, 17, 22))
 
     property2: boolean;
->property2 : Symbol(AnotherComponentProps.property2, Decl(file.tsx, 16, 29))
+>property2 : Symbol(AnotherComponentProps.property2, Decl(file.tsx, 18, 29))
 }
 
 function AnotherComponent({ property1 }: AnotherComponentProps) {
->AnotherComponent : Symbol(AnotherComponent, Decl(file.tsx, 18, 1))
->property1 : Symbol(property1, Decl(file.tsx, 20, 27))
->AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 12, 1))
+>AnotherComponent : Symbol(AnotherComponent, Decl(file.tsx, 20, 1))
+>property1 : Symbol(property1, Decl(file.tsx, 22, 27))
+>AnotherComponentProps : Symbol(AnotherComponentProps, Decl(file.tsx, 14, 1))
 
     return (
         <span>{property1}</span>
 >span : Symbol(JSX.IntrinsicElements.span, Decl(react.d.ts, 2461, 51))
->property1 : Symbol(property1, Decl(file.tsx, 20, 27))
+>property1 : Symbol(property1, Decl(file.tsx, 22, 27))
 >span : Symbol(JSX.IntrinsicElements.span, Decl(react.d.ts, 2461, 51))
 
     );
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution16.types b/tests/baselines/reference/tsxSpreadAttributesResolution16.types
index e59d83dce5545..270e0ea57ccc2 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution16.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution16.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution16.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution2.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution2.errors.txt
index 0500334342cb3..5066c900a1f04 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution2.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution2.errors.txt
@@ -1,15 +1,17 @@
-file.tsx(20,10): error TS2739: Type '{}' is missing the following properties from type 'PoisonedProp': x, y
-file.tsx(21,10): error TS2739: Type '{}' is missing the following properties from type 'PoisonedProp': x, y
-file.tsx(22,19): error TS2322: Type 'boolean' is not assignable to type 'string'.
-file.tsx(22,21): error TS2322: Type 'true' is not assignable to type '"2"'.
-file.tsx(23,10): error TS2322: Type '{ x: number; y: "2"; }' is not assignable to type 'PoisonedProp'.
+file.tsx(22,10): error TS2739: Type '{}' is missing the following properties from type 'PoisonedProp': x, y
+file.tsx(23,10): error TS2739: Type '{}' is missing the following properties from type 'PoisonedProp': x, y
+file.tsx(24,19): error TS2322: Type 'boolean' is not assignable to type 'string'.
+file.tsx(24,21): error TS2322: Type 'true' is not assignable to type '"2"'.
+file.tsx(25,10): error TS2322: Type '{ x: number; y: "2"; }' is not assignable to type 'PoisonedProp'.
   Types of property 'x' are incompatible.
     Type 'number' is not assignable to type 'string'.
-file.tsx(24,40): error TS2322: Type '{ X: string; x: number; y: "2"; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<Poisoned> & PoisonedProp & { children?: ReactNode; }'.
+file.tsx(26,40): error TS2322: Type '{ X: string; x: number; y: "2"; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<Poisoned> & PoisonedProp & { children?: ReactNode; }'.
   Property 'X' does not exist on type 'IntrinsicAttributes & IntrinsicClassAttributes<Poisoned> & PoisonedProp & { children?: ReactNode; }'. Did you mean 'x'?
 
 
 ==== file.tsx (6 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface PoisonedProp {
@@ -38,10 +40,10 @@ file.tsx(24,40): error TS2322: Type '{ X: string; x: number; y: "2"; }' is not a
     let z = <Poisoned x y/>;
                       ~
 !!! error TS2322: Type 'boolean' is not assignable to type 'string'.
-!!! related TS6500 file.tsx:4:5: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Poisoned> & PoisonedProp & { children?: ReactNode; }'
+!!! related TS6500 file.tsx:6:5: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Poisoned> & PoisonedProp & { children?: ReactNode; }'
                         ~
 !!! error TS2322: Type 'true' is not assignable to type '"2"'.
-!!! related TS6500 file.tsx:5:5: The expected type comes from property 'y' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Poisoned> & PoisonedProp & { children?: ReactNode; }'
+!!! related TS6500 file.tsx:7:5: The expected type comes from property 'y' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Poisoned> & PoisonedProp & { children?: ReactNode; }'
     let w = <Poisoned {...{x: 5, y: "2"}}/>;
              ~~~~~~~~
 !!! error TS2322: Type '{ x: number; y: "2"; }' is not assignable to type 'PoisonedProp'.
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution2.js b/tests/baselines/reference/tsxSpreadAttributesResolution2.js
index b32d3d61be271..4bc00285b15b7 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution2.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution2.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution2.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface PoisonedProp {
@@ -28,6 +30,7 @@ let w1 = <Poisoned {...{x: 5, y: "2"}} X="hi" />;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution2.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution2.symbols
index 293500110c4ab..058cdac66b268 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution2.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution2.symbols
@@ -1,28 +1,30 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface PoisonedProp {
->PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 0, 32))
+>PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 2, 32))
 
     x: string;
->x : Symbol(PoisonedProp.x, Decl(file.tsx, 2, 24))
+>x : Symbol(PoisonedProp.x, Decl(file.tsx, 4, 24))
 
     y: "2";
->y : Symbol(PoisonedProp.y, Decl(file.tsx, 3, 14))
+>y : Symbol(PoisonedProp.y, Decl(file.tsx, 5, 14))
 }
 
 class Poisoned extends React.Component<PoisonedProp, {}> {
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 5, 1))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 7, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 0, 32))
+>PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 2, 32))
 
     render() {
->render : Symbol(Poisoned.render, Decl(file.tsx, 7, 58))
+>render : Symbol(Poisoned.render, Decl(file.tsx, 9, 58))
 
         return <div>Hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -31,40 +33,40 @@ class Poisoned extends React.Component<PoisonedProp, {}> {
 }
 
 const obj = {};
->obj : Symbol(obj, Decl(file.tsx, 13, 5))
+>obj : Symbol(obj, Decl(file.tsx, 15, 5))
 
 // OK
 <Poisoned {...{x: "ok", y: "2"}} />;
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 5, 1))
->x : Symbol(x, Decl(file.tsx, 16, 15))
->y : Symbol(y, Decl(file.tsx, 16, 23))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 7, 1))
+>x : Symbol(x, Decl(file.tsx, 18, 15))
+>y : Symbol(y, Decl(file.tsx, 18, 23))
 
 // Error
 let p = <Poisoned {...obj} />;
->p : Symbol(p, Decl(file.tsx, 19, 3))
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 5, 1))
->obj : Symbol(obj, Decl(file.tsx, 13, 5))
+>p : Symbol(p, Decl(file.tsx, 21, 3))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 7, 1))
+>obj : Symbol(obj, Decl(file.tsx, 15, 5))
 
 let y = <Poisoned />;
->y : Symbol(y, Decl(file.tsx, 20, 3))
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 5, 1))
+>y : Symbol(y, Decl(file.tsx, 22, 3))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 7, 1))
 
 let z = <Poisoned x y/>;
->z : Symbol(z, Decl(file.tsx, 21, 3))
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 5, 1))
->x : Symbol(x, Decl(file.tsx, 21, 17))
->y : Symbol(y, Decl(file.tsx, 21, 19))
+>z : Symbol(z, Decl(file.tsx, 23, 3))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 7, 1))
+>x : Symbol(x, Decl(file.tsx, 23, 17))
+>y : Symbol(y, Decl(file.tsx, 23, 19))
 
 let w = <Poisoned {...{x: 5, y: "2"}}/>;
->w : Symbol(w, Decl(file.tsx, 22, 3))
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 5, 1))
->x : Symbol(x, Decl(file.tsx, 22, 23))
->y : Symbol(y, Decl(file.tsx, 22, 28))
+>w : Symbol(w, Decl(file.tsx, 24, 3))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 7, 1))
+>x : Symbol(x, Decl(file.tsx, 24, 23))
+>y : Symbol(y, Decl(file.tsx, 24, 28))
 
 let w1 = <Poisoned {...{x: 5, y: "2"}} X="hi" />;
->w1 : Symbol(w1, Decl(file.tsx, 23, 3))
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 5, 1))
->x : Symbol(x, Decl(file.tsx, 23, 24))
->y : Symbol(y, Decl(file.tsx, 23, 29))
->X : Symbol(X, Decl(file.tsx, 23, 38))
+>w1 : Symbol(w1, Decl(file.tsx, 25, 3))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 7, 1))
+>x : Symbol(x, Decl(file.tsx, 25, 24))
+>y : Symbol(y, Decl(file.tsx, 25, 29))
+>X : Symbol(X, Decl(file.tsx, 25, 38))
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution2.types b/tests/baselines/reference/tsxSpreadAttributesResolution2.types
index a9842286c4d4a..da5dc86aa04c9 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution2.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution2.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution3.js b/tests/baselines/reference/tsxSpreadAttributesResolution3.js
index 016a27b5acf9f..7bf27735fc1a0 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution3.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution3.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution3.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface PoisonedProp {
@@ -25,6 +27,7 @@ let y = <Poisoned x="hi" y={2} />;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution3.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution3.symbols
index 508a1bd9424fe..98c190309477b 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution3.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution3.symbols
@@ -1,28 +1,30 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface PoisonedProp {
->PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 0, 32))
+>PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 2, 32))
 
     x: string;
->x : Symbol(PoisonedProp.x, Decl(file.tsx, 2, 24))
+>x : Symbol(PoisonedProp.x, Decl(file.tsx, 4, 24))
 
     y: number;
->y : Symbol(PoisonedProp.y, Decl(file.tsx, 3, 14))
+>y : Symbol(PoisonedProp.y, Decl(file.tsx, 5, 14))
 }
 
 class Poisoned extends React.Component<PoisonedProp, {}> {
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 5, 1))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 7, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 0, 32))
+>PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 2, 32))
 
     render() {
->render : Symbol(Poisoned.render, Decl(file.tsx, 7, 58))
+>render : Symbol(Poisoned.render, Decl(file.tsx, 9, 58))
 
         return <div>Hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -31,25 +33,25 @@ class Poisoned extends React.Component<PoisonedProp, {}> {
 }
 
 const obj = {
->obj : Symbol(obj, Decl(file.tsx, 13, 5))
+>obj : Symbol(obj, Decl(file.tsx, 15, 5))
 
     x: "hello world",
->x : Symbol(x, Decl(file.tsx, 13, 13))
+>x : Symbol(x, Decl(file.tsx, 15, 13))
 
     y: 2
->y : Symbol(y, Decl(file.tsx, 14, 21))
+>y : Symbol(y, Decl(file.tsx, 16, 21))
 
 };
 
 // OK
 let p = <Poisoned {...obj} />;
->p : Symbol(p, Decl(file.tsx, 19, 3))
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 5, 1))
->obj : Symbol(obj, Decl(file.tsx, 13, 5))
+>p : Symbol(p, Decl(file.tsx, 21, 3))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 7, 1))
+>obj : Symbol(obj, Decl(file.tsx, 15, 5))
 
 let y = <Poisoned x="hi" y={2} />;
->y : Symbol(y, Decl(file.tsx, 20, 3))
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 5, 1))
->x : Symbol(x, Decl(file.tsx, 20, 17))
->y : Symbol(y, Decl(file.tsx, 20, 24))
+>y : Symbol(y, Decl(file.tsx, 22, 3))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 7, 1))
+>x : Symbol(x, Decl(file.tsx, 22, 17))
+>y : Symbol(y, Decl(file.tsx, 22, 24))
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution3.types b/tests/baselines/reference/tsxSpreadAttributesResolution3.types
index ca5b1b544035b..b42491970338d 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution3.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution3.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution4.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution4.errors.txt
index bc8ccdce41f5a..30dc162a73e35 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.errors.txt
@@ -1,7 +1,9 @@
-file.tsx(32,45): error TS2532: Object is possibly 'undefined'.
+file.tsx(34,45): error TS2532: Object is possibly 'undefined'.
 
 
 ==== file.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface PoisonedProp {
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution4.js b/tests/baselines/reference/tsxSpreadAttributesResolution4.js
index 3b6da7d0c3003..8297baaf0949c 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution4.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface PoisonedProp {
@@ -38,6 +40,7 @@ let e5 = <EmptyProp {...{ "data-prop": true}} />
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution4.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution4.symbols
index 8225cadd2c1f7..d21521627e050 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.symbols
@@ -1,28 +1,30 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution4.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface PoisonedProp {
->PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 0, 32))
+>PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 2, 32))
 
     x: string;
->x : Symbol(PoisonedProp.x, Decl(file.tsx, 2, 24))
+>x : Symbol(PoisonedProp.x, Decl(file.tsx, 4, 24))
 
     y: 2;
->y : Symbol(PoisonedProp.y, Decl(file.tsx, 3, 14))
+>y : Symbol(PoisonedProp.y, Decl(file.tsx, 5, 14))
 }
 
 class Poisoned extends React.Component<PoisonedProp, {}> {
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 5, 1))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 7, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 0, 32))
+>PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 2, 32))
 
     render() {
->render : Symbol(Poisoned.render, Decl(file.tsx, 7, 58))
+>render : Symbol(Poisoned.render, Decl(file.tsx, 9, 58))
 
         return <div>Hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -31,31 +33,31 @@ class Poisoned extends React.Component<PoisonedProp, {}> {
 }
 
 const obj: PoisonedProp = {
->obj : Symbol(obj, Decl(file.tsx, 13, 5))
->PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 0, 32))
+>obj : Symbol(obj, Decl(file.tsx, 15, 5))
+>PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 2, 32))
 
     x: "hello world",
->x : Symbol(x, Decl(file.tsx, 13, 27))
+>x : Symbol(x, Decl(file.tsx, 15, 27))
 
     y: 2
->y : Symbol(y, Decl(file.tsx, 14, 21))
+>y : Symbol(y, Decl(file.tsx, 16, 21))
 
 };
 
 // OK
 let p = <Poisoned {...obj} />;
->p : Symbol(p, Decl(file.tsx, 19, 3))
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 5, 1))
->obj : Symbol(obj, Decl(file.tsx, 13, 5))
+>p : Symbol(p, Decl(file.tsx, 21, 3))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 7, 1))
+>obj : Symbol(obj, Decl(file.tsx, 15, 5))
 
 class EmptyProp extends React.Component<{}, {}> {
->EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 19, 30))
+>EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 21, 30))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 
     render() {
->render : Symbol(EmptyProp.render, Decl(file.tsx, 21, 49))
+>render : Symbol(EmptyProp.render, Decl(file.tsx, 23, 49))
 
         return <div>Default hi</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -65,31 +67,31 @@ class EmptyProp extends React.Component<{}, {}> {
 
 // OK
 let j: any;
->j : Symbol(j, Decl(file.tsx, 28, 3))
+>j : Symbol(j, Decl(file.tsx, 30, 3))
 
 let e1 = <EmptyProp {...{}} />;
->e1 : Symbol(e1, Decl(file.tsx, 29, 3))
->EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 19, 30))
+>e1 : Symbol(e1, Decl(file.tsx, 31, 3))
+>EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 21, 30))
 
 let e2 = <EmptyProp {...j} />
->e2 : Symbol(e2, Decl(file.tsx, 30, 3))
->EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 19, 30))
->j : Symbol(j, Decl(file.tsx, 28, 3))
+>e2 : Symbol(e2, Decl(file.tsx, 32, 3))
+>EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 21, 30))
+>j : Symbol(j, Decl(file.tsx, 30, 3))
 
 let e3 = <EmptyProp {...{ ref: (input) => { this.textInput = input; } }} />
->e3 : Symbol(e3, Decl(file.tsx, 31, 3))
->EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 19, 30))
->ref : Symbol(ref, Decl(file.tsx, 31, 25))
->input : Symbol(input, Decl(file.tsx, 31, 32))
->input : Symbol(input, Decl(file.tsx, 31, 32))
+>e3 : Symbol(e3, Decl(file.tsx, 33, 3))
+>EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 21, 30))
+>ref : Symbol(ref, Decl(file.tsx, 33, 25))
+>input : Symbol(input, Decl(file.tsx, 33, 32))
+>input : Symbol(input, Decl(file.tsx, 33, 32))
 
 let e4 = <EmptyProp data-prop />
->e4 : Symbol(e4, Decl(file.tsx, 32, 3))
->EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 19, 30))
->data-prop : Symbol(data-prop, Decl(file.tsx, 32, 19))
+>e4 : Symbol(e4, Decl(file.tsx, 34, 3))
+>EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 21, 30))
+>data-prop : Symbol(data-prop, Decl(file.tsx, 34, 19))
 
 let e5 = <EmptyProp {...{ "data-prop": true}} />
->e5 : Symbol(e5, Decl(file.tsx, 33, 3))
->EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 19, 30))
->"data-prop" : Symbol("data-prop", Decl(file.tsx, 33, 25))
+>e5 : Symbol(e5, Decl(file.tsx, 35, 3))
+>EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 21, 30))
+>"data-prop" : Symbol("data-prop", Decl(file.tsx, 35, 25))
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution4.types b/tests/baselines/reference/tsxSpreadAttributesResolution4.types
index 3b7f283130f70..deb7e046bb31a 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution4.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution5.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution5.errors.txt
index d0b4bd2e673d0..f71d46741048f 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution5.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution5.errors.txt
@@ -1,10 +1,12 @@
-file.tsx(20,10): error TS2322: Type '{ x: string; y: number; }' is not assignable to type 'PoisonedProp'.
+file.tsx(22,10): error TS2322: Type '{ x: string; y: number; }' is not assignable to type 'PoisonedProp'.
   Types of property 'y' are incompatible.
     Type 'number' is not assignable to type '2'.
-file.tsx(33,10): error TS2559: Type '{ prop1: boolean; }' has no properties in common with type 'IntrinsicAttributes & IntrinsicClassAttributes<EmptyProp> & { children?: ReactNode; }'.
+file.tsx(35,10): error TS2559: Type '{ prop1: boolean; }' has no properties in common with type 'IntrinsicAttributes & IntrinsicClassAttributes<EmptyProp> & { children?: ReactNode; }'.
 
 
 ==== file.tsx (2 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface PoisonedProp {
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution5.js b/tests/baselines/reference/tsxSpreadAttributesResolution5.js
index fdfd154484a97..cbef80da1ea46 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution5.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution5.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution5.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface PoisonedProp {
@@ -37,6 +39,7 @@ let e = <EmptyProp {...o} />;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution5.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution5.symbols
index be8ed6aa0d19d..7e2f07402488c 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution5.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution5.symbols
@@ -1,28 +1,30 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution5.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface PoisonedProp {
->PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 0, 32))
+>PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 2, 32))
 
     x: string;
->x : Symbol(PoisonedProp.x, Decl(file.tsx, 2, 24))
+>x : Symbol(PoisonedProp.x, Decl(file.tsx, 4, 24))
 
     y: 2;
->y : Symbol(PoisonedProp.y, Decl(file.tsx, 3, 14))
+>y : Symbol(PoisonedProp.y, Decl(file.tsx, 5, 14))
 }
 
 class Poisoned extends React.Component<PoisonedProp, {}> {
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 5, 1))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 7, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 0, 32))
+>PoisonedProp : Symbol(PoisonedProp, Decl(file.tsx, 2, 32))
 
     render() {
->render : Symbol(Poisoned.render, Decl(file.tsx, 7, 58))
+>render : Symbol(Poisoned.render, Decl(file.tsx, 9, 58))
 
         return <div>Hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -31,48 +33,48 @@ class Poisoned extends React.Component<PoisonedProp, {}> {
 }
 
 let obj = {
->obj : Symbol(obj, Decl(file.tsx, 13, 3))
+>obj : Symbol(obj, Decl(file.tsx, 15, 3))
 
     x: "hello world",
->x : Symbol(x, Decl(file.tsx, 13, 11))
+>x : Symbol(x, Decl(file.tsx, 15, 11))
 
     y: 2
->y : Symbol(y, Decl(file.tsx, 14, 21))
+>y : Symbol(y, Decl(file.tsx, 16, 21))
 
 };
 
 // Error as "obj" has type { x: string; y: number }
 let p = <Poisoned {...obj} />;
->p : Symbol(p, Decl(file.tsx, 19, 3))
->Poisoned : Symbol(Poisoned, Decl(file.tsx, 5, 1))
->obj : Symbol(obj, Decl(file.tsx, 13, 3))
+>p : Symbol(p, Decl(file.tsx, 21, 3))
+>Poisoned : Symbol(Poisoned, Decl(file.tsx, 7, 1))
+>obj : Symbol(obj, Decl(file.tsx, 15, 3))
 
 class EmptyProp extends React.Component<{}, {}> {
->EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 19, 30))
+>EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 21, 30))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 
     render() {
->render : Symbol(EmptyProp.render, Decl(file.tsx, 21, 49))
+>render : Symbol(EmptyProp.render, Decl(file.tsx, 23, 49))
 
         return <div>Default hi</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
     }
     greeting: string;
->greeting : Symbol(EmptyProp.greeting, Decl(file.tsx, 24, 5))
+>greeting : Symbol(EmptyProp.greeting, Decl(file.tsx, 26, 5))
 }
 
 let o = {
->o : Symbol(o, Decl(file.tsx, 28, 3))
+>o : Symbol(o, Decl(file.tsx, 30, 3))
 
     prop1: false
->prop1 : Symbol(prop1, Decl(file.tsx, 28, 9))
+>prop1 : Symbol(prop1, Decl(file.tsx, 30, 9))
 }
 // Ok
 let e = <EmptyProp {...o} />;
->e : Symbol(e, Decl(file.tsx, 32, 3))
->EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 19, 30))
->o : Symbol(o, Decl(file.tsx, 28, 3))
+>e : Symbol(e, Decl(file.tsx, 34, 3))
+>EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 21, 30))
+>o : Symbol(o, Decl(file.tsx, 30, 3))
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution5.types b/tests/baselines/reference/tsxSpreadAttributesResolution5.types
index e1cd5e5f79574..34e2987a8103a 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution5.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution5.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution5.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt
index cbc04c6f77307..a32f1a5c1fff2 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.errors.txt
@@ -1,8 +1,10 @@
-file.tsx(13,10): error TS2322: Type '{ editable: true; }' is not assignable to type 'IntrinsicAttributes & (IntrinsicClassAttributes<TextComponent> & (TextProps & { children?: ReactNode; }))'.
+file.tsx(15,10): error TS2322: Type '{ editable: true; }' is not assignable to type 'IntrinsicAttributes & (IntrinsicClassAttributes<TextComponent> & (TextProps & { children?: ReactNode; }))'.
   Property 'onEdit' is missing in type '{ editable: true; }' but required in type '{ editable: true; onEdit: (newText: string) => void; }'.
 
 
 ==== file.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     type TextProps = { editable: false }
@@ -19,7 +21,7 @@ file.tsx(13,10): error TS2322: Type '{ editable: true; }' is not assignable to t
              ~~~~~~~~~~~~~
 !!! error TS2322: Type '{ editable: true; }' is not assignable to type 'IntrinsicAttributes & (IntrinsicClassAttributes<TextComponent> & (TextProps & { children?: ReactNode; }))'.
 !!! error TS2322:   Property 'onEdit' is missing in type '{ editable: true; }' but required in type '{ editable: true; onEdit: (newText: string) => void; }'.
-!!! related TS2728 file.tsx:4:36: 'onEdit' is declared here.
+!!! related TS2728 file.tsx:6:36: 'onEdit' is declared here.
     
     const textProps: TextProps = {
         editable: false
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution6.js b/tests/baselines/reference/tsxSpreadAttributesResolution6.js
index fd41994f8a301..dc22fa5aca9db 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution6.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 type TextProps = { editable: false }
@@ -21,6 +23,7 @@ const textProps: TextProps = {
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution6.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution6.symbols
index 50b5f7003cf4b..8527f349b19be 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.symbols
@@ -1,27 +1,29 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution6.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 type TextProps = { editable: false }
->TextProps : Symbol(TextProps, Decl(file.tsx, 0, 32))
->editable : Symbol(editable, Decl(file.tsx, 2, 18))
+>TextProps : Symbol(TextProps, Decl(file.tsx, 2, 32))
+>editable : Symbol(editable, Decl(file.tsx, 4, 18))
 
                | { editable: true, onEdit: (newText: string) => void };
->editable : Symbol(editable, Decl(file.tsx, 3, 18))
->onEdit : Symbol(onEdit, Decl(file.tsx, 3, 34))
->newText : Symbol(newText, Decl(file.tsx, 3, 44))
+>editable : Symbol(editable, Decl(file.tsx, 5, 18))
+>onEdit : Symbol(onEdit, Decl(file.tsx, 5, 34))
+>newText : Symbol(newText, Decl(file.tsx, 5, 44))
 
 class TextComponent extends React.Component<TextProps, {}> {
->TextComponent : Symbol(TextComponent, Decl(file.tsx, 3, 71))
+>TextComponent : Symbol(TextComponent, Decl(file.tsx, 5, 71))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->TextProps : Symbol(TextProps, Decl(file.tsx, 0, 32))
+>TextProps : Symbol(TextProps, Decl(file.tsx, 2, 32))
 
     render() {
->render : Symbol(TextComponent.render, Decl(file.tsx, 5, 60))
+>render : Symbol(TextComponent.render, Decl(file.tsx, 7, 60))
 
         return <span>Some Text..</span>;
 >span : Symbol(JSX.IntrinsicElements.span, Decl(react.d.ts, 2461, 51))
@@ -31,15 +33,15 @@ class TextComponent extends React.Component<TextProps, {}> {
 
 // Error
 let x = <TextComponent editable={true} />
->x : Symbol(x, Decl(file.tsx, 12, 3))
->TextComponent : Symbol(TextComponent, Decl(file.tsx, 3, 71))
->editable : Symbol(editable, Decl(file.tsx, 12, 22))
+>x : Symbol(x, Decl(file.tsx, 14, 3))
+>TextComponent : Symbol(TextComponent, Decl(file.tsx, 5, 71))
+>editable : Symbol(editable, Decl(file.tsx, 14, 22))
 
 const textProps: TextProps = {
->textProps : Symbol(textProps, Decl(file.tsx, 14, 5))
->TextProps : Symbol(TextProps, Decl(file.tsx, 0, 32))
+>textProps : Symbol(textProps, Decl(file.tsx, 16, 5))
+>TextProps : Symbol(TextProps, Decl(file.tsx, 2, 32))
 
     editable: false
->editable : Symbol(editable, Decl(file.tsx, 14, 30))
+>editable : Symbol(editable, Decl(file.tsx, 16, 30))
 
 };
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution6.types b/tests/baselines/reference/tsxSpreadAttributesResolution6.types
index d911d9f373569..0d6ba238d3afb 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution6.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution7.js b/tests/baselines/reference/tsxSpreadAttributesResolution7.js
index fa20f6e495b46..162086ee34635 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution7.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution7.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution7.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 type TextProps = { editable: false }
@@ -28,6 +30,7 @@ let y2 = <TextComponent {...textPropsTrue} />
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution7.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution7.symbols
index ed2a25867b255..7327aa0edfeab 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution7.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution7.symbols
@@ -1,27 +1,29 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution7.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 type TextProps = { editable: false }
->TextProps : Symbol(TextProps, Decl(file.tsx, 0, 32))
->editable : Symbol(editable, Decl(file.tsx, 2, 18))
+>TextProps : Symbol(TextProps, Decl(file.tsx, 2, 32))
+>editable : Symbol(editable, Decl(file.tsx, 4, 18))
 
                | { editable: true, onEdit: (newText: string) => void };
->editable : Symbol(editable, Decl(file.tsx, 3, 18))
->onEdit : Symbol(onEdit, Decl(file.tsx, 3, 34))
->newText : Symbol(newText, Decl(file.tsx, 3, 44))
+>editable : Symbol(editable, Decl(file.tsx, 5, 18))
+>onEdit : Symbol(onEdit, Decl(file.tsx, 5, 34))
+>newText : Symbol(newText, Decl(file.tsx, 5, 44))
 
 class TextComponent extends React.Component<TextProps, {}> {
->TextComponent : Symbol(TextComponent, Decl(file.tsx, 3, 71))
+>TextComponent : Symbol(TextComponent, Decl(file.tsx, 5, 71))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->TextProps : Symbol(TextProps, Decl(file.tsx, 0, 32))
+>TextProps : Symbol(TextProps, Decl(file.tsx, 2, 32))
 
     render() {
->render : Symbol(TextComponent.render, Decl(file.tsx, 5, 60))
+>render : Symbol(TextComponent.render, Decl(file.tsx, 7, 60))
 
         return <span>Some Text..</span>;
 >span : Symbol(JSX.IntrinsicElements.span, Decl(react.d.ts, 2461, 51))
@@ -31,33 +33,33 @@ class TextComponent extends React.Component<TextProps, {}> {
 
 // OK
 const textPropsFalse: TextProps = {
->textPropsFalse : Symbol(textPropsFalse, Decl(file.tsx, 12, 5))
->TextProps : Symbol(TextProps, Decl(file.tsx, 0, 32))
+>textPropsFalse : Symbol(textPropsFalse, Decl(file.tsx, 14, 5))
+>TextProps : Symbol(TextProps, Decl(file.tsx, 2, 32))
 
     editable: false
->editable : Symbol(editable, Decl(file.tsx, 12, 35))
+>editable : Symbol(editable, Decl(file.tsx, 14, 35))
 
 };
 
 let y1 = <TextComponent {...textPropsFalse} />
->y1 : Symbol(y1, Decl(file.tsx, 16, 3))
->TextComponent : Symbol(TextComponent, Decl(file.tsx, 3, 71))
->textPropsFalse : Symbol(textPropsFalse, Decl(file.tsx, 12, 5))
+>y1 : Symbol(y1, Decl(file.tsx, 18, 3))
+>TextComponent : Symbol(TextComponent, Decl(file.tsx, 5, 71))
+>textPropsFalse : Symbol(textPropsFalse, Decl(file.tsx, 14, 5))
 
 const textPropsTrue: TextProps = {
->textPropsTrue : Symbol(textPropsTrue, Decl(file.tsx, 18, 5))
->TextProps : Symbol(TextProps, Decl(file.tsx, 0, 32))
+>textPropsTrue : Symbol(textPropsTrue, Decl(file.tsx, 20, 5))
+>TextProps : Symbol(TextProps, Decl(file.tsx, 2, 32))
 
     editable: true,
->editable : Symbol(editable, Decl(file.tsx, 18, 34))
+>editable : Symbol(editable, Decl(file.tsx, 20, 34))
 
     onEdit: () => {}
->onEdit : Symbol(onEdit, Decl(file.tsx, 19, 19))
+>onEdit : Symbol(onEdit, Decl(file.tsx, 21, 19))
 
 };
 
 let y2 = <TextComponent {...textPropsTrue} />
->y2 : Symbol(y2, Decl(file.tsx, 23, 3))
->TextComponent : Symbol(TextComponent, Decl(file.tsx, 3, 71))
->textPropsTrue : Symbol(textPropsTrue, Decl(file.tsx, 18, 5))
+>y2 : Symbol(y2, Decl(file.tsx, 25, 3))
+>TextComponent : Symbol(TextComponent, Decl(file.tsx, 5, 71))
+>textPropsTrue : Symbol(textPropsTrue, Decl(file.tsx, 20, 5))
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution7.types b/tests/baselines/reference/tsxSpreadAttributesResolution7.types
index 5e4bd26cbfa62..4a32c209ddf91 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution7.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution7.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution7.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution8.js b/tests/baselines/reference/tsxSpreadAttributesResolution8.js
index 274502a4bd10b..f3ee05716fe7f 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution8.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution8.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution8.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 const obj = {};
@@ -30,6 +32,7 @@ let x1 = <OverWriteAttr {...obj1} {...obj3}  />
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution8.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution8.symbols
index 47d62716fac35..77d67140f39c4 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution8.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution8.symbols
@@ -1,50 +1,52 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution8.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 const obj = {};
->obj : Symbol(obj, Decl(file.tsx, 2, 5))
+>obj : Symbol(obj, Decl(file.tsx, 4, 5))
 
 const obj1 = {
->obj1 : Symbol(obj1, Decl(file.tsx, 3, 5))
+>obj1 : Symbol(obj1, Decl(file.tsx, 5, 5))
 
     x: 2
->x : Symbol(x, Decl(file.tsx, 3, 14))
+>x : Symbol(x, Decl(file.tsx, 5, 14))
 }
 const obj3 = {
->obj3 : Symbol(obj3, Decl(file.tsx, 6, 5))
+>obj3 : Symbol(obj3, Decl(file.tsx, 8, 5))
 
     y: true,
->y : Symbol(y, Decl(file.tsx, 6, 14))
+>y : Symbol(y, Decl(file.tsx, 8, 14))
 
     overwrite: "hi"
->overwrite : Symbol(overwrite, Decl(file.tsx, 7, 12))
+>overwrite : Symbol(overwrite, Decl(file.tsx, 9, 12))
 }
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 9, 1))
+>Prop : Symbol(Prop, Decl(file.tsx, 11, 1))
 
     x: number
->x : Symbol(Prop.x, Decl(file.tsx, 11, 16))
+>x : Symbol(Prop.x, Decl(file.tsx, 13, 16))
 
     y: boolean
->y : Symbol(Prop.y, Decl(file.tsx, 12, 13))
+>y : Symbol(Prop.y, Decl(file.tsx, 14, 13))
 
     overwrite: string
->overwrite : Symbol(Prop.overwrite, Decl(file.tsx, 13, 14))
+>overwrite : Symbol(Prop.overwrite, Decl(file.tsx, 15, 14))
 }
 
 class OverWriteAttr extends React.Component<Prop, {}> {
->OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 15, 1))
+>OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 17, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->Prop : Symbol(Prop, Decl(file.tsx, 9, 1))
+>Prop : Symbol(Prop, Decl(file.tsx, 11, 1))
 
     render() {
->render : Symbol(OverWriteAttr.render, Decl(file.tsx, 17, 55))
+>render : Symbol(OverWriteAttr.render, Decl(file.tsx, 19, 55))
 
         return <div>Hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -54,16 +56,16 @@ class OverWriteAttr extends React.Component<Prop, {}> {
 
 // OK
 let x = <OverWriteAttr {...obj} y overwrite="hi" {...obj1} />
->x : Symbol(x, Decl(file.tsx, 24, 3))
->OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 15, 1))
->obj : Symbol(obj, Decl(file.tsx, 2, 5))
->y : Symbol(y, Decl(file.tsx, 24, 31))
->overwrite : Symbol(overwrite, Decl(file.tsx, 24, 33))
->obj1 : Symbol(obj1, Decl(file.tsx, 3, 5))
+>x : Symbol(x, Decl(file.tsx, 26, 3))
+>OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 17, 1))
+>obj : Symbol(obj, Decl(file.tsx, 4, 5))
+>y : Symbol(y, Decl(file.tsx, 26, 31))
+>overwrite : Symbol(overwrite, Decl(file.tsx, 26, 33))
+>obj1 : Symbol(obj1, Decl(file.tsx, 5, 5))
 
 let x1 = <OverWriteAttr {...obj1} {...obj3}  />
->x1 : Symbol(x1, Decl(file.tsx, 25, 3))
->OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 15, 1))
->obj1 : Symbol(obj1, Decl(file.tsx, 3, 5))
->obj3 : Symbol(obj3, Decl(file.tsx, 6, 5))
+>x1 : Symbol(x1, Decl(file.tsx, 27, 3))
+>OverWriteAttr : Symbol(OverWriteAttr, Decl(file.tsx, 17, 1))
+>obj1 : Symbol(obj1, Decl(file.tsx, 5, 5))
+>obj3 : Symbol(obj3, Decl(file.tsx, 8, 5))
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution8.types b/tests/baselines/reference/tsxSpreadAttributesResolution8.types
index 0b740151e5d0c..048e3682abf69 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution8.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution8.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution8.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution9.js b/tests/baselines/reference/tsxSpreadAttributesResolution9.js
index ff34ab5694715..aa28e17c297e9 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution9.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution9.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution9.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface OptionProp {
@@ -28,6 +30,7 @@ let y3 = <Opt x={2} />;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution9.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution9.symbols
index f922ad7c3314d..d9281e2589290 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution9.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution9.symbols
@@ -1,28 +1,30 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution9.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface OptionProp {
->OptionProp : Symbol(OptionProp, Decl(file.tsx, 0, 32))
+>OptionProp : Symbol(OptionProp, Decl(file.tsx, 2, 32))
 
     x?: 2
->x : Symbol(OptionProp.x, Decl(file.tsx, 2, 22))
+>x : Symbol(OptionProp.x, Decl(file.tsx, 4, 22))
 
     y?: boolean
->y : Symbol(OptionProp.y, Decl(file.tsx, 3, 9))
+>y : Symbol(OptionProp.y, Decl(file.tsx, 5, 9))
 }
 
 class Opt extends React.Component<OptionProp, {}> {
->Opt : Symbol(Opt, Decl(file.tsx, 5, 1))
+>Opt : Symbol(Opt, Decl(file.tsx, 7, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->OptionProp : Symbol(OptionProp, Decl(file.tsx, 0, 32))
+>OptionProp : Symbol(OptionProp, Decl(file.tsx, 2, 32))
 
     render() {
->render : Symbol(Opt.render, Decl(file.tsx, 7, 51))
+>render : Symbol(Opt.render, Decl(file.tsx, 9, 51))
 
         return <div>Hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -31,40 +33,40 @@ class Opt extends React.Component<OptionProp, {}> {
 }
 
 const obj: OptionProp = {};
->obj : Symbol(obj, Decl(file.tsx, 13, 5))
->OptionProp : Symbol(OptionProp, Decl(file.tsx, 0, 32))
+>obj : Symbol(obj, Decl(file.tsx, 15, 5))
+>OptionProp : Symbol(OptionProp, Decl(file.tsx, 2, 32))
 
 const obj1: OptionProp = {
->obj1 : Symbol(obj1, Decl(file.tsx, 14, 5))
->OptionProp : Symbol(OptionProp, Decl(file.tsx, 0, 32))
+>obj1 : Symbol(obj1, Decl(file.tsx, 16, 5))
+>OptionProp : Symbol(OptionProp, Decl(file.tsx, 2, 32))
 
     x: 2
->x : Symbol(x, Decl(file.tsx, 14, 26))
+>x : Symbol(x, Decl(file.tsx, 16, 26))
 }
 
 // OK
 let p = <Opt />;
->p : Symbol(p, Decl(file.tsx, 19, 3))
->Opt : Symbol(Opt, Decl(file.tsx, 5, 1))
+>p : Symbol(p, Decl(file.tsx, 21, 3))
+>Opt : Symbol(Opt, Decl(file.tsx, 7, 1))
 
 let y = <Opt {...obj} />;
->y : Symbol(y, Decl(file.tsx, 20, 3))
->Opt : Symbol(Opt, Decl(file.tsx, 5, 1))
->obj : Symbol(obj, Decl(file.tsx, 13, 5))
+>y : Symbol(y, Decl(file.tsx, 22, 3))
+>Opt : Symbol(Opt, Decl(file.tsx, 7, 1))
+>obj : Symbol(obj, Decl(file.tsx, 15, 5))
 
 let y1 = <Opt {...obj1} />;
->y1 : Symbol(y1, Decl(file.tsx, 21, 3))
->Opt : Symbol(Opt, Decl(file.tsx, 5, 1))
->obj1 : Symbol(obj1, Decl(file.tsx, 14, 5))
+>y1 : Symbol(y1, Decl(file.tsx, 23, 3))
+>Opt : Symbol(Opt, Decl(file.tsx, 7, 1))
+>obj1 : Symbol(obj1, Decl(file.tsx, 16, 5))
 
 let y2 = <Opt {...obj1} y/>;
->y2 : Symbol(y2, Decl(file.tsx, 22, 3))
->Opt : Symbol(Opt, Decl(file.tsx, 5, 1))
->obj1 : Symbol(obj1, Decl(file.tsx, 14, 5))
->y : Symbol(y, Decl(file.tsx, 22, 23))
+>y2 : Symbol(y2, Decl(file.tsx, 24, 3))
+>Opt : Symbol(Opt, Decl(file.tsx, 7, 1))
+>obj1 : Symbol(obj1, Decl(file.tsx, 16, 5))
+>y : Symbol(y, Decl(file.tsx, 24, 23))
 
 let y3 = <Opt x={2} />;
->y3 : Symbol(y3, Decl(file.tsx, 23, 3))
->Opt : Symbol(Opt, Decl(file.tsx, 5, 1))
->x : Symbol(x, Decl(file.tsx, 23, 13))
+>y3 : Symbol(y3, Decl(file.tsx, 25, 3))
+>Opt : Symbol(Opt, Decl(file.tsx, 7, 1))
+>x : Symbol(x, Decl(file.tsx, 25, 13))
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution9.types b/tests/baselines/reference/tsxSpreadAttributesResolution9.types
index cd5baa9e9a50c..c8661849de31c 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution9.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution9.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxSpreadAttributesResolution9.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).errors.txt b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).errors.txt
index 662da7b4b6f05..fb160a2421a85 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).errors.txt
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).errors.txt
@@ -33,6 +33,6 @@ tsxSpreadChildrenInvalidType.tsx(21,9): error TS2609: JSX spread child must be a
             {...(<Todo key={todos[0].id} todo={todos[0].todo} /> as any)}
         </div>;
     }
-    let x: TodoListProps;
+    declare let x: TodoListProps;
         <TodoList {...x}/>
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).js b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).js
index 6d07dca5b399a..7aea2dbb8f9d7 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).js
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).js
@@ -30,7 +30,7 @@ function TodoListNoError({ todos }: TodoListProps) {
         {...(<Todo key={todos[0].id} todo={todos[0].todo} /> as any)}
     </div>;
 }
-let x: TodoListProps;
+declare let x: TodoListProps;
     <TodoList {...x}/>
 
 
@@ -45,5 +45,4 @@ function TodoListNoError({ todos }) {
     // any is not checked
     return React.createElement("div", null, ...React.createElement(Todo, { key: todos[0].id, todo: todos[0].todo }));
 }
-let x;
 React.createElement(TodoList, Object.assign({}, x));
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).symbols b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).symbols
index 3c1bdd1dd8f79..85af82ef46883 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).symbols
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).symbols
@@ -96,11 +96,11 @@ function TodoListNoError({ todos }: TodoListProps) {
     </div>;
 >div : Symbol(JSX.IntrinsicElements.__index, Decl(tsxSpreadChildrenInvalidType.tsx, 2, 30))
 }
-let x: TodoListProps;
->x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 3))
+declare let x: TodoListProps;
+>x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 11))
 >TodoListProps : Symbol(TodoListProps, Decl(tsxSpreadChildrenInvalidType.tsx, 11, 1))
 
     <TodoList {...x}/>
 >TodoList : Symbol(TodoList, Decl(tsxSpreadChildrenInvalidType.tsx, 17, 1))
->x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 3))
+>x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 11))
 
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).types b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).types
index 8a920d8c76cfc..318ccc4c63210 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).types
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).types
@@ -162,7 +162,7 @@ function TodoListNoError({ todos }: TodoListProps) {
 >div : any
 >    : ^^^
 }
-let x: TodoListProps;
+declare let x: TodoListProps;
 >x : TodoListProps
 >  : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).errors.txt b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).errors.txt
index 662da7b4b6f05..fb160a2421a85 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).errors.txt
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).errors.txt
@@ -33,6 +33,6 @@ tsxSpreadChildrenInvalidType.tsx(21,9): error TS2609: JSX spread child must be a
             {...(<Todo key={todos[0].id} todo={todos[0].todo} /> as any)}
         </div>;
     }
-    let x: TodoListProps;
+    declare let x: TodoListProps;
         <TodoList {...x}/>
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).js b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).js
index f9f95bba2e691..ec1aa0ab47d1e 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).js
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).js
@@ -30,7 +30,7 @@ function TodoListNoError({ todos }: TodoListProps) {
         {...(<Todo key={todos[0].id} todo={todos[0].todo} /> as any)}
     </div>;
 }
-let x: TodoListProps;
+declare let x: TodoListProps;
     <TodoList {...x}/>
 
 
@@ -67,5 +67,4 @@ function TodoListNoError(_a) {
     // any is not checked
     return React.createElement.apply(React, __spreadArray(["div", null], React.createElement(Todo, { key: todos[0].id, todo: todos[0].todo }), false));
 }
-var x;
 React.createElement(TodoList, __assign({}, x));
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).symbols b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).symbols
index 3c1bdd1dd8f79..85af82ef46883 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).symbols
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).symbols
@@ -96,11 +96,11 @@ function TodoListNoError({ todos }: TodoListProps) {
     </div>;
 >div : Symbol(JSX.IntrinsicElements.__index, Decl(tsxSpreadChildrenInvalidType.tsx, 2, 30))
 }
-let x: TodoListProps;
->x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 3))
+declare let x: TodoListProps;
+>x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 11))
 >TodoListProps : Symbol(TodoListProps, Decl(tsxSpreadChildrenInvalidType.tsx, 11, 1))
 
     <TodoList {...x}/>
 >TodoList : Symbol(TodoList, Decl(tsxSpreadChildrenInvalidType.tsx, 17, 1))
->x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 3))
+>x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 11))
 
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).types b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).types
index 8a920d8c76cfc..318ccc4c63210 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).types
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).types
@@ -162,7 +162,7 @@ function TodoListNoError({ todos }: TodoListProps) {
 >div : any
 >    : ^^^
 }
-let x: TodoListProps;
+declare let x: TodoListProps;
 >x : TodoListProps
 >  : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt
index f588ee4714406..834a97c28b803 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt
@@ -36,6 +36,6 @@ tsxSpreadChildrenInvalidType.tsx(21,9): error TS2609: JSX spread child must be a
             {...(<Todo key={todos[0].id} todo={todos[0].todo} /> as any)}
         </div>;
     }
-    let x: TodoListProps;
+    declare let x: TodoListProps;
         <TodoList {...x}/>
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).js b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).js
index ae8913b8dcca5..8a2133edb3af6 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).js
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).js
@@ -30,7 +30,7 @@ function TodoListNoError({ todos }: TodoListProps) {
         {...(<Todo key={todos[0].id} todo={todos[0].todo} /> as any)}
     </div>;
 }
-let x: TodoListProps;
+declare let x: TodoListProps;
     <TodoList {...x}/>
 
 
@@ -46,5 +46,4 @@ function TodoListNoError({ todos }) {
     // any is not checked
     return _jsxs("div", { children: [..._jsx(Todo, { todo: todos[0].todo }, todos[0].id)] });
 }
-let x;
 _jsx(TodoList, Object.assign({}, x));
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).symbols b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).symbols
index 912bc3d6af9e2..f8ae3472d4019 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).symbols
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).symbols
@@ -88,11 +88,11 @@ function TodoListNoError({ todos }: TodoListProps) {
 
     </div>;
 }
-let x: TodoListProps;
->x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 3))
+declare let x: TodoListProps;
+>x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 11))
 >TodoListProps : Symbol(TodoListProps, Decl(tsxSpreadChildrenInvalidType.tsx, 11, 1))
 
     <TodoList {...x}/>
 >TodoList : Symbol(TodoList, Decl(tsxSpreadChildrenInvalidType.tsx, 17, 1))
->x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 3))
+>x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 11))
 
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).types b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).types
index d1d91d0e97593..975f442cbb899 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).types
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).types
@@ -162,7 +162,7 @@ function TodoListNoError({ todos }: TodoListProps) {
 >div : any
 >    : ^^^
 }
-let x: TodoListProps;
+declare let x: TodoListProps;
 >x : TodoListProps
 >  : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).errors.txt b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).errors.txt
index f588ee4714406..834a97c28b803 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).errors.txt
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).errors.txt
@@ -36,6 +36,6 @@ tsxSpreadChildrenInvalidType.tsx(21,9): error TS2609: JSX spread child must be a
             {...(<Todo key={todos[0].id} todo={todos[0].todo} /> as any)}
         </div>;
     }
-    let x: TodoListProps;
+    declare let x: TodoListProps;
         <TodoList {...x}/>
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).js b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).js
index ca623655b2d27..36f2a18fc225e 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).js
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).js
@@ -30,7 +30,7 @@ function TodoListNoError({ todos }: TodoListProps) {
         {...(<Todo key={todos[0].id} todo={todos[0].todo} /> as any)}
     </div>;
 }
-let x: TodoListProps;
+declare let x: TodoListProps;
     <TodoList {...x}/>
 
 
@@ -70,5 +70,4 @@ function TodoListNoError(_a) {
     // any is not checked
     return (0, jsx_runtime_1.jsxs)("div", { children: __spreadArray([], (0, jsx_runtime_1.jsx)(Todo, { todo: todos[0].todo }, todos[0].id), true) });
 }
-var x;
 (0, jsx_runtime_1.jsx)(TodoList, __assign({}, x));
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).symbols b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).symbols
index 912bc3d6af9e2..f8ae3472d4019 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).symbols
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).symbols
@@ -88,11 +88,11 @@ function TodoListNoError({ todos }: TodoListProps) {
 
     </div>;
 }
-let x: TodoListProps;
->x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 3))
+declare let x: TodoListProps;
+>x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 11))
 >TodoListProps : Symbol(TodoListProps, Decl(tsxSpreadChildrenInvalidType.tsx, 11, 1))
 
     <TodoList {...x}/>
 >TodoList : Symbol(TodoList, Decl(tsxSpreadChildrenInvalidType.tsx, 17, 1))
->x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 3))
+>x : Symbol(x, Decl(tsxSpreadChildrenInvalidType.tsx, 29, 11))
 
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).types b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).types
index d1d91d0e97593..975f442cbb899 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).types
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).types
@@ -162,7 +162,7 @@ function TodoListNoError({ todos }: TodoListProps) {
 >div : any
 >    : ^^^
 }
-let x: TodoListProps;
+declare let x: TodoListProps;
 >x : TodoListProps
 >  : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js b/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
index 39ef9039480f0..874ff757dfe3a 100644
--- a/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
+++ b/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
@@ -14,7 +14,7 @@ class MyComponent extends React.Component<{dataSource: number[], onClick?: any},
 
 //// [tsxSpreadDoesNotReportExcessProps.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxStatelessComponentDefaultProps.js b/tests/baselines/reference/tsxStatelessComponentDefaultProps.js
index c9249fa38e833..5385637cb99a4 100644
--- a/tests/baselines/reference/tsxStatelessComponentDefaultProps.js
+++ b/tests/baselines/reference/tsxStatelessComponentDefaultProps.js
@@ -19,7 +19,7 @@ let a = <BackButton />
 
 //// [tsxStatelessComponentDefaultProps.js]
 "use strict";
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.errors.txt
index 798bb8c18c256..55c45b8a16d75 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.errors.txt
@@ -1,9 +1,11 @@
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-file.tsx(17,39): error TS2842: 'string' is an unused renaming of 'y1'. Did you intend to use it as a type annotation?
+file.tsx(19,39): error TS2842: 'string' is an unused renaming of 'y1'. Did you intend to use it as a type annotation?
 
 
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react')
     
     declare function OneThing(k: {yxx: string}): JSX.Element;
@@ -23,7 +25,7 @@ file.tsx(17,39): error TS2842: 'string' is an unused renaming of 'y1'. Did you i
     declare function TestingOneThing({y1: string}): JSX.Element;
                                           ~~~~~~
 !!! error TS2842: 'string' is an unused renaming of 'y1'. Did you intend to use it as a type annotation?
-!!! related TS2843 file.tsx:17:46: We can only write a type for 'y1' by adding a type for the entire parameter here.
+!!! related TS2843 file.tsx:19:46: We can only write a type for 'y1' by adding a type for the entire parameter here.
     declare function TestingOneThing(j: {"extra-data": string, yy?: string}): JSX.Element;
     declare function TestingOneThing(n: {yy: number, direction?: number}): JSX.Element;
     declare function TestingOneThing(n: {yy: string, name: string}): JSX.Element;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.js b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.js
index 8f8d9892f8839..836cea3fb63da 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload1.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react')
 
 declare function OneThing(k: {yxx: string}): JSX.Element;
@@ -45,6 +47,7 @@ const e2 = <TestingOptional y1 y3 extra-prop/>
 
 
 //// [file.jsx]
+/// <reference path="/.lib/react.d.ts" />
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.symbols
index 46f230cc8207d..337c5b10474bf 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.symbols
@@ -1,196 +1,198 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 declare function OneThing(k: {yxx: string}): JSX.Element;
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 57), Decl(file.tsx, 3, 76), Decl(file.tsx, 4, 69), Decl(file.tsx, 5, 83))
->k : Symbol(k, Decl(file.tsx, 2, 26))
->yxx : Symbol(yxx, Decl(file.tsx, 2, 30))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 57), Decl(file.tsx, 5, 76), Decl(file.tsx, 6, 69), Decl(file.tsx, 7, 83))
+>k : Symbol(k, Decl(file.tsx, 4, 26))
+>yxx : Symbol(yxx, Decl(file.tsx, 4, 30))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function OneThing(k: {yxx1: string, children: string}): JSX.Element;
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 57), Decl(file.tsx, 3, 76), Decl(file.tsx, 4, 69), Decl(file.tsx, 5, 83))
->k : Symbol(k, Decl(file.tsx, 3, 26))
->yxx1 : Symbol(yxx1, Decl(file.tsx, 3, 30))
->children : Symbol(children, Decl(file.tsx, 3, 43))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 57), Decl(file.tsx, 5, 76), Decl(file.tsx, 6, 69), Decl(file.tsx, 7, 83))
+>k : Symbol(k, Decl(file.tsx, 5, 26))
+>yxx1 : Symbol(yxx1, Decl(file.tsx, 5, 30))
+>children : Symbol(children, Decl(file.tsx, 5, 43))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function OneThing(l: {yy: number, yy1: string}): JSX.Element;
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 57), Decl(file.tsx, 3, 76), Decl(file.tsx, 4, 69), Decl(file.tsx, 5, 83))
->l : Symbol(l, Decl(file.tsx, 4, 26))
->yy : Symbol(yy, Decl(file.tsx, 4, 30))
->yy1 : Symbol(yy1, Decl(file.tsx, 4, 41))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 57), Decl(file.tsx, 5, 76), Decl(file.tsx, 6, 69), Decl(file.tsx, 7, 83))
+>l : Symbol(l, Decl(file.tsx, 6, 26))
+>yy : Symbol(yy, Decl(file.tsx, 6, 30))
+>yy1 : Symbol(yy1, Decl(file.tsx, 6, 41))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function OneThing(l: {yy: number, yy1: string, yy2: boolean}): JSX.Element;
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 57), Decl(file.tsx, 3, 76), Decl(file.tsx, 4, 69), Decl(file.tsx, 5, 83))
->l : Symbol(l, Decl(file.tsx, 5, 26))
->yy : Symbol(yy, Decl(file.tsx, 5, 30))
->yy1 : Symbol(yy1, Decl(file.tsx, 5, 41))
->yy2 : Symbol(yy2, Decl(file.tsx, 5, 54))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 57), Decl(file.tsx, 5, 76), Decl(file.tsx, 6, 69), Decl(file.tsx, 7, 83))
+>l : Symbol(l, Decl(file.tsx, 7, 26))
+>yy : Symbol(yy, Decl(file.tsx, 7, 30))
+>yy1 : Symbol(yy1, Decl(file.tsx, 7, 41))
+>yy2 : Symbol(yy2, Decl(file.tsx, 7, 54))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function OneThing(l1: {data: string, "data-prop": boolean}): JSX.Element;
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 57), Decl(file.tsx, 3, 76), Decl(file.tsx, 4, 69), Decl(file.tsx, 5, 83))
->l1 : Symbol(l1, Decl(file.tsx, 6, 26))
->data : Symbol(data, Decl(file.tsx, 6, 31))
->"data-prop" : Symbol("data-prop", Decl(file.tsx, 6, 44))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 57), Decl(file.tsx, 5, 76), Decl(file.tsx, 6, 69), Decl(file.tsx, 7, 83))
+>l1 : Symbol(l1, Decl(file.tsx, 8, 26))
+>data : Symbol(data, Decl(file.tsx, 8, 31))
+>"data-prop" : Symbol("data-prop", Decl(file.tsx, 8, 44))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 // OK
 const c1 = <OneThing yxx='ok' />
->c1 : Symbol(c1, Decl(file.tsx, 9, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 57), Decl(file.tsx, 3, 76), Decl(file.tsx, 4, 69), Decl(file.tsx, 5, 83))
->yxx : Symbol(yxx, Decl(file.tsx, 9, 20))
+>c1 : Symbol(c1, Decl(file.tsx, 11, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 57), Decl(file.tsx, 5, 76), Decl(file.tsx, 6, 69), Decl(file.tsx, 7, 83))
+>yxx : Symbol(yxx, Decl(file.tsx, 11, 20))
 
 const c2 = <OneThing yy={100}  yy1="hello"/>
->c2 : Symbol(c2, Decl(file.tsx, 10, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 57), Decl(file.tsx, 3, 76), Decl(file.tsx, 4, 69), Decl(file.tsx, 5, 83))
->yy : Symbol(yy, Decl(file.tsx, 10, 20))
->yy1 : Symbol(yy1, Decl(file.tsx, 10, 29))
+>c2 : Symbol(c2, Decl(file.tsx, 12, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 57), Decl(file.tsx, 5, 76), Decl(file.tsx, 6, 69), Decl(file.tsx, 7, 83))
+>yy : Symbol(yy, Decl(file.tsx, 12, 20))
+>yy1 : Symbol(yy1, Decl(file.tsx, 12, 29))
 
 const c3 = <OneThing yxx="hello" ignore-prop />
->c3 : Symbol(c3, Decl(file.tsx, 11, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 57), Decl(file.tsx, 3, 76), Decl(file.tsx, 4, 69), Decl(file.tsx, 5, 83))
->yxx : Symbol(yxx, Decl(file.tsx, 11, 20))
->ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 11, 32))
+>c3 : Symbol(c3, Decl(file.tsx, 13, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 57), Decl(file.tsx, 5, 76), Decl(file.tsx, 6, 69), Decl(file.tsx, 7, 83))
+>yxx : Symbol(yxx, Decl(file.tsx, 13, 20))
+>ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 13, 32))
 
 const c4 = <OneThing data="hello" data-prop />
->c4 : Symbol(c4, Decl(file.tsx, 12, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 57), Decl(file.tsx, 3, 76), Decl(file.tsx, 4, 69), Decl(file.tsx, 5, 83))
->data : Symbol(data, Decl(file.tsx, 12, 20))
->data-prop : Symbol(data-prop, Decl(file.tsx, 12, 33))
+>c4 : Symbol(c4, Decl(file.tsx, 14, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 57), Decl(file.tsx, 5, 76), Decl(file.tsx, 6, 69), Decl(file.tsx, 7, 83))
+>data : Symbol(data, Decl(file.tsx, 14, 20))
+>data-prop : Symbol(data-prop, Decl(file.tsx, 14, 33))
 
 const c5 = <OneThing yxx1='ok'>Hello</OneThing>
->c5 : Symbol(c5, Decl(file.tsx, 13, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 57), Decl(file.tsx, 3, 76), Decl(file.tsx, 4, 69), Decl(file.tsx, 5, 83))
->yxx1 : Symbol(yxx1, Decl(file.tsx, 13, 20))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 57), Decl(file.tsx, 3, 76), Decl(file.tsx, 4, 69), Decl(file.tsx, 5, 83))
+>c5 : Symbol(c5, Decl(file.tsx, 15, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 57), Decl(file.tsx, 5, 76), Decl(file.tsx, 6, 69), Decl(file.tsx, 7, 83))
+>yxx1 : Symbol(yxx1, Decl(file.tsx, 15, 20))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 57), Decl(file.tsx, 5, 76), Decl(file.tsx, 6, 69), Decl(file.tsx, 7, 83))
 
 
 declare function TestingOneThing({y1: string}): JSX.Element;
->TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 13, 47), Decl(file.tsx, 16, 60), Decl(file.tsx, 17, 86), Decl(file.tsx, 18, 83))
+>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 15, 47), Decl(file.tsx, 18, 60), Decl(file.tsx, 19, 86), Decl(file.tsx, 20, 83))
 >y1 : Symbol(y1)
->string : Symbol(string, Decl(file.tsx, 16, 34))
+>string : Symbol(string, Decl(file.tsx, 18, 34))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function TestingOneThing(j: {"extra-data": string, yy?: string}): JSX.Element;
->TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 13, 47), Decl(file.tsx, 16, 60), Decl(file.tsx, 17, 86), Decl(file.tsx, 18, 83))
->j : Symbol(j, Decl(file.tsx, 17, 33))
->"extra-data" : Symbol("extra-data", Decl(file.tsx, 17, 37))
->yy : Symbol(yy, Decl(file.tsx, 17, 58))
+>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 15, 47), Decl(file.tsx, 18, 60), Decl(file.tsx, 19, 86), Decl(file.tsx, 20, 83))
+>j : Symbol(j, Decl(file.tsx, 19, 33))
+>"extra-data" : Symbol("extra-data", Decl(file.tsx, 19, 37))
+>yy : Symbol(yy, Decl(file.tsx, 19, 58))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function TestingOneThing(n: {yy: number, direction?: number}): JSX.Element;
->TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 13, 47), Decl(file.tsx, 16, 60), Decl(file.tsx, 17, 86), Decl(file.tsx, 18, 83))
->n : Symbol(n, Decl(file.tsx, 18, 33))
->yy : Symbol(yy, Decl(file.tsx, 18, 37))
->direction : Symbol(direction, Decl(file.tsx, 18, 48))
+>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 15, 47), Decl(file.tsx, 18, 60), Decl(file.tsx, 19, 86), Decl(file.tsx, 20, 83))
+>n : Symbol(n, Decl(file.tsx, 20, 33))
+>yy : Symbol(yy, Decl(file.tsx, 20, 37))
+>direction : Symbol(direction, Decl(file.tsx, 20, 48))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function TestingOneThing(n: {yy: string, name: string}): JSX.Element;
->TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 13, 47), Decl(file.tsx, 16, 60), Decl(file.tsx, 17, 86), Decl(file.tsx, 18, 83))
->n : Symbol(n, Decl(file.tsx, 19, 33))
->yy : Symbol(yy, Decl(file.tsx, 19, 37))
->name : Symbol(name, Decl(file.tsx, 19, 48))
+>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 15, 47), Decl(file.tsx, 18, 60), Decl(file.tsx, 19, 86), Decl(file.tsx, 20, 83))
+>n : Symbol(n, Decl(file.tsx, 21, 33))
+>yy : Symbol(yy, Decl(file.tsx, 21, 37))
+>name : Symbol(name, Decl(file.tsx, 21, 48))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 // OK
 const d1 = <TestingOneThing y1 extra-data />;
->d1 : Symbol(d1, Decl(file.tsx, 22, 5))
->TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 13, 47), Decl(file.tsx, 16, 60), Decl(file.tsx, 17, 86), Decl(file.tsx, 18, 83))
->y1 : Symbol(y1, Decl(file.tsx, 22, 27))
->extra-data : Symbol(extra-data, Decl(file.tsx, 22, 30))
+>d1 : Symbol(d1, Decl(file.tsx, 24, 5))
+>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 15, 47), Decl(file.tsx, 18, 60), Decl(file.tsx, 19, 86), Decl(file.tsx, 20, 83))
+>y1 : Symbol(y1, Decl(file.tsx, 24, 27))
+>extra-data : Symbol(extra-data, Decl(file.tsx, 24, 30))
 
 const d2 = <TestingOneThing extra-data="hello" />;
->d2 : Symbol(d2, Decl(file.tsx, 23, 5))
->TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 13, 47), Decl(file.tsx, 16, 60), Decl(file.tsx, 17, 86), Decl(file.tsx, 18, 83))
->extra-data : Symbol(extra-data, Decl(file.tsx, 23, 27))
+>d2 : Symbol(d2, Decl(file.tsx, 25, 5))
+>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 15, 47), Decl(file.tsx, 18, 60), Decl(file.tsx, 19, 86), Decl(file.tsx, 20, 83))
+>extra-data : Symbol(extra-data, Decl(file.tsx, 25, 27))
 
 const d3 = <TestingOneThing extra-data="hello" yy="hihi" />;
->d3 : Symbol(d3, Decl(file.tsx, 24, 5))
->TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 13, 47), Decl(file.tsx, 16, 60), Decl(file.tsx, 17, 86), Decl(file.tsx, 18, 83))
->extra-data : Symbol(extra-data, Decl(file.tsx, 24, 27))
->yy : Symbol(yy, Decl(file.tsx, 24, 46))
+>d3 : Symbol(d3, Decl(file.tsx, 26, 5))
+>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 15, 47), Decl(file.tsx, 18, 60), Decl(file.tsx, 19, 86), Decl(file.tsx, 20, 83))
+>extra-data : Symbol(extra-data, Decl(file.tsx, 26, 27))
+>yy : Symbol(yy, Decl(file.tsx, 26, 46))
 
 const d4 = <TestingOneThing extra-data="hello" yy={9} direction={10} />;
->d4 : Symbol(d4, Decl(file.tsx, 25, 5))
->TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 13, 47), Decl(file.tsx, 16, 60), Decl(file.tsx, 17, 86), Decl(file.tsx, 18, 83))
->extra-data : Symbol(extra-data, Decl(file.tsx, 25, 27))
->yy : Symbol(yy, Decl(file.tsx, 25, 46))
->direction : Symbol(direction, Decl(file.tsx, 25, 53))
+>d4 : Symbol(d4, Decl(file.tsx, 27, 5))
+>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 15, 47), Decl(file.tsx, 18, 60), Decl(file.tsx, 19, 86), Decl(file.tsx, 20, 83))
+>extra-data : Symbol(extra-data, Decl(file.tsx, 27, 27))
+>yy : Symbol(yy, Decl(file.tsx, 27, 46))
+>direction : Symbol(direction, Decl(file.tsx, 27, 53))
 
 const d5 = <TestingOneThing extra-data="hello" yy="hello" name="Bob" />;
->d5 : Symbol(d5, Decl(file.tsx, 26, 5))
->TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 13, 47), Decl(file.tsx, 16, 60), Decl(file.tsx, 17, 86), Decl(file.tsx, 18, 83))
->extra-data : Symbol(extra-data, Decl(file.tsx, 26, 27))
->yy : Symbol(yy, Decl(file.tsx, 26, 46))
->name : Symbol(name, Decl(file.tsx, 26, 57))
+>d5 : Symbol(d5, Decl(file.tsx, 28, 5))
+>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 15, 47), Decl(file.tsx, 18, 60), Decl(file.tsx, 19, 86), Decl(file.tsx, 20, 83))
+>extra-data : Symbol(extra-data, Decl(file.tsx, 28, 27))
+>yy : Symbol(yy, Decl(file.tsx, 28, 46))
+>name : Symbol(name, Decl(file.tsx, 28, 57))
 
 
 declare function TestingOptional(a: {y1?: string, y2?: number}): JSX.Element;
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 26, 72), Decl(file.tsx, 29, 77))
->a : Symbol(a, Decl(file.tsx, 29, 33))
->y1 : Symbol(y1, Decl(file.tsx, 29, 37))
->y2 : Symbol(y2, Decl(file.tsx, 29, 49))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 28, 72), Decl(file.tsx, 31, 77))
+>a : Symbol(a, Decl(file.tsx, 31, 33))
+>y1 : Symbol(y1, Decl(file.tsx, 31, 37))
+>y2 : Symbol(y2, Decl(file.tsx, 31, 49))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function TestingOptional(a: {y1: boolean, y2?: number, y3: boolean}): JSX.Element;
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 26, 72), Decl(file.tsx, 29, 77))
->a : Symbol(a, Decl(file.tsx, 30, 33))
->y1 : Symbol(y1, Decl(file.tsx, 30, 37))
->y2 : Symbol(y2, Decl(file.tsx, 30, 49))
->y3 : Symbol(y3, Decl(file.tsx, 30, 62))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 28, 72), Decl(file.tsx, 31, 77))
+>a : Symbol(a, Decl(file.tsx, 32, 33))
+>y1 : Symbol(y1, Decl(file.tsx, 32, 37))
+>y2 : Symbol(y2, Decl(file.tsx, 32, 49))
+>y3 : Symbol(y3, Decl(file.tsx, 32, 62))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 // OK
 const e1 = <TestingOptional />
->e1 : Symbol(e1, Decl(file.tsx, 33, 5))
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 26, 72), Decl(file.tsx, 29, 77))
+>e1 : Symbol(e1, Decl(file.tsx, 35, 5))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 28, 72), Decl(file.tsx, 31, 77))
 
 const e3 = <TestingOptional y1="hello"/>
->e3 : Symbol(e3, Decl(file.tsx, 34, 5))
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 26, 72), Decl(file.tsx, 29, 77))
->y1 : Symbol(y1, Decl(file.tsx, 34, 27))
+>e3 : Symbol(e3, Decl(file.tsx, 36, 5))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 28, 72), Decl(file.tsx, 31, 77))
+>y1 : Symbol(y1, Decl(file.tsx, 36, 27))
 
 const e4 = <TestingOptional y1="hello" y2={1000} />
->e4 : Symbol(e4, Decl(file.tsx, 35, 5))
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 26, 72), Decl(file.tsx, 29, 77))
->y1 : Symbol(y1, Decl(file.tsx, 35, 27))
->y2 : Symbol(y2, Decl(file.tsx, 35, 38))
+>e4 : Symbol(e4, Decl(file.tsx, 37, 5))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 28, 72), Decl(file.tsx, 31, 77))
+>y1 : Symbol(y1, Decl(file.tsx, 37, 27))
+>y2 : Symbol(y2, Decl(file.tsx, 37, 38))
 
 const e5 = <TestingOptional y1 y3/>
->e5 : Symbol(e5, Decl(file.tsx, 36, 5))
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 26, 72), Decl(file.tsx, 29, 77))
->y1 : Symbol(y1, Decl(file.tsx, 36, 27))
->y3 : Symbol(y3, Decl(file.tsx, 36, 30))
+>e5 : Symbol(e5, Decl(file.tsx, 38, 5))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 28, 72), Decl(file.tsx, 31, 77))
+>y1 : Symbol(y1, Decl(file.tsx, 38, 27))
+>y3 : Symbol(y3, Decl(file.tsx, 38, 30))
 
 const e6 = <TestingOptional y1 y3 y2={10} />
->e6 : Symbol(e6, Decl(file.tsx, 37, 5))
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 26, 72), Decl(file.tsx, 29, 77))
->y1 : Symbol(y1, Decl(file.tsx, 37, 27))
->y3 : Symbol(y3, Decl(file.tsx, 37, 30))
->y2 : Symbol(y2, Decl(file.tsx, 37, 33))
+>e6 : Symbol(e6, Decl(file.tsx, 39, 5))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 28, 72), Decl(file.tsx, 31, 77))
+>y1 : Symbol(y1, Decl(file.tsx, 39, 27))
+>y3 : Symbol(y3, Decl(file.tsx, 39, 30))
+>y2 : Symbol(y2, Decl(file.tsx, 39, 33))
 
 const e2 = <TestingOptional y1 y3 extra-prop/>
->e2 : Symbol(e2, Decl(file.tsx, 38, 5))
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 26, 72), Decl(file.tsx, 29, 77))
->y1 : Symbol(y1, Decl(file.tsx, 38, 27))
->y3 : Symbol(y3, Decl(file.tsx, 38, 30))
->extra-prop : Symbol(extra-prop, Decl(file.tsx, 38, 33))
+>e2 : Symbol(e2, Decl(file.tsx, 40, 5))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 28, 72), Decl(file.tsx, 31, 77))
+>y1 : Symbol(y1, Decl(file.tsx, 40, 27))
+>y3 : Symbol(y3, Decl(file.tsx, 40, 30))
+>extra-prop : Symbol(extra-prop, Decl(file.tsx, 40, 33))
 
 
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
index 5dbf2a767fc03..9094e06abf225 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.errors.txt
index 5132e02d98719..9599239b66468 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.errors.txt
@@ -3,6 +3,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file.tsx (0 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react')
     declare function OneThing(): JSX.Element;
     declare function OneThing(l: {yy: number, yy1: string}): JSX.Element;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.js b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.js
index 8af3285bad119..e8487383495bd 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload2.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react')
 declare function OneThing(): JSX.Element;
 declare function OneThing(l: {yy: number, yy1: string}): JSX.Element;
@@ -35,6 +37,7 @@ const c10 = <OneThing {...obj2} yy1="boo" />;
 
 
 //// [file.jsx]
+/// <reference path="/.lib/react.d.ts" />
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.symbols
index b035058d26867..d920b3dd0faf3 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.symbols
@@ -1,106 +1,108 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 declare function OneThing(): JSX.Element;
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function OneThing(l: {yy: number, yy1: string}): JSX.Element;
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->l : Symbol(l, Decl(file.tsx, 2, 26))
->yy : Symbol(yy, Decl(file.tsx, 2, 30))
->yy1 : Symbol(yy1, Decl(file.tsx, 2, 41))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>l : Symbol(l, Decl(file.tsx, 4, 26))
+>yy : Symbol(yy, Decl(file.tsx, 4, 30))
+>yy1 : Symbol(yy1, Decl(file.tsx, 4, 41))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 let obj = {
->obj : Symbol(obj, Decl(file.tsx, 4, 3))
+>obj : Symbol(obj, Decl(file.tsx, 6, 3))
 
     yy: 10,
->yy : Symbol(yy, Decl(file.tsx, 4, 11))
+>yy : Symbol(yy, Decl(file.tsx, 6, 11))
 
     yy1: "hello"
->yy1 : Symbol(yy1, Decl(file.tsx, 5, 11))
+>yy1 : Symbol(yy1, Decl(file.tsx, 7, 11))
 }
 
 let obj1 = {
->obj1 : Symbol(obj1, Decl(file.tsx, 9, 3))
+>obj1 : Symbol(obj1, Decl(file.tsx, 11, 3))
 
     yy: true
->yy : Symbol(yy, Decl(file.tsx, 9, 12))
+>yy : Symbol(yy, Decl(file.tsx, 11, 12))
 }
 
 let obj2 = {
->obj2 : Symbol(obj2, Decl(file.tsx, 13, 3))
+>obj2 : Symbol(obj2, Decl(file.tsx, 15, 3))
 
     yy: 500,
->yy : Symbol(yy, Decl(file.tsx, 13, 12))
+>yy : Symbol(yy, Decl(file.tsx, 15, 12))
 
     "ignore-prop": "hello"
->"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 14, 12))
+>"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 16, 12))
 }
 
 let defaultObj: any;
->defaultObj : Symbol(defaultObj, Decl(file.tsx, 18, 3))
+>defaultObj : Symbol(defaultObj, Decl(file.tsx, 20, 3))
 
 // OK
 const c1 = <OneThing />
->c1 : Symbol(c1, Decl(file.tsx, 21, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
+>c1 : Symbol(c1, Decl(file.tsx, 23, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
 
 const c2 = <OneThing {...obj}/>
->c2 : Symbol(c2, Decl(file.tsx, 22, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->obj : Symbol(obj, Decl(file.tsx, 4, 3))
+>c2 : Symbol(c2, Decl(file.tsx, 24, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>obj : Symbol(obj, Decl(file.tsx, 6, 3))
 
 const c3 = <OneThing {...{}} />
->c3 : Symbol(c3, Decl(file.tsx, 23, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
+>c3 : Symbol(c3, Decl(file.tsx, 25, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
 
 const c4 = <OneThing {...obj1} {...obj} />
->c4 : Symbol(c4, Decl(file.tsx, 24, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->obj1 : Symbol(obj1, Decl(file.tsx, 9, 3))
->obj : Symbol(obj, Decl(file.tsx, 4, 3))
+>c4 : Symbol(c4, Decl(file.tsx, 26, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>obj1 : Symbol(obj1, Decl(file.tsx, 11, 3))
+>obj : Symbol(obj, Decl(file.tsx, 6, 3))
 
 const c5 = <OneThing {...obj1} yy={42} {...{yy1: "hi"}}/>
->c5 : Symbol(c5, Decl(file.tsx, 25, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->obj1 : Symbol(obj1, Decl(file.tsx, 9, 3))
->yy : Symbol(yy, Decl(file.tsx, 25, 30))
->yy1 : Symbol(yy1, Decl(file.tsx, 25, 44))
+>c5 : Symbol(c5, Decl(file.tsx, 27, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>obj1 : Symbol(obj1, Decl(file.tsx, 11, 3))
+>yy : Symbol(yy, Decl(file.tsx, 27, 30))
+>yy1 : Symbol(yy1, Decl(file.tsx, 27, 44))
 
 const c6 = <OneThing {...obj1} {...{yy: 10000, yy1: "true"}} />
->c6 : Symbol(c6, Decl(file.tsx, 26, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->obj1 : Symbol(obj1, Decl(file.tsx, 9, 3))
->yy : Symbol(yy, Decl(file.tsx, 26, 36))
->yy1 : Symbol(yy1, Decl(file.tsx, 26, 46))
+>c6 : Symbol(c6, Decl(file.tsx, 28, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>obj1 : Symbol(obj1, Decl(file.tsx, 11, 3))
+>yy : Symbol(yy, Decl(file.tsx, 28, 36))
+>yy1 : Symbol(yy1, Decl(file.tsx, 28, 46))
 
 const c7 = <OneThing {...defaultObj} yy {...obj} />;  // No error. should pick second overload
->c7 : Symbol(c7, Decl(file.tsx, 27, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->defaultObj : Symbol(defaultObj, Decl(file.tsx, 18, 3))
->yy : Symbol(yy, Decl(file.tsx, 27, 36))
->obj : Symbol(obj, Decl(file.tsx, 4, 3))
+>c7 : Symbol(c7, Decl(file.tsx, 29, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>defaultObj : Symbol(defaultObj, Decl(file.tsx, 20, 3))
+>yy : Symbol(yy, Decl(file.tsx, 29, 36))
+>obj : Symbol(obj, Decl(file.tsx, 6, 3))
 
 const c8 = <OneThing ignore-prop={100} />
->c8 : Symbol(c8, Decl(file.tsx, 28, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 28, 20))
+>c8 : Symbol(c8, Decl(file.tsx, 30, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 30, 20))
 
 const c9 = <OneThing {...{ "ignore-prop":200 }} />;
->c9 : Symbol(c9, Decl(file.tsx, 29, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 29, 26))
+>c9 : Symbol(c9, Decl(file.tsx, 31, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 31, 26))
 
 const c10 = <OneThing {...obj2} yy1="boo" />;
->c10 : Symbol(c10, Decl(file.tsx, 30, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->obj2 : Symbol(obj2, Decl(file.tsx, 13, 3))
->yy1 : Symbol(yy1, Decl(file.tsx, 30, 31))
+>c10 : Symbol(c10, Decl(file.tsx, 32, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>obj2 : Symbol(obj2, Decl(file.tsx, 15, 3))
+>yy1 : Symbol(yy1, Decl(file.tsx, 32, 31))
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
index 479db6c2f8e64..f14a3a95dc849 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.errors.txt
index fe4eb1fcc947c..dec1817ad2dfd 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.errors.txt
@@ -3,6 +3,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file.tsx (0 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     interface Context {
         color: any;
     }
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.js b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.js
index 28ce22470c509..975a469ab6c6f 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload3.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 interface Context {
     color: any;
 }
@@ -26,6 +28,7 @@ const three2 = <ThreeThing y2="Bye" />;
 const three3 = <ThreeThing {...obj2} y2={10} />;  // it is just any so we allow it to pass through
 
 //// [file.jsx]
+/// <reference path="/.lib/react.d.ts" />
 var obj2;
 // OK
 var two1 = <ZeroThingOrTwoThing />;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.symbols
index 0f2a85adb8eeb..79b65aa38e199 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.symbols
@@ -1,98 +1,100 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 interface Context {
 >Context : Symbol(Context, Decl(file.tsx, 0, 0))
 
     color: any;
->color : Symbol(Context.color, Decl(file.tsx, 0, 19))
+>color : Symbol(Context.color, Decl(file.tsx, 2, 19))
 }
 declare function ZeroThingOrTwoThing(): JSX.Element;
->ZeroThingOrTwoThing : Symbol(ZeroThingOrTwoThing, Decl(file.tsx, 2, 1), Decl(file.tsx, 3, 52))
+>ZeroThingOrTwoThing : Symbol(ZeroThingOrTwoThing, Decl(file.tsx, 4, 1), Decl(file.tsx, 5, 52))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function ZeroThingOrTwoThing(l: {yy: number, yy1: string}, context: Context): JSX.Element;
->ZeroThingOrTwoThing : Symbol(ZeroThingOrTwoThing, Decl(file.tsx, 2, 1), Decl(file.tsx, 3, 52))
->l : Symbol(l, Decl(file.tsx, 4, 37))
->yy : Symbol(yy, Decl(file.tsx, 4, 41))
->yy1 : Symbol(yy1, Decl(file.tsx, 4, 52))
->context : Symbol(context, Decl(file.tsx, 4, 66))
+>ZeroThingOrTwoThing : Symbol(ZeroThingOrTwoThing, Decl(file.tsx, 4, 1), Decl(file.tsx, 5, 52))
+>l : Symbol(l, Decl(file.tsx, 6, 37))
+>yy : Symbol(yy, Decl(file.tsx, 6, 41))
+>yy1 : Symbol(yy1, Decl(file.tsx, 6, 52))
+>context : Symbol(context, Decl(file.tsx, 6, 66))
 >Context : Symbol(Context, Decl(file.tsx, 0, 0))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 let obj2: any;
->obj2 : Symbol(obj2, Decl(file.tsx, 6, 3))
+>obj2 : Symbol(obj2, Decl(file.tsx, 8, 3))
 
 // OK
 const two1 = <ZeroThingOrTwoThing />;
->two1 : Symbol(two1, Decl(file.tsx, 9, 5))
->ZeroThingOrTwoThing : Symbol(ZeroThingOrTwoThing, Decl(file.tsx, 2, 1), Decl(file.tsx, 3, 52))
+>two1 : Symbol(two1, Decl(file.tsx, 11, 5))
+>ZeroThingOrTwoThing : Symbol(ZeroThingOrTwoThing, Decl(file.tsx, 4, 1), Decl(file.tsx, 5, 52))
 
 const two2 = <ZeroThingOrTwoThing yy={100}  yy1="hello"/>;
->two2 : Symbol(two2, Decl(file.tsx, 10, 5))
->ZeroThingOrTwoThing : Symbol(ZeroThingOrTwoThing, Decl(file.tsx, 2, 1), Decl(file.tsx, 3, 52))
->yy : Symbol(yy, Decl(file.tsx, 10, 33))
->yy1 : Symbol(yy1, Decl(file.tsx, 10, 42))
+>two2 : Symbol(two2, Decl(file.tsx, 12, 5))
+>ZeroThingOrTwoThing : Symbol(ZeroThingOrTwoThing, Decl(file.tsx, 4, 1), Decl(file.tsx, 5, 52))
+>yy : Symbol(yy, Decl(file.tsx, 12, 33))
+>yy1 : Symbol(yy1, Decl(file.tsx, 12, 42))
 
 const two3 = <ZeroThingOrTwoThing {...obj2} />;  // it is just any so we allow it to pass through
->two3 : Symbol(two3, Decl(file.tsx, 11, 5))
->ZeroThingOrTwoThing : Symbol(ZeroThingOrTwoThing, Decl(file.tsx, 2, 1), Decl(file.tsx, 3, 52))
->obj2 : Symbol(obj2, Decl(file.tsx, 6, 3))
+>two3 : Symbol(two3, Decl(file.tsx, 13, 5))
+>ZeroThingOrTwoThing : Symbol(ZeroThingOrTwoThing, Decl(file.tsx, 4, 1), Decl(file.tsx, 5, 52))
+>obj2 : Symbol(obj2, Decl(file.tsx, 8, 3))
 
 const two4 = <ZeroThingOrTwoThing  yy={1000} {...obj2} />;  // it is just any so we allow it to pass through
->two4 : Symbol(two4, Decl(file.tsx, 12, 5))
->ZeroThingOrTwoThing : Symbol(ZeroThingOrTwoThing, Decl(file.tsx, 2, 1), Decl(file.tsx, 3, 52))
->yy : Symbol(yy, Decl(file.tsx, 12, 33))
->obj2 : Symbol(obj2, Decl(file.tsx, 6, 3))
+>two4 : Symbol(two4, Decl(file.tsx, 14, 5))
+>ZeroThingOrTwoThing : Symbol(ZeroThingOrTwoThing, Decl(file.tsx, 4, 1), Decl(file.tsx, 5, 52))
+>yy : Symbol(yy, Decl(file.tsx, 14, 33))
+>obj2 : Symbol(obj2, Decl(file.tsx, 8, 3))
 
 const two5 = <ZeroThingOrTwoThing  {...obj2} yy={1000} />;  // it is just any so we allow it to pass through
->two5 : Symbol(two5, Decl(file.tsx, 13, 5))
->ZeroThingOrTwoThing : Symbol(ZeroThingOrTwoThing, Decl(file.tsx, 2, 1), Decl(file.tsx, 3, 52))
->obj2 : Symbol(obj2, Decl(file.tsx, 6, 3))
->yy : Symbol(yy, Decl(file.tsx, 13, 44))
+>two5 : Symbol(two5, Decl(file.tsx, 15, 5))
+>ZeroThingOrTwoThing : Symbol(ZeroThingOrTwoThing, Decl(file.tsx, 4, 1), Decl(file.tsx, 5, 52))
+>obj2 : Symbol(obj2, Decl(file.tsx, 8, 3))
+>yy : Symbol(yy, Decl(file.tsx, 15, 44))
 
 declare function ThreeThing(l: {y1: string}): JSX.Element;
->ThreeThing : Symbol(ThreeThing, Decl(file.tsx, 13, 58), Decl(file.tsx, 15, 58), Decl(file.tsx, 16, 58))
->l : Symbol(l, Decl(file.tsx, 15, 28))
->y1 : Symbol(y1, Decl(file.tsx, 15, 32))
+>ThreeThing : Symbol(ThreeThing, Decl(file.tsx, 15, 58), Decl(file.tsx, 17, 58), Decl(file.tsx, 18, 58))
+>l : Symbol(l, Decl(file.tsx, 17, 28))
+>y1 : Symbol(y1, Decl(file.tsx, 17, 32))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function ThreeThing(l: {y2: string}): JSX.Element;
->ThreeThing : Symbol(ThreeThing, Decl(file.tsx, 13, 58), Decl(file.tsx, 15, 58), Decl(file.tsx, 16, 58))
->l : Symbol(l, Decl(file.tsx, 16, 28))
->y2 : Symbol(y2, Decl(file.tsx, 16, 32))
+>ThreeThing : Symbol(ThreeThing, Decl(file.tsx, 15, 58), Decl(file.tsx, 17, 58), Decl(file.tsx, 18, 58))
+>l : Symbol(l, Decl(file.tsx, 18, 28))
+>y2 : Symbol(y2, Decl(file.tsx, 18, 32))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function ThreeThing(l: {yy: number, yy1: string}, context: Context, updater: any): JSX.Element;
->ThreeThing : Symbol(ThreeThing, Decl(file.tsx, 13, 58), Decl(file.tsx, 15, 58), Decl(file.tsx, 16, 58))
->l : Symbol(l, Decl(file.tsx, 17, 28))
->yy : Symbol(yy, Decl(file.tsx, 17, 32))
->yy1 : Symbol(yy1, Decl(file.tsx, 17, 43))
->context : Symbol(context, Decl(file.tsx, 17, 57))
+>ThreeThing : Symbol(ThreeThing, Decl(file.tsx, 15, 58), Decl(file.tsx, 17, 58), Decl(file.tsx, 18, 58))
+>l : Symbol(l, Decl(file.tsx, 19, 28))
+>yy : Symbol(yy, Decl(file.tsx, 19, 32))
+>yy1 : Symbol(yy1, Decl(file.tsx, 19, 43))
+>context : Symbol(context, Decl(file.tsx, 19, 57))
 >Context : Symbol(Context, Decl(file.tsx, 0, 0))
->updater : Symbol(updater, Decl(file.tsx, 17, 75))
+>updater : Symbol(updater, Decl(file.tsx, 19, 75))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 // OK
 const three1 = <ThreeThing yy={99} yy1="hello world" />;
->three1 : Symbol(three1, Decl(file.tsx, 20, 5))
->ThreeThing : Symbol(ThreeThing, Decl(file.tsx, 13, 58), Decl(file.tsx, 15, 58), Decl(file.tsx, 16, 58))
->yy : Symbol(yy, Decl(file.tsx, 20, 26))
->yy1 : Symbol(yy1, Decl(file.tsx, 20, 34))
+>three1 : Symbol(three1, Decl(file.tsx, 22, 5))
+>ThreeThing : Symbol(ThreeThing, Decl(file.tsx, 15, 58), Decl(file.tsx, 17, 58), Decl(file.tsx, 18, 58))
+>yy : Symbol(yy, Decl(file.tsx, 22, 26))
+>yy1 : Symbol(yy1, Decl(file.tsx, 22, 34))
 
 const three2 = <ThreeThing y2="Bye" />;
->three2 : Symbol(three2, Decl(file.tsx, 21, 5))
->ThreeThing : Symbol(ThreeThing, Decl(file.tsx, 13, 58), Decl(file.tsx, 15, 58), Decl(file.tsx, 16, 58))
->y2 : Symbol(y2, Decl(file.tsx, 21, 26))
+>three2 : Symbol(three2, Decl(file.tsx, 23, 5))
+>ThreeThing : Symbol(ThreeThing, Decl(file.tsx, 15, 58), Decl(file.tsx, 17, 58), Decl(file.tsx, 18, 58))
+>y2 : Symbol(y2, Decl(file.tsx, 23, 26))
 
 const three3 = <ThreeThing {...obj2} y2={10} />;  // it is just any so we allow it to pass through
->three3 : Symbol(three3, Decl(file.tsx, 22, 5))
->ThreeThing : Symbol(ThreeThing, Decl(file.tsx, 13, 58), Decl(file.tsx, 15, 58), Decl(file.tsx, 16, 58))
->obj2 : Symbol(obj2, Decl(file.tsx, 6, 3))
->y2 : Symbol(y2, Decl(file.tsx, 22, 36))
+>three3 : Symbol(three3, Decl(file.tsx, 24, 5))
+>ThreeThing : Symbol(ThreeThing, Decl(file.tsx, 15, 58), Decl(file.tsx, 17, 58), Decl(file.tsx, 18, 58))
+>obj2 : Symbol(obj2, Decl(file.tsx, 8, 3))
+>y2 : Symbol(y2, Decl(file.tsx, 24, 36))
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
index f2aa2b6594741..67fd0a9ffe08a 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 interface Context {
     color: any;
 >color : any
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt
index 725ef6fb2b2bb..b878f8e4d5133 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.errors.txt
@@ -1,57 +1,57 @@
-file.tsx(12,22): error TS2769: No overload matches this call.
+file.tsx(14,22): error TS2769: No overload matches this call.
   Overload 1 of 2, '(): Element', gave the following error.
     Type '{ extraProp: true; }' is not assignable to type 'IntrinsicAttributes'.
       Property 'extraProp' does not exist on type 'IntrinsicAttributes'.
   Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error.
     Type '{ extraProp: true; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
       Property 'extraProp' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
-file.tsx(13,13): error TS2769: No overload matches this call.
+file.tsx(15,13): error TS2769: No overload matches this call.
   Overload 1 of 2, '(): Element', gave the following error.
     Type '{ yy: number; }' is not assignable to type 'IntrinsicAttributes'.
       Property 'yy' does not exist on type 'IntrinsicAttributes'.
   Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error.
     Property 'yy1' is missing in type '{ yy: number; }' but required in type '{ yy: number; yy1: string; }'.
-file.tsx(14,31): error TS2769: No overload matches this call.
+file.tsx(16,31): error TS2769: No overload matches this call.
   Overload 1 of 2, '(): Element', gave the following error.
     Type '{ yy1: true; yy: number; }' is not assignable to type 'IntrinsicAttributes'.
       Property 'yy1' does not exist on type 'IntrinsicAttributes'.
   Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error.
     Type 'boolean' is not assignable to type 'string'.
-file.tsx(16,31): error TS2769: No overload matches this call.
+file.tsx(18,31): error TS2769: No overload matches this call.
   Overload 1 of 2, '(): Element', gave the following error.
     Type '{ y1: number; yy: number; yy1: string; }' is not assignable to type 'IntrinsicAttributes'.
       Property 'y1' does not exist on type 'IntrinsicAttributes'.
   Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error.
     Type '{ y1: number; yy: number; yy1: string; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
       Property 'y1' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'.
-file.tsx(17,13): error TS2769: No overload matches this call.
+file.tsx(19,13): error TS2769: No overload matches this call.
   Overload 1 of 2, '(): Element', gave the following error.
     Type '{ yy: boolean; yy1: string; }' has no properties in common with type 'IntrinsicAttributes'.
   Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error.
     Type '{ yy: boolean; yy1: string; }' is not assignable to type '{ yy: number; yy1: string; }'.
       Types of property 'yy' are incompatible.
         Type 'boolean' is not assignable to type 'number'.
-file.tsx(25,13): error TS2769: No overload matches this call.
+file.tsx(27,13): error TS2769: No overload matches this call.
   Overload 1 of 2, '(j: { "extra-data": string; }): Element', gave the following error.
     Type '{ "extra-data": true; }' is not assignable to type '{ "extra-data": string; }'.
       Types of property '"extra-data"' are incompatible.
         Type 'boolean' is not assignable to type 'string'.
   Overload 2 of 2, '(n: { yy: string; direction?: number; }): Element', gave the following error.
     Property 'yy' is missing in type '{ "extra-data": true; }' but required in type '{ yy: string; direction?: number; }'.
-file.tsx(26,13): error TS2769: No overload matches this call.
+file.tsx(28,13): error TS2769: No overload matches this call.
   Overload 1 of 2, '(j: { "extra-data": string; }): Element', gave the following error.
     Type '{ yy: string; direction: string; }' is not assignable to type 'IntrinsicAttributes & { "extra-data": string; }'.
       Property 'yy' does not exist on type 'IntrinsicAttributes & { "extra-data": string; }'.
   Overload 2 of 2, '(n: { yy: string; direction?: number; }): Element', gave the following error.
     Type 'string' is not assignable to type 'number'.
-file.tsx(33,13): error TS2769: No overload matches this call.
+file.tsx(35,13): error TS2769: No overload matches this call.
   Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error.
     Type 'boolean' is not assignable to type 'string'.
   Overload 2 of 3, '(a: { y1?: string; y2?: number; children: Element; }): Element', gave the following error.
     Type 'boolean' is not assignable to type 'string'.
   Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error.
     Type 'string' is not assignable to type 'boolean'.
-file.tsx(34,13): error TS2769: No overload matches this call.
+file.tsx(36,13): error TS2769: No overload matches this call.
   Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error.
     Type '{ y1: string; y2: number; y3: true; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; }'.
       Property 'y3' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; }'.
@@ -60,7 +60,7 @@ file.tsx(34,13): error TS2769: No overload matches this call.
       Property 'y3' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }'.
   Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error.
     Type 'string' is not assignable to type 'boolean'.
-file.tsx(35,13): error TS2769: No overload matches this call.
+file.tsx(37,13): error TS2769: No overload matches this call.
   Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error.
     Type '{ y1: string; y2: number; children: string; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; }'.
       Property 'children' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; }'.
@@ -68,7 +68,7 @@ file.tsx(35,13): error TS2769: No overload matches this call.
     Type 'string' is not assignable to type 'Element'.
   Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error.
     Type 'string' is not assignable to type 'boolean'.
-file.tsx(36,13): error TS2769: No overload matches this call.
+file.tsx(38,13): error TS2769: No overload matches this call.
   Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error.
     Type '{ children: string; y1: string; y2: number; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; }'.
       Property 'children' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; }'.
@@ -79,6 +79,8 @@ file.tsx(36,13): error TS2769: No overload matches this call.
 
 
 ==== file.tsx (11 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react')
     declare function OneThing(): JSX.Element;
     declare function OneThing(l: {yy: number, yy1: string}): JSX.Element;
@@ -107,7 +109,7 @@ file.tsx(36,13): error TS2769: No overload matches this call.
 !!! error TS2769:       Property 'yy' does not exist on type 'IntrinsicAttributes'.
 !!! error TS2769:   Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error.
 !!! error TS2769:     Property 'yy1' is missing in type '{ yy: number; }' but required in type '{ yy: number; yy1: string; }'.
-!!! related TS2728 file.tsx:3:43: 'yy1' is declared here.
+!!! related TS2728 file.tsx:5:43: 'yy1' is declared here.
     const c2 = <OneThing {...obj} yy1 />; // type incompatible;
                                   ~~~
 !!! error TS2769: No overload matches this call.
@@ -116,7 +118,7 @@ file.tsx(36,13): error TS2769: No overload matches this call.
 !!! error TS2769:       Property 'yy1' does not exist on type 'IntrinsicAttributes'.
 !!! error TS2769:   Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error.
 !!! error TS2769:     Type 'boolean' is not assignable to type 'string'.
-!!! related TS6500 file.tsx:3:43: The expected type comes from property 'yy1' which is declared here on type 'IntrinsicAttributes & { yy: number; yy1: string; }'
+!!! related TS6500 file.tsx:5:43: The expected type comes from property 'yy1' which is declared here on type 'IntrinsicAttributes & { yy: number; yy1: string; }'
     const c3 = <OneThing {...obj} {...{extra: "extra attr"}} />;  //  This is OK because all attribute are spread
     const c4 = <OneThing {...obj} y1={10000} />;  // extra property;
                                   ~~
@@ -152,7 +154,7 @@ file.tsx(36,13): error TS2769: No overload matches this call.
 !!! error TS2769:         Type 'boolean' is not assignable to type 'string'.
 !!! error TS2769:   Overload 2 of 2, '(n: { yy: string; direction?: number; }): Element', gave the following error.
 !!! error TS2769:     Property 'yy' is missing in type '{ "extra-data": true; }' but required in type '{ yy: string; direction?: number; }'.
-!!! related TS2728 file.tsx:22:38: 'yy' is declared here.
+!!! related TS2728 file.tsx:24:38: 'yy' is declared here.
     const d2 = <TestingOneThing yy="hello" direction="left" />
                 ~~~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -161,7 +163,7 @@ file.tsx(36,13): error TS2769: No overload matches this call.
 !!! error TS2769:       Property 'yy' does not exist on type 'IntrinsicAttributes & { "extra-data": string; }'.
 !!! error TS2769:   Overload 2 of 2, '(n: { yy: string; direction?: number; }): Element', gave the following error.
 !!! error TS2769:     Type 'string' is not assignable to type 'number'.
-!!! related TS6500 file.tsx:22:50: The expected type comes from property 'direction' which is declared here on type 'IntrinsicAttributes & { yy: string; direction?: number; }'
+!!! related TS6500 file.tsx:24:50: The expected type comes from property 'direction' which is declared here on type 'IntrinsicAttributes & { yy: string; direction?: number; }'
     
     declare function TestingOptional(a: {y1?: string, y2?: number}): JSX.Element;
     declare function TestingOptional(a: {y1?: string, y2?: number, children: JSX.Element}): JSX.Element;
@@ -177,9 +179,9 @@ file.tsx(36,13): error TS2769: No overload matches this call.
 !!! error TS2769:     Type 'boolean' is not assignable to type 'string'.
 !!! error TS2769:   Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error.
 !!! error TS2769:     Type 'string' is not assignable to type 'boolean'.
-!!! related TS6500 file.tsx:28:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1?: string; y2?: number; }'
-!!! related TS6500 file.tsx:29:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }'
-!!! related TS6500 file.tsx:30:64: The expected type comes from property 'y3' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }'
+!!! related TS6500 file.tsx:30:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1?: string; y2?: number; }'
+!!! related TS6500 file.tsx:31:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }'
+!!! related TS6500 file.tsx:32:64: The expected type comes from property 'y3' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }'
     const e2 = <TestingOptional y1="hello" y2={1000} y3 />
                 ~~~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -191,7 +193,7 @@ file.tsx(36,13): error TS2769: No overload matches this call.
 !!! error TS2769:       Property 'y3' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }'.
 !!! error TS2769:   Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error.
 !!! error TS2769:     Type 'string' is not assignable to type 'boolean'.
-!!! related TS6500 file.tsx:30:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }'
+!!! related TS6500 file.tsx:32:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }'
     const e3 = <TestingOptional y1="hello" y2={1000} children="hi" />
                 ~~~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -202,8 +204,8 @@ file.tsx(36,13): error TS2769: No overload matches this call.
 !!! error TS2769:     Type 'string' is not assignable to type 'Element'.
 !!! error TS2769:   Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error.
 !!! error TS2769:     Type 'string' is not assignable to type 'boolean'.
-!!! related TS6500 file.tsx:29:64: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }'
-!!! related TS6500 file.tsx:30:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }'
+!!! related TS6500 file.tsx:31:64: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }'
+!!! related TS6500 file.tsx:32:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }'
     const e4 = <TestingOptional y1="hello" y2={1000}>Hi</TestingOptional>
                 ~~~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -214,6 +216,6 @@ file.tsx(36,13): error TS2769: No overload matches this call.
 !!! error TS2769:     'TestingOptional' components don't accept text as child elements. Text in JSX has the type 'string', but the expected type of 'children' is 'Element'.
 !!! error TS2769:   Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error.
 !!! error TS2769:     Type 'string' is not assignable to type 'boolean'.
-!!! related TS6500 file.tsx:29:64: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }'
-!!! related TS6500 file.tsx:30:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }'
+!!! related TS6500 file.tsx:31:64: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }'
+!!! related TS6500 file.tsx:32:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }'
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.js b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.js
index eb9ddba05c53e..8505f66e8b40a 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react')
 declare function OneThing(): JSX.Element;
 declare function OneThing(l: {yy: number, yy1: string}): JSX.Element;
@@ -41,6 +43,7 @@ const e4 = <TestingOptional y1="hello" y2={1000}>Hi</TestingOptional>
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 var obj = {
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.symbols
index b2d468e69d920..9e7c919b6199d 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.symbols
@@ -1,161 +1,163 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 declare function OneThing(): JSX.Element;
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function OneThing(l: {yy: number, yy1: string}): JSX.Element;
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->l : Symbol(l, Decl(file.tsx, 2, 26))
->yy : Symbol(yy, Decl(file.tsx, 2, 30))
->yy1 : Symbol(yy1, Decl(file.tsx, 2, 41))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>l : Symbol(l, Decl(file.tsx, 4, 26))
+>yy : Symbol(yy, Decl(file.tsx, 4, 30))
+>yy1 : Symbol(yy1, Decl(file.tsx, 4, 41))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 let obj = {
->obj : Symbol(obj, Decl(file.tsx, 4, 3))
+>obj : Symbol(obj, Decl(file.tsx, 6, 3))
 
     yy: 10,
->yy : Symbol(yy, Decl(file.tsx, 4, 11))
+>yy : Symbol(yy, Decl(file.tsx, 6, 11))
 
     yy1: "hello"
->yy1 : Symbol(yy1, Decl(file.tsx, 5, 11))
+>yy1 : Symbol(yy1, Decl(file.tsx, 7, 11))
 }
 let obj2: any;
->obj2 : Symbol(obj2, Decl(file.tsx, 8, 3))
+>obj2 : Symbol(obj2, Decl(file.tsx, 10, 3))
 
 // Error
 const c0 = <OneThing extraProp />;  // extra property;
->c0 : Symbol(c0, Decl(file.tsx, 11, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->extraProp : Symbol(extraProp, Decl(file.tsx, 11, 20))
+>c0 : Symbol(c0, Decl(file.tsx, 13, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>extraProp : Symbol(extraProp, Decl(file.tsx, 13, 20))
 
 const c1 = <OneThing yy={10}/>;  // missing property;
->c1 : Symbol(c1, Decl(file.tsx, 12, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->yy : Symbol(yy, Decl(file.tsx, 12, 20))
+>c1 : Symbol(c1, Decl(file.tsx, 14, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>yy : Symbol(yy, Decl(file.tsx, 14, 20))
 
 const c2 = <OneThing {...obj} yy1 />; // type incompatible;
->c2 : Symbol(c2, Decl(file.tsx, 13, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->obj : Symbol(obj, Decl(file.tsx, 4, 3))
->yy1 : Symbol(yy1, Decl(file.tsx, 13, 29))
+>c2 : Symbol(c2, Decl(file.tsx, 15, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>obj : Symbol(obj, Decl(file.tsx, 6, 3))
+>yy1 : Symbol(yy1, Decl(file.tsx, 15, 29))
 
 const c3 = <OneThing {...obj} {...{extra: "extra attr"}} />;  //  This is OK because all attribute are spread
->c3 : Symbol(c3, Decl(file.tsx, 14, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->obj : Symbol(obj, Decl(file.tsx, 4, 3))
->extra : Symbol(extra, Decl(file.tsx, 14, 35))
+>c3 : Symbol(c3, Decl(file.tsx, 16, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>obj : Symbol(obj, Decl(file.tsx, 6, 3))
+>extra : Symbol(extra, Decl(file.tsx, 16, 35))
 
 const c4 = <OneThing {...obj} y1={10000} />;  // extra property;
->c4 : Symbol(c4, Decl(file.tsx, 15, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->obj : Symbol(obj, Decl(file.tsx, 4, 3))
->y1 : Symbol(y1, Decl(file.tsx, 15, 29))
+>c4 : Symbol(c4, Decl(file.tsx, 17, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>obj : Symbol(obj, Decl(file.tsx, 6, 3))
+>y1 : Symbol(y1, Decl(file.tsx, 17, 29))
 
 const c5 = <OneThing {...obj} {...{yy: true}} />;  // type incompatible;
->c5 : Symbol(c5, Decl(file.tsx, 16, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->obj : Symbol(obj, Decl(file.tsx, 4, 3))
->yy : Symbol(yy, Decl(file.tsx, 16, 35))
+>c5 : Symbol(c5, Decl(file.tsx, 18, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>obj : Symbol(obj, Decl(file.tsx, 6, 3))
+>yy : Symbol(yy, Decl(file.tsx, 18, 35))
 
 const c6 = <OneThing {...obj2} {...{extra: "extra attr"}} />;  // Should error as there is extra attribute that doesn't match any. Current it is not
->c6 : Symbol(c6, Decl(file.tsx, 17, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->obj2 : Symbol(obj2, Decl(file.tsx, 8, 3))
->extra : Symbol(extra, Decl(file.tsx, 17, 36))
+>c6 : Symbol(c6, Decl(file.tsx, 19, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>obj2 : Symbol(obj2, Decl(file.tsx, 10, 3))
+>extra : Symbol(extra, Decl(file.tsx, 19, 36))
 
 const c7 = <OneThing {...obj2} yy />;  // Should error as there is extra attribute that doesn't match any. Current it is not
->c7 : Symbol(c7, Decl(file.tsx, 18, 5))
->OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
->obj2 : Symbol(obj2, Decl(file.tsx, 8, 3))
->yy : Symbol(yy, Decl(file.tsx, 18, 30))
+>c7 : Symbol(c7, Decl(file.tsx, 20, 5))
+>OneThing : Symbol(OneThing, Decl(file.tsx, 2, 31), Decl(file.tsx, 3, 41))
+>obj2 : Symbol(obj2, Decl(file.tsx, 10, 3))
+>yy : Symbol(yy, Decl(file.tsx, 20, 30))
 
 declare function TestingOneThing(j: {"extra-data": string}): JSX.Element;
->TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 18, 37), Decl(file.tsx, 20, 73))
->j : Symbol(j, Decl(file.tsx, 20, 33))
->"extra-data" : Symbol("extra-data", Decl(file.tsx, 20, 37))
+>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 20, 37), Decl(file.tsx, 22, 73))
+>j : Symbol(j, Decl(file.tsx, 22, 33))
+>"extra-data" : Symbol("extra-data", Decl(file.tsx, 22, 37))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function TestingOneThing(n: {yy: string, direction?: number}): JSX.Element;
->TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 18, 37), Decl(file.tsx, 20, 73))
->n : Symbol(n, Decl(file.tsx, 21, 33))
->yy : Symbol(yy, Decl(file.tsx, 21, 37))
->direction : Symbol(direction, Decl(file.tsx, 21, 48))
+>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 20, 37), Decl(file.tsx, 22, 73))
+>n : Symbol(n, Decl(file.tsx, 23, 33))
+>yy : Symbol(yy, Decl(file.tsx, 23, 37))
+>direction : Symbol(direction, Decl(file.tsx, 23, 48))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 // Error
 const d1 = <TestingOneThing extra-data />
->d1 : Symbol(d1, Decl(file.tsx, 24, 5))
->TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 18, 37), Decl(file.tsx, 20, 73))
->extra-data : Symbol(extra-data, Decl(file.tsx, 24, 27))
+>d1 : Symbol(d1, Decl(file.tsx, 26, 5))
+>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 20, 37), Decl(file.tsx, 22, 73))
+>extra-data : Symbol(extra-data, Decl(file.tsx, 26, 27))
 
 const d2 = <TestingOneThing yy="hello" direction="left" />
->d2 : Symbol(d2, Decl(file.tsx, 25, 5))
->TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 18, 37), Decl(file.tsx, 20, 73))
->yy : Symbol(yy, Decl(file.tsx, 25, 27))
->direction : Symbol(direction, Decl(file.tsx, 25, 38))
+>d2 : Symbol(d2, Decl(file.tsx, 27, 5))
+>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 20, 37), Decl(file.tsx, 22, 73))
+>yy : Symbol(yy, Decl(file.tsx, 27, 27))
+>direction : Symbol(direction, Decl(file.tsx, 27, 38))
 
 declare function TestingOptional(a: {y1?: string, y2?: number}): JSX.Element;
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100))
->a : Symbol(a, Decl(file.tsx, 27, 33))
->y1 : Symbol(y1, Decl(file.tsx, 27, 37))
->y2 : Symbol(y2, Decl(file.tsx, 27, 49))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 27, 58), Decl(file.tsx, 29, 77), Decl(file.tsx, 30, 100))
+>a : Symbol(a, Decl(file.tsx, 29, 33))
+>y1 : Symbol(y1, Decl(file.tsx, 29, 37))
+>y2 : Symbol(y2, Decl(file.tsx, 29, 49))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function TestingOptional(a: {y1?: string, y2?: number, children: JSX.Element}): JSX.Element;
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100))
->a : Symbol(a, Decl(file.tsx, 28, 33))
->y1 : Symbol(y1, Decl(file.tsx, 28, 37))
->y2 : Symbol(y2, Decl(file.tsx, 28, 49))
->children : Symbol(children, Decl(file.tsx, 28, 62))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 27, 58), Decl(file.tsx, 29, 77), Decl(file.tsx, 30, 100))
+>a : Symbol(a, Decl(file.tsx, 30, 33))
+>y1 : Symbol(y1, Decl(file.tsx, 30, 37))
+>y2 : Symbol(y2, Decl(file.tsx, 30, 49))
+>children : Symbol(children, Decl(file.tsx, 30, 62))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function TestingOptional(a: {y1: boolean, y2?: number, y3: boolean}): JSX.Element;
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100))
->a : Symbol(a, Decl(file.tsx, 29, 33))
->y1 : Symbol(y1, Decl(file.tsx, 29, 37))
->y2 : Symbol(y2, Decl(file.tsx, 29, 49))
->y3 : Symbol(y3, Decl(file.tsx, 29, 62))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 27, 58), Decl(file.tsx, 29, 77), Decl(file.tsx, 30, 100))
+>a : Symbol(a, Decl(file.tsx, 31, 33))
+>y1 : Symbol(y1, Decl(file.tsx, 31, 37))
+>y2 : Symbol(y2, Decl(file.tsx, 31, 49))
+>y3 : Symbol(y3, Decl(file.tsx, 31, 62))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 // Error
 const e1 = <TestingOptional y1 y3="hello"/>
->e1 : Symbol(e1, Decl(file.tsx, 32, 5))
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100))
->y1 : Symbol(y1, Decl(file.tsx, 32, 27))
->y3 : Symbol(y3, Decl(file.tsx, 32, 30))
+>e1 : Symbol(e1, Decl(file.tsx, 34, 5))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 27, 58), Decl(file.tsx, 29, 77), Decl(file.tsx, 30, 100))
+>y1 : Symbol(y1, Decl(file.tsx, 34, 27))
+>y3 : Symbol(y3, Decl(file.tsx, 34, 30))
 
 const e2 = <TestingOptional y1="hello" y2={1000} y3 />
->e2 : Symbol(e2, Decl(file.tsx, 33, 5))
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100))
->y1 : Symbol(y1, Decl(file.tsx, 33, 27))
->y2 : Symbol(y2, Decl(file.tsx, 33, 38))
->y3 : Symbol(y3, Decl(file.tsx, 33, 48))
+>e2 : Symbol(e2, Decl(file.tsx, 35, 5))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 27, 58), Decl(file.tsx, 29, 77), Decl(file.tsx, 30, 100))
+>y1 : Symbol(y1, Decl(file.tsx, 35, 27))
+>y2 : Symbol(y2, Decl(file.tsx, 35, 38))
+>y3 : Symbol(y3, Decl(file.tsx, 35, 48))
 
 const e3 = <TestingOptional y1="hello" y2={1000} children="hi" />
->e3 : Symbol(e3, Decl(file.tsx, 34, 5))
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100))
->y1 : Symbol(y1, Decl(file.tsx, 34, 27))
->y2 : Symbol(y2, Decl(file.tsx, 34, 38))
->children : Symbol(children, Decl(file.tsx, 34, 48))
+>e3 : Symbol(e3, Decl(file.tsx, 36, 5))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 27, 58), Decl(file.tsx, 29, 77), Decl(file.tsx, 30, 100))
+>y1 : Symbol(y1, Decl(file.tsx, 36, 27))
+>y2 : Symbol(y2, Decl(file.tsx, 36, 38))
+>children : Symbol(children, Decl(file.tsx, 36, 48))
 
 const e4 = <TestingOptional y1="hello" y2={1000}>Hi</TestingOptional>
->e4 : Symbol(e4, Decl(file.tsx, 35, 5))
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100))
->y1 : Symbol(y1, Decl(file.tsx, 35, 27))
->y2 : Symbol(y2, Decl(file.tsx, 35, 38))
->TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100))
+>e4 : Symbol(e4, Decl(file.tsx, 37, 5))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 27, 58), Decl(file.tsx, 29, 77), Decl(file.tsx, 30, 100))
+>y1 : Symbol(y1, Decl(file.tsx, 37, 27))
+>y2 : Symbol(y2, Decl(file.tsx, 37, 38))
+>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 27, 58), Decl(file.tsx, 29, 77), Decl(file.tsx, 30, 100))
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
index 54c8b20e97769..2b99147b05b53 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.errors.txt
index cf6aab23da1ff..029a3f87b9e28 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.errors.txt
@@ -1,4 +1,4 @@
-file.tsx(48,13): error TS2769: No overload matches this call.
+file.tsx(50,13): error TS2769: No overload matches this call.
   Overload 1 of 3, '(buttonProps: ButtonProps): Element', gave the following error.
     Type '{ children: string; to: string; onClick: (e: MouseEvent<any>) => void; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'.
       Property 'to' does not exist on type 'IntrinsicAttributes & ButtonProps'.
@@ -8,21 +8,21 @@ file.tsx(48,13): error TS2769: No overload matches this call.
   Overload 3 of 3, '(hyphenProps: HyphenProps): Element', gave the following error.
     Type '{ children: string; to: string; onClick: (e: MouseEvent<any>) => void; }' is not assignable to type 'IntrinsicAttributes & HyphenProps'.
       Property 'to' does not exist on type 'IntrinsicAttributes & HyphenProps'.
-file.tsx(54,51): error TS2769: No overload matches this call.
+file.tsx(56,51): error TS2769: No overload matches this call.
   Overload 1 of 3, '(buttonProps: ButtonProps): Element', gave the following error.
     Type 'number' is not assignable to type 'string'.
   Overload 2 of 3, '(linkProps: LinkProps): Element', gave the following error.
     Type 'number' is not assignable to type 'string'.
   Overload 3 of 3, '(hyphenProps: HyphenProps): Element', gave the following error.
     Type 'number' is not assignable to type 'string'.
-file.tsx(55,68): error TS2769: No overload matches this call.
+file.tsx(57,68): error TS2769: No overload matches this call.
   Overload 1 of 3, '(buttonProps: ButtonProps): Element', gave the following error.
     Type 'boolean' is not assignable to type 'string'.
   Overload 2 of 3, '(linkProps: LinkProps): Element', gave the following error.
     Type 'boolean' is not assignable to type 'string'.
   Overload 3 of 3, '(hyphenProps: HyphenProps): Element', gave the following error.
     Type 'boolean' is not assignable to type 'string'.
-file.tsx(56,13): error TS2769: No overload matches this call.
+file.tsx(58,13): error TS2769: No overload matches this call.
   Overload 1 of 3, '(buttonProps: ButtonProps): Element', gave the following error.
     Property 'onClick' is missing in type '{ "data-format": true; }' but required in type 'ButtonProps'.
   Overload 2 of 3, '(linkProps: LinkProps): Element', gave the following error.
@@ -34,6 +34,8 @@ file.tsx(56,13): error TS2769: No overload matches this call.
 
 
 ==== file.tsx (4 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react')
     
     export interface ClickableProps {
@@ -93,7 +95,7 @@ file.tsx(56,13): error TS2769: No overload matches this call.
 !!! error TS2769:   Overload 3 of 3, '(hyphenProps: HyphenProps): Element', gave the following error.
 !!! error TS2769:     Type '{ children: string; to: string; onClick: (e: MouseEvent<any>) => void; }' is not assignable to type 'IntrinsicAttributes & HyphenProps'.
 !!! error TS2769:       Property 'to' does not exist on type 'IntrinsicAttributes & HyphenProps'.
-!!! related TS2793 file.tsx:38:17: The call would have succeeded against this implementation, but implementation signatures of overloads are not externally visible.
+!!! related TS2793 file.tsx:40:17: The call would have succeeded against this implementation, but implementation signatures of overloads are not externally visible.
     const b1 = <MainButton onClick={(e: any)=> {}} {...obj0}>Hello world</MainButton>;  // extra property;
     const b2 = <MainButton {...{to: "10000"}} {...obj2} />;  // extra property
     const b3 = <MainButton {...{to: "10000"}} {...{onClick: (k) => {}}} />;  // extra property
@@ -108,9 +110,9 @@ file.tsx(56,13): error TS2769: No overload matches this call.
 !!! error TS2769:     Type 'number' is not assignable to type 'string'.
 !!! error TS2769:   Overload 3 of 3, '(hyphenProps: HyphenProps): Element', gave the following error.
 !!! error TS2769:     Type 'number' is not assignable to type 'string'.
-!!! related TS6500 file.tsx:4:5: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & ButtonProps'
-!!! related TS6500 file.tsx:4:5: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & LinkProps'
-!!! related TS6500 file.tsx:4:5: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & HyphenProps'
+!!! related TS6500 file.tsx:6:5: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & ButtonProps'
+!!! related TS6500 file.tsx:6:5: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & LinkProps'
+!!! related TS6500 file.tsx:6:5: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & HyphenProps'
     const b7 = <MainButton {...{ onClick(e: any){} }} children="hello" className />;  // incorrect type for optional attribute
                                                                        ~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -120,9 +122,9 @@ file.tsx(56,13): error TS2769: No overload matches this call.
 !!! error TS2769:     Type 'boolean' is not assignable to type 'string'.
 !!! error TS2769:   Overload 3 of 3, '(hyphenProps: HyphenProps): Element', gave the following error.
 !!! error TS2769:     Type 'boolean' is not assignable to type 'string'.
-!!! related TS6500 file.tsx:5:5: The expected type comes from property 'className' which is declared here on type 'IntrinsicAttributes & ButtonProps'
-!!! related TS6500 file.tsx:5:5: The expected type comes from property 'className' which is declared here on type 'IntrinsicAttributes & LinkProps'
-!!! related TS6500 file.tsx:5:5: The expected type comes from property 'className' which is declared here on type 'IntrinsicAttributes & HyphenProps'
+!!! related TS6500 file.tsx:7:5: The expected type comes from property 'className' which is declared here on type 'IntrinsicAttributes & ButtonProps'
+!!! related TS6500 file.tsx:7:5: The expected type comes from property 'className' which is declared here on type 'IntrinsicAttributes & LinkProps'
+!!! related TS6500 file.tsx:7:5: The expected type comes from property 'className' which is declared here on type 'IntrinsicAttributes & HyphenProps'
     const b8 = <MainButton data-format />;  // incorrect type for specified hyphanated name
                 ~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -134,5 +136,5 @@ file.tsx(56,13): error TS2769: No overload matches this call.
 !!! error TS2769:     Type '{ "data-format": true; }' is not assignable to type 'HyphenProps'.
 !!! error TS2769:       Types of property '"data-format"' are incompatible.
 !!! error TS2769:         Type 'boolean' is not assignable to type 'string'.
-!!! related TS2728 file.tsx:9:5: 'onClick' is declared here.
-!!! related TS2728 file.tsx:13:5: 'to' is declared here.
\ No newline at end of file
+!!! related TS2728 file.tsx:11:5: 'onClick' is declared here.
+!!! related TS2728 file.tsx:15:5: 'to' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js
index 3d71699df61c6..179a803b80569 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload5.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react')
 
 export interface ClickableProps {
@@ -60,6 +62,7 @@ const b8 = <MainButton data-format />;  // incorrect type for specified hyphanat
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MainButton = MainButton;
 var React = require("react");
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.symbols
index 4d5d3e21e4a54..31ba990f3c21c 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.symbols
@@ -1,181 +1,183 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload5.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 export interface ClickableProps {
->ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31))
+>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 2, 31))
 
     children?: string;
->children : Symbol(ClickableProps.children, Decl(file.tsx, 2, 33))
+>children : Symbol(ClickableProps.children, Decl(file.tsx, 4, 33))
 
     className?: string;
->className : Symbol(ClickableProps.className, Decl(file.tsx, 3, 22))
+>className : Symbol(ClickableProps.className, Decl(file.tsx, 5, 22))
 }
 
 export interface ButtonProps extends ClickableProps {
->ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1))
->ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31))
+>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 7, 1))
+>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 2, 31))
 
     onClick: React.MouseEventHandler<any>;
->onClick : Symbol(ButtonProps.onClick, Decl(file.tsx, 7, 53))
+>onClick : Symbol(ButtonProps.onClick, Decl(file.tsx, 9, 53))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >MouseEventHandler : Symbol(React.MouseEventHandler, Decl(react.d.ts, 389, 66))
 }
 
 export interface LinkProps extends ClickableProps {
->LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1))
->ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31))
+>LinkProps : Symbol(LinkProps, Decl(file.tsx, 11, 1))
+>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 2, 31))
 
     to: string;
->to : Symbol(LinkProps.to, Decl(file.tsx, 11, 51))
+>to : Symbol(LinkProps.to, Decl(file.tsx, 13, 51))
 }
 
 export interface HyphenProps extends ClickableProps {
->HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 13, 1))
->ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31))
+>HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 15, 1))
+>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 2, 31))
 
     "data-format": string;
->"data-format" : Symbol(HyphenProps["data-format"], Decl(file.tsx, 15, 53))
+>"data-format" : Symbol(HyphenProps["data-format"], Decl(file.tsx, 17, 53))
 }
 
 let obj0 = {
->obj0 : Symbol(obj0, Decl(file.tsx, 19, 3))
+>obj0 : Symbol(obj0, Decl(file.tsx, 21, 3))
 
     to: "world"
->to : Symbol(to, Decl(file.tsx, 19, 12))
+>to : Symbol(to, Decl(file.tsx, 21, 12))
 
 };
 
 let obj1 = {
->obj1 : Symbol(obj1, Decl(file.tsx, 23, 3))
+>obj1 : Symbol(obj1, Decl(file.tsx, 25, 3))
 
     children: "hi",
->children : Symbol(children, Decl(file.tsx, 23, 12))
+>children : Symbol(children, Decl(file.tsx, 25, 12))
 
     to: "boo"
->to : Symbol(to, Decl(file.tsx, 24, 19))
+>to : Symbol(to, Decl(file.tsx, 26, 19))
 }
 
 let obj2 = {
->obj2 : Symbol(obj2, Decl(file.tsx, 28, 3))
+>obj2 : Symbol(obj2, Decl(file.tsx, 30, 3))
 
     onClick: ()=>{}
->onClick : Symbol(onClick, Decl(file.tsx, 28, 12))
+>onClick : Symbol(onClick, Decl(file.tsx, 30, 12))
 }
 
 let obj3: any;
->obj3 : Symbol(obj3, Decl(file.tsx, 32, 3))
+>obj3 : Symbol(obj3, Decl(file.tsx, 34, 3))
 
 export function MainButton(buttonProps: ButtonProps): JSX.Element;
->MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66))
->buttonProps : Symbol(buttonProps, Decl(file.tsx, 34, 27))
->ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 34, 14), Decl(file.tsx, 36, 66), Decl(file.tsx, 37, 62), Decl(file.tsx, 38, 66))
+>buttonProps : Symbol(buttonProps, Decl(file.tsx, 36, 27))
+>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 7, 1))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 export function MainButton(linkProps: LinkProps): JSX.Element;
->MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66))
->linkProps : Symbol(linkProps, Decl(file.tsx, 35, 27))
->LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 34, 14), Decl(file.tsx, 36, 66), Decl(file.tsx, 37, 62), Decl(file.tsx, 38, 66))
+>linkProps : Symbol(linkProps, Decl(file.tsx, 37, 27))
+>LinkProps : Symbol(LinkProps, Decl(file.tsx, 11, 1))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 export function MainButton(hyphenProps: HyphenProps): JSX.Element;
->MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66))
->hyphenProps : Symbol(hyphenProps, Decl(file.tsx, 36, 27))
->HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 13, 1))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 34, 14), Decl(file.tsx, 36, 66), Decl(file.tsx, 37, 62), Decl(file.tsx, 38, 66))
+>hyphenProps : Symbol(hyphenProps, Decl(file.tsx, 38, 27))
+>HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 15, 1))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 export function MainButton(props: ButtonProps | LinkProps | HyphenProps): JSX.Element {
->MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66))
->props : Symbol(props, Decl(file.tsx, 37, 27))
->ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1))
->LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1))
->HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 13, 1))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 34, 14), Decl(file.tsx, 36, 66), Decl(file.tsx, 37, 62), Decl(file.tsx, 38, 66))
+>props : Symbol(props, Decl(file.tsx, 39, 27))
+>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 7, 1))
+>LinkProps : Symbol(LinkProps, Decl(file.tsx, 11, 1))
+>HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 15, 1))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
     const linkProps = props as LinkProps;
->linkProps : Symbol(linkProps, Decl(file.tsx, 38, 9))
->props : Symbol(props, Decl(file.tsx, 37, 27))
->LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1))
+>linkProps : Symbol(linkProps, Decl(file.tsx, 40, 9))
+>props : Symbol(props, Decl(file.tsx, 39, 27))
+>LinkProps : Symbol(LinkProps, Decl(file.tsx, 11, 1))
 
     if(linkProps.to) {
->linkProps.to : Symbol(LinkProps.to, Decl(file.tsx, 11, 51))
->linkProps : Symbol(linkProps, Decl(file.tsx, 38, 9))
->to : Symbol(LinkProps.to, Decl(file.tsx, 11, 51))
+>linkProps.to : Symbol(LinkProps.to, Decl(file.tsx, 13, 51))
+>linkProps : Symbol(linkProps, Decl(file.tsx, 40, 9))
+>to : Symbol(LinkProps.to, Decl(file.tsx, 13, 51))
 
         return this._buildMainLink(props);
->props : Symbol(props, Decl(file.tsx, 37, 27))
+>props : Symbol(props, Decl(file.tsx, 39, 27))
     }
 
     return this._buildMainButton(props);
->props : Symbol(props, Decl(file.tsx, 37, 27))
+>props : Symbol(props, Decl(file.tsx, 39, 27))
 }
 
 // Error
 const b0 = <MainButton to='/some/path' onClick={(e)=>{}}>GO</MainButton>;  // extra property;
->b0 : Symbol(b0, Decl(file.tsx, 47, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66))
->to : Symbol(to, Decl(file.tsx, 47, 22))
->onClick : Symbol(onClick, Decl(file.tsx, 47, 38))
->e : Symbol(e, Decl(file.tsx, 47, 49))
->MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66))
+>b0 : Symbol(b0, Decl(file.tsx, 49, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 34, 14), Decl(file.tsx, 36, 66), Decl(file.tsx, 37, 62), Decl(file.tsx, 38, 66))
+>to : Symbol(to, Decl(file.tsx, 49, 22))
+>onClick : Symbol(onClick, Decl(file.tsx, 49, 38))
+>e : Symbol(e, Decl(file.tsx, 49, 49))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 34, 14), Decl(file.tsx, 36, 66), Decl(file.tsx, 37, 62), Decl(file.tsx, 38, 66))
 
 const b1 = <MainButton onClick={(e: any)=> {}} {...obj0}>Hello world</MainButton>;  // extra property;
->b1 : Symbol(b1, Decl(file.tsx, 48, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66))
->onClick : Symbol(onClick, Decl(file.tsx, 48, 22))
->e : Symbol(e, Decl(file.tsx, 48, 33))
->obj0 : Symbol(obj0, Decl(file.tsx, 19, 3))
->MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66))
+>b1 : Symbol(b1, Decl(file.tsx, 50, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 34, 14), Decl(file.tsx, 36, 66), Decl(file.tsx, 37, 62), Decl(file.tsx, 38, 66))
+>onClick : Symbol(onClick, Decl(file.tsx, 50, 22))
+>e : Symbol(e, Decl(file.tsx, 50, 33))
+>obj0 : Symbol(obj0, Decl(file.tsx, 21, 3))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 34, 14), Decl(file.tsx, 36, 66), Decl(file.tsx, 37, 62), Decl(file.tsx, 38, 66))
 
 const b2 = <MainButton {...{to: "10000"}} {...obj2} />;  // extra property
->b2 : Symbol(b2, Decl(file.tsx, 49, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66))
->to : Symbol(to, Decl(file.tsx, 49, 28))
->obj2 : Symbol(obj2, Decl(file.tsx, 28, 3))
+>b2 : Symbol(b2, Decl(file.tsx, 51, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 34, 14), Decl(file.tsx, 36, 66), Decl(file.tsx, 37, 62), Decl(file.tsx, 38, 66))
+>to : Symbol(to, Decl(file.tsx, 51, 28))
+>obj2 : Symbol(obj2, Decl(file.tsx, 30, 3))
 
 const b3 = <MainButton {...{to: "10000"}} {...{onClick: (k) => {}}} />;  // extra property
->b3 : Symbol(b3, Decl(file.tsx, 50, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66))
->to : Symbol(to, Decl(file.tsx, 50, 28))
->onClick : Symbol(onClick, Decl(file.tsx, 50, 47))
->k : Symbol(k, Decl(file.tsx, 50, 57))
+>b3 : Symbol(b3, Decl(file.tsx, 52, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 34, 14), Decl(file.tsx, 36, 66), Decl(file.tsx, 37, 62), Decl(file.tsx, 38, 66))
+>to : Symbol(to, Decl(file.tsx, 52, 28))
+>onClick : Symbol(onClick, Decl(file.tsx, 52, 47))
+>k : Symbol(k, Decl(file.tsx, 52, 57))
 
 const b4 = <MainButton {...obj3} to />;  // Should error because Incorrect type; but attributes are any so everything is allowed
->b4 : Symbol(b4, Decl(file.tsx, 51, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66))
->obj3 : Symbol(obj3, Decl(file.tsx, 32, 3))
->to : Symbol(to, Decl(file.tsx, 51, 32))
+>b4 : Symbol(b4, Decl(file.tsx, 53, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 34, 14), Decl(file.tsx, 36, 66), Decl(file.tsx, 37, 62), Decl(file.tsx, 38, 66))
+>obj3 : Symbol(obj3, Decl(file.tsx, 34, 3))
+>to : Symbol(to, Decl(file.tsx, 53, 32))
 
 const b5 = <MainButton {...{ onClick(e: any) { } }} {...obj0} />;  // Spread retain method declaration (see GitHub #13365), so now there is an extra attributes
->b5 : Symbol(b5, Decl(file.tsx, 52, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66))
->onClick : Symbol(onClick, Decl(file.tsx, 52, 28))
->e : Symbol(e, Decl(file.tsx, 52, 37))
->obj0 : Symbol(obj0, Decl(file.tsx, 19, 3))
+>b5 : Symbol(b5, Decl(file.tsx, 54, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 34, 14), Decl(file.tsx, 36, 66), Decl(file.tsx, 37, 62), Decl(file.tsx, 38, 66))
+>onClick : Symbol(onClick, Decl(file.tsx, 54, 28))
+>e : Symbol(e, Decl(file.tsx, 54, 37))
+>obj0 : Symbol(obj0, Decl(file.tsx, 21, 3))
 
 const b6 = <MainButton {...{ onClick(e: any){} }} children={10} />;  // incorrect type for optional attribute
->b6 : Symbol(b6, Decl(file.tsx, 53, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66))
->onClick : Symbol(onClick, Decl(file.tsx, 53, 28))
->e : Symbol(e, Decl(file.tsx, 53, 37))
->children : Symbol(children, Decl(file.tsx, 53, 49))
+>b6 : Symbol(b6, Decl(file.tsx, 55, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 34, 14), Decl(file.tsx, 36, 66), Decl(file.tsx, 37, 62), Decl(file.tsx, 38, 66))
+>onClick : Symbol(onClick, Decl(file.tsx, 55, 28))
+>e : Symbol(e, Decl(file.tsx, 55, 37))
+>children : Symbol(children, Decl(file.tsx, 55, 49))
 
 const b7 = <MainButton {...{ onClick(e: any){} }} children="hello" className />;  // incorrect type for optional attribute
->b7 : Symbol(b7, Decl(file.tsx, 54, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66))
->onClick : Symbol(onClick, Decl(file.tsx, 54, 28))
->e : Symbol(e, Decl(file.tsx, 54, 37))
->children : Symbol(children, Decl(file.tsx, 54, 49))
->className : Symbol(className, Decl(file.tsx, 54, 66))
+>b7 : Symbol(b7, Decl(file.tsx, 56, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 34, 14), Decl(file.tsx, 36, 66), Decl(file.tsx, 37, 62), Decl(file.tsx, 38, 66))
+>onClick : Symbol(onClick, Decl(file.tsx, 56, 28))
+>e : Symbol(e, Decl(file.tsx, 56, 37))
+>children : Symbol(children, Decl(file.tsx, 56, 49))
+>className : Symbol(className, Decl(file.tsx, 56, 66))
 
 const b8 = <MainButton data-format />;  // incorrect type for specified hyphanated name
->b8 : Symbol(b8, Decl(file.tsx, 55, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66))
->data-format : Symbol(data-format, Decl(file.tsx, 55, 22))
+>b8 : Symbol(b8, Decl(file.tsx, 57, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 34, 14), Decl(file.tsx, 36, 66), Decl(file.tsx, 37, 62), Decl(file.tsx, 38, 66))
+>data-format : Symbol(data-format, Decl(file.tsx, 57, 22))
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
index a44c769489372..95090c258484e 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload5.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.js b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.js
index a6c1613a60863..e179cb61c8b9a 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.js
@@ -1,8 +1,12 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload6.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react')
 
+declare function log(...args: any[]): void;
+
 export interface ClickableProps {
     children?: string;
     className?: string;
@@ -49,7 +53,7 @@ const b3 = <MainButton {...{to: 10000}} {...obj} />;
 const b4 = <MainButton {...obj1} />;  // any; just pick the first overload
 const b5 = <MainButton {...obj1} to="/to/somewhere" />;  // should pick the second overload
 const b6 = <MainButton {...obj2} />;
-const b7 = <MainButton {...{onClick: () => { console.log("hi") }}} />;
+const b7 = <MainButton {...{onClick: () => { log("hi") }}} />;
 const b8 = <MainButton {...{onClick() {}}} />;  // OK; method declaration get retained (See GitHub #13365)
 const b9 = <MainButton to='/some/path' extra-prop>GO</MainButton>;
 const b10 = <MainButton to='/some/path' children="hi" ></MainButton>;
@@ -61,6 +65,7 @@ const b12 = <MainButton data-format="Hello world" />
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MainButton = MainButton;
 var React = require("react");
@@ -87,7 +92,7 @@ var b3 = <MainButton {...{ to: 10000 }} {...obj}/>;
 var b4 = <MainButton {...obj1}/>; // any; just pick the first overload
 var b5 = <MainButton {...obj1} to="/to/somewhere"/>; // should pick the second overload
 var b6 = <MainButton {...obj2}/>;
-var b7 = <MainButton {...{ onClick: function () { console.log("hi"); } }}/>;
+var b7 = <MainButton {...{ onClick: function () { log("hi"); } }}/>;
 var b8 = <MainButton {...{ onClick: function () { } }}/>; // OK; method declaration get retained (See GitHub #13365)
 var b9 = <MainButton to='/some/path' extra-prop>GO</MainButton>;
 var b10 = <MainButton to='/some/path' children="hi"></MainButton>;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.symbols
index 0e0656495cc4f..9a4f072e94aeb 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.symbols
@@ -1,193 +1,197 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload6.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
+declare function log(...args: any[]): void;
+>log : Symbol(log, Decl(file.tsx, 2, 31))
+>args : Symbol(args, Decl(file.tsx, 4, 21))
+
 export interface ClickableProps {
->ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31))
+>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 4, 43))
 
     children?: string;
->children : Symbol(ClickableProps.children, Decl(file.tsx, 2, 33))
+>children : Symbol(ClickableProps.children, Decl(file.tsx, 6, 33))
 
     className?: string;
->className : Symbol(ClickableProps.className, Decl(file.tsx, 3, 22))
+>className : Symbol(ClickableProps.className, Decl(file.tsx, 7, 22))
 }
 
 export interface ButtonProps extends ClickableProps {
->ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1))
->ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31))
+>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 9, 1))
+>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 4, 43))
 
     onClick: React.MouseEventHandler<any>;
->onClick : Symbol(ButtonProps.onClick, Decl(file.tsx, 7, 53))
+>onClick : Symbol(ButtonProps.onClick, Decl(file.tsx, 11, 53))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >MouseEventHandler : Symbol(React.MouseEventHandler, Decl(react.d.ts, 389, 66))
 }
 
 export interface LinkProps extends ClickableProps {
->LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1))
->ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31))
+>LinkProps : Symbol(LinkProps, Decl(file.tsx, 13, 1))
+>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 4, 43))
 
     to: string;
->to : Symbol(LinkProps.to, Decl(file.tsx, 11, 51))
+>to : Symbol(LinkProps.to, Decl(file.tsx, 15, 51))
 }
 
 export interface HyphenProps extends ClickableProps {
->HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 13, 1))
->ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31))
+>HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 17, 1))
+>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 4, 43))
 
     "data-format": string;
->"data-format" : Symbol(HyphenProps["data-format"], Decl(file.tsx, 15, 53))
+>"data-format" : Symbol(HyphenProps["data-format"], Decl(file.tsx, 19, 53))
 }
 
 let obj = {
->obj : Symbol(obj, Decl(file.tsx, 19, 3))
+>obj : Symbol(obj, Decl(file.tsx, 23, 3))
 
     children: "hi",
->children : Symbol(children, Decl(file.tsx, 19, 11))
+>children : Symbol(children, Decl(file.tsx, 23, 11))
 
     to: "boo"
->to : Symbol(to, Decl(file.tsx, 20, 19))
+>to : Symbol(to, Decl(file.tsx, 24, 19))
 }
 let obj1: any;
->obj1 : Symbol(obj1, Decl(file.tsx, 23, 3))
+>obj1 : Symbol(obj1, Decl(file.tsx, 27, 3))
 
 let obj2 = {
->obj2 : Symbol(obj2, Decl(file.tsx, 24, 3))
+>obj2 : Symbol(obj2, Decl(file.tsx, 28, 3))
 
     onClick: () => {}
->onClick : Symbol(onClick, Decl(file.tsx, 24, 12))
+>onClick : Symbol(onClick, Decl(file.tsx, 28, 12))
 }
 
 export function MainButton(buttonProps: ButtonProps): JSX.Element;
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->buttonProps : Symbol(buttonProps, Decl(file.tsx, 28, 27))
->ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>buttonProps : Symbol(buttonProps, Decl(file.tsx, 32, 27))
+>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 9, 1))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 export function MainButton(linkProps: LinkProps): JSX.Element;
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->linkProps : Symbol(linkProps, Decl(file.tsx, 29, 27))
->LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>linkProps : Symbol(linkProps, Decl(file.tsx, 33, 27))
+>LinkProps : Symbol(LinkProps, Decl(file.tsx, 13, 1))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 export function MainButton(hyphenProps: HyphenProps): JSX.Element;
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->hyphenProps : Symbol(hyphenProps, Decl(file.tsx, 30, 27))
->HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 13, 1))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>hyphenProps : Symbol(hyphenProps, Decl(file.tsx, 34, 27))
+>HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 17, 1))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 export function MainButton(props: ButtonProps | LinkProps | HyphenProps): JSX.Element {
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->props : Symbol(props, Decl(file.tsx, 31, 27))
->ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1))
->LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1))
->HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 13, 1))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>props : Symbol(props, Decl(file.tsx, 35, 27))
+>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 9, 1))
+>LinkProps : Symbol(LinkProps, Decl(file.tsx, 13, 1))
+>HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 17, 1))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
     const linkProps = props as LinkProps;
->linkProps : Symbol(linkProps, Decl(file.tsx, 32, 9))
->props : Symbol(props, Decl(file.tsx, 31, 27))
->LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1))
+>linkProps : Symbol(linkProps, Decl(file.tsx, 36, 9))
+>props : Symbol(props, Decl(file.tsx, 35, 27))
+>LinkProps : Symbol(LinkProps, Decl(file.tsx, 13, 1))
 
     if(linkProps.to) {
->linkProps.to : Symbol(LinkProps.to, Decl(file.tsx, 11, 51))
->linkProps : Symbol(linkProps, Decl(file.tsx, 32, 9))
->to : Symbol(LinkProps.to, Decl(file.tsx, 11, 51))
+>linkProps.to : Symbol(LinkProps.to, Decl(file.tsx, 15, 51))
+>linkProps : Symbol(linkProps, Decl(file.tsx, 36, 9))
+>to : Symbol(LinkProps.to, Decl(file.tsx, 15, 51))
 
         return this._buildMainLink(props);
->props : Symbol(props, Decl(file.tsx, 31, 27))
+>props : Symbol(props, Decl(file.tsx, 35, 27))
     }
 
     return this._buildMainButton(props);
->props : Symbol(props, Decl(file.tsx, 31, 27))
+>props : Symbol(props, Decl(file.tsx, 35, 27))
 }
 
 // OK
 const b0 = <MainButton to='/some/path'>GO</MainButton>;
->b0 : Symbol(b0, Decl(file.tsx, 41, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->to : Symbol(to, Decl(file.tsx, 41, 22))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
+>b0 : Symbol(b0, Decl(file.tsx, 45, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>to : Symbol(to, Decl(file.tsx, 45, 22))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
 
 const b1 = <MainButton onClick={(e) => {}}>Hello world</MainButton>;
->b1 : Symbol(b1, Decl(file.tsx, 42, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->onClick : Symbol(onClick, Decl(file.tsx, 42, 22))
->e : Symbol(e, Decl(file.tsx, 42, 33))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
+>b1 : Symbol(b1, Decl(file.tsx, 46, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>onClick : Symbol(onClick, Decl(file.tsx, 46, 22))
+>e : Symbol(e, Decl(file.tsx, 46, 33))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
 
 const b2 = <MainButton {...obj} />;
->b2 : Symbol(b2, Decl(file.tsx, 43, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->obj : Symbol(obj, Decl(file.tsx, 19, 3))
+>b2 : Symbol(b2, Decl(file.tsx, 47, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>obj : Symbol(obj, Decl(file.tsx, 23, 3))
 
 const b3 = <MainButton {...{to: 10000}} {...obj} />;
->b3 : Symbol(b3, Decl(file.tsx, 44, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->to : Symbol(to, Decl(file.tsx, 44, 28))
->obj : Symbol(obj, Decl(file.tsx, 19, 3))
+>b3 : Symbol(b3, Decl(file.tsx, 48, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>to : Symbol(to, Decl(file.tsx, 48, 28))
+>obj : Symbol(obj, Decl(file.tsx, 23, 3))
 
 const b4 = <MainButton {...obj1} />;  // any; just pick the first overload
->b4 : Symbol(b4, Decl(file.tsx, 45, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->obj1 : Symbol(obj1, Decl(file.tsx, 23, 3))
+>b4 : Symbol(b4, Decl(file.tsx, 49, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>obj1 : Symbol(obj1, Decl(file.tsx, 27, 3))
 
 const b5 = <MainButton {...obj1} to="/to/somewhere" />;  // should pick the second overload
->b5 : Symbol(b5, Decl(file.tsx, 46, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->obj1 : Symbol(obj1, Decl(file.tsx, 23, 3))
->to : Symbol(to, Decl(file.tsx, 46, 32))
+>b5 : Symbol(b5, Decl(file.tsx, 50, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>obj1 : Symbol(obj1, Decl(file.tsx, 27, 3))
+>to : Symbol(to, Decl(file.tsx, 50, 32))
 
 const b6 = <MainButton {...obj2} />;
->b6 : Symbol(b6, Decl(file.tsx, 47, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->obj2 : Symbol(obj2, Decl(file.tsx, 24, 3))
-
-const b7 = <MainButton {...{onClick: () => { console.log("hi") }}} />;
->b7 : Symbol(b7, Decl(file.tsx, 48, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->onClick : Symbol(onClick, Decl(file.tsx, 48, 28))
->console.log : Symbol(Console.log, Decl(lib.d.ts, --, --))
->console : Symbol(console, Decl(lib.d.ts, --, --))
->log : Symbol(Console.log, Decl(lib.d.ts, --, --))
+>b6 : Symbol(b6, Decl(file.tsx, 51, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>obj2 : Symbol(obj2, Decl(file.tsx, 28, 3))
+
+const b7 = <MainButton {...{onClick: () => { log("hi") }}} />;
+>b7 : Symbol(b7, Decl(file.tsx, 52, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>onClick : Symbol(onClick, Decl(file.tsx, 52, 28))
+>log : Symbol(log, Decl(file.tsx, 2, 31))
 
 const b8 = <MainButton {...{onClick() {}}} />;  // OK; method declaration get retained (See GitHub #13365)
->b8 : Symbol(b8, Decl(file.tsx, 49, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->onClick : Symbol(onClick, Decl(file.tsx, 49, 28))
+>b8 : Symbol(b8, Decl(file.tsx, 53, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>onClick : Symbol(onClick, Decl(file.tsx, 53, 28))
 
 const b9 = <MainButton to='/some/path' extra-prop>GO</MainButton>;
->b9 : Symbol(b9, Decl(file.tsx, 50, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->to : Symbol(to, Decl(file.tsx, 50, 22))
->extra-prop : Symbol(extra-prop, Decl(file.tsx, 50, 38))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
+>b9 : Symbol(b9, Decl(file.tsx, 54, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>to : Symbol(to, Decl(file.tsx, 54, 22))
+>extra-prop : Symbol(extra-prop, Decl(file.tsx, 54, 38))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
 
 const b10 = <MainButton to='/some/path' children="hi" ></MainButton>;
->b10 : Symbol(b10, Decl(file.tsx, 51, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->to : Symbol(to, Decl(file.tsx, 51, 23))
->children : Symbol(children, Decl(file.tsx, 51, 39))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
+>b10 : Symbol(b10, Decl(file.tsx, 55, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>to : Symbol(to, Decl(file.tsx, 55, 23))
+>children : Symbol(children, Decl(file.tsx, 55, 39))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
 
 const b11 = <MainButton onClick={(e) => {}} className="hello" data-format>Hello world</MainButton>;
->b11 : Symbol(b11, Decl(file.tsx, 52, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->onClick : Symbol(onClick, Decl(file.tsx, 52, 23))
->e : Symbol(e, Decl(file.tsx, 52, 34))
->className : Symbol(className, Decl(file.tsx, 52, 43))
->data-format : Symbol(data-format, Decl(file.tsx, 52, 61))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
+>b11 : Symbol(b11, Decl(file.tsx, 56, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>onClick : Symbol(onClick, Decl(file.tsx, 56, 23))
+>e : Symbol(e, Decl(file.tsx, 56, 34))
+>className : Symbol(className, Decl(file.tsx, 56, 43))
+>data-format : Symbol(data-format, Decl(file.tsx, 56, 61))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
 
 const b12 = <MainButton data-format="Hello world" />
->b12 : Symbol(b12, Decl(file.tsx, 53, 5))
->MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66))
->data-format : Symbol(data-format, Decl(file.tsx, 53, 23))
+>b12 : Symbol(b12, Decl(file.tsx, 57, 5))
+>MainButton : Symbol(MainButton, Decl(file.tsx, 30, 1), Decl(file.tsx, 32, 66), Decl(file.tsx, 33, 62), Decl(file.tsx, 34, 66))
+>data-format : Symbol(data-format, Decl(file.tsx, 57, 23))
 
 
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
index 9bad96ee1daee..8f6255f4cdc0d 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
@@ -1,10 +1,18 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload6.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : typeof React
 >      : ^^^^^^^^^^^^
 
+declare function log(...args: any[]): void;
+>log : (...args: any[]) => void
+>    : ^^^^    ^^     ^^^^^    
+>args : any[]
+>     : ^^^^^
+
 export interface ClickableProps {
     children?: string;
 >children : string
@@ -224,27 +232,23 @@ const b6 = <MainButton {...obj2} />;
 >obj2 : { onClick: () => void; }
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^
 
-const b7 = <MainButton {...{onClick: () => { console.log("hi") }}} />;
+const b7 = <MainButton {...{onClick: () => { log("hi") }}} />;
 >b7 : JSX.Element
 >   : ^^^^^^^^^^^
-><MainButton {...{onClick: () => { console.log("hi") }}} /> : JSX.Element
->                                                           : ^^^^^^^^^^^
+><MainButton {...{onClick: () => { log("hi") }}} /> : JSX.Element
+>                                                   : ^^^^^^^^^^^
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 >           : ^^^           ^^           ^^^           ^^^         ^^         ^^^           ^^^           ^^           ^^^           ^^^
->{onClick: () => { console.log("hi") }} : { onClick: () => void; }
->                                       : ^^^^^^^^^^^^^^^^^^^^^^^^
+>{onClick: () => { log("hi") }} : { onClick: () => void; }
+>                               : ^^^^^^^^^^^^^^^^^^^^^^^^
 >onClick : () => void
 >        : ^^^^^^^^^^
->() => { console.log("hi") } : () => void
->                            : ^^^^^^^^^^
->console.log("hi") : void
->                  : ^^^^
->console.log : (message?: any, ...optionalParams: any[]) => void
->            : ^       ^^^   ^^^^^              ^^     ^^^^^    
->console : Console
->        : ^^^^^^^
->log : (message?: any, ...optionalParams: any[]) => void
->    : ^       ^^^   ^^^^^              ^^     ^^^^^    
+>() => { log("hi") } : () => void
+>                    : ^^^^^^^^^^
+>log("hi") : void
+>          : ^^^^
+>log : (...args: any[]) => void
+>    : ^^^^    ^^     ^^^^^    
 >"hi" : "hi"
 >     : ^^^^
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.errors.txt
index 795f9da77205b..311f6647336d3 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.errors.txt
@@ -3,6 +3,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file.tsx (0 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react')
     
     interface MyComponentProp {
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.js b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.js
index 393830a5e1429..b466cbef6f72e 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter1.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react')
 
 interface MyComponentProp {
@@ -16,6 +18,7 @@ let i = <MyComponent values />;  // We infer type arguments here
 let i1 = <MyComponent values="Hello"/>;
 
 //// [file.jsx]
+/// <reference path="/.lib/react.d.ts" />
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.symbols
index cbb84ab6020f4..f4c91c5021b1f 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.symbols
@@ -1,22 +1,24 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface MyComponentProp {
->MyComponentProp : Symbol(MyComponentProp, Decl(file.tsx, 0, 31))
+>MyComponentProp : Symbol(MyComponentProp, Decl(file.tsx, 2, 31))
 
     values: string;
->values : Symbol(MyComponentProp.values, Decl(file.tsx, 2, 27))
+>values : Symbol(MyComponentProp.values, Decl(file.tsx, 4, 27))
 }
 
 function MyComponent<T = MyComponentProp>(attr: T) {
->MyComponent : Symbol(MyComponent, Decl(file.tsx, 4, 1))
->T : Symbol(T, Decl(file.tsx, 6, 21))
->MyComponentProp : Symbol(MyComponentProp, Decl(file.tsx, 0, 31))
->attr : Symbol(attr, Decl(file.tsx, 6, 42))
->T : Symbol(T, Decl(file.tsx, 6, 21))
+>MyComponent : Symbol(MyComponent, Decl(file.tsx, 6, 1))
+>T : Symbol(T, Decl(file.tsx, 8, 21))
+>MyComponentProp : Symbol(MyComponentProp, Decl(file.tsx, 2, 31))
+>attr : Symbol(attr, Decl(file.tsx, 8, 42))
+>T : Symbol(T, Decl(file.tsx, 8, 21))
 
     return <div>attr.values</div>
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -25,12 +27,12 @@ function MyComponent<T = MyComponentProp>(attr: T) {
 
 // OK
 let i = <MyComponent values />;  // We infer type arguments here
->i : Symbol(i, Decl(file.tsx, 11, 3))
->MyComponent : Symbol(MyComponent, Decl(file.tsx, 4, 1))
->values : Symbol(values, Decl(file.tsx, 11, 20))
+>i : Symbol(i, Decl(file.tsx, 13, 3))
+>MyComponent : Symbol(MyComponent, Decl(file.tsx, 6, 1))
+>values : Symbol(values, Decl(file.tsx, 13, 20))
 
 let i1 = <MyComponent values="Hello"/>;
->i1 : Symbol(i1, Decl(file.tsx, 12, 3))
->MyComponent : Symbol(MyComponent, Decl(file.tsx, 4, 1))
->values : Symbol(values, Decl(file.tsx, 12, 21))
+>i1 : Symbol(i1, Decl(file.tsx, 14, 3))
+>MyComponent : Symbol(MyComponent, Decl(file.tsx, 6, 1))
+>values : Symbol(values, Decl(file.tsx, 14, 21))
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types
index 90e48ed14f275..24a79c88e75ec 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.errors.txt
index ebc2736a796d4..c7415202da21b 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.errors.txt
@@ -1,9 +1,11 @@
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-file.tsx(13,24): error TS2322: Type 'number' is not assignable to type 'string'.
+file.tsx(15,24): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react')
     
     interface MyComponentProp {
@@ -19,4 +21,4 @@ file.tsx(13,24): error TS2322: Type 'number' is not assignable to type 'string'.
     let i1 = <MyComponent1 values={5}/>;
                            ~~~~~~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
-!!! related TS6500 file.tsx:4:5: The expected type comes from property 'values' which is declared here on type 'IntrinsicAttributes & MyComponentProp'
\ No newline at end of file
+!!! related TS6500 file.tsx:6:5: The expected type comes from property 'values' which is declared here on type 'IntrinsicAttributes & MyComponentProp'
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.js b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.js
index e85fc71891931..cfff8d495e111 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter2.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react')
 
 interface MyComponentProp {
@@ -16,6 +18,7 @@ function MyComponent1<T extends MyComponentProp>(attr: T) {
 let i1 = <MyComponent1 values={5}/>;
 
 //// [file.jsx]
+/// <reference path="/.lib/react.d.ts" />
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.symbols
index b448d1e9f615d..b424932b22efd 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.symbols
@@ -1,22 +1,24 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface MyComponentProp {
->MyComponentProp : Symbol(MyComponentProp, Decl(file.tsx, 0, 31))
+>MyComponentProp : Symbol(MyComponentProp, Decl(file.tsx, 2, 31))
 
     values: string;
->values : Symbol(MyComponentProp.values, Decl(file.tsx, 2, 27))
+>values : Symbol(MyComponentProp.values, Decl(file.tsx, 4, 27))
 }
 
 function MyComponent1<T extends MyComponentProp>(attr: T) {
->MyComponent1 : Symbol(MyComponent1, Decl(file.tsx, 4, 1))
->T : Symbol(T, Decl(file.tsx, 6, 22))
->MyComponentProp : Symbol(MyComponentProp, Decl(file.tsx, 0, 31))
->attr : Symbol(attr, Decl(file.tsx, 6, 49))
->T : Symbol(T, Decl(file.tsx, 6, 22))
+>MyComponent1 : Symbol(MyComponent1, Decl(file.tsx, 6, 1))
+>T : Symbol(T, Decl(file.tsx, 8, 22))
+>MyComponentProp : Symbol(MyComponentProp, Decl(file.tsx, 2, 31))
+>attr : Symbol(attr, Decl(file.tsx, 8, 49))
+>T : Symbol(T, Decl(file.tsx, 8, 22))
 
     return <div>attr.values</div>
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -26,7 +28,7 @@ function MyComponent1<T extends MyComponentProp>(attr: T) {
 
 // Error
 let i1 = <MyComponent1 values={5}/>;
->i1 : Symbol(i1, Decl(file.tsx, 12, 3))
->MyComponent1 : Symbol(MyComponent1, Decl(file.tsx, 4, 1))
->values : Symbol(values, Decl(file.tsx, 12, 22))
+>i1 : Symbol(i1, Decl(file.tsx, 14, 3))
+>MyComponent1 : Symbol(MyComponent1, Decl(file.tsx, 6, 1))
+>values : Symbol(values, Decl(file.tsx, 14, 22))
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types
index ef82ca9b63018..69e1bcf7d4f3f 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt
index b8437c4b2d8c7..527fa8380ed2d 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents1.errors.txt
@@ -1,18 +1,20 @@
-file.tsx(19,16): error TS2322: Type '{ naaame: string; }' is not assignable to type 'IntrinsicAttributes & { name: string; }'.
+file.tsx(21,16): error TS2322: Type '{ naaame: string; }' is not assignable to type 'IntrinsicAttributes & { name: string; }'.
   Property 'naaame' does not exist on type 'IntrinsicAttributes & { name: string; }'. Did you mean 'name'?
-file.tsx(27,15): error TS2322: Type 'number' is not assignable to type 'string'.
-file.tsx(29,15): error TS2322: Type '{ naaaaaaame: string; }' is not assignable to type 'IntrinsicAttributes & { name?: string; }'.
+file.tsx(29,15): error TS2322: Type 'number' is not assignable to type 'string'.
+file.tsx(31,15): error TS2322: Type '{ naaaaaaame: string; }' is not assignable to type 'IntrinsicAttributes & { name?: string; }'.
   Property 'naaaaaaame' does not exist on type 'IntrinsicAttributes & { name?: string; }'.
-file.tsx(34,10): error TS2741: Property '"prop-name"' is missing in type '{ "extra-prop-name": string; }' but required in type '{ "prop-name": string; }'.
-file.tsx(37,23): error TS2322: Type '{ prop1: true; }' is not assignable to type 'IntrinsicAttributes'.
+file.tsx(36,10): error TS2741: Property '"prop-name"' is missing in type '{ "extra-prop-name": string; }' but required in type '{ "prop-name": string; }'.
+file.tsx(39,23): error TS2322: Type '{ prop1: true; }' is not assignable to type 'IntrinsicAttributes'.
   Property 'prop1' does not exist on type 'IntrinsicAttributes'.
-file.tsx(38,24): error TS2322: Type '{ ref: (x: any) => any; }' is not assignable to type 'IntrinsicAttributes'.
+file.tsx(40,24): error TS2322: Type '{ ref: (x: any) => any; }' is not assignable to type 'IntrinsicAttributes'.
   Property 'ref' does not exist on type 'IntrinsicAttributes'.
-file.tsx(41,16): error TS1005: ',' expected.
-file.tsx(45,11): error TS2559: Type '{ prop1: boolean; }' has no properties in common with type 'IntrinsicAttributes'.
+file.tsx(43,16): error TS1005: ',' expected.
+file.tsx(47,11): error TS2559: Type '{ prop1: boolean; }' has no properties in common with type 'IntrinsicAttributes'.
 
 
 ==== file.tsx (8 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     function EmptyPropSFC() {
         return <div> Default Greeting </div>;
     }
@@ -57,7 +59,7 @@ file.tsx(45,11): error TS2559: Type '{ prop1: boolean; }' has no properties in c
     let h = <MeetAndGreet extra-prop-name="World" />;
              ~~~~~~~~~~~~
 !!! error TS2741: Property '"prop-name"' is missing in type '{ "extra-prop-name": string; }' but required in type '{ "prop-name": string; }'.
-!!! related TS2728 file.tsx:11:27: '"prop-name"' is declared here.
+!!! related TS2728 file.tsx:13:27: '"prop-name"' is declared here.
     
     // Error
     let i = <EmptyPropSFC prop1 />
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents1.js b/tests/baselines/reference/tsxStatelessFunctionComponents1.js
index 826f1ad785ad4..db053401c5986 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents1.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents1.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponents1.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 function EmptyPropSFC() {
     return <div> Default Greeting </div>;
 }
@@ -58,6 +60,7 @@ let j4 = <EmptyPropSFC {...{ "data-info": "hi"}} />
 
 
 //// [file.jsx]
+/// <reference path="/.lib/react.d.ts" />
 function EmptyPropSFC() {
     return <div> Default Greeting </div>;
 }
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents1.symbols b/tests/baselines/reference/tsxStatelessFunctionComponents1.symbols
index 4ba544e558f65..f5b79a0e9839a 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents1.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents1.symbols
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponents1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 function EmptyPropSFC() {
 >EmptyPropSFC : Symbol(EmptyPropSFC, Decl(file.tsx, 0, 0))
 
@@ -10,28 +12,28 @@ function EmptyPropSFC() {
 }
 
 function Greet(x: {name: string}) {
->Greet : Symbol(Greet, Decl(file.tsx, 2, 1))
->x : Symbol(x, Decl(file.tsx, 4, 15))
->name : Symbol(name, Decl(file.tsx, 4, 19))
+>Greet : Symbol(Greet, Decl(file.tsx, 4, 1))
+>x : Symbol(x, Decl(file.tsx, 6, 15))
+>name : Symbol(name, Decl(file.tsx, 6, 19))
 
 	return <div>Hello, {x}</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->x : Symbol(x, Decl(file.tsx, 4, 15))
+>x : Symbol(x, Decl(file.tsx, 6, 15))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 }
 function Meet({name = 'world'}) {
->Meet : Symbol(Meet, Decl(file.tsx, 6, 1))
->name : Symbol(name, Decl(file.tsx, 7, 15))
+>Meet : Symbol(Meet, Decl(file.tsx, 8, 1))
+>name : Symbol(name, Decl(file.tsx, 9, 15))
 
 	return <div>Hello, {name}</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->name : Symbol(name, Decl(file.tsx, 7, 15))
+>name : Symbol(name, Decl(file.tsx, 9, 15))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 }
 function MeetAndGreet(k: {"prop-name": string}) {
->MeetAndGreet : Symbol(MeetAndGreet, Decl(file.tsx, 9, 1))
->k : Symbol(k, Decl(file.tsx, 10, 22))
->"prop-name" : Symbol("prop-name", Decl(file.tsx, 10, 26))
+>MeetAndGreet : Symbol(MeetAndGreet, Decl(file.tsx, 11, 1))
+>k : Symbol(k, Decl(file.tsx, 12, 22))
+>"prop-name" : Symbol("prop-name", Decl(file.tsx, 12, 26))
 
 	return <div>Hi Hi</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -40,113 +42,113 @@ function MeetAndGreet(k: {"prop-name": string}) {
 
 // OK
 let a = <Greet name='world' />;
->a : Symbol(a, Decl(file.tsx, 15, 3))
->Greet : Symbol(Greet, Decl(file.tsx, 2, 1))
->name : Symbol(name, Decl(file.tsx, 15, 14))
+>a : Symbol(a, Decl(file.tsx, 17, 3))
+>Greet : Symbol(Greet, Decl(file.tsx, 4, 1))
+>name : Symbol(name, Decl(file.tsx, 17, 14))
 
 let a1 = <Greet name='world' extra-prop />;
->a1 : Symbol(a1, Decl(file.tsx, 16, 3))
->Greet : Symbol(Greet, Decl(file.tsx, 2, 1))
->name : Symbol(name, Decl(file.tsx, 16, 15))
->extra-prop : Symbol(extra-prop, Decl(file.tsx, 16, 28))
+>a1 : Symbol(a1, Decl(file.tsx, 18, 3))
+>Greet : Symbol(Greet, Decl(file.tsx, 4, 1))
+>name : Symbol(name, Decl(file.tsx, 18, 15))
+>extra-prop : Symbol(extra-prop, Decl(file.tsx, 18, 28))
 
 // Error
 let b = <Greet naaame='world' />;
->b : Symbol(b, Decl(file.tsx, 18, 3))
->Greet : Symbol(Greet, Decl(file.tsx, 2, 1))
->naaame : Symbol(naaame, Decl(file.tsx, 18, 14))
+>b : Symbol(b, Decl(file.tsx, 20, 3))
+>Greet : Symbol(Greet, Decl(file.tsx, 4, 1))
+>naaame : Symbol(naaame, Decl(file.tsx, 20, 14))
 
 // OK
 let c = <Meet />;
->c : Symbol(c, Decl(file.tsx, 21, 3))
->Meet : Symbol(Meet, Decl(file.tsx, 6, 1))
+>c : Symbol(c, Decl(file.tsx, 23, 3))
+>Meet : Symbol(Meet, Decl(file.tsx, 8, 1))
 
 let c1 = <Meet extra-prop/>;
->c1 : Symbol(c1, Decl(file.tsx, 22, 3))
->Meet : Symbol(Meet, Decl(file.tsx, 6, 1))
->extra-prop : Symbol(extra-prop, Decl(file.tsx, 22, 14))
+>c1 : Symbol(c1, Decl(file.tsx, 24, 3))
+>Meet : Symbol(Meet, Decl(file.tsx, 8, 1))
+>extra-prop : Symbol(extra-prop, Decl(file.tsx, 24, 14))
 
 // OK
 let d = <Meet name='me' />;
->d : Symbol(d, Decl(file.tsx, 24, 3))
->Meet : Symbol(Meet, Decl(file.tsx, 6, 1))
->name : Symbol(name, Decl(file.tsx, 24, 13))
+>d : Symbol(d, Decl(file.tsx, 26, 3))
+>Meet : Symbol(Meet, Decl(file.tsx, 8, 1))
+>name : Symbol(name, Decl(file.tsx, 26, 13))
 
 // Error
 let e = <Meet name={42} />;
->e : Symbol(e, Decl(file.tsx, 26, 3))
->Meet : Symbol(Meet, Decl(file.tsx, 6, 1))
->name : Symbol(name, Decl(file.tsx, 26, 13))
+>e : Symbol(e, Decl(file.tsx, 28, 3))
+>Meet : Symbol(Meet, Decl(file.tsx, 8, 1))
+>name : Symbol(name, Decl(file.tsx, 28, 13))
 
 // Error
 let f = <Meet naaaaaaame='no' />;
->f : Symbol(f, Decl(file.tsx, 28, 3))
->Meet : Symbol(Meet, Decl(file.tsx, 6, 1))
->naaaaaaame : Symbol(naaaaaaame, Decl(file.tsx, 28, 13))
+>f : Symbol(f, Decl(file.tsx, 30, 3))
+>Meet : Symbol(Meet, Decl(file.tsx, 8, 1))
+>naaaaaaame : Symbol(naaaaaaame, Decl(file.tsx, 30, 13))
 
 // OK
 let g = <MeetAndGreet prop-name="Bob" />;
->g : Symbol(g, Decl(file.tsx, 31, 3))
->MeetAndGreet : Symbol(MeetAndGreet, Decl(file.tsx, 9, 1))
->prop-name : Symbol(prop-name, Decl(file.tsx, 31, 21))
+>g : Symbol(g, Decl(file.tsx, 33, 3))
+>MeetAndGreet : Symbol(MeetAndGreet, Decl(file.tsx, 11, 1))
+>prop-name : Symbol(prop-name, Decl(file.tsx, 33, 21))
 
 // Error
 let h = <MeetAndGreet extra-prop-name="World" />;
->h : Symbol(h, Decl(file.tsx, 33, 3))
->MeetAndGreet : Symbol(MeetAndGreet, Decl(file.tsx, 9, 1))
->extra-prop-name : Symbol(extra-prop-name, Decl(file.tsx, 33, 21))
+>h : Symbol(h, Decl(file.tsx, 35, 3))
+>MeetAndGreet : Symbol(MeetAndGreet, Decl(file.tsx, 11, 1))
+>extra-prop-name : Symbol(extra-prop-name, Decl(file.tsx, 35, 21))
 
 // Error
 let i = <EmptyPropSFC prop1 />
->i : Symbol(i, Decl(file.tsx, 36, 3))
+>i : Symbol(i, Decl(file.tsx, 38, 3))
 >EmptyPropSFC : Symbol(EmptyPropSFC, Decl(file.tsx, 0, 0))
->prop1 : Symbol(prop1, Decl(file.tsx, 36, 21))
+>prop1 : Symbol(prop1, Decl(file.tsx, 38, 21))
 
 let i1 = <EmptyPropSFC ref={x => x.greeting.substr(10)} />
->i1 : Symbol(i1, Decl(file.tsx, 37, 3))
+>i1 : Symbol(i1, Decl(file.tsx, 39, 3))
 >EmptyPropSFC : Symbol(EmptyPropSFC, Decl(file.tsx, 0, 0))
->ref : Symbol(ref, Decl(file.tsx, 37, 22))
->x : Symbol(x, Decl(file.tsx, 37, 28))
->x : Symbol(x, Decl(file.tsx, 37, 28))
+>ref : Symbol(ref, Decl(file.tsx, 39, 22))
+>x : Symbol(x, Decl(file.tsx, 39, 28))
+>x : Symbol(x, Decl(file.tsx, 39, 28))
 
 let o = {
->o : Symbol(o, Decl(file.tsx, 39, 3))
+>o : Symbol(o, Decl(file.tsx, 41, 3))
 
     prop1: true;
->prop1 : Symbol(prop1, Decl(file.tsx, 39, 9))
+>prop1 : Symbol(prop1, Decl(file.tsx, 41, 9))
 }
 
 // OK as access properties are allow when spread
 let i2 = <EmptyPropSFC {...o} />
->i2 : Symbol(i2, Decl(file.tsx, 44, 3))
+>i2 : Symbol(i2, Decl(file.tsx, 46, 3))
 >EmptyPropSFC : Symbol(EmptyPropSFC, Decl(file.tsx, 0, 0))
->o : Symbol(o, Decl(file.tsx, 39, 3))
+>o : Symbol(o, Decl(file.tsx, 41, 3))
 
 let o1: any;
->o1 : Symbol(o1, Decl(file.tsx, 46, 3))
+>o1 : Symbol(o1, Decl(file.tsx, 48, 3))
 
 // OK
 let j = <EmptyPropSFC {...o1} />
->j : Symbol(j, Decl(file.tsx, 48, 3))
+>j : Symbol(j, Decl(file.tsx, 50, 3))
 >EmptyPropSFC : Symbol(EmptyPropSFC, Decl(file.tsx, 0, 0))
->o1 : Symbol(o1, Decl(file.tsx, 46, 3))
+>o1 : Symbol(o1, Decl(file.tsx, 48, 3))
 
 let j1 = <EmptyPropSFC />
->j1 : Symbol(j1, Decl(file.tsx, 49, 3))
+>j1 : Symbol(j1, Decl(file.tsx, 51, 3))
 >EmptyPropSFC : Symbol(EmptyPropSFC, Decl(file.tsx, 0, 0))
 
 let j2 = <EmptyPropSFC data-prop />
->j2 : Symbol(j2, Decl(file.tsx, 50, 3))
+>j2 : Symbol(j2, Decl(file.tsx, 52, 3))
 >EmptyPropSFC : Symbol(EmptyPropSFC, Decl(file.tsx, 0, 0))
->data-prop : Symbol(data-prop, Decl(file.tsx, 50, 22))
+>data-prop : Symbol(data-prop, Decl(file.tsx, 52, 22))
 
 let j3 = <EmptyPropSFC {...{}} />
->j3 : Symbol(j3, Decl(file.tsx, 51, 3))
+>j3 : Symbol(j3, Decl(file.tsx, 53, 3))
 >EmptyPropSFC : Symbol(EmptyPropSFC, Decl(file.tsx, 0, 0))
 
 let j4 = <EmptyPropSFC {...{ "data-info": "hi"}} />
->j4 : Symbol(j4, Decl(file.tsx, 52, 3))
+>j4 : Symbol(j4, Decl(file.tsx, 54, 3))
 >EmptyPropSFC : Symbol(EmptyPropSFC, Decl(file.tsx, 0, 0))
->"data-info" : Symbol("data-info", Decl(file.tsx, 52, 28))
+>"data-info" : Symbol("data-info", Decl(file.tsx, 54, 28))
 
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents1.types b/tests/baselines/reference/tsxStatelessFunctionComponents1.types
index 971bc1646b497..6d642180afb39 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents1.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponents1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 function EmptyPropSFC() {
 >EmptyPropSFC : () => JSX.Element
 >             : ^^^^^^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponents2.errors.txt
index 0249c2a301515..5b1c623b7775a 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.errors.txt
@@ -1,11 +1,13 @@
-file.tsx(19,16): error TS2322: Type '{ ref: string; }' is not assignable to type 'IntrinsicAttributes & { name?: string; }'.
+file.tsx(21,16): error TS2322: Type '{ ref: string; }' is not assignable to type 'IntrinsicAttributes & { name?: string; }'.
   Property 'ref' does not exist on type 'IntrinsicAttributes & { name?: string; }'.
-file.tsx(25,42): error TS2551: Property 'subtr' does not exist on type 'string'. Did you mean 'substr'?
-file.tsx(27,33): error TS2339: Property 'notARealProperty' does not exist on type 'BigGreeter'.
-file.tsx(35,26): error TS2339: Property 'propertyNotOnHtmlDivElement' does not exist on type 'HTMLDivElement'.
+file.tsx(27,42): error TS2551: Property 'subtr' does not exist on type 'string'. Did you mean 'substr'?
+file.tsx(29,33): error TS2339: Property 'notARealProperty' does not exist on type 'BigGreeter'.
+file.tsx(37,26): error TS2339: Property 'propertyNotOnHtmlDivElement' does not exist on type 'HTMLDivElement'.
 
 
 ==== file.tsx (4 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     function Greet(x: {name?: string}) {
@@ -36,7 +38,7 @@ file.tsx(35,26): error TS2339: Property 'propertyNotOnHtmlDivElement' does not e
     let e = <BigGreeter ref={x => x.greeting.subtr(10)} />;
                                              ~~~~~
 !!! error TS2551: Property 'subtr' does not exist on type 'string'. Did you mean 'substr'?
-!!! related TS2728 lib.d.ts:--:--: 'substr' is declared here.
+!!! related TS2728 lib.es5.d.ts:--:--: 'substr' is declared here.
     // Error (ref callback is contextually typed)
     let f = <BigGreeter ref={x => x.notARealProperty} />;
                                     ~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.js b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
index ea70a2818dc75..e4380cb348ee2 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponents2.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 function Greet(x: {name?: string}) {
@@ -41,6 +43,7 @@ let i = <div ref={x => x.propertyNotOnHtmlDivElement} />;
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.symbols b/tests/baselines/reference/tsxStatelessFunctionComponents2.symbols
index 531339356c9b4..9172ccf64b715 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.symbols
@@ -1,108 +1,110 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponents2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 function Greet(x: {name?: string}) {
->Greet : Symbol(Greet, Decl(file.tsx, 0, 32))
->x : Symbol(x, Decl(file.tsx, 2, 15))
->name : Symbol(name, Decl(file.tsx, 2, 19))
+>Greet : Symbol(Greet, Decl(file.tsx, 2, 32))
+>x : Symbol(x, Decl(file.tsx, 4, 15))
+>name : Symbol(name, Decl(file.tsx, 4, 19))
 
 	return <div>Hello, {x}</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->x : Symbol(x, Decl(file.tsx, 2, 15))
+>x : Symbol(x, Decl(file.tsx, 4, 15))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 }
 
 class BigGreeter extends React.Component<{ name?: string }, {}> {
->BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 4, 1))
+>BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 6, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->name : Symbol(name, Decl(file.tsx, 6, 42))
+>name : Symbol(name, Decl(file.tsx, 8, 42))
 
 	render() {
->render : Symbol(BigGreeter.render, Decl(file.tsx, 6, 65))
+>render : Symbol(BigGreeter.render, Decl(file.tsx, 8, 65))
 
 		return <div></div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 	}
 	greeting: string;
->greeting : Symbol(BigGreeter.greeting, Decl(file.tsx, 9, 2))
+>greeting : Symbol(BigGreeter.greeting, Decl(file.tsx, 11, 2))
 }
 
 // OK
 let a = <Greet />;
->a : Symbol(a, Decl(file.tsx, 14, 3))
->Greet : Symbol(Greet, Decl(file.tsx, 0, 32))
+>a : Symbol(a, Decl(file.tsx, 16, 3))
+>Greet : Symbol(Greet, Decl(file.tsx, 2, 32))
 
 // OK - always valid to specify 'key'
 let b = <Greet key="k" />;
->b : Symbol(b, Decl(file.tsx, 16, 3))
->Greet : Symbol(Greet, Decl(file.tsx, 0, 32))
->key : Symbol(key, Decl(file.tsx, 16, 14))
+>b : Symbol(b, Decl(file.tsx, 18, 3))
+>Greet : Symbol(Greet, Decl(file.tsx, 2, 32))
+>key : Symbol(key, Decl(file.tsx, 18, 14))
 
 // Error - not allowed to specify 'ref' on SFCs
 let c = <Greet ref="myRef" />;
->c : Symbol(c, Decl(file.tsx, 18, 3))
->Greet : Symbol(Greet, Decl(file.tsx, 0, 32))
->ref : Symbol(ref, Decl(file.tsx, 18, 14))
+>c : Symbol(c, Decl(file.tsx, 20, 3))
+>Greet : Symbol(Greet, Decl(file.tsx, 2, 32))
+>ref : Symbol(ref, Decl(file.tsx, 20, 14))
 
 
 // OK - ref is valid for classes
 let d = <BigGreeter ref={x => x.greeting.substr(10)} />;
->d : Symbol(d, Decl(file.tsx, 22, 3))
->BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 4, 1))
->ref : Symbol(ref, Decl(file.tsx, 22, 19))
->x : Symbol(x, Decl(file.tsx, 22, 25))
->x.greeting.substr : Symbol(String.substr, Decl(lib.d.ts, --, --))
->x.greeting : Symbol(BigGreeter.greeting, Decl(file.tsx, 9, 2))
->x : Symbol(x, Decl(file.tsx, 22, 25))
->greeting : Symbol(BigGreeter.greeting, Decl(file.tsx, 9, 2))
->substr : Symbol(String.substr, Decl(lib.d.ts, --, --))
-
-// Error ('subtr' not on string)
-let e = <BigGreeter ref={x => x.greeting.subtr(10)} />;
->e : Symbol(e, Decl(file.tsx, 24, 3))
->BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 4, 1))
+>d : Symbol(d, Decl(file.tsx, 24, 3))
+>BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 6, 1))
 >ref : Symbol(ref, Decl(file.tsx, 24, 19))
 >x : Symbol(x, Decl(file.tsx, 24, 25))
->x.greeting : Symbol(BigGreeter.greeting, Decl(file.tsx, 9, 2))
+>x.greeting.substr : Symbol(String.substr, Decl(lib.es5.d.ts, --, --))
+>x.greeting : Symbol(BigGreeter.greeting, Decl(file.tsx, 11, 2))
 >x : Symbol(x, Decl(file.tsx, 24, 25))
->greeting : Symbol(BigGreeter.greeting, Decl(file.tsx, 9, 2))
+>greeting : Symbol(BigGreeter.greeting, Decl(file.tsx, 11, 2))
+>substr : Symbol(String.substr, Decl(lib.es5.d.ts, --, --))
 
-// Error (ref callback is contextually typed)
-let f = <BigGreeter ref={x => x.notARealProperty} />;
->f : Symbol(f, Decl(file.tsx, 26, 3))
->BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 4, 1))
+// Error ('subtr' not on string)
+let e = <BigGreeter ref={x => x.greeting.subtr(10)} />;
+>e : Symbol(e, Decl(file.tsx, 26, 3))
+>BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 6, 1))
 >ref : Symbol(ref, Decl(file.tsx, 26, 19))
 >x : Symbol(x, Decl(file.tsx, 26, 25))
+>x.greeting : Symbol(BigGreeter.greeting, Decl(file.tsx, 11, 2))
 >x : Symbol(x, Decl(file.tsx, 26, 25))
+>greeting : Symbol(BigGreeter.greeting, Decl(file.tsx, 11, 2))
+
+// Error (ref callback is contextually typed)
+let f = <BigGreeter ref={x => x.notARealProperty} />;
+>f : Symbol(f, Decl(file.tsx, 28, 3))
+>BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 6, 1))
+>ref : Symbol(ref, Decl(file.tsx, 28, 19))
+>x : Symbol(x, Decl(file.tsx, 28, 25))
+>x : Symbol(x, Decl(file.tsx, 28, 25))
 
 // OK - key is always valid
 let g = <BigGreeter key={100} />;
->g : Symbol(g, Decl(file.tsx, 29, 3))
->BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 4, 1))
->key : Symbol(key, Decl(file.tsx, 29, 19))
+>g : Symbol(g, Decl(file.tsx, 31, 3))
+>BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 6, 1))
+>key : Symbol(key, Decl(file.tsx, 31, 19))
 
 // OK - contextually typed intrinsic ref callback parameter
 let h = <div ref={x => x.innerText} />;
->h : Symbol(h, Decl(file.tsx, 32, 3))
+>h : Symbol(h, Decl(file.tsx, 34, 3))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->ref : Symbol(ref, Decl(file.tsx, 32, 12))
->x : Symbol(x, Decl(file.tsx, 32, 18))
->x.innerText : Symbol(HTMLElement.innerText, Decl(lib.d.ts, --, --))
->x : Symbol(x, Decl(file.tsx, 32, 18))
->innerText : Symbol(HTMLElement.innerText, Decl(lib.d.ts, --, --))
+>ref : Symbol(ref, Decl(file.tsx, 34, 12))
+>x : Symbol(x, Decl(file.tsx, 34, 18))
+>x.innerText : Symbol(HTMLElement.innerText, Decl(lib.dom.d.ts, --, --))
+>x : Symbol(x, Decl(file.tsx, 34, 18))
+>innerText : Symbol(HTMLElement.innerText, Decl(lib.dom.d.ts, --, --))
 
 // Error - property not on ontextually typed intrinsic ref callback parameter
 let i = <div ref={x => x.propertyNotOnHtmlDivElement} />;
->i : Symbol(i, Decl(file.tsx, 34, 3))
+>i : Symbol(i, Decl(file.tsx, 36, 3))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->ref : Symbol(ref, Decl(file.tsx, 34, 12))
->x : Symbol(x, Decl(file.tsx, 34, 18))
->x : Symbol(x, Decl(file.tsx, 34, 18))
+>ref : Symbol(ref, Decl(file.tsx, 36, 12))
+>x : Symbol(x, Decl(file.tsx, 36, 18))
+>x : Symbol(x, Decl(file.tsx, 36, 18))
 
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.types b/tests/baselines/reference/tsxStatelessFunctionComponents2.types
index b2a4e39632b5d..9856fb6c100d3 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponents2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents3.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponents3.errors.txt
index 38242626b59ab..f5d3adf285d78 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents3.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents3.errors.txt
@@ -3,6 +3,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file.tsx (0 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     const Foo = (props: any) => <div/>;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents3.js b/tests/baselines/reference/tsxStatelessFunctionComponents3.js
index 52c53ad77fbe6..a9fd52085ce78 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents3.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents3.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponents3.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 const Foo = (props: any) => <div/>;
@@ -20,6 +22,7 @@ var App: React.StatelessComponent<{ children }> = ({children}) => (
 );
 
 //// [file.jsx]
+/// <reference path="/.lib/react.d.ts" />
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents3.symbols b/tests/baselines/reference/tsxStatelessFunctionComponents3.symbols
index f1ffa80d79b23..73d996db72e95 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents3.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents3.symbols
@@ -1,26 +1,28 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponents3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 const Foo = (props: any) => <div/>;
->Foo : Symbol(Foo, Decl(file.tsx, 2, 5))
->props : Symbol(props, Decl(file.tsx, 2, 13))
+>Foo : Symbol(Foo, Decl(file.tsx, 4, 5))
+>props : Symbol(props, Decl(file.tsx, 4, 13))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
 // Should be OK
 const foo = <Foo />;
->foo : Symbol(foo, Decl(file.tsx, 4, 5))
->Foo : Symbol(Foo, Decl(file.tsx, 2, 5))
+>foo : Symbol(foo, Decl(file.tsx, 6, 5))
+>Foo : Symbol(Foo, Decl(file.tsx, 4, 5))
 
 
 // Should be OK
 var MainMenu: React.StatelessComponent<{}> = (props) => (<div>
->MainMenu : Symbol(MainMenu, Decl(file.tsx, 8, 3))
+>MainMenu : Symbol(MainMenu, Decl(file.tsx, 10, 3))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >StatelessComponent : Symbol(React.StatelessComponent, Decl(react.d.ts, 198, 40))
->props : Symbol(props, Decl(file.tsx, 8, 46))
+>props : Symbol(props, Decl(file.tsx, 10, 46))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
     <h3>Main Menu</h3>
@@ -31,17 +33,17 @@ var MainMenu: React.StatelessComponent<{}> = (props) => (<div>
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
 var App: React.StatelessComponent<{ children }> = ({children}) => (
->App : Symbol(App, Decl(file.tsx, 12, 3))
+>App : Symbol(App, Decl(file.tsx, 14, 3))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >StatelessComponent : Symbol(React.StatelessComponent, Decl(react.d.ts, 198, 40))
->children : Symbol(children, Decl(file.tsx, 12, 35))
->children : Symbol(children, Decl(file.tsx, 12, 52))
+>children : Symbol(children, Decl(file.tsx, 14, 35))
+>children : Symbol(children, Decl(file.tsx, 14, 52))
 
     <div >
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
         <MainMenu/>
->MainMenu : Symbol(MainMenu, Decl(file.tsx, 8, 3))
+>MainMenu : Symbol(MainMenu, Decl(file.tsx, 10, 3))
 
 	</div>
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents3.types b/tests/baselines/reference/tsxStatelessFunctionComponents3.types
index a3d87d3a03a0a..766083c989446 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents3.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponents3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.errors.txt
index bbe13314ee5bd..596f08b7ab0e0 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.errors.txt
@@ -3,6 +3,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file.tsx (0 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react')
     
     declare function ComponentWithTwoAttributes<K,V>(l: {key1: K, value: V}): JSX.Element;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.js b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.js
index 5134e9d6a6559..88570edef1d5a 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments1.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react')
 
 declare function ComponentWithTwoAttributes<K,V>(l: {key1: K, value: V}): JSX.Element;
@@ -33,6 +35,7 @@ declare function InferParamComponent<T>(attr: InferParamProp<T>): JSX.Element;
 let i = <InferParamComponent values={[1, 2, 3, 4]} selectHandler={(val) => { }} />;
 
 //// [file.jsx]
+/// <reference path="/.lib/react.d.ts" />
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.symbols
index 9ea0354f4397d..9e1cb8294b8bf 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.symbols
@@ -1,112 +1,114 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 declare function ComponentWithTwoAttributes<K,V>(l: {key1: K, value: V}): JSX.Element;
->ComponentWithTwoAttributes : Symbol(ComponentWithTwoAttributes, Decl(file.tsx, 0, 31))
->K : Symbol(K, Decl(file.tsx, 2, 44))
->V : Symbol(V, Decl(file.tsx, 2, 46))
->l : Symbol(l, Decl(file.tsx, 2, 49))
->key1 : Symbol(key1, Decl(file.tsx, 2, 53))
->K : Symbol(K, Decl(file.tsx, 2, 44))
->value : Symbol(value, Decl(file.tsx, 2, 61))
->V : Symbol(V, Decl(file.tsx, 2, 46))
+>ComponentWithTwoAttributes : Symbol(ComponentWithTwoAttributes, Decl(file.tsx, 2, 31))
+>K : Symbol(K, Decl(file.tsx, 4, 44))
+>V : Symbol(V, Decl(file.tsx, 4, 46))
+>l : Symbol(l, Decl(file.tsx, 4, 49))
+>key1 : Symbol(key1, Decl(file.tsx, 4, 53))
+>K : Symbol(K, Decl(file.tsx, 4, 44))
+>value : Symbol(value, Decl(file.tsx, 4, 61))
+>V : Symbol(V, Decl(file.tsx, 4, 46))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 // OK
 function Baz<T,U>(key1: T, value: U) {
->Baz : Symbol(Baz, Decl(file.tsx, 2, 86))
->T : Symbol(T, Decl(file.tsx, 5, 13))
->U : Symbol(U, Decl(file.tsx, 5, 15))
->key1 : Symbol(key1, Decl(file.tsx, 5, 18))
->T : Symbol(T, Decl(file.tsx, 5, 13))
->value : Symbol(value, Decl(file.tsx, 5, 26))
->U : Symbol(U, Decl(file.tsx, 5, 15))
+>Baz : Symbol(Baz, Decl(file.tsx, 4, 86))
+>T : Symbol(T, Decl(file.tsx, 7, 13))
+>U : Symbol(U, Decl(file.tsx, 7, 15))
+>key1 : Symbol(key1, Decl(file.tsx, 7, 18))
+>T : Symbol(T, Decl(file.tsx, 7, 13))
+>value : Symbol(value, Decl(file.tsx, 7, 26))
+>U : Symbol(U, Decl(file.tsx, 7, 15))
 
     let a0 = <ComponentWithTwoAttributes key1={key1} value={value} />
->a0 : Symbol(a0, Decl(file.tsx, 6, 7))
->ComponentWithTwoAttributes : Symbol(ComponentWithTwoAttributes, Decl(file.tsx, 0, 31))
->key1 : Symbol(key1, Decl(file.tsx, 6, 40))
->key1 : Symbol(key1, Decl(file.tsx, 5, 18))
->value : Symbol(value, Decl(file.tsx, 6, 52))
->value : Symbol(value, Decl(file.tsx, 5, 26))
+>a0 : Symbol(a0, Decl(file.tsx, 8, 7))
+>ComponentWithTwoAttributes : Symbol(ComponentWithTwoAttributes, Decl(file.tsx, 2, 31))
+>key1 : Symbol(key1, Decl(file.tsx, 8, 40))
+>key1 : Symbol(key1, Decl(file.tsx, 7, 18))
+>value : Symbol(value, Decl(file.tsx, 8, 52))
+>value : Symbol(value, Decl(file.tsx, 7, 26))
 
     let a1 = <ComponentWithTwoAttributes {...{key1, value: value}} key="Component" />
->a1 : Symbol(a1, Decl(file.tsx, 7, 7))
->ComponentWithTwoAttributes : Symbol(ComponentWithTwoAttributes, Decl(file.tsx, 0, 31))
->key1 : Symbol(key1, Decl(file.tsx, 7, 46))
->value : Symbol(value, Decl(file.tsx, 7, 51))
->value : Symbol(value, Decl(file.tsx, 5, 26))
->key : Symbol(key, Decl(file.tsx, 7, 66))
+>a1 : Symbol(a1, Decl(file.tsx, 9, 7))
+>ComponentWithTwoAttributes : Symbol(ComponentWithTwoAttributes, Decl(file.tsx, 2, 31))
+>key1 : Symbol(key1, Decl(file.tsx, 9, 46))
+>value : Symbol(value, Decl(file.tsx, 9, 51))
+>value : Symbol(value, Decl(file.tsx, 7, 26))
+>key : Symbol(key, Decl(file.tsx, 9, 66))
 }
 
 declare function Link<U>(l: {func: (arg: U)=>void}): JSX.Element;
->Link : Symbol(Link, Decl(file.tsx, 8, 1))
->U : Symbol(U, Decl(file.tsx, 10, 22))
->l : Symbol(l, Decl(file.tsx, 10, 25))
->func : Symbol(func, Decl(file.tsx, 10, 29))
->arg : Symbol(arg, Decl(file.tsx, 10, 36))
->U : Symbol(U, Decl(file.tsx, 10, 22))
+>Link : Symbol(Link, Decl(file.tsx, 10, 1))
+>U : Symbol(U, Decl(file.tsx, 12, 22))
+>l : Symbol(l, Decl(file.tsx, 12, 25))
+>func : Symbol(func, Decl(file.tsx, 12, 29))
+>arg : Symbol(arg, Decl(file.tsx, 12, 36))
+>U : Symbol(U, Decl(file.tsx, 12, 22))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 // OK
 function createLink(func: (a: number)=>void) {
->createLink : Symbol(createLink, Decl(file.tsx, 10, 65))
->func : Symbol(func, Decl(file.tsx, 13, 20))
->a : Symbol(a, Decl(file.tsx, 13, 27))
+>createLink : Symbol(createLink, Decl(file.tsx, 12, 65))
+>func : Symbol(func, Decl(file.tsx, 15, 20))
+>a : Symbol(a, Decl(file.tsx, 15, 27))
 
     let o = <Link func={func} />
->o : Symbol(o, Decl(file.tsx, 14, 7))
->Link : Symbol(Link, Decl(file.tsx, 8, 1))
->func : Symbol(func, Decl(file.tsx, 14, 17))
->func : Symbol(func, Decl(file.tsx, 13, 20))
+>o : Symbol(o, Decl(file.tsx, 16, 7))
+>Link : Symbol(Link, Decl(file.tsx, 10, 1))
+>func : Symbol(func, Decl(file.tsx, 16, 17))
+>func : Symbol(func, Decl(file.tsx, 15, 20))
 }
 
 function createLink1(func: (a: number)=>boolean) {
->createLink1 : Symbol(createLink1, Decl(file.tsx, 15, 1))
->func : Symbol(func, Decl(file.tsx, 17, 21))
->a : Symbol(a, Decl(file.tsx, 17, 28))
+>createLink1 : Symbol(createLink1, Decl(file.tsx, 17, 1))
+>func : Symbol(func, Decl(file.tsx, 19, 21))
+>a : Symbol(a, Decl(file.tsx, 19, 28))
 
     let o = <Link func={func} />
->o : Symbol(o, Decl(file.tsx, 18, 7))
->Link : Symbol(Link, Decl(file.tsx, 8, 1))
->func : Symbol(func, Decl(file.tsx, 18, 17))
->func : Symbol(func, Decl(file.tsx, 17, 21))
+>o : Symbol(o, Decl(file.tsx, 20, 7))
+>Link : Symbol(Link, Decl(file.tsx, 10, 1))
+>func : Symbol(func, Decl(file.tsx, 20, 17))
+>func : Symbol(func, Decl(file.tsx, 19, 21))
 }
 
 interface InferParamProp<T> {
->InferParamProp : Symbol(InferParamProp, Decl(file.tsx, 19, 1))
->T : Symbol(T, Decl(file.tsx, 21, 25))
+>InferParamProp : Symbol(InferParamProp, Decl(file.tsx, 21, 1))
+>T : Symbol(T, Decl(file.tsx, 23, 25))
 
     values: Array<T>;
->values : Symbol(InferParamProp.values, Decl(file.tsx, 21, 29))
->Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->T : Symbol(T, Decl(file.tsx, 21, 25))
+>values : Symbol(InferParamProp.values, Decl(file.tsx, 23, 29))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>T : Symbol(T, Decl(file.tsx, 23, 25))
 
     selectHandler: (selectedVal: T) => void;
->selectHandler : Symbol(InferParamProp.selectHandler, Decl(file.tsx, 22, 21))
->selectedVal : Symbol(selectedVal, Decl(file.tsx, 23, 20))
->T : Symbol(T, Decl(file.tsx, 21, 25))
+>selectHandler : Symbol(InferParamProp.selectHandler, Decl(file.tsx, 24, 21))
+>selectedVal : Symbol(selectedVal, Decl(file.tsx, 25, 20))
+>T : Symbol(T, Decl(file.tsx, 23, 25))
 }
 
 declare function InferParamComponent<T>(attr: InferParamProp<T>): JSX.Element;
->InferParamComponent : Symbol(InferParamComponent, Decl(file.tsx, 24, 1))
->T : Symbol(T, Decl(file.tsx, 26, 37))
->attr : Symbol(attr, Decl(file.tsx, 26, 40))
->InferParamProp : Symbol(InferParamProp, Decl(file.tsx, 19, 1))
->T : Symbol(T, Decl(file.tsx, 26, 37))
+>InferParamComponent : Symbol(InferParamComponent, Decl(file.tsx, 26, 1))
+>T : Symbol(T, Decl(file.tsx, 28, 37))
+>attr : Symbol(attr, Decl(file.tsx, 28, 40))
+>InferParamProp : Symbol(InferParamProp, Decl(file.tsx, 21, 1))
+>T : Symbol(T, Decl(file.tsx, 28, 37))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 // OK
 let i = <InferParamComponent values={[1, 2, 3, 4]} selectHandler={(val) => { }} />;
->i : Symbol(i, Decl(file.tsx, 29, 3))
->InferParamComponent : Symbol(InferParamComponent, Decl(file.tsx, 24, 1))
->values : Symbol(values, Decl(file.tsx, 29, 28))
->selectHandler : Symbol(selectHandler, Decl(file.tsx, 29, 50))
->val : Symbol(val, Decl(file.tsx, 29, 67))
+>i : Symbol(i, Decl(file.tsx, 31, 3))
+>InferParamComponent : Symbol(InferParamComponent, Decl(file.tsx, 26, 1))
+>values : Symbol(values, Decl(file.tsx, 31, 28))
+>selectHandler : Symbol(selectHandler, Decl(file.tsx, 31, 50))
+>val : Symbol(val, Decl(file.tsx, 31, 67))
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
index 3afdade77b833..08e68e064f2e6 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.errors.txt
index 5d0e87b0a004c..887ae68bbe565 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.errors.txt
@@ -1,19 +1,21 @@
 error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-file.tsx(8,15): error TS2322: Type 'T & { "ignore-prop": number; }' is not assignable to type 'IntrinsicAttributes & { prop: number; "ignore-prop": string; }'.
+file.tsx(10,15): error TS2322: Type 'T & { "ignore-prop": number; }' is not assignable to type 'IntrinsicAttributes & { prop: number; "ignore-prop": string; }'.
   Type 'T & { "ignore-prop": number; }' is not assignable to type '{ prop: number; "ignore-prop": string; }'.
     Types of property '"ignore-prop"' are incompatible.
       Type 'number' is not assignable to type 'string'.
-file.tsx(13,15): error TS2322: Type 'T' is not assignable to type 'IntrinsicAttributes & { prop: unknown; "ignore-prop": string; }'.
+file.tsx(15,15): error TS2322: Type 'T' is not assignable to type 'IntrinsicAttributes & { prop: unknown; "ignore-prop": string; }'.
   Type 'T' is not assignable to type '{ prop: unknown; "ignore-prop": string; }'.
-file.tsx(20,19): error TS2322: Type '(a: number, b: string) => void' is not assignable to type '(arg: number) => void'.
+file.tsx(22,19): error TS2322: Type '(a: number, b: string) => void' is not assignable to type '(arg: number) => void'.
   Target signature provides too few arguments. Expected 2 or more, but got 1.
-file.tsx(31,52): error TS2322: Type '(val: string) => void' is not assignable to type '(selectedVal: number) => void'.
+file.tsx(33,52): error TS2322: Type '(val: string) => void' is not assignable to type '(selectedVal: number) => void'.
   Types of parameters 'val' and 'selectedVal' are incompatible.
     Type 'number' is not assignable to type 'string'.
 
 
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file.tsx (4 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react')
     
     declare function ComponentSpecific1<U>(l: {prop: U, "ignore-prop": string}): JSX.Element;
@@ -35,8 +37,8 @@ file.tsx(31,52): error TS2322: Type '(val: string) => void' is not assignable to
                   ~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'T' is not assignable to type 'IntrinsicAttributes & { prop: unknown; "ignore-prop": string; }'.
 !!! error TS2322:   Type 'T' is not assignable to type '{ prop: unknown; "ignore-prop": string; }'.
-!!! related TS2208 file.tsx:12:14: This type parameter might need an `extends { prop: unknown; "ignore-prop": string; }` constraint.
-!!! related TS2208 file.tsx:12:14: This type parameter might need an `extends JSX.IntrinsicAttributes & { prop: unknown; "ignore-prop": string; }` constraint.
+!!! related TS2208 file.tsx:14:14: This type parameter might need an `extends { prop: unknown; "ignore-prop": string; }` constraint.
+!!! related TS2208 file.tsx:14:14: This type parameter might need an `extends JSX.IntrinsicAttributes & { prop: unknown; "ignore-prop": string; }` constraint.
     }
     
     declare function Link<U>(l: {func: (arg: U)=>void}): JSX.Element;
@@ -47,7 +49,7 @@ file.tsx(31,52): error TS2322: Type '(val: string) => void' is not assignable to
                       ~~~~
 !!! error TS2322: Type '(a: number, b: string) => void' is not assignable to type '(arg: number) => void'.
 !!! error TS2322:   Target signature provides too few arguments. Expected 2 or more, but got 1.
-!!! related TS6500 file.tsx:16:30: The expected type comes from property 'func' which is declared here on type 'IntrinsicAttributes & { func: (arg: number) => void; }'
+!!! related TS6500 file.tsx:18:30: The expected type comes from property 'func' which is declared here on type 'IntrinsicAttributes & { func: (arg: number) => void; }'
     }
     
     interface InferParamProp<T> {
@@ -63,5 +65,5 @@ file.tsx(31,52): error TS2322: Type '(val: string) => void' is not assignable to
 !!! error TS2322: Type '(val: string) => void' is not assignable to type '(selectedVal: number) => void'.
 !!! error TS2322:   Types of parameters 'val' and 'selectedVal' are incompatible.
 !!! error TS2322:     Type 'number' is not assignable to type 'string'.
-!!! related TS6500 file.tsx:25:5: The expected type comes from property 'selectHandler' which is declared here on type 'IntrinsicAttributes & InferParamProp<number>'
+!!! related TS6500 file.tsx:27:5: The expected type comes from property 'selectHandler' which is declared here on type 'IntrinsicAttributes & InferParamProp<number>'
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.js b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.js
index f5f1819eb6089..3f0db4d697b0c 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments2.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react')
 
 declare function ComponentSpecific1<U>(l: {prop: U, "ignore-prop": string}): JSX.Element;
@@ -35,6 +37,7 @@ let i = <InferParamComponent values={[1, 2, 3, 4]} selectHandler={(val: string)
 
 
 //// [file.jsx]
+/// <reference path="/.lib/react.d.ts" />
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.symbols
index 79fd00f489219..1cf1083f637a1 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.symbols
@@ -1,109 +1,111 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 declare function ComponentSpecific1<U>(l: {prop: U, "ignore-prop": string}): JSX.Element;
->ComponentSpecific1 : Symbol(ComponentSpecific1, Decl(file.tsx, 0, 31))
->U : Symbol(U, Decl(file.tsx, 2, 36))
->l : Symbol(l, Decl(file.tsx, 2, 39))
->prop : Symbol(prop, Decl(file.tsx, 2, 43))
->U : Symbol(U, Decl(file.tsx, 2, 36))
->"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 2, 51))
+>ComponentSpecific1 : Symbol(ComponentSpecific1, Decl(file.tsx, 2, 31))
+>U : Symbol(U, Decl(file.tsx, 4, 36))
+>l : Symbol(l, Decl(file.tsx, 4, 39))
+>prop : Symbol(prop, Decl(file.tsx, 4, 43))
+>U : Symbol(U, Decl(file.tsx, 4, 36))
+>"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 4, 51))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function ComponentSpecific2<U>(l: {prop: U}): JSX.Element;
->ComponentSpecific2 : Symbol(ComponentSpecific2, Decl(file.tsx, 2, 89))
->U : Symbol(U, Decl(file.tsx, 3, 36))
->l : Symbol(l, Decl(file.tsx, 3, 39))
->prop : Symbol(prop, Decl(file.tsx, 3, 43))
->U : Symbol(U, Decl(file.tsx, 3, 36))
+>ComponentSpecific2 : Symbol(ComponentSpecific2, Decl(file.tsx, 4, 89))
+>U : Symbol(U, Decl(file.tsx, 5, 36))
+>l : Symbol(l, Decl(file.tsx, 5, 39))
+>prop : Symbol(prop, Decl(file.tsx, 5, 43))
+>U : Symbol(U, Decl(file.tsx, 5, 36))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 // Error
 function Bar<T extends {prop: number}>(arg: T) {
->Bar : Symbol(Bar, Decl(file.tsx, 3, 66))
->T : Symbol(T, Decl(file.tsx, 6, 13))
->prop : Symbol(prop, Decl(file.tsx, 6, 24))
->arg : Symbol(arg, Decl(file.tsx, 6, 39))
->T : Symbol(T, Decl(file.tsx, 6, 13))
+>Bar : Symbol(Bar, Decl(file.tsx, 5, 66))
+>T : Symbol(T, Decl(file.tsx, 8, 13))
+>prop : Symbol(prop, Decl(file.tsx, 8, 24))
+>arg : Symbol(arg, Decl(file.tsx, 8, 39))
+>T : Symbol(T, Decl(file.tsx, 8, 13))
 
     let a1 = <ComponentSpecific1 {...arg} ignore-prop={10} />;
->a1 : Symbol(a1, Decl(file.tsx, 7, 7))
->ComponentSpecific1 : Symbol(ComponentSpecific1, Decl(file.tsx, 0, 31))
->arg : Symbol(arg, Decl(file.tsx, 6, 39))
->ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 7, 41))
+>a1 : Symbol(a1, Decl(file.tsx, 9, 7))
+>ComponentSpecific1 : Symbol(ComponentSpecific1, Decl(file.tsx, 2, 31))
+>arg : Symbol(arg, Decl(file.tsx, 8, 39))
+>ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 9, 41))
  }
 
 // Error
 function Baz<T>(arg: T) {
->Baz : Symbol(Baz, Decl(file.tsx, 8, 2))
->T : Symbol(T, Decl(file.tsx, 11, 13))
->arg : Symbol(arg, Decl(file.tsx, 11, 16))
->T : Symbol(T, Decl(file.tsx, 11, 13))
+>Baz : Symbol(Baz, Decl(file.tsx, 10, 2))
+>T : Symbol(T, Decl(file.tsx, 13, 13))
+>arg : Symbol(arg, Decl(file.tsx, 13, 16))
+>T : Symbol(T, Decl(file.tsx, 13, 13))
 
     let a0 = <ComponentSpecific1 {...arg} />
->a0 : Symbol(a0, Decl(file.tsx, 12, 7))
->ComponentSpecific1 : Symbol(ComponentSpecific1, Decl(file.tsx, 0, 31))
->arg : Symbol(arg, Decl(file.tsx, 11, 16))
+>a0 : Symbol(a0, Decl(file.tsx, 14, 7))
+>ComponentSpecific1 : Symbol(ComponentSpecific1, Decl(file.tsx, 2, 31))
+>arg : Symbol(arg, Decl(file.tsx, 13, 16))
 }
 
 declare function Link<U>(l: {func: (arg: U)=>void}): JSX.Element;
->Link : Symbol(Link, Decl(file.tsx, 13, 1))
->U : Symbol(U, Decl(file.tsx, 15, 22))
->l : Symbol(l, Decl(file.tsx, 15, 25))
->func : Symbol(func, Decl(file.tsx, 15, 29))
->arg : Symbol(arg, Decl(file.tsx, 15, 36))
->U : Symbol(U, Decl(file.tsx, 15, 22))
+>Link : Symbol(Link, Decl(file.tsx, 15, 1))
+>U : Symbol(U, Decl(file.tsx, 17, 22))
+>l : Symbol(l, Decl(file.tsx, 17, 25))
+>func : Symbol(func, Decl(file.tsx, 17, 29))
+>arg : Symbol(arg, Decl(file.tsx, 17, 36))
+>U : Symbol(U, Decl(file.tsx, 17, 22))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 // Error
 function createLink(func: (a: number, b: string)=>void) {
->createLink : Symbol(createLink, Decl(file.tsx, 15, 65))
->func : Symbol(func, Decl(file.tsx, 18, 20))
->a : Symbol(a, Decl(file.tsx, 18, 27))
->b : Symbol(b, Decl(file.tsx, 18, 37))
+>createLink : Symbol(createLink, Decl(file.tsx, 17, 65))
+>func : Symbol(func, Decl(file.tsx, 20, 20))
+>a : Symbol(a, Decl(file.tsx, 20, 27))
+>b : Symbol(b, Decl(file.tsx, 20, 37))
 
     let o = <Link func={func} />
->o : Symbol(o, Decl(file.tsx, 19, 7))
->Link : Symbol(Link, Decl(file.tsx, 13, 1))
->func : Symbol(func, Decl(file.tsx, 19, 17))
->func : Symbol(func, Decl(file.tsx, 18, 20))
+>o : Symbol(o, Decl(file.tsx, 21, 7))
+>Link : Symbol(Link, Decl(file.tsx, 15, 1))
+>func : Symbol(func, Decl(file.tsx, 21, 17))
+>func : Symbol(func, Decl(file.tsx, 20, 20))
 }
 
 interface InferParamProp<T> {
->InferParamProp : Symbol(InferParamProp, Decl(file.tsx, 20, 1))
->T : Symbol(T, Decl(file.tsx, 22, 25))
+>InferParamProp : Symbol(InferParamProp, Decl(file.tsx, 22, 1))
+>T : Symbol(T, Decl(file.tsx, 24, 25))
 
     values: Array<T>;
->values : Symbol(InferParamProp.values, Decl(file.tsx, 22, 29))
->Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->T : Symbol(T, Decl(file.tsx, 22, 25))
+>values : Symbol(InferParamProp.values, Decl(file.tsx, 24, 29))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>T : Symbol(T, Decl(file.tsx, 24, 25))
 
     selectHandler: (selectedVal: T) => void;
->selectHandler : Symbol(InferParamProp.selectHandler, Decl(file.tsx, 23, 21))
->selectedVal : Symbol(selectedVal, Decl(file.tsx, 24, 20))
->T : Symbol(T, Decl(file.tsx, 22, 25))
+>selectHandler : Symbol(InferParamProp.selectHandler, Decl(file.tsx, 25, 21))
+>selectedVal : Symbol(selectedVal, Decl(file.tsx, 26, 20))
+>T : Symbol(T, Decl(file.tsx, 24, 25))
 }
 
 declare function InferParamComponent<T>(attr: InferParamProp<T>): JSX.Element;
->InferParamComponent : Symbol(InferParamComponent, Decl(file.tsx, 25, 1))
->T : Symbol(T, Decl(file.tsx, 27, 37))
->attr : Symbol(attr, Decl(file.tsx, 27, 40))
->InferParamProp : Symbol(InferParamProp, Decl(file.tsx, 20, 1))
->T : Symbol(T, Decl(file.tsx, 27, 37))
+>InferParamComponent : Symbol(InferParamComponent, Decl(file.tsx, 27, 1))
+>T : Symbol(T, Decl(file.tsx, 29, 37))
+>attr : Symbol(attr, Decl(file.tsx, 29, 40))
+>InferParamProp : Symbol(InferParamProp, Decl(file.tsx, 22, 1))
+>T : Symbol(T, Decl(file.tsx, 29, 37))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 // Error
 let i = <InferParamComponent values={[1, 2, 3, 4]} selectHandler={(val: string) => { }} />;
->i : Symbol(i, Decl(file.tsx, 30, 3))
->InferParamComponent : Symbol(InferParamComponent, Decl(file.tsx, 25, 1))
->values : Symbol(values, Decl(file.tsx, 30, 28))
->selectHandler : Symbol(selectHandler, Decl(file.tsx, 30, 50))
->val : Symbol(val, Decl(file.tsx, 30, 67))
+>i : Symbol(i, Decl(file.tsx, 32, 3))
+>InferParamComponent : Symbol(InferParamComponent, Decl(file.tsx, 27, 1))
+>values : Symbol(values, Decl(file.tsx, 32, 28))
+>selectHandler : Symbol(selectHandler, Decl(file.tsx, 32, 50))
+>val : Symbol(val, Decl(file.tsx, 32, 67))
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
index feda5b1af3d83..3d9c873f24cd8 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.errors.txt
index 83d30a9ba4ae0..054144311c0ad 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.errors.txt
@@ -3,6 +3,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file.tsx (0 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react')
     
     declare function OverloadComponent<U>(): JSX.Element;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.js b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.js
index ea5cf5e566894..ede7d2b73069c 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments3.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react')
 
 declare function OverloadComponent<U>(): JSX.Element;
@@ -26,6 +28,7 @@ function createLink(func: (a: number)=>void) {
 }
 
 //// [file.jsx]
+/// <reference path="/.lib/react.d.ts" />
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.symbols
index 427cc365a570b..fddad2b80e558 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.symbols
@@ -1,130 +1,132 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 declare function OverloadComponent<U>(): JSX.Element;
->OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 101))
->U : Symbol(U, Decl(file.tsx, 2, 35))
+>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 53), Decl(file.tsx, 5, 101))
+>U : Symbol(U, Decl(file.tsx, 4, 35))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function OverloadComponent<U>(attr: {b: U, a?: string, "ignore-prop": boolean}): JSX.Element;
->OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 101))
->U : Symbol(U, Decl(file.tsx, 3, 35))
->attr : Symbol(attr, Decl(file.tsx, 3, 38))
->b : Symbol(b, Decl(file.tsx, 3, 45))
->U : Symbol(U, Decl(file.tsx, 3, 35))
->a : Symbol(a, Decl(file.tsx, 3, 50))
->"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 3, 62))
+>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 53), Decl(file.tsx, 5, 101))
+>U : Symbol(U, Decl(file.tsx, 5, 35))
+>attr : Symbol(attr, Decl(file.tsx, 5, 38))
+>b : Symbol(b, Decl(file.tsx, 5, 45))
+>U : Symbol(U, Decl(file.tsx, 5, 35))
+>a : Symbol(a, Decl(file.tsx, 5, 50))
+>"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 5, 62))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function OverloadComponent<T, U>(attr: {b: U, a: T}): JSX.Element;
->OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 101))
->T : Symbol(T, Decl(file.tsx, 4, 35))
->U : Symbol(U, Decl(file.tsx, 4, 37))
->attr : Symbol(attr, Decl(file.tsx, 4, 41))
->b : Symbol(b, Decl(file.tsx, 4, 48))
->U : Symbol(U, Decl(file.tsx, 4, 37))
->a : Symbol(a, Decl(file.tsx, 4, 53))
->T : Symbol(T, Decl(file.tsx, 4, 35))
+>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 53), Decl(file.tsx, 5, 101))
+>T : Symbol(T, Decl(file.tsx, 6, 35))
+>U : Symbol(U, Decl(file.tsx, 6, 37))
+>attr : Symbol(attr, Decl(file.tsx, 6, 41))
+>b : Symbol(b, Decl(file.tsx, 6, 48))
+>U : Symbol(U, Decl(file.tsx, 6, 37))
+>a : Symbol(a, Decl(file.tsx, 6, 53))
+>T : Symbol(T, Decl(file.tsx, 6, 35))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 // OK
 function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, arg2: U) {
->Baz : Symbol(Baz, Decl(file.tsx, 4, 74))
->T : Symbol(T, Decl(file.tsx, 7, 13))
->b : Symbol(b, Decl(file.tsx, 7, 24))
->U : Symbol(U, Decl(file.tsx, 7, 35))
->a : Symbol(a, Decl(file.tsx, 7, 47))
->b : Symbol(b, Decl(file.tsx, 7, 58))
->arg1 : Symbol(arg1, Decl(file.tsx, 7, 70))
->T : Symbol(T, Decl(file.tsx, 7, 13))
->arg2 : Symbol(arg2, Decl(file.tsx, 7, 78))
->U : Symbol(U, Decl(file.tsx, 7, 35))
+>Baz : Symbol(Baz, Decl(file.tsx, 6, 74))
+>T : Symbol(T, Decl(file.tsx, 9, 13))
+>b : Symbol(b, Decl(file.tsx, 9, 24))
+>U : Symbol(U, Decl(file.tsx, 9, 35))
+>a : Symbol(a, Decl(file.tsx, 9, 47))
+>b : Symbol(b, Decl(file.tsx, 9, 58))
+>arg1 : Symbol(arg1, Decl(file.tsx, 9, 70))
+>T : Symbol(T, Decl(file.tsx, 9, 13))
+>arg2 : Symbol(arg2, Decl(file.tsx, 9, 78))
+>U : Symbol(U, Decl(file.tsx, 9, 35))
 
     let a0 = <OverloadComponent {...arg1} a="hello" ignore-prop />;
->a0 : Symbol(a0, Decl(file.tsx, 8, 7))
->OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 101))
->arg1 : Symbol(arg1, Decl(file.tsx, 7, 70))
->a : Symbol(a, Decl(file.tsx, 8, 41))
->ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 8, 51))
+>a0 : Symbol(a0, Decl(file.tsx, 10, 7))
+>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 53), Decl(file.tsx, 5, 101))
+>arg1 : Symbol(arg1, Decl(file.tsx, 9, 70))
+>a : Symbol(a, Decl(file.tsx, 10, 41))
+>ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 10, 51))
 
     let a1 = <OverloadComponent {...arg2} ignore-pro="hello world" />;
->a1 : Symbol(a1, Decl(file.tsx, 9, 7))
->OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 101))
->arg2 : Symbol(arg2, Decl(file.tsx, 7, 78))
->ignore-pro : Symbol(ignore-pro, Decl(file.tsx, 9, 41))
+>a1 : Symbol(a1, Decl(file.tsx, 11, 7))
+>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 53), Decl(file.tsx, 5, 101))
+>arg2 : Symbol(arg2, Decl(file.tsx, 9, 78))
+>ignore-pro : Symbol(ignore-pro, Decl(file.tsx, 11, 41))
 
     let a2 = <OverloadComponent {...arg2} />;
->a2 : Symbol(a2, Decl(file.tsx, 10, 7))
->OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 101))
->arg2 : Symbol(arg2, Decl(file.tsx, 7, 78))
+>a2 : Symbol(a2, Decl(file.tsx, 12, 7))
+>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 53), Decl(file.tsx, 5, 101))
+>arg2 : Symbol(arg2, Decl(file.tsx, 9, 78))
 
     let a3 = <OverloadComponent {...arg1} ignore-prop />;
->a3 : Symbol(a3, Decl(file.tsx, 11, 7))
->OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 101))
->arg1 : Symbol(arg1, Decl(file.tsx, 7, 70))
->ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 11, 41))
+>a3 : Symbol(a3, Decl(file.tsx, 13, 7))
+>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 53), Decl(file.tsx, 5, 101))
+>arg1 : Symbol(arg1, Decl(file.tsx, 9, 70))
+>ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 13, 41))
 
     let a4 = <OverloadComponent />;
->a4 : Symbol(a4, Decl(file.tsx, 12, 7))
->OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 101))
+>a4 : Symbol(a4, Decl(file.tsx, 14, 7))
+>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 53), Decl(file.tsx, 5, 101))
 
     let a5 = <OverloadComponent {...arg2} ignore-prop="hello" {...arg1} />;
->a5 : Symbol(a5, Decl(file.tsx, 13, 7))
->OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 101))
->arg2 : Symbol(arg2, Decl(file.tsx, 7, 78))
->ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 13, 41))
->arg1 : Symbol(arg1, Decl(file.tsx, 7, 70))
+>a5 : Symbol(a5, Decl(file.tsx, 15, 7))
+>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 53), Decl(file.tsx, 5, 101))
+>arg2 : Symbol(arg2, Decl(file.tsx, 9, 78))
+>ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 15, 41))
+>arg1 : Symbol(arg1, Decl(file.tsx, 9, 70))
 
     let a6 = <OverloadComponent {...arg2} ignore-prop {...arg1} />;
->a6 : Symbol(a6, Decl(file.tsx, 14, 7))
->OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 101))
->arg2 : Symbol(arg2, Decl(file.tsx, 7, 78))
->ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 14, 41))
->arg1 : Symbol(arg1, Decl(file.tsx, 7, 70))
+>a6 : Symbol(a6, Decl(file.tsx, 16, 7))
+>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 53), Decl(file.tsx, 5, 101))
+>arg2 : Symbol(arg2, Decl(file.tsx, 9, 78))
+>ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 16, 41))
+>arg1 : Symbol(arg1, Decl(file.tsx, 9, 70))
 }
 
 declare function Link<U>(l: {func: (arg: U)=>void}): JSX.Element;
->Link : Symbol(Link, Decl(file.tsx, 15, 1), Decl(file.tsx, 17, 65))
->U : Symbol(U, Decl(file.tsx, 17, 22))
->l : Symbol(l, Decl(file.tsx, 17, 25))
->func : Symbol(func, Decl(file.tsx, 17, 29))
->arg : Symbol(arg, Decl(file.tsx, 17, 36))
->U : Symbol(U, Decl(file.tsx, 17, 22))
+>Link : Symbol(Link, Decl(file.tsx, 17, 1), Decl(file.tsx, 19, 65))
+>U : Symbol(U, Decl(file.tsx, 19, 22))
+>l : Symbol(l, Decl(file.tsx, 19, 25))
+>func : Symbol(func, Decl(file.tsx, 19, 29))
+>arg : Symbol(arg, Decl(file.tsx, 19, 36))
+>U : Symbol(U, Decl(file.tsx, 19, 22))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function Link<U>(l: {func: (arg1:U, arg2: string)=>void}): JSX.Element;
->Link : Symbol(Link, Decl(file.tsx, 15, 1), Decl(file.tsx, 17, 65))
->U : Symbol(U, Decl(file.tsx, 18, 22))
->l : Symbol(l, Decl(file.tsx, 18, 25))
->func : Symbol(func, Decl(file.tsx, 18, 29))
->arg1 : Symbol(arg1, Decl(file.tsx, 18, 36))
->U : Symbol(U, Decl(file.tsx, 18, 22))
->arg2 : Symbol(arg2, Decl(file.tsx, 18, 43))
+>Link : Symbol(Link, Decl(file.tsx, 17, 1), Decl(file.tsx, 19, 65))
+>U : Symbol(U, Decl(file.tsx, 20, 22))
+>l : Symbol(l, Decl(file.tsx, 20, 25))
+>func : Symbol(func, Decl(file.tsx, 20, 29))
+>arg1 : Symbol(arg1, Decl(file.tsx, 20, 36))
+>U : Symbol(U, Decl(file.tsx, 20, 22))
+>arg2 : Symbol(arg2, Decl(file.tsx, 20, 43))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 function createLink(func: (a: number)=>void) {
->createLink : Symbol(createLink, Decl(file.tsx, 18, 79))
->func : Symbol(func, Decl(file.tsx, 19, 20))
->a : Symbol(a, Decl(file.tsx, 19, 27))
+>createLink : Symbol(createLink, Decl(file.tsx, 20, 79))
+>func : Symbol(func, Decl(file.tsx, 21, 20))
+>a : Symbol(a, Decl(file.tsx, 21, 27))
 
     let o = <Link func={func} />
->o : Symbol(o, Decl(file.tsx, 20, 7))
->Link : Symbol(Link, Decl(file.tsx, 15, 1), Decl(file.tsx, 17, 65))
->func : Symbol(func, Decl(file.tsx, 20, 17))
->func : Symbol(func, Decl(file.tsx, 19, 20))
+>o : Symbol(o, Decl(file.tsx, 22, 7))
+>Link : Symbol(Link, Decl(file.tsx, 17, 1), Decl(file.tsx, 19, 65))
+>func : Symbol(func, Decl(file.tsx, 22, 17))
+>func : Symbol(func, Decl(file.tsx, 21, 20))
 
     let o1 = <Link func={(a:number, b:string)=>{}} />;
->o1 : Symbol(o1, Decl(file.tsx, 21, 7))
->Link : Symbol(Link, Decl(file.tsx, 15, 1), Decl(file.tsx, 17, 65))
->func : Symbol(func, Decl(file.tsx, 21, 18))
->a : Symbol(a, Decl(file.tsx, 21, 26))
->b : Symbol(b, Decl(file.tsx, 21, 35))
+>o1 : Symbol(o1, Decl(file.tsx, 23, 7))
+>Link : Symbol(Link, Decl(file.tsx, 17, 1), Decl(file.tsx, 19, 65))
+>func : Symbol(func, Decl(file.tsx, 23, 18))
+>a : Symbol(a, Decl(file.tsx, 23, 26))
+>b : Symbol(b, Decl(file.tsx, 23, 35))
 }
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
index 042f5db5a0ec1..f8f364c96c9c3 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt
index fdd4fa153df6f..b7a52554544e6 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt
@@ -1,4 +1,4 @@
-file.tsx(9,15): error TS2769: No overload matches this call.
+file.tsx(11,15): error TS2769: No overload matches this call.
   Overload 1 of 3, '(): Element', gave the following error.
     Type '{ a: number; }' is not assignable to type 'IntrinsicAttributes'.
       Property 'a' does not exist on type 'IntrinsicAttributes'.
@@ -6,7 +6,7 @@ file.tsx(9,15): error TS2769: No overload matches this call.
     Type 'number' is not assignable to type 'string'.
   Overload 3 of 3, '(attr: { b: unknown; a: number; }): Element', gave the following error.
     Property 'b' is missing in type '{ a: number; }' but required in type '{ b: unknown; a: number; }'.
-file.tsx(10,15): error TS2769: No overload matches this call.
+file.tsx(12,15): error TS2769: No overload matches this call.
   Overload 1 of 3, '(): Element', gave the following error.
     Type 'T & { "ignore-prop": true; }' has no properties in common with type 'IntrinsicAttributes'.
   Overload 2 of 3, '(attr: { b: number; a: string; "ignore-prop": boolean; }): Element', gave the following error.
@@ -18,6 +18,8 @@ file.tsx(10,15): error TS2769: No overload matches this call.
 
 
 ==== file.tsx (2 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react')
     
     declare function OverloadComponent<U>(): JSX.Element;
@@ -36,8 +38,8 @@ file.tsx(10,15): error TS2769: No overload matches this call.
 !!! error TS2769:     Type 'number' is not assignable to type 'string'.
 !!! error TS2769:   Overload 3 of 3, '(attr: { b: unknown; a: number; }): Element', gave the following error.
 !!! error TS2769:     Property 'b' is missing in type '{ a: number; }' but required in type '{ b: unknown; a: number; }'.
-!!! related TS6500 file.tsx:4:52: The expected type comes from property 'a' which is declared here on type 'IntrinsicAttributes & { b: unknown; a: string; "ignore-prop": boolean; }'
-!!! related TS2728 file.tsx:5:49: 'b' is declared here.
+!!! related TS6500 file.tsx:6:52: The expected type comes from property 'a' which is declared here on type 'IntrinsicAttributes & { b: unknown; a: string; "ignore-prop": boolean; }'
+!!! related TS2728 file.tsx:7:49: 'b' is declared here.
         let a2 = <OverloadComponent {...arg1} ignore-prop />  // missing a
                   ~~~~~~~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.
@@ -49,6 +51,6 @@ file.tsx(10,15): error TS2769: No overload matches this call.
 !!! error TS2769:   Overload 3 of 3, '(attr: { b: unknown; a: unknown; }): Element', gave the following error.
 !!! error TS2769:     Type 'T & { "ignore-prop": true; }' is not assignable to type 'IntrinsicAttributes & { b: unknown; a: unknown; }'.
 !!! error TS2769:       Property 'a' is missing in type '{ b: number; } & { "ignore-prop": true; }' but required in type '{ b: unknown; a: unknown; }'.
-!!! related TS2728 file.tsx:4:52: 'a' is declared here.
-!!! related TS2728 file.tsx:5:55: 'a' is declared here.
+!!! related TS2728 file.tsx:6:52: 'a' is declared here.
+!!! related TS2728 file.tsx:7:55: 'a' is declared here.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.js b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.js
index 9354b3dad1cfb..1e561774bcbf4 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments4.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react')
 
 declare function OverloadComponent<U>(): JSX.Element;
@@ -15,6 +17,7 @@ function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, a
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 // Error
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.symbols
index df279c9333ccf..dc060703fd86b 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.symbols
@@ -1,62 +1,64 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments4.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 declare function OverloadComponent<U>(): JSX.Element;
->OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 100))
->U : Symbol(U, Decl(file.tsx, 2, 35))
+>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 53), Decl(file.tsx, 5, 100))
+>U : Symbol(U, Decl(file.tsx, 4, 35))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function OverloadComponent<U>(attr: {b: U, a: string, "ignore-prop": boolean}): JSX.Element;
->OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 100))
->U : Symbol(U, Decl(file.tsx, 3, 35))
->attr : Symbol(attr, Decl(file.tsx, 3, 38))
->b : Symbol(b, Decl(file.tsx, 3, 45))
->U : Symbol(U, Decl(file.tsx, 3, 35))
->a : Symbol(a, Decl(file.tsx, 3, 50))
->"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 3, 61))
+>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 53), Decl(file.tsx, 5, 100))
+>U : Symbol(U, Decl(file.tsx, 5, 35))
+>attr : Symbol(attr, Decl(file.tsx, 5, 38))
+>b : Symbol(b, Decl(file.tsx, 5, 45))
+>U : Symbol(U, Decl(file.tsx, 5, 35))
+>a : Symbol(a, Decl(file.tsx, 5, 50))
+>"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 5, 61))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function OverloadComponent<T, U>(attr: {b: U, a: T}): JSX.Element;
->OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 100))
->T : Symbol(T, Decl(file.tsx, 4, 35))
->U : Symbol(U, Decl(file.tsx, 4, 37))
->attr : Symbol(attr, Decl(file.tsx, 4, 41))
->b : Symbol(b, Decl(file.tsx, 4, 48))
->U : Symbol(U, Decl(file.tsx, 4, 37))
->a : Symbol(a, Decl(file.tsx, 4, 53))
->T : Symbol(T, Decl(file.tsx, 4, 35))
+>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 53), Decl(file.tsx, 5, 100))
+>T : Symbol(T, Decl(file.tsx, 6, 35))
+>U : Symbol(U, Decl(file.tsx, 6, 37))
+>attr : Symbol(attr, Decl(file.tsx, 6, 41))
+>b : Symbol(b, Decl(file.tsx, 6, 48))
+>U : Symbol(U, Decl(file.tsx, 6, 37))
+>a : Symbol(a, Decl(file.tsx, 6, 53))
+>T : Symbol(T, Decl(file.tsx, 6, 35))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 // Error
 function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, arg2: U) {
->Baz : Symbol(Baz, Decl(file.tsx, 4, 74))
->T : Symbol(T, Decl(file.tsx, 7, 13))
->b : Symbol(b, Decl(file.tsx, 7, 24))
->U : Symbol(U, Decl(file.tsx, 7, 35))
->a : Symbol(a, Decl(file.tsx, 7, 47))
->b : Symbol(b, Decl(file.tsx, 7, 58))
->arg1 : Symbol(arg1, Decl(file.tsx, 7, 70))
->T : Symbol(T, Decl(file.tsx, 7, 13))
->arg2 : Symbol(arg2, Decl(file.tsx, 7, 78))
->U : Symbol(U, Decl(file.tsx, 7, 35))
+>Baz : Symbol(Baz, Decl(file.tsx, 6, 74))
+>T : Symbol(T, Decl(file.tsx, 9, 13))
+>b : Symbol(b, Decl(file.tsx, 9, 24))
+>U : Symbol(U, Decl(file.tsx, 9, 35))
+>a : Symbol(a, Decl(file.tsx, 9, 47))
+>b : Symbol(b, Decl(file.tsx, 9, 58))
+>arg1 : Symbol(arg1, Decl(file.tsx, 9, 70))
+>T : Symbol(T, Decl(file.tsx, 9, 13))
+>arg2 : Symbol(arg2, Decl(file.tsx, 9, 78))
+>U : Symbol(U, Decl(file.tsx, 9, 35))
 
     let a0 = <OverloadComponent a={arg1.b}/>
->a0 : Symbol(a0, Decl(file.tsx, 8, 7))
->OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 100))
->a : Symbol(a, Decl(file.tsx, 8, 31))
->arg1.b : Symbol(b, Decl(file.tsx, 7, 24))
->arg1 : Symbol(arg1, Decl(file.tsx, 7, 70))
->b : Symbol(b, Decl(file.tsx, 7, 24))
+>a0 : Symbol(a0, Decl(file.tsx, 10, 7))
+>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 53), Decl(file.tsx, 5, 100))
+>a : Symbol(a, Decl(file.tsx, 10, 31))
+>arg1.b : Symbol(b, Decl(file.tsx, 9, 24))
+>arg1 : Symbol(arg1, Decl(file.tsx, 9, 70))
+>b : Symbol(b, Decl(file.tsx, 9, 24))
 
     let a2 = <OverloadComponent {...arg1} ignore-prop />  // missing a
->a2 : Symbol(a2, Decl(file.tsx, 9, 7))
->OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 100))
->arg1 : Symbol(arg1, Decl(file.tsx, 7, 70))
->ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 9, 41))
+>a2 : Symbol(a2, Decl(file.tsx, 11, 7))
+>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 2, 31), Decl(file.tsx, 4, 53), Decl(file.tsx, 5, 100))
+>arg1 : Symbol(arg1, Decl(file.tsx, 9, 70))
+>ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 11, 41))
 }
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types
index 14c73f553bcca..28b344369d448 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments4.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.errors.txt
index 85277801e12b1..a68f8d8d50bcf 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.errors.txt
@@ -3,6 +3,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file.tsx (0 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react')
     
     declare function Component<U>(l: U): JSX.Element;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.js b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.js
index 7c71b609e8c13..daec6cf5c0947 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments5.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react')
 
 declare function Component<U>(l: U): JSX.Element;
@@ -21,6 +23,7 @@ function Bar<T extends { prop: number }>(arg: T) {
 
 
 //// [file.jsx]
+/// <reference path="/.lib/react.d.ts" />
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.symbols
index 124d684869fc6..61e694163c8d9 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.symbols
@@ -1,84 +1,86 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments5.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 declare function Component<U>(l: U): JSX.Element;
->Component : Symbol(Component, Decl(file.tsx, 0, 31))
->U : Symbol(U, Decl(file.tsx, 2, 27))
->l : Symbol(l, Decl(file.tsx, 2, 30))
->U : Symbol(U, Decl(file.tsx, 2, 27))
+>Component : Symbol(Component, Decl(file.tsx, 2, 31))
+>U : Symbol(U, Decl(file.tsx, 4, 27))
+>l : Symbol(l, Decl(file.tsx, 4, 30))
+>U : Symbol(U, Decl(file.tsx, 4, 27))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 function createComponent<T extends { prop: number }>(arg: T) {
->createComponent : Symbol(createComponent, Decl(file.tsx, 2, 49))
->T : Symbol(T, Decl(file.tsx, 3, 25))
->prop : Symbol(prop, Decl(file.tsx, 3, 36))
->arg : Symbol(arg, Decl(file.tsx, 3, 53))
->T : Symbol(T, Decl(file.tsx, 3, 25))
+>createComponent : Symbol(createComponent, Decl(file.tsx, 4, 49))
+>T : Symbol(T, Decl(file.tsx, 5, 25))
+>prop : Symbol(prop, Decl(file.tsx, 5, 36))
+>arg : Symbol(arg, Decl(file.tsx, 5, 53))
+>T : Symbol(T, Decl(file.tsx, 5, 25))
 
     let a1 = <Component {...arg} />;
->a1 : Symbol(a1, Decl(file.tsx, 4, 7))
->Component : Symbol(Component, Decl(file.tsx, 0, 31))
->arg : Symbol(arg, Decl(file.tsx, 3, 53))
+>a1 : Symbol(a1, Decl(file.tsx, 6, 7))
+>Component : Symbol(Component, Decl(file.tsx, 2, 31))
+>arg : Symbol(arg, Decl(file.tsx, 5, 53))
 
     let a2 = <Component {...arg} prop1 />;
->a2 : Symbol(a2, Decl(file.tsx, 5, 7))
->Component : Symbol(Component, Decl(file.tsx, 0, 31))
->arg : Symbol(arg, Decl(file.tsx, 3, 53))
->prop1 : Symbol(prop1, Decl(file.tsx, 5, 32))
+>a2 : Symbol(a2, Decl(file.tsx, 7, 7))
+>Component : Symbol(Component, Decl(file.tsx, 2, 31))
+>arg : Symbol(arg, Decl(file.tsx, 5, 53))
+>prop1 : Symbol(prop1, Decl(file.tsx, 7, 32))
 }
 
 declare function ComponentSpecific<U>(l: { prop: U }): JSX.Element;
->ComponentSpecific : Symbol(ComponentSpecific, Decl(file.tsx, 6, 1))
->U : Symbol(U, Decl(file.tsx, 8, 35))
->l : Symbol(l, Decl(file.tsx, 8, 38))
->prop : Symbol(prop, Decl(file.tsx, 8, 42))
->U : Symbol(U, Decl(file.tsx, 8, 35))
+>ComponentSpecific : Symbol(ComponentSpecific, Decl(file.tsx, 8, 1))
+>U : Symbol(U, Decl(file.tsx, 10, 35))
+>l : Symbol(l, Decl(file.tsx, 10, 38))
+>prop : Symbol(prop, Decl(file.tsx, 10, 42))
+>U : Symbol(U, Decl(file.tsx, 10, 35))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 declare function ComponentSpecific1<U>(l: { prop: U, "ignore-prop": number }): JSX.Element;
->ComponentSpecific1 : Symbol(ComponentSpecific1, Decl(file.tsx, 8, 67))
->U : Symbol(U, Decl(file.tsx, 9, 36))
->l : Symbol(l, Decl(file.tsx, 9, 39))
->prop : Symbol(prop, Decl(file.tsx, 9, 43))
->U : Symbol(U, Decl(file.tsx, 9, 36))
->"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 9, 52))
+>ComponentSpecific1 : Symbol(ComponentSpecific1, Decl(file.tsx, 10, 67))
+>U : Symbol(U, Decl(file.tsx, 11, 36))
+>l : Symbol(l, Decl(file.tsx, 11, 39))
+>prop : Symbol(prop, Decl(file.tsx, 11, 43))
+>U : Symbol(U, Decl(file.tsx, 11, 36))
+>"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 11, 52))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
 function Bar<T extends { prop: number }>(arg: T) {
->Bar : Symbol(Bar, Decl(file.tsx, 9, 91))
->T : Symbol(T, Decl(file.tsx, 11, 13))
->prop : Symbol(prop, Decl(file.tsx, 11, 24))
->arg : Symbol(arg, Decl(file.tsx, 11, 41))
->T : Symbol(T, Decl(file.tsx, 11, 13))
+>Bar : Symbol(Bar, Decl(file.tsx, 11, 91))
+>T : Symbol(T, Decl(file.tsx, 13, 13))
+>prop : Symbol(prop, Decl(file.tsx, 13, 24))
+>arg : Symbol(arg, Decl(file.tsx, 13, 41))
+>T : Symbol(T, Decl(file.tsx, 13, 13))
 
     let a1 = <ComponentSpecific {...arg} ignore-prop="hi" />;  // U is number
->a1 : Symbol(a1, Decl(file.tsx, 12, 7))
->ComponentSpecific : Symbol(ComponentSpecific, Decl(file.tsx, 6, 1))
->arg : Symbol(arg, Decl(file.tsx, 11, 41))
->ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 12, 40))
+>a1 : Symbol(a1, Decl(file.tsx, 14, 7))
+>ComponentSpecific : Symbol(ComponentSpecific, Decl(file.tsx, 8, 1))
+>arg : Symbol(arg, Decl(file.tsx, 13, 41))
+>ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 14, 40))
 
     let a2 = <ComponentSpecific1 {...arg} ignore-prop={10} />;  // U is number
->a2 : Symbol(a2, Decl(file.tsx, 13, 7))
->ComponentSpecific1 : Symbol(ComponentSpecific1, Decl(file.tsx, 8, 67))
->arg : Symbol(arg, Decl(file.tsx, 11, 41))
->ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 13, 41))
+>a2 : Symbol(a2, Decl(file.tsx, 15, 7))
+>ComponentSpecific1 : Symbol(ComponentSpecific1, Decl(file.tsx, 10, 67))
+>arg : Symbol(arg, Decl(file.tsx, 13, 41))
+>ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 15, 41))
 
     let a3 = <ComponentSpecific {...arg} prop="hello" />;   // U is "hello"
->a3 : Symbol(a3, Decl(file.tsx, 14, 7))
->ComponentSpecific : Symbol(ComponentSpecific, Decl(file.tsx, 6, 1))
->arg : Symbol(arg, Decl(file.tsx, 11, 41))
->prop : Symbol(prop, Decl(file.tsx, 14, 40))
+>a3 : Symbol(a3, Decl(file.tsx, 16, 7))
+>ComponentSpecific : Symbol(ComponentSpecific, Decl(file.tsx, 8, 1))
+>arg : Symbol(arg, Decl(file.tsx, 13, 41))
+>prop : Symbol(prop, Decl(file.tsx, 16, 40))
 
     let a4 = <ComponentSpecific {...arg} prop1="hello" />;   // U is "hello"
->a4 : Symbol(a4, Decl(file.tsx, 15, 7))
->ComponentSpecific : Symbol(ComponentSpecific, Decl(file.tsx, 6, 1))
->arg : Symbol(arg, Decl(file.tsx, 11, 41))
->prop1 : Symbol(prop1, Decl(file.tsx, 15, 40))
+>a4 : Symbol(a4, Decl(file.tsx, 17, 7))
+>ComponentSpecific : Symbol(ComponentSpecific, Decl(file.tsx, 8, 1))
+>arg : Symbol(arg, Decl(file.tsx, 13, 41))
+>prop1 : Symbol(prop1, Decl(file.tsx, 17, 40))
 }
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
index 4ff0ac71dd001..652a1d5e74730 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments5.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react')
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxTypeArgumentResolution.errors.txt b/tests/baselines/reference/tsxTypeArgumentResolution.errors.txt
index dcadad81babd1..98baf3534dca6 100644
--- a/tests/baselines/reference/tsxTypeArgumentResolution.errors.txt
+++ b/tests/baselines/reference/tsxTypeArgumentResolution.errors.txt
@@ -1,22 +1,24 @@
-file.tsx(16,26): error TS2322: Type 'number' is not assignable to type 'string'.
 file.tsx(18,26): error TS2322: Type 'number' is not assignable to type 'string'.
-file.tsx(20,13): error TS2558: Expected 1 type arguments, but got 2.
+file.tsx(20,26): error TS2322: Type 'number' is not assignable to type 'string'.
 file.tsx(22,13): error TS2558: Expected 1 type arguments, but got 2.
-file.tsx(24,12): error TS1099: Type argument list cannot be empty.
+file.tsx(24,13): error TS2558: Expected 1 type arguments, but got 2.
 file.tsx(26,12): error TS1099: Type argument list cannot be empty.
-file.tsx(39,14): error TS2344: Type 'Prop' does not satisfy the constraint '{ a: string; }'.
+file.tsx(28,12): error TS1099: Type argument list cannot be empty.
+file.tsx(41,14): error TS2344: Type 'Prop' does not satisfy the constraint '{ a: string; }'.
   Types of property 'a' are incompatible.
     Type 'number' is not assignable to type 'string'.
-file.tsx(41,14): error TS2344: Type 'Prop' does not satisfy the constraint '{ a: string; }'.
+file.tsx(43,14): error TS2344: Type 'Prop' does not satisfy the constraint '{ a: string; }'.
   Types of property 'a' are incompatible.
     Type 'number' is not assignable to type 'string'.
-file.tsx(47,14): error TS2558: Expected 1-2 type arguments, but got 3.
 file.tsx(49,14): error TS2558: Expected 1-2 type arguments, but got 3.
-file.tsx(51,47): error TS2322: Type 'string' is not assignable to type 'number'.
+file.tsx(51,14): error TS2558: Expected 1-2 type arguments, but got 3.
 file.tsx(53,47): error TS2322: Type 'string' is not assignable to type 'number'.
+file.tsx(55,47): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
 ==== file.tsx (12 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     interface Prop {
@@ -35,12 +37,12 @@ file.tsx(53,47): error TS2322: Type 'string' is not assignable to type 'number'.
     x = <MyComp<Prop> a={10} b={20} />; // error
                              ~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
-!!! related TS6500 file.tsx:5:5: The expected type comes from property 'b' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComp<Prop>> & Prop & { children?: ReactNode; }'
+!!! related TS6500 file.tsx:7:5: The expected type comes from property 'b' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComp<Prop>> & Prop & { children?: ReactNode; }'
     
     x = <MyComp<Prop> a={10} b={20}></MyComp>; // error
                              ~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
-!!! related TS6500 file.tsx:5:5: The expected type comes from property 'b' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComp<Prop>> & Prop & { children?: ReactNode; }'
+!!! related TS6500 file.tsx:7:5: The expected type comes from property 'b' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComp<Prop>> & Prop & { children?: ReactNode; }'
     
     x = <MyComp<Prop, Prop> a={10} b="hi" />; // error
                 ~~~~~~~~~~
@@ -96,10 +98,10 @@ file.tsx(53,47): error TS2322: Type 'string' is not assignable to type 'number'.
     x = <MyComp2<{a: string}, {b: number}> a="hi" b="hi" />; // error
                                                   ~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
-!!! related TS6500 file.tsx:51:28: The expected type comes from property 'b' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComp2<{ a: string; }, { b: number; }>> & { a: string; } & { b: number; } & { children?: ReactNode; }'
+!!! related TS6500 file.tsx:53:28: The expected type comes from property 'b' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComp2<{ a: string; }, { b: number; }>> & { a: string; } & { b: number; } & { children?: ReactNode; }'
     
     x = <MyComp2<{a: string}, {b: number}> a="hi" b="hi"></MyComp2>; // error
                                                   ~
 !!! error TS2322: Type 'string' is not assignable to type 'number'.
-!!! related TS6500 file.tsx:53:28: The expected type comes from property 'b' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComp2<{ a: string; }, { b: number; }>> & { a: string; } & { b: number; } & { children?: ReactNode; }'
+!!! related TS6500 file.tsx:55:28: The expected type comes from property 'b' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<MyComp2<{ a: string; }, { b: number; }>> & { a: string; } & { b: number; } & { children?: ReactNode; }'
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxTypeArgumentResolution.js b/tests/baselines/reference/tsxTypeArgumentResolution.js
index 6aed3e0ddc49b..adc8c4037e7b5 100644
--- a/tests/baselines/reference/tsxTypeArgumentResolution.js
+++ b/tests/baselines/reference/tsxTypeArgumentResolution.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxTypeArgumentResolution.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface Prop {
@@ -58,6 +60,7 @@ x = <MyComp2<{a: string}, {b: number}> a="hi" b="hi"></MyComp2>; // error
 
 //// [file.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 var x = <MyComp a={10} b="hi"/>; // OK
diff --git a/tests/baselines/reference/tsxTypeArgumentResolution.symbols b/tests/baselines/reference/tsxTypeArgumentResolution.symbols
index cf40c1a00e2e5..8b95d67e31fab 100644
--- a/tests/baselines/reference/tsxTypeArgumentResolution.symbols
+++ b/tests/baselines/reference/tsxTypeArgumentResolution.symbols
@@ -1,199 +1,201 @@
 //// [tests/cases/conformance/jsx/tsxTypeArgumentResolution.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface Prop {
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 
     a: number,
->a : Symbol(Prop.a, Decl(file.tsx, 2, 16))
+>a : Symbol(Prop.a, Decl(file.tsx, 4, 16))
 
     b: string
->b : Symbol(Prop.b, Decl(file.tsx, 3, 14))
+>b : Symbol(Prop.b, Decl(file.tsx, 5, 14))
 }
 
 declare class MyComp<P> extends React.Component<P, {}> {
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->P : Symbol(P, Decl(file.tsx, 7, 21))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>P : Symbol(P, Decl(file.tsx, 9, 21))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->P : Symbol(P, Decl(file.tsx, 7, 21))
+>P : Symbol(P, Decl(file.tsx, 9, 21))
 
     internalProp: P;
->internalProp : Symbol(MyComp.internalProp, Decl(file.tsx, 7, 56))
->P : Symbol(P, Decl(file.tsx, 7, 21))
+>internalProp : Symbol(MyComp.internalProp, Decl(file.tsx, 9, 56))
+>P : Symbol(P, Decl(file.tsx, 9, 21))
 }
 
 let x = <MyComp<Prop> a={10} b="hi" />; // OK
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
->a : Symbol(a, Decl(file.tsx, 11, 21))
->b : Symbol(b, Decl(file.tsx, 11, 28))
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
+>a : Symbol(a, Decl(file.tsx, 13, 21))
+>b : Symbol(b, Decl(file.tsx, 13, 28))
 
 x = <MyComp<Prop> a={10} b="hi"></MyComp>; // OK
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
->a : Symbol(a, Decl(file.tsx, 13, 17))
->b : Symbol(b, Decl(file.tsx, 13, 24))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
-
-x = <MyComp<Prop> a={10} b={20} />; // error
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 >a : Symbol(a, Decl(file.tsx, 15, 17))
 >b : Symbol(b, Decl(file.tsx, 15, 24))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
 
-x = <MyComp<Prop> a={10} b={20}></MyComp>; // error
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+x = <MyComp<Prop> a={10} b={20} />; // error
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 >a : Symbol(a, Decl(file.tsx, 17, 17))
 >b : Symbol(b, Decl(file.tsx, 17, 24))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
 
-x = <MyComp<Prop, Prop> a={10} b="hi" />; // error
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
->a : Symbol(a, Decl(file.tsx, 19, 23))
->b : Symbol(b, Decl(file.tsx, 19, 30))
+x = <MyComp<Prop> a={10} b={20}></MyComp>; // error
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
+>a : Symbol(a, Decl(file.tsx, 19, 17))
+>b : Symbol(b, Decl(file.tsx, 19, 24))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
 
-x = <MyComp<Prop, Prop> a={10} b="hi"></MyComp>; // error
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+x = <MyComp<Prop, Prop> a={10} b="hi" />; // error
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 >a : Symbol(a, Decl(file.tsx, 21, 23))
 >b : Symbol(b, Decl(file.tsx, 21, 30))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
 
-x = <MyComp<> a={10} b="hi" />; // error
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->a : Symbol(a, Decl(file.tsx, 23, 13))
->b : Symbol(b, Decl(file.tsx, 23, 20))
+x = <MyComp<Prop, Prop> a={10} b="hi"></MyComp>; // error
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
+>a : Symbol(a, Decl(file.tsx, 23, 23))
+>b : Symbol(b, Decl(file.tsx, 23, 30))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
 
-x = <MyComp<> a={10} b="hi"></MyComp>; // error
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
+x = <MyComp<> a={10} b="hi" />; // error
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
 >a : Symbol(a, Decl(file.tsx, 25, 13))
 >b : Symbol(b, Decl(file.tsx, 25, 20))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
+
+x = <MyComp<> a={10} b="hi"></MyComp>; // error
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>a : Symbol(a, Decl(file.tsx, 27, 13))
+>b : Symbol(b, Decl(file.tsx, 27, 20))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
 
 x= <MyComp<{}> /> // OK
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
 
 x= <MyComp<{}>></MyComp> // OK
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
->MyComp : Symbol(MyComp, Decl(file.tsx, 5, 1))
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
+>MyComp : Symbol(MyComp, Decl(file.tsx, 7, 1))
 
 declare class MyComp2<P extends { a: string }, P2 = {}> extends React.Component<P & P2, {}> {
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
->P : Symbol(P, Decl(file.tsx, 31, 22))
->a : Symbol(a, Decl(file.tsx, 31, 33))
->P2 : Symbol(P2, Decl(file.tsx, 31, 46))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
+>P : Symbol(P, Decl(file.tsx, 33, 22))
+>a : Symbol(a, Decl(file.tsx, 33, 33))
+>P2 : Symbol(P2, Decl(file.tsx, 33, 46))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->P : Symbol(P, Decl(file.tsx, 31, 22))
->P2 : Symbol(P2, Decl(file.tsx, 31, 46))
+>P : Symbol(P, Decl(file.tsx, 33, 22))
+>P2 : Symbol(P2, Decl(file.tsx, 33, 46))
 
     internalProp: [P, P2];
->internalProp : Symbol(MyComp2.internalProp, Decl(file.tsx, 31, 93))
->P : Symbol(P, Decl(file.tsx, 31, 22))
->P2 : Symbol(P2, Decl(file.tsx, 31, 46))
+>internalProp : Symbol(MyComp2.internalProp, Decl(file.tsx, 33, 93))
+>P : Symbol(P, Decl(file.tsx, 33, 22))
+>P2 : Symbol(P2, Decl(file.tsx, 33, 46))
 }
 x = <MyComp2<{a: string, b: string}> a="a" b="b" />; // OK
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
->a : Symbol(a, Decl(file.tsx, 34, 14))
->b : Symbol(b, Decl(file.tsx, 34, 24))
->a : Symbol(a, Decl(file.tsx, 34, 36))
->b : Symbol(b, Decl(file.tsx, 34, 42))
-
-x = <MyComp2<{a: string, b: string}> a="a" b="b"></MyComp2>; // OK
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
 >a : Symbol(a, Decl(file.tsx, 36, 14))
 >b : Symbol(b, Decl(file.tsx, 36, 24))
 >a : Symbol(a, Decl(file.tsx, 36, 36))
 >b : Symbol(b, Decl(file.tsx, 36, 42))
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
 
-x = <MyComp2<Prop> a={10} b="hi" />; // error
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
->a : Symbol(a, Decl(file.tsx, 38, 18))
->b : Symbol(b, Decl(file.tsx, 38, 25))
+x = <MyComp2<{a: string, b: string}> a="a" b="b"></MyComp2>; // OK
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
+>a : Symbol(a, Decl(file.tsx, 38, 14))
+>b : Symbol(b, Decl(file.tsx, 38, 24))
+>a : Symbol(a, Decl(file.tsx, 38, 36))
+>b : Symbol(b, Decl(file.tsx, 38, 42))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
 
-x = <MyComp2<Prop> a={10} b="hi"></MyComp2>; // error
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+x = <MyComp2<Prop> a={10} b="hi" />; // error
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 >a : Symbol(a, Decl(file.tsx, 40, 18))
 >b : Symbol(b, Decl(file.tsx, 40, 25))
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
 
-x = <MyComp2<{a: string}, {b: string}> a="hi" b="hi" />; // OK
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
->a : Symbol(a, Decl(file.tsx, 42, 14))
->b : Symbol(b, Decl(file.tsx, 42, 27))
->a : Symbol(a, Decl(file.tsx, 42, 38))
->b : Symbol(b, Decl(file.tsx, 42, 45))
+x = <MyComp2<Prop> a={10} b="hi"></MyComp2>; // error
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
+>a : Symbol(a, Decl(file.tsx, 42, 18))
+>b : Symbol(b, Decl(file.tsx, 42, 25))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
 
-x = <MyComp2<{a: string}, {b: string}> a="hi" b="hi"></MyComp2>; // OK
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
+x = <MyComp2<{a: string}, {b: string}> a="hi" b="hi" />; // OK
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
 >a : Symbol(a, Decl(file.tsx, 44, 14))
 >b : Symbol(b, Decl(file.tsx, 44, 27))
 >a : Symbol(a, Decl(file.tsx, 44, 38))
 >b : Symbol(b, Decl(file.tsx, 44, 45))
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
 
-x = <MyComp2<{a: string}, {b: string}, Prop> a="hi" b="hi" />; // error
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
+x = <MyComp2<{a: string}, {b: string}> a="hi" b="hi"></MyComp2>; // OK
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
 >a : Symbol(a, Decl(file.tsx, 46, 14))
 >b : Symbol(b, Decl(file.tsx, 46, 27))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
->a : Symbol(a, Decl(file.tsx, 46, 44))
->b : Symbol(b, Decl(file.tsx, 46, 51))
+>a : Symbol(a, Decl(file.tsx, 46, 38))
+>b : Symbol(b, Decl(file.tsx, 46, 45))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
 
-x = <MyComp2<{a: string}, {b: string}, Prop> a="hi" b="hi"></MyComp2>; // error
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
+x = <MyComp2<{a: string}, {b: string}, Prop> a="hi" b="hi" />; // error
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
 >a : Symbol(a, Decl(file.tsx, 48, 14))
 >b : Symbol(b, Decl(file.tsx, 48, 27))
->Prop : Symbol(Prop, Decl(file.tsx, 0, 32))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
 >a : Symbol(a, Decl(file.tsx, 48, 44))
 >b : Symbol(b, Decl(file.tsx, 48, 51))
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
 
-x = <MyComp2<{a: string}, {b: number}> a="hi" b="hi" />; // error
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
+x = <MyComp2<{a: string}, {b: string}, Prop> a="hi" b="hi"></MyComp2>; // error
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
 >a : Symbol(a, Decl(file.tsx, 50, 14))
 >b : Symbol(b, Decl(file.tsx, 50, 27))
->a : Symbol(a, Decl(file.tsx, 50, 38))
->b : Symbol(b, Decl(file.tsx, 50, 45))
+>Prop : Symbol(Prop, Decl(file.tsx, 2, 32))
+>a : Symbol(a, Decl(file.tsx, 50, 44))
+>b : Symbol(b, Decl(file.tsx, 50, 51))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
 
-x = <MyComp2<{a: string}, {b: number}> a="hi" b="hi"></MyComp2>; // error
->x : Symbol(x, Decl(file.tsx, 11, 3))
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
+x = <MyComp2<{a: string}, {b: number}> a="hi" b="hi" />; // error
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
 >a : Symbol(a, Decl(file.tsx, 52, 14))
 >b : Symbol(b, Decl(file.tsx, 52, 27))
 >a : Symbol(a, Decl(file.tsx, 52, 38))
 >b : Symbol(b, Decl(file.tsx, 52, 45))
->MyComp2 : Symbol(MyComp2, Decl(file.tsx, 29, 24))
+
+x = <MyComp2<{a: string}, {b: number}> a="hi" b="hi"></MyComp2>; // error
+>x : Symbol(x, Decl(file.tsx, 13, 3))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
+>a : Symbol(a, Decl(file.tsx, 54, 14))
+>b : Symbol(b, Decl(file.tsx, 54, 27))
+>a : Symbol(a, Decl(file.tsx, 54, 38))
+>b : Symbol(b, Decl(file.tsx, 54, 45))
+>MyComp2 : Symbol(MyComp2, Decl(file.tsx, 31, 24))
 
diff --git a/tests/baselines/reference/tsxTypeArgumentResolution.types b/tests/baselines/reference/tsxTypeArgumentResolution.types
index e8be9ceada4d2..c8ee8de3ee252 100644
--- a/tests/baselines/reference/tsxTypeArgumentResolution.types
+++ b/tests/baselines/reference/tsxTypeArgumentResolution.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxTypeArgumentResolution.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxTypeArgumentsJsxPreserveOutput.js b/tests/baselines/reference/tsxTypeArgumentsJsxPreserveOutput.js
index b6a7b6b697a5b..8e2e795132882 100644
--- a/tests/baselines/reference/tsxTypeArgumentsJsxPreserveOutput.js
+++ b/tests/baselines/reference/tsxTypeArgumentsJsxPreserveOutput.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxTypeArgumentsJsxPreserveOutput.tsx] ////
 
 //// [foo.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 type TypeProps = { foo?: boolean; };
@@ -39,6 +41,7 @@ function Foo<T>() {
 
 //// [foo.jsx]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 function Foo() {
diff --git a/tests/baselines/reference/tsxTypeArgumentsJsxPreserveOutput.symbols b/tests/baselines/reference/tsxTypeArgumentsJsxPreserveOutput.symbols
index 60bb9a20f9984..414c390b253be 100644
--- a/tests/baselines/reference/tsxTypeArgumentsJsxPreserveOutput.symbols
+++ b/tests/baselines/reference/tsxTypeArgumentsJsxPreserveOutput.symbols
@@ -1,20 +1,22 @@
 //// [tests/cases/conformance/jsx/tsxTypeArgumentsJsxPreserveOutput.tsx] ////
 
 === foo.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(foo.tsx, 0, 0))
 
 type TypeProps = { foo?: boolean; };
->TypeProps : Symbol(TypeProps, Decl(foo.tsx, 0, 32))
->foo : Symbol(foo, Decl(foo.tsx, 2, 18))
+>TypeProps : Symbol(TypeProps, Decl(foo.tsx, 2, 32))
+>foo : Symbol(foo, Decl(foo.tsx, 4, 18))
 
 interface InterfaceProps { foo?: boolean; }
->InterfaceProps : Symbol(InterfaceProps, Decl(foo.tsx, 2, 36))
->foo : Symbol(InterfaceProps.foo, Decl(foo.tsx, 3, 26))
+>InterfaceProps : Symbol(InterfaceProps, Decl(foo.tsx, 4, 36))
+>foo : Symbol(InterfaceProps.foo, Decl(foo.tsx, 5, 26))
 
 function Foo<T>() {
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
->T : Symbol(T, Decl(foo.tsx, 5, 13))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
+>T : Symbol(T, Decl(foo.tsx, 7, 13))
 
     return null;
 }
@@ -22,79 +24,79 @@ function Foo<T>() {
 <>
     {/* JsxSelfClosingElement */}
     <Foo<unknown> />
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<string> />
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<boolean> />
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<object> />
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<null> />
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<any> />
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<never> />
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<undefined> />
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<TypeProps> />
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
->TypeProps : Symbol(TypeProps, Decl(foo.tsx, 0, 32))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
+>TypeProps : Symbol(TypeProps, Decl(foo.tsx, 2, 32))
 
     <Foo<InterfaceProps> />
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
->InterfaceProps : Symbol(InterfaceProps, Decl(foo.tsx, 2, 36))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
+>InterfaceProps : Symbol(InterfaceProps, Decl(foo.tsx, 4, 36))
 
     {/* JsxOpeningElement */}
     <Foo<unknown>></Foo>
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<string>></Foo>
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<boolean>></Foo>
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<object>></Foo>
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<null>></Foo>
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<any>></Foo>
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<never>></Foo>
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<undefined>></Foo>
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<TypeProps>></Foo>
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
->TypeProps : Symbol(TypeProps, Decl(foo.tsx, 0, 32))
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
+>TypeProps : Symbol(TypeProps, Decl(foo.tsx, 2, 32))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
     <Foo<InterfaceProps>></Foo>
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
->InterfaceProps : Symbol(InterfaceProps, Decl(foo.tsx, 2, 36))
->Foo : Symbol(Foo, Decl(foo.tsx, 3, 43))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
+>InterfaceProps : Symbol(InterfaceProps, Decl(foo.tsx, 4, 36))
+>Foo : Symbol(Foo, Decl(foo.tsx, 5, 43))
 
 </>
 
diff --git a/tests/baselines/reference/tsxTypeArgumentsJsxPreserveOutput.types b/tests/baselines/reference/tsxTypeArgumentsJsxPreserveOutput.types
index 722375db44c5f..8608e36083e4c 100644
--- a/tests/baselines/reference/tsxTypeArgumentsJsxPreserveOutput.types
+++ b/tests/baselines/reference/tsxTypeArgumentsJsxPreserveOutput.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxTypeArgumentsJsxPreserveOutput.tsx] ////
 
 === foo.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxUnionElementType1.errors.txt b/tests/baselines/reference/tsxUnionElementType1.errors.txt
index e88ecda0e4c95..9ff61a5cd227c 100644
--- a/tests/baselines/reference/tsxUnionElementType1.errors.txt
+++ b/tests/baselines/reference/tsxUnionElementType1.errors.txt
@@ -1,7 +1,9 @@
-file.tsx(12,10): error TS2322: Type 'true' is not assignable to type 'never'.
+file.tsx(14,10): error TS2322: Type 'true' is not assignable to type 'never'.
 
 
 ==== file.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     function SFC1(prop: { x: number }) {
diff --git a/tests/baselines/reference/tsxUnionElementType1.js b/tests/baselines/reference/tsxUnionElementType1.js
index 40c630905ef49..82f181933366a 100644
--- a/tests/baselines/reference/tsxUnionElementType1.js
+++ b/tests/baselines/reference/tsxUnionElementType1.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType1.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 function SFC1(prop: { x: number }) {
@@ -16,6 +18,7 @@ var SFCComp = SFC1 || SFC2;
 
 //// [file.js]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 function SFC1(prop) {
diff --git a/tests/baselines/reference/tsxUnionElementType1.symbols b/tests/baselines/reference/tsxUnionElementType1.symbols
index 3343be1d99596..d349f1ea6f527 100644
--- a/tests/baselines/reference/tsxUnionElementType1.symbols
+++ b/tests/baselines/reference/tsxUnionElementType1.symbols
@@ -1,13 +1,15 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 function SFC1(prop: { x: number }) {
->SFC1 : Symbol(SFC1, Decl(file.tsx, 0, 32))
->prop : Symbol(prop, Decl(file.tsx, 2, 14))
->x : Symbol(x, Decl(file.tsx, 2, 21))
+>SFC1 : Symbol(SFC1, Decl(file.tsx, 2, 32))
+>prop : Symbol(prop, Decl(file.tsx, 4, 14))
+>x : Symbol(x, Decl(file.tsx, 4, 21))
 
     return <div>hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -16,9 +18,9 @@ function SFC1(prop: { x: number }) {
 };
 
 function SFC2(prop: { x: boolean }) {
->SFC2 : Symbol(SFC2, Decl(file.tsx, 4, 2))
->prop : Symbol(prop, Decl(file.tsx, 6, 14))
->x : Symbol(x, Decl(file.tsx, 6, 21))
+>SFC2 : Symbol(SFC2, Decl(file.tsx, 6, 2))
+>prop : Symbol(prop, Decl(file.tsx, 8, 14))
+>x : Symbol(x, Decl(file.tsx, 8, 21))
 
     return <h1>World </h1>;
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
@@ -26,11 +28,11 @@ function SFC2(prop: { x: boolean }) {
 }
 
 var SFCComp = SFC1 || SFC2;
->SFCComp : Symbol(SFCComp, Decl(file.tsx, 10, 3))
->SFC1 : Symbol(SFC1, Decl(file.tsx, 0, 32))
->SFC2 : Symbol(SFC2, Decl(file.tsx, 4, 2))
+>SFCComp : Symbol(SFCComp, Decl(file.tsx, 12, 3))
+>SFC1 : Symbol(SFC1, Decl(file.tsx, 2, 32))
+>SFC2 : Symbol(SFC2, Decl(file.tsx, 6, 2))
 
 <SFCComp x />
->SFCComp : Symbol(SFCComp, Decl(file.tsx, 10, 3))
->x : Symbol(x, Decl(file.tsx, 11, 8))
+>SFCComp : Symbol(SFCComp, Decl(file.tsx, 12, 3))
+>x : Symbol(x, Decl(file.tsx, 13, 8))
 
diff --git a/tests/baselines/reference/tsxUnionElementType1.types b/tests/baselines/reference/tsxUnionElementType1.types
index b32ac6244c572..60a4662da2f02 100644
--- a/tests/baselines/reference/tsxUnionElementType1.types
+++ b/tests/baselines/reference/tsxUnionElementType1.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxUnionElementType2.errors.txt b/tests/baselines/reference/tsxUnionElementType2.errors.txt
index 0ca7d9844ed79..72b5dbfa418ab 100644
--- a/tests/baselines/reference/tsxUnionElementType2.errors.txt
+++ b/tests/baselines/reference/tsxUnionElementType2.errors.txt
@@ -1,7 +1,9 @@
-file.tsx(12,10): error TS2322: Type 'string' is not assignable to type 'never'.
+file.tsx(14,10): error TS2322: Type 'string' is not assignable to type 'never'.
 
 
 ==== file.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     function SFC1(prop: { x: number }) {
diff --git a/tests/baselines/reference/tsxUnionElementType2.js b/tests/baselines/reference/tsxUnionElementType2.js
index 14f3bf750b8a0..b737269a1465e 100644
--- a/tests/baselines/reference/tsxUnionElementType2.js
+++ b/tests/baselines/reference/tsxUnionElementType2.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType2.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 function SFC1(prop: { x: number }) {
@@ -16,6 +18,7 @@ var SFCComp = SFC1 || SFC2;
 
 //// [file.js]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 function SFC1(prop) {
diff --git a/tests/baselines/reference/tsxUnionElementType2.symbols b/tests/baselines/reference/tsxUnionElementType2.symbols
index 471b7367a6ae5..cee3cca5390b1 100644
--- a/tests/baselines/reference/tsxUnionElementType2.symbols
+++ b/tests/baselines/reference/tsxUnionElementType2.symbols
@@ -1,13 +1,15 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 function SFC1(prop: { x: number }) {
->SFC1 : Symbol(SFC1, Decl(file.tsx, 0, 32))
->prop : Symbol(prop, Decl(file.tsx, 2, 14))
->x : Symbol(x, Decl(file.tsx, 2, 21))
+>SFC1 : Symbol(SFC1, Decl(file.tsx, 2, 32))
+>prop : Symbol(prop, Decl(file.tsx, 4, 14))
+>x : Symbol(x, Decl(file.tsx, 4, 21))
 
     return <div>hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -16,9 +18,9 @@ function SFC1(prop: { x: number }) {
 };
 
 function SFC2(prop: { x: boolean }) {
->SFC2 : Symbol(SFC2, Decl(file.tsx, 4, 2))
->prop : Symbol(prop, Decl(file.tsx, 6, 14))
->x : Symbol(x, Decl(file.tsx, 6, 21))
+>SFC2 : Symbol(SFC2, Decl(file.tsx, 6, 2))
+>prop : Symbol(prop, Decl(file.tsx, 8, 14))
+>x : Symbol(x, Decl(file.tsx, 8, 21))
 
     return <h1>World </h1>;
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
@@ -26,11 +28,11 @@ function SFC2(prop: { x: boolean }) {
 }
 
 var SFCComp = SFC1 || SFC2;
->SFCComp : Symbol(SFCComp, Decl(file.tsx, 10, 3))
->SFC1 : Symbol(SFC1, Decl(file.tsx, 0, 32))
->SFC2 : Symbol(SFC2, Decl(file.tsx, 4, 2))
+>SFCComp : Symbol(SFCComp, Decl(file.tsx, 12, 3))
+>SFC1 : Symbol(SFC1, Decl(file.tsx, 2, 32))
+>SFC2 : Symbol(SFC2, Decl(file.tsx, 6, 2))
 
 <SFCComp x={"hi"}/>
->SFCComp : Symbol(SFCComp, Decl(file.tsx, 10, 3))
->x : Symbol(x, Decl(file.tsx, 11, 8))
+>SFCComp : Symbol(SFCComp, Decl(file.tsx, 12, 3))
+>x : Symbol(x, Decl(file.tsx, 13, 8))
 
diff --git a/tests/baselines/reference/tsxUnionElementType2.types b/tests/baselines/reference/tsxUnionElementType2.types
index 0b7a203e7b2f3..a5fe3d395520b 100644
--- a/tests/baselines/reference/tsxUnionElementType2.types
+++ b/tests/baselines/reference/tsxUnionElementType2.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxUnionElementType3.errors.txt b/tests/baselines/reference/tsxUnionElementType3.errors.txt
index 71dbf4c93814f..d4d66d9a76a14 100644
--- a/tests/baselines/reference/tsxUnionElementType3.errors.txt
+++ b/tests/baselines/reference/tsxUnionElementType3.errors.txt
@@ -1,7 +1,9 @@
-file.tsx(32,17): error TS2322: Type 'string' is not assignable to type 'never'.
+file.tsx(34,17): error TS2322: Type 'string' is not assignable to type 'never'.
 
 
 ==== file.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     class RC1 extends React.Component<{x : number}, {}> {
@@ -36,7 +38,7 @@ file.tsx(32,17): error TS2322: Type 'string' is not assignable to type 'never'.
     let a = <RCComp x="Hi" />;
                     ~
 !!! error TS2322: Type 'string' is not assignable to type 'never'.
-!!! related TS6500 file.tsx:3:36: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<RC1 | RC2> & { x: number; } & { children?: ReactNode; } & { x: string; } & { children?: ReactNode; }'
+!!! related TS6500 file.tsx:5:36: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<RC1 | RC2> & { x: number; } & { children?: ReactNode; } & { x: string; } & { children?: ReactNode; }'
     let a1 = <EmptyRCComp />;
     let a2 = <EmptyRCComp data-prop="hello" />;
     let b = <PartRCComp />
diff --git a/tests/baselines/reference/tsxUnionElementType3.js b/tests/baselines/reference/tsxUnionElementType3.js
index bd35aaeee8e2b..5ae71cc03b879 100644
--- a/tests/baselines/reference/tsxUnionElementType3.js
+++ b/tests/baselines/reference/tsxUnionElementType3.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType3.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 class RC1 extends React.Component<{x : number}, {}> {
@@ -40,6 +42,7 @@ let c = <PartRCComp data-extra="hello" />
 
 //// [file.js]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxUnionElementType3.symbols b/tests/baselines/reference/tsxUnionElementType3.symbols
index f17d73c204731..c5d1063095562 100644
--- a/tests/baselines/reference/tsxUnionElementType3.symbols
+++ b/tests/baselines/reference/tsxUnionElementType3.symbols
@@ -1,101 +1,103 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 class RC1 extends React.Component<{x : number}, {}> {
->RC1 : Symbol(RC1, Decl(file.tsx, 0, 32))
+>RC1 : Symbol(RC1, Decl(file.tsx, 2, 32))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->x : Symbol(x, Decl(file.tsx, 2, 35))
+>x : Symbol(x, Decl(file.tsx, 4, 35))
 
     render() {
->render : Symbol(RC1.render, Decl(file.tsx, 2, 53))
+>render : Symbol(RC1.render, Decl(file.tsx, 4, 53))
 
         return null;
     }
 }
 
 class RC2 extends React.Component<{ x: string }, {}> {
->RC2 : Symbol(RC2, Decl(file.tsx, 6, 1))
+>RC2 : Symbol(RC2, Decl(file.tsx, 8, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->x : Symbol(x, Decl(file.tsx, 8, 35))
+>x : Symbol(x, Decl(file.tsx, 10, 35))
 
     render() {
->render : Symbol(RC2.render, Decl(file.tsx, 8, 54))
+>render : Symbol(RC2.render, Decl(file.tsx, 10, 54))
 
         return null;
     }
     private method() { }
->method : Symbol(RC2.method, Decl(file.tsx, 11, 5))
+>method : Symbol(RC2.method, Decl(file.tsx, 13, 5))
 }
 
 class RC3 extends React.Component<{}, {}> {
->RC3 : Symbol(RC3, Decl(file.tsx, 13, 1))
+>RC3 : Symbol(RC3, Decl(file.tsx, 15, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 
     render() {
->render : Symbol(RC3.render, Decl(file.tsx, 15, 43))
+>render : Symbol(RC3.render, Decl(file.tsx, 17, 43))
 
         return null;
     }
 }
 
 class RC4 extends React.Component<{}, {}> {
->RC4 : Symbol(RC4, Decl(file.tsx, 19, 1))
+>RC4 : Symbol(RC4, Decl(file.tsx, 21, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 
     render() {
->render : Symbol(RC4.render, Decl(file.tsx, 21, 43))
+>render : Symbol(RC4.render, Decl(file.tsx, 23, 43))
 
         return null;
     }
 }
 
 var EmptyRCComp = RC3 || RC4;
->EmptyRCComp : Symbol(EmptyRCComp, Decl(file.tsx, 27, 3))
->RC3 : Symbol(RC3, Decl(file.tsx, 13, 1))
->RC4 : Symbol(RC4, Decl(file.tsx, 19, 1))
+>EmptyRCComp : Symbol(EmptyRCComp, Decl(file.tsx, 29, 3))
+>RC3 : Symbol(RC3, Decl(file.tsx, 15, 1))
+>RC4 : Symbol(RC4, Decl(file.tsx, 21, 1))
 
 var PartRCComp = RC1 || RC4;
->PartRCComp : Symbol(PartRCComp, Decl(file.tsx, 28, 3))
->RC1 : Symbol(RC1, Decl(file.tsx, 0, 32))
->RC4 : Symbol(RC4, Decl(file.tsx, 19, 1))
+>PartRCComp : Symbol(PartRCComp, Decl(file.tsx, 30, 3))
+>RC1 : Symbol(RC1, Decl(file.tsx, 2, 32))
+>RC4 : Symbol(RC4, Decl(file.tsx, 21, 1))
 
 var RCComp = RC1 || RC2;
->RCComp : Symbol(RCComp, Decl(file.tsx, 29, 3))
->RC1 : Symbol(RC1, Decl(file.tsx, 0, 32))
->RC2 : Symbol(RC2, Decl(file.tsx, 6, 1))
+>RCComp : Symbol(RCComp, Decl(file.tsx, 31, 3))
+>RC1 : Symbol(RC1, Decl(file.tsx, 2, 32))
+>RC2 : Symbol(RC2, Decl(file.tsx, 8, 1))
 
 // OK
 let a = <RCComp x="Hi" />;
->a : Symbol(a, Decl(file.tsx, 31, 3))
->RCComp : Symbol(RCComp, Decl(file.tsx, 29, 3))
->x : Symbol(x, Decl(file.tsx, 31, 15))
+>a : Symbol(a, Decl(file.tsx, 33, 3))
+>RCComp : Symbol(RCComp, Decl(file.tsx, 31, 3))
+>x : Symbol(x, Decl(file.tsx, 33, 15))
 
 let a1 = <EmptyRCComp />;
->a1 : Symbol(a1, Decl(file.tsx, 32, 3))
->EmptyRCComp : Symbol(EmptyRCComp, Decl(file.tsx, 27, 3))
+>a1 : Symbol(a1, Decl(file.tsx, 34, 3))
+>EmptyRCComp : Symbol(EmptyRCComp, Decl(file.tsx, 29, 3))
 
 let a2 = <EmptyRCComp data-prop="hello" />;
->a2 : Symbol(a2, Decl(file.tsx, 33, 3))
->EmptyRCComp : Symbol(EmptyRCComp, Decl(file.tsx, 27, 3))
->data-prop : Symbol(data-prop, Decl(file.tsx, 33, 21))
+>a2 : Symbol(a2, Decl(file.tsx, 35, 3))
+>EmptyRCComp : Symbol(EmptyRCComp, Decl(file.tsx, 29, 3))
+>data-prop : Symbol(data-prop, Decl(file.tsx, 35, 21))
 
 let b = <PartRCComp />
->b : Symbol(b, Decl(file.tsx, 34, 3))
->PartRCComp : Symbol(PartRCComp, Decl(file.tsx, 28, 3))
+>b : Symbol(b, Decl(file.tsx, 36, 3))
+>PartRCComp : Symbol(PartRCComp, Decl(file.tsx, 30, 3))
 
 let c = <PartRCComp data-extra="hello" />
->c : Symbol(c, Decl(file.tsx, 35, 3))
->PartRCComp : Symbol(PartRCComp, Decl(file.tsx, 28, 3))
->data-extra : Symbol(data-extra, Decl(file.tsx, 35, 19))
+>c : Symbol(c, Decl(file.tsx, 37, 3))
+>PartRCComp : Symbol(PartRCComp, Decl(file.tsx, 30, 3))
+>data-extra : Symbol(data-extra, Decl(file.tsx, 37, 19))
 
diff --git a/tests/baselines/reference/tsxUnionElementType3.types b/tests/baselines/reference/tsxUnionElementType3.types
index d55c251d3ffe3..301523bb1be23 100644
--- a/tests/baselines/reference/tsxUnionElementType3.types
+++ b/tests/baselines/reference/tsxUnionElementType3.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType3.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxUnionElementType4.errors.txt b/tests/baselines/reference/tsxUnionElementType4.errors.txt
index c91f508e81b51..0fed9a25b9674 100644
--- a/tests/baselines/reference/tsxUnionElementType4.errors.txt
+++ b/tests/baselines/reference/tsxUnionElementType4.errors.txt
@@ -1,11 +1,13 @@
-file.tsx(32,17): error TS2322: Type 'true' is not assignable to type 'never'.
-file.tsx(33,21): error TS2322: Type '{ x: number; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<RC4> & { children?: ReactNode; }'.
+file.tsx(34,17): error TS2322: Type 'true' is not assignable to type 'never'.
+file.tsx(35,21): error TS2322: Type '{ x: number; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<RC4> & { children?: ReactNode; }'.
   Property 'x' does not exist on type 'IntrinsicAttributes & IntrinsicClassAttributes<RC4> & { children?: ReactNode; }'.
-file.tsx(34,22): error TS2322: Type '{ prop: true; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<RC3> & { children?: ReactNode; }'.
+file.tsx(36,22): error TS2322: Type '{ prop: true; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<RC3> & { children?: ReactNode; }'.
   Property 'prop' does not exist on type 'IntrinsicAttributes & IntrinsicClassAttributes<RC3> & { children?: ReactNode; }'.
 
 
 ==== file.tsx (3 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     class RC1 extends React.Component<{x : number}, {}> {
@@ -40,7 +42,7 @@ file.tsx(34,22): error TS2322: Type '{ prop: true; }' is not assignable to type
     let a = <RCComp x />;
                     ~
 !!! error TS2322: Type 'true' is not assignable to type 'never'.
-!!! related TS6500 file.tsx:3:36: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<RC1 | RC2> & { x: number; } & { children?: ReactNode; } & { x: string; } & { children?: ReactNode; }'
+!!! related TS6500 file.tsx:5:36: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<RC1 | RC2> & { x: number; } & { children?: ReactNode; } & { x: string; } & { children?: ReactNode; }'
     let b = <PartRCComp x={10} />
                         ~
 !!! error TS2322: Type '{ x: number; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<RC4> & { children?: ReactNode; }'.
diff --git a/tests/baselines/reference/tsxUnionElementType4.js b/tests/baselines/reference/tsxUnionElementType4.js
index 683160776ae0e..e3cdb3fc34169 100644
--- a/tests/baselines/reference/tsxUnionElementType4.js
+++ b/tests/baselines/reference/tsxUnionElementType4.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType4.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 class RC1 extends React.Component<{x : number}, {}> {
@@ -39,6 +41,7 @@ let c = <EmptyRCComp prop />;
 
 //// [file.js]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxUnionElementType4.symbols b/tests/baselines/reference/tsxUnionElementType4.symbols
index 3a74a7605a2af..dab6ebf10cd92 100644
--- a/tests/baselines/reference/tsxUnionElementType4.symbols
+++ b/tests/baselines/reference/tsxUnionElementType4.symbols
@@ -1,93 +1,95 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType4.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 class RC1 extends React.Component<{x : number}, {}> {
->RC1 : Symbol(RC1, Decl(file.tsx, 0, 32))
+>RC1 : Symbol(RC1, Decl(file.tsx, 2, 32))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->x : Symbol(x, Decl(file.tsx, 2, 35))
+>x : Symbol(x, Decl(file.tsx, 4, 35))
 
     render() {
->render : Symbol(RC1.render, Decl(file.tsx, 2, 53))
+>render : Symbol(RC1.render, Decl(file.tsx, 4, 53))
 
         return null;
     }
 }
 
 class RC2 extends React.Component<{ x: string }, {}> {
->RC2 : Symbol(RC2, Decl(file.tsx, 6, 1))
+>RC2 : Symbol(RC2, Decl(file.tsx, 8, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->x : Symbol(x, Decl(file.tsx, 8, 35))
+>x : Symbol(x, Decl(file.tsx, 10, 35))
 
     render() {
->render : Symbol(RC2.render, Decl(file.tsx, 8, 54))
+>render : Symbol(RC2.render, Decl(file.tsx, 10, 54))
 
         return null;
     }
     private method() { }
->method : Symbol(RC2.method, Decl(file.tsx, 11, 5))
+>method : Symbol(RC2.method, Decl(file.tsx, 13, 5))
 }
 
 class RC3 extends React.Component<{}, {}> {
->RC3 : Symbol(RC3, Decl(file.tsx, 13, 1))
+>RC3 : Symbol(RC3, Decl(file.tsx, 15, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 
     render() {
->render : Symbol(RC3.render, Decl(file.tsx, 15, 43))
+>render : Symbol(RC3.render, Decl(file.tsx, 17, 43))
 
         return null;
     }
 }
 
 class RC4 extends React.Component<{}, {}> {
->RC4 : Symbol(RC4, Decl(file.tsx, 19, 1))
+>RC4 : Symbol(RC4, Decl(file.tsx, 21, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 
     render() {
->render : Symbol(RC4.render, Decl(file.tsx, 21, 43))
+>render : Symbol(RC4.render, Decl(file.tsx, 23, 43))
 
         return null;
     }
 }
 
 var RCComp = RC1 || RC2;
->RCComp : Symbol(RCComp, Decl(file.tsx, 27, 3))
->RC1 : Symbol(RC1, Decl(file.tsx, 0, 32))
->RC2 : Symbol(RC2, Decl(file.tsx, 6, 1))
+>RCComp : Symbol(RCComp, Decl(file.tsx, 29, 3))
+>RC1 : Symbol(RC1, Decl(file.tsx, 2, 32))
+>RC2 : Symbol(RC2, Decl(file.tsx, 8, 1))
 
 var EmptyRCComp = RC3 || RC4;
->EmptyRCComp : Symbol(EmptyRCComp, Decl(file.tsx, 28, 3))
->RC3 : Symbol(RC3, Decl(file.tsx, 13, 1))
->RC4 : Symbol(RC4, Decl(file.tsx, 19, 1))
+>EmptyRCComp : Symbol(EmptyRCComp, Decl(file.tsx, 30, 3))
+>RC3 : Symbol(RC3, Decl(file.tsx, 15, 1))
+>RC4 : Symbol(RC4, Decl(file.tsx, 21, 1))
 
 var PartRCComp = RC1 || RC4;
->PartRCComp : Symbol(PartRCComp, Decl(file.tsx, 29, 3))
->RC1 : Symbol(RC1, Decl(file.tsx, 0, 32))
->RC4 : Symbol(RC4, Decl(file.tsx, 19, 1))
+>PartRCComp : Symbol(PartRCComp, Decl(file.tsx, 31, 3))
+>RC1 : Symbol(RC1, Decl(file.tsx, 2, 32))
+>RC4 : Symbol(RC4, Decl(file.tsx, 21, 1))
 
 // Error
 let a = <RCComp x />;
->a : Symbol(a, Decl(file.tsx, 31, 3))
->RCComp : Symbol(RCComp, Decl(file.tsx, 27, 3))
->x : Symbol(x, Decl(file.tsx, 31, 15))
+>a : Symbol(a, Decl(file.tsx, 33, 3))
+>RCComp : Symbol(RCComp, Decl(file.tsx, 29, 3))
+>x : Symbol(x, Decl(file.tsx, 33, 15))
 
 let b = <PartRCComp x={10} />
->b : Symbol(b, Decl(file.tsx, 32, 3))
->PartRCComp : Symbol(PartRCComp, Decl(file.tsx, 29, 3))
->x : Symbol(x, Decl(file.tsx, 32, 19))
+>b : Symbol(b, Decl(file.tsx, 34, 3))
+>PartRCComp : Symbol(PartRCComp, Decl(file.tsx, 31, 3))
+>x : Symbol(x, Decl(file.tsx, 34, 19))
 
 let c = <EmptyRCComp prop />;
->c : Symbol(c, Decl(file.tsx, 33, 3))
->EmptyRCComp : Symbol(EmptyRCComp, Decl(file.tsx, 28, 3))
->prop : Symbol(prop, Decl(file.tsx, 33, 20))
+>c : Symbol(c, Decl(file.tsx, 35, 3))
+>EmptyRCComp : Symbol(EmptyRCComp, Decl(file.tsx, 30, 3))
+>prop : Symbol(prop, Decl(file.tsx, 35, 20))
 
diff --git a/tests/baselines/reference/tsxUnionElementType4.types b/tests/baselines/reference/tsxUnionElementType4.types
index 51b876a0b7ffc..60de48fafe935 100644
--- a/tests/baselines/reference/tsxUnionElementType4.types
+++ b/tests/baselines/reference/tsxUnionElementType4.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType4.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxUnionElementType5.js b/tests/baselines/reference/tsxUnionElementType5.js
index 7eae6d3139409..03660c38bddae 100644
--- a/tests/baselines/reference/tsxUnionElementType5.js
+++ b/tests/baselines/reference/tsxUnionElementType5.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType5.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 function EmptySFC1() {
@@ -24,6 +26,7 @@ let b = <SFC2AndEmptyComp x />
 
 //// [file.js]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 function EmptySFC1() {
diff --git a/tests/baselines/reference/tsxUnionElementType5.symbols b/tests/baselines/reference/tsxUnionElementType5.symbols
index 003d515ff5e04..6c93feb5a119c 100644
--- a/tests/baselines/reference/tsxUnionElementType5.symbols
+++ b/tests/baselines/reference/tsxUnionElementType5.symbols
@@ -1,11 +1,13 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType5.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 function EmptySFC1() {
->EmptySFC1 : Symbol(EmptySFC1, Decl(file.tsx, 0, 32))
+>EmptySFC1 : Symbol(EmptySFC1, Decl(file.tsx, 2, 32))
 
     return <div>hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -13,7 +15,7 @@ function EmptySFC1() {
 }
 
 function EmptySFC2() {
->EmptySFC2 : Symbol(EmptySFC2, Decl(file.tsx, 4, 1))
+>EmptySFC2 : Symbol(EmptySFC2, Decl(file.tsx, 6, 1))
 
     return <div>Hello</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -21,9 +23,9 @@ function EmptySFC2() {
 }
 
 function SFC2(prop: { x: boolean }) {
->SFC2 : Symbol(SFC2, Decl(file.tsx, 8, 1))
->prop : Symbol(prop, Decl(file.tsx, 10, 14))
->x : Symbol(x, Decl(file.tsx, 10, 21))
+>SFC2 : Symbol(SFC2, Decl(file.tsx, 10, 1))
+>prop : Symbol(prop, Decl(file.tsx, 12, 14))
+>x : Symbol(x, Decl(file.tsx, 12, 21))
 
     return <h1>World</h1>;
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
@@ -31,26 +33,26 @@ function SFC2(prop: { x: boolean }) {
 }
 
 var EmptySFCComp = EmptySFC1 || EmptySFC2;
->EmptySFCComp : Symbol(EmptySFCComp, Decl(file.tsx, 14, 3))
->EmptySFC1 : Symbol(EmptySFC1, Decl(file.tsx, 0, 32))
->EmptySFC2 : Symbol(EmptySFC2, Decl(file.tsx, 4, 1))
+>EmptySFCComp : Symbol(EmptySFCComp, Decl(file.tsx, 16, 3))
+>EmptySFC1 : Symbol(EmptySFC1, Decl(file.tsx, 2, 32))
+>EmptySFC2 : Symbol(EmptySFC2, Decl(file.tsx, 6, 1))
 
 var SFC2AndEmptyComp = SFC2 || EmptySFC1;
->SFC2AndEmptyComp : Symbol(SFC2AndEmptyComp, Decl(file.tsx, 15, 3))
->SFC2 : Symbol(SFC2, Decl(file.tsx, 8, 1))
->EmptySFC1 : Symbol(EmptySFC1, Decl(file.tsx, 0, 32))
+>SFC2AndEmptyComp : Symbol(SFC2AndEmptyComp, Decl(file.tsx, 17, 3))
+>SFC2 : Symbol(SFC2, Decl(file.tsx, 10, 1))
+>EmptySFC1 : Symbol(EmptySFC1, Decl(file.tsx, 2, 32))
 
 let a = <EmptySFCComp />
->a : Symbol(a, Decl(file.tsx, 17, 3))
->EmptySFCComp : Symbol(EmptySFCComp, Decl(file.tsx, 14, 3))
+>a : Symbol(a, Decl(file.tsx, 19, 3))
+>EmptySFCComp : Symbol(EmptySFCComp, Decl(file.tsx, 16, 3))
 
 let a1 = <EmptySFCComp data-prop />
->a1 : Symbol(a1, Decl(file.tsx, 18, 3))
->EmptySFCComp : Symbol(EmptySFCComp, Decl(file.tsx, 14, 3))
->data-prop : Symbol(data-prop, Decl(file.tsx, 18, 22))
+>a1 : Symbol(a1, Decl(file.tsx, 20, 3))
+>EmptySFCComp : Symbol(EmptySFCComp, Decl(file.tsx, 16, 3))
+>data-prop : Symbol(data-prop, Decl(file.tsx, 20, 22))
 
 let b = <SFC2AndEmptyComp x />
->b : Symbol(b, Decl(file.tsx, 19, 3))
->SFC2AndEmptyComp : Symbol(SFC2AndEmptyComp, Decl(file.tsx, 15, 3))
->x : Symbol(x, Decl(file.tsx, 19, 25))
+>b : Symbol(b, Decl(file.tsx, 21, 3))
+>SFC2AndEmptyComp : Symbol(SFC2AndEmptyComp, Decl(file.tsx, 17, 3))
+>x : Symbol(x, Decl(file.tsx, 21, 25))
 
diff --git a/tests/baselines/reference/tsxUnionElementType5.types b/tests/baselines/reference/tsxUnionElementType5.types
index 6d716c4e879bb..0292241b7bdf5 100644
--- a/tests/baselines/reference/tsxUnionElementType5.types
+++ b/tests/baselines/reference/tsxUnionElementType5.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType5.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxUnionElementType6.errors.txt b/tests/baselines/reference/tsxUnionElementType6.errors.txt
index dec6a54482cb6..fb381020ecebc 100644
--- a/tests/baselines/reference/tsxUnionElementType6.errors.txt
+++ b/tests/baselines/reference/tsxUnionElementType6.errors.txt
@@ -1,11 +1,13 @@
-file.tsx(18,23): error TS2322: Type '{ x: true; }' is not assignable to type 'IntrinsicAttributes'.
+file.tsx(20,23): error TS2322: Type '{ x: true; }' is not assignable to type 'IntrinsicAttributes'.
   Property 'x' does not exist on type 'IntrinsicAttributes'.
-file.tsx(19,27): error TS2322: Type 'string' is not assignable to type 'boolean'.
-file.tsx(20,10): error TS2741: Property 'x' is missing in type '{}' but required in type '{ x: boolean; }'.
-file.tsx(21,10): error TS2741: Property 'x' is missing in type '{ "data-prop": true; }' but required in type '{ x: boolean; }'.
+file.tsx(21,27): error TS2322: Type 'string' is not assignable to type 'boolean'.
+file.tsx(22,10): error TS2741: Property 'x' is missing in type '{}' but required in type '{ x: boolean; }'.
+file.tsx(23,10): error TS2741: Property 'x' is missing in type '{ "data-prop": true; }' but required in type '{ x: boolean; }'.
 
 
 ==== file.tsx (4 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     function EmptySFC1() {
@@ -30,14 +32,14 @@ file.tsx(21,10): error TS2741: Property 'x' is missing in type '{ "data-prop": t
     let b = <SFC2AndEmptyComp x="hi" />;
                               ~
 !!! error TS2322: Type 'string' is not assignable to type 'boolean'.
-!!! related TS6500 file.tsx:11:23: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & { x: boolean; }'
+!!! related TS6500 file.tsx:13:23: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & { x: boolean; }'
     let c = <SFC2AndEmptyComp />;
              ~~~~~~~~~~~~~~~~
 !!! error TS2741: Property 'x' is missing in type '{}' but required in type '{ x: boolean; }'.
-!!! related TS2728 file.tsx:11:23: 'x' is declared here.
+!!! related TS2728 file.tsx:13:23: 'x' is declared here.
     let d = <SFC2AndEmptyComp data-prop />;
              ~~~~~~~~~~~~~~~~
 !!! error TS2741: Property 'x' is missing in type '{ "data-prop": true; }' but required in type '{ x: boolean; }'.
-!!! related TS2728 file.tsx:11:23: 'x' is declared here.
+!!! related TS2728 file.tsx:13:23: 'x' is declared here.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxUnionElementType6.js b/tests/baselines/reference/tsxUnionElementType6.js
index 6d989c56dd6b2..38aa556d875e4 100644
--- a/tests/baselines/reference/tsxUnionElementType6.js
+++ b/tests/baselines/reference/tsxUnionElementType6.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType6.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 function EmptySFC1() {
@@ -27,6 +29,7 @@ let d = <SFC2AndEmptyComp data-prop />;
 
 //// [file.js]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 function EmptySFC1() {
diff --git a/tests/baselines/reference/tsxUnionElementType6.symbols b/tests/baselines/reference/tsxUnionElementType6.symbols
index e3f8e952fd7ba..289a981cb89a7 100644
--- a/tests/baselines/reference/tsxUnionElementType6.symbols
+++ b/tests/baselines/reference/tsxUnionElementType6.symbols
@@ -1,11 +1,13 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType6.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 function EmptySFC1() {
->EmptySFC1 : Symbol(EmptySFC1, Decl(file.tsx, 0, 32))
+>EmptySFC1 : Symbol(EmptySFC1, Decl(file.tsx, 2, 32))
 
     return <div>Hi</div>
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -13,7 +15,7 @@ function EmptySFC1() {
 }
 
 function EmptySFC2() {
->EmptySFC2 : Symbol(EmptySFC2, Decl(file.tsx, 4, 1))
+>EmptySFC2 : Symbol(EmptySFC2, Decl(file.tsx, 6, 1))
 
     return <div>Hello</div>
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -21,9 +23,9 @@ function EmptySFC2() {
 }
 
 function SFC2(prop: { x: boolean }) {
->SFC2 : Symbol(SFC2, Decl(file.tsx, 8, 1))
->prop : Symbol(prop, Decl(file.tsx, 10, 14))
->x : Symbol(x, Decl(file.tsx, 10, 21))
+>SFC2 : Symbol(SFC2, Decl(file.tsx, 10, 1))
+>prop : Symbol(prop, Decl(file.tsx, 12, 14))
+>x : Symbol(x, Decl(file.tsx, 12, 21))
 
     return <h1>World</h1>;
 >h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react.d.ts, 2410, 47))
@@ -31,33 +33,33 @@ function SFC2(prop: { x: boolean }) {
 }
 
 var EmptySFCComp = EmptySFC1 || EmptySFC2;
->EmptySFCComp : Symbol(EmptySFCComp, Decl(file.tsx, 14, 3))
->EmptySFC1 : Symbol(EmptySFC1, Decl(file.tsx, 0, 32))
->EmptySFC2 : Symbol(EmptySFC2, Decl(file.tsx, 4, 1))
+>EmptySFCComp : Symbol(EmptySFCComp, Decl(file.tsx, 16, 3))
+>EmptySFC1 : Symbol(EmptySFC1, Decl(file.tsx, 2, 32))
+>EmptySFC2 : Symbol(EmptySFC2, Decl(file.tsx, 6, 1))
 
 var SFC2AndEmptyComp = SFC2 || EmptySFC1;
->SFC2AndEmptyComp : Symbol(SFC2AndEmptyComp, Decl(file.tsx, 15, 3))
->SFC2 : Symbol(SFC2, Decl(file.tsx, 8, 1))
->EmptySFC1 : Symbol(EmptySFC1, Decl(file.tsx, 0, 32))
+>SFC2AndEmptyComp : Symbol(SFC2AndEmptyComp, Decl(file.tsx, 17, 3))
+>SFC2 : Symbol(SFC2, Decl(file.tsx, 10, 1))
+>EmptySFC1 : Symbol(EmptySFC1, Decl(file.tsx, 2, 32))
 
 // Error
 let a = <EmptySFCComp x />;
->a : Symbol(a, Decl(file.tsx, 17, 3))
->EmptySFCComp : Symbol(EmptySFCComp, Decl(file.tsx, 14, 3))
->x : Symbol(x, Decl(file.tsx, 17, 21))
+>a : Symbol(a, Decl(file.tsx, 19, 3))
+>EmptySFCComp : Symbol(EmptySFCComp, Decl(file.tsx, 16, 3))
+>x : Symbol(x, Decl(file.tsx, 19, 21))
 
 let b = <SFC2AndEmptyComp x="hi" />;
->b : Symbol(b, Decl(file.tsx, 18, 3))
->SFC2AndEmptyComp : Symbol(SFC2AndEmptyComp, Decl(file.tsx, 15, 3))
->x : Symbol(x, Decl(file.tsx, 18, 25))
+>b : Symbol(b, Decl(file.tsx, 20, 3))
+>SFC2AndEmptyComp : Symbol(SFC2AndEmptyComp, Decl(file.tsx, 17, 3))
+>x : Symbol(x, Decl(file.tsx, 20, 25))
 
 let c = <SFC2AndEmptyComp />;
->c : Symbol(c, Decl(file.tsx, 19, 3))
->SFC2AndEmptyComp : Symbol(SFC2AndEmptyComp, Decl(file.tsx, 15, 3))
+>c : Symbol(c, Decl(file.tsx, 21, 3))
+>SFC2AndEmptyComp : Symbol(SFC2AndEmptyComp, Decl(file.tsx, 17, 3))
 
 let d = <SFC2AndEmptyComp data-prop />;
->d : Symbol(d, Decl(file.tsx, 20, 3))
->SFC2AndEmptyComp : Symbol(SFC2AndEmptyComp, Decl(file.tsx, 15, 3))
->data-prop : Symbol(data-prop, Decl(file.tsx, 20, 25))
+>d : Symbol(d, Decl(file.tsx, 22, 3))
+>SFC2AndEmptyComp : Symbol(SFC2AndEmptyComp, Decl(file.tsx, 17, 3))
+>data-prop : Symbol(data-prop, Decl(file.tsx, 22, 25))
 
 
diff --git a/tests/baselines/reference/tsxUnionElementType6.types b/tests/baselines/reference/tsxUnionElementType6.types
index 3b350834998ce..f3aaf43ab8664 100644
--- a/tests/baselines/reference/tsxUnionElementType6.types
+++ b/tests/baselines/reference/tsxUnionElementType6.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionElementType6.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxUnionMemberChecksFilterDataProps.js b/tests/baselines/reference/tsxUnionMemberChecksFilterDataProps.js
index e5b35f0c013ba..19cf7e7a48720 100644
--- a/tests/baselines/reference/tsxUnionMemberChecksFilterDataProps.js
+++ b/tests/baselines/reference/tsxUnionMemberChecksFilterDataProps.js
@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="react16.d.ts" />
+/// <reference path="/.lib/react16.d.ts" />
 var react_1 = __importDefault(require("react"));
 var RootNotHappy = function () { return (react_1.default.createElement(NotHappy, { "data-testid": "my-test-id" })); };
 var RootHappy = function () { return (react_1.default.createElement(Happy, { "data-testid": "my-test-id" })); };
diff --git a/tests/baselines/reference/tsxUnionTypeComponent1.js b/tests/baselines/reference/tsxUnionTypeComponent1.js
index 5717a275bf48b..4c050c41fbbd0 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent1.js
+++ b/tests/baselines/reference/tsxUnionTypeComponent1.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionTypeComponent1.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 interface ComponentProps {
@@ -27,6 +29,7 @@ class MyButtonComponent extends React.Component<{},{}> {
 
 //// [file.js]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/tsxUnionTypeComponent1.symbols b/tests/baselines/reference/tsxUnionTypeComponent1.symbols
index 9ca2109ed3af6..96021f347ef06 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent1.symbols
+++ b/tests/baselines/reference/tsxUnionTypeComponent1.symbols
@@ -1,14 +1,16 @@
 //// [tests/cases/conformance/jsx/tsxUnionTypeComponent1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 interface ComponentProps {
->ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 0, 32))
+>ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 2, 32))
 
     AnyComponent: React.StatelessComponent<any> | React.ComponentClass<any>;
->AnyComponent : Symbol(ComponentProps.AnyComponent, Decl(file.tsx, 2, 26))
+>AnyComponent : Symbol(ComponentProps.AnyComponent, Decl(file.tsx, 4, 26))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >StatelessComponent : Symbol(React.StatelessComponent, Decl(react.d.ts, 198, 40))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
@@ -16,44 +18,44 @@ interface ComponentProps {
 }
 
 class MyComponent extends React.Component<ComponentProps, {}> {
->MyComponent : Symbol(MyComponent, Decl(file.tsx, 4, 1))
+>MyComponent : Symbol(MyComponent, Decl(file.tsx, 6, 1))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
->ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 0, 32))
+>ComponentProps : Symbol(ComponentProps, Decl(file.tsx, 2, 32))
 
     render() {
->render : Symbol(MyComponent.render, Decl(file.tsx, 6, 63))
+>render : Symbol(MyComponent.render, Decl(file.tsx, 8, 63))
 
         const { AnyComponent } = this.props;
->AnyComponent : Symbol(AnyComponent, Decl(file.tsx, 8, 15))
+>AnyComponent : Symbol(AnyComponent, Decl(file.tsx, 10, 15))
 >this.props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
->this : Symbol(MyComponent, Decl(file.tsx, 4, 1))
+>this : Symbol(MyComponent, Decl(file.tsx, 6, 1))
 >props : Symbol(React.Component.props, Decl(react.d.ts, 167, 37))
 
         return (<AnyComponent />);
->AnyComponent : Symbol(AnyComponent, Decl(file.tsx, 8, 15))
+>AnyComponent : Symbol(AnyComponent, Decl(file.tsx, 10, 15))
     }
 }
 
 // Stateless Component As Props
 <MyComponent AnyComponent={() => <button>test</button>}/>
->MyComponent : Symbol(MyComponent, Decl(file.tsx, 4, 1))
->AnyComponent : Symbol(AnyComponent, Decl(file.tsx, 14, 12))
+>MyComponent : Symbol(MyComponent, Decl(file.tsx, 6, 1))
+>AnyComponent : Symbol(AnyComponent, Decl(file.tsx, 16, 12))
 >button : Symbol(JSX.IntrinsicElements.button, Decl(react.d.ts, 2386, 43))
 >button : Symbol(JSX.IntrinsicElements.button, Decl(react.d.ts, 2386, 43))
 
 // Component Class as Props
 class MyButtonComponent extends React.Component<{},{}> {
->MyButtonComponent : Symbol(MyButtonComponent, Decl(file.tsx, 14, 57))
+>MyButtonComponent : Symbol(MyButtonComponent, Decl(file.tsx, 16, 57))
 >React.Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >Component : Symbol(React.Component, Decl(react.d.ts, 158, 55), Decl(react.d.ts, 161, 66))
 }
 
 <MyComponent AnyComponent={MyButtonComponent} />
->MyComponent : Symbol(MyComponent, Decl(file.tsx, 4, 1))
->AnyComponent : Symbol(AnyComponent, Decl(file.tsx, 20, 12))
->MyButtonComponent : Symbol(MyButtonComponent, Decl(file.tsx, 14, 57))
+>MyComponent : Symbol(MyComponent, Decl(file.tsx, 6, 1))
+>AnyComponent : Symbol(AnyComponent, Decl(file.tsx, 22, 12))
+>MyButtonComponent : Symbol(MyButtonComponent, Decl(file.tsx, 16, 57))
 
 
diff --git a/tests/baselines/reference/tsxUnionTypeComponent1.types b/tests/baselines/reference/tsxUnionTypeComponent1.types
index 27db7ab58bd9c..5c32b49abf43a 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent1.types
+++ b/tests/baselines/reference/tsxUnionTypeComponent1.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionTypeComponent1.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/tsxUnionTypeComponent2.errors.txt b/tests/baselines/reference/tsxUnionTypeComponent2.errors.txt
index 6187e403688c1..7263b1e9c3ab1 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent2.errors.txt
+++ b/tests/baselines/reference/tsxUnionTypeComponent2.errors.txt
@@ -1,7 +1,9 @@
-file.tsx(7,2): error TS2604: JSX element type 'X' does not have any construct or call signatures.
+file.tsx(9,2): error TS2604: JSX element type 'X' does not have any construct or call signatures.
 
 
 ==== file.tsx (1 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
+    
     import React = require('react');
     
     type Invalid1 = React.ComponentClass<any> | number;
diff --git a/tests/baselines/reference/tsxUnionTypeComponent2.js b/tests/baselines/reference/tsxUnionTypeComponent2.js
index 8c839ca4a73d4..a27e8cc5ea0bf 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent2.js
+++ b/tests/baselines/reference/tsxUnionTypeComponent2.js
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionTypeComponent2.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
+
 import React = require('react');
 
 type Invalid1 = React.ComponentClass<any> | number;
@@ -14,6 +16,7 @@ const X: Invalid1 = 1;
 
 //// [file.js]
 "use strict";
+/// <reference path="/.lib/react.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 var X = 1;
diff --git a/tests/baselines/reference/tsxUnionTypeComponent2.symbols b/tests/baselines/reference/tsxUnionTypeComponent2.symbols
index fc083c400ed8d..d9da2728211bc 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent2.symbols
+++ b/tests/baselines/reference/tsxUnionTypeComponent2.symbols
@@ -1,20 +1,22 @@
 //// [tests/cases/conformance/jsx/tsxUnionTypeComponent2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 
 type Invalid1 = React.ComponentClass<any> | number;
->Invalid1 : Symbol(Invalid1, Decl(file.tsx, 0, 32))
+>Invalid1 : Symbol(Invalid1, Decl(file.tsx, 2, 32))
 >React : Symbol(React, Decl(file.tsx, 0, 0))
 >ComponentClass : Symbol(React.ComponentClass, Decl(react.d.ts, 205, 5))
 
 const X: Invalid1 = 1;
->X : Symbol(X, Decl(file.tsx, 4, 5))
->Invalid1 : Symbol(Invalid1, Decl(file.tsx, 0, 32))
+>X : Symbol(X, Decl(file.tsx, 6, 5))
+>Invalid1 : Symbol(Invalid1, Decl(file.tsx, 2, 32))
 
 <X />;
->X : Symbol(X, Decl(file.tsx, 4, 5))
+>X : Symbol(X, Decl(file.tsx, 6, 5))
 
 
 
diff --git a/tests/baselines/reference/tsxUnionTypeComponent2.types b/tests/baselines/reference/tsxUnionTypeComponent2.types
index ae7af328f1eda..852f42ca8632b 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent2.types
+++ b/tests/baselines/reference/tsxUnionTypeComponent2.types
@@ -1,6 +1,8 @@
 //// [tests/cases/conformance/jsx/tsxUnionTypeComponent2.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
+
 import React = require('react');
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule.errors.txt b/tests/baselines/reference/twoInterfacesDifferentRootModule.errors.txt
index b39a1ab1b8ced..02905e4542e34 100644
--- a/tests/baselines/reference/twoInterfacesDifferentRootModule.errors.txt
+++ b/tests/baselines/reference/twoInterfacesDifferentRootModule.errors.txt
@@ -20,7 +20,7 @@ twoInterfacesDifferentRootModule.ts(27,16): error TS2339: Property 'foo' does no
             bar: number;
         }
     
-        var a: A;
+        declare var a: A;
         var r1 = a.foo; // error
                    ~~~
 !!! error TS2339: Property 'foo' does not exist on type 'A'.
@@ -30,7 +30,7 @@ twoInterfacesDifferentRootModule.ts(27,16): error TS2339: Property 'foo' does no
             bar: T;
         }
     
-        var b: B<string>;
+        declare var b: B<string>;
         var r3 = b.foo; // error
                    ~~~
 !!! error TS2339: Property 'foo' does not exist on type 'B<string>'.
diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule.js b/tests/baselines/reference/twoInterfacesDifferentRootModule.js
index abc9a27d934db..850767ee17dba 100644
--- a/tests/baselines/reference/twoInterfacesDifferentRootModule.js
+++ b/tests/baselines/reference/twoInterfacesDifferentRootModule.js
@@ -18,7 +18,7 @@ namespace M2 {
         bar: number;
     }
 
-    var a: A;
+    declare var a: A;
     var r1 = a.foo; // error
     var r2 = a.bar; 
 
@@ -26,7 +26,7 @@ namespace M2 {
         bar: T;
     }
 
-    var b: B<string>;
+    declare var b: B<string>;
     var r3 = b.foo; // error
     var r4 = b.bar; 
 }
@@ -35,10 +35,8 @@ namespace M2 {
 // two interfaces with different root modules should not merge
 var M2;
 (function (M2) {
-    var a;
     var r1 = a.foo; // error
     var r2 = a.bar;
-    var b;
     var r3 = b.foo; // error
     var r4 = b.bar;
 })(M2 || (M2 = {}));
diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule.symbols b/tests/baselines/reference/twoInterfacesDifferentRootModule.symbols
index 7dbd1f5bf03c2..1a55782278951 100644
--- a/tests/baselines/reference/twoInterfacesDifferentRootModule.symbols
+++ b/tests/baselines/reference/twoInterfacesDifferentRootModule.symbols
@@ -33,18 +33,18 @@ namespace M2 {
 >bar : Symbol(A.bar, Decl(twoInterfacesDifferentRootModule.ts, 13, 24))
     }
 
-    var a: A;
->a : Symbol(a, Decl(twoInterfacesDifferentRootModule.ts, 17, 7))
+    declare var a: A;
+>a : Symbol(a, Decl(twoInterfacesDifferentRootModule.ts, 17, 15))
 >A : Symbol(A, Decl(twoInterfacesDifferentRootModule.ts, 12, 14))
 
     var r1 = a.foo; // error
 >r1 : Symbol(r1, Decl(twoInterfacesDifferentRootModule.ts, 18, 7))
->a : Symbol(a, Decl(twoInterfacesDifferentRootModule.ts, 17, 7))
+>a : Symbol(a, Decl(twoInterfacesDifferentRootModule.ts, 17, 15))
 
     var r2 = a.bar; 
 >r2 : Symbol(r2, Decl(twoInterfacesDifferentRootModule.ts, 19, 7))
 >a.bar : Symbol(A.bar, Decl(twoInterfacesDifferentRootModule.ts, 13, 24))
->a : Symbol(a, Decl(twoInterfacesDifferentRootModule.ts, 17, 7))
+>a : Symbol(a, Decl(twoInterfacesDifferentRootModule.ts, 17, 15))
 >bar : Symbol(A.bar, Decl(twoInterfacesDifferentRootModule.ts, 13, 24))
 
     export interface B<T> {
@@ -56,17 +56,17 @@ namespace M2 {
 >T : Symbol(T, Decl(twoInterfacesDifferentRootModule.ts, 21, 23))
     }
 
-    var b: B<string>;
->b : Symbol(b, Decl(twoInterfacesDifferentRootModule.ts, 25, 7))
+    declare var b: B<string>;
+>b : Symbol(b, Decl(twoInterfacesDifferentRootModule.ts, 25, 15))
 >B : Symbol(B, Decl(twoInterfacesDifferentRootModule.ts, 19, 19))
 
     var r3 = b.foo; // error
 >r3 : Symbol(r3, Decl(twoInterfacesDifferentRootModule.ts, 26, 7))
->b : Symbol(b, Decl(twoInterfacesDifferentRootModule.ts, 25, 7))
+>b : Symbol(b, Decl(twoInterfacesDifferentRootModule.ts, 25, 15))
 
     var r4 = b.bar; 
 >r4 : Symbol(r4, Decl(twoInterfacesDifferentRootModule.ts, 27, 7))
 >b.bar : Symbol(B.bar, Decl(twoInterfacesDifferentRootModule.ts, 21, 27))
->b : Symbol(b, Decl(twoInterfacesDifferentRootModule.ts, 25, 7))
+>b : Symbol(b, Decl(twoInterfacesDifferentRootModule.ts, 25, 15))
 >bar : Symbol(B.bar, Decl(twoInterfacesDifferentRootModule.ts, 21, 27))
 }
diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule.types b/tests/baselines/reference/twoInterfacesDifferentRootModule.types
index 7caf54bc64966..b6f0787703452 100644
--- a/tests/baselines/reference/twoInterfacesDifferentRootModule.types
+++ b/tests/baselines/reference/twoInterfacesDifferentRootModule.types
@@ -27,7 +27,7 @@ namespace M2 {
 >    : ^^^^^^
     }
 
-    var a: A;
+    declare var a: A;
 >a : A
 >  : ^
 
@@ -57,7 +57,7 @@ namespace M2 {
 >    : ^
     }
 
-    var b: B<string>;
+    declare var b: B<string>;
 >b : B<string>
 >  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule2.errors.txt b/tests/baselines/reference/twoInterfacesDifferentRootModule2.errors.txt
index 55ba198e0ce47..3c977bc9946c7 100644
--- a/tests/baselines/reference/twoInterfacesDifferentRootModule2.errors.txt
+++ b/tests/baselines/reference/twoInterfacesDifferentRootModule2.errors.txt
@@ -21,7 +21,7 @@ twoInterfacesDifferentRootModule2.ts(36,16): error TS2339: Property 'bar' does n
                 bar: number;
             }
     
-            var a: A;
+            declare var a: A;
             var r1 = a.foo; // error
                        ~~~
 !!! error TS2339: Property 'foo' does not exist on type 'A'.
@@ -31,20 +31,20 @@ twoInterfacesDifferentRootModule2.ts(36,16): error TS2339: Property 'bar' does n
                 bar: T;
             }
     
-            var b: B<string>;
+            declare var b: B<string>;
             var r3 = b.foo; // error
                        ~~~
 !!! error TS2339: Property 'foo' does not exist on type 'B<string>'.
             var r4 = b.bar;
         }
     
-        var a: A;
+        declare var a: A;
         var r1 = a.foo; 
         var r2 = a.bar; // error
                    ~~~
 !!! error TS2339: Property 'bar' does not exist on type 'A'.
     
-        var b: B<string>;
+        declare var b: B<string>;
         var r3 = b.foo; 
         var r4 = b.bar; // error
                    ~~~
diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule2.js b/tests/baselines/reference/twoInterfacesDifferentRootModule2.js
index 042699b1c3523..3ec2dfcace514 100644
--- a/tests/baselines/reference/twoInterfacesDifferentRootModule2.js
+++ b/tests/baselines/reference/twoInterfacesDifferentRootModule2.js
@@ -17,7 +17,7 @@ namespace M {
             bar: number;
         }
 
-        var a: A;
+        declare var a: A;
         var r1 = a.foo; // error
         var r2 = a.bar;
 
@@ -25,16 +25,16 @@ namespace M {
             bar: T;
         }
 
-        var b: B<string>;
+        declare var b: B<string>;
         var r3 = b.foo; // error
         var r4 = b.bar;
     }
 
-    var a: A;
+    declare var a: A;
     var r1 = a.foo; 
     var r2 = a.bar; // error
 
-    var b: B<string>;
+    declare var b: B<string>;
     var r3 = b.foo; 
     var r4 = b.bar; // error
 }
@@ -45,17 +45,13 @@ var M;
 (function (M) {
     var M2;
     (function (M2) {
-        var a;
         var r1 = a.foo; // error
         var r2 = a.bar;
-        var b;
         var r3 = b.foo; // error
         var r4 = b.bar;
     })(M2 || (M2 = {}));
-    var a;
     var r1 = a.foo;
     var r2 = a.bar; // error
-    var b;
     var r3 = b.foo;
     var r4 = b.bar; // error
 })(M || (M = {}));
diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule2.symbols b/tests/baselines/reference/twoInterfacesDifferentRootModule2.symbols
index 9e1b322985727..287450491cc81 100644
--- a/tests/baselines/reference/twoInterfacesDifferentRootModule2.symbols
+++ b/tests/baselines/reference/twoInterfacesDifferentRootModule2.symbols
@@ -32,18 +32,18 @@ namespace M {
 >bar : Symbol(A.bar, Decl(twoInterfacesDifferentRootModule2.ts, 12, 28))
         }
 
-        var a: A;
->a : Symbol(a, Decl(twoInterfacesDifferentRootModule2.ts, 16, 11))
+        declare var a: A;
+>a : Symbol(a, Decl(twoInterfacesDifferentRootModule2.ts, 16, 19))
 >A : Symbol(A, Decl(twoInterfacesDifferentRootModule2.ts, 11, 18))
 
         var r1 = a.foo; // error
 >r1 : Symbol(r1, Decl(twoInterfacesDifferentRootModule2.ts, 17, 11))
->a : Symbol(a, Decl(twoInterfacesDifferentRootModule2.ts, 16, 11))
+>a : Symbol(a, Decl(twoInterfacesDifferentRootModule2.ts, 16, 19))
 
         var r2 = a.bar;
 >r2 : Symbol(r2, Decl(twoInterfacesDifferentRootModule2.ts, 18, 11))
 >a.bar : Symbol(A.bar, Decl(twoInterfacesDifferentRootModule2.ts, 12, 28))
->a : Symbol(a, Decl(twoInterfacesDifferentRootModule2.ts, 16, 11))
+>a : Symbol(a, Decl(twoInterfacesDifferentRootModule2.ts, 16, 19))
 >bar : Symbol(A.bar, Decl(twoInterfacesDifferentRootModule2.ts, 12, 28))
 
         export interface B<T> {
@@ -55,46 +55,46 @@ namespace M {
 >T : Symbol(T, Decl(twoInterfacesDifferentRootModule2.ts, 20, 27))
         }
 
-        var b: B<string>;
->b : Symbol(b, Decl(twoInterfacesDifferentRootModule2.ts, 24, 11))
+        declare var b: B<string>;
+>b : Symbol(b, Decl(twoInterfacesDifferentRootModule2.ts, 24, 19))
 >B : Symbol(B, Decl(twoInterfacesDifferentRootModule2.ts, 18, 23))
 
         var r3 = b.foo; // error
 >r3 : Symbol(r3, Decl(twoInterfacesDifferentRootModule2.ts, 25, 11))
->b : Symbol(b, Decl(twoInterfacesDifferentRootModule2.ts, 24, 11))
+>b : Symbol(b, Decl(twoInterfacesDifferentRootModule2.ts, 24, 19))
 
         var r4 = b.bar;
 >r4 : Symbol(r4, Decl(twoInterfacesDifferentRootModule2.ts, 26, 11))
 >b.bar : Symbol(B.bar, Decl(twoInterfacesDifferentRootModule2.ts, 20, 31))
->b : Symbol(b, Decl(twoInterfacesDifferentRootModule2.ts, 24, 11))
+>b : Symbol(b, Decl(twoInterfacesDifferentRootModule2.ts, 24, 19))
 >bar : Symbol(B.bar, Decl(twoInterfacesDifferentRootModule2.ts, 20, 31))
     }
 
-    var a: A;
->a : Symbol(a, Decl(twoInterfacesDifferentRootModule2.ts, 29, 7))
+    declare var a: A;
+>a : Symbol(a, Decl(twoInterfacesDifferentRootModule2.ts, 29, 15))
 >A : Symbol(A, Decl(twoInterfacesDifferentRootModule2.ts, 2, 13))
 
     var r1 = a.foo; 
 >r1 : Symbol(r1, Decl(twoInterfacesDifferentRootModule2.ts, 30, 7))
 >a.foo : Symbol(A.foo, Decl(twoInterfacesDifferentRootModule2.ts, 3, 24))
->a : Symbol(a, Decl(twoInterfacesDifferentRootModule2.ts, 29, 7))
+>a : Symbol(a, Decl(twoInterfacesDifferentRootModule2.ts, 29, 15))
 >foo : Symbol(A.foo, Decl(twoInterfacesDifferentRootModule2.ts, 3, 24))
 
     var r2 = a.bar; // error
 >r2 : Symbol(r2, Decl(twoInterfacesDifferentRootModule2.ts, 31, 7))
->a : Symbol(a, Decl(twoInterfacesDifferentRootModule2.ts, 29, 7))
+>a : Symbol(a, Decl(twoInterfacesDifferentRootModule2.ts, 29, 15))
 
-    var b: B<string>;
->b : Symbol(b, Decl(twoInterfacesDifferentRootModule2.ts, 33, 7))
+    declare var b: B<string>;
+>b : Symbol(b, Decl(twoInterfacesDifferentRootModule2.ts, 33, 15))
 >B : Symbol(B, Decl(twoInterfacesDifferentRootModule2.ts, 5, 5))
 
     var r3 = b.foo; 
 >r3 : Symbol(r3, Decl(twoInterfacesDifferentRootModule2.ts, 34, 7))
 >b.foo : Symbol(B.foo, Decl(twoInterfacesDifferentRootModule2.ts, 7, 27))
->b : Symbol(b, Decl(twoInterfacesDifferentRootModule2.ts, 33, 7))
+>b : Symbol(b, Decl(twoInterfacesDifferentRootModule2.ts, 33, 15))
 >foo : Symbol(B.foo, Decl(twoInterfacesDifferentRootModule2.ts, 7, 27))
 
     var r4 = b.bar; // error
 >r4 : Symbol(r4, Decl(twoInterfacesDifferentRootModule2.ts, 35, 7))
->b : Symbol(b, Decl(twoInterfacesDifferentRootModule2.ts, 33, 7))
+>b : Symbol(b, Decl(twoInterfacesDifferentRootModule2.ts, 33, 15))
 }
diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule2.types b/tests/baselines/reference/twoInterfacesDifferentRootModule2.types
index 6f800ceaa271c..1f61f7834b379 100644
--- a/tests/baselines/reference/twoInterfacesDifferentRootModule2.types
+++ b/tests/baselines/reference/twoInterfacesDifferentRootModule2.types
@@ -29,7 +29,7 @@ namespace M {
 >    : ^^^^^^
         }
 
-        var a: A;
+        declare var a: A;
 >a : A
 >  : ^
 
@@ -59,7 +59,7 @@ namespace M {
 >    : ^
         }
 
-        var b: B<string>;
+        declare var b: B<string>;
 >b : B<string>
 >  : ^^^^^^^^^
 
@@ -84,7 +84,7 @@ namespace M {
 >    : ^^^^^^
     }
 
-    var a: A;
+    declare var a: A;
 >a : A
 >  : ^
 
@@ -108,7 +108,7 @@ namespace M {
 >bar : any
 >    : ^^^
 
-    var b: B<string>;
+    declare var b: B<string>;
 >b : B<string>
 >  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/typeAliasDeclareKeywordNewlines.errors.txt b/tests/baselines/reference/typeAliasDeclareKeywordNewlines.errors.txt
index afbea95e16117..576977a0f12c5 100644
--- a/tests/baselines/reference/typeAliasDeclareKeywordNewlines.errors.txt
+++ b/tests/baselines/reference/typeAliasDeclareKeywordNewlines.errors.txt
@@ -1,8 +1,9 @@
-typeAliasDeclareKeywordNewlines.ts(5,1): error TS1142: Line break not permitted here.
+typeAliasDeclareKeywordNewlines.ts(6,1): error TS1142: Line break not permitted here.
 
 
 ==== typeAliasDeclareKeywordNewlines.ts (1 errors) ====
-    var declare: string, type: number;
+    declare var declare: string;
+    declare var type: number;
     
     // The following is invalid but should declare a type alias named 'T1':
     declare type /*unexpected newline*/
@@ -11,7 +12,7 @@ typeAliasDeclareKeywordNewlines.ts(5,1): error TS1142: Line break not permitted
 !!! error TS1142: Line break not permitted here.
     const t1: T1 = null; // Assert that T1 is the null type.
     
-    let T: null;
+    let T: null = null;
     // The following should use a variable named 'declare', use a variable named
     // 'type', and assign to a variable named 'T'.
     declare /*ASI*/
diff --git a/tests/baselines/reference/typeAliasDeclareKeywordNewlines.js b/tests/baselines/reference/typeAliasDeclareKeywordNewlines.js
index dda27f355c915..9c1a081b94a88 100644
--- a/tests/baselines/reference/typeAliasDeclareKeywordNewlines.js
+++ b/tests/baselines/reference/typeAliasDeclareKeywordNewlines.js
@@ -1,14 +1,15 @@
 //// [tests/cases/compiler/typeAliasDeclareKeywordNewlines.ts] ////
 
 //// [typeAliasDeclareKeywordNewlines.ts]
-var declare: string, type: number;
+declare var declare: string;
+declare var type: number;
 
 // The following is invalid but should declare a type alias named 'T1':
 declare type /*unexpected newline*/
 T1 = null;
 const t1: T1 = null; // Assert that T1 is the null type.
 
-let T: null;
+let T: null = null;
 // The following should use a variable named 'declare', use a variable named
 // 'type', and assign to a variable named 'T'.
 declare /*ASI*/
@@ -23,9 +24,8 @@ const t2: T2 = null; // Assert that T2 is the null type.
 
 
 //// [typeAliasDeclareKeywordNewlines.js]
-var declare, type;
 var t1 = null; // Assert that T1 is the null type.
-var T;
+var T = null;
 // The following should use a variable named 'declare', use a variable named
 // 'type', and assign to a variable named 'T'.
 declare; /*ASI*/
diff --git a/tests/baselines/reference/typeAliasDeclareKeywordNewlines.symbols b/tests/baselines/reference/typeAliasDeclareKeywordNewlines.symbols
index 95ce65218ec83..1970170bccd36 100644
--- a/tests/baselines/reference/typeAliasDeclareKeywordNewlines.symbols
+++ b/tests/baselines/reference/typeAliasDeclareKeywordNewlines.symbols
@@ -1,42 +1,44 @@
 //// [tests/cases/compiler/typeAliasDeclareKeywordNewlines.ts] ////
 
 === typeAliasDeclareKeywordNewlines.ts ===
-var declare: string, type: number;
->declare : Symbol(declare, Decl(typeAliasDeclareKeywordNewlines.ts, 0, 3))
->type : Symbol(type, Decl(typeAliasDeclareKeywordNewlines.ts, 0, 20))
+declare var declare: string;
+>declare : Symbol(declare, Decl(typeAliasDeclareKeywordNewlines.ts, 0, 11))
+
+declare var type: number;
+>type : Symbol(type, Decl(typeAliasDeclareKeywordNewlines.ts, 1, 11))
 
 // The following is invalid but should declare a type alias named 'T1':
 declare type /*unexpected newline*/
 T1 = null;
->T1 : Symbol(T1, Decl(typeAliasDeclareKeywordNewlines.ts, 0, 34))
+>T1 : Symbol(T1, Decl(typeAliasDeclareKeywordNewlines.ts, 1, 25))
 
 const t1: T1 = null; // Assert that T1 is the null type.
->t1 : Symbol(t1, Decl(typeAliasDeclareKeywordNewlines.ts, 5, 5))
->T1 : Symbol(T1, Decl(typeAliasDeclareKeywordNewlines.ts, 0, 34))
+>t1 : Symbol(t1, Decl(typeAliasDeclareKeywordNewlines.ts, 6, 5))
+>T1 : Symbol(T1, Decl(typeAliasDeclareKeywordNewlines.ts, 1, 25))
 
-let T: null;
->T : Symbol(T, Decl(typeAliasDeclareKeywordNewlines.ts, 7, 3))
+let T: null = null;
+>T : Symbol(T, Decl(typeAliasDeclareKeywordNewlines.ts, 8, 3))
 
 // The following should use a variable named 'declare', use a variable named
 // 'type', and assign to a variable named 'T'.
 declare /*ASI*/
->declare : Symbol(declare, Decl(typeAliasDeclareKeywordNewlines.ts, 0, 3))
+>declare : Symbol(declare, Decl(typeAliasDeclareKeywordNewlines.ts, 0, 11))
 
 type /*ASI*/
->type : Symbol(type, Decl(typeAliasDeclareKeywordNewlines.ts, 0, 20))
+>type : Symbol(type, Decl(typeAliasDeclareKeywordNewlines.ts, 1, 11))
 
 T = null;
->T : Symbol(T, Decl(typeAliasDeclareKeywordNewlines.ts, 7, 3))
+>T : Symbol(T, Decl(typeAliasDeclareKeywordNewlines.ts, 8, 3))
 
 // The following should use a variable named 'declare' and declare a type alias
 // named 'T2':
 declare /*ASI*/
->declare : Symbol(declare, Decl(typeAliasDeclareKeywordNewlines.ts, 0, 3))
+>declare : Symbol(declare, Decl(typeAliasDeclareKeywordNewlines.ts, 0, 11))
 
 type T2 = null;
->T2 : Symbol(T2, Decl(typeAliasDeclareKeywordNewlines.ts, 16, 7))
+>T2 : Symbol(T2, Decl(typeAliasDeclareKeywordNewlines.ts, 17, 7))
 
 const t2: T2 = null; // Assert that T2 is the null type.
->t2 : Symbol(t2, Decl(typeAliasDeclareKeywordNewlines.ts, 18, 5))
->T2 : Symbol(T2, Decl(typeAliasDeclareKeywordNewlines.ts, 16, 7))
+>t2 : Symbol(t2, Decl(typeAliasDeclareKeywordNewlines.ts, 19, 5))
+>T2 : Symbol(T2, Decl(typeAliasDeclareKeywordNewlines.ts, 17, 7))
 
diff --git a/tests/baselines/reference/typeAliasDeclareKeywordNewlines.types b/tests/baselines/reference/typeAliasDeclareKeywordNewlines.types
index b046ab654777b..6e082e79b06fa 100644
--- a/tests/baselines/reference/typeAliasDeclareKeywordNewlines.types
+++ b/tests/baselines/reference/typeAliasDeclareKeywordNewlines.types
@@ -1,9 +1,11 @@
 //// [tests/cases/compiler/typeAliasDeclareKeywordNewlines.ts] ////
 
 === typeAliasDeclareKeywordNewlines.ts ===
-var declare: string, type: number;
+declare var declare: string;
 >declare : string
 >        : ^^^^^^
+
+declare var type: number;
 >type : number
 >     : ^^^^^^
 
@@ -17,7 +19,7 @@ const t1: T1 = null; // Assert that T1 is the null type.
 >t1 : null
 >   : ^^^^
 
-let T: null;
+let T: null = null;
 >T : null
 >  : ^^^^
 
diff --git a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.errors.txt b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.errors.txt
index 98b9862c07c8f..1679e18f089f0 100644
--- a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.errors.txt
+++ b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.errors.txt
@@ -9,8 +9,8 @@ typeArgumentInferenceConstructSignatures.ts(81,45): error TS2345: Argument of ty
   Types of parameters 'n' and 'b' are incompatible.
     Type 'number' is not assignable to type 'string'.
 typeArgumentInferenceConstructSignatures.ts(106,33): error TS2345: Argument of type '0' is not assignable to parameter of type '""'.
-typeArgumentInferenceConstructSignatures.ts(107,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a9a' must be of type 'string', but here has type '{}'.
-typeArgumentInferenceConstructSignatures.ts(121,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a9e' must be of type '{ x: number; z: Window & typeof globalThis; y?: undefined; } | { x: number; y: string; z?: undefined; }', but here has type '{}'.
+typeArgumentInferenceConstructSignatures.ts(107,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a9a' must be of type 'string', but here has type '{}'.
+typeArgumentInferenceConstructSignatures.ts(121,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a9e' must be of type '{ x: number; z: Window & typeof globalThis; y?: undefined; } | { x: number; y: string; z?: undefined; }', but here has type '{}'.
 typeArgumentInferenceConstructSignatures.ts(122,74): error TS2353: Object literal may only specify known properties, and 'y' does not exist in type 'A92'.
 
 
@@ -19,7 +19,7 @@ typeArgumentInferenceConstructSignatures.ts(122,74): error TS2353: Object litera
     interface NoParams {
         new <T>();
     }
-    var noParams: NoParams;
+    declare var noParams: NoParams;
     new noParams();
     new noParams<string>();
     new noParams<{}>();
@@ -28,7 +28,7 @@ typeArgumentInferenceConstructSignatures.ts(122,74): error TS2353: Object litera
     interface noGenericParams {
         new <T>(n: string);
     }
-    var noGenericParams: noGenericParams;
+    declare var noGenericParams: noGenericParams;
     new noGenericParams('');
     new noGenericParams<number>('');
     new noGenericParams<{}>('');
@@ -37,7 +37,7 @@ typeArgumentInferenceConstructSignatures.ts(122,74): error TS2353: Object litera
     interface someGenerics1 {
         new <T, U>(n: T, m: number);
     }
-    var someGenerics1: someGenerics1;
+    declare var someGenerics1: someGenerics1;
     new someGenerics1(3, 4);
     new someGenerics1<string, number>(3, 4); // Error
                                       ~
@@ -48,7 +48,7 @@ typeArgumentInferenceConstructSignatures.ts(122,74): error TS2353: Object litera
     interface someGenerics2a {
         new <T>(n: (x: T) => void);
     }
-    var someGenerics2a: someGenerics2a;
+    declare var someGenerics2a: someGenerics2a;
     new someGenerics2a((n: string) => n);
     new someGenerics2a<string>((n: string) => n);
     new someGenerics2a<string>((n) => n.substr(0));
@@ -56,7 +56,7 @@ typeArgumentInferenceConstructSignatures.ts(122,74): error TS2353: Object litera
     interface someGenerics2b {
         new <T, U>(n: (x: T, y: U) => void);
     }
-    var someGenerics2b: someGenerics2b;
+    declare var someGenerics2b: someGenerics2b;
     new someGenerics2b((n: string, x: number) => n);
     new someGenerics2b<string, number>((n: string, t: number) => n);
     new someGenerics2b<string, number>((n, t) => n.substr(t * t));
@@ -65,7 +65,7 @@ typeArgumentInferenceConstructSignatures.ts(122,74): error TS2353: Object litera
     interface someGenerics3 {
         new <T>(producer: () => T);
     }
-    var someGenerics3: someGenerics3;
+    declare var someGenerics3: someGenerics3;
     new someGenerics3(() => '');
     new someGenerics3<Window>(() => undefined);
     new someGenerics3<number>(() => 3);
@@ -74,7 +74,7 @@ typeArgumentInferenceConstructSignatures.ts(122,74): error TS2353: Object litera
     interface someGenerics4 {
         new <T, U>(n: T, f: (x: U) => void);
     }
-    var someGenerics4: someGenerics4;
+    declare var someGenerics4: someGenerics4;
     new someGenerics4(4, () => null);
     new someGenerics4<string, number>('', () => 3);
     new someGenerics4<string, number>('', (x: string) => ''); // Error
@@ -88,7 +88,7 @@ typeArgumentInferenceConstructSignatures.ts(122,74): error TS2353: Object litera
     interface someGenerics5 {
         new <U, T>(n: T, f: (x: U) => void);
     }
-    var someGenerics5: someGenerics5;
+    declare var someGenerics5: someGenerics5;
     new someGenerics5(4, () => null);
     new someGenerics5<number, string>('', () => 3);
     new someGenerics5<number, string>('', (x: string) => ''); // Error
@@ -102,7 +102,7 @@ typeArgumentInferenceConstructSignatures.ts(122,74): error TS2353: Object litera
     interface someGenerics6 {
         new <A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A);
     }
-    var someGenerics6: someGenerics6;
+    declare var someGenerics6: someGenerics6;
     new someGenerics6(n => n, n => n, n => n);
     new someGenerics6<number>(n => n, n => n, n => n);
     new someGenerics6<number>((n: number) => n, (n: string) => n, (n: number) => n); // Error
@@ -116,7 +116,7 @@ typeArgumentInferenceConstructSignatures.ts(122,74): error TS2353: Object litera
     interface someGenerics7 {
         new <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C);
     }
-    var someGenerics7: someGenerics7;
+    declare var someGenerics7: someGenerics7;
     new someGenerics7(n => n, n => n, n => n);
     new someGenerics7<number, string, number>(n => n, n => n, n => n);
     new someGenerics7<number, string, number>((n: number) => n, (n: string) => n, (n: number) => n);
@@ -125,7 +125,7 @@ typeArgumentInferenceConstructSignatures.ts(122,74): error TS2353: Object litera
     interface someGenerics8 {
         new <T>(n: T): T;
     }
-    var someGenerics8: someGenerics8;
+    declare var someGenerics8: someGenerics8;
     var x = new someGenerics8(someGenerics7);
     new x<string, string, string>(null, null, null);
     
@@ -133,16 +133,16 @@ typeArgumentInferenceConstructSignatures.ts(122,74): error TS2353: Object litera
     interface someGenerics9 {
         new <T>(a: T, b: T, c: T): T;
     }
-    var someGenerics9: someGenerics9;
+    declare var someGenerics9: someGenerics9;
     var a9a = new someGenerics9('', 0, []);
                                     ~
 !!! error TS2345: Argument of type '0' is not assignable to parameter of type '""'.
-    var a9a: {};
-        ~~~
+    declare var a9a: {};
+                ~~~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'a9a' must be of type 'string', but here has type '{}'.
 !!! related TS6203 typeArgumentInferenceConstructSignatures.ts:106:5: 'a9a' was also declared here.
     var a9b = new someGenerics9<{ a?: number; b?: string; }>({ a: 0 }, { b: '' }, null);
-    var a9b: { a?: number; b?: string; };
+    declare var a9b: { a?: number; b?: string; };
     
     // Generic call with multiple parameters of generic type passed arguments with multiple best common types
     interface A91 {
@@ -154,26 +154,26 @@ typeArgumentInferenceConstructSignatures.ts(122,74): error TS2353: Object litera
         z?: Window;
     }
     var a9e = new someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' });
-    var a9e: {};
-        ~~~
+    declare var a9e: {};
+                ~~~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'a9e' must be of type '{ x: number; z: Window & typeof globalThis; y?: undefined; } | { x: number; y: string; z?: undefined; }', but here has type '{}'.
 !!! related TS6203 typeArgumentInferenceConstructSignatures.ts:120:5: 'a9e' was also declared here.
     var a9f = new someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' });
                                                                              ~
 !!! error TS2353: Object literal may only specify known properties, and 'y' does not exist in type 'A92'.
-    var a9f: A92;
+    declare var a9f: A92;
     
     // Generic call with multiple parameters of generic type passed arguments with a single best common type
     var a9d = new someGenerics9({ x: 3 }, { x: 6 }, { x: 6 });
-    var a9d: { x: number; };
+    declare var a9d: { x: number; };
     
     // Generic call with multiple parameters of generic type where one argument is of type 'any'
-    var anyVar: any;
+    declare var anyVar: any;
     var a = new someGenerics9(7, anyVar, 4);
-    var a: any;
+    declare var a: any;
     
     // Generic call with multiple parameters of generic type where one argument is [] and the other is not 'any'
     var arr = new someGenerics9([], null, undefined);
-    var arr: any[];
+    declare var arr: any[];
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.js b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.js
index 477d8780dfc3d..44cb8cda02ae6 100644
--- a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.js
+++ b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.js
@@ -5,7 +5,7 @@
 interface NoParams {
     new <T>();
 }
-var noParams: NoParams;
+declare var noParams: NoParams;
 new noParams();
 new noParams<string>();
 new noParams<{}>();
@@ -14,7 +14,7 @@ new noParams<{}>();
 interface noGenericParams {
     new <T>(n: string);
 }
-var noGenericParams: noGenericParams;
+declare var noGenericParams: noGenericParams;
 new noGenericParams('');
 new noGenericParams<number>('');
 new noGenericParams<{}>('');
@@ -23,7 +23,7 @@ new noGenericParams<{}>('');
 interface someGenerics1 {
     new <T, U>(n: T, m: number);
 }
-var someGenerics1: someGenerics1;
+declare var someGenerics1: someGenerics1;
 new someGenerics1(3, 4);
 new someGenerics1<string, number>(3, 4); // Error
 new someGenerics1<number, {}>(3, 4);
@@ -32,7 +32,7 @@ new someGenerics1<number, {}>(3, 4);
 interface someGenerics2a {
     new <T>(n: (x: T) => void);
 }
-var someGenerics2a: someGenerics2a;
+declare var someGenerics2a: someGenerics2a;
 new someGenerics2a((n: string) => n);
 new someGenerics2a<string>((n: string) => n);
 new someGenerics2a<string>((n) => n.substr(0));
@@ -40,7 +40,7 @@ new someGenerics2a<string>((n) => n.substr(0));
 interface someGenerics2b {
     new <T, U>(n: (x: T, y: U) => void);
 }
-var someGenerics2b: someGenerics2b;
+declare var someGenerics2b: someGenerics2b;
 new someGenerics2b((n: string, x: number) => n);
 new someGenerics2b<string, number>((n: string, t: number) => n);
 new someGenerics2b<string, number>((n, t) => n.substr(t * t));
@@ -49,7 +49,7 @@ new someGenerics2b<string, number>((n, t) => n.substr(t * t));
 interface someGenerics3 {
     new <T>(producer: () => T);
 }
-var someGenerics3: someGenerics3;
+declare var someGenerics3: someGenerics3;
 new someGenerics3(() => '');
 new someGenerics3<Window>(() => undefined);
 new someGenerics3<number>(() => 3);
@@ -58,7 +58,7 @@ new someGenerics3<number>(() => 3);
 interface someGenerics4 {
     new <T, U>(n: T, f: (x: U) => void);
 }
-var someGenerics4: someGenerics4;
+declare var someGenerics4: someGenerics4;
 new someGenerics4(4, () => null);
 new someGenerics4<string, number>('', () => 3);
 new someGenerics4<string, number>('', (x: string) => ''); // Error
@@ -68,7 +68,7 @@ new someGenerics4<string, number>(null, null);
 interface someGenerics5 {
     new <U, T>(n: T, f: (x: U) => void);
 }
-var someGenerics5: someGenerics5;
+declare var someGenerics5: someGenerics5;
 new someGenerics5(4, () => null);
 new someGenerics5<number, string>('', () => 3);
 new someGenerics5<number, string>('', (x: string) => ''); // Error
@@ -78,7 +78,7 @@ new someGenerics5<string, number>(null, null);
 interface someGenerics6 {
     new <A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A);
 }
-var someGenerics6: someGenerics6;
+declare var someGenerics6: someGenerics6;
 new someGenerics6(n => n, n => n, n => n);
 new someGenerics6<number>(n => n, n => n, n => n);
 new someGenerics6<number>((n: number) => n, (n: string) => n, (n: number) => n); // Error
@@ -88,7 +88,7 @@ new someGenerics6<number>((n: number) => n, (n: number) => n, (n: number) => n);
 interface someGenerics7 {
     new <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C);
 }
-var someGenerics7: someGenerics7;
+declare var someGenerics7: someGenerics7;
 new someGenerics7(n => n, n => n, n => n);
 new someGenerics7<number, string, number>(n => n, n => n, n => n);
 new someGenerics7<number, string, number>((n: number) => n, (n: string) => n, (n: number) => n);
@@ -97,7 +97,7 @@ new someGenerics7<number, string, number>((n: number) => n, (n: string) => n, (n
 interface someGenerics8 {
     new <T>(n: T): T;
 }
-var someGenerics8: someGenerics8;
+declare var someGenerics8: someGenerics8;
 var x = new someGenerics8(someGenerics7);
 new x<string, string, string>(null, null, null);
 
@@ -105,11 +105,11 @@ new x<string, string, string>(null, null, null);
 interface someGenerics9 {
     new <T>(a: T, b: T, c: T): T;
 }
-var someGenerics9: someGenerics9;
+declare var someGenerics9: someGenerics9;
 var a9a = new someGenerics9('', 0, []);
-var a9a: {};
+declare var a9a: {};
 var a9b = new someGenerics9<{ a?: number; b?: string; }>({ a: 0 }, { b: '' }, null);
-var a9b: { a?: number; b?: string; };
+declare var a9b: { a?: number; b?: string; };
 
 // Generic call with multiple parameters of generic type passed arguments with multiple best common types
 interface A91 {
@@ -121,88 +121,67 @@ interface A92 {
     z?: Window;
 }
 var a9e = new someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' });
-var a9e: {};
+declare var a9e: {};
 var a9f = new someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' });
-var a9f: A92;
+declare var a9f: A92;
 
 // Generic call with multiple parameters of generic type passed arguments with a single best common type
 var a9d = new someGenerics9({ x: 3 }, { x: 6 }, { x: 6 });
-var a9d: { x: number; };
+declare var a9d: { x: number; };
 
 // Generic call with multiple parameters of generic type where one argument is of type 'any'
-var anyVar: any;
+declare var anyVar: any;
 var a = new someGenerics9(7, anyVar, 4);
-var a: any;
+declare var a: any;
 
 // Generic call with multiple parameters of generic type where one argument is [] and the other is not 'any'
 var arr = new someGenerics9([], null, undefined);
-var arr: any[];
+declare var arr: any[];
 
 
 
 //// [typeArgumentInferenceConstructSignatures.js]
-var noParams;
 new noParams();
 new noParams();
 new noParams();
-var noGenericParams;
 new noGenericParams('');
 new noGenericParams('');
 new noGenericParams('');
-var someGenerics1;
 new someGenerics1(3, 4);
 new someGenerics1(3, 4); // Error
 new someGenerics1(3, 4);
-var someGenerics2a;
 new someGenerics2a(function (n) { return n; });
 new someGenerics2a(function (n) { return n; });
 new someGenerics2a(function (n) { return n.substr(0); });
-var someGenerics2b;
 new someGenerics2b(function (n, x) { return n; });
 new someGenerics2b(function (n, t) { return n; });
 new someGenerics2b(function (n, t) { return n.substr(t * t); });
-var someGenerics3;
 new someGenerics3(function () { return ''; });
 new someGenerics3(function () { return undefined; });
 new someGenerics3(function () { return 3; });
-var someGenerics4;
 new someGenerics4(4, function () { return null; });
 new someGenerics4('', function () { return 3; });
 new someGenerics4('', function (x) { return ''; }); // Error
 new someGenerics4(null, null);
-var someGenerics5;
 new someGenerics5(4, function () { return null; });
 new someGenerics5('', function () { return 3; });
 new someGenerics5('', function (x) { return ''; }); // Error
 new someGenerics5(null, null);
-var someGenerics6;
 new someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; });
 new someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; });
 new someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); // Error
 new someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; });
-var someGenerics7;
 new someGenerics7(function (n) { return n; }, function (n) { return n; }, function (n) { return n; });
 new someGenerics7(function (n) { return n; }, function (n) { return n; }, function (n) { return n; });
 new someGenerics7(function (n) { return n; }, function (n) { return n; }, function (n) { return n; });
-var someGenerics8;
 var x = new someGenerics8(someGenerics7);
 new x(null, null, null);
-var someGenerics9;
 var a9a = new someGenerics9('', 0, []);
-var a9a;
 var a9b = new someGenerics9({ a: 0 }, { b: '' }, null);
-var a9b;
 var a9e = new someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' });
-var a9e;
 var a9f = new someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' });
-var a9f;
 // Generic call with multiple parameters of generic type passed arguments with a single best common type
 var a9d = new someGenerics9({ x: 3 }, { x: 6 }, { x: 6 });
-var a9d;
-// Generic call with multiple parameters of generic type where one argument is of type 'any'
-var anyVar;
 var a = new someGenerics9(7, anyVar, 4);
-var a;
 // Generic call with multiple parameters of generic type where one argument is [] and the other is not 'any'
 var arr = new someGenerics9([], null, undefined);
-var arr;
diff --git a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.symbols b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.symbols
index 72b35c7bed0b7..bd5154351b307 100644
--- a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.symbols
+++ b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.symbols
@@ -8,43 +8,43 @@ interface NoParams {
     new <T>();
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 2, 9))
 }
-var noParams: NoParams;
->noParams : Symbol(noParams, Decl(typeArgumentInferenceConstructSignatures.ts, 4, 3))
+declare var noParams: NoParams;
+>noParams : Symbol(noParams, Decl(typeArgumentInferenceConstructSignatures.ts, 4, 11))
 >NoParams : Symbol(NoParams, Decl(typeArgumentInferenceConstructSignatures.ts, 0, 0))
 
 new noParams();
->noParams : Symbol(noParams, Decl(typeArgumentInferenceConstructSignatures.ts, 4, 3))
+>noParams : Symbol(noParams, Decl(typeArgumentInferenceConstructSignatures.ts, 4, 11))
 
 new noParams<string>();
->noParams : Symbol(noParams, Decl(typeArgumentInferenceConstructSignatures.ts, 4, 3))
+>noParams : Symbol(noParams, Decl(typeArgumentInferenceConstructSignatures.ts, 4, 11))
 
 new noParams<{}>();
->noParams : Symbol(noParams, Decl(typeArgumentInferenceConstructSignatures.ts, 4, 3))
+>noParams : Symbol(noParams, Decl(typeArgumentInferenceConstructSignatures.ts, 4, 11))
 
 // Generic call with parameters but none use type parameter type
 interface noGenericParams {
->noGenericParams : Symbol(noGenericParams, Decl(typeArgumentInferenceConstructSignatures.ts, 7, 19), Decl(typeArgumentInferenceConstructSignatures.ts, 13, 3))
+>noGenericParams : Symbol(noGenericParams, Decl(typeArgumentInferenceConstructSignatures.ts, 7, 19), Decl(typeArgumentInferenceConstructSignatures.ts, 13, 11))
 
     new <T>(n: string);
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 11, 9))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 11, 12))
 }
-var noGenericParams: noGenericParams;
->noGenericParams : Symbol(noGenericParams, Decl(typeArgumentInferenceConstructSignatures.ts, 7, 19), Decl(typeArgumentInferenceConstructSignatures.ts, 13, 3))
->noGenericParams : Symbol(noGenericParams, Decl(typeArgumentInferenceConstructSignatures.ts, 7, 19), Decl(typeArgumentInferenceConstructSignatures.ts, 13, 3))
+declare var noGenericParams: noGenericParams;
+>noGenericParams : Symbol(noGenericParams, Decl(typeArgumentInferenceConstructSignatures.ts, 7, 19), Decl(typeArgumentInferenceConstructSignatures.ts, 13, 11))
+>noGenericParams : Symbol(noGenericParams, Decl(typeArgumentInferenceConstructSignatures.ts, 7, 19), Decl(typeArgumentInferenceConstructSignatures.ts, 13, 11))
 
 new noGenericParams('');
->noGenericParams : Symbol(noGenericParams, Decl(typeArgumentInferenceConstructSignatures.ts, 7, 19), Decl(typeArgumentInferenceConstructSignatures.ts, 13, 3))
+>noGenericParams : Symbol(noGenericParams, Decl(typeArgumentInferenceConstructSignatures.ts, 7, 19), Decl(typeArgumentInferenceConstructSignatures.ts, 13, 11))
 
 new noGenericParams<number>('');
->noGenericParams : Symbol(noGenericParams, Decl(typeArgumentInferenceConstructSignatures.ts, 7, 19), Decl(typeArgumentInferenceConstructSignatures.ts, 13, 3))
+>noGenericParams : Symbol(noGenericParams, Decl(typeArgumentInferenceConstructSignatures.ts, 7, 19), Decl(typeArgumentInferenceConstructSignatures.ts, 13, 11))
 
 new noGenericParams<{}>('');
->noGenericParams : Symbol(noGenericParams, Decl(typeArgumentInferenceConstructSignatures.ts, 7, 19), Decl(typeArgumentInferenceConstructSignatures.ts, 13, 3))
+>noGenericParams : Symbol(noGenericParams, Decl(typeArgumentInferenceConstructSignatures.ts, 7, 19), Decl(typeArgumentInferenceConstructSignatures.ts, 13, 11))
 
 // Generic call with multiple type parameters and only one used in parameter type annotation
 interface someGenerics1 {
->someGenerics1 : Symbol(someGenerics1, Decl(typeArgumentInferenceConstructSignatures.ts, 16, 28), Decl(typeArgumentInferenceConstructSignatures.ts, 22, 3))
+>someGenerics1 : Symbol(someGenerics1, Decl(typeArgumentInferenceConstructSignatures.ts, 16, 28), Decl(typeArgumentInferenceConstructSignatures.ts, 22, 11))
 
     new <T, U>(n: T, m: number);
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 20, 9))
@@ -53,22 +53,22 @@ interface someGenerics1 {
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 20, 9))
 >m : Symbol(m, Decl(typeArgumentInferenceConstructSignatures.ts, 20, 20))
 }
-var someGenerics1: someGenerics1;
->someGenerics1 : Symbol(someGenerics1, Decl(typeArgumentInferenceConstructSignatures.ts, 16, 28), Decl(typeArgumentInferenceConstructSignatures.ts, 22, 3))
->someGenerics1 : Symbol(someGenerics1, Decl(typeArgumentInferenceConstructSignatures.ts, 16, 28), Decl(typeArgumentInferenceConstructSignatures.ts, 22, 3))
+declare var someGenerics1: someGenerics1;
+>someGenerics1 : Symbol(someGenerics1, Decl(typeArgumentInferenceConstructSignatures.ts, 16, 28), Decl(typeArgumentInferenceConstructSignatures.ts, 22, 11))
+>someGenerics1 : Symbol(someGenerics1, Decl(typeArgumentInferenceConstructSignatures.ts, 16, 28), Decl(typeArgumentInferenceConstructSignatures.ts, 22, 11))
 
 new someGenerics1(3, 4);
->someGenerics1 : Symbol(someGenerics1, Decl(typeArgumentInferenceConstructSignatures.ts, 16, 28), Decl(typeArgumentInferenceConstructSignatures.ts, 22, 3))
+>someGenerics1 : Symbol(someGenerics1, Decl(typeArgumentInferenceConstructSignatures.ts, 16, 28), Decl(typeArgumentInferenceConstructSignatures.ts, 22, 11))
 
 new someGenerics1<string, number>(3, 4); // Error
->someGenerics1 : Symbol(someGenerics1, Decl(typeArgumentInferenceConstructSignatures.ts, 16, 28), Decl(typeArgumentInferenceConstructSignatures.ts, 22, 3))
+>someGenerics1 : Symbol(someGenerics1, Decl(typeArgumentInferenceConstructSignatures.ts, 16, 28), Decl(typeArgumentInferenceConstructSignatures.ts, 22, 11))
 
 new someGenerics1<number, {}>(3, 4);
->someGenerics1 : Symbol(someGenerics1, Decl(typeArgumentInferenceConstructSignatures.ts, 16, 28), Decl(typeArgumentInferenceConstructSignatures.ts, 22, 3))
+>someGenerics1 : Symbol(someGenerics1, Decl(typeArgumentInferenceConstructSignatures.ts, 16, 28), Decl(typeArgumentInferenceConstructSignatures.ts, 22, 11))
 
 // Generic call with argument of function type whose parameter is of type parameter type
 interface someGenerics2a {
->someGenerics2a : Symbol(someGenerics2a, Decl(typeArgumentInferenceConstructSignatures.ts, 25, 36), Decl(typeArgumentInferenceConstructSignatures.ts, 31, 3))
+>someGenerics2a : Symbol(someGenerics2a, Decl(typeArgumentInferenceConstructSignatures.ts, 25, 36), Decl(typeArgumentInferenceConstructSignatures.ts, 31, 11))
 
     new <T>(n: (x: T) => void);
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 29, 9))
@@ -76,29 +76,29 @@ interface someGenerics2a {
 >x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 29, 16))
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 29, 9))
 }
-var someGenerics2a: someGenerics2a;
->someGenerics2a : Symbol(someGenerics2a, Decl(typeArgumentInferenceConstructSignatures.ts, 25, 36), Decl(typeArgumentInferenceConstructSignatures.ts, 31, 3))
->someGenerics2a : Symbol(someGenerics2a, Decl(typeArgumentInferenceConstructSignatures.ts, 25, 36), Decl(typeArgumentInferenceConstructSignatures.ts, 31, 3))
+declare var someGenerics2a: someGenerics2a;
+>someGenerics2a : Symbol(someGenerics2a, Decl(typeArgumentInferenceConstructSignatures.ts, 25, 36), Decl(typeArgumentInferenceConstructSignatures.ts, 31, 11))
+>someGenerics2a : Symbol(someGenerics2a, Decl(typeArgumentInferenceConstructSignatures.ts, 25, 36), Decl(typeArgumentInferenceConstructSignatures.ts, 31, 11))
 
 new someGenerics2a((n: string) => n);
->someGenerics2a : Symbol(someGenerics2a, Decl(typeArgumentInferenceConstructSignatures.ts, 25, 36), Decl(typeArgumentInferenceConstructSignatures.ts, 31, 3))
+>someGenerics2a : Symbol(someGenerics2a, Decl(typeArgumentInferenceConstructSignatures.ts, 25, 36), Decl(typeArgumentInferenceConstructSignatures.ts, 31, 11))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 32, 20))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 32, 20))
 
 new someGenerics2a<string>((n: string) => n);
->someGenerics2a : Symbol(someGenerics2a, Decl(typeArgumentInferenceConstructSignatures.ts, 25, 36), Decl(typeArgumentInferenceConstructSignatures.ts, 31, 3))
+>someGenerics2a : Symbol(someGenerics2a, Decl(typeArgumentInferenceConstructSignatures.ts, 25, 36), Decl(typeArgumentInferenceConstructSignatures.ts, 31, 11))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 33, 28))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 33, 28))
 
 new someGenerics2a<string>((n) => n.substr(0));
->someGenerics2a : Symbol(someGenerics2a, Decl(typeArgumentInferenceConstructSignatures.ts, 25, 36), Decl(typeArgumentInferenceConstructSignatures.ts, 31, 3))
+>someGenerics2a : Symbol(someGenerics2a, Decl(typeArgumentInferenceConstructSignatures.ts, 25, 36), Decl(typeArgumentInferenceConstructSignatures.ts, 31, 11))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 34, 28))
 >n.substr : Symbol(String.substr, Decl(lib.es5.d.ts, --, --))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 34, 28))
 >substr : Symbol(String.substr, Decl(lib.es5.d.ts, --, --))
 
 interface someGenerics2b {
->someGenerics2b : Symbol(someGenerics2b, Decl(typeArgumentInferenceConstructSignatures.ts, 34, 47), Decl(typeArgumentInferenceConstructSignatures.ts, 39, 3))
+>someGenerics2b : Symbol(someGenerics2b, Decl(typeArgumentInferenceConstructSignatures.ts, 34, 47), Decl(typeArgumentInferenceConstructSignatures.ts, 39, 11))
 
     new <T, U>(n: (x: T, y: U) => void);
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 37, 9))
@@ -109,24 +109,24 @@ interface someGenerics2b {
 >y : Symbol(y, Decl(typeArgumentInferenceConstructSignatures.ts, 37, 24))
 >U : Symbol(U, Decl(typeArgumentInferenceConstructSignatures.ts, 37, 11))
 }
-var someGenerics2b: someGenerics2b;
->someGenerics2b : Symbol(someGenerics2b, Decl(typeArgumentInferenceConstructSignatures.ts, 34, 47), Decl(typeArgumentInferenceConstructSignatures.ts, 39, 3))
->someGenerics2b : Symbol(someGenerics2b, Decl(typeArgumentInferenceConstructSignatures.ts, 34, 47), Decl(typeArgumentInferenceConstructSignatures.ts, 39, 3))
+declare var someGenerics2b: someGenerics2b;
+>someGenerics2b : Symbol(someGenerics2b, Decl(typeArgumentInferenceConstructSignatures.ts, 34, 47), Decl(typeArgumentInferenceConstructSignatures.ts, 39, 11))
+>someGenerics2b : Symbol(someGenerics2b, Decl(typeArgumentInferenceConstructSignatures.ts, 34, 47), Decl(typeArgumentInferenceConstructSignatures.ts, 39, 11))
 
 new someGenerics2b((n: string, x: number) => n);
->someGenerics2b : Symbol(someGenerics2b, Decl(typeArgumentInferenceConstructSignatures.ts, 34, 47), Decl(typeArgumentInferenceConstructSignatures.ts, 39, 3))
+>someGenerics2b : Symbol(someGenerics2b, Decl(typeArgumentInferenceConstructSignatures.ts, 34, 47), Decl(typeArgumentInferenceConstructSignatures.ts, 39, 11))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 40, 20))
 >x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 40, 30))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 40, 20))
 
 new someGenerics2b<string, number>((n: string, t: number) => n);
->someGenerics2b : Symbol(someGenerics2b, Decl(typeArgumentInferenceConstructSignatures.ts, 34, 47), Decl(typeArgumentInferenceConstructSignatures.ts, 39, 3))
+>someGenerics2b : Symbol(someGenerics2b, Decl(typeArgumentInferenceConstructSignatures.ts, 34, 47), Decl(typeArgumentInferenceConstructSignatures.ts, 39, 11))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 41, 36))
 >t : Symbol(t, Decl(typeArgumentInferenceConstructSignatures.ts, 41, 46))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 41, 36))
 
 new someGenerics2b<string, number>((n, t) => n.substr(t * t));
->someGenerics2b : Symbol(someGenerics2b, Decl(typeArgumentInferenceConstructSignatures.ts, 34, 47), Decl(typeArgumentInferenceConstructSignatures.ts, 39, 3))
+>someGenerics2b : Symbol(someGenerics2b, Decl(typeArgumentInferenceConstructSignatures.ts, 34, 47), Decl(typeArgumentInferenceConstructSignatures.ts, 39, 11))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 42, 36))
 >t : Symbol(t, Decl(typeArgumentInferenceConstructSignatures.ts, 42, 38))
 >n.substr : Symbol(String.substr, Decl(lib.es5.d.ts, --, --))
@@ -137,31 +137,31 @@ new someGenerics2b<string, number>((n, t) => n.substr(t * t));
 
 // Generic call with argument of function type whose parameter is not of type parameter type but body/return type uses type parameter
 interface someGenerics3 {
->someGenerics3 : Symbol(someGenerics3, Decl(typeArgumentInferenceConstructSignatures.ts, 42, 62), Decl(typeArgumentInferenceConstructSignatures.ts, 48, 3))
+>someGenerics3 : Symbol(someGenerics3, Decl(typeArgumentInferenceConstructSignatures.ts, 42, 62), Decl(typeArgumentInferenceConstructSignatures.ts, 48, 11))
 
     new <T>(producer: () => T);
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 46, 9))
 >producer : Symbol(producer, Decl(typeArgumentInferenceConstructSignatures.ts, 46, 12))
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 46, 9))
 }
-var someGenerics3: someGenerics3;
->someGenerics3 : Symbol(someGenerics3, Decl(typeArgumentInferenceConstructSignatures.ts, 42, 62), Decl(typeArgumentInferenceConstructSignatures.ts, 48, 3))
->someGenerics3 : Symbol(someGenerics3, Decl(typeArgumentInferenceConstructSignatures.ts, 42, 62), Decl(typeArgumentInferenceConstructSignatures.ts, 48, 3))
+declare var someGenerics3: someGenerics3;
+>someGenerics3 : Symbol(someGenerics3, Decl(typeArgumentInferenceConstructSignatures.ts, 42, 62), Decl(typeArgumentInferenceConstructSignatures.ts, 48, 11))
+>someGenerics3 : Symbol(someGenerics3, Decl(typeArgumentInferenceConstructSignatures.ts, 42, 62), Decl(typeArgumentInferenceConstructSignatures.ts, 48, 11))
 
 new someGenerics3(() => '');
->someGenerics3 : Symbol(someGenerics3, Decl(typeArgumentInferenceConstructSignatures.ts, 42, 62), Decl(typeArgumentInferenceConstructSignatures.ts, 48, 3))
+>someGenerics3 : Symbol(someGenerics3, Decl(typeArgumentInferenceConstructSignatures.ts, 42, 62), Decl(typeArgumentInferenceConstructSignatures.ts, 48, 11))
 
 new someGenerics3<Window>(() => undefined);
->someGenerics3 : Symbol(someGenerics3, Decl(typeArgumentInferenceConstructSignatures.ts, 42, 62), Decl(typeArgumentInferenceConstructSignatures.ts, 48, 3))
+>someGenerics3 : Symbol(someGenerics3, Decl(typeArgumentInferenceConstructSignatures.ts, 42, 62), Decl(typeArgumentInferenceConstructSignatures.ts, 48, 11))
 >Window : Symbol(Window, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
 >undefined : Symbol(undefined)
 
 new someGenerics3<number>(() => 3);
->someGenerics3 : Symbol(someGenerics3, Decl(typeArgumentInferenceConstructSignatures.ts, 42, 62), Decl(typeArgumentInferenceConstructSignatures.ts, 48, 3))
+>someGenerics3 : Symbol(someGenerics3, Decl(typeArgumentInferenceConstructSignatures.ts, 42, 62), Decl(typeArgumentInferenceConstructSignatures.ts, 48, 11))
 
 // 2 parameter generic call with argument 1 of type parameter type and argument 2 of function type whose parameter is of type parameter type
 interface someGenerics4 {
->someGenerics4 : Symbol(someGenerics4, Decl(typeArgumentInferenceConstructSignatures.ts, 51, 35), Decl(typeArgumentInferenceConstructSignatures.ts, 57, 3))
+>someGenerics4 : Symbol(someGenerics4, Decl(typeArgumentInferenceConstructSignatures.ts, 51, 35), Decl(typeArgumentInferenceConstructSignatures.ts, 57, 11))
 
     new <T, U>(n: T, f: (x: U) => void);
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 55, 9))
@@ -172,26 +172,26 @@ interface someGenerics4 {
 >x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 55, 25))
 >U : Symbol(U, Decl(typeArgumentInferenceConstructSignatures.ts, 55, 11))
 }
-var someGenerics4: someGenerics4;
->someGenerics4 : Symbol(someGenerics4, Decl(typeArgumentInferenceConstructSignatures.ts, 51, 35), Decl(typeArgumentInferenceConstructSignatures.ts, 57, 3))
->someGenerics4 : Symbol(someGenerics4, Decl(typeArgumentInferenceConstructSignatures.ts, 51, 35), Decl(typeArgumentInferenceConstructSignatures.ts, 57, 3))
+declare var someGenerics4: someGenerics4;
+>someGenerics4 : Symbol(someGenerics4, Decl(typeArgumentInferenceConstructSignatures.ts, 51, 35), Decl(typeArgumentInferenceConstructSignatures.ts, 57, 11))
+>someGenerics4 : Symbol(someGenerics4, Decl(typeArgumentInferenceConstructSignatures.ts, 51, 35), Decl(typeArgumentInferenceConstructSignatures.ts, 57, 11))
 
 new someGenerics4(4, () => null);
->someGenerics4 : Symbol(someGenerics4, Decl(typeArgumentInferenceConstructSignatures.ts, 51, 35), Decl(typeArgumentInferenceConstructSignatures.ts, 57, 3))
+>someGenerics4 : Symbol(someGenerics4, Decl(typeArgumentInferenceConstructSignatures.ts, 51, 35), Decl(typeArgumentInferenceConstructSignatures.ts, 57, 11))
 
 new someGenerics4<string, number>('', () => 3);
->someGenerics4 : Symbol(someGenerics4, Decl(typeArgumentInferenceConstructSignatures.ts, 51, 35), Decl(typeArgumentInferenceConstructSignatures.ts, 57, 3))
+>someGenerics4 : Symbol(someGenerics4, Decl(typeArgumentInferenceConstructSignatures.ts, 51, 35), Decl(typeArgumentInferenceConstructSignatures.ts, 57, 11))
 
 new someGenerics4<string, number>('', (x: string) => ''); // Error
->someGenerics4 : Symbol(someGenerics4, Decl(typeArgumentInferenceConstructSignatures.ts, 51, 35), Decl(typeArgumentInferenceConstructSignatures.ts, 57, 3))
+>someGenerics4 : Symbol(someGenerics4, Decl(typeArgumentInferenceConstructSignatures.ts, 51, 35), Decl(typeArgumentInferenceConstructSignatures.ts, 57, 11))
 >x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 60, 39))
 
 new someGenerics4<string, number>(null, null);
->someGenerics4 : Symbol(someGenerics4, Decl(typeArgumentInferenceConstructSignatures.ts, 51, 35), Decl(typeArgumentInferenceConstructSignatures.ts, 57, 3))
+>someGenerics4 : Symbol(someGenerics4, Decl(typeArgumentInferenceConstructSignatures.ts, 51, 35), Decl(typeArgumentInferenceConstructSignatures.ts, 57, 11))
 
 // 2 parameter generic call with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type
 interface someGenerics5 {
->someGenerics5 : Symbol(someGenerics5, Decl(typeArgumentInferenceConstructSignatures.ts, 61, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 67, 3))
+>someGenerics5 : Symbol(someGenerics5, Decl(typeArgumentInferenceConstructSignatures.ts, 61, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 67, 11))
 
     new <U, T>(n: T, f: (x: U) => void);
 >U : Symbol(U, Decl(typeArgumentInferenceConstructSignatures.ts, 65, 9))
@@ -202,26 +202,26 @@ interface someGenerics5 {
 >x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 65, 25))
 >U : Symbol(U, Decl(typeArgumentInferenceConstructSignatures.ts, 65, 9))
 }
-var someGenerics5: someGenerics5;
->someGenerics5 : Symbol(someGenerics5, Decl(typeArgumentInferenceConstructSignatures.ts, 61, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 67, 3))
->someGenerics5 : Symbol(someGenerics5, Decl(typeArgumentInferenceConstructSignatures.ts, 61, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 67, 3))
+declare var someGenerics5: someGenerics5;
+>someGenerics5 : Symbol(someGenerics5, Decl(typeArgumentInferenceConstructSignatures.ts, 61, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 67, 11))
+>someGenerics5 : Symbol(someGenerics5, Decl(typeArgumentInferenceConstructSignatures.ts, 61, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 67, 11))
 
 new someGenerics5(4, () => null);
->someGenerics5 : Symbol(someGenerics5, Decl(typeArgumentInferenceConstructSignatures.ts, 61, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 67, 3))
+>someGenerics5 : Symbol(someGenerics5, Decl(typeArgumentInferenceConstructSignatures.ts, 61, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 67, 11))
 
 new someGenerics5<number, string>('', () => 3);
->someGenerics5 : Symbol(someGenerics5, Decl(typeArgumentInferenceConstructSignatures.ts, 61, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 67, 3))
+>someGenerics5 : Symbol(someGenerics5, Decl(typeArgumentInferenceConstructSignatures.ts, 61, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 67, 11))
 
 new someGenerics5<number, string>('', (x: string) => ''); // Error
->someGenerics5 : Symbol(someGenerics5, Decl(typeArgumentInferenceConstructSignatures.ts, 61, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 67, 3))
+>someGenerics5 : Symbol(someGenerics5, Decl(typeArgumentInferenceConstructSignatures.ts, 61, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 67, 11))
 >x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 70, 39))
 
 new someGenerics5<string, number>(null, null);
->someGenerics5 : Symbol(someGenerics5, Decl(typeArgumentInferenceConstructSignatures.ts, 61, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 67, 3))
+>someGenerics5 : Symbol(someGenerics5, Decl(typeArgumentInferenceConstructSignatures.ts, 61, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 67, 11))
 
 // Generic call with multiple arguments of function types that each have parameters of the same generic type
 interface someGenerics6 {
->someGenerics6 : Symbol(someGenerics6, Decl(typeArgumentInferenceConstructSignatures.ts, 71, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 77, 3))
+>someGenerics6 : Symbol(someGenerics6, Decl(typeArgumentInferenceConstructSignatures.ts, 71, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 77, 11))
 
     new <A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A);
 >A : Symbol(A, Decl(typeArgumentInferenceConstructSignatures.ts, 75, 9))
@@ -238,12 +238,12 @@ interface someGenerics6 {
 >A : Symbol(A, Decl(typeArgumentInferenceConstructSignatures.ts, 75, 9))
 >A : Symbol(A, Decl(typeArgumentInferenceConstructSignatures.ts, 75, 9))
 }
-var someGenerics6: someGenerics6;
->someGenerics6 : Symbol(someGenerics6, Decl(typeArgumentInferenceConstructSignatures.ts, 71, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 77, 3))
->someGenerics6 : Symbol(someGenerics6, Decl(typeArgumentInferenceConstructSignatures.ts, 71, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 77, 3))
+declare var someGenerics6: someGenerics6;
+>someGenerics6 : Symbol(someGenerics6, Decl(typeArgumentInferenceConstructSignatures.ts, 71, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 77, 11))
+>someGenerics6 : Symbol(someGenerics6, Decl(typeArgumentInferenceConstructSignatures.ts, 71, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 77, 11))
 
 new someGenerics6(n => n, n => n, n => n);
->someGenerics6 : Symbol(someGenerics6, Decl(typeArgumentInferenceConstructSignatures.ts, 71, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 77, 3))
+>someGenerics6 : Symbol(someGenerics6, Decl(typeArgumentInferenceConstructSignatures.ts, 71, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 77, 11))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 78, 18))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 78, 18))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 78, 25))
@@ -252,7 +252,7 @@ new someGenerics6(n => n, n => n, n => n);
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 78, 33))
 
 new someGenerics6<number>(n => n, n => n, n => n);
->someGenerics6 : Symbol(someGenerics6, Decl(typeArgumentInferenceConstructSignatures.ts, 71, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 77, 3))
+>someGenerics6 : Symbol(someGenerics6, Decl(typeArgumentInferenceConstructSignatures.ts, 71, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 77, 11))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 79, 26))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 79, 26))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 79, 33))
@@ -261,7 +261,7 @@ new someGenerics6<number>(n => n, n => n, n => n);
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 79, 41))
 
 new someGenerics6<number>((n: number) => n, (n: string) => n, (n: number) => n); // Error
->someGenerics6 : Symbol(someGenerics6, Decl(typeArgumentInferenceConstructSignatures.ts, 71, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 77, 3))
+>someGenerics6 : Symbol(someGenerics6, Decl(typeArgumentInferenceConstructSignatures.ts, 71, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 77, 11))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 80, 27))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 80, 27))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 80, 45))
@@ -270,7 +270,7 @@ new someGenerics6<number>((n: number) => n, (n: string) => n, (n: number) => n);
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 80, 63))
 
 new someGenerics6<number>((n: number) => n, (n: number) => n, (n: number) => n);
->someGenerics6 : Symbol(someGenerics6, Decl(typeArgumentInferenceConstructSignatures.ts, 71, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 77, 3))
+>someGenerics6 : Symbol(someGenerics6, Decl(typeArgumentInferenceConstructSignatures.ts, 71, 46), Decl(typeArgumentInferenceConstructSignatures.ts, 77, 11))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 27))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 27))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 45))
@@ -280,7 +280,7 @@ new someGenerics6<number>((n: number) => n, (n: number) => n, (n: number) => n);
 
 // Generic call with multiple arguments of function types that each have parameters of different generic type
 interface someGenerics7 {
->someGenerics7 : Symbol(someGenerics7, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 80), Decl(typeArgumentInferenceConstructSignatures.ts, 87, 3))
+>someGenerics7 : Symbol(someGenerics7, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 80), Decl(typeArgumentInferenceConstructSignatures.ts, 87, 11))
 
     new <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C);
 >A : Symbol(A, Decl(typeArgumentInferenceConstructSignatures.ts, 85, 9))
@@ -299,12 +299,12 @@ interface someGenerics7 {
 >C : Symbol(C, Decl(typeArgumentInferenceConstructSignatures.ts, 85, 14))
 >C : Symbol(C, Decl(typeArgumentInferenceConstructSignatures.ts, 85, 14))
 }
-var someGenerics7: someGenerics7;
->someGenerics7 : Symbol(someGenerics7, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 80), Decl(typeArgumentInferenceConstructSignatures.ts, 87, 3))
->someGenerics7 : Symbol(someGenerics7, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 80), Decl(typeArgumentInferenceConstructSignatures.ts, 87, 3))
+declare var someGenerics7: someGenerics7;
+>someGenerics7 : Symbol(someGenerics7, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 80), Decl(typeArgumentInferenceConstructSignatures.ts, 87, 11))
+>someGenerics7 : Symbol(someGenerics7, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 80), Decl(typeArgumentInferenceConstructSignatures.ts, 87, 11))
 
 new someGenerics7(n => n, n => n, n => n);
->someGenerics7 : Symbol(someGenerics7, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 80), Decl(typeArgumentInferenceConstructSignatures.ts, 87, 3))
+>someGenerics7 : Symbol(someGenerics7, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 80), Decl(typeArgumentInferenceConstructSignatures.ts, 87, 11))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 88, 18))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 88, 18))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 88, 25))
@@ -313,7 +313,7 @@ new someGenerics7(n => n, n => n, n => n);
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 88, 33))
 
 new someGenerics7<number, string, number>(n => n, n => n, n => n);
->someGenerics7 : Symbol(someGenerics7, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 80), Decl(typeArgumentInferenceConstructSignatures.ts, 87, 3))
+>someGenerics7 : Symbol(someGenerics7, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 80), Decl(typeArgumentInferenceConstructSignatures.ts, 87, 11))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 89, 42))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 89, 42))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 89, 49))
@@ -322,7 +322,7 @@ new someGenerics7<number, string, number>(n => n, n => n, n => n);
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 89, 57))
 
 new someGenerics7<number, string, number>((n: number) => n, (n: string) => n, (n: number) => n);
->someGenerics7 : Symbol(someGenerics7, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 80), Decl(typeArgumentInferenceConstructSignatures.ts, 87, 3))
+>someGenerics7 : Symbol(someGenerics7, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 80), Decl(typeArgumentInferenceConstructSignatures.ts, 87, 11))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 90, 43))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 90, 43))
 >n : Symbol(n, Decl(typeArgumentInferenceConstructSignatures.ts, 90, 61))
@@ -332,7 +332,7 @@ new someGenerics7<number, string, number>((n: number) => n, (n: string) => n, (n
 
 // Generic call with argument of generic function type
 interface someGenerics8 {
->someGenerics8 : Symbol(someGenerics8, Decl(typeArgumentInferenceConstructSignatures.ts, 90, 96), Decl(typeArgumentInferenceConstructSignatures.ts, 96, 3))
+>someGenerics8 : Symbol(someGenerics8, Decl(typeArgumentInferenceConstructSignatures.ts, 90, 96), Decl(typeArgumentInferenceConstructSignatures.ts, 96, 11))
 
     new <T>(n: T): T;
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 94, 9))
@@ -340,21 +340,21 @@ interface someGenerics8 {
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 94, 9))
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 94, 9))
 }
-var someGenerics8: someGenerics8;
->someGenerics8 : Symbol(someGenerics8, Decl(typeArgumentInferenceConstructSignatures.ts, 90, 96), Decl(typeArgumentInferenceConstructSignatures.ts, 96, 3))
->someGenerics8 : Symbol(someGenerics8, Decl(typeArgumentInferenceConstructSignatures.ts, 90, 96), Decl(typeArgumentInferenceConstructSignatures.ts, 96, 3))
+declare var someGenerics8: someGenerics8;
+>someGenerics8 : Symbol(someGenerics8, Decl(typeArgumentInferenceConstructSignatures.ts, 90, 96), Decl(typeArgumentInferenceConstructSignatures.ts, 96, 11))
+>someGenerics8 : Symbol(someGenerics8, Decl(typeArgumentInferenceConstructSignatures.ts, 90, 96), Decl(typeArgumentInferenceConstructSignatures.ts, 96, 11))
 
 var x = new someGenerics8(someGenerics7);
 >x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 97, 3))
->someGenerics8 : Symbol(someGenerics8, Decl(typeArgumentInferenceConstructSignatures.ts, 90, 96), Decl(typeArgumentInferenceConstructSignatures.ts, 96, 3))
->someGenerics7 : Symbol(someGenerics7, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 80), Decl(typeArgumentInferenceConstructSignatures.ts, 87, 3))
+>someGenerics8 : Symbol(someGenerics8, Decl(typeArgumentInferenceConstructSignatures.ts, 90, 96), Decl(typeArgumentInferenceConstructSignatures.ts, 96, 11))
+>someGenerics7 : Symbol(someGenerics7, Decl(typeArgumentInferenceConstructSignatures.ts, 81, 80), Decl(typeArgumentInferenceConstructSignatures.ts, 87, 11))
 
 new x<string, string, string>(null, null, null);
 >x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 97, 3))
 
 // Generic call with multiple parameters of generic type passed arguments with no best common type
 interface someGenerics9 {
->someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 3))
+>someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 11))
 
     new <T>(a: T, b: T, c: T): T;
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 102, 9))
@@ -366,33 +366,33 @@ interface someGenerics9 {
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 102, 9))
 >T : Symbol(T, Decl(typeArgumentInferenceConstructSignatures.ts, 102, 9))
 }
-var someGenerics9: someGenerics9;
->someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 3))
->someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 3))
+declare var someGenerics9: someGenerics9;
+>someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 11))
+>someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 11))
 
 var a9a = new someGenerics9('', 0, []);
->a9a : Symbol(a9a, Decl(typeArgumentInferenceConstructSignatures.ts, 105, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 106, 3))
->someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 3))
+>a9a : Symbol(a9a, Decl(typeArgumentInferenceConstructSignatures.ts, 105, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 106, 11))
+>someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 11))
 
-var a9a: {};
->a9a : Symbol(a9a, Decl(typeArgumentInferenceConstructSignatures.ts, 105, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 106, 3))
+declare var a9a: {};
+>a9a : Symbol(a9a, Decl(typeArgumentInferenceConstructSignatures.ts, 105, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 106, 11))
 
 var a9b = new someGenerics9<{ a?: number; b?: string; }>({ a: 0 }, { b: '' }, null);
->a9b : Symbol(a9b, Decl(typeArgumentInferenceConstructSignatures.ts, 107, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 108, 3))
->someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 3))
+>a9b : Symbol(a9b, Decl(typeArgumentInferenceConstructSignatures.ts, 107, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 108, 11))
+>someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 11))
 >a : Symbol(a, Decl(typeArgumentInferenceConstructSignatures.ts, 107, 29))
 >b : Symbol(b, Decl(typeArgumentInferenceConstructSignatures.ts, 107, 41))
 >a : Symbol(a, Decl(typeArgumentInferenceConstructSignatures.ts, 107, 58))
 >b : Symbol(b, Decl(typeArgumentInferenceConstructSignatures.ts, 107, 68))
 
-var a9b: { a?: number; b?: string; };
->a9b : Symbol(a9b, Decl(typeArgumentInferenceConstructSignatures.ts, 107, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 108, 3))
->a : Symbol(a, Decl(typeArgumentInferenceConstructSignatures.ts, 108, 10))
->b : Symbol(b, Decl(typeArgumentInferenceConstructSignatures.ts, 108, 22))
+declare var a9b: { a?: number; b?: string; };
+>a9b : Symbol(a9b, Decl(typeArgumentInferenceConstructSignatures.ts, 107, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 108, 11))
+>a : Symbol(a, Decl(typeArgumentInferenceConstructSignatures.ts, 108, 18))
+>b : Symbol(b, Decl(typeArgumentInferenceConstructSignatures.ts, 108, 30))
 
 // Generic call with multiple parameters of generic type passed arguments with multiple best common types
 interface A91 {
->A91 : Symbol(A91, Decl(typeArgumentInferenceConstructSignatures.ts, 108, 37))
+>A91 : Symbol(A91, Decl(typeArgumentInferenceConstructSignatures.ts, 108, 45))
 
     x: number;
 >x : Symbol(A91.x, Decl(typeArgumentInferenceConstructSignatures.ts, 111, 15))
@@ -411,8 +411,8 @@ interface A92 {
 >Window : Symbol(Window, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
 }
 var a9e = new someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' });
->a9e : Symbol(a9e, Decl(typeArgumentInferenceConstructSignatures.ts, 119, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 120, 3))
->someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 3))
+>a9e : Symbol(a9e, Decl(typeArgumentInferenceConstructSignatures.ts, 119, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 120, 11))
+>someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 11))
 >undefined : Symbol(undefined)
 >x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 119, 40))
 >z : Symbol(z, Decl(typeArgumentInferenceConstructSignatures.ts, 119, 46))
@@ -420,12 +420,12 @@ var a9e = new someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' });
 >x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 119, 61))
 >y : Symbol(y, Decl(typeArgumentInferenceConstructSignatures.ts, 119, 67))
 
-var a9e: {};
->a9e : Symbol(a9e, Decl(typeArgumentInferenceConstructSignatures.ts, 119, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 120, 3))
+declare var a9e: {};
+>a9e : Symbol(a9e, Decl(typeArgumentInferenceConstructSignatures.ts, 119, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 120, 11))
 
 var a9f = new someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' });
->a9f : Symbol(a9f, Decl(typeArgumentInferenceConstructSignatures.ts, 121, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 122, 3))
->someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 3))
+>a9f : Symbol(a9f, Decl(typeArgumentInferenceConstructSignatures.ts, 121, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 122, 11))
+>someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 11))
 >A92 : Symbol(A92, Decl(typeArgumentInferenceConstructSignatures.ts, 114, 1))
 >undefined : Symbol(undefined)
 >x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 121, 45))
@@ -434,41 +434,41 @@ var a9f = new someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' }
 >x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 121, 66))
 >y : Symbol(y, Decl(typeArgumentInferenceConstructSignatures.ts, 121, 72))
 
-var a9f: A92;
->a9f : Symbol(a9f, Decl(typeArgumentInferenceConstructSignatures.ts, 121, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 122, 3))
+declare var a9f: A92;
+>a9f : Symbol(a9f, Decl(typeArgumentInferenceConstructSignatures.ts, 121, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 122, 11))
 >A92 : Symbol(A92, Decl(typeArgumentInferenceConstructSignatures.ts, 114, 1))
 
 // Generic call with multiple parameters of generic type passed arguments with a single best common type
 var a9d = new someGenerics9({ x: 3 }, { x: 6 }, { x: 6 });
->a9d : Symbol(a9d, Decl(typeArgumentInferenceConstructSignatures.ts, 125, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 126, 3))
->someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 3))
+>a9d : Symbol(a9d, Decl(typeArgumentInferenceConstructSignatures.ts, 125, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 126, 11))
+>someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 11))
 >x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 125, 29))
 >x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 125, 39))
 >x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 125, 49))
 
-var a9d: { x: number; };
->a9d : Symbol(a9d, Decl(typeArgumentInferenceConstructSignatures.ts, 125, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 126, 3))
->x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 126, 10))
+declare var a9d: { x: number; };
+>a9d : Symbol(a9d, Decl(typeArgumentInferenceConstructSignatures.ts, 125, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 126, 11))
+>x : Symbol(x, Decl(typeArgumentInferenceConstructSignatures.ts, 126, 18))
 
 // Generic call with multiple parameters of generic type where one argument is of type 'any'
-var anyVar: any;
->anyVar : Symbol(anyVar, Decl(typeArgumentInferenceConstructSignatures.ts, 129, 3))
+declare var anyVar: any;
+>anyVar : Symbol(anyVar, Decl(typeArgumentInferenceConstructSignatures.ts, 129, 11))
 
 var a = new someGenerics9(7, anyVar, 4);
->a : Symbol(a, Decl(typeArgumentInferenceConstructSignatures.ts, 130, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 131, 3))
->someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 3))
->anyVar : Symbol(anyVar, Decl(typeArgumentInferenceConstructSignatures.ts, 129, 3))
+>a : Symbol(a, Decl(typeArgumentInferenceConstructSignatures.ts, 130, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 131, 11))
+>someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 11))
+>anyVar : Symbol(anyVar, Decl(typeArgumentInferenceConstructSignatures.ts, 129, 11))
 
-var a: any;
->a : Symbol(a, Decl(typeArgumentInferenceConstructSignatures.ts, 130, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 131, 3))
+declare var a: any;
+>a : Symbol(a, Decl(typeArgumentInferenceConstructSignatures.ts, 130, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 131, 11))
 
 // Generic call with multiple parameters of generic type where one argument is [] and the other is not 'any'
 var arr = new someGenerics9([], null, undefined);
->arr : Symbol(arr, Decl(typeArgumentInferenceConstructSignatures.ts, 134, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 135, 3))
->someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 3))
+>arr : Symbol(arr, Decl(typeArgumentInferenceConstructSignatures.ts, 134, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 135, 11))
+>someGenerics9 : Symbol(someGenerics9, Decl(typeArgumentInferenceConstructSignatures.ts, 98, 48), Decl(typeArgumentInferenceConstructSignatures.ts, 104, 11))
 >undefined : Symbol(undefined)
 
-var arr: any[];
->arr : Symbol(arr, Decl(typeArgumentInferenceConstructSignatures.ts, 134, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 135, 3))
+declare var arr: any[];
+>arr : Symbol(arr, Decl(typeArgumentInferenceConstructSignatures.ts, 134, 3), Decl(typeArgumentInferenceConstructSignatures.ts, 135, 11))
 
 
diff --git a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.types b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.types
index 6bc5dd052dfbf..8699e90d2839b 100644
--- a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.types
+++ b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.types
@@ -5,7 +5,7 @@
 interface NoParams {
     new <T>();
 }
-var noParams: NoParams;
+declare var noParams: NoParams;
 >noParams : NoParams
 >         : ^^^^^^^^
 
@@ -33,7 +33,7 @@ interface noGenericParams {
 >n : string
 >  : ^^^^^^
 }
-var noGenericParams: noGenericParams;
+declare var noGenericParams: noGenericParams;
 >noGenericParams : noGenericParams
 >                : ^^^^^^^^^^^^^^^
 
@@ -69,7 +69,7 @@ interface someGenerics1 {
 >m : number
 >  : ^^^^^^
 }
-var someGenerics1: someGenerics1;
+declare var someGenerics1: someGenerics1;
 >someGenerics1 : someGenerics1
 >              : ^^^^^^^^^^^^^
 
@@ -111,7 +111,7 @@ interface someGenerics2a {
 >x : T
 >  : ^
 }
-var someGenerics2a: someGenerics2a;
+declare var someGenerics2a: someGenerics2a;
 >someGenerics2a : someGenerics2a
 >               : ^^^^^^^^^^^^^^
 
@@ -168,7 +168,7 @@ interface someGenerics2b {
 >y : U
 >  : ^
 }
-var someGenerics2b: someGenerics2b;
+declare var someGenerics2b: someGenerics2b;
 >someGenerics2b : someGenerics2b
 >               : ^^^^^^^^^^^^^^
 
@@ -232,7 +232,7 @@ interface someGenerics3 {
 >producer : () => T
 >         : ^^^^^^ 
 }
-var someGenerics3: someGenerics3;
+declare var someGenerics3: someGenerics3;
 >someGenerics3 : someGenerics3
 >              : ^^^^^^^^^^^^^
 
@@ -276,7 +276,7 @@ interface someGenerics4 {
 >x : U
 >  : ^
 }
-var someGenerics4: someGenerics4;
+declare var someGenerics4: someGenerics4;
 >someGenerics4 : someGenerics4
 >              : ^^^^^^^^^^^^^
 
@@ -332,7 +332,7 @@ interface someGenerics5 {
 >x : U
 >  : ^
 }
-var someGenerics5: someGenerics5;
+declare var someGenerics5: someGenerics5;
 >someGenerics5 : someGenerics5
 >              : ^^^^^^^^^^^^^
 
@@ -394,7 +394,7 @@ interface someGenerics6 {
 >c : A
 >  : ^
 }
-var someGenerics6: someGenerics6;
+declare var someGenerics6: someGenerics6;
 >someGenerics6 : someGenerics6
 >              : ^^^^^^^^^^^^^
 
@@ -510,7 +510,7 @@ interface someGenerics7 {
 >c : C
 >  : ^
 }
-var someGenerics7: someGenerics7;
+declare var someGenerics7: someGenerics7;
 >someGenerics7 : someGenerics7
 >              : ^^^^^^^^^^^^^
 
@@ -592,7 +592,7 @@ interface someGenerics8 {
 >n : T
 >  : ^
 }
-var someGenerics8: someGenerics8;
+declare var someGenerics8: someGenerics8;
 >someGenerics8 : someGenerics8
 >              : ^^^^^^^^^^^^^
 
@@ -622,7 +622,7 @@ interface someGenerics9 {
 >c : T
 >  : ^
 }
-var someGenerics9: someGenerics9;
+declare var someGenerics9: someGenerics9;
 >someGenerics9 : someGenerics9
 >              : ^^^^^^^^^^^^^
 
@@ -640,7 +640,7 @@ var a9a = new someGenerics9('', 0, []);
 >[] : undefined[]
 >   : ^^^^^^^^^^^
 
-var a9a: {};
+declare var a9a: {};
 >a9a : string
 >    : ^^^^^^
 
@@ -668,7 +668,7 @@ var a9b = new someGenerics9<{ a?: number; b?: string; }>({ a: 0 }, { b: '' }, nu
 >'' : ""
 >   : ^^
 
-var a9b: { a?: number; b?: string; };
+declare var a9b: { a?: number; b?: string; };
 >a9b : { a?: number; b?: string; }
 >    : ^^^^^^      ^^^^^^      ^^^
 >a : number
@@ -725,7 +725,7 @@ var a9e = new someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' });
 >'' : ""
 >   : ^^
 
-var a9e: {};
+declare var a9e: {};
 >a9e : { x: number; z: Window & typeof globalThis; y?: undefined; } | { x: number; y: string; z?: undefined; }
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -759,7 +759,7 @@ var a9f = new someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' }
 >'' : ""
 >   : ^^
 
-var a9f: A92;
+declare var a9f: A92;
 >a9f : A92
 >    : ^^^
 
@@ -790,14 +790,14 @@ var a9d = new someGenerics9({ x: 3 }, { x: 6 }, { x: 6 });
 >6 : 6
 >  : ^
 
-var a9d: { x: number; };
+declare var a9d: { x: number; };
 >a9d : { x: number; }
 >    : ^^^^^^^^^^^^^^
 >x : number
 >  : ^^^^^^
 
 // Generic call with multiple parameters of generic type where one argument is of type 'any'
-var anyVar: any;
+declare var anyVar: any;
 >anyVar : any
 >       : ^^^
 
@@ -815,7 +815,7 @@ var a = new someGenerics9(7, anyVar, 4);
 >4 : 4
 >  : ^
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
@@ -832,7 +832,7 @@ var arr = new someGenerics9([], null, undefined);
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var arr: any[];
+declare var arr: any[];
 >arr : any[]
 >    : ^^^^^
 
diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt
index 73382d9f2a776..8e4527e20ddf1 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt
+++ b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.errors.txt
@@ -7,8 +7,8 @@ typeArgumentInferenceWithConstraintAsCommonRoot.ts(7,6): error TS2345: Argument
     interface Giraffe extends Animal { y }
     interface Elephant extends Animal { z }
     function f<T extends Animal>(x: T, y: T): T { return undefined; }
-    var g: Giraffe;
-    var e: Elephant;
+    declare var g: Giraffe;
+    declare var e: Elephant;
     f(g, e); // valid because both Giraffe and Elephant satisfy the constraint. T is Animal
          ~
 !!! error TS2345: Argument of type 'Elephant' is not assignable to parameter of type 'Giraffe'.
diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.js b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.js
index cab1a6a02af23..fe7e297f0675a 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.js
+++ b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.js
@@ -5,12 +5,10 @@ interface Animal { x }
 interface Giraffe extends Animal { y }
 interface Elephant extends Animal { z }
 function f<T extends Animal>(x: T, y: T): T { return undefined; }
-var g: Giraffe;
-var e: Elephant;
+declare var g: Giraffe;
+declare var e: Elephant;
 f(g, e); // valid because both Giraffe and Elephant satisfy the constraint. T is Animal
 
 //// [typeArgumentInferenceWithConstraintAsCommonRoot.js]
 function f(x, y) { return undefined; }
-var g;
-var e;
 f(g, e); // valid because both Giraffe and Elephant satisfy the constraint. T is Animal
diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.symbols b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.symbols
index 23f54b285b287..95b5a415b1280 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.symbols
+++ b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.symbols
@@ -26,16 +26,16 @@ function f<T extends Animal>(x: T, y: T): T { return undefined; }
 >T : Symbol(T, Decl(typeArgumentInferenceWithConstraintAsCommonRoot.ts, 3, 11))
 >undefined : Symbol(undefined)
 
-var g: Giraffe;
->g : Symbol(g, Decl(typeArgumentInferenceWithConstraintAsCommonRoot.ts, 4, 3))
+declare var g: Giraffe;
+>g : Symbol(g, Decl(typeArgumentInferenceWithConstraintAsCommonRoot.ts, 4, 11))
 >Giraffe : Symbol(Giraffe, Decl(typeArgumentInferenceWithConstraintAsCommonRoot.ts, 0, 22))
 
-var e: Elephant;
->e : Symbol(e, Decl(typeArgumentInferenceWithConstraintAsCommonRoot.ts, 5, 3))
+declare var e: Elephant;
+>e : Symbol(e, Decl(typeArgumentInferenceWithConstraintAsCommonRoot.ts, 5, 11))
 >Elephant : Symbol(Elephant, Decl(typeArgumentInferenceWithConstraintAsCommonRoot.ts, 1, 38))
 
 f(g, e); // valid because both Giraffe and Elephant satisfy the constraint. T is Animal
 >f : Symbol(f, Decl(typeArgumentInferenceWithConstraintAsCommonRoot.ts, 2, 39))
->g : Symbol(g, Decl(typeArgumentInferenceWithConstraintAsCommonRoot.ts, 4, 3))
->e : Symbol(e, Decl(typeArgumentInferenceWithConstraintAsCommonRoot.ts, 5, 3))
+>g : Symbol(g, Decl(typeArgumentInferenceWithConstraintAsCommonRoot.ts, 4, 11))
+>e : Symbol(e, Decl(typeArgumentInferenceWithConstraintAsCommonRoot.ts, 5, 11))
 
diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types
index c43ed052bb0f4..0153731aba228 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types
@@ -23,11 +23,11 @@ function f<T extends Animal>(x: T, y: T): T { return undefined; }
 >undefined : undefined
 >          : ^^^^^^^^^
 
-var g: Giraffe;
+declare var g: Giraffe;
 >g : Giraffe
 >  : ^^^^^^^
 
-var e: Elephant;
+declare var e: Elephant;
 >e : Elephant
 >  : ^^^^^^^^
 
diff --git a/tests/baselines/reference/typeAssertions.errors.txt b/tests/baselines/reference/typeAssertions.errors.txt
index 1e4a84b919aa2..84d97f41ffbfe 100644
--- a/tests/baselines/reference/typeAssertions.errors.txt
+++ b/tests/baselines/reference/typeAssertions.errors.txt
@@ -32,8 +32,8 @@ typeAssertions.ts(48,50): error TS1128: Declaration or statement expected.
             ~~~~~~
 !!! error TS2558: Expected 0 type arguments, but got 1.
     
-    var a: any;
-    var s: string;
+    declare var a: any;
+    declare var s: string;
     
     // Type assertion of non - unary expression
     var a = <any>"" + 4;
@@ -82,8 +82,8 @@ typeAssertions.ts(48,50): error TS1128: Declaration or statement expected.
     someOther = <SomeOther>someOther;
     
     // Type assertion cannot be a type-predicate type
-    var numOrStr: number | string;
-    var str: string;
+    declare var numOrStr: number | string;
+    declare var str: string;
     if(<numOrStr is string>(numOrStr === undefined)) { // Error
         ~~~~~~~~
 !!! error TS2749: 'numOrStr' refers to a value, but is being used as a type here. Did you mean 'typeof numOrStr'?
diff --git a/tests/baselines/reference/typeAssertions.js b/tests/baselines/reference/typeAssertions.js
index f20f4bd13b4e3..0a7c69663b68c 100644
--- a/tests/baselines/reference/typeAssertions.js
+++ b/tests/baselines/reference/typeAssertions.js
@@ -7,8 +7,8 @@ function fn2(t: any) { }
 
 fn1(fn2<string>(4)); // Error
 
-var a: any;
-var s: string;
+declare var a: any;
+declare var s: string;
 
 // Type assertion of non - unary expression
 var a = <any>"" + 4;
@@ -42,8 +42,8 @@ someOther = <SomeOther>someBase; // Error
 someOther = <SomeOther>someOther;
 
 // Type assertion cannot be a type-predicate type
-var numOrStr: number | string;
-var str: string;
+declare var numOrStr: number | string;
+declare var str: string;
 if(<numOrStr is string>(numOrStr === undefined)) { // Error
 	str = numOrStr; // Error, no narrowing occurred
 }
@@ -73,8 +73,6 @@ var __extends = (this && this.__extends) || (function () {
 function fn1(t) { }
 function fn2(t) { }
 fn1(fn2(4)); // Error
-var a;
-var s;
 // Type assertion of non - unary expression
 var a = "" + 4;
 var s = "" + 4;
@@ -108,9 +106,6 @@ someDerived = someOther; // Error
 someOther = someDerived; // Error
 someOther = someBase; // Error
 someOther = someOther;
-// Type assertion cannot be a type-predicate type
-var numOrStr;
-var str;
 if (is)
     string > (numOrStr === undefined);
 { // Error
diff --git a/tests/baselines/reference/typeAssertions.symbols b/tests/baselines/reference/typeAssertions.symbols
index 72f37f556830d..a9d8dfc0d5084 100644
--- a/tests/baselines/reference/typeAssertions.symbols
+++ b/tests/baselines/reference/typeAssertions.symbols
@@ -16,18 +16,18 @@ fn1(fn2<string>(4)); // Error
 >fn1 : Symbol(fn1, Decl(typeAssertions.ts, 0, 0))
 >fn2 : Symbol(fn2, Decl(typeAssertions.ts, 1, 25))
 
-var a: any;
->a : Symbol(a, Decl(typeAssertions.ts, 6, 3), Decl(typeAssertions.ts, 10, 3))
+declare var a: any;
+>a : Symbol(a, Decl(typeAssertions.ts, 6, 11), Decl(typeAssertions.ts, 10, 3))
 
-var s: string;
->s : Symbol(s, Decl(typeAssertions.ts, 7, 3), Decl(typeAssertions.ts, 11, 3))
+declare var s: string;
+>s : Symbol(s, Decl(typeAssertions.ts, 7, 11), Decl(typeAssertions.ts, 11, 3))
 
 // Type assertion of non - unary expression
 var a = <any>"" + 4;
->a : Symbol(a, Decl(typeAssertions.ts, 6, 3), Decl(typeAssertions.ts, 10, 3))
+>a : Symbol(a, Decl(typeAssertions.ts, 6, 11), Decl(typeAssertions.ts, 10, 3))
 
 var s = "" + <any>4;
->s : Symbol(s, Decl(typeAssertions.ts, 7, 3), Decl(typeAssertions.ts, 11, 3))
+>s : Symbol(s, Decl(typeAssertions.ts, 7, 11), Decl(typeAssertions.ts, 11, 3))
 
 class SomeBase {
 >SomeBase : Symbol(SomeBase, Decl(typeAssertions.ts, 11, 20))
@@ -108,24 +108,24 @@ someOther = <SomeOther>someOther;
 >someOther : Symbol(someOther, Decl(typeAssertions.ts, 26, 3))
 
 // Type assertion cannot be a type-predicate type
-var numOrStr: number | string;
->numOrStr : Symbol(numOrStr, Decl(typeAssertions.ts, 41, 3))
+declare var numOrStr: number | string;
+>numOrStr : Symbol(numOrStr, Decl(typeAssertions.ts, 41, 11))
 
-var str: string;
->str : Symbol(str, Decl(typeAssertions.ts, 42, 3))
+declare var str: string;
+>str : Symbol(str, Decl(typeAssertions.ts, 42, 11))
 
 if(<numOrStr is string>(numOrStr === undefined)) { // Error
 >numOrStr : Symbol(numOrStr)
->numOrStr : Symbol(numOrStr, Decl(typeAssertions.ts, 41, 3))
+>numOrStr : Symbol(numOrStr, Decl(typeAssertions.ts, 41, 11))
 >undefined : Symbol(undefined)
 
 	str = numOrStr; // Error, no narrowing occurred
->str : Symbol(str, Decl(typeAssertions.ts, 42, 3))
->numOrStr : Symbol(numOrStr, Decl(typeAssertions.ts, 41, 3))
+>str : Symbol(str, Decl(typeAssertions.ts, 42, 11))
+>numOrStr : Symbol(numOrStr, Decl(typeAssertions.ts, 41, 11))
 }
 
 if((numOrStr === undefined) as numOrStr is string) { // Error
->numOrStr : Symbol(numOrStr, Decl(typeAssertions.ts, 41, 3))
+>numOrStr : Symbol(numOrStr, Decl(typeAssertions.ts, 41, 11))
 >undefined : Symbol(undefined)
 >numOrStr : Symbol(numOrStr)
 }
diff --git a/tests/baselines/reference/typeAssertions.types b/tests/baselines/reference/typeAssertions.types
index bc6a8c82a5e03..31d6f8f3d426a 100644
--- a/tests/baselines/reference/typeAssertions.types
+++ b/tests/baselines/reference/typeAssertions.types
@@ -26,11 +26,11 @@ fn1(fn2<string>(4)); // Error
 >4 : 4
 >  : ^
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
-var s: string;
+declare var s: string;
 >s : string
 >  : ^^^^^^
 
@@ -202,11 +202,11 @@ someOther = <SomeOther>someOther;
 >          : ^^^^^^^^^
 
 // Type assertion cannot be a type-predicate type
-var numOrStr: number | string;
+declare var numOrStr: number | string;
 >numOrStr : string | number
 >         : ^^^^^^^^^^^^^^^
 
-var str: string;
+declare var str: string;
 >str : string
 >    : ^^^^^^
 
diff --git a/tests/baselines/reference/typeComparisonCaching.errors.txt b/tests/baselines/reference/typeComparisonCaching.errors.txt
index e8a0c1a3e0662..fc243dd15c7e3 100644
--- a/tests/baselines/reference/typeComparisonCaching.errors.txt
+++ b/tests/baselines/reference/typeComparisonCaching.errors.txt
@@ -28,9 +28,9 @@ typeComparisonCaching.ts(27,1): error TS2322: Type 'D' is not assignable to type
     }
     
     var a: A;
-    var b: B;
+    declare var b: B;
     var c: C;
-    var d: D;
+    declare var d: D;
     
     a = b;
     ~
diff --git a/tests/baselines/reference/typeComparisonCaching.js b/tests/baselines/reference/typeComparisonCaching.js
index e7efe3a864f69..ea062919b2a7f 100644
--- a/tests/baselines/reference/typeComparisonCaching.js
+++ b/tests/baselines/reference/typeComparisonCaching.js
@@ -22,9 +22,9 @@ interface D {
 }
 
 var a: A;
-var b: B;
+declare var b: B;
 var c: C;
-var d: D;
+declare var d: D;
 
 a = b;
 c = d; // Should not be allowed
@@ -33,8 +33,6 @@ c = d; // Should not be allowed
 //// [typeComparisonCaching.js]
 // Check that we only cache results of type comparisons that are free of assumptions
 var a;
-var b;
 var c;
-var d;
 a = b;
 c = d; // Should not be allowed
diff --git a/tests/baselines/reference/typeComparisonCaching.symbols b/tests/baselines/reference/typeComparisonCaching.symbols
index a9ea598662073..a636ea61a2952 100644
--- a/tests/baselines/reference/typeComparisonCaching.symbols
+++ b/tests/baselines/reference/typeComparisonCaching.symbols
@@ -45,23 +45,23 @@ var a: A;
 >a : Symbol(a, Decl(typeComparisonCaching.ts, 20, 3))
 >A : Symbol(A, Decl(typeComparisonCaching.ts, 0, 0))
 
-var b: B;
->b : Symbol(b, Decl(typeComparisonCaching.ts, 21, 3))
+declare var b: B;
+>b : Symbol(b, Decl(typeComparisonCaching.ts, 21, 11))
 >B : Symbol(B, Decl(typeComparisonCaching.ts, 5, 1))
 
 var c: C;
 >c : Symbol(c, Decl(typeComparisonCaching.ts, 22, 3))
 >C : Symbol(C, Decl(typeComparisonCaching.ts, 10, 1))
 
-var d: D;
->d : Symbol(d, Decl(typeComparisonCaching.ts, 23, 3))
+declare var d: D;
+>d : Symbol(d, Decl(typeComparisonCaching.ts, 23, 11))
 >D : Symbol(D, Decl(typeComparisonCaching.ts, 14, 1))
 
 a = b;
 >a : Symbol(a, Decl(typeComparisonCaching.ts, 20, 3))
->b : Symbol(b, Decl(typeComparisonCaching.ts, 21, 3))
+>b : Symbol(b, Decl(typeComparisonCaching.ts, 21, 11))
 
 c = d; // Should not be allowed
 >c : Symbol(c, Decl(typeComparisonCaching.ts, 22, 3))
->d : Symbol(d, Decl(typeComparisonCaching.ts, 23, 3))
+>d : Symbol(d, Decl(typeComparisonCaching.ts, 23, 11))
 
diff --git a/tests/baselines/reference/typeComparisonCaching.types b/tests/baselines/reference/typeComparisonCaching.types
index b9a2765a5fd5d..12e1c150d5053 100644
--- a/tests/baselines/reference/typeComparisonCaching.types
+++ b/tests/baselines/reference/typeComparisonCaching.types
@@ -39,7 +39,7 @@ var a: A;
 >a : A
 >  : ^
 
-var b: B;
+declare var b: B;
 >b : B
 >  : ^
 
@@ -47,7 +47,7 @@ var c: C;
 >c : C
 >  : ^
 
-var d: D;
+declare var d: D;
 >d : D
 >  : ^
 
diff --git a/tests/baselines/reference/typeGuardConstructorClassAndNumber.errors.txt b/tests/baselines/reference/typeGuardConstructorClassAndNumber.errors.txt
index 95a3da3583f12..157a2a7ea374c 100644
--- a/tests/baselines/reference/typeGuardConstructorClassAndNumber.errors.txt
+++ b/tests/baselines/reference/typeGuardConstructorClassAndNumber.errors.txt
@@ -19,10 +19,10 @@ typeGuardConstructorClassAndNumber.ts(115,10): error TS2339: Property 'property1
 ==== typeGuardConstructorClassAndNumber.ts (8 errors) ====
     // Typical case
     class C1 {
-        property1: string;
+        property1!: string;
     }
     
-    let var1: C1 | number;
+    declare let var1: C1 | number;
     if (var1.constructor == C1) {
         var1; // C1
         var1.property1; // string
diff --git a/tests/baselines/reference/typeGuardConstructorClassAndNumber.js b/tests/baselines/reference/typeGuardConstructorClassAndNumber.js
index 47a761fd04f72..6f2ead90bb8e8 100644
--- a/tests/baselines/reference/typeGuardConstructorClassAndNumber.js
+++ b/tests/baselines/reference/typeGuardConstructorClassAndNumber.js
@@ -3,10 +3,10 @@
 //// [typeGuardConstructorClassAndNumber.ts]
 // Typical case
 class C1 {
-    property1: string;
+    property1!: string;
 }
 
-let var1: C1 | number;
+declare let var1: C1 | number;
 if (var1.constructor == C1) {
     var1; // C1
     var1.property1; // string
@@ -139,7 +139,6 @@ var C1 = /** @class */ (function () {
     }
     return C1;
 }());
-var var1;
 if (var1.constructor == C1) {
     var1; // C1
     var1.property1; // string
diff --git a/tests/baselines/reference/typeGuardConstructorClassAndNumber.symbols b/tests/baselines/reference/typeGuardConstructorClassAndNumber.symbols
index 8565033061736..0cd380326c6d4 100644
--- a/tests/baselines/reference/typeGuardConstructorClassAndNumber.symbols
+++ b/tests/baselines/reference/typeGuardConstructorClassAndNumber.symbols
@@ -5,278 +5,278 @@
 class C1 {
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
 
-    property1: string;
+    property1!: string;
 >property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
 }
 
-let var1: C1 | number;
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+declare let var1: C1 | number;
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
 
 if (var1.constructor == C1) {
 >var1.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
 
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // string
 >var1.property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
 }
 else {
     var1; // number | C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 if (var1["constructor"] == C1) {
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >"constructor" : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
 
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // string
 >var1.property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
 }
 else {
     var1; // number | C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 if (var1.constructor === C1) {
 >var1.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
 
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // string
 >var1.property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
 }
 else {
     var1; // number | C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 if (var1["constructor"] === C1) {
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >"constructor" : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
 
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // string
 >var1.property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
 }
 else {
     var1; // number | C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 if (C1 == var1.constructor) {
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
 >var1.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // string
 >var1.property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
 }
 else {
     var1; // number | C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 if (C1 == var1["constructor"]) {
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >"constructor" : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // string
 >var1.property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
 }
 else {
     var1; // number | C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 if (C1 === var1.constructor) {
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
 >var1.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // string
 >var1.property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
 }
 else {
     var1; // number | C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 if (C1 === var1["constructor"]) {
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >"constructor" : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // string
 >var1.property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >property1 : Symbol(C1.property1, Decl(typeGuardConstructorClassAndNumber.ts, 1, 10))
 }
 else {
     var1; // number | C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 
 if (var1.constructor != C1) {
 >var1.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
 
     var1; // C1 | number
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // error
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 else {
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 if (var1["constructor"] != C1) {
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >"constructor" : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
 
     var1; // C1 | number
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // error
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 else {
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 if (var1.constructor !== C1) {
 >var1.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
 
     var1; // C1 | number
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // error
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 else {
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 if (var1["constructor"] !== C1) {
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >"constructor" : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
 
     var1; // C1 | number
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // error
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 else {
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 if (C1 != var1.constructor) {
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
 >var1.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 
     var1; // C1 | number
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // error
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 else {
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 if (C1 != var1["constructor"]) {
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >"constructor" : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 
     var1; // C1 | number
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // error
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 else {
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 if (C1 !== var1.constructor) {
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
 >var1.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 
     var1; // C1 | number
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // error
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 else {
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 if (C1 !== var1["constructor"]) {
 >C1 : Symbol(C1, Decl(typeGuardConstructorClassAndNumber.ts, 0, 0))
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 >"constructor" : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 
     var1; // C1 | number
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 
     var1.property1; // error
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 else {
     var1; // C1
->var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorClassAndNumber.ts, 5, 11))
 }
 
 // Repro from #37660
diff --git a/tests/baselines/reference/typeGuardConstructorClassAndNumber.types b/tests/baselines/reference/typeGuardConstructorClassAndNumber.types
index 9d0ecfeefab9c..decfae66a4a6d 100644
--- a/tests/baselines/reference/typeGuardConstructorClassAndNumber.types
+++ b/tests/baselines/reference/typeGuardConstructorClassAndNumber.types
@@ -6,12 +6,12 @@ class C1 {
 >C1 : C1
 >   : ^^
 
-    property1: string;
+    property1!: string;
 >property1 : string
 >          : ^^^^^^
 }
 
-let var1: C1 | number;
+declare let var1: C1 | number;
 >var1 : number | C1
 >     : ^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/typeGuardConstructorDerivedClass.errors.txt b/tests/baselines/reference/typeGuardConstructorDerivedClass.errors.txt
index 414004aa881f7..939a371b7abb4 100644
--- a/tests/baselines/reference/typeGuardConstructorDerivedClass.errors.txt
+++ b/tests/baselines/reference/typeGuardConstructorDerivedClass.errors.txt
@@ -4,14 +4,14 @@ typeGuardConstructorDerivedClass.ts(13,10): error TS2339: Property 'property1' d
 ==== typeGuardConstructorDerivedClass.ts (1 errors) ====
     // Derived class with different structures
     class C1 {
-        property1: number;
+        property1!: number;
     }
     
     class C2 extends C1 {
-        property2: number;
+        property2!: number;
     }
     
-    let var1: C2 | string;
+    declare let var1: C2 | string;
     if (var1.constructor === C1) {
         var1; // never
         var1.property1; // error
@@ -28,7 +28,7 @@ typeGuardConstructorDerivedClass.ts(13,10): error TS2339: Property 'property1' d
     
     class C4 extends C3 {}
     
-    let var2: C4 | string;
+    declare let var2: C4 | string;
     if (var2.constructor === C3) {
         var2; // never
     }
@@ -38,14 +38,14 @@ typeGuardConstructorDerivedClass.ts(13,10): error TS2339: Property 'property1' d
     
     // Disjointly structured classes
     class C5 {
-        property1: number;
+        property1!: number;
     }
     
     class C6 {
-        property2: number;
+        property2!: number;
     }
     
-    let let3: C6 | string;
+    declare let let3: C6 | string;
     if (let3.constructor === C5) {
         let3; // never
     }
@@ -62,7 +62,7 @@ typeGuardConstructorDerivedClass.ts(13,10): error TS2339: Property 'property1' d
         property1: number;
     }
     
-    let let4: C8 | string;
+    declare let let4: C8 | string;
     if (let4.constructor === C7) {
         let4; // never
     }
diff --git a/tests/baselines/reference/typeGuardConstructorDerivedClass.js b/tests/baselines/reference/typeGuardConstructorDerivedClass.js
index f7230f28ff501..a403694443e01 100644
--- a/tests/baselines/reference/typeGuardConstructorDerivedClass.js
+++ b/tests/baselines/reference/typeGuardConstructorDerivedClass.js
@@ -3,14 +3,14 @@
 //// [typeGuardConstructorDerivedClass.ts]
 // Derived class with different structures
 class C1 {
-    property1: number;
+    property1!: number;
 }
 
 class C2 extends C1 {
-    property2: number;
+    property2!: number;
 }
 
-let var1: C2 | string;
+declare let var1: C2 | string;
 if (var1.constructor === C1) {
     var1; // never
     var1.property1; // error
@@ -25,7 +25,7 @@ class C3 {}
 
 class C4 extends C3 {}
 
-let var2: C4 | string;
+declare let var2: C4 | string;
 if (var2.constructor === C3) {
     var2; // never
 }
@@ -35,14 +35,14 @@ if (var2.constructor === C4) {
 
 // Disjointly structured classes
 class C5 {
-    property1: number;
+    property1!: number;
 }
 
 class C6 {
-    property2: number;
+    property2!: number;
 }
 
-let let3: C6 | string;
+declare let let3: C6 | string;
 if (let3.constructor === C5) {
     let3; // never
 }
@@ -59,7 +59,7 @@ class C8 {
     property1: number;
 }
 
-let let4: C8 | string;
+declare let let4: C8 | string;
 if (let4.constructor === C7) {
     let4; // never
 }
@@ -97,7 +97,6 @@ var C2 = /** @class */ (function (_super) {
     }
     return C2;
 }(C1));
-var var1;
 if (var1.constructor === C1) {
     var1; // never
     var1.property1; // error
@@ -119,7 +118,6 @@ var C4 = /** @class */ (function (_super) {
     }
     return C4;
 }(C3));
-var var2;
 if (var2.constructor === C3) {
     var2; // never
 }
@@ -137,7 +135,6 @@ var C6 = /** @class */ (function () {
     }
     return C6;
 }());
-var let3;
 if (let3.constructor === C5) {
     let3; // never
 }
@@ -155,7 +152,6 @@ var C8 = /** @class */ (function () {
     }
     return C8;
 }());
-var let4;
 if (let4.constructor === C7) {
     let4; // never
 }
diff --git a/tests/baselines/reference/typeGuardConstructorDerivedClass.symbols b/tests/baselines/reference/typeGuardConstructorDerivedClass.symbols
index dd61f212ae5bb..bb81b66c75658 100644
--- a/tests/baselines/reference/typeGuardConstructorDerivedClass.symbols
+++ b/tests/baselines/reference/typeGuardConstructorDerivedClass.symbols
@@ -5,7 +5,7 @@
 class C1 {
 >C1 : Symbol(C1, Decl(typeGuardConstructorDerivedClass.ts, 0, 0))
 
-    property1: number;
+    property1!: number;
 >property1 : Symbol(C1.property1, Decl(typeGuardConstructorDerivedClass.ts, 1, 10))
 }
 
@@ -13,38 +13,38 @@ class C2 extends C1 {
 >C2 : Symbol(C2, Decl(typeGuardConstructorDerivedClass.ts, 3, 1))
 >C1 : Symbol(C1, Decl(typeGuardConstructorDerivedClass.ts, 0, 0))
 
-    property2: number;
+    property2!: number;
 >property2 : Symbol(C2.property2, Decl(typeGuardConstructorDerivedClass.ts, 5, 21))
 }
 
-let var1: C2 | string;
->var1 : Symbol(var1, Decl(typeGuardConstructorDerivedClass.ts, 9, 3))
+declare let var1: C2 | string;
+>var1 : Symbol(var1, Decl(typeGuardConstructorDerivedClass.ts, 9, 11))
 >C2 : Symbol(C2, Decl(typeGuardConstructorDerivedClass.ts, 3, 1))
 
 if (var1.constructor === C1) {
 >var1.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->var1 : Symbol(var1, Decl(typeGuardConstructorDerivedClass.ts, 9, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorDerivedClass.ts, 9, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C1 : Symbol(C1, Decl(typeGuardConstructorDerivedClass.ts, 0, 0))
 
     var1; // never
->var1 : Symbol(var1, Decl(typeGuardConstructorDerivedClass.ts, 9, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorDerivedClass.ts, 9, 11))
 
     var1.property1; // error
->var1 : Symbol(var1, Decl(typeGuardConstructorDerivedClass.ts, 9, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorDerivedClass.ts, 9, 11))
 }
 if (var1.constructor === C2) {
 >var1.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->var1 : Symbol(var1, Decl(typeGuardConstructorDerivedClass.ts, 9, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorDerivedClass.ts, 9, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C2 : Symbol(C2, Decl(typeGuardConstructorDerivedClass.ts, 3, 1))
 
     var1; // C2
->var1 : Symbol(var1, Decl(typeGuardConstructorDerivedClass.ts, 9, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorDerivedClass.ts, 9, 11))
 
     var1.property1; // number
 >var1.property1 : Symbol(C1.property1, Decl(typeGuardConstructorDerivedClass.ts, 1, 10))
->var1 : Symbol(var1, Decl(typeGuardConstructorDerivedClass.ts, 9, 3))
+>var1 : Symbol(var1, Decl(typeGuardConstructorDerivedClass.ts, 9, 11))
 >property1 : Symbol(C1.property1, Decl(typeGuardConstructorDerivedClass.ts, 1, 10))
 }
 
@@ -56,65 +56,65 @@ class C4 extends C3 {}
 >C4 : Symbol(C4, Decl(typeGuardConstructorDerivedClass.ts, 20, 11))
 >C3 : Symbol(C3, Decl(typeGuardConstructorDerivedClass.ts, 17, 1))
 
-let var2: C4 | string;
->var2 : Symbol(var2, Decl(typeGuardConstructorDerivedClass.ts, 24, 3))
+declare let var2: C4 | string;
+>var2 : Symbol(var2, Decl(typeGuardConstructorDerivedClass.ts, 24, 11))
 >C4 : Symbol(C4, Decl(typeGuardConstructorDerivedClass.ts, 20, 11))
 
 if (var2.constructor === C3) {
 >var2.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->var2 : Symbol(var2, Decl(typeGuardConstructorDerivedClass.ts, 24, 3))
+>var2 : Symbol(var2, Decl(typeGuardConstructorDerivedClass.ts, 24, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C3 : Symbol(C3, Decl(typeGuardConstructorDerivedClass.ts, 17, 1))
 
     var2; // never
->var2 : Symbol(var2, Decl(typeGuardConstructorDerivedClass.ts, 24, 3))
+>var2 : Symbol(var2, Decl(typeGuardConstructorDerivedClass.ts, 24, 11))
 }
 if (var2.constructor === C4) {
 >var2.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->var2 : Symbol(var2, Decl(typeGuardConstructorDerivedClass.ts, 24, 3))
+>var2 : Symbol(var2, Decl(typeGuardConstructorDerivedClass.ts, 24, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C4 : Symbol(C4, Decl(typeGuardConstructorDerivedClass.ts, 20, 11))
 
     var2; // C4
->var2 : Symbol(var2, Decl(typeGuardConstructorDerivedClass.ts, 24, 3))
+>var2 : Symbol(var2, Decl(typeGuardConstructorDerivedClass.ts, 24, 11))
 }
 
 // Disjointly structured classes
 class C5 {
 >C5 : Symbol(C5, Decl(typeGuardConstructorDerivedClass.ts, 30, 1))
 
-    property1: number;
+    property1!: number;
 >property1 : Symbol(C5.property1, Decl(typeGuardConstructorDerivedClass.ts, 33, 10))
 }
 
 class C6 {
 >C6 : Symbol(C6, Decl(typeGuardConstructorDerivedClass.ts, 35, 1))
 
-    property2: number;
+    property2!: number;
 >property2 : Symbol(C6.property2, Decl(typeGuardConstructorDerivedClass.ts, 37, 10))
 }
 
-let let3: C6 | string;
->let3 : Symbol(let3, Decl(typeGuardConstructorDerivedClass.ts, 41, 3))
+declare let let3: C6 | string;
+>let3 : Symbol(let3, Decl(typeGuardConstructorDerivedClass.ts, 41, 11))
 >C6 : Symbol(C6, Decl(typeGuardConstructorDerivedClass.ts, 35, 1))
 
 if (let3.constructor === C5) {
 >let3.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->let3 : Symbol(let3, Decl(typeGuardConstructorDerivedClass.ts, 41, 3))
+>let3 : Symbol(let3, Decl(typeGuardConstructorDerivedClass.ts, 41, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C5 : Symbol(C5, Decl(typeGuardConstructorDerivedClass.ts, 30, 1))
 
     let3; // never
->let3 : Symbol(let3, Decl(typeGuardConstructorDerivedClass.ts, 41, 3))
+>let3 : Symbol(let3, Decl(typeGuardConstructorDerivedClass.ts, 41, 11))
 }
 if (let3.constructor === C6) {
 >let3.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->let3 : Symbol(let3, Decl(typeGuardConstructorDerivedClass.ts, 41, 3))
+>let3 : Symbol(let3, Decl(typeGuardConstructorDerivedClass.ts, 41, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C6 : Symbol(C6, Decl(typeGuardConstructorDerivedClass.ts, 35, 1))
 
     let3; // C6
->let3 : Symbol(let3, Decl(typeGuardConstructorDerivedClass.ts, 41, 3))
+>let3 : Symbol(let3, Decl(typeGuardConstructorDerivedClass.ts, 41, 11))
 }
 
 // Classes with the same structure
@@ -132,26 +132,26 @@ class C8 {
 >property1 : Symbol(C8.property1, Decl(typeGuardConstructorDerivedClass.ts, 54, 10))
 }
 
-let let4: C8 | string;
->let4 : Symbol(let4, Decl(typeGuardConstructorDerivedClass.ts, 58, 3))
+declare let let4: C8 | string;
+>let4 : Symbol(let4, Decl(typeGuardConstructorDerivedClass.ts, 58, 11))
 >C8 : Symbol(C8, Decl(typeGuardConstructorDerivedClass.ts, 52, 1))
 
 if (let4.constructor === C7) {
 >let4.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->let4 : Symbol(let4, Decl(typeGuardConstructorDerivedClass.ts, 58, 3))
+>let4 : Symbol(let4, Decl(typeGuardConstructorDerivedClass.ts, 58, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C7 : Symbol(C7, Decl(typeGuardConstructorDerivedClass.ts, 47, 1))
 
     let4; // never
->let4 : Symbol(let4, Decl(typeGuardConstructorDerivedClass.ts, 58, 3))
+>let4 : Symbol(let4, Decl(typeGuardConstructorDerivedClass.ts, 58, 11))
 }
 if (let4.constructor === C8) {
 >let4.constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
->let4 : Symbol(let4, Decl(typeGuardConstructorDerivedClass.ts, 58, 3))
+>let4 : Symbol(let4, Decl(typeGuardConstructorDerivedClass.ts, 58, 11))
 >constructor : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --))
 >C8 : Symbol(C8, Decl(typeGuardConstructorDerivedClass.ts, 52, 1))
 
     let4; // C8
->let4 : Symbol(let4, Decl(typeGuardConstructorDerivedClass.ts, 58, 3))
+>let4 : Symbol(let4, Decl(typeGuardConstructorDerivedClass.ts, 58, 11))
 }
 
diff --git a/tests/baselines/reference/typeGuardConstructorDerivedClass.types b/tests/baselines/reference/typeGuardConstructorDerivedClass.types
index 73f7021300123..dcee3a38ef6d1 100644
--- a/tests/baselines/reference/typeGuardConstructorDerivedClass.types
+++ b/tests/baselines/reference/typeGuardConstructorDerivedClass.types
@@ -6,7 +6,7 @@ class C1 {
 >C1 : C1
 >   : ^^
 
-    property1: number;
+    property1!: number;
 >property1 : number
 >          : ^^^^^^
 }
@@ -17,12 +17,12 @@ class C2 extends C1 {
 >C1 : C1
 >   : ^^
 
-    property2: number;
+    property2!: number;
 >property2 : number
 >          : ^^^^^^
 }
 
-let var1: C2 | string;
+declare let var1: C2 | string;
 >var1 : string | C2
 >     : ^^^^^^^^^^^
 
@@ -86,7 +86,7 @@ class C4 extends C3 {}
 >C3 : C3
 >   : ^^
 
-let var2: C4 | string;
+declare let var2: C4 | string;
 >var2 : string | C4
 >     : ^^^^^^^^^^^
 
@@ -128,7 +128,7 @@ class C5 {
 >C5 : C5
 >   : ^^
 
-    property1: number;
+    property1!: number;
 >property1 : number
 >          : ^^^^^^
 }
@@ -137,12 +137,12 @@ class C6 {
 >C6 : C6
 >   : ^^
 
-    property2: number;
+    property2!: number;
 >property2 : number
 >          : ^^^^^^
 }
 
-let let3: C6 | string;
+declare let let3: C6 | string;
 >let3 : string | C6
 >     : ^^^^^^^^^^^
 
@@ -198,7 +198,7 @@ class C8 {
 >          : ^^^^^^
 }
 
-let let4: C8 | string;
+declare let let4: C8 | string;
 >let4 : string | C8
 >     : ^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt
index 8c8da810d4748..2855aba365fcb 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt
@@ -67,7 +67,7 @@ typeGuardFunctionOfFormThisErrors.ts(58,7): error TS2339: Property 'lead' does n
         return false;
     }
     
-    let c: number | number[];
+    declare var c: number | number[];
     if (invalidGuard(c)) {
         c;
     }
diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js
index 3de4086386995..a3a125d01f438 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js
@@ -33,7 +33,7 @@ function invalidGuard(c: any): this is number {
     return false;
 }
 
-let c: number | number[];
+declare var c: number | number[];
 if (invalidGuard(c)) {
     c;
 }
@@ -116,7 +116,6 @@ a.isLeader = a.isFollower;
 function invalidGuard(c) {
     return false;
 }
-var c;
 if (invalidGuard(c)) {
     c;
 }
@@ -157,7 +156,7 @@ interface GuardInterface extends RoyalGuard {
 declare let a: RoyalGuard;
 declare let b: GuardInterface;
 declare function invalidGuard(c: any): this is number;
-declare let c: number | number[];
+declare var c: number | number[];
 declare let holder: {
     invalidGuard: typeof invalidGuard;
 };
diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.symbols b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.symbols
index 3efd7359c1c0a..116e69c5f64e0 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.symbols
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.symbols
@@ -92,19 +92,19 @@ function invalidGuard(c: any): this is number {
     return false;
 }
 
-let c: number | number[];
->c : Symbol(c, Decl(typeGuardFunctionOfFormThisErrors.ts, 32, 3))
+declare var c: number | number[];
+>c : Symbol(c, Decl(typeGuardFunctionOfFormThisErrors.ts, 32, 11))
 
 if (invalidGuard(c)) {
 >invalidGuard : Symbol(invalidGuard, Decl(typeGuardFunctionOfFormThisErrors.ts, 26, 26))
->c : Symbol(c, Decl(typeGuardFunctionOfFormThisErrors.ts, 32, 3))
+>c : Symbol(c, Decl(typeGuardFunctionOfFormThisErrors.ts, 32, 11))
 
     c;
->c : Symbol(c, Decl(typeGuardFunctionOfFormThisErrors.ts, 32, 3))
+>c : Symbol(c, Decl(typeGuardFunctionOfFormThisErrors.ts, 32, 11))
 }
 else {
     c;
->c : Symbol(c, Decl(typeGuardFunctionOfFormThisErrors.ts, 32, 3))
+>c : Symbol(c, Decl(typeGuardFunctionOfFormThisErrors.ts, 32, 11))
 }
 
 let holder = {invalidGuard};
@@ -115,17 +115,17 @@ if (holder.invalidGuard(c)) {
 >holder.invalidGuard : Symbol(invalidGuard, Decl(typeGuardFunctionOfFormThisErrors.ts, 40, 14))
 >holder : Symbol(holder, Decl(typeGuardFunctionOfFormThisErrors.ts, 40, 3))
 >invalidGuard : Symbol(invalidGuard, Decl(typeGuardFunctionOfFormThisErrors.ts, 40, 14))
->c : Symbol(c, Decl(typeGuardFunctionOfFormThisErrors.ts, 32, 3))
+>c : Symbol(c, Decl(typeGuardFunctionOfFormThisErrors.ts, 32, 11))
 
     c;
->c : Symbol(c, Decl(typeGuardFunctionOfFormThisErrors.ts, 32, 3))
+>c : Symbol(c, Decl(typeGuardFunctionOfFormThisErrors.ts, 32, 11))
 
     holder;
 >holder : Symbol(holder, Decl(typeGuardFunctionOfFormThisErrors.ts, 40, 3))
 }
 else {
     c;
->c : Symbol(c, Decl(typeGuardFunctionOfFormThisErrors.ts, 32, 3))
+>c : Symbol(c, Decl(typeGuardFunctionOfFormThisErrors.ts, 32, 11))
 
     holder;
 >holder : Symbol(holder, Decl(typeGuardFunctionOfFormThisErrors.ts, 40, 3))
diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.types b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.types
index 28598a91262a4..33f886160e437 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.types
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.types
@@ -146,7 +146,7 @@ function invalidGuard(c: any): this is number {
 >      : ^^^^^
 }
 
-let c: number | number[];
+declare var c: number | number[];
 >c : number | number[]
 >  : ^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/typeGuardInClass.errors.txt b/tests/baselines/reference/typeGuardInClass.errors.txt
index 9c668a335a84c..b1870b009fe39 100644
--- a/tests/baselines/reference/typeGuardInClass.errors.txt
+++ b/tests/baselines/reference/typeGuardInClass.errors.txt
@@ -5,7 +5,7 @@ typeGuardInClass.ts(13,17): error TS2322: Type 'string | number' is not assignab
 
 
 ==== typeGuardInClass.ts (2 errors) ====
-    let x: string | number;
+    declare var x: string | number;
     
     if (typeof x === "string") {
         let n = class {
diff --git a/tests/baselines/reference/typeGuardInClass.js b/tests/baselines/reference/typeGuardInClass.js
index 7b15566b7c7f2..e1b1d633247eb 100644
--- a/tests/baselines/reference/typeGuardInClass.js
+++ b/tests/baselines/reference/typeGuardInClass.js
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts] ////
 
 //// [typeGuardInClass.ts]
-let x: string | number;
+declare var x: string | number;
 
 if (typeof x === "string") {
     let n = class {
@@ -20,7 +20,6 @@ else {
 
 
 //// [typeGuardInClass.js]
-var x;
 if (typeof x === "string") {
     var n = /** @class */ (function () {
         function class_1() {
diff --git a/tests/baselines/reference/typeGuardInClass.symbols b/tests/baselines/reference/typeGuardInClass.symbols
index ee1b2d5090f92..fc3c616d8766e 100644
--- a/tests/baselines/reference/typeGuardInClass.symbols
+++ b/tests/baselines/reference/typeGuardInClass.symbols
@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts] ////
 
 === typeGuardInClass.ts ===
-let x: string | number;
->x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3))
+declare var x: string | number;
+>x : Symbol(x, Decl(typeGuardInClass.ts, 0, 11))
 
 if (typeof x === "string") {
->x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3))
+>x : Symbol(x, Decl(typeGuardInClass.ts, 0, 11))
 
     let n = class {
 >n : Symbol(n, Decl(typeGuardInClass.ts, 3, 7))
@@ -13,7 +13,7 @@ if (typeof x === "string") {
         constructor() {
             let y: string = x;
 >y : Symbol(y, Decl(typeGuardInClass.ts, 5, 15))
->x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3))
+>x : Symbol(x, Decl(typeGuardInClass.ts, 0, 11))
         }
     }
 }
@@ -24,7 +24,7 @@ else {
         constructor() {
             let y: number = x;
 >y : Symbol(y, Decl(typeGuardInClass.ts, 12, 15))
->x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3))
+>x : Symbol(x, Decl(typeGuardInClass.ts, 0, 11))
         }
     }
 }
diff --git a/tests/baselines/reference/typeGuardInClass.types b/tests/baselines/reference/typeGuardInClass.types
index 3cb864873d1a4..49259595d061a 100644
--- a/tests/baselines/reference/typeGuardInClass.types
+++ b/tests/baselines/reference/typeGuardInClass.types
@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts] ////
 
 === typeGuardInClass.ts ===
-let x: string | number;
+declare var x: string | number;
 >x : string | number
 >  : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.errors.txt b/tests/baselines/reference/typeGuardOfFormThisMember.errors.txt
index 64657216b082f..35aa351318d29 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMember.errors.txt
+++ b/tests/baselines/reference/typeGuardOfFormThisMember.errors.txt
@@ -98,7 +98,7 @@ typeGuardOfFormThisMember.ts(79,11): error TS2339: Property 'do' does not exist
 !!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
     	}
     
-    	let guard: GenericGuard<File>;
+    	declare var guard: GenericGuard<File>;
     	if (guard.isLeader) {
     		guard.lead();
     		      ~~~~
@@ -120,7 +120,7 @@ typeGuardOfFormThisMember.ts(79,11): error TS2339: Property 'do' does not exist
     		do(): void;
     	}
     
-    	let general: SpecificGuard;
+    	declare var general: SpecificGuard;
     	if (general.isMoreSpecific) {
     		general.do();
     		        ~~
diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.js b/tests/baselines/reference/typeGuardOfFormThisMember.js
index dca2ae2a07115..832cdf672636c 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMember.js
+++ b/tests/baselines/reference/typeGuardOfFormThisMember.js
@@ -61,7 +61,7 @@ namespace Test {
 		isFollower: this is GenericFollowerGuard<T>;
 	}
 
-	let guard: GenericGuard<File>;
+	declare var guard: GenericGuard<File>;
 	if (guard.isLeader) {
 		guard.lead();
 	}
@@ -77,7 +77,7 @@ namespace Test {
 		do(): void;
 	}
 
-	let general: SpecificGuard;
+	declare var general: SpecificGuard;
 	if (general.isMoreSpecific) {
 		general.do();
 	}
@@ -163,14 +163,12 @@ var Test;
     else if (file.isNetworked) {
         file.host;
     }
-    var guard;
     if (guard.isLeader) {
         guard.lead();
     }
     else if (guard.isFollower) {
         guard.follow();
     }
-    var general;
     if (general.isMoreSpecific) {
         general.do();
     }
diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.symbols b/tests/baselines/reference/typeGuardOfFormThisMember.symbols
index 3071a72e32578..e546c3430e5e5 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMember.symbols
+++ b/tests/baselines/reference/typeGuardOfFormThisMember.symbols
@@ -172,26 +172,26 @@ namespace Test {
 >T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 54, 24))
 	}
 
-	let guard: GenericGuard<File>;
->guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 4))
+	declare var guard: GenericGuard<File>;
+>guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 12))
 >GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 52, 2))
 >File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 15, 2))
 
 	if (guard.isLeader) {
 >guard.isLeader : Symbol(GenericGuard.isLeader, Decl(typeGuardOfFormThisMember.ts, 55, 12))
->guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 4))
+>guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 12))
 >isLeader : Symbol(GenericGuard.isLeader, Decl(typeGuardOfFormThisMember.ts, 55, 12))
 
 		guard.lead();
->guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 4))
+>guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 12))
 	}
 	else if (guard.isFollower) {
 >guard.isFollower : Symbol(GenericGuard.isFollower, Decl(typeGuardOfFormThisMember.ts, 56, 42))
->guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 4))
+>guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 12))
 >isFollower : Symbol(GenericGuard.isFollower, Decl(typeGuardOfFormThisMember.ts, 56, 42))
 
 		guard.follow();
->guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 4))
+>guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 12))
 	}
 
 	interface SpecificGuard {
@@ -210,17 +210,17 @@ namespace Test {
 >do : Symbol(MoreSpecificGuard.do, Decl(typeGuardOfFormThisMember.ts, 72, 52))
 	}
 
-	let general: SpecificGuard;
->general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 76, 4))
+	declare var general: SpecificGuard;
+>general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 76, 12))
 >SpecificGuard : Symbol(SpecificGuard, Decl(typeGuardOfFormThisMember.ts, 66, 2))
 
 	if (general.isMoreSpecific) {
 >general.isMoreSpecific : Symbol(SpecificGuard.isMoreSpecific, Decl(typeGuardOfFormThisMember.ts, 68, 26))
->general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 76, 4))
+>general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 76, 12))
 >isMoreSpecific : Symbol(SpecificGuard.isMoreSpecific, Decl(typeGuardOfFormThisMember.ts, 68, 26))
 
 		general.do();
->general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 76, 4))
+>general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 76, 12))
 	}
 }
 
diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.types b/tests/baselines/reference/typeGuardOfFormThisMember.types
index c81aba9070e46..220996fb07760 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMember.types
+++ b/tests/baselines/reference/typeGuardOfFormThisMember.types
@@ -251,7 +251,7 @@ namespace Test {
 >           : ^^^^^^^
 	}
 
-	let guard: GenericGuard<File>;
+	declare var guard: GenericGuard<File>;
 >guard : GenericGuard<File>
 >      : ^^^^^^^^^^^^^^^^^^
 
@@ -304,7 +304,7 @@ namespace Test {
 >   : ^^^^^^    
 	}
 
-	let general: SpecificGuard;
+	declare var general: SpecificGuard;
 >general : SpecificGuard
 >        : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt
index 0f0e9d27cc62a..0f875c0538181 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt
@@ -8,10 +8,10 @@ typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(34,9): error TS2403: Subsequent va
 ==== typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts (5 errors) ====
     class C { private p: string };
     
-    var strOrNum: string | number;
-    var strOrBool: string | boolean;
-    var numOrBool: number | boolean
-    var strOrC: string | C;
+    declare var strOrNum: string | number;
+    declare var strOrBool: string | boolean;
+    declare var numOrBool: number | boolean;
+    declare var strOrC: string | C;
     
     // typeof x == s has not effect on typeguard
     if (typeof strOrNum == "string") {
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.js b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.js
index 9bf218444e1a3..5acccdc6dba1b 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.js
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.js
@@ -3,10 +3,10 @@
 //// [typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts]
 class C { private p: string };
 
-var strOrNum: string | number;
-var strOrBool: string | boolean;
-var numOrBool: number | boolean
-var strOrC: string | C;
+declare var strOrNum: string | number;
+declare var strOrBool: string | boolean;
+declare var numOrBool: number | boolean;
+declare var strOrC: string | C;
 
 // typeof x == s has not effect on typeguard
 if (typeof strOrNum == "string") {
@@ -44,10 +44,6 @@ var C = /** @class */ (function () {
     return C;
 }());
 ;
-var strOrNum;
-var strOrBool;
-var numOrBool;
-var strOrC;
 // typeof x == s has not effect on typeguard
 if (typeof strOrNum == "string") {
     var r1 = strOrNum; // string | number
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.symbols b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.symbols
index cff09a0e0f9d1..33c925a242954 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.symbols
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.symbols
@@ -5,68 +5,68 @@ class C { private p: string };
 >C : Symbol(C, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 0, 0))
 >p : Symbol(C.p, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 0, 9))
 
-var strOrNum: string | number;
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 3))
+declare var strOrNum: string | number;
+>strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 11))
 
-var strOrBool: string | boolean;
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 3))
+declare var strOrBool: string | boolean;
+>strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 11))
 
-var numOrBool: number | boolean
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 3))
+declare var numOrBool: number | boolean;
+>numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 11))
 
-var strOrC: string | C;
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 3))
+declare var strOrC: string | C;
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 11))
 >C : Symbol(C, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 0, 0))
 
 // typeof x == s has not effect on typeguard
 if (typeof strOrNum == "string") {
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 3))
+>strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 11))
 
     var r1 = strOrNum; // string | number
 >r1 : Symbol(r1, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 9, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 12, 7))
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 3))
+>strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 11))
 }
 else {
     var r1 = strOrNum; // string | number
 >r1 : Symbol(r1, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 9, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 12, 7))
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 3))
+>strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 11))
 }
 
 if (typeof strOrBool == "boolean") {
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 11))
 
     var r2 = strOrBool; // string | boolean
 >r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 16, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 19, 7))
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 11))
 }
 else {
     var r2 = strOrBool; // string | boolean
 >r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 16, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 19, 7))
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 11))
 }
 
 if (typeof numOrBool == "number") {
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 3))
+>numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 11))
 
     var r3 = numOrBool; // number | boolean
 >r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 23, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 26, 7))
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 3))
+>numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 11))
 }
 else {
     var r3 =  numOrBool; // number | boolean
 >r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 23, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 26, 7))
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 3))
+>numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 11))
 }
 
 if (typeof strOrC == "Object") {
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 3))
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 11))
 
     var r4 = strOrC; // string | C
 >r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 30, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 33, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 3))
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 11))
 }
 else {
     var r4 = strOrC; // string | C
 >r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 30, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 33, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 3))
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 11))
 }
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.types b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.types
index 4fc268abbdedd..772145f5c6a35 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.types
@@ -7,19 +7,19 @@ class C { private p: string };
 >p : string
 >  : ^^^^^^
 
-var strOrNum: string | number;
+declare var strOrNum: string | number;
 >strOrNum : string | number
 >         : ^^^^^^^^^^^^^^^
 
-var strOrBool: string | boolean;
+declare var strOrBool: string | boolean;
 >strOrBool : string | boolean
 >          : ^^^^^^^^^^^^^^^^
 
-var numOrBool: number | boolean
+declare var numOrBool: number | boolean;
 >numOrBool : number | boolean
 >          : ^^^^^^^^^^^^^^^^
 
-var strOrC: string | C;
+declare var strOrC: string | C;
 >strOrC : string | C
 >       : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt
index 0032b0b422311..0f460c94953b7 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt
@@ -8,10 +8,10 @@ typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(34,9): error TS2403: Subsequent vari
 ==== typeGuardOfFormTypeOfNotEqualHasNoEffect.ts (5 errors) ====
     class C { private p: string };
     
-    var strOrNum: string | number;
-    var strOrBool: string | boolean;
-    var numOrBool: number | boolean
-    var strOrC: string | C;
+    declare var strOrNum: string | number;
+    declare var strOrBool: string | boolean;
+    declare var numOrBool: number | boolean;
+    declare var strOrC: string | C;
     
     // typeof x != s has not effect on typeguard
     if (typeof strOrNum != "string") {
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.js b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.js
index e1bf25b928639..506357c25c4d1 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.js
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.js
@@ -3,10 +3,10 @@
 //// [typeGuardOfFormTypeOfNotEqualHasNoEffect.ts]
 class C { private p: string };
 
-var strOrNum: string | number;
-var strOrBool: string | boolean;
-var numOrBool: number | boolean
-var strOrC: string | C;
+declare var strOrNum: string | number;
+declare var strOrBool: string | boolean;
+declare var numOrBool: number | boolean;
+declare var strOrC: string | C;
 
 // typeof x != s has not effect on typeguard
 if (typeof strOrNum != "string") {
@@ -44,10 +44,6 @@ var C = /** @class */ (function () {
     return C;
 }());
 ;
-var strOrNum;
-var strOrBool;
-var numOrBool;
-var strOrC;
 // typeof x != s has not effect on typeguard
 if (typeof strOrNum != "string") {
     var r1 = strOrNum; // string | number
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.symbols b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.symbols
index 9054186e4dcb8..477ce691bfb71 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.symbols
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.symbols
@@ -5,68 +5,68 @@ class C { private p: string };
 >C : Symbol(C, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 0, 0))
 >p : Symbol(C.p, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 0, 9))
 
-var strOrNum: string | number;
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 3))
+declare var strOrNum: string | number;
+>strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 11))
 
-var strOrBool: string | boolean;
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 3))
+declare var strOrBool: string | boolean;
+>strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 11))
 
-var numOrBool: number | boolean
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 3))
+declare var numOrBool: number | boolean;
+>numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 11))
 
-var strOrC: string | C;
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 3))
+declare var strOrC: string | C;
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 11))
 >C : Symbol(C, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 0, 0))
 
 // typeof x != s has not effect on typeguard
 if (typeof strOrNum != "string") {
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 3))
+>strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 11))
 
     var r1 = strOrNum; // string | number
 >r1 : Symbol(r1, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 9, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 12, 7))
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 3))
+>strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 11))
 }
 else {
     var r1 = strOrNum; // string | number
 >r1 : Symbol(r1, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 9, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 12, 7))
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 3))
+>strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 11))
 }
 
 if (typeof strOrBool != "boolean") {
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 11))
 
     var r2 = strOrBool; // string | boolean
 >r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 16, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 19, 7))
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 11))
 }
 else {
     var r2 = strOrBool; // string | boolean
 >r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 16, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 19, 7))
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 3))
+>strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 11))
 }
 
 if (typeof numOrBool != "number") {
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 3))
+>numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 11))
 
     var r3 = numOrBool; // number | boolean
 >r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 23, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 26, 7))
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 3))
+>numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 11))
 }
 else {
     var r3 = numOrBool; // number | boolean
 >r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 23, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 26, 7))
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 3))
+>numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 11))
 }
 
 if (typeof strOrC != "Object") {
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 3))
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 11))
 
     var r4 = strOrC; // string | C
 >r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 30, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 33, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 3))
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 11))
 }
 else {
     var r4 = strOrC; // string | C
 >r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 30, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 33, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 3))
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 11))
 }
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.types b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.types
index 3ee867159b67b..5c66816175342 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.types
@@ -7,19 +7,19 @@ class C { private p: string };
 >p : string
 >  : ^^^^^^
 
-var strOrNum: string | number;
+declare var strOrNum: string | number;
 >strOrNum : string | number
 >         : ^^^^^^^^^^^^^^^
 
-var strOrBool: string | boolean;
+declare var strOrBool: string | boolean;
 >strOrBool : string | boolean
 >          : ^^^^^^^^^^^^^^^^
 
-var numOrBool: number | boolean
+declare var numOrBool: number | boolean;
 >numOrBool : number | boolean
 >          : ^^^^^^^^^^^^^^^^
 
-var strOrC: string | C;
+declare var strOrC: string | C;
 >strOrC : string | C
 >       : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.errors.txt b/tests/baselines/reference/typeGuardOfFormTypeOfOther.errors.txt
index d7be75b79a458..ae419c3e30828 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.errors.txt
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.errors.txt
@@ -22,9 +22,9 @@ typeGuardOfFormTypeOfOther.ts(75,5): error TS2367: This comparison appears to be
     var strOrBool: string | boolean;
     var numOrBool: number | boolean
     var strOrNumOrBool: string | number | boolean;
-    var strOrC: string | C;
-    var numOrC: number | C;
-    var boolOrC: boolean | C;
+    declare var strOrC: string | C;
+    declare var numOrC: number | C;
+    declare var boolOrC: boolean | C;
     var emptyObj: {};
     var c: C;
     
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.js b/tests/baselines/reference/typeGuardOfFormTypeOfOther.js
index 4fdaa2261ea69..b14c83e17c9e4 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.js
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.js
@@ -10,9 +10,9 @@ var strOrNum: string | number;
 var strOrBool: string | boolean;
 var numOrBool: number | boolean
 var strOrNumOrBool: string | number | boolean;
-var strOrC: string | C;
-var numOrC: number | C;
-var boolOrC: boolean | C;
+declare var strOrC: string | C;
+declare var numOrC: number | C;
+declare var boolOrC: boolean | C;
 var emptyObj: {};
 var c: C;
 
@@ -97,9 +97,6 @@ var strOrNum;
 var strOrBool;
 var numOrBool;
 var strOrNumOrBool;
-var strOrC;
-var numOrC;
-var boolOrC;
 var emptyObj;
 var c;
 // A type guard of the form typeof x === s, 
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols b/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols
index 16d96d5f7ffd7..c28ad34beee26 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols
@@ -26,16 +26,16 @@ var numOrBool: number | boolean
 var strOrNumOrBool: string | number | boolean;
 >strOrNumOrBool : Symbol(strOrNumOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 8, 3))
 
-var strOrC: string | C;
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
+declare var strOrC: string | C;
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 11))
 >C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0))
 
-var numOrC: number | C;
->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
+declare var numOrC: number | C;
+>numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 11))
 >C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0))
 
-var boolOrC: boolean | C;
->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
+declare var boolOrC: boolean | C;
+>boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 11))
 >C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0))
 
 var emptyObj: {};
@@ -51,52 +51,52 @@ var c: C;
 //  - when false, has no effect on the type of x.
 
 if (typeof strOrC === "Object") {
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 11))
 
     c = strOrC; // C
 >c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 11))
 }
 else {
     var r2: string = strOrC; // string
 >r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfOther.ts, 24, 7), Decl(typeGuardOfFormTypeOfOther.ts, 56, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 11))
 }
 if (typeof numOrC === "Object") {
->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
+>numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 11))
 
     c = numOrC; // C
 >c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3))
->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
+>numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 11))
 }
 else {
     var r3: number  = numOrC; // number
 >r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfOther.ts, 30, 7), Decl(typeGuardOfFormTypeOfOther.ts, 62, 7))
->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
+>numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 11))
 }
 if (typeof boolOrC === "Object") {
->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
+>boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 11))
 
     c = boolOrC; // C
 >c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3))
->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
+>boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 11))
 }
 else {
     var r4: boolean = boolOrC; // boolean
 >r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfOther.ts, 36, 7), Decl(typeGuardOfFormTypeOfOther.ts, 68, 7))
->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
+>boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 11))
 }
 if (typeof strOrC === "Object" as string) { // comparison is OK with cast
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 11))
 
     c = strOrC; // error: but no narrowing to C
 >c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 11))
 }
 else {
     var r5: string = strOrC; // error: no narrowing to string
 >r5 : Symbol(r5, Decl(typeGuardOfFormTypeOfOther.ts, 42, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 11))
 }
 
 if (typeof strOrNumOrBool === "Object") {
@@ -116,40 +116,40 @@ else {
 //  - when true, narrows the type of x by typeof x === s when false, or
 //  - when false, narrows the type of x by typeof x === s when true.
 if (typeof strOrC !== "Object") {
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 11))
 
     var r2: string = strOrC; // string
 >r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfOther.ts, 24, 7), Decl(typeGuardOfFormTypeOfOther.ts, 56, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 11))
 }
 else {
     c = strOrC; // C
 >c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
+>strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 11))
 }
 if (typeof numOrC !== "Object") {
->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
+>numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 11))
 
     var r3: number = numOrC; // number
 >r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfOther.ts, 30, 7), Decl(typeGuardOfFormTypeOfOther.ts, 62, 7))
->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
+>numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 11))
 }
 else {
     c = numOrC; // C
 >c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3))
->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
+>numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 11))
 }
 if (typeof boolOrC !== "Object") {
->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
+>boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 11))
 
     var r4: boolean = boolOrC; // boolean
 >r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfOther.ts, 36, 7), Decl(typeGuardOfFormTypeOfOther.ts, 68, 7))
->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
+>boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 11))
 }
 else {
     c = boolOrC; // C
 >c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3))
->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
+>boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 11))
 }
 
 if (typeof strOrNumOrBool !== "Object") {
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types b/tests/baselines/reference/typeGuardOfFormTypeOfOther.types
index 5acd032dc4a48..a9123f1e4c9c1 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.types
@@ -35,15 +35,15 @@ var strOrNumOrBool: string | number | boolean;
 >strOrNumOrBool : string | number | boolean
 >               : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-var strOrC: string | C;
+declare var strOrC: string | C;
 >strOrC : string | C
 >       : ^^^^^^^^^^
 
-var numOrC: number | C;
+declare var numOrC: number | C;
 >numOrC : number | C
 >       : ^^^^^^^^^^
 
-var boolOrC: boolean | C;
+declare var boolOrC: boolean | C;
 >boolOrC : boolean | C
 >        : ^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/typeGuardsNestedAssignments.js b/tests/baselines/reference/typeGuardsNestedAssignments.js
index e195cde18833c..8534f78d9d4f3 100644
--- a/tests/baselines/reference/typeGuardsNestedAssignments.js
+++ b/tests/baselines/reference/typeGuardsNestedAssignments.js
@@ -2,7 +2,7 @@
 
 //// [typeGuardsNestedAssignments.ts]
 class Foo {
-    x: string;
+    x: string = "";
 }
 
 declare function getFooOrNull(): Foo | null;
@@ -50,6 +50,7 @@ while ((match = re.exec("xxx")) != null) {
 //// [typeGuardsNestedAssignments.js]
 var Foo = /** @class */ (function () {
     function Foo() {
+        this.x = "";
     }
     return Foo;
 }());
diff --git a/tests/baselines/reference/typeGuardsNestedAssignments.symbols b/tests/baselines/reference/typeGuardsNestedAssignments.symbols
index 49ccb47beb265..576f1a0a43277 100644
--- a/tests/baselines/reference/typeGuardsNestedAssignments.symbols
+++ b/tests/baselines/reference/typeGuardsNestedAssignments.symbols
@@ -4,7 +4,7 @@
 class Foo {
 >Foo : Symbol(Foo, Decl(typeGuardsNestedAssignments.ts, 0, 0))
 
-    x: string;
+    x: string = "";
 >x : Symbol(Foo.x, Decl(typeGuardsNestedAssignments.ts, 0, 11))
 }
 
diff --git a/tests/baselines/reference/typeGuardsNestedAssignments.types b/tests/baselines/reference/typeGuardsNestedAssignments.types
index 069a2e6612356..88d5c0d34fe86 100644
--- a/tests/baselines/reference/typeGuardsNestedAssignments.types
+++ b/tests/baselines/reference/typeGuardsNestedAssignments.types
@@ -5,9 +5,11 @@ class Foo {
 >Foo : Foo
 >    : ^^^
 
-    x: string;
+    x: string = "";
 >x : string
 >  : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 declare function getFooOrNull(): Foo | null;
diff --git a/tests/baselines/reference/typeGuardsTypeParameters.js b/tests/baselines/reference/typeGuardsTypeParameters.js
index cde3d832ff343..273099ee99642 100644
--- a/tests/baselines/reference/typeGuardsTypeParameters.js
+++ b/tests/baselines/reference/typeGuardsTypeParameters.js
@@ -4,7 +4,7 @@
 // Type guards involving type parameters produce intersection types
 
 class C {
-    prop: string;
+    prop: string = "";
 }
 
 function f1<T>(x: T) {
@@ -40,6 +40,7 @@ function fun<T>(item: { [P in keyof T]: T[P] }) {
 // Type guards involving type parameters produce intersection types
 var C = /** @class */ (function () {
     function C() {
+        this.prop = "";
     }
     return C;
 }());
diff --git a/tests/baselines/reference/typeGuardsTypeParameters.symbols b/tests/baselines/reference/typeGuardsTypeParameters.symbols
index 4aa4f9447773e..45879e84ea37d 100644
--- a/tests/baselines/reference/typeGuardsTypeParameters.symbols
+++ b/tests/baselines/reference/typeGuardsTypeParameters.symbols
@@ -6,7 +6,7 @@
 class C {
 >C : Symbol(C, Decl(typeGuardsTypeParameters.ts, 0, 0))
 
-    prop: string;
+    prop: string = "";
 >prop : Symbol(C.prop, Decl(typeGuardsTypeParameters.ts, 2, 9))
 }
 
diff --git a/tests/baselines/reference/typeGuardsTypeParameters.types b/tests/baselines/reference/typeGuardsTypeParameters.types
index 40614718b6193..174d6a4cc1593 100644
--- a/tests/baselines/reference/typeGuardsTypeParameters.types
+++ b/tests/baselines/reference/typeGuardsTypeParameters.types
@@ -7,9 +7,11 @@ class C {
 >C : C
 >  : ^
 
-    prop: string;
+    prop: string = "";
 >prop : string
 >     : ^^^^^^
+>"" : ""
+>   : ^^
 }
 
 function f1<T>(x: T) {
diff --git a/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.errors.txt b/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.errors.txt
index f0c93a11efe23..18bea63bde47e 100644
--- a/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.errors.txt
+++ b/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.errors.txt
@@ -35,7 +35,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
     }
     declare var A: AConstructor;
     
-    var obj1: A | string;
+    declare var obj1: A | string;
     if (obj1 instanceof A) { // narrowed to A.
         obj1.foo;
         obj1.bar;
@@ -43,7 +43,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
 !!! error TS2339: Property 'bar' does not exist on type 'A'.
     }
     
-    var obj2: any;
+    declare var obj2: any;
     if (obj2 instanceof A) {
         obj2.foo;
         obj2.bar;
@@ -60,7 +60,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
     }
     declare var B: BConstructor;
     
-    var obj3: B<number> | string;
+    declare var obj3: B<number> | string;
     if (obj3 instanceof B) { // narrowed to B<number>.
         obj3.foo = 1;
         obj3.foo = "str";
@@ -71,7 +71,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
 !!! error TS2339: Property 'bar' does not exist on type 'B<number>'.
     }
     
-    var obj4: any;
+    declare var obj4: any;
     if (obj4 instanceof B) {
         obj4.foo = "str";
         obj4.foo = 1;
@@ -97,7 +97,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
     }
     declare var C: CConstructor;
     
-    var obj5: C1 | A;
+    declare var obj5: C1 | A;
     if (obj5 instanceof C) { // narrowed to C1.
         obj5.foo;
         obj5.c;
@@ -107,7 +107,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
 !!! error TS2339: Property 'bar2' does not exist on type 'C1'.
     }
     
-    var obj6: any;
+    declare var obj6: any;
     if (obj6 instanceof C) {
         obj6.foo;
         obj6.bar1;
@@ -126,7 +126,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
     }
     declare var D: { new (): D; };
     
-    var obj7: D | string;
+    declare var obj7: D | string;
     if (obj7 instanceof D) { // narrowed to D.
         obj7.foo;
         obj7.bar;
@@ -134,7 +134,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
 !!! error TS2339: Property 'bar' does not exist on type 'D'.
     }
     
-    var obj8: any;
+    declare var obj8: any;
     if (obj8 instanceof D) {
         obj8.foo;
         obj8.bar;
@@ -156,7 +156,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
     }
     declare var E: EConstructor;
     
-    var obj9: E1 | A;
+    declare var obj9: E1 | A;
     if (obj9 instanceof E) { // narrowed to E1
         obj9.foo;
         obj9.bar1;
@@ -165,7 +165,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
 !!! error TS2339: Property 'bar2' does not exist on type 'E1'.
     }
     
-    var obj10: any;
+    declare var obj10: any;
     if (obj10 instanceof E) {
         obj10.foo;
         obj10.bar1;
@@ -188,7 +188,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
     }
     declare var F: FConstructor;
     
-    var obj11: F | string;
+    declare var obj11: F | string;
     if (obj11 instanceof F) { // can't type narrowing, construct signature returns any.
         obj11.foo;
               ~~~
@@ -200,7 +200,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
 !!! error TS2339:   Property 'bar' does not exist on type 'string'.
     }
     
-    var obj12: any;
+    declare var obj12: any;
     if (obj12 instanceof F) {
         obj12.foo;
         obj12.bar;
@@ -219,7 +219,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
     }
     declare var G: GConstructor;
     
-    var obj13: G1 | G2;
+    declare var obj13: G1 | G2;
     if (obj13 instanceof G) { // narrowed to G1. G1 is return type of prototype property.
         obj13.foo1;
         obj13.foo2;
@@ -227,7 +227,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
 !!! error TS2339: Property 'foo2' does not exist on type 'G1'.
     }
     
-    var obj14: any;
+    declare var obj14: any;
     if (obj14 instanceof G) {
         obj14.foo1;
         obj14.foo2;
@@ -245,7 +245,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
     }
     declare var H: HConstructor;
     
-    var obj15: H | string;
+    declare var obj15: H | string;
     if (obj15 instanceof H) { // narrowed to H.
         obj15.foo;
         obj15.bar;
@@ -253,7 +253,7 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
 !!! error TS2339: Property 'bar' does not exist on type 'H'.
     }
     
-    var obj16: any;
+    declare var obj16: any;
     if (obj16 instanceof H) {
         obj16.foo1;
               ~~~~
@@ -265,13 +265,13 @@ typeGuardsWithInstanceOfByConstructorSignature.ts(188,11): error TS2551: Propert
 !!! related TS2728 typeGuardsWithInstanceOfByConstructorSignature.ts:175:5: 'foo' is declared here.
     }
     
-    var obj17: any;
+    declare var obj17: any;
     if (obj17 instanceof Object) { // can't narrow type from 'any' to 'Object'
         obj17.foo1;
         obj17.foo2;
     }
     
-    var obj18: any;
+    declare var obj18: any;
     if (obj18 instanceof Function) { // can't narrow type from 'any' to 'Function'
         obj18.foo1;
         obj18.foo2;
diff --git a/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.js b/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.js
index 1beff0fd46200..cb88a6d4ab038 100644
--- a/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.js
+++ b/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.js
@@ -9,13 +9,13 @@ interface A {
 }
 declare var A: AConstructor;
 
-var obj1: A | string;
+declare var obj1: A | string;
 if (obj1 instanceof A) { // narrowed to A.
     obj1.foo;
     obj1.bar;
 }
 
-var obj2: any;
+declare var obj2: any;
 if (obj2 instanceof A) {
     obj2.foo;
     obj2.bar;
@@ -30,14 +30,14 @@ interface B<T> {
 }
 declare var B: BConstructor;
 
-var obj3: B<number> | string;
+declare var obj3: B<number> | string;
 if (obj3 instanceof B) { // narrowed to B<number>.
     obj3.foo = 1;
     obj3.foo = "str";
     obj3.bar = "str";
 }
 
-var obj4: any;
+declare var obj4: any;
 if (obj4 instanceof B) {
     obj4.foo = "str";
     obj4.foo = 1;
@@ -61,7 +61,7 @@ interface C2 {
 }
 declare var C: CConstructor;
 
-var obj5: C1 | A;
+declare var obj5: C1 | A;
 if (obj5 instanceof C) { // narrowed to C1.
     obj5.foo;
     obj5.c;
@@ -69,7 +69,7 @@ if (obj5 instanceof C) { // narrowed to C1.
     obj5.bar2;
 }
 
-var obj6: any;
+declare var obj6: any;
 if (obj6 instanceof C) {
     obj6.foo;
     obj6.bar1;
@@ -82,13 +82,13 @@ interface D {
 }
 declare var D: { new (): D; };
 
-var obj7: D | string;
+declare var obj7: D | string;
 if (obj7 instanceof D) { // narrowed to D.
     obj7.foo;
     obj7.bar;
 }
 
-var obj8: any;
+declare var obj8: any;
 if (obj8 instanceof D) {
     obj8.foo;
     obj8.bar;
@@ -108,14 +108,14 @@ interface E2 {
 }
 declare var E: EConstructor;
 
-var obj9: E1 | A;
+declare var obj9: E1 | A;
 if (obj9 instanceof E) { // narrowed to E1
     obj9.foo;
     obj9.bar1;
     obj9.bar2;
 }
 
-var obj10: any;
+declare var obj10: any;
 if (obj10 instanceof E) {
     obj10.foo;
     obj10.bar1;
@@ -132,13 +132,13 @@ interface F {
 }
 declare var F: FConstructor;
 
-var obj11: F | string;
+declare var obj11: F | string;
 if (obj11 instanceof F) { // can't type narrowing, construct signature returns any.
     obj11.foo;
     obj11.bar;
 }
 
-var obj12: any;
+declare var obj12: any;
 if (obj12 instanceof F) {
     obj12.foo;
     obj12.bar;
@@ -157,13 +157,13 @@ interface G2 {
 }
 declare var G: GConstructor;
 
-var obj13: G1 | G2;
+declare var obj13: G1 | G2;
 if (obj13 instanceof G) { // narrowed to G1. G1 is return type of prototype property.
     obj13.foo1;
     obj13.foo2;
 }
 
-var obj14: any;
+declare var obj14: any;
 if (obj14 instanceof G) {
     obj14.foo1;
     obj14.foo2;
@@ -179,25 +179,25 @@ interface H {
 }
 declare var H: HConstructor;
 
-var obj15: H | string;
+declare var obj15: H | string;
 if (obj15 instanceof H) { // narrowed to H.
     obj15.foo;
     obj15.bar;
 }
 
-var obj16: any;
+declare var obj16: any;
 if (obj16 instanceof H) {
     obj16.foo1;
     obj16.foo2;
 }
 
-var obj17: any;
+declare var obj17: any;
 if (obj17 instanceof Object) { // can't narrow type from 'any' to 'Object'
     obj17.foo1;
     obj17.foo2;
 }
 
-var obj18: any;
+declare var obj18: any;
 if (obj18 instanceof Function) { // can't narrow type from 'any' to 'Function'
     obj18.foo1;
     obj18.foo2;
@@ -205,99 +205,81 @@ if (obj18 instanceof Function) { // can't narrow type from 'any' to 'Function'
 
 
 //// [typeGuardsWithInstanceOfByConstructorSignature.js]
-var obj1;
 if (obj1 instanceof A) { // narrowed to A.
     obj1.foo;
     obj1.bar;
 }
-var obj2;
 if (obj2 instanceof A) {
     obj2.foo;
     obj2.bar;
 }
-var obj3;
 if (obj3 instanceof B) { // narrowed to B<number>.
     obj3.foo = 1;
     obj3.foo = "str";
     obj3.bar = "str";
 }
-var obj4;
 if (obj4 instanceof B) {
     obj4.foo = "str";
     obj4.foo = 1;
     obj4.bar = "str";
 }
-var obj5;
 if (obj5 instanceof C) { // narrowed to C1.
     obj5.foo;
     obj5.c;
     obj5.bar1;
     obj5.bar2;
 }
-var obj6;
 if (obj6 instanceof C) {
     obj6.foo;
     obj6.bar1;
     obj6.bar2;
 }
-var obj7;
 if (obj7 instanceof D) { // narrowed to D.
     obj7.foo;
     obj7.bar;
 }
-var obj8;
 if (obj8 instanceof D) {
     obj8.foo;
     obj8.bar;
 }
-var obj9;
 if (obj9 instanceof E) { // narrowed to E1
     obj9.foo;
     obj9.bar1;
     obj9.bar2;
 }
-var obj10;
 if (obj10 instanceof E) {
     obj10.foo;
     obj10.bar1;
     obj10.bar2;
 }
-var obj11;
 if (obj11 instanceof F) { // can't type narrowing, construct signature returns any.
     obj11.foo;
     obj11.bar;
 }
-var obj12;
 if (obj12 instanceof F) {
     obj12.foo;
     obj12.bar;
 }
-var obj13;
 if (obj13 instanceof G) { // narrowed to G1. G1 is return type of prototype property.
     obj13.foo1;
     obj13.foo2;
 }
-var obj14;
 if (obj14 instanceof G) {
     obj14.foo1;
     obj14.foo2;
 }
-var obj15;
 if (obj15 instanceof H) { // narrowed to H.
     obj15.foo;
     obj15.bar;
 }
-var obj16;
 if (obj16 instanceof H) {
     obj16.foo1;
     obj16.foo2;
 }
-var obj17;
 if (obj17 instanceof Object) { // can't narrow type from 'any' to 'Object'
     obj17.foo1;
     obj17.foo2;
 }
-var obj18;
 if (obj18 instanceof Function) { // can't narrow type from 'any' to 'Function'
     obj18.foo1;
     obj18.foo2;
diff --git a/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.symbols b/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.symbols
index 7398cd8a65326..2eead1f34542e 100644
--- a/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.symbols
+++ b/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.symbols
@@ -17,37 +17,37 @@ declare var A: AConstructor;
 >A : Symbol(A, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 2, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 6, 11))
 >AConstructor : Symbol(AConstructor, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 0, 0))
 
-var obj1: A | string;
->obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 8, 3))
+declare var obj1: A | string;
+>obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 8, 11))
 >A : Symbol(A, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 2, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 6, 11))
 
 if (obj1 instanceof A) { // narrowed to A.
->obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 8, 3))
+>obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 8, 11))
 >A : Symbol(A, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 2, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 6, 11))
 
     obj1.foo;
 >obj1.foo : Symbol(A.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 3, 13))
->obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 8, 3))
+>obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 8, 11))
 >foo : Symbol(A.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 3, 13))
 
     obj1.bar;
->obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 8, 3))
+>obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 8, 11))
 }
 
-var obj2: any;
->obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 14, 3))
+declare var obj2: any;
+>obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 14, 11))
 
 if (obj2 instanceof A) {
->obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 14, 3))
+>obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 14, 11))
 >A : Symbol(A, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 2, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 6, 11))
 
     obj2.foo;
 >obj2.foo : Symbol(A.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 3, 13))
->obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 14, 3))
+>obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 14, 11))
 >foo : Symbol(A.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 3, 13))
 
     obj2.bar;
->obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 14, 3))
+>obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 14, 11))
 }
 
 // a construct signature with generics
@@ -71,47 +71,47 @@ declare var B: BConstructor;
 >B : Symbol(B, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 23, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 27, 11))
 >BConstructor : Symbol(BConstructor, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 18, 1))
 
-var obj3: B<number> | string;
->obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 29, 3))
+declare var obj3: B<number> | string;
+>obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 29, 11))
 >B : Symbol(B, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 23, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 27, 11))
 
 if (obj3 instanceof B) { // narrowed to B<number>.
->obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 29, 3))
+>obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 29, 11))
 >B : Symbol(B, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 23, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 27, 11))
 
     obj3.foo = 1;
 >obj3.foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 24, 16))
->obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 29, 3))
+>obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 29, 11))
 >foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 24, 16))
 
     obj3.foo = "str";
 >obj3.foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 24, 16))
->obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 29, 3))
+>obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 29, 11))
 >foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 24, 16))
 
     obj3.bar = "str";
->obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 29, 3))
+>obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 29, 11))
 }
 
-var obj4: any;
->obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 36, 3))
+declare var obj4: any;
+>obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 36, 11))
 
 if (obj4 instanceof B) {
->obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 36, 3))
+>obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 36, 11))
 >B : Symbol(B, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 23, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 27, 11))
 
     obj4.foo = "str";
 >obj4.foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 24, 16))
->obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 36, 3))
+>obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 36, 11))
 >foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 24, 16))
 
     obj4.foo = 1;
 >obj4.foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 24, 16))
->obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 36, 3))
+>obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 36, 11))
 >foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 24, 16))
 
     obj4.bar = "str";
->obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 36, 3))
+>obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 36, 11))
 }
 
 // has multiple construct signature
@@ -154,51 +154,51 @@ declare var C: CConstructor;
 >C : Symbol(C, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 58, 11))
 >CConstructor : Symbol(CConstructor, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 41, 1))
 
-var obj5: C1 | A;
->obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 60, 3))
+declare var obj5: C1 | A;
+>obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 60, 11))
 >C1 : Symbol(C1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 47, 1))
 >A : Symbol(A, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 2, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 6, 11))
 
 if (obj5 instanceof C) { // narrowed to C1.
->obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 60, 3))
+>obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 60, 11))
 >C : Symbol(C, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 58, 11))
 
     obj5.foo;
 >obj5.foo : Symbol(C1.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 48, 14))
->obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 60, 3))
+>obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 60, 11))
 >foo : Symbol(C1.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 48, 14))
 
     obj5.c;
 >obj5.c : Symbol(C1.c, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 49, 16))
->obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 60, 3))
+>obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 60, 11))
 >c : Symbol(C1.c, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 49, 16))
 
     obj5.bar1;
 >obj5.bar1 : Symbol(C1.bar1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 50, 14))
->obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 60, 3))
+>obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 60, 11))
 >bar1 : Symbol(C1.bar1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 50, 14))
 
     obj5.bar2;
->obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 60, 3))
+>obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 60, 11))
 }
 
-var obj6: any;
->obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 68, 3))
+declare var obj6: any;
+>obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 68, 11))
 
 if (obj6 instanceof C) {
->obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 68, 3))
+>obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 68, 11))
 >C : Symbol(C, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 58, 11))
 
     obj6.foo;
 >obj6.foo : Symbol(foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 48, 14), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 53, 14))
->obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 68, 3))
+>obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 68, 11))
 >foo : Symbol(foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 48, 14), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 53, 14))
 
     obj6.bar1;
->obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 68, 3))
+>obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 68, 11))
 
     obj6.bar2;
->obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 68, 3))
+>obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 68, 11))
 }
 
 // with object type literal
@@ -212,37 +212,37 @@ declare var D: { new (): D; };
 >D : Symbol(D, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 73, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 79, 11))
 >D : Symbol(D, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 73, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 79, 11))
 
-var obj7: D | string;
->obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 81, 3))
+declare var obj7: D | string;
+>obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 81, 11))
 >D : Symbol(D, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 73, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 79, 11))
 
 if (obj7 instanceof D) { // narrowed to D.
->obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 81, 3))
+>obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 81, 11))
 >D : Symbol(D, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 73, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 79, 11))
 
     obj7.foo;
 >obj7.foo : Symbol(D.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 76, 13))
->obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 81, 3))
+>obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 81, 11))
 >foo : Symbol(D.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 76, 13))
 
     obj7.bar;
->obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 81, 3))
+>obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 81, 11))
 }
 
-var obj8: any;
->obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 87, 3))
+declare var obj8: any;
+>obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 87, 11))
 
 if (obj8 instanceof D) {
->obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 87, 3))
+>obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 87, 11))
 >D : Symbol(D, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 73, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 79, 11))
 
     obj8.foo;
 >obj8.foo : Symbol(D.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 76, 13))
->obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 87, 3))
+>obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 87, 11))
 >foo : Symbol(D.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 76, 13))
 
     obj8.bar;
->obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 87, 3))
+>obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 87, 11))
 }
 
 // a construct signature that returns a union type
@@ -275,46 +275,46 @@ declare var E: EConstructor;
 >E : Symbol(E, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 105, 11))
 >EConstructor : Symbol(EConstructor, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 91, 1))
 
-var obj9: E1 | A;
->obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 107, 3))
+declare var obj9: E1 | A;
+>obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 107, 11))
 >E1 : Symbol(E1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 96, 1))
 >A : Symbol(A, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 2, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 6, 11))
 
 if (obj9 instanceof E) { // narrowed to E1
->obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 107, 3))
+>obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 107, 11))
 >E : Symbol(E, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 105, 11))
 
     obj9.foo;
 >obj9.foo : Symbol(E1.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 97, 14))
->obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 107, 3))
+>obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 107, 11))
 >foo : Symbol(E1.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 97, 14))
 
     obj9.bar1;
 >obj9.bar1 : Symbol(E1.bar1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 98, 16))
->obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 107, 3))
+>obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 107, 11))
 >bar1 : Symbol(E1.bar1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 98, 16))
 
     obj9.bar2;
->obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 107, 3))
+>obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 107, 11))
 }
 
-var obj10: any;
->obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 114, 3))
+declare var obj10: any;
+>obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 114, 11))
 
 if (obj10 instanceof E) {
->obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 114, 3))
+>obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 114, 11))
 >E : Symbol(E, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 105, 11))
 
     obj10.foo;
 >obj10.foo : Symbol(foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 97, 14), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 101, 14))
->obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 114, 3))
+>obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 114, 11))
 >foo : Symbol(foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 97, 14), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 101, 14))
 
     obj10.bar1;
->obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 114, 3))
+>obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 114, 11))
 
     obj10.bar2;
->obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 114, 3))
+>obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 114, 11))
 }
 
 // a construct signature that returns any
@@ -336,33 +336,33 @@ declare var F: FConstructor;
 >F : Symbol(F, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 124, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 129, 11))
 >FConstructor : Symbol(FConstructor, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 119, 1))
 
-var obj11: F | string;
->obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 131, 3))
+declare var obj11: F | string;
+>obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 131, 11))
 >F : Symbol(F, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 124, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 129, 11))
 
 if (obj11 instanceof F) { // can't type narrowing, construct signature returns any.
->obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 131, 3))
+>obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 131, 11))
 >F : Symbol(F, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 124, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 129, 11))
 
     obj11.foo;
->obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 131, 3))
+>obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 131, 11))
 
     obj11.bar;
->obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 131, 3))
+>obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 131, 11))
 }
 
-var obj12: any;
->obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 137, 3))
+declare var obj12: any;
+>obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 137, 11))
 
 if (obj12 instanceof F) {
->obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 137, 3))
+>obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 137, 11))
 >F : Symbol(F, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 124, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 129, 11))
 
     obj12.foo;
->obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 137, 3))
+>obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 137, 11))
 
     obj12.bar;
->obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 137, 3))
+>obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 137, 11))
 }
 
 // a type with a prototype, it overrides the construct signature
@@ -392,38 +392,38 @@ declare var G: GConstructor;
 >G : Symbol(G, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 154, 11))
 >GConstructor : Symbol(GConstructor, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 141, 1))
 
-var obj13: G1 | G2;
->obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 156, 3))
+declare var obj13: G1 | G2;
+>obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 156, 11))
 >G1 : Symbol(G1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 147, 1))
 >G2 : Symbol(G2, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 150, 1))
 
 if (obj13 instanceof G) { // narrowed to G1. G1 is return type of prototype property.
->obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 156, 3))
+>obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 156, 11))
 >G : Symbol(G, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 154, 11))
 
     obj13.foo1;
 >obj13.foo1 : Symbol(G1.foo1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 148, 14))
->obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 156, 3))
+>obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 156, 11))
 >foo1 : Symbol(G1.foo1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 148, 14))
 
     obj13.foo2;
->obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 156, 3))
+>obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 156, 11))
 }
 
-var obj14: any;
->obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 162, 3))
+declare var obj14: any;
+>obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 162, 11))
 
 if (obj14 instanceof G) {
->obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 162, 3))
+>obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 162, 11))
 >G : Symbol(G, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 154, 11))
 
     obj14.foo1;
 >obj14.foo1 : Symbol(G1.foo1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 148, 14))
->obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 162, 3))
+>obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 162, 11))
 >foo1 : Symbol(G1.foo1, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 148, 14))
 
     obj14.foo2;
->obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 162, 3))
+>obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 162, 11))
 }
 
 // a type with a prototype that has any type
@@ -446,62 +446,62 @@ declare var H: HConstructor;
 >H : Symbol(H, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 172, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 176, 11))
 >HConstructor : Symbol(HConstructor, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 166, 1))
 
-var obj15: H | string;
->obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 178, 3))
+declare var obj15: H | string;
+>obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 178, 11))
 >H : Symbol(H, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 172, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 176, 11))
 
 if (obj15 instanceof H) { // narrowed to H.
->obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 178, 3))
+>obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 178, 11))
 >H : Symbol(H, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 172, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 176, 11))
 
     obj15.foo;
 >obj15.foo : Symbol(H.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 173, 13))
->obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 178, 3))
+>obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 178, 11))
 >foo : Symbol(H.foo, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 173, 13))
 
     obj15.bar;
->obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 178, 3))
+>obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 178, 11))
 }
 
-var obj16: any;
->obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 184, 3))
+declare var obj16: any;
+>obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 184, 11))
 
 if (obj16 instanceof H) {
->obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 184, 3))
+>obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 184, 11))
 >H : Symbol(H, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 172, 1), Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 176, 11))
 
     obj16.foo1;
->obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 184, 3))
+>obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 184, 11))
 
     obj16.foo2;
->obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 184, 3))
+>obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 184, 11))
 }
 
-var obj17: any;
->obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 190, 3))
+declare var obj17: any;
+>obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 190, 11))
 
 if (obj17 instanceof Object) { // can't narrow type from 'any' to 'Object'
->obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 190, 3))
+>obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 190, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
     obj17.foo1;
->obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 190, 3))
+>obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 190, 11))
 
     obj17.foo2;
->obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 190, 3))
+>obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 190, 11))
 }
 
-var obj18: any;
->obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 196, 3))
+declare var obj18: any;
+>obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 196, 11))
 
 if (obj18 instanceof Function) { // can't narrow type from 'any' to 'Function'
->obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 196, 3))
+>obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 196, 11))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     obj18.foo1;
->obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 196, 3))
+>obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 196, 11))
 
     obj18.foo2;
->obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 196, 3))
+>obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfByConstructorSignature.ts, 196, 11))
 }
 
diff --git a/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types b/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types
index 3cf06c72adecd..c1898be93a314 100644
--- a/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types
+++ b/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types
@@ -13,7 +13,7 @@ declare var A: AConstructor;
 >A : AConstructor
 >  : ^^^^^^^^^^^^
 
-var obj1: A | string;
+declare var obj1: A | string;
 >obj1 : string | A
 >     : ^^^^^^^^^^
 
@@ -42,7 +42,7 @@ if (obj1 instanceof A) { // narrowed to A.
 >    : ^^^
 }
 
-var obj2: any;
+declare var obj2: any;
 >obj2 : any
 >     : ^^^
 
@@ -84,7 +84,7 @@ declare var B: BConstructor;
 >B : BConstructor
 >  : ^^^^^^^^^^^^
 
-var obj3: B<number> | string;
+declare var obj3: B<number> | string;
 >obj3 : string | B<number>
 >     : ^^^^^^^^^^^^^^^^^^
 
@@ -133,7 +133,7 @@ if (obj3 instanceof B) { // narrowed to B<number>.
 >      : ^^^^^
 }
 
-var obj4: any;
+declare var obj4: any;
 >obj4 : any
 >     : ^^^
 
@@ -222,7 +222,7 @@ declare var C: CConstructor;
 >C : CConstructor
 >  : ^^^^^^^^^^^^
 
-var obj5: C1 | A;
+declare var obj5: C1 | A;
 >obj5 : A | C1
 >     : ^^^^^^
 
@@ -267,7 +267,7 @@ if (obj5 instanceof C) { // narrowed to C1.
 >     : ^^^
 }
 
-var obj6: any;
+declare var obj6: any;
 >obj6 : any
 >     : ^^^
 
@@ -314,7 +314,7 @@ declare var D: { new (): D; };
 >D : new () => D
 >  : ^^^^^^^^^^ 
 
-var obj7: D | string;
+declare var obj7: D | string;
 >obj7 : string | D
 >     : ^^^^^^^^^^
 
@@ -343,7 +343,7 @@ if (obj7 instanceof D) { // narrowed to D.
 >    : ^^^
 }
 
-var obj8: any;
+declare var obj8: any;
 >obj8 : any
 >     : ^^^
 
@@ -398,7 +398,7 @@ declare var E: EConstructor;
 >E : EConstructor
 >  : ^^^^^^^^^^^^
 
-var obj9: E1 | A;
+declare var obj9: E1 | A;
 >obj9 : A | E1
 >     : ^^^^^^
 
@@ -435,7 +435,7 @@ if (obj9 instanceof E) { // narrowed to E1
 >     : ^^^
 }
 
-var obj10: any;
+declare var obj10: any;
 >obj10 : any
 >      : ^^^
 
@@ -489,7 +489,7 @@ declare var F: FConstructor;
 >F : FConstructor
 >  : ^^^^^^^^^^^^
 
-var obj11: F | string;
+declare var obj11: F | string;
 >obj11 : string | F
 >      : ^^^^^^^^^^
 
@@ -518,7 +518,7 @@ if (obj11 instanceof F) { // can't type narrowing, construct signature returns a
 >    : ^^^
 }
 
-var obj12: any;
+declare var obj12: any;
 >obj12 : any
 >      : ^^^
 
@@ -569,7 +569,7 @@ declare var G: GConstructor;
 >G : GConstructor
 >  : ^^^^^^^^^^^^
 
-var obj13: G1 | G2;
+declare var obj13: G1 | G2;
 >obj13 : G1 | G2
 >      : ^^^^^^^
 
@@ -598,7 +598,7 @@ if (obj13 instanceof G) { // narrowed to G1. G1 is return type of prototype prop
 >     : ^^^
 }
 
-var obj14: any;
+declare var obj14: any;
 >obj14 : any
 >      : ^^^
 
@@ -644,7 +644,7 @@ declare var H: HConstructor;
 >H : HConstructor
 >  : ^^^^^^^^^^^^
 
-var obj15: H | string;
+declare var obj15: H | string;
 >obj15 : string | H
 >      : ^^^^^^^^^^
 
@@ -673,7 +673,7 @@ if (obj15 instanceof H) { // narrowed to H.
 >    : ^^^
 }
 
-var obj16: any;
+declare var obj16: any;
 >obj16 : any
 >      : ^^^
 
@@ -702,7 +702,7 @@ if (obj16 instanceof H) {
 >     : ^^^
 }
 
-var obj17: any;
+declare var obj17: any;
 >obj17 : any
 >      : ^^^
 
@@ -731,7 +731,7 @@ if (obj17 instanceof Object) { // can't narrow type from 'any' to 'Object'
 >     : ^^^
 }
 
-var obj18: any;
+declare var obj18: any;
 >obj18 : any
 >      : ^^^
 
diff --git a/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.errors.txt b/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.errors.txt
index f4ec1af5217f5..65e1efdde3a61 100644
--- a/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.errors.txt
+++ b/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.errors.txt
@@ -36,7 +36,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
     }
     declare var A: AConstructor;
     
-    var obj1: A | string;
+    declare var obj1: A | string;
     if (obj1 instanceof A) { // narrowed to A.
         obj1.foo;
         obj1.bar;
@@ -44,7 +44,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
 !!! error TS2339: Property 'bar' does not exist on type 'A'.
     }
     
-    var obj2: any;
+    declare var obj2: any;
     if (obj2 instanceof A) {
         obj2.foo;
         obj2.bar;
@@ -62,7 +62,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
     }
     declare var B: BConstructor;
     
-    var obj3: B<number> | string;
+    declare var obj3: B<number> | string;
     if (obj3 instanceof B) { // narrowed to B<number>.
         obj3.foo = 1;
         obj3.foo = "str";
@@ -73,7 +73,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
 !!! error TS2339: Property 'bar' does not exist on type 'B<number>'.
     }
     
-    var obj4: any;
+    declare var obj4: any;
     if (obj4 instanceof B) {
         obj4.foo = "str";
         obj4.foo = 1;
@@ -100,7 +100,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
     }
     declare var C: CConstructor;
     
-    var obj5: C1 | A;
+    declare var obj5: C1 | A;
     if (obj5 instanceof C) { // narrowed to C1.
         obj5.foo;
         obj5.c;
@@ -110,7 +110,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
 !!! error TS2339: Property 'bar2' does not exist on type 'C1'.
     }
     
-    var obj6: any;
+    declare var obj6: any;
     if (obj6 instanceof C) {
         obj6.foo;
         obj6.bar1;
@@ -132,7 +132,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
         [Symbol.hasInstance](value: unknown): value is D;
     };
     
-    var obj7: D | string;
+    declare var obj7: D | string;
     if (obj7 instanceof D) { // narrowed to D.
         obj7.foo;
         obj7.bar;
@@ -140,7 +140,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
 !!! error TS2339: Property 'bar' does not exist on type 'D'.
     }
     
-    var obj8: any;
+    declare var obj8: any;
     if (obj8 instanceof D) {
         obj8.foo;
         obj8.bar;
@@ -163,7 +163,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
     }
     declare var E: EConstructor;
     
-    var obj9: E1 | A;
+    declare var obj9: E1 | A;
     if (obj9 instanceof E) { // narrowed to E1
         obj9.foo;
         obj9.bar1;
@@ -172,7 +172,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
 !!! error TS2339: Property 'bar2' does not exist on type 'E1'.
     }
     
-    var obj10: any;
+    declare var obj10: any;
     if (obj10 instanceof E) {
         obj10.foo;
         obj10.bar1;
@@ -196,7 +196,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
     }
     declare var F: FConstructor;
     
-    var obj11: F | string;
+    declare var obj11: F | string;
     if (obj11 instanceof F) { // can't type narrowing, construct signature returns any.
         obj11.foo;
               ~~~
@@ -208,7 +208,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
 !!! error TS2339:   Property 'bar' does not exist on type 'string'.
     }
     
-    var obj12: any;
+    declare var obj12: any;
     if (obj12 instanceof F) {
         obj12.foo;
         obj12.bar;
@@ -228,7 +228,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
     }
     declare var G: GConstructor;
     
-    var obj13: G1 | G2;
+    declare var obj13: G1 | G2;
     if (obj13 instanceof G) { // narrowed to G1. G1 is return type of prototype property.
         obj13.foo1;
         obj13.foo2;
@@ -236,7 +236,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
 !!! error TS2339: Property 'foo2' does not exist on type 'G1'.
     }
     
-    var obj14: any;
+    declare var obj14: any;
     if (obj14 instanceof G) {
         obj14.foo1;
         obj14.foo2;
@@ -255,7 +255,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
     }
     declare var H: HConstructor;
     
-    var obj15: H | string;
+    declare var obj15: H | string;
     if (obj15 instanceof H) { // narrowed to H.
         obj15.foo;
         obj15.bar;
@@ -263,7 +263,7 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
 !!! error TS2339: Property 'bar' does not exist on type 'H'.
     }
     
-    var obj16: any;
+    declare var obj16: any;
     if (obj16 instanceof H) {
         obj16.foo1;
               ~~~~
@@ -275,13 +275,13 @@ typeGuardsWithInstanceOfBySymbolHasInstance.ts(198,11): error TS2551: Property '
 !!! related TS2728 typeGuardsWithInstanceOfBySymbolHasInstance.ts:185:5: 'foo' is declared here.
     }
     
-    var obj17: any;
+    declare var obj17: any;
     if (obj17 instanceof Object) { // can't narrow type from 'any' to 'Object'
         obj17.foo1;
         obj17.foo2;
     }
     
-    var obj18: any;
+    declare var obj18: any;
     if (obj18 instanceof Function) { // can't narrow type from 'any' to 'Function'
         obj18.foo1;
         obj18.foo2;
diff --git a/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.js b/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.js
index 07f4b5178a2e2..cb51a51d546d5 100644
--- a/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.js
+++ b/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.js
@@ -10,13 +10,13 @@ interface A {
 }
 declare var A: AConstructor;
 
-var obj1: A | string;
+declare var obj1: A | string;
 if (obj1 instanceof A) { // narrowed to A.
     obj1.foo;
     obj1.bar;
 }
 
-var obj2: any;
+declare var obj2: any;
 if (obj2 instanceof A) {
     obj2.foo;
     obj2.bar;
@@ -32,14 +32,14 @@ interface B<T> {
 }
 declare var B: BConstructor;
 
-var obj3: B<number> | string;
+declare var obj3: B<number> | string;
 if (obj3 instanceof B) { // narrowed to B<number>.
     obj3.foo = 1;
     obj3.foo = "str";
     obj3.bar = "str";
 }
 
-var obj4: any;
+declare var obj4: any;
 if (obj4 instanceof B) {
     obj4.foo = "str";
     obj4.foo = 1;
@@ -64,7 +64,7 @@ interface C2 {
 }
 declare var C: CConstructor;
 
-var obj5: C1 | A;
+declare var obj5: C1 | A;
 if (obj5 instanceof C) { // narrowed to C1.
     obj5.foo;
     obj5.c;
@@ -72,7 +72,7 @@ if (obj5 instanceof C) { // narrowed to C1.
     obj5.bar2;
 }
 
-var obj6: any;
+declare var obj6: any;
 if (obj6 instanceof C) {
     obj6.foo;
     obj6.bar1;
@@ -88,13 +88,13 @@ declare var D: {
     [Symbol.hasInstance](value: unknown): value is D;
 };
 
-var obj7: D | string;
+declare var obj7: D | string;
 if (obj7 instanceof D) { // narrowed to D.
     obj7.foo;
     obj7.bar;
 }
 
-var obj8: any;
+declare var obj8: any;
 if (obj8 instanceof D) {
     obj8.foo;
     obj8.bar;
@@ -115,14 +115,14 @@ interface E2 {
 }
 declare var E: EConstructor;
 
-var obj9: E1 | A;
+declare var obj9: E1 | A;
 if (obj9 instanceof E) { // narrowed to E1
     obj9.foo;
     obj9.bar1;
     obj9.bar2;
 }
 
-var obj10: any;
+declare var obj10: any;
 if (obj10 instanceof E) {
     obj10.foo;
     obj10.bar1;
@@ -140,13 +140,13 @@ interface F {
 }
 declare var F: FConstructor;
 
-var obj11: F | string;
+declare var obj11: F | string;
 if (obj11 instanceof F) { // can't type narrowing, construct signature returns any.
     obj11.foo;
     obj11.bar;
 }
 
-var obj12: any;
+declare var obj12: any;
 if (obj12 instanceof F) {
     obj12.foo;
     obj12.bar;
@@ -166,13 +166,13 @@ interface G2 {
 }
 declare var G: GConstructor;
 
-var obj13: G1 | G2;
+declare var obj13: G1 | G2;
 if (obj13 instanceof G) { // narrowed to G1. G1 is return type of prototype property.
     obj13.foo1;
     obj13.foo2;
 }
 
-var obj14: any;
+declare var obj14: any;
 if (obj14 instanceof G) {
     obj14.foo1;
     obj14.foo2;
@@ -189,25 +189,25 @@ interface H {
 }
 declare var H: HConstructor;
 
-var obj15: H | string;
+declare var obj15: H | string;
 if (obj15 instanceof H) { // narrowed to H.
     obj15.foo;
     obj15.bar;
 }
 
-var obj16: any;
+declare var obj16: any;
 if (obj16 instanceof H) {
     obj16.foo1;
     obj16.foo2;
 }
 
-var obj17: any;
+declare var obj17: any;
 if (obj17 instanceof Object) { // can't narrow type from 'any' to 'Object'
     obj17.foo1;
     obj17.foo2;
 }
 
-var obj18: any;
+declare var obj18: any;
 if (obj18 instanceof Function) { // can't narrow type from 'any' to 'Function'
     obj18.foo1;
     obj18.foo2;
@@ -215,99 +215,81 @@ if (obj18 instanceof Function) { // can't narrow type from 'any' to 'Function'
 
 
 //// [typeGuardsWithInstanceOfBySymbolHasInstance.js]
-var obj1;
 if (obj1 instanceof A) { // narrowed to A.
     obj1.foo;
     obj1.bar;
 }
-var obj2;
 if (obj2 instanceof A) {
     obj2.foo;
     obj2.bar;
 }
-var obj3;
 if (obj3 instanceof B) { // narrowed to B<number>.
     obj3.foo = 1;
     obj3.foo = "str";
     obj3.bar = "str";
 }
-var obj4;
 if (obj4 instanceof B) {
     obj4.foo = "str";
     obj4.foo = 1;
     obj4.bar = "str";
 }
-var obj5;
 if (obj5 instanceof C) { // narrowed to C1.
     obj5.foo;
     obj5.c;
     obj5.bar1;
     obj5.bar2;
 }
-var obj6;
 if (obj6 instanceof C) {
     obj6.foo;
     obj6.bar1;
     obj6.bar2;
 }
-var obj7;
 if (obj7 instanceof D) { // narrowed to D.
     obj7.foo;
     obj7.bar;
 }
-var obj8;
 if (obj8 instanceof D) {
     obj8.foo;
     obj8.bar;
 }
-var obj9;
 if (obj9 instanceof E) { // narrowed to E1
     obj9.foo;
     obj9.bar1;
     obj9.bar2;
 }
-var obj10;
 if (obj10 instanceof E) {
     obj10.foo;
     obj10.bar1;
     obj10.bar2;
 }
-var obj11;
 if (obj11 instanceof F) { // can't type narrowing, construct signature returns any.
     obj11.foo;
     obj11.bar;
 }
-var obj12;
 if (obj12 instanceof F) {
     obj12.foo;
     obj12.bar;
 }
-var obj13;
 if (obj13 instanceof G) { // narrowed to G1. G1 is return type of prototype property.
     obj13.foo1;
     obj13.foo2;
 }
-var obj14;
 if (obj14 instanceof G) {
     obj14.foo1;
     obj14.foo2;
 }
-var obj15;
 if (obj15 instanceof H) { // narrowed to H.
     obj15.foo;
     obj15.bar;
 }
-var obj16;
 if (obj16 instanceof H) {
     obj16.foo1;
     obj16.foo2;
 }
-var obj17;
 if (obj17 instanceof Object) { // can't narrow type from 'any' to 'Object'
     obj17.foo1;
     obj17.foo2;
 }
-var obj18;
 if (obj18 instanceof Function) { // can't narrow type from 'any' to 'Function'
     obj18.foo1;
     obj18.foo2;
diff --git a/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.symbols b/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.symbols
index 6be6f0afde989..d215a6302cab1 100644
--- a/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.symbols
+++ b/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.symbols
@@ -26,37 +26,37 @@ declare var A: AConstructor;
 >A : Symbol(A, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 3, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 7, 11))
 >AConstructor : Symbol(AConstructor, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 0, 0))
 
-var obj1: A | string;
->obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 9, 3))
+declare var obj1: A | string;
+>obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 9, 11))
 >A : Symbol(A, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 3, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 7, 11))
 
 if (obj1 instanceof A) { // narrowed to A.
->obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 9, 3))
+>obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 9, 11))
 >A : Symbol(A, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 3, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 7, 11))
 
     obj1.foo;
 >obj1.foo : Symbol(A.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 4, 13))
->obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 9, 3))
+>obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 9, 11))
 >foo : Symbol(A.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 4, 13))
 
     obj1.bar;
->obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 9, 3))
+>obj1 : Symbol(obj1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 9, 11))
 }
 
-var obj2: any;
->obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 15, 3))
+declare var obj2: any;
+>obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 15, 11))
 
 if (obj2 instanceof A) {
->obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 15, 3))
+>obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 15, 11))
 >A : Symbol(A, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 3, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 7, 11))
 
     obj2.foo;
 >obj2.foo : Symbol(A.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 4, 13))
->obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 15, 3))
+>obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 15, 11))
 >foo : Symbol(A.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 4, 13))
 
     obj2.bar;
->obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 15, 3))
+>obj2 : Symbol(obj2, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 15, 11))
 }
 
 // a construct signature with generics
@@ -89,47 +89,47 @@ declare var B: BConstructor;
 >B : Symbol(B, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 25, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 29, 11))
 >BConstructor : Symbol(BConstructor, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 19, 1))
 
-var obj3: B<number> | string;
->obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 31, 3))
+declare var obj3: B<number> | string;
+>obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 31, 11))
 >B : Symbol(B, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 25, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 29, 11))
 
 if (obj3 instanceof B) { // narrowed to B<number>.
->obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 31, 3))
+>obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 31, 11))
 >B : Symbol(B, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 25, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 29, 11))
 
     obj3.foo = 1;
 >obj3.foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 26, 16))
->obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 31, 3))
+>obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 31, 11))
 >foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 26, 16))
 
     obj3.foo = "str";
 >obj3.foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 26, 16))
->obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 31, 3))
+>obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 31, 11))
 >foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 26, 16))
 
     obj3.bar = "str";
->obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 31, 3))
+>obj3 : Symbol(obj3, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 31, 11))
 }
 
-var obj4: any;
->obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 38, 3))
+declare var obj4: any;
+>obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 38, 11))
 
 if (obj4 instanceof B) {
->obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 38, 3))
+>obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 38, 11))
 >B : Symbol(B, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 25, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 29, 11))
 
     obj4.foo = "str";
 >obj4.foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 26, 16))
->obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 38, 3))
+>obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 38, 11))
 >foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 26, 16))
 
     obj4.foo = 1;
 >obj4.foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 26, 16))
->obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 38, 3))
+>obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 38, 11))
 >foo : Symbol(B.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 26, 16))
 
     obj4.bar = "str";
->obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 38, 3))
+>obj4 : Symbol(obj4, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 38, 11))
 }
 
 // has multiple construct signature
@@ -182,51 +182,51 @@ declare var C: CConstructor;
 >C : Symbol(C, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 61, 11))
 >CConstructor : Symbol(CConstructor, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 43, 1))
 
-var obj5: C1 | A;
->obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 63, 3))
+declare var obj5: C1 | A;
+>obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 63, 11))
 >C1 : Symbol(C1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 50, 1))
 >A : Symbol(A, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 3, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 7, 11))
 
 if (obj5 instanceof C) { // narrowed to C1.
->obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 63, 3))
+>obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 63, 11))
 >C : Symbol(C, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 61, 11))
 
     obj5.foo;
 >obj5.foo : Symbol(C1.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 51, 14))
->obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 63, 3))
+>obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 63, 11))
 >foo : Symbol(C1.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 51, 14))
 
     obj5.c;
 >obj5.c : Symbol(C1.c, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 52, 16))
->obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 63, 3))
+>obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 63, 11))
 >c : Symbol(C1.c, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 52, 16))
 
     obj5.bar1;
 >obj5.bar1 : Symbol(C1.bar1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 53, 14))
->obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 63, 3))
+>obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 63, 11))
 >bar1 : Symbol(C1.bar1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 53, 14))
 
     obj5.bar2;
->obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 63, 3))
+>obj5 : Symbol(obj5, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 63, 11))
 }
 
-var obj6: any;
->obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 71, 3))
+declare var obj6: any;
+>obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 71, 11))
 
 if (obj6 instanceof C) {
->obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 71, 3))
+>obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 71, 11))
 >C : Symbol(C, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 61, 11))
 
     obj6.foo;
 >obj6.foo : Symbol(foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 51, 14), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 56, 14))
->obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 71, 3))
+>obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 71, 11))
 >foo : Symbol(foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 51, 14), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 56, 14))
 
     obj6.bar1;
->obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 71, 3))
+>obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 71, 11))
 
     obj6.bar2;
->obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 71, 3))
+>obj6 : Symbol(obj6, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 71, 11))
 }
 
 // with object type literal
@@ -253,37 +253,37 @@ declare var D: {
 
 };
 
-var obj7: D | string;
->obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 87, 3))
+declare var obj7: D | string;
+>obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 87, 11))
 >D : Symbol(D, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 76, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 82, 11))
 
 if (obj7 instanceof D) { // narrowed to D.
->obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 87, 3))
+>obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 87, 11))
 >D : Symbol(D, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 76, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 82, 11))
 
     obj7.foo;
 >obj7.foo : Symbol(D.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 79, 13))
->obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 87, 3))
+>obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 87, 11))
 >foo : Symbol(D.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 79, 13))
 
     obj7.bar;
->obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 87, 3))
+>obj7 : Symbol(obj7, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 87, 11))
 }
 
-var obj8: any;
->obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 93, 3))
+declare var obj8: any;
+>obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 93, 11))
 
 if (obj8 instanceof D) {
->obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 93, 3))
+>obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 93, 11))
 >D : Symbol(D, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 76, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 82, 11))
 
     obj8.foo;
 >obj8.foo : Symbol(D.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 79, 13))
->obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 93, 3))
+>obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 93, 11))
 >foo : Symbol(D.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 79, 13))
 
     obj8.bar;
->obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 93, 3))
+>obj8 : Symbol(obj8, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 93, 11))
 }
 
 // a construct signature that returns a union type
@@ -326,46 +326,46 @@ declare var E: EConstructor;
 >E : Symbol(E, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 112, 11))
 >EConstructor : Symbol(EConstructor, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 97, 1))
 
-var obj9: E1 | A;
->obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 114, 3))
+declare var obj9: E1 | A;
+>obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 114, 11))
 >E1 : Symbol(E1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 103, 1))
 >A : Symbol(A, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 3, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 7, 11))
 
 if (obj9 instanceof E) { // narrowed to E1
->obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 114, 3))
+>obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 114, 11))
 >E : Symbol(E, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 112, 11))
 
     obj9.foo;
 >obj9.foo : Symbol(E1.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 104, 14))
->obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 114, 3))
+>obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 114, 11))
 >foo : Symbol(E1.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 104, 14))
 
     obj9.bar1;
 >obj9.bar1 : Symbol(E1.bar1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 105, 16))
->obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 114, 3))
+>obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 114, 11))
 >bar1 : Symbol(E1.bar1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 105, 16))
 
     obj9.bar2;
->obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 114, 3))
+>obj9 : Symbol(obj9, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 114, 11))
 }
 
-var obj10: any;
->obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 121, 3))
+declare var obj10: any;
+>obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 121, 11))
 
 if (obj10 instanceof E) {
->obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 121, 3))
+>obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 121, 11))
 >E : Symbol(E, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 112, 11))
 
     obj10.foo;
 >obj10.foo : Symbol(foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 104, 14), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 108, 14))
->obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 121, 3))
+>obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 121, 11))
 >foo : Symbol(foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 104, 14), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 108, 14))
 
     obj10.bar1;
->obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 121, 3))
+>obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 121, 11))
 
     obj10.bar2;
->obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 121, 3))
+>obj10 : Symbol(obj10, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 121, 11))
 }
 
 // a construct signature that returns any
@@ -394,33 +394,33 @@ declare var F: FConstructor;
 >F : Symbol(F, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 132, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 137, 11))
 >FConstructor : Symbol(FConstructor, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 126, 1))
 
-var obj11: F | string;
->obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 139, 3))
+declare var obj11: F | string;
+>obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 139, 11))
 >F : Symbol(F, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 132, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 137, 11))
 
 if (obj11 instanceof F) { // can't type narrowing, construct signature returns any.
->obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 139, 3))
+>obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 139, 11))
 >F : Symbol(F, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 132, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 137, 11))
 
     obj11.foo;
->obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 139, 3))
+>obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 139, 11))
 
     obj11.bar;
->obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 139, 3))
+>obj11 : Symbol(obj11, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 139, 11))
 }
 
-var obj12: any;
->obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 145, 3))
+declare var obj12: any;
+>obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 145, 11))
 
 if (obj12 instanceof F) {
->obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 145, 3))
+>obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 145, 11))
 >F : Symbol(F, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 132, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 137, 11))
 
     obj12.foo;
->obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 145, 3))
+>obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 145, 11))
 
     obj12.bar;
->obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 145, 3))
+>obj12 : Symbol(obj12, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 145, 11))
 }
 
 // a type with a prototype, it overrides the construct signature
@@ -459,38 +459,38 @@ declare var G: GConstructor;
 >G : Symbol(G, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 163, 11))
 >GConstructor : Symbol(GConstructor, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 149, 1))
 
-var obj13: G1 | G2;
->obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 165, 3))
+declare var obj13: G1 | G2;
+>obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 165, 11))
 >G1 : Symbol(G1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 156, 1))
 >G2 : Symbol(G2, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 159, 1))
 
 if (obj13 instanceof G) { // narrowed to G1. G1 is return type of prototype property.
->obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 165, 3))
+>obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 165, 11))
 >G : Symbol(G, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 163, 11))
 
     obj13.foo1;
 >obj13.foo1 : Symbol(G1.foo1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 157, 14))
->obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 165, 3))
+>obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 165, 11))
 >foo1 : Symbol(G1.foo1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 157, 14))
 
     obj13.foo2;
->obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 165, 3))
+>obj13 : Symbol(obj13, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 165, 11))
 }
 
-var obj14: any;
->obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 171, 3))
+declare var obj14: any;
+>obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 171, 11))
 
 if (obj14 instanceof G) {
->obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 171, 3))
+>obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 171, 11))
 >G : Symbol(G, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 163, 11))
 
     obj14.foo1;
 >obj14.foo1 : Symbol(G1.foo1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 157, 14))
->obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 171, 3))
+>obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 171, 11))
 >foo1 : Symbol(G1.foo1, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 157, 14))
 
     obj14.foo2;
->obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 171, 3))
+>obj14 : Symbol(obj14, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 171, 11))
 }
 
 // a type with a prototype that has any type
@@ -522,62 +522,62 @@ declare var H: HConstructor;
 >H : Symbol(H, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 182, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 186, 11))
 >HConstructor : Symbol(HConstructor, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 175, 1))
 
-var obj15: H | string;
->obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 188, 3))
+declare var obj15: H | string;
+>obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 188, 11))
 >H : Symbol(H, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 182, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 186, 11))
 
 if (obj15 instanceof H) { // narrowed to H.
->obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 188, 3))
+>obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 188, 11))
 >H : Symbol(H, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 182, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 186, 11))
 
     obj15.foo;
 >obj15.foo : Symbol(H.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 183, 13))
->obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 188, 3))
+>obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 188, 11))
 >foo : Symbol(H.foo, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 183, 13))
 
     obj15.bar;
->obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 188, 3))
+>obj15 : Symbol(obj15, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 188, 11))
 }
 
-var obj16: any;
->obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 194, 3))
+declare var obj16: any;
+>obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 194, 11))
 
 if (obj16 instanceof H) {
->obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 194, 3))
+>obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 194, 11))
 >H : Symbol(H, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 182, 1), Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 186, 11))
 
     obj16.foo1;
->obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 194, 3))
+>obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 194, 11))
 
     obj16.foo2;
->obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 194, 3))
+>obj16 : Symbol(obj16, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 194, 11))
 }
 
-var obj17: any;
->obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 200, 3))
+declare var obj17: any;
+>obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 200, 11))
 
 if (obj17 instanceof Object) { // can't narrow type from 'any' to 'Object'
->obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 200, 3))
+>obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 200, 11))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
     obj17.foo1;
->obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 200, 3))
+>obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 200, 11))
 
     obj17.foo2;
->obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 200, 3))
+>obj17 : Symbol(obj17, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 200, 11))
 }
 
-var obj18: any;
->obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 206, 3))
+declare var obj18: any;
+>obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 206, 11))
 
 if (obj18 instanceof Function) { // can't narrow type from 'any' to 'Function'
->obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 206, 3))
+>obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 206, 11))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.esnext.decorators.d.ts, --, --))
 
     obj18.foo1;
->obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 206, 3))
+>obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 206, 11))
 
     obj18.foo2;
->obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 206, 3))
+>obj18 : Symbol(obj18, Decl(typeGuardsWithInstanceOfBySymbolHasInstance.ts, 206, 11))
 }
 
diff --git a/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.types b/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.types
index f0f867b8e235f..242e44a54a0f4 100644
--- a/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.types
+++ b/tests/baselines/reference/typeGuardsWithInstanceOfBySymbolHasInstance.types
@@ -24,7 +24,7 @@ declare var A: AConstructor;
 >A : AConstructor
 >  : ^^^^^^^^^^^^
 
-var obj1: A | string;
+declare var obj1: A | string;
 >obj1 : string | A
 >     : ^^^^^^^^^^
 
@@ -53,7 +53,7 @@ if (obj1 instanceof A) { // narrowed to A.
 >    : ^^^
 }
 
-var obj2: any;
+declare var obj2: any;
 >obj2 : any
 >     : ^^^
 
@@ -106,7 +106,7 @@ declare var B: BConstructor;
 >B : BConstructor
 >  : ^^^^^^^^^^^^
 
-var obj3: B<number> | string;
+declare var obj3: B<number> | string;
 >obj3 : string | B<number>
 >     : ^^^^^^^^^^^^^^^^^^
 
@@ -155,7 +155,7 @@ if (obj3 instanceof B) { // narrowed to B<number>.
 >      : ^^^^^
 }
 
-var obj4: any;
+declare var obj4: any;
 >obj4 : any
 >     : ^^^
 
@@ -256,7 +256,7 @@ declare var C: CConstructor;
 >C : CConstructor
 >  : ^^^^^^^^^^^^
 
-var obj5: C1 | A;
+declare var obj5: C1 | A;
 >obj5 : A | C1
 >     : ^^^^^^
 
@@ -301,7 +301,7 @@ if (obj5 instanceof C) { // narrowed to C1.
 >     : ^^^
 }
 
-var obj6: any;
+declare var obj6: any;
 >obj6 : any
 >     : ^^^
 
@@ -363,7 +363,7 @@ declare var D: {
 
 };
 
-var obj7: D | string;
+declare var obj7: D | string;
 >obj7 : string | D
 >     : ^^^^^^^^^^
 
@@ -392,7 +392,7 @@ if (obj7 instanceof D) { // narrowed to D.
 >    : ^^^
 }
 
-var obj8: any;
+declare var obj8: any;
 >obj8 : any
 >     : ^^^
 
@@ -458,7 +458,7 @@ declare var E: EConstructor;
 >E : EConstructor
 >  : ^^^^^^^^^^^^
 
-var obj9: E1 | A;
+declare var obj9: E1 | A;
 >obj9 : A | E1
 >     : ^^^^^^
 
@@ -495,7 +495,7 @@ if (obj9 instanceof E) { // narrowed to E1
 >     : ^^^
 }
 
-var obj10: any;
+declare var obj10: any;
 >obj10 : any
 >      : ^^^
 
@@ -560,7 +560,7 @@ declare var F: FConstructor;
 >F : FConstructor
 >  : ^^^^^^^^^^^^
 
-var obj11: F | string;
+declare var obj11: F | string;
 >obj11 : string | F
 >      : ^^^^^^^^^^
 
@@ -589,7 +589,7 @@ if (obj11 instanceof F) { // can't type narrowing, construct signature returns a
 >    : ^^^
 }
 
-var obj12: any;
+declare var obj12: any;
 >obj12 : any
 >      : ^^^
 
@@ -651,7 +651,7 @@ declare var G: GConstructor;
 >G : GConstructor
 >  : ^^^^^^^^^^^^
 
-var obj13: G1 | G2;
+declare var obj13: G1 | G2;
 >obj13 : G1 | G2
 >      : ^^^^^^^
 
@@ -680,7 +680,7 @@ if (obj13 instanceof G) { // narrowed to G1. G1 is return type of prototype prop
 >     : ^^^
 }
 
-var obj14: any;
+declare var obj14: any;
 >obj14 : any
 >      : ^^^
 
@@ -737,7 +737,7 @@ declare var H: HConstructor;
 >H : HConstructor
 >  : ^^^^^^^^^^^^
 
-var obj15: H | string;
+declare var obj15: H | string;
 >obj15 : string | H
 >      : ^^^^^^^^^^
 
@@ -766,7 +766,7 @@ if (obj15 instanceof H) { // narrowed to H.
 >    : ^^^
 }
 
-var obj16: any;
+declare var obj16: any;
 >obj16 : any
 >      : ^^^
 
@@ -795,7 +795,7 @@ if (obj16 instanceof H) {
 >     : ^^^
 }
 
-var obj17: any;
+declare var obj17: any;
 >obj17 : any
 >      : ^^^
 
@@ -824,7 +824,7 @@ if (obj17 instanceof Object) { // can't narrow type from 'any' to 'Object'
 >     : ^^^
 }
 
-var obj18: any;
+declare var obj18: any;
 >obj18 : any
 >      : ^^^
 
diff --git a/tests/baselines/reference/typeMatch1.errors.txt b/tests/baselines/reference/typeMatch1.errors.txt
index ed2421871edf0..e86395ed3c8a1 100644
--- a/tests/baselines/reference/typeMatch1.errors.txt
+++ b/tests/baselines/reference/typeMatch1.errors.txt
@@ -8,10 +8,10 @@ typeMatch1.ts(20,1): error TS2367: This comparison appears to be unintentional b
     interface I { z; }
     interface I2 { z; }
     
-    var x1: { z: number; f(n: number): string; f(s: string): number; }
+    declare var x1: { z: number; f(n: number): string; f(s: string): number; }
     var x2: { z:number;f:{(n:number):string;(s:string):number;}; } = x1;
-    var i:I;
-    var i2:I2;
+    declare var i:I;
+    declare var i2:I2;
     var x3:{ z; }= i;
     var x4:{ z; }= i2;
     var x5:I=i2;
diff --git a/tests/baselines/reference/typeMatch1.js b/tests/baselines/reference/typeMatch1.js
index b135b482de904..9276f327a7a1d 100644
--- a/tests/baselines/reference/typeMatch1.js
+++ b/tests/baselines/reference/typeMatch1.js
@@ -4,10 +4,10 @@
 interface I { z; }
 interface I2 { z; }
 
-var x1: { z: number; f(n: number): string; f(s: string): number; }
+declare var x1: { z: number; f(n: number): string; f(s: string): number; }
 var x2: { z:number;f:{(n:number):string;(s:string):number;}; } = x1;
-var i:I;
-var i2:I2;
+declare var i:I;
+declare var i2:I2;
 var x3:{ z; }= i;
 var x4:{ z; }= i2;
 var x5:I=i2;
@@ -26,10 +26,7 @@ C==C;
 
 
 //// [typeMatch1.js]
-var x1;
 var x2 = x1;
-var i;
-var i2;
 var x3 = i;
 var x4 = i2;
 var x5 = i2;
diff --git a/tests/baselines/reference/typeMatch1.symbols b/tests/baselines/reference/typeMatch1.symbols
index 5df3c541d9962..5dd7abec8ada4 100644
--- a/tests/baselines/reference/typeMatch1.symbols
+++ b/tests/baselines/reference/typeMatch1.symbols
@@ -9,13 +9,13 @@ interface I2 { z; }
 >I2 : Symbol(I2, Decl(typeMatch1.ts, 0, 18))
 >z : Symbol(I2.z, Decl(typeMatch1.ts, 1, 14))
 
-var x1: { z: number; f(n: number): string; f(s: string): number; }
->x1 : Symbol(x1, Decl(typeMatch1.ts, 3, 3))
->z : Symbol(z, Decl(typeMatch1.ts, 3, 9))
->f : Symbol(f, Decl(typeMatch1.ts, 3, 20), Decl(typeMatch1.ts, 3, 42))
->n : Symbol(n, Decl(typeMatch1.ts, 3, 23))
->f : Symbol(f, Decl(typeMatch1.ts, 3, 20), Decl(typeMatch1.ts, 3, 42))
->s : Symbol(s, Decl(typeMatch1.ts, 3, 45))
+declare var x1: { z: number; f(n: number): string; f(s: string): number; }
+>x1 : Symbol(x1, Decl(typeMatch1.ts, 3, 11))
+>z : Symbol(z, Decl(typeMatch1.ts, 3, 17))
+>f : Symbol(f, Decl(typeMatch1.ts, 3, 28), Decl(typeMatch1.ts, 3, 50))
+>n : Symbol(n, Decl(typeMatch1.ts, 3, 31))
+>f : Symbol(f, Decl(typeMatch1.ts, 3, 28), Decl(typeMatch1.ts, 3, 50))
+>s : Symbol(s, Decl(typeMatch1.ts, 3, 53))
 
 var x2: { z:number;f:{(n:number):string;(s:string):number;}; } = x1;
 >x2 : Symbol(x2, Decl(typeMatch1.ts, 4, 3))
@@ -23,30 +23,30 @@ var x2: { z:number;f:{(n:number):string;(s:string):number;}; } = x1;
 >f : Symbol(f, Decl(typeMatch1.ts, 4, 19))
 >n : Symbol(n, Decl(typeMatch1.ts, 4, 23))
 >s : Symbol(s, Decl(typeMatch1.ts, 4, 41))
->x1 : Symbol(x1, Decl(typeMatch1.ts, 3, 3))
+>x1 : Symbol(x1, Decl(typeMatch1.ts, 3, 11))
 
-var i:I;
->i : Symbol(i, Decl(typeMatch1.ts, 5, 3))
+declare var i:I;
+>i : Symbol(i, Decl(typeMatch1.ts, 5, 11))
 >I : Symbol(I, Decl(typeMatch1.ts, 0, 0))
 
-var i2:I2;
->i2 : Symbol(i2, Decl(typeMatch1.ts, 6, 3))
+declare var i2:I2;
+>i2 : Symbol(i2, Decl(typeMatch1.ts, 6, 11))
 >I2 : Symbol(I2, Decl(typeMatch1.ts, 0, 18))
 
 var x3:{ z; }= i;
 >x3 : Symbol(x3, Decl(typeMatch1.ts, 7, 3))
 >z : Symbol(z, Decl(typeMatch1.ts, 7, 8))
->i : Symbol(i, Decl(typeMatch1.ts, 5, 3))
+>i : Symbol(i, Decl(typeMatch1.ts, 5, 11))
 
 var x4:{ z; }= i2;
 >x4 : Symbol(x4, Decl(typeMatch1.ts, 8, 3))
 >z : Symbol(z, Decl(typeMatch1.ts, 8, 8))
->i2 : Symbol(i2, Decl(typeMatch1.ts, 6, 3))
+>i2 : Symbol(i2, Decl(typeMatch1.ts, 6, 11))
 
 var x5:I=i2;
 >x5 : Symbol(x5, Decl(typeMatch1.ts, 9, 3))
 >I : Symbol(I, Decl(typeMatch1.ts, 0, 0))
->i2 : Symbol(i2, Decl(typeMatch1.ts, 6, 3))
+>i2 : Symbol(i2, Decl(typeMatch1.ts, 6, 11))
 
 class C { private x; }
 >C : Symbol(C, Decl(typeMatch1.ts, 9, 12))
diff --git a/tests/baselines/reference/typeMatch1.types b/tests/baselines/reference/typeMatch1.types
index 4b11351c1160a..25c425921461d 100644
--- a/tests/baselines/reference/typeMatch1.types
+++ b/tests/baselines/reference/typeMatch1.types
@@ -9,7 +9,7 @@ interface I2 { z; }
 >z : any
 >  : ^^^
 
-var x1: { z: number; f(n: number): string; f(s: string): number; }
+declare var x1: { z: number; f(n: number): string; f(s: string): number; }
 >x1 : { z: number; f(n: number): string; f(s: string): number; }
 >   : ^^^^^      ^^^^ ^^      ^^^      ^^^^ ^^      ^^^      ^^^
 >z : number
@@ -37,11 +37,11 @@ var x2: { z:number;f:{(n:number):string;(s:string):number;}; } = x1;
 >x1 : { z: number; f(n: number): string; f(s: string): number; }
 >   : ^^^^^      ^^^^ ^^      ^^^      ^^^^ ^^      ^^^      ^^^
 
-var i:I;
+declare var i:I;
 >i : I
 >  : ^
 
-var i2:I2;
+declare var i2:I2;
 >i2 : I2
 >   : ^^
 
diff --git a/tests/baselines/reference/typeOfThisGeneral.errors.txt b/tests/baselines/reference/typeOfThisGeneral.errors.txt
index 04bc11e51718c..75217b8b0843a 100644
--- a/tests/baselines/reference/typeOfThisGeneral.errors.txt
+++ b/tests/baselines/reference/typeOfThisGeneral.errors.txt
@@ -18,20 +18,20 @@ typeOfThisGeneral.ts(106,13): error TS2403: Subsequent variable declarations mus
         constructor() {
             //type of 'this' in constructor body is the class instance type
             var p = this.canary;
-            var p: number;
+            var p!: number;
             this.canary = 3;
         }
     
         //type of 'this' in member function param list is the class instance type
         memberFunc(t = this) {
-            var t: MyTestClass;
+            var t!: MyTestClass;
                 ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 't' must be of type 'this', but here has type 'MyTestClass'.
 !!! related TS6203 typeOfThisGeneral.ts:13:16: 't' was also declared here.
     
             //type of 'this' in member function body is the class instance type
             var p = this;
-            var p: MyTestClass;
+            var p!: MyTestClass;
                 ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'p' must be of type 'this', but here has type 'MyTestClass'.
 !!! related TS6203 typeOfThisGeneral.ts:17:13: 'p' was also declared here.
@@ -40,7 +40,7 @@ typeOfThisGeneral.ts(106,13): error TS2403: Subsequent variable declarations mus
         //type of 'this' in member accessor(get and set) body is the class instance type
         get prop() {
             var p = this;
-            var p: MyTestClass;
+            var p!: MyTestClass;
                 ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'p' must be of type 'this', but here has type 'MyTestClass'.
 !!! related TS6203 typeOfThisGeneral.ts:23:13: 'p' was also declared here.
@@ -48,7 +48,7 @@ typeOfThisGeneral.ts(106,13): error TS2403: Subsequent variable declarations mus
         }
         set prop(v) {
             var p = this;
-            var p: MyTestClass;
+            var p!: MyTestClass;
                 ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'p' must be of type 'this', but here has type 'MyTestClass'.
 !!! related TS6203 typeOfThisGeneral.ts:28:13: 'p' was also declared here.
@@ -59,7 +59,7 @@ typeOfThisGeneral.ts(106,13): error TS2403: Subsequent variable declarations mus
         someFunc = () => {
             //type of 'this' in member variable initializer is the class instance type
             var t = this;
-            var t: MyTestClass;
+            var t!: MyTestClass;
                 ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 't' must be of type 'this', but here has type 'MyTestClass'.
 !!! related TS6203 typeOfThisGeneral.ts:36:13: 't' was also declared here.
@@ -67,13 +67,13 @@ typeOfThisGeneral.ts(106,13): error TS2403: Subsequent variable declarations mus
     
         //type of 'this' in static function param list is constructor function type
         static staticFn(t = this) {
-            var t: typeof MyTestClass;
+            var t!: typeof MyTestClass;
             var t = MyTestClass;
             t.staticCanary;
     
             //type of 'this' in static function body is constructor function type
             var p = this;
-            var p: typeof MyTestClass;
+            var p!: typeof MyTestClass;
             var p = MyTestClass;
             p.staticCanary;
         }
@@ -81,7 +81,7 @@ typeOfThisGeneral.ts(106,13): error TS2403: Subsequent variable declarations mus
         static get staticProp() {
             //type of 'this' in static accessor body is constructor function type
             var p = this;
-            var p: typeof MyTestClass;
+            var p!: typeof MyTestClass;
             var p = MyTestClass;
             p.staticCanary;
             return this;
@@ -89,7 +89,7 @@ typeOfThisGeneral.ts(106,13): error TS2403: Subsequent variable declarations mus
         static set staticProp(v: typeof MyTestClass) {
             //type of 'this' in static accessor body is constructor function type
             var p = this;
-            var p: typeof MyTestClass;
+            var p!: typeof MyTestClass;
             var p = MyTestClass;
             p.staticCanary;
         }
@@ -102,20 +102,20 @@ typeOfThisGeneral.ts(106,13): error TS2403: Subsequent variable declarations mus
         constructor() {
             //type of 'this' in constructor body is the class instance type
             var p = this.canary;
-            var p: number;
+            var p!: number;
             this.canary = 3;
         }
     
         //type of 'this' in member function param list is the class instance type
         memberFunc(t = this) {
-            var t: MyGenericTestClass<T, U>;
+            var t!: MyGenericTestClass<T, U>;
                 ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 't' must be of type 'this', but here has type 'MyGenericTestClass<T, U>'.
 !!! related TS6203 typeOfThisGeneral.ts:82:16: 't' was also declared here.
     
             //type of 'this' in member function body is the class instance type
             var p = this;
-            var p: MyGenericTestClass<T, U>;
+            var p!: MyGenericTestClass<T, U>;
                 ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'p' must be of type 'this', but here has type 'MyGenericTestClass<T, U>'.
 !!! related TS6203 typeOfThisGeneral.ts:86:13: 'p' was also declared here.
@@ -124,7 +124,7 @@ typeOfThisGeneral.ts(106,13): error TS2403: Subsequent variable declarations mus
         //type of 'this' in member accessor(get and set) body is the class instance type
         get prop() {
             var p = this;
-            var p: MyGenericTestClass<T, U>;
+            var p!: MyGenericTestClass<T, U>;
                 ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'p' must be of type 'this', but here has type 'MyGenericTestClass<T, U>'.
 !!! related TS6203 typeOfThisGeneral.ts:92:13: 'p' was also declared here.
@@ -132,7 +132,7 @@ typeOfThisGeneral.ts(106,13): error TS2403: Subsequent variable declarations mus
         }
         set prop(v) {
             var p = this;
-            var p: MyGenericTestClass<T, U>;
+            var p!: MyGenericTestClass<T, U>;
                 ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'p' must be of type 'this', but here has type 'MyGenericTestClass<T, U>'.
 !!! related TS6203 typeOfThisGeneral.ts:97:13: 'p' was also declared here.
@@ -143,7 +143,7 @@ typeOfThisGeneral.ts(106,13): error TS2403: Subsequent variable declarations mus
         someFunc = () => {
             //type of 'this' in member variable initializer is the class instance type
             var t = this;
-            var t: MyGenericTestClass<T, U>;
+            var t!: MyGenericTestClass<T, U>;
                 ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 't' must be of type 'this', but here has type 'MyGenericTestClass<T, U>'.
 !!! related TS6203 typeOfThisGeneral.ts:105:13: 't' was also declared here.
@@ -151,13 +151,13 @@ typeOfThisGeneral.ts(106,13): error TS2403: Subsequent variable declarations mus
     
         //type of 'this' in static function param list is constructor function type
         static staticFn(t = this) {
-            var t: typeof MyGenericTestClass;
+            var t!: typeof MyGenericTestClass;
             var t = MyGenericTestClass;
             t.staticCanary;
     
             //type of 'this' in static function body is constructor function type
             var p = this;
-            var p: typeof MyGenericTestClass;
+            var p!: typeof MyGenericTestClass;
             var p = MyGenericTestClass;
             p.staticCanary;
         }
@@ -165,7 +165,7 @@ typeOfThisGeneral.ts(106,13): error TS2403: Subsequent variable declarations mus
         static get staticProp() {
             //type of 'this' in static accessor body is constructor function type
             var p = this;
-            var p: typeof MyGenericTestClass;
+            var p!: typeof MyGenericTestClass;
             var p = MyGenericTestClass;
             p.staticCanary;
             return this;
@@ -173,7 +173,7 @@ typeOfThisGeneral.ts(106,13): error TS2403: Subsequent variable declarations mus
         static set staticProp(v: typeof MyGenericTestClass) {
             //type of 'this' in static accessor body is constructor function type
             var p = this;
-            var p: typeof MyGenericTestClass;
+            var p!: typeof MyGenericTestClass;
             var p = MyGenericTestClass;
             p.staticCanary;
         }
@@ -181,39 +181,39 @@ typeOfThisGeneral.ts(106,13): error TS2403: Subsequent variable declarations mus
     
     //type of 'this' in a function declaration param list is Any
     function fn(s = this) {
-        var s: any;
+        var s!: any;
         s.spaaaaaaace = 4;
     
         //type of 'this' in a function declaration body is Any
-        var t: any;
+        var t!: any;
         var t = this;
         this.spaaaaace = 4;
     }
     
     //type of 'this' in a function expression param list list is Any
     var q1 = function (s = this) {
-        var s: any;
+        var s!: any;
         s.spaaaaaaace = 4;
     
         //type of 'this' in a function expression body is Any
-        var t: any;
+        var t!: any;
         var t = this;
         this.spaaaaace = 4;
     }
     
     //type of 'this' in a fat arrow expression param list is typeof globalThis
     var q2 = (s = this) => {
-        var s: typeof globalThis;
+        var s!: typeof globalThis;
         s.spaaaaaaace = 4;
     
         //type of 'this' in a fat arrow expression body is typeof globalThis
-        var t: typeof globalThis;
+        var t!: typeof globalThis;
         var t = this;
         this.spaaaaace = 4;
     }
     
-    //type of 'this' in global module is GlobalThis
-    var t: typeof globalThis;
+    //type of 'this' in global namespace is GlobalThis
+    var t!: typeof globalThis;
     var t = this;
     this.spaaaaace = 4;
     
diff --git a/tests/baselines/reference/typeOfThisGeneral.js b/tests/baselines/reference/typeOfThisGeneral.js
index e474f566f62f2..031ca1e0ac58c 100644
--- a/tests/baselines/reference/typeOfThisGeneral.js
+++ b/tests/baselines/reference/typeOfThisGeneral.js
@@ -8,28 +8,28 @@ class MyTestClass {
     constructor() {
         //type of 'this' in constructor body is the class instance type
         var p = this.canary;
-        var p: number;
+        var p!: number;
         this.canary = 3;
     }
 
     //type of 'this' in member function param list is the class instance type
     memberFunc(t = this) {
-        var t: MyTestClass;
+        var t!: MyTestClass;
 
         //type of 'this' in member function body is the class instance type
         var p = this;
-        var p: MyTestClass;
+        var p!: MyTestClass;
     }
 
     //type of 'this' in member accessor(get and set) body is the class instance type
     get prop() {
         var p = this;
-        var p: MyTestClass;
+        var p!: MyTestClass;
         return this;
     }
     set prop(v) {
         var p = this;
-        var p: MyTestClass;
+        var p!: MyTestClass;
         p = v;
         v = p;
     }
@@ -37,18 +37,18 @@ class MyTestClass {
     someFunc = () => {
         //type of 'this' in member variable initializer is the class instance type
         var t = this;
-        var t: MyTestClass;
+        var t!: MyTestClass;
     };
 
     //type of 'this' in static function param list is constructor function type
     static staticFn(t = this) {
-        var t: typeof MyTestClass;
+        var t!: typeof MyTestClass;
         var t = MyTestClass;
         t.staticCanary;
 
         //type of 'this' in static function body is constructor function type
         var p = this;
-        var p: typeof MyTestClass;
+        var p!: typeof MyTestClass;
         var p = MyTestClass;
         p.staticCanary;
     }
@@ -56,7 +56,7 @@ class MyTestClass {
     static get staticProp() {
         //type of 'this' in static accessor body is constructor function type
         var p = this;
-        var p: typeof MyTestClass;
+        var p!: typeof MyTestClass;
         var p = MyTestClass;
         p.staticCanary;
         return this;
@@ -64,7 +64,7 @@ class MyTestClass {
     static set staticProp(v: typeof MyTestClass) {
         //type of 'this' in static accessor body is constructor function type
         var p = this;
-        var p: typeof MyTestClass;
+        var p!: typeof MyTestClass;
         var p = MyTestClass;
         p.staticCanary;
     }
@@ -77,28 +77,28 @@ class MyGenericTestClass<T, U> {
     constructor() {
         //type of 'this' in constructor body is the class instance type
         var p = this.canary;
-        var p: number;
+        var p!: number;
         this.canary = 3;
     }
 
     //type of 'this' in member function param list is the class instance type
     memberFunc(t = this) {
-        var t: MyGenericTestClass<T, U>;
+        var t!: MyGenericTestClass<T, U>;
 
         //type of 'this' in member function body is the class instance type
         var p = this;
-        var p: MyGenericTestClass<T, U>;
+        var p!: MyGenericTestClass<T, U>;
     }
 
     //type of 'this' in member accessor(get and set) body is the class instance type
     get prop() {
         var p = this;
-        var p: MyGenericTestClass<T, U>;
+        var p!: MyGenericTestClass<T, U>;
         return this;
     }
     set prop(v) {
         var p = this;
-        var p: MyGenericTestClass<T, U>;
+        var p!: MyGenericTestClass<T, U>;
         p = v;
         v = p;
     }
@@ -106,18 +106,18 @@ class MyGenericTestClass<T, U> {
     someFunc = () => {
         //type of 'this' in member variable initializer is the class instance type
         var t = this;
-        var t: MyGenericTestClass<T, U>;
+        var t!: MyGenericTestClass<T, U>;
     };
 
     //type of 'this' in static function param list is constructor function type
     static staticFn(t = this) {
-        var t: typeof MyGenericTestClass;
+        var t!: typeof MyGenericTestClass;
         var t = MyGenericTestClass;
         t.staticCanary;
 
         //type of 'this' in static function body is constructor function type
         var p = this;
-        var p: typeof MyGenericTestClass;
+        var p!: typeof MyGenericTestClass;
         var p = MyGenericTestClass;
         p.staticCanary;
     }
@@ -125,7 +125,7 @@ class MyGenericTestClass<T, U> {
     static get staticProp() {
         //type of 'this' in static accessor body is constructor function type
         var p = this;
-        var p: typeof MyGenericTestClass;
+        var p!: typeof MyGenericTestClass;
         var p = MyGenericTestClass;
         p.staticCanary;
         return this;
@@ -133,7 +133,7 @@ class MyGenericTestClass<T, U> {
     static set staticProp(v: typeof MyGenericTestClass) {
         //type of 'this' in static accessor body is constructor function type
         var p = this;
-        var p: typeof MyGenericTestClass;
+        var p!: typeof MyGenericTestClass;
         var p = MyGenericTestClass;
         p.staticCanary;
     }
@@ -141,39 +141,39 @@ class MyGenericTestClass<T, U> {
 
 //type of 'this' in a function declaration param list is Any
 function fn(s = this) {
-    var s: any;
+    var s!: any;
     s.spaaaaaaace = 4;
 
     //type of 'this' in a function declaration body is Any
-    var t: any;
+    var t!: any;
     var t = this;
     this.spaaaaace = 4;
 }
 
 //type of 'this' in a function expression param list list is Any
 var q1 = function (s = this) {
-    var s: any;
+    var s!: any;
     s.spaaaaaaace = 4;
 
     //type of 'this' in a function expression body is Any
-    var t: any;
+    var t!: any;
     var t = this;
     this.spaaaaace = 4;
 }
 
 //type of 'this' in a fat arrow expression param list is typeof globalThis
 var q2 = (s = this) => {
-    var s: typeof globalThis;
+    var s!: typeof globalThis;
     s.spaaaaaaace = 4;
 
     //type of 'this' in a fat arrow expression body is typeof globalThis
-    var t: typeof globalThis;
+    var t!: typeof globalThis;
     var t = this;
     this.spaaaaace = 4;
 }
 
-//type of 'this' in global module is GlobalThis
-var t: typeof globalThis;
+//type of 'this' in global namespace is GlobalThis
+var t!: typeof globalThis;
 var t = this;
 this.spaaaaace = 4;
 
@@ -323,7 +323,7 @@ var q2 = (s = this) => {
     var t = this;
     this.spaaaaace = 4;
 };
-//type of 'this' in global module is GlobalThis
+//type of 'this' in global namespace is GlobalThis
 var t;
 var t = this;
 this.spaaaaace = 4;
diff --git a/tests/baselines/reference/typeOfThisGeneral.symbols b/tests/baselines/reference/typeOfThisGeneral.symbols
index 173801468f60f..c64c79cb58b8b 100644
--- a/tests/baselines/reference/typeOfThisGeneral.symbols
+++ b/tests/baselines/reference/typeOfThisGeneral.symbols
@@ -18,7 +18,7 @@ class MyTestClass {
 >this : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 >canary : Symbol(MyTestClass.canary, Decl(typeOfThisGeneral.ts, 0, 19))
 
-        var p: number;
+        var p!: number;
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 6, 11), Decl(typeOfThisGeneral.ts, 7, 11))
 
         this.canary = 3;
@@ -33,7 +33,7 @@ class MyTestClass {
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 12, 15), Decl(typeOfThisGeneral.ts, 13, 11))
 >this : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
-        var t: MyTestClass;
+        var t!: MyTestClass;
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 12, 15), Decl(typeOfThisGeneral.ts, 13, 11))
 >MyTestClass : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
@@ -42,7 +42,7 @@ class MyTestClass {
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 16, 11), Decl(typeOfThisGeneral.ts, 17, 11))
 >this : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
-        var p: MyTestClass;
+        var p!: MyTestClass;
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 16, 11), Decl(typeOfThisGeneral.ts, 17, 11))
 >MyTestClass : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
     }
@@ -55,7 +55,7 @@ class MyTestClass {
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 22, 11), Decl(typeOfThisGeneral.ts, 23, 11))
 >this : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
-        var p: MyTestClass;
+        var p!: MyTestClass;
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 22, 11), Decl(typeOfThisGeneral.ts, 23, 11))
 >MyTestClass : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
@@ -70,7 +70,7 @@ class MyTestClass {
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 27, 11), Decl(typeOfThisGeneral.ts, 28, 11))
 >this : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
-        var p: MyTestClass;
+        var p!: MyTestClass;
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 27, 11), Decl(typeOfThisGeneral.ts, 28, 11))
 >MyTestClass : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
@@ -91,7 +91,7 @@ class MyTestClass {
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 35, 11), Decl(typeOfThisGeneral.ts, 36, 11))
 >this : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
-        var t: MyTestClass;
+        var t!: MyTestClass;
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 35, 11), Decl(typeOfThisGeneral.ts, 36, 11))
 >MyTestClass : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
@@ -103,7 +103,7 @@ class MyTestClass {
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 40, 20), Decl(typeOfThisGeneral.ts, 41, 11), Decl(typeOfThisGeneral.ts, 42, 11))
 >this : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
-        var t: typeof MyTestClass;
+        var t!: typeof MyTestClass;
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 40, 20), Decl(typeOfThisGeneral.ts, 41, 11), Decl(typeOfThisGeneral.ts, 42, 11))
 >MyTestClass : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
@@ -121,7 +121,7 @@ class MyTestClass {
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 46, 11), Decl(typeOfThisGeneral.ts, 47, 11), Decl(typeOfThisGeneral.ts, 48, 11))
 >this : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
-        var p: typeof MyTestClass;
+        var p!: typeof MyTestClass;
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 46, 11), Decl(typeOfThisGeneral.ts, 47, 11), Decl(typeOfThisGeneral.ts, 48, 11))
 >MyTestClass : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
@@ -143,7 +143,7 @@ class MyTestClass {
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 54, 11), Decl(typeOfThisGeneral.ts, 55, 11), Decl(typeOfThisGeneral.ts, 56, 11))
 >this : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
-        var p: typeof MyTestClass;
+        var p!: typeof MyTestClass;
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 54, 11), Decl(typeOfThisGeneral.ts, 55, 11), Decl(typeOfThisGeneral.ts, 56, 11))
 >MyTestClass : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
@@ -169,7 +169,7 @@ class MyTestClass {
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 62, 11), Decl(typeOfThisGeneral.ts, 63, 11), Decl(typeOfThisGeneral.ts, 64, 11))
 >this : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
-        var p: typeof MyTestClass;
+        var p!: typeof MyTestClass;
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 62, 11), Decl(typeOfThisGeneral.ts, 63, 11), Decl(typeOfThisGeneral.ts, 64, 11))
 >MyTestClass : Symbol(MyTestClass, Decl(typeOfThisGeneral.ts, 0, 0))
 
@@ -203,7 +203,7 @@ class MyGenericTestClass<T, U> {
 >this : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 >canary : Symbol(MyGenericTestClass.canary, Decl(typeOfThisGeneral.ts, 69, 32))
 
-        var p: number;
+        var p!: number;
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 75, 11), Decl(typeOfThisGeneral.ts, 76, 11))
 
         this.canary = 3;
@@ -218,7 +218,7 @@ class MyGenericTestClass<T, U> {
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 81, 15), Decl(typeOfThisGeneral.ts, 82, 11))
 >this : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 
-        var t: MyGenericTestClass<T, U>;
+        var t!: MyGenericTestClass<T, U>;
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 81, 15), Decl(typeOfThisGeneral.ts, 82, 11))
 >MyGenericTestClass : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 >T : Symbol(T, Decl(typeOfThisGeneral.ts, 69, 25))
@@ -229,7 +229,7 @@ class MyGenericTestClass<T, U> {
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 85, 11), Decl(typeOfThisGeneral.ts, 86, 11))
 >this : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 
-        var p: MyGenericTestClass<T, U>;
+        var p!: MyGenericTestClass<T, U>;
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 85, 11), Decl(typeOfThisGeneral.ts, 86, 11))
 >MyGenericTestClass : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 >T : Symbol(T, Decl(typeOfThisGeneral.ts, 69, 25))
@@ -244,7 +244,7 @@ class MyGenericTestClass<T, U> {
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 91, 11), Decl(typeOfThisGeneral.ts, 92, 11))
 >this : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 
-        var p: MyGenericTestClass<T, U>;
+        var p!: MyGenericTestClass<T, U>;
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 91, 11), Decl(typeOfThisGeneral.ts, 92, 11))
 >MyGenericTestClass : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 >T : Symbol(T, Decl(typeOfThisGeneral.ts, 69, 25))
@@ -261,7 +261,7 @@ class MyGenericTestClass<T, U> {
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 96, 11), Decl(typeOfThisGeneral.ts, 97, 11))
 >this : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 
-        var p: MyGenericTestClass<T, U>;
+        var p!: MyGenericTestClass<T, U>;
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 96, 11), Decl(typeOfThisGeneral.ts, 97, 11))
 >MyGenericTestClass : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 >T : Symbol(T, Decl(typeOfThisGeneral.ts, 69, 25))
@@ -284,7 +284,7 @@ class MyGenericTestClass<T, U> {
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 104, 11), Decl(typeOfThisGeneral.ts, 105, 11))
 >this : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 
-        var t: MyGenericTestClass<T, U>;
+        var t!: MyGenericTestClass<T, U>;
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 104, 11), Decl(typeOfThisGeneral.ts, 105, 11))
 >MyGenericTestClass : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 >T : Symbol(T, Decl(typeOfThisGeneral.ts, 69, 25))
@@ -298,7 +298,7 @@ class MyGenericTestClass<T, U> {
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 109, 20), Decl(typeOfThisGeneral.ts, 110, 11), Decl(typeOfThisGeneral.ts, 111, 11))
 >this : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 
-        var t: typeof MyGenericTestClass;
+        var t!: typeof MyGenericTestClass;
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 109, 20), Decl(typeOfThisGeneral.ts, 110, 11), Decl(typeOfThisGeneral.ts, 111, 11))
 >MyGenericTestClass : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 
@@ -316,7 +316,7 @@ class MyGenericTestClass<T, U> {
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 115, 11), Decl(typeOfThisGeneral.ts, 116, 11), Decl(typeOfThisGeneral.ts, 117, 11))
 >this : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 
-        var p: typeof MyGenericTestClass;
+        var p!: typeof MyGenericTestClass;
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 115, 11), Decl(typeOfThisGeneral.ts, 116, 11), Decl(typeOfThisGeneral.ts, 117, 11))
 >MyGenericTestClass : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 
@@ -338,7 +338,7 @@ class MyGenericTestClass<T, U> {
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 123, 11), Decl(typeOfThisGeneral.ts, 124, 11), Decl(typeOfThisGeneral.ts, 125, 11))
 >this : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 
-        var p: typeof MyGenericTestClass;
+        var p!: typeof MyGenericTestClass;
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 123, 11), Decl(typeOfThisGeneral.ts, 124, 11), Decl(typeOfThisGeneral.ts, 125, 11))
 >MyGenericTestClass : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 
@@ -364,7 +364,7 @@ class MyGenericTestClass<T, U> {
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 131, 11), Decl(typeOfThisGeneral.ts, 132, 11), Decl(typeOfThisGeneral.ts, 133, 11))
 >this : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 
-        var p: typeof MyGenericTestClass;
+        var p!: typeof MyGenericTestClass;
 >p : Symbol(p, Decl(typeOfThisGeneral.ts, 131, 11), Decl(typeOfThisGeneral.ts, 132, 11), Decl(typeOfThisGeneral.ts, 133, 11))
 >MyGenericTestClass : Symbol(MyGenericTestClass, Decl(typeOfThisGeneral.ts, 67, 1))
 
@@ -384,14 +384,14 @@ function fn(s = this) {
 >fn : Symbol(fn, Decl(typeOfThisGeneral.ts, 136, 1))
 >s : Symbol(s, Decl(typeOfThisGeneral.ts, 139, 12), Decl(typeOfThisGeneral.ts, 140, 7))
 
-    var s: any;
+    var s!: any;
 >s : Symbol(s, Decl(typeOfThisGeneral.ts, 139, 12), Decl(typeOfThisGeneral.ts, 140, 7))
 
     s.spaaaaaaace = 4;
 >s : Symbol(s, Decl(typeOfThisGeneral.ts, 139, 12), Decl(typeOfThisGeneral.ts, 140, 7))
 
     //type of 'this' in a function declaration body is Any
-    var t: any;
+    var t!: any;
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 144, 7), Decl(typeOfThisGeneral.ts, 145, 7))
 
     var t = this;
@@ -405,14 +405,14 @@ var q1 = function (s = this) {
 >q1 : Symbol(q1, Decl(typeOfThisGeneral.ts, 150, 3))
 >s : Symbol(s, Decl(typeOfThisGeneral.ts, 150, 19), Decl(typeOfThisGeneral.ts, 151, 7))
 
-    var s: any;
+    var s!: any;
 >s : Symbol(s, Decl(typeOfThisGeneral.ts, 150, 19), Decl(typeOfThisGeneral.ts, 151, 7))
 
     s.spaaaaaaace = 4;
 >s : Symbol(s, Decl(typeOfThisGeneral.ts, 150, 19), Decl(typeOfThisGeneral.ts, 151, 7))
 
     //type of 'this' in a function expression body is Any
-    var t: any;
+    var t!: any;
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 155, 7), Decl(typeOfThisGeneral.ts, 156, 7))
 
     var t = this;
@@ -427,7 +427,7 @@ var q2 = (s = this) => {
 >s : Symbol(s, Decl(typeOfThisGeneral.ts, 161, 10), Decl(typeOfThisGeneral.ts, 162, 7))
 >this : Symbol(globalThis)
 
-    var s: typeof globalThis;
+    var s!: typeof globalThis;
 >s : Symbol(s, Decl(typeOfThisGeneral.ts, 161, 10), Decl(typeOfThisGeneral.ts, 162, 7))
 >globalThis : Symbol(globalThis)
 
@@ -435,7 +435,7 @@ var q2 = (s = this) => {
 >s : Symbol(s, Decl(typeOfThisGeneral.ts, 161, 10), Decl(typeOfThisGeneral.ts, 162, 7))
 
     //type of 'this' in a fat arrow expression body is typeof globalThis
-    var t: typeof globalThis;
+    var t!: typeof globalThis;
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 166, 7), Decl(typeOfThisGeneral.ts, 167, 7))
 >globalThis : Symbol(globalThis)
 
@@ -447,8 +447,8 @@ var q2 = (s = this) => {
 >this : Symbol(globalThis)
 }
 
-//type of 'this' in global module is GlobalThis
-var t: typeof globalThis;
+//type of 'this' in global namespace is GlobalThis
+var t!: typeof globalThis;
 >t : Symbol(t, Decl(typeOfThisGeneral.ts, 172, 3), Decl(typeOfThisGeneral.ts, 173, 3))
 >globalThis : Symbol(globalThis)
 
diff --git a/tests/baselines/reference/typeOfThisGeneral.types b/tests/baselines/reference/typeOfThisGeneral.types
index 4e53282ef731a..167ee89924de6 100644
--- a/tests/baselines/reference/typeOfThisGeneral.types
+++ b/tests/baselines/reference/typeOfThisGeneral.types
@@ -25,7 +25,7 @@ class MyTestClass {
 >canary : number
 >       : ^^^^^^
 
-        var p: number;
+        var p!: number;
 >p : number
 >  : ^^^^^^
 
@@ -51,7 +51,7 @@ class MyTestClass {
 >this : this
 >     : ^^^^
 
-        var t: MyTestClass;
+        var t!: MyTestClass;
 >t : this
 >  : ^^^^
 
@@ -62,7 +62,7 @@ class MyTestClass {
 >this : this
 >     : ^^^^
 
-        var p: MyTestClass;
+        var p!: MyTestClass;
 >p : this
 >  : ^^^^
     }
@@ -78,7 +78,7 @@ class MyTestClass {
 >this : this
 >     : ^^^^
 
-        var p: MyTestClass;
+        var p!: MyTestClass;
 >p : this
 >  : ^^^^
 
@@ -98,7 +98,7 @@ class MyTestClass {
 >this : this
 >     : ^^^^
 
-        var p: MyTestClass;
+        var p!: MyTestClass;
 >p : this
 >  : ^^^^
 
@@ -122,8 +122,8 @@ class MyTestClass {
     someFunc = () => {
 >someFunc : () => void
 >         : ^^^^^^^^^^
->() => {        //type of 'this' in member variable initializer is the class instance type        var t = this;        var t: MyTestClass;    } : () => void
->                                                                                                                                               : ^^^^^^^^^^
+>() => {        //type of 'this' in member variable initializer is the class instance type        var t = this;        var t!: MyTestClass;    } : () => void
+>                                                                                                                                                : ^^^^^^^^^^
 
         //type of 'this' in member variable initializer is the class instance type
         var t = this;
@@ -132,7 +132,7 @@ class MyTestClass {
 >this : this
 >     : ^^^^
 
-        var t: MyTestClass;
+        var t!: MyTestClass;
 >t : this
 >  : ^^^^
 
@@ -147,7 +147,7 @@ class MyTestClass {
 >this : typeof MyTestClass
 >     : ^^^^^^^^^^^^^^^^^^
 
-        var t: typeof MyTestClass;
+        var t!: typeof MyTestClass;
 >t : typeof MyTestClass
 >  : ^^^^^^^^^^^^^^^^^^
 >MyTestClass : typeof MyTestClass
@@ -174,7 +174,7 @@ class MyTestClass {
 >this : typeof MyTestClass
 >     : ^^^^^^^^^^^^^^^^^^
 
-        var p: typeof MyTestClass;
+        var p!: typeof MyTestClass;
 >p : typeof MyTestClass
 >  : ^^^^^^^^^^^^^^^^^^
 >MyTestClass : typeof MyTestClass
@@ -206,7 +206,7 @@ class MyTestClass {
 >this : typeof MyTestClass
 >     : ^^^^^^^^^^^^^^^^^^
 
-        var p: typeof MyTestClass;
+        var p!: typeof MyTestClass;
 >p : typeof MyTestClass
 >  : ^^^^^^^^^^^^^^^^^^
 >MyTestClass : typeof MyTestClass
@@ -245,7 +245,7 @@ class MyTestClass {
 >this : typeof MyTestClass
 >     : ^^^^^^^^^^^^^^^^^^
 
-        var p: typeof MyTestClass;
+        var p!: typeof MyTestClass;
 >p : typeof MyTestClass
 >  : ^^^^^^^^^^^^^^^^^^
 >MyTestClass : typeof MyTestClass
@@ -291,7 +291,7 @@ class MyGenericTestClass<T, U> {
 >canary : number
 >       : ^^^^^^
 
-        var p: number;
+        var p!: number;
 >p : number
 >  : ^^^^^^
 
@@ -317,7 +317,7 @@ class MyGenericTestClass<T, U> {
 >this : this
 >     : ^^^^
 
-        var t: MyGenericTestClass<T, U>;
+        var t!: MyGenericTestClass<T, U>;
 >t : this
 >  : ^^^^
 
@@ -328,7 +328,7 @@ class MyGenericTestClass<T, U> {
 >this : this
 >     : ^^^^
 
-        var p: MyGenericTestClass<T, U>;
+        var p!: MyGenericTestClass<T, U>;
 >p : this
 >  : ^^^^
     }
@@ -344,7 +344,7 @@ class MyGenericTestClass<T, U> {
 >this : this
 >     : ^^^^
 
-        var p: MyGenericTestClass<T, U>;
+        var p!: MyGenericTestClass<T, U>;
 >p : this
 >  : ^^^^
 
@@ -364,7 +364,7 @@ class MyGenericTestClass<T, U> {
 >this : this
 >     : ^^^^
 
-        var p: MyGenericTestClass<T, U>;
+        var p!: MyGenericTestClass<T, U>;
 >p : this
 >  : ^^^^
 
@@ -388,8 +388,8 @@ class MyGenericTestClass<T, U> {
     someFunc = () => {
 >someFunc : () => void
 >         : ^^^^^^^^^^
->() => {        //type of 'this' in member variable initializer is the class instance type        var t = this;        var t: MyGenericTestClass<T, U>;    } : () => void
->                                                                                                                                                            : ^^^^^^^^^^
+>() => {        //type of 'this' in member variable initializer is the class instance type        var t = this;        var t!: MyGenericTestClass<T, U>;    } : () => void
+>                                                                                                                                                             : ^^^^^^^^^^
 
         //type of 'this' in member variable initializer is the class instance type
         var t = this;
@@ -398,7 +398,7 @@ class MyGenericTestClass<T, U> {
 >this : this
 >     : ^^^^
 
-        var t: MyGenericTestClass<T, U>;
+        var t!: MyGenericTestClass<T, U>;
 >t : this
 >  : ^^^^
 
@@ -413,7 +413,7 @@ class MyGenericTestClass<T, U> {
 >this : typeof MyGenericTestClass
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-        var t: typeof MyGenericTestClass;
+        var t!: typeof MyGenericTestClass;
 >t : typeof MyGenericTestClass
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >MyGenericTestClass : typeof MyGenericTestClass
@@ -440,7 +440,7 @@ class MyGenericTestClass<T, U> {
 >this : typeof MyGenericTestClass
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-        var p: typeof MyGenericTestClass;
+        var p!: typeof MyGenericTestClass;
 >p : typeof MyGenericTestClass
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >MyGenericTestClass : typeof MyGenericTestClass
@@ -472,7 +472,7 @@ class MyGenericTestClass<T, U> {
 >this : typeof MyGenericTestClass
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-        var p: typeof MyGenericTestClass;
+        var p!: typeof MyGenericTestClass;
 >p : typeof MyGenericTestClass
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >MyGenericTestClass : typeof MyGenericTestClass
@@ -511,7 +511,7 @@ class MyGenericTestClass<T, U> {
 >this : typeof MyGenericTestClass
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-        var p: typeof MyGenericTestClass;
+        var p!: typeof MyGenericTestClass;
 >p : typeof MyGenericTestClass
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >MyGenericTestClass : typeof MyGenericTestClass
@@ -542,7 +542,7 @@ function fn(s = this) {
 >this : any
 >     : ^^^
 
-    var s: any;
+    var s!: any;
 >s : any
 >  : ^^^
 
@@ -559,7 +559,7 @@ function fn(s = this) {
 >  : ^
 
     //type of 'this' in a function declaration body is Any
-    var t: any;
+    var t!: any;
 >t : any
 >  : ^^^
 
@@ -586,14 +586,14 @@ function fn(s = this) {
 var q1 = function (s = this) {
 >q1 : (s?: any) => void
 >   : ^ ^^^^^^^^^^^^^^^
->function (s = this) {    var s: any;    s.spaaaaaaace = 4;    //type of 'this' in a function expression body is Any    var t: any;    var t = this;    this.spaaaaace = 4;} : (s?: any) => void
->                                                                                                                                                                            : ^ ^^^^^^^^^^^^^^^
+>function (s = this) {    var s!: any;    s.spaaaaaaace = 4;    //type of 'this' in a function expression body is Any    var t!: any;    var t = this;    this.spaaaaace = 4;} : (s?: any) => void
+>                                                                                                                                                                              : ^ ^^^^^^^^^^^^^^^
 >s : any
 >  : ^^^
 >this : any
 >     : ^^^
 
-    var s: any;
+    var s!: any;
 >s : any
 >  : ^^^
 
@@ -610,7 +610,7 @@ var q1 = function (s = this) {
 >  : ^
 
     //type of 'this' in a function expression body is Any
-    var t: any;
+    var t!: any;
 >t : any
 >  : ^^^
 
@@ -637,14 +637,14 @@ var q1 = function (s = this) {
 var q2 = (s = this) => {
 >q2 : (s?: typeof globalThis) => void
 >   : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->(s = this) => {    var s: typeof globalThis;    s.spaaaaaaace = 4;    //type of 'this' in a fat arrow expression body is typeof globalThis    var t: typeof globalThis;    var t = this;    this.spaaaaace = 4;} : (s?: typeof globalThis) => void
->                                                                                                                                                                                                                 : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>(s = this) => {    var s!: typeof globalThis;    s.spaaaaaaace = 4;    //type of 'this' in a fat arrow expression body is typeof globalThis    var t!: typeof globalThis;    var t = this;    this.spaaaaace = 4;} : (s?: typeof globalThis) => void
+>                                                                                                                                                                                                                   : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >s : typeof globalThis
 >  : ^^^^^^^^^^^^^^^^^
 >this : typeof globalThis
 >     : ^^^^^^^^^^^^^^^^^
 
-    var s: typeof globalThis;
+    var s!: typeof globalThis;
 >s : typeof globalThis
 >  : ^^^^^^^^^^^^^^^^^
 >globalThis : typeof globalThis
@@ -663,7 +663,7 @@ var q2 = (s = this) => {
 >  : ^
 
     //type of 'this' in a fat arrow expression body is typeof globalThis
-    var t: typeof globalThis;
+    var t!: typeof globalThis;
 >t : typeof globalThis
 >  : ^^^^^^^^^^^^^^^^^
 >globalThis : typeof globalThis
@@ -688,8 +688,8 @@ var q2 = (s = this) => {
 >  : ^
 }
 
-//type of 'this' in global module is GlobalThis
-var t: typeof globalThis;
+//type of 'this' in global namespace is GlobalThis
+var t!: typeof globalThis;
 >t : typeof globalThis
 >  : ^^^^^^^^^^^^^^^^^
 >globalThis : typeof globalThis
diff --git a/tests/baselines/reference/typeOfThisInInstanceMember.errors.txt b/tests/baselines/reference/typeOfThisInInstanceMember.errors.txt
index b560d6498825b..c9dc3406784be 100644
--- a/tests/baselines/reference/typeOfThisInInstanceMember.errors.txt
+++ b/tests/baselines/reference/typeOfThisInInstanceMember.errors.txt
@@ -22,7 +22,7 @@ typeOfThisInInstanceMember.ts(10,11): error TS2339: Property 'z' does not exist
         }
     }
     
-    var c: C;
+    declare var c: C;
     // all ok
     var r = c.x;
     var ra = c.x.x.x;
diff --git a/tests/baselines/reference/typeOfThisInInstanceMember.js b/tests/baselines/reference/typeOfThisInInstanceMember.js
index 4056077c13096..66600548512d7 100644
--- a/tests/baselines/reference/typeOfThisInInstanceMember.js
+++ b/tests/baselines/reference/typeOfThisInInstanceMember.js
@@ -19,7 +19,7 @@ class C {
     }
 }
 
-var c: C;
+declare var c: C;
 // all ok
 var r = c.x;
 var ra = c.x.x.x;
@@ -55,7 +55,6 @@ var C = /** @class */ (function () {
     });
     return C;
 }());
-var c;
 // all ok
 var r = c.x;
 var ra = c.x.x.x;
diff --git a/tests/baselines/reference/typeOfThisInInstanceMember.symbols b/tests/baselines/reference/typeOfThisInInstanceMember.symbols
index d22259cbcd654..f5d95eb54f7c5 100644
--- a/tests/baselines/reference/typeOfThisInInstanceMember.symbols
+++ b/tests/baselines/reference/typeOfThisInInstanceMember.symbols
@@ -49,15 +49,15 @@ class C {
     }
 }
 
-var c: C;
->c : Symbol(c, Decl(typeOfThisInInstanceMember.ts, 18, 3))
+declare var c: C;
+>c : Symbol(c, Decl(typeOfThisInInstanceMember.ts, 18, 11))
 >C : Symbol(C, Decl(typeOfThisInInstanceMember.ts, 0, 0))
 
 // all ok
 var r = c.x;
 >r : Symbol(r, Decl(typeOfThisInInstanceMember.ts, 20, 3))
 >c.x : Symbol(C.x, Decl(typeOfThisInInstanceMember.ts, 0, 9))
->c : Symbol(c, Decl(typeOfThisInInstanceMember.ts, 18, 3))
+>c : Symbol(c, Decl(typeOfThisInInstanceMember.ts, 18, 11))
 >x : Symbol(C.x, Decl(typeOfThisInInstanceMember.ts, 0, 9))
 
 var ra = c.x.x.x;
@@ -65,7 +65,7 @@ var ra = c.x.x.x;
 >c.x.x.x : Symbol(C.x, Decl(typeOfThisInInstanceMember.ts, 0, 9))
 >c.x.x : Symbol(C.x, Decl(typeOfThisInInstanceMember.ts, 0, 9))
 >c.x : Symbol(C.x, Decl(typeOfThisInInstanceMember.ts, 0, 9))
->c : Symbol(c, Decl(typeOfThisInInstanceMember.ts, 18, 3))
+>c : Symbol(c, Decl(typeOfThisInInstanceMember.ts, 18, 11))
 >x : Symbol(C.x, Decl(typeOfThisInInstanceMember.ts, 0, 9))
 >x : Symbol(C.x, Decl(typeOfThisInInstanceMember.ts, 0, 9))
 >x : Symbol(C.x, Decl(typeOfThisInInstanceMember.ts, 0, 9))
@@ -73,13 +73,13 @@ var ra = c.x.x.x;
 var r2 = c.y;
 >r2 : Symbol(r2, Decl(typeOfThisInInstanceMember.ts, 22, 3))
 >c.y : Symbol(C.y, Decl(typeOfThisInInstanceMember.ts, 11, 5))
->c : Symbol(c, Decl(typeOfThisInInstanceMember.ts, 18, 3))
+>c : Symbol(c, Decl(typeOfThisInInstanceMember.ts, 18, 11))
 >y : Symbol(C.y, Decl(typeOfThisInInstanceMember.ts, 11, 5))
 
 var r3 = c.foo();
 >r3 : Symbol(r3, Decl(typeOfThisInInstanceMember.ts, 23, 3))
 >c.foo : Symbol(C.foo, Decl(typeOfThisInInstanceMember.ts, 1, 13))
->c : Symbol(c, Decl(typeOfThisInInstanceMember.ts, 18, 3))
+>c : Symbol(c, Decl(typeOfThisInInstanceMember.ts, 18, 11))
 >foo : Symbol(C.foo, Decl(typeOfThisInInstanceMember.ts, 1, 13))
 
 var rs = [r, r2, r3];
diff --git a/tests/baselines/reference/typeOfThisInInstanceMember.types b/tests/baselines/reference/typeOfThisInInstanceMember.types
index 778004f41e4cd..fecd02b324de4 100644
--- a/tests/baselines/reference/typeOfThisInInstanceMember.types
+++ b/tests/baselines/reference/typeOfThisInInstanceMember.types
@@ -76,7 +76,7 @@ class C {
     }
 }
 
-var c: C;
+declare var c: C;
 >c : C
 >  : ^
 
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence.errors.txt b/tests/baselines/reference/typeParameterArgumentEquivalence.errors.txt
index e7baf233b1e01..53c3a48519a91 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence.errors.txt
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence.errors.txt
@@ -9,8 +9,8 @@ typeParameterArgumentEquivalence.ts(5,5): error TS2322: Type '(item: number) =>
 
 ==== typeParameterArgumentEquivalence.ts (2 errors) ====
     function foo<T>() {
-        var x: (item: number) => boolean;
-        var y: (item: T) => boolean;
+        var x!: (item: number) => boolean;
+        var y!: (item: T) => boolean;
         x = y;  // Should be an error
         ~
 !!! error TS2322: Type '(item: T) => boolean' is not assignable to type '(item: number) => boolean'.
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence.js b/tests/baselines/reference/typeParameterArgumentEquivalence.js
index 101a452d0eaa8..0bb472a4ad56d 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence.js
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence.js
@@ -2,8 +2,8 @@
 
 //// [typeParameterArgumentEquivalence.ts]
 function foo<T>() {
-    var x: (item: number) => boolean;
-    var y: (item: T) => boolean;
+    var x!: (item: number) => boolean;
+    var y!: (item: T) => boolean;
     x = y;  // Should be an error
     y = x;  // Shound be an error
 }
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence.symbols b/tests/baselines/reference/typeParameterArgumentEquivalence.symbols
index c9f07ee86fc45..b009d3c30e53d 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence.symbols
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence.symbols
@@ -5,13 +5,13 @@ function foo<T>() {
 >foo : Symbol(foo, Decl(typeParameterArgumentEquivalence.ts, 0, 0))
 >T : Symbol(T, Decl(typeParameterArgumentEquivalence.ts, 0, 13))
 
-    var x: (item: number) => boolean;
+    var x!: (item: number) => boolean;
 >x : Symbol(x, Decl(typeParameterArgumentEquivalence.ts, 1, 7))
->item : Symbol(item, Decl(typeParameterArgumentEquivalence.ts, 1, 12))
+>item : Symbol(item, Decl(typeParameterArgumentEquivalence.ts, 1, 13))
 
-    var y: (item: T) => boolean;
+    var y!: (item: T) => boolean;
 >y : Symbol(y, Decl(typeParameterArgumentEquivalence.ts, 2, 7))
->item : Symbol(item, Decl(typeParameterArgumentEquivalence.ts, 2, 12))
+>item : Symbol(item, Decl(typeParameterArgumentEquivalence.ts, 2, 13))
 >T : Symbol(T, Decl(typeParameterArgumentEquivalence.ts, 0, 13))
 
     x = y;  // Should be an error
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence.types b/tests/baselines/reference/typeParameterArgumentEquivalence.types
index f0c07d8e65963..c231186983c7a 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence.types
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence.types
@@ -5,13 +5,13 @@ function foo<T>() {
 >foo : <T>() => void
 >    : ^ ^^^^^^^^^^^
 
-    var x: (item: number) => boolean;
+    var x!: (item: number) => boolean;
 >x : (item: number) => boolean
 >  : ^    ^^      ^^^^^       
 >item : number
 >     : ^^^^^^
 
-    var y: (item: T) => boolean;
+    var y!: (item: T) => boolean;
 >y : (item: T) => boolean
 >  : ^    ^^ ^^^^^       
 >item : T
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence2.errors.txt b/tests/baselines/reference/typeParameterArgumentEquivalence2.errors.txt
index fd34093a24146..8895a8ac9d4cc 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence2.errors.txt
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence2.errors.txt
@@ -10,8 +10,8 @@ typeParameterArgumentEquivalence2.ts(5,5): error TS2322: Type '(item: U) => bool
 
 ==== typeParameterArgumentEquivalence2.ts (2 errors) ====
     function foo<T,U>() {
-        var x: (item: U) => boolean;
-        var y: (item: T) => boolean;
+        var x!: (item: U) => boolean;
+        var y!: (item: T) => boolean;
         x = y;  // Should be an error
         ~
 !!! error TS2322: Type '(item: T) => boolean' is not assignable to type '(item: U) => boolean'.
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence2.js b/tests/baselines/reference/typeParameterArgumentEquivalence2.js
index 72e10f1805d36..a411b05ac7c09 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence2.js
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence2.js
@@ -2,8 +2,8 @@
 
 //// [typeParameterArgumentEquivalence2.ts]
 function foo<T,U>() {
-    var x: (item: U) => boolean;
-    var y: (item: T) => boolean;
+    var x!: (item: U) => boolean;
+    var y!: (item: T) => boolean;
     x = y;  // Should be an error
     y = x;  // Shound be an error
 }
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence2.symbols b/tests/baselines/reference/typeParameterArgumentEquivalence2.symbols
index 88917eea03d7a..cf01bb9233865 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence2.symbols
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence2.symbols
@@ -6,14 +6,14 @@ function foo<T,U>() {
 >T : Symbol(T, Decl(typeParameterArgumentEquivalence2.ts, 0, 13))
 >U : Symbol(U, Decl(typeParameterArgumentEquivalence2.ts, 0, 15))
 
-    var x: (item: U) => boolean;
+    var x!: (item: U) => boolean;
 >x : Symbol(x, Decl(typeParameterArgumentEquivalence2.ts, 1, 7))
->item : Symbol(item, Decl(typeParameterArgumentEquivalence2.ts, 1, 12))
+>item : Symbol(item, Decl(typeParameterArgumentEquivalence2.ts, 1, 13))
 >U : Symbol(U, Decl(typeParameterArgumentEquivalence2.ts, 0, 15))
 
-    var y: (item: T) => boolean;
+    var y!: (item: T) => boolean;
 >y : Symbol(y, Decl(typeParameterArgumentEquivalence2.ts, 2, 7))
->item : Symbol(item, Decl(typeParameterArgumentEquivalence2.ts, 2, 12))
+>item : Symbol(item, Decl(typeParameterArgumentEquivalence2.ts, 2, 13))
 >T : Symbol(T, Decl(typeParameterArgumentEquivalence2.ts, 0, 13))
 
     x = y;  // Should be an error
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence2.types b/tests/baselines/reference/typeParameterArgumentEquivalence2.types
index d39f0c9cbd565..46bec0037c507 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence2.types
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence2.types
@@ -5,13 +5,13 @@ function foo<T,U>() {
 >foo : <T, U>() => void
 >    : ^ ^^ ^^^^^^^^^^^
 
-    var x: (item: U) => boolean;
+    var x!: (item: U) => boolean;
 >x : (item: U) => boolean
 >  : ^    ^^ ^^^^^       
 >item : U
 >     : ^
 
-    var y: (item: T) => boolean;
+    var y!: (item: T) => boolean;
 >y : (item: T) => boolean
 >  : ^    ^^ ^^^^^       
 >item : T
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence3.errors.txt b/tests/baselines/reference/typeParameterArgumentEquivalence3.errors.txt
index 67323fa6992c2..b9a4a726c3bf8 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence3.errors.txt
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence3.errors.txt
@@ -7,8 +7,8 @@ typeParameterArgumentEquivalence3.ts(5,5): error TS2322: Type '(item: any) => T'
 
 ==== typeParameterArgumentEquivalence3.ts (2 errors) ====
     function foo<T,U>() {
-        var x: (item) => T;
-        var y: (item) => boolean;
+        var x!: (item: any) => T;
+        var y!: (item: any) => boolean;
         x = y;  // Should be an error
         ~
 !!! error TS2322: Type '(item: any) => boolean' is not assignable to type '(item: any) => T'.
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence3.js b/tests/baselines/reference/typeParameterArgumentEquivalence3.js
index 91ad3922e2a5a..14e61352e5401 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence3.js
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence3.js
@@ -2,8 +2,8 @@
 
 //// [typeParameterArgumentEquivalence3.ts]
 function foo<T,U>() {
-    var x: (item) => T;
-    var y: (item) => boolean;
+    var x!: (item: any) => T;
+    var y!: (item: any) => boolean;
     x = y;  // Should be an error
     y = x;  // Shound be an error
 }
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence3.symbols b/tests/baselines/reference/typeParameterArgumentEquivalence3.symbols
index 3e88cc71a2743..23ecf245d0338 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence3.symbols
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence3.symbols
@@ -6,14 +6,14 @@ function foo<T,U>() {
 >T : Symbol(T, Decl(typeParameterArgumentEquivalence3.ts, 0, 13))
 >U : Symbol(U, Decl(typeParameterArgumentEquivalence3.ts, 0, 15))
 
-    var x: (item) => T;
+    var x!: (item: any) => T;
 >x : Symbol(x, Decl(typeParameterArgumentEquivalence3.ts, 1, 7))
->item : Symbol(item, Decl(typeParameterArgumentEquivalence3.ts, 1, 12))
+>item : Symbol(item, Decl(typeParameterArgumentEquivalence3.ts, 1, 13))
 >T : Symbol(T, Decl(typeParameterArgumentEquivalence3.ts, 0, 13))
 
-    var y: (item) => boolean;
+    var y!: (item: any) => boolean;
 >y : Symbol(y, Decl(typeParameterArgumentEquivalence3.ts, 2, 7))
->item : Symbol(item, Decl(typeParameterArgumentEquivalence3.ts, 2, 12))
+>item : Symbol(item, Decl(typeParameterArgumentEquivalence3.ts, 2, 13))
 
     x = y;  // Should be an error
 >x : Symbol(x, Decl(typeParameterArgumentEquivalence3.ts, 1, 7))
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence3.types b/tests/baselines/reference/typeParameterArgumentEquivalence3.types
index 723e6d3da3b64..205bb5bfa50c4 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence3.types
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence3.types
@@ -5,32 +5,32 @@ function foo<T,U>() {
 >foo : <T, U>() => void
 >    : ^ ^^ ^^^^^^^^^^^
 
-    var x: (item) => T;
+    var x!: (item: any) => T;
 >x : (item: any) => T
->  : ^    ^^^^^^^^^^ 
+>  : ^    ^^   ^^^^^ 
 >item : any
 >     : ^^^
 
-    var y: (item) => boolean;
+    var y!: (item: any) => boolean;
 >y : (item: any) => boolean
->  : ^    ^^^^^^^^^^       
+>  : ^    ^^   ^^^^^       
 >item : any
 >     : ^^^
 
     x = y;  // Should be an error
 >x = y : (item: any) => boolean
->      : ^    ^^^^^^^^^^       
+>      : ^    ^^   ^^^^^       
 >x : (item: any) => T
->  : ^    ^^^^^^^^^^ 
+>  : ^    ^^   ^^^^^ 
 >y : (item: any) => boolean
->  : ^    ^^^^^^^^^^       
+>  : ^    ^^   ^^^^^       
 
     y = x;  // Shound be an error
 >y = x : (item: any) => T
->      : ^    ^^^^^^^^^^ 
+>      : ^    ^^   ^^^^^ 
 >y : (item: any) => boolean
->  : ^    ^^^^^^^^^^       
+>  : ^    ^^   ^^^^^       
 >x : (item: any) => T
->  : ^    ^^^^^^^^^^ 
+>  : ^    ^^   ^^^^^ 
 }
 
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence4.errors.txt b/tests/baselines/reference/typeParameterArgumentEquivalence4.errors.txt
index 8bfde43d3cb23..8907304ee7fac 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence4.errors.txt
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence4.errors.txt
@@ -8,8 +8,8 @@ typeParameterArgumentEquivalence4.ts(5,5): error TS2322: Type '(item: any) => U'
 
 ==== typeParameterArgumentEquivalence4.ts (2 errors) ====
     function foo<T,U>() {
-        var x: (item) => U;
-        var y: (item) => T;
+        var x!: (item: any) => U;
+        var y!: (item: any) => T;
         x = y;  // Should be an error
         ~
 !!! error TS2322: Type '(item: any) => T' is not assignable to type '(item: any) => U'.
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence4.js b/tests/baselines/reference/typeParameterArgumentEquivalence4.js
index bfb17bc56f530..0796ea59b79f0 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence4.js
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence4.js
@@ -2,8 +2,8 @@
 
 //// [typeParameterArgumentEquivalence4.ts]
 function foo<T,U>() {
-    var x: (item) => U;
-    var y: (item) => T;
+    var x!: (item: any) => U;
+    var y!: (item: any) => T;
     x = y;  // Should be an error
     y = x;  // Shound be an error
 }
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence4.symbols b/tests/baselines/reference/typeParameterArgumentEquivalence4.symbols
index 9150933185745..affae4df91a06 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence4.symbols
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence4.symbols
@@ -6,14 +6,14 @@ function foo<T,U>() {
 >T : Symbol(T, Decl(typeParameterArgumentEquivalence4.ts, 0, 13))
 >U : Symbol(U, Decl(typeParameterArgumentEquivalence4.ts, 0, 15))
 
-    var x: (item) => U;
+    var x!: (item: any) => U;
 >x : Symbol(x, Decl(typeParameterArgumentEquivalence4.ts, 1, 7))
->item : Symbol(item, Decl(typeParameterArgumentEquivalence4.ts, 1, 12))
+>item : Symbol(item, Decl(typeParameterArgumentEquivalence4.ts, 1, 13))
 >U : Symbol(U, Decl(typeParameterArgumentEquivalence4.ts, 0, 15))
 
-    var y: (item) => T;
+    var y!: (item: any) => T;
 >y : Symbol(y, Decl(typeParameterArgumentEquivalence4.ts, 2, 7))
->item : Symbol(item, Decl(typeParameterArgumentEquivalence4.ts, 2, 12))
+>item : Symbol(item, Decl(typeParameterArgumentEquivalence4.ts, 2, 13))
 >T : Symbol(T, Decl(typeParameterArgumentEquivalence4.ts, 0, 13))
 
     x = y;  // Should be an error
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence4.types b/tests/baselines/reference/typeParameterArgumentEquivalence4.types
index 6550f15502c8a..7771d2c6a5ccb 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence4.types
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence4.types
@@ -5,32 +5,32 @@ function foo<T,U>() {
 >foo : <T, U>() => void
 >    : ^ ^^ ^^^^^^^^^^^
 
-    var x: (item) => U;
+    var x!: (item: any) => U;
 >x : (item: any) => U
->  : ^    ^^^^^^^^^^ 
+>  : ^    ^^   ^^^^^ 
 >item : any
 >     : ^^^
 
-    var y: (item) => T;
+    var y!: (item: any) => T;
 >y : (item: any) => T
->  : ^    ^^^^^^^^^^ 
+>  : ^    ^^   ^^^^^ 
 >item : any
 >     : ^^^
 
     x = y;  // Should be an error
 >x = y : (item: any) => T
->      : ^    ^^^^^^^^^^ 
+>      : ^    ^^   ^^^^^ 
 >x : (item: any) => U
->  : ^    ^^^^^^^^^^ 
+>  : ^    ^^   ^^^^^ 
 >y : (item: any) => T
->  : ^    ^^^^^^^^^^ 
+>  : ^    ^^   ^^^^^ 
 
     y = x;  // Shound be an error
 >y = x : (item: any) => U
->      : ^    ^^^^^^^^^^ 
+>      : ^    ^^   ^^^^^ 
 >y : (item: any) => T
->  : ^    ^^^^^^^^^^ 
+>  : ^    ^^   ^^^^^ 
 >x : (item: any) => U
->  : ^    ^^^^^^^^^^ 
+>  : ^    ^^   ^^^^^ 
 }
 
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence5.errors.txt b/tests/baselines/reference/typeParameterArgumentEquivalence5.errors.txt
index 3fdd5cbeb0321..adc1fc4a37d6f 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence5.errors.txt
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence5.errors.txt
@@ -10,8 +10,8 @@ typeParameterArgumentEquivalence5.ts(5,5): error TS2322: Type '() => (item: any)
 
 ==== typeParameterArgumentEquivalence5.ts (2 errors) ====
     function foo<T,U>() {
-        var x: () => (item) => U;
-        var y: () => (item) => T;
+        var x!: () => (item: any) => U;
+        var y!: () => (item: any) => T;
         x = y;  // Should be an error
         ~
 !!! error TS2322: Type '() => (item: any) => T' is not assignable to type '() => (item: any) => U'.
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence5.js b/tests/baselines/reference/typeParameterArgumentEquivalence5.js
index f978d8e476598..b1fe8b8aae72d 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence5.js
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence5.js
@@ -2,8 +2,8 @@
 
 //// [typeParameterArgumentEquivalence5.ts]
 function foo<T,U>() {
-    var x: () => (item) => U;
-    var y: () => (item) => T;
+    var x!: () => (item: any) => U;
+    var y!: () => (item: any) => T;
     x = y;  // Should be an error
     y = x;  // Shound be an error
 }
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence5.symbols b/tests/baselines/reference/typeParameterArgumentEquivalence5.symbols
index 4e1ae87b9ccc1..5f948940cabd2 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence5.symbols
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence5.symbols
@@ -6,14 +6,14 @@ function foo<T,U>() {
 >T : Symbol(T, Decl(typeParameterArgumentEquivalence5.ts, 0, 13))
 >U : Symbol(U, Decl(typeParameterArgumentEquivalence5.ts, 0, 15))
 
-    var x: () => (item) => U;
+    var x!: () => (item: any) => U;
 >x : Symbol(x, Decl(typeParameterArgumentEquivalence5.ts, 1, 7))
->item : Symbol(item, Decl(typeParameterArgumentEquivalence5.ts, 1, 18))
+>item : Symbol(item, Decl(typeParameterArgumentEquivalence5.ts, 1, 19))
 >U : Symbol(U, Decl(typeParameterArgumentEquivalence5.ts, 0, 15))
 
-    var y: () => (item) => T;
+    var y!: () => (item: any) => T;
 >y : Symbol(y, Decl(typeParameterArgumentEquivalence5.ts, 2, 7))
->item : Symbol(item, Decl(typeParameterArgumentEquivalence5.ts, 2, 18))
+>item : Symbol(item, Decl(typeParameterArgumentEquivalence5.ts, 2, 19))
 >T : Symbol(T, Decl(typeParameterArgumentEquivalence5.ts, 0, 13))
 
     x = y;  // Should be an error
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence5.types b/tests/baselines/reference/typeParameterArgumentEquivalence5.types
index fc0e28f525809..725726f673caa 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence5.types
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence5.types
@@ -5,32 +5,32 @@ function foo<T,U>() {
 >foo : <T, U>() => void
 >    : ^ ^^ ^^^^^^^^^^^
 
-    var x: () => (item) => U;
+    var x!: () => (item: any) => U;
 >x : () => (item: any) => U
->  : ^^^^^^       ^^^      
+>  : ^^^^^^                
 >item : any
 >     : ^^^
 
-    var y: () => (item) => T;
+    var y!: () => (item: any) => T;
 >y : () => (item: any) => T
->  : ^^^^^^       ^^^      
+>  : ^^^^^^                
 >item : any
 >     : ^^^
 
     x = y;  // Should be an error
 >x = y : () => (item: any) => T
->      : ^^^^^^       ^^^      
+>      : ^^^^^^                
 >x : () => (item: any) => U
->  : ^^^^^^       ^^^      
+>  : ^^^^^^                
 >y : () => (item: any) => T
->  : ^^^^^^       ^^^      
+>  : ^^^^^^                
 
     y = x;  // Shound be an error
 >y = x : () => (item: any) => U
->      : ^^^^^^       ^^^      
+>      : ^^^^^^                
 >y : () => (item: any) => T
->  : ^^^^^^       ^^^      
+>  : ^^^^^^                
 >x : () => (item: any) => U
->  : ^^^^^^       ^^^      
+>  : ^^^^^^                
 }
 
diff --git a/tests/baselines/reference/typeParameterAssignmentCompat1.errors.txt b/tests/baselines/reference/typeParameterAssignmentCompat1.errors.txt
index cbba70ca89e80..c52940e03ad2c 100644
--- a/tests/baselines/reference/typeParameterAssignmentCompat1.errors.txt
+++ b/tests/baselines/reference/typeParameterAssignmentCompat1.errors.txt
@@ -18,8 +18,8 @@ typeParameterAssignmentCompat1.ts(17,9): error TS2322: Type 'Foo<T>' is not assi
     }
     
     function f<T, U>(): Foo<U> {
-        var x: Foo<T>;
-        var y: Foo<U>;
+        var x!: Foo<T>;
+        var y!: Foo<U>;
         x = y; // should be an error
         ~
 !!! error TS2322: Type 'Foo<U>' is not assignable to type 'Foo<T>'.
@@ -36,8 +36,8 @@ typeParameterAssignmentCompat1.ts(17,9): error TS2322: Type 'Foo<T>' is not assi
     
     class C<T> {
         f<U>(): Foo<U> {
-            var x: Foo<T>;
-            var y: Foo<U>;
+            var x!: Foo<T>;
+            var y!: Foo<U>;
             x = y; // should be an error
             ~
 !!! error TS2322: Type 'Foo<U>' is not assignable to type 'Foo<T>'.
diff --git a/tests/baselines/reference/typeParameterAssignmentCompat1.js b/tests/baselines/reference/typeParameterAssignmentCompat1.js
index a356e284505f7..bba984c1e1fa4 100644
--- a/tests/baselines/reference/typeParameterAssignmentCompat1.js
+++ b/tests/baselines/reference/typeParameterAssignmentCompat1.js
@@ -6,16 +6,16 @@ interface Foo<T> {
 }
 
 function f<T, U>(): Foo<U> {
-    var x: Foo<T>;
-    var y: Foo<U>;
+    var x!: Foo<T>;
+    var y!: Foo<U>;
     x = y; // should be an error
     return x;
 }
 
 class C<T> {
     f<U>(): Foo<U> {
-        var x: Foo<T>;
-        var y: Foo<U>;
+        var x!: Foo<T>;
+        var y!: Foo<U>;
         x = y; // should be an error
         return x;
     }
diff --git a/tests/baselines/reference/typeParameterAssignmentCompat1.symbols b/tests/baselines/reference/typeParameterAssignmentCompat1.symbols
index 9042e3493dac0..7ac0befb44daa 100644
--- a/tests/baselines/reference/typeParameterAssignmentCompat1.symbols
+++ b/tests/baselines/reference/typeParameterAssignmentCompat1.symbols
@@ -19,12 +19,12 @@ function f<T, U>(): Foo<U> {
 >Foo : Symbol(Foo, Decl(typeParameterAssignmentCompat1.ts, 0, 0))
 >U : Symbol(U, Decl(typeParameterAssignmentCompat1.ts, 4, 13))
 
-    var x: Foo<T>;
+    var x!: Foo<T>;
 >x : Symbol(x, Decl(typeParameterAssignmentCompat1.ts, 5, 7))
 >Foo : Symbol(Foo, Decl(typeParameterAssignmentCompat1.ts, 0, 0))
 >T : Symbol(T, Decl(typeParameterAssignmentCompat1.ts, 4, 11))
 
-    var y: Foo<U>;
+    var y!: Foo<U>;
 >y : Symbol(y, Decl(typeParameterAssignmentCompat1.ts, 6, 7))
 >Foo : Symbol(Foo, Decl(typeParameterAssignmentCompat1.ts, 0, 0))
 >U : Symbol(U, Decl(typeParameterAssignmentCompat1.ts, 4, 13))
@@ -47,12 +47,12 @@ class C<T> {
 >Foo : Symbol(Foo, Decl(typeParameterAssignmentCompat1.ts, 0, 0))
 >U : Symbol(U, Decl(typeParameterAssignmentCompat1.ts, 12, 6))
 
-        var x: Foo<T>;
+        var x!: Foo<T>;
 >x : Symbol(x, Decl(typeParameterAssignmentCompat1.ts, 13, 11))
 >Foo : Symbol(Foo, Decl(typeParameterAssignmentCompat1.ts, 0, 0))
 >T : Symbol(T, Decl(typeParameterAssignmentCompat1.ts, 11, 8))
 
-        var y: Foo<U>;
+        var y!: Foo<U>;
 >y : Symbol(y, Decl(typeParameterAssignmentCompat1.ts, 14, 11))
 >Foo : Symbol(Foo, Decl(typeParameterAssignmentCompat1.ts, 0, 0))
 >U : Symbol(U, Decl(typeParameterAssignmentCompat1.ts, 12, 6))
diff --git a/tests/baselines/reference/typeParameterAssignmentCompat1.types b/tests/baselines/reference/typeParameterAssignmentCompat1.types
index 0b3c05aabcea7..4a970b8c46bb2 100644
--- a/tests/baselines/reference/typeParameterAssignmentCompat1.types
+++ b/tests/baselines/reference/typeParameterAssignmentCompat1.types
@@ -13,11 +13,11 @@ function f<T, U>(): Foo<U> {
 >f : <T, U>() => Foo<U>
 >  : ^ ^^ ^^^^^^^      
 
-    var x: Foo<T>;
+    var x!: Foo<T>;
 >x : Foo<T>
 >  : ^^^^^^
 
-    var y: Foo<U>;
+    var y!: Foo<U>;
 >y : Foo<U>
 >  : ^^^^^^
 
@@ -42,11 +42,11 @@ class C<T> {
 >f : <U>() => Foo<U>
 >  : ^ ^^^^^^^      
 
-        var x: Foo<T>;
+        var x!: Foo<T>;
 >x : Foo<T>
 >  : ^^^^^^
 
-        var y: Foo<U>;
+        var y!: Foo<U>;
 >y : Foo<U>
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.errors.txt b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.errors.txt
index 11e95c8421bb7..0cbcbc35d3912 100644
--- a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.errors.txt
+++ b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.errors.txt
@@ -13,7 +13,7 @@ typeParameterConstrainedToOuterTypeParameter.ts(10,5): error TS2322: Type 'A<str
         <U extends T>(x: U)
     }
     
-    var a: A<string>
+    declare var a: A<string>;
     var b: B<string> = a; // assignment should be legal (both U's get instantiated to any for comparison)
         ~
 !!! error TS2322: Type 'A<string>' is not assignable to type 'B<string>'.
diff --git a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.js b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.js
index e9d733cf5f255..dc43590415aa9 100644
--- a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.js
+++ b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.js
@@ -9,9 +9,8 @@ interface B<T> {
     <U extends T>(x: U)
 }
 
-var a: A<string>
+declare var a: A<string>;
 var b: B<string> = a; // assignment should be legal (both U's get instantiated to any for comparison)
 
 //// [typeParameterConstrainedToOuterTypeParameter.js]
-var a;
 var b = a; // assignment should be legal (both U's get instantiated to any for comparison)
diff --git a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.symbols b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.symbols
index 029ecca9f1191..4214e090b4daf 100644
--- a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.symbols
+++ b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.symbols
@@ -23,12 +23,12 @@ interface B<T> {
 >U : Symbol(U, Decl(typeParameterConstrainedToOuterTypeParameter.ts, 5, 5))
 }
 
-var a: A<string>
->a : Symbol(a, Decl(typeParameterConstrainedToOuterTypeParameter.ts, 8, 3))
+declare var a: A<string>;
+>a : Symbol(a, Decl(typeParameterConstrainedToOuterTypeParameter.ts, 8, 11))
 >A : Symbol(A, Decl(typeParameterConstrainedToOuterTypeParameter.ts, 0, 0))
 
 var b: B<string> = a; // assignment should be legal (both U's get instantiated to any for comparison)
 >b : Symbol(b, Decl(typeParameterConstrainedToOuterTypeParameter.ts, 9, 3))
 >B : Symbol(B, Decl(typeParameterConstrainedToOuterTypeParameter.ts, 2, 1))
->a : Symbol(a, Decl(typeParameterConstrainedToOuterTypeParameter.ts, 8, 3))
+>a : Symbol(a, Decl(typeParameterConstrainedToOuterTypeParameter.ts, 8, 11))
 
diff --git a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.types b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.types
index 9ff9b55891336..9536dfd9da740 100644
--- a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.types
+++ b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.types
@@ -13,7 +13,7 @@ interface B<T> {
 >  : ^
 }
 
-var a: A<string>
+declare var a: A<string>;
 >a : A<string>
 >  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/typeParameterDiamond2.errors.txt b/tests/baselines/reference/typeParameterDiamond2.errors.txt
index 411486bf90830..c1fa82b270038 100644
--- a/tests/baselines/reference/typeParameterDiamond2.errors.txt
+++ b/tests/baselines/reference/typeParameterDiamond2.errors.txt
@@ -8,9 +8,9 @@ typeParameterDiamond2.ts(10,13): error TS2322: Type 'Bottom' is not assignable t
     function diamondTop<Top>() {
         function diamondMiddle<T extends Top, U>() {
             function diamondBottom<Bottom extends T | U>() {
-                var top: Top;
-                var middle: T | U;
-                var bottom: Bottom;
+                var top!: Top;
+                var middle!: T | U;
+                var bottom!: Bottom;
     
                 top = middle;
                 ~~~
diff --git a/tests/baselines/reference/typeParameterDiamond2.js b/tests/baselines/reference/typeParameterDiamond2.js
index 4863f45323bb3..788e86ef28153 100644
--- a/tests/baselines/reference/typeParameterDiamond2.js
+++ b/tests/baselines/reference/typeParameterDiamond2.js
@@ -4,9 +4,9 @@
 function diamondTop<Top>() {
     function diamondMiddle<T extends Top, U>() {
         function diamondBottom<Bottom extends T | U>() {
-            var top: Top;
-            var middle: T | U;
-            var bottom: Bottom;
+            var top!: Top;
+            var middle!: T | U;
+            var bottom!: Bottom;
 
             top = middle;
             middle = bottom;
diff --git a/tests/baselines/reference/typeParameterDiamond2.symbols b/tests/baselines/reference/typeParameterDiamond2.symbols
index 361d2e2eb96a7..b754bd5fae13e 100644
--- a/tests/baselines/reference/typeParameterDiamond2.symbols
+++ b/tests/baselines/reference/typeParameterDiamond2.symbols
@@ -17,16 +17,16 @@ function diamondTop<Top>() {
 >T : Symbol(T, Decl(typeParameterDiamond2.ts, 1, 27))
 >U : Symbol(U, Decl(typeParameterDiamond2.ts, 1, 41))
 
-            var top: Top;
+            var top!: Top;
 >top : Symbol(top, Decl(typeParameterDiamond2.ts, 3, 15))
 >Top : Symbol(Top, Decl(typeParameterDiamond2.ts, 0, 20))
 
-            var middle: T | U;
+            var middle!: T | U;
 >middle : Symbol(middle, Decl(typeParameterDiamond2.ts, 4, 15))
 >T : Symbol(T, Decl(typeParameterDiamond2.ts, 1, 27))
 >U : Symbol(U, Decl(typeParameterDiamond2.ts, 1, 41))
 
-            var bottom: Bottom;
+            var bottom!: Bottom;
 >bottom : Symbol(bottom, Decl(typeParameterDiamond2.ts, 5, 15))
 >Bottom : Symbol(Bottom, Decl(typeParameterDiamond2.ts, 2, 31))
 
diff --git a/tests/baselines/reference/typeParameterDiamond2.types b/tests/baselines/reference/typeParameterDiamond2.types
index edf1c60232221..563f1e9ebca8a 100644
--- a/tests/baselines/reference/typeParameterDiamond2.types
+++ b/tests/baselines/reference/typeParameterDiamond2.types
@@ -13,15 +13,15 @@ function diamondTop<Top>() {
 >diamondBottom : <Bottom extends T | U>() => void
 >              : ^      ^^^^^^^^^     ^^^^^^^^^^^
 
-            var top: Top;
+            var top!: Top;
 >top : Top
 >    : ^^^
 
-            var middle: T | U;
+            var middle!: T | U;
 >middle : T | U
 >       : ^^^^^
 
-            var bottom: Bottom;
+            var bottom!: Bottom;
 >bottom : Bottom
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/typeParameterDiamond3.errors.txt b/tests/baselines/reference/typeParameterDiamond3.errors.txt
index 0a65c77595899..59920354f0dcf 100644
--- a/tests/baselines/reference/typeParameterDiamond3.errors.txt
+++ b/tests/baselines/reference/typeParameterDiamond3.errors.txt
@@ -11,9 +11,9 @@ typeParameterDiamond3.ts(10,13): error TS2322: Type 'Bottom' is not assignable t
     function diamondTop<Top>() {
         function diamondMiddle<T, U>() {
             function diamondBottom<Bottom extends Top | T | U>() {
-                var top: Top;
-                var middle: T | U;
-                var bottom: Bottom;
+                var top!: Top;
+                var middle!: T | U;
+                var bottom!: Bottom;
     
                 top = middle;
                 ~~~
diff --git a/tests/baselines/reference/typeParameterDiamond3.js b/tests/baselines/reference/typeParameterDiamond3.js
index 0e5c968b52d72..962862f244bbc 100644
--- a/tests/baselines/reference/typeParameterDiamond3.js
+++ b/tests/baselines/reference/typeParameterDiamond3.js
@@ -4,9 +4,9 @@
 function diamondTop<Top>() {
     function diamondMiddle<T, U>() {
         function diamondBottom<Bottom extends Top | T | U>() {
-            var top: Top;
-            var middle: T | U;
-            var bottom: Bottom;
+            var top!: Top;
+            var middle!: T | U;
+            var bottom!: Bottom;
 
             top = middle;
             middle = bottom;
diff --git a/tests/baselines/reference/typeParameterDiamond3.symbols b/tests/baselines/reference/typeParameterDiamond3.symbols
index 5cefe5e401e8d..5e2dae72106db 100644
--- a/tests/baselines/reference/typeParameterDiamond3.symbols
+++ b/tests/baselines/reference/typeParameterDiamond3.symbols
@@ -17,16 +17,16 @@ function diamondTop<Top>() {
 >T : Symbol(T, Decl(typeParameterDiamond3.ts, 1, 27))
 >U : Symbol(U, Decl(typeParameterDiamond3.ts, 1, 29))
 
-            var top: Top;
+            var top!: Top;
 >top : Symbol(top, Decl(typeParameterDiamond3.ts, 3, 15))
 >Top : Symbol(Top, Decl(typeParameterDiamond3.ts, 0, 20))
 
-            var middle: T | U;
+            var middle!: T | U;
 >middle : Symbol(middle, Decl(typeParameterDiamond3.ts, 4, 15))
 >T : Symbol(T, Decl(typeParameterDiamond3.ts, 1, 27))
 >U : Symbol(U, Decl(typeParameterDiamond3.ts, 1, 29))
 
-            var bottom: Bottom;
+            var bottom!: Bottom;
 >bottom : Symbol(bottom, Decl(typeParameterDiamond3.ts, 5, 15))
 >Bottom : Symbol(Bottom, Decl(typeParameterDiamond3.ts, 2, 31))
 
diff --git a/tests/baselines/reference/typeParameterDiamond3.types b/tests/baselines/reference/typeParameterDiamond3.types
index b74ac85eaeda8..9da135943d79e 100644
--- a/tests/baselines/reference/typeParameterDiamond3.types
+++ b/tests/baselines/reference/typeParameterDiamond3.types
@@ -13,15 +13,15 @@ function diamondTop<Top>() {
 >diamondBottom : <Bottom extends Top | T | U>() => void
 >              : ^      ^^^^^^^^^           ^^^^^^^^^^^
 
-            var top: Top;
+            var top!: Top;
 >top : Top
 >    : ^^^
 
-            var middle: T | U;
+            var middle!: T | U;
 >middle : T | U
 >       : ^^^^^
 
-            var bottom: Bottom;
+            var bottom!: Bottom;
 >bottom : Bottom
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/typeParameterDiamond4.errors.txt b/tests/baselines/reference/typeParameterDiamond4.errors.txt
index 0a55ce915a378..1422a6eccfdb8 100644
--- a/tests/baselines/reference/typeParameterDiamond4.errors.txt
+++ b/tests/baselines/reference/typeParameterDiamond4.errors.txt
@@ -8,9 +8,9 @@ typeParameterDiamond4.ts(10,13): error TS2322: Type 'Bottom' is not assignable t
     function diamondTop<Top>() {
         function diamondMiddle<T, U>() {
             function diamondBottom<Bottom extends Top | T | U>() {
-                var top: Top;
-                var middle: Top | T | U;
-                var bottom: Bottom;
+                var top!: Top;
+                var middle!: Top | T | U;
+                var bottom!: Bottom;
     
                 top = middle;
                 ~~~
diff --git a/tests/baselines/reference/typeParameterDiamond4.js b/tests/baselines/reference/typeParameterDiamond4.js
index 5c210d49c1019..b09a9f99b9185 100644
--- a/tests/baselines/reference/typeParameterDiamond4.js
+++ b/tests/baselines/reference/typeParameterDiamond4.js
@@ -4,9 +4,9 @@
 function diamondTop<Top>() {
     function diamondMiddle<T, U>() {
         function diamondBottom<Bottom extends Top | T | U>() {
-            var top: Top;
-            var middle: Top | T | U;
-            var bottom: Bottom;
+            var top!: Top;
+            var middle!: Top | T | U;
+            var bottom!: Bottom;
 
             top = middle;
             middle = bottom;
diff --git a/tests/baselines/reference/typeParameterDiamond4.symbols b/tests/baselines/reference/typeParameterDiamond4.symbols
index bbeb02ddacd96..c309ff8da5f39 100644
--- a/tests/baselines/reference/typeParameterDiamond4.symbols
+++ b/tests/baselines/reference/typeParameterDiamond4.symbols
@@ -17,17 +17,17 @@ function diamondTop<Top>() {
 >T : Symbol(T, Decl(typeParameterDiamond4.ts, 1, 27))
 >U : Symbol(U, Decl(typeParameterDiamond4.ts, 1, 29))
 
-            var top: Top;
+            var top!: Top;
 >top : Symbol(top, Decl(typeParameterDiamond4.ts, 3, 15))
 >Top : Symbol(Top, Decl(typeParameterDiamond4.ts, 0, 20))
 
-            var middle: Top | T | U;
+            var middle!: Top | T | U;
 >middle : Symbol(middle, Decl(typeParameterDiamond4.ts, 4, 15))
 >Top : Symbol(Top, Decl(typeParameterDiamond4.ts, 0, 20))
 >T : Symbol(T, Decl(typeParameterDiamond4.ts, 1, 27))
 >U : Symbol(U, Decl(typeParameterDiamond4.ts, 1, 29))
 
-            var bottom: Bottom;
+            var bottom!: Bottom;
 >bottom : Symbol(bottom, Decl(typeParameterDiamond4.ts, 5, 15))
 >Bottom : Symbol(Bottom, Decl(typeParameterDiamond4.ts, 2, 31))
 
diff --git a/tests/baselines/reference/typeParameterDiamond4.types b/tests/baselines/reference/typeParameterDiamond4.types
index 154ae0312ab80..eeb8d2ce682c4 100644
--- a/tests/baselines/reference/typeParameterDiamond4.types
+++ b/tests/baselines/reference/typeParameterDiamond4.types
@@ -13,15 +13,15 @@ function diamondTop<Top>() {
 >diamondBottom : <Bottom extends Top | T | U>() => void
 >              : ^      ^^^^^^^^^           ^^^^^^^^^^^
 
-            var top: Top;
+            var top!: Top;
 >top : Top
 >    : ^^^
 
-            var middle: Top | T | U;
+            var middle!: Top | T | U;
 >middle : Top | T | U
 >       : ^^^^^^^^^^^
 
-            var bottom: Bottom;
+            var bottom!: Bottom;
 >bottom : Bottom
 >       : ^^^^^^
 
diff --git a/tests/baselines/reference/typeParameterExplicitlyExtendsAny.errors.txt b/tests/baselines/reference/typeParameterExplicitlyExtendsAny.errors.txt
index 72ffcb76a1610..80fbfaffc7e28 100644
--- a/tests/baselines/reference/typeParameterExplicitlyExtendsAny.errors.txt
+++ b/tests/baselines/reference/typeParameterExplicitlyExtendsAny.errors.txt
@@ -10,7 +10,7 @@ typeParameterExplicitlyExtendsAny.ts(30,14): error TS2339: Property 'children' d
 
 ==== typeParameterExplicitlyExtendsAny.ts (6 errors) ====
     function fee<T>() {
-        var t: T;
+        var t!: T;
         t.blah; // Error
           ~~~~
 !!! error TS2339: Property 'blah' does not exist on type 'T'.
@@ -18,7 +18,7 @@ typeParameterExplicitlyExtendsAny.ts(30,14): error TS2339: Property 'children' d
     }
     
     function fee2<T extends any>() {
-        var t: T;
+        var t!: T;
         t.blah; // ok
           ~~~~
 !!! error TS2339: Property 'blah' does not exist on type 'T'.
diff --git a/tests/baselines/reference/typeParameterExplicitlyExtendsAny.js b/tests/baselines/reference/typeParameterExplicitlyExtendsAny.js
index 4123e6e9ad1a0..c61b7e56d7f61 100644
--- a/tests/baselines/reference/typeParameterExplicitlyExtendsAny.js
+++ b/tests/baselines/reference/typeParameterExplicitlyExtendsAny.js
@@ -2,13 +2,13 @@
 
 //// [typeParameterExplicitlyExtendsAny.ts]
 function fee<T>() {
-    var t: T;
+    var t!: T;
     t.blah; // Error
     t.toString; // ok
 }
 
 function fee2<T extends any>() {
-    var t: T;
+    var t!: T;
     t.blah; // ok
     t.toString; // ok
 }
diff --git a/tests/baselines/reference/typeParameterExplicitlyExtendsAny.symbols b/tests/baselines/reference/typeParameterExplicitlyExtendsAny.symbols
index c95e8202cc8b7..d4fa3b6188ee1 100644
--- a/tests/baselines/reference/typeParameterExplicitlyExtendsAny.symbols
+++ b/tests/baselines/reference/typeParameterExplicitlyExtendsAny.symbols
@@ -5,7 +5,7 @@ function fee<T>() {
 >fee : Symbol(fee, Decl(typeParameterExplicitlyExtendsAny.ts, 0, 0))
 >T : Symbol(T, Decl(typeParameterExplicitlyExtendsAny.ts, 0, 13))
 
-    var t: T;
+    var t!: T;
 >t : Symbol(t, Decl(typeParameterExplicitlyExtendsAny.ts, 1, 7))
 >T : Symbol(T, Decl(typeParameterExplicitlyExtendsAny.ts, 0, 13))
 
@@ -22,7 +22,7 @@ function fee2<T extends any>() {
 >fee2 : Symbol(fee2, Decl(typeParameterExplicitlyExtendsAny.ts, 4, 1))
 >T : Symbol(T, Decl(typeParameterExplicitlyExtendsAny.ts, 6, 14))
 
-    var t: T;
+    var t!: T;
 >t : Symbol(t, Decl(typeParameterExplicitlyExtendsAny.ts, 7, 7))
 >T : Symbol(T, Decl(typeParameterExplicitlyExtendsAny.ts, 6, 14))
 
diff --git a/tests/baselines/reference/typeParameterExplicitlyExtendsAny.types b/tests/baselines/reference/typeParameterExplicitlyExtendsAny.types
index 5d8dfdcaa1f98..267881f94f777 100644
--- a/tests/baselines/reference/typeParameterExplicitlyExtendsAny.types
+++ b/tests/baselines/reference/typeParameterExplicitlyExtendsAny.types
@@ -5,7 +5,7 @@ function fee<T>() {
 >fee : <T>() => void
 >    : ^ ^^^^^^^^^^^
 
-    var t: T;
+    var t!: T;
 >t : T
 >  : ^
 
@@ -30,7 +30,7 @@ function fee2<T extends any>() {
 >fee2 : <T extends unknown>() => void
 >     : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-    var t: T;
+    var t!: T;
 >t : T
 >  : ^
 
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
index 85d26cfa6283e..dc127c5ec9479 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.errors.txt
@@ -6,7 +6,7 @@ typeParameterFixingWithContextSensitiveArguments2.ts(7,30): error TS2741: Proper
     interface A { a: A; }
     interface B extends A { b; }
     
-    var a: A, b: B;
+    declare var a: A, b: B;
     
     var d = f(a, b, x => x, x => x); // A => A not assignable to A => B
                                  ~
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.js b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.js
index 1d19fc37e4f59..fd324a622c98c 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.js
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.js
@@ -5,11 +5,10 @@ function f<T, U>(y: T, y1: U, p: (z: U) => T, p1: (x: T) => U): [T, U] { return
 interface A { a: A; }
 interface B extends A { b; }
 
-var a: A, b: B;
+declare var a: A, b: B;
 
 var d = f(a, b, x => x, x => x); // A => A not assignable to A => B
 
 //// [typeParameterFixingWithContextSensitiveArguments2.js]
 function f(y, y1, p, p1) { return [y, p1(y)]; }
-var a, b;
 var d = f(a, b, function (x) { return x; }, function (x) { return x; }); // A => A not assignable to A => B
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.symbols b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.symbols
index dc9008ea3dfd1..bcb365c8a3516 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.symbols
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.symbols
@@ -33,17 +33,17 @@ interface B extends A { b; }
 >A : Symbol(A, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 0, 93))
 >b : Symbol(B.b, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 2, 23))
 
-var a: A, b: B;
->a : Symbol(a, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 4, 3))
+declare var a: A, b: B;
+>a : Symbol(a, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 4, 11))
 >A : Symbol(A, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 0, 93))
->b : Symbol(b, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 4, 9))
+>b : Symbol(b, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 4, 17))
 >B : Symbol(B, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 1, 21))
 
 var d = f(a, b, x => x, x => x); // A => A not assignable to A => B
 >d : Symbol(d, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 6, 3))
 >f : Symbol(f, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 0, 0))
->a : Symbol(a, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 4, 3))
->b : Symbol(b, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 4, 9))
+>a : Symbol(a, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 4, 11))
+>b : Symbol(b, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 4, 17))
 >x : Symbol(x, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 6, 15))
 >x : Symbol(x, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 6, 15))
 >x : Symbol(x, Decl(typeParameterFixingWithContextSensitiveArguments2.ts, 6, 23))
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.types b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.types
index 42f1ca3d701a8..de10e8879d0cd 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.types
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.types
@@ -35,7 +35,7 @@ interface B extends A { b; }
 >b : any
 >  : ^^^
 
-var a: A, b: B;
+declare var a: A, b: B;
 >a : A
 >  : ^
 >b : B
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt
index 1670671cfc2c9..3cc1181e234c8 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.errors.txt
@@ -6,7 +6,7 @@ typeParameterFixingWithContextSensitiveArguments3.ts(7,35): error TS2741: Proper
     interface A { a: A; }
     interface B extends A { b: B; }
     
-    var a: A, b: B;
+    declare var a: A, b: B;
     
     var d = f(a, b, u2 => u2.b, t2 => t2);
                                       ~~
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.js b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.js
index ede8ce3b1706b..3d25093176322 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.js
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.js
@@ -5,11 +5,10 @@ function f<T, U>(t1: T, u1: U, pf1: (u2: U) => T, pf2: (t2: T) => U): [T, U] { r
 interface A { a: A; }
 interface B extends A { b: B; }
 
-var a: A, b: B;
+declare var a: A, b: B;
 
 var d = f(a, b, u2 => u2.b, t2 => t2);
 
 //// [typeParameterFixingWithContextSensitiveArguments3.js]
 function f(t1, u1, pf1, pf2) { return [t1, pf2(t1)]; }
-var a, b;
 var d = f(a, b, function (u2) { return u2.b; }, function (t2) { return t2; });
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.symbols b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.symbols
index 0dd1b7ef88686..d2756a5a1511d 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.symbols
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.symbols
@@ -34,17 +34,17 @@ interface B extends A { b: B; }
 >b : Symbol(B.b, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 2, 23))
 >B : Symbol(B, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 1, 21))
 
-var a: A, b: B;
->a : Symbol(a, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 4, 3))
+declare var a: A, b: B;
+>a : Symbol(a, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 4, 11))
 >A : Symbol(A, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 0, 102))
->b : Symbol(b, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 4, 9))
+>b : Symbol(b, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 4, 17))
 >B : Symbol(B, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 1, 21))
 
 var d = f(a, b, u2 => u2.b, t2 => t2);
 >d : Symbol(d, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 6, 3))
 >f : Symbol(f, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 0, 0))
->a : Symbol(a, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 4, 3))
->b : Symbol(b, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 4, 9))
+>a : Symbol(a, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 4, 11))
+>b : Symbol(b, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 4, 17))
 >u2 : Symbol(u2, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 6, 15))
 >u2.b : Symbol(B.b, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 2, 23))
 >u2 : Symbol(u2, Decl(typeParameterFixingWithContextSensitiveArguments3.ts, 6, 15))
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.types b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.types
index 4e538eec3f2f2..d2276cd97201e 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.types
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.types
@@ -35,7 +35,7 @@ interface B extends A { b: B; }
 >b : B
 >  : ^
 
-var a: A, b: B;
+declare var a: A, b: B;
 >a : A
 >  : ^
 >b : B
diff --git a/tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt b/tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt
index d5fa251adcc4f..342cb732ba6ff 100644
--- a/tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt
+++ b/tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt
@@ -11,7 +11,7 @@ typeParameterWithInvalidConstraintType.ts(7,17): error TS2349: This expression i
                       ~
 !!! error TS2313: Type parameter 'T' has a circular constraint.
         foo() {
-            var x: T;
+            var x!: T;
             var a = x.foo();
                       ~~~
 !!! error TS2339: Property 'foo' does not exist on type 'T'.
diff --git a/tests/baselines/reference/typeParameterWithInvalidConstraintType.js b/tests/baselines/reference/typeParameterWithInvalidConstraintType.js
index 0f28d2b742138..f7a89a4816c39 100644
--- a/tests/baselines/reference/typeParameterWithInvalidConstraintType.js
+++ b/tests/baselines/reference/typeParameterWithInvalidConstraintType.js
@@ -3,7 +3,7 @@
 //// [typeParameterWithInvalidConstraintType.ts]
 class A<T extends T> {
     foo() {
-        var x: T;
+        var x!: T;
         var a = x.foo();
         var b = new x(123);
         var c = x[1];
diff --git a/tests/baselines/reference/typeParameterWithInvalidConstraintType.symbols b/tests/baselines/reference/typeParameterWithInvalidConstraintType.symbols
index e9684a730b59c..d05b5155e734e 100644
--- a/tests/baselines/reference/typeParameterWithInvalidConstraintType.symbols
+++ b/tests/baselines/reference/typeParameterWithInvalidConstraintType.symbols
@@ -9,7 +9,7 @@ class A<T extends T> {
     foo() {
 >foo : Symbol(A.foo, Decl(typeParameterWithInvalidConstraintType.ts, 0, 22))
 
-        var x: T;
+        var x!: T;
 >x : Symbol(x, Decl(typeParameterWithInvalidConstraintType.ts, 2, 11))
 >T : Symbol(T, Decl(typeParameterWithInvalidConstraintType.ts, 0, 8))
 
diff --git a/tests/baselines/reference/typeParameterWithInvalidConstraintType.types b/tests/baselines/reference/typeParameterWithInvalidConstraintType.types
index 45592c10b4157..c1a47f8b2e68c 100644
--- a/tests/baselines/reference/typeParameterWithInvalidConstraintType.types
+++ b/tests/baselines/reference/typeParameterWithInvalidConstraintType.types
@@ -9,7 +9,7 @@ class A<T extends T> {
 >foo : () => void
 >    : ^^^^^^^^^^
 
-        var x: T;
+        var x!: T;
 >x : T
 >  : ^
 
diff --git a/tests/baselines/reference/typeParametersShouldNotBeEqual.errors.txt b/tests/baselines/reference/typeParametersShouldNotBeEqual.errors.txt
index 3241095401ef9..a90141036c136 100644
--- a/tests/baselines/reference/typeParametersShouldNotBeEqual.errors.txt
+++ b/tests/baselines/reference/typeParametersShouldNotBeEqual.errors.txt
@@ -6,7 +6,7 @@ typeParametersShouldNotBeEqual.ts(5,5): error TS2322: Type 'Object' is not assig
 
 ==== typeParametersShouldNotBeEqual.ts (2 errors) ====
     function ff<T, U>(x: T, y: U) {
-        var z: Object;
+        var z!: Object;
         x = x;  // Ok
         x = y;  // Error
         ~
diff --git a/tests/baselines/reference/typeParametersShouldNotBeEqual.js b/tests/baselines/reference/typeParametersShouldNotBeEqual.js
index e15aac7380087..c4ea6842486d3 100644
--- a/tests/baselines/reference/typeParametersShouldNotBeEqual.js
+++ b/tests/baselines/reference/typeParametersShouldNotBeEqual.js
@@ -2,7 +2,7 @@
 
 //// [typeParametersShouldNotBeEqual.ts]
 function ff<T, U>(x: T, y: U) {
-    var z: Object;
+    var z!: Object;
     x = x;  // Ok
     x = y;  // Error
     x = z;  // Error
diff --git a/tests/baselines/reference/typeParametersShouldNotBeEqual.symbols b/tests/baselines/reference/typeParametersShouldNotBeEqual.symbols
index 80a90740e6f30..1ab1b1d198250 100644
--- a/tests/baselines/reference/typeParametersShouldNotBeEqual.symbols
+++ b/tests/baselines/reference/typeParametersShouldNotBeEqual.symbols
@@ -10,7 +10,7 @@ function ff<T, U>(x: T, y: U) {
 >y : Symbol(y, Decl(typeParametersShouldNotBeEqual.ts, 0, 23))
 >U : Symbol(U, Decl(typeParametersShouldNotBeEqual.ts, 0, 14))
 
-    var z: Object;
+    var z!: Object;
 >z : Symbol(z, Decl(typeParametersShouldNotBeEqual.ts, 1, 7))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
diff --git a/tests/baselines/reference/typeParametersShouldNotBeEqual.types b/tests/baselines/reference/typeParametersShouldNotBeEqual.types
index 72d54644670df..f4a6875f02c92 100644
--- a/tests/baselines/reference/typeParametersShouldNotBeEqual.types
+++ b/tests/baselines/reference/typeParametersShouldNotBeEqual.types
@@ -9,7 +9,7 @@ function ff<T, U>(x: T, y: U) {
 >y : U
 >  : ^
 
-    var z: Object;
+    var z!: Object;
 >z : Object
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/typeParametersShouldNotBeEqual2.errors.txt b/tests/baselines/reference/typeParametersShouldNotBeEqual2.errors.txt
index 6f45110e9877c..08a27a16bb294 100644
--- a/tests/baselines/reference/typeParametersShouldNotBeEqual2.errors.txt
+++ b/tests/baselines/reference/typeParametersShouldNotBeEqual2.errors.txt
@@ -14,7 +14,7 @@ typeParametersShouldNotBeEqual2.ts(9,5): error TS2322: Type 'Object' is not assi
 
 ==== typeParametersShouldNotBeEqual2.ts (6 errors) ====
     function ff<T extends Date, U extends Date, V>(x: T, y: U, z: V) {
-        var zz: Object;
+        var zz!: Object;
         x = x;  // Ok
         x = y;  // Ok
         ~
diff --git a/tests/baselines/reference/typeParametersShouldNotBeEqual2.js b/tests/baselines/reference/typeParametersShouldNotBeEqual2.js
index f934be3524ef3..f71c6df7d6fc2 100644
--- a/tests/baselines/reference/typeParametersShouldNotBeEqual2.js
+++ b/tests/baselines/reference/typeParametersShouldNotBeEqual2.js
@@ -2,7 +2,7 @@
 
 //// [typeParametersShouldNotBeEqual2.ts]
 function ff<T extends Date, U extends Date, V>(x: T, y: U, z: V) {
-    var zz: Object;
+    var zz!: Object;
     x = x;  // Ok
     x = y;  // Ok
     x = z;  // Error
diff --git a/tests/baselines/reference/typeParametersShouldNotBeEqual2.symbols b/tests/baselines/reference/typeParametersShouldNotBeEqual2.symbols
index 08fc654f5e888..830a39b578017 100644
--- a/tests/baselines/reference/typeParametersShouldNotBeEqual2.symbols
+++ b/tests/baselines/reference/typeParametersShouldNotBeEqual2.symbols
@@ -15,7 +15,7 @@ function ff<T extends Date, U extends Date, V>(x: T, y: U, z: V) {
 >z : Symbol(z, Decl(typeParametersShouldNotBeEqual2.ts, 0, 58))
 >V : Symbol(V, Decl(typeParametersShouldNotBeEqual2.ts, 0, 43))
 
-    var zz: Object;
+    var zz!: Object;
 >zz : Symbol(zz, Decl(typeParametersShouldNotBeEqual2.ts, 1, 7))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
diff --git a/tests/baselines/reference/typeParametersShouldNotBeEqual2.types b/tests/baselines/reference/typeParametersShouldNotBeEqual2.types
index da7c03932120f..465ea7286ebe7 100644
--- a/tests/baselines/reference/typeParametersShouldNotBeEqual2.types
+++ b/tests/baselines/reference/typeParametersShouldNotBeEqual2.types
@@ -11,7 +11,7 @@ function ff<T extends Date, U extends Date, V>(x: T, y: U, z: V) {
 >z : V
 >  : ^
 
-    var zz: Object;
+    var zz!: Object;
 >zz : Object
 >   : ^^^^^^
 
diff --git a/tests/baselines/reference/typeParametersShouldNotBeEqual3.errors.txt b/tests/baselines/reference/typeParametersShouldNotBeEqual3.errors.txt
index b5e5f1a6bff9d..40f22b9ceb560 100644
--- a/tests/baselines/reference/typeParametersShouldNotBeEqual3.errors.txt
+++ b/tests/baselines/reference/typeParametersShouldNotBeEqual3.errors.txt
@@ -7,7 +7,7 @@ typeParametersShouldNotBeEqual3.ts(5,5): error TS2322: Type 'Object' is not assi
 
 ==== typeParametersShouldNotBeEqual3.ts (2 errors) ====
     function ff<T extends Object, U extends Object>(x: T, y: U) {
-        var z: Object;
+        var z!: Object;
         x = x;  // Ok
         x = y;  // Ok
         ~
diff --git a/tests/baselines/reference/typeParametersShouldNotBeEqual3.js b/tests/baselines/reference/typeParametersShouldNotBeEqual3.js
index ae507eac8c654..f6e4472f1f46e 100644
--- a/tests/baselines/reference/typeParametersShouldNotBeEqual3.js
+++ b/tests/baselines/reference/typeParametersShouldNotBeEqual3.js
@@ -2,7 +2,7 @@
 
 //// [typeParametersShouldNotBeEqual3.ts]
 function ff<T extends Object, U extends Object>(x: T, y: U) {
-    var z: Object;
+    var z!: Object;
     x = x;  // Ok
     x = y;  // Ok
     x = z;  // Ok
diff --git a/tests/baselines/reference/typeParametersShouldNotBeEqual3.symbols b/tests/baselines/reference/typeParametersShouldNotBeEqual3.symbols
index 98b1b97e9100e..4c5788324810e 100644
--- a/tests/baselines/reference/typeParametersShouldNotBeEqual3.symbols
+++ b/tests/baselines/reference/typeParametersShouldNotBeEqual3.symbols
@@ -12,7 +12,7 @@ function ff<T extends Object, U extends Object>(x: T, y: U) {
 >y : Symbol(y, Decl(typeParametersShouldNotBeEqual3.ts, 0, 53))
 >U : Symbol(U, Decl(typeParametersShouldNotBeEqual3.ts, 0, 29))
 
-    var z: Object;
+    var z!: Object;
 >z : Symbol(z, Decl(typeParametersShouldNotBeEqual3.ts, 1, 7))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
diff --git a/tests/baselines/reference/typeParametersShouldNotBeEqual3.types b/tests/baselines/reference/typeParametersShouldNotBeEqual3.types
index 7d9075ec04813..699e18abe22cb 100644
--- a/tests/baselines/reference/typeParametersShouldNotBeEqual3.types
+++ b/tests/baselines/reference/typeParametersShouldNotBeEqual3.types
@@ -9,7 +9,7 @@ function ff<T extends Object, U extends Object>(x: T, y: U) {
 >y : U
 >  : ^
 
-    var z: Object;
+    var z!: Object;
 >z : Object
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/typeReferenceDirectives11.errors.txt b/tests/baselines/reference/typeReferenceDirectives11.errors.txt
index fa3bba15ee23d..7949645483b5c 100644
--- a/tests/baselines/reference/typeReferenceDirectives11.errors.txt
+++ b/tests/baselines/reference/typeReferenceDirectives11.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 /mod1.ts(1,17): error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /mod2.ts (0 errors) ====
     import {foo} from "./mod1";
     export const bar = foo();
diff --git a/tests/baselines/reference/typeReferenceDirectives12.errors.txt b/tests/baselines/reference/typeReferenceDirectives12.errors.txt
index dce188dc25ca5..ea73362f0a3e9 100644
--- a/tests/baselines/reference/typeReferenceDirectives12.errors.txt
+++ b/tests/baselines/reference/typeReferenceDirectives12.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 /main.ts(1,14): error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /mod2.ts (0 errors) ====
     import { Cls } from "./main";
     import "./mod1";
diff --git a/tests/baselines/reference/typeSatisfaction_js.errors.txt b/tests/baselines/reference/typeSatisfaction_js.errors.txt
index 0858b35c7e426..fe8112216e6e6 100644
--- a/tests/baselines/reference/typeSatisfaction_js.errors.txt
+++ b/tests/baselines/reference/typeSatisfaction_js.errors.txt
@@ -1,6 +1,8 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 /src/a.js(1,29): error TS8037: Type satisfaction expressions can only be used in TypeScript files.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /src/a.js (1 errors) ====
     var v = undefined satisfies 1;
                                 ~
diff --git a/tests/baselines/reference/typeofClass.errors.txt b/tests/baselines/reference/typeofClass.errors.txt
index e49465a0e71fe..157d581d26455 100644
--- a/tests/baselines/reference/typeofClass.errors.txt
+++ b/tests/baselines/reference/typeofClass.errors.txt
@@ -8,12 +8,12 @@ typeofClass.ts(10,4): error TS2339: Property 'foo' does not exist on type 'typeo
         static bar: string;
     }
     
-    var k1: K;
+    declare var k1: K;
     k1.foo;
     k1.bar;
        ~~~
 !!! error TS2576: Property 'bar' does not exist on type 'K'. Did you mean to access the static member 'K.bar' instead?
-    var k2: typeof K;
+    declare var k2: typeof K;
     k2.foo;
        ~~~
 !!! error TS2339: Property 'foo' does not exist on type 'typeof K'.
diff --git a/tests/baselines/reference/typeofClass.js b/tests/baselines/reference/typeofClass.js
index a688d6d03dffe..aa6aeca9c8a49 100644
--- a/tests/baselines/reference/typeofClass.js
+++ b/tests/baselines/reference/typeofClass.js
@@ -6,10 +6,10 @@ class K {
     static bar: string;
 }
 
-var k1: K;
+declare var k1: K;
 k1.foo;
 k1.bar;
-var k2: typeof K;
+declare var k2: typeof K;
 k2.foo;
 k2.bar;
 
@@ -19,9 +19,7 @@ var K = /** @class */ (function () {
     }
     return K;
 }());
-var k1;
 k1.foo;
 k1.bar;
-var k2;
 k2.foo;
 k2.bar;
diff --git a/tests/baselines/reference/typeofClass.symbols b/tests/baselines/reference/typeofClass.symbols
index ef9d49a8fa0fb..b3dbffeabf7e9 100644
--- a/tests/baselines/reference/typeofClass.symbols
+++ b/tests/baselines/reference/typeofClass.symbols
@@ -11,27 +11,27 @@ class K {
 >bar : Symbol(K.bar, Decl(typeofClass.ts, 1, 16))
 }
 
-var k1: K;
->k1 : Symbol(k1, Decl(typeofClass.ts, 5, 3))
+declare var k1: K;
+>k1 : Symbol(k1, Decl(typeofClass.ts, 5, 11))
 >K : Symbol(K, Decl(typeofClass.ts, 0, 0))
 
 k1.foo;
 >k1.foo : Symbol(K.foo, Decl(typeofClass.ts, 0, 9))
->k1 : Symbol(k1, Decl(typeofClass.ts, 5, 3))
+>k1 : Symbol(k1, Decl(typeofClass.ts, 5, 11))
 >foo : Symbol(K.foo, Decl(typeofClass.ts, 0, 9))
 
 k1.bar;
->k1 : Symbol(k1, Decl(typeofClass.ts, 5, 3))
+>k1 : Symbol(k1, Decl(typeofClass.ts, 5, 11))
 
-var k2: typeof K;
->k2 : Symbol(k2, Decl(typeofClass.ts, 8, 3))
+declare var k2: typeof K;
+>k2 : Symbol(k2, Decl(typeofClass.ts, 8, 11))
 >K : Symbol(K, Decl(typeofClass.ts, 0, 0))
 
 k2.foo;
->k2 : Symbol(k2, Decl(typeofClass.ts, 8, 3))
+>k2 : Symbol(k2, Decl(typeofClass.ts, 8, 11))
 
 k2.bar;
 >k2.bar : Symbol(K.bar, Decl(typeofClass.ts, 1, 16))
->k2 : Symbol(k2, Decl(typeofClass.ts, 8, 3))
+>k2 : Symbol(k2, Decl(typeofClass.ts, 8, 11))
 >bar : Symbol(K.bar, Decl(typeofClass.ts, 1, 16))
 
diff --git a/tests/baselines/reference/typeofClass.types b/tests/baselines/reference/typeofClass.types
index 8c678d20c2526..5bd67fd178b5d 100644
--- a/tests/baselines/reference/typeofClass.types
+++ b/tests/baselines/reference/typeofClass.types
@@ -14,7 +14,7 @@ class K {
 >    : ^^^^^^
 }
 
-var k1: K;
+declare var k1: K;
 >k1 : K
 >   : ^
 
@@ -34,7 +34,7 @@ k1.bar;
 >bar : any
 >    : ^^^
 
-var k2: typeof K;
+declare var k2: typeof K;
 >k2 : typeof K
 >   : ^^^^^^^^
 >K : typeof K
diff --git a/tests/baselines/reference/typeofOperatorWithAnyOtherType.errors.txt b/tests/baselines/reference/typeofOperatorWithAnyOtherType.errors.txt
index 4ff9a46c50111..811a2b1c8e1ca 100644
--- a/tests/baselines/reference/typeofOperatorWithAnyOtherType.errors.txt
+++ b/tests/baselines/reference/typeofOperatorWithAnyOtherType.errors.txt
@@ -7,25 +7,25 @@ typeofOperatorWithAnyOtherType.ts(58,1): error TS2695: Left side of comma operat
 ==== typeofOperatorWithAnyOtherType.ts (4 errors) ====
     // typeof  operator on any type
     
-    var ANY: any;
-    var ANY1;
+    declare var ANY: any;
+    declare var ANY1;
     var ANY2: any[] = ["", ""];
-    var obj: () => {}
+    declare var obj: () => {};
     var obj1 = { x: "a", y: () => { }};
     
     function foo(): any {
-        var a;
+        var a!: any;
         return a;
     }
     class A {
         public a: any;
         static foo() {
-            var a;
+            var a!: any;
             return a;
         }
     }
     namespace M {
-        export var n: any;
+        export var n!: any;
     }
     var objA = new A();
     
@@ -77,9 +77,9 @@ typeofOperatorWithAnyOtherType.ts(58,1): error TS2695: Left side of comma operat
     typeof M.n;
     
     // use typeof in type query
-    var z: any;
-    var x: any[];
-    var r: () => any;
+    var z!: any;
+    var x!: any[];
+    var r!: () => any;
     z: typeof ANY;
     x: typeof ANY2;
     r: typeof foo;
diff --git a/tests/baselines/reference/typeofOperatorWithAnyOtherType.js b/tests/baselines/reference/typeofOperatorWithAnyOtherType.js
index 43be56aa759b5..7a67a47959b49 100644
--- a/tests/baselines/reference/typeofOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/typeofOperatorWithAnyOtherType.js
@@ -3,25 +3,25 @@
 //// [typeofOperatorWithAnyOtherType.ts]
 // typeof  operator on any type
 
-var ANY: any;
-var ANY1;
+declare var ANY: any;
+declare var ANY1;
 var ANY2: any[] = ["", ""];
-var obj: () => {}
+declare var obj: () => {};
 var obj1 = { x: "a", y: () => { }};
 
 function foo(): any {
-    var a;
+    var a!: any;
     return a;
 }
 class A {
     public a: any;
     static foo() {
-        var a;
+        var a!: any;
         return a;
     }
 }
 namespace M {
-    export var n: any;
+    export var n!: any;
 }
 var objA = new A();
 
@@ -65,9 +65,9 @@ typeof objA.a;
 typeof M.n;
 
 // use typeof in type query
-var z: any;
-var x: any[];
-var r: () => any;
+var z!: any;
+var x!: any[];
+var r!: () => any;
 z: typeof ANY;
 x: typeof ANY2;
 r: typeof foo;
@@ -78,10 +78,7 @@ z: typeof obj1.x;
 
 //// [typeofOperatorWithAnyOtherType.js]
 // typeof  operator on any type
-var ANY;
-var ANY1;
 var ANY2 = ["", ""];
-var obj;
 var obj1 = { x: "a", y: function () { } };
 function foo() {
     var a;
diff --git a/tests/baselines/reference/typeofOperatorWithAnyOtherType.symbols b/tests/baselines/reference/typeofOperatorWithAnyOtherType.symbols
index 7eacc9ce48e73..b6b6422fd567e 100644
--- a/tests/baselines/reference/typeofOperatorWithAnyOtherType.symbols
+++ b/tests/baselines/reference/typeofOperatorWithAnyOtherType.symbols
@@ -3,17 +3,17 @@
 === typeofOperatorWithAnyOtherType.ts ===
 // typeof  operator on any type
 
-var ANY: any;
->ANY : Symbol(ANY, Decl(typeofOperatorWithAnyOtherType.ts, 2, 3))
+declare var ANY: any;
+>ANY : Symbol(ANY, Decl(typeofOperatorWithAnyOtherType.ts, 2, 11))
 
-var ANY1;
->ANY1 : Symbol(ANY1, Decl(typeofOperatorWithAnyOtherType.ts, 3, 3))
+declare var ANY1;
+>ANY1 : Symbol(ANY1, Decl(typeofOperatorWithAnyOtherType.ts, 3, 11))
 
 var ANY2: any[] = ["", ""];
 >ANY2 : Symbol(ANY2, Decl(typeofOperatorWithAnyOtherType.ts, 4, 3))
 
-var obj: () => {}
->obj : Symbol(obj, Decl(typeofOperatorWithAnyOtherType.ts, 5, 3))
+declare var obj: () => {};
+>obj : Symbol(obj, Decl(typeofOperatorWithAnyOtherType.ts, 5, 11))
 
 var obj1 = { x: "a", y: () => { }};
 >obj1 : Symbol(obj1, Decl(typeofOperatorWithAnyOtherType.ts, 6, 3))
@@ -23,7 +23,7 @@ var obj1 = { x: "a", y: () => { }};
 function foo(): any {
 >foo : Symbol(foo, Decl(typeofOperatorWithAnyOtherType.ts, 6, 35))
 
-    var a;
+    var a!: any;
 >a : Symbol(a, Decl(typeofOperatorWithAnyOtherType.ts, 9, 7))
 
     return a;
@@ -38,7 +38,7 @@ class A {
     static foo() {
 >foo : Symbol(A.foo, Decl(typeofOperatorWithAnyOtherType.ts, 13, 18))
 
-        var a;
+        var a!: any;
 >a : Symbol(a, Decl(typeofOperatorWithAnyOtherType.ts, 15, 11))
 
         return a;
@@ -48,7 +48,7 @@ class A {
 namespace M {
 >M : Symbol(M, Decl(typeofOperatorWithAnyOtherType.ts, 18, 1))
 
-    export var n: any;
+    export var n!: any;
 >n : Symbol(n, Decl(typeofOperatorWithAnyOtherType.ts, 20, 14))
 }
 var objA = new A();
@@ -58,7 +58,7 @@ var objA = new A();
 // any type var
 var ResultIsString1 = typeof ANY1;
 >ResultIsString1 : Symbol(ResultIsString1, Decl(typeofOperatorWithAnyOtherType.ts, 25, 3))
->ANY1 : Symbol(ANY1, Decl(typeofOperatorWithAnyOtherType.ts, 3, 3))
+>ANY1 : Symbol(ANY1, Decl(typeofOperatorWithAnyOtherType.ts, 3, 11))
 
 var ResultIsString2 = typeof ANY2;
 >ResultIsString2 : Symbol(ResultIsString2, Decl(typeofOperatorWithAnyOtherType.ts, 26, 3))
@@ -74,7 +74,7 @@ var ResultIsString4 = typeof M;
 
 var ResultIsString5 = typeof obj;
 >ResultIsString5 : Symbol(ResultIsString5, Decl(typeofOperatorWithAnyOtherType.ts, 29, 3))
->obj : Symbol(obj, Decl(typeofOperatorWithAnyOtherType.ts, 5, 3))
+>obj : Symbol(obj, Decl(typeofOperatorWithAnyOtherType.ts, 5, 11))
 
 var ResultIsString6 = typeof obj1;
 >ResultIsString6 : Symbol(ResultIsString6, Decl(typeofOperatorWithAnyOtherType.ts, 30, 3))
@@ -126,8 +126,8 @@ var ResultIsString15 = typeof A.foo();
 
 var ResultIsString16 = typeof (ANY + ANY1);
 >ResultIsString16 : Symbol(ResultIsString16, Decl(typeofOperatorWithAnyOtherType.ts, 44, 3))
->ANY : Symbol(ANY, Decl(typeofOperatorWithAnyOtherType.ts, 2, 3))
->ANY1 : Symbol(ANY1, Decl(typeofOperatorWithAnyOtherType.ts, 3, 3))
+>ANY : Symbol(ANY, Decl(typeofOperatorWithAnyOtherType.ts, 2, 11))
+>ANY1 : Symbol(ANY1, Decl(typeofOperatorWithAnyOtherType.ts, 3, 11))
 
 var ResultIsString17 = typeof (null + undefined);
 >ResultIsString17 : Symbol(ResultIsString17, Decl(typeofOperatorWithAnyOtherType.ts, 45, 3))
@@ -144,26 +144,26 @@ var ResultIsString19 = typeof (undefined + undefined);
 // multiple typeof  operators
 var ResultIsString20 = typeof typeof ANY;
 >ResultIsString20 : Symbol(ResultIsString20, Decl(typeofOperatorWithAnyOtherType.ts, 50, 3))
->ANY : Symbol(ANY, Decl(typeofOperatorWithAnyOtherType.ts, 2, 3))
+>ANY : Symbol(ANY, Decl(typeofOperatorWithAnyOtherType.ts, 2, 11))
 
 var ResultIsString21 = typeof typeof typeof (ANY + ANY1);
 >ResultIsString21 : Symbol(ResultIsString21, Decl(typeofOperatorWithAnyOtherType.ts, 51, 3))
->ANY : Symbol(ANY, Decl(typeofOperatorWithAnyOtherType.ts, 2, 3))
->ANY1 : Symbol(ANY1, Decl(typeofOperatorWithAnyOtherType.ts, 3, 3))
+>ANY : Symbol(ANY, Decl(typeofOperatorWithAnyOtherType.ts, 2, 11))
+>ANY1 : Symbol(ANY1, Decl(typeofOperatorWithAnyOtherType.ts, 3, 11))
 
 // miss assignment operators
 typeof ANY;
->ANY : Symbol(ANY, Decl(typeofOperatorWithAnyOtherType.ts, 2, 3))
+>ANY : Symbol(ANY, Decl(typeofOperatorWithAnyOtherType.ts, 2, 11))
 
 typeof ANY1;
->ANY1 : Symbol(ANY1, Decl(typeofOperatorWithAnyOtherType.ts, 3, 3))
+>ANY1 : Symbol(ANY1, Decl(typeofOperatorWithAnyOtherType.ts, 3, 11))
 
 typeof ANY2[0];
 >ANY2 : Symbol(ANY2, Decl(typeofOperatorWithAnyOtherType.ts, 4, 3))
 
 typeof ANY, ANY1;
->ANY : Symbol(ANY, Decl(typeofOperatorWithAnyOtherType.ts, 2, 3))
->ANY1 : Symbol(ANY1, Decl(typeofOperatorWithAnyOtherType.ts, 3, 3))
+>ANY : Symbol(ANY, Decl(typeofOperatorWithAnyOtherType.ts, 2, 11))
+>ANY1 : Symbol(ANY1, Decl(typeofOperatorWithAnyOtherType.ts, 3, 11))
 
 typeof obj1;
 >obj1 : Symbol(obj1, Decl(typeofOperatorWithAnyOtherType.ts, 6, 3))
@@ -184,17 +184,17 @@ typeof M.n;
 >n : Symbol(M.n, Decl(typeofOperatorWithAnyOtherType.ts, 20, 14))
 
 // use typeof in type query
-var z: any;
+var z!: any;
 >z : Symbol(z, Decl(typeofOperatorWithAnyOtherType.ts, 64, 3))
 
-var x: any[];
+var x!: any[];
 >x : Symbol(x, Decl(typeofOperatorWithAnyOtherType.ts, 65, 3))
 
-var r: () => any;
+var r!: () => any;
 >r : Symbol(r, Decl(typeofOperatorWithAnyOtherType.ts, 66, 3))
 
 z: typeof ANY;
->ANY : Symbol(ANY, Decl(typeofOperatorWithAnyOtherType.ts, 2, 3))
+>ANY : Symbol(ANY, Decl(typeofOperatorWithAnyOtherType.ts, 2, 11))
 
 x: typeof ANY2;
 >ANY2 : Symbol(ANY2, Decl(typeofOperatorWithAnyOtherType.ts, 4, 3))
diff --git a/tests/baselines/reference/typeofOperatorWithAnyOtherType.types b/tests/baselines/reference/typeofOperatorWithAnyOtherType.types
index 76059fda5ea20..10560f48e6844 100644
--- a/tests/baselines/reference/typeofOperatorWithAnyOtherType.types
+++ b/tests/baselines/reference/typeofOperatorWithAnyOtherType.types
@@ -3,11 +3,11 @@
 === typeofOperatorWithAnyOtherType.ts ===
 // typeof  operator on any type
 
-var ANY: any;
+declare var ANY: any;
 >ANY : any
 >    : ^^^
 
-var ANY1;
+declare var ANY1;
 >ANY1 : any
 >     : ^^^
 
@@ -21,7 +21,7 @@ var ANY2: any[] = ["", ""];
 >"" : ""
 >   : ^^
 
-var obj: () => {}
+declare var obj: () => {};
 >obj : () => {}
 >    : ^^^^^^  
 
@@ -43,7 +43,7 @@ function foo(): any {
 >foo : () => any
 >    : ^^^^^^   
 
-    var a;
+    var a!: any;
 >a : any
 >  : ^^^
 
@@ -63,7 +63,7 @@ class A {
 >foo : () => any
 >    : ^^^^^^^^^
 
-        var a;
+        var a!: any;
 >a : any
 >  : ^^^
 
@@ -76,7 +76,7 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: any;
+    export var n!: any;
 >n : any
 >  : ^^^
 }
@@ -382,15 +382,15 @@ typeof M.n;
 >  : ^^^
 
 // use typeof in type query
-var z: any;
+var z!: any;
 >z : any
 >  : ^^^
 
-var x: any[];
+var x!: any[];
 >x : any[]
 >  : ^^^^^
 
-var r: () => any;
+var r!: () => any;
 >r : () => any
 >  : ^^^^^^   
 
diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.errors.txt b/tests/baselines/reference/typeofOperatorWithBooleanType.errors.txt
index ef9d0afab04ca..427396d238af5 100644
--- a/tests/baselines/reference/typeofOperatorWithBooleanType.errors.txt
+++ b/tests/baselines/reference/typeofOperatorWithBooleanType.errors.txt
@@ -3,7 +3,7 @@ typeofOperatorWithBooleanType.ts(36,1): error TS2695: Left side of comma operato
 
 ==== typeofOperatorWithBooleanType.ts (1 errors) ====
     // typeof  operator on boolean type
-    var BOOLEAN: boolean;
+    declare var BOOLEAN: boolean;
     
     function foo(): boolean { return true; }
     
@@ -12,7 +12,7 @@ typeofOperatorWithBooleanType.ts(36,1): error TS2695: Left side of comma operato
         static foo() { return false; }
     }
     namespace M {
-        export var n: boolean;
+        export var n!: boolean;
     }
     
     var objA = new A();
@@ -44,9 +44,9 @@ typeofOperatorWithBooleanType.ts(36,1): error TS2695: Left side of comma operato
     typeof M.n;
     
     // use typeof in type query
-    var z: boolean;
-    var x: boolean[];
-    var r: () => boolean;
+    declare var z: boolean;
+    declare var x: boolean[];
+    declare var r: () => boolean;
     z: typeof BOOLEAN;
     r: typeof foo;
     var y = { a: true, b: false};
diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.js b/tests/baselines/reference/typeofOperatorWithBooleanType.js
index 01766d4d3487c..a4f9f05a176ee 100644
--- a/tests/baselines/reference/typeofOperatorWithBooleanType.js
+++ b/tests/baselines/reference/typeofOperatorWithBooleanType.js
@@ -2,7 +2,7 @@
 
 //// [typeofOperatorWithBooleanType.ts]
 // typeof  operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 
 function foo(): boolean { return true; }
 
@@ -11,7 +11,7 @@ class A {
     static foo() { return false; }
 }
 namespace M {
-    export var n: boolean;
+    export var n!: boolean;
 }
 
 var objA = new A();
@@ -41,9 +41,9 @@ typeof objA.a;
 typeof M.n;
 
 // use typeof in type query
-var z: boolean;
-var x: boolean[];
-var r: () => boolean;
+declare var z: boolean;
+declare var x: boolean[];
+declare var r: () => boolean;
 z: typeof BOOLEAN;
 r: typeof foo;
 var y = { a: true, b: false};
@@ -53,8 +53,6 @@ z: typeof A.foo;
 z: typeof M.n;
 
 //// [typeofOperatorWithBooleanType.js]
-// typeof  operator on boolean type
-var BOOLEAN;
 function foo() { return true; }
 var A = /** @class */ (function () {
     function A() {
@@ -85,10 +83,6 @@ typeof foo();
 typeof true, false;
 typeof objA.a;
 typeof M.n;
-// use typeof in type query
-var z;
-var x;
-var r;
 z: typeof BOOLEAN;
 r: typeof foo;
 var y = { a: true, b: false };
diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.symbols b/tests/baselines/reference/typeofOperatorWithBooleanType.symbols
index bfd6d4c5fe0c9..b02139ba983ff 100644
--- a/tests/baselines/reference/typeofOperatorWithBooleanType.symbols
+++ b/tests/baselines/reference/typeofOperatorWithBooleanType.symbols
@@ -2,11 +2,11 @@
 
 === typeofOperatorWithBooleanType.ts ===
 // typeof  operator on boolean type
-var BOOLEAN: boolean;
->BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 1, 3))
+declare var BOOLEAN: boolean;
+>BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 1, 11))
 
 function foo(): boolean { return true; }
->foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 1, 29))
 
 class A {
 >A : Symbol(A, Decl(typeofOperatorWithBooleanType.ts, 3, 40))
@@ -20,7 +20,7 @@ class A {
 namespace M {
 >M : Symbol(M, Decl(typeofOperatorWithBooleanType.ts, 8, 1))
 
-    export var n: boolean;
+    export var n!: boolean;
 >n : Symbol(n, Decl(typeofOperatorWithBooleanType.ts, 10, 14))
 }
 
@@ -31,7 +31,7 @@ var objA = new A();
 // boolean type var
 var ResultIsString1 = typeof BOOLEAN;
 >ResultIsString1 : Symbol(ResultIsString1, Decl(typeofOperatorWithBooleanType.ts, 16, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 1, 11))
 
 // boolean type literal
 var ResultIsString2 = typeof true;
@@ -57,7 +57,7 @@ var ResultIsString5 = typeof M.n;
 
 var ResultIsString6 = typeof foo();
 >ResultIsString6 : Symbol(ResultIsString6, Decl(typeofOperatorWithBooleanType.ts, 25, 3))
->foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 1, 29))
 
 var ResultIsString7 = typeof A.foo();
 >ResultIsString7 : Symbol(ResultIsString7, Decl(typeofOperatorWithBooleanType.ts, 26, 3))
@@ -68,15 +68,15 @@ var ResultIsString7 = typeof A.foo();
 // multiple typeof  operator
 var ResultIsString8 = typeof typeof BOOLEAN;
 >ResultIsString8 : Symbol(ResultIsString8, Decl(typeofOperatorWithBooleanType.ts, 29, 3))
->BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 1, 11))
 
 // miss assignment operators
 typeof true;
 typeof BOOLEAN;
->BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 1, 11))
 
 typeof foo();
->foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 1, 29))
 
 typeof true, false;
 typeof objA.a;
@@ -90,20 +90,20 @@ typeof M.n;
 >n : Symbol(M.n, Decl(typeofOperatorWithBooleanType.ts, 10, 14))
 
 // use typeof in type query
-var z: boolean;
->z : Symbol(z, Decl(typeofOperatorWithBooleanType.ts, 40, 3))
+declare var z: boolean;
+>z : Symbol(z, Decl(typeofOperatorWithBooleanType.ts, 40, 11))
 
-var x: boolean[];
->x : Symbol(x, Decl(typeofOperatorWithBooleanType.ts, 41, 3))
+declare var x: boolean[];
+>x : Symbol(x, Decl(typeofOperatorWithBooleanType.ts, 41, 11))
 
-var r: () => boolean;
->r : Symbol(r, Decl(typeofOperatorWithBooleanType.ts, 42, 3))
+declare var r: () => boolean;
+>r : Symbol(r, Decl(typeofOperatorWithBooleanType.ts, 42, 11))
 
 z: typeof BOOLEAN;
->BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 1, 3))
+>BOOLEAN : Symbol(BOOLEAN, Decl(typeofOperatorWithBooleanType.ts, 1, 11))
 
 r: typeof foo;
->foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 1, 21))
+>foo : Symbol(foo, Decl(typeofOperatorWithBooleanType.ts, 1, 29))
 
 var y = { a: true, b: false};
 >y : Symbol(y, Decl(typeofOperatorWithBooleanType.ts, 45, 3))
diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.types b/tests/baselines/reference/typeofOperatorWithBooleanType.types
index a5a0e80d6504b..da8108764b6e2 100644
--- a/tests/baselines/reference/typeofOperatorWithBooleanType.types
+++ b/tests/baselines/reference/typeofOperatorWithBooleanType.types
@@ -2,7 +2,7 @@
 
 === typeofOperatorWithBooleanType.ts ===
 // typeof  operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 >BOOLEAN : boolean
 >        : ^^^^^^^
 
@@ -30,7 +30,7 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: boolean;
+    export var n!: boolean;
 >n : boolean
 >  : ^^^^^^^
 }
@@ -189,15 +189,15 @@ typeof M.n;
 >  : ^^^^^^^
 
 // use typeof in type query
-var z: boolean;
+declare var z: boolean;
 >z : boolean
 >  : ^^^^^^^
 
-var x: boolean[];
+declare var x: boolean[];
 >x : boolean[]
 >  : ^^^^^^^^^
 
-var r: () => boolean;
+declare var r: () => boolean;
 >r : () => boolean
 >  : ^^^^^^       
 
diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.errors.txt b/tests/baselines/reference/typeofOperatorWithNumberType.errors.txt
index d5e872341d8d8..834a4df423a0a 100644
--- a/tests/baselines/reference/typeofOperatorWithNumberType.errors.txt
+++ b/tests/baselines/reference/typeofOperatorWithNumberType.errors.txt
@@ -3,7 +3,7 @@ typeofOperatorWithNumberType.ts(45,1): error TS2695: Left side of comma operator
 
 ==== typeofOperatorWithNumberType.ts (1 errors) ====
     // typeof  operator on number type
-    var NUMBER: number;
+    declare var NUMBER: number;
     var NUMBER1: number[] = [1, 2];
     
     function foo(): number { return 1; }
@@ -13,7 +13,7 @@ typeofOperatorWithNumberType.ts(45,1): error TS2695: Left side of comma operator
         static foo() { return 1; }
     }
     namespace M {
-        export var n: number;
+        export var n!: number;
     }
     
     var objA = new A();
@@ -51,8 +51,9 @@ typeofOperatorWithNumberType.ts(45,1): error TS2695: Left side of comma operator
 !!! error TS2695: Left side of comma operator is unused and has no side effects.
     
     // use typeof in type query
-    var z: number;
-    var x: number[];
+    declare var z: number;
+    declare var x: number[];
+    declare var r: () => number;
     z: typeof NUMBER;
     x: typeof NUMBER1;
     r: typeof foo;
diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.js b/tests/baselines/reference/typeofOperatorWithNumberType.js
index 7ceb527dd0d30..ddecf27d9cd2b 100644
--- a/tests/baselines/reference/typeofOperatorWithNumberType.js
+++ b/tests/baselines/reference/typeofOperatorWithNumberType.js
@@ -2,7 +2,7 @@
 
 //// [typeofOperatorWithNumberType.ts]
 // typeof  operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
 
 function foo(): number { return 1; }
@@ -12,7 +12,7 @@ class A {
     static foo() { return 1; }
 }
 namespace M {
-    export var n: number;
+    export var n!: number;
 }
 
 var objA = new A();
@@ -48,8 +48,9 @@ typeof M.n;
 typeof objA.a, M.n;
 
 // use typeof in type query
-var z: number;
-var x: number[];
+declare var z: number;
+declare var x: number[];
+declare var r: () => number;
 z: typeof NUMBER;
 x: typeof NUMBER1;
 r: typeof foo;
@@ -60,8 +61,6 @@ z: typeof A.foo;
 z: typeof M.n;
 
 //// [typeofOperatorWithNumberType.js]
-// typeof  operator on number type
-var NUMBER;
 var NUMBER1 = [1, 2];
 function foo() { return 1; }
 var A = /** @class */ (function () {
@@ -99,9 +98,6 @@ typeof foo();
 typeof objA.a;
 typeof M.n;
 typeof objA.a, M.n;
-// use typeof in type query
-var z;
-var x;
 z: typeof NUMBER;
 x: typeof NUMBER1;
 r: typeof foo;
diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.symbols b/tests/baselines/reference/typeofOperatorWithNumberType.symbols
index e9f80d00de00d..0505c2b6225fb 100644
--- a/tests/baselines/reference/typeofOperatorWithNumberType.symbols
+++ b/tests/baselines/reference/typeofOperatorWithNumberType.symbols
@@ -2,8 +2,8 @@
 
 === typeofOperatorWithNumberType.ts ===
 // typeof  operator on number type
-var NUMBER: number;
->NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 3))
+declare var NUMBER: number;
+>NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 11))
 
 var NUMBER1: number[] = [1, 2];
 >NUMBER1 : Symbol(NUMBER1, Decl(typeofOperatorWithNumberType.ts, 2, 3))
@@ -23,7 +23,7 @@ class A {
 namespace M {
 >M : Symbol(M, Decl(typeofOperatorWithNumberType.ts, 9, 1))
 
-    export var n: number;
+    export var n!: number;
 >n : Symbol(n, Decl(typeofOperatorWithNumberType.ts, 11, 14))
 }
 
@@ -34,7 +34,7 @@ var objA = new A();
 // number type var
 var ResultIsString1 = typeof NUMBER;
 >ResultIsString1 : Symbol(ResultIsString1, Decl(typeofOperatorWithNumberType.ts, 17, 3))
->NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 11))
 
 var ResultIsString2 = typeof NUMBER1;
 >ResultIsString2 : Symbol(ResultIsString2, Decl(typeofOperatorWithNumberType.ts, 18, 3))
@@ -85,23 +85,23 @@ var ResultIsString10 = typeof A.foo();
 
 var ResultIsString11 = typeof (NUMBER + NUMBER);
 >ResultIsString11 : Symbol(ResultIsString11, Decl(typeofOperatorWithNumberType.ts, 31, 3))
->NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 3))
->NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 11))
+>NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 11))
 
 // multiple typeof  operators
 var ResultIsString12 = typeof typeof NUMBER;
 >ResultIsString12 : Symbol(ResultIsString12, Decl(typeofOperatorWithNumberType.ts, 34, 3))
->NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 11))
 
 var ResultIsString13 = typeof typeof typeof (NUMBER + NUMBER);
 >ResultIsString13 : Symbol(ResultIsString13, Decl(typeofOperatorWithNumberType.ts, 35, 3))
->NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 3))
->NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 11))
+>NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 11))
 
 // miss assignment operators
 typeof 1;
 typeof NUMBER;
->NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 11))
 
 typeof NUMBER1;
 >NUMBER1 : Symbol(NUMBER1, Decl(typeofOperatorWithNumberType.ts, 2, 3))
@@ -128,14 +128,17 @@ typeof objA.a, M.n;
 >n : Symbol(M.n, Decl(typeofOperatorWithNumberType.ts, 11, 14))
 
 // use typeof in type query
-var z: number;
->z : Symbol(z, Decl(typeofOperatorWithNumberType.ts, 47, 3))
+declare var z: number;
+>z : Symbol(z, Decl(typeofOperatorWithNumberType.ts, 47, 11))
 
-var x: number[];
->x : Symbol(x, Decl(typeofOperatorWithNumberType.ts, 48, 3))
+declare var x: number[];
+>x : Symbol(x, Decl(typeofOperatorWithNumberType.ts, 48, 11))
+
+declare var r: () => number;
+>r : Symbol(r, Decl(typeofOperatorWithNumberType.ts, 49, 11))
 
 z: typeof NUMBER;
->NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 3))
+>NUMBER : Symbol(NUMBER, Decl(typeofOperatorWithNumberType.ts, 1, 11))
 
 x: typeof NUMBER1;
 >NUMBER1 : Symbol(NUMBER1, Decl(typeofOperatorWithNumberType.ts, 2, 3))
@@ -144,14 +147,14 @@ r: typeof foo;
 >foo : Symbol(foo, Decl(typeofOperatorWithNumberType.ts, 2, 31))
 
 var y = { a: 1, b: 2 };
->y : Symbol(y, Decl(typeofOperatorWithNumberType.ts, 52, 3))
->a : Symbol(a, Decl(typeofOperatorWithNumberType.ts, 52, 9))
->b : Symbol(b, Decl(typeofOperatorWithNumberType.ts, 52, 15))
+>y : Symbol(y, Decl(typeofOperatorWithNumberType.ts, 53, 3))
+>a : Symbol(a, Decl(typeofOperatorWithNumberType.ts, 53, 9))
+>b : Symbol(b, Decl(typeofOperatorWithNumberType.ts, 53, 15))
 
 z: typeof y.a;
->y.a : Symbol(a, Decl(typeofOperatorWithNumberType.ts, 52, 9))
->y : Symbol(y, Decl(typeofOperatorWithNumberType.ts, 52, 3))
->a : Symbol(a, Decl(typeofOperatorWithNumberType.ts, 52, 9))
+>y.a : Symbol(a, Decl(typeofOperatorWithNumberType.ts, 53, 9))
+>y : Symbol(y, Decl(typeofOperatorWithNumberType.ts, 53, 3))
+>a : Symbol(a, Decl(typeofOperatorWithNumberType.ts, 53, 9))
 
 z: typeof objA.a;
 >objA.a : Symbol(A.a, Decl(typeofOperatorWithNumberType.ts, 6, 9))
diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.types b/tests/baselines/reference/typeofOperatorWithNumberType.types
index 70dc7b60b4707..fd8ad494b5afd 100644
--- a/tests/baselines/reference/typeofOperatorWithNumberType.types
+++ b/tests/baselines/reference/typeofOperatorWithNumberType.types
@@ -2,7 +2,7 @@
 
 === typeofOperatorWithNumberType.ts ===
 // typeof  operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 >NUMBER : number
 >       : ^^^^^^
 
@@ -40,7 +40,7 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: number;
+    export var n!: number;
 >n : number
 >  : ^^^^^^
 }
@@ -285,14 +285,18 @@ typeof objA.a, M.n;
 >  : ^^^^^^
 
 // use typeof in type query
-var z: number;
+declare var z: number;
 >z : number
 >  : ^^^^^^
 
-var x: number[];
+declare var x: number[];
 >x : number[]
 >  : ^^^^^^^^
 
+declare var r: () => number;
+>r : () => number
+>  : ^^^^^^      
+
 z: typeof NUMBER;
 >z : any
 >  : ^^^
diff --git a/tests/baselines/reference/typeofOperatorWithStringType.errors.txt b/tests/baselines/reference/typeofOperatorWithStringType.errors.txt
index 68a51040a9853..24318020ff473 100644
--- a/tests/baselines/reference/typeofOperatorWithStringType.errors.txt
+++ b/tests/baselines/reference/typeofOperatorWithStringType.errors.txt
@@ -3,7 +3,7 @@ typeofOperatorWithStringType.ts(44,1): error TS2695: Left side of comma operator
 
 ==== typeofOperatorWithStringType.ts (1 errors) ====
     // typeof  operator on string type
-    var STRING: string;
+    declare var STRING: string;
     var STRING1: string[] = ["", "abc"];
     
     function foo(): string { return "abc"; }
@@ -13,7 +13,7 @@ typeofOperatorWithStringType.ts(44,1): error TS2695: Left side of comma operator
         static foo() { return ""; }
     }
     namespace M {
-        export var n: string;
+        export var n!: string;
     }
     
     var objA = new A();
@@ -50,9 +50,9 @@ typeofOperatorWithStringType.ts(44,1): error TS2695: Left side of comma operator
 !!! error TS2695: Left side of comma operator is unused and has no side effects.
     
     // use typeof in type query
-    var z: string;
-    var x: string[];
-    var r: () => string;
+    declare var z: string;
+    declare var x: string[];
+    declare var r: () => string;
     z: typeof STRING;
     x: typeof STRING1;
     r: typeof foo;
diff --git a/tests/baselines/reference/typeofOperatorWithStringType.js b/tests/baselines/reference/typeofOperatorWithStringType.js
index 2d350ea926f6a..9f911abf1129e 100644
--- a/tests/baselines/reference/typeofOperatorWithStringType.js
+++ b/tests/baselines/reference/typeofOperatorWithStringType.js
@@ -2,7 +2,7 @@
 
 //// [typeofOperatorWithStringType.ts]
 // typeof  operator on string type
-var STRING: string;
+declare var STRING: string;
 var STRING1: string[] = ["", "abc"];
 
 function foo(): string { return "abc"; }
@@ -12,7 +12,7 @@ class A {
     static foo() { return ""; }
 }
 namespace M {
-    export var n: string;
+    export var n!: string;
 }
 
 var objA = new A();
@@ -47,9 +47,9 @@ typeof foo();
 typeof objA.a, M.n;
 
 // use typeof in type query
-var z: string;
-var x: string[];
-var r: () => string;
+declare var z: string;
+declare var x: string[];
+declare var r: () => string;
 z: typeof STRING;
 x: typeof STRING1;
 r: typeof foo;
@@ -60,8 +60,6 @@ z: typeof A.foo;
 z: typeof M.n;
 
 //// [typeofOperatorWithStringType.js]
-// typeof  operator on string type
-var STRING;
 var STRING1 = ["", "abc"];
 function foo() { return "abc"; }
 var A = /** @class */ (function () {
@@ -98,10 +96,6 @@ typeof STRING;
 typeof STRING1;
 typeof foo();
 typeof objA.a, M.n;
-// use typeof in type query
-var z;
-var x;
-var r;
 z: typeof STRING;
 x: typeof STRING1;
 r: typeof foo;
diff --git a/tests/baselines/reference/typeofOperatorWithStringType.symbols b/tests/baselines/reference/typeofOperatorWithStringType.symbols
index 5bc71cf4d3cf8..2fdd456acbd02 100644
--- a/tests/baselines/reference/typeofOperatorWithStringType.symbols
+++ b/tests/baselines/reference/typeofOperatorWithStringType.symbols
@@ -2,8 +2,8 @@
 
 === typeofOperatorWithStringType.ts ===
 // typeof  operator on string type
-var STRING: string;
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
+declare var STRING: string;
+>STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 11))
 
 var STRING1: string[] = ["", "abc"];
 >STRING1 : Symbol(STRING1, Decl(typeofOperatorWithStringType.ts, 2, 3))
@@ -23,7 +23,7 @@ class A {
 namespace M {
 >M : Symbol(M, Decl(typeofOperatorWithStringType.ts, 9, 1))
 
-    export var n: string;
+    export var n!: string;
 >n : Symbol(n, Decl(typeofOperatorWithStringType.ts, 11, 14))
 }
 
@@ -34,7 +34,7 @@ var objA = new A();
 // string type var
 var ResultIsString1 = typeof STRING;
 >ResultIsString1 : Symbol(ResultIsString1, Decl(typeofOperatorWithStringType.ts, 17, 3))
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 11))
 
 var ResultIsString2 = typeof STRING1;
 >ResultIsString2 : Symbol(ResultIsString2, Decl(typeofOperatorWithStringType.ts, 18, 3))
@@ -85,29 +85,29 @@ var ResultIsString10 = typeof A.foo();
 
 var ResultIsString11 = typeof (STRING + STRING);
 >ResultIsString11 : Symbol(ResultIsString11, Decl(typeofOperatorWithStringType.ts, 31, 3))
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 11))
+>STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 11))
 
 var ResultIsString12 = typeof STRING.charAt(0);
 >ResultIsString12 : Symbol(ResultIsString12, Decl(typeofOperatorWithStringType.ts, 32, 3))
 >STRING.charAt : Symbol(String.charAt, Decl(lib.es5.d.ts, --, --))
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 11))
 >charAt : Symbol(String.charAt, Decl(lib.es5.d.ts, --, --))
 
 // multiple typeof  operators
 var ResultIsString13 = typeof typeof STRING;
 >ResultIsString13 : Symbol(ResultIsString13, Decl(typeofOperatorWithStringType.ts, 35, 3))
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 11))
 
 var ResultIsString14 = typeof typeof typeof (STRING + STRING);
 >ResultIsString14 : Symbol(ResultIsString14, Decl(typeofOperatorWithStringType.ts, 36, 3))
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 11))
+>STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 11))
 
 // miss assignment operators
 typeof "";
 typeof STRING;
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 11))
 
 typeof STRING1;
 >STRING1 : Symbol(STRING1, Decl(typeofOperatorWithStringType.ts, 2, 3))
@@ -124,17 +124,17 @@ typeof objA.a, M.n;
 >n : Symbol(M.n, Decl(typeofOperatorWithStringType.ts, 11, 14))
 
 // use typeof in type query
-var z: string;
->z : Symbol(z, Decl(typeofOperatorWithStringType.ts, 46, 3))
+declare var z: string;
+>z : Symbol(z, Decl(typeofOperatorWithStringType.ts, 46, 11))
 
-var x: string[];
->x : Symbol(x, Decl(typeofOperatorWithStringType.ts, 47, 3))
+declare var x: string[];
+>x : Symbol(x, Decl(typeofOperatorWithStringType.ts, 47, 11))
 
-var r: () => string;
->r : Symbol(r, Decl(typeofOperatorWithStringType.ts, 48, 3))
+declare var r: () => string;
+>r : Symbol(r, Decl(typeofOperatorWithStringType.ts, 48, 11))
 
 z: typeof STRING;
->STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 3))
+>STRING : Symbol(STRING, Decl(typeofOperatorWithStringType.ts, 1, 11))
 
 x: typeof STRING1;
 >STRING1 : Symbol(STRING1, Decl(typeofOperatorWithStringType.ts, 2, 3))
diff --git a/tests/baselines/reference/typeofOperatorWithStringType.types b/tests/baselines/reference/typeofOperatorWithStringType.types
index b8b780e367fa6..75a49f4543a96 100644
--- a/tests/baselines/reference/typeofOperatorWithStringType.types
+++ b/tests/baselines/reference/typeofOperatorWithStringType.types
@@ -2,7 +2,7 @@
 
 === typeofOperatorWithStringType.ts ===
 // typeof  operator on string type
-var STRING: string;
+declare var STRING: string;
 >STRING : string
 >       : ^^^^^^
 
@@ -40,7 +40,7 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: string;
+    export var n!: string;
 >n : string
 >  : ^^^^^^
 }
@@ -281,15 +281,15 @@ typeof objA.a, M.n;
 >  : ^^^^^^
 
 // use typeof in type query
-var z: string;
+declare var z: string;
 >z : string
 >  : ^^^^^^
 
-var x: string[];
+declare var x: string[];
 >x : string[]
 >  : ^^^^^^^^
 
-var r: () => string;
+declare var r: () => string;
 >r : () => string
 >  : ^^^^^^      
 
diff --git a/tests/baselines/reference/typeofSimple.errors.txt b/tests/baselines/reference/typeofSimple.errors.txt
index 7d904de8639b9..f2b55af210db5 100644
--- a/tests/baselines/reference/typeofSimple.errors.txt
+++ b/tests/baselines/reference/typeofSimple.errors.txt
@@ -1,10 +1,10 @@
 typeofSimple.ts(3,5): error TS2322: Type 'number' is not assignable to type 'string'.
-typeofSimple.ts(8,21): error TS2693: 'J' only refers to a type, but is being used as a value here.
+typeofSimple.ts(8,29): error TS2693: 'J' only refers to a type, but is being used as a value here.
 
 
 ==== typeofSimple.ts (2 errors) ====
     var v = 3;
-    var v2: typeof v;
+    var v2: typeof v = v;
     var v3: string = v2; // Not assignment compatible
         ~~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
@@ -12,10 +12,10 @@ typeofSimple.ts(8,21): error TS2693: 'J' only refers to a type, but is being use
     interface I<T> { x: T; }
     interface J { }
     
-    var numberJ: typeof J; //Error, cannot reference type in typeof
-                        ~
+    declare var numberJ: typeof J; //Error, cannot reference type in typeof
+                                ~
 !!! error TS2693: 'J' only refers to a type, but is being used as a value here.
-    var numberI: I<typeof v2>;
+    declare var numberI: I<typeof v2>;
     
-    var fun: () => I<number>;
+    declare var fun: () => I<number>;
     numberI = fun();
\ No newline at end of file
diff --git a/tests/baselines/reference/typeofSimple.js b/tests/baselines/reference/typeofSimple.js
index 98cfa8f5916ab..9dec21f2bb1b0 100644
--- a/tests/baselines/reference/typeofSimple.js
+++ b/tests/baselines/reference/typeofSimple.js
@@ -2,23 +2,20 @@
 
 //// [typeofSimple.ts]
 var v = 3;
-var v2: typeof v;
+var v2: typeof v = v;
 var v3: string = v2; // Not assignment compatible
 
 interface I<T> { x: T; }
 interface J { }
 
-var numberJ: typeof J; //Error, cannot reference type in typeof
-var numberI: I<typeof v2>;
+declare var numberJ: typeof J; //Error, cannot reference type in typeof
+declare var numberI: I<typeof v2>;
 
-var fun: () => I<number>;
+declare var fun: () => I<number>;
 numberI = fun();
 
 //// [typeofSimple.js]
 var v = 3;
-var v2;
+var v2 = v;
 var v3 = v2; // Not assignment compatible
-var numberJ; //Error, cannot reference type in typeof
-var numberI;
-var fun;
 numberI = fun();
diff --git a/tests/baselines/reference/typeofSimple.symbols b/tests/baselines/reference/typeofSimple.symbols
index 3e74fa4ac60f1..96012c5f7b9ce 100644
--- a/tests/baselines/reference/typeofSimple.symbols
+++ b/tests/baselines/reference/typeofSimple.symbols
@@ -4,9 +4,10 @@
 var v = 3;
 >v : Symbol(v, Decl(typeofSimple.ts, 0, 3))
 
-var v2: typeof v;
+var v2: typeof v = v;
 >v2 : Symbol(v2, Decl(typeofSimple.ts, 1, 3))
 >v : Symbol(v, Decl(typeofSimple.ts, 0, 3))
+>v : Symbol(v, Decl(typeofSimple.ts, 0, 3))
 
 var v3: string = v2; // Not assignment compatible
 >v3 : Symbol(v3, Decl(typeofSimple.ts, 2, 3))
@@ -21,19 +22,19 @@ interface I<T> { x: T; }
 interface J { }
 >J : Symbol(J, Decl(typeofSimple.ts, 4, 24))
 
-var numberJ: typeof J; //Error, cannot reference type in typeof
->numberJ : Symbol(numberJ, Decl(typeofSimple.ts, 7, 3))
+declare var numberJ: typeof J; //Error, cannot reference type in typeof
+>numberJ : Symbol(numberJ, Decl(typeofSimple.ts, 7, 11))
 
-var numberI: I<typeof v2>;
->numberI : Symbol(numberI, Decl(typeofSimple.ts, 8, 3))
+declare var numberI: I<typeof v2>;
+>numberI : Symbol(numberI, Decl(typeofSimple.ts, 8, 11))
 >I : Symbol(I, Decl(typeofSimple.ts, 2, 20))
 >v2 : Symbol(v2, Decl(typeofSimple.ts, 1, 3))
 
-var fun: () => I<number>;
->fun : Symbol(fun, Decl(typeofSimple.ts, 10, 3))
+declare var fun: () => I<number>;
+>fun : Symbol(fun, Decl(typeofSimple.ts, 10, 11))
 >I : Symbol(I, Decl(typeofSimple.ts, 2, 20))
 
 numberI = fun();
->numberI : Symbol(numberI, Decl(typeofSimple.ts, 8, 3))
->fun : Symbol(fun, Decl(typeofSimple.ts, 10, 3))
+>numberI : Symbol(numberI, Decl(typeofSimple.ts, 8, 11))
+>fun : Symbol(fun, Decl(typeofSimple.ts, 10, 11))
 
diff --git a/tests/baselines/reference/typeofSimple.types b/tests/baselines/reference/typeofSimple.types
index d5091946e6ffc..5d4c19fe17b81 100644
--- a/tests/baselines/reference/typeofSimple.types
+++ b/tests/baselines/reference/typeofSimple.types
@@ -7,11 +7,13 @@ var v = 3;
 >3 : 3
 >  : ^
 
-var v2: typeof v;
+var v2: typeof v = v;
 >v2 : number
 >   : ^^^^^^
 >v : number
 >  : ^^^^^^
+>v : number
+>  : ^^^^^^
 
 var v3: string = v2; // Not assignment compatible
 >v3 : string
@@ -25,19 +27,19 @@ interface I<T> { x: T; }
 
 interface J { }
 
-var numberJ: typeof J; //Error, cannot reference type in typeof
+declare var numberJ: typeof J; //Error, cannot reference type in typeof
 >numberJ : any
 >        : ^^^
 >J : any
 >  : ^^^
 
-var numberI: I<typeof v2>;
+declare var numberI: I<typeof v2>;
 >numberI : I<number>
 >        : ^^^^^^^^^
 >v2 : number
 >   : ^^^^^^
 
-var fun: () => I<number>;
+declare var fun: () => I<number>;
 >fun : () => I<number>
 >    : ^^^^^^         
 
diff --git a/tests/baselines/reference/typeofTypeParameter.errors.txt b/tests/baselines/reference/typeofTypeParameter.errors.txt
index 467bca2396202..ce2acbef3bedf 100644
--- a/tests/baselines/reference/typeofTypeParameter.errors.txt
+++ b/tests/baselines/reference/typeofTypeParameter.errors.txt
@@ -1,11 +1,11 @@
-typeofTypeParameter.ts(3,19): error TS2693: 'T' only refers to a type, but is being used as a value here.
+typeofTypeParameter.ts(3,20): error TS2693: 'T' only refers to a type, but is being used as a value here.
 
 
 ==== typeofTypeParameter.ts (1 errors) ====
     function f<T>(x: T): T {
-        var a: typeof x;
-        var y: typeof T;
-                      ~
+        var a!: typeof x;
+        var y!: typeof T;
+                       ~
 !!! error TS2693: 'T' only refers to a type, but is being used as a value here.
         return a;
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/typeofTypeParameter.js b/tests/baselines/reference/typeofTypeParameter.js
index bf74443df4d7e..a7e4b03b2e981 100644
--- a/tests/baselines/reference/typeofTypeParameter.js
+++ b/tests/baselines/reference/typeofTypeParameter.js
@@ -2,8 +2,8 @@
 
 //// [typeofTypeParameter.ts]
 function f<T>(x: T): T {
-    var a: typeof x;
-    var y: typeof T;
+    var a!: typeof x;
+    var y!: typeof T;
     return a;
 }
 
diff --git a/tests/baselines/reference/typeofTypeParameter.symbols b/tests/baselines/reference/typeofTypeParameter.symbols
index 8e41e27202463..cdedee3025b8b 100644
--- a/tests/baselines/reference/typeofTypeParameter.symbols
+++ b/tests/baselines/reference/typeofTypeParameter.symbols
@@ -8,11 +8,11 @@ function f<T>(x: T): T {
 >T : Symbol(T, Decl(typeofTypeParameter.ts, 0, 11))
 >T : Symbol(T, Decl(typeofTypeParameter.ts, 0, 11))
 
-    var a: typeof x;
+    var a!: typeof x;
 >a : Symbol(a, Decl(typeofTypeParameter.ts, 1, 7))
 >x : Symbol(x, Decl(typeofTypeParameter.ts, 0, 14))
 
-    var y: typeof T;
+    var y!: typeof T;
 >y : Symbol(y, Decl(typeofTypeParameter.ts, 2, 7))
 
     return a;
diff --git a/tests/baselines/reference/typeofTypeParameter.types b/tests/baselines/reference/typeofTypeParameter.types
index b226539695853..06fbc989850bb 100644
--- a/tests/baselines/reference/typeofTypeParameter.types
+++ b/tests/baselines/reference/typeofTypeParameter.types
@@ -7,13 +7,13 @@ function f<T>(x: T): T {
 >x : T
 >  : ^
 
-    var a: typeof x;
+    var a!: typeof x;
 >a : T
 >  : ^
 >x : T
 >  : ^
 
-    var y: typeof T;
+    var y!: typeof T;
 >y : any
 >  : ^^^
 >T : any
diff --git a/tests/baselines/reference/umd5.errors.txt b/tests/baselines/reference/umd5.errors.txt
index 34108d4d75804..a68162069344a 100644
--- a/tests/baselines/reference/umd5.errors.txt
+++ b/tests/baselines/reference/umd5.errors.txt
@@ -4,7 +4,7 @@ a.ts(6,9): error TS2686: 'Foo' refers to a UMD global, but the current file is a
 ==== a.ts (1 errors) ====
     import * as Bar from './foo';
     Bar.fn();
-    let x: Bar.Thing;
+    declare let x: Bar.Thing;
     let y: number = x.n;
     // should error
     let z = Foo;
diff --git a/tests/baselines/reference/umd5.js b/tests/baselines/reference/umd5.js
index 11057d45eb673..7bae36b1bdbbc 100644
--- a/tests/baselines/reference/umd5.js
+++ b/tests/baselines/reference/umd5.js
@@ -9,7 +9,7 @@ export as namespace Foo;
 //// [a.ts]
 import * as Bar from './foo';
 Bar.fn();
-let x: Bar.Thing;
+declare let x: Bar.Thing;
 let y: number = x.n;
 // should error
 let z = Foo;
@@ -53,7 +53,6 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 var Bar = __importStar(require("./foo"));
 Bar.fn();
-var x;
 var y = x.n;
 // should error
 var z = Foo;
diff --git a/tests/baselines/reference/umd5.symbols b/tests/baselines/reference/umd5.symbols
index 41eba451b25cc..34ab80afb71b8 100644
--- a/tests/baselines/reference/umd5.symbols
+++ b/tests/baselines/reference/umd5.symbols
@@ -9,15 +9,15 @@ Bar.fn();
 >Bar : Symbol(Bar, Decl(a.ts, 0, 6))
 >fn : Symbol(Bar.fn, Decl(foo.d.ts, 0, 21))
 
-let x: Bar.Thing;
->x : Symbol(x, Decl(a.ts, 2, 3))
+declare let x: Bar.Thing;
+>x : Symbol(x, Decl(a.ts, 2, 11))
 >Bar : Symbol(Bar, Decl(a.ts, 0, 6))
 >Thing : Symbol(Bar.Thing, Decl(foo.d.ts, 1, 27))
 
 let y: number = x.n;
 >y : Symbol(y, Decl(a.ts, 3, 3))
 >x.n : Symbol(Bar.Thing.n, Decl(foo.d.ts, 2, 24))
->x : Symbol(x, Decl(a.ts, 2, 3))
+>x : Symbol(x, Decl(a.ts, 2, 11))
 >n : Symbol(Bar.Thing.n, Decl(foo.d.ts, 2, 24))
 
 // should error
diff --git a/tests/baselines/reference/umd5.types b/tests/baselines/reference/umd5.types
index 9add60c8b8c81..d256717500c57 100644
--- a/tests/baselines/reference/umd5.types
+++ b/tests/baselines/reference/umd5.types
@@ -15,7 +15,7 @@ Bar.fn();
 >fn : () => void
 >   : ^^^^^^    
 
-let x: Bar.Thing;
+declare let x: Bar.Thing;
 >x : Bar.Thing
 >  : ^^^^^^^^^
 >Bar : any
diff --git a/tests/baselines/reference/umd8.errors.txt b/tests/baselines/reference/umd8.errors.txt
index 79dc529f2d62c..50d40e9f0b421 100644
--- a/tests/baselines/reference/umd8.errors.txt
+++ b/tests/baselines/reference/umd8.errors.txt
@@ -5,9 +5,9 @@ a.ts(7,14): error TS2686: 'Foo' refers to a UMD global, but the current file is
     /// <reference path="foo.d.ts" />
     import * as ff from './foo';
     
-    let y: Foo; // OK in type position
+    declare let y: Foo; // OK in type position
     y.foo();
-    let z: Foo.SubThing; // OK in ns position
+    declare let z: Foo.SubThing; // OK in ns position
     let x: any = Foo; // Not OK in value position
                  ~~~
 !!! error TS2686: 'Foo' refers to a UMD global, but the current file is a module. Consider adding an import instead.
diff --git a/tests/baselines/reference/umd8.js b/tests/baselines/reference/umd8.js
index a6a501057b99c..e1938399bca14 100644
--- a/tests/baselines/reference/umd8.js
+++ b/tests/baselines/reference/umd8.js
@@ -14,16 +14,14 @@ export as namespace Foo;
 /// <reference path="foo.d.ts" />
 import * as ff from './foo';
 
-let y: Foo; // OK in type position
+declare let y: Foo; // OK in type position
 y.foo();
-let z: Foo.SubThing; // OK in ns position
+declare let z: Foo.SubThing; // OK in ns position
 let x: any = Foo; // Not OK in value position
 
 
 //// [a.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var y; // OK in type position
 y.foo();
-var z; // OK in ns position
 var x = Foo; // Not OK in value position
diff --git a/tests/baselines/reference/umd8.symbols b/tests/baselines/reference/umd8.symbols
index 0cb5bdf2f270f..2a8264365b7a7 100644
--- a/tests/baselines/reference/umd8.symbols
+++ b/tests/baselines/reference/umd8.symbols
@@ -5,17 +5,17 @@
 import * as ff from './foo';
 >ff : Symbol(ff, Decl(a.ts, 1, 6))
 
-let y: Foo; // OK in type position
->y : Symbol(y, Decl(a.ts, 3, 3))
+declare let y: Foo; // OK in type position
+>y : Symbol(y, Decl(a.ts, 3, 11))
 >Foo : Symbol(Foo, Decl(foo.d.ts, 6, 15))
 
 y.foo();
 >y.foo : Symbol(Thing.foo, Decl(foo.d.ts, 0, 21))
->y : Symbol(y, Decl(a.ts, 3, 3))
+>y : Symbol(y, Decl(a.ts, 3, 11))
 >foo : Symbol(Thing.foo, Decl(foo.d.ts, 0, 21))
 
-let z: Foo.SubThing; // OK in ns position
->z : Symbol(z, Decl(a.ts, 5, 3))
+declare let z: Foo.SubThing; // OK in ns position
+>z : Symbol(z, Decl(a.ts, 5, 11))
 >Foo : Symbol(Foo, Decl(foo.d.ts, 6, 15))
 >SubThing : Symbol(ff.SubThing, Decl(foo.d.ts, 3, 25))
 
diff --git a/tests/baselines/reference/umd8.types b/tests/baselines/reference/umd8.types
index 57d63c467b132..d7543561dc686 100644
--- a/tests/baselines/reference/umd8.types
+++ b/tests/baselines/reference/umd8.types
@@ -6,7 +6,7 @@ import * as ff from './foo';
 >ff : typeof ff
 >   : ^^^^^^^^^
 
-let y: Foo; // OK in type position
+declare let y: Foo; // OK in type position
 >y : import("foo")
 >  : ^^^^^^^^^^^^^
 
@@ -20,7 +20,7 @@ y.foo();
 >foo : () => number
 >    : ^^^^^^      
 
-let z: Foo.SubThing; // OK in ns position
+declare let z: Foo.SubThing; // OK in ns position
 >z : ff.SubThing
 >  : ^^^^^^^^^^^
 >Foo : any
diff --git a/tests/baselines/reference/underscoreTest1.errors.txt b/tests/baselines/reference/underscoreTest1.errors.txt
index ab14202e8fc98..ba91927c40b90 100644
--- a/tests/baselines/reference/underscoreTest1.errors.txt
+++ b/tests/baselines/reference/underscoreTest1.errors.txt
@@ -144,7 +144,7 @@ underscoreTest1_underscoreTests.ts(26,3): error TS2769: No overload matches this
     initialize();
     initialize();
     
-    var notes: any[];
+    var notes: any[] = [];
     var render = () => alert("rendering...");
     var renderNotes = _.after(notes.length, render);
     _.each(notes, (note) => note.asyncSave({ success: renderNotes }));
diff --git a/tests/baselines/reference/underscoreTest1.js b/tests/baselines/reference/underscoreTest1.js
index 6e81cdc454014..cf2db5f34c0e3 100644
--- a/tests/baselines/reference/underscoreTest1.js
+++ b/tests/baselines/reference/underscoreTest1.js
@@ -775,7 +775,7 @@ var initialize = _.once(createApplication);
 initialize();
 initialize();
 
-var notes: any[];
+var notes: any[] = [];
 var render = () => alert("rendering...");
 var renderNotes = _.after(notes.length, render);
 _.each(notes, (note) => note.asyncSave({ success: renderNotes }));
@@ -996,7 +996,7 @@ var createApplication = function () { return alert('creating application...'); }
 var initialize = _.once(createApplication);
 initialize();
 initialize();
-var notes;
+var notes = [];
 var render = function () { return alert("rendering..."); };
 var renderNotes = _.after(notes.length, render);
 _.each(notes, function (note) { return note.asyncSave({ success: renderNotes }); });
diff --git a/tests/baselines/reference/underscoreTest1.symbols b/tests/baselines/reference/underscoreTest1.symbols
index be9548bdf6daa..c4e6d3ca27173 100644
--- a/tests/baselines/reference/underscoreTest1.symbols
+++ b/tests/baselines/reference/underscoreTest1.symbols
@@ -500,7 +500,7 @@ initialize();
 initialize();
 >initialize : Symbol(initialize, Decl(underscoreTest1_underscoreTests.ts, 122, 3))
 
-var notes: any[];
+var notes: any[] = [];
 >notes : Symbol(notes, Decl(underscoreTest1_underscoreTests.ts, 126, 3))
 
 var render = () => alert("rendering...");
diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types
index 8ab77090fa52e..77de0efd1bcbf 100644
--- a/tests/baselines/reference/underscoreTest1.types
+++ b/tests/baselines/reference/underscoreTest1.types
@@ -1812,9 +1812,11 @@ initialize();
 >initialize : () => void
 >           : ^^^^^^^^^^
 
-var notes: any[];
+var notes: any[] = [];
 >notes : any[]
 >      : ^^^^^
+>[] : undefined[]
+>   : ^^^^^^^^^^^
 
 var render = () => alert("rendering...");
 >render : () => void
diff --git a/tests/baselines/reference/unicodeEscapesInJsxtags.errors.txt b/tests/baselines/reference/unicodeEscapesInJsxtags.errors.txt
index cc664d0d2ece4..e70893f7d1bd0 100644
--- a/tests/baselines/reference/unicodeEscapesInJsxtags.errors.txt
+++ b/tests/baselines/reference/unicodeEscapesInJsxtags.errors.txt
@@ -1,17 +1,18 @@
-file.tsx(15,4): error TS17021: Unicode escape sequence cannot appear here.
 file.tsx(16,4): error TS17021: Unicode escape sequence cannot appear here.
 file.tsx(17,4): error TS17021: Unicode escape sequence cannot appear here.
 file.tsx(18,4): error TS17021: Unicode escape sequence cannot appear here.
-file.tsx(19,6): error TS17021: Unicode escape sequence cannot appear here.
-file.tsx(20,4): error TS17021: Unicode escape sequence cannot appear here.
+file.tsx(19,4): error TS17021: Unicode escape sequence cannot appear here.
+file.tsx(20,6): error TS17021: Unicode escape sequence cannot appear here.
 file.tsx(21,4): error TS17021: Unicode escape sequence cannot appear here.
 file.tsx(22,4): error TS17021: Unicode escape sequence cannot appear here.
 file.tsx(23,4): error TS17021: Unicode escape sequence cannot appear here.
-file.tsx(26,9): error TS17021: Unicode escape sequence cannot appear here.
+file.tsx(24,4): error TS17021: Unicode escape sequence cannot appear here.
 file.tsx(27,9): error TS17021: Unicode escape sequence cannot appear here.
+file.tsx(28,9): error TS17021: Unicode escape sequence cannot appear here.
 
 
 ==== file.tsx (11 errors) ====
+    /// <reference path="/.lib/react.d.ts" />
     import * as React from "react";
     declare global {
         namespace JSX {
diff --git a/tests/baselines/reference/unicodeEscapesInJsxtags.js b/tests/baselines/reference/unicodeEscapesInJsxtags.js
index 19d083df09371..fb197640c40d5 100644
--- a/tests/baselines/reference/unicodeEscapesInJsxtags.js
+++ b/tests/baselines/reference/unicodeEscapesInJsxtags.js
@@ -1,6 +1,7 @@
 //// [tests/cases/conformance/jsx/unicodeEscapesInJsxtags.tsx] ////
 
 //// [file.tsx]
+/// <reference path="/.lib/react.d.ts" />
 import * as React from "react";
 declare global {
     namespace JSX {
@@ -31,6 +32,7 @@ const x = { video: () => null }
 
 
 //// [file.js]
+/// <reference path="/.lib/react.d.ts" />
 import * as React from "react";
 const Compa = (x) => React.createElement("div", null, "" + x);
 const x = { video: () => null };
diff --git a/tests/baselines/reference/unicodeEscapesInJsxtags.symbols b/tests/baselines/reference/unicodeEscapesInJsxtags.symbols
index dc9acb394ab4a..af0fb11b547f9 100644
--- a/tests/baselines/reference/unicodeEscapesInJsxtags.symbols
+++ b/tests/baselines/reference/unicodeEscapesInJsxtags.symbols
@@ -1,37 +1,38 @@
 //// [tests/cases/conformance/jsx/unicodeEscapesInJsxtags.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
 import * as React from "react";
->React : Symbol(React, Decl(file.tsx, 0, 6))
+>React : Symbol(React, Decl(file.tsx, 1, 6))
 
 declare global {
->global : Symbol(global, Decl(file.tsx, 0, 31))
+>global : Symbol(global, Decl(file.tsx, 1, 31))
 
     namespace JSX {
->JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1), Decl(file.tsx, 1, 16))
+>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1), Decl(file.tsx, 2, 16))
 
         interface IntrinsicElements {
->IntrinsicElements : Symbol(IntrinsicElements, Decl(react.d.ts, 2368, 78), Decl(file.tsx, 2, 19))
+>IntrinsicElements : Symbol(IntrinsicElements, Decl(react.d.ts, 2368, 78), Decl(file.tsx, 3, 19))
 
             "a-b": any;
->"a-b" : Symbol(IntrinsicElements["a-b"], Decl(file.tsx, 3, 37))
+>"a-b" : Symbol(IntrinsicElements["a-b"], Decl(file.tsx, 4, 37))
 
             "a-c": any;
->"a-c" : Symbol(IntrinsicElements["a-c"], Decl(file.tsx, 4, 23))
+>"a-c" : Symbol(IntrinsicElements["a-c"], Decl(file.tsx, 5, 23))
         }
     }
 }
 const Compa = (x: {x: number}) => <div>{"" + x}</div>;
->Compa : Symbol(Compa, Decl(file.tsx, 9, 5))
->x : Symbol(x, Decl(file.tsx, 9, 15))
->x : Symbol(x, Decl(file.tsx, 9, 19))
+>Compa : Symbol(Compa, Decl(file.tsx, 10, 5))
+>x : Symbol(x, Decl(file.tsx, 10, 15))
+>x : Symbol(x, Decl(file.tsx, 10, 19))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
->x : Symbol(x, Decl(file.tsx, 9, 15))
+>x : Symbol(x, Decl(file.tsx, 10, 15))
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
 
 const x = { video: () => null }
->x : Symbol(x, Decl(file.tsx, 10, 5))
->video : Symbol(video, Decl(file.tsx, 10, 11))
+>x : Symbol(x, Decl(file.tsx, 11, 5))
+>video : Symbol(video, Decl(file.tsx, 11, 11))
 
 // unicode escape sequence is not allowed in tag name or JSX attribute name.
 // tag name:
@@ -40,44 +41,44 @@ const x = { video: () => null }
 >a : Symbol(JSX.IntrinsicElements.a, Decl(react.d.ts, 2370, 33))
 
 ; <\u0061-b></a-b>
->\u0061-b : Symbol(JSX.IntrinsicElements["a-b"], Decl(file.tsx, 3, 37))
->a-b : Symbol(JSX.IntrinsicElements["a-b"], Decl(file.tsx, 3, 37))
+>\u0061-b : Symbol(JSX.IntrinsicElements["a-b"], Decl(file.tsx, 4, 37))
+>a-b : Symbol(JSX.IntrinsicElements["a-b"], Decl(file.tsx, 4, 37))
 
 ; <a-\u0063></a-c>
->a-\u0063 : Symbol(JSX.IntrinsicElements["a-c"], Decl(file.tsx, 4, 23))
->a-c : Symbol(JSX.IntrinsicElements["a-c"], Decl(file.tsx, 4, 23))
+>a-\u0063 : Symbol(JSX.IntrinsicElements["a-c"], Decl(file.tsx, 5, 23))
+>a-c : Symbol(JSX.IntrinsicElements["a-c"], Decl(file.tsx, 5, 23))
 
 ; <Comp\u0061 x={12} />
->Comp\u0061 : Symbol(Compa, Decl(file.tsx, 9, 5))
->x : Symbol(x, Decl(file.tsx, 17, 13))
+>Comp\u0061 : Symbol(Compa, Decl(file.tsx, 10, 5))
+>x : Symbol(x, Decl(file.tsx, 18, 13))
 
 ; <x.\u0076ideo />
->x.\u0076ideo : Symbol(video, Decl(file.tsx, 10, 11))
->x : Symbol(x, Decl(file.tsx, 10, 5))
->\u0076ideo : Symbol(video, Decl(file.tsx, 10, 11))
+>x.\u0076ideo : Symbol(video, Decl(file.tsx, 11, 11))
+>x : Symbol(x, Decl(file.tsx, 11, 5))
+>\u0076ideo : Symbol(video, Decl(file.tsx, 11, 11))
 
 ; <\u{0061}></a>
 >\u{0061} : Symbol(JSX.IntrinsicElements.a, Decl(react.d.ts, 2370, 33))
 >a : Symbol(JSX.IntrinsicElements.a, Decl(react.d.ts, 2370, 33))
 
 ; <\u{0061}-b></a-b>
->\u{0061}-b : Symbol(JSX.IntrinsicElements["a-b"], Decl(file.tsx, 3, 37))
->a-b : Symbol(JSX.IntrinsicElements["a-b"], Decl(file.tsx, 3, 37))
+>\u{0061}-b : Symbol(JSX.IntrinsicElements["a-b"], Decl(file.tsx, 4, 37))
+>a-b : Symbol(JSX.IntrinsicElements["a-b"], Decl(file.tsx, 4, 37))
 
 ; <a-\u{0063}></a-c>
->a-\u{0063} : Symbol(JSX.IntrinsicElements["a-c"], Decl(file.tsx, 4, 23))
->a-c : Symbol(JSX.IntrinsicElements["a-c"], Decl(file.tsx, 4, 23))
+>a-\u{0063} : Symbol(JSX.IntrinsicElements["a-c"], Decl(file.tsx, 5, 23))
+>a-c : Symbol(JSX.IntrinsicElements["a-c"], Decl(file.tsx, 5, 23))
 
 ; <Comp\u{0061} x={12} />
->Comp\u{0061} : Symbol(Compa, Decl(file.tsx, 9, 5))
->x : Symbol(x, Decl(file.tsx, 22, 15))
+>Comp\u{0061} : Symbol(Compa, Decl(file.tsx, 10, 5))
+>x : Symbol(x, Decl(file.tsx, 23, 15))
 
 // attribute name
 ;<video data-\u0076ideo />
 >video : Symbol(JSX.IntrinsicElements.video, Decl(react.d.ts, 2481, 44))
->data-\u0076ideo : Symbol(data-\u0076ideo, Decl(file.tsx, 25, 7))
+>data-\u0076ideo : Symbol(data-\u0076ideo, Decl(file.tsx, 26, 7))
 
 ;<video \u0073rc="" />
 >video : Symbol(JSX.IntrinsicElements.video, Decl(react.d.ts, 2481, 44))
->\u0073rc : Symbol(\u0073rc, Decl(file.tsx, 26, 7))
+>\u0073rc : Symbol(\u0073rc, Decl(file.tsx, 27, 7))
 
diff --git a/tests/baselines/reference/unicodeEscapesInJsxtags.types b/tests/baselines/reference/unicodeEscapesInJsxtags.types
index f17acb48e1f42..a53c89c46a99c 100644
--- a/tests/baselines/reference/unicodeEscapesInJsxtags.types
+++ b/tests/baselines/reference/unicodeEscapesInJsxtags.types
@@ -1,6 +1,7 @@
 //// [tests/cases/conformance/jsx/unicodeEscapesInJsxtags.tsx] ////
 
 === file.tsx ===
+/// <reference path="react.d.ts" />
 import * as React from "react";
 >React : typeof React
 >      : ^^^^^^^^^^^^
diff --git a/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).errors.txt b/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).errors.txt
index de53e2b1953e1..5189ef7361999 100644
--- a/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).errors.txt
+++ b/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).errors.txt
@@ -6,8 +6,8 @@ astralAsSurrogatePair.ts(1,24): error TS2305: Module '"./extendedEscapesForAstra
 
 ==== extendedEscapesForAstralsInVarsAndClasses.ts (0 errors) ====
     // U+102A7 CARIAN LETTER A2
-    var 𐊧: string;
-    var \u{102A7}: string;
+    declare var 𐊧: string;
+    declare var \u{102A7}: string;
     
     if (Math.random()) {
         𐊧 = "hello";
diff --git a/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).js b/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).js
index fb37c4b33871a..d2f99305fa346 100644
--- a/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).js
+++ b/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).js
@@ -2,8 +2,8 @@
 
 //// [extendedEscapesForAstralsInVarsAndClasses.ts]
 // U+102A7 CARIAN LETTER A2
-var 𐊧: string;
-var \u{102A7}: string;
+declare var 𐊧: string;
+declare var \u{102A7}: string;
 
 if (Math.random()) {
     𐊧 = "hello";
@@ -31,9 +31,6 @@ import { _𐊧 as \uD800\uDEA7 } from "./extendedEscapesForAstralsInVarsAndClass
 
 
 //// [extendedEscapesForAstralsInVarsAndClasses.js]
-// U+102A7 CARIAN LETTER A2
-var 𐊧;
-var \u{102A7};
 if (Math.random()) {
     𐊧 = "hello";
 }
diff --git a/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).js.map b/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).js.map
index 8eb7b3f65eac1..2c7b919a93385 100644
--- a/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).js.map
+++ b/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).js.map
@@ -1,6 +1,6 @@
 //// [extendedEscapesForAstralsInVarsAndClasses.js.map]
-{"version":3,"file":"extendedEscapesForAstralsInVarsAndClasses.js","sourceRoot":"","sources":["extendedEscapesForAstralsInVarsAndClasses.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,IAAI,EAAU,CAAC;AACf,IAAI,SAAiB,CAAC;AAEtB,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;IAChB,EAAE,GAAG,OAAO,CAAC;AACjB,CAAC;KACI,CAAC;IACF,SAAS,GAAG,OAAO,CAAC;AACxB,CAAC;AAED,MAAM,GAAG;IAEL;QACI,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC9B,CAAC;IACD,OAAO;QACH,OAAO,IAAI,CAAC,EAAE,CAAC;IACnB,CAAC;CACJ;AAED,MAAM,CAAC,IAAI,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;AAE3D,UAAU,IAAI,GAAG,CAAC"}
-//// https://sokra.github.io/source-map-visualization#base64,Ly8gVSsxMDJBNyBDQVJJQU4gTEVUVEVSIEEyDQp2YXIg7aCA7bqnOw0KdmFyIFx1ezEwMkE3fTsNCmlmIChNYXRoLnJhbmRvbSgpKSB7DQogICAg7aCA7bqnID0gImhlbGxvIjsNCn0NCmVsc2Ugew0KICAgIFx1ezEwMkE3fSA9ICJoYWxsbyI7DQp9DQpjbGFzcyBGb28gew0KICAgIGNvbnN0cnVjdG9yKCkgew0KICAgICAgICB0aGlzLlx1ezEwMkE3fSA9ICIgd29ybGQiOw0KICAgIH0NCiAgICBtZXRob2RBKCkgew0KICAgICAgICByZXR1cm4gdGhpcy7toIDtuqc7DQogICAgfQ0KfQ0KZXhwb3J0IHZhciBf7aCA7bqnID0gbmV3IEZvbygpLlx1ezEwMkE3fSArIG5ldyBGb28oKS5tZXRob2RBKCk7DQpfXHV7MTAyQTd9ICs9ICIhIjsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPWV4dGVuZGVkRXNjYXBlc0ZvckFzdHJhbHNJblZhcnNBbmRDbGFzc2VzLmpzLm1hcA==,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZW5kZWRFc2NhcGVzRm9yQXN0cmFsc0luVmFyc0FuZENsYXNzZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJleHRlbmRlZEVzY2FwZXNGb3JBc3RyYWxzSW5WYXJzQW5kQ2xhc3Nlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQkFBMkI7QUFDM0IsSUFBSSxFQUFVLENBQUM7QUFDZixJQUFJLFNBQWlCLENBQUM7QUFFdEIsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQztJQUNoQixFQUFFLEdBQUcsT0FBTyxDQUFDO0FBQ2pCLENBQUM7S0FDSSxDQUFDO0lBQ0YsU0FBUyxHQUFHLE9BQU8sQ0FBQztBQUN4QixDQUFDO0FBRUQsTUFBTSxHQUFHO0lBRUw7UUFDSSxJQUFJLENBQUMsU0FBUyxHQUFHLFFBQVEsQ0FBQztJQUM5QixDQUFDO0lBQ0QsT0FBTztRQUNILE9BQU8sSUFBSSxDQUFDLEVBQUUsQ0FBQztJQUNuQixDQUFDO0NBQ0o7QUFFRCxNQUFNLENBQUMsSUFBSSxHQUFHLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQyxTQUFTLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQztBQUUzRCxVQUFVLElBQUksR0FBRyxDQUFDIn0=,Ly8gVSsxMDJBNyBDQVJJQU4gTEVUVEVSIEEyCnZhciDtoIDtuqc6IHN0cmluZzsKdmFyIFx1ezEwMkE3fTogc3RyaW5nOwoKaWYgKE1hdGgucmFuZG9tKCkpIHsKICAgIO2ggO26pyA9ICJoZWxsbyI7Cn0KZWxzZSB7CiAgICBcdXsxMDJBN30gPSAiaGFsbG8iOwp9CgpjbGFzcyBGb28gewogICAgXHV7MTAyQTd9OiBzdHJpbmc7CiAgICBjb25zdHJ1Y3RvcigpIHsKICAgICAgICB0aGlzLlx1ezEwMkE3fSA9ICIgd29ybGQiOwogICAgfQogICAgbWV0aG9kQSgpIHsKICAgICAgICByZXR1cm4gdGhpcy7toIDtuqc7CiAgICB9Cn0KCmV4cG9ydCB2YXIgX+2ggO26pyA9IG5ldyBGb28oKS5cdXsxMDJBN30gKyBuZXcgRm9vKCkubWV0aG9kQSgpOwoKX1x1ezEwMkE3fSArPSAiISI7Cg==
+{"version":3,"file":"extendedEscapesForAstralsInVarsAndClasses.js","sourceRoot":"","sources":["extendedEscapesForAstralsInVarsAndClasses.ts"],"names":[],"mappings":"AAIA,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;IAChB,EAAE,GAAG,OAAO,CAAC;AACjB,CAAC;KACI,CAAC;IACF,SAAS,GAAG,OAAO,CAAC;AACxB,CAAC;AAED,MAAM,GAAG;IAEL;QACI,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC9B,CAAC;IACD,OAAO;QACH,OAAO,IAAI,CAAC,EAAE,CAAC;IACnB,CAAC;CACJ;AAED,MAAM,CAAC,IAAI,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;AAE3D,UAAU,IAAI,GAAG,CAAC"}
+//// https://sokra.github.io/source-map-visualization#base64,aWYgKE1hdGgucmFuZG9tKCkpIHsNCiAgICDtoIDtuqcgPSAiaGVsbG8iOw0KfQ0KZWxzZSB7DQogICAgXHV7MTAyQTd9ID0gImhhbGxvIjsNCn0NCmNsYXNzIEZvbyB7DQogICAgY29uc3RydWN0b3IoKSB7DQogICAgICAgIHRoaXMuXHV7MTAyQTd9ID0gIiB3b3JsZCI7DQogICAgfQ0KICAgIG1ldGhvZEEoKSB7DQogICAgICAgIHJldHVybiB0aGlzLu2ggO26pzsNCiAgICB9DQp9DQpleHBvcnQgdmFyIF/toIDtuqcgPSBuZXcgRm9vKCkuXHV7MTAyQTd9ICsgbmV3IEZvbygpLm1ldGhvZEEoKTsNCl9cdXsxMDJBN30gKz0gIiEiOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9ZXh0ZW5kZWRFc2NhcGVzRm9yQXN0cmFsc0luVmFyc0FuZENsYXNzZXMuanMubWFw,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZW5kZWRFc2NhcGVzRm9yQXN0cmFsc0luVmFyc0FuZENsYXNzZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJleHRlbmRlZEVzY2FwZXNGb3JBc3RyYWxzSW5WYXJzQW5kQ2xhc3Nlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLEVBQUUsR0FBRyxPQUFPLENBQUM7QUFDakIsQ0FBQztLQUNJLENBQUM7SUFDRixTQUFTLEdBQUcsT0FBTyxDQUFDO0FBQ3hCLENBQUM7QUFFRCxNQUFNLEdBQUc7SUFFTDtRQUNJLElBQUksQ0FBQyxTQUFTLEdBQUcsUUFBUSxDQUFDO0lBQzlCLENBQUM7SUFDRCxPQUFPO1FBQ0gsT0FBTyxJQUFJLENBQUMsRUFBRSxDQUFDO0lBQ25CLENBQUM7Q0FDSjtBQUVELE1BQU0sQ0FBQyxJQUFJLEdBQUcsR0FBRyxJQUFJLEdBQUcsRUFBRSxDQUFDLFNBQVMsR0FBRyxJQUFJLEdBQUcsRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDO0FBRTNELFVBQVUsSUFBSSxHQUFHLENBQUMifQ==,Ly8gVSsxMDJBNyBDQVJJQU4gTEVUVEVSIEEyCmRlY2xhcmUgdmFyIO2ggO26pzogc3RyaW5nOwpkZWNsYXJlIHZhciBcdXsxMDJBN306IHN0cmluZzsKCmlmIChNYXRoLnJhbmRvbSgpKSB7CiAgICDtoIDtuqcgPSAiaGVsbG8iOwp9CmVsc2UgewogICAgXHV7MTAyQTd9ID0gImhhbGxvIjsKfQoKY2xhc3MgRm9vIHsKICAgIFx1ezEwMkE3fTogc3RyaW5nOwogICAgY29uc3RydWN0b3IoKSB7CiAgICAgICAgdGhpcy5cdXsxMDJBN30gPSAiIHdvcmxkIjsKICAgIH0KICAgIG1ldGhvZEEoKSB7CiAgICAgICAgcmV0dXJuIHRoaXMu7aCA7bqnOwogICAgfQp9CgpleHBvcnQgdmFyIF/toIDtuqcgPSBuZXcgRm9vKCkuXHV7MTAyQTd9ICsgbmV3IEZvbygpLm1ldGhvZEEoKTsKCl9cdXsxMDJBN30gKz0gIiEiOwo=
 
 //// [astralAsSurrogatePair.js.map]
 {"version":3,"file":"astralAsSurrogatePair.js","sourceRoot":"","sources":["astralAsSurrogatePair.ts"],"names":[],"mappings":""}
diff --git a/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).sourcemap.txt b/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).sourcemap.txt
index e9ffa88cad7ca..1417ea17e9c7d 100644
--- a/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).sourcemap.txt
+++ b/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).sourcemap.txt
@@ -8,48 +8,8 @@ sources: extendedEscapesForAstralsInVarsAndClasses.ts
 emittedFile:extendedEscapesForAstralsInVarsAndClasses.js
 sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 -------------------------------------------------------------------
->>>// U+102A7 CARIAN LETTER A2
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >
-2 >// U+102A7 CARIAN LETTER A2
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 28) Source(1, 28) + SourceIndex(0)
----
->>>var 𐊧;
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^
-5 >       ^^^^^^^^->
-1 >
-  >
-2 >var 
-3 >    𐊧: string
-4 >      ;
-1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-3 >Emitted(2, 7) Source(2, 15) + SourceIndex(0)
-4 >Emitted(2, 8) Source(2, 16) + SourceIndex(0)
----
->>>var \u{102A7};
-1->
-2 >^^^^
-3 >    ^^^^^^^^^
-4 >             ^
-5 >              ^^^^^^^->
-1->
-  >
-2 >var 
-3 >    \u{102A7}: string
-4 >             ;
-1->Emitted(3, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-3 >Emitted(3, 14) Source(3, 22) + SourceIndex(0)
-4 >Emitted(3, 15) Source(3, 23) + SourceIndex(0)
----
 >>>if (Math.random()) {
-1->
+1 >
 2 >^^^^
 3 >    ^^^^
 4 >        ^
@@ -57,7 +17,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 6 >               ^^
 7 >                 ^^
 8 >                   ^
-1->
+1 >// U+102A7 CARIAN LETTER A2
+  >declare var 𐊧: string;
+  >declare var \u{102A7}: string;
   >
   >
 2 >if (
@@ -67,14 +29,14 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 6 >               ()
 7 >                 ) 
 8 >                   {
-1->Emitted(4, 1) Source(5, 1) + SourceIndex(0)
-2 >Emitted(4, 5) Source(5, 5) + SourceIndex(0)
-3 >Emitted(4, 9) Source(5, 9) + SourceIndex(0)
-4 >Emitted(4, 10) Source(5, 10) + SourceIndex(0)
-5 >Emitted(4, 16) Source(5, 16) + SourceIndex(0)
-6 >Emitted(4, 18) Source(5, 18) + SourceIndex(0)
-7 >Emitted(4, 20) Source(5, 20) + SourceIndex(0)
-8 >Emitted(4, 21) Source(5, 21) + SourceIndex(0)
+1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(5, 5) + SourceIndex(0)
+3 >Emitted(1, 9) Source(5, 9) + SourceIndex(0)
+4 >Emitted(1, 10) Source(5, 10) + SourceIndex(0)
+5 >Emitted(1, 16) Source(5, 16) + SourceIndex(0)
+6 >Emitted(1, 18) Source(5, 18) + SourceIndex(0)
+7 >Emitted(1, 20) Source(5, 20) + SourceIndex(0)
+8 >Emitted(1, 21) Source(5, 21) + SourceIndex(0)
 ---
 >>>    𐊧 = "hello";
 1 >^^^^
@@ -88,11 +50,11 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 3 >       = 
 4 >         "hello"
 5 >                ;
-1 >Emitted(5, 5) Source(6, 5) + SourceIndex(0)
-2 >Emitted(5, 7) Source(6, 7) + SourceIndex(0)
-3 >Emitted(5, 10) Source(6, 10) + SourceIndex(0)
-4 >Emitted(5, 17) Source(6, 17) + SourceIndex(0)
-5 >Emitted(5, 18) Source(6, 18) + SourceIndex(0)
+1 >Emitted(2, 5) Source(6, 5) + SourceIndex(0)
+2 >Emitted(2, 7) Source(6, 7) + SourceIndex(0)
+3 >Emitted(2, 10) Source(6, 10) + SourceIndex(0)
+4 >Emitted(2, 17) Source(6, 17) + SourceIndex(0)
+5 >Emitted(2, 18) Source(6, 18) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -101,8 +63,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1 >
   >
 2 >}
-1 >Emitted(6, 1) Source(7, 1) + SourceIndex(0)
-2 >Emitted(6, 2) Source(7, 2) + SourceIndex(0)
+1 >Emitted(3, 1) Source(7, 1) + SourceIndex(0)
+2 >Emitted(3, 2) Source(7, 2) + SourceIndex(0)
 ---
 >>>else {
 1->^^^^^
@@ -111,8 +73,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1->
   >else 
 2 >     {
-1->Emitted(7, 6) Source(8, 6) + SourceIndex(0)
-2 >Emitted(7, 7) Source(8, 7) + SourceIndex(0)
+1->Emitted(4, 6) Source(8, 6) + SourceIndex(0)
+2 >Emitted(4, 7) Source(8, 7) + SourceIndex(0)
 ---
 >>>    \u{102A7} = "hallo";
 1->^^^^
@@ -126,11 +88,11 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 3 >              = 
 4 >                "hallo"
 5 >                       ;
-1->Emitted(8, 5) Source(9, 5) + SourceIndex(0)
-2 >Emitted(8, 14) Source(9, 14) + SourceIndex(0)
-3 >Emitted(8, 17) Source(9, 17) + SourceIndex(0)
-4 >Emitted(8, 24) Source(9, 24) + SourceIndex(0)
-5 >Emitted(8, 25) Source(9, 25) + SourceIndex(0)
+1->Emitted(5, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(5, 14) Source(9, 14) + SourceIndex(0)
+3 >Emitted(5, 17) Source(9, 17) + SourceIndex(0)
+4 >Emitted(5, 24) Source(9, 24) + SourceIndex(0)
+5 >Emitted(5, 25) Source(9, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -139,8 +101,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1 >
   >
 2 >}
-1 >Emitted(9, 1) Source(10, 1) + SourceIndex(0)
-2 >Emitted(9, 2) Source(10, 2) + SourceIndex(0)
+1 >Emitted(6, 1) Source(10, 1) + SourceIndex(0)
+2 >Emitted(6, 2) Source(10, 2) + SourceIndex(0)
 ---
 >>>class Foo {
 1->
@@ -152,9 +114,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
   >
 2 >class 
 3 >      Foo
-1->Emitted(10, 1) Source(12, 1) + SourceIndex(0)
-2 >Emitted(10, 7) Source(12, 7) + SourceIndex(0)
-3 >Emitted(10, 10) Source(12, 10) + SourceIndex(0)
+1->Emitted(7, 1) Source(12, 1) + SourceIndex(0)
+2 >Emitted(7, 7) Source(12, 7) + SourceIndex(0)
+3 >Emitted(7, 10) Source(12, 10) + SourceIndex(0)
 ---
 >>>    constructor() {
 1->^^^^
@@ -162,7 +124,7 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1-> {
   >    \u{102A7}: string;
   >    
-1->Emitted(11, 5) Source(14, 5) + SourceIndex(0)
+1->Emitted(8, 5) Source(14, 5) + SourceIndex(0)
 ---
 >>>        this.\u{102A7} = " world";
 1->^^^^^^^^
@@ -180,13 +142,13 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 5 >                       = 
 6 >                         " world"
 7 >                                 ;
-1->Emitted(12, 9) Source(15, 9) + SourceIndex(0)
-2 >Emitted(12, 13) Source(15, 13) + SourceIndex(0)
-3 >Emitted(12, 14) Source(15, 14) + SourceIndex(0)
-4 >Emitted(12, 23) Source(15, 23) + SourceIndex(0)
-5 >Emitted(12, 26) Source(15, 26) + SourceIndex(0)
-6 >Emitted(12, 34) Source(15, 34) + SourceIndex(0)
-7 >Emitted(12, 35) Source(15, 35) + SourceIndex(0)
+1->Emitted(9, 9) Source(15, 9) + SourceIndex(0)
+2 >Emitted(9, 13) Source(15, 13) + SourceIndex(0)
+3 >Emitted(9, 14) Source(15, 14) + SourceIndex(0)
+4 >Emitted(9, 23) Source(15, 23) + SourceIndex(0)
+5 >Emitted(9, 26) Source(15, 26) + SourceIndex(0)
+6 >Emitted(9, 34) Source(15, 34) + SourceIndex(0)
+7 >Emitted(9, 35) Source(15, 35) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -195,8 +157,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1 >
   >    
 2 >    }
-1 >Emitted(13, 5) Source(16, 5) + SourceIndex(0)
-2 >Emitted(13, 6) Source(16, 6) + SourceIndex(0)
+1 >Emitted(10, 5) Source(16, 5) + SourceIndex(0)
+2 >Emitted(10, 6) Source(16, 6) + SourceIndex(0)
 ---
 >>>    methodA() {
 1->^^^^
@@ -205,8 +167,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1->
   >    
 2 >    methodA
-1->Emitted(14, 5) Source(17, 5) + SourceIndex(0)
-2 >Emitted(14, 12) Source(17, 12) + SourceIndex(0)
+1->Emitted(11, 5) Source(17, 5) + SourceIndex(0)
+2 >Emitted(11, 12) Source(17, 12) + SourceIndex(0)
 ---
 >>>        return this.𐊧;
 1->^^^^^^^^
@@ -222,12 +184,12 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 4 >                   .
 5 >                    𐊧
 6 >                      ;
-1->Emitted(15, 9) Source(18, 9) + SourceIndex(0)
-2 >Emitted(15, 16) Source(18, 16) + SourceIndex(0)
-3 >Emitted(15, 20) Source(18, 20) + SourceIndex(0)
-4 >Emitted(15, 21) Source(18, 21) + SourceIndex(0)
-5 >Emitted(15, 23) Source(18, 23) + SourceIndex(0)
-6 >Emitted(15, 24) Source(18, 24) + SourceIndex(0)
+1->Emitted(12, 9) Source(18, 9) + SourceIndex(0)
+2 >Emitted(12, 16) Source(18, 16) + SourceIndex(0)
+3 >Emitted(12, 20) Source(18, 20) + SourceIndex(0)
+4 >Emitted(12, 21) Source(18, 21) + SourceIndex(0)
+5 >Emitted(12, 23) Source(18, 23) + SourceIndex(0)
+6 >Emitted(12, 24) Source(18, 24) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -235,15 +197,15 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1 >
   >    
 2 >    }
-1 >Emitted(16, 5) Source(19, 5) + SourceIndex(0)
-2 >Emitted(16, 6) Source(19, 6) + SourceIndex(0)
+1 >Emitted(13, 5) Source(19, 5) + SourceIndex(0)
+2 >Emitted(13, 6) Source(19, 6) + SourceIndex(0)
 ---
 >>>}
 1 >^
 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(17, 2) Source(20, 2) + SourceIndex(0)
+1 >Emitted(14, 2) Source(20, 2) + SourceIndex(0)
 ---
 >>>export var _𐊧 = new Foo().\u{102A7} + new Foo().methodA();
 1->
@@ -286,25 +248,25 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 17>                                                 methodA
 18>                                                        ()
 19>                                                          ;
-1->Emitted(18, 1) Source(22, 1) + SourceIndex(0)
-2 >Emitted(18, 7) Source(22, 7) + SourceIndex(0)
-3 >Emitted(18, 8) Source(22, 8) + SourceIndex(0)
-4 >Emitted(18, 12) Source(22, 12) + SourceIndex(0)
-5 >Emitted(18, 15) Source(22, 15) + SourceIndex(0)
-6 >Emitted(18, 18) Source(22, 18) + SourceIndex(0)
-7 >Emitted(18, 22) Source(22, 22) + SourceIndex(0)
-8 >Emitted(18, 25) Source(22, 25) + SourceIndex(0)
-9 >Emitted(18, 27) Source(22, 27) + SourceIndex(0)
-10>Emitted(18, 28) Source(22, 28) + SourceIndex(0)
-11>Emitted(18, 37) Source(22, 37) + SourceIndex(0)
-12>Emitted(18, 40) Source(22, 40) + SourceIndex(0)
-13>Emitted(18, 44) Source(22, 44) + SourceIndex(0)
-14>Emitted(18, 47) Source(22, 47) + SourceIndex(0)
-15>Emitted(18, 49) Source(22, 49) + SourceIndex(0)
-16>Emitted(18, 50) Source(22, 50) + SourceIndex(0)
-17>Emitted(18, 57) Source(22, 57) + SourceIndex(0)
-18>Emitted(18, 59) Source(22, 59) + SourceIndex(0)
-19>Emitted(18, 60) Source(22, 60) + SourceIndex(0)
+1->Emitted(15, 1) Source(22, 1) + SourceIndex(0)
+2 >Emitted(15, 7) Source(22, 7) + SourceIndex(0)
+3 >Emitted(15, 8) Source(22, 8) + SourceIndex(0)
+4 >Emitted(15, 12) Source(22, 12) + SourceIndex(0)
+5 >Emitted(15, 15) Source(22, 15) + SourceIndex(0)
+6 >Emitted(15, 18) Source(22, 18) + SourceIndex(0)
+7 >Emitted(15, 22) Source(22, 22) + SourceIndex(0)
+8 >Emitted(15, 25) Source(22, 25) + SourceIndex(0)
+9 >Emitted(15, 27) Source(22, 27) + SourceIndex(0)
+10>Emitted(15, 28) Source(22, 28) + SourceIndex(0)
+11>Emitted(15, 37) Source(22, 37) + SourceIndex(0)
+12>Emitted(15, 40) Source(22, 40) + SourceIndex(0)
+13>Emitted(15, 44) Source(22, 44) + SourceIndex(0)
+14>Emitted(15, 47) Source(22, 47) + SourceIndex(0)
+15>Emitted(15, 49) Source(22, 49) + SourceIndex(0)
+16>Emitted(15, 50) Source(22, 50) + SourceIndex(0)
+17>Emitted(15, 57) Source(22, 57) + SourceIndex(0)
+18>Emitted(15, 59) Source(22, 59) + SourceIndex(0)
+19>Emitted(15, 60) Source(22, 60) + SourceIndex(0)
 ---
 >>>_\u{102A7} += "!";
 1 >
@@ -320,11 +282,11 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 3 >           += 
 4 >              "!"
 5 >                 ;
-1 >Emitted(19, 1) Source(24, 1) + SourceIndex(0)
-2 >Emitted(19, 11) Source(24, 11) + SourceIndex(0)
-3 >Emitted(19, 15) Source(24, 15) + SourceIndex(0)
-4 >Emitted(19, 18) Source(24, 18) + SourceIndex(0)
-5 >Emitted(19, 19) Source(24, 19) + SourceIndex(0)
+1 >Emitted(16, 1) Source(24, 1) + SourceIndex(0)
+2 >Emitted(16, 11) Source(24, 11) + SourceIndex(0)
+3 >Emitted(16, 15) Source(24, 15) + SourceIndex(0)
+4 >Emitted(16, 18) Source(24, 18) + SourceIndex(0)
+5 >Emitted(16, 19) Source(24, 19) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=extendedEscapesForAstralsInVarsAndClasses.js.map===================================================================
 JsFile: astralAsSurrogatePair.js
diff --git a/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).symbols b/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).symbols
index 85df1f8dc0559..2a5919ded6bc5 100644
--- a/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).symbols
+++ b/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).symbols
@@ -2,11 +2,11 @@
 
 === extendedEscapesForAstralsInVarsAndClasses.ts ===
 // U+102A7 CARIAN LETTER A2
-var 𐊧: string;
->𐊧 : Symbol(𐊧, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 1, 3), Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 3))
+declare var 𐊧: string;
+>𐊧 : Symbol(𐊧, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 1, 11), Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 11))
 
-var \u{102A7}: string;
->\u{102A7} : Symbol(𐊧, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 1, 3), Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 3))
+declare var \u{102A7}: string;
+>\u{102A7} : Symbol(𐊧, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 1, 11), Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 11))
 
 if (Math.random()) {
 >Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
@@ -14,11 +14,11 @@ if (Math.random()) {
 >random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
 
     𐊧 = "hello";
->𐊧 : Symbol(𐊧, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 1, 3), Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 3))
+>𐊧 : Symbol(𐊧, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 1, 11), Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 11))
 }
 else {
     \u{102A7} = "hallo";
->\u{102A7} : Symbol(𐊧, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 1, 3), Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 3))
+>\u{102A7} : Symbol(𐊧, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 1, 11), Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 11))
 }
 
 class Foo {
diff --git a/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).types b/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).types
index cc561770d8044..567ceb9c94b4b 100644
--- a/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).types
+++ b/tests/baselines/reference/unicodeEscapesInNames02(target=es2015).types
@@ -2,11 +2,11 @@
 
 === extendedEscapesForAstralsInVarsAndClasses.ts ===
 // U+102A7 CARIAN LETTER A2
-var 𐊧: string;
+declare var 𐊧: string;
 >𐊧 : string
 >   : ^^^^^^
 
-var \u{102A7}: string;
+declare var \u{102A7}: string;
 >\u{102A7} : string
 >          : ^^^^^^
 
diff --git a/tests/baselines/reference/unicodeEscapesInNames02(target=es5).errors.txt b/tests/baselines/reference/unicodeEscapesInNames02(target=es5).errors.txt
index d0482948aa891..4ff9ce9e6f575 100644
--- a/tests/baselines/reference/unicodeEscapesInNames02(target=es5).errors.txt
+++ b/tests/baselines/reference/unicodeEscapesInNames02(target=es5).errors.txt
@@ -5,11 +5,11 @@ astralAsSurrogatePair.ts(1,17): error TS1127: Invalid character.
 astralAsSurrogatePair.ts(1,18): error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uD800'.
 astralAsSurrogatePair.ts(1,23): error TS1127: Invalid character.
 astralAsSurrogatePair.ts(1,24): error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uDEA7'.
-extendedEscapesForAstralsInVarsAndClasses.ts(2,5): error TS1127: Invalid character.
-extendedEscapesForAstralsInVarsAndClasses.ts(2,7): error TS1134: Variable declaration expected.
-extendedEscapesForAstralsInVarsAndClasses.ts(3,5): error TS1127: Invalid character.
-extendedEscapesForAstralsInVarsAndClasses.ts(3,7): error TS1005: ',' expected.
-extendedEscapesForAstralsInVarsAndClasses.ts(3,11): error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
+extendedEscapesForAstralsInVarsAndClasses.ts(2,13): error TS1127: Invalid character.
+extendedEscapesForAstralsInVarsAndClasses.ts(2,15): error TS1134: Variable declaration expected.
+extendedEscapesForAstralsInVarsAndClasses.ts(3,13): error TS1127: Invalid character.
+extendedEscapesForAstralsInVarsAndClasses.ts(3,15): error TS1005: ',' expected.
+extendedEscapesForAstralsInVarsAndClasses.ts(3,19): error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
 extendedEscapesForAstralsInVarsAndClasses.ts(6,5): error TS1127: Invalid character.
 extendedEscapesForAstralsInVarsAndClasses.ts(6,8): error TS1128: Declaration or statement expected.
 extendedEscapesForAstralsInVarsAndClasses.ts(9,5): error TS1127: Invalid character.
@@ -50,17 +50,17 @@ extendedEscapesForAstralsInVarsAndClasses.ts(24,12): error TS1128: Declaration o
 !!! related TS2532 extendedEscapesForAstralsInVarsAndClasses.ts:18:16: Object is possibly 'undefined'.
 ==== extendedEscapesForAstralsInVarsAndClasses.ts (38 errors) ====
     // U+102A7 CARIAN LETTER A2
-    var 𐊧: string;
-        ~~
+    declare var 𐊧: string;
+                ~~
 !!! error TS1127: Invalid character.
-          ~
+                  ~
 !!! error TS1134: Variable declaration expected.
-    var \u{102A7}: string;
-        
+    declare var \u{102A7}: string;
+                
 !!! error TS1127: Invalid character.
-          ~
+                  ~
 !!! error TS1005: ',' expected.
-              ~~
+                      ~~
 !!! error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
     
     if (Math.random()) {
diff --git a/tests/baselines/reference/unicodeEscapesInNames02(target=es5).js b/tests/baselines/reference/unicodeEscapesInNames02(target=es5).js
index 2d6548b846408..d34b06c56d046 100644
--- a/tests/baselines/reference/unicodeEscapesInNames02(target=es5).js
+++ b/tests/baselines/reference/unicodeEscapesInNames02(target=es5).js
@@ -2,8 +2,8 @@
 
 //// [extendedEscapesForAstralsInVarsAndClasses.ts]
 // U+102A7 CARIAN LETTER A2
-var 𐊧: string;
-var \u{102A7}: string;
+declare var 𐊧: string;
+declare var \u{102A7}: string;
 
 if (Math.random()) {
     𐊧 = "hello";
@@ -31,9 +31,6 @@ import { _𐊧 as \uD800\uDEA7 } from "./extendedEscapesForAstralsInVarsAndClass
 
 
 //// [extendedEscapesForAstralsInVarsAndClasses.js]
-// U+102A7 CARIAN LETTER A2
-var string;
-var u, A7 = (void 0)[102];
 if (Math.random()) {
     "hello";
 }
diff --git a/tests/baselines/reference/unicodeEscapesInNames02(target=es5).js.map b/tests/baselines/reference/unicodeEscapesInNames02(target=es5).js.map
index e62265291f04f..0ecca25a49cbe 100644
--- a/tests/baselines/reference/unicodeEscapesInNames02(target=es5).js.map
+++ b/tests/baselines/reference/unicodeEscapesInNames02(target=es5).js.map
@@ -1,6 +1,6 @@
 //// [extendedEscapesForAstralsInVarsAndClasses.js.map]
-{"version":3,"file":"extendedEscapesForAstralsInVarsAndClasses.js","sourceRoot":"","sources":["extendedEscapesForAstralsInVarsAndClasses.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,IAAQ,MAAM,CAAC;AACV,IAAA,CAAC,EAAI,EAAE,gBAAA,CAAU;AAEtB,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;IACX,OAAO,CAAC;AACjB,CAAC;KACI,CAAC;IACD,CAAC,CAAA;IAAA,CAAC;QAAA,GAAG,CAAA;QAAA,EAAE,CAAA;IAAA,CAAC;IAAG,OAAO,CAAC;AACxB,CAAC;AAED;IAAA;IACM,CAAC,AAAD;IAAA,UAAC;AAAD,CAAC,AAAD,AADN,IACM;AAAA,CAAC;IAAA,GAAG,CAAA;IAAA,EAAE,CAAA;AAAA,CAAC;AAAE,MAAM,CAAC;AAClB,WAAW,EAAE,CAAA;AAAC,CAAC;IACX,IAAI,CAAC,CAAA;IAAC,CAAC,CAAA;IAAA,CAAC;QAAA,GAAG,CAAA;QAAA,EAAE,CAAA;IAAA,CAAC;IAAG,QAAQ,CAAC;AAC9B,CAAC;AACD,OAAO,EAAE,CAAA;AAAC,CAAC;IACP,OAAO,IAAI,CAAC,EAAE,CAAC;AACnB,CAAC;AAGL,MAAM,CAAC,IAAI,CAAK,CAAA;AAAC,IAAI,GAAG,EAAE,CAAC,CAAA;AAAC,CAAC,CAAA;AAAA,CAAC;IAAA,GAAG,CAAA;IAAA,EAAE,CAAA;AAAA,CAAC;AAAC,CAAE,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;AAE3D,CAAC,CAAA;AAAC,CAAC,CAAA;AAAA,CAAC;IAAA,GAAG,CAAA;IAAA,EAAE,CAAA;AAAA,CAAC;AAAI,GAAG,CAAC"}
-//// https://sokra.github.io/source-map-visualization#base64,Ly8gVSsxMDJBNyBDQVJJQU4gTEVUVEVSIEEyDQp2YXIgc3RyaW5nOw0KdmFyIHUsIEE3ID0gKHZvaWQgMClbMTAyXTsNCmlmIChNYXRoLnJhbmRvbSgpKSB7DQogICAgImhlbGxvIjsNCn0NCmVsc2Ugew0KICAgIHU7DQogICAgew0KICAgICAgICAxMDI7DQogICAgICAgIEE3Ow0KICAgIH0NCiAgICAiaGFsbG8iOw0KfQ0KdmFyIEZvbyA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICBmdW5jdGlvbiBGb28oKSB7DQogICAgfQ0KICAgIHJldHVybiBGb287DQp9KCkpOw0Kew0KICAgIDEwMjsNCiAgICBBNzsNCn0NCnN0cmluZzsNCmNvbnN0cnVjdG9yKCk7DQp7DQogICAgdGhpcy47DQogICAgdTsNCiAgICB7DQogICAgICAgIDEwMjsNCiAgICAgICAgQTc7DQogICAgfQ0KICAgICIgd29ybGQiOw0KfQ0KbWV0aG9kQSgpOw0Kew0KICAgIHJldHVybiB0aGlzLu2ggO26pzsNCn0NCmV4cG9ydCB2YXIgXzsNCm5ldyBGb28oKS47DQp1Ow0Kew0KICAgIDEwMjsNCiAgICBBNzsNCn0NCituZXcgRm9vKCkubWV0aG9kQSgpOw0KXzsNCnU7DQp7DQogICAgMTAyOw0KICAgIEE3Ow0KfQ0KIiEiOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9ZXh0ZW5kZWRFc2NhcGVzRm9yQXN0cmFsc0luVmFyc0FuZENsYXNzZXMuanMubWFw,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZW5kZWRFc2NhcGVzRm9yQXN0cmFsc0luVmFyc0FuZENsYXNzZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJleHRlbmRlZEVzY2FwZXNGb3JBc3RyYWxzSW5WYXJzQW5kQ2xhc3Nlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQkFBMkI7QUFDM0IsSUFBUSxNQUFNLENBQUM7QUFDVixJQUFBLENBQUMsRUFBSSxFQUFFLGdCQUFBLENBQVU7QUFFdEIsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQztJQUNYLE9BQU8sQ0FBQztBQUNqQixDQUFDO0tBQ0ksQ0FBQztJQUNELENBQUMsQ0FBQTtJQUFBLENBQUM7UUFBQSxHQUFHLENBQUE7UUFBQSxFQUFFLENBQUE7SUFBQSxDQUFDO0lBQUcsT0FBTyxDQUFDO0FBQ3hCLENBQUM7QUFFRDtJQUFBO0lBQ00sQ0FBQyxBQUFEO0lBQUEsVUFBQztBQUFELENBQUMsQUFBRCxBQUROLElBQ007QUFBQSxDQUFDO0lBQUEsR0FBRyxDQUFBO0lBQUEsRUFBRSxDQUFBO0FBQUEsQ0FBQztBQUFFLE1BQU0sQ0FBQztBQUNsQixXQUFXLEVBQUUsQ0FBQTtBQUFDLENBQUM7SUFDWCxJQUFJLENBQUMsQ0FBQTtJQUFDLENBQUMsQ0FBQTtJQUFBLENBQUM7UUFBQSxHQUFHLENBQUE7UUFBQSxFQUFFLENBQUE7SUFBQSxDQUFDO0lBQUcsUUFBUSxDQUFDO0FBQzlCLENBQUM7QUFDRCxPQUFPLEVBQUUsQ0FBQTtBQUFDLENBQUM7SUFDUCxPQUFPLElBQUksQ0FBQyxFQUFFLENBQUM7QUFDbkIsQ0FBQztBQUdMLE1BQU0sQ0FBQyxJQUFJLENBQUssQ0FBQTtBQUFDLElBQUksR0FBRyxFQUFFLENBQUMsQ0FBQTtBQUFDLENBQUMsQ0FBQTtBQUFBLENBQUM7SUFBQSxHQUFHLENBQUE7SUFBQSxFQUFFLENBQUE7QUFBQSxDQUFDO0FBQUMsQ0FBRSxJQUFJLEdBQUcsRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDO0FBRTNELENBQUMsQ0FBQTtBQUFDLENBQUMsQ0FBQTtBQUFBLENBQUM7SUFBQSxHQUFHLENBQUE7SUFBQSxFQUFFLENBQUE7QUFBQSxDQUFDO0FBQUksR0FBRyxDQUFDIn0=,Ly8gVSsxMDJBNyBDQVJJQU4gTEVUVEVSIEEyCnZhciDtoIDtuqc6IHN0cmluZzsKdmFyIFx1ezEwMkE3fTogc3RyaW5nOwoKaWYgKE1hdGgucmFuZG9tKCkpIHsKICAgIO2ggO26pyA9ICJoZWxsbyI7Cn0KZWxzZSB7CiAgICBcdXsxMDJBN30gPSAiaGFsbG8iOwp9CgpjbGFzcyBGb28gewogICAgXHV7MTAyQTd9OiBzdHJpbmc7CiAgICBjb25zdHJ1Y3RvcigpIHsKICAgICAgICB0aGlzLlx1ezEwMkE3fSA9ICIgd29ybGQiOwogICAgfQogICAgbWV0aG9kQSgpIHsKICAgICAgICByZXR1cm4gdGhpcy7toIDtuqc7CiAgICB9Cn0KCmV4cG9ydCB2YXIgX+2ggO26pyA9IG5ldyBGb28oKS5cdXsxMDJBN30gKyBuZXcgRm9vKCkubWV0aG9kQSgpOwoKX1x1ezEwMkE3fSArPSAiISI7Cg==
+{"version":3,"file":"extendedEscapesForAstralsInVarsAndClasses.js","sourceRoot":"","sources":["extendedEscapesForAstralsInVarsAndClasses.ts"],"names":[],"mappings":"AAIA,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;IACX,OAAO,CAAC;AACjB,CAAC;KACI,CAAC;IACD,CAAC,CAAA;IAAA,CAAC;QAAA,GAAG,CAAA;QAAA,EAAE,CAAA;IAAA,CAAC;IAAG,OAAO,CAAC;AACxB,CAAC;AAED;IAAA;IACM,CAAC,AAAD;IAAA,UAAC;AAAD,CAAC,AAAD,AADN,IACM;AAAA,CAAC;IAAA,GAAG,CAAA;IAAA,EAAE,CAAA;AAAA,CAAC;AAAE,MAAM,CAAC;AAClB,WAAW,EAAE,CAAA;AAAC,CAAC;IACX,IAAI,CAAC,CAAA;IAAC,CAAC,CAAA;IAAA,CAAC;QAAA,GAAG,CAAA;QAAA,EAAE,CAAA;IAAA,CAAC;IAAG,QAAQ,CAAC;AAC9B,CAAC;AACD,OAAO,EAAE,CAAA;AAAC,CAAC;IACP,OAAO,IAAI,CAAC,EAAE,CAAC;AACnB,CAAC;AAGL,MAAM,CAAC,IAAI,CAAK,CAAA;AAAC,IAAI,GAAG,EAAE,CAAC,CAAA;AAAC,CAAC,CAAA;AAAA,CAAC;IAAA,GAAG,CAAA;IAAA,EAAE,CAAA;AAAA,CAAC;AAAC,CAAE,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;AAE3D,CAAC,CAAA;AAAC,CAAC,CAAA;AAAA,CAAC;IAAA,GAAG,CAAA;IAAA,EAAE,CAAA;AAAA,CAAC;AAAI,GAAG,CAAC"}
+//// https://sokra.github.io/source-map-visualization#base64,aWYgKE1hdGgucmFuZG9tKCkpIHsNCiAgICAiaGVsbG8iOw0KfQ0KZWxzZSB7DQogICAgdTsNCiAgICB7DQogICAgICAgIDEwMjsNCiAgICAgICAgQTc7DQogICAgfQ0KICAgICJoYWxsbyI7DQp9DQp2YXIgRm9vID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIEZvbygpIHsNCiAgICB9DQogICAgcmV0dXJuIEZvbzsNCn0oKSk7DQp7DQogICAgMTAyOw0KICAgIEE3Ow0KfQ0Kc3RyaW5nOw0KY29uc3RydWN0b3IoKTsNCnsNCiAgICB0aGlzLjsNCiAgICB1Ow0KICAgIHsNCiAgICAgICAgMTAyOw0KICAgICAgICBBNzsNCiAgICB9DQogICAgIiB3b3JsZCI7DQp9DQptZXRob2RBKCk7DQp7DQogICAgcmV0dXJuIHRoaXMu7aCA7bqnOw0KfQ0KZXhwb3J0IHZhciBfOw0KbmV3IEZvbygpLjsNCnU7DQp7DQogICAgMTAyOw0KICAgIEE3Ow0KfQ0KK25ldyBGb28oKS5tZXRob2RBKCk7DQpfOw0KdTsNCnsNCiAgICAxMDI7DQogICAgQTc7DQp9DQoiISI7DQovLyMgc291cmNlTWFwcGluZ1VSTD1leHRlbmRlZEVzY2FwZXNGb3JBc3RyYWxzSW5WYXJzQW5kQ2xhc3Nlcy5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZW5kZWRFc2NhcGVzRm9yQXN0cmFsc0luVmFyc0FuZENsYXNzZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJleHRlbmRlZEVzY2FwZXNGb3JBc3RyYWxzSW5WYXJzQW5kQ2xhc3Nlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDO0lBQ1gsT0FBTyxDQUFDO0FBQ2pCLENBQUM7S0FDSSxDQUFDO0lBQ0QsQ0FBQyxDQUFBO0lBQUEsQ0FBQztRQUFBLEdBQUcsQ0FBQTtRQUFBLEVBQUUsQ0FBQTtJQUFBLENBQUM7SUFBRyxPQUFPLENBQUM7QUFDeEIsQ0FBQztBQUVEO0lBQUE7SUFDTSxDQUFDLEFBQUQ7SUFBQSxVQUFDO0FBQUQsQ0FBQyxBQUFELEFBRE4sSUFDTTtBQUFBLENBQUM7SUFBQSxHQUFHLENBQUE7SUFBQSxFQUFFLENBQUE7QUFBQSxDQUFDO0FBQUUsTUFBTSxDQUFDO0FBQ2xCLFdBQVcsRUFBRSxDQUFBO0FBQUMsQ0FBQztJQUNYLElBQUksQ0FBQyxDQUFBO0lBQUMsQ0FBQyxDQUFBO0lBQUEsQ0FBQztRQUFBLEdBQUcsQ0FBQTtRQUFBLEVBQUUsQ0FBQTtJQUFBLENBQUM7SUFBRyxRQUFRLENBQUM7QUFDOUIsQ0FBQztBQUNELE9BQU8sRUFBRSxDQUFBO0FBQUMsQ0FBQztJQUNQLE9BQU8sSUFBSSxDQUFDLEVBQUUsQ0FBQztBQUNuQixDQUFDO0FBR0wsTUFBTSxDQUFDLElBQUksQ0FBSyxDQUFBO0FBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQyxDQUFBO0FBQUMsQ0FBQyxDQUFBO0FBQUEsQ0FBQztJQUFBLEdBQUcsQ0FBQTtJQUFBLEVBQUUsQ0FBQTtBQUFBLENBQUM7QUFBQyxDQUFFLElBQUksR0FBRyxFQUFFLENBQUMsT0FBTyxFQUFFLENBQUM7QUFFM0QsQ0FBQyxDQUFBO0FBQUMsQ0FBQyxDQUFBO0FBQUEsQ0FBQztJQUFBLEdBQUcsQ0FBQTtJQUFBLEVBQUUsQ0FBQTtBQUFBLENBQUM7QUFBSSxHQUFHLENBQUMifQ==,Ly8gVSsxMDJBNyBDQVJJQU4gTEVUVEVSIEEyCmRlY2xhcmUgdmFyIO2ggO26pzogc3RyaW5nOwpkZWNsYXJlIHZhciBcdXsxMDJBN306IHN0cmluZzsKCmlmIChNYXRoLnJhbmRvbSgpKSB7CiAgICDtoIDtuqcgPSAiaGVsbG8iOwp9CmVsc2UgewogICAgXHV7MTAyQTd9ID0gImhhbGxvIjsKfQoKY2xhc3MgRm9vIHsKICAgIFx1ezEwMkE3fTogc3RyaW5nOwogICAgY29uc3RydWN0b3IoKSB7CiAgICAgICAgdGhpcy5cdXsxMDJBN30gPSAiIHdvcmxkIjsKICAgIH0KICAgIG1ldGhvZEEoKSB7CiAgICAgICAgcmV0dXJuIHRoaXMu7aCA7bqnOwogICAgfQp9CgpleHBvcnQgdmFyIF/toIDtuqcgPSBuZXcgRm9vKCkuXHV7MTAyQTd9ICsgbmV3IEZvbygpLm1ldGhvZEEoKTsKCl9cdXsxMDJBN30gKz0gIiEiOwo=
 
 //// [astralAsSurrogatePair.js.map]
 {"version":3,"file":"astralAsSurrogatePair.js","sourceRoot":"","sources":["astralAsSurrogatePair.ts"],"names":[],"mappings":""}
diff --git a/tests/baselines/reference/unicodeEscapesInNames02(target=es5).sourcemap.txt b/tests/baselines/reference/unicodeEscapesInNames02(target=es5).sourcemap.txt
index 402cd48063928..4d92cc81cdd84 100644
--- a/tests/baselines/reference/unicodeEscapesInNames02(target=es5).sourcemap.txt
+++ b/tests/baselines/reference/unicodeEscapesInNames02(target=es5).sourcemap.txt
@@ -8,54 +8,6 @@ sources: extendedEscapesForAstralsInVarsAndClasses.ts
 emittedFile:extendedEscapesForAstralsInVarsAndClasses.js
 sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 -------------------------------------------------------------------
->>>// U+102A7 CARIAN LETTER A2
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >
-2 >// U+102A7 CARIAN LETTER A2
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 28) Source(1, 28) + SourceIndex(0)
----
->>>var string;
-1 >
-2 >^^^^
-3 >    ^^^^^^
-4 >          ^
-5 >           ^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >var 𐊧: 
-3 >    string
-4 >          ;
-1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(2, 9) + SourceIndex(0)
-3 >Emitted(2, 11) Source(2, 15) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 16) + SourceIndex(0)
----
->>>var u, A7 = (void 0)[102];
-1->
-2 >^^^^
-3 >    ^
-4 >     ^^
-5 >       ^^
-6 >         ^^^^^^^^^^^^^^^^
-7 >                         ^
-1->
-  >var \
-2 >
-3 >    u
-4 >     {102
-5 >       A7
-6 >         
-7 >                         }: string;
-1->Emitted(3, 1) Source(3, 6) + SourceIndex(0)
-2 >Emitted(3, 5) Source(3, 6) + SourceIndex(0)
-3 >Emitted(3, 6) Source(3, 7) + SourceIndex(0)
-4 >Emitted(3, 8) Source(3, 11) + SourceIndex(0)
-5 >Emitted(3, 10) Source(3, 13) + SourceIndex(0)
-6 >Emitted(3, 26) Source(3, 13) + SourceIndex(0)
-7 >Emitted(3, 27) Source(3, 23) + SourceIndex(0)
----
 >>>if (Math.random()) {
 1 >
 2 >^^^^
@@ -65,7 +17,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 6 >               ^^
 7 >                 ^^
 8 >                   ^
-1 >
+1 >// U+102A7 CARIAN LETTER A2
+  >declare var 𐊧: string;
+  >declare var \u{102A7}: string;
   >
   >
 2 >if (
@@ -75,14 +29,14 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 6 >               ()
 7 >                 ) 
 8 >                   {
-1 >Emitted(4, 1) Source(5, 1) + SourceIndex(0)
-2 >Emitted(4, 5) Source(5, 5) + SourceIndex(0)
-3 >Emitted(4, 9) Source(5, 9) + SourceIndex(0)
-4 >Emitted(4, 10) Source(5, 10) + SourceIndex(0)
-5 >Emitted(4, 16) Source(5, 16) + SourceIndex(0)
-6 >Emitted(4, 18) Source(5, 18) + SourceIndex(0)
-7 >Emitted(4, 20) Source(5, 20) + SourceIndex(0)
-8 >Emitted(4, 21) Source(5, 21) + SourceIndex(0)
+1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(5, 5) + SourceIndex(0)
+3 >Emitted(1, 9) Source(5, 9) + SourceIndex(0)
+4 >Emitted(1, 10) Source(5, 10) + SourceIndex(0)
+5 >Emitted(1, 16) Source(5, 16) + SourceIndex(0)
+6 >Emitted(1, 18) Source(5, 18) + SourceIndex(0)
+7 >Emitted(1, 20) Source(5, 20) + SourceIndex(0)
+8 >Emitted(1, 21) Source(5, 21) + SourceIndex(0)
 ---
 >>>    "hello";
 1 >^^^^
@@ -92,9 +46,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
   >    𐊧 = 
 2 >    "hello"
 3 >           ;
-1 >Emitted(5, 5) Source(6, 10) + SourceIndex(0)
-2 >Emitted(5, 12) Source(6, 17) + SourceIndex(0)
-3 >Emitted(5, 13) Source(6, 18) + SourceIndex(0)
+1 >Emitted(2, 5) Source(6, 10) + SourceIndex(0)
+2 >Emitted(2, 12) Source(6, 17) + SourceIndex(0)
+3 >Emitted(2, 13) Source(6, 18) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -103,8 +57,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1 >
   >
 2 >}
-1 >Emitted(6, 1) Source(7, 1) + SourceIndex(0)
-2 >Emitted(6, 2) Source(7, 2) + SourceIndex(0)
+1 >Emitted(3, 1) Source(7, 1) + SourceIndex(0)
+2 >Emitted(3, 2) Source(7, 2) + SourceIndex(0)
 ---
 >>>else {
 1->^^^^^
@@ -113,8 +67,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1->
   >else 
 2 >     {
-1->Emitted(7, 6) Source(8, 6) + SourceIndex(0)
-2 >Emitted(7, 7) Source(8, 7) + SourceIndex(0)
+1->Emitted(4, 6) Source(8, 6) + SourceIndex(0)
+2 >Emitted(4, 7) Source(8, 7) + SourceIndex(0)
 ---
 >>>    u;
 1->^^^^
@@ -124,9 +78,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
   >    \
 2 >    u
 3 >     
-1->Emitted(8, 5) Source(9, 6) + SourceIndex(0)
-2 >Emitted(8, 6) Source(9, 7) + SourceIndex(0)
-3 >Emitted(8, 7) Source(9, 7) + SourceIndex(0)
+1->Emitted(5, 5) Source(9, 6) + SourceIndex(0)
+2 >Emitted(5, 6) Source(9, 7) + SourceIndex(0)
+3 >Emitted(5, 7) Source(9, 7) + SourceIndex(0)
 ---
 >>>    {
 1 >^^^^
@@ -134,8 +88,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 3 >     ^^^^^^^^->
 1 >
 2 >    {
-1 >Emitted(9, 5) Source(9, 7) + SourceIndex(0)
-2 >Emitted(9, 6) Source(9, 8) + SourceIndex(0)
+1 >Emitted(6, 5) Source(9, 7) + SourceIndex(0)
+2 >Emitted(6, 6) Source(9, 8) + SourceIndex(0)
 ---
 >>>        102;
 1->^^^^^^^^
@@ -144,9 +98,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1->
 2 >        102
 3 >           
-1->Emitted(10, 9) Source(9, 8) + SourceIndex(0)
-2 >Emitted(10, 12) Source(9, 11) + SourceIndex(0)
-3 >Emitted(10, 13) Source(9, 11) + SourceIndex(0)
+1->Emitted(7, 9) Source(9, 8) + SourceIndex(0)
+2 >Emitted(7, 12) Source(9, 11) + SourceIndex(0)
+3 >Emitted(7, 13) Source(9, 11) + SourceIndex(0)
 ---
 >>>        A7;
 1 >^^^^^^^^
@@ -155,9 +109,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1 >
 2 >        A7
 3 >          
-1 >Emitted(11, 9) Source(9, 11) + SourceIndex(0)
-2 >Emitted(11, 11) Source(9, 13) + SourceIndex(0)
-3 >Emitted(11, 12) Source(9, 13) + SourceIndex(0)
+1 >Emitted(8, 9) Source(9, 11) + SourceIndex(0)
+2 >Emitted(8, 11) Source(9, 13) + SourceIndex(0)
+3 >Emitted(8, 12) Source(9, 13) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -165,8 +119,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 3 >     ^^^^^^^^->
 1 >
 2 >    }
-1 >Emitted(12, 5) Source(9, 13) + SourceIndex(0)
-2 >Emitted(12, 6) Source(9, 14) + SourceIndex(0)
+1 >Emitted(9, 5) Source(9, 13) + SourceIndex(0)
+2 >Emitted(9, 6) Source(9, 14) + SourceIndex(0)
 ---
 >>>    "hallo";
 1->^^^^
@@ -175,9 +129,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1-> = 
 2 >    "hallo"
 3 >           ;
-1->Emitted(13, 5) Source(9, 17) + SourceIndex(0)
-2 >Emitted(13, 12) Source(9, 24) + SourceIndex(0)
-3 >Emitted(13, 13) Source(9, 25) + SourceIndex(0)
+1->Emitted(10, 5) Source(9, 17) + SourceIndex(0)
+2 >Emitted(10, 12) Source(9, 24) + SourceIndex(0)
+3 >Emitted(10, 13) Source(9, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -186,8 +140,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1 >
   >
 2 >}
-1 >Emitted(14, 1) Source(10, 1) + SourceIndex(0)
-2 >Emitted(14, 2) Source(10, 2) + SourceIndex(0)
+1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0)
+2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0)
 ---
 >>>var Foo = /** @class */ (function () {
 1->
@@ -195,13 +149,13 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1->
   >
   >
-1->Emitted(15, 1) Source(12, 1) + SourceIndex(0)
+1->Emitted(12, 1) Source(12, 1) + SourceIndex(0)
 ---
 >>>    function Foo() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(16, 5) Source(12, 1) + SourceIndex(0)
+1->Emitted(13, 5) Source(12, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -212,17 +166,17 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
   >    \u
 2 >    {
 3 >     
-1->Emitted(17, 5) Source(13, 7) + SourceIndex(0)
-2 >Emitted(17, 6) Source(13, 8) + SourceIndex(0)
-3 >Emitted(17, 6) Source(13, 7) + SourceIndex(0)
+1->Emitted(14, 5) Source(13, 7) + SourceIndex(0)
+2 >Emitted(14, 6) Source(13, 8) + SourceIndex(0)
+3 >Emitted(14, 6) Source(13, 7) + SourceIndex(0)
 ---
 >>>    return Foo;
 1->^^^^
 2 >    ^^^^^^^^^^
 1->
 2 >    {
-1->Emitted(18, 5) Source(13, 7) + SourceIndex(0)
-2 >Emitted(18, 15) Source(13, 8) + SourceIndex(0)
+1->Emitted(15, 5) Source(13, 7) + SourceIndex(0)
+2 >Emitted(15, 15) Source(13, 8) + SourceIndex(0)
 ---
 >>>}());
 1 >
@@ -236,11 +190,11 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 4 > 
 5 > class Foo {
   >     \u
-1 >Emitted(19, 1) Source(13, 7) + SourceIndex(0)
-2 >Emitted(19, 2) Source(13, 8) + SourceIndex(0)
-3 >Emitted(19, 2) Source(13, 7) + SourceIndex(0)
-4 >Emitted(19, 2) Source(12, 1) + SourceIndex(0)
-5 >Emitted(19, 6) Source(13, 7) + SourceIndex(0)
+1 >Emitted(16, 1) Source(13, 7) + SourceIndex(0)
+2 >Emitted(16, 2) Source(13, 8) + SourceIndex(0)
+3 >Emitted(16, 2) Source(13, 7) + SourceIndex(0)
+4 >Emitted(16, 2) Source(12, 1) + SourceIndex(0)
+5 >Emitted(16, 6) Source(13, 7) + SourceIndex(0)
 ---
 >>>{
 1 >
@@ -248,8 +202,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 3 > ^^^^^^^^->
 1 >
 2 >{
-1 >Emitted(20, 1) Source(13, 7) + SourceIndex(0)
-2 >Emitted(20, 2) Source(13, 8) + SourceIndex(0)
+1 >Emitted(17, 1) Source(13, 7) + SourceIndex(0)
+2 >Emitted(17, 2) Source(13, 8) + SourceIndex(0)
 ---
 >>>    102;
 1->^^^^
@@ -258,9 +212,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1->
 2 >    102
 3 >       
-1->Emitted(21, 5) Source(13, 8) + SourceIndex(0)
-2 >Emitted(21, 8) Source(13, 11) + SourceIndex(0)
-3 >Emitted(21, 9) Source(13, 11) + SourceIndex(0)
+1->Emitted(18, 5) Source(13, 8) + SourceIndex(0)
+2 >Emitted(18, 8) Source(13, 11) + SourceIndex(0)
+3 >Emitted(18, 9) Source(13, 11) + SourceIndex(0)
 ---
 >>>    A7;
 1 >^^^^
@@ -269,9 +223,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1 >
 2 >    A7
 3 >      
-1 >Emitted(22, 5) Source(13, 11) + SourceIndex(0)
-2 >Emitted(22, 7) Source(13, 13) + SourceIndex(0)
-3 >Emitted(22, 8) Source(13, 13) + SourceIndex(0)
+1 >Emitted(19, 5) Source(13, 11) + SourceIndex(0)
+2 >Emitted(19, 7) Source(13, 13) + SourceIndex(0)
+3 >Emitted(19, 8) Source(13, 13) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -279,8 +233,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 3 > ^^^^^^^->
 1 >
 2 >}
-1 >Emitted(23, 1) Source(13, 13) + SourceIndex(0)
-2 >Emitted(23, 2) Source(13, 14) + SourceIndex(0)
+1 >Emitted(20, 1) Source(13, 13) + SourceIndex(0)
+2 >Emitted(20, 2) Source(13, 14) + SourceIndex(0)
 ---
 >>>string;
 1->
@@ -290,9 +244,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1->: 
 2 >string
 3 >      ;
-1->Emitted(24, 1) Source(13, 16) + SourceIndex(0)
-2 >Emitted(24, 7) Source(13, 22) + SourceIndex(0)
-3 >Emitted(24, 8) Source(13, 23) + SourceIndex(0)
+1->Emitted(21, 1) Source(13, 16) + SourceIndex(0)
+2 >Emitted(21, 7) Source(13, 22) + SourceIndex(0)
+3 >Emitted(21, 8) Source(13, 23) + SourceIndex(0)
 ---
 >>>constructor();
 1->
@@ -304,10 +258,10 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 2 >constructor
 3 >           ()
 4 >             
-1->Emitted(25, 1) Source(14, 5) + SourceIndex(0)
-2 >Emitted(25, 12) Source(14, 16) + SourceIndex(0)
-3 >Emitted(25, 14) Source(14, 18) + SourceIndex(0)
-4 >Emitted(25, 15) Source(14, 18) + SourceIndex(0)
+1->Emitted(22, 1) Source(14, 5) + SourceIndex(0)
+2 >Emitted(22, 12) Source(14, 16) + SourceIndex(0)
+3 >Emitted(22, 14) Source(14, 18) + SourceIndex(0)
+4 >Emitted(22, 15) Source(14, 18) + SourceIndex(0)
 ---
 >>>{
 1 >
@@ -315,8 +269,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 3 > ^^^^^^^^^^->
 1 > 
 2 >{
-1 >Emitted(26, 1) Source(14, 19) + SourceIndex(0)
-2 >Emitted(26, 2) Source(14, 20) + SourceIndex(0)
+1 >Emitted(23, 1) Source(14, 19) + SourceIndex(0)
+2 >Emitted(23, 2) Source(14, 20) + SourceIndex(0)
 ---
 >>>    this.;
 1->^^^^
@@ -328,10 +282,10 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 2 >    this
 3 >        .
 4 >         
-1->Emitted(27, 5) Source(15, 9) + SourceIndex(0)
-2 >Emitted(27, 9) Source(15, 13) + SourceIndex(0)
-3 >Emitted(27, 10) Source(15, 14) + SourceIndex(0)
-4 >Emitted(27, 11) Source(15, 14) + SourceIndex(0)
+1->Emitted(24, 5) Source(15, 9) + SourceIndex(0)
+2 >Emitted(24, 9) Source(15, 13) + SourceIndex(0)
+3 >Emitted(24, 10) Source(15, 14) + SourceIndex(0)
+4 >Emitted(24, 11) Source(15, 14) + SourceIndex(0)
 ---
 >>>    u;
 1 >^^^^
@@ -340,9 +294,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1 >\
 2 >    u
 3 >     
-1 >Emitted(28, 5) Source(15, 15) + SourceIndex(0)
-2 >Emitted(28, 6) Source(15, 16) + SourceIndex(0)
-3 >Emitted(28, 7) Source(15, 16) + SourceIndex(0)
+1 >Emitted(25, 5) Source(15, 15) + SourceIndex(0)
+2 >Emitted(25, 6) Source(15, 16) + SourceIndex(0)
+3 >Emitted(25, 7) Source(15, 16) + SourceIndex(0)
 ---
 >>>    {
 1 >^^^^
@@ -350,8 +304,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 3 >     ^^^^^^^^->
 1 >
 2 >    {
-1 >Emitted(29, 5) Source(15, 16) + SourceIndex(0)
-2 >Emitted(29, 6) Source(15, 17) + SourceIndex(0)
+1 >Emitted(26, 5) Source(15, 16) + SourceIndex(0)
+2 >Emitted(26, 6) Source(15, 17) + SourceIndex(0)
 ---
 >>>        102;
 1->^^^^^^^^
@@ -360,9 +314,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1->
 2 >        102
 3 >           
-1->Emitted(30, 9) Source(15, 17) + SourceIndex(0)
-2 >Emitted(30, 12) Source(15, 20) + SourceIndex(0)
-3 >Emitted(30, 13) Source(15, 20) + SourceIndex(0)
+1->Emitted(27, 9) Source(15, 17) + SourceIndex(0)
+2 >Emitted(27, 12) Source(15, 20) + SourceIndex(0)
+3 >Emitted(27, 13) Source(15, 20) + SourceIndex(0)
 ---
 >>>        A7;
 1 >^^^^^^^^
@@ -371,9 +325,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1 >
 2 >        A7
 3 >          
-1 >Emitted(31, 9) Source(15, 20) + SourceIndex(0)
-2 >Emitted(31, 11) Source(15, 22) + SourceIndex(0)
-3 >Emitted(31, 12) Source(15, 22) + SourceIndex(0)
+1 >Emitted(28, 9) Source(15, 20) + SourceIndex(0)
+2 >Emitted(28, 11) Source(15, 22) + SourceIndex(0)
+3 >Emitted(28, 12) Source(15, 22) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -381,8 +335,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 3 >     ^^^^^^^^^->
 1 >
 2 >    }
-1 >Emitted(32, 5) Source(15, 22) + SourceIndex(0)
-2 >Emitted(32, 6) Source(15, 23) + SourceIndex(0)
+1 >Emitted(29, 5) Source(15, 22) + SourceIndex(0)
+2 >Emitted(29, 6) Source(15, 23) + SourceIndex(0)
 ---
 >>>    " world";
 1->^^^^
@@ -391,9 +345,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1-> = 
 2 >    " world"
 3 >            ;
-1->Emitted(33, 5) Source(15, 26) + SourceIndex(0)
-2 >Emitted(33, 13) Source(15, 34) + SourceIndex(0)
-3 >Emitted(33, 14) Source(15, 35) + SourceIndex(0)
+1->Emitted(30, 5) Source(15, 26) + SourceIndex(0)
+2 >Emitted(30, 13) Source(15, 34) + SourceIndex(0)
+3 >Emitted(30, 14) Source(15, 35) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -402,8 +356,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1 >
   >    
 2 >}
-1 >Emitted(34, 1) Source(16, 5) + SourceIndex(0)
-2 >Emitted(34, 2) Source(16, 6) + SourceIndex(0)
+1 >Emitted(31, 1) Source(16, 5) + SourceIndex(0)
+2 >Emitted(31, 2) Source(16, 6) + SourceIndex(0)
 ---
 >>>methodA();
 1->
@@ -415,10 +369,10 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 2 >methodA
 3 >       ()
 4 >         
-1->Emitted(35, 1) Source(17, 5) + SourceIndex(0)
-2 >Emitted(35, 8) Source(17, 12) + SourceIndex(0)
-3 >Emitted(35, 10) Source(17, 14) + SourceIndex(0)
-4 >Emitted(35, 11) Source(17, 14) + SourceIndex(0)
+1->Emitted(32, 1) Source(17, 5) + SourceIndex(0)
+2 >Emitted(32, 8) Source(17, 12) + SourceIndex(0)
+3 >Emitted(32, 10) Source(17, 14) + SourceIndex(0)
+4 >Emitted(32, 11) Source(17, 14) + SourceIndex(0)
 ---
 >>>{
 1 >
@@ -426,8 +380,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 3 > ^^^^^^^^^^^^^^^^^^^->
 1 > 
 2 >{
-1 >Emitted(36, 1) Source(17, 15) + SourceIndex(0)
-2 >Emitted(36, 2) Source(17, 16) + SourceIndex(0)
+1 >Emitted(33, 1) Source(17, 15) + SourceIndex(0)
+2 >Emitted(33, 2) Source(17, 16) + SourceIndex(0)
 ---
 >>>    return this.𐊧;
 1->^^^^
@@ -443,12 +397,12 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 4 >               .
 5 >                𐊧
 6 >                  ;
-1->Emitted(37, 5) Source(18, 9) + SourceIndex(0)
-2 >Emitted(37, 12) Source(18, 16) + SourceIndex(0)
-3 >Emitted(37, 16) Source(18, 20) + SourceIndex(0)
-4 >Emitted(37, 17) Source(18, 21) + SourceIndex(0)
-5 >Emitted(37, 19) Source(18, 23) + SourceIndex(0)
-6 >Emitted(37, 20) Source(18, 24) + SourceIndex(0)
+1->Emitted(34, 5) Source(18, 9) + SourceIndex(0)
+2 >Emitted(34, 12) Source(18, 16) + SourceIndex(0)
+3 >Emitted(34, 16) Source(18, 20) + SourceIndex(0)
+4 >Emitted(34, 17) Source(18, 21) + SourceIndex(0)
+5 >Emitted(34, 19) Source(18, 23) + SourceIndex(0)
+6 >Emitted(34, 20) Source(18, 24) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -457,8 +411,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1 >
   >    
 2 >}
-1 >Emitted(38, 1) Source(19, 5) + SourceIndex(0)
-2 >Emitted(38, 2) Source(19, 6) + SourceIndex(0)
+1 >Emitted(35, 1) Source(19, 5) + SourceIndex(0)
+2 >Emitted(35, 2) Source(19, 6) + SourceIndex(0)
 ---
 >>>export var _;
 1->
@@ -476,12 +430,12 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 4 >       var 
 5 >           _𐊧 =
 6 >            
-1->Emitted(39, 1) Source(22, 1) + SourceIndex(0)
-2 >Emitted(39, 7) Source(22, 7) + SourceIndex(0)
-3 >Emitted(39, 8) Source(22, 8) + SourceIndex(0)
-4 >Emitted(39, 12) Source(22, 12) + SourceIndex(0)
-5 >Emitted(39, 13) Source(22, 17) + SourceIndex(0)
-6 >Emitted(39, 14) Source(22, 17) + SourceIndex(0)
+1->Emitted(36, 1) Source(22, 1) + SourceIndex(0)
+2 >Emitted(36, 7) Source(22, 7) + SourceIndex(0)
+3 >Emitted(36, 8) Source(22, 8) + SourceIndex(0)
+4 >Emitted(36, 12) Source(22, 12) + SourceIndex(0)
+5 >Emitted(36, 13) Source(22, 17) + SourceIndex(0)
+6 >Emitted(36, 14) Source(22, 17) + SourceIndex(0)
 ---
 >>>new Foo().;
 1 >
@@ -496,12 +450,12 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 4 >       ()
 5 >         .
 6 >          
-1 >Emitted(40, 1) Source(22, 18) + SourceIndex(0)
-2 >Emitted(40, 5) Source(22, 22) + SourceIndex(0)
-3 >Emitted(40, 8) Source(22, 25) + SourceIndex(0)
-4 >Emitted(40, 10) Source(22, 27) + SourceIndex(0)
-5 >Emitted(40, 11) Source(22, 28) + SourceIndex(0)
-6 >Emitted(40, 12) Source(22, 28) + SourceIndex(0)
+1 >Emitted(37, 1) Source(22, 18) + SourceIndex(0)
+2 >Emitted(37, 5) Source(22, 22) + SourceIndex(0)
+3 >Emitted(37, 8) Source(22, 25) + SourceIndex(0)
+4 >Emitted(37, 10) Source(22, 27) + SourceIndex(0)
+5 >Emitted(37, 11) Source(22, 28) + SourceIndex(0)
+6 >Emitted(37, 12) Source(22, 28) + SourceIndex(0)
 ---
 >>>u;
 1 >
@@ -510,9 +464,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1 >\
 2 >u
 3 > 
-1 >Emitted(41, 1) Source(22, 29) + SourceIndex(0)
-2 >Emitted(41, 2) Source(22, 30) + SourceIndex(0)
-3 >Emitted(41, 3) Source(22, 30) + SourceIndex(0)
+1 >Emitted(38, 1) Source(22, 29) + SourceIndex(0)
+2 >Emitted(38, 2) Source(22, 30) + SourceIndex(0)
+3 >Emitted(38, 3) Source(22, 30) + SourceIndex(0)
 ---
 >>>{
 1 >
@@ -520,8 +474,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 3 > ^^^^^^^^->
 1 >
 2 >{
-1 >Emitted(42, 1) Source(22, 30) + SourceIndex(0)
-2 >Emitted(42, 2) Source(22, 31) + SourceIndex(0)
+1 >Emitted(39, 1) Source(22, 30) + SourceIndex(0)
+2 >Emitted(39, 2) Source(22, 31) + SourceIndex(0)
 ---
 >>>    102;
 1->^^^^
@@ -530,9 +484,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1->
 2 >    102
 3 >       
-1->Emitted(43, 5) Source(22, 31) + SourceIndex(0)
-2 >Emitted(43, 8) Source(22, 34) + SourceIndex(0)
-3 >Emitted(43, 9) Source(22, 34) + SourceIndex(0)
+1->Emitted(40, 5) Source(22, 31) + SourceIndex(0)
+2 >Emitted(40, 8) Source(22, 34) + SourceIndex(0)
+3 >Emitted(40, 9) Source(22, 34) + SourceIndex(0)
 ---
 >>>    A7;
 1 >^^^^
@@ -541,9 +495,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1 >
 2 >    A7
 3 >      
-1 >Emitted(44, 5) Source(22, 34) + SourceIndex(0)
-2 >Emitted(44, 7) Source(22, 36) + SourceIndex(0)
-3 >Emitted(44, 8) Source(22, 36) + SourceIndex(0)
+1 >Emitted(41, 5) Source(22, 34) + SourceIndex(0)
+2 >Emitted(41, 7) Source(22, 36) + SourceIndex(0)
+3 >Emitted(41, 8) Source(22, 36) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -551,8 +505,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 3 > ^^^^^^^^^^^^^^^^^^^^^->
 1 >
 2 >}
-1 >Emitted(45, 1) Source(22, 36) + SourceIndex(0)
-2 >Emitted(45, 2) Source(22, 37) + SourceIndex(0)
+1 >Emitted(42, 1) Source(22, 36) + SourceIndex(0)
+2 >Emitted(42, 2) Source(22, 37) + SourceIndex(0)
 ---
 >>>+new Foo().methodA();
 1->
@@ -573,15 +527,15 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 7 >           methodA
 8 >                  ()
 9 >                    ;
-1->Emitted(46, 1) Source(22, 38) + SourceIndex(0)
-2 >Emitted(46, 2) Source(22, 40) + SourceIndex(0)
-3 >Emitted(46, 6) Source(22, 44) + SourceIndex(0)
-4 >Emitted(46, 9) Source(22, 47) + SourceIndex(0)
-5 >Emitted(46, 11) Source(22, 49) + SourceIndex(0)
-6 >Emitted(46, 12) Source(22, 50) + SourceIndex(0)
-7 >Emitted(46, 19) Source(22, 57) + SourceIndex(0)
-8 >Emitted(46, 21) Source(22, 59) + SourceIndex(0)
-9 >Emitted(46, 22) Source(22, 60) + SourceIndex(0)
+1->Emitted(43, 1) Source(22, 38) + SourceIndex(0)
+2 >Emitted(43, 2) Source(22, 40) + SourceIndex(0)
+3 >Emitted(43, 6) Source(22, 44) + SourceIndex(0)
+4 >Emitted(43, 9) Source(22, 47) + SourceIndex(0)
+5 >Emitted(43, 11) Source(22, 49) + SourceIndex(0)
+6 >Emitted(43, 12) Source(22, 50) + SourceIndex(0)
+7 >Emitted(43, 19) Source(22, 57) + SourceIndex(0)
+8 >Emitted(43, 21) Source(22, 59) + SourceIndex(0)
+9 >Emitted(43, 22) Source(22, 60) + SourceIndex(0)
 ---
 >>>_;
 1 >
@@ -593,9 +547,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
   >
 2 >_
 3 > 
-1 >Emitted(47, 1) Source(24, 1) + SourceIndex(0)
-2 >Emitted(47, 2) Source(24, 2) + SourceIndex(0)
-3 >Emitted(47, 3) Source(24, 2) + SourceIndex(0)
+1 >Emitted(44, 1) Source(24, 1) + SourceIndex(0)
+2 >Emitted(44, 2) Source(24, 2) + SourceIndex(0)
+3 >Emitted(44, 3) Source(24, 2) + SourceIndex(0)
 ---
 >>>u;
 1->
@@ -604,9 +558,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1->\
 2 >u
 3 > 
-1->Emitted(48, 1) Source(24, 3) + SourceIndex(0)
-2 >Emitted(48, 2) Source(24, 4) + SourceIndex(0)
-3 >Emitted(48, 3) Source(24, 4) + SourceIndex(0)
+1->Emitted(45, 1) Source(24, 3) + SourceIndex(0)
+2 >Emitted(45, 2) Source(24, 4) + SourceIndex(0)
+3 >Emitted(45, 3) Source(24, 4) + SourceIndex(0)
 ---
 >>>{
 1 >
@@ -614,8 +568,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 3 > ^^^^^^^^->
 1 >
 2 >{
-1 >Emitted(49, 1) Source(24, 4) + SourceIndex(0)
-2 >Emitted(49, 2) Source(24, 5) + SourceIndex(0)
+1 >Emitted(46, 1) Source(24, 4) + SourceIndex(0)
+2 >Emitted(46, 2) Source(24, 5) + SourceIndex(0)
 ---
 >>>    102;
 1->^^^^
@@ -624,9 +578,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1->
 2 >    102
 3 >       
-1->Emitted(50, 5) Source(24, 5) + SourceIndex(0)
-2 >Emitted(50, 8) Source(24, 8) + SourceIndex(0)
-3 >Emitted(50, 9) Source(24, 8) + SourceIndex(0)
+1->Emitted(47, 5) Source(24, 5) + SourceIndex(0)
+2 >Emitted(47, 8) Source(24, 8) + SourceIndex(0)
+3 >Emitted(47, 9) Source(24, 8) + SourceIndex(0)
 ---
 >>>    A7;
 1 >^^^^
@@ -635,9 +589,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1 >
 2 >    A7
 3 >      
-1 >Emitted(51, 5) Source(24, 8) + SourceIndex(0)
-2 >Emitted(51, 7) Source(24, 10) + SourceIndex(0)
-3 >Emitted(51, 8) Source(24, 10) + SourceIndex(0)
+1 >Emitted(48, 5) Source(24, 8) + SourceIndex(0)
+2 >Emitted(48, 7) Source(24, 10) + SourceIndex(0)
+3 >Emitted(48, 8) Source(24, 10) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -645,8 +599,8 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 3 > ^^^^->
 1 >
 2 >}
-1 >Emitted(52, 1) Source(24, 10) + SourceIndex(0)
-2 >Emitted(52, 2) Source(24, 11) + SourceIndex(0)
+1 >Emitted(49, 1) Source(24, 10) + SourceIndex(0)
+2 >Emitted(49, 2) Source(24, 11) + SourceIndex(0)
 ---
 >>>"!";
 1->
@@ -656,9 +610,9 @@ sourceFile:extendedEscapesForAstralsInVarsAndClasses.ts
 1-> += 
 2 >"!"
 3 >   ;
-1->Emitted(53, 1) Source(24, 15) + SourceIndex(0)
-2 >Emitted(53, 4) Source(24, 18) + SourceIndex(0)
-3 >Emitted(53, 5) Source(24, 19) + SourceIndex(0)
+1->Emitted(50, 1) Source(24, 15) + SourceIndex(0)
+2 >Emitted(50, 4) Source(24, 18) + SourceIndex(0)
+3 >Emitted(50, 5) Source(24, 19) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=extendedEscapesForAstralsInVarsAndClasses.js.map===================================================================
 JsFile: astralAsSurrogatePair.js
diff --git a/tests/baselines/reference/unicodeEscapesInNames02(target=es5).symbols b/tests/baselines/reference/unicodeEscapesInNames02(target=es5).symbols
index 75ef2daee9d4b..a5d382b65d581 100644
--- a/tests/baselines/reference/unicodeEscapesInNames02(target=es5).symbols
+++ b/tests/baselines/reference/unicodeEscapesInNames02(target=es5).symbols
@@ -2,12 +2,12 @@
 
 === extendedEscapesForAstralsInVarsAndClasses.ts ===
 // U+102A7 CARIAN LETTER A2
-var 𐊧: string;
->string : Symbol(string, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 1, 7))
+declare var 𐊧: string;
+>string : Symbol(string, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 1, 15))
 
-var \u{102A7}: string;
->u : Symbol(u, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 5))
->A7 : Symbol(A7, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 7))
+declare var \u{102A7}: string;
+>u : Symbol(u, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 13))
+>A7 : Symbol(A7, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 15))
 
 if (Math.random()) {
 >Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
@@ -18,8 +18,8 @@ if (Math.random()) {
 }
 else {
     \u{102A7} = "hallo";
->u : Symbol(u, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 5))
->A7 : Symbol(A7, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 7))
+>u : Symbol(u, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 13))
+>A7 : Symbol(A7, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 15))
 }
 
 class Foo {
@@ -27,13 +27,13 @@ class Foo {
 
     \u{102A7}: string;
 >u : Symbol(Foo.u, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 12, 5))
->A7 : Symbol(A7, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 7))
->string : Symbol(string, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 1, 7))
+>A7 : Symbol(A7, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 15))
+>string : Symbol(string, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 1, 15))
 
     constructor() {
         this.\u{102A7} = " world";
->u : Symbol(u, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 5))
->A7 : Symbol(A7, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 7))
+>u : Symbol(u, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 13))
+>A7 : Symbol(A7, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 15))
     }
     methodA() {
         return this.𐊧;
@@ -43,14 +43,14 @@ class Foo {
 export var _𐊧 = new Foo().\u{102A7} + new Foo().methodA();
 >_ : Symbol(_, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 21, 10))
 >Foo : Symbol(Foo, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 9, 1))
->u : Symbol(u, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 5))
->A7 : Symbol(A7, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 7))
+>u : Symbol(u, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 13))
+>A7 : Symbol(A7, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 15))
 >Foo : Symbol(Foo, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 9, 1))
 
 _\u{102A7} += "!";
 >_ : Symbol(_, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 21, 10))
->u : Symbol(u, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 5))
->A7 : Symbol(A7, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 7))
+>u : Symbol(u, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 13))
+>A7 : Symbol(A7, Decl(extendedEscapesForAstralsInVarsAndClasses.ts, 2, 15))
 
 === astralAsSurrogatePair.ts ===
 import { _𐊧 as \uD800\uDEA7 } from "./extendedEscapesForAstralsInVarsAndClasses.js";
diff --git a/tests/baselines/reference/unicodeEscapesInNames02(target=es5).types b/tests/baselines/reference/unicodeEscapesInNames02(target=es5).types
index 25ad36211f7c3..124b57415db0f 100644
--- a/tests/baselines/reference/unicodeEscapesInNames02(target=es5).types
+++ b/tests/baselines/reference/unicodeEscapesInNames02(target=es5).types
@@ -2,11 +2,11 @@
 
 === extendedEscapesForAstralsInVarsAndClasses.ts ===
 // U+102A7 CARIAN LETTER A2
-var 𐊧: string;
+declare var 𐊧: string;
 >string : any
 >       : ^^^
 
-var \u{102A7}: string;
+declare var \u{102A7}: string;
 >u : any
 >  : ^^^
 >A7 : string
diff --git a/tests/baselines/reference/unionPropertyExistence.errors.txt b/tests/baselines/reference/unionPropertyExistence.errors.txt
index 3afdb838e1e92..4bed59ad72407 100644
--- a/tests/baselines/reference/unionPropertyExistence.errors.txt
+++ b/tests/baselines/reference/unionPropertyExistence.errors.txt
@@ -37,8 +37,8 @@ unionPropertyExistence.ts(40,5): error TS2339: Property 'inNone' does not exist
     type AB = A | B;
     type ABC = C | AB;
     
-    var ab: AB;
-    var abc: ABC;
+    declare var ab: AB;
+    declare var abc: ABC;
     
     declare const x: "foo" | "bar";
     declare const bFoo: B | "foo";
diff --git a/tests/baselines/reference/unionPropertyExistence.js b/tests/baselines/reference/unionPropertyExistence.js
index 62a85f2f0dd37..ee3e5c9d8af10 100644
--- a/tests/baselines/reference/unionPropertyExistence.js
+++ b/tests/baselines/reference/unionPropertyExistence.js
@@ -21,8 +21,8 @@ interface C {
 type AB = A | B;
 type ABC = C | AB;
 
-var ab: AB;
-var abc: ABC;
+declare var ab: AB;
+declare var abc: ABC;
 
 declare const x: "foo" | "bar";
 declare const bFoo: B | "foo";
@@ -44,8 +44,6 @@ abc.inNone;
 
 
 //// [unionPropertyExistence.js]
-var ab;
-var abc;
 x.nope();
 bFoo.onlyInB;
 x.length; // Ok
diff --git a/tests/baselines/reference/unionPropertyExistence.symbols b/tests/baselines/reference/unionPropertyExistence.symbols
index 9d30626c102e5..29d36b46fcd64 100644
--- a/tests/baselines/reference/unionPropertyExistence.symbols
+++ b/tests/baselines/reference/unionPropertyExistence.symbols
@@ -47,12 +47,12 @@ type ABC = C | AB;
 >C : Symbol(C, Decl(unionPropertyExistence.ts, 10, 1))
 >AB : Symbol(AB, Decl(unionPropertyExistence.ts, 15, 1))
 
-var ab: AB;
->ab : Symbol(ab, Decl(unionPropertyExistence.ts, 20, 3))
+declare var ab: AB;
+>ab : Symbol(ab, Decl(unionPropertyExistence.ts, 20, 11))
 >AB : Symbol(AB, Decl(unionPropertyExistence.ts, 15, 1))
 
-var abc: ABC;
->abc : Symbol(abc, Decl(unionPropertyExistence.ts, 21, 3))
+declare var abc: ABC;
+>abc : Symbol(abc, Decl(unionPropertyExistence.ts, 21, 11))
 >ABC : Symbol(ABC, Decl(unionPropertyExistence.ts, 17, 16))
 
 declare const x: "foo" | "bar";
@@ -77,27 +77,27 @@ bFoo.length;
 >bFoo : Symbol(bFoo, Decl(unionPropertyExistence.ts, 24, 13))
 
 ab.onlyInB;
->ab : Symbol(ab, Decl(unionPropertyExistence.ts, 20, 3))
+>ab : Symbol(ab, Decl(unionPropertyExistence.ts, 20, 11))
 
 ab.notInC; // Ok
 >ab.notInC : Symbol(notInC, Decl(unionPropertyExistence.ts, 2, 19), Decl(unionPropertyExistence.ts, 8, 20))
->ab : Symbol(ab, Decl(unionPropertyExistence.ts, 20, 3))
+>ab : Symbol(ab, Decl(unionPropertyExistence.ts, 20, 11))
 >notInC : Symbol(notInC, Decl(unionPropertyExistence.ts, 2, 19), Decl(unionPropertyExistence.ts, 8, 20))
 
 abc.notInC;
->abc : Symbol(abc, Decl(unionPropertyExistence.ts, 21, 3))
+>abc : Symbol(abc, Decl(unionPropertyExistence.ts, 21, 11))
 
 ab.notInB;
->ab : Symbol(ab, Decl(unionPropertyExistence.ts, 20, 3))
+>ab : Symbol(ab, Decl(unionPropertyExistence.ts, 20, 11))
 
 abc.notInB;
->abc : Symbol(abc, Decl(unionPropertyExistence.ts, 21, 3))
+>abc : Symbol(abc, Decl(unionPropertyExistence.ts, 21, 11))
 
 abc.inAll; // Ok
 >abc.inAll : Symbol(inAll, Decl(unionPropertyExistence.ts, 0, 13), Decl(unionPropertyExistence.ts, 6, 13), Decl(unionPropertyExistence.ts, 12, 13))
->abc : Symbol(abc, Decl(unionPropertyExistence.ts, 21, 3))
+>abc : Symbol(abc, Decl(unionPropertyExistence.ts, 21, 11))
 >inAll : Symbol(inAll, Decl(unionPropertyExistence.ts, 0, 13), Decl(unionPropertyExistence.ts, 6, 13), Decl(unionPropertyExistence.ts, 12, 13))
 
 abc.inNone;
->abc : Symbol(abc, Decl(unionPropertyExistence.ts, 21, 3))
+>abc : Symbol(abc, Decl(unionPropertyExistence.ts, 21, 11))
 
diff --git a/tests/baselines/reference/unionPropertyExistence.types b/tests/baselines/reference/unionPropertyExistence.types
index 8283919ae57bb..5304df3f6d108 100644
--- a/tests/baselines/reference/unionPropertyExistence.types
+++ b/tests/baselines/reference/unionPropertyExistence.types
@@ -47,11 +47,11 @@ type ABC = C | AB;
 >ABC : ABC
 >    : ^^^
 
-var ab: AB;
+declare var ab: AB;
 >ab : AB
 >   : ^^
 
-var abc: ABC;
+declare var abc: ABC;
 >abc : ABC
 >    : ^^^
 
diff --git a/tests/baselines/reference/unionTypeCallSignatures.errors.txt b/tests/baselines/reference/unionTypeCallSignatures.errors.txt
index 05db312f7c471..38de1d403e107 100644
--- a/tests/baselines/reference/unionTypeCallSignatures.errors.txt
+++ b/tests/baselines/reference/unionTypeCallSignatures.errors.txt
@@ -38,13 +38,13 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1
 
 
 ==== unionTypeCallSignatures.ts (28 errors) ====
-    var numOrDate: number | Date;
-    var strOrBoolean: string | boolean;
-    var strOrNum: string | number;
+    declare var numOrDate: number | Date;
+    declare var strOrBoolean: string | boolean;
+    declare var strOrNum: string | number;
     
     // If each type in U has call signatures and the sets of call signatures are identical ignoring return types, 
     // U has the same set of call signatures, but with return types that are unions of the return types of the respective call signatures from each type in U.
-    var unionOfDifferentReturnType: { (a: number): number; } | { (a: number): Date; };
+    declare var unionOfDifferentReturnType: { (a: number): number; } | { (a: number): Date; };
     numOrDate = unionOfDifferentReturnType(10);
     strOrBoolean = unionOfDifferentReturnType("hello"); // error 
     ~~~~~~~~~~~~
@@ -60,7 +60,7 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1
 !!! error TS2769:   Overload 2 of 2, '(a: string): string | boolean', gave the following error.
 !!! error TS2769:     Argument of type 'boolean' is not assignable to parameter of type 'string'.
     
-    var unionOfDifferentReturnType1: { (a: number): number; (a: string): string; } | { (a: number): Date; (a: string): boolean; };
+    declare var unionOfDifferentReturnType1: { (a: number): number; (a: string): string; } | { (a: number): Date; (a: string): boolean; };
     numOrDate = unionOfDifferentReturnType1(10);
     strOrBoolean = unionOfDifferentReturnType1("hello");
     unionOfDifferentReturnType1(true); // error in type of parameter
@@ -73,9 +73,9 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1
     unionOfDifferentReturnType1(); // error missing parameter
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
-!!! related TS6210 unionTypeCallSignatures.ts:12:37: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeCallSignatures.ts:12:45: An argument for 'a' was not provided.
     
-    var unionOfDifferentParameterTypes: { (a: number): number; } | { (a: string): Date; };
+    declare var unionOfDifferentParameterTypes: { (a: number): number; } | { (a: string): Date; };
     unionOfDifferentParameterTypes(10);// error - no call signatures
                                    ~~
 !!! error TS2345: Argument of type '10' is not assignable to parameter of type 'never'.
@@ -85,30 +85,30 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1
     unionOfDifferentParameterTypes();// error - no call signatures
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
-!!! related TS6210 unionTypeCallSignatures.ts:18:40: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeCallSignatures.ts:18:48: An argument for 'a' was not provided.
     
-    var unionOfDifferentNumberOfSignatures: { (a: number): number; } | { (a: number): Date; (a: string): boolean; };
+    declare var unionOfDifferentNumberOfSignatures: { (a: number): number; } | { (a: number): Date; (a: string): boolean; };
     unionOfDifferentNumberOfSignatures(); // error - no call signatures
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
-!!! related TS6210 unionTypeCallSignatures.ts:23:44: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeCallSignatures.ts:23:52: An argument for 'a' was not provided.
     unionOfDifferentNumberOfSignatures(10); // error - no call signatures
     unionOfDifferentNumberOfSignatures("hello"); // error - no call signatures
                                        ~~~~~~~
 !!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
     
-    var unionWithDifferentParameterCount: { (a: string): string; } | { (a: string, b: number): number; } ;
+    declare var unionWithDifferentParameterCount: { (a: string): string; } | { (a: string, b: number): number; } ;
     unionWithDifferentParameterCount();// needs more args
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 0.
-!!! related TS6210 unionTypeCallSignatures.ts:28:69: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeCallSignatures.ts:28:77: An argument for 'a' was not provided.
     unionWithDifferentParameterCount("hello");// needs more args
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
-!!! related TS6210 unionTypeCallSignatures.ts:28:80: An argument for 'b' was not provided.
+!!! related TS6210 unionTypeCallSignatures.ts:28:88: An argument for 'b' was not provided.
     unionWithDifferentParameterCount("hello", 10);// OK
     
-    var unionWithOptionalParameter1: { (a: string, b?: number): string; } | { (a: string, b?: number): number; };
+    declare var unionWithOptionalParameter1: { (a: string, b?: number): string; } | { (a: string, b?: number): number; };
     strOrNum = unionWithOptionalParameter1('hello');
     strOrNum = unionWithOptionalParameter1('hello', 10);
     strOrNum = unionWithOptionalParameter1('hello', "hello"); // error in parameter type
@@ -117,13 +117,13 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1
     strOrNum = unionWithOptionalParameter1(); // error
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1-2 arguments, but got 0.
-!!! related TS6210 unionTypeCallSignatures.ts:33:37: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeCallSignatures.ts:33:45: An argument for 'a' was not provided.
     
-    var unionWithOptionalParameter2: { (a: string, b?: number): string; } | { (a: string, b: number): number };
+    declare var unionWithOptionalParameter2: { (a: string, b?: number): string; } | { (a: string, b: number): number };
     strOrNum = unionWithOptionalParameter2('hello'); // error no call signature
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
-!!! related TS6210 unionTypeCallSignatures.ts:39:87: An argument for 'b' was not provided.
+!!! related TS6210 unionTypeCallSignatures.ts:39:95: An argument for 'b' was not provided.
     strOrNum = unionWithOptionalParameter2('hello', 10); // error no call signature
     strOrNum = unionWithOptionalParameter2('hello', "hello"); // error no call signature
                                                     ~~~~~~~
@@ -131,9 +131,9 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1
     strOrNum = unionWithOptionalParameter2(); // error no call signature
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 0.
-!!! related TS6210 unionTypeCallSignatures.ts:39:76: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeCallSignatures.ts:39:84: An argument for 'a' was not provided.
     
-    var unionWithOptionalParameter3: { (a: string, b?: number): string; } | { (a: string): number; };
+    declare var unionWithOptionalParameter3: { (a: string, b?: number): string; } | { (a: string): number; };
     strOrNum = unionWithOptionalParameter3('hello');
     strOrNum = unionWithOptionalParameter3('hello', 10); // ok
     strOrNum = unionWithOptionalParameter3('hello', "hello"); // wrong argument type
@@ -142,9 +142,9 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1
     strOrNum = unionWithOptionalParameter3(); // needs more args
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1-2 arguments, but got 0.
-!!! related TS6210 unionTypeCallSignatures.ts:45:37: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeCallSignatures.ts:45:45: An argument for 'a' was not provided.
     
-    var unionWithRestParameter1: { (a: string, ...b: number[]): string; } | { (a: string, ...b: number[]): number };
+    declare var unionWithRestParameter1: { (a: string, ...b: number[]): string; } | { (a: string, ...b: number[]): number };
     strOrNum = unionWithRestParameter1('hello');
     strOrNum = unionWithRestParameter1('hello', 10);
     strOrNum = unionWithRestParameter1('hello', 10, 11);
@@ -154,13 +154,13 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1
     strOrNum = unionWithRestParameter1(); // error
                ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2555: Expected at least 1 arguments, but got 0.
-!!! related TS6210 unionTypeCallSignatures.ts:51:33: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeCallSignatures.ts:51:41: An argument for 'a' was not provided.
     
-    var unionWithRestParameter2: { (a: string, ...b: number[]): string; } | { (a: string, b: number): number };
+    declare var unionWithRestParameter2: { (a: string, ...b: number[]): string; } | { (a: string, b: number): number };
     strOrNum = unionWithRestParameter2('hello'); // error no call signature
                ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
-!!! related TS6210 unionTypeCallSignatures.ts:58:87: An argument for 'b' was not provided.
+!!! related TS6210 unionTypeCallSignatures.ts:58:95: An argument for 'b' was not provided.
     strOrNum = unionWithRestParameter2('hello', 10); // error no call signature
     strOrNum = unionWithRestParameter2('hello', 10, 11); // error no call signature
                                                     ~~
@@ -171,9 +171,9 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1
     strOrNum = unionWithRestParameter2(); // error no call signature
                ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 0.
-!!! related TS6210 unionTypeCallSignatures.ts:58:76: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeCallSignatures.ts:58:84: An argument for 'a' was not provided.
     
-    var unionWithRestParameter3: { (a: string, ...b: number[]): string; } | { (a: string): number };
+    declare var unionWithRestParameter3: { (a: string, ...b: number[]): string; } | { (a: string): number };
     strOrNum = unionWithRestParameter3('hello');
     strOrNum = unionWithRestParameter3('hello', 10); // error no call signature
     strOrNum = unionWithRestParameter3('hello', 10, 11); // error no call signature
@@ -183,12 +183,12 @@ unionTypeCallSignatures.ts(73,12): error TS2554: Expected 2 arguments, but got 1
     strOrNum = unionWithRestParameter3(); // error no call signature
                ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2555: Expected at least 1 arguments, but got 0.
-!!! related TS6210 unionTypeCallSignatures.ts:65:33: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeCallSignatures.ts:65:41: An argument for 'a' was not provided.
     
-    var unionWithRestParameter4: { (...a: string[]): string; } | { (a: string, b: string): number; };
+    declare var unionWithRestParameter4: { (...a: string[]): string; } | { (a: string, b: string): number; };
     strOrNum = unionWithRestParameter4("hello"); // error supplied parameters do not match any call signature
                ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
-!!! related TS6210 unionTypeCallSignatures.ts:72:76: An argument for 'b' was not provided.
+!!! related TS6210 unionTypeCallSignatures.ts:72:84: An argument for 'b' was not provided.
     strOrNum = unionWithRestParameter4("hello", "world");
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unionTypeCallSignatures.js b/tests/baselines/reference/unionTypeCallSignatures.js
index ae2d22bccf7e2..ea53d3822697b 100644
--- a/tests/baselines/reference/unionTypeCallSignatures.js
+++ b/tests/baselines/reference/unionTypeCallSignatures.js
@@ -1,142 +1,125 @@
 //// [tests/cases/conformance/types/union/unionTypeCallSignatures.ts] ////
 
 //// [unionTypeCallSignatures.ts]
-var numOrDate: number | Date;
-var strOrBoolean: string | boolean;
-var strOrNum: string | number;
+declare var numOrDate: number | Date;
+declare var strOrBoolean: string | boolean;
+declare var strOrNum: string | number;
 
 // If each type in U has call signatures and the sets of call signatures are identical ignoring return types, 
 // U has the same set of call signatures, but with return types that are unions of the return types of the respective call signatures from each type in U.
-var unionOfDifferentReturnType: { (a: number): number; } | { (a: number): Date; };
+declare var unionOfDifferentReturnType: { (a: number): number; } | { (a: number): Date; };
 numOrDate = unionOfDifferentReturnType(10);
 strOrBoolean = unionOfDifferentReturnType("hello"); // error 
 unionOfDifferentReturnType1(true); // error in type of parameter
 
-var unionOfDifferentReturnType1: { (a: number): number; (a: string): string; } | { (a: number): Date; (a: string): boolean; };
+declare var unionOfDifferentReturnType1: { (a: number): number; (a: string): string; } | { (a: number): Date; (a: string): boolean; };
 numOrDate = unionOfDifferentReturnType1(10);
 strOrBoolean = unionOfDifferentReturnType1("hello");
 unionOfDifferentReturnType1(true); // error in type of parameter
 unionOfDifferentReturnType1(); // error missing parameter
 
-var unionOfDifferentParameterTypes: { (a: number): number; } | { (a: string): Date; };
+declare var unionOfDifferentParameterTypes: { (a: number): number; } | { (a: string): Date; };
 unionOfDifferentParameterTypes(10);// error - no call signatures
 unionOfDifferentParameterTypes("hello");// error - no call signatures
 unionOfDifferentParameterTypes();// error - no call signatures
 
-var unionOfDifferentNumberOfSignatures: { (a: number): number; } | { (a: number): Date; (a: string): boolean; };
+declare var unionOfDifferentNumberOfSignatures: { (a: number): number; } | { (a: number): Date; (a: string): boolean; };
 unionOfDifferentNumberOfSignatures(); // error - no call signatures
 unionOfDifferentNumberOfSignatures(10); // error - no call signatures
 unionOfDifferentNumberOfSignatures("hello"); // error - no call signatures
 
-var unionWithDifferentParameterCount: { (a: string): string; } | { (a: string, b: number): number; } ;
+declare var unionWithDifferentParameterCount: { (a: string): string; } | { (a: string, b: number): number; } ;
 unionWithDifferentParameterCount();// needs more args
 unionWithDifferentParameterCount("hello");// needs more args
 unionWithDifferentParameterCount("hello", 10);// OK
 
-var unionWithOptionalParameter1: { (a: string, b?: number): string; } | { (a: string, b?: number): number; };
+declare var unionWithOptionalParameter1: { (a: string, b?: number): string; } | { (a: string, b?: number): number; };
 strOrNum = unionWithOptionalParameter1('hello');
 strOrNum = unionWithOptionalParameter1('hello', 10);
 strOrNum = unionWithOptionalParameter1('hello', "hello"); // error in parameter type
 strOrNum = unionWithOptionalParameter1(); // error
 
-var unionWithOptionalParameter2: { (a: string, b?: number): string; } | { (a: string, b: number): number };
+declare var unionWithOptionalParameter2: { (a: string, b?: number): string; } | { (a: string, b: number): number };
 strOrNum = unionWithOptionalParameter2('hello'); // error no call signature
 strOrNum = unionWithOptionalParameter2('hello', 10); // error no call signature
 strOrNum = unionWithOptionalParameter2('hello', "hello"); // error no call signature
 strOrNum = unionWithOptionalParameter2(); // error no call signature
 
-var unionWithOptionalParameter3: { (a: string, b?: number): string; } | { (a: string): number; };
+declare var unionWithOptionalParameter3: { (a: string, b?: number): string; } | { (a: string): number; };
 strOrNum = unionWithOptionalParameter3('hello');
 strOrNum = unionWithOptionalParameter3('hello', 10); // ok
 strOrNum = unionWithOptionalParameter3('hello', "hello"); // wrong argument type
 strOrNum = unionWithOptionalParameter3(); // needs more args
 
-var unionWithRestParameter1: { (a: string, ...b: number[]): string; } | { (a: string, ...b: number[]): number };
+declare var unionWithRestParameter1: { (a: string, ...b: number[]): string; } | { (a: string, ...b: number[]): number };
 strOrNum = unionWithRestParameter1('hello');
 strOrNum = unionWithRestParameter1('hello', 10);
 strOrNum = unionWithRestParameter1('hello', 10, 11);
 strOrNum = unionWithRestParameter1('hello', "hello"); // error in parameter type
 strOrNum = unionWithRestParameter1(); // error
 
-var unionWithRestParameter2: { (a: string, ...b: number[]): string; } | { (a: string, b: number): number };
+declare var unionWithRestParameter2: { (a: string, ...b: number[]): string; } | { (a: string, b: number): number };
 strOrNum = unionWithRestParameter2('hello'); // error no call signature
 strOrNum = unionWithRestParameter2('hello', 10); // error no call signature
 strOrNum = unionWithRestParameter2('hello', 10, 11); // error no call signature
 strOrNum = unionWithRestParameter2('hello', "hello"); // error no call signature
 strOrNum = unionWithRestParameter2(); // error no call signature
 
-var unionWithRestParameter3: { (a: string, ...b: number[]): string; } | { (a: string): number };
+declare var unionWithRestParameter3: { (a: string, ...b: number[]): string; } | { (a: string): number };
 strOrNum = unionWithRestParameter3('hello');
 strOrNum = unionWithRestParameter3('hello', 10); // error no call signature
 strOrNum = unionWithRestParameter3('hello', 10, 11); // error no call signature
 strOrNum = unionWithRestParameter3('hello', "hello"); // wrong argument type
 strOrNum = unionWithRestParameter3(); // error no call signature
 
-var unionWithRestParameter4: { (...a: string[]): string; } | { (a: string, b: string): number; };
+declare var unionWithRestParameter4: { (...a: string[]): string; } | { (a: string, b: string): number; };
 strOrNum = unionWithRestParameter4("hello"); // error supplied parameters do not match any call signature
 strOrNum = unionWithRestParameter4("hello", "world");
 
 
 //// [unionTypeCallSignatures.js]
-var numOrDate;
-var strOrBoolean;
-var strOrNum;
-// If each type in U has call signatures and the sets of call signatures are identical ignoring return types, 
-// U has the same set of call signatures, but with return types that are unions of the return types of the respective call signatures from each type in U.
-var unionOfDifferentReturnType;
 numOrDate = unionOfDifferentReturnType(10);
 strOrBoolean = unionOfDifferentReturnType("hello"); // error 
 unionOfDifferentReturnType1(true); // error in type of parameter
-var unionOfDifferentReturnType1;
 numOrDate = unionOfDifferentReturnType1(10);
 strOrBoolean = unionOfDifferentReturnType1("hello");
 unionOfDifferentReturnType1(true); // error in type of parameter
 unionOfDifferentReturnType1(); // error missing parameter
-var unionOfDifferentParameterTypes;
 unionOfDifferentParameterTypes(10); // error - no call signatures
 unionOfDifferentParameterTypes("hello"); // error - no call signatures
 unionOfDifferentParameterTypes(); // error - no call signatures
-var unionOfDifferentNumberOfSignatures;
 unionOfDifferentNumberOfSignatures(); // error - no call signatures
 unionOfDifferentNumberOfSignatures(10); // error - no call signatures
 unionOfDifferentNumberOfSignatures("hello"); // error - no call signatures
-var unionWithDifferentParameterCount;
 unionWithDifferentParameterCount(); // needs more args
 unionWithDifferentParameterCount("hello"); // needs more args
 unionWithDifferentParameterCount("hello", 10); // OK
-var unionWithOptionalParameter1;
 strOrNum = unionWithOptionalParameter1('hello');
 strOrNum = unionWithOptionalParameter1('hello', 10);
 strOrNum = unionWithOptionalParameter1('hello', "hello"); // error in parameter type
 strOrNum = unionWithOptionalParameter1(); // error
-var unionWithOptionalParameter2;
 strOrNum = unionWithOptionalParameter2('hello'); // error no call signature
 strOrNum = unionWithOptionalParameter2('hello', 10); // error no call signature
 strOrNum = unionWithOptionalParameter2('hello', "hello"); // error no call signature
 strOrNum = unionWithOptionalParameter2(); // error no call signature
-var unionWithOptionalParameter3;
 strOrNum = unionWithOptionalParameter3('hello');
 strOrNum = unionWithOptionalParameter3('hello', 10); // ok
 strOrNum = unionWithOptionalParameter3('hello', "hello"); // wrong argument type
 strOrNum = unionWithOptionalParameter3(); // needs more args
-var unionWithRestParameter1;
 strOrNum = unionWithRestParameter1('hello');
 strOrNum = unionWithRestParameter1('hello', 10);
 strOrNum = unionWithRestParameter1('hello', 10, 11);
 strOrNum = unionWithRestParameter1('hello', "hello"); // error in parameter type
 strOrNum = unionWithRestParameter1(); // error
-var unionWithRestParameter2;
 strOrNum = unionWithRestParameter2('hello'); // error no call signature
 strOrNum = unionWithRestParameter2('hello', 10); // error no call signature
 strOrNum = unionWithRestParameter2('hello', 10, 11); // error no call signature
 strOrNum = unionWithRestParameter2('hello', "hello"); // error no call signature
 strOrNum = unionWithRestParameter2(); // error no call signature
-var unionWithRestParameter3;
 strOrNum = unionWithRestParameter3('hello');
 strOrNum = unionWithRestParameter3('hello', 10); // error no call signature
 strOrNum = unionWithRestParameter3('hello', 10, 11); // error no call signature
 strOrNum = unionWithRestParameter3('hello', "hello"); // wrong argument type
 strOrNum = unionWithRestParameter3(); // error no call signature
-var unionWithRestParameter4;
 strOrNum = unionWithRestParameter4("hello"); // error supplied parameters do not match any call signature
 strOrNum = unionWithRestParameter4("hello", "world");
diff --git a/tests/baselines/reference/unionTypeCallSignatures.symbols b/tests/baselines/reference/unionTypeCallSignatures.symbols
index 04cdcea967725..619fbe8df948c 100644
--- a/tests/baselines/reference/unionTypeCallSignatures.symbols
+++ b/tests/baselines/reference/unionTypeCallSignatures.symbols
@@ -1,262 +1,262 @@
 //// [tests/cases/conformance/types/union/unionTypeCallSignatures.ts] ////
 
 === unionTypeCallSignatures.ts ===
-var numOrDate: number | Date;
->numOrDate : Symbol(numOrDate, Decl(unionTypeCallSignatures.ts, 0, 3))
+declare var numOrDate: number | Date;
+>numOrDate : Symbol(numOrDate, Decl(unionTypeCallSignatures.ts, 0, 11))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
-var strOrBoolean: string | boolean;
->strOrBoolean : Symbol(strOrBoolean, Decl(unionTypeCallSignatures.ts, 1, 3))
+declare var strOrBoolean: string | boolean;
+>strOrBoolean : Symbol(strOrBoolean, Decl(unionTypeCallSignatures.ts, 1, 11))
 
-var strOrNum: string | number;
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
+declare var strOrNum: string | number;
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
 
 // If each type in U has call signatures and the sets of call signatures are identical ignoring return types, 
 // U has the same set of call signatures, but with return types that are unions of the return types of the respective call signatures from each type in U.
-var unionOfDifferentReturnType: { (a: number): number; } | { (a: number): Date; };
->unionOfDifferentReturnType : Symbol(unionOfDifferentReturnType, Decl(unionTypeCallSignatures.ts, 6, 3))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 6, 35))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 6, 62))
+declare var unionOfDifferentReturnType: { (a: number): number; } | { (a: number): Date; };
+>unionOfDifferentReturnType : Symbol(unionOfDifferentReturnType, Decl(unionTypeCallSignatures.ts, 6, 11))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 6, 43))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 6, 70))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 numOrDate = unionOfDifferentReturnType(10);
->numOrDate : Symbol(numOrDate, Decl(unionTypeCallSignatures.ts, 0, 3))
->unionOfDifferentReturnType : Symbol(unionOfDifferentReturnType, Decl(unionTypeCallSignatures.ts, 6, 3))
+>numOrDate : Symbol(numOrDate, Decl(unionTypeCallSignatures.ts, 0, 11))
+>unionOfDifferentReturnType : Symbol(unionOfDifferentReturnType, Decl(unionTypeCallSignatures.ts, 6, 11))
 
 strOrBoolean = unionOfDifferentReturnType("hello"); // error 
->strOrBoolean : Symbol(strOrBoolean, Decl(unionTypeCallSignatures.ts, 1, 3))
->unionOfDifferentReturnType : Symbol(unionOfDifferentReturnType, Decl(unionTypeCallSignatures.ts, 6, 3))
+>strOrBoolean : Symbol(strOrBoolean, Decl(unionTypeCallSignatures.ts, 1, 11))
+>unionOfDifferentReturnType : Symbol(unionOfDifferentReturnType, Decl(unionTypeCallSignatures.ts, 6, 11))
 
 unionOfDifferentReturnType1(true); // error in type of parameter
->unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeCallSignatures.ts, 11, 3))
+>unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeCallSignatures.ts, 11, 11))
 
-var unionOfDifferentReturnType1: { (a: number): number; (a: string): string; } | { (a: number): Date; (a: string): boolean; };
->unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeCallSignatures.ts, 11, 3))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 11, 36))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 11, 57))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 11, 84))
+declare var unionOfDifferentReturnType1: { (a: number): number; (a: string): string; } | { (a: number): Date; (a: string): boolean; };
+>unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeCallSignatures.ts, 11, 11))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 11, 44))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 11, 65))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 11, 92))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 11, 103))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 11, 111))
 
 numOrDate = unionOfDifferentReturnType1(10);
->numOrDate : Symbol(numOrDate, Decl(unionTypeCallSignatures.ts, 0, 3))
->unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeCallSignatures.ts, 11, 3))
+>numOrDate : Symbol(numOrDate, Decl(unionTypeCallSignatures.ts, 0, 11))
+>unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeCallSignatures.ts, 11, 11))
 
 strOrBoolean = unionOfDifferentReturnType1("hello");
->strOrBoolean : Symbol(strOrBoolean, Decl(unionTypeCallSignatures.ts, 1, 3))
->unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeCallSignatures.ts, 11, 3))
+>strOrBoolean : Symbol(strOrBoolean, Decl(unionTypeCallSignatures.ts, 1, 11))
+>unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeCallSignatures.ts, 11, 11))
 
 unionOfDifferentReturnType1(true); // error in type of parameter
->unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeCallSignatures.ts, 11, 3))
+>unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeCallSignatures.ts, 11, 11))
 
 unionOfDifferentReturnType1(); // error missing parameter
->unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeCallSignatures.ts, 11, 3))
+>unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeCallSignatures.ts, 11, 11))
 
-var unionOfDifferentParameterTypes: { (a: number): number; } | { (a: string): Date; };
->unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeCallSignatures.ts, 17, 3))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 17, 39))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 17, 66))
+declare var unionOfDifferentParameterTypes: { (a: number): number; } | { (a: string): Date; };
+>unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeCallSignatures.ts, 17, 11))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 17, 47))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 17, 74))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 unionOfDifferentParameterTypes(10);// error - no call signatures
->unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeCallSignatures.ts, 17, 3))
+>unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeCallSignatures.ts, 17, 11))
 
 unionOfDifferentParameterTypes("hello");// error - no call signatures
->unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeCallSignatures.ts, 17, 3))
+>unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeCallSignatures.ts, 17, 11))
 
 unionOfDifferentParameterTypes();// error - no call signatures
->unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeCallSignatures.ts, 17, 3))
+>unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeCallSignatures.ts, 17, 11))
 
-var unionOfDifferentNumberOfSignatures: { (a: number): number; } | { (a: number): Date; (a: string): boolean; };
->unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeCallSignatures.ts, 22, 3))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 22, 43))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 22, 70))
+declare var unionOfDifferentNumberOfSignatures: { (a: number): number; } | { (a: number): Date; (a: string): boolean; };
+>unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeCallSignatures.ts, 22, 11))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 22, 51))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 22, 78))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 22, 89))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 22, 97))
 
 unionOfDifferentNumberOfSignatures(); // error - no call signatures
->unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeCallSignatures.ts, 22, 3))
+>unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeCallSignatures.ts, 22, 11))
 
 unionOfDifferentNumberOfSignatures(10); // error - no call signatures
->unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeCallSignatures.ts, 22, 3))
+>unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeCallSignatures.ts, 22, 11))
 
 unionOfDifferentNumberOfSignatures("hello"); // error - no call signatures
->unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeCallSignatures.ts, 22, 3))
+>unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeCallSignatures.ts, 22, 11))
 
-var unionWithDifferentParameterCount: { (a: string): string; } | { (a: string, b: number): number; } ;
->unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeCallSignatures.ts, 27, 3))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 27, 41))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 27, 68))
->b : Symbol(b, Decl(unionTypeCallSignatures.ts, 27, 78))
+declare var unionWithDifferentParameterCount: { (a: string): string; } | { (a: string, b: number): number; } ;
+>unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeCallSignatures.ts, 27, 11))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 27, 49))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 27, 76))
+>b : Symbol(b, Decl(unionTypeCallSignatures.ts, 27, 86))
 
 unionWithDifferentParameterCount();// needs more args
->unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeCallSignatures.ts, 27, 3))
+>unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeCallSignatures.ts, 27, 11))
 
 unionWithDifferentParameterCount("hello");// needs more args
->unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeCallSignatures.ts, 27, 3))
+>unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeCallSignatures.ts, 27, 11))
 
 unionWithDifferentParameterCount("hello", 10);// OK
->unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeCallSignatures.ts, 27, 3))
+>unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeCallSignatures.ts, 27, 11))
 
-var unionWithOptionalParameter1: { (a: string, b?: number): string; } | { (a: string, b?: number): number; };
->unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeCallSignatures.ts, 32, 3))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 32, 36))
->b : Symbol(b, Decl(unionTypeCallSignatures.ts, 32, 46))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 32, 75))
->b : Symbol(b, Decl(unionTypeCallSignatures.ts, 32, 85))
+declare var unionWithOptionalParameter1: { (a: string, b?: number): string; } | { (a: string, b?: number): number; };
+>unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeCallSignatures.ts, 32, 11))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 32, 44))
+>b : Symbol(b, Decl(unionTypeCallSignatures.ts, 32, 54))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 32, 83))
+>b : Symbol(b, Decl(unionTypeCallSignatures.ts, 32, 93))
 
 strOrNum = unionWithOptionalParameter1('hello');
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeCallSignatures.ts, 32, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeCallSignatures.ts, 32, 11))
 
 strOrNum = unionWithOptionalParameter1('hello', 10);
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeCallSignatures.ts, 32, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeCallSignatures.ts, 32, 11))
 
 strOrNum = unionWithOptionalParameter1('hello', "hello"); // error in parameter type
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeCallSignatures.ts, 32, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeCallSignatures.ts, 32, 11))
 
 strOrNum = unionWithOptionalParameter1(); // error
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeCallSignatures.ts, 32, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeCallSignatures.ts, 32, 11))
 
-var unionWithOptionalParameter2: { (a: string, b?: number): string; } | { (a: string, b: number): number };
->unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeCallSignatures.ts, 38, 3))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 38, 36))
->b : Symbol(b, Decl(unionTypeCallSignatures.ts, 38, 46))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 38, 75))
->b : Symbol(b, Decl(unionTypeCallSignatures.ts, 38, 85))
+declare var unionWithOptionalParameter2: { (a: string, b?: number): string; } | { (a: string, b: number): number };
+>unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeCallSignatures.ts, 38, 11))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 38, 44))
+>b : Symbol(b, Decl(unionTypeCallSignatures.ts, 38, 54))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 38, 83))
+>b : Symbol(b, Decl(unionTypeCallSignatures.ts, 38, 93))
 
 strOrNum = unionWithOptionalParameter2('hello'); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeCallSignatures.ts, 38, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeCallSignatures.ts, 38, 11))
 
 strOrNum = unionWithOptionalParameter2('hello', 10); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeCallSignatures.ts, 38, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeCallSignatures.ts, 38, 11))
 
 strOrNum = unionWithOptionalParameter2('hello', "hello"); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeCallSignatures.ts, 38, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeCallSignatures.ts, 38, 11))
 
 strOrNum = unionWithOptionalParameter2(); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeCallSignatures.ts, 38, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeCallSignatures.ts, 38, 11))
 
-var unionWithOptionalParameter3: { (a: string, b?: number): string; } | { (a: string): number; };
->unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeCallSignatures.ts, 44, 3))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 44, 36))
->b : Symbol(b, Decl(unionTypeCallSignatures.ts, 44, 46))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 44, 75))
+declare var unionWithOptionalParameter3: { (a: string, b?: number): string; } | { (a: string): number; };
+>unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeCallSignatures.ts, 44, 11))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 44, 44))
+>b : Symbol(b, Decl(unionTypeCallSignatures.ts, 44, 54))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 44, 83))
 
 strOrNum = unionWithOptionalParameter3('hello');
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeCallSignatures.ts, 44, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeCallSignatures.ts, 44, 11))
 
 strOrNum = unionWithOptionalParameter3('hello', 10); // ok
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeCallSignatures.ts, 44, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeCallSignatures.ts, 44, 11))
 
 strOrNum = unionWithOptionalParameter3('hello', "hello"); // wrong argument type
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeCallSignatures.ts, 44, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeCallSignatures.ts, 44, 11))
 
 strOrNum = unionWithOptionalParameter3(); // needs more args
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeCallSignatures.ts, 44, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeCallSignatures.ts, 44, 11))
 
-var unionWithRestParameter1: { (a: string, ...b: number[]): string; } | { (a: string, ...b: number[]): number };
->unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeCallSignatures.ts, 50, 3))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 50, 32))
->b : Symbol(b, Decl(unionTypeCallSignatures.ts, 50, 42))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 50, 75))
->b : Symbol(b, Decl(unionTypeCallSignatures.ts, 50, 85))
+declare var unionWithRestParameter1: { (a: string, ...b: number[]): string; } | { (a: string, ...b: number[]): number };
+>unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeCallSignatures.ts, 50, 11))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 50, 40))
+>b : Symbol(b, Decl(unionTypeCallSignatures.ts, 50, 50))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 50, 83))
+>b : Symbol(b, Decl(unionTypeCallSignatures.ts, 50, 93))
 
 strOrNum = unionWithRestParameter1('hello');
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeCallSignatures.ts, 50, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeCallSignatures.ts, 50, 11))
 
 strOrNum = unionWithRestParameter1('hello', 10);
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeCallSignatures.ts, 50, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeCallSignatures.ts, 50, 11))
 
 strOrNum = unionWithRestParameter1('hello', 10, 11);
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeCallSignatures.ts, 50, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeCallSignatures.ts, 50, 11))
 
 strOrNum = unionWithRestParameter1('hello', "hello"); // error in parameter type
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeCallSignatures.ts, 50, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeCallSignatures.ts, 50, 11))
 
 strOrNum = unionWithRestParameter1(); // error
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeCallSignatures.ts, 50, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeCallSignatures.ts, 50, 11))
 
-var unionWithRestParameter2: { (a: string, ...b: number[]): string; } | { (a: string, b: number): number };
->unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeCallSignatures.ts, 57, 3))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 57, 32))
->b : Symbol(b, Decl(unionTypeCallSignatures.ts, 57, 42))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 57, 75))
->b : Symbol(b, Decl(unionTypeCallSignatures.ts, 57, 85))
+declare var unionWithRestParameter2: { (a: string, ...b: number[]): string; } | { (a: string, b: number): number };
+>unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeCallSignatures.ts, 57, 11))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 57, 40))
+>b : Symbol(b, Decl(unionTypeCallSignatures.ts, 57, 50))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 57, 83))
+>b : Symbol(b, Decl(unionTypeCallSignatures.ts, 57, 93))
 
 strOrNum = unionWithRestParameter2('hello'); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeCallSignatures.ts, 57, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeCallSignatures.ts, 57, 11))
 
 strOrNum = unionWithRestParameter2('hello', 10); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeCallSignatures.ts, 57, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeCallSignatures.ts, 57, 11))
 
 strOrNum = unionWithRestParameter2('hello', 10, 11); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeCallSignatures.ts, 57, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeCallSignatures.ts, 57, 11))
 
 strOrNum = unionWithRestParameter2('hello', "hello"); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeCallSignatures.ts, 57, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeCallSignatures.ts, 57, 11))
 
 strOrNum = unionWithRestParameter2(); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeCallSignatures.ts, 57, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeCallSignatures.ts, 57, 11))
 
-var unionWithRestParameter3: { (a: string, ...b: number[]): string; } | { (a: string): number };
->unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeCallSignatures.ts, 64, 3))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 64, 32))
->b : Symbol(b, Decl(unionTypeCallSignatures.ts, 64, 42))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 64, 75))
+declare var unionWithRestParameter3: { (a: string, ...b: number[]): string; } | { (a: string): number };
+>unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeCallSignatures.ts, 64, 11))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 64, 40))
+>b : Symbol(b, Decl(unionTypeCallSignatures.ts, 64, 50))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 64, 83))
 
 strOrNum = unionWithRestParameter3('hello');
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeCallSignatures.ts, 64, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeCallSignatures.ts, 64, 11))
 
 strOrNum = unionWithRestParameter3('hello', 10); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeCallSignatures.ts, 64, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeCallSignatures.ts, 64, 11))
 
 strOrNum = unionWithRestParameter3('hello', 10, 11); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeCallSignatures.ts, 64, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeCallSignatures.ts, 64, 11))
 
 strOrNum = unionWithRestParameter3('hello', "hello"); // wrong argument type
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeCallSignatures.ts, 64, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeCallSignatures.ts, 64, 11))
 
 strOrNum = unionWithRestParameter3(); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeCallSignatures.ts, 64, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeCallSignatures.ts, 64, 11))
 
-var unionWithRestParameter4: { (...a: string[]): string; } | { (a: string, b: string): number; };
->unionWithRestParameter4 : Symbol(unionWithRestParameter4, Decl(unionTypeCallSignatures.ts, 71, 3))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 71, 32))
->a : Symbol(a, Decl(unionTypeCallSignatures.ts, 71, 64))
->b : Symbol(b, Decl(unionTypeCallSignatures.ts, 71, 74))
+declare var unionWithRestParameter4: { (...a: string[]): string; } | { (a: string, b: string): number; };
+>unionWithRestParameter4 : Symbol(unionWithRestParameter4, Decl(unionTypeCallSignatures.ts, 71, 11))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 71, 40))
+>a : Symbol(a, Decl(unionTypeCallSignatures.ts, 71, 72))
+>b : Symbol(b, Decl(unionTypeCallSignatures.ts, 71, 82))
 
 strOrNum = unionWithRestParameter4("hello"); // error supplied parameters do not match any call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter4 : Symbol(unionWithRestParameter4, Decl(unionTypeCallSignatures.ts, 71, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter4 : Symbol(unionWithRestParameter4, Decl(unionTypeCallSignatures.ts, 71, 11))
 
 strOrNum = unionWithRestParameter4("hello", "world");
->strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 3))
->unionWithRestParameter4 : Symbol(unionWithRestParameter4, Decl(unionTypeCallSignatures.ts, 71, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeCallSignatures.ts, 2, 11))
+>unionWithRestParameter4 : Symbol(unionWithRestParameter4, Decl(unionTypeCallSignatures.ts, 71, 11))
 
diff --git a/tests/baselines/reference/unionTypeCallSignatures.types b/tests/baselines/reference/unionTypeCallSignatures.types
index 7663b60400216..ec61455e147b2 100644
--- a/tests/baselines/reference/unionTypeCallSignatures.types
+++ b/tests/baselines/reference/unionTypeCallSignatures.types
@@ -1,21 +1,21 @@
 //// [tests/cases/conformance/types/union/unionTypeCallSignatures.ts] ////
 
 === unionTypeCallSignatures.ts ===
-var numOrDate: number | Date;
+declare var numOrDate: number | Date;
 >numOrDate : number | Date
 >          : ^^^^^^^^^^^^^
 
-var strOrBoolean: string | boolean;
+declare var strOrBoolean: string | boolean;
 >strOrBoolean : string | boolean
 >             : ^^^^^^^^^^^^^^^^
 
-var strOrNum: string | number;
+declare var strOrNum: string | number;
 >strOrNum : string | number
 >         : ^^^^^^^^^^^^^^^
 
 // If each type in U has call signatures and the sets of call signatures are identical ignoring return types, 
 // U has the same set of call signatures, but with return types that are unions of the return types of the respective call signatures from each type in U.
-var unionOfDifferentReturnType: { (a: number): number; } | { (a: number): Date; };
+declare var unionOfDifferentReturnType: { (a: number): number; } | { (a: number): Date; };
 >unionOfDifferentReturnType : ((a: number) => number) | ((a: number) => Date)
 >                           : ^^ ^^      ^^^^^      ^^^^^^ ^^      ^^^^^    ^
 >a : number
@@ -55,7 +55,7 @@ unionOfDifferentReturnType1(true); // error in type of parameter
 >true : true
 >     : ^^^^
 
-var unionOfDifferentReturnType1: { (a: number): number; (a: string): string; } | { (a: number): Date; (a: string): boolean; };
+declare var unionOfDifferentReturnType1: { (a: number): number; (a: string): string; } | { (a: number): Date; (a: string): boolean; };
 >unionOfDifferentReturnType1 : { (a: number): number; (a: string): string; } | { (a: number): Date; (a: string): boolean; }
 >                            : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^^^^^^^ ^^      ^^^    ^^^ ^^      ^^^       ^^^
 >a : number
@@ -105,7 +105,7 @@ unionOfDifferentReturnType1(); // error missing parameter
 >unionOfDifferentReturnType1 : { (a: number): number; (a: string): string; } | { (a: number): Date; (a: string): boolean; }
 >                            : ^^^ ^^      ^^^      ^^^ ^^      ^^^      ^^^^^^^^^ ^^      ^^^    ^^^ ^^      ^^^       ^^^
 
-var unionOfDifferentParameterTypes: { (a: number): number; } | { (a: string): Date; };
+declare var unionOfDifferentParameterTypes: { (a: number): number; } | { (a: string): Date; };
 >unionOfDifferentParameterTypes : ((a: number) => number) | ((a: string) => Date)
 >                               : ^^ ^^      ^^^^^      ^^^^^^ ^^      ^^^^^    ^
 >a : number
@@ -135,7 +135,7 @@ unionOfDifferentParameterTypes();// error - no call signatures
 >unionOfDifferentParameterTypes : ((a: number) => number) | ((a: string) => Date)
 >                               : ^^ ^^      ^^^^^      ^^^^^^ ^^      ^^^^^    ^
 
-var unionOfDifferentNumberOfSignatures: { (a: number): number; } | { (a: number): Date; (a: string): boolean; };
+declare var unionOfDifferentNumberOfSignatures: { (a: number): number; } | { (a: number): Date; (a: string): boolean; };
 >unionOfDifferentNumberOfSignatures : ((a: number) => number) | { (a: number): Date; (a: string): boolean; }
 >                                   : ^^ ^^      ^^^^^      ^^^^^^^ ^^      ^^^    ^^^ ^^      ^^^       ^^^
 >a : number
@@ -167,7 +167,7 @@ unionOfDifferentNumberOfSignatures("hello"); // error - no call signatures
 >"hello" : "hello"
 >        : ^^^^^^^
 
-var unionWithDifferentParameterCount: { (a: string): string; } | { (a: string, b: number): number; } ;
+declare var unionWithDifferentParameterCount: { (a: string): string; } | { (a: string, b: number): number; } ;
 >unionWithDifferentParameterCount : ((a: string) => string) | ((a: string, b: number) => number)
 >                                 : ^^ ^^      ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
 >a : string
@@ -201,7 +201,7 @@ unionWithDifferentParameterCount("hello", 10);// OK
 >10 : 10
 >   : ^^
 
-var unionWithOptionalParameter1: { (a: string, b?: number): string; } | { (a: string, b?: number): number; };
+declare var unionWithOptionalParameter1: { (a: string, b?: number): string; } | { (a: string, b?: number): number; };
 >unionWithOptionalParameter1 : ((a: string, b?: number) => string) | ((a: string, b?: number) => number)
 >                            : ^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^
 >a : string
@@ -263,7 +263,7 @@ strOrNum = unionWithOptionalParameter1(); // error
 >unionWithOptionalParameter1 : ((a: string, b?: number) => string) | ((a: string, b?: number) => number)
 >                            : ^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^
 
-var unionWithOptionalParameter2: { (a: string, b?: number): string; } | { (a: string, b: number): number };
+declare var unionWithOptionalParameter2: { (a: string, b?: number): string; } | { (a: string, b: number): number };
 >unionWithOptionalParameter2 : ((a: string, b?: number) => string) | ((a: string, b: number) => number)
 >                            : ^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
 >a : string
@@ -325,7 +325,7 @@ strOrNum = unionWithOptionalParameter2(); // error no call signature
 >unionWithOptionalParameter2 : ((a: string, b?: number) => string) | ((a: string, b: number) => number)
 >                            : ^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
 
-var unionWithOptionalParameter3: { (a: string, b?: number): string; } | { (a: string): number; };
+declare var unionWithOptionalParameter3: { (a: string, b?: number): string; } | { (a: string): number; };
 >unionWithOptionalParameter3 : ((a: string, b?: number) => string) | ((a: string) => number)
 >                            : ^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^ ^^      ^^^^^      ^
 >a : string
@@ -385,7 +385,7 @@ strOrNum = unionWithOptionalParameter3(); // needs more args
 >unionWithOptionalParameter3 : ((a: string, b?: number) => string) | ((a: string) => number)
 >                            : ^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^ ^^      ^^^^^      ^
 
-var unionWithRestParameter1: { (a: string, ...b: number[]): string; } | { (a: string, ...b: number[]): number };
+declare var unionWithRestParameter1: { (a: string, ...b: number[]): string; } | { (a: string, ...b: number[]): number };
 >unionWithRestParameter1 : ((a: string, ...b: number[]) => string) | ((a: string, ...b: number[]) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^
 >a : string
@@ -463,7 +463,7 @@ strOrNum = unionWithRestParameter1(); // error
 >unionWithRestParameter1 : ((a: string, ...b: number[]) => string) | ((a: string, ...b: number[]) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^
 
-var unionWithRestParameter2: { (a: string, ...b: number[]): string; } | { (a: string, b: number): number };
+declare var unionWithRestParameter2: { (a: string, ...b: number[]): string; } | { (a: string, b: number): number };
 >unionWithRestParameter2 : ((a: string, ...b: number[]) => string) | ((a: string, b: number) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
 >a : string
@@ -541,7 +541,7 @@ strOrNum = unionWithRestParameter2(); // error no call signature
 >unionWithRestParameter2 : ((a: string, ...b: number[]) => string) | ((a: string, b: number) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
 
-var unionWithRestParameter3: { (a: string, ...b: number[]): string; } | { (a: string): number };
+declare var unionWithRestParameter3: { (a: string, ...b: number[]): string; } | { (a: string): number };
 >unionWithRestParameter3 : ((a: string, ...b: number[]) => string) | ((a: string) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^^^^      ^
 >a : string
@@ -617,7 +617,7 @@ strOrNum = unionWithRestParameter3(); // error no call signature
 >unionWithRestParameter3 : ((a: string, ...b: number[]) => string) | ((a: string) => number)
 >                        : ^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^^^^      ^
 
-var unionWithRestParameter4: { (...a: string[]): string; } | { (a: string, b: string): number; };
+declare var unionWithRestParameter4: { (...a: string[]): string; } | { (a: string, b: string): number; };
 >unionWithRestParameter4 : ((...a: string[]) => string) | ((a: string, b: string) => number)
 >                        : ^^^^^ ^^        ^^^^^      ^^^^^^ ^^      ^^ ^^      ^^^^^      ^
 >a : string[]
diff --git a/tests/baselines/reference/unionTypeCallSignatures4.errors.txt b/tests/baselines/reference/unionTypeCallSignatures4.errors.txt
index 3a790cf5d9987..58dd8b3336e22 100644
--- a/tests/baselines/reference/unionTypeCallSignatures4.errors.txt
+++ b/tests/baselines/reference/unionTypeCallSignatures4.errors.txt
@@ -9,22 +9,22 @@ unionTypeCallSignatures4.ts(25,18): error TS2554: Expected 2 arguments, but got
     type F4 = (a: string, b?: string, ...rest: string[]) => void;
     type F5 = (a: string, b: string) => void;
     
-    var f12: F1 | F2;
+    declare var f12: F1 | F2;
     f12("a");
     f12("a", "b");
     f12("a", "b", "c");  // ok
     
-    var f34: F3 | F4;
+    declare var f34: F3 | F4;
     f34("a");
     f34("a", "b");
     f34("a", "b", "c");
     
-    var f1234: F1 | F2 | F3 | F4;
+    declare var f1234: F1 | F2 | F3 | F4;
     f1234("a");
     f1234("a", "b");
     f1234("a", "b", "c");  // ok
     
-    var f12345: F1 | F2 | F3 | F4 | F5;
+    declare var f12345: F1 | F2 | F3 | F4 | F5;
     f12345("a");  // error
     ~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
diff --git a/tests/baselines/reference/unionTypeCallSignatures4.js b/tests/baselines/reference/unionTypeCallSignatures4.js
index 33ea11a8cd7ca..f2d76d67bdd91 100644
--- a/tests/baselines/reference/unionTypeCallSignatures4.js
+++ b/tests/baselines/reference/unionTypeCallSignatures4.js
@@ -7,41 +7,37 @@ type F3 = (a: string, ...rest: string[]) => void;
 type F4 = (a: string, b?: string, ...rest: string[]) => void;
 type F5 = (a: string, b: string) => void;
 
-var f12: F1 | F2;
+declare var f12: F1 | F2;
 f12("a");
 f12("a", "b");
 f12("a", "b", "c");  // ok
 
-var f34: F3 | F4;
+declare var f34: F3 | F4;
 f34("a");
 f34("a", "b");
 f34("a", "b", "c");
 
-var f1234: F1 | F2 | F3 | F4;
+declare var f1234: F1 | F2 | F3 | F4;
 f1234("a");
 f1234("a", "b");
 f1234("a", "b", "c");  // ok
 
-var f12345: F1 | F2 | F3 | F4 | F5;
+declare var f12345: F1 | F2 | F3 | F4 | F5;
 f12345("a");  // error
 f12345("a", "b");
 f12345("a", "b", "c");  // error
 
 
 //// [unionTypeCallSignatures4.js]
-var f12;
 f12("a");
 f12("a", "b");
 f12("a", "b", "c"); // ok
-var f34;
 f34("a");
 f34("a", "b");
 f34("a", "b", "c");
-var f1234;
 f1234("a");
 f1234("a", "b");
 f1234("a", "b", "c"); // ok
-var f12345;
 f12345("a"); // error
 f12345("a", "b");
 f12345("a", "b", "c"); // error
diff --git a/tests/baselines/reference/unionTypeCallSignatures4.symbols b/tests/baselines/reference/unionTypeCallSignatures4.symbols
index c9b8df146dfe5..b9203cd32040e 100644
--- a/tests/baselines/reference/unionTypeCallSignatures4.symbols
+++ b/tests/baselines/reference/unionTypeCallSignatures4.symbols
@@ -28,52 +28,52 @@ type F5 = (a: string, b: string) => void;
 >a : Symbol(a, Decl(unionTypeCallSignatures4.ts, 4, 11))
 >b : Symbol(b, Decl(unionTypeCallSignatures4.ts, 4, 21))
 
-var f12: F1 | F2;
->f12 : Symbol(f12, Decl(unionTypeCallSignatures4.ts, 6, 3))
+declare var f12: F1 | F2;
+>f12 : Symbol(f12, Decl(unionTypeCallSignatures4.ts, 6, 11))
 >F1 : Symbol(F1, Decl(unionTypeCallSignatures4.ts, 0, 0))
 >F2 : Symbol(F2, Decl(unionTypeCallSignatures4.ts, 0, 42))
 
 f12("a");
->f12 : Symbol(f12, Decl(unionTypeCallSignatures4.ts, 6, 3))
+>f12 : Symbol(f12, Decl(unionTypeCallSignatures4.ts, 6, 11))
 
 f12("a", "b");
->f12 : Symbol(f12, Decl(unionTypeCallSignatures4.ts, 6, 3))
+>f12 : Symbol(f12, Decl(unionTypeCallSignatures4.ts, 6, 11))
 
 f12("a", "b", "c");  // ok
->f12 : Symbol(f12, Decl(unionTypeCallSignatures4.ts, 6, 3))
+>f12 : Symbol(f12, Decl(unionTypeCallSignatures4.ts, 6, 11))
 
-var f34: F3 | F4;
->f34 : Symbol(f34, Decl(unionTypeCallSignatures4.ts, 11, 3))
+declare var f34: F3 | F4;
+>f34 : Symbol(f34, Decl(unionTypeCallSignatures4.ts, 11, 11))
 >F3 : Symbol(F3, Decl(unionTypeCallSignatures4.ts, 1, 54))
 >F4 : Symbol(F4, Decl(unionTypeCallSignatures4.ts, 2, 49))
 
 f34("a");
->f34 : Symbol(f34, Decl(unionTypeCallSignatures4.ts, 11, 3))
+>f34 : Symbol(f34, Decl(unionTypeCallSignatures4.ts, 11, 11))
 
 f34("a", "b");
->f34 : Symbol(f34, Decl(unionTypeCallSignatures4.ts, 11, 3))
+>f34 : Symbol(f34, Decl(unionTypeCallSignatures4.ts, 11, 11))
 
 f34("a", "b", "c");
->f34 : Symbol(f34, Decl(unionTypeCallSignatures4.ts, 11, 3))
+>f34 : Symbol(f34, Decl(unionTypeCallSignatures4.ts, 11, 11))
 
-var f1234: F1 | F2 | F3 | F4;
->f1234 : Symbol(f1234, Decl(unionTypeCallSignatures4.ts, 16, 3))
+declare var f1234: F1 | F2 | F3 | F4;
+>f1234 : Symbol(f1234, Decl(unionTypeCallSignatures4.ts, 16, 11))
 >F1 : Symbol(F1, Decl(unionTypeCallSignatures4.ts, 0, 0))
 >F2 : Symbol(F2, Decl(unionTypeCallSignatures4.ts, 0, 42))
 >F3 : Symbol(F3, Decl(unionTypeCallSignatures4.ts, 1, 54))
 >F4 : Symbol(F4, Decl(unionTypeCallSignatures4.ts, 2, 49))
 
 f1234("a");
->f1234 : Symbol(f1234, Decl(unionTypeCallSignatures4.ts, 16, 3))
+>f1234 : Symbol(f1234, Decl(unionTypeCallSignatures4.ts, 16, 11))
 
 f1234("a", "b");
->f1234 : Symbol(f1234, Decl(unionTypeCallSignatures4.ts, 16, 3))
+>f1234 : Symbol(f1234, Decl(unionTypeCallSignatures4.ts, 16, 11))
 
 f1234("a", "b", "c");  // ok
->f1234 : Symbol(f1234, Decl(unionTypeCallSignatures4.ts, 16, 3))
+>f1234 : Symbol(f1234, Decl(unionTypeCallSignatures4.ts, 16, 11))
 
-var f12345: F1 | F2 | F3 | F4 | F5;
->f12345 : Symbol(f12345, Decl(unionTypeCallSignatures4.ts, 21, 3))
+declare var f12345: F1 | F2 | F3 | F4 | F5;
+>f12345 : Symbol(f12345, Decl(unionTypeCallSignatures4.ts, 21, 11))
 >F1 : Symbol(F1, Decl(unionTypeCallSignatures4.ts, 0, 0))
 >F2 : Symbol(F2, Decl(unionTypeCallSignatures4.ts, 0, 42))
 >F3 : Symbol(F3, Decl(unionTypeCallSignatures4.ts, 1, 54))
@@ -81,11 +81,11 @@ var f12345: F1 | F2 | F3 | F4 | F5;
 >F5 : Symbol(F5, Decl(unionTypeCallSignatures4.ts, 3, 61))
 
 f12345("a");  // error
->f12345 : Symbol(f12345, Decl(unionTypeCallSignatures4.ts, 21, 3))
+>f12345 : Symbol(f12345, Decl(unionTypeCallSignatures4.ts, 21, 11))
 
 f12345("a", "b");
->f12345 : Symbol(f12345, Decl(unionTypeCallSignatures4.ts, 21, 3))
+>f12345 : Symbol(f12345, Decl(unionTypeCallSignatures4.ts, 21, 11))
 
 f12345("a", "b", "c");  // error
->f12345 : Symbol(f12345, Decl(unionTypeCallSignatures4.ts, 21, 3))
+>f12345 : Symbol(f12345, Decl(unionTypeCallSignatures4.ts, 21, 11))
 
diff --git a/tests/baselines/reference/unionTypeCallSignatures4.types b/tests/baselines/reference/unionTypeCallSignatures4.types
index 84058d75f95bf..6ccd8bf5ad631 100644
--- a/tests/baselines/reference/unionTypeCallSignatures4.types
+++ b/tests/baselines/reference/unionTypeCallSignatures4.types
@@ -45,7 +45,7 @@ type F5 = (a: string, b: string) => void;
 >b : string
 >  : ^^^^^^
 
-var f12: F1 | F2;
+declare var f12: F1 | F2;
 >f12 : F1 | F2
 >    : ^^^^^^^
 
@@ -79,7 +79,7 @@ f12("a", "b", "c");  // ok
 >"c" : "c"
 >    : ^^^
 
-var f34: F3 | F4;
+declare var f34: F3 | F4;
 >f34 : F3 | F4
 >    : ^^^^^^^
 
@@ -113,7 +113,7 @@ f34("a", "b", "c");
 >"c" : "c"
 >    : ^^^
 
-var f1234: F1 | F2 | F3 | F4;
+declare var f1234: F1 | F2 | F3 | F4;
 >f1234 : F1 | F2 | F3 | F4
 >      : ^^^^^^^^^^^^^^^^^
 
@@ -147,7 +147,7 @@ f1234("a", "b", "c");  // ok
 >"c" : "c"
 >    : ^^^
 
-var f12345: F1 | F2 | F3 | F4 | F5;
+declare var f12345: F1 | F2 | F3 | F4 | F5;
 >f12345 : F1 | F2 | F3 | F4 | F5
 >       : ^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/unionTypeConstructSignatures.errors.txt b/tests/baselines/reference/unionTypeConstructSignatures.errors.txt
index e72268863a43e..80ac57a990560 100644
--- a/tests/baselines/reference/unionTypeConstructSignatures.errors.txt
+++ b/tests/baselines/reference/unionTypeConstructSignatures.errors.txt
@@ -38,13 +38,13 @@ unionTypeConstructSignatures.ts(73,1): error TS2511: Cannot create an instance o
 
 
 ==== unionTypeConstructSignatures.ts (28 errors) ====
-    var numOrDate: number | Date;
-    var strOrBoolean: string | boolean;
-    var strOrNum: string | number;
+    declare var numOrDate: number | Date;
+    declare var strOrBoolean: string | boolean;
+    declare var strOrNum: string | number;
     
     // If each type in U has construct signatures and the sets of construct signatures are identical ignoring return types,
     // U has the same set of construct signatures, but with return types that are unions of the return types of the respective construct signatures from each type in U.
-    var unionOfDifferentReturnType: { new (a: number): number; } | { new (a: number): Date; };
+    declare var unionOfDifferentReturnType: { new (a: number): number; } | { new (a: number): Date; };
     numOrDate = new unionOfDifferentReturnType(10);
     strOrBoolean = new unionOfDifferentReturnType("hello"); // error
     ~~~~~~~~~~~~
@@ -60,7 +60,7 @@ unionTypeConstructSignatures.ts(73,1): error TS2511: Cannot create an instance o
 !!! error TS2769:   Overload 2 of 2, '(a: string): string | boolean', gave the following error.
 !!! error TS2769:     Argument of type 'boolean' is not assignable to parameter of type 'string'.
     
-    var unionOfDifferentReturnType1: { new (a: number): number; new (a: string): string; } | { new (a: number): Date; new (a: string): boolean; };
+    declare var unionOfDifferentReturnType1: { new (a: number): number; new (a: string): string; } | { new (a: number): Date; new (a: string): boolean; };
     numOrDate = new unionOfDifferentReturnType1(10);
     strOrBoolean = new unionOfDifferentReturnType1("hello");
     new unionOfDifferentReturnType1(true); // error in type of parameter
@@ -73,9 +73,9 @@ unionTypeConstructSignatures.ts(73,1): error TS2511: Cannot create an instance o
     new unionOfDifferentReturnType1(); // error missing parameter
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
-!!! related TS6210 unionTypeConstructSignatures.ts:12:41: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeConstructSignatures.ts:12:49: An argument for 'a' was not provided.
     
-    var unionOfDifferentParameterTypes: { new (a: number): number; } | { new (a: string): Date; };
+    declare var unionOfDifferentParameterTypes: { new (a: number): number; } | { new (a: string): Date; };
     new unionOfDifferentParameterTypes(10);// error - no call signatures
                                        ~~
 !!! error TS2345: Argument of type '10' is not assignable to parameter of type 'never'.
@@ -85,30 +85,30 @@ unionTypeConstructSignatures.ts(73,1): error TS2511: Cannot create an instance o
     new unionOfDifferentParameterTypes();// error - no call signatures
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
-!!! related TS6210 unionTypeConstructSignatures.ts:18:44: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeConstructSignatures.ts:18:52: An argument for 'a' was not provided.
     
-    var unionOfDifferentNumberOfSignatures: { new (a: number): number; } | { new (a: number): Date; new (a: string): boolean; };
+    declare var unionOfDifferentNumberOfSignatures: { new (a: number): number; } | { new (a: number): Date; new (a: string): boolean; };
     new unionOfDifferentNumberOfSignatures(); // error - no call signatures
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
-!!! related TS6210 unionTypeConstructSignatures.ts:23:48: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeConstructSignatures.ts:23:56: An argument for 'a' was not provided.
     new unionOfDifferentNumberOfSignatures(10); // error - no call signatures
     new unionOfDifferentNumberOfSignatures("hello"); // error - no call signatures
                                            ~~~~~~~
 !!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
     
-    var unionWithDifferentParameterCount: { new (a: string): string; } | { new (a: string, b: number): number; };
+    declare var unionWithDifferentParameterCount: { new (a: string): string; } | { new (a: string, b: number): number; };
     new unionWithDifferentParameterCount();// needs more args
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 0.
-!!! related TS6210 unionTypeConstructSignatures.ts:28:77: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeConstructSignatures.ts:28:85: An argument for 'a' was not provided.
     new unionWithDifferentParameterCount("hello");// needs more args
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
-!!! related TS6210 unionTypeConstructSignatures.ts:28:88: An argument for 'b' was not provided.
+!!! related TS6210 unionTypeConstructSignatures.ts:28:96: An argument for 'b' was not provided.
     new unionWithDifferentParameterCount("hello", 10);// ok
     
-    var unionWithOptionalParameter1: { new (a: string, b?: number): string; } | { new (a: string, b?: number): number; };
+    declare var unionWithOptionalParameter1: { new (a: string, b?: number): string; } | { new (a: string, b?: number): number; };
     strOrNum = new unionWithOptionalParameter1('hello');
     strOrNum = new unionWithOptionalParameter1('hello', 10);
     strOrNum = new unionWithOptionalParameter1('hello', "hello"); // error in parameter type
@@ -117,13 +117,13 @@ unionTypeConstructSignatures.ts(73,1): error TS2511: Cannot create an instance o
     strOrNum = new unionWithOptionalParameter1(); // error
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1-2 arguments, but got 0.
-!!! related TS6210 unionTypeConstructSignatures.ts:33:41: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeConstructSignatures.ts:33:49: An argument for 'a' was not provided.
     
-    var unionWithOptionalParameter2: { new (a: string, b?: number): string; } | { new (a: string, b: number): number };
+    declare var unionWithOptionalParameter2: { new (a: string, b?: number): string; } | { new (a: string, b: number): number };
     strOrNum = new unionWithOptionalParameter2('hello'); // error no call signature
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
-!!! related TS6210 unionTypeConstructSignatures.ts:39:95: An argument for 'b' was not provided.
+!!! related TS6210 unionTypeConstructSignatures.ts:39:103: An argument for 'b' was not provided.
     strOrNum = new unionWithOptionalParameter2('hello', 10); // error no call signature
     strOrNum = new unionWithOptionalParameter2('hello', "hello"); // error no call signature
                                                         ~~~~~~~
@@ -131,9 +131,9 @@ unionTypeConstructSignatures.ts(73,1): error TS2511: Cannot create an instance o
     strOrNum = new unionWithOptionalParameter2(); // error no call signature
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 0.
-!!! related TS6210 unionTypeConstructSignatures.ts:39:84: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeConstructSignatures.ts:39:92: An argument for 'a' was not provided.
     
-    var unionWithOptionalParameter3: { new (a: string, b?: number): string; } | { new (a: string): number; };
+    declare var unionWithOptionalParameter3: { new (a: string, b?: number): string; } | { new (a: string): number; };
     strOrNum = new unionWithOptionalParameter3('hello'); // error no call signature
     strOrNum = new unionWithOptionalParameter3('hello', 10); // ok
     strOrNum = new unionWithOptionalParameter3('hello', "hello"); // wrong type
@@ -142,9 +142,9 @@ unionTypeConstructSignatures.ts(73,1): error TS2511: Cannot create an instance o
     strOrNum = new unionWithOptionalParameter3(); // error no call signature
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1-2 arguments, but got 0.
-!!! related TS6210 unionTypeConstructSignatures.ts:45:41: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeConstructSignatures.ts:45:49: An argument for 'a' was not provided.
     
-    var unionWithRestParameter1: { new (a: string, ...b: number[]): string; } | { new (a: string, ...b: number[]): number };
+    declare var unionWithRestParameter1: { new (a: string, ...b: number[]): string; } | { new (a: string, ...b: number[]): number };
     strOrNum = new unionWithRestParameter1('hello');
     strOrNum = new unionWithRestParameter1('hello', 10);
     strOrNum = new unionWithRestParameter1('hello', 10, 11);
@@ -154,13 +154,13 @@ unionTypeConstructSignatures.ts(73,1): error TS2511: Cannot create an instance o
     strOrNum = new unionWithRestParameter1(); // error
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2555: Expected at least 1 arguments, but got 0.
-!!! related TS6210 unionTypeConstructSignatures.ts:51:37: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeConstructSignatures.ts:51:45: An argument for 'a' was not provided.
     
-    var unionWithRestParameter2: { new (a: string, ...b: number[]): string; } | { new (a: string, b: number): number };
+    declare var unionWithRestParameter2: { new (a: string, ...b: number[]): string; } | { new (a: string, b: number): number };
     strOrNum = new unionWithRestParameter2('hello'); // error no call signature
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
-!!! related TS6210 unionTypeConstructSignatures.ts:58:95: An argument for 'b' was not provided.
+!!! related TS6210 unionTypeConstructSignatures.ts:58:103: An argument for 'b' was not provided.
     strOrNum = new unionWithRestParameter2('hello', 10); // error no call signature
     strOrNum = new unionWithRestParameter2('hello', 10, 11); // error no call signature
                                                         ~~
@@ -171,9 +171,9 @@ unionTypeConstructSignatures.ts(73,1): error TS2511: Cannot create an instance o
     strOrNum = new unionWithRestParameter2(); // error no call signature
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 0.
-!!! related TS6210 unionTypeConstructSignatures.ts:58:84: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeConstructSignatures.ts:58:92: An argument for 'a' was not provided.
     
-    var unionWithRestParameter3: { new (a: string, ...b: number[]): string; } | { new (a: string): number };
+    declare var unionWithRestParameter3: { new (a: string, ...b: number[]): string; } | { new (a: string): number };
     strOrNum = new unionWithRestParameter3('hello'); // error no call signature
     strOrNum = new unionWithRestParameter3('hello', 10); // ok
     strOrNum = new unionWithRestParameter3('hello', 10, 11); // ok
@@ -183,9 +183,9 @@ unionTypeConstructSignatures.ts(73,1): error TS2511: Cannot create an instance o
     strOrNum = new unionWithRestParameter3(); // error no call signature
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2555: Expected at least 1 arguments, but got 0.
-!!! related TS6210 unionTypeConstructSignatures.ts:65:37: An argument for 'a' was not provided.
+!!! related TS6210 unionTypeConstructSignatures.ts:65:45: An argument for 'a' was not provided.
     
-    var unionWithAbstractSignature: (abstract new (a: string) => string) | (new (a: string) => string);
+    declare var unionWithAbstractSignature: (abstract new (a: string) => string) | (new (a: string) => string);
     new unionWithAbstractSignature('hello');
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2511: Cannot create an instance of an abstract class.
diff --git a/tests/baselines/reference/unionTypeConstructSignatures.js b/tests/baselines/reference/unionTypeConstructSignatures.js
index 0bade18beec4c..4509cf066b263 100644
--- a/tests/baselines/reference/unionTypeConstructSignatures.js
+++ b/tests/baselines/reference/unionTypeConstructSignatures.js
@@ -1,140 +1,123 @@
 //// [tests/cases/conformance/types/union/unionTypeConstructSignatures.ts] ////
 
 //// [unionTypeConstructSignatures.ts]
-var numOrDate: number | Date;
-var strOrBoolean: string | boolean;
-var strOrNum: string | number;
+declare var numOrDate: number | Date;
+declare var strOrBoolean: string | boolean;
+declare var strOrNum: string | number;
 
 // If each type in U has construct signatures and the sets of construct signatures are identical ignoring return types,
 // U has the same set of construct signatures, but with return types that are unions of the return types of the respective construct signatures from each type in U.
-var unionOfDifferentReturnType: { new (a: number): number; } | { new (a: number): Date; };
+declare var unionOfDifferentReturnType: { new (a: number): number; } | { new (a: number): Date; };
 numOrDate = new unionOfDifferentReturnType(10);
 strOrBoolean = new unionOfDifferentReturnType("hello"); // error
 new unionOfDifferentReturnType1(true); // error in type of parameter
 
-var unionOfDifferentReturnType1: { new (a: number): number; new (a: string): string; } | { new (a: number): Date; new (a: string): boolean; };
+declare var unionOfDifferentReturnType1: { new (a: number): number; new (a: string): string; } | { new (a: number): Date; new (a: string): boolean; };
 numOrDate = new unionOfDifferentReturnType1(10);
 strOrBoolean = new unionOfDifferentReturnType1("hello");
 new unionOfDifferentReturnType1(true); // error in type of parameter
 new unionOfDifferentReturnType1(); // error missing parameter
 
-var unionOfDifferentParameterTypes: { new (a: number): number; } | { new (a: string): Date; };
+declare var unionOfDifferentParameterTypes: { new (a: number): number; } | { new (a: string): Date; };
 new unionOfDifferentParameterTypes(10);// error - no call signatures
 new unionOfDifferentParameterTypes("hello");// error - no call signatures
 new unionOfDifferentParameterTypes();// error - no call signatures
 
-var unionOfDifferentNumberOfSignatures: { new (a: number): number; } | { new (a: number): Date; new (a: string): boolean; };
+declare var unionOfDifferentNumberOfSignatures: { new (a: number): number; } | { new (a: number): Date; new (a: string): boolean; };
 new unionOfDifferentNumberOfSignatures(); // error - no call signatures
 new unionOfDifferentNumberOfSignatures(10); // error - no call signatures
 new unionOfDifferentNumberOfSignatures("hello"); // error - no call signatures
 
-var unionWithDifferentParameterCount: { new (a: string): string; } | { new (a: string, b: number): number; };
+declare var unionWithDifferentParameterCount: { new (a: string): string; } | { new (a: string, b: number): number; };
 new unionWithDifferentParameterCount();// needs more args
 new unionWithDifferentParameterCount("hello");// needs more args
 new unionWithDifferentParameterCount("hello", 10);// ok
 
-var unionWithOptionalParameter1: { new (a: string, b?: number): string; } | { new (a: string, b?: number): number; };
+declare var unionWithOptionalParameter1: { new (a: string, b?: number): string; } | { new (a: string, b?: number): number; };
 strOrNum = new unionWithOptionalParameter1('hello');
 strOrNum = new unionWithOptionalParameter1('hello', 10);
 strOrNum = new unionWithOptionalParameter1('hello', "hello"); // error in parameter type
 strOrNum = new unionWithOptionalParameter1(); // error
 
-var unionWithOptionalParameter2: { new (a: string, b?: number): string; } | { new (a: string, b: number): number };
+declare var unionWithOptionalParameter2: { new (a: string, b?: number): string; } | { new (a: string, b: number): number };
 strOrNum = new unionWithOptionalParameter2('hello'); // error no call signature
 strOrNum = new unionWithOptionalParameter2('hello', 10); // error no call signature
 strOrNum = new unionWithOptionalParameter2('hello', "hello"); // error no call signature
 strOrNum = new unionWithOptionalParameter2(); // error no call signature
 
-var unionWithOptionalParameter3: { new (a: string, b?: number): string; } | { new (a: string): number; };
+declare var unionWithOptionalParameter3: { new (a: string, b?: number): string; } | { new (a: string): number; };
 strOrNum = new unionWithOptionalParameter3('hello'); // error no call signature
 strOrNum = new unionWithOptionalParameter3('hello', 10); // ok
 strOrNum = new unionWithOptionalParameter3('hello', "hello"); // wrong type
 strOrNum = new unionWithOptionalParameter3(); // error no call signature
 
-var unionWithRestParameter1: { new (a: string, ...b: number[]): string; } | { new (a: string, ...b: number[]): number };
+declare var unionWithRestParameter1: { new (a: string, ...b: number[]): string; } | { new (a: string, ...b: number[]): number };
 strOrNum = new unionWithRestParameter1('hello');
 strOrNum = new unionWithRestParameter1('hello', 10);
 strOrNum = new unionWithRestParameter1('hello', 10, 11);
 strOrNum = new unionWithRestParameter1('hello', "hello"); // error in parameter type
 strOrNum = new unionWithRestParameter1(); // error
 
-var unionWithRestParameter2: { new (a: string, ...b: number[]): string; } | { new (a: string, b: number): number };
+declare var unionWithRestParameter2: { new (a: string, ...b: number[]): string; } | { new (a: string, b: number): number };
 strOrNum = new unionWithRestParameter2('hello'); // error no call signature
 strOrNum = new unionWithRestParameter2('hello', 10); // error no call signature
 strOrNum = new unionWithRestParameter2('hello', 10, 11); // error no call signature
 strOrNum = new unionWithRestParameter2('hello', "hello"); // error no call signature
 strOrNum = new unionWithRestParameter2(); // error no call signature
 
-var unionWithRestParameter3: { new (a: string, ...b: number[]): string; } | { new (a: string): number };
+declare var unionWithRestParameter3: { new (a: string, ...b: number[]): string; } | { new (a: string): number };
 strOrNum = new unionWithRestParameter3('hello'); // error no call signature
 strOrNum = new unionWithRestParameter3('hello', 10); // ok
 strOrNum = new unionWithRestParameter3('hello', 10, 11); // ok
 strOrNum = new unionWithRestParameter3('hello', "hello"); // wrong type
 strOrNum = new unionWithRestParameter3(); // error no call signature
 
-var unionWithAbstractSignature: (abstract new (a: string) => string) | (new (a: string) => string);
+declare var unionWithAbstractSignature: (abstract new (a: string) => string) | (new (a: string) => string);
 new unionWithAbstractSignature('hello');
 
 
 //// [unionTypeConstructSignatures.js]
-var numOrDate;
-var strOrBoolean;
-var strOrNum;
-// If each type in U has construct signatures and the sets of construct signatures are identical ignoring return types,
-// U has the same set of construct signatures, but with return types that are unions of the return types of the respective construct signatures from each type in U.
-var unionOfDifferentReturnType;
 numOrDate = new unionOfDifferentReturnType(10);
 strOrBoolean = new unionOfDifferentReturnType("hello"); // error
 new unionOfDifferentReturnType1(true); // error in type of parameter
-var unionOfDifferentReturnType1;
 numOrDate = new unionOfDifferentReturnType1(10);
 strOrBoolean = new unionOfDifferentReturnType1("hello");
 new unionOfDifferentReturnType1(true); // error in type of parameter
 new unionOfDifferentReturnType1(); // error missing parameter
-var unionOfDifferentParameterTypes;
 new unionOfDifferentParameterTypes(10); // error - no call signatures
 new unionOfDifferentParameterTypes("hello"); // error - no call signatures
 new unionOfDifferentParameterTypes(); // error - no call signatures
-var unionOfDifferentNumberOfSignatures;
 new unionOfDifferentNumberOfSignatures(); // error - no call signatures
 new unionOfDifferentNumberOfSignatures(10); // error - no call signatures
 new unionOfDifferentNumberOfSignatures("hello"); // error - no call signatures
-var unionWithDifferentParameterCount;
 new unionWithDifferentParameterCount(); // needs more args
 new unionWithDifferentParameterCount("hello"); // needs more args
 new unionWithDifferentParameterCount("hello", 10); // ok
-var unionWithOptionalParameter1;
 strOrNum = new unionWithOptionalParameter1('hello');
 strOrNum = new unionWithOptionalParameter1('hello', 10);
 strOrNum = new unionWithOptionalParameter1('hello', "hello"); // error in parameter type
 strOrNum = new unionWithOptionalParameter1(); // error
-var unionWithOptionalParameter2;
 strOrNum = new unionWithOptionalParameter2('hello'); // error no call signature
 strOrNum = new unionWithOptionalParameter2('hello', 10); // error no call signature
 strOrNum = new unionWithOptionalParameter2('hello', "hello"); // error no call signature
 strOrNum = new unionWithOptionalParameter2(); // error no call signature
-var unionWithOptionalParameter3;
 strOrNum = new unionWithOptionalParameter3('hello'); // error no call signature
 strOrNum = new unionWithOptionalParameter3('hello', 10); // ok
 strOrNum = new unionWithOptionalParameter3('hello', "hello"); // wrong type
 strOrNum = new unionWithOptionalParameter3(); // error no call signature
-var unionWithRestParameter1;
 strOrNum = new unionWithRestParameter1('hello');
 strOrNum = new unionWithRestParameter1('hello', 10);
 strOrNum = new unionWithRestParameter1('hello', 10, 11);
 strOrNum = new unionWithRestParameter1('hello', "hello"); // error in parameter type
 strOrNum = new unionWithRestParameter1(); // error
-var unionWithRestParameter2;
 strOrNum = new unionWithRestParameter2('hello'); // error no call signature
 strOrNum = new unionWithRestParameter2('hello', 10); // error no call signature
 strOrNum = new unionWithRestParameter2('hello', 10, 11); // error no call signature
 strOrNum = new unionWithRestParameter2('hello', "hello"); // error no call signature
 strOrNum = new unionWithRestParameter2(); // error no call signature
-var unionWithRestParameter3;
 strOrNum = new unionWithRestParameter3('hello'); // error no call signature
 strOrNum = new unionWithRestParameter3('hello', 10); // ok
 strOrNum = new unionWithRestParameter3('hello', 10, 11); // ok
 strOrNum = new unionWithRestParameter3('hello', "hello"); // wrong type
 strOrNum = new unionWithRestParameter3(); // error no call signature
-var unionWithAbstractSignature;
 new unionWithAbstractSignature('hello');
diff --git a/tests/baselines/reference/unionTypeConstructSignatures.symbols b/tests/baselines/reference/unionTypeConstructSignatures.symbols
index c5776d7dbc106..89855db0e8f73 100644
--- a/tests/baselines/reference/unionTypeConstructSignatures.symbols
+++ b/tests/baselines/reference/unionTypeConstructSignatures.symbols
@@ -1,256 +1,256 @@
 //// [tests/cases/conformance/types/union/unionTypeConstructSignatures.ts] ////
 
 === unionTypeConstructSignatures.ts ===
-var numOrDate: number | Date;
->numOrDate : Symbol(numOrDate, Decl(unionTypeConstructSignatures.ts, 0, 3))
+declare var numOrDate: number | Date;
+>numOrDate : Symbol(numOrDate, Decl(unionTypeConstructSignatures.ts, 0, 11))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
-var strOrBoolean: string | boolean;
->strOrBoolean : Symbol(strOrBoolean, Decl(unionTypeConstructSignatures.ts, 1, 3))
+declare var strOrBoolean: string | boolean;
+>strOrBoolean : Symbol(strOrBoolean, Decl(unionTypeConstructSignatures.ts, 1, 11))
 
-var strOrNum: string | number;
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
+declare var strOrNum: string | number;
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
 
 // If each type in U has construct signatures and the sets of construct signatures are identical ignoring return types,
 // U has the same set of construct signatures, but with return types that are unions of the return types of the respective construct signatures from each type in U.
-var unionOfDifferentReturnType: { new (a: number): number; } | { new (a: number): Date; };
->unionOfDifferentReturnType : Symbol(unionOfDifferentReturnType, Decl(unionTypeConstructSignatures.ts, 6, 3))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 6, 39))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 6, 70))
+declare var unionOfDifferentReturnType: { new (a: number): number; } | { new (a: number): Date; };
+>unionOfDifferentReturnType : Symbol(unionOfDifferentReturnType, Decl(unionTypeConstructSignatures.ts, 6, 11))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 6, 47))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 6, 78))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 numOrDate = new unionOfDifferentReturnType(10);
->numOrDate : Symbol(numOrDate, Decl(unionTypeConstructSignatures.ts, 0, 3))
->unionOfDifferentReturnType : Symbol(unionOfDifferentReturnType, Decl(unionTypeConstructSignatures.ts, 6, 3))
+>numOrDate : Symbol(numOrDate, Decl(unionTypeConstructSignatures.ts, 0, 11))
+>unionOfDifferentReturnType : Symbol(unionOfDifferentReturnType, Decl(unionTypeConstructSignatures.ts, 6, 11))
 
 strOrBoolean = new unionOfDifferentReturnType("hello"); // error
->strOrBoolean : Symbol(strOrBoolean, Decl(unionTypeConstructSignatures.ts, 1, 3))
->unionOfDifferentReturnType : Symbol(unionOfDifferentReturnType, Decl(unionTypeConstructSignatures.ts, 6, 3))
+>strOrBoolean : Symbol(strOrBoolean, Decl(unionTypeConstructSignatures.ts, 1, 11))
+>unionOfDifferentReturnType : Symbol(unionOfDifferentReturnType, Decl(unionTypeConstructSignatures.ts, 6, 11))
 
 new unionOfDifferentReturnType1(true); // error in type of parameter
->unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeConstructSignatures.ts, 11, 3))
+>unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeConstructSignatures.ts, 11, 11))
 
-var unionOfDifferentReturnType1: { new (a: number): number; new (a: string): string; } | { new (a: number): Date; new (a: string): boolean; };
->unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeConstructSignatures.ts, 11, 3))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 11, 40))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 11, 65))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 11, 96))
+declare var unionOfDifferentReturnType1: { new (a: number): number; new (a: string): string; } | { new (a: number): Date; new (a: string): boolean; };
+>unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeConstructSignatures.ts, 11, 11))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 11, 48))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 11, 73))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 11, 104))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 11, 119))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 11, 127))
 
 numOrDate = new unionOfDifferentReturnType1(10);
->numOrDate : Symbol(numOrDate, Decl(unionTypeConstructSignatures.ts, 0, 3))
->unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeConstructSignatures.ts, 11, 3))
+>numOrDate : Symbol(numOrDate, Decl(unionTypeConstructSignatures.ts, 0, 11))
+>unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeConstructSignatures.ts, 11, 11))
 
 strOrBoolean = new unionOfDifferentReturnType1("hello");
->strOrBoolean : Symbol(strOrBoolean, Decl(unionTypeConstructSignatures.ts, 1, 3))
->unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeConstructSignatures.ts, 11, 3))
+>strOrBoolean : Symbol(strOrBoolean, Decl(unionTypeConstructSignatures.ts, 1, 11))
+>unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeConstructSignatures.ts, 11, 11))
 
 new unionOfDifferentReturnType1(true); // error in type of parameter
->unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeConstructSignatures.ts, 11, 3))
+>unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeConstructSignatures.ts, 11, 11))
 
 new unionOfDifferentReturnType1(); // error missing parameter
->unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeConstructSignatures.ts, 11, 3))
+>unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeConstructSignatures.ts, 11, 11))
 
-var unionOfDifferentParameterTypes: { new (a: number): number; } | { new (a: string): Date; };
->unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeConstructSignatures.ts, 17, 3))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 17, 43))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 17, 74))
+declare var unionOfDifferentParameterTypes: { new (a: number): number; } | { new (a: string): Date; };
+>unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeConstructSignatures.ts, 17, 11))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 17, 51))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 17, 82))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 new unionOfDifferentParameterTypes(10);// error - no call signatures
->unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeConstructSignatures.ts, 17, 3))
+>unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeConstructSignatures.ts, 17, 11))
 
 new unionOfDifferentParameterTypes("hello");// error - no call signatures
->unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeConstructSignatures.ts, 17, 3))
+>unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeConstructSignatures.ts, 17, 11))
 
 new unionOfDifferentParameterTypes();// error - no call signatures
->unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeConstructSignatures.ts, 17, 3))
+>unionOfDifferentParameterTypes : Symbol(unionOfDifferentParameterTypes, Decl(unionTypeConstructSignatures.ts, 17, 11))
 
-var unionOfDifferentNumberOfSignatures: { new (a: number): number; } | { new (a: number): Date; new (a: string): boolean; };
->unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeConstructSignatures.ts, 22, 3))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 22, 47))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 22, 78))
+declare var unionOfDifferentNumberOfSignatures: { new (a: number): number; } | { new (a: number): Date; new (a: string): boolean; };
+>unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeConstructSignatures.ts, 22, 11))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 22, 55))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 22, 86))
 >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 22, 101))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 22, 109))
 
 new unionOfDifferentNumberOfSignatures(); // error - no call signatures
->unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeConstructSignatures.ts, 22, 3))
+>unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeConstructSignatures.ts, 22, 11))
 
 new unionOfDifferentNumberOfSignatures(10); // error - no call signatures
->unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeConstructSignatures.ts, 22, 3))
+>unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeConstructSignatures.ts, 22, 11))
 
 new unionOfDifferentNumberOfSignatures("hello"); // error - no call signatures
->unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeConstructSignatures.ts, 22, 3))
+>unionOfDifferentNumberOfSignatures : Symbol(unionOfDifferentNumberOfSignatures, Decl(unionTypeConstructSignatures.ts, 22, 11))
 
-var unionWithDifferentParameterCount: { new (a: string): string; } | { new (a: string, b: number): number; };
->unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeConstructSignatures.ts, 27, 3))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 27, 45))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 27, 76))
->b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 27, 86))
+declare var unionWithDifferentParameterCount: { new (a: string): string; } | { new (a: string, b: number): number; };
+>unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeConstructSignatures.ts, 27, 11))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 27, 53))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 27, 84))
+>b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 27, 94))
 
 new unionWithDifferentParameterCount();// needs more args
->unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeConstructSignatures.ts, 27, 3))
+>unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeConstructSignatures.ts, 27, 11))
 
 new unionWithDifferentParameterCount("hello");// needs more args
->unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeConstructSignatures.ts, 27, 3))
+>unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeConstructSignatures.ts, 27, 11))
 
 new unionWithDifferentParameterCount("hello", 10);// ok
->unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeConstructSignatures.ts, 27, 3))
+>unionWithDifferentParameterCount : Symbol(unionWithDifferentParameterCount, Decl(unionTypeConstructSignatures.ts, 27, 11))
 
-var unionWithOptionalParameter1: { new (a: string, b?: number): string; } | { new (a: string, b?: number): number; };
->unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeConstructSignatures.ts, 32, 3))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 32, 40))
->b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 32, 50))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 32, 83))
->b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 32, 93))
+declare var unionWithOptionalParameter1: { new (a: string, b?: number): string; } | { new (a: string, b?: number): number; };
+>unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeConstructSignatures.ts, 32, 11))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 32, 48))
+>b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 32, 58))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 32, 91))
+>b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 32, 101))
 
 strOrNum = new unionWithOptionalParameter1('hello');
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeConstructSignatures.ts, 32, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeConstructSignatures.ts, 32, 11))
 
 strOrNum = new unionWithOptionalParameter1('hello', 10);
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeConstructSignatures.ts, 32, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeConstructSignatures.ts, 32, 11))
 
 strOrNum = new unionWithOptionalParameter1('hello', "hello"); // error in parameter type
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeConstructSignatures.ts, 32, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeConstructSignatures.ts, 32, 11))
 
 strOrNum = new unionWithOptionalParameter1(); // error
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeConstructSignatures.ts, 32, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithOptionalParameter1 : Symbol(unionWithOptionalParameter1, Decl(unionTypeConstructSignatures.ts, 32, 11))
 
-var unionWithOptionalParameter2: { new (a: string, b?: number): string; } | { new (a: string, b: number): number };
->unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeConstructSignatures.ts, 38, 3))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 38, 40))
->b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 38, 50))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 38, 83))
->b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 38, 93))
+declare var unionWithOptionalParameter2: { new (a: string, b?: number): string; } | { new (a: string, b: number): number };
+>unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeConstructSignatures.ts, 38, 11))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 38, 48))
+>b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 38, 58))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 38, 91))
+>b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 38, 101))
 
 strOrNum = new unionWithOptionalParameter2('hello'); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeConstructSignatures.ts, 38, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeConstructSignatures.ts, 38, 11))
 
 strOrNum = new unionWithOptionalParameter2('hello', 10); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeConstructSignatures.ts, 38, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeConstructSignatures.ts, 38, 11))
 
 strOrNum = new unionWithOptionalParameter2('hello', "hello"); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeConstructSignatures.ts, 38, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeConstructSignatures.ts, 38, 11))
 
 strOrNum = new unionWithOptionalParameter2(); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeConstructSignatures.ts, 38, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithOptionalParameter2 : Symbol(unionWithOptionalParameter2, Decl(unionTypeConstructSignatures.ts, 38, 11))
 
-var unionWithOptionalParameter3: { new (a: string, b?: number): string; } | { new (a: string): number; };
->unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeConstructSignatures.ts, 44, 3))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 44, 40))
->b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 44, 50))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 44, 83))
+declare var unionWithOptionalParameter3: { new (a: string, b?: number): string; } | { new (a: string): number; };
+>unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeConstructSignatures.ts, 44, 11))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 44, 48))
+>b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 44, 58))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 44, 91))
 
 strOrNum = new unionWithOptionalParameter3('hello'); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeConstructSignatures.ts, 44, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeConstructSignatures.ts, 44, 11))
 
 strOrNum = new unionWithOptionalParameter3('hello', 10); // ok
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeConstructSignatures.ts, 44, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeConstructSignatures.ts, 44, 11))
 
 strOrNum = new unionWithOptionalParameter3('hello', "hello"); // wrong type
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeConstructSignatures.ts, 44, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeConstructSignatures.ts, 44, 11))
 
 strOrNum = new unionWithOptionalParameter3(); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeConstructSignatures.ts, 44, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithOptionalParameter3 : Symbol(unionWithOptionalParameter3, Decl(unionTypeConstructSignatures.ts, 44, 11))
 
-var unionWithRestParameter1: { new (a: string, ...b: number[]): string; } | { new (a: string, ...b: number[]): number };
->unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeConstructSignatures.ts, 50, 3))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 50, 36))
->b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 50, 46))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 50, 83))
->b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 50, 93))
+declare var unionWithRestParameter1: { new (a: string, ...b: number[]): string; } | { new (a: string, ...b: number[]): number };
+>unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeConstructSignatures.ts, 50, 11))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 50, 44))
+>b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 50, 54))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 50, 91))
+>b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 50, 101))
 
 strOrNum = new unionWithRestParameter1('hello');
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeConstructSignatures.ts, 50, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeConstructSignatures.ts, 50, 11))
 
 strOrNum = new unionWithRestParameter1('hello', 10);
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeConstructSignatures.ts, 50, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeConstructSignatures.ts, 50, 11))
 
 strOrNum = new unionWithRestParameter1('hello', 10, 11);
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeConstructSignatures.ts, 50, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeConstructSignatures.ts, 50, 11))
 
 strOrNum = new unionWithRestParameter1('hello', "hello"); // error in parameter type
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeConstructSignatures.ts, 50, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeConstructSignatures.ts, 50, 11))
 
 strOrNum = new unionWithRestParameter1(); // error
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeConstructSignatures.ts, 50, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithRestParameter1 : Symbol(unionWithRestParameter1, Decl(unionTypeConstructSignatures.ts, 50, 11))
 
-var unionWithRestParameter2: { new (a: string, ...b: number[]): string; } | { new (a: string, b: number): number };
->unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeConstructSignatures.ts, 57, 3))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 57, 36))
->b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 57, 46))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 57, 83))
->b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 57, 93))
+declare var unionWithRestParameter2: { new (a: string, ...b: number[]): string; } | { new (a: string, b: number): number };
+>unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeConstructSignatures.ts, 57, 11))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 57, 44))
+>b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 57, 54))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 57, 91))
+>b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 57, 101))
 
 strOrNum = new unionWithRestParameter2('hello'); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeConstructSignatures.ts, 57, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeConstructSignatures.ts, 57, 11))
 
 strOrNum = new unionWithRestParameter2('hello', 10); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeConstructSignatures.ts, 57, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeConstructSignatures.ts, 57, 11))
 
 strOrNum = new unionWithRestParameter2('hello', 10, 11); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeConstructSignatures.ts, 57, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeConstructSignatures.ts, 57, 11))
 
 strOrNum = new unionWithRestParameter2('hello', "hello"); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeConstructSignatures.ts, 57, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeConstructSignatures.ts, 57, 11))
 
 strOrNum = new unionWithRestParameter2(); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeConstructSignatures.ts, 57, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithRestParameter2 : Symbol(unionWithRestParameter2, Decl(unionTypeConstructSignatures.ts, 57, 11))
 
-var unionWithRestParameter3: { new (a: string, ...b: number[]): string; } | { new (a: string): number };
->unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeConstructSignatures.ts, 64, 3))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 64, 36))
->b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 64, 46))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 64, 83))
+declare var unionWithRestParameter3: { new (a: string, ...b: number[]): string; } | { new (a: string): number };
+>unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeConstructSignatures.ts, 64, 11))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 64, 44))
+>b : Symbol(b, Decl(unionTypeConstructSignatures.ts, 64, 54))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 64, 91))
 
 strOrNum = new unionWithRestParameter3('hello'); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeConstructSignatures.ts, 64, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeConstructSignatures.ts, 64, 11))
 
 strOrNum = new unionWithRestParameter3('hello', 10); // ok
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeConstructSignatures.ts, 64, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeConstructSignatures.ts, 64, 11))
 
 strOrNum = new unionWithRestParameter3('hello', 10, 11); // ok
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeConstructSignatures.ts, 64, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeConstructSignatures.ts, 64, 11))
 
 strOrNum = new unionWithRestParameter3('hello', "hello"); // wrong type
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeConstructSignatures.ts, 64, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeConstructSignatures.ts, 64, 11))
 
 strOrNum = new unionWithRestParameter3(); // error no call signature
->strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 3))
->unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeConstructSignatures.ts, 64, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeConstructSignatures.ts, 2, 11))
+>unionWithRestParameter3 : Symbol(unionWithRestParameter3, Decl(unionTypeConstructSignatures.ts, 64, 11))
 
-var unionWithAbstractSignature: (abstract new (a: string) => string) | (new (a: string) => string);
->unionWithAbstractSignature : Symbol(unionWithAbstractSignature, Decl(unionTypeConstructSignatures.ts, 71, 3))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 71, 47))
->a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 71, 77))
+declare var unionWithAbstractSignature: (abstract new (a: string) => string) | (new (a: string) => string);
+>unionWithAbstractSignature : Symbol(unionWithAbstractSignature, Decl(unionTypeConstructSignatures.ts, 71, 11))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 71, 55))
+>a : Symbol(a, Decl(unionTypeConstructSignatures.ts, 71, 85))
 
 new unionWithAbstractSignature('hello');
->unionWithAbstractSignature : Symbol(unionWithAbstractSignature, Decl(unionTypeConstructSignatures.ts, 71, 3))
+>unionWithAbstractSignature : Symbol(unionWithAbstractSignature, Decl(unionTypeConstructSignatures.ts, 71, 11))
 
diff --git a/tests/baselines/reference/unionTypeConstructSignatures.types b/tests/baselines/reference/unionTypeConstructSignatures.types
index 7876baf6bc870..2900b172307fa 100644
--- a/tests/baselines/reference/unionTypeConstructSignatures.types
+++ b/tests/baselines/reference/unionTypeConstructSignatures.types
@@ -1,21 +1,21 @@
 //// [tests/cases/conformance/types/union/unionTypeConstructSignatures.ts] ////
 
 === unionTypeConstructSignatures.ts ===
-var numOrDate: number | Date;
+declare var numOrDate: number | Date;
 >numOrDate : number | Date
 >          : ^^^^^^^^^^^^^
 
-var strOrBoolean: string | boolean;
+declare var strOrBoolean: string | boolean;
 >strOrBoolean : string | boolean
 >             : ^^^^^^^^^^^^^^^^
 
-var strOrNum: string | number;
+declare var strOrNum: string | number;
 >strOrNum : string | number
 >         : ^^^^^^^^^^^^^^^
 
 // If each type in U has construct signatures and the sets of construct signatures are identical ignoring return types,
 // U has the same set of construct signatures, but with return types that are unions of the return types of the respective construct signatures from each type in U.
-var unionOfDifferentReturnType: { new (a: number): number; } | { new (a: number): Date; };
+declare var unionOfDifferentReturnType: { new (a: number): number; } | { new (a: number): Date; };
 >unionOfDifferentReturnType : (new (a: number) => number) | (new (a: number) => Date)
 >                           : ^^^^^^ ^^      ^^^^^      ^^^^^^^^^^ ^^      ^^^^^    ^
 >a : number
@@ -55,7 +55,7 @@ new unionOfDifferentReturnType1(true); // error in type of parameter
 >true : true
 >     : ^^^^
 
-var unionOfDifferentReturnType1: { new (a: number): number; new (a: string): string; } | { new (a: number): Date; new (a: string): boolean; };
+declare var unionOfDifferentReturnType1: { new (a: number): number; new (a: string): string; } | { new (a: number): Date; new (a: string): boolean; };
 >unionOfDifferentReturnType1 : { new (a: number): number; new (a: string): string; } | { new (a: number): Date; new (a: string): boolean; }
 >                            : ^^^^^^^ ^^      ^^^      ^^^^^^^ ^^      ^^^      ^^^^^^^^^^^^^ ^^      ^^^    ^^^^^^^ ^^      ^^^       ^^^
 >a : number
@@ -105,7 +105,7 @@ new unionOfDifferentReturnType1(); // error missing parameter
 >unionOfDifferentReturnType1 : { new (a: number): number; new (a: string): string; } | { new (a: number): Date; new (a: string): boolean; }
 >                            : ^^^^^^^ ^^      ^^^      ^^^^^^^ ^^      ^^^      ^^^^^^^^^^^^^ ^^      ^^^    ^^^^^^^ ^^      ^^^       ^^^
 
-var unionOfDifferentParameterTypes: { new (a: number): number; } | { new (a: string): Date; };
+declare var unionOfDifferentParameterTypes: { new (a: number): number; } | { new (a: string): Date; };
 >unionOfDifferentParameterTypes : (new (a: number) => number) | (new (a: string) => Date)
 >                               : ^^^^^^ ^^      ^^^^^      ^^^^^^^^^^ ^^      ^^^^^    ^
 >a : number
@@ -135,7 +135,7 @@ new unionOfDifferentParameterTypes();// error - no call signatures
 >unionOfDifferentParameterTypes : (new (a: number) => number) | (new (a: string) => Date)
 >                               : ^^^^^^ ^^      ^^^^^      ^^^^^^^^^^ ^^      ^^^^^    ^
 
-var unionOfDifferentNumberOfSignatures: { new (a: number): number; } | { new (a: number): Date; new (a: string): boolean; };
+declare var unionOfDifferentNumberOfSignatures: { new (a: number): number; } | { new (a: number): Date; new (a: string): boolean; };
 >unionOfDifferentNumberOfSignatures : (new (a: number) => number) | { new (a: number): Date; new (a: string): boolean; }
 >                                   : ^^^^^^ ^^      ^^^^^      ^^^^^^^^^^^ ^^      ^^^    ^^^^^^^ ^^      ^^^       ^^^
 >a : number
@@ -167,7 +167,7 @@ new unionOfDifferentNumberOfSignatures("hello"); // error - no call signatures
 >"hello" : "hello"
 >        : ^^^^^^^
 
-var unionWithDifferentParameterCount: { new (a: string): string; } | { new (a: string, b: number): number; };
+declare var unionWithDifferentParameterCount: { new (a: string): string; } | { new (a: string, b: number): number; };
 >unionWithDifferentParameterCount : (new (a: string) => string) | (new (a: string, b: number) => number)
 >                                 : ^^^^^^ ^^      ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^      ^^^^^      ^
 >a : string
@@ -201,7 +201,7 @@ new unionWithDifferentParameterCount("hello", 10);// ok
 >10 : 10
 >   : ^^
 
-var unionWithOptionalParameter1: { new (a: string, b?: number): string; } | { new (a: string, b?: number): number; };
+declare var unionWithOptionalParameter1: { new (a: string, b?: number): string; } | { new (a: string, b?: number): number; };
 >unionWithOptionalParameter1 : (new (a: string, b?: number) => string) | (new (a: string, b?: number) => number)
 >                            : ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^      ^
 >a : string
@@ -263,7 +263,7 @@ strOrNum = new unionWithOptionalParameter1(); // error
 >unionWithOptionalParameter1 : (new (a: string, b?: number) => string) | (new (a: string, b?: number) => number)
 >                            : ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^^      ^^^^^      ^
 
-var unionWithOptionalParameter2: { new (a: string, b?: number): string; } | { new (a: string, b: number): number };
+declare var unionWithOptionalParameter2: { new (a: string, b?: number): string; } | { new (a: string, b: number): number };
 >unionWithOptionalParameter2 : (new (a: string, b?: number) => string) | (new (a: string, b: number) => number)
 >                            : ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^      ^^^^^      ^
 >a : string
@@ -325,7 +325,7 @@ strOrNum = new unionWithOptionalParameter2(); // error no call signature
 >unionWithOptionalParameter2 : (new (a: string, b?: number) => string) | (new (a: string, b: number) => number)
 >                            : ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^      ^^^^^      ^
 
-var unionWithOptionalParameter3: { new (a: string, b?: number): string; } | { new (a: string): number; };
+declare var unionWithOptionalParameter3: { new (a: string, b?: number): string; } | { new (a: string): number; };
 >unionWithOptionalParameter3 : (new (a: string, b?: number) => string) | (new (a: string) => number)
 >                            : ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^^^^^ ^^      ^^^^^      ^
 >a : string
@@ -385,7 +385,7 @@ strOrNum = new unionWithOptionalParameter3(); // error no call signature
 >unionWithOptionalParameter3 : (new (a: string, b?: number) => string) | (new (a: string) => number)
 >                            : ^^^^^^ ^^      ^^ ^^^      ^^^^^      ^^^^^^^^^^ ^^      ^^^^^      ^
 
-var unionWithRestParameter1: { new (a: string, ...b: number[]): string; } | { new (a: string, ...b: number[]): number };
+declare var unionWithRestParameter1: { new (a: string, ...b: number[]): string; } | { new (a: string, ...b: number[]): number };
 >unionWithRestParameter1 : (new (a: string, ...b: number[]) => string) | (new (a: string, ...b: number[]) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^
 >a : string
@@ -463,7 +463,7 @@ strOrNum = new unionWithRestParameter1(); // error
 >unionWithRestParameter1 : (new (a: string, ...b: number[]) => string) | (new (a: string, ...b: number[]) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^
 
-var unionWithRestParameter2: { new (a: string, ...b: number[]): string; } | { new (a: string, b: number): number };
+declare var unionWithRestParameter2: { new (a: string, ...b: number[]): string; } | { new (a: string, b: number): number };
 >unionWithRestParameter2 : (new (a: string, ...b: number[]) => string) | (new (a: string, b: number) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^      ^^^^^      ^
 >a : string
@@ -541,7 +541,7 @@ strOrNum = new unionWithRestParameter2(); // error no call signature
 >unionWithRestParameter2 : (new (a: string, ...b: number[]) => string) | (new (a: string, b: number) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^ ^^      ^^^^^      ^
 
-var unionWithRestParameter3: { new (a: string, ...b: number[]): string; } | { new (a: string): number };
+declare var unionWithRestParameter3: { new (a: string, ...b: number[]): string; } | { new (a: string): number };
 >unionWithRestParameter3 : (new (a: string, ...b: number[]) => string) | (new (a: string) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^^^^      ^
 >a : string
@@ -617,7 +617,7 @@ strOrNum = new unionWithRestParameter3(); // error no call signature
 >unionWithRestParameter3 : (new (a: string, ...b: number[]) => string) | (new (a: string) => number)
 >                        : ^^^^^^ ^^      ^^^^^ ^^        ^^^^^      ^^^^^^^^^^ ^^      ^^^^^      ^
 
-var unionWithAbstractSignature: (abstract new (a: string) => string) | (new (a: string) => string);
+declare var unionWithAbstractSignature: (abstract new (a: string) => string) | (new (a: string) => string);
 >unionWithAbstractSignature : (abstract new (a: string) => string) | (new (a: string) => string)
 >                           : ^^^^^^^^^^^^^^^ ^^      ^^^^^      ^^^^^^^^^^ ^^      ^^^^^      ^
 >a : string
diff --git a/tests/baselines/reference/unionTypeFromArrayLiteral.errors.txt b/tests/baselines/reference/unionTypeFromArrayLiteral.errors.txt
index 8c0fd372531b5..a9790631b1838 100644
--- a/tests/baselines/reference/unionTypeFromArrayLiteral.errors.txt
+++ b/tests/baselines/reference/unionTypeFromArrayLiteral.errors.txt
@@ -24,7 +24,7 @@ unionTypeFromArrayLiteral.ts(9,5): error TS2322: Type '[number, string, string]'
     class D { foo2() { } }
     class E extends C { foo3() { } }
     class F extends C { foo4() { } }
-    var c: C, d: D, e: E, f: F;
+    declare var c: C, d: D, e: E, f: F;
     var arr6 = [c, d];  // (C | D)[]
     var arr7 = [c, d, e]; // (C | D)[]
     var arr8 = [c, e]; // C[]
diff --git a/tests/baselines/reference/unionTypeFromArrayLiteral.js b/tests/baselines/reference/unionTypeFromArrayLiteral.js
index d3439676599dd..e042fbfb699bd 100644
--- a/tests/baselines/reference/unionTypeFromArrayLiteral.js
+++ b/tests/baselines/reference/unionTypeFromArrayLiteral.js
@@ -19,7 +19,7 @@ class C { foo() { } }
 class D { foo2() { } }
 class E extends C { foo3() { } }
 class F extends C { foo4() { } }
-var c: C, d: D, e: E, f: F;
+declare var c: C, d: D, e: E, f: F;
 var arr6 = [c, d];  // (C | D)[]
 var arr7 = [c, d, e]; // (C | D)[]
 var arr8 = [c, e]; // C[]
@@ -79,7 +79,6 @@ var F = /** @class */ (function (_super) {
     F.prototype.foo4 = function () { };
     return F;
 }(C));
-var c, d, e, f;
 var arr6 = [c, d]; // (C | D)[]
 var arr7 = [c, d, e]; // (C | D)[]
 var arr8 = [c, e]; // C[]
diff --git a/tests/baselines/reference/unionTypeFromArrayLiteral.symbols b/tests/baselines/reference/unionTypeFromArrayLiteral.symbols
index 2ea513ded00e5..8af8030042cb2 100644
--- a/tests/baselines/reference/unionTypeFromArrayLiteral.symbols
+++ b/tests/baselines/reference/unionTypeFromArrayLiteral.symbols
@@ -49,34 +49,34 @@ class F extends C { foo4() { } }
 >C : Symbol(C, Decl(unionTypeFromArrayLiteral.ts, 13, 54))
 >foo4 : Symbol(F.foo4, Decl(unionTypeFromArrayLiteral.ts, 17, 19))
 
-var c: C, d: D, e: E, f: F;
->c : Symbol(c, Decl(unionTypeFromArrayLiteral.ts, 18, 3))
+declare var c: C, d: D, e: E, f: F;
+>c : Symbol(c, Decl(unionTypeFromArrayLiteral.ts, 18, 11))
 >C : Symbol(C, Decl(unionTypeFromArrayLiteral.ts, 13, 54))
->d : Symbol(d, Decl(unionTypeFromArrayLiteral.ts, 18, 9))
+>d : Symbol(d, Decl(unionTypeFromArrayLiteral.ts, 18, 17))
 >D : Symbol(D, Decl(unionTypeFromArrayLiteral.ts, 14, 21))
->e : Symbol(e, Decl(unionTypeFromArrayLiteral.ts, 18, 15))
+>e : Symbol(e, Decl(unionTypeFromArrayLiteral.ts, 18, 23))
 >E : Symbol(E, Decl(unionTypeFromArrayLiteral.ts, 15, 22))
->f : Symbol(f, Decl(unionTypeFromArrayLiteral.ts, 18, 21))
+>f : Symbol(f, Decl(unionTypeFromArrayLiteral.ts, 18, 29))
 >F : Symbol(F, Decl(unionTypeFromArrayLiteral.ts, 16, 32))
 
 var arr6 = [c, d];  // (C | D)[]
 >arr6 : Symbol(arr6, Decl(unionTypeFromArrayLiteral.ts, 19, 3))
->c : Symbol(c, Decl(unionTypeFromArrayLiteral.ts, 18, 3))
->d : Symbol(d, Decl(unionTypeFromArrayLiteral.ts, 18, 9))
+>c : Symbol(c, Decl(unionTypeFromArrayLiteral.ts, 18, 11))
+>d : Symbol(d, Decl(unionTypeFromArrayLiteral.ts, 18, 17))
 
 var arr7 = [c, d, e]; // (C | D)[]
 >arr7 : Symbol(arr7, Decl(unionTypeFromArrayLiteral.ts, 20, 3))
->c : Symbol(c, Decl(unionTypeFromArrayLiteral.ts, 18, 3))
->d : Symbol(d, Decl(unionTypeFromArrayLiteral.ts, 18, 9))
->e : Symbol(e, Decl(unionTypeFromArrayLiteral.ts, 18, 15))
+>c : Symbol(c, Decl(unionTypeFromArrayLiteral.ts, 18, 11))
+>d : Symbol(d, Decl(unionTypeFromArrayLiteral.ts, 18, 17))
+>e : Symbol(e, Decl(unionTypeFromArrayLiteral.ts, 18, 23))
 
 var arr8 = [c, e]; // C[]
 >arr8 : Symbol(arr8, Decl(unionTypeFromArrayLiteral.ts, 21, 3))
->c : Symbol(c, Decl(unionTypeFromArrayLiteral.ts, 18, 3))
->e : Symbol(e, Decl(unionTypeFromArrayLiteral.ts, 18, 15))
+>c : Symbol(c, Decl(unionTypeFromArrayLiteral.ts, 18, 11))
+>e : Symbol(e, Decl(unionTypeFromArrayLiteral.ts, 18, 23))
 
 var arr9 = [e, f]; // (E|F)[]
 >arr9 : Symbol(arr9, Decl(unionTypeFromArrayLiteral.ts, 22, 3))
->e : Symbol(e, Decl(unionTypeFromArrayLiteral.ts, 18, 15))
->f : Symbol(f, Decl(unionTypeFromArrayLiteral.ts, 18, 21))
+>e : Symbol(e, Decl(unionTypeFromArrayLiteral.ts, 18, 23))
+>f : Symbol(f, Decl(unionTypeFromArrayLiteral.ts, 18, 29))
 
diff --git a/tests/baselines/reference/unionTypeFromArrayLiteral.types b/tests/baselines/reference/unionTypeFromArrayLiteral.types
index 3678810494fce..6edb312757f86 100644
--- a/tests/baselines/reference/unionTypeFromArrayLiteral.types
+++ b/tests/baselines/reference/unionTypeFromArrayLiteral.types
@@ -112,7 +112,7 @@ class F extends C { foo4() { } }
 >foo4 : () => void
 >     : ^^^^^^^^^^
 
-var c: C, d: D, e: E, f: F;
+declare var c: C, d: D, e: E, f: F;
 >c : C
 >  : ^
 >d : D
diff --git a/tests/baselines/reference/unionTypeMembers.errors.txt b/tests/baselines/reference/unionTypeMembers.errors.txt
index 5f83b5fbf1708..4a94ed8190542 100644
--- a/tests/baselines/reference/unionTypeMembers.errors.txt
+++ b/tests/baselines/reference/unionTypeMembers.errors.txt
@@ -43,10 +43,10 @@ unionTypeMembers.ts(54,3): error TS2339: Property 'methodOnlyInI2' does not exis
     
     // a union type U has those members that are present in every one of its constituent types, 
     // with types that are unions of the respective members in the constituent types
-    var x : I1<number> | I2<number>;
-    var str: string;
-    var num: number;
-    var strOrNum: string | number;
+    declare var x : I1<number> | I2<number>;
+    declare var str: string;
+    declare var num: number;
+    declare var strOrNum: string | number;
     
     // If each type in U has a property P, U has a property P of a union type of the types of P from each type in U.
     str = x.commonPropertyType; // string
diff --git a/tests/baselines/reference/unionTypeMembers.js b/tests/baselines/reference/unionTypeMembers.js
index 653a7574f5b44..e9a04a1f1273a 100644
--- a/tests/baselines/reference/unionTypeMembers.js
+++ b/tests/baselines/reference/unionTypeMembers.js
@@ -33,10 +33,10 @@ interface I2<T> {
 
 // a union type U has those members that are present in every one of its constituent types, 
 // with types that are unions of the respective members in the constituent types
-var x : I1<number> | I2<number>;
-var str: string;
-var num: number;
-var strOrNum: string | number;
+declare var x : I1<number> | I2<number>;
+declare var str: string;
+declare var num: number;
+declare var strOrNum: string | number;
 
 // If each type in U has a property P, U has a property P of a union type of the types of P from each type in U.
 str = x.commonPropertyType; // string
@@ -57,12 +57,6 @@ x.methodOnlyInI1("hello"); // error
 x.methodOnlyInI2(10); // error
 
 //// [unionTypeMembers.js]
-// a union type U has those members that are present in every one of its constituent types, 
-// with types that are unions of the respective members in the constituent types
-var x;
-var str;
-var num;
-var strOrNum;
 // If each type in U has a property P, U has a property P of a union type of the types of P from each type in U.
 str = x.commonPropertyType; // string
 str = x.commonMethodType(str); // (a: string) => string so result should be string
diff --git a/tests/baselines/reference/unionTypeMembers.symbols b/tests/baselines/reference/unionTypeMembers.symbols
index deea535c41a30..4e90aeb319eaa 100644
--- a/tests/baselines/reference/unionTypeMembers.symbols
+++ b/tests/baselines/reference/unionTypeMembers.symbols
@@ -89,96 +89,96 @@ interface I2<T> {
 
 // a union type U has those members that are present in every one of its constituent types, 
 // with types that are unions of the respective members in the constituent types
-var x : I1<number> | I2<number>;
->x : Symbol(x, Decl(unionTypeMembers.ts, 32, 3))
+declare var x : I1<number> | I2<number>;
+>x : Symbol(x, Decl(unionTypeMembers.ts, 32, 11))
 >I1 : Symbol(I1, Decl(unionTypeMembers.ts, 0, 0))
 >I2 : Symbol(I2, Decl(unionTypeMembers.ts, 13, 1))
 
-var str: string;
->str : Symbol(str, Decl(unionTypeMembers.ts, 33, 3))
+declare var str: string;
+>str : Symbol(str, Decl(unionTypeMembers.ts, 33, 11))
 
-var num: number;
->num : Symbol(num, Decl(unionTypeMembers.ts, 34, 3))
+declare var num: number;
+>num : Symbol(num, Decl(unionTypeMembers.ts, 34, 11))
 
-var strOrNum: string | number;
->strOrNum : Symbol(strOrNum, Decl(unionTypeMembers.ts, 35, 3))
+declare var strOrNum: string | number;
+>strOrNum : Symbol(strOrNum, Decl(unionTypeMembers.ts, 35, 11))
 
 // If each type in U has a property P, U has a property P of a union type of the types of P from each type in U.
 str = x.commonPropertyType; // string
->str : Symbol(str, Decl(unionTypeMembers.ts, 33, 3))
+>str : Symbol(str, Decl(unionTypeMembers.ts, 33, 11))
 >x.commonPropertyType : Symbol(commonPropertyType, Decl(unionTypeMembers.ts, 1, 40), Decl(unionTypeMembers.ts, 16, 40))
->x : Symbol(x, Decl(unionTypeMembers.ts, 32, 3))
+>x : Symbol(x, Decl(unionTypeMembers.ts, 32, 11))
 >commonPropertyType : Symbol(commonPropertyType, Decl(unionTypeMembers.ts, 1, 40), Decl(unionTypeMembers.ts, 16, 40))
 
 str = x.commonMethodType(str); // (a: string) => string so result should be string
->str : Symbol(str, Decl(unionTypeMembers.ts, 33, 3))
+>str : Symbol(str, Decl(unionTypeMembers.ts, 33, 11))
 >x.commonMethodType : Symbol(commonMethodType, Decl(unionTypeMembers.ts, 0, 17), Decl(unionTypeMembers.ts, 15, 17))
->x : Symbol(x, Decl(unionTypeMembers.ts, 32, 3))
+>x : Symbol(x, Decl(unionTypeMembers.ts, 32, 11))
 >commonMethodType : Symbol(commonMethodType, Decl(unionTypeMembers.ts, 0, 17), Decl(unionTypeMembers.ts, 15, 17))
->str : Symbol(str, Decl(unionTypeMembers.ts, 33, 3))
+>str : Symbol(str, Decl(unionTypeMembers.ts, 33, 11))
 
 strOrNum = x.commonPropertyDifferenType;
->strOrNum : Symbol(strOrNum, Decl(unionTypeMembers.ts, 35, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeMembers.ts, 35, 11))
 >x.commonPropertyDifferenType : Symbol(commonPropertyDifferenType, Decl(unionTypeMembers.ts, 5, 55), Decl(unionTypeMembers.ts, 20, 55))
->x : Symbol(x, Decl(unionTypeMembers.ts, 32, 3))
+>x : Symbol(x, Decl(unionTypeMembers.ts, 32, 11))
 >commonPropertyDifferenType : Symbol(commonPropertyDifferenType, Decl(unionTypeMembers.ts, 5, 55), Decl(unionTypeMembers.ts, 20, 55))
 
 strOrNum = x.commonMethodDifferentReturnType(str); // string | union
->strOrNum : Symbol(strOrNum, Decl(unionTypeMembers.ts, 35, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeMembers.ts, 35, 11))
 >x.commonMethodDifferentReturnType : Symbol(commonMethodDifferentReturnType, Decl(unionTypeMembers.ts, 4, 58), Decl(unionTypeMembers.ts, 19, 58))
->x : Symbol(x, Decl(unionTypeMembers.ts, 32, 3))
+>x : Symbol(x, Decl(unionTypeMembers.ts, 32, 11))
 >commonMethodDifferentReturnType : Symbol(commonMethodDifferentReturnType, Decl(unionTypeMembers.ts, 4, 58), Decl(unionTypeMembers.ts, 19, 58))
->str : Symbol(str, Decl(unionTypeMembers.ts, 33, 3))
+>str : Symbol(str, Decl(unionTypeMembers.ts, 33, 11))
 
 x.commonMethodDifferentParameterType; // No error - property exists
 >x.commonMethodDifferentParameterType : Symbol(commonMethodDifferentParameterType, Decl(unionTypeMembers.ts, 2, 31), Decl(unionTypeMembers.ts, 17, 31))
->x : Symbol(x, Decl(unionTypeMembers.ts, 32, 3))
+>x : Symbol(x, Decl(unionTypeMembers.ts, 32, 11))
 >commonMethodDifferentParameterType : Symbol(commonMethodDifferentParameterType, Decl(unionTypeMembers.ts, 2, 31), Decl(unionTypeMembers.ts, 17, 31))
 
 x.commonMethodDifferentParameterType(strOrNum); // error - no call signatures because the type of this property is ((a: string) => string) | (a: number) => number
 >x.commonMethodDifferentParameterType : Symbol(commonMethodDifferentParameterType, Decl(unionTypeMembers.ts, 2, 31), Decl(unionTypeMembers.ts, 17, 31))
->x : Symbol(x, Decl(unionTypeMembers.ts, 32, 3))
+>x : Symbol(x, Decl(unionTypeMembers.ts, 32, 11))
 >commonMethodDifferentParameterType : Symbol(commonMethodDifferentParameterType, Decl(unionTypeMembers.ts, 2, 31), Decl(unionTypeMembers.ts, 17, 31))
->strOrNum : Symbol(strOrNum, Decl(unionTypeMembers.ts, 35, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeMembers.ts, 35, 11))
 
                                                 // and the call signatures arent identical
 num = x.commonMethodWithTypeParameter(num);
->num : Symbol(num, Decl(unionTypeMembers.ts, 34, 3))
+>num : Symbol(num, Decl(unionTypeMembers.ts, 34, 11))
 >x.commonMethodWithTypeParameter : Symbol(commonMethodWithTypeParameter, Decl(unionTypeMembers.ts, 6, 39), Decl(unionTypeMembers.ts, 21, 39))
->x : Symbol(x, Decl(unionTypeMembers.ts, 32, 3))
+>x : Symbol(x, Decl(unionTypeMembers.ts, 32, 11))
 >commonMethodWithTypeParameter : Symbol(commonMethodWithTypeParameter, Decl(unionTypeMembers.ts, 6, 39), Decl(unionTypeMembers.ts, 21, 39))
->num : Symbol(num, Decl(unionTypeMembers.ts, 34, 3))
+>num : Symbol(num, Decl(unionTypeMembers.ts, 34, 11))
 
 num = x.commonMethodWithOwnTypeParameter(num);
->num : Symbol(num, Decl(unionTypeMembers.ts, 34, 3))
+>num : Symbol(num, Decl(unionTypeMembers.ts, 34, 11))
 >x.commonMethodWithOwnTypeParameter : Symbol(commonMethodWithOwnTypeParameter, Decl(unionTypeMembers.ts, 8, 43), Decl(unionTypeMembers.ts, 23, 43))
->x : Symbol(x, Decl(unionTypeMembers.ts, 32, 3))
+>x : Symbol(x, Decl(unionTypeMembers.ts, 32, 11))
 >commonMethodWithOwnTypeParameter : Symbol(commonMethodWithOwnTypeParameter, Decl(unionTypeMembers.ts, 8, 43), Decl(unionTypeMembers.ts, 23, 43))
->num : Symbol(num, Decl(unionTypeMembers.ts, 34, 3))
+>num : Symbol(num, Decl(unionTypeMembers.ts, 34, 11))
 
 str = x.commonMethodWithOwnTypeParameter(str);
->str : Symbol(str, Decl(unionTypeMembers.ts, 33, 3))
+>str : Symbol(str, Decl(unionTypeMembers.ts, 33, 11))
 >x.commonMethodWithOwnTypeParameter : Symbol(commonMethodWithOwnTypeParameter, Decl(unionTypeMembers.ts, 8, 43), Decl(unionTypeMembers.ts, 23, 43))
->x : Symbol(x, Decl(unionTypeMembers.ts, 32, 3))
+>x : Symbol(x, Decl(unionTypeMembers.ts, 32, 11))
 >commonMethodWithOwnTypeParameter : Symbol(commonMethodWithOwnTypeParameter, Decl(unionTypeMembers.ts, 8, 43), Decl(unionTypeMembers.ts, 23, 43))
->str : Symbol(str, Decl(unionTypeMembers.ts, 33, 3))
+>str : Symbol(str, Decl(unionTypeMembers.ts, 33, 11))
 
 strOrNum = x.commonMethodWithOwnTypeParameter(strOrNum);
->strOrNum : Symbol(strOrNum, Decl(unionTypeMembers.ts, 35, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeMembers.ts, 35, 11))
 >x.commonMethodWithOwnTypeParameter : Symbol(commonMethodWithOwnTypeParameter, Decl(unionTypeMembers.ts, 8, 43), Decl(unionTypeMembers.ts, 23, 43))
->x : Symbol(x, Decl(unionTypeMembers.ts, 32, 3))
+>x : Symbol(x, Decl(unionTypeMembers.ts, 32, 11))
 >commonMethodWithOwnTypeParameter : Symbol(commonMethodWithOwnTypeParameter, Decl(unionTypeMembers.ts, 8, 43), Decl(unionTypeMembers.ts, 23, 43))
->strOrNum : Symbol(strOrNum, Decl(unionTypeMembers.ts, 35, 3))
+>strOrNum : Symbol(strOrNum, Decl(unionTypeMembers.ts, 35, 11))
 
 x.propertyOnlyInI1; // error
->x : Symbol(x, Decl(unionTypeMembers.ts, 32, 3))
+>x : Symbol(x, Decl(unionTypeMembers.ts, 32, 11))
 
 x.propertyOnlyInI2; // error
->x : Symbol(x, Decl(unionTypeMembers.ts, 32, 3))
+>x : Symbol(x, Decl(unionTypeMembers.ts, 32, 11))
 
 x.methodOnlyInI1("hello"); // error
->x : Symbol(x, Decl(unionTypeMembers.ts, 32, 3))
+>x : Symbol(x, Decl(unionTypeMembers.ts, 32, 11))
 
 x.methodOnlyInI2(10); // error
->x : Symbol(x, Decl(unionTypeMembers.ts, 32, 3))
+>x : Symbol(x, Decl(unionTypeMembers.ts, 32, 11))
 
diff --git a/tests/baselines/reference/unionTypeMembers.types b/tests/baselines/reference/unionTypeMembers.types
index f7f64cc525415..9523dcac4eadc 100644
--- a/tests/baselines/reference/unionTypeMembers.types
+++ b/tests/baselines/reference/unionTypeMembers.types
@@ -103,19 +103,19 @@ interface I2<T> {
 
 // a union type U has those members that are present in every one of its constituent types, 
 // with types that are unions of the respective members in the constituent types
-var x : I1<number> | I2<number>;
+declare var x : I1<number> | I2<number>;
 >x : I1<number> | I2<number>
 >  : ^^^^^^^^^^^^^^^^^^^^^^^
 
-var str: string;
+declare var str: string;
 >str : string
 >    : ^^^^^^
 
-var num: number;
+declare var num: number;
 >num : number
 >    : ^^^^^^
 
-var strOrNum: string | number;
+declare var strOrNum: string | number;
 >strOrNum : string | number
 >         : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/unionTypePropertyAccessibility.errors.txt b/tests/baselines/reference/unionTypePropertyAccessibility.errors.txt
index 76a35c9930427..7ec39b2a9ab9e 100644
--- a/tests/baselines/reference/unionTypePropertyAccessibility.errors.txt
+++ b/tests/baselines/reference/unionTypePropertyAccessibility.errors.txt
@@ -29,21 +29,21 @@ unionTypePropertyAccessibility.ts(47,5): error TS2339: Property 'member' does no
         private member: number;
     }
     
-    var v1: Default;
-    var v2: Public;
-    var v3: Protected;
-    var v4: Private;
-    var v5: Default | Public;
-    var v6: Default | Protected;
-    var v7: Default | Private;
-    var v8: Public | Protected;
-    var v9: Public | Private;
-    var v10: Protected | Private;
-    var v11: Default | Public | Protected;
-    var v12: Default | Public | Private;
-    var v13: Default | Protected | Private;
-    var v14: Public | Private | Protected;
-    var v15: Default | Public | Private | Protected;
+    declare var v1: Default;
+    declare var v2: Public;
+    declare var v3: Protected;
+    declare var v4: Private;
+    declare var v5: Default | Public;
+    declare var v6: Default | Protected;
+    declare var v7: Default | Private;
+    declare var v8: Public | Protected;
+    declare var v9: Public | Private;
+    declare var v10: Protected | Private;
+    declare var v11: Default | Public | Protected;
+    declare var v12: Default | Public | Private;
+    declare var v13: Default | Protected | Private;
+    declare var v14: Public | Private | Protected;
+    declare var v15: Default | Public | Private | Protected;
     
     v1.member;
     v2.member;
diff --git a/tests/baselines/reference/unionTypePropertyAccessibility.js b/tests/baselines/reference/unionTypePropertyAccessibility.js
index bc29a2c276376..ccf7a50fe35ce 100644
--- a/tests/baselines/reference/unionTypePropertyAccessibility.js
+++ b/tests/baselines/reference/unionTypePropertyAccessibility.js
@@ -17,21 +17,21 @@ class Private {
     private member: number;
 }
 
-var v1: Default;
-var v2: Public;
-var v3: Protected;
-var v4: Private;
-var v5: Default | Public;
-var v6: Default | Protected;
-var v7: Default | Private;
-var v8: Public | Protected;
-var v9: Public | Private;
-var v10: Protected | Private;
-var v11: Default | Public | Protected;
-var v12: Default | Public | Private;
-var v13: Default | Protected | Private;
-var v14: Public | Private | Protected;
-var v15: Default | Public | Private | Protected;
+declare var v1: Default;
+declare var v2: Public;
+declare var v3: Protected;
+declare var v4: Private;
+declare var v5: Default | Public;
+declare var v6: Default | Protected;
+declare var v7: Default | Private;
+declare var v8: Public | Protected;
+declare var v9: Public | Private;
+declare var v10: Protected | Private;
+declare var v11: Default | Public | Protected;
+declare var v12: Default | Public | Private;
+declare var v13: Default | Protected | Private;
+declare var v14: Public | Private | Protected;
+declare var v15: Default | Public | Private | Protected;
 
 v1.member;
 v2.member;
@@ -71,21 +71,6 @@ var Private = /** @class */ (function () {
     }
     return Private;
 }());
-var v1;
-var v2;
-var v3;
-var v4;
-var v5;
-var v6;
-var v7;
-var v8;
-var v9;
-var v10;
-var v11;
-var v12;
-var v13;
-var v14;
-var v15;
 v1.member;
 v2.member;
 v3.member;
diff --git a/tests/baselines/reference/unionTypePropertyAccessibility.symbols b/tests/baselines/reference/unionTypePropertyAccessibility.symbols
index e046bdc92eb29..05f43ba6fcb04 100644
--- a/tests/baselines/reference/unionTypePropertyAccessibility.symbols
+++ b/tests/baselines/reference/unionTypePropertyAccessibility.symbols
@@ -29,78 +29,78 @@ class Private {
 >member : Symbol(Private.member, Decl(unionTypePropertyAccessibility.ts, 12, 15))
 }
 
-var v1: Default;
->v1 : Symbol(v1, Decl(unionTypePropertyAccessibility.ts, 16, 3))
+declare var v1: Default;
+>v1 : Symbol(v1, Decl(unionTypePropertyAccessibility.ts, 16, 11))
 >Default : Symbol(Default, Decl(unionTypePropertyAccessibility.ts, 0, 0))
 
-var v2: Public;
->v2 : Symbol(v2, Decl(unionTypePropertyAccessibility.ts, 17, 3))
+declare var v2: Public;
+>v2 : Symbol(v2, Decl(unionTypePropertyAccessibility.ts, 17, 11))
 >Public : Symbol(Public, Decl(unionTypePropertyAccessibility.ts, 2, 1))
 
-var v3: Protected;
->v3 : Symbol(v3, Decl(unionTypePropertyAccessibility.ts, 18, 3))
+declare var v3: Protected;
+>v3 : Symbol(v3, Decl(unionTypePropertyAccessibility.ts, 18, 11))
 >Protected : Symbol(Protected, Decl(unionTypePropertyAccessibility.ts, 6, 1))
 
-var v4: Private;
->v4 : Symbol(v4, Decl(unionTypePropertyAccessibility.ts, 19, 3))
+declare var v4: Private;
+>v4 : Symbol(v4, Decl(unionTypePropertyAccessibility.ts, 19, 11))
 >Private : Symbol(Private, Decl(unionTypePropertyAccessibility.ts, 10, 1))
 
-var v5: Default | Public;
->v5 : Symbol(v5, Decl(unionTypePropertyAccessibility.ts, 20, 3))
+declare var v5: Default | Public;
+>v5 : Symbol(v5, Decl(unionTypePropertyAccessibility.ts, 20, 11))
 >Default : Symbol(Default, Decl(unionTypePropertyAccessibility.ts, 0, 0))
 >Public : Symbol(Public, Decl(unionTypePropertyAccessibility.ts, 2, 1))
 
-var v6: Default | Protected;
->v6 : Symbol(v6, Decl(unionTypePropertyAccessibility.ts, 21, 3))
+declare var v6: Default | Protected;
+>v6 : Symbol(v6, Decl(unionTypePropertyAccessibility.ts, 21, 11))
 >Default : Symbol(Default, Decl(unionTypePropertyAccessibility.ts, 0, 0))
 >Protected : Symbol(Protected, Decl(unionTypePropertyAccessibility.ts, 6, 1))
 
-var v7: Default | Private;
->v7 : Symbol(v7, Decl(unionTypePropertyAccessibility.ts, 22, 3))
+declare var v7: Default | Private;
+>v7 : Symbol(v7, Decl(unionTypePropertyAccessibility.ts, 22, 11))
 >Default : Symbol(Default, Decl(unionTypePropertyAccessibility.ts, 0, 0))
 >Private : Symbol(Private, Decl(unionTypePropertyAccessibility.ts, 10, 1))
 
-var v8: Public | Protected;
->v8 : Symbol(v8, Decl(unionTypePropertyAccessibility.ts, 23, 3))
+declare var v8: Public | Protected;
+>v8 : Symbol(v8, Decl(unionTypePropertyAccessibility.ts, 23, 11))
 >Public : Symbol(Public, Decl(unionTypePropertyAccessibility.ts, 2, 1))
 >Protected : Symbol(Protected, Decl(unionTypePropertyAccessibility.ts, 6, 1))
 
-var v9: Public | Private;
->v9 : Symbol(v9, Decl(unionTypePropertyAccessibility.ts, 24, 3))
+declare var v9: Public | Private;
+>v9 : Symbol(v9, Decl(unionTypePropertyAccessibility.ts, 24, 11))
 >Public : Symbol(Public, Decl(unionTypePropertyAccessibility.ts, 2, 1))
 >Private : Symbol(Private, Decl(unionTypePropertyAccessibility.ts, 10, 1))
 
-var v10: Protected | Private;
->v10 : Symbol(v10, Decl(unionTypePropertyAccessibility.ts, 25, 3))
+declare var v10: Protected | Private;
+>v10 : Symbol(v10, Decl(unionTypePropertyAccessibility.ts, 25, 11))
 >Protected : Symbol(Protected, Decl(unionTypePropertyAccessibility.ts, 6, 1))
 >Private : Symbol(Private, Decl(unionTypePropertyAccessibility.ts, 10, 1))
 
-var v11: Default | Public | Protected;
->v11 : Symbol(v11, Decl(unionTypePropertyAccessibility.ts, 26, 3))
+declare var v11: Default | Public | Protected;
+>v11 : Symbol(v11, Decl(unionTypePropertyAccessibility.ts, 26, 11))
 >Default : Symbol(Default, Decl(unionTypePropertyAccessibility.ts, 0, 0))
 >Public : Symbol(Public, Decl(unionTypePropertyAccessibility.ts, 2, 1))
 >Protected : Symbol(Protected, Decl(unionTypePropertyAccessibility.ts, 6, 1))
 
-var v12: Default | Public | Private;
->v12 : Symbol(v12, Decl(unionTypePropertyAccessibility.ts, 27, 3))
+declare var v12: Default | Public | Private;
+>v12 : Symbol(v12, Decl(unionTypePropertyAccessibility.ts, 27, 11))
 >Default : Symbol(Default, Decl(unionTypePropertyAccessibility.ts, 0, 0))
 >Public : Symbol(Public, Decl(unionTypePropertyAccessibility.ts, 2, 1))
 >Private : Symbol(Private, Decl(unionTypePropertyAccessibility.ts, 10, 1))
 
-var v13: Default | Protected | Private;
->v13 : Symbol(v13, Decl(unionTypePropertyAccessibility.ts, 28, 3))
+declare var v13: Default | Protected | Private;
+>v13 : Symbol(v13, Decl(unionTypePropertyAccessibility.ts, 28, 11))
 >Default : Symbol(Default, Decl(unionTypePropertyAccessibility.ts, 0, 0))
 >Protected : Symbol(Protected, Decl(unionTypePropertyAccessibility.ts, 6, 1))
 >Private : Symbol(Private, Decl(unionTypePropertyAccessibility.ts, 10, 1))
 
-var v14: Public | Private | Protected;
->v14 : Symbol(v14, Decl(unionTypePropertyAccessibility.ts, 29, 3))
+declare var v14: Public | Private | Protected;
+>v14 : Symbol(v14, Decl(unionTypePropertyAccessibility.ts, 29, 11))
 >Public : Symbol(Public, Decl(unionTypePropertyAccessibility.ts, 2, 1))
 >Private : Symbol(Private, Decl(unionTypePropertyAccessibility.ts, 10, 1))
 >Protected : Symbol(Protected, Decl(unionTypePropertyAccessibility.ts, 6, 1))
 
-var v15: Default | Public | Private | Protected;
->v15 : Symbol(v15, Decl(unionTypePropertyAccessibility.ts, 30, 3))
+declare var v15: Default | Public | Private | Protected;
+>v15 : Symbol(v15, Decl(unionTypePropertyAccessibility.ts, 30, 11))
 >Default : Symbol(Default, Decl(unionTypePropertyAccessibility.ts, 0, 0))
 >Public : Symbol(Public, Decl(unionTypePropertyAccessibility.ts, 2, 1))
 >Private : Symbol(Private, Decl(unionTypePropertyAccessibility.ts, 10, 1))
@@ -108,56 +108,56 @@ var v15: Default | Public | Private | Protected;
 
 v1.member;
 >v1.member : Symbol(Default.member, Decl(unionTypePropertyAccessibility.ts, 0, 15))
->v1 : Symbol(v1, Decl(unionTypePropertyAccessibility.ts, 16, 3))
+>v1 : Symbol(v1, Decl(unionTypePropertyAccessibility.ts, 16, 11))
 >member : Symbol(Default.member, Decl(unionTypePropertyAccessibility.ts, 0, 15))
 
 v2.member;
 >v2.member : Symbol(Public.member, Decl(unionTypePropertyAccessibility.ts, 4, 14))
->v2 : Symbol(v2, Decl(unionTypePropertyAccessibility.ts, 17, 3))
+>v2 : Symbol(v2, Decl(unionTypePropertyAccessibility.ts, 17, 11))
 >member : Symbol(Public.member, Decl(unionTypePropertyAccessibility.ts, 4, 14))
 
 v3.member;
 >v3.member : Symbol(Protected.member, Decl(unionTypePropertyAccessibility.ts, 8, 17))
->v3 : Symbol(v3, Decl(unionTypePropertyAccessibility.ts, 18, 3))
+>v3 : Symbol(v3, Decl(unionTypePropertyAccessibility.ts, 18, 11))
 >member : Symbol(Protected.member, Decl(unionTypePropertyAccessibility.ts, 8, 17))
 
 v4.member;
 >v4.member : Symbol(Private.member, Decl(unionTypePropertyAccessibility.ts, 12, 15))
->v4 : Symbol(v4, Decl(unionTypePropertyAccessibility.ts, 19, 3))
+>v4 : Symbol(v4, Decl(unionTypePropertyAccessibility.ts, 19, 11))
 >member : Symbol(Private.member, Decl(unionTypePropertyAccessibility.ts, 12, 15))
 
 v5.member;
 >v5.member : Symbol(member, Decl(unionTypePropertyAccessibility.ts, 0, 15), Decl(unionTypePropertyAccessibility.ts, 4, 14))
->v5 : Symbol(v5, Decl(unionTypePropertyAccessibility.ts, 20, 3))
+>v5 : Symbol(v5, Decl(unionTypePropertyAccessibility.ts, 20, 11))
 >member : Symbol(member, Decl(unionTypePropertyAccessibility.ts, 0, 15), Decl(unionTypePropertyAccessibility.ts, 4, 14))
 
 v6.member;
->v6 : Symbol(v6, Decl(unionTypePropertyAccessibility.ts, 21, 3))
+>v6 : Symbol(v6, Decl(unionTypePropertyAccessibility.ts, 21, 11))
 
 v7.member;
->v7 : Symbol(v7, Decl(unionTypePropertyAccessibility.ts, 22, 3))
+>v7 : Symbol(v7, Decl(unionTypePropertyAccessibility.ts, 22, 11))
 
 v8.member;
->v8 : Symbol(v8, Decl(unionTypePropertyAccessibility.ts, 23, 3))
+>v8 : Symbol(v8, Decl(unionTypePropertyAccessibility.ts, 23, 11))
 
 v9.member;
->v9 : Symbol(v9, Decl(unionTypePropertyAccessibility.ts, 24, 3))
+>v9 : Symbol(v9, Decl(unionTypePropertyAccessibility.ts, 24, 11))
 
 v10.member;
->v10 : Symbol(v10, Decl(unionTypePropertyAccessibility.ts, 25, 3))
+>v10 : Symbol(v10, Decl(unionTypePropertyAccessibility.ts, 25, 11))
 
 v11.member;
->v11 : Symbol(v11, Decl(unionTypePropertyAccessibility.ts, 26, 3))
+>v11 : Symbol(v11, Decl(unionTypePropertyAccessibility.ts, 26, 11))
 
 v12.member;
->v12 : Symbol(v12, Decl(unionTypePropertyAccessibility.ts, 27, 3))
+>v12 : Symbol(v12, Decl(unionTypePropertyAccessibility.ts, 27, 11))
 
 v13.member;
->v13 : Symbol(v13, Decl(unionTypePropertyAccessibility.ts, 28, 3))
+>v13 : Symbol(v13, Decl(unionTypePropertyAccessibility.ts, 28, 11))
 
 v14.member;
->v14 : Symbol(v14, Decl(unionTypePropertyAccessibility.ts, 29, 3))
+>v14 : Symbol(v14, Decl(unionTypePropertyAccessibility.ts, 29, 11))
 
 v15.member;
->v15 : Symbol(v15, Decl(unionTypePropertyAccessibility.ts, 30, 3))
+>v15 : Symbol(v15, Decl(unionTypePropertyAccessibility.ts, 30, 11))
 
diff --git a/tests/baselines/reference/unionTypePropertyAccessibility.types b/tests/baselines/reference/unionTypePropertyAccessibility.types
index 2c635e777d209..d5ae2a6e117b2 100644
--- a/tests/baselines/reference/unionTypePropertyAccessibility.types
+++ b/tests/baselines/reference/unionTypePropertyAccessibility.types
@@ -37,63 +37,63 @@ class Private {
 >       : ^^^^^^
 }
 
-var v1: Default;
+declare var v1: Default;
 >v1 : Default
 >   : ^^^^^^^
 
-var v2: Public;
+declare var v2: Public;
 >v2 : Public
 >   : ^^^^^^
 
-var v3: Protected;
+declare var v3: Protected;
 >v3 : Protected
 >   : ^^^^^^^^^
 
-var v4: Private;
+declare var v4: Private;
 >v4 : Private
 >   : ^^^^^^^
 
-var v5: Default | Public;
+declare var v5: Default | Public;
 >v5 : Default | Public
 >   : ^^^^^^^^^^^^^^^^
 
-var v6: Default | Protected;
+declare var v6: Default | Protected;
 >v6 : Default | Protected
 >   : ^^^^^^^^^^^^^^^^^^^
 
-var v7: Default | Private;
+declare var v7: Default | Private;
 >v7 : Default | Private
 >   : ^^^^^^^^^^^^^^^^^
 
-var v8: Public | Protected;
+declare var v8: Public | Protected;
 >v8 : Public | Protected
 >   : ^^^^^^^^^^^^^^^^^^
 
-var v9: Public | Private;
+declare var v9: Public | Private;
 >v9 : Public | Private
 >   : ^^^^^^^^^^^^^^^^
 
-var v10: Protected | Private;
+declare var v10: Protected | Private;
 >v10 : Protected | Private
 >    : ^^^^^^^^^^^^^^^^^^^
 
-var v11: Default | Public | Protected;
+declare var v11: Default | Public | Protected;
 >v11 : Default | Public | Protected
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-var v12: Default | Public | Private;
+declare var v12: Default | Public | Private;
 >v12 : Default | Public | Private
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-var v13: Default | Protected | Private;
+declare var v13: Default | Protected | Private;
 >v13 : Default | Protected | Private
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-var v14: Public | Private | Protected;
+declare var v14: Public | Private | Protected;
 >v14 : Public | Protected | Private
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-var v15: Default | Public | Private | Protected;
+declare var v15: Default | Public | Private | Protected;
 >v15 : Default | Public | Protected | Private
 >    : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/unionTypeReadonly.errors.txt b/tests/baselines/reference/unionTypeReadonly.errors.txt
index 6b31cf413fcb9..e4bdd93d879e4 100644
--- a/tests/baselines/reference/unionTypeReadonly.errors.txt
+++ b/tests/baselines/reference/unionTypeReadonly.errors.txt
@@ -22,23 +22,23 @@ unionTypeReadonly.ts(25,15): error TS2339: Property 'value' does not exist on ty
     interface DifferentName {
         readonly other: number;
     }
-    let base: Base;
+    declare let base: Base;
     base.value = 12 // error, lhs can't be a readonly property
          ~~~~~
 !!! error TS2540: Cannot assign to 'value' because it is a read-only property.
-    let identical: Base | Identical;
+    declare let identical: Base | Identical;
     identical.value = 12; // error, lhs can't be a readonly property
               ~~~~~
 !!! error TS2540: Cannot assign to 'value' because it is a read-only property.
-    let mutable: Base | Mutable;
+    declare let mutable: Base | Mutable;
     mutable.value = 12; // error, lhs can't be a readonly property
             ~~~~~
 !!! error TS2540: Cannot assign to 'value' because it is a read-only property.
-    let differentType: Base | DifferentType;
+    declare let differentType: Base | DifferentType;
     differentType.value = 12; // error, lhs can't be a readonly property
                   ~~~~~
 !!! error TS2540: Cannot assign to 'value' because it is a read-only property.
-    let differentName: Base | DifferentName;
+    declare let differentName: Base | DifferentName;
     differentName.value = 12; // error, property 'value' doesn't exist
                   ~~~~~
 !!! error TS2339: Property 'value' does not exist on type 'Base | DifferentName'.
diff --git a/tests/baselines/reference/unionTypeReadonly.js b/tests/baselines/reference/unionTypeReadonly.js
index d1000302b7ac7..c39020f1090c6 100644
--- a/tests/baselines/reference/unionTypeReadonly.js
+++ b/tests/baselines/reference/unionTypeReadonly.js
@@ -16,27 +16,22 @@ interface DifferentType {
 interface DifferentName {
     readonly other: number;
 }
-let base: Base;
+declare let base: Base;
 base.value = 12 // error, lhs can't be a readonly property
-let identical: Base | Identical;
+declare let identical: Base | Identical;
 identical.value = 12; // error, lhs can't be a readonly property
-let mutable: Base | Mutable;
+declare let mutable: Base | Mutable;
 mutable.value = 12; // error, lhs can't be a readonly property
-let differentType: Base | DifferentType;
+declare let differentType: Base | DifferentType;
 differentType.value = 12; // error, lhs can't be a readonly property
-let differentName: Base | DifferentName;
+declare let differentName: Base | DifferentName;
 differentName.value = 12; // error, property 'value' doesn't exist
 
 
 
 //// [unionTypeReadonly.js]
-var base;
 base.value = 12; // error, lhs can't be a readonly property
-var identical;
 identical.value = 12; // error, lhs can't be a readonly property
-var mutable;
 mutable.value = 12; // error, lhs can't be a readonly property
-var differentType;
 differentType.value = 12; // error, lhs can't be a readonly property
-var differentName;
 differentName.value = 12; // error, property 'value' doesn't exist
diff --git a/tests/baselines/reference/unionTypeReadonly.symbols b/tests/baselines/reference/unionTypeReadonly.symbols
index e98c6c7117ea5..19e6be7eb5354 100644
--- a/tests/baselines/reference/unionTypeReadonly.symbols
+++ b/tests/baselines/reference/unionTypeReadonly.symbols
@@ -31,51 +31,51 @@ interface DifferentName {
     readonly other: number;
 >other : Symbol(DifferentName.other, Decl(unionTypeReadonly.ts, 12, 25))
 }
-let base: Base;
->base : Symbol(base, Decl(unionTypeReadonly.ts, 15, 3))
+declare let base: Base;
+>base : Symbol(base, Decl(unionTypeReadonly.ts, 15, 11))
 >Base : Symbol(Base, Decl(unionTypeReadonly.ts, 0, 0))
 
 base.value = 12 // error, lhs can't be a readonly property
 >base.value : Symbol(Base.value, Decl(unionTypeReadonly.ts, 0, 16))
->base : Symbol(base, Decl(unionTypeReadonly.ts, 15, 3))
+>base : Symbol(base, Decl(unionTypeReadonly.ts, 15, 11))
 >value : Symbol(Base.value, Decl(unionTypeReadonly.ts, 0, 16))
 
-let identical: Base | Identical;
->identical : Symbol(identical, Decl(unionTypeReadonly.ts, 17, 3))
+declare let identical: Base | Identical;
+>identical : Symbol(identical, Decl(unionTypeReadonly.ts, 17, 11))
 >Base : Symbol(Base, Decl(unionTypeReadonly.ts, 0, 0))
 >Identical : Symbol(Identical, Decl(unionTypeReadonly.ts, 2, 1))
 
 identical.value = 12; // error, lhs can't be a readonly property
 >identical.value : Symbol(value, Decl(unionTypeReadonly.ts, 0, 16), Decl(unionTypeReadonly.ts, 3, 21))
->identical : Symbol(identical, Decl(unionTypeReadonly.ts, 17, 3))
+>identical : Symbol(identical, Decl(unionTypeReadonly.ts, 17, 11))
 >value : Symbol(value, Decl(unionTypeReadonly.ts, 0, 16), Decl(unionTypeReadonly.ts, 3, 21))
 
-let mutable: Base | Mutable;
->mutable : Symbol(mutable, Decl(unionTypeReadonly.ts, 19, 3))
+declare let mutable: Base | Mutable;
+>mutable : Symbol(mutable, Decl(unionTypeReadonly.ts, 19, 11))
 >Base : Symbol(Base, Decl(unionTypeReadonly.ts, 0, 0))
 >Mutable : Symbol(Mutable, Decl(unionTypeReadonly.ts, 5, 1))
 
 mutable.value = 12; // error, lhs can't be a readonly property
 >mutable.value : Symbol(value, Decl(unionTypeReadonly.ts, 0, 16), Decl(unionTypeReadonly.ts, 6, 19))
->mutable : Symbol(mutable, Decl(unionTypeReadonly.ts, 19, 3))
+>mutable : Symbol(mutable, Decl(unionTypeReadonly.ts, 19, 11))
 >value : Symbol(value, Decl(unionTypeReadonly.ts, 0, 16), Decl(unionTypeReadonly.ts, 6, 19))
 
-let differentType: Base | DifferentType;
->differentType : Symbol(differentType, Decl(unionTypeReadonly.ts, 21, 3))
+declare let differentType: Base | DifferentType;
+>differentType : Symbol(differentType, Decl(unionTypeReadonly.ts, 21, 11))
 >Base : Symbol(Base, Decl(unionTypeReadonly.ts, 0, 0))
 >DifferentType : Symbol(DifferentType, Decl(unionTypeReadonly.ts, 8, 1))
 
 differentType.value = 12; // error, lhs can't be a readonly property
 >differentType.value : Symbol(value, Decl(unionTypeReadonly.ts, 0, 16), Decl(unionTypeReadonly.ts, 9, 25))
->differentType : Symbol(differentType, Decl(unionTypeReadonly.ts, 21, 3))
+>differentType : Symbol(differentType, Decl(unionTypeReadonly.ts, 21, 11))
 >value : Symbol(value, Decl(unionTypeReadonly.ts, 0, 16), Decl(unionTypeReadonly.ts, 9, 25))
 
-let differentName: Base | DifferentName;
->differentName : Symbol(differentName, Decl(unionTypeReadonly.ts, 23, 3))
+declare let differentName: Base | DifferentName;
+>differentName : Symbol(differentName, Decl(unionTypeReadonly.ts, 23, 11))
 >Base : Symbol(Base, Decl(unionTypeReadonly.ts, 0, 0))
 >DifferentName : Symbol(DifferentName, Decl(unionTypeReadonly.ts, 11, 1))
 
 differentName.value = 12; // error, property 'value' doesn't exist
->differentName : Symbol(differentName, Decl(unionTypeReadonly.ts, 23, 3))
+>differentName : Symbol(differentName, Decl(unionTypeReadonly.ts, 23, 11))
 
 
diff --git a/tests/baselines/reference/unionTypeReadonly.types b/tests/baselines/reference/unionTypeReadonly.types
index e7cb4e1b5315d..479ecb9d0b76d 100644
--- a/tests/baselines/reference/unionTypeReadonly.types
+++ b/tests/baselines/reference/unionTypeReadonly.types
@@ -26,7 +26,7 @@ interface DifferentName {
 >other : number
 >      : ^^^^^^
 }
-let base: Base;
+declare let base: Base;
 >base : Base
 >     : ^^^^
 
@@ -42,7 +42,7 @@ base.value = 12 // error, lhs can't be a readonly property
 >12 : 12
 >   : ^^
 
-let identical: Base | Identical;
+declare let identical: Base | Identical;
 >identical : Base | Identical
 >          : ^^^^^^^^^^^^^^^^
 
@@ -58,7 +58,7 @@ identical.value = 12; // error, lhs can't be a readonly property
 >12 : 12
 >   : ^^
 
-let mutable: Base | Mutable;
+declare let mutable: Base | Mutable;
 >mutable : Base | Mutable
 >        : ^^^^^^^^^^^^^^
 
@@ -74,7 +74,7 @@ mutable.value = 12; // error, lhs can't be a readonly property
 >12 : 12
 >   : ^^
 
-let differentType: Base | DifferentType;
+declare let differentType: Base | DifferentType;
 >differentType : Base | DifferentType
 >              : ^^^^^^^^^^^^^^^^^^^^
 
@@ -90,7 +90,7 @@ differentType.value = 12; // error, lhs can't be a readonly property
 >12 : 12
 >   : ^^
 
-let differentName: Base | DifferentName;
+declare let differentName: Base | DifferentName;
 >differentName : Base | DifferentName
 >              : ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt
index a15de01e3a7be..4527c16471a6d 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.errors.txt
@@ -32,8 +32,8 @@ unionTypeWithRecursiveSubtypeReduction2.ts(20,1): error TS2322: Type 'Class' is
         public parent: Module | Class;
     }
     
-    var c: Class;
-    var p: Property;
+    declare var c: Class;
+    declare var p: Property;
     c = p;
     ~
 !!! error TS2322: Type 'Property' is not assignable to type 'Class'.
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.js b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.js
index 6b22cbef99aca..e3a7ff1e7074b 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.js
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.js
@@ -17,8 +17,8 @@ class Property {
     public parent: Module | Class;
 }
 
-var c: Class;
-var p: Property;
+declare var c: Class;
+declare var p: Property;
 c = p;
 p = c;
 
@@ -44,7 +44,5 @@ var Property = /** @class */ (function () {
     }
     return Property;
 }());
-var c;
-var p;
 c = p;
 p = c;
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.symbols b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.symbols
index 69b5b25d03ecf..c8917d2bb4381 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.symbols
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.symbols
@@ -35,19 +35,19 @@ class Property {
 >Class : Symbol(Class, Decl(unionTypeWithRecursiveSubtypeReduction2.ts, 6, 1))
 }
 
-var c: Class;
->c : Symbol(c, Decl(unionTypeWithRecursiveSubtypeReduction2.ts, 16, 3))
+declare var c: Class;
+>c : Symbol(c, Decl(unionTypeWithRecursiveSubtypeReduction2.ts, 16, 11))
 >Class : Symbol(Class, Decl(unionTypeWithRecursiveSubtypeReduction2.ts, 6, 1))
 
-var p: Property;
->p : Symbol(p, Decl(unionTypeWithRecursiveSubtypeReduction2.ts, 17, 3))
+declare var p: Property;
+>p : Symbol(p, Decl(unionTypeWithRecursiveSubtypeReduction2.ts, 17, 11))
 >Property : Symbol(Property, Decl(unionTypeWithRecursiveSubtypeReduction2.ts, 10, 1))
 
 c = p;
->c : Symbol(c, Decl(unionTypeWithRecursiveSubtypeReduction2.ts, 16, 3))
->p : Symbol(p, Decl(unionTypeWithRecursiveSubtypeReduction2.ts, 17, 3))
+>c : Symbol(c, Decl(unionTypeWithRecursiveSubtypeReduction2.ts, 16, 11))
+>p : Symbol(p, Decl(unionTypeWithRecursiveSubtypeReduction2.ts, 17, 11))
 
 p = c;
->p : Symbol(p, Decl(unionTypeWithRecursiveSubtypeReduction2.ts, 17, 3))
->c : Symbol(c, Decl(unionTypeWithRecursiveSubtypeReduction2.ts, 16, 3))
+>p : Symbol(p, Decl(unionTypeWithRecursiveSubtypeReduction2.ts, 17, 11))
+>c : Symbol(c, Decl(unionTypeWithRecursiveSubtypeReduction2.ts, 16, 11))
 
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.types b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.types
index ec862b8bd7cf6..f73161babe545 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.types
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.types
@@ -37,11 +37,11 @@ class Property {
 >       : ^^^^^^^^^^^^^^
 }
 
-var c: Class;
+declare var c: Class;
 >c : Class
 >  : ^^^^^
 
-var p: Property;
+declare var p: Property;
 >p : Property
 >  : ^^^^^^^^
 
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.errors.txt b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.errors.txt
index 5939db39b1ab7..b5b1605b40d32 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.errors.txt
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.errors.txt
@@ -3,10 +3,10 @@ unionTypeWithRecursiveSubtypeReduction3.ts(5,5): error TS2322: Type '{ prop: num
 
 
 ==== unionTypeWithRecursiveSubtypeReduction3.ts (1 errors) ====
-    var a27: { prop: number } | { prop: T27 };
+    declare var a27: { prop: number } | { prop: T27 };
     type T27 = typeof a27;
     
-    var b: T27;
+    declare var b: T27;
     var s: string = b;
         ~
 !!! error TS2322: Type '{ prop: number; } | { prop: { prop: number; } | any; }' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.js b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.js
index 1ab84be585263..8c95436929a8a 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.js
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.js
@@ -1,14 +1,12 @@
 //// [tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction3.ts] ////
 
 //// [unionTypeWithRecursiveSubtypeReduction3.ts]
-var a27: { prop: number } | { prop: T27 };
+declare var a27: { prop: number } | { prop: T27 };
 type T27 = typeof a27;
 
-var b: T27;
+declare var b: T27;
 var s: string = b;
 
 
 //// [unionTypeWithRecursiveSubtypeReduction3.js]
-var a27;
-var b;
 var s = b;
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.symbols b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.symbols
index 39b5c5f211f1f..3c4613902a764 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.symbols
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.symbols
@@ -1,21 +1,21 @@
 //// [tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction3.ts] ////
 
 === unionTypeWithRecursiveSubtypeReduction3.ts ===
-var a27: { prop: number } | { prop: T27 };
->a27 : Symbol(a27, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 0, 3))
->prop : Symbol(prop, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 0, 10))
->prop : Symbol(prop, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 0, 29))
->T27 : Symbol(T27, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 0, 42))
+declare var a27: { prop: number } | { prop: T27 };
+>a27 : Symbol(a27, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 0, 11))
+>prop : Symbol(prop, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 0, 18))
+>prop : Symbol(prop, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 0, 37))
+>T27 : Symbol(T27, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 0, 50))
 
 type T27 = typeof a27;
->T27 : Symbol(T27, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 0, 42))
->a27 : Symbol(a27, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 0, 3))
+>T27 : Symbol(T27, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 0, 50))
+>a27 : Symbol(a27, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 0, 11))
 
-var b: T27;
->b : Symbol(b, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 3, 3))
->T27 : Symbol(T27, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 0, 42))
+declare var b: T27;
+>b : Symbol(b, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 3, 11))
+>T27 : Symbol(T27, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 0, 50))
 
 var s: string = b;
 >s : Symbol(s, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 4, 3))
->b : Symbol(b, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 3, 3))
+>b : Symbol(b, Decl(unionTypeWithRecursiveSubtypeReduction3.ts, 3, 11))
 
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.types b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.types
index 50db124d50cb7..ef5284315fe58 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.types
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction3.ts] ////
 
 === unionTypeWithRecursiveSubtypeReduction3.ts ===
-var a27: { prop: number } | { prop: T27 };
+declare var a27: { prop: number } | { prop: T27 };
 >a27 : { prop: number; } | { prop: T27; }
 >    : ^^^^^^^^      ^^^^^^^^^^^^^^   ^^^
 >prop : number
@@ -15,7 +15,7 @@ type T27 = typeof a27;
 >a27 : { prop: number; } | { prop: T27; }
 >    : ^^^^^^^^      ^^^^^^^^^^^^^^   ^^^
 
-var b: T27;
+declare var b: T27;
 >b : { prop: number; } | { prop: T27; }
 >  : ^^^^^^^^      ^^^^^^^^^^^^^^   ^^^
 
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarationsInJs.errors.txt b/tests/baselines/reference/uniqueSymbolsDeclarationsInJs.errors.txt
new file mode 100644
index 0000000000000..4811c79562d9e
--- /dev/null
+++ b/tests/baselines/reference/uniqueSymbolsDeclarationsInJs.errors.txt
@@ -0,0 +1,33 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== uniqueSymbolsDeclarationsInJs.js (0 errors) ====
+    // classes
+    class C {
+        /**
+         * @readonly
+         */
+        static readonlyStaticCall = Symbol();
+        /**
+         * @type {unique symbol}
+         * @readonly
+         */
+        static readonlyStaticType;
+        /**
+         * @type {unique symbol}
+         * @readonly
+         */
+        static readonlyStaticTypeAndCall = Symbol();
+        static readwriteStaticCall = Symbol();
+    
+        /**
+         * @readonly
+         */
+        readonlyCall = Symbol();
+        readwriteCall = Symbol();
+    }
+    
+    /** @type {unique symbol} */
+    const a = Symbol();
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.errors.txt b/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.errors.txt
index 681f7c5f3e7d2..03d2d1ce8eb2f 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.errors.txt
+++ b/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.errors.txt
@@ -1,7 +1,9 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 uniqueSymbolsDeclarationsInJsErrors.js(5,12): error TS1331: A property of a class whose type is a 'unique symbol' type must be both 'static' and 'readonly'.
 uniqueSymbolsDeclarationsInJsErrors.js(14,12): error TS1331: A property of a class whose type is a 'unique symbol' type must be both 'static' and 'readonly'.
 
 
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== uniqueSymbolsDeclarationsInJsErrors.js (2 errors) ====
     class C {
         /**
diff --git a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.errors.txt b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.errors.txt
index 0f1c2a7f23582..e26249486d0ff 100644
--- a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.errors.txt
+++ b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.errors.txt
@@ -22,7 +22,7 @@ untypedFunctionCallsWithTypeParameters1.ts(41,4): error TS2558: Expected 0 type
              ~~~~~~~~~~~
 !!! error TS2347: Untyped function calls may not accept type arguments.
     
-    var c: Function;
+    declare var c: Function;
     var r3 = c<number>(); // should be an error
              ~~~~~~~~~~~
 !!! error TS2347: Untyped function calls may not accept type arguments.
@@ -37,14 +37,14 @@ untypedFunctionCallsWithTypeParameters1.ts(41,4): error TS2558: Expected 0 type
         caller = () => { };
     }
     
-    var c2: C;
+    declare var c2: C;
     var r4 = c2<number>(); // should be an error
              ~~
 !!! error TS2349: This expression is not callable.
 !!! error TS2349:   Type 'C' has no call signatures.
     
     class C2 extends Function { } // error
-    var c3: C2;
+    declare var c3: C2;
     var r5 = c3<number>(); // error
              ~~~~~~~~~~~~
 !!! error TS2347: Untyped function calls may not accept type arguments.
@@ -52,7 +52,7 @@ untypedFunctionCallsWithTypeParameters1.ts(41,4): error TS2558: Expected 0 type
     interface I {
         (number): number;
     }
-    var z: I;
+    declare var z: I;
     var r6 = z<string>(1); // error
                ~~~~~~
 !!! error TS2558: Expected 0 type arguments, but got 1.
@@ -61,7 +61,7 @@ untypedFunctionCallsWithTypeParameters1.ts(41,4): error TS2558: Expected 0 type
         (a: T): T;
     }
     
-    var c4: callable2<number>;
+    declare var c4: callable2<number>;
     c4<number>(1);
        ~~~~~~
 !!! error TS2558: Expected 0 type arguments, but got 1.
@@ -69,7 +69,7 @@ untypedFunctionCallsWithTypeParameters1.ts(41,4): error TS2558: Expected 0 type
         (a: T): T;
     }
     
-    var c5: callable3<number>;
+    declare var c5: callable3<number>;
     c5<string>(1); // error
        ~~~~~~
 !!! error TS2558: Expected 0 type arguments, but got 1.
diff --git a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
index 94adf1b1d714b..01f7dc7a0072f 100644
--- a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
+++ b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
@@ -7,7 +7,7 @@ var r1 = x<number>();
 var y: any = x;
 var r2 = y<string>();
 
-var c: Function;
+declare var c: Function;
 var r3 = c<number>(); // should be an error
 
 class C implements Function {
@@ -17,30 +17,30 @@ class C implements Function {
     caller = () => { };
 }
 
-var c2: C;
+declare var c2: C;
 var r4 = c2<number>(); // should be an error
 
 class C2 extends Function { } // error
-var c3: C2;
+declare var c3: C2;
 var r5 = c3<number>(); // error
 
 interface I {
     (number): number;
 }
-var z: I;
+declare var z: I;
 var r6 = z<string>(1); // error
 
 interface callable2<T> {
     (a: T): T;
 }
 
-var c4: callable2<number>;
+declare var c4: callable2<number>;
 c4<number>(1);
 interface callable3<T> {
     (a: T): T;
 }
 
-var c5: callable3<number>;
+declare var c5: callable3<number>;
 c5<string>(1); // error
 
 
@@ -66,7 +66,6 @@ var x = function () { return; };
 var r1 = x();
 var y = x;
 var r2 = y();
-var c;
 var r3 = c(); // should be an error
 var C = /** @class */ (function () {
     function C() {
@@ -77,7 +76,6 @@ var C = /** @class */ (function () {
     }
     return C;
 }());
-var c2;
 var r4 = c2(); // should be an error
 var C2 = /** @class */ (function (_super) {
     __extends(C2, _super);
@@ -86,11 +84,7 @@ var C2 = /** @class */ (function (_super) {
     }
     return C2;
 }(Function)); // error
-var c3;
 var r5 = c3(); // error
-var z;
 var r6 = z(1); // error
-var c4;
 c4(1);
-var c5;
 c5(1); // error
diff --git a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.symbols b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.symbols
index 6dd2599b7f68f..c55b31fe83499 100644
--- a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.symbols
+++ b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.symbols
@@ -17,13 +17,13 @@ var r2 = y<string>();
 >r2 : Symbol(r2, Decl(untypedFunctionCallsWithTypeParameters1.ts, 4, 3))
 >y : Symbol(y, Decl(untypedFunctionCallsWithTypeParameters1.ts, 3, 3))
 
-var c: Function;
->c : Symbol(c, Decl(untypedFunctionCallsWithTypeParameters1.ts, 6, 3))
+declare var c: Function;
+>c : Symbol(c, Decl(untypedFunctionCallsWithTypeParameters1.ts, 6, 11))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 var r3 = c<number>(); // should be an error
 >r3 : Symbol(r3, Decl(untypedFunctionCallsWithTypeParameters1.ts, 7, 3))
->c : Symbol(c, Decl(untypedFunctionCallsWithTypeParameters1.ts, 6, 3))
+>c : Symbol(c, Decl(untypedFunctionCallsWithTypeParameters1.ts, 6, 11))
 
 class C implements Function {
 >C : Symbol(C, Decl(untypedFunctionCallsWithTypeParameters1.ts, 7, 21))
@@ -42,25 +42,25 @@ class C implements Function {
 >caller : Symbol(C.caller, Decl(untypedFunctionCallsWithTypeParameters1.ts, 12, 21))
 }
 
-var c2: C;
->c2 : Symbol(c2, Decl(untypedFunctionCallsWithTypeParameters1.ts, 16, 3))
+declare var c2: C;
+>c2 : Symbol(c2, Decl(untypedFunctionCallsWithTypeParameters1.ts, 16, 11))
 >C : Symbol(C, Decl(untypedFunctionCallsWithTypeParameters1.ts, 7, 21))
 
 var r4 = c2<number>(); // should be an error
 >r4 : Symbol(r4, Decl(untypedFunctionCallsWithTypeParameters1.ts, 17, 3))
->c2 : Symbol(c2, Decl(untypedFunctionCallsWithTypeParameters1.ts, 16, 3))
+>c2 : Symbol(c2, Decl(untypedFunctionCallsWithTypeParameters1.ts, 16, 11))
 
 class C2 extends Function { } // error
 >C2 : Symbol(C2, Decl(untypedFunctionCallsWithTypeParameters1.ts, 17, 22))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
-var c3: C2;
->c3 : Symbol(c3, Decl(untypedFunctionCallsWithTypeParameters1.ts, 20, 3))
+declare var c3: C2;
+>c3 : Symbol(c3, Decl(untypedFunctionCallsWithTypeParameters1.ts, 20, 11))
 >C2 : Symbol(C2, Decl(untypedFunctionCallsWithTypeParameters1.ts, 17, 22))
 
 var r5 = c3<number>(); // error
 >r5 : Symbol(r5, Decl(untypedFunctionCallsWithTypeParameters1.ts, 21, 3))
->c3 : Symbol(c3, Decl(untypedFunctionCallsWithTypeParameters1.ts, 20, 3))
+>c3 : Symbol(c3, Decl(untypedFunctionCallsWithTypeParameters1.ts, 20, 11))
 
 interface I {
 >I : Symbol(I, Decl(untypedFunctionCallsWithTypeParameters1.ts, 21, 22))
@@ -68,13 +68,13 @@ interface I {
     (number): number;
 >number : Symbol(number, Decl(untypedFunctionCallsWithTypeParameters1.ts, 24, 5))
 }
-var z: I;
->z : Symbol(z, Decl(untypedFunctionCallsWithTypeParameters1.ts, 26, 3))
+declare var z: I;
+>z : Symbol(z, Decl(untypedFunctionCallsWithTypeParameters1.ts, 26, 11))
 >I : Symbol(I, Decl(untypedFunctionCallsWithTypeParameters1.ts, 21, 22))
 
 var r6 = z<string>(1); // error
 >r6 : Symbol(r6, Decl(untypedFunctionCallsWithTypeParameters1.ts, 27, 3))
->z : Symbol(z, Decl(untypedFunctionCallsWithTypeParameters1.ts, 26, 3))
+>z : Symbol(z, Decl(untypedFunctionCallsWithTypeParameters1.ts, 26, 11))
 
 interface callable2<T> {
 >callable2 : Symbol(callable2, Decl(untypedFunctionCallsWithTypeParameters1.ts, 27, 22))
@@ -86,12 +86,12 @@ interface callable2<T> {
 >T : Symbol(T, Decl(untypedFunctionCallsWithTypeParameters1.ts, 29, 20))
 }
 
-var c4: callable2<number>;
->c4 : Symbol(c4, Decl(untypedFunctionCallsWithTypeParameters1.ts, 33, 3))
+declare var c4: callable2<number>;
+>c4 : Symbol(c4, Decl(untypedFunctionCallsWithTypeParameters1.ts, 33, 11))
 >callable2 : Symbol(callable2, Decl(untypedFunctionCallsWithTypeParameters1.ts, 27, 22))
 
 c4<number>(1);
->c4 : Symbol(c4, Decl(untypedFunctionCallsWithTypeParameters1.ts, 33, 3))
+>c4 : Symbol(c4, Decl(untypedFunctionCallsWithTypeParameters1.ts, 33, 11))
 
 interface callable3<T> {
 >callable3 : Symbol(callable3, Decl(untypedFunctionCallsWithTypeParameters1.ts, 34, 14))
@@ -103,11 +103,11 @@ interface callable3<T> {
 >T : Symbol(T, Decl(untypedFunctionCallsWithTypeParameters1.ts, 35, 20))
 }
 
-var c5: callable3<number>;
->c5 : Symbol(c5, Decl(untypedFunctionCallsWithTypeParameters1.ts, 39, 3))
+declare var c5: callable3<number>;
+>c5 : Symbol(c5, Decl(untypedFunctionCallsWithTypeParameters1.ts, 39, 11))
 >callable3 : Symbol(callable3, Decl(untypedFunctionCallsWithTypeParameters1.ts, 34, 14))
 
 c5<string>(1); // error
->c5 : Symbol(c5, Decl(untypedFunctionCallsWithTypeParameters1.ts, 39, 3))
+>c5 : Symbol(c5, Decl(untypedFunctionCallsWithTypeParameters1.ts, 39, 11))
 
 
diff --git a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.types b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.types
index b8e4050c1026b..109ea71a9c544 100644
--- a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.types
+++ b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.types
@@ -30,7 +30,7 @@ var r2 = y<string>();
 >y : any
 >  : ^^^
 
-var c: Function;
+declare var c: Function;
 >c : Function
 >  : ^^^^^^^^
 
@@ -67,7 +67,7 @@ class C implements Function {
 >          : ^^^^^^^^^^
 }
 
-var c2: C;
+declare var c2: C;
 >c2 : C
 >   : ^
 
@@ -85,7 +85,7 @@ class C2 extends Function { } // error
 >Function : Function
 >         : ^^^^^^^^
 
-var c3: C2;
+declare var c3: C2;
 >c3 : C2
 >   : ^^
 
@@ -102,7 +102,7 @@ interface I {
 >number : any
 >       : ^^^
 }
-var z: I;
+declare var z: I;
 >z : I
 >  : ^
 
@@ -122,7 +122,7 @@ interface callable2<T> {
 >  : ^
 }
 
-var c4: callable2<number>;
+declare var c4: callable2<number>;
 >c4 : callable2<number>
 >   : ^^^^^^^^^^^^^^^^^
 
@@ -140,7 +140,7 @@ interface callable3<T> {
 >  : ^
 }
 
-var c5: callable3<number>;
+declare var c5: callable3<number>;
 >c5 : callable3<number>
 >   : ^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/unusedLocalsInForInOrOf1.errors.txt b/tests/baselines/reference/unusedLocalsInForInOrOf1.errors.txt
new file mode 100644
index 0000000000000..2b0a014ec961b
--- /dev/null
+++ b/tests/baselines/reference/unusedLocalsInForInOrOf1.errors.txt
@@ -0,0 +1,84 @@
+unusedLocalsInForInOrOf1.ts(2,12): error TS6133: 'f' is declared but its value is never read.
+unusedLocalsInForInOrOf1.ts(8,7): error TS6133: 'f' is declared but its value is never read.
+unusedLocalsInForInOrOf1.ts(14,12): error TS6133: 'g' is declared but its value is never read.
+unusedLocalsInForInOrOf1.ts(20,12): error TS6133: 'f2' is declared but its value is never read.
+unusedLocalsInForInOrOf1.ts(26,7): error TS6133: 'f2' is declared but its value is never read.
+unusedLocalsInForInOrOf1.ts(32,12): error TS6133: 'g2' is declared but its value is never read.
+unusedLocalsInForInOrOf1.ts(38,12): error TS6133: 'f3' is declared but its value is never read.
+unusedLocalsInForInOrOf1.ts(44,7): error TS6133: 'f3' is declared but its value is never read.
+unusedLocalsInForInOrOf1.ts(50,12): error TS6133: 'g3' is declared but its value is never read.
+
+
+==== unusedLocalsInForInOrOf1.ts (9 errors) ====
+    for (let x of [1, 2]) {
+      function f() {
+               ~
+!!! error TS6133: 'f' is declared but its value is never read.
+        x;
+      }
+    }
+    
+    for (let x of [1, 2]) {
+      let f = () => {
+          ~
+!!! error TS6133: 'f' is declared but its value is never read.
+        x;
+      };
+    }
+    
+    for (const x of [1, 2]) {
+      function g() {
+               ~
+!!! error TS6133: 'g' is declared but its value is never read.
+        x;
+      }
+    }
+    
+    for (let x in { a: 1, b: 2 }) {
+      function f2() {
+               ~~
+!!! error TS6133: 'f2' is declared but its value is never read.
+        x;
+      }
+    }
+    
+    for (let x in { a: 1, b: 2 }) {
+      let f2 = () => {
+          ~~
+!!! error TS6133: 'f2' is declared but its value is never read.
+        x;
+      };
+    }
+    
+    for (const x in { a: 1, b: 2 }) {
+      function g2() {
+               ~~
+!!! error TS6133: 'g2' is declared but its value is never read.
+        x;
+      }
+    }
+    
+    for (let { x } of [{ x: 1 }, { x: 2 }]) {
+      function f3() {
+               ~~
+!!! error TS6133: 'f3' is declared but its value is never read.
+        x;
+      }
+    }
+    
+    for (let { x } of [{ x: 1 }, { x: 2 }]) {
+      let f3 = () => {
+          ~~
+!!! error TS6133: 'f3' is declared but its value is never read.
+        x;
+      };
+    }
+    
+    for (const { x } of [{ x: 1 }, { x: 2 }]) {
+      function g3() {
+               ~~
+!!! error TS6133: 'g3' is declared but its value is never read.
+        x;
+      }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedLocalsInForInOrOf1.symbols b/tests/baselines/reference/unusedLocalsInForInOrOf1.symbols
new file mode 100644
index 0000000000000..c4c2381baff5d
--- /dev/null
+++ b/tests/baselines/reference/unusedLocalsInForInOrOf1.symbols
@@ -0,0 +1,117 @@
+//// [tests/cases/compiler/unusedLocalsInForInOrOf1.ts] ////
+
+=== unusedLocalsInForInOrOf1.ts ===
+for (let x of [1, 2]) {
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 0, 8))
+
+  function f() {
+>f : Symbol(f, Decl(unusedLocalsInForInOrOf1.ts, 0, 23))
+
+    x;
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 0, 8))
+  }
+}
+
+for (let x of [1, 2]) {
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 6, 8))
+
+  let f = () => {
+>f : Symbol(f, Decl(unusedLocalsInForInOrOf1.ts, 7, 5))
+
+    x;
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 6, 8))
+
+  };
+}
+
+for (const x of [1, 2]) {
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 12, 10))
+
+  function g() {
+>g : Symbol(g, Decl(unusedLocalsInForInOrOf1.ts, 12, 25))
+
+    x;
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 12, 10))
+  }
+}
+
+for (let x in { a: 1, b: 2 }) {
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 18, 8))
+>a : Symbol(a, Decl(unusedLocalsInForInOrOf1.ts, 18, 15))
+>b : Symbol(b, Decl(unusedLocalsInForInOrOf1.ts, 18, 21))
+
+  function f2() {
+>f2 : Symbol(f2, Decl(unusedLocalsInForInOrOf1.ts, 18, 31))
+
+    x;
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 18, 8))
+  }
+}
+
+for (let x in { a: 1, b: 2 }) {
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 24, 8))
+>a : Symbol(a, Decl(unusedLocalsInForInOrOf1.ts, 24, 15))
+>b : Symbol(b, Decl(unusedLocalsInForInOrOf1.ts, 24, 21))
+
+  let f2 = () => {
+>f2 : Symbol(f2, Decl(unusedLocalsInForInOrOf1.ts, 25, 5))
+
+    x;
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 24, 8))
+
+  };
+}
+
+for (const x in { a: 1, b: 2 }) {
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 30, 10))
+>a : Symbol(a, Decl(unusedLocalsInForInOrOf1.ts, 30, 17))
+>b : Symbol(b, Decl(unusedLocalsInForInOrOf1.ts, 30, 23))
+
+  function g2() {
+>g2 : Symbol(g2, Decl(unusedLocalsInForInOrOf1.ts, 30, 33))
+
+    x;
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 30, 10))
+  }
+}
+
+for (let { x } of [{ x: 1 }, { x: 2 }]) {
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 36, 10))
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 36, 20))
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 36, 30))
+
+  function f3() {
+>f3 : Symbol(f3, Decl(unusedLocalsInForInOrOf1.ts, 36, 41))
+
+    x;
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 36, 10))
+  }
+}
+
+for (let { x } of [{ x: 1 }, { x: 2 }]) {
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 42, 10))
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 42, 20))
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 42, 30))
+
+  let f3 = () => {
+>f3 : Symbol(f3, Decl(unusedLocalsInForInOrOf1.ts, 43, 5))
+
+    x;
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 42, 10))
+
+  };
+}
+
+for (const { x } of [{ x: 1 }, { x: 2 }]) {
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 48, 12))
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 48, 22))
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 48, 32))
+
+  function g3() {
+>g3 : Symbol(g3, Decl(unusedLocalsInForInOrOf1.ts, 48, 43))
+
+    x;
+>x : Symbol(x, Decl(unusedLocalsInForInOrOf1.ts, 48, 12))
+  }
+}
+
diff --git a/tests/baselines/reference/unusedLocalsInForInOrOf1.types b/tests/baselines/reference/unusedLocalsInForInOrOf1.types
new file mode 100644
index 0000000000000..cf2e52be73799
--- /dev/null
+++ b/tests/baselines/reference/unusedLocalsInForInOrOf1.types
@@ -0,0 +1,228 @@
+//// [tests/cases/compiler/unusedLocalsInForInOrOf1.ts] ////
+
+=== unusedLocalsInForInOrOf1.ts ===
+for (let x of [1, 2]) {
+>x : number
+>  : ^^^^^^
+>[1, 2] : number[]
+>       : ^^^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+
+  function f() {
+>f : () => void
+>  : ^^^^^^^^^^
+
+    x;
+>x : number
+>  : ^^^^^^
+  }
+}
+
+for (let x of [1, 2]) {
+>x : number
+>  : ^^^^^^
+>[1, 2] : number[]
+>       : ^^^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+
+  let f = () => {
+>f : () => void
+>  : ^^^^^^^^^^
+>() => {    x;  } : () => void
+>                 : ^^^^^^^^^^
+
+    x;
+>x : number
+>  : ^^^^^^
+
+  };
+}
+
+for (const x of [1, 2]) {
+>x : number
+>  : ^^^^^^
+>[1, 2] : number[]
+>       : ^^^^^^^^
+>1 : 1
+>  : ^
+>2 : 2
+>  : ^
+
+  function g() {
+>g : () => void
+>  : ^^^^^^^^^^
+
+    x;
+>x : number
+>  : ^^^^^^
+  }
+}
+
+for (let x in { a: 1, b: 2 }) {
+>x : string
+>  : ^^^^^^
+>{ a: 1, b: 2 } : { a: number; b: number; }
+>               : ^^^^^^^^^^^^^^^^^^^^^^^^^
+>a : number
+>  : ^^^^^^
+>1 : 1
+>  : ^
+>b : number
+>  : ^^^^^^
+>2 : 2
+>  : ^
+
+  function f2() {
+>f2 : () => void
+>   : ^^^^^^^^^^
+
+    x;
+>x : string
+>  : ^^^^^^
+  }
+}
+
+for (let x in { a: 1, b: 2 }) {
+>x : string
+>  : ^^^^^^
+>{ a: 1, b: 2 } : { a: number; b: number; }
+>               : ^^^^^^^^^^^^^^^^^^^^^^^^^
+>a : number
+>  : ^^^^^^
+>1 : 1
+>  : ^
+>b : number
+>  : ^^^^^^
+>2 : 2
+>  : ^
+
+  let f2 = () => {
+>f2 : () => void
+>   : ^^^^^^^^^^
+>() => {    x;  } : () => void
+>                 : ^^^^^^^^^^
+
+    x;
+>x : string
+>  : ^^^^^^
+
+  };
+}
+
+for (const x in { a: 1, b: 2 }) {
+>x : string
+>  : ^^^^^^
+>{ a: 1, b: 2 } : { a: number; b: number; }
+>               : ^^^^^^^^^^^^^^^^^^^^^^^^^
+>a : number
+>  : ^^^^^^
+>1 : 1
+>  : ^
+>b : number
+>  : ^^^^^^
+>2 : 2
+>  : ^
+
+  function g2() {
+>g2 : () => void
+>   : ^^^^^^^^^^
+
+    x;
+>x : string
+>  : ^^^^^^
+  }
+}
+
+for (let { x } of [{ x: 1 }, { x: 2 }]) {
+>x : number
+>  : ^^^^^^
+>[{ x: 1 }, { x: 2 }] : { x: number; }[]
+>                     : ^^^^^^^^^^^^^^^^
+>{ x: 1 } : { x: number; }
+>         : ^^^^^^^^^^^^^^
+>x : number
+>  : ^^^^^^
+>1 : 1
+>  : ^
+>{ x: 2 } : { x: number; }
+>         : ^^^^^^^^^^^^^^
+>x : number
+>  : ^^^^^^
+>2 : 2
+>  : ^
+
+  function f3() {
+>f3 : () => void
+>   : ^^^^^^^^^^
+
+    x;
+>x : number
+>  : ^^^^^^
+  }
+}
+
+for (let { x } of [{ x: 1 }, { x: 2 }]) {
+>x : number
+>  : ^^^^^^
+>[{ x: 1 }, { x: 2 }] : { x: number; }[]
+>                     : ^^^^^^^^^^^^^^^^
+>{ x: 1 } : { x: number; }
+>         : ^^^^^^^^^^^^^^
+>x : number
+>  : ^^^^^^
+>1 : 1
+>  : ^
+>{ x: 2 } : { x: number; }
+>         : ^^^^^^^^^^^^^^
+>x : number
+>  : ^^^^^^
+>2 : 2
+>  : ^
+
+  let f3 = () => {
+>f3 : () => void
+>   : ^^^^^^^^^^
+>() => {    x;  } : () => void
+>                 : ^^^^^^^^^^
+
+    x;
+>x : number
+>  : ^^^^^^
+
+  };
+}
+
+for (const { x } of [{ x: 1 }, { x: 2 }]) {
+>x : number
+>  : ^^^^^^
+>[{ x: 1 }, { x: 2 }] : { x: number; }[]
+>                     : ^^^^^^^^^^^^^^^^
+>{ x: 1 } : { x: number; }
+>         : ^^^^^^^^^^^^^^
+>x : number
+>  : ^^^^^^
+>1 : 1
+>  : ^
+>{ x: 2 } : { x: number; }
+>         : ^^^^^^^^^^^^^^
+>x : number
+>  : ^^^^^^
+>2 : 2
+>  : ^
+
+  function g3() {
+>g3 : () => void
+>   : ^^^^^^^^^^
+
+    x;
+>x : number
+>  : ^^^^^^
+  }
+}
+
diff --git a/tests/baselines/reference/unusedPrivateVariableInClass5.errors.txt b/tests/baselines/reference/unusedPrivateVariableInClass5.errors.txt
index 88511f029a087..9627ae6bd78e0 100644
--- a/tests/baselines/reference/unusedPrivateVariableInClass5.errors.txt
+++ b/tests/baselines/reference/unusedPrivateVariableInClass5.errors.txt
@@ -3,11 +3,11 @@ unusedPrivateVariableInClass5.ts(3,13): error TS6133: 'y' is declared but its va
 
 ==== unusedPrivateVariableInClass5.ts (1 errors) ====
     class greeter {
-        private x: string;
-        private y: string;
+        private x!: string;
+        private y!: string;
                 ~
 !!! error TS6133: 'y' is declared but its value is never read.
-        public  z: string;
+        public  z!: string;
     
         constructor() {
             this.x;
diff --git a/tests/baselines/reference/unusedPrivateVariableInClass5.js b/tests/baselines/reference/unusedPrivateVariableInClass5.js
index 0b7af8693893c..807032dc28008 100644
--- a/tests/baselines/reference/unusedPrivateVariableInClass5.js
+++ b/tests/baselines/reference/unusedPrivateVariableInClass5.js
@@ -2,9 +2,9 @@
 
 //// [unusedPrivateVariableInClass5.ts]
 class greeter {
-    private x: string;
-    private y: string;
-    public  z: string;
+    private x!: string;
+    private y!: string;
+    public  z!: string;
 
     constructor() {
         this.x;
diff --git a/tests/baselines/reference/unusedPrivateVariableInClass5.symbols b/tests/baselines/reference/unusedPrivateVariableInClass5.symbols
index 00bd314e44b13..6e933dd776b80 100644
--- a/tests/baselines/reference/unusedPrivateVariableInClass5.symbols
+++ b/tests/baselines/reference/unusedPrivateVariableInClass5.symbols
@@ -4,14 +4,14 @@
 class greeter {
 >greeter : Symbol(greeter, Decl(unusedPrivateVariableInClass5.ts, 0, 0))
 
-    private x: string;
+    private x!: string;
 >x : Symbol(greeter.x, Decl(unusedPrivateVariableInClass5.ts, 0, 15))
 
-    private y: string;
->y : Symbol(greeter.y, Decl(unusedPrivateVariableInClass5.ts, 1, 22))
+    private y!: string;
+>y : Symbol(greeter.y, Decl(unusedPrivateVariableInClass5.ts, 1, 23))
 
-    public  z: string;
->z : Symbol(greeter.z, Decl(unusedPrivateVariableInClass5.ts, 2, 22))
+    public  z!: string;
+>z : Symbol(greeter.z, Decl(unusedPrivateVariableInClass5.ts, 2, 23))
 
     constructor() {
         this.x;
diff --git a/tests/baselines/reference/unusedPrivateVariableInClass5.types b/tests/baselines/reference/unusedPrivateVariableInClass5.types
index e7f15bf0b6682..3e2013d96f6f2 100644
--- a/tests/baselines/reference/unusedPrivateVariableInClass5.types
+++ b/tests/baselines/reference/unusedPrivateVariableInClass5.types
@@ -5,15 +5,15 @@ class greeter {
 >greeter : greeter
 >        : ^^^^^^^
 
-    private x: string;
+    private x!: string;
 >x : string
 >  : ^^^^^^
 
-    private y: string;
+    private y!: string;
 >y : string
 >  : ^^^^^^
 
-    public  z: string;
+    public  z!: string;
 >z : string
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction2.errors.txt b/tests/baselines/reference/unusedTypeParameterInFunction2.errors.txt
index cf8a06f14ef55..678bb5653f91a 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction2.errors.txt
+++ b/tests/baselines/reference/unusedTypeParameterInFunction2.errors.txt
@@ -5,6 +5,6 @@ unusedTypeParameterInFunction2.ts(1,16): error TS6133: 'Y' is declared but its v
     function f1<X, Y>() {
                    ~
 !!! error TS6133: 'Y' is declared but its value is never read.
-        var a: X;
+        var a!: X;
         a;
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction2.js b/tests/baselines/reference/unusedTypeParameterInFunction2.js
index 2ceb0c573f649..f04c44bdef355 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction2.js
+++ b/tests/baselines/reference/unusedTypeParameterInFunction2.js
@@ -2,7 +2,7 @@
 
 //// [unusedTypeParameterInFunction2.ts]
 function f1<X, Y>() {
-    var a: X;
+    var a!: X;
     a;
 }
 
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction2.symbols b/tests/baselines/reference/unusedTypeParameterInFunction2.symbols
index e66ef7132e241..ff1087dc1de6f 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction2.symbols
+++ b/tests/baselines/reference/unusedTypeParameterInFunction2.symbols
@@ -6,7 +6,7 @@ function f1<X, Y>() {
 >X : Symbol(X, Decl(unusedTypeParameterInFunction2.ts, 0, 12))
 >Y : Symbol(Y, Decl(unusedTypeParameterInFunction2.ts, 0, 14))
 
-    var a: X;
+    var a!: X;
 >a : Symbol(a, Decl(unusedTypeParameterInFunction2.ts, 1, 7))
 >X : Symbol(X, Decl(unusedTypeParameterInFunction2.ts, 0, 12))
 
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction2.types b/tests/baselines/reference/unusedTypeParameterInFunction2.types
index 05aceaa41eaf6..2590e14de0d79 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction2.types
+++ b/tests/baselines/reference/unusedTypeParameterInFunction2.types
@@ -5,7 +5,7 @@ function f1<X, Y>() {
 >f1 : <X, Y>() => void
 >   : ^ ^^ ^^^^^^^^^^^
 
-    var a: X;
+    var a!: X;
 >a : X
 >  : ^
 
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction3.errors.txt b/tests/baselines/reference/unusedTypeParameterInFunction3.errors.txt
index b2c1fb3f86443..94927cdecab4e 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction3.errors.txt
+++ b/tests/baselines/reference/unusedTypeParameterInFunction3.errors.txt
@@ -5,8 +5,8 @@ unusedTypeParameterInFunction3.ts(1,16): error TS6133: 'Y' is declared but its v
     function f1<X, Y, Z>() {
                    ~
 !!! error TS6133: 'Y' is declared but its value is never read.
-        var a: X;
-        var b: Z;
+        var a!: X;
+        var b!: Z;
         a;
         b;
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction3.js b/tests/baselines/reference/unusedTypeParameterInFunction3.js
index 90b680d17fb38..ca7d80ab4d43a 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction3.js
+++ b/tests/baselines/reference/unusedTypeParameterInFunction3.js
@@ -2,8 +2,8 @@
 
 //// [unusedTypeParameterInFunction3.ts]
 function f1<X, Y, Z>() {
-    var a: X;
-    var b: Z;
+    var a!: X;
+    var b!: Z;
     a;
     b;
 }
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction3.symbols b/tests/baselines/reference/unusedTypeParameterInFunction3.symbols
index d513c64b25251..a9588d4898f82 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction3.symbols
+++ b/tests/baselines/reference/unusedTypeParameterInFunction3.symbols
@@ -7,11 +7,11 @@ function f1<X, Y, Z>() {
 >Y : Symbol(Y, Decl(unusedTypeParameterInFunction3.ts, 0, 14))
 >Z : Symbol(Z, Decl(unusedTypeParameterInFunction3.ts, 0, 17))
 
-    var a: X;
+    var a!: X;
 >a : Symbol(a, Decl(unusedTypeParameterInFunction3.ts, 1, 7))
 >X : Symbol(X, Decl(unusedTypeParameterInFunction3.ts, 0, 12))
 
-    var b: Z;
+    var b!: Z;
 >b : Symbol(b, Decl(unusedTypeParameterInFunction3.ts, 2, 7))
 >Z : Symbol(Z, Decl(unusedTypeParameterInFunction3.ts, 0, 17))
 
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction3.types b/tests/baselines/reference/unusedTypeParameterInFunction3.types
index d666f2201117c..d3e12f2680bc7 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction3.types
+++ b/tests/baselines/reference/unusedTypeParameterInFunction3.types
@@ -5,11 +5,11 @@ function f1<X, Y, Z>() {
 >f1 : <X, Y, Z>() => void
 >   : ^ ^^ ^^ ^^^^^^^^^^^
 
-    var a: X;
+    var a!: X;
 >a : X
 >  : ^
 
-    var b: Z;
+    var b!: Z;
 >b : Z
 >  : ^
 
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction4.errors.txt b/tests/baselines/reference/unusedTypeParameterInFunction4.errors.txt
index a4997f6ed0e7c..66da672ee9ba0 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction4.errors.txt
+++ b/tests/baselines/reference/unusedTypeParameterInFunction4.errors.txt
@@ -5,8 +5,8 @@ unusedTypeParameterInFunction4.ts(1,13): error TS6133: 'X' is declared but its v
     function f1<X, Y, Z>() {
                 ~
 !!! error TS6133: 'X' is declared but its value is never read.
-        var a: Y;
-        var b: Z;
+        var a!: Y;
+        var b!: Z;
         a;
         b;
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction4.js b/tests/baselines/reference/unusedTypeParameterInFunction4.js
index b50c971ad3192..c851c2b01ede0 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction4.js
+++ b/tests/baselines/reference/unusedTypeParameterInFunction4.js
@@ -2,8 +2,8 @@
 
 //// [unusedTypeParameterInFunction4.ts]
 function f1<X, Y, Z>() {
-    var a: Y;
-    var b: Z;
+    var a!: Y;
+    var b!: Z;
     a;
     b;
 }
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction4.symbols b/tests/baselines/reference/unusedTypeParameterInFunction4.symbols
index 097ce8344febc..8a51a9163021a 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction4.symbols
+++ b/tests/baselines/reference/unusedTypeParameterInFunction4.symbols
@@ -7,11 +7,11 @@ function f1<X, Y, Z>() {
 >Y : Symbol(Y, Decl(unusedTypeParameterInFunction4.ts, 0, 14))
 >Z : Symbol(Z, Decl(unusedTypeParameterInFunction4.ts, 0, 17))
 
-    var a: Y;
+    var a!: Y;
 >a : Symbol(a, Decl(unusedTypeParameterInFunction4.ts, 1, 7))
 >Y : Symbol(Y, Decl(unusedTypeParameterInFunction4.ts, 0, 14))
 
-    var b: Z;
+    var b!: Z;
 >b : Symbol(b, Decl(unusedTypeParameterInFunction4.ts, 2, 7))
 >Z : Symbol(Z, Decl(unusedTypeParameterInFunction4.ts, 0, 17))
 
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction4.types b/tests/baselines/reference/unusedTypeParameterInFunction4.types
index b0696729e4afb..041ee326194aa 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction4.types
+++ b/tests/baselines/reference/unusedTypeParameterInFunction4.types
@@ -5,11 +5,11 @@ function f1<X, Y, Z>() {
 >f1 : <X, Y, Z>() => void
 >   : ^ ^^ ^^ ^^^^^^^^^^^
 
-    var a: Y;
+    var a!: Y;
 >a : Y
 >  : ^
 
-    var b: Z;
+    var b!: Z;
 >b : Z
 >  : ^
 
diff --git a/tests/baselines/reference/unusedTypeParameterInLambda2.errors.txt b/tests/baselines/reference/unusedTypeParameterInLambda2.errors.txt
index f395698e6c420..d35b11a6e27ad 100644
--- a/tests/baselines/reference/unusedTypeParameterInLambda2.errors.txt
+++ b/tests/baselines/reference/unusedTypeParameterInLambda2.errors.txt
@@ -7,7 +7,7 @@ unusedTypeParameterInLambda2.ts(3,17): error TS6133: 'T' is declared but its val
             return <T, X>() => {
                     ~
 !!! error TS6133: 'T' is declared but its value is never read.
-                var a: X;
+                var a!: X;
                 a;
             }
         }
diff --git a/tests/baselines/reference/unusedTypeParameterInLambda2.js b/tests/baselines/reference/unusedTypeParameterInLambda2.js
index e9737d36668c9..78dbf51a4bd33 100644
--- a/tests/baselines/reference/unusedTypeParameterInLambda2.js
+++ b/tests/baselines/reference/unusedTypeParameterInLambda2.js
@@ -4,7 +4,7 @@
 class A {
     public f1() {
         return <T, X>() => {
-            var a: X;
+            var a!: X;
             a;
         }
     }
diff --git a/tests/baselines/reference/unusedTypeParameterInLambda2.symbols b/tests/baselines/reference/unusedTypeParameterInLambda2.symbols
index f8d4ba797bb8e..3e470918a5a16 100644
--- a/tests/baselines/reference/unusedTypeParameterInLambda2.symbols
+++ b/tests/baselines/reference/unusedTypeParameterInLambda2.symbols
@@ -11,7 +11,7 @@ class A {
 >T : Symbol(T, Decl(unusedTypeParameterInLambda2.ts, 2, 16))
 >X : Symbol(X, Decl(unusedTypeParameterInLambda2.ts, 2, 18))
 
-            var a: X;
+            var a!: X;
 >a : Symbol(a, Decl(unusedTypeParameterInLambda2.ts, 3, 15))
 >X : Symbol(X, Decl(unusedTypeParameterInLambda2.ts, 2, 18))
 
diff --git a/tests/baselines/reference/unusedTypeParameterInLambda2.types b/tests/baselines/reference/unusedTypeParameterInLambda2.types
index 94b1b2d48e105..2a5401beac606 100644
--- a/tests/baselines/reference/unusedTypeParameterInLambda2.types
+++ b/tests/baselines/reference/unusedTypeParameterInLambda2.types
@@ -10,10 +10,10 @@ class A {
 >   : ^^^^^^^ ^^ ^^^^^^^^^^^
 
         return <T, X>() => {
-><T, X>() => {            var a: X;            a;        } : <T, X>() => void
->                                                          : ^ ^^ ^^^^^^^^^^^
+><T, X>() => {            var a!: X;            a;        } : <T, X>() => void
+>                                                           : ^ ^^ ^^^^^^^^^^^
 
-            var a: X;
+            var a!: X;
 >a : X
 >  : ^
 
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod1.errors.txt b/tests/baselines/reference/unusedTypeParameterInMethod1.errors.txt
index e23b8060fb2a3..9dc915d8e35b2 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod1.errors.txt
+++ b/tests/baselines/reference/unusedTypeParameterInMethod1.errors.txt
@@ -6,8 +6,8 @@ unusedTypeParameterInMethod1.ts(2,15): error TS6133: 'X' is declared but its val
         public f1<X, Y, Z>() {
                   ~
 !!! error TS6133: 'X' is declared but its value is never read.
-            var a: Y;
-            var b: Z;
+            var a!: Y;
+            var b!: Z;
             a;
             b;
         }
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod1.js b/tests/baselines/reference/unusedTypeParameterInMethod1.js
index 85ef2cac5b23a..d5348e269a941 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod1.js
+++ b/tests/baselines/reference/unusedTypeParameterInMethod1.js
@@ -3,8 +3,8 @@
 //// [unusedTypeParameterInMethod1.ts]
 class A {
     public f1<X, Y, Z>() {
-        var a: Y;
-        var b: Z;
+        var a!: Y;
+        var b!: Z;
         a;
         b;
     }
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod1.symbols b/tests/baselines/reference/unusedTypeParameterInMethod1.symbols
index bffd0ac9142f7..b32516a60dd04 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod1.symbols
+++ b/tests/baselines/reference/unusedTypeParameterInMethod1.symbols
@@ -10,11 +10,11 @@ class A {
 >Y : Symbol(Y, Decl(unusedTypeParameterInMethod1.ts, 1, 16))
 >Z : Symbol(Z, Decl(unusedTypeParameterInMethod1.ts, 1, 19))
 
-        var a: Y;
+        var a!: Y;
 >a : Symbol(a, Decl(unusedTypeParameterInMethod1.ts, 2, 11))
 >Y : Symbol(Y, Decl(unusedTypeParameterInMethod1.ts, 1, 16))
 
-        var b: Z;
+        var b!: Z;
 >b : Symbol(b, Decl(unusedTypeParameterInMethod1.ts, 3, 11))
 >Z : Symbol(Z, Decl(unusedTypeParameterInMethod1.ts, 1, 19))
 
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod1.types b/tests/baselines/reference/unusedTypeParameterInMethod1.types
index ecd2d731ff44d..478994db1902d 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod1.types
+++ b/tests/baselines/reference/unusedTypeParameterInMethod1.types
@@ -9,11 +9,11 @@ class A {
 >f1 : <X, Y, Z>() => void
 >   : ^ ^^ ^^ ^^^^^^^^^^^
 
-        var a: Y;
+        var a!: Y;
 >a : Y
 >  : ^
 
-        var b: Z;
+        var b!: Z;
 >b : Z
 >  : ^
 
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod2.errors.txt b/tests/baselines/reference/unusedTypeParameterInMethod2.errors.txt
index 5903c148d9b63..e745f10e7cfd1 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod2.errors.txt
+++ b/tests/baselines/reference/unusedTypeParameterInMethod2.errors.txt
@@ -6,8 +6,8 @@ unusedTypeParameterInMethod2.ts(2,18): error TS6133: 'Y' is declared but its val
         public f1<X, Y, Z>() {
                      ~
 !!! error TS6133: 'Y' is declared but its value is never read.
-            var a: X;
-            var b: Z;
+            var a!: X;
+            var b!: Z;
             a;
             b;
         }
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod2.js b/tests/baselines/reference/unusedTypeParameterInMethod2.js
index ed576caf05c02..1cff82e08fa64 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod2.js
+++ b/tests/baselines/reference/unusedTypeParameterInMethod2.js
@@ -3,8 +3,8 @@
 //// [unusedTypeParameterInMethod2.ts]
 class A {
     public f1<X, Y, Z>() {
-        var a: X;
-        var b: Z;
+        var a!: X;
+        var b!: Z;
         a;
         b;
     }
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod2.symbols b/tests/baselines/reference/unusedTypeParameterInMethod2.symbols
index eebf0f895df88..19b889c9a729b 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod2.symbols
+++ b/tests/baselines/reference/unusedTypeParameterInMethod2.symbols
@@ -10,11 +10,11 @@ class A {
 >Y : Symbol(Y, Decl(unusedTypeParameterInMethod2.ts, 1, 16))
 >Z : Symbol(Z, Decl(unusedTypeParameterInMethod2.ts, 1, 19))
 
-        var a: X;
+        var a!: X;
 >a : Symbol(a, Decl(unusedTypeParameterInMethod2.ts, 2, 11))
 >X : Symbol(X, Decl(unusedTypeParameterInMethod2.ts, 1, 14))
 
-        var b: Z;
+        var b!: Z;
 >b : Symbol(b, Decl(unusedTypeParameterInMethod2.ts, 3, 11))
 >Z : Symbol(Z, Decl(unusedTypeParameterInMethod2.ts, 1, 19))
 
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod2.types b/tests/baselines/reference/unusedTypeParameterInMethod2.types
index a7480f74f0b9b..c926cfe24ade1 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod2.types
+++ b/tests/baselines/reference/unusedTypeParameterInMethod2.types
@@ -9,11 +9,11 @@ class A {
 >f1 : <X, Y, Z>() => void
 >   : ^ ^^ ^^ ^^^^^^^^^^^
 
-        var a: X;
+        var a!: X;
 >a : X
 >  : ^
 
-        var b: Z;
+        var b!: Z;
 >b : Z
 >  : ^
 
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod3.errors.txt b/tests/baselines/reference/unusedTypeParameterInMethod3.errors.txt
index 2d8ac88be2556..90be2662dc4bc 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod3.errors.txt
+++ b/tests/baselines/reference/unusedTypeParameterInMethod3.errors.txt
@@ -6,8 +6,8 @@ unusedTypeParameterInMethod3.ts(2,21): error TS6133: 'Z' is declared but its val
         public f1<X, Y, Z>() {
                         ~
 !!! error TS6133: 'Z' is declared but its value is never read.
-            var a: X;
-            var b: Y;
+            var a!: X;
+            var b!: Y;
             a;
             b;
         }
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod3.js b/tests/baselines/reference/unusedTypeParameterInMethod3.js
index c15c63785262a..a5c9aae44707e 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod3.js
+++ b/tests/baselines/reference/unusedTypeParameterInMethod3.js
@@ -3,8 +3,8 @@
 //// [unusedTypeParameterInMethod3.ts]
 class A {
     public f1<X, Y, Z>() {
-        var a: X;
-        var b: Y;
+        var a!: X;
+        var b!: Y;
         a;
         b;
     }
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod3.symbols b/tests/baselines/reference/unusedTypeParameterInMethod3.symbols
index 91adcbfdf1d39..cf9beead3b728 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod3.symbols
+++ b/tests/baselines/reference/unusedTypeParameterInMethod3.symbols
@@ -10,11 +10,11 @@ class A {
 >Y : Symbol(Y, Decl(unusedTypeParameterInMethod3.ts, 1, 16))
 >Z : Symbol(Z, Decl(unusedTypeParameterInMethod3.ts, 1, 19))
 
-        var a: X;
+        var a!: X;
 >a : Symbol(a, Decl(unusedTypeParameterInMethod3.ts, 2, 11))
 >X : Symbol(X, Decl(unusedTypeParameterInMethod3.ts, 1, 14))
 
-        var b: Y;
+        var b!: Y;
 >b : Symbol(b, Decl(unusedTypeParameterInMethod3.ts, 3, 11))
 >Y : Symbol(Y, Decl(unusedTypeParameterInMethod3.ts, 1, 16))
 
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod3.types b/tests/baselines/reference/unusedTypeParameterInMethod3.types
index 9aded1d9ebf92..9b5f4565ddd65 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod3.types
+++ b/tests/baselines/reference/unusedTypeParameterInMethod3.types
@@ -9,11 +9,11 @@ class A {
 >f1 : <X, Y, Z>() => void
 >   : ^ ^^ ^^ ^^^^^^^^^^^
 
-        var a: X;
+        var a!: X;
 >a : X
 >  : ^
 
-        var b: Y;
+        var b!: Y;
 >b : Y
 >  : ^
 
diff --git a/tests/baselines/reference/useBeforeDeclaration.errors.txt b/tests/baselines/reference/useBeforeDeclaration.errors.txt
new file mode 100644
index 0000000000000..8cd7624fb4265
--- /dev/null
+++ b/tests/baselines/reference/useBeforeDeclaration.errors.txt
@@ -0,0 +1,23 @@
+error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+==== A.ts (0 errors) ====
+    namespace ts {
+        export function printVersion():void {
+            log("Version: " + sys.version);  // the call of sys.version is deferred, should not report an error.
+        }
+    
+        export function log(info:string):void {
+    
+        }
+    }
+    
+==== B.ts (0 errors) ====
+    namespace ts {
+    
+        export let sys:{version:string} = {version: "2.0.5"};
+    
+    }
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/validEnumAssignments.errors.txt b/tests/baselines/reference/validEnumAssignments.errors.txt
index bd10e6b81d21e..5ad6c634bfaae 100644
--- a/tests/baselines/reference/validEnumAssignments.errors.txt
+++ b/tests/baselines/reference/validEnumAssignments.errors.txt
@@ -7,9 +7,9 @@ validEnumAssignments.ts(26,1): error TS2322: Type '-1' is not assignable to type
         B
     }
     
-    var n: number;
-    var a: any;
-    var e: E;
+    declare var n: number;
+    declare var a: any;
+    declare var e: E;
     
     n = e;
     n = E.A;
diff --git a/tests/baselines/reference/validEnumAssignments.js b/tests/baselines/reference/validEnumAssignments.js
index 711aa3433df37..30e92aaee0fce 100644
--- a/tests/baselines/reference/validEnumAssignments.js
+++ b/tests/baselines/reference/validEnumAssignments.js
@@ -6,9 +6,9 @@ enum E {
     B
 }
 
-var n: number;
-var a: any;
-var e: E;
+declare var n: number;
+declare var a: any;
+declare var e: E;
 
 n = e;
 n = E.A;
@@ -34,9 +34,6 @@ var E;
     E[E["A"] = 0] = "A";
     E[E["B"] = 1] = "B";
 })(E || (E = {}));
-var n;
-var a;
-var e;
 n = e;
 n = E.A;
 a = n;
diff --git a/tests/baselines/reference/validEnumAssignments.symbols b/tests/baselines/reference/validEnumAssignments.symbols
index 7f4d5e0e5fe28..3c5adc5241451 100644
--- a/tests/baselines/reference/validEnumAssignments.symbols
+++ b/tests/baselines/reference/validEnumAssignments.symbols
@@ -11,76 +11,76 @@ enum E {
 >B : Symbol(E.B, Decl(validEnumAssignments.ts, 1, 6))
 }
 
-var n: number;
->n : Symbol(n, Decl(validEnumAssignments.ts, 5, 3))
+declare var n: number;
+>n : Symbol(n, Decl(validEnumAssignments.ts, 5, 11))
 
-var a: any;
->a : Symbol(a, Decl(validEnumAssignments.ts, 6, 3))
+declare var a: any;
+>a : Symbol(a, Decl(validEnumAssignments.ts, 6, 11))
 
-var e: E;
->e : Symbol(e, Decl(validEnumAssignments.ts, 7, 3))
+declare var e: E;
+>e : Symbol(e, Decl(validEnumAssignments.ts, 7, 11))
 >E : Symbol(E, Decl(validEnumAssignments.ts, 0, 0))
 
 n = e;
->n : Symbol(n, Decl(validEnumAssignments.ts, 5, 3))
->e : Symbol(e, Decl(validEnumAssignments.ts, 7, 3))
+>n : Symbol(n, Decl(validEnumAssignments.ts, 5, 11))
+>e : Symbol(e, Decl(validEnumAssignments.ts, 7, 11))
 
 n = E.A;
->n : Symbol(n, Decl(validEnumAssignments.ts, 5, 3))
+>n : Symbol(n, Decl(validEnumAssignments.ts, 5, 11))
 >E.A : Symbol(E.A, Decl(validEnumAssignments.ts, 0, 8))
 >E : Symbol(E, Decl(validEnumAssignments.ts, 0, 0))
 >A : Symbol(E.A, Decl(validEnumAssignments.ts, 0, 8))
 
 a = n;
->a : Symbol(a, Decl(validEnumAssignments.ts, 6, 3))
->n : Symbol(n, Decl(validEnumAssignments.ts, 5, 3))
+>a : Symbol(a, Decl(validEnumAssignments.ts, 6, 11))
+>n : Symbol(n, Decl(validEnumAssignments.ts, 5, 11))
 
 a = e;
->a : Symbol(a, Decl(validEnumAssignments.ts, 6, 3))
->e : Symbol(e, Decl(validEnumAssignments.ts, 7, 3))
+>a : Symbol(a, Decl(validEnumAssignments.ts, 6, 11))
+>e : Symbol(e, Decl(validEnumAssignments.ts, 7, 11))
 
 a = E.A;
->a : Symbol(a, Decl(validEnumAssignments.ts, 6, 3))
+>a : Symbol(a, Decl(validEnumAssignments.ts, 6, 11))
 >E.A : Symbol(E.A, Decl(validEnumAssignments.ts, 0, 8))
 >E : Symbol(E, Decl(validEnumAssignments.ts, 0, 0))
 >A : Symbol(E.A, Decl(validEnumAssignments.ts, 0, 8))
 
 e = e;
->e : Symbol(e, Decl(validEnumAssignments.ts, 7, 3))
->e : Symbol(e, Decl(validEnumAssignments.ts, 7, 3))
+>e : Symbol(e, Decl(validEnumAssignments.ts, 7, 11))
+>e : Symbol(e, Decl(validEnumAssignments.ts, 7, 11))
 
 e = E.A;
->e : Symbol(e, Decl(validEnumAssignments.ts, 7, 3))
+>e : Symbol(e, Decl(validEnumAssignments.ts, 7, 11))
 >E.A : Symbol(E.A, Decl(validEnumAssignments.ts, 0, 8))
 >E : Symbol(E, Decl(validEnumAssignments.ts, 0, 0))
 >A : Symbol(E.A, Decl(validEnumAssignments.ts, 0, 8))
 
 e = E.B;
->e : Symbol(e, Decl(validEnumAssignments.ts, 7, 3))
+>e : Symbol(e, Decl(validEnumAssignments.ts, 7, 11))
 >E.B : Symbol(E.B, Decl(validEnumAssignments.ts, 1, 6))
 >E : Symbol(E, Decl(validEnumAssignments.ts, 0, 0))
 >B : Symbol(E.B, Decl(validEnumAssignments.ts, 1, 6))
 
 e = n;
->e : Symbol(e, Decl(validEnumAssignments.ts, 7, 3))
->n : Symbol(n, Decl(validEnumAssignments.ts, 5, 3))
+>e : Symbol(e, Decl(validEnumAssignments.ts, 7, 11))
+>n : Symbol(n, Decl(validEnumAssignments.ts, 5, 11))
 
 e = null;
->e : Symbol(e, Decl(validEnumAssignments.ts, 7, 3))
+>e : Symbol(e, Decl(validEnumAssignments.ts, 7, 11))
 
 e = undefined;
->e : Symbol(e, Decl(validEnumAssignments.ts, 7, 3))
+>e : Symbol(e, Decl(validEnumAssignments.ts, 7, 11))
 >undefined : Symbol(undefined)
 
 e = 1;
->e : Symbol(e, Decl(validEnumAssignments.ts, 7, 3))
+>e : Symbol(e, Decl(validEnumAssignments.ts, 7, 11))
 
 e = 1.;
->e : Symbol(e, Decl(validEnumAssignments.ts, 7, 3))
+>e : Symbol(e, Decl(validEnumAssignments.ts, 7, 11))
 
 e = 1.0;
->e : Symbol(e, Decl(validEnumAssignments.ts, 7, 3))
+>e : Symbol(e, Decl(validEnumAssignments.ts, 7, 11))
 
 e = -1;
->e : Symbol(e, Decl(validEnumAssignments.ts, 7, 3))
+>e : Symbol(e, Decl(validEnumAssignments.ts, 7, 11))
 
diff --git a/tests/baselines/reference/validEnumAssignments.types b/tests/baselines/reference/validEnumAssignments.types
index 1c63ff33548c6..64bd8b33d958a 100644
--- a/tests/baselines/reference/validEnumAssignments.types
+++ b/tests/baselines/reference/validEnumAssignments.types
@@ -14,15 +14,15 @@ enum E {
 >  : ^^^
 }
 
-var n: number;
+declare var n: number;
 >n : number
 >  : ^^^^^^
 
-var a: any;
+declare var a: any;
 >a : any
 >  : ^^^
 
-var e: E;
+declare var e: E;
 >e : E
 >  : ^
 
diff --git a/tests/baselines/reference/voidOperatorWithAnyOtherType.errors.txt b/tests/baselines/reference/voidOperatorWithAnyOtherType.errors.txt
index 1dd68ac5d8482..61cf059655af6 100644
--- a/tests/baselines/reference/voidOperatorWithAnyOtherType.errors.txt
+++ b/tests/baselines/reference/voidOperatorWithAnyOtherType.errors.txt
@@ -6,25 +6,25 @@ voidOperatorWithAnyOtherType.ts(48,27): error TS2365: Operator '+' cannot be app
 ==== voidOperatorWithAnyOtherType.ts (3 errors) ====
     // void  operator on any type
     
-    var ANY: any;
-    var ANY1;
+    declare var ANY: any;
+    declare var ANY1;
     var ANY2: any[] = ["", ""];
-    var obj: () => {}
+    declare var obj: () => {};
     var obj1 = {x:"",y:1};
     
     function foo(): any {
-        var a;
+        var a!: any;
         return a;
     }
     class A {
         public a: any;
         static foo() {
-            var a;
+            var a!: any;
             return a;
         }
     }
     namespace M {
-        export var n: any;
+        export var n!: any;
     }
     var objA = new A();
     
diff --git a/tests/baselines/reference/voidOperatorWithAnyOtherType.js b/tests/baselines/reference/voidOperatorWithAnyOtherType.js
index 3774fac744ba6..1901a916ee878 100644
--- a/tests/baselines/reference/voidOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/voidOperatorWithAnyOtherType.js
@@ -3,25 +3,25 @@
 //// [voidOperatorWithAnyOtherType.ts]
 // void  operator on any type
 
-var ANY: any;
-var ANY1;
+declare var ANY: any;
+declare var ANY1;
 var ANY2: any[] = ["", ""];
-var obj: () => {}
+declare var obj: () => {};
 var obj1 = {x:"",y:1};
 
 function foo(): any {
-    var a;
+    var a!: any;
     return a;
 }
 class A {
     public a: any;
     static foo() {
-        var a;
+        var a!: any;
         return a;
     }
 }
 namespace M {
-    export var n: any;
+    export var n!: any;
 }
 var objA = new A();
 
@@ -64,10 +64,7 @@ void M.n;
 
 //// [voidOperatorWithAnyOtherType.js]
 // void  operator on any type
-var ANY;
-var ANY1;
 var ANY2 = ["", ""];
-var obj;
 var obj1 = { x: "", y: 1 };
 function foo() {
     var a;
diff --git a/tests/baselines/reference/voidOperatorWithAnyOtherType.symbols b/tests/baselines/reference/voidOperatorWithAnyOtherType.symbols
index 68042164ef765..c5f129893a5dc 100644
--- a/tests/baselines/reference/voidOperatorWithAnyOtherType.symbols
+++ b/tests/baselines/reference/voidOperatorWithAnyOtherType.symbols
@@ -3,17 +3,17 @@
 === voidOperatorWithAnyOtherType.ts ===
 // void  operator on any type
 
-var ANY: any;
->ANY : Symbol(ANY, Decl(voidOperatorWithAnyOtherType.ts, 2, 3))
+declare var ANY: any;
+>ANY : Symbol(ANY, Decl(voidOperatorWithAnyOtherType.ts, 2, 11))
 
-var ANY1;
->ANY1 : Symbol(ANY1, Decl(voidOperatorWithAnyOtherType.ts, 3, 3))
+declare var ANY1;
+>ANY1 : Symbol(ANY1, Decl(voidOperatorWithAnyOtherType.ts, 3, 11))
 
 var ANY2: any[] = ["", ""];
 >ANY2 : Symbol(ANY2, Decl(voidOperatorWithAnyOtherType.ts, 4, 3))
 
-var obj: () => {}
->obj : Symbol(obj, Decl(voidOperatorWithAnyOtherType.ts, 5, 3))
+declare var obj: () => {};
+>obj : Symbol(obj, Decl(voidOperatorWithAnyOtherType.ts, 5, 11))
 
 var obj1 = {x:"",y:1};
 >obj1 : Symbol(obj1, Decl(voidOperatorWithAnyOtherType.ts, 6, 3))
@@ -23,7 +23,7 @@ var obj1 = {x:"",y:1};
 function foo(): any {
 >foo : Symbol(foo, Decl(voidOperatorWithAnyOtherType.ts, 6, 22))
 
-    var a;
+    var a!: any;
 >a : Symbol(a, Decl(voidOperatorWithAnyOtherType.ts, 9, 7))
 
     return a;
@@ -38,7 +38,7 @@ class A {
     static foo() {
 >foo : Symbol(A.foo, Decl(voidOperatorWithAnyOtherType.ts, 13, 18))
 
-        var a;
+        var a!: any;
 >a : Symbol(a, Decl(voidOperatorWithAnyOtherType.ts, 15, 11))
 
         return a;
@@ -48,7 +48,7 @@ class A {
 namespace M {
 >M : Symbol(M, Decl(voidOperatorWithAnyOtherType.ts, 18, 1))
 
-    export var n: any;
+    export var n!: any;
 >n : Symbol(n, Decl(voidOperatorWithAnyOtherType.ts, 20, 14))
 }
 var objA = new A();
@@ -58,7 +58,7 @@ var objA = new A();
 // any type var
 var ResultIsAny1 = void ANY1;
 >ResultIsAny1 : Symbol(ResultIsAny1, Decl(voidOperatorWithAnyOtherType.ts, 25, 3))
->ANY1 : Symbol(ANY1, Decl(voidOperatorWithAnyOtherType.ts, 3, 3))
+>ANY1 : Symbol(ANY1, Decl(voidOperatorWithAnyOtherType.ts, 3, 11))
 
 var ResultIsAny2 = void ANY2;
 >ResultIsAny2 : Symbol(ResultIsAny2, Decl(voidOperatorWithAnyOtherType.ts, 26, 3))
@@ -74,7 +74,7 @@ var ResultIsAny4 = void M;
 
 var ResultIsAny5 = void obj;
 >ResultIsAny5 : Symbol(ResultIsAny5, Decl(voidOperatorWithAnyOtherType.ts, 29, 3))
->obj : Symbol(obj, Decl(voidOperatorWithAnyOtherType.ts, 5, 3))
+>obj : Symbol(obj, Decl(voidOperatorWithAnyOtherType.ts, 5, 11))
 
 var ResultIsAny6 = void obj1;
 >ResultIsAny6 : Symbol(ResultIsAny6, Decl(voidOperatorWithAnyOtherType.ts, 30, 3))
@@ -129,8 +129,8 @@ var ResultIsAny15 = void A.foo();
 
 var ResultIsAny16 = void (ANY + ANY1);
 >ResultIsAny16 : Symbol(ResultIsAny16, Decl(voidOperatorWithAnyOtherType.ts, 44, 3))
->ANY : Symbol(ANY, Decl(voidOperatorWithAnyOtherType.ts, 2, 3))
->ANY1 : Symbol(ANY1, Decl(voidOperatorWithAnyOtherType.ts, 3, 3))
+>ANY : Symbol(ANY, Decl(voidOperatorWithAnyOtherType.ts, 2, 11))
+>ANY1 : Symbol(ANY1, Decl(voidOperatorWithAnyOtherType.ts, 3, 11))
 
 var ResultIsAny17 = void (null + undefined);
 >ResultIsAny17 : Symbol(ResultIsAny17, Decl(voidOperatorWithAnyOtherType.ts, 45, 3))
@@ -147,26 +147,26 @@ var ResultIsAny19 = void (undefined + undefined);
 // multiple void  operators
 var ResultIsAny20 = void void ANY;
 >ResultIsAny20 : Symbol(ResultIsAny20, Decl(voidOperatorWithAnyOtherType.ts, 50, 3))
->ANY : Symbol(ANY, Decl(voidOperatorWithAnyOtherType.ts, 2, 3))
+>ANY : Symbol(ANY, Decl(voidOperatorWithAnyOtherType.ts, 2, 11))
 
 var ResultIsAny21 = void void void (ANY + ANY1);
 >ResultIsAny21 : Symbol(ResultIsAny21, Decl(voidOperatorWithAnyOtherType.ts, 51, 3))
->ANY : Symbol(ANY, Decl(voidOperatorWithAnyOtherType.ts, 2, 3))
->ANY1 : Symbol(ANY1, Decl(voidOperatorWithAnyOtherType.ts, 3, 3))
+>ANY : Symbol(ANY, Decl(voidOperatorWithAnyOtherType.ts, 2, 11))
+>ANY1 : Symbol(ANY1, Decl(voidOperatorWithAnyOtherType.ts, 3, 11))
 
 // miss assignment operators
 void ANY;
->ANY : Symbol(ANY, Decl(voidOperatorWithAnyOtherType.ts, 2, 3))
+>ANY : Symbol(ANY, Decl(voidOperatorWithAnyOtherType.ts, 2, 11))
 
 void ANY1;
->ANY1 : Symbol(ANY1, Decl(voidOperatorWithAnyOtherType.ts, 3, 3))
+>ANY1 : Symbol(ANY1, Decl(voidOperatorWithAnyOtherType.ts, 3, 11))
 
 void ANY2[0];
 >ANY2 : Symbol(ANY2, Decl(voidOperatorWithAnyOtherType.ts, 4, 3))
 
 void ANY, ANY1;
->ANY : Symbol(ANY, Decl(voidOperatorWithAnyOtherType.ts, 2, 3))
->ANY1 : Symbol(ANY1, Decl(voidOperatorWithAnyOtherType.ts, 3, 3))
+>ANY : Symbol(ANY, Decl(voidOperatorWithAnyOtherType.ts, 2, 11))
+>ANY1 : Symbol(ANY1, Decl(voidOperatorWithAnyOtherType.ts, 3, 11))
 
 void objA.a;
 >objA.a : Symbol(A.a, Decl(voidOperatorWithAnyOtherType.ts, 12, 9))
diff --git a/tests/baselines/reference/voidOperatorWithAnyOtherType.types b/tests/baselines/reference/voidOperatorWithAnyOtherType.types
index 5b75774fe997a..8ff2706271615 100644
--- a/tests/baselines/reference/voidOperatorWithAnyOtherType.types
+++ b/tests/baselines/reference/voidOperatorWithAnyOtherType.types
@@ -3,11 +3,11 @@
 === voidOperatorWithAnyOtherType.ts ===
 // void  operator on any type
 
-var ANY: any;
+declare var ANY: any;
 >ANY : any
 >    : ^^^
 
-var ANY1;
+declare var ANY1;
 >ANY1 : any
 >     : ^^^
 
@@ -21,7 +21,7 @@ var ANY2: any[] = ["", ""];
 >"" : ""
 >   : ^^
 
-var obj: () => {}
+declare var obj: () => {};
 >obj : () => {}
 >    : ^^^^^^  
 
@@ -43,7 +43,7 @@ function foo(): any {
 >foo : () => any
 >    : ^^^^^^   
 
-    var a;
+    var a!: any;
 >a : any
 >  : ^^^
 
@@ -63,7 +63,7 @@ class A {
 >foo : () => any
 >    : ^^^^^^^^^
 
-        var a;
+        var a!: any;
 >a : any
 >  : ^^^
 
@@ -76,7 +76,7 @@ namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 
-    export var n: any;
+    export var n!: any;
 >n : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/weakType.errors.txt b/tests/baselines/reference/weakType.errors.txt
index 63732842ec62c..6e484730c68e2 100644
--- a/tests/baselines/reference/weakType.errors.txt
+++ b/tests/baselines/reference/weakType.errors.txt
@@ -60,7 +60,7 @@ weakType.ts(62,5): error TS2322: Type '{ properties: { wrong: string; }; }' is n
     
     function del(options: ConfigurableStartEnd = {},
                  error: { error?: number } = {}) {
-        let changes: ChangeOptions[];
+        let changes: ChangeOptions[] = [];
         changes.push(options);
         changes.push(error);
                      ~~~~~
diff --git a/tests/baselines/reference/weakType.js b/tests/baselines/reference/weakType.js
index bccd0a198de39..2bae064881a5b 100644
--- a/tests/baselines/reference/weakType.js
+++ b/tests/baselines/reference/weakType.js
@@ -35,7 +35,7 @@ type ChangeOptions = ConfigurableStartEnd & InsertOptions;
 
 function del(options: ConfigurableStartEnd = {},
              error: { error?: number } = {}) {
-    let changes: ChangeOptions[];
+    let changes: ChangeOptions[] = [];
     changes.push(options);
     changes.push(error);
 }
@@ -81,7 +81,7 @@ doSomething(false);
 function del(options, error) {
     if (options === void 0) { options = {}; }
     if (error === void 0) { error = {}; }
-    var changes;
+    var changes = [];
     changes.push(options);
     changes.push(error);
 }
diff --git a/tests/baselines/reference/weakType.symbols b/tests/baselines/reference/weakType.symbols
index bae7c5a89342b..924f4ddff9b93 100644
--- a/tests/baselines/reference/weakType.symbols
+++ b/tests/baselines/reference/weakType.symbols
@@ -90,7 +90,7 @@ function del(options: ConfigurableStartEnd = {},
 >error : Symbol(error, Decl(weakType.ts, 32, 48))
 >error : Symbol(error, Decl(weakType.ts, 33, 21))
 
-    let changes: ChangeOptions[];
+    let changes: ChangeOptions[] = [];
 >changes : Symbol(changes, Decl(weakType.ts, 34, 7))
 >ChangeOptions : Symbol(ChangeOptions, Decl(weakType.ts, 29, 1))
 
diff --git a/tests/baselines/reference/weakType.types b/tests/baselines/reference/weakType.types
index be047048adee5..0830ab160b910 100644
--- a/tests/baselines/reference/weakType.types
+++ b/tests/baselines/reference/weakType.types
@@ -141,9 +141,11 @@ function del(options: ConfigurableStartEnd = {},
 >{} : {}
 >   : ^^
 
-    let changes: ChangeOptions[];
+    let changes: ChangeOptions[] = [];
 >changes : ChangeOptions[]
 >        : ^^^^^^^^^^^^^^^
+>[] : undefined[]
+>   : ^^^^^^^^^^^
 
     changes.push(options);
 >changes.push(options) : number
diff --git a/tests/baselines/reference/witness.errors.txt b/tests/baselines/reference/witness.errors.txt
index f5883461341cf..937e545c4db4d 100644
--- a/tests/baselines/reference/witness.errors.txt
+++ b/tests/baselines/reference/witness.errors.txt
@@ -181,7 +181,7 @@ witness.ts(128,19): error TS2729: Property 'q' is used before its initialization
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'propAcc1' must be of type 'any', but here has type '{ m: any; }'.
 !!! related TS6203 witness.ts:107:5: 'propAcc1' was also declared here.
     
-    // Property access of module member
+    // Property access of namespace member
     namespace M2 {
         export var x = M2.x;
         var y = x;
diff --git a/tests/baselines/reference/witness.js b/tests/baselines/reference/witness.js
index 17e054e1a3e9c..ad88800ce321b 100644
--- a/tests/baselines/reference/witness.js
+++ b/tests/baselines/reference/witness.js
@@ -112,7 +112,7 @@ var propAcc1 = {
 };
 var propAcc1: { m: any; }
 
-// Property access of module member
+// Property access of namespace member
 namespace M2 {
     export var x = M2.x;
     var y = x;
@@ -240,7 +240,7 @@ var propAcc1 = {
     m: propAcc1.m
 };
 var propAcc1;
-// Property access of module member
+// Property access of namespace member
 var M2;
 (function (M2) {
     M2.x = M2.x;
diff --git a/tests/baselines/reference/witness.symbols b/tests/baselines/reference/witness.symbols
index 63431a726d27e..5c1a03126efa3 100644
--- a/tests/baselines/reference/witness.symbols
+++ b/tests/baselines/reference/witness.symbols
@@ -292,7 +292,7 @@ var propAcc1: { m: any; }
 >propAcc1 : Symbol(propAcc1, Decl(witness.ts, 106, 3), Decl(witness.ts, 109, 3))
 >m : Symbol(m, Decl(witness.ts, 109, 15))
 
-// Property access of module member
+// Property access of namespace member
 namespace M2 {
 >M2 : Symbol(M2, Decl(witness.ts, 109, 25))
 
diff --git a/tests/baselines/reference/witness.types b/tests/baselines/reference/witness.types
index 1581d05441c9a..b37e6312867bf 100644
--- a/tests/baselines/reference/witness.types
+++ b/tests/baselines/reference/witness.types
@@ -540,7 +540,7 @@ var propAcc1: { m: any; }
 >m : any
 >  : ^^^
 
-// Property access of module member
+// Property access of namespace member
 namespace M2 {
 >M2 : typeof M2
 >   : ^^^^^^^^^
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints.js b/tests/baselines/reference/wrappedAndRecursiveConstraints.js
index e22561c786a2a..38c71f63f058f 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints.js
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints.js
@@ -14,7 +14,7 @@ interface Foo extends Date {
     foo: string;
 }
 
-var y: Foo = null;
+var y: Foo = {} as Foo;
 var c = new C(y);
 var r = c.foo(y);
 
@@ -29,6 +29,6 @@ var C = /** @class */ (function () {
     };
     return C;
 }());
-var y = null;
+var y = {};
 var c = new C(y);
 var r = c.foo(y);
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints.symbols b/tests/baselines/reference/wrappedAndRecursiveConstraints.symbols
index cc9d5b42eaa2d..83ac314e1d969 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints.symbols
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints.symbols
@@ -32,9 +32,10 @@ interface Foo extends Date {
 >foo : Symbol(Foo.foo, Decl(wrappedAndRecursiveConstraints.ts, 9, 28))
 }
 
-var y: Foo = null;
+var y: Foo = {} as Foo;
 >y : Symbol(y, Decl(wrappedAndRecursiveConstraints.ts, 13, 3))
 >Foo : Symbol(Foo, Decl(wrappedAndRecursiveConstraints.ts, 7, 1))
+>Foo : Symbol(Foo, Decl(wrappedAndRecursiveConstraints.ts, 7, 1))
 
 var c = new C(y);
 >c : Symbol(c, Decl(wrappedAndRecursiveConstraints.ts, 14, 3))
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints.types b/tests/baselines/reference/wrappedAndRecursiveConstraints.types
index 37050946dee1d..76a5f7fc3f595 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints.types
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints.types
@@ -29,9 +29,13 @@ interface Foo extends Date {
 >    : ^^^^^^
 }
 
-var y: Foo = null;
+var y: Foo = {} as Foo;
 >y : Foo
 >  : ^^^
+>{} as Foo : Foo
+>          : ^^^
+>{} : {}
+>   : ^^
 
 var c = new C(y);
 >c : C<Foo>
diff --git a/tests/baselines/reference/wrappedRecursiveGenericType.errors.txt b/tests/baselines/reference/wrappedRecursiveGenericType.errors.txt
index 07ba088446578..9055b44a18708 100644
--- a/tests/baselines/reference/wrappedRecursiveGenericType.errors.txt
+++ b/tests/baselines/reference/wrappedRecursiveGenericType.errors.txt
@@ -12,7 +12,7 @@ wrappedRecursiveGenericType.ts(14,1): error TS2322: Type 'number' is not assigna
         b: A<X<T>>;
         val: T;
     }
-    var x: A<number>;
+    declare var x: A<number>;
     x.val = 5;         // val -> number
     x.a.val = 5;       // val -> number
     x.a.b.val = 5;     // val -> X<number> (This should be an error)
diff --git a/tests/baselines/reference/wrappedRecursiveGenericType.js b/tests/baselines/reference/wrappedRecursiveGenericType.js
index 5cf142670c5b1..e175424590ae0 100644
--- a/tests/baselines/reference/wrappedRecursiveGenericType.js
+++ b/tests/baselines/reference/wrappedRecursiveGenericType.js
@@ -10,14 +10,13 @@ interface B<T> {
     b: A<X<T>>;
     val: T;
 }
-var x: A<number>;
+declare var x: A<number>;
 x.val = 5;         // val -> number
 x.a.val = 5;       // val -> number
 x.a.b.val = 5;     // val -> X<number> (This should be an error)
 x.a.b.a.val = 5;   // val -> X<number> (This should be an error)
 
 //// [wrappedRecursiveGenericType.js]
-var x;
 x.val = 5; // val -> number
 x.a.val = 5; // val -> number
 x.a.b.val = 5; // val -> X<number> (This should be an error)
diff --git a/tests/baselines/reference/wrappedRecursiveGenericType.symbols b/tests/baselines/reference/wrappedRecursiveGenericType.symbols
index 2135d475189b1..e76444b0bef18 100644
--- a/tests/baselines/reference/wrappedRecursiveGenericType.symbols
+++ b/tests/baselines/reference/wrappedRecursiveGenericType.symbols
@@ -34,19 +34,19 @@ interface B<T> {
 >val : Symbol(B.val, Decl(wrappedRecursiveGenericType.ts, 6, 15))
 >T : Symbol(T, Decl(wrappedRecursiveGenericType.ts, 5, 12))
 }
-var x: A<number>;
->x : Symbol(x, Decl(wrappedRecursiveGenericType.ts, 9, 3))
+declare var x: A<number>;
+>x : Symbol(x, Decl(wrappedRecursiveGenericType.ts, 9, 11))
 >A : Symbol(A, Decl(wrappedRecursiveGenericType.ts, 0, 24))
 
 x.val = 5;         // val -> number
 >x.val : Symbol(A.val, Decl(wrappedRecursiveGenericType.ts, 2, 12))
->x : Symbol(x, Decl(wrappedRecursiveGenericType.ts, 9, 3))
+>x : Symbol(x, Decl(wrappedRecursiveGenericType.ts, 9, 11))
 >val : Symbol(A.val, Decl(wrappedRecursiveGenericType.ts, 2, 12))
 
 x.a.val = 5;       // val -> number
 >x.a.val : Symbol(B.val, Decl(wrappedRecursiveGenericType.ts, 6, 15))
 >x.a : Symbol(A.a, Decl(wrappedRecursiveGenericType.ts, 1, 16))
->x : Symbol(x, Decl(wrappedRecursiveGenericType.ts, 9, 3))
+>x : Symbol(x, Decl(wrappedRecursiveGenericType.ts, 9, 11))
 >a : Symbol(A.a, Decl(wrappedRecursiveGenericType.ts, 1, 16))
 >val : Symbol(B.val, Decl(wrappedRecursiveGenericType.ts, 6, 15))
 
@@ -54,7 +54,7 @@ x.a.b.val = 5;     // val -> X<number> (This should be an error)
 >x.a.b.val : Symbol(A.val, Decl(wrappedRecursiveGenericType.ts, 2, 12))
 >x.a.b : Symbol(B.b, Decl(wrappedRecursiveGenericType.ts, 5, 16))
 >x.a : Symbol(A.a, Decl(wrappedRecursiveGenericType.ts, 1, 16))
->x : Symbol(x, Decl(wrappedRecursiveGenericType.ts, 9, 3))
+>x : Symbol(x, Decl(wrappedRecursiveGenericType.ts, 9, 11))
 >a : Symbol(A.a, Decl(wrappedRecursiveGenericType.ts, 1, 16))
 >b : Symbol(B.b, Decl(wrappedRecursiveGenericType.ts, 5, 16))
 >val : Symbol(A.val, Decl(wrappedRecursiveGenericType.ts, 2, 12))
@@ -64,7 +64,7 @@ x.a.b.a.val = 5;   // val -> X<number> (This should be an error)
 >x.a.b.a : Symbol(A.a, Decl(wrappedRecursiveGenericType.ts, 1, 16))
 >x.a.b : Symbol(B.b, Decl(wrappedRecursiveGenericType.ts, 5, 16))
 >x.a : Symbol(A.a, Decl(wrappedRecursiveGenericType.ts, 1, 16))
->x : Symbol(x, Decl(wrappedRecursiveGenericType.ts, 9, 3))
+>x : Symbol(x, Decl(wrappedRecursiveGenericType.ts, 9, 11))
 >a : Symbol(A.a, Decl(wrappedRecursiveGenericType.ts, 1, 16))
 >b : Symbol(B.b, Decl(wrappedRecursiveGenericType.ts, 5, 16))
 >a : Symbol(A.a, Decl(wrappedRecursiveGenericType.ts, 1, 16))
diff --git a/tests/baselines/reference/wrappedRecursiveGenericType.types b/tests/baselines/reference/wrappedRecursiveGenericType.types
index c98ea5de25b7c..5beacb9d157bf 100644
--- a/tests/baselines/reference/wrappedRecursiveGenericType.types
+++ b/tests/baselines/reference/wrappedRecursiveGenericType.types
@@ -23,7 +23,7 @@ interface B<T> {
 >val : T
 >    : ^
 }
-var x: A<number>;
+declare var x: A<number>;
 >x : A<number>
 >  : ^^^^^^^^^
 
diff --git a/tests/cases/compiler/2dArrays.ts b/tests/cases/compiler/2dArrays.ts
index 5a3dac3fff60e..7fe0cb43a27a3 100644
--- a/tests/cases/compiler/2dArrays.ts
+++ b/tests/cases/compiler/2dArrays.ts
@@ -2,12 +2,12 @@ class Cell {
 }
 
 class Ship {
-    isSunk: boolean;
+    isSunk: boolean = false;
 }
 
 class Board {
-    ships: Ship[];
-    cells: Cell[];
+    ships: Ship[] = [];
+    cells: Cell[] = [];
 
     private allShipsSunk() {
         return this.ships.every(function (val) { return val.isSunk; });
diff --git a/tests/cases/compiler/APISample_Watch.ts b/tests/cases/compiler/APISample_Watch.ts
index 42b1fef4c4a0b..ae56cf6987dca 100644
--- a/tests/cases/compiler/APISample_Watch.ts
+++ b/tests/cases/compiler/APISample_Watch.ts
@@ -55,7 +55,7 @@ function watchMain() {
     // You can technically override any given hook on the host, though you probably don't need to.
     // Note that we're assuming `origCreateProgram` and `origPostProgramCreate` doesn't use `this` at all.
     const origCreateProgram = host.createProgram;
-    host.createProgram = (rootNames: ReadonlyArray<string>, options, host, oldProgram) => {
+    host.createProgram = (rootNames: ReadonlyArray<string> | undefined, options, host, oldProgram) => {
         console.log("** We're about to create the program! **");
         return origCreateProgram(rootNames, options, host, oldProgram);
     }
diff --git a/tests/cases/compiler/ClassDeclaration10.ts b/tests/cases/compiler/ClassDeclaration10.ts
index 5dbbdbaca85c3..8aa2e7918068e 100644
--- a/tests/cases/compiler/ClassDeclaration10.ts
+++ b/tests/cases/compiler/ClassDeclaration10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    constructor();
    foo();
diff --git a/tests/cases/compiler/ClassDeclaration13.ts b/tests/cases/compiler/ClassDeclaration13.ts
index f58340bc491da..bbc057e4bb478 100644
--- a/tests/cases/compiler/ClassDeclaration13.ts
+++ b/tests/cases/compiler/ClassDeclaration13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    foo();
    bar() { }
diff --git a/tests/cases/compiler/ClassDeclaration14.ts b/tests/cases/compiler/ClassDeclaration14.ts
index a91f34253fa11..ad7333d9bb42a 100644
--- a/tests/cases/compiler/ClassDeclaration14.ts
+++ b/tests/cases/compiler/ClassDeclaration14.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    foo();
    constructor();
diff --git a/tests/cases/compiler/ClassDeclaration15.ts b/tests/cases/compiler/ClassDeclaration15.ts
index 6b28c5200893b..78caec37b2f4d 100644
--- a/tests/cases/compiler/ClassDeclaration15.ts
+++ b/tests/cases/compiler/ClassDeclaration15.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    foo();
    constructor() { }
diff --git a/tests/cases/compiler/ClassDeclaration21.ts b/tests/cases/compiler/ClassDeclaration21.ts
index c9a54f97ef598..eeff13aebe850 100644
--- a/tests/cases/compiler/ClassDeclaration21.ts
+++ b/tests/cases/compiler/ClassDeclaration21.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     0();
     1() { }
diff --git a/tests/cases/compiler/ClassDeclaration22.ts b/tests/cases/compiler/ClassDeclaration22.ts
index ec6da6d269c7c..ba9c8ab0552f1 100644
--- a/tests/cases/compiler/ClassDeclaration22.ts
+++ b/tests/cases/compiler/ClassDeclaration22.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     "foo"();
     "bar"() { }
diff --git a/tests/cases/compiler/ClassDeclaration26.ts b/tests/cases/compiler/ClassDeclaration26.ts
index 0adcbc470e0b9..d947fba3cf21e 100644
--- a/tests/cases/compiler/ClassDeclaration26.ts
+++ b/tests/cases/compiler/ClassDeclaration26.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     public const var export foo = 10;
 
diff --git a/tests/cases/compiler/ClassDeclaration9.ts b/tests/cases/compiler/ClassDeclaration9.ts
index 620dc45a4df52..84d4d63da65c3 100644
--- a/tests/cases/compiler/ClassDeclaration9.ts
+++ b/tests/cases/compiler/ClassDeclaration9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    foo();
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.ts b/tests/cases/compiler/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.ts
index fe90dded9e3c8..ae07e82ff02a1 100644
--- a/tests/cases/compiler/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.ts
+++ b/tests/cases/compiler/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     const
     x = 10;
diff --git a/tests/cases/compiler/abstractPropertyBasics.ts b/tests/cases/compiler/abstractPropertyBasics.ts
index c0b76057a6b08..c8fd32b52b902 100644
--- a/tests/cases/compiler/abstractPropertyBasics.ts
+++ b/tests/cases/compiler/abstractPropertyBasics.ts
@@ -17,6 +17,6 @@ class C extends B {
     set prop(v) { }
     raw = "edge";
     readonly ro = "readonly please";
-    readonlyProp: string; // don't have to give a value, in fact
+    readonlyProp!: string;
     m() { }
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/accessorDeclarationEmitJs.ts b/tests/cases/compiler/accessorDeclarationEmitJs.ts
index b729ec9209ebe..890f284e12d26 100644
--- a/tests/cases/compiler/accessorDeclarationEmitJs.ts
+++ b/tests/cases/compiler/accessorDeclarationEmitJs.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @declaration: true
diff --git a/tests/cases/compiler/accessorParameterAccessibilityModifier.ts b/tests/cases/compiler/accessorParameterAccessibilityModifier.ts
index 9d6ec6870f175..baa5841fbfe3b 100644
--- a/tests/cases/compiler/accessorParameterAccessibilityModifier.ts
+++ b/tests/cases/compiler/accessorParameterAccessibilityModifier.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 
 class C {
diff --git a/tests/cases/compiler/accessorWithInitializer.ts b/tests/cases/compiler/accessorWithInitializer.ts
index cdb63475adf60..867dc097c2043 100644
--- a/tests/cases/compiler/accessorWithInitializer.ts
+++ b/tests/cases/compiler/accessorWithInitializer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 
 class C {
diff --git a/tests/cases/compiler/accessorWithRestParam.ts b/tests/cases/compiler/accessorWithRestParam.ts
index 015846a4aaa96..677bc1fc3c25b 100644
--- a/tests/cases/compiler/accessorWithRestParam.ts
+++ b/tests/cases/compiler/accessorWithRestParam.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 
 class C {
diff --git a/tests/cases/compiler/accessorWithoutBody1.ts b/tests/cases/compiler/accessorWithoutBody1.ts
index 2cf246affbae0..617afe2c8bf1d 100644
--- a/tests/cases/compiler/accessorWithoutBody1.ts
+++ b/tests/cases/compiler/accessorWithoutBody1.ts
@@ -1,2 +1,3 @@
+// @strict: false
 // @target: ES5
 var v = { get foo() }
\ No newline at end of file
diff --git a/tests/cases/compiler/accessorWithoutBody2.ts b/tests/cases/compiler/accessorWithoutBody2.ts
index 11ece4b4d96ae..be30eacaad66b 100644
--- a/tests/cases/compiler/accessorWithoutBody2.ts
+++ b/tests/cases/compiler/accessorWithoutBody2.ts
@@ -1,2 +1,3 @@
+// @strict: false
 // @target: ES5
 var v = { set foo(a) }
\ No newline at end of file
diff --git a/tests/cases/compiler/accessorsEmit.ts b/tests/cases/compiler/accessorsEmit.ts
index dd96c63b7a7a9..98f2287722be1 100644
--- a/tests/cases/compiler/accessorsEmit.ts
+++ b/tests/cases/compiler/accessorsEmit.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Result { }
 
 class Test {
diff --git a/tests/cases/compiler/aliasOnMergedModuleInterface.ts b/tests/cases/compiler/aliasOnMergedModuleInterface.ts
index bfa1835641447..0b0bec43eedef 100644
--- a/tests/cases/compiler/aliasOnMergedModuleInterface.ts
+++ b/tests/cases/compiler/aliasOnMergedModuleInterface.ts
@@ -15,6 +15,6 @@ declare module "foo"
 // @Filename: aliasOnMergedModuleInterface_1.ts
 ///<reference path='aliasOnMergedModuleInterface_0.ts' />
 import foo = require("foo")
-var z: foo;
+declare var z: foo;
 z.bar("hello"); // This should be ok
 var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be error
diff --git a/tests/cases/compiler/aliasUsageInOrExpression.ts b/tests/cases/compiler/aliasUsageInOrExpression.ts
index 540a3ae91c03d..efead7edf5f92 100644
--- a/tests/cases/compiler/aliasUsageInOrExpression.ts
+++ b/tests/cases/compiler/aliasUsageInOrExpression.ts
@@ -16,7 +16,7 @@ import moduleA = require("./aliasUsageInOrExpression_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
-var i: IHasVisualizationModel;
+declare var i: IHasVisualizationModel;
 var d1 = i || moduleA;
 var d2: IHasVisualizationModel = i || moduleA;
 var d2: IHasVisualizationModel = moduleA || i;
diff --git a/tests/cases/compiler/allowJscheckJsTypeParameterNoCrash.ts b/tests/cases/compiler/allowJscheckJsTypeParameterNoCrash.ts
index 90f9869d94d63..49f3bc814ec19 100644
--- a/tests/cases/compiler/allowJscheckJsTypeParameterNoCrash.ts
+++ b/tests/cases/compiler/allowJscheckJsTypeParameterNoCrash.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkJs: true
 // @allowJs: true
 // @outDir: ./dist
diff --git a/tests/cases/compiler/allowSyntheticDefaultImports10.ts b/tests/cases/compiler/allowSyntheticDefaultImports10.ts
index 6b50bae96d8fe..020e3e0c60cc4 100644
--- a/tests/cases/compiler/allowSyntheticDefaultImports10.ts
+++ b/tests/cases/compiler/allowSyntheticDefaultImports10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowSyntheticDefaultImports: true
 // @module: commonjs
 // @Filename: b.d.ts
diff --git a/tests/cases/compiler/allowSyntheticDefaultImports7.ts b/tests/cases/compiler/allowSyntheticDefaultImports7.ts
index 2da05e4678c7f..8d0540208e726 100644
--- a/tests/cases/compiler/allowSyntheticDefaultImports7.ts
+++ b/tests/cases/compiler/allowSyntheticDefaultImports7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: system
 // @Filename: b.d.ts
 export function foo();
diff --git a/tests/cases/compiler/allowSyntheticDefaultImports8.ts b/tests/cases/compiler/allowSyntheticDefaultImports8.ts
index 3a213ad80235f..6460befbc2dff 100644
--- a/tests/cases/compiler/allowSyntheticDefaultImports8.ts
+++ b/tests/cases/compiler/allowSyntheticDefaultImports8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowSyntheticDefaultImports: false
 // @module: system
 // @Filename: b.d.ts
diff --git a/tests/cases/compiler/allowSyntheticDefaultImports9.ts b/tests/cases/compiler/allowSyntheticDefaultImports9.ts
index 8da66f33adf56..b5f877a0d35c7 100644
--- a/tests/cases/compiler/allowSyntheticDefaultImports9.ts
+++ b/tests/cases/compiler/allowSyntheticDefaultImports9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowSyntheticDefaultImports: true
 // @module: commonjs
 // @Filename: b.d.ts
diff --git a/tests/cases/compiler/ambientClassDeclarationWithExtends.ts b/tests/cases/compiler/ambientClassDeclarationWithExtends.ts
index ca26f1b2a4415..8cbfa323448ea 100644
--- a/tests/cases/compiler/ambientClassDeclarationWithExtends.ts
+++ b/tests/cases/compiler/ambientClassDeclarationWithExtends.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @Filename: ambientClassDeclarationExtends_singleFile.ts
 declare class A { }
 declare class B extends A { }
diff --git a/tests/cases/compiler/ambientClassOverloadForFunction.ts b/tests/cases/compiler/ambientClassOverloadForFunction.ts
index 83b089dffbb8d..583f9c9468239 100644
--- a/tests/cases/compiler/ambientClassOverloadForFunction.ts
+++ b/tests/cases/compiler/ambientClassOverloadForFunction.ts
@@ -1,2 +1,3 @@
+// @strict: false
 declare class foo{};
 function foo() { return null; }
diff --git a/tests/cases/compiler/ambientFundule.ts b/tests/cases/compiler/ambientFundule.ts
index 772ae088eb1c0..1dcb40706b9ad 100644
--- a/tests/cases/compiler/ambientFundule.ts
+++ b/tests/cases/compiler/ambientFundule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function f();
 declare namespace f { var x }
 declare function f(x);
\ No newline at end of file
diff --git a/tests/cases/compiler/ambientWithStatements.ts b/tests/cases/compiler/ambientWithStatements.ts
index d4dcc3a5b7d67..467bb3da80c94 100644
--- a/tests/cases/compiler/ambientWithStatements.ts
+++ b/tests/cases/compiler/ambientWithStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare namespace M {
     break;
     continue;
diff --git a/tests/cases/compiler/ambiguousGenericAssertion1.ts b/tests/cases/compiler/ambiguousGenericAssertion1.ts
index 2d0df6debae71..48a81890a9057 100644
--- a/tests/cases/compiler/ambiguousGenericAssertion1.ts
+++ b/tests/cases/compiler/ambiguousGenericAssertion1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f<T>(x: T): T { return null; }
 var r = <T>(x: T) => x;
 var r2 = < <T>(x: T) => T>f; // valid
diff --git a/tests/cases/compiler/ambiguousOverload.ts b/tests/cases/compiler/ambiguousOverload.ts
index 2a69c48b0034b..18fecf5e3f22d 100644
--- a/tests/cases/compiler/ambiguousOverload.ts
+++ b/tests/cases/compiler/ambiguousOverload.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foof(bar: string, y): number;
 function foof(bar: string, x): string;
 function foof(bar: any): any { return bar };
diff --git a/tests/cases/compiler/ambiguousOverloadResolution.ts b/tests/cases/compiler/ambiguousOverloadResolution.ts
index cb4ae158cc325..076ba2aa46cca 100644
--- a/tests/cases/compiler/ambiguousOverloadResolution.ts
+++ b/tests/cases/compiler/ambiguousOverloadResolution.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A { }
 class B extends A { x: number; }
 
diff --git a/tests/cases/compiler/amdLikeInputDeclarationEmit.ts b/tests/cases/compiler/amdLikeInputDeclarationEmit.ts
index 91cb244525027..c122b7a11e085 100644
--- a/tests/cases/compiler/amdLikeInputDeclarationEmit.ts
+++ b/tests/cases/compiler/amdLikeInputDeclarationEmit.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @declarationDir: definitions
 // @emitDeclarationOnly: true
diff --git a/tests/cases/compiler/anyAsReturnTypeForNewOnCall.ts b/tests/cases/compiler/anyAsReturnTypeForNewOnCall.ts
index 4f909241f9509..741b120b009f8 100644
--- a/tests/cases/compiler/anyAsReturnTypeForNewOnCall.ts
+++ b/tests/cases/compiler/anyAsReturnTypeForNewOnCall.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function Point(x, y) {
 
  this.x = x;
diff --git a/tests/cases/compiler/anyIdenticalToItself.ts b/tests/cases/compiler/anyIdenticalToItself.ts
index a94389e6e3377..a47004a758b00 100644
--- a/tests/cases/compiler/anyIdenticalToItself.ts
+++ b/tests/cases/compiler/anyIdenticalToItself.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(x: any);
 function foo(x: any);
 function foo(x: any, y: number) { }
diff --git a/tests/cases/compiler/argumentsAsPropertyName.ts b/tests/cases/compiler/argumentsAsPropertyName.ts
index ffecdaa1301de..570d8b9e05f48 100644
--- a/tests/cases/compiler/argumentsAsPropertyName.ts
+++ b/tests/cases/compiler/argumentsAsPropertyName.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // target: es5
 type MyType = {
     arguments: Array<string>
diff --git a/tests/cases/compiler/argumentsAsPropertyName2.ts b/tests/cases/compiler/argumentsAsPropertyName2.ts
index 4c17a8a96a690..fb98f9bd2129c 100644
--- a/tests/cases/compiler/argumentsAsPropertyName2.ts
+++ b/tests/cases/compiler/argumentsAsPropertyName2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // target: es5
 
 function foo() {
diff --git a/tests/cases/compiler/argumentsBindsToFunctionScopeArgumentList.ts b/tests/cases/compiler/argumentsBindsToFunctionScopeArgumentList.ts
index 9a8a8fe4d8fbe..e5332a2d44561 100644
--- a/tests/cases/compiler/argumentsBindsToFunctionScopeArgumentList.ts
+++ b/tests/cases/compiler/argumentsBindsToFunctionScopeArgumentList.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var arguments = 10;
 function foo(a) {
     arguments = 10;  /// This shouldnt be of type number and result in error.
diff --git a/tests/cases/compiler/argumentsObjectCreatesRestForJs.ts b/tests/cases/compiler/argumentsObjectCreatesRestForJs.ts
index 4c3ca335d1df1..e941fc098fbbd 100644
--- a/tests/cases/compiler/argumentsObjectCreatesRestForJs.ts
+++ b/tests/cases/compiler/argumentsObjectCreatesRestForJs.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkJs: true
 // @allowJs: true
 // @Filename: main.js
diff --git a/tests/cases/compiler/argumentsPropertyNameInJsMode1.ts b/tests/cases/compiler/argumentsPropertyNameInJsMode1.ts
index fdf74c8b9a230..43ce80ca04987 100644
--- a/tests/cases/compiler/argumentsPropertyNameInJsMode1.ts
+++ b/tests/cases/compiler/argumentsPropertyNameInJsMode1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @declaration: true
diff --git a/tests/cases/compiler/argumentsPropertyNameInJsMode2.ts b/tests/cases/compiler/argumentsPropertyNameInJsMode2.ts
index 11515ea74a1b6..aa76126db8eff 100644
--- a/tests/cases/compiler/argumentsPropertyNameInJsMode2.ts
+++ b/tests/cases/compiler/argumentsPropertyNameInJsMode2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @declaration: true
diff --git a/tests/cases/compiler/argumentsReferenceInObjectLiteral_Js.ts b/tests/cases/compiler/argumentsReferenceInObjectLiteral_Js.ts
index 92fadcd6001b8..559edba66c28a 100644
--- a/tests/cases/compiler/argumentsReferenceInObjectLiteral_Js.ts
+++ b/tests/cases/compiler/argumentsReferenceInObjectLiteral_Js.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkJs: true
 // @allowJs: true
 // @target: es6
diff --git a/tests/cases/compiler/arityErrorRelatedSpanBindingPattern.ts b/tests/cases/compiler/arityErrorRelatedSpanBindingPattern.ts
index c82b8c493cc3e..948d6276dd9c7 100644
--- a/tests/cases/compiler/arityErrorRelatedSpanBindingPattern.ts
+++ b/tests/cases/compiler/arityErrorRelatedSpanBindingPattern.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(a, b, {c}): void {}
 
 function bar(a, b, [c]): void {}
diff --git a/tests/cases/compiler/arrayAssignmentTest2.ts b/tests/cases/compiler/arrayAssignmentTest2.ts
index 88ad2a1fb47d9..b86fa90a7b48c 100644
--- a/tests/cases/compiler/arrayAssignmentTest2.ts
+++ b/tests/cases/compiler/arrayAssignmentTest2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I1 {
 	IM1():void[];
 }
diff --git a/tests/cases/compiler/arrayAssignmentTest4.ts b/tests/cases/compiler/arrayAssignmentTest4.ts
index 81db959e8f653..d35d8d7ff7298 100644
--- a/tests/cases/compiler/arrayAssignmentTest4.ts
+++ b/tests/cases/compiler/arrayAssignmentTest4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 
 class C3 {
diff --git a/tests/cases/compiler/arrayFromAsync.ts b/tests/cases/compiler/arrayFromAsync.ts
index 55c34d7b66468..2b6dfa154684c 100644
--- a/tests/cases/compiler/arrayFromAsync.ts
+++ b/tests/cases/compiler/arrayFromAsync.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: esnext
 // @target: esnext
 
diff --git a/tests/cases/compiler/arrayIndexWithArrayFails.ts b/tests/cases/compiler/arrayIndexWithArrayFails.ts
index 242e1ff333443..aca5407d5ba6c 100644
--- a/tests/cases/compiler/arrayIndexWithArrayFails.ts
+++ b/tests/cases/compiler/arrayIndexWithArrayFails.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare const arr1: (string | string[])[];
 declare const arr2: number[];
 const j = arr2[arr1[0]]; // should error
\ No newline at end of file
diff --git a/tests/cases/compiler/arrayLiteralAndArrayConstructorEquivalence1.ts b/tests/cases/compiler/arrayLiteralAndArrayConstructorEquivalence1.ts
index 5f44389ba933d..439afb15ba80e 100644
--- a/tests/cases/compiler/arrayLiteralAndArrayConstructorEquivalence1.ts
+++ b/tests/cases/compiler/arrayLiteralAndArrayConstructorEquivalence1.ts
@@ -1,7 +1,7 @@
 var myCars=new Array(); 
 var myCars3 = new Array({});
-var myCars4: Array; // error
-var myCars5: Array<any>[];
+declare var myCars4: Array; // error
+declare var myCars5: Array<any>[];
  
 myCars = myCars3;
 myCars = myCars4;
diff --git a/tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts b/tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts
index d621cf460bcb1..a6d034f4e66de 100644
--- a/tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts
+++ b/tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A { a }
 class B extends A { b }
 class C<T> extends Array<T> { c }
diff --git a/tests/cases/compiler/arraySigChecking.ts b/tests/cases/compiler/arraySigChecking.ts
index 191f13f5afb82..686b99ea86f7a 100644
--- a/tests/cases/compiler/arraySigChecking.ts
+++ b/tests/cases/compiler/arraySigChecking.ts
@@ -14,7 +14,7 @@ declare namespace M {
 interface myInt {
     voidFn(): void;
 }
-var myVar: myInt;
+declare var myVar: myInt;
 var strArray: string[] = [myVar.voidFn()];
 
 
diff --git a/tests/cases/compiler/arrowFunctionErrorSpan.ts b/tests/cases/compiler/arrowFunctionErrorSpan.ts
index 4c7fff88a9394..93c400db54c82 100644
--- a/tests/cases/compiler/arrowFunctionErrorSpan.ts
+++ b/tests/cases/compiler/arrowFunctionErrorSpan.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f(a: () => number) { }
 
 // oneliner
diff --git a/tests/cases/compiler/arrowFunctionWithObjectLiteralBody3.ts b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody3.ts
index f5c1a86f296e2..227e9f4044a75 100644
--- a/tests/cases/compiler/arrowFunctionWithObjectLiteralBody3.ts
+++ b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody3.ts
@@ -1,2 +1,3 @@
+// @strict: false
 // @target: es6
 var v = a => <any>{}
\ No newline at end of file
diff --git a/tests/cases/compiler/arrowFunctionWithObjectLiteralBody4.ts b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody4.ts
index 33fe8439ebed9..43439bda39e32 100644
--- a/tests/cases/compiler/arrowFunctionWithObjectLiteralBody4.ts
+++ b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody4.ts
@@ -1,2 +1,3 @@
+// @strict: false
 // @target: es6
 var v = a => <any><any>{}
\ No newline at end of file
diff --git a/tests/cases/compiler/arrowFunctionsMissingTokens.ts b/tests/cases/compiler/arrowFunctionsMissingTokens.ts
index 13b17343c672c..069f9dd6b22a2 100644
--- a/tests/cases/compiler/arrowFunctionsMissingTokens.ts
+++ b/tests/cases/compiler/arrowFunctionsMissingTokens.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 namespace missingArrowsWithCurly {
     var a = () { };
diff --git a/tests/cases/compiler/asiAbstract.ts b/tests/cases/compiler/asiAbstract.ts
index f9f36b12001ef..062d68e96e5d4 100644
--- a/tests/cases/compiler/asiAbstract.ts
+++ b/tests/cases/compiler/asiAbstract.ts
@@ -1,3 +1,4 @@
+// @strict: false
 abstract
 class NonAbstractClass {
   abstract s();
diff --git a/tests/cases/compiler/asiPublicPrivateProtected.ts b/tests/cases/compiler/asiPublicPrivateProtected.ts
index 4ccd4c1c01bdd..5ea44460799f7 100644
--- a/tests/cases/compiler/asiPublicPrivateProtected.ts
+++ b/tests/cases/compiler/asiPublicPrivateProtected.ts
@@ -1,3 +1,4 @@
+// @strict: false
 public
 class NonPublicClass {
     public s() {
diff --git a/tests/cases/compiler/assertInWrapSomeTypeParameter.ts b/tests/cases/compiler/assertInWrapSomeTypeParameter.ts
index d2ffbb6d775ad..c646bbc781ab2 100644
--- a/tests/cases/compiler/assertInWrapSomeTypeParameter.ts
+++ b/tests/cases/compiler/assertInWrapSomeTypeParameter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C<T extends C<T>> {
     foo<U extends C<C<T>>(x: U) {
         return null;
diff --git a/tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts b/tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts
index 59d76564bc118..69728a300d8d5 100644
--- a/tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts
+++ b/tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface IResultCallback extends Function {
     x: number;
 }
diff --git a/tests/cases/compiler/assigningFromObjectToAnythingElse.ts b/tests/cases/compiler/assigningFromObjectToAnythingElse.ts
index ebf1a0a876318..692808306c5d5 100644
--- a/tests/cases/compiler/assigningFromObjectToAnythingElse.ts
+++ b/tests/cases/compiler/assigningFromObjectToAnythingElse.ts
@@ -1,4 +1,4 @@
-var x: Object;
+declare var x: Object;
 var y: RegExp;
 y = x;
 
diff --git a/tests/cases/compiler/assignmentCompat1.ts b/tests/cases/compiler/assignmentCompat1.ts
index e93da76d95e06..02eac0e9927b5 100644
--- a/tests/cases/compiler/assignmentCompat1.ts
+++ b/tests/cases/compiler/assignmentCompat1.ts
@@ -1,6 +1,6 @@
 var x = { one: 1 };
-var y: { [index: string]: any };
-var z: { [index: number]: any };
+declare var y: { [index: string]: any };
+declare var z: { [index: number]: any };
 x = y;  // Error
 y = x;  // Ok because index signature type is any
 x = z;  // Error
diff --git a/tests/cases/compiler/assignmentCompatForEnums.ts b/tests/cases/compiler/assignmentCompatForEnums.ts
index 3426d934be403..dff22949701cc 100644
--- a/tests/cases/compiler/assignmentCompatForEnums.ts
+++ b/tests/cases/compiler/assignmentCompatForEnums.ts
@@ -1,3 +1,4 @@
+// @strict: false
 enum TokenType { One, Two };
 
 var list = {};
diff --git a/tests/cases/compiler/assignmentCompatInterfaceWithStringIndexSignature.ts b/tests/cases/compiler/assignmentCompatInterfaceWithStringIndexSignature.ts
index bebba88fbf52b..642101d2b8d70 100644
--- a/tests/cases/compiler/assignmentCompatInterfaceWithStringIndexSignature.ts
+++ b/tests/cases/compiler/assignmentCompatInterfaceWithStringIndexSignature.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface IHandler {
     (e): boolean;
 }
diff --git a/tests/cases/compiler/assignmentCompatability25.ts b/tests/cases/compiler/assignmentCompatability25.ts
index d805e63156115..f87acce4b5f6c 100644
--- a/tests/cases/compiler/assignmentCompatability25.ts
+++ b/tests/cases/compiler/assignmentCompatability25.ts
@@ -3,7 +3,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{two:number;};;
+    export declare var aa:{two:number;};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability26.ts b/tests/cases/compiler/assignmentCompatability26.ts
index e137f5d1ac6ae..4b1dc00df58e9 100644
--- a/tests/cases/compiler/assignmentCompatability26.ts
+++ b/tests/cases/compiler/assignmentCompatability26.ts
@@ -3,7 +3,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{one:string;};;
+    export declare var aa:{one:string;};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability27.ts b/tests/cases/compiler/assignmentCompatability27.ts
index 857cf5f0882d2..9c6a65bd77f19 100644
--- a/tests/cases/compiler/assignmentCompatability27.ts
+++ b/tests/cases/compiler/assignmentCompatability27.ts
@@ -3,7 +3,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{two:string;};;
+    export declare var aa:{two:string;};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability28.ts b/tests/cases/compiler/assignmentCompatability28.ts
index 86c932399fff8..9a37180a795ef 100644
--- a/tests/cases/compiler/assignmentCompatability28.ts
+++ b/tests/cases/compiler/assignmentCompatability28.ts
@@ -3,7 +3,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{one:boolean;};;
+    export declare var aa:{one:boolean;};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability29.ts b/tests/cases/compiler/assignmentCompatability29.ts
index ecc9d4e0e63c6..8f7d9efbb056d 100644
--- a/tests/cases/compiler/assignmentCompatability29.ts
+++ b/tests/cases/compiler/assignmentCompatability29.ts
@@ -3,7 +3,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{one:any[];};;
+    export declare var aa:{one:any[];};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability30.ts b/tests/cases/compiler/assignmentCompatability30.ts
index 9268ae7a55c61..a685a6e2814a7 100644
--- a/tests/cases/compiler/assignmentCompatability30.ts
+++ b/tests/cases/compiler/assignmentCompatability30.ts
@@ -3,7 +3,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{one:number[];};;
+    export declare var aa:{one:number[];};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability31.ts b/tests/cases/compiler/assignmentCompatability31.ts
index 90323e6e925ca..4cb4eab4c1781 100644
--- a/tests/cases/compiler/assignmentCompatability31.ts
+++ b/tests/cases/compiler/assignmentCompatability31.ts
@@ -3,7 +3,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{one:string[];};;
+    export declare var aa:{one:string[];};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability32.ts b/tests/cases/compiler/assignmentCompatability32.ts
index 9de6cc70112bd..745efafb3cb6e 100644
--- a/tests/cases/compiler/assignmentCompatability32.ts
+++ b/tests/cases/compiler/assignmentCompatability32.ts
@@ -3,7 +3,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{one:boolean[];};;
+    export declare var aa:{one:boolean[];};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability33.ts b/tests/cases/compiler/assignmentCompatability33.ts
index 6688ba7ace607..d4e157aad88aa 100644
--- a/tests/cases/compiler/assignmentCompatability33.ts
+++ b/tests/cases/compiler/assignmentCompatability33.ts
@@ -3,7 +3,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var obj: { <Tstring>(a: Tstring): Tstring; };
+    export declare var obj: { <Tstring>(a: Tstring): Tstring; };
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability34.ts b/tests/cases/compiler/assignmentCompatability34.ts
index 34481a64e8123..39e348b95d46a 100644
--- a/tests/cases/compiler/assignmentCompatability34.ts
+++ b/tests/cases/compiler/assignmentCompatability34.ts
@@ -3,7 +3,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var obj: { <Tnumber>(a:Tnumber):Tnumber;};
+    export declare var obj: { <Tnumber>(a:Tnumber):Tnumber;};
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability35.ts b/tests/cases/compiler/assignmentCompatability35.ts
index 384fefe3832d7..e2b7a143afe17 100644
--- a/tests/cases/compiler/assignmentCompatability35.ts
+++ b/tests/cases/compiler/assignmentCompatability35.ts
@@ -3,7 +3,7 @@ namespace __test1__ {
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{[index:number]:number;};;
+    export declare var aa:{[index:number]:number;};;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability37.ts b/tests/cases/compiler/assignmentCompatability37.ts
index 8e15f53297fc2..e55686b596c73 100644
--- a/tests/cases/compiler/assignmentCompatability37.ts
+++ b/tests/cases/compiler/assignmentCompatability37.ts
@@ -1,9 +1,10 @@
+// @strict: false
 namespace __test1__ {
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{ new <Tnumber>(param: Tnumber); };;
+    export declare var aa:{ new <Tnumber>(param: Tnumber); };;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability38.ts b/tests/cases/compiler/assignmentCompatability38.ts
index 8a95ffebde0b1..6dc81cd4a8c1b 100644
--- a/tests/cases/compiler/assignmentCompatability38.ts
+++ b/tests/cases/compiler/assignmentCompatability38.ts
@@ -1,9 +1,10 @@
+// @strict: false
 namespace __test1__ {
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
     export var __val__obj4 = obj4;
 }
 namespace __test2__ {
-    export var aa:{ new <Tstring>(param: Tstring); };;
+    export declare var aa:{ new <Tstring>(param: Tstring); };;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts b/tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts
index 35d07b2542c9c..823d28e3a6188 100644
--- a/tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts
+++ b/tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // 3.8.4 Assignment Compatibility 
 
 interface Applicable {
diff --git a/tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts b/tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts
index 155659fcead10..8f53d3eda834f 100644
--- a/tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts
+++ b/tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // 3.8.4 Assignment Compatibility 
 
 interface Callable {
diff --git a/tests/cases/compiler/assignmentNonObjectTypeConstraints.ts b/tests/cases/compiler/assignmentNonObjectTypeConstraints.ts
index b68fad48e8ec1..2699c916017fe 100644
--- a/tests/cases/compiler/assignmentNonObjectTypeConstraints.ts
+++ b/tests/cases/compiler/assignmentNonObjectTypeConstraints.ts
@@ -1,3 +1,4 @@
+// @strict: false
 const enum E { A, B, C }
 
 function foo<T extends number>(x: T) {
diff --git a/tests/cases/compiler/assignmentToObjectAndFunction.ts b/tests/cases/compiler/assignmentToObjectAndFunction.ts
index 4e53cfabc6cd1..256b16b78ff57 100644
--- a/tests/cases/compiler/assignmentToObjectAndFunction.ts
+++ b/tests/cases/compiler/assignmentToObjectAndFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var errObj: Object = { toString: 0 }; // Error, incompatible toString
 var goodObj: Object = {
     toString(x?) {
diff --git a/tests/cases/compiler/assignmentToReferenceTypes.ts b/tests/cases/compiler/assignmentToReferenceTypes.ts
index 876039a28fb7b..86e5fe024dd81 100644
--- a/tests/cases/compiler/assignmentToReferenceTypes.ts
+++ b/tests/cases/compiler/assignmentToReferenceTypes.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Should all be allowed
 
 namespace M {
diff --git a/tests/cases/compiler/asyncFunctionTempVariableScoping.ts b/tests/cases/compiler/asyncFunctionTempVariableScoping.ts
index c1d52d6da17f6..99c51276d0a35 100644
--- a/tests/cases/compiler/asyncFunctionTempVariableScoping.ts
+++ b/tests/cases/compiler/asyncFunctionTempVariableScoping.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @lib: es2015
 // https://github.com/Microsoft/TypeScript/issues/19187
diff --git a/tests/cases/compiler/augmentExportEquals1.ts b/tests/cases/compiler/augmentExportEquals1.ts
index d814bfdcc71b2..25d22f59f1e9f 100644
--- a/tests/cases/compiler/augmentExportEquals1.ts
+++ b/tests/cases/compiler/augmentExportEquals1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @filename: file1.ts
 var x = 1;
diff --git a/tests/cases/compiler/augmentExportEquals1_1.ts b/tests/cases/compiler/augmentExportEquals1_1.ts
index 6afc6e70910ba..8f3cecefe1ace 100644
--- a/tests/cases/compiler/augmentExportEquals1_1.ts
+++ b/tests/cases/compiler/augmentExportEquals1_1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 
 // @filename: file1.d.ts
diff --git a/tests/cases/compiler/augmentExportEquals2.ts b/tests/cases/compiler/augmentExportEquals2.ts
index b037249645ac9..bc6c3c0a45ecd 100644
--- a/tests/cases/compiler/augmentExportEquals2.ts
+++ b/tests/cases/compiler/augmentExportEquals2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 
 // @filename: file1.ts
diff --git a/tests/cases/compiler/augmentExportEquals2_1.ts b/tests/cases/compiler/augmentExportEquals2_1.ts
index b6aeb21efd051..0de8a0647e24a 100644
--- a/tests/cases/compiler/augmentExportEquals2_1.ts
+++ b/tests/cases/compiler/augmentExportEquals2_1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 
 // @filename: file1.d.ts
diff --git a/tests/cases/compiler/augmentExportEquals3.ts b/tests/cases/compiler/augmentExportEquals3.ts
index e8585aba26d56..08bff0dc27ce2 100644
--- a/tests/cases/compiler/augmentExportEquals3.ts
+++ b/tests/cases/compiler/augmentExportEquals3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 
 // @filename: file1.ts
diff --git a/tests/cases/compiler/augmentExportEquals3_1.ts b/tests/cases/compiler/augmentExportEquals3_1.ts
index ad329643fa57c..a4f5fc3d6f3f0 100644
--- a/tests/cases/compiler/augmentExportEquals3_1.ts
+++ b/tests/cases/compiler/augmentExportEquals3_1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 // @filename: file1.d.ts
 declare module "file1" {
diff --git a/tests/cases/compiler/augmentExportEquals4.ts b/tests/cases/compiler/augmentExportEquals4.ts
index 5e0f28ce963ed..4bf93068a6c1f 100644
--- a/tests/cases/compiler/augmentExportEquals4.ts
+++ b/tests/cases/compiler/augmentExportEquals4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 
 // @filename: file1.ts
diff --git a/tests/cases/compiler/augmentExportEquals4_1.ts b/tests/cases/compiler/augmentExportEquals4_1.ts
index 467d0af38ef39..46cd24844656f 100644
--- a/tests/cases/compiler/augmentExportEquals4_1.ts
+++ b/tests/cases/compiler/augmentExportEquals4_1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 
 // @filename: file1.d.ts
diff --git a/tests/cases/compiler/augmentExportEquals6.ts b/tests/cases/compiler/augmentExportEquals6.ts
index 4b10586779a64..e0bdf98cf3745 100644
--- a/tests/cases/compiler/augmentExportEquals6.ts
+++ b/tests/cases/compiler/augmentExportEquals6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 
 // @filename: file1.ts
diff --git a/tests/cases/compiler/augmentExportEquals6_1.ts b/tests/cases/compiler/augmentExportEquals6_1.ts
index aaee43bae746f..3d172335e4fc4 100644
--- a/tests/cases/compiler/augmentExportEquals6_1.ts
+++ b/tests/cases/compiler/augmentExportEquals6_1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 
 // @filename: file1.d.ts
diff --git a/tests/cases/compiler/augmentedClassWithPrototypePropertyOnModule.ts b/tests/cases/compiler/augmentedClassWithPrototypePropertyOnModule.ts
index f3881804c46d0..a5061440fee43 100644
--- a/tests/cases/compiler/augmentedClassWithPrototypePropertyOnModule.ts
+++ b/tests/cases/compiler/augmentedClassWithPrototypePropertyOnModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare namespace m {
     var f;
     var prototype; // This should be error since prototype would be static property on class m
diff --git a/tests/cases/compiler/augmentedTypeBracketNamedPropertyAccess.ts b/tests/cases/compiler/augmentedTypeBracketNamedPropertyAccess.ts
index 4eeb56e6e757e..0673bd1e3d011 100644
--- a/tests/cases/compiler/augmentedTypeBracketNamedPropertyAccess.ts
+++ b/tests/cases/compiler/augmentedTypeBracketNamedPropertyAccess.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Object {
     data: number;
 }
diff --git a/tests/cases/compiler/avoid.ts b/tests/cases/compiler/avoid.ts
index 5ffa4a214ed22..abd5e02c3f08d 100644
--- a/tests/cases/compiler/avoid.ts
+++ b/tests/cases/compiler/avoid.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f() {
     var x=1;
 }
diff --git a/tests/cases/compiler/avoidListingPropertiesForTypesWithOnlyCallOrConstructSignatures.ts b/tests/cases/compiler/avoidListingPropertiesForTypesWithOnlyCallOrConstructSignatures.ts
index 4bc72303fb0f5..2e3d1fe68a2ba 100644
--- a/tests/cases/compiler/avoidListingPropertiesForTypesWithOnlyCallOrConstructSignatures.ts
+++ b/tests/cases/compiler/avoidListingPropertiesForTypesWithOnlyCallOrConstructSignatures.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Dog {
     barkable: true
 }
diff --git a/tests/cases/compiler/awaitInNonAsyncFunction.ts b/tests/cases/compiler/awaitInNonAsyncFunction.ts
index 5ebf37dc7ed04..1e619d9fe54fb 100644
--- a/tests/cases/compiler/awaitInNonAsyncFunction.ts
+++ b/tests/cases/compiler/awaitInNonAsyncFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // https://github.com/Microsoft/TypeScript/issues/26586
 
diff --git a/tests/cases/compiler/awaitedTypeCrash.ts b/tests/cases/compiler/awaitedTypeCrash.ts
index b90f32363210e..f048404a1dc3a 100644
--- a/tests/cases/compiler/awaitedTypeCrash.ts
+++ b/tests/cases/compiler/awaitedTypeCrash.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 
 // https://github.com/microsoft/TypeScript/issues/51984
diff --git a/tests/cases/compiler/awaitedTypeJQuery.ts b/tests/cases/compiler/awaitedTypeJQuery.ts
index a477b7719e4da..4b8b66eda6a42 100644
--- a/tests/cases/compiler/awaitedTypeJQuery.ts
+++ b/tests/cases/compiler/awaitedTypeJQuery.ts
@@ -1,3 +1,4 @@
+// @strict: false
 /// <reference lib="dom" />
 
 interface Thenable<T> extends PromiseLike<T> { }
diff --git a/tests/cases/compiler/badArraySyntax.ts b/tests/cases/compiler/badArraySyntax.ts
index 6a19a1504ac38..d39bc5f34998f 100644
--- a/tests/cases/compiler/badArraySyntax.ts
+++ b/tests/cases/compiler/badArraySyntax.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Z {
  public x = "";
 }
diff --git a/tests/cases/compiler/baseConstraintOfDecorator.ts b/tests/cases/compiler/baseConstraintOfDecorator.ts
index 9419974a04ff4..d85d0d51326aa 100644
--- a/tests/cases/compiler/baseConstraintOfDecorator.ts
+++ b/tests/cases/compiler/baseConstraintOfDecorator.ts
@@ -1,3 +1,4 @@
+// @strict: false
 export function classExtender<TFunction>(superClass: TFunction, _instanceModifier: (instance: any, args: any[]) => void): TFunction {
     return class decoratorFunc extends superClass {
         constructor(...args: any[]) {
diff --git a/tests/cases/compiler/bases.ts b/tests/cases/compiler/bases.ts
index 9bfc2e56caf5a..0565d7660c060 100644
--- a/tests/cases/compiler/bases.ts
+++ b/tests/cases/compiler/bases.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
     x;
 }
diff --git a/tests/cases/compiler/bestCommonTypeWithContextualTyping.ts b/tests/cases/compiler/bestCommonTypeWithContextualTyping.ts
index 32990cbb264e7..135e73829e78a 100644
--- a/tests/cases/compiler/bestCommonTypeWithContextualTyping.ts
+++ b/tests/cases/compiler/bestCommonTypeWithContextualTyping.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Contextual {
     dummy;
     p?: number;
@@ -8,7 +9,7 @@ interface Ellement {
     p: any;
 }
 
-var e: Ellement;
+declare var e: Ellement;
 
 // All of these should pass. Neither type is a supertype of the other, but the RHS should
 // always use Ellement in these examples (not Contextual). Because Ellement is assignable
diff --git a/tests/cases/compiler/bigintIndex.ts b/tests/cases/compiler/bigintIndex.ts
index cb70721f464a3..e4c32e53281e6 100644
--- a/tests/cases/compiler/bigintIndex.ts
+++ b/tests/cases/compiler/bigintIndex.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2020
 
 // @filename: a.ts
diff --git a/tests/cases/compiler/bigintWithLib.ts b/tests/cases/compiler/bigintWithLib.ts
index a4701496550e5..1cbbcc63e67e9 100644
--- a/tests/cases/compiler/bigintWithLib.ts
+++ b/tests/cases/compiler/bigintWithLib.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2020
 // @declaration: true
 
diff --git a/tests/cases/compiler/binopAssignmentShouldHaveType.ts b/tests/cases/compiler/binopAssignmentShouldHaveType.ts
index 9c4fc068f84e0..ca9c44b17c9ea 100644
--- a/tests/cases/compiler/binopAssignmentShouldHaveType.ts
+++ b/tests/cases/compiler/binopAssignmentShouldHaveType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 declare var console;
 "use strict";
diff --git a/tests/cases/compiler/blockScopedBindingCaptureThisInFunction.ts b/tests/cases/compiler/blockScopedBindingCaptureThisInFunction.ts
index 7c054a0e0eacb..100c42238a5e8 100644
--- a/tests/cases/compiler/blockScopedBindingCaptureThisInFunction.ts
+++ b/tests/cases/compiler/blockScopedBindingCaptureThisInFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // https://github.com/Microsoft/TypeScript/issues/11038
 () => function () {
     for (let someKey in {}) {
diff --git a/tests/cases/compiler/blockScopedBindingUsedBeforeDef.ts b/tests/cases/compiler/blockScopedBindingUsedBeforeDef.ts
index c0b803df6e890..ad6bf0c4625a8 100644
--- a/tests/cases/compiler/blockScopedBindingUsedBeforeDef.ts
+++ b/tests/cases/compiler/blockScopedBindingUsedBeforeDef.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // 1:
 for (let {[a]: a} of [{ }]) continue;
 
diff --git a/tests/cases/compiler/blockScopedNamespaceDifferentFile.ts b/tests/cases/compiler/blockScopedNamespaceDifferentFile.ts
index 4a9fe4a2a859a..c6e303314b24d 100644
--- a/tests/cases/compiler/blockScopedNamespaceDifferentFile.ts
+++ b/tests/cases/compiler/blockScopedNamespaceDifferentFile.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @outFile: out.js
 // @module: amd
diff --git a/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts b/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts
index 7cf893e2a7436..97bc54a28b1a0 100644
--- a/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts
+++ b/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @lib: esnext, dom
 function foo0() {
diff --git a/tests/cases/compiler/bluebirdStaticThis.ts b/tests/cases/compiler/bluebirdStaticThis.ts
index 02dab6f350a52..e4d0872934cfd 100644
--- a/tests/cases/compiler/bluebirdStaticThis.ts
+++ b/tests/cases/compiler/bluebirdStaticThis.ts
@@ -122,10 +122,10 @@ interface Foo {
     a: number;
     b: string;
 }
-var x: any;
-var arr: any[];
-var foo: Foo;
-var fooProm: Promise<Foo>;
+declare var x: any;
+declare var arr: any[];
+declare var foo: Foo;
+declare var fooProm: Promise<Foo>;
 
 fooProm = Promise.try(Promise, () => {
 	return foo;
diff --git a/tests/cases/compiler/booleanAssignment.ts b/tests/cases/compiler/booleanAssignment.ts
index 619b16bc419fd..b1556fa7af064 100644
--- a/tests/cases/compiler/booleanAssignment.ts
+++ b/tests/cases/compiler/booleanAssignment.ts
@@ -8,5 +8,5 @@ o = b; // OK
 
 b = true; // OK
 
-var b2:boolean;
+declare var b2:boolean;
 b = b2; // OK
\ No newline at end of file
diff --git a/tests/cases/compiler/booleanLiteralsContextuallyTypedFromUnion.tsx b/tests/cases/compiler/booleanLiteralsContextuallyTypedFromUnion.tsx
index fd5bbb73cf6a9..a7d467a1b236f 100644
--- a/tests/cases/compiler/booleanLiteralsContextuallyTypedFromUnion.tsx
+++ b/tests/cases/compiler/booleanLiteralsContextuallyTypedFromUnion.tsx
@@ -1,7 +1,7 @@
 // @strict: true
 // @jsx: preserve
 // @skipLibCheck: true
-// @libFiles: lib.d.ts,react.d.ts
+/// <reference path="/.lib/react.d.ts" />
 interface A { isIt: true; text: string; }
 interface B { isIt: false; value: number; }
 type C = A | B;
diff --git a/tests/cases/compiler/callConstructAssignment.ts b/tests/cases/compiler/callConstructAssignment.ts
index 1ed8a318c309e..78e80beb3bc37 100644
--- a/tests/cases/compiler/callConstructAssignment.ts
+++ b/tests/cases/compiler/callConstructAssignment.ts
@@ -1,8 +1,8 @@
 
 
-var foo:{ ( ):void; }
+declare var foo:{ ( ):void; }
 
-var bar:{ new ( ):any; }
+declare var bar:{ new ( ):any; }
 
 foo = bar; // error
 bar = foo; // error
\ No newline at end of file
diff --git a/tests/cases/compiler/callOverloads1.ts b/tests/cases/compiler/callOverloads1.ts
index e2ce278eec004..516fd4cac4ae2 100644
--- a/tests/cases/compiler/callOverloads1.ts
+++ b/tests/cases/compiler/callOverloads1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Foo { // error
     bar1() { /*WScript.Echo("bar1");*/ }
 
diff --git a/tests/cases/compiler/callOverloads2.ts b/tests/cases/compiler/callOverloads2.ts
index e18815fd46b76..652dcddffc06c 100644
--- a/tests/cases/compiler/callOverloads2.ts
+++ b/tests/cases/compiler/callOverloads2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 
 class Foo { // error
diff --git a/tests/cases/compiler/callOverloads5.ts b/tests/cases/compiler/callOverloads5.ts
index 212b68b168a43..2e9319f379bcc 100644
--- a/tests/cases/compiler/callOverloads5.ts
+++ b/tests/cases/compiler/callOverloads5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function Foo():Foo; // error
 function Foo(s:string):Foo; // error
 class Foo { // error
diff --git a/tests/cases/compiler/callSignaturesShouldBeResolvedBeforeSpecialization.ts b/tests/cases/compiler/callSignaturesShouldBeResolvedBeforeSpecialization.ts
index b3bd77031a98c..a373ec20ce3a1 100644
--- a/tests/cases/compiler/callSignaturesShouldBeResolvedBeforeSpecialization.ts
+++ b/tests/cases/compiler/callSignaturesShouldBeResolvedBeforeSpecialization.ts
@@ -4,7 +4,7 @@ interface I1<T> {
 }
 
 function foo() {
-    var test: I1<string>;
+    var test!: I1<string>;
     test("expects boolean instead of string"); // should not error - "test" should not expect a boolean
     test(true); // should error - string expected
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/callbackArgsDifferByOptionality.ts b/tests/cases/compiler/callbackArgsDifferByOptionality.ts
index d0bab4d84a7b7..e2899813b22d3 100644
--- a/tests/cases/compiler/callbackArgsDifferByOptionality.ts
+++ b/tests/cases/compiler/callbackArgsDifferByOptionality.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function x3(callback: (x?: 'hi') => number);
 function x3(callback: (x: string) => number);
 function x3(callback: (x: any) => number) {
diff --git a/tests/cases/compiler/capturedLetConstInLoop1.ts b/tests/cases/compiler/capturedLetConstInLoop1.ts
index 4919429eec706..d48ac08ac6f29 100644
--- a/tests/cases/compiler/capturedLetConstInLoop1.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function use(x: any): any;
 
 //==== let
diff --git a/tests/cases/compiler/capturedLetConstInLoop10.ts b/tests/cases/compiler/capturedLetConstInLoop10.ts
index 47eee6d6a7d47..b389edac6b87f 100644
--- a/tests/cases/compiler/capturedLetConstInLoop10.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A {
     foo() {
         for (let x of [0]) {
diff --git a/tests/cases/compiler/capturedLetConstInLoop10_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop10_ES6.ts
index 21c58e3aa3d49..4f32b828e82cc 100644
--- a/tests/cases/compiler/capturedLetConstInLoop10_ES6.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop10_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 class A {
     foo() {
diff --git a/tests/cases/compiler/capturedLetConstInLoop11.ts b/tests/cases/compiler/capturedLetConstInLoop11.ts
index bda0cec9d6912..cc0568e677931 100644
--- a/tests/cases/compiler/capturedLetConstInLoop11.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (;;) {
     let x = 1;
     () => x;
diff --git a/tests/cases/compiler/capturedLetConstInLoop11_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop11_ES6.ts
index 24005ed4833a3..2ffc9e0728ffa 100644
--- a/tests/cases/compiler/capturedLetConstInLoop11_ES6.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop11_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 for (;;) {
     let x = 1;
diff --git a/tests/cases/compiler/capturedLetConstInLoop12.ts b/tests/cases/compiler/capturedLetConstInLoop12.ts
index 5540f75635e00..73d90f74525f1 100644
--- a/tests/cases/compiler/capturedLetConstInLoop12.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 (function() {
     "use strict";
 
diff --git a/tests/cases/compiler/capturedLetConstInLoop13.ts b/tests/cases/compiler/capturedLetConstInLoop13.ts
index 0aa00b0e1a0f1..ff428b856d66a 100644
--- a/tests/cases/compiler/capturedLetConstInLoop13.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Main {
 
     constructor() {
diff --git a/tests/cases/compiler/capturedLetConstInLoop1_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop1_ES6.ts
index 314fc4a9919fd..a5fa1ca9d3073 100644
--- a/tests/cases/compiler/capturedLetConstInLoop1_ES6.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop1_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 //==== let
 for (let x in {}) {
diff --git a/tests/cases/compiler/capturedLetConstInLoop2.ts b/tests/cases/compiler/capturedLetConstInLoop2.ts
index 7dbd5d01f9371..c3b57efcfd32a 100644
--- a/tests/cases/compiler/capturedLetConstInLoop2.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 
 // ========let
diff --git a/tests/cases/compiler/capturedLetConstInLoop2_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop2_ES6.ts
index 00aed7121885d..27548cd8e05cd 100644
--- a/tests/cases/compiler/capturedLetConstInLoop2_ES6.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop2_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 // ========let
diff --git a/tests/cases/compiler/capturedLetConstInLoop3.ts b/tests/cases/compiler/capturedLetConstInLoop3.ts
index dc5eef6dd3491..9496d8d7bc257 100644
--- a/tests/cases/compiler/capturedLetConstInLoop3.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 ///=========let
 declare function use(a: any);
 function foo0(x) {
diff --git a/tests/cases/compiler/capturedLetConstInLoop3_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop3_ES6.ts
index 657c519047370..54af999e71b29 100644
--- a/tests/cases/compiler/capturedLetConstInLoop3_ES6.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop3_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 ///=========let
diff --git a/tests/cases/compiler/capturedLetConstInLoop4.ts b/tests/cases/compiler/capturedLetConstInLoop4.ts
index 58f05876f89d1..58d25ab141844 100644
--- a/tests/cases/compiler/capturedLetConstInLoop4.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: system
 
 //======let
diff --git a/tests/cases/compiler/capturedLetConstInLoop4_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop4_ES6.ts
index e65c01e90e2d3..924b2708e67c8 100644
--- a/tests/cases/compiler/capturedLetConstInLoop4_ES6.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop4_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 //======let
diff --git a/tests/cases/compiler/capturedLetConstInLoop5.ts b/tests/cases/compiler/capturedLetConstInLoop5.ts
index 5eedd5aac85b7..86b9617812f0f 100644
--- a/tests/cases/compiler/capturedLetConstInLoop5.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function use(a: any);
 
 //====let
diff --git a/tests/cases/compiler/capturedLetConstInLoop5_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop5_ES6.ts
index 224ffa823bf32..b217af85f49f9 100644
--- a/tests/cases/compiler/capturedLetConstInLoop5_ES6.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop5_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 declare function use(a: any);
diff --git a/tests/cases/compiler/capturedLetConstInLoop6.ts b/tests/cases/compiler/capturedLetConstInLoop6.ts
index a854be4619527..d7d1ce21acc83 100644
--- a/tests/cases/compiler/capturedLetConstInLoop6.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // ====let
 for (let x of []) {
     (function() { return x});
diff --git a/tests/cases/compiler/capturedLetConstInLoop6_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop6_ES6.ts
index ad10f1fcb74f7..a6261e1aa8864 100644
--- a/tests/cases/compiler/capturedLetConstInLoop6_ES6.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop6_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // ====let
 for (let x of []) {
diff --git a/tests/cases/compiler/capturedLetConstInLoop7.ts b/tests/cases/compiler/capturedLetConstInLoop7.ts
index 12805411f969f..9680b13d21980 100644
--- a/tests/cases/compiler/capturedLetConstInLoop7.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //===let
 l0:
 for (let x of []) {
diff --git a/tests/cases/compiler/capturedLetConstInLoop7_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop7_ES6.ts
index 2e2784f9a16c0..d1191bff608b8 100644
--- a/tests/cases/compiler/capturedLetConstInLoop7_ES6.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop7_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 //===let
 l0:
diff --git a/tests/cases/compiler/capturedLetConstInLoop9.ts b/tests/cases/compiler/capturedLetConstInLoop9.ts
index 4b67349690d6f..137664203f268 100644
--- a/tests/cases/compiler/capturedLetConstInLoop9.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (let x = 0; x < 1; ++x) {
     let x;
     (function() { return x });
diff --git a/tests/cases/compiler/capturedLetConstInLoop9_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop9_ES6.ts
index 25c696ff7e641..03e38e4b83716 100644
--- a/tests/cases/compiler/capturedLetConstInLoop9_ES6.ts
+++ b/tests/cases/compiler/capturedLetConstInLoop9_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 for (let x = 0; x < 1; ++x) {
diff --git a/tests/cases/compiler/capturedParametersInInitializers1.ts b/tests/cases/compiler/capturedParametersInInitializers1.ts
index be989e92f8bcf..00a2a20606423 100644
--- a/tests/cases/compiler/capturedParametersInInitializers1.ts
+++ b/tests/cases/compiler/capturedParametersInInitializers1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 // ok - usage is deferred
 function foo1(y = class {c = x}, x = 1) {
diff --git a/tests/cases/compiler/capturedVarInLoop.ts b/tests/cases/compiler/capturedVarInLoop.ts
index 65cc5620f8374..59ba79dbe92e9 100644
--- a/tests/cases/compiler/capturedVarInLoop.ts
+++ b/tests/cases/compiler/capturedVarInLoop.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 for (var i = 0; i < 10; i++) {
     var str = 'x', len = str.length;
diff --git a/tests/cases/compiler/castExpressionParentheses.ts b/tests/cases/compiler/castExpressionParentheses.ts
index 4d70b9a777723..ba6b13a563da6 100644
--- a/tests/cases/compiler/castExpressionParentheses.ts
+++ b/tests/cases/compiler/castExpressionParentheses.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare var a;
 
 // parentheses should be omitted
diff --git a/tests/cases/compiler/chainedAssignment1.ts b/tests/cases/compiler/chainedAssignment1.ts
index 963a1fbea7e5c..e1f65458502f6 100644
--- a/tests/cases/compiler/chainedAssignment1.ts
+++ b/tests/cases/compiler/chainedAssignment1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class X {
     constructor(public z) { }
     a: number;
diff --git a/tests/cases/compiler/chainedAssignmentChecking.ts b/tests/cases/compiler/chainedAssignmentChecking.ts
index efc16cc7c3c37..ccff32d35664f 100644
--- a/tests/cases/compiler/chainedAssignmentChecking.ts
+++ b/tests/cases/compiler/chainedAssignmentChecking.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class X {
   constructor(public z) { }
   a: number;
diff --git a/tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts b/tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts
index 66ed33cf11368..b065e6a3df6f2 100644
--- a/tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts
+++ b/tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Chain<T extends A> {
     constructor(public value: T) { }
     then<S extends T>(cb: (x: T) => S): Chain<S> {
diff --git a/tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts b/tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts
index 0e8e5a0d53c46..21ccf862b06f2 100644
--- a/tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts
+++ b/tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts
@@ -1,8 +1,9 @@
+// @strict: false
 class Chain<T> {
     constructor(public value: T) { }
     then<S extends T>(cb: (x: T) => S): Chain<S> {
-        var t: T;
-        var s: S;
+        var t!: T;
+        var s!: S;
         // Ok to go down the chain, but error to climb up the chain
         (new Chain(t)).then(tt => s).then(ss => t);
 
@@ -24,9 +25,9 @@ interface I {
 class Chain2<T extends I> {
     constructor(public value: T) { }
     then<S extends T>(cb: (x: T) => S): Chain2<S> {
-        var i: I;
-        var t: T;
-        var s: S;
+        var i!: I;
+        var t!: T;
+        var s!: S;
         // Ok to go down the chain, check the constraint at the end.
         // Should get an error that we are assigning a string to a number
         (new Chain2(i)).then(ii => t).then(tt => s).value.x = "";
diff --git a/tests/cases/compiler/checkInfiniteExpansionTermination.ts b/tests/cases/compiler/checkInfiniteExpansionTermination.ts
index 8514ebce96606..f21b95f275444 100644
--- a/tests/cases/compiler/checkInfiniteExpansionTermination.ts
+++ b/tests/cases/compiler/checkInfiniteExpansionTermination.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Regression test for #1002
 // Before fix this code would cause infinite loop
 
diff --git a/tests/cases/compiler/checkInfiniteExpansionTermination2.ts b/tests/cases/compiler/checkInfiniteExpansionTermination2.ts
index f30499ba5403c..d4d400c0ad9ab 100644
--- a/tests/cases/compiler/checkInfiniteExpansionTermination2.ts
+++ b/tests/cases/compiler/checkInfiniteExpansionTermination2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Regression test for #1002
 // Before fix this code would cause infinite loop
 
diff --git a/tests/cases/compiler/checkJsxNotSetError.ts b/tests/cases/compiler/checkJsxNotSetError.ts
index 824a68d4ff1d7..a3d7795354581 100644
--- a/tests/cases/compiler/checkJsxNotSetError.ts
+++ b/tests/cases/compiler/checkJsxNotSetError.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true 
 // @checkJs: true
 
diff --git a/tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts b/tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts
index 65d1db6df7522..41f36623fe0bf 100644
--- a/tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts
+++ b/tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts
@@ -1,6 +1,6 @@
 class Based { constructor(...arg) { } }
 class Derived extends Based {
-    public x: number;
+    public x!: number;
     constructor() {
         super(this.x);
     }
diff --git a/tests/cases/compiler/checkingObjectDefinePropertyOnFunctionNonexistentPropertyNoCrash1.ts b/tests/cases/compiler/checkingObjectDefinePropertyOnFunctionNonexistentPropertyNoCrash1.ts
index 525d7b1feb4fe..af09f841fdf3b 100644
--- a/tests/cases/compiler/checkingObjectDefinePropertyOnFunctionNonexistentPropertyNoCrash1.ts
+++ b/tests/cases/compiler/checkingObjectDefinePropertyOnFunctionNonexistentPropertyNoCrash1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @declaration: true
diff --git a/tests/cases/compiler/classExpressionWithStaticProperties2.ts b/tests/cases/compiler/classExpressionWithStaticProperties2.ts
index 353926e7abdbd..52cd5927b713a 100644
--- a/tests/cases/compiler/classExpressionWithStaticProperties2.ts
+++ b/tests/cases/compiler/classExpressionWithStaticProperties2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: es5
 var v = class C {
     static a = 1;
diff --git a/tests/cases/compiler/classExpressionWithStaticPropertiesES62.ts b/tests/cases/compiler/classExpressionWithStaticPropertiesES62.ts
index afb87b10de96a..49e1bc1d1336f 100644
--- a/tests/cases/compiler/classExpressionWithStaticPropertiesES62.ts
+++ b/tests/cases/compiler/classExpressionWithStaticPropertiesES62.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: es6
 var v = class C {
     static a = 1;
diff --git a/tests/cases/compiler/classImplementingInterfaceIndexer.ts b/tests/cases/compiler/classImplementingInterfaceIndexer.ts
index 89b1f2094cf66..0de0e9be8f0eb 100644
--- a/tests/cases/compiler/classImplementingInterfaceIndexer.ts
+++ b/tests/cases/compiler/classImplementingInterfaceIndexer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
     [index: string]: { prop }
 }
diff --git a/tests/cases/compiler/classImplementsClass2.ts b/tests/cases/compiler/classImplementsClass2.ts
index 74a16a1c03c54..36b4acdb61d16 100644
--- a/tests/cases/compiler/classImplementsClass2.ts
+++ b/tests/cases/compiler/classImplementsClass2.ts
@@ -7,7 +7,7 @@ class C2 extends A {
     }
 }
 
-var c: C;
-var c2: C2;
+declare var c: C;
+declare var c2: C2;
 c = c2;
 c2 = c;
\ No newline at end of file
diff --git a/tests/cases/compiler/classImplementsClass4.ts b/tests/cases/compiler/classImplementsClass4.ts
index 29e0125908302..a4157dec7adaa 100644
--- a/tests/cases/compiler/classImplementsClass4.ts
+++ b/tests/cases/compiler/classImplementsClass4.ts
@@ -10,7 +10,7 @@ class C implements A {
 
 class C2 extends A {}
 
-var c: C;
-var c2: C2;
+declare var c: C;
+declare var c2: C2;
 c = c2;
 c2 = c;
\ No newline at end of file
diff --git a/tests/cases/compiler/classImplementsClass5.ts b/tests/cases/compiler/classImplementsClass5.ts
index e3023de60557d..3c4c3fafdf280 100644
--- a/tests/cases/compiler/classImplementsClass5.ts
+++ b/tests/cases/compiler/classImplementsClass5.ts
@@ -11,7 +11,7 @@ class C implements A {
 
 class C2 extends A {}
 
-var c: C;
-var c2: C2;
+declare var c: C;
+declare var c2: C2;
 c = c2;
 c2 = c;
\ No newline at end of file
diff --git a/tests/cases/compiler/classImplementsClass6.ts b/tests/cases/compiler/classImplementsClass6.ts
index e945ab5072868..756160bde5cc8 100644
--- a/tests/cases/compiler/classImplementsClass6.ts
+++ b/tests/cases/compiler/classImplementsClass6.ts
@@ -13,8 +13,8 @@ class C implements A {
 
 class C2 extends A {}
 
-var c: C;
-var c2: C2;
+declare var c: C;
+declare var c2: C2;
 c = c2;
 c2 = c;
 c.bar(); // error
diff --git a/tests/cases/compiler/classImplementsImportedInterface.ts b/tests/cases/compiler/classImplementsImportedInterface.ts
index 88750e1dd3ccd..7c07f9fd63bc2 100644
--- a/tests/cases/compiler/classImplementsImportedInterface.ts
+++ b/tests/cases/compiler/classImplementsImportedInterface.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M1 {
     export interface I {
         foo();
diff --git a/tests/cases/compiler/classMemberInitializerScoping.ts b/tests/cases/compiler/classMemberInitializerScoping.ts
index bb8ca637da660..f5aef9a63eaff 100644
--- a/tests/cases/compiler/classMemberInitializerScoping.ts
+++ b/tests/cases/compiler/classMemberInitializerScoping.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var aaa = 1;
 class CCC {
     y: number = aaa;
diff --git a/tests/cases/compiler/classMemberInitializerScoping2.ts b/tests/cases/compiler/classMemberInitializerScoping2.ts
index 583d9f03aae21..8ebf2cb7a63ca 100644
--- a/tests/cases/compiler/classMemberInitializerScoping2.ts
+++ b/tests/cases/compiler/classMemberInitializerScoping2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2017,esnext
 // @useDefineForClassFields: true,false
 
diff --git a/tests/cases/compiler/classMemberWithMissingIdentifier.ts b/tests/cases/compiler/classMemberWithMissingIdentifier.ts
index 01ba223f4c49c..ceb4f985d1d71 100644
--- a/tests/cases/compiler/classMemberWithMissingIdentifier.ts
+++ b/tests/cases/compiler/classMemberWithMissingIdentifier.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C { 
     public {};
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/classMemberWithMissingIdentifier2.ts b/tests/cases/compiler/classMemberWithMissingIdentifier2.ts
index e16186597970a..0d08c0c06038f 100644
--- a/tests/cases/compiler/classMemberWithMissingIdentifier2.ts
+++ b/tests/cases/compiler/classMemberWithMissingIdentifier2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C { 
     public {[name:string]:VariableDeclaration};
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/classSideInheritance1.ts b/tests/cases/compiler/classSideInheritance1.ts
index eff2b43674fd7..f6428d583ce86 100644
--- a/tests/cases/compiler/classSideInheritance1.ts
+++ b/tests/cases/compiler/classSideInheritance1.ts
@@ -7,8 +7,8 @@ class A {
  
 class C2 extends A {}
 
-var a: A;
-var c: C2;
+declare var a: A;
+declare var c: C2;
 a.bar(); // static off an instance - should be an error
 c.bar(); // static off an instance - should be an error
 A.bar(); // valid
diff --git a/tests/cases/compiler/classUpdateTests.ts b/tests/cases/compiler/classUpdateTests.ts
index f71aa994eda62..2775cc2a679bd 100644
--- a/tests/cases/compiler/classUpdateTests.ts
+++ b/tests/cases/compiler/classUpdateTests.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //
 // test codegen for instance properties
 //
diff --git a/tests/cases/compiler/classWithMultipleBaseClasses.ts b/tests/cases/compiler/classWithMultipleBaseClasses.ts
index dd9a3a5fe7ee1..8aa8c1cff1c1f 100644
--- a/tests/cases/compiler/classWithMultipleBaseClasses.ts
+++ b/tests/cases/compiler/classWithMultipleBaseClasses.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A {
     foo() { }
 }
diff --git a/tests/cases/compiler/classWithOverloadImplementationOfWrongName.ts b/tests/cases/compiler/classWithOverloadImplementationOfWrongName.ts
index 2fc58bae0bf8e..295191867a383 100644
--- a/tests/cases/compiler/classWithOverloadImplementationOfWrongName.ts
+++ b/tests/cases/compiler/classWithOverloadImplementationOfWrongName.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     foo(): string;
     foo(x): number;
diff --git a/tests/cases/compiler/classWithOverloadImplementationOfWrongName2.ts b/tests/cases/compiler/classWithOverloadImplementationOfWrongName2.ts
index 2f67cd1a66e0e..753145b46953b 100644
--- a/tests/cases/compiler/classWithOverloadImplementationOfWrongName2.ts
+++ b/tests/cases/compiler/classWithOverloadImplementationOfWrongName2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     foo(): string;
     bar(x): any { }
diff --git a/tests/cases/compiler/classdecl.ts b/tests/cases/compiler/classdecl.ts
index 3005d77d496fa..e8ce495898f75 100644
--- a/tests/cases/compiler/classdecl.ts
+++ b/tests/cases/compiler/classdecl.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @target: es5
 class a {
diff --git a/tests/cases/compiler/cloduleTest2.ts b/tests/cases/compiler/cloduleTest2.ts
index 0a4403ec30a6c..a1add252cfb64 100644
--- a/tests/cases/compiler/cloduleTest2.ts
+++ b/tests/cases/compiler/cloduleTest2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace T1 {
     namespace m3d { export var y = 2; }
     declare class m3d { constructor(foo); foo(): void ; static bar(); }
diff --git a/tests/cases/compiler/cloduleWithDuplicateMember2.ts b/tests/cases/compiler/cloduleWithDuplicateMember2.ts
index acb019f0d305f..5545ad85f245d 100644
--- a/tests/cases/compiler/cloduleWithDuplicateMember2.ts
+++ b/tests/cases/compiler/cloduleWithDuplicateMember2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     set x(y) { }
     static set y(z) { }
diff --git a/tests/cases/compiler/collisionArgumentsArrowFunctions.ts b/tests/cases/compiler/collisionArgumentsArrowFunctions.ts
index e4d9215862d57..49fdb036ac573 100644
--- a/tests/cases/compiler/collisionArgumentsArrowFunctions.ts
+++ b/tests/cases/compiler/collisionArgumentsArrowFunctions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var f1 = (i: number, ...arguments) => { //arguments is error
     var arguments: any[]; // no error
 }
diff --git a/tests/cases/compiler/collisionArgumentsClassConstructor.ts b/tests/cases/compiler/collisionArgumentsClassConstructor.ts
index c06a108c77b28..3f966191f7a83 100644
--- a/tests/cases/compiler/collisionArgumentsClassConstructor.ts
+++ b/tests/cases/compiler/collisionArgumentsClassConstructor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Constructors
 class c1 {
     constructor(i: number, ...arguments) { // error
diff --git a/tests/cases/compiler/collisionArgumentsClassMethod.ts b/tests/cases/compiler/collisionArgumentsClassMethod.ts
index dba2c31293cb2..dc15cdba02c41 100644
--- a/tests/cases/compiler/collisionArgumentsClassMethod.ts
+++ b/tests/cases/compiler/collisionArgumentsClassMethod.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class c1 {
     public foo(i: number, ...arguments) { //arguments is error
         var arguments: any[]; // no error
diff --git a/tests/cases/compiler/collisionArgumentsFunction.ts b/tests/cases/compiler/collisionArgumentsFunction.ts
index b90dee9ec1142..d2d6938080ea0 100644
--- a/tests/cases/compiler/collisionArgumentsFunction.ts
+++ b/tests/cases/compiler/collisionArgumentsFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Functions
 function f1(arguments: number, ...restParameters) { //arguments is error
     var arguments = 10; // no error
diff --git a/tests/cases/compiler/collisionArgumentsFunctionExpressions.ts b/tests/cases/compiler/collisionArgumentsFunctionExpressions.ts
index a5a39b09c5495..b6bda566dd798 100644
--- a/tests/cases/compiler/collisionArgumentsFunctionExpressions.ts
+++ b/tests/cases/compiler/collisionArgumentsFunctionExpressions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo() {
     function f1(arguments: number, ...restParameters) { //arguments is error
         var arguments = 10; // no error
diff --git a/tests/cases/compiler/collisionArgumentsInType.ts b/tests/cases/compiler/collisionArgumentsInType.ts
index c9354ba0baec9..9c09f883de57e 100644
--- a/tests/cases/compiler/collisionArgumentsInType.ts
+++ b/tests/cases/compiler/collisionArgumentsInType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var v1: (i: number, ...arguments) => void; // no error - no code gen
 var v12: (arguments: number, ...restParameters) => void; // no error - no code gen
 var v2: {
diff --git a/tests/cases/compiler/collisionArgumentsInterfaceMembers.ts b/tests/cases/compiler/collisionArgumentsInterfaceMembers.ts
index bfb280116e4b1..a0a5d28de5ccd 100644
--- a/tests/cases/compiler/collisionArgumentsInterfaceMembers.ts
+++ b/tests/cases/compiler/collisionArgumentsInterfaceMembers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // call
 interface i1 {
     (i: number, ...arguments); // no error - no code gen
diff --git a/tests/cases/compiler/collisionCodeGenModuleWithAccessorChildren.ts b/tests/cases/compiler/collisionCodeGenModuleWithAccessorChildren.ts
index a16306a5a1b28..97a3346c1c7e9 100644
--- a/tests/cases/compiler/collisionCodeGenModuleWithAccessorChildren.ts
+++ b/tests/cases/compiler/collisionCodeGenModuleWithAccessorChildren.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
     export var x = 3;
     class c {
diff --git a/tests/cases/compiler/collisionCodeGenModuleWithConstructorChildren.ts b/tests/cases/compiler/collisionCodeGenModuleWithConstructorChildren.ts
index 1eb8d3c79a82b..a31ccfe6c5b03 100644
--- a/tests/cases/compiler/collisionCodeGenModuleWithConstructorChildren.ts
+++ b/tests/cases/compiler/collisionCodeGenModuleWithConstructorChildren.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
     export var x = 3;
     class c {
diff --git a/tests/cases/compiler/collisionCodeGenModuleWithFunctionChildren.ts b/tests/cases/compiler/collisionCodeGenModuleWithFunctionChildren.ts
index 96f8d86be2449..1ee5e4517a296 100644
--- a/tests/cases/compiler/collisionCodeGenModuleWithFunctionChildren.ts
+++ b/tests/cases/compiler/collisionCodeGenModuleWithFunctionChildren.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
     export var x = 3;
     function fn(M, p = x) { }
diff --git a/tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts b/tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts
index c4919a158e8d8..51a0328b65a58 100644
--- a/tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts
+++ b/tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
     export var x = 3;
     class c {
diff --git a/tests/cases/compiler/collisionRestParameterArrowFunctions.ts b/tests/cases/compiler/collisionRestParameterArrowFunctions.ts
index 0fb46590d10b8..d32afdd186671 100644
--- a/tests/cases/compiler/collisionRestParameterArrowFunctions.ts
+++ b/tests/cases/compiler/collisionRestParameterArrowFunctions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var f1 = (_i: number, ...restParameters) => { //_i is error
     var _i = 10; // no error
 }
diff --git a/tests/cases/compiler/collisionRestParameterClassConstructor.ts b/tests/cases/compiler/collisionRestParameterClassConstructor.ts
index 2269f57e99218..02def8435e59a 100644
--- a/tests/cases/compiler/collisionRestParameterClassConstructor.ts
+++ b/tests/cases/compiler/collisionRestParameterClassConstructor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Constructors
 class c1 {
     constructor(_i: number, ...restParameters) { //_i is error
diff --git a/tests/cases/compiler/collisionRestParameterClassMethod.ts b/tests/cases/compiler/collisionRestParameterClassMethod.ts
index 507c8d3779259..67117f042d024 100644
--- a/tests/cases/compiler/collisionRestParameterClassMethod.ts
+++ b/tests/cases/compiler/collisionRestParameterClassMethod.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class c1 {
     public foo(_i: number, ...restParameters) { //_i is error
         var _i = 10; // no error
diff --git a/tests/cases/compiler/collisionRestParameterFunction.ts b/tests/cases/compiler/collisionRestParameterFunction.ts
index c31e6ab8f9b70..a3d85ac052723 100644
--- a/tests/cases/compiler/collisionRestParameterFunction.ts
+++ b/tests/cases/compiler/collisionRestParameterFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Functions
 function f1(_i: number, ...restParameters) { //_i is error
     var _i = 10; // no error
diff --git a/tests/cases/compiler/collisionRestParameterFunctionExpressions.ts b/tests/cases/compiler/collisionRestParameterFunctionExpressions.ts
index 7e54c24ec660e..817c0a1c263e8 100644
--- a/tests/cases/compiler/collisionRestParameterFunctionExpressions.ts
+++ b/tests/cases/compiler/collisionRestParameterFunctionExpressions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo() {
     function f1(_i: number, ...restParameters) { //_i is error
         var _i = 10; // no error
diff --git a/tests/cases/compiler/collisionRestParameterInType.ts b/tests/cases/compiler/collisionRestParameterInType.ts
index 62e3809a546e0..f1671d4743209 100644
--- a/tests/cases/compiler/collisionRestParameterInType.ts
+++ b/tests/cases/compiler/collisionRestParameterInType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var v1: (_i: number, ...restParameters) => void; // no error - no code gen
 var v2: {
     (_i: number, ...restParameters); // no error - no code gen
diff --git a/tests/cases/compiler/collisionRestParameterInterfaceMembers.ts b/tests/cases/compiler/collisionRestParameterInterfaceMembers.ts
index 80041e667b637..192a963576b59 100644
--- a/tests/cases/compiler/collisionRestParameterInterfaceMembers.ts
+++ b/tests/cases/compiler/collisionRestParameterInterfaceMembers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // call
 interface i1 {
     (_i: number, ...restParameters); // no error - no code gen
diff --git a/tests/cases/compiler/collisionSuperAndNameResolution.ts b/tests/cases/compiler/collisionSuperAndNameResolution.ts
index 4e08fe96982f6..2354ea582fe6c 100644
--- a/tests/cases/compiler/collisionSuperAndNameResolution.ts
+++ b/tests/cases/compiler/collisionSuperAndNameResolution.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 var console: {
     log(message: any);
diff --git a/tests/cases/compiler/collisionSuperAndParameter.ts b/tests/cases/compiler/collisionSuperAndParameter.ts
index 88c0235a5b599..ccbbde0482781 100644
--- a/tests/cases/compiler/collisionSuperAndParameter.ts
+++ b/tests/cases/compiler/collisionSuperAndParameter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class Foo {
     a() {
diff --git a/tests/cases/compiler/collisionSuperAndParameter1.ts b/tests/cases/compiler/collisionSuperAndParameter1.ts
index 9c42472fff8cc..0ac8272fb5222 100644
--- a/tests/cases/compiler/collisionSuperAndParameter1.ts
+++ b/tests/cases/compiler/collisionSuperAndParameter1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Foo {
 }
 
diff --git a/tests/cases/compiler/collisionThisExpressionAndAliasInGlobal.ts b/tests/cases/compiler/collisionThisExpressionAndAliasInGlobal.ts
index 6c4d9c768a7be..d81d96994a0b4 100644
--- a/tests/cases/compiler/collisionThisExpressionAndAliasInGlobal.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndAliasInGlobal.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace a {
     export var b = 10;
 }
diff --git a/tests/cases/compiler/collisionThisExpressionAndAmbientClassInGlobal.ts b/tests/cases/compiler/collisionThisExpressionAndAmbientClassInGlobal.ts
index d4e9b2f06b9d8..bc169f0252db7 100644
--- a/tests/cases/compiler/collisionThisExpressionAndAmbientClassInGlobal.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndAmbientClassInGlobal.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare class _this { // no error - as no code generation
 }
 var f = () => this;
diff --git a/tests/cases/compiler/collisionThisExpressionAndAmbientVarInGlobal.ts b/tests/cases/compiler/collisionThisExpressionAndAmbientVarInGlobal.ts
index c2f228d26d802..cb5edca93a73a 100644
--- a/tests/cases/compiler/collisionThisExpressionAndAmbientVarInGlobal.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndAmbientVarInGlobal.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare var _this: number; // no error as no code gen
 var f = () => this;
 _this = 10; // Error
\ No newline at end of file
diff --git a/tests/cases/compiler/collisionThisExpressionAndClassInGlobal.ts b/tests/cases/compiler/collisionThisExpressionAndClassInGlobal.ts
index 236f038614500..cafb4ee7d940b 100644
--- a/tests/cases/compiler/collisionThisExpressionAndClassInGlobal.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndClassInGlobal.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class _this {
 }
 var f = () => this;
\ No newline at end of file
diff --git a/tests/cases/compiler/collisionThisExpressionAndEnumInGlobal.ts b/tests/cases/compiler/collisionThisExpressionAndEnumInGlobal.ts
index 49d9aaa3ce47c..49d09fbfeedc6 100644
--- a/tests/cases/compiler/collisionThisExpressionAndEnumInGlobal.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndEnumInGlobal.ts
@@ -1,3 +1,4 @@
+// @strict: false
 enum _this { // Error
     _thisVal1,
     _thisVal2,
diff --git a/tests/cases/compiler/collisionThisExpressionAndFunctionInGlobal.ts b/tests/cases/compiler/collisionThisExpressionAndFunctionInGlobal.ts
index 50cbb6c1157fa..a25011166cf4c 100644
--- a/tests/cases/compiler/collisionThisExpressionAndFunctionInGlobal.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndFunctionInGlobal.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function _this() { //Error
     return 10;
 }
diff --git a/tests/cases/compiler/collisionThisExpressionAndLocalVarInAccessors.ts b/tests/cases/compiler/collisionThisExpressionAndLocalVarInAccessors.ts
index d3546733e101b..1f5384d53fa8a 100644
--- a/tests/cases/compiler/collisionThisExpressionAndLocalVarInAccessors.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndLocalVarInAccessors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class class1 {
     get a(): number {
diff --git a/tests/cases/compiler/collisionThisExpressionAndLocalVarInConstructor.ts b/tests/cases/compiler/collisionThisExpressionAndLocalVarInConstructor.ts
index 380fb783a4f14..7a20477239ba4 100644
--- a/tests/cases/compiler/collisionThisExpressionAndLocalVarInConstructor.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndLocalVarInConstructor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class class1 {
     constructor() {
         var x2 = {
diff --git a/tests/cases/compiler/collisionThisExpressionAndLocalVarInFunction.ts b/tests/cases/compiler/collisionThisExpressionAndLocalVarInFunction.ts
index feb3fe25379b3..ad932a00c26a9 100644
--- a/tests/cases/compiler/collisionThisExpressionAndLocalVarInFunction.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndLocalVarInFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 var console: {
     log(val: any);
diff --git a/tests/cases/compiler/collisionThisExpressionAndLocalVarInLambda.ts b/tests/cases/compiler/collisionThisExpressionAndLocalVarInLambda.ts
index 99b13763d3136..22d660bb91eac 100644
--- a/tests/cases/compiler/collisionThisExpressionAndLocalVarInLambda.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndLocalVarInLambda.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function alert(message?: any): void;
 
 var x = {
diff --git a/tests/cases/compiler/collisionThisExpressionAndLocalVarInMethod.ts b/tests/cases/compiler/collisionThisExpressionAndLocalVarInMethod.ts
index b8c13a215ec0a..53f42be707173 100644
--- a/tests/cases/compiler/collisionThisExpressionAndLocalVarInMethod.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndLocalVarInMethod.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     method1() {
         return {
diff --git a/tests/cases/compiler/collisionThisExpressionAndLocalVarInProperty.ts b/tests/cases/compiler/collisionThisExpressionAndLocalVarInProperty.ts
index 9146c9b2d930b..89b46198decaa 100644
--- a/tests/cases/compiler/collisionThisExpressionAndLocalVarInProperty.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndLocalVarInProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class class1 {
     public prop1 = {
         doStuff: (callback) => () => {
diff --git a/tests/cases/compiler/collisionThisExpressionAndModuleInGlobal.ts b/tests/cases/compiler/collisionThisExpressionAndModuleInGlobal.ts
index d830f14a811a2..6c0b2af14d900 100644
--- a/tests/cases/compiler/collisionThisExpressionAndModuleInGlobal.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndModuleInGlobal.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace _this { //Error
     class c {
     }
diff --git a/tests/cases/compiler/collisionThisExpressionAndNameResolution.ts b/tests/cases/compiler/collisionThisExpressionAndNameResolution.ts
index d479498e2256a..7fb17c7df3c7c 100644
--- a/tests/cases/compiler/collisionThisExpressionAndNameResolution.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndNameResolution.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 var console : {
     log(message: any);
diff --git a/tests/cases/compiler/collisionThisExpressionAndParameter.ts b/tests/cases/compiler/collisionThisExpressionAndParameter.ts
index fc7410bcf7d99..3d6be204aec16 100644
--- a/tests/cases/compiler/collisionThisExpressionAndParameter.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndParameter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 class Foo {
     x() {
diff --git a/tests/cases/compiler/collisionThisExpressionAndPropertyNameAsConstuctorParameter.ts b/tests/cases/compiler/collisionThisExpressionAndPropertyNameAsConstuctorParameter.ts
index 0bd9be4e72098..9dcbf559150c2 100644
--- a/tests/cases/compiler/collisionThisExpressionAndPropertyNameAsConstuctorParameter.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndPropertyNameAsConstuctorParameter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Foo2 {
     constructor(_this: number) { //Error
         var lambda = () => {
diff --git a/tests/cases/compiler/collisionThisExpressionAndVarInGlobal.ts b/tests/cases/compiler/collisionThisExpressionAndVarInGlobal.ts
index 26ea678e80768..09faa94a82b5e 100644
--- a/tests/cases/compiler/collisionThisExpressionAndVarInGlobal.ts
+++ b/tests/cases/compiler/collisionThisExpressionAndVarInGlobal.ts
@@ -1,2 +1,3 @@
+// @strict: false
 var _this = 1;
 var f = () => this;
\ No newline at end of file
diff --git a/tests/cases/compiler/commentOnAmbientModule.ts b/tests/cases/compiler/commentOnAmbientModule.ts
index d878760fa2df5..f025ea9e917ad 100644
--- a/tests/cases/compiler/commentOnAmbientModule.ts
+++ b/tests/cases/compiler/commentOnAmbientModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@filename: a.ts
 /*!=========
     Keep this pinned comment
diff --git a/tests/cases/compiler/commentOnAmbientfunction.ts b/tests/cases/compiler/commentOnAmbientfunction.ts
index 51f3b6194b59a..e38f80b42a73d 100644
--- a/tests/cases/compiler/commentOnAmbientfunction.ts
+++ b/tests/cases/compiler/commentOnAmbientfunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@filename: a.ts
 /*!=========
     Keep this pinned comment
diff --git a/tests/cases/compiler/commentOnSignature1.ts b/tests/cases/compiler/commentOnSignature1.ts
index e8d2d831e8b1f..f13d9622fd6b5 100644
--- a/tests/cases/compiler/commentOnSignature1.ts
+++ b/tests/cases/compiler/commentOnSignature1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: a.ts
 /*!=================
     Keep this pinned
diff --git a/tests/cases/compiler/commentsAfterFunctionExpression1.ts b/tests/cases/compiler/commentsAfterFunctionExpression1.ts
index 04fb0aec3b1a8..9a93fbf1596cb 100644
--- a/tests/cases/compiler/commentsAfterFunctionExpression1.ts
+++ b/tests/cases/compiler/commentsAfterFunctionExpression1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @removeComments: false
 var v = {
     f: a => 0 /*t1*/,
diff --git a/tests/cases/compiler/commentsAfterSpread.ts b/tests/cases/compiler/commentsAfterSpread.ts
index d517ddbab1d5e..ec92a06824798 100644
--- a/tests/cases/compiler/commentsAfterSpread.ts
+++ b/tests/cases/compiler/commentsAfterSpread.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ESNEXT
 const identity = (a) => a;
 
diff --git a/tests/cases/compiler/commentsBeforeFunctionExpression1.ts b/tests/cases/compiler/commentsBeforeFunctionExpression1.ts
index d3b21c1847591..27fb182db04e4 100644
--- a/tests/cases/compiler/commentsBeforeFunctionExpression1.ts
+++ b/tests/cases/compiler/commentsBeforeFunctionExpression1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @removeComments: false
 var v = {
     f: /**own f*/ (a) => 0
diff --git a/tests/cases/compiler/commentsCommentParsing.ts b/tests/cases/compiler/commentsCommentParsing.ts
index a1fbf50c61fdb..cffdad17fa9ec 100644
--- a/tests/cases/compiler/commentsCommentParsing.ts
+++ b/tests/cases/compiler/commentsCommentParsing.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @declaration: true
 // @removeComments: false
diff --git a/tests/cases/compiler/commentsInterface.ts b/tests/cases/compiler/commentsInterface.ts
index 2e35a95f207a0..c2438e198a918 100644
--- a/tests/cases/compiler/commentsInterface.ts
+++ b/tests/cases/compiler/commentsInterface.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @declaration: true
 // @removeComments: false
diff --git a/tests/cases/compiler/commentsOnObjectLiteral2.ts b/tests/cases/compiler/commentsOnObjectLiteral2.ts
index 952df7ed96973..c38785a71059e 100644
--- a/tests/cases/compiler/commentsOnObjectLiteral2.ts
+++ b/tests/cases/compiler/commentsOnObjectLiteral2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @removeComments: false
 var Person = makeClass( 
    { 
diff --git a/tests/cases/compiler/commentsOverloads.ts b/tests/cases/compiler/commentsOverloads.ts
index efb5d73df8f2c..502c54ce10345 100644
--- a/tests/cases/compiler/commentsOverloads.ts
+++ b/tests/cases/compiler/commentsOverloads.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @declaration: true
 // @removeComments: false
diff --git a/tests/cases/compiler/commentsdoNotEmitComments.ts b/tests/cases/compiler/commentsdoNotEmitComments.ts
index af831c74d4891..cc9dda1fa50c2 100644
--- a/tests/cases/compiler/commentsdoNotEmitComments.ts
+++ b/tests/cases/compiler/commentsdoNotEmitComments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @declaration: true
 // @removeComments: true
diff --git a/tests/cases/compiler/commentsemitComments.ts b/tests/cases/compiler/commentsemitComments.ts
index 449bacec8af7a..06c7d4db7c251 100644
--- a/tests/cases/compiler/commentsemitComments.ts
+++ b/tests/cases/compiler/commentsemitComments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @declaration: true
 // @removeComments: false
diff --git a/tests/cases/compiler/commonMissingSemicolons.ts b/tests/cases/compiler/commonMissingSemicolons.ts
index 197177c9f4bb5..0e27ea677007e 100644
--- a/tests/cases/compiler/commonMissingSemicolons.ts
+++ b/tests/cases/compiler/commonMissingSemicolons.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @noTypesAndSymbols: true
 
diff --git a/tests/cases/compiler/complexNarrowingWithAny.ts b/tests/cases/compiler/complexNarrowingWithAny.ts
index 746e2ef031f19..4951ee7a6e45d 100644
--- a/tests/cases/compiler/complexNarrowingWithAny.ts
+++ b/tests/cases/compiler/complexNarrowingWithAny.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Repro from #10869
 
 /**
diff --git a/tests/cases/compiler/complicatedPrivacy.ts b/tests/cases/compiler/complicatedPrivacy.ts
index ec86b63660907..dc748c4832632 100644
--- a/tests/cases/compiler/complicatedPrivacy.ts
+++ b/tests/cases/compiler/complicatedPrivacy.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 namespace m1 {
     export namespace m2 {
diff --git a/tests/cases/compiler/computerPropertiesInES5ShouldBeTransformed.ts b/tests/cases/compiler/computerPropertiesInES5ShouldBeTransformed.ts
index 42eb602989dfe..f4817ae707c1d 100644
--- a/tests/cases/compiler/computerPropertiesInES5ShouldBeTransformed.ts
+++ b/tests/cases/compiler/computerPropertiesInES5ShouldBeTransformed.ts
@@ -1,2 +1,3 @@
+// @strict: false
 // @target: es5
 const b = ({ [`key`]: renamed }) => renamed;
\ No newline at end of file
diff --git a/tests/cases/compiler/conditionalExpressions2.ts b/tests/cases/compiler/conditionalExpressions2.ts
index ece002d7778fc..5307093240272 100644
--- a/tests/cases/compiler/conditionalExpressions2.ts
+++ b/tests/cases/compiler/conditionalExpressions2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 
 var a = false ? 1 : null;
diff --git a/tests/cases/compiler/constDeclarations-access.ts b/tests/cases/compiler/constDeclarations-access.ts
index 665d6753a6df6..10804d8ab020c 100644
--- a/tests/cases/compiler/constDeclarations-access.ts
+++ b/tests/cases/compiler/constDeclarations-access.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 // @Filename: file1.ts
diff --git a/tests/cases/compiler/constDeclarations-access2.ts b/tests/cases/compiler/constDeclarations-access2.ts
index e3f83940d1de0..153a003df7bd7 100644
--- a/tests/cases/compiler/constDeclarations-access2.ts
+++ b/tests/cases/compiler/constDeclarations-access2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 const x = 0
diff --git a/tests/cases/compiler/constDeclarations-access3.ts b/tests/cases/compiler/constDeclarations-access3.ts
index 344af8229320f..1e94dd75c9a70 100644
--- a/tests/cases/compiler/constDeclarations-access3.ts
+++ b/tests/cases/compiler/constDeclarations-access3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 
diff --git a/tests/cases/compiler/constDeclarations-access4.ts b/tests/cases/compiler/constDeclarations-access4.ts
index 3ea4f54e8dfd3..17884add67679 100644
--- a/tests/cases/compiler/constDeclarations-access4.ts
+++ b/tests/cases/compiler/constDeclarations-access4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 
diff --git a/tests/cases/compiler/constDeclarations-access5.ts b/tests/cases/compiler/constDeclarations-access5.ts
index 769e72c266a76..a20fb76cd367a 100644
--- a/tests/cases/compiler/constDeclarations-access5.ts
+++ b/tests/cases/compiler/constDeclarations-access5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @module: commonjs
 
diff --git a/tests/cases/compiler/constDeclarations-ambient-errors.ts b/tests/cases/compiler/constDeclarations-ambient-errors.ts
index ecc6521c208b7..d37e90b2d576e 100644
--- a/tests/cases/compiler/constDeclarations-ambient-errors.ts
+++ b/tests/cases/compiler/constDeclarations-ambient-errors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 // error: no intialization expected in ambient declarations
diff --git a/tests/cases/compiler/constDeclarations-ambient.ts b/tests/cases/compiler/constDeclarations-ambient.ts
index e9fdab5faabb6..83fd24529aa84 100644
--- a/tests/cases/compiler/constDeclarations-ambient.ts
+++ b/tests/cases/compiler/constDeclarations-ambient.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 // No error
diff --git a/tests/cases/compiler/constDeclarations-errors.ts b/tests/cases/compiler/constDeclarations-errors.ts
index 1c3ef8848b0b9..71a8c33706e66 100644
--- a/tests/cases/compiler/constDeclarations-errors.ts
+++ b/tests/cases/compiler/constDeclarations-errors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 // error, missing intialicer
diff --git a/tests/cases/compiler/constDeclarations-es5.ts b/tests/cases/compiler/constDeclarations-es5.ts
index 0da824a7396d8..12da20e233fb9 100644
--- a/tests/cases/compiler/constDeclarations-es5.ts
+++ b/tests/cases/compiler/constDeclarations-es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 
 const z7 = false;
diff --git a/tests/cases/compiler/constDeclarations-invalidContexts.ts b/tests/cases/compiler/constDeclarations-invalidContexts.ts
index 6d21ee31ec243..bf7d290befb4d 100644
--- a/tests/cases/compiler/constDeclarations-invalidContexts.ts
+++ b/tests/cases/compiler/constDeclarations-invalidContexts.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 // @target: ES6
 
diff --git a/tests/cases/compiler/constDeclarations-scopes.ts b/tests/cases/compiler/constDeclarations-scopes.ts
index 3fe6bf707fd2c..b2cd4416e43d7 100644
--- a/tests/cases/compiler/constDeclarations-scopes.ts
+++ b/tests/cases/compiler/constDeclarations-scopes.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 // global
diff --git a/tests/cases/compiler/constDeclarations-scopes2.ts b/tests/cases/compiler/constDeclarations-scopes2.ts
index fe0ab16409a98..b8e5378129c40 100644
--- a/tests/cases/compiler/constDeclarations-scopes2.ts
+++ b/tests/cases/compiler/constDeclarations-scopes2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 // global
diff --git a/tests/cases/compiler/constDeclarations-useBeforeDefinition.ts b/tests/cases/compiler/constDeclarations-useBeforeDefinition.ts
index ec793fda4846f..f5e2c25077772 100644
--- a/tests/cases/compiler/constDeclarations-useBeforeDefinition.ts
+++ b/tests/cases/compiler/constDeclarations-useBeforeDefinition.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 {
diff --git a/tests/cases/compiler/constDeclarations-useBeforeDefinition2.ts b/tests/cases/compiler/constDeclarations-useBeforeDefinition2.ts
index 2f9def647d060..a4f53512e9307 100644
--- a/tests/cases/compiler/constDeclarations-useBeforeDefinition2.ts
+++ b/tests/cases/compiler/constDeclarations-useBeforeDefinition2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @outFile: out.js
 
diff --git a/tests/cases/compiler/constDeclarations-validContexts.ts b/tests/cases/compiler/constDeclarations-validContexts.ts
index 323eba564505a..7806fd34534d4 100644
--- a/tests/cases/compiler/constDeclarations-validContexts.ts
+++ b/tests/cases/compiler/constDeclarations-validContexts.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 // @target: ES6
 
diff --git a/tests/cases/compiler/constDeclarations.ts b/tests/cases/compiler/constDeclarations.ts
index 2b8563b340a21..0aba63c3cf758 100644
--- a/tests/cases/compiler/constDeclarations.ts
+++ b/tests/cases/compiler/constDeclarations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @declaration: true
 
diff --git a/tests/cases/compiler/constDeclarations2.ts b/tests/cases/compiler/constDeclarations2.ts
index 75d39f8eb81bf..f55a175efc656 100644
--- a/tests/cases/compiler/constDeclarations2.ts
+++ b/tests/cases/compiler/constDeclarations2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @declaration: true
 
diff --git a/tests/cases/compiler/constraintReferencingTypeParameterFromSameTypeParameterList.ts b/tests/cases/compiler/constraintReferencingTypeParameterFromSameTypeParameterList.ts
index f576e2a43025c..1d605c1e3f07a 100644
--- a/tests/cases/compiler/constraintReferencingTypeParameterFromSameTypeParameterList.ts
+++ b/tests/cases/compiler/constraintReferencingTypeParameterFromSameTypeParameterList.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // used to be valid, now an error to do this
 
 interface IComparable<T> {
diff --git a/tests/cases/compiler/constraints0.ts b/tests/cases/compiler/constraints0.ts
index 08416c00fce53..3120a8709717b 100644
--- a/tests/cases/compiler/constraints0.ts
+++ b/tests/cases/compiler/constraints0.ts
@@ -10,7 +10,7 @@ interface C<T extends A> {
     x: T;
 }
 
-var v1: C<A>; // should work
-var v2: C<B>; // should not work
+declare var v1: C<A>; // should work
+declare var v2: C<B>; // should not work
 
 var y = v1.x.a; // 'a' should be of type 'number'
\ No newline at end of file
diff --git a/tests/cases/compiler/constructorAsType.ts b/tests/cases/compiler/constructorAsType.ts
index 0191f40504938..7fb5e27ab35b5 100644
--- a/tests/cases/compiler/constructorAsType.ts
+++ b/tests/cases/compiler/constructorAsType.ts
@@ -1,5 +1,5 @@
 var Person:new () => {name: string;} = function () {return {name:"joe"};};
 
-var Person2:{new() : {name:string;};};
+declare var Person2:{new() : {name:string;};};
 
 Person = Person2;
\ No newline at end of file
diff --git a/tests/cases/compiler/constructorOverloads7.ts b/tests/cases/compiler/constructorOverloads7.ts
index 59efbbd619cae..db0feced24fde 100644
--- a/tests/cases/compiler/constructorOverloads7.ts
+++ b/tests/cases/compiler/constructorOverloads7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare class Point
 {
     x: number;
diff --git a/tests/cases/compiler/constructorOverloads8.ts b/tests/cases/compiler/constructorOverloads8.ts
index 448d6f476c503..2df340c3dc32b 100644
--- a/tests/cases/compiler/constructorOverloads8.ts
+++ b/tests/cases/compiler/constructorOverloads8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     constructor(x) { }
     constructor(y, x) { } // illegal, 2 constructor implementations
diff --git a/tests/cases/compiler/constructorStaticParamName.ts b/tests/cases/compiler/constructorStaticParamName.ts
index 3edd36cdad141..053bd8e978887 100644
--- a/tests/cases/compiler/constructorStaticParamName.ts
+++ b/tests/cases/compiler/constructorStaticParamName.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // static as constructor parameter name should only give error if 'use strict'
 
 class test {
diff --git a/tests/cases/compiler/constructorStaticParamNameErrors.ts b/tests/cases/compiler/constructorStaticParamNameErrors.ts
index 1fbbf6b48f6ad..ca7d4ed260d12 100644
--- a/tests/cases/compiler/constructorStaticParamNameErrors.ts
+++ b/tests/cases/compiler/constructorStaticParamNameErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 'use strict'
 // static as constructor parameter name should give error if 'use strict'
 class test {
diff --git a/tests/cases/compiler/constructorsWithSpecializedSignatures.ts b/tests/cases/compiler/constructorsWithSpecializedSignatures.ts
index 49af660fee19a..c769e22379ef9 100644
--- a/tests/cases/compiler/constructorsWithSpecializedSignatures.ts
+++ b/tests/cases/compiler/constructorsWithSpecializedSignatures.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // errors
 declare class C {
     constructor(x: "hi");
diff --git a/tests/cases/compiler/contextualSignatureInstatiationContravariance.ts b/tests/cases/compiler/contextualSignatureInstatiationContravariance.ts
index 2bd0673abd5e5..2a487b74a07d0 100644
--- a/tests/cases/compiler/contextualSignatureInstatiationContravariance.ts
+++ b/tests/cases/compiler/contextualSignatureInstatiationContravariance.ts
@@ -1,11 +1,12 @@
+// @strict: false
 interface Animal { x }
 interface Giraffe extends Animal { y }
 interface Elephant extends Animal { y2 }
 
-var f2: <T extends Animal>(x: T, y: T) => void;
+declare var f2: <T extends Animal>(x: T, y: T) => void;
 
-var g2: (g: Giraffe, e: Elephant) => void;
+declare var g2: (g: Giraffe, e: Elephant) => void;
 g2 = f2; // error because Giraffe and Elephant are disjoint types
 
-var h2: (g1: Giraffe, g2: Giraffe) => void;
+declare var h2: (g1: Giraffe, g2: Giraffe) => void;
 h2 = f2; // valid because Giraffe satisfies the constraint. It is safe in the traditional contravariant fashion.
\ No newline at end of file
diff --git a/tests/cases/compiler/contextualSignatureInstatiationCovariance.ts b/tests/cases/compiler/contextualSignatureInstatiationCovariance.ts
index ec4a8bc236d1f..b72bf9a81e4df 100644
--- a/tests/cases/compiler/contextualSignatureInstatiationCovariance.ts
+++ b/tests/cases/compiler/contextualSignatureInstatiationCovariance.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Animal { x }
 interface TallThing { x2 }
 interface Giraffe extends Animal, TallThing { y }
diff --git a/tests/cases/compiler/contextualTyping.ts b/tests/cases/compiler/contextualTyping.ts
index c8df0a473403c..46b663cc94098 100644
--- a/tests/cases/compiler/contextualTyping.ts
+++ b/tests/cases/compiler/contextualTyping.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @sourcemap: true
 // DEFAULT INTERFACES
 interface IFoo {
@@ -18,7 +19,7 @@ class C1T5 {
     }
 }
 
-// CONTEXT: Module property declaration
+// CONTEXT: Namespace property declaration
 namespace C2T5 {
     export var foo: (i: number, s: string) => number = function(i) {
         return i;
@@ -63,7 +64,7 @@ class C4T5 {
     }
 }
 
-// CONTEXT: Module property assignment
+// CONTEXT: Namespace property assignment
 namespace C5T5 {
     export var foo: (i: number, s: string) => string;
     foo = function(i, s) {
@@ -76,7 +77,7 @@ var c6t5: (n: number) => IFoo;
 c6t5 = <(n: number) => IFoo>function(n) { return <IFoo>({}) };
 
 // CONTEXT: Array index assignment
-var c7t2: IFoo[];
+var c7t2: IFoo[] = [];
 c7t2[0] = <IFoo>({n: 1});
 
 // CONTEXT: Object property assignment
diff --git a/tests/cases/compiler/contextualTypingArrayDestructuringWithDefaults.ts b/tests/cases/compiler/contextualTypingArrayDestructuringWithDefaults.ts
index f52b3e7fecaf8..4d31238a176ed 100644
--- a/tests/cases/compiler/contextualTypingArrayDestructuringWithDefaults.ts
+++ b/tests/cases/compiler/contextualTypingArrayDestructuringWithDefaults.ts
@@ -1,3 +1,4 @@
+// @strict: false
 type I = { a: "a" };
 let [ c0 = {a: "a"} ]: [I?] = [];
 let [ x1, c1 = {a: "a"} ]: [number, I?] = [1];
diff --git a/tests/cases/compiler/contextualTypingArrayOfLambdas.ts b/tests/cases/compiler/contextualTypingArrayOfLambdas.ts
index 4d86031d1fa2d..8a8d4dcfda3ac 100644
--- a/tests/cases/compiler/contextualTypingArrayOfLambdas.ts
+++ b/tests/cases/compiler/contextualTypingArrayOfLambdas.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A {
     foo: string;
 }
diff --git a/tests/cases/compiler/contextualTypingFunctionReturningFunction.ts b/tests/cases/compiler/contextualTypingFunctionReturningFunction.ts
index 556f42f7eb505..57c3da6f2b722 100644
--- a/tests/cases/compiler/contextualTypingFunctionReturningFunction.ts
+++ b/tests/cases/compiler/contextualTypingFunctionReturningFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
 	a(s: string): void;
 	b(): (n: number) => void;
diff --git a/tests/cases/compiler/contextualTypingFunctionReturningFunction2.ts b/tests/cases/compiler/contextualTypingFunctionReturningFunction2.ts
index 9bcd34e4c0f0f..fdaf7f0571d10 100644
--- a/tests/cases/compiler/contextualTypingFunctionReturningFunction2.ts
+++ b/tests/cases/compiler/contextualTypingFunctionReturningFunction2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function f(n: number): void;
 declare function f(cb: () => (n: number) => number): void;
 
diff --git a/tests/cases/compiler/contextualTypingOfAccessors.ts b/tests/cases/compiler/contextualTypingOfAccessors.ts
index f8e20d5c4eff3..09345eebb1949 100644
--- a/tests/cases/compiler/contextualTypingOfAccessors.ts
+++ b/tests/cases/compiler/contextualTypingOfAccessors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // not contextually typing accessors
 
 var x: {
diff --git a/tests/cases/compiler/contextualTypingOfArrayLiterals1.ts b/tests/cases/compiler/contextualTypingOfArrayLiterals1.ts
index 475bdbacc44e4..3a6f2dc324e36 100644
--- a/tests/cases/compiler/contextualTypingOfArrayLiterals1.ts
+++ b/tests/cases/compiler/contextualTypingOfArrayLiterals1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
    [x: number]: Date;
 }
diff --git a/tests/cases/compiler/contextualTypingOfConditionalExpression.ts b/tests/cases/compiler/contextualTypingOfConditionalExpression.ts
index eaa48aca6b108..4fe6391e0b114 100644
--- a/tests/cases/compiler/contextualTypingOfConditionalExpression.ts
+++ b/tests/cases/compiler/contextualTypingOfConditionalExpression.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var x: (a: number) => void = true ? (a) => a.toExponential() : (b) => b.toFixed();
 
 class A {
diff --git a/tests/cases/compiler/contextualTypingOfConditionalExpression2.ts b/tests/cases/compiler/contextualTypingOfConditionalExpression2.ts
index eb3d534cbb338..9790b1e035731 100644
--- a/tests/cases/compiler/contextualTypingOfConditionalExpression2.ts
+++ b/tests/cases/compiler/contextualTypingOfConditionalExpression2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A {
     foo: number;
 }
diff --git a/tests/cases/compiler/contextualTypingOfGenericFunctionTypedArguments1.ts b/tests/cases/compiler/contextualTypingOfGenericFunctionTypedArguments1.ts
index 1a58317c4692d..32e307331ebd3 100644
--- a/tests/cases/compiler/contextualTypingOfGenericFunctionTypedArguments1.ts
+++ b/tests/cases/compiler/contextualTypingOfGenericFunctionTypedArguments1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Collection<T> {
     length: number;
     add(x: T): void;
@@ -8,8 +9,8 @@ interface Combinators {
     forEach<T>(c: Collection<T>, f: (x: T) => Date): void;
 }
 
-var c2: Collection<number>;
-var _: Combinators;
+declare var c2: Collection<number>;
+declare var _: Combinators;
 
 // errors on all 3 lines, bug was that r5 was the only line with errors
 var f = (x: number) => { return x.toFixed() };
diff --git a/tests/cases/compiler/contextualTypingOfLambdaReturnExpression.ts b/tests/cases/compiler/contextualTypingOfLambdaReturnExpression.ts
index d23a2e9e57bdd..2b22f603654b2 100644
--- a/tests/cases/compiler/contextualTypingOfLambdaReturnExpression.ts
+++ b/tests/cases/compiler/contextualTypingOfLambdaReturnExpression.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function callb(lam: (l: number) => void);
 function callb(lam: (n: string) => void);
 function callb(a) { }
diff --git a/tests/cases/compiler/contextualTypingOfLambdaWithMultipleSignatures.ts b/tests/cases/compiler/contextualTypingOfLambdaWithMultipleSignatures.ts
index a06f715014778..dfd8a8e1b0f9f 100644
--- a/tests/cases/compiler/contextualTypingOfLambdaWithMultipleSignatures.ts
+++ b/tests/cases/compiler/contextualTypingOfLambdaWithMultipleSignatures.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Foo {
     getFoo(n: number): void;
     getFoo(s: string): void;
diff --git a/tests/cases/compiler/contextualTypingOfLambdaWithMultipleSignatures2.ts b/tests/cases/compiler/contextualTypingOfLambdaWithMultipleSignatures2.ts
index 2fd03ef4d4cb1..84c2bb6532b23 100644
--- a/tests/cases/compiler/contextualTypingOfLambdaWithMultipleSignatures2.ts
+++ b/tests/cases/compiler/contextualTypingOfLambdaWithMultipleSignatures2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var f: {
     (x: string): string;
     (x: number): string
diff --git a/tests/cases/compiler/contextualTypingOfObjectLiterals.ts b/tests/cases/compiler/contextualTypingOfObjectLiterals.ts
index b7f57ab3caa53..353e24cf53e38 100644
--- a/tests/cases/compiler/contextualTypingOfObjectLiterals.ts
+++ b/tests/cases/compiler/contextualTypingOfObjectLiterals.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var obj1: { [x: string]: string; };
 var obj2 = {x: ""};
 obj1 = {}; // Ok
diff --git a/tests/cases/compiler/contextualTypingOfObjectLiterals2.ts b/tests/cases/compiler/contextualTypingOfObjectLiterals2.ts
index 2cc7da7bc2b87..d7169244c58b1 100644
--- a/tests/cases/compiler/contextualTypingOfObjectLiterals2.ts
+++ b/tests/cases/compiler/contextualTypingOfObjectLiterals2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Foo {
     foo: (t: string) => string;
 }
diff --git a/tests/cases/compiler/contextualTypingOfTooShortOverloads.ts b/tests/cases/compiler/contextualTypingOfTooShortOverloads.ts
index cbc0769bd6661..a39874bccb18d 100644
--- a/tests/cases/compiler/contextualTypingOfTooShortOverloads.ts
+++ b/tests/cases/compiler/contextualTypingOfTooShortOverloads.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 // small repro from #11875
 var use: Overload;
diff --git a/tests/cases/compiler/contextualTypingTwoInstancesOfSameTypeParameter.ts b/tests/cases/compiler/contextualTypingTwoInstancesOfSameTypeParameter.ts
index 86cbe8d5d5a49..235dd46e45824 100644
--- a/tests/cases/compiler/contextualTypingTwoInstancesOfSameTypeParameter.ts
+++ b/tests/cases/compiler/contextualTypingTwoInstancesOfSameTypeParameter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f6<T>(x: (a: T) => T) {
     return null;
 } 
diff --git a/tests/cases/compiler/contextualTypingWithFixedTypeParameters1.ts b/tests/cases/compiler/contextualTypingWithFixedTypeParameters1.ts
index 451e67092bb7a..b8457bcf86a8f 100644
--- a/tests/cases/compiler/contextualTypingWithFixedTypeParameters1.ts
+++ b/tests/cases/compiler/contextualTypingWithFixedTypeParameters1.ts
@@ -1,3 +1,4 @@
-var f10: <T>(x: T, b: () => (a: T) => void, y: T) => T;
+// @strict: false
+declare var f10: <T>(x: T, b: () => (a: T) => void, y: T) => T;
 f10('', () => a => a.foo, ''); // a is ""
 var r9 = f10('', () => (a => a.foo), 1); // error
\ No newline at end of file
diff --git a/tests/cases/compiler/contextuallyTypedByDiscriminableUnion2.ts b/tests/cases/compiler/contextuallyTypedByDiscriminableUnion2.ts
new file mode 100644
index 0000000000000..498199d268b94
--- /dev/null
+++ b/tests/cases/compiler/contextuallyTypedByDiscriminableUnion2.ts
@@ -0,0 +1,51 @@
+// @strict: true
+// @noEmit: true
+
+// https://github.com/microsoft/TypeScript/issues/62256
+
+type Identifiable = { id: string };
+
+interface EnableA {
+  readonly enableA: true;
+  // this introduces a conflicting property with some of the other members of MyComponentProps
+  // making relevant final union members reduced nevers
+  readonly enableB: true;
+}
+
+interface DisableA {
+  readonly enableA?: false;
+}
+
+interface EnableB {
+  readonly enableB?: true;
+}
+
+interface DisableB {
+  readonly enableB: false;
+}
+
+export interface EnableD<I extends Identifiable> {
+  readonly enableD: true;
+  readonly value: I["id"] | null;
+  readonly setItem: (item: I | null) => void;
+}
+
+export interface DisableD<I extends Identifiable> {
+  readonly enableD: false;
+  readonly value: I["id"];
+  readonly setItem: (item: I) => void;
+}
+
+type MyComponentProps<I extends Identifiable> = (EnableA | DisableA) &
+  (EnableB | DisableB) &
+  (DisableD<I> | EnableD<I>);
+
+const MyComponent = <I extends Identifiable>(props: MyComponentProps<I>) => {};
+
+declare const item: string | null;
+
+MyComponent({
+  enableD: true,
+  value: item,
+  setItem: (item) => {},
+});
diff --git a/tests/cases/compiler/contextuallyTypingOrOperator.ts b/tests/cases/compiler/contextuallyTypingOrOperator.ts
index c1d8f5e6bad19..e390c116e8025 100644
--- a/tests/cases/compiler/contextuallyTypingOrOperator.ts
+++ b/tests/cases/compiler/contextuallyTypingOrOperator.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var v: { a: (_: string) => number } = { a: s => s.length } || { a: s => 1 };
 
 var v2 = (s: string) => s.length || function (s) { s.length };
diff --git a/tests/cases/compiler/contextuallyTypingOrOperator2.ts b/tests/cases/compiler/contextuallyTypingOrOperator2.ts
index a430fad56da6e..65e20539e3e95 100644
--- a/tests/cases/compiler/contextuallyTypingOrOperator2.ts
+++ b/tests/cases/compiler/contextuallyTypingOrOperator2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var v: { a: (_: string) => number } = { a: s => s.length } || { a: s => 1 };
 
 var v2 = (s: string) => s.length || function (s) { s.aaa };
\ No newline at end of file
diff --git a/tests/cases/compiler/contextuallyTypingOrOperator3.ts b/tests/cases/compiler/contextuallyTypingOrOperator3.ts
index e1522d4607c29..acc3331d1deec 100644
--- a/tests/cases/compiler/contextuallyTypingOrOperator3.ts
+++ b/tests/cases/compiler/contextuallyTypingOrOperator3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo<T, U extends T>(u: U) {
     var x3: U = u || u;
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/controlFlowInstanceof.ts b/tests/cases/compiler/controlFlowInstanceof.ts
index b032fb708dc58..ec8588675d4b5 100644
--- a/tests/cases/compiler/controlFlowInstanceof.ts
+++ b/tests/cases/compiler/controlFlowInstanceof.ts
@@ -50,9 +50,9 @@ function f4(s: Set<string> | Set<number>) {
 
 // More tests
 
-class A { a: string }
-class B extends A { b: string }
-class C extends A { c: string }
+class A { a: string = "" }
+class B extends A { b: string = "" }
+class C extends A { c: string = "" }
 
 function foo(x: A | undefined) {
     x;  // A | undefined
@@ -88,11 +88,11 @@ function foo(x: A | undefined) {
 // Y is assignable to X, but not a subtype of X
 
 interface X {
-    x?: string;
+    x?: string
 }
 
 class Y {
-    y: string;
+    y: string = "";
 }
 
 function goo(x: X) {
@@ -114,7 +114,10 @@ if (x instanceof ctor) {
 
 // Repro from #27550 (based on uglify code)
 // @Filename: uglify.js
-/** @constructor */
+/**
+ * @constructor
+ * @param {any} val
+ */
 function AtTop(val) { this.val = val }
 /** @type {*} */
 var v = 1;
diff --git a/tests/cases/compiler/controlFlowInstanceofWithSymbolHasInstance.ts b/tests/cases/compiler/controlFlowInstanceofWithSymbolHasInstance.ts
index 83b38fce9df27..633d691c294ce 100644
--- a/tests/cases/compiler/controlFlowInstanceofWithSymbolHasInstance.ts
+++ b/tests/cases/compiler/controlFlowInstanceofWithSymbolHasInstance.ts
@@ -56,7 +56,7 @@ function f4(s: Set<string> | Set<number>) {
 // More tests
 
 class A {
-    a: string;
+    a: string = "";
     static [Symbol.hasInstance]<T>(this: T, value: unknown): value is (
         T extends (abstract new (...args: any) => infer U) ? U :
         never
@@ -64,8 +64,8 @@ class A {
         return Function.prototype[Symbol.hasInstance].call(this, value);
     }
 }
-class B extends A { b: string }
-class C extends A { c: string }
+class B extends A { b: string = ""; }
+class C extends A { c: string = ""; }
 
 function foo(x: A | undefined) {
     x;  // A | undefined
@@ -105,7 +105,7 @@ interface X {
 }
 
 class Y {
-    y: string;
+    y: string = "";
 }
 
 function goo(x: X) {
diff --git a/tests/cases/compiler/controlFlowPropertyDeclarations.ts b/tests/cases/compiler/controlFlowPropertyDeclarations.ts
index 5a5e9fb96bfa0..ef6830df7e7da 100644
--- a/tests/cases/compiler/controlFlowPropertyDeclarations.ts
+++ b/tests/cases/compiler/controlFlowPropertyDeclarations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Repro from ##8913
 
 declare var require:any;
diff --git a/tests/cases/compiler/convertKeywordsYes.ts b/tests/cases/compiler/convertKeywordsYes.ts
index feb273bb688fa..bd4dcda355217 100644
--- a/tests/cases/compiler/convertKeywordsYes.ts
+++ b/tests/cases/compiler/convertKeywordsYes.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // reserved ES5 future in strict mode
 
 var constructor = 0;
diff --git a/tests/cases/compiler/crashInEmitTokenWithComment.ts b/tests/cases/compiler/crashInEmitTokenWithComment.ts
index 41d2ca1892933..407063f2fb63f 100644
--- a/tests/cases/compiler/crashInEmitTokenWithComment.ts
+++ b/tests/cases/compiler/crashInEmitTokenWithComment.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noTypesAndSymbols: true
 
 // GH#32358
diff --git a/tests/cases/compiler/crashInresolveReturnStatement.ts b/tests/cases/compiler/crashInresolveReturnStatement.ts
index 8e40c8489e783..a181b70269b26 100644
--- a/tests/cases/compiler/crashInresolveReturnStatement.ts
+++ b/tests/cases/compiler/crashInresolveReturnStatement.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class WorkItemToolbar {
     public onToolbarItemClick() {
         WITDialogs.createCopyOfWorkItem();
diff --git a/tests/cases/compiler/crashIntypeCheckInvocationExpression.ts b/tests/cases/compiler/crashIntypeCheckInvocationExpression.ts
index a2062ef6bda75..8a48b5f9212e3 100644
--- a/tests/cases/compiler/crashIntypeCheckInvocationExpression.ts
+++ b/tests/cases/compiler/crashIntypeCheckInvocationExpression.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: esnext
 var nake;
 function doCompile<P0, P1, P2>(fileset: P0, moduleType: P1) {
diff --git a/tests/cases/compiler/createArray.ts b/tests/cases/compiler/createArray.ts
index dba269b07dc28..d332b7648a01b 100644
--- a/tests/cases/compiler/createArray.ts
+++ b/tests/cases/compiler/createArray.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var na=new number[];
 
 class C {
diff --git a/tests/cases/compiler/declFileConstructSignatures.ts b/tests/cases/compiler/declFileConstructSignatures.ts
index 717619e8b2f4d..dc2120cc1ce57 100644
--- a/tests/cases/compiler/declFileConstructSignatures.ts
+++ b/tests/cases/compiler/declFileConstructSignatures.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @declaration: true
 // @removeComments: false
diff --git a/tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts b/tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts
index 08e2af20a2e52..afc100e66b8f9 100644
--- a/tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts
+++ b/tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 // @declaration: true
 namespace m3 {
diff --git a/tests/cases/compiler/declFileForClassWithMultipleBaseClasses.ts b/tests/cases/compiler/declFileForClassWithMultipleBaseClasses.ts
index c3c7794902082..6799e89daa263 100644
--- a/tests/cases/compiler/declFileForClassWithMultipleBaseClasses.ts
+++ b/tests/cases/compiler/declFileForClassWithMultipleBaseClasses.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 class A {
diff --git a/tests/cases/compiler/declFileForClassWithPrivateOverloadedFunction.ts b/tests/cases/compiler/declFileForClassWithPrivateOverloadedFunction.ts
index 5ec6b42a711d4..a36d1afb0e56e 100644
--- a/tests/cases/compiler/declFileForClassWithPrivateOverloadedFunction.ts
+++ b/tests/cases/compiler/declFileForClassWithPrivateOverloadedFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 class C {
diff --git a/tests/cases/compiler/declFileForInterfaceWithOptionalFunction.ts b/tests/cases/compiler/declFileForInterfaceWithOptionalFunction.ts
index ef8a4d86c06df..3759cf554fe10 100644
--- a/tests/cases/compiler/declFileForInterfaceWithOptionalFunction.ts
+++ b/tests/cases/compiler/declFileForInterfaceWithOptionalFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 interface I {
diff --git a/tests/cases/compiler/declFileForInterfaceWithRestParams.ts b/tests/cases/compiler/declFileForInterfaceWithRestParams.ts
index 95956b77e05b9..89368c5579b32 100644
--- a/tests/cases/compiler/declFileForInterfaceWithRestParams.ts
+++ b/tests/cases/compiler/declFileForInterfaceWithRestParams.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 interface I {
diff --git a/tests/cases/compiler/declFileFunctions.ts b/tests/cases/compiler/declFileFunctions.ts
index 4217fdf6e953b..a5e804940ab1f 100644
--- a/tests/cases/compiler/declFileFunctions.ts
+++ b/tests/cases/compiler/declFileFunctions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @declaration: true
 // @removeComments: false
diff --git a/tests/cases/compiler/declFileImportModuleWithExportAssignment.ts b/tests/cases/compiler/declFileImportModuleWithExportAssignment.ts
index fbc78ef134449..f0a0290c440ef 100644
--- a/tests/cases/compiler/declFileImportModuleWithExportAssignment.ts
+++ b/tests/cases/compiler/declFileImportModuleWithExportAssignment.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @declaration: true
 
diff --git a/tests/cases/compiler/declFileOptionalInterfaceMethod.ts b/tests/cases/compiler/declFileOptionalInterfaceMethod.ts
index 73eb40238a93a..5b170da766b9e 100644
--- a/tests/cases/compiler/declFileOptionalInterfaceMethod.ts
+++ b/tests/cases/compiler/declFileOptionalInterfaceMethod.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 interface X {
     f? <T>();
diff --git a/tests/cases/compiler/declFilePrivateMethodOverloads.ts b/tests/cases/compiler/declFilePrivateMethodOverloads.ts
index 55bebeb9c8302..fbc863e05f291 100644
--- a/tests/cases/compiler/declFilePrivateMethodOverloads.ts
+++ b/tests/cases/compiler/declFilePrivateMethodOverloads.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 interface IContext {
diff --git a/tests/cases/compiler/declFilePrivateStatic.ts b/tests/cases/compiler/declFilePrivateStatic.ts
index 0d64844ff99d2..10878218cbb23 100644
--- a/tests/cases/compiler/declFilePrivateStatic.ts
+++ b/tests/cases/compiler/declFilePrivateStatic.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @target: es5
 
diff --git a/tests/cases/compiler/declFileRegressionTests.ts b/tests/cases/compiler/declFileRegressionTests.ts
index 4d19696bacfa2..f91bc3f59e0d0 100644
--- a/tests/cases/compiler/declFileRegressionTests.ts
+++ b/tests/cases/compiler/declFileRegressionTests.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // 'null' not converted to 'any' in d.ts
 // function types not piped through correctly
diff --git a/tests/cases/compiler/declFileRestParametersOfFunctionAndFunctionType.ts b/tests/cases/compiler/declFileRestParametersOfFunctionAndFunctionType.ts
index c398ffa1e3a11..fd131c7c03cd8 100644
--- a/tests/cases/compiler/declFileRestParametersOfFunctionAndFunctionType.ts
+++ b/tests/cases/compiler/declFileRestParametersOfFunctionAndFunctionType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 function f1(...args) { }
diff --git a/tests/cases/compiler/declFileTypeAnnotationBuiltInType.ts b/tests/cases/compiler/declFileTypeAnnotationBuiltInType.ts
index 3b2344765794e..2ac0084e8ffe3 100644
--- a/tests/cases/compiler/declFileTypeAnnotationBuiltInType.ts
+++ b/tests/cases/compiler/declFileTypeAnnotationBuiltInType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @declaration: true
 
diff --git a/tests/cases/compiler/declFileTypeAnnotationTypeAlias.ts b/tests/cases/compiler/declFileTypeAnnotationTypeAlias.ts
index 5af929c20166c..255e69f080fd8 100644
--- a/tests/cases/compiler/declFileTypeAnnotationTypeAlias.ts
+++ b/tests/cases/compiler/declFileTypeAnnotationTypeAlias.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @module: commonjs
 // @declaration: true
diff --git a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts
index f43d2b1073c9f..01ed209152800 100644
--- a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts
+++ b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @module: commonjs
 // @declaration: true
diff --git a/tests/cases/compiler/declFileTypeofFunction.ts b/tests/cases/compiler/declFileTypeofFunction.ts
index 247de84e26ca9..e1f8238b6da74 100644
--- a/tests/cases/compiler/declFileTypeofFunction.ts
+++ b/tests/cases/compiler/declFileTypeofFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 function f(n: typeof f): string;
diff --git a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts
index 2c1e9f518719b..1bafa1da252ed 100644
--- a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts
+++ b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 // @Filename: declFile.d.ts
diff --git a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts
index 7a79a1db225f5..07dc00b5cf919 100644
--- a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts
+++ b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @outFile: out.js
 
diff --git a/tests/cases/compiler/declInput-2.ts b/tests/cases/compiler/declInput-2.ts
index 7a90a2f1a60aa..cd7a39ab35d41 100644
--- a/tests/cases/compiler/declInput-2.ts
+++ b/tests/cases/compiler/declInput-2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 namespace M {
     class C { }
diff --git a/tests/cases/compiler/declInput.ts b/tests/cases/compiler/declInput.ts
index e0234b9bee74c..f44d210460cbb 100644
--- a/tests/cases/compiler/declInput.ts
+++ b/tests/cases/compiler/declInput.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 interface bar {
 
diff --git a/tests/cases/compiler/declInput3.ts b/tests/cases/compiler/declInput3.ts
index 4abbb9ba37327..ac0aa1c9c343c 100644
--- a/tests/cases/compiler/declInput3.ts
+++ b/tests/cases/compiler/declInput3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 interface bar2 {
 
diff --git a/tests/cases/compiler/declInput4.ts b/tests/cases/compiler/declInput4.ts
index 57f4c10ccd507..d8418cd9d48ca 100644
--- a/tests/cases/compiler/declInput4.ts
+++ b/tests/cases/compiler/declInput4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 namespace M {
     class C { }
diff --git a/tests/cases/compiler/declarationEmitAliasExportStar.ts b/tests/cases/compiler/declarationEmitAliasExportStar.ts
index f556e35aa0b20..9b56ed15253e7 100644
--- a/tests/cases/compiler/declarationEmitAliasExportStar.ts
+++ b/tests/cases/compiler/declarationEmitAliasExportStar.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @filename: thingB.ts
 export interface ThingB { }
diff --git a/tests/cases/compiler/declarationEmitBindingPatterns.ts b/tests/cases/compiler/declarationEmitBindingPatterns.ts
index 16d380307fd76..1512096091f38 100644
--- a/tests/cases/compiler/declarationEmitBindingPatterns.ts
+++ b/tests/cases/compiler/declarationEmitBindingPatterns.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 const k = ({x: z = 'y'}) => { }
diff --git a/tests/cases/compiler/declarationEmitBindingPatternsFunctionExpr.ts b/tests/cases/compiler/declarationEmitBindingPatternsFunctionExpr.ts
index 42fda3d008873..e4246a2c0814a 100644
--- a/tests/cases/compiler/declarationEmitBindingPatternsFunctionExpr.ts
+++ b/tests/cases/compiler/declarationEmitBindingPatternsFunctionExpr.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @target: esnext
 // @skipLibCheck: false
diff --git a/tests/cases/compiler/declarationEmitBindingPatternsUnused.ts b/tests/cases/compiler/declarationEmitBindingPatternsUnused.ts
index 173b280cd5149..ea28769dbbdea 100644
--- a/tests/cases/compiler/declarationEmitBindingPatternsUnused.ts
+++ b/tests/cases/compiler/declarationEmitBindingPatternsUnused.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @target: esnext
 // @skipLibCheck: false
diff --git a/tests/cases/compiler/declarationEmitClassMemberNameConflict.ts b/tests/cases/compiler/declarationEmitClassMemberNameConflict.ts
index 16f096d43ca19..5aa8bff365d0f 100644
--- a/tests/cases/compiler/declarationEmitClassMemberNameConflict.ts
+++ b/tests/cases/compiler/declarationEmitClassMemberNameConflict.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @module: commonjs
 // @declaration: true
diff --git a/tests/cases/compiler/declarationEmitClassMemberNameConflict2.ts b/tests/cases/compiler/declarationEmitClassMemberNameConflict2.ts
index 90b488ebec7d6..0c519a56226bf 100644
--- a/tests/cases/compiler/declarationEmitClassMemberNameConflict2.ts
+++ b/tests/cases/compiler/declarationEmitClassMemberNameConflict2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @module: commonjs
 // @declaration: true
diff --git a/tests/cases/compiler/declarationEmitDefaultExportWithStaticAssignment.ts b/tests/cases/compiler/declarationEmitDefaultExportWithStaticAssignment.ts
index d6638ab8e3641..088c7cbcbd160 100644
--- a/tests/cases/compiler/declarationEmitDefaultExportWithStaticAssignment.ts
+++ b/tests/cases/compiler/declarationEmitDefaultExportWithStaticAssignment.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @filename: foo.ts
 export class Foo {}
diff --git a/tests/cases/compiler/declarationEmitDestructuring2.ts b/tests/cases/compiler/declarationEmitDestructuring2.ts
index 34441cd6c7bd8..4ff66110425c3 100644
--- a/tests/cases/compiler/declarationEmitDestructuring2.ts
+++ b/tests/cases/compiler/declarationEmitDestructuring2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 function f({x = 10, y: [a, b, c, d] = [1, 2, 3, 4]} = { x: 10, y: [2, 4, 6, 8] }) { }
 function g([a, b, c, d] = [1, 2, 3, 4]) { }
diff --git a/tests/cases/compiler/declarationEmitDestructuring3.ts b/tests/cases/compiler/declarationEmitDestructuring3.ts
index 78aeddb0e11bf..2fcde3b8492f9 100644
--- a/tests/cases/compiler/declarationEmitDestructuring3.ts
+++ b/tests/cases/compiler/declarationEmitDestructuring3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 function bar([x, z, ...w]) { }
 function foo([x, ...y] = [1, "string", true]) { }
diff --git a/tests/cases/compiler/declarationEmitDestructuringParameterProperties2.ts b/tests/cases/compiler/declarationEmitDestructuringParameterProperties2.ts
new file mode 100644
index 0000000000000..9f3e678697cd7
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitDestructuringParameterProperties2.ts
@@ -0,0 +1,19 @@
+// @module: commonjs
+// @declaration: true
+// @target: es2024
+class C1 {
+    constructor(public [x, y, z]: string[]) {
+    }
+}
+
+type TupleType1 =[string, number, boolean];
+class C2 {
+    constructor(public [x, y, z]: TupleType1) {
+    }
+}
+
+type ObjType1 = { x: number; y: string; z: boolean }
+class C3 {
+    constructor(public { x, y, z }: ObjType1) {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmitNameConflicts2.ts b/tests/cases/compiler/declarationEmitNameConflicts2.ts
index 9921b13c8957c..f13a273526031 100644
--- a/tests/cases/compiler/declarationEmitNameConflicts2.ts
+++ b/tests/cases/compiler/declarationEmitNameConflicts2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 namespace X.Y.base {
     export function f() { }
diff --git a/tests/cases/compiler/declarationEmitPromise.ts b/tests/cases/compiler/declarationEmitPromise.ts
index 2eff0b6c50c9e..93882abab3763 100644
--- a/tests/cases/compiler/declarationEmitPromise.ts
+++ b/tests/cases/compiler/declarationEmitPromise.ts
@@ -1,4 +1,5 @@
 // @declaration: true
+// @noImplicitThis: false
 // @module: commonjs
 // @target: es6
 
diff --git a/tests/cases/compiler/declarationEmitProtectedMembers.ts b/tests/cases/compiler/declarationEmitProtectedMembers.ts
index 8d40ecbe218fe..c48f0afbd78ed 100644
--- a/tests/cases/compiler/declarationEmitProtectedMembers.ts
+++ b/tests/cases/compiler/declarationEmitProtectedMembers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @target: es5
 
diff --git a/tests/cases/compiler/declarationMaps.ts b/tests/cases/compiler/declarationMaps.ts
index d338b9993c714..bbff84ba1e027 100644
--- a/tests/cases/compiler/declarationMaps.ts
+++ b/tests/cases/compiler/declarationMaps.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @declarationMap: true
 namespace m2 {
diff --git a/tests/cases/compiler/declarationMapsMultifile.ts b/tests/cases/compiler/declarationMapsMultifile.ts
index 43d77c4c49e1c..18026bc41a1a8 100644
--- a/tests/cases/compiler/declarationMapsMultifile.ts
+++ b/tests/cases/compiler/declarationMapsMultifile.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @declarationMap: true
 // @filename: a.ts
diff --git a/tests/cases/compiler/declarationMapsOutFile.ts b/tests/cases/compiler/declarationMapsOutFile.ts
index b388d567ef335..b6edde8f80ff0 100644
--- a/tests/cases/compiler/declarationMapsOutFile.ts
+++ b/tests/cases/compiler/declarationMapsOutFile.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @declarationMap: true
 // @module: amd
diff --git a/tests/cases/compiler/declarationMapsOutFile2.ts b/tests/cases/compiler/declarationMapsOutFile2.ts
index 713f6f5391044..8c939bef9edde 100644
--- a/tests/cases/compiler/declarationMapsOutFile2.ts
+++ b/tests/cases/compiler/declarationMapsOutFile2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @declarationMap: true
 // @outFile: bundle.js
diff --git a/tests/cases/compiler/declarationMapsWithSourceMap.ts b/tests/cases/compiler/declarationMapsWithSourceMap.ts
index 332ccb04fce36..b2360ad3bc5e4 100644
--- a/tests/cases/compiler/declarationMapsWithSourceMap.ts
+++ b/tests/cases/compiler/declarationMapsWithSourceMap.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @declarationMap: true
 // @outFile: bundle.js
diff --git a/tests/cases/compiler/declarationMapsWithoutDeclaration.ts b/tests/cases/compiler/declarationMapsWithoutDeclaration.ts
index 30070a04d9087..6105939b1d3b0 100644
--- a/tests/cases/compiler/declarationMapsWithoutDeclaration.ts
+++ b/tests/cases/compiler/declarationMapsWithoutDeclaration.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declarationMap: true
 namespace m2 {
     export interface connectModule {
@@ -10,7 +11,7 @@ namespace m2 {
 
 }
 
-var m2: {
+declare var m2: {
     (): m2.connectExport;
     test1: m2.connectModule;
     test2(): m2.connectModule;
diff --git a/tests/cases/compiler/declarationMerging1.ts b/tests/cases/compiler/declarationMerging1.ts
index 256cacf4a524b..f109d4ab1dd45 100644
--- a/tests/cases/compiler/declarationMerging1.ts
+++ b/tests/cases/compiler/declarationMerging1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: file1.ts
 class A {
     protected _f: number;
diff --git a/tests/cases/compiler/declarationMerging2.ts b/tests/cases/compiler/declarationMerging2.ts
index 6be5f4d0e4d91..864b35e7a2b5a 100644
--- a/tests/cases/compiler/declarationMerging2.ts
+++ b/tests/cases/compiler/declarationMerging2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 
 // @filename: a.ts
diff --git a/tests/cases/compiler/declareAlreadySeen.ts b/tests/cases/compiler/declareAlreadySeen.ts
index 2687582263797..3f197ad56f532 100644
--- a/tests/cases/compiler/declareAlreadySeen.ts
+++ b/tests/cases/compiler/declareAlreadySeen.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
     declare declare var x;
     declare declare function f();
diff --git a/tests/cases/compiler/declareFileExportAssignment.ts b/tests/cases/compiler/declareFileExportAssignment.ts
index 19a4da31f08ec..e76d36d852069 100644
--- a/tests/cases/compiler/declareFileExportAssignment.ts
+++ b/tests/cases/compiler/declareFileExportAssignment.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 // @declaration: true
 namespace m2 {
diff --git a/tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts b/tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts
index 3c591015ebcf6..64c698e971f1e 100644
--- a/tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts
+++ b/tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 // @declaration: true
 namespace m2 {
diff --git a/tests/cases/compiler/declaredExternalModule.ts b/tests/cases/compiler/declaredExternalModule.ts
index c29439c25a9d5..5534adbfab9c3 100644
--- a/tests/cases/compiler/declaredExternalModule.ts
+++ b/tests/cases/compiler/declaredExternalModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare module 'connect' {
 
     interface connectModule {
diff --git a/tests/cases/compiler/declaredExternalModuleWithExportAssignment.ts b/tests/cases/compiler/declaredExternalModuleWithExportAssignment.ts
index 622dc1d28c163..17735fb400e3d 100644
--- a/tests/cases/compiler/declaredExternalModuleWithExportAssignment.ts
+++ b/tests/cases/compiler/declaredExternalModuleWithExportAssignment.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare module 'connect' {
     interface connectModule {
         (res, req, next): void;
diff --git a/tests/cases/compiler/decoratorMetadataNoStrictNull.ts b/tests/cases/compiler/decoratorMetadataNoStrictNull.ts
index 4ac608ebd7445..1a292036acc8d 100644
--- a/tests/cases/compiler/decoratorMetadataNoStrictNull.ts
+++ b/tests/cases/compiler/decoratorMetadataNoStrictNull.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @experimentalDecorators: true
 // @emitDecoratorMetadata: true
 const dec = (obj: {}, prop: string) => undefined
diff --git a/tests/cases/compiler/decoratorMetadataTypeOnlyExport.ts b/tests/cases/compiler/decoratorMetadataTypeOnlyExport.ts
index 6908423e426a1..0dc111267f62a 100644
--- a/tests/cases/compiler/decoratorMetadataTypeOnlyExport.ts
+++ b/tests/cases/compiler/decoratorMetadataTypeOnlyExport.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @experimentalDecorators: true
 // @emitDecoratorMetadata: true
 
diff --git a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision.ts b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision.ts
index 8d198e44752f5..b9fccbd42ca2f 100644
--- a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision.ts
+++ b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noemithelpers: true
 // @experimentaldecorators: true
 // @emitdecoratormetadata: true
diff --git a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision2.ts b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision2.ts
index ac097dd3ba452..fe41f67353d14 100644
--- a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision2.ts
+++ b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noemithelpers: true
 // @experimentaldecorators: true
 // @emitdecoratormetadata: true
diff --git a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision3.ts b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision3.ts
index e15570cb5baae..0f1bf86aa352b 100644
--- a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision3.ts
+++ b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noemithelpers: true
 // @experimentaldecorators: true
 // @emitdecoratormetadata: true
diff --git a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision4.ts b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision4.ts
index d04d1300531da..b1adf25a05593 100644
--- a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision4.ts
+++ b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noemithelpers: true
 // @experimentaldecorators: true
 // @emitdecoratormetadata: true
diff --git a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision5.ts b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision5.ts
index 24934963b3e12..bec73c38baa6f 100644
--- a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision5.ts
+++ b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noemithelpers: true
 // @experimentaldecorators: true
 // @emitdecoratormetadata: true
diff --git a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision6.ts b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision6.ts
index 2043279c4aaf2..9b4e54f63dd7d 100644
--- a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision6.ts
+++ b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noemithelpers: true
 // @experimentaldecorators: true
 // @emitdecoratormetadata: true
diff --git a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision7.ts b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision7.ts
index bbedf61c6dfc5..dac2ca67b0cea 100644
--- a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision7.ts
+++ b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noemithelpers: true
 // @experimentaldecorators: true
 // @emitdecoratormetadata: true
diff --git a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision8.ts b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision8.ts
index e3318d813a87b..f2b14890acd9d 100644
--- a/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision8.ts
+++ b/tests/cases/compiler/decoratorMetadataWithImportDeclarationNameCollision8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noemithelpers: true
 // @experimentaldecorators: true
 // @emitdecoratormetadata: true
diff --git a/tests/cases/compiler/decoratorReferenceOnOtherProperty.ts b/tests/cases/compiler/decoratorReferenceOnOtherProperty.ts
index c7465471ed855..4284b575bb0a9 100644
--- a/tests/cases/compiler/decoratorReferenceOnOtherProperty.ts
+++ b/tests/cases/compiler/decoratorReferenceOnOtherProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // https://github.com/Microsoft/TypeScript/issues/19799
 // @experimentalDecorators: true
 // @emitDecoratorMetadata: true
diff --git a/tests/cases/compiler/decoratorReferences.ts b/tests/cases/compiler/decoratorReferences.ts
index faa257983d20f..569b1ea23f9f8 100644
--- a/tests/cases/compiler/decoratorReferences.ts
+++ b/tests/cases/compiler/decoratorReferences.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @experimentalDecorators: true
 
 declare function y(...args: any[]): any;
diff --git a/tests/cases/compiler/decrementAndIncrementOperators.ts b/tests/cases/compiler/decrementAndIncrementOperators.ts
index a31e5243d1931..e29b2ee784b02 100644
--- a/tests/cases/compiler/decrementAndIncrementOperators.ts
+++ b/tests/cases/compiler/decrementAndIncrementOperators.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var x = 0;
 
 // errors
diff --git a/tests/cases/compiler/deeplyDependentLargeArrayMutation2.ts b/tests/cases/compiler/deeplyDependentLargeArrayMutation2.ts
index d82fae46744b6..23248514e124d 100644
--- a/tests/cases/compiler/deeplyDependentLargeArrayMutation2.ts
+++ b/tests/cases/compiler/deeplyDependentLargeArrayMutation2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/compiler/defaultArgsInFunctionExpressions.ts b/tests/cases/compiler/defaultArgsInFunctionExpressions.ts
index cfbdb9a55b3f0..ab73fea6f46f4 100644
--- a/tests/cases/compiler/defaultArgsInFunctionExpressions.ts
+++ b/tests/cases/compiler/defaultArgsInFunctionExpressions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var f = function (a = 3) { return a; }; // Type should be (a?: number) => number
 var n: number = f(4);
 n = f();
diff --git a/tests/cases/compiler/defaultArgsInOverloads.ts b/tests/cases/compiler/defaultArgsInOverloads.ts
index 63c03a3d12ec1..62b8de87589f2 100644
--- a/tests/cases/compiler/defaultArgsInOverloads.ts
+++ b/tests/cases/compiler/defaultArgsInOverloads.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function fun(a: string);
 function fun(a = 3);
 function fun(a = null) { }
diff --git a/tests/cases/compiler/defaultBestCommonTypesHaveDecls.ts b/tests/cases/compiler/defaultBestCommonTypesHaveDecls.ts
index 254197bf30986..6de7e80141e45 100644
--- a/tests/cases/compiler/defaultBestCommonTypesHaveDecls.ts
+++ b/tests/cases/compiler/defaultBestCommonTypesHaveDecls.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var obj1: {};
 obj1.length;
 
diff --git a/tests/cases/compiler/defaultIndexProps2.ts b/tests/cases/compiler/defaultIndexProps2.ts
index 35abeca3f876f..61973f5c3b8cb 100644
--- a/tests/cases/compiler/defaultIndexProps2.ts
+++ b/tests/cases/compiler/defaultIndexProps2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Foo {
 	public v = "Yo";
 }
diff --git a/tests/cases/compiler/defaultOfAnyInStrictNullChecks.ts b/tests/cases/compiler/defaultOfAnyInStrictNullChecks.ts
index 17568f48029a5..fe1ba0b8ef89c 100644
--- a/tests/cases/compiler/defaultOfAnyInStrictNullChecks.ts
+++ b/tests/cases/compiler/defaultOfAnyInStrictNullChecks.ts
@@ -1,5 +1,5 @@
 // @strictNullChecks: true
-
+// @useUnknownInCatchVariables: false
 // Regression test for #8295
 
 function foo() {
diff --git a/tests/cases/compiler/defaultValueInFunctionOverload1.ts b/tests/cases/compiler/defaultValueInFunctionOverload1.ts
index e38f8b9848c8b..47b973f1067cb 100644
--- a/tests/cases/compiler/defaultValueInFunctionOverload1.ts
+++ b/tests/cases/compiler/defaultValueInFunctionOverload1.ts
@@ -1,2 +1,3 @@
+// @strict: false
 function foo(x: string = '');
 function foo(x = '') { }
\ No newline at end of file
diff --git a/tests/cases/compiler/defineVariables_useDefineForClassFields.ts b/tests/cases/compiler/defineVariables_useDefineForClassFields.ts
index 4d161a5c9a0e6..4e40c4228875e 100644
--- a/tests/cases/compiler/defineVariables_useDefineForClassFields.ts
+++ b/tests/cases/compiler/defineVariables_useDefineForClassFields.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ESNext
 // @useDefineForClassFields: true
 
diff --git a/tests/cases/compiler/definiteAssignmentWithErrorStillStripped.ts b/tests/cases/compiler/definiteAssignmentWithErrorStillStripped.ts
index 4f7f594363a25..c63982da33940 100644
--- a/tests/cases/compiler/definiteAssignmentWithErrorStillStripped.ts
+++ b/tests/cases/compiler/definiteAssignmentWithErrorStillStripped.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @useDefineForClassFields: true
 class C {
diff --git a/tests/cases/compiler/deleteReadonly.ts b/tests/cases/compiler/deleteReadonly.ts
index cdab3f2eb234d..887dbb340d505 100644
--- a/tests/cases/compiler/deleteReadonly.ts
+++ b/tests/cases/compiler/deleteReadonly.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface A {
   readonly b
 }
diff --git a/tests/cases/compiler/derivedInterfaceCallSignature.ts b/tests/cases/compiler/derivedInterfaceCallSignature.ts
index ce6a8eeafdf83..ee0aa7093596a 100644
--- a/tests/cases/compiler/derivedInterfaceCallSignature.ts
+++ b/tests/cases/compiler/derivedInterfaceCallSignature.ts
@@ -23,5 +23,5 @@ interface D3SvgArea extends D3SvgPath {
     defined(defined: (data: any, index?: number) => boolean): D3SvgArea;
 }
 
-var area: D3SvgArea;
+declare var area: D3SvgArea;
 area.interpolate('two')('one');
\ No newline at end of file
diff --git a/tests/cases/compiler/derivedTypeCallingBaseImplWithOptionalParams.ts b/tests/cases/compiler/derivedTypeCallingBaseImplWithOptionalParams.ts
index ff875f23c1d7f..424090a0ae6f4 100644
--- a/tests/cases/compiler/derivedTypeCallingBaseImplWithOptionalParams.ts
+++ b/tests/cases/compiler/derivedTypeCallingBaseImplWithOptionalParams.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface MyInterface {
     myMethod(...myList: any[]);
 }
diff --git a/tests/cases/compiler/destructuringControlFlowNoCrash.ts b/tests/cases/compiler/destructuringControlFlowNoCrash.ts
index a8a2d05b73edb..6ede0f6cda490 100644
--- a/tests/cases/compiler/destructuringControlFlowNoCrash.ts
+++ b/tests/cases/compiler/destructuringControlFlowNoCrash.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 // legal JS, if nonsensical, which also triggers the issue
 const {
diff --git a/tests/cases/compiler/detachedCommentAtStartOfConstructor1.ts b/tests/cases/compiler/detachedCommentAtStartOfConstructor1.ts
index 84a72d3595bb9..cf793cd39ca92 100644
--- a/tests/cases/compiler/detachedCommentAtStartOfConstructor1.ts
+++ b/tests/cases/compiler/detachedCommentAtStartOfConstructor1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class TestFile {
     public message: string;
     public name;
diff --git a/tests/cases/compiler/doYouNeedToChangeYourTargetLibraryES2016Plus.ts b/tests/cases/compiler/doYouNeedToChangeYourTargetLibraryES2016Plus.ts
index 0c754c740c4a5..8f11dc71c00cd 100644
--- a/tests/cases/compiler/doYouNeedToChangeYourTargetLibraryES2016Plus.ts
+++ b/tests/cases/compiler/doYouNeedToChangeYourTargetLibraryES2016Plus.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es2015
 
 // es2016
diff --git a/tests/cases/compiler/dontShowCompilerGeneratedMembers.ts b/tests/cases/compiler/dontShowCompilerGeneratedMembers.ts
index e7dddbf24f10c..68ad884e23385 100644
--- a/tests/cases/compiler/dontShowCompilerGeneratedMembers.ts
+++ b/tests/cases/compiler/dontShowCompilerGeneratedMembers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var f: {
     x: number;
     <-
diff --git a/tests/cases/compiler/dottedModuleName.ts b/tests/cases/compiler/dottedModuleName.ts
index 5caff45d58dee..c7f0a1e8d5810 100644
--- a/tests/cases/compiler/dottedModuleName.ts
+++ b/tests/cases/compiler/dottedModuleName.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
     export namespace N {
 	export function f(x:number)=>2*x;
diff --git a/tests/cases/compiler/dottedModuleName2.ts b/tests/cases/compiler/dottedModuleName2.ts
index a68e65c6c1640..8c2e269892953 100644
--- a/tests/cases/compiler/dottedModuleName2.ts
+++ b/tests/cases/compiler/dottedModuleName2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace A.B {
  
   export var x = 1;
diff --git a/tests/cases/compiler/downlevelLetConst14.ts b/tests/cases/compiler/downlevelLetConst14.ts
index 0a77883809618..9f003bc3ff954 100644
--- a/tests/cases/compiler/downlevelLetConst14.ts
+++ b/tests/cases/compiler/downlevelLetConst14.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target:es5
 'use strict'
 declare function use(a: any);
diff --git a/tests/cases/compiler/downlevelLetConst15.ts b/tests/cases/compiler/downlevelLetConst15.ts
index abe06e1709bd9..3468b1cba8d5b 100644
--- a/tests/cases/compiler/downlevelLetConst15.ts
+++ b/tests/cases/compiler/downlevelLetConst15.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target:es5
 'use strict'
 declare function use(a: any);
diff --git a/tests/cases/compiler/downlevelLetConst16.ts b/tests/cases/compiler/downlevelLetConst16.ts
index 4a2bc0a055cdb..77d5147bacd7b 100644
--- a/tests/cases/compiler/downlevelLetConst16.ts
+++ b/tests/cases/compiler/downlevelLetConst16.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target:es5
 // @allowUnreachableCode: true
 
diff --git a/tests/cases/compiler/downlevelLetConst17.ts b/tests/cases/compiler/downlevelLetConst17.ts
index 7cea2031ac5b6..82f594c9a2b3e 100644
--- a/tests/cases/compiler/downlevelLetConst17.ts
+++ b/tests/cases/compiler/downlevelLetConst17.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target:es5
 // @allowUnreachableCode: true
 'use strict'
diff --git a/tests/cases/compiler/downlevelLetConst18.ts b/tests/cases/compiler/downlevelLetConst18.ts
index 61cb2f46cc987..585f15acf8ca6 100644
--- a/tests/cases/compiler/downlevelLetConst18.ts
+++ b/tests/cases/compiler/downlevelLetConst18.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target:es5
 // @allowUnreachableCode: true
 
diff --git a/tests/cases/compiler/downlevelLetConst19.ts b/tests/cases/compiler/downlevelLetConst19.ts
index e7aa48421f740..c0ba694098085 100644
--- a/tests/cases/compiler/downlevelLetConst19.ts
+++ b/tests/cases/compiler/downlevelLetConst19.ts
@@ -1,3 +1,4 @@
+// @strict: false
 'use strict'
 declare function use(a: any);
 var x;
diff --git a/tests/cases/compiler/duplicateClassElements.ts b/tests/cases/compiler/duplicateClassElements.ts
index 6e46c106fa3a4..0cbc122685a33 100644
--- a/tests/cases/compiler/duplicateClassElements.ts
+++ b/tests/cases/compiler/duplicateClassElements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     public a;
     public a;
diff --git a/tests/cases/compiler/duplicateIdentifierDifferentModifiers.ts b/tests/cases/compiler/duplicateIdentifierDifferentModifiers.ts
index 67ec8e1a19fb9..8200ce39f4784 100644
--- a/tests/cases/compiler/duplicateIdentifierDifferentModifiers.ts
+++ b/tests/cases/compiler/duplicateIdentifierDifferentModifiers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Not OK
 interface B { x; }
 interface B { x?; }
diff --git a/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts b/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts
index 81f45ff82e3a7..270afcc68f536 100644
--- a/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts
+++ b/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
     export interface I { }
 }
diff --git a/tests/cases/compiler/duplicateIdentifiersAcrossFileBoundaries.ts b/tests/cases/compiler/duplicateIdentifiersAcrossFileBoundaries.ts
index 005bfd306d177..c7523ce31950d 100644
--- a/tests/cases/compiler/duplicateIdentifiersAcrossFileBoundaries.ts
+++ b/tests/cases/compiler/duplicateIdentifiersAcrossFileBoundaries.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 // @Filename: file1.ts
diff --git a/tests/cases/compiler/duplicateLocalVariable1.ts b/tests/cases/compiler/duplicateLocalVariable1.ts
index 10145aa87caed..ba9f302d34c8a 100644
--- a/tests/cases/compiler/duplicateLocalVariable1.ts
+++ b/tests/cases/compiler/duplicateLocalVariable1.ts
@@ -32,7 +32,7 @@ export class TestRunner {
             try {
                 testResult = testcase.test();
             }
-            catch (e) {
+            catch (e: any) {
                 exception = true;
                 testResult = false;
                 if (typeof testcase.errorMessageRegEx === "string") {
diff --git a/tests/cases/compiler/dynamicNamesErrors.ts b/tests/cases/compiler/dynamicNamesErrors.ts
index 9187f5bab467a..a33d3654c5bfd 100644
--- a/tests/cases/compiler/dynamicNamesErrors.ts
+++ b/tests/cases/compiler/dynamicNamesErrors.ts
@@ -24,8 +24,8 @@ interface T3 {
     [c1]: string;
 }
 
-let t1: T1;
-let t2: T2;
+declare let t1: T1;
+declare let t2: T2;
 t1 = t2;
 t2 = t1;
 
diff --git a/tests/cases/compiler/elaboratedErrors.ts b/tests/cases/compiler/elaboratedErrors.ts
index e985a9362f333..09e7b83f90c00 100644
--- a/tests/cases/compiler/elaboratedErrors.ts
+++ b/tests/cases/compiler/elaboratedErrors.ts
@@ -13,8 +13,8 @@ class WorkerFS implements FileSystem {
 
 interface Alpha { x: string; }
 interface Beta { y: number; }
-var x: Alpha;
-var y: Beta;
+declare var x: Alpha;
+declare var y: Beta;
 
 // Only one of these errors should be large
 x = y;
diff --git a/tests/cases/compiler/elidedEmbeddedStatementsReplacedWithSemicolon.ts b/tests/cases/compiler/elidedEmbeddedStatementsReplacedWithSemicolon.ts
index dd9f6cc09f32b..51b3f0c2499fd 100644
--- a/tests/cases/compiler/elidedEmbeddedStatementsReplacedWithSemicolon.ts
+++ b/tests/cases/compiler/elidedEmbeddedStatementsReplacedWithSemicolon.ts
@@ -1,3 +1,4 @@
+// @strict: false
 if (1)
     const enum A {}
 else
diff --git a/tests/cases/compiler/emitDecoratorMetadata_restArgs.ts b/tests/cases/compiler/emitDecoratorMetadata_restArgs.ts
index f58e9b704d48e..1835876780fe3 100644
--- a/tests/cases/compiler/emitDecoratorMetadata_restArgs.ts
+++ b/tests/cases/compiler/emitDecoratorMetadata_restArgs.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @experimentaldecorators: true
 // @emitdecoratormetadata: true
 // @target: ES5
diff --git a/tests/cases/compiler/emitThisInObjectLiteralGetter.ts b/tests/cases/compiler/emitThisInObjectLiteralGetter.ts
index 8927891bd989c..4d6001f95e09d 100644
--- a/tests/cases/compiler/emitThisInObjectLiteralGetter.ts
+++ b/tests/cases/compiler/emitThisInObjectLiteralGetter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 const example = {
     get foo() {
diff --git a/tests/cases/compiler/emptyArgumentsListComment.ts b/tests/cases/compiler/emptyArgumentsListComment.ts
index 4a435018f6900..95a72a33fbff3 100644
--- a/tests/cases/compiler/emptyArgumentsListComment.ts
+++ b/tests/cases/compiler/emptyArgumentsListComment.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare var a;
 
 a(/*1*/);
diff --git a/tests/cases/compiler/enumAssignmentCompat3.ts b/tests/cases/compiler/enumAssignmentCompat3.ts
index 4b987b97f7463..b568461d94cb3 100644
--- a/tests/cases/compiler/enumAssignmentCompat3.ts
+++ b/tests/cases/compiler/enumAssignmentCompat3.ts
@@ -54,16 +54,16 @@ namespace Merged2 {
     }
 }
 
-var abc: First.E;
-var secondAbc: Abc.E;
-var secondAbcd: Abcd.E;
-var secondAb: Ab.E;
-var secondCd: Cd.E;
-var nope: Abc.Nope;
-var k: Const.E;
-var decl: Decl.E;
-var merged: Merged.E;
-var merged2: Merged2.E;
+declare var abc: First.E;
+declare var secondAbc: Abc.E;
+declare var secondAbcd: Abcd.E;
+declare var secondAb: Ab.E;
+declare var secondCd: Cd.E;
+declare var nope: Abc.Nope;
+declare var k: Const.E;
+declare var decl: Decl.E;
+declare var merged: Merged.E;
+declare var merged2: Merged2.E;
 abc = secondAbc; // ok
 abc = secondAbcd; // missing 'd'
 abc = secondAb; // ok
diff --git a/tests/cases/compiler/enumAssignmentCompat5.ts b/tests/cases/compiler/enumAssignmentCompat5.ts
index c56db8b04f564..f36768ee48be4 100644
--- a/tests/cases/compiler/enumAssignmentCompat5.ts
+++ b/tests/cases/compiler/enumAssignmentCompat5.ts
@@ -6,7 +6,7 @@ enum Computed {
     B = 1 << 2,
     C = 1 << 3,
 }
-let n: number;
+declare let n: number;
 let e: E = n; // ok because it's too inconvenient otherwise
 e = 0; // ok, in range
 e = 4; // ok, out of range, but allowed computed enums don't have all members
diff --git a/tests/cases/compiler/enumBasics1.ts b/tests/cases/compiler/enumBasics1.ts
index b3614d5bcc2b9..70091093bf940 100644
--- a/tests/cases/compiler/enumBasics1.ts
+++ b/tests/cases/compiler/enumBasics1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 enum E {
 	A = 1,
 	B,
diff --git a/tests/cases/compiler/enumBasics2.ts b/tests/cases/compiler/enumBasics2.ts
index 5a957b9170df0..7abe73bdd65b1 100644
--- a/tests/cases/compiler/enumBasics2.ts
+++ b/tests/cases/compiler/enumBasics2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 enum Foo {
   a = 2,
   b = 3,
diff --git a/tests/cases/compiler/enumBasics3.ts b/tests/cases/compiler/enumBasics3.ts
index d39c1c6f0283f..e111fe4e6a02d 100644
--- a/tests/cases/compiler/enumBasics3.ts
+++ b/tests/cases/compiler/enumBasics3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
   export namespace N {
     export enum E1 {
diff --git a/tests/cases/compiler/enumIndexer.ts b/tests/cases/compiler/enumIndexer.ts
index 2a156782c4e57..03db00ba75f3b 100644
--- a/tests/cases/compiler/enumIndexer.ts
+++ b/tests/cases/compiler/enumIndexer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 enum MyEnumType {
     foo, bar
 }
diff --git a/tests/cases/compiler/errorElaboration.ts b/tests/cases/compiler/errorElaboration.ts
index bea98f7e60adf..c5b4d95c9b7f5 100644
--- a/tests/cases/compiler/errorElaboration.ts
+++ b/tests/cases/compiler/errorElaboration.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Repro for #5712
 
 interface Ref<T> {
@@ -8,7 +9,7 @@ interface Container<T> {
     m2: T;
 }
 declare function foo(x: () => Container<Ref<number>>): void;
-let a: () => Container<Ref<string>>;
+declare let a: () => Container<Ref<string>>;
 foo(a);
 
 // Repro for #25498
diff --git a/tests/cases/compiler/errorElaborationDivesIntoApparentlyPresentPropsOnly.ts b/tests/cases/compiler/errorElaborationDivesIntoApparentlyPresentPropsOnly.ts
index 1045fd95cad73..a3b038cb30c90 100644
--- a/tests/cases/compiler/errorElaborationDivesIntoApparentlyPresentPropsOnly.ts
+++ b/tests/cases/compiler/errorElaborationDivesIntoApparentlyPresentPropsOnly.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo<T extends { a: string }>(x: T) {
     x = { a: "abc", b: 20, c: 30 };
 }
diff --git a/tests/cases/compiler/errorForConflictingExportEqualsValue.ts b/tests/cases/compiler/errorForConflictingExportEqualsValue.ts
index a91ecc390b5a9..c4620fddd2bc2 100644
--- a/tests/cases/compiler/errorForConflictingExportEqualsValue.ts
+++ b/tests/cases/compiler/errorForConflictingExportEqualsValue.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es6
 // @Filename: /a.ts
 export var x;
diff --git a/tests/cases/compiler/errorMessageOnObjectLiteralType.ts b/tests/cases/compiler/errorMessageOnObjectLiteralType.ts
index a9d9bd727451f..4851a288e8535 100644
--- a/tests/cases/compiler/errorMessageOnObjectLiteralType.ts
+++ b/tests/cases/compiler/errorMessageOnObjectLiteralType.ts
@@ -1,4 +1,4 @@
-var x: {
+declare var x: {
     a: string;
     b: number;
 };
diff --git a/tests/cases/compiler/errorMessagesIntersectionTypes03.ts b/tests/cases/compiler/errorMessagesIntersectionTypes03.ts
index 73969bc17b300..8fd96da184f50 100644
--- a/tests/cases/compiler/errorMessagesIntersectionTypes03.ts
+++ b/tests/cases/compiler/errorMessagesIntersectionTypes03.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface A {
     a;
 }
diff --git a/tests/cases/compiler/errorMessagesIntersectionTypes04.ts b/tests/cases/compiler/errorMessagesIntersectionTypes04.ts
index 74dcfa658e7b5..273b7db071649 100644
--- a/tests/cases/compiler/errorMessagesIntersectionTypes04.ts
+++ b/tests/cases/compiler/errorMessagesIntersectionTypes04.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface A {
     a;
 }
diff --git a/tests/cases/compiler/errorWithSameNameType.ts b/tests/cases/compiler/errorWithSameNameType.ts
index 662ae638753bb..bae75776b908b 100644
--- a/tests/cases/compiler/errorWithSameNameType.ts
+++ b/tests/cases/compiler/errorWithSameNameType.ts
@@ -12,8 +12,8 @@ export interface F {
 import * as A from './a'
 import * as B from './b'
 
-let a: A.F
-let b: B.F
+declare let a: A.F
+declare let b: B.F
 
 if (a === b) {
 
diff --git a/tests/cases/compiler/errorWithTruncatedType.ts b/tests/cases/compiler/errorWithTruncatedType.ts
index c615ff928e40a..237860d29bbbf 100644
--- a/tests/cases/compiler/errorWithTruncatedType.ts
+++ b/tests/cases/compiler/errorWithTruncatedType.ts
@@ -1,6 +1,6 @@
 // @noErrorTruncation: false
 
-var x: {
+declare var x: {
     propertyWithAnExceedinglyLongName1: string;
     propertyWithAnExceedinglyLongName2: string;
     propertyWithAnExceedinglyLongName3: string;
diff --git a/tests/cases/compiler/errorsInGenericTypeReference.ts b/tests/cases/compiler/errorsInGenericTypeReference.ts
index 7b385feb2dc09..49d7202fec4e8 100644
--- a/tests/cases/compiler/errorsInGenericTypeReference.ts
+++ b/tests/cases/compiler/errorsInGenericTypeReference.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 interface IFoo<T> { }
 
diff --git a/tests/cases/compiler/es5-asyncFunction.ts b/tests/cases/compiler/es5-asyncFunction.ts
index 2ee2ccb3f91d9..9496f393c0164 100644
--- a/tests/cases/compiler/es5-asyncFunction.ts
+++ b/tests/cases/compiler/es5-asyncFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @target: ES5
 declare var x;
diff --git a/tests/cases/compiler/es5-asyncFunctionArrayLiterals.ts b/tests/cases/compiler/es5-asyncFunctionArrayLiterals.ts
index 69240010c2759..462e516b426fd 100644
--- a/tests/cases/compiler/es5-asyncFunctionArrayLiterals.ts
+++ b/tests/cases/compiler/es5-asyncFunctionArrayLiterals.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionBinaryExpressions.ts b/tests/cases/compiler/es5-asyncFunctionBinaryExpressions.ts
index 6d8afb166c076..d1678c5fcacd0 100644
--- a/tests/cases/compiler/es5-asyncFunctionBinaryExpressions.ts
+++ b/tests/cases/compiler/es5-asyncFunctionBinaryExpressions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @allowUnreachableCode: true
diff --git a/tests/cases/compiler/es5-asyncFunctionCallExpressions.ts b/tests/cases/compiler/es5-asyncFunctionCallExpressions.ts
index 7b748b95bdf9f..8cdb107df8ae2 100644
--- a/tests/cases/compiler/es5-asyncFunctionCallExpressions.ts
+++ b/tests/cases/compiler/es5-asyncFunctionCallExpressions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionConditionals.ts b/tests/cases/compiler/es5-asyncFunctionConditionals.ts
index fbc577b983347..c8a5708be7f23 100644
--- a/tests/cases/compiler/es5-asyncFunctionConditionals.ts
+++ b/tests/cases/compiler/es5-asyncFunctionConditionals.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionDoStatements.ts b/tests/cases/compiler/es5-asyncFunctionDoStatements.ts
index 6501e27769fb1..32a680c55158a 100644
--- a/tests/cases/compiler/es5-asyncFunctionDoStatements.ts
+++ b/tests/cases/compiler/es5-asyncFunctionDoStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionElementAccess.ts b/tests/cases/compiler/es5-asyncFunctionElementAccess.ts
index 01372b43f5eb3..86f831122d4f7 100644
--- a/tests/cases/compiler/es5-asyncFunctionElementAccess.ts
+++ b/tests/cases/compiler/es5-asyncFunctionElementAccess.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionForInStatements.ts b/tests/cases/compiler/es5-asyncFunctionForInStatements.ts
index b1593041080d1..6d38b35d41d68 100644
--- a/tests/cases/compiler/es5-asyncFunctionForInStatements.ts
+++ b/tests/cases/compiler/es5-asyncFunctionForInStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionForOfStatements.ts b/tests/cases/compiler/es5-asyncFunctionForOfStatements.ts
index d741c55e31e98..c3a949a237aad 100644
--- a/tests/cases/compiler/es5-asyncFunctionForOfStatements.ts
+++ b/tests/cases/compiler/es5-asyncFunctionForOfStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionForStatements.ts b/tests/cases/compiler/es5-asyncFunctionForStatements.ts
index 4fddf395588f2..e011b49af9f67 100644
--- a/tests/cases/compiler/es5-asyncFunctionForStatements.ts
+++ b/tests/cases/compiler/es5-asyncFunctionForStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionHoisting.ts b/tests/cases/compiler/es5-asyncFunctionHoisting.ts
index 7c05372ada9d3..6f217181558a0 100644
--- a/tests/cases/compiler/es5-asyncFunctionHoisting.ts
+++ b/tests/cases/compiler/es5-asyncFunctionHoisting.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionIfStatements.ts b/tests/cases/compiler/es5-asyncFunctionIfStatements.ts
index 65bda05ee7954..fa9f9911b5df1 100644
--- a/tests/cases/compiler/es5-asyncFunctionIfStatements.ts
+++ b/tests/cases/compiler/es5-asyncFunctionIfStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionLongObjectLiteral.ts b/tests/cases/compiler/es5-asyncFunctionLongObjectLiteral.ts
index 563f81a0b55a0..e062de41ded35 100644
--- a/tests/cases/compiler/es5-asyncFunctionLongObjectLiteral.ts
+++ b/tests/cases/compiler/es5-asyncFunctionLongObjectLiteral.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @target: ES5
 
diff --git a/tests/cases/compiler/es5-asyncFunctionNestedLoops.ts b/tests/cases/compiler/es5-asyncFunctionNestedLoops.ts
index dd6f3126bcf10..1c8652b4a58f8 100644
--- a/tests/cases/compiler/es5-asyncFunctionNestedLoops.ts
+++ b/tests/cases/compiler/es5-asyncFunctionNestedLoops.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionNewExpressions.ts b/tests/cases/compiler/es5-asyncFunctionNewExpressions.ts
index d7f0da9f433e8..367968124cf66 100644
--- a/tests/cases/compiler/es5-asyncFunctionNewExpressions.ts
+++ b/tests/cases/compiler/es5-asyncFunctionNewExpressions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionObjectLiterals.ts b/tests/cases/compiler/es5-asyncFunctionObjectLiterals.ts
index 42d03f90494c7..4c8f48ea2d897 100644
--- a/tests/cases/compiler/es5-asyncFunctionObjectLiterals.ts
+++ b/tests/cases/compiler/es5-asyncFunctionObjectLiterals.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionPropertyAccess.ts b/tests/cases/compiler/es5-asyncFunctionPropertyAccess.ts
index 3541c1b354b36..80ecf24c528a9 100644
--- a/tests/cases/compiler/es5-asyncFunctionPropertyAccess.ts
+++ b/tests/cases/compiler/es5-asyncFunctionPropertyAccess.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionReturnStatements.ts b/tests/cases/compiler/es5-asyncFunctionReturnStatements.ts
index 944c61b568c6e..75d05deee6b30 100644
--- a/tests/cases/compiler/es5-asyncFunctionReturnStatements.ts
+++ b/tests/cases/compiler/es5-asyncFunctionReturnStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionSwitchStatements.ts b/tests/cases/compiler/es5-asyncFunctionSwitchStatements.ts
index b321c7115ce28..18cbcec9b6d9c 100644
--- a/tests/cases/compiler/es5-asyncFunctionSwitchStatements.ts
+++ b/tests/cases/compiler/es5-asyncFunctionSwitchStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionTryStatements.ts b/tests/cases/compiler/es5-asyncFunctionTryStatements.ts
index 0d14b5f4242c2..24648d03a3910 100644
--- a/tests/cases/compiler/es5-asyncFunctionTryStatements.ts
+++ b/tests/cases/compiler/es5-asyncFunctionTryStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionWhileStatements.ts b/tests/cases/compiler/es5-asyncFunctionWhileStatements.ts
index d31ab21ab7bf7..c2fb2dd6e69ba 100644
--- a/tests/cases/compiler/es5-asyncFunctionWhileStatements.ts
+++ b/tests/cases/compiler/es5-asyncFunctionWhileStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-asyncFunctionWithStatements.ts b/tests/cases/compiler/es5-asyncFunctionWithStatements.ts
index c82901ac9fd1e..4f02528a4dc2d 100644
--- a/tests/cases/compiler/es5-asyncFunctionWithStatements.ts
+++ b/tests/cases/compiler/es5-asyncFunctionWithStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es5-commonjs7.ts b/tests/cases/compiler/es5-commonjs7.ts
index 0ad10c1822dac..e7d56da3d6ceb 100644
--- a/tests/cases/compiler/es5-commonjs7.ts
+++ b/tests/cases/compiler/es5-commonjs7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @sourcemap: false
 // @declaration: false
diff --git a/tests/cases/compiler/es5-yieldFunctionObjectLiterals.ts b/tests/cases/compiler/es5-yieldFunctionObjectLiterals.ts
index f6a00a3f956ae..ab7854f33a0b6 100644
--- a/tests/cases/compiler/es5-yieldFunctionObjectLiterals.ts
+++ b/tests/cases/compiler/es5-yieldFunctionObjectLiterals.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
 // @target: ES5
diff --git a/tests/cases/compiler/es6ClassTest.ts b/tests/cases/compiler/es6ClassTest.ts
index 73d1c2bc6f0e9..3ce0a3084ea53 100644
--- a/tests/cases/compiler/es6ClassTest.ts
+++ b/tests/cases/compiler/es6ClassTest.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Bar {
     public goo: number;
     public prop1(x) {
diff --git a/tests/cases/compiler/es6ClassTest2.ts b/tests/cases/compiler/es6ClassTest2.ts
index ff235670b69ca..09c1faad3bde0 100644
--- a/tests/cases/compiler/es6ClassTest2.ts
+++ b/tests/cases/compiler/es6ClassTest2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class BasicMonster {
     constructor(public name: string, public health: number) {
 
diff --git a/tests/cases/compiler/es6ClassTest3.ts b/tests/cases/compiler/es6ClassTest3.ts
index 392acbe952911..4cc0ca3f1f7dd 100644
--- a/tests/cases/compiler/es6ClassTest3.ts
+++ b/tests/cases/compiler/es6ClassTest3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {	
 	class Visibility {
 	    public foo() { };
diff --git a/tests/cases/compiler/es6ClassTest4.ts b/tests/cases/compiler/es6ClassTest4.ts
index 6b16c82d19ad0..3f7a2e22bd8d8 100644
--- a/tests/cases/compiler/es6ClassTest4.ts
+++ b/tests/cases/compiler/es6ClassTest4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare class Point
 {
     x: number;
diff --git a/tests/cases/compiler/es6ClassTest5.ts b/tests/cases/compiler/es6ClassTest5.ts
index 51b37575b0d43..7fb022bbc795c 100644
--- a/tests/cases/compiler/es6ClassTest5.ts
+++ b/tests/cases/compiler/es6ClassTest5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C1T5 {
     foo: (i: number, s: string) => number = 
 	   	(i) => {
diff --git a/tests/cases/compiler/es6ClassTest7.ts b/tests/cases/compiler/es6ClassTest7.ts
index 1cfdb3dcf5e3d..a464fd863d903 100644
--- a/tests/cases/compiler/es6ClassTest7.ts
+++ b/tests/cases/compiler/es6ClassTest7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare namespace M {
     export class Foo {
     }
diff --git a/tests/cases/compiler/es6ClassTest8.ts b/tests/cases/compiler/es6ClassTest8.ts
index da50c8adfeca5..3492a6414f1c2 100644
--- a/tests/cases/compiler/es6ClassTest8.ts
+++ b/tests/cases/compiler/es6ClassTest8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f1(x:any) {return x;}
 
 class C {
diff --git a/tests/cases/compiler/es6ClassTest9.ts b/tests/cases/compiler/es6ClassTest9.ts
index d8f826c93965c..69e58aed783e3 100644
--- a/tests/cases/compiler/es6ClassTest9.ts
+++ b/tests/cases/compiler/es6ClassTest9.ts
@@ -1,2 +1,3 @@
+// @strict: false
 declare class foo();
 function foo() {}
diff --git a/tests/cases/compiler/es6ExportEqualsInterop.ts b/tests/cases/compiler/es6ExportEqualsInterop.ts
index 26fec1a30de31..a41a7e6d24412 100644
--- a/tests/cases/compiler/es6ExportEqualsInterop.ts
+++ b/tests/cases/compiler/es6ExportEqualsInterop.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 
 // @filename: modules.d.ts
diff --git a/tests/cases/compiler/esModuleInteropImportTSLibHasImport.ts b/tests/cases/compiler/esModuleInteropImportTSLibHasImport.ts
index b7f6ce748c3c2..1614e56d2a204 100644
--- a/tests/cases/compiler/esModuleInteropImportTSLibHasImport.ts
+++ b/tests/cases/compiler/esModuleInteropImportTSLibHasImport.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @esModuleInterop: true
 // @importHelpers: true
 // @noEmitHelpers: true
diff --git a/tests/cases/compiler/evalAfter0.ts b/tests/cases/compiler/evalAfter0.ts
index 8b9ac51d5d473..2b3fafeba0ae0 100644
--- a/tests/cases/compiler/evalAfter0.ts
+++ b/tests/cases/compiler/evalAfter0.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: false
 (0,eval)("10"); // fine: special case for eval
 
diff --git a/tests/cases/compiler/excessPropertyCheckWithSpread.ts b/tests/cases/compiler/excessPropertyCheckWithSpread.ts
index 11c573b4ce4da..0b4a9c0271b59 100644
--- a/tests/cases/compiler/excessPropertyCheckWithSpread.ts
+++ b/tests/cases/compiler/excessPropertyCheckWithSpread.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function f({ a: number }): void
 interface I {
     readonly n: number;
diff --git a/tests/cases/compiler/expandoFunctionContextualTypesJs.ts b/tests/cases/compiler/expandoFunctionContextualTypesJs.ts
index e69f3dc79c470..8f199937fb9b5 100644
--- a/tests/cases/compiler/expandoFunctionContextualTypesJs.ts
+++ b/tests/cases/compiler/expandoFunctionContextualTypesJs.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/compiler/expandoFunctionNestedAssigments.ts b/tests/cases/compiler/expandoFunctionNestedAssigments.ts
index 7448ba939dcba..0adab6f84a153 100644
--- a/tests/cases/compiler/expandoFunctionNestedAssigments.ts
+++ b/tests/cases/compiler/expandoFunctionNestedAssigments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: esnext
 // @declaration: true
 
diff --git a/tests/cases/compiler/expandoFunctionNestedAssigmentsDeclared.ts b/tests/cases/compiler/expandoFunctionNestedAssigmentsDeclared.ts
index a0375921bf6b5..ad4ef67f32679 100644
--- a/tests/cases/compiler/expandoFunctionNestedAssigmentsDeclared.ts
+++ b/tests/cases/compiler/expandoFunctionNestedAssigmentsDeclared.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: esnext
 // @declaration: true
 
diff --git a/tests/cases/compiler/exportAlreadySeen.ts b/tests/cases/compiler/exportAlreadySeen.ts
index 188ef2be4ddfc..3eb4819c288ed 100644
--- a/tests/cases/compiler/exportAlreadySeen.ts
+++ b/tests/cases/compiler/exportAlreadySeen.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
     export export var x = 1;
     export export function f() { }
diff --git a/tests/cases/compiler/exportAsNamespace.d.ts b/tests/cases/compiler/exportAsNamespace.d.ts
index 755d4fdb2a957..c5e1d80936a39 100644
--- a/tests/cases/compiler/exportAsNamespace.d.ts
+++ b/tests/cases/compiler/exportAsNamespace.d.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // issue: https://github.com/Microsoft/TypeScript/issues/11545
 
 export var X;
diff --git a/tests/cases/compiler/exportAssignmentError.ts b/tests/cases/compiler/exportAssignmentError.ts
index 69d4777cda25f..a4b2de211614d 100644
--- a/tests/cases/compiler/exportAssignmentError.ts
+++ b/tests/cases/compiler/exportAssignmentError.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: amd
 // @Filename: exportEqualsModule_A.ts
 namespace M {
diff --git a/tests/cases/compiler/exportAssignmentImportMergeNoCrash.ts b/tests/cases/compiler/exportAssignmentImportMergeNoCrash.ts
index 0ce4792ca9d15..a43cffee095e2 100644
--- a/tests/cases/compiler/exportAssignmentImportMergeNoCrash.ts
+++ b/tests/cases/compiler/exportAssignmentImportMergeNoCrash.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: assignment.ts
 export default {
     foo: 12
diff --git a/tests/cases/compiler/exportAssignmentInternalModule.ts b/tests/cases/compiler/exportAssignmentInternalModule.ts
index e1ef4fcc6d4cb..e376d97c4641c 100644
--- a/tests/cases/compiler/exportAssignmentInternalModule.ts
+++ b/tests/cases/compiler/exportAssignmentInternalModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: amd
 // @Filename: exportAssignmentInternalModule_A.ts
 namespace M {
diff --git a/tests/cases/compiler/exportAssignmentOfDeclaredExternalModule.ts b/tests/cases/compiler/exportAssignmentOfDeclaredExternalModule.ts
index fd6b55c9c0855..e527466940047 100644
--- a/tests/cases/compiler/exportAssignmentOfDeclaredExternalModule.ts
+++ b/tests/cases/compiler/exportAssignmentOfDeclaredExternalModule.ts
@@ -11,6 +11,6 @@ export = Sammy;
 import Sammy = require('./exportAssignmentOfDeclaredExternalModule_0');
 var x = new Sammy(); // error to use as constructor as there is not constructor symbol
 var y = Sammy(); // error to use interface name as call target
-var z: Sammy; // no error - z is of type interface Sammy from module 'M'
+declare var z: Sammy; // no error - z is of type interface Sammy from module 'M'
 var a = new z(); // constructor - no error
 var b = z(); // call signature - no error
\ No newline at end of file
diff --git a/tests/cases/compiler/exportAssignmentWithImportStatementPrivacyError.ts b/tests/cases/compiler/exportAssignmentWithImportStatementPrivacyError.ts
index 1d7a9f3bbc25a..11d227dc91422 100644
--- a/tests/cases/compiler/exportAssignmentWithImportStatementPrivacyError.ts
+++ b/tests/cases/compiler/exportAssignmentWithImportStatementPrivacyError.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: amd
 namespace m2 {
     export interface connectModule {
diff --git a/tests/cases/compiler/exportAssignmentWithPrivacyError.ts b/tests/cases/compiler/exportAssignmentWithPrivacyError.ts
index 2b14ba10f12fd..2b755dee3caa3 100644
--- a/tests/cases/compiler/exportAssignmentWithPrivacyError.ts
+++ b/tests/cases/compiler/exportAssignmentWithPrivacyError.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: amd
 interface connectmodule {
     (res, req, next): void;
diff --git a/tests/cases/compiler/exportAssignmentWithoutIdentifier1.ts b/tests/cases/compiler/exportAssignmentWithoutIdentifier1.ts
index b978cb09bb1bc..c96c7f654a8a0 100644
--- a/tests/cases/compiler/exportAssignmentWithoutIdentifier1.ts
+++ b/tests/cases/compiler/exportAssignmentWithoutIdentifier1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 function Greeter() {
     //...
diff --git a/tests/cases/compiler/exportDeclareClass1.ts b/tests/cases/compiler/exportDeclareClass1.ts
index 9230eda30aaed..e4925cb659f30 100644
--- a/tests/cases/compiler/exportDeclareClass1.ts
+++ b/tests/cases/compiler/exportDeclareClass1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
     export declare class eaC {
         static tF() { };
diff --git a/tests/cases/compiler/exportEqualErrorType.ts b/tests/cases/compiler/exportEqualErrorType.ts
index 5adaffcbaee4d..90677555e52c5 100644
--- a/tests/cases/compiler/exportEqualErrorType.ts
+++ b/tests/cases/compiler/exportEqualErrorType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 // @Filename: exportEqualErrorType_0.ts
 namespace server {
@@ -8,7 +9,7 @@ namespace server {
         use: (mod: connectModule) => connectExport;
     }
 }
-var server: {
+declare var server: {
     (): server.connectExport;
     foo: Date;
 };
diff --git a/tests/cases/compiler/exportEqualMemberMissing.ts b/tests/cases/compiler/exportEqualMemberMissing.ts
index 0751aea85e813..86530f98bd617 100644
--- a/tests/cases/compiler/exportEqualMemberMissing.ts
+++ b/tests/cases/compiler/exportEqualMemberMissing.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @Filename: exportEqualMemberMissing_0.ts
 namespace server {
@@ -8,7 +9,7 @@ namespace server {
         use: (mod: connectModule) => connectExport;
     }
 }
-var server: {
+declare var server: {
     (): server.connectExport;
     foo: Date;
 };
diff --git a/tests/cases/compiler/exportImportMultipleFiles.ts b/tests/cases/compiler/exportImportMultipleFiles.ts
index fb93ebfc3b497..d199c72392843 100644
--- a/tests/cases/compiler/exportImportMultipleFiles.ts
+++ b/tests/cases/compiler/exportImportMultipleFiles.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: amd
 // @Filename: exportImportMultipleFiles_math.ts
 export function add(a, b) { return a + b; }
diff --git a/tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts b/tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts
index 54c161af447f9..c2d7572c08fab 100644
--- a/tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts
+++ b/tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare module "m2" {
     export namespace X {
         interface I { }
diff --git a/tests/cases/compiler/exportSpecifierAndLocalMemberDeclaration.ts b/tests/cases/compiler/exportSpecifierAndLocalMemberDeclaration.ts
index cb781c36ba57c..1734dd07288c5 100644
--- a/tests/cases/compiler/exportSpecifierAndLocalMemberDeclaration.ts
+++ b/tests/cases/compiler/exportSpecifierAndLocalMemberDeclaration.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare module "m2" {
     namespace X {
         interface I { }
diff --git a/tests/cases/compiler/exportSpecifierForAGlobal.ts b/tests/cases/compiler/exportSpecifierForAGlobal.ts
index c24ec0b086f88..058648090da1e 100644
--- a/tests/cases/compiler/exportSpecifierForAGlobal.ts
+++ b/tests/cases/compiler/exportSpecifierForAGlobal.ts
@@ -7,6 +7,6 @@ declare class X { }
 // @filename: b.ts
 export {X};
 export function f() {
-    var x: X;
+    var x!: X;
     return x;
 } 
diff --git a/tests/cases/compiler/exportStarForValues.ts b/tests/cases/compiler/exportStarForValues.ts
index 3432548c5286e..f72c3b425ea34 100644
--- a/tests/cases/compiler/exportStarForValues.ts
+++ b/tests/cases/compiler/exportStarForValues.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 
 // @filename: file1.ts
diff --git a/tests/cases/compiler/exportStarForValues10.ts b/tests/cases/compiler/exportStarForValues10.ts
index 82cee772b18d0..61e0e088c1237 100644
--- a/tests/cases/compiler/exportStarForValues10.ts
+++ b/tests/cases/compiler/exportStarForValues10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: system
 
 // @filename: file0.ts
diff --git a/tests/cases/compiler/exportStarForValues2.ts b/tests/cases/compiler/exportStarForValues2.ts
index 63a880cce0a8f..13f817f786f20 100644
--- a/tests/cases/compiler/exportStarForValues2.ts
+++ b/tests/cases/compiler/exportStarForValues2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 
 // @filename: file1.ts
diff --git a/tests/cases/compiler/exportStarForValues3.ts b/tests/cases/compiler/exportStarForValues3.ts
index f0c36db0bda04..cf0834e70db7b 100644
--- a/tests/cases/compiler/exportStarForValues3.ts
+++ b/tests/cases/compiler/exportStarForValues3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 
 // @filename: file1.ts
diff --git a/tests/cases/compiler/exportStarForValues4.ts b/tests/cases/compiler/exportStarForValues4.ts
index d685ba1c8a37b..81e52c0db1946 100644
--- a/tests/cases/compiler/exportStarForValues4.ts
+++ b/tests/cases/compiler/exportStarForValues4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 
 // @filename: file1.ts
diff --git a/tests/cases/compiler/exportStarForValues5.ts b/tests/cases/compiler/exportStarForValues5.ts
index cb716c720021a..712d3cf6d8716 100644
--- a/tests/cases/compiler/exportStarForValues5.ts
+++ b/tests/cases/compiler/exportStarForValues5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 
 // @filename: file1.ts
diff --git a/tests/cases/compiler/exportStarForValues6.ts b/tests/cases/compiler/exportStarForValues6.ts
index a623e31f1782f..59696b240b2a0 100644
--- a/tests/cases/compiler/exportStarForValues6.ts
+++ b/tests/cases/compiler/exportStarForValues6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: system
 
 // @filename: file1.ts
diff --git a/tests/cases/compiler/exportStarForValues7.ts b/tests/cases/compiler/exportStarForValues7.ts
index c1343a44119ca..744e4962a1f90 100644
--- a/tests/cases/compiler/exportStarForValues7.ts
+++ b/tests/cases/compiler/exportStarForValues7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 
 // @filename: file1.ts
diff --git a/tests/cases/compiler/exportStarForValues8.ts b/tests/cases/compiler/exportStarForValues8.ts
index 0594f8b0877f9..26a67ece3245a 100644
--- a/tests/cases/compiler/exportStarForValues8.ts
+++ b/tests/cases/compiler/exportStarForValues8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 
 // @filename: file1.ts
diff --git a/tests/cases/compiler/exportStarForValues9.ts b/tests/cases/compiler/exportStarForValues9.ts
index 53ffb1b79544e..139109cc3cd47 100644
--- a/tests/cases/compiler/exportStarForValues9.ts
+++ b/tests/cases/compiler/exportStarForValues9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 
 // @filename: file1.ts
diff --git a/tests/cases/compiler/exportStarForValuesInSystem.ts b/tests/cases/compiler/exportStarForValuesInSystem.ts
index 1f60e8dec6fab..5f953b38e31a5 100644
--- a/tests/cases/compiler/exportStarForValuesInSystem.ts
+++ b/tests/cases/compiler/exportStarForValuesInSystem.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: system
 
 // @filename: file1.ts
diff --git a/tests/cases/compiler/exportStarFromEmptyModule.ts b/tests/cases/compiler/exportStarFromEmptyModule.ts
index 8e4ea8a7b214e..5eac2fabe810c 100644
--- a/tests/cases/compiler/exportStarFromEmptyModule.ts
+++ b/tests/cases/compiler/exportStarFromEmptyModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @module: commonjs
 // @declaration: true
diff --git a/tests/cases/compiler/exportedBlockScopedDeclarations.ts b/tests/cases/compiler/exportedBlockScopedDeclarations.ts
index 54f43adfe75bf..52d1e70eaf032 100644
--- a/tests/cases/compiler/exportedBlockScopedDeclarations.ts
+++ b/tests/cases/compiler/exportedBlockScopedDeclarations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: esnext
 const foo = foo; // compile error
 export const bar = bar; // should be compile error
diff --git a/tests/cases/compiler/expr.ts b/tests/cases/compiler/expr.ts
index 8d6f7beed7ece..7e0f6231ba3ed 100644
--- a/tests/cases/compiler/expr.ts
+++ b/tests/cases/compiler/expr.ts
@@ -6,12 +6,12 @@ enum E {
 }
 
 function f() {
-    var a: any;
+    var a!: any;
     var n=3;
     var s="";
     var b=false;
-    var i:I;
-    var e:E;
+    var i!: I;
+    var e!: E;
 
     n&&a;
     n&&s;
diff --git a/tests/cases/compiler/expressionTypeNodeShouldError.ts b/tests/cases/compiler/expressionTypeNodeShouldError.ts
index 0f6463f454b66..fdc8b2b4501e3 100644
--- a/tests/cases/compiler/expressionTypeNodeShouldError.ts
+++ b/tests/cases/compiler/expressionTypeNodeShouldError.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @Filename: base.d.ts
 declare const x: "foo".charCodeAt(0);
 
diff --git a/tests/cases/compiler/expressionsForbiddenInParameterInitializers.ts b/tests/cases/compiler/expressionsForbiddenInParameterInitializers.ts
index ea4dce154086d..89d5a73f6af40 100644
--- a/tests/cases/compiler/expressionsForbiddenInParameterInitializers.ts
+++ b/tests/cases/compiler/expressionsForbiddenInParameterInitializers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es6
 // @filename: bar.ts
 export async function foo({ foo = await import("./bar") }) {
diff --git a/tests/cases/compiler/extendArray.ts b/tests/cases/compiler/extendArray.ts
index 781765257b5e1..5837bf712ece5 100644
--- a/tests/cases/compiler/extendArray.ts
+++ b/tests/cases/compiler/extendArray.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var a = [1,2];
 a.forEach(function (v,i,a) {});
 
diff --git a/tests/cases/compiler/extendGlobalThis.ts b/tests/cases/compiler/extendGlobalThis.ts
index 1ad9f0552b4d6..7e0814fcbb90e 100644
--- a/tests/cases/compiler/extendGlobalThis.ts
+++ b/tests/cases/compiler/extendGlobalThis.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: extension.d.ts
 declare global {
     namespace globalThis  {
diff --git a/tests/cases/compiler/extendGlobalThis2.ts b/tests/cases/compiler/extendGlobalThis2.ts
index 4949c91cf22eb..1952c193951e4 100644
--- a/tests/cases/compiler/extendGlobalThis2.ts
+++ b/tests/cases/compiler/extendGlobalThis2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace globalThis {
     export function foo() { console.log("x"); }
 }
diff --git a/tests/cases/compiler/extendNonClassSymbol2.ts b/tests/cases/compiler/extendNonClassSymbol2.ts
index 7c8ded214a580..8d76d2e00e088 100644
--- a/tests/cases/compiler/extendNonClassSymbol2.ts
+++ b/tests/cases/compiler/extendNonClassSymbol2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function Foo() {
    this.x = 1;
 }
diff --git a/tests/cases/compiler/extendsUntypedModule.ts b/tests/cases/compiler/extendsUntypedModule.ts
index 0ebd9d0f72cf1..2cc741a2c2345 100644
--- a/tests/cases/compiler/extendsUntypedModule.ts
+++ b/tests/cases/compiler/extendsUntypedModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Test that extending an untyped module is an error, unlike extending unknownSymbol.
 // @noImplicitReferences: true
 // @noUnusedLocals: true
diff --git a/tests/cases/compiler/extension.ts b/tests/cases/compiler/extension.ts
index f412c4d700d7e..8fb0782206269 100644
--- a/tests/cases/compiler/extension.ts
+++ b/tests/cases/compiler/extension.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
     x;
 }
@@ -21,7 +22,7 @@ declare namespace M {
 var c=new M.C();
 c.pe;
 c.p;
-var i:I;
+declare var i:I;
 i.x;
 i.y;
 
diff --git a/tests/cases/compiler/externSemantics.ts b/tests/cases/compiler/externSemantics.ts
index 975af849997a2..47225a4d1b35e 100644
--- a/tests/cases/compiler/externSemantics.ts
+++ b/tests/cases/compiler/externSemantics.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare var x=10;
 declare var v;
 declare var y:number=3;
diff --git a/tests/cases/compiler/externSyntax.ts b/tests/cases/compiler/externSyntax.ts
index 429f94201572f..87c5491f121e8 100644
--- a/tests/cases/compiler/externSyntax.ts
+++ b/tests/cases/compiler/externSyntax.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare var v;
 declare namespace M {
     export class D {
diff --git a/tests/cases/compiler/externalModuleImmutableBindings.ts b/tests/cases/compiler/externalModuleImmutableBindings.ts
index 33e1b9894e176..691ba545399df 100644
--- a/tests/cases/compiler/externalModuleImmutableBindings.ts
+++ b/tests/cases/compiler/externalModuleImmutableBindings.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @Filename: f1.ts
 export var x = 1;
diff --git a/tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration.ts b/tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration.ts
index 55922da6ca8e6..569140ca0051d 100644
--- a/tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration.ts
+++ b/tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @Filename: externalModuleRefernceResolutionOrderInImportDeclaration_file1.ts
 export function foo() { };
diff --git a/tests/cases/compiler/fallFromLastCase1.ts b/tests/cases/compiler/fallFromLastCase1.ts
index d8037c61a96c8..a2b6446c5847e 100644
--- a/tests/cases/compiler/fallFromLastCase1.ts
+++ b/tests/cases/compiler/fallFromLastCase1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noFallthroughCasesInSwitch: true
 
 declare function use(a: string);
diff --git a/tests/cases/compiler/fallFromLastCase2.ts b/tests/cases/compiler/fallFromLastCase2.ts
index 231d3512dbe92..cd9f22f1191e4 100644
--- a/tests/cases/compiler/fallFromLastCase2.ts
+++ b/tests/cases/compiler/fallFromLastCase2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noFallthroughCasesInSwitch: true
 
 declare function use(a: string);
diff --git a/tests/cases/compiler/fatarrowfunctions.ts b/tests/cases/compiler/fatarrowfunctions.ts
index 2afa4c54b4a6a..b08c694a970a4 100644
--- a/tests/cases/compiler/fatarrowfunctions.ts
+++ b/tests/cases/compiler/fatarrowfunctions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 function foo(x:any) {
 	return x();
diff --git a/tests/cases/compiler/fatarrowfunctionsErrors.ts b/tests/cases/compiler/fatarrowfunctionsErrors.ts
index dde681c7036a0..cc40d69983b51 100644
--- a/tests/cases/compiler/fatarrowfunctionsErrors.ts
+++ b/tests/cases/compiler/fatarrowfunctionsErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 foo((...Far:any[])=>{return 0;})
 foo((1)=>{return 0;}); 
 foo((x?)=>{return x;})
diff --git a/tests/cases/compiler/fatarrowfunctionsInFunctionParameterDefaults.ts b/tests/cases/compiler/fatarrowfunctionsInFunctionParameterDefaults.ts
index 703854d4ab70a..30fbd5d8133a2 100644
--- a/tests/cases/compiler/fatarrowfunctionsInFunctionParameterDefaults.ts
+++ b/tests/cases/compiler/fatarrowfunctionsInFunctionParameterDefaults.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function fn(x = () => this, y = x()) {
 
     // should be 4
diff --git a/tests/cases/compiler/fatarrowfunctionsInFunctions.ts b/tests/cases/compiler/fatarrowfunctionsInFunctions.ts
index 67bbfeb163943..38030e63d78bd 100644
--- a/tests/cases/compiler/fatarrowfunctionsInFunctions.ts
+++ b/tests/cases/compiler/fatarrowfunctionsInFunctions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function setTimeout(expression: any, msec?: number, language?: any): number;
 
 var messenger = {
diff --git a/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors1.ts b/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors1.ts
index 814f1b41619e6..ea0888ac4ba1e 100644
--- a/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors1.ts
+++ b/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 (arg1?, arg2) => 101;
 (...arg?) => 102;
 (...arg) => 103;
diff --git a/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors2.ts b/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors2.ts
index 7e4b30a431cc1..4699773ba61f3 100644
--- a/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors2.ts
+++ b/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var tt1 = (a, (b, c)) => a+b+c;
 var tt2 = ((a), b, c) => a+b+c;
 
diff --git a/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors3.ts b/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors3.ts
index 779494197111e..80c32b32a55e8 100644
--- a/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors3.ts
+++ b/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors3.ts
@@ -1 +1,2 @@
+// @strict: false
 (...) => 105;
diff --git a/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors4.ts b/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors4.ts
index b4daf2cc3abfc..b8ff5a1c46e97 100644
--- a/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors4.ts
+++ b/tests/cases/compiler/fatarrowfunctionsOptionalArgsErrors4.ts
@@ -1,3 +1,4 @@
+// @strict: false
     false ? (arg?: number = 0) => 47 : null;
     false ? ((arg?: number = 0) => 57) : null;
     false ? null : (arg?: number = 0) => 67;
diff --git a/tests/cases/compiler/fillInMissingTypeArgsOnJSConstructCalls.ts b/tests/cases/compiler/fillInMissingTypeArgsOnJSConstructCalls.ts
index 8ef0f90318937..8628be04ac100 100644
--- a/tests/cases/compiler/fillInMissingTypeArgsOnJSConstructCalls.ts
+++ b/tests/cases/compiler/fillInMissingTypeArgsOnJSConstructCalls.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/compiler/findLast.ts b/tests/cases/compiler/findLast.ts
index ad0bddfb092c0..8e029bb4ce0e3 100644
--- a/tests/cases/compiler/findLast.ts
+++ b/tests/cases/compiler/findLast.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext, es2022
 
 const itemNumber: number | undefined = [0].findLast((item) => item === 0);
diff --git a/tests/cases/compiler/fixingTypeParametersRepeatedly1.ts b/tests/cases/compiler/fixingTypeParametersRepeatedly1.ts
index d02e434c61c9c..17c5d4851675e 100644
--- a/tests/cases/compiler/fixingTypeParametersRepeatedly1.ts
+++ b/tests/cases/compiler/fixingTypeParametersRepeatedly1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function f<T>(x: T, y: (p: T) => T, z: (p: T) => T): T;
 f("", x => null, x => x.toLowerCase());
 
diff --git a/tests/cases/compiler/fixingTypeParametersRepeatedly2.ts b/tests/cases/compiler/fixingTypeParametersRepeatedly2.ts
index b439838862f4e..98a066a073c12 100644
--- a/tests/cases/compiler/fixingTypeParametersRepeatedly2.ts
+++ b/tests/cases/compiler/fixingTypeParametersRepeatedly2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Base {
     baseProp;
 }
@@ -5,7 +6,7 @@ interface Derived extends Base {
     toBase(): Base;
 }
 
-var derived: Derived;
+declare var derived: Derived;
 
 declare function foo<T>(x: T, func: (p: T) => T): T;
 var result = foo(derived, d => d.toBase());
diff --git a/tests/cases/compiler/fixingTypeParametersRepeatedly3.ts b/tests/cases/compiler/fixingTypeParametersRepeatedly3.ts
index 1ffba2e50c6c2..719cc262776b9 100644
--- a/tests/cases/compiler/fixingTypeParametersRepeatedly3.ts
+++ b/tests/cases/compiler/fixingTypeParametersRepeatedly3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Base {
     baseProp;
 }
diff --git a/tests/cases/compiler/forIn.ts b/tests/cases/compiler/forIn.ts
index 8ea9aee493dbc..91d1a0a5d6675 100644
--- a/tests/cases/compiler/forIn.ts
+++ b/tests/cases/compiler/forIn.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var arr = null;
 for (var i:number in arr) { // error
     var x1 = arr[i];
diff --git a/tests/cases/compiler/forIn2.ts b/tests/cases/compiler/forIn2.ts
index a0bf14e7b5d10..e8ace8b02c568 100644
--- a/tests/cases/compiler/forIn2.ts
+++ b/tests/cases/compiler/forIn2.ts
@@ -1,2 +1,3 @@
+// @strict: false
 for (var i in 1) {
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/forInModule.ts b/tests/cases/compiler/forInModule.ts
index 92ef2b0eb1b1d..561a56061da3c 100644
--- a/tests/cases/compiler/forInModule.ts
+++ b/tests/cases/compiler/forInModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace Foo {
 	for (var i = 0; i < 1; i++) {
 		i+i;
diff --git a/tests/cases/compiler/forInStatement1.ts b/tests/cases/compiler/forInStatement1.ts
index 2d127b45bb343..5c42070334f5d 100644
--- a/tests/cases/compiler/forInStatement1.ts
+++ b/tests/cases/compiler/forInStatement1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var expr: any;
 for (var a in expr) {
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/forInStatement2.ts b/tests/cases/compiler/forInStatement2.ts
index 4e5ea37cc07f5..a2221bd13468d 100644
--- a/tests/cases/compiler/forInStatement2.ts
+++ b/tests/cases/compiler/forInStatement2.ts
@@ -1,3 +1,4 @@
-var expr: number;
+// @strict: false
+declare var expr: number;
 for (var a in expr) {
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/forInStatement3.ts b/tests/cases/compiler/forInStatement3.ts
index 9d0441ba3eca5..74c28e4ff2455 100644
--- a/tests/cases/compiler/forInStatement3.ts
+++ b/tests/cases/compiler/forInStatement3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function F<T>() {
   var expr: T;
   for (var a in expr) {
diff --git a/tests/cases/compiler/forInStatement4.ts b/tests/cases/compiler/forInStatement4.ts
index 4213e8b77feb8..bc1c4b0929fda 100644
--- a/tests/cases/compiler/forInStatement4.ts
+++ b/tests/cases/compiler/forInStatement4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var expr: any;
 for (var a: number in expr) {
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/forInStatement5.ts b/tests/cases/compiler/forInStatement5.ts
index 3ac2a94c17c10..a190903ed8dc5 100644
--- a/tests/cases/compiler/forInStatement5.ts
+++ b/tests/cases/compiler/forInStatement5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var a: string;
 var expr: any;
 for (a in expr) {
diff --git a/tests/cases/compiler/forInStatement6.ts b/tests/cases/compiler/forInStatement6.ts
index c4e2988897ef9..30789e2a6afeb 100644
--- a/tests/cases/compiler/forInStatement6.ts
+++ b/tests/cases/compiler/forInStatement6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var a: any;
 var expr: any;
 for (a in expr) {
diff --git a/tests/cases/compiler/forInStatement7.ts b/tests/cases/compiler/forInStatement7.ts
index 381fcc475791c..55a735b0fe058 100644
--- a/tests/cases/compiler/forInStatement7.ts
+++ b/tests/cases/compiler/forInStatement7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var a: number;
 var expr: any;
 for (a in expr) {
diff --git a/tests/cases/compiler/forStatementInnerComments.ts b/tests/cases/compiler/forStatementInnerComments.ts
index 14ef4554b06a8..12258d37487d0 100644
--- a/tests/cases/compiler/forStatementInnerComments.ts
+++ b/tests/cases/compiler/forStatementInnerComments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 declare var a;
 /*0*/ for /*1*/ ( /*2*/ var /*3*/ x /*4*/ in /*5*/ a /*6*/) /*7*/ {}
diff --git a/tests/cases/compiler/funClodule.ts b/tests/cases/compiler/funClodule.ts
index 24836852384ff..48e83e9afec0c 100644
--- a/tests/cases/compiler/funClodule.ts
+++ b/tests/cases/compiler/funClodule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function foo();
 declare namespace foo {
     export function x(): any;
diff --git a/tests/cases/compiler/funcdecl.ts b/tests/cases/compiler/funcdecl.ts
index b4ef1a3cbafc8..cec1b146ce3a1 100644
--- a/tests/cases/compiler/funcdecl.ts
+++ b/tests/cases/compiler/funcdecl.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 function simpleFunc() {
     return "this is my simple func";
diff --git a/tests/cases/compiler/functionAssignment.ts b/tests/cases/compiler/functionAssignment.ts
index 4d05e9c5b4a12..d15c88a0d4188 100644
--- a/tests/cases/compiler/functionAssignment.ts
+++ b/tests/cases/compiler/functionAssignment.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f(n: Function) { }
 f(function () { });
 
@@ -9,8 +10,8 @@ interface baz {
     get(callback: Function): number;
 }
 
-var barbaz: baz;
-var test: foo;
+declare var barbaz: baz;
+declare var test: foo;
 
 test.get(function (param) {
     var x = barbaz.get(function () { });
diff --git a/tests/cases/compiler/functionAssignmentError.ts b/tests/cases/compiler/functionAssignmentError.ts
index fd91cc2741914..4b2ca005403f6 100644
--- a/tests/cases/compiler/functionAssignmentError.ts
+++ b/tests/cases/compiler/functionAssignmentError.ts
@@ -1,2 +1,3 @@
+// @strict: false
 var func = function (){return "ONE";};
 func = function (){return "ONE";};
\ No newline at end of file
diff --git a/tests/cases/compiler/functionCall18.ts b/tests/cases/compiler/functionCall18.ts
index 848580db729c8..1366ce47f8403 100644
--- a/tests/cases/compiler/functionCall18.ts
+++ b/tests/cases/compiler/functionCall18.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Repro from #26835
 declare function foo<T>(a: T, b: T);
 declare function foo(a: {});
diff --git a/tests/cases/compiler/functionCall5.ts b/tests/cases/compiler/functionCall5.ts
index 7b253d0c78ffa..bb344baa0f8c3 100644
--- a/tests/cases/compiler/functionCall5.ts
+++ b/tests/cases/compiler/functionCall5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace m1 { export class c1 { public a; }} 
 function foo():m1.c1{return new m1.c1();}; 
 var x = foo();
\ No newline at end of file
diff --git a/tests/cases/compiler/functionCall7.ts b/tests/cases/compiler/functionCall7.ts
index e36c4ec36ae35..14b21237ac099 100644
--- a/tests/cases/compiler/functionCall7.ts
+++ b/tests/cases/compiler/functionCall7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace m1 { export class c1 { public a; }}
 function foo(a:m1.c1){ a.a = 1; }; 
 var myC = new m1.c1(); 
diff --git a/tests/cases/compiler/functionDeclarationWithArgumentOfTypeFunctionTypeArray.ts b/tests/cases/compiler/functionDeclarationWithArgumentOfTypeFunctionTypeArray.ts
index 105fb1acff3fb..a07dca3a963fb 100644
--- a/tests/cases/compiler/functionDeclarationWithArgumentOfTypeFunctionTypeArray.ts
+++ b/tests/cases/compiler/functionDeclarationWithArgumentOfTypeFunctionTypeArray.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 function foo(args: { (x): number }[]) {
     return args.length;
diff --git a/tests/cases/compiler/functionExpressionAndLambdaMatchesFunction.ts b/tests/cases/compiler/functionExpressionAndLambdaMatchesFunction.ts
index f11519501d047..ee08de1ca390f 100644
--- a/tests/cases/compiler/functionExpressionAndLambdaMatchesFunction.ts
+++ b/tests/cases/compiler/functionExpressionAndLambdaMatchesFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class CDoc {
         constructor() {
         function doSomething(a: Function) {
diff --git a/tests/cases/compiler/functionExpressionNames.ts b/tests/cases/compiler/functionExpressionNames.ts
index 93c5f228da5c6..052fc04a29072 100644
--- a/tests/cases/compiler/functionExpressionNames.ts
+++ b/tests/cases/compiler/functionExpressionNames.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @noEmit: true
 // @checkJs: true
diff --git a/tests/cases/compiler/functionInIfStatementInModule.ts b/tests/cases/compiler/functionInIfStatementInModule.ts
index 485928b0b9892..1851d511e4296 100644
--- a/tests/cases/compiler/functionInIfStatementInModule.ts
+++ b/tests/cases/compiler/functionInIfStatementInModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
  
 namespace Midori
 {
diff --git a/tests/cases/compiler/functionOverloadAmbiguity1.ts b/tests/cases/compiler/functionOverloadAmbiguity1.ts
index 019ea748f2c80..54aceeb2e9920 100644
--- a/tests/cases/compiler/functionOverloadAmbiguity1.ts
+++ b/tests/cases/compiler/functionOverloadAmbiguity1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function callb(lam: (l: number) => void );
 function callb(lam: (n: string) => void );
 function callb(a) { }
diff --git a/tests/cases/compiler/functionOverloadImplementationOfWrongName.ts b/tests/cases/compiler/functionOverloadImplementationOfWrongName.ts
index 50458f6ea9903..8171f94163b30 100644
--- a/tests/cases/compiler/functionOverloadImplementationOfWrongName.ts
+++ b/tests/cases/compiler/functionOverloadImplementationOfWrongName.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(x);
 function foo(x, y);
 function bar() { }
\ No newline at end of file
diff --git a/tests/cases/compiler/functionOverloadImplementationOfWrongName2.ts b/tests/cases/compiler/functionOverloadImplementationOfWrongName2.ts
index b62b8d01deb47..43957b9967015 100644
--- a/tests/cases/compiler/functionOverloadImplementationOfWrongName2.ts
+++ b/tests/cases/compiler/functionOverloadImplementationOfWrongName2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(x);
 function bar() { }
 function foo(x, y);
\ No newline at end of file
diff --git a/tests/cases/compiler/functionOverloads1.ts b/tests/cases/compiler/functionOverloads1.ts
index 8bbb452d9be0a..77f91d152b517 100644
--- a/tests/cases/compiler/functionOverloads1.ts
+++ b/tests/cases/compiler/functionOverloads1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo();
 1+1;
 function foo():string { return "a" }
\ No newline at end of file
diff --git a/tests/cases/compiler/functionOverloads10.ts b/tests/cases/compiler/functionOverloads10.ts
index 1c0bbbfc7d45d..13871c12a766a 100644
--- a/tests/cases/compiler/functionOverloads10.ts
+++ b/tests/cases/compiler/functionOverloads10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(foo:string, bar:number);
 function foo(foo:string);
 function foo(foo:any){ }
diff --git a/tests/cases/compiler/functionOverloads11.ts b/tests/cases/compiler/functionOverloads11.ts
index e70b2140e758b..e6aee444f8331 100644
--- a/tests/cases/compiler/functionOverloads11.ts
+++ b/tests/cases/compiler/functionOverloads11.ts
@@ -1,2 +1,3 @@
+// @strict: false
 function foo():number;
 function foo():string { return "" }
diff --git a/tests/cases/compiler/functionOverloads12.ts b/tests/cases/compiler/functionOverloads12.ts
index 48a8af06cc5de..44284ddc6fecd 100644
--- a/tests/cases/compiler/functionOverloads12.ts
+++ b/tests/cases/compiler/functionOverloads12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 
 function foo():string;
diff --git a/tests/cases/compiler/functionOverloads13.ts b/tests/cases/compiler/functionOverloads13.ts
index b5bd8cd2ec266..db3b386844ed0 100644
--- a/tests/cases/compiler/functionOverloads13.ts
+++ b/tests/cases/compiler/functionOverloads13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(bar:number):string;
 function foo(bar:number):number;
 function foo(bar?:number):any { return "" }
diff --git a/tests/cases/compiler/functionOverloads14.ts b/tests/cases/compiler/functionOverloads14.ts
index 7159f1d106cd0..ee96f58580bd6 100644
--- a/tests/cases/compiler/functionOverloads14.ts
+++ b/tests/cases/compiler/functionOverloads14.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo():{a:number;}
 function foo():{a:string;}
 function foo():{a:any;} { return {a:1} }
diff --git a/tests/cases/compiler/functionOverloads15.ts b/tests/cases/compiler/functionOverloads15.ts
index 841fc2442fd6b..70bf3d5973864 100644
--- a/tests/cases/compiler/functionOverloads15.ts
+++ b/tests/cases/compiler/functionOverloads15.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(foo:{a:string; b:number;}):string;
 function foo(foo:{a:string; b:number;}):number;
 function foo(foo:{a:string; b?:number;}):any { return "" }
diff --git a/tests/cases/compiler/functionOverloads16.ts b/tests/cases/compiler/functionOverloads16.ts
index c2331fe90db4e..b98234dc94971 100644
--- a/tests/cases/compiler/functionOverloads16.ts
+++ b/tests/cases/compiler/functionOverloads16.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(foo:{a:string;}):string;
 function foo(foo:{a:string;}):number;
 function foo(foo:{a:string; b?:number;}):any { return "" }
diff --git a/tests/cases/compiler/functionOverloads17.ts b/tests/cases/compiler/functionOverloads17.ts
index 73e329ad50198..067e1cceca61e 100644
--- a/tests/cases/compiler/functionOverloads17.ts
+++ b/tests/cases/compiler/functionOverloads17.ts
@@ -1,2 +1,3 @@
+// @strict: false
 function foo():{a:number;}
 function foo():{a:string;} { return {a:""} }
diff --git a/tests/cases/compiler/functionOverloads18.ts b/tests/cases/compiler/functionOverloads18.ts
index a426746338540..ff7d289970e75 100644
--- a/tests/cases/compiler/functionOverloads18.ts
+++ b/tests/cases/compiler/functionOverloads18.ts
@@ -1,2 +1,3 @@
+// @strict: false
 function foo(bar:{a:number;});
 function foo(bar:{a:string;}) { return {a:""} }
diff --git a/tests/cases/compiler/functionOverloads19.ts b/tests/cases/compiler/functionOverloads19.ts
index a593090f63f93..c7eee85a638de 100644
--- a/tests/cases/compiler/functionOverloads19.ts
+++ b/tests/cases/compiler/functionOverloads19.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(bar:{b:string;});
 function foo(bar:{a:string;});
 function foo(bar:{a:any;}) { return {a:""} }
diff --git a/tests/cases/compiler/functionOverloads21.ts b/tests/cases/compiler/functionOverloads21.ts
index ec306db40e486..965df6688011c 100644
--- a/tests/cases/compiler/functionOverloads21.ts
+++ b/tests/cases/compiler/functionOverloads21.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(bar:{a:number;}[]);
 function foo(bar:{a:number; b:string;}[]);
 function foo(bar:{a:any; b?:string;}[]) { return 0 }
diff --git a/tests/cases/compiler/functionOverloads23.ts b/tests/cases/compiler/functionOverloads23.ts
index 5432b76137f81..9c25252adb7b0 100644
--- a/tests/cases/compiler/functionOverloads23.ts
+++ b/tests/cases/compiler/functionOverloads23.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(bar:(b:string)=>void);
 function foo(bar:(a:number)=>void);
 function foo(bar:(a?)=>void) { return 0 }
diff --git a/tests/cases/compiler/functionOverloads24.ts b/tests/cases/compiler/functionOverloads24.ts
index 44aac5ced2133..df1b340b03941 100644
--- a/tests/cases/compiler/functionOverloads24.ts
+++ b/tests/cases/compiler/functionOverloads24.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(bar:number):(b:string)=>void;
 function foo(bar:string):(a:number)=>void;
 function foo(bar:any):(a)=>void { return function(){} }
diff --git a/tests/cases/compiler/functionOverloads44.ts b/tests/cases/compiler/functionOverloads44.ts
index 20a7ed540f0fd..7407c61cd2ee6 100644
--- a/tests/cases/compiler/functionOverloads44.ts
+++ b/tests/cases/compiler/functionOverloads44.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Animal { animal }
 interface Dog extends Animal { dog }
 interface Cat extends Animal { cat }
diff --git a/tests/cases/compiler/functionOverloads45.ts b/tests/cases/compiler/functionOverloads45.ts
index 6210bd13427e5..f03cfd5919423 100644
--- a/tests/cases/compiler/functionOverloads45.ts
+++ b/tests/cases/compiler/functionOverloads45.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Animal { animal }
 interface Dog extends Animal { dog }
 interface Cat extends Animal { cat }
diff --git a/tests/cases/compiler/functionOverloads5.ts b/tests/cases/compiler/functionOverloads5.ts
index 77dcfe5b6d8c0..56d586800203d 100644
--- a/tests/cases/compiler/functionOverloads5.ts
+++ b/tests/cases/compiler/functionOverloads5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class baz { 
   public foo();
   private foo(bar?:any){ }
diff --git a/tests/cases/compiler/functionOverloads6.ts b/tests/cases/compiler/functionOverloads6.ts
index dc64d397906c4..2d7b5737fecc3 100644
--- a/tests/cases/compiler/functionOverloads6.ts
+++ b/tests/cases/compiler/functionOverloads6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class foo { 
    static fnOverload();
    static fnOverload(foo:string);
diff --git a/tests/cases/compiler/functionOverloads7.ts b/tests/cases/compiler/functionOverloads7.ts
index bb76547f9cb48..d22b3286f9445 100644
--- a/tests/cases/compiler/functionOverloads7.ts
+++ b/tests/cases/compiler/functionOverloads7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class foo { 
    private bar();
    private bar(foo: string);
diff --git a/tests/cases/compiler/functionOverloads8.ts b/tests/cases/compiler/functionOverloads8.ts
index 2cf4a810bcb45..4d08f2ad8648b 100644
--- a/tests/cases/compiler/functionOverloads8.ts
+++ b/tests/cases/compiler/functionOverloads8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo();
 function foo(foo:string);
 function foo(foo?:any){ return '' }
diff --git a/tests/cases/compiler/functionOverloads9.ts b/tests/cases/compiler/functionOverloads9.ts
index a770eba46e692..2ab5f719610ae 100644
--- a/tests/cases/compiler/functionOverloads9.ts
+++ b/tests/cases/compiler/functionOverloads9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(foo:string);
 function foo(foo?:string){ return '' };
 var x = foo('foo');
diff --git a/tests/cases/compiler/functionParameterArityMismatch.ts b/tests/cases/compiler/functionParameterArityMismatch.ts
index 1bb627b64f861..f5d99ddafedc0 100644
--- a/tests/cases/compiler/functionParameterArityMismatch.ts
+++ b/tests/cases/compiler/functionParameterArityMismatch.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function f1(a: number);
 declare function f1(a: number, b: number, c: number);
 f1();
diff --git a/tests/cases/compiler/functionSignatureAssignmentCompat1.ts b/tests/cases/compiler/functionSignatureAssignmentCompat1.ts
index 93684bbaf507d..c05104da4b9aa 100644
--- a/tests/cases/compiler/functionSignatureAssignmentCompat1.ts
+++ b/tests/cases/compiler/functionSignatureAssignmentCompat1.ts
@@ -5,7 +5,7 @@ interface Parsers {
     raw: ParserFunc;
     readline(delimiter?: string): ParserFunc;
 }
-var parsers: Parsers;
+declare var parsers: Parsers;
 var c: ParserFunc = parsers.raw; // ok!
 var d: ParserFunc = parsers.readline; // not ok
 var e: ParserFunc = parsers.readline(); // ok
\ No newline at end of file
diff --git a/tests/cases/compiler/functionSubtypingOfVarArgs.ts b/tests/cases/compiler/functionSubtypingOfVarArgs.ts
index d70e385aabc68..10cf42faceb45 100644
--- a/tests/cases/compiler/functionSubtypingOfVarArgs.ts
+++ b/tests/cases/compiler/functionSubtypingOfVarArgs.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class EventBase {
     private _listeners = [];
 
diff --git a/tests/cases/compiler/functionSubtypingOfVarArgs2.ts b/tests/cases/compiler/functionSubtypingOfVarArgs2.ts
index 994dfb9c5e231..91e5c65891c47 100644
--- a/tests/cases/compiler/functionSubtypingOfVarArgs2.ts
+++ b/tests/cases/compiler/functionSubtypingOfVarArgs2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class EventBase {
     private _listeners: { (...args: any[]): void; }[] = [];
 
diff --git a/tests/cases/compiler/functionTypeArgumentArityErrors.ts b/tests/cases/compiler/functionTypeArgumentArityErrors.ts
index 5cf681effa61d..39caf72fe0f45 100644
--- a/tests/cases/compiler/functionTypeArgumentArityErrors.ts
+++ b/tests/cases/compiler/functionTypeArgumentArityErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Overloaded functions with default type arguments
 declare function f1<A = any>(): void;
 declare function f1<A, B, C, D = any>(): void;
diff --git a/tests/cases/compiler/functionTypesLackingReturnTypes.ts b/tests/cases/compiler/functionTypesLackingReturnTypes.ts
index f1dac4712876f..5aebd338719fe 100644
--- a/tests/cases/compiler/functionTypesLackingReturnTypes.ts
+++ b/tests/cases/compiler/functionTypesLackingReturnTypes.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 // Error (no '=>')
 function f(x: ()) {
diff --git a/tests/cases/compiler/functionWithDefaultParameterWithNoStatements8.ts b/tests/cases/compiler/functionWithDefaultParameterWithNoStatements8.ts
index ae0689a7e29a4..700589f94929e 100644
--- a/tests/cases/compiler/functionWithDefaultParameterWithNoStatements8.ts
+++ b/tests/cases/compiler/functionWithDefaultParameterWithNoStatements8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(a = undefined) { }
 
 function bar(a = undefined) {
diff --git a/tests/cases/compiler/generatorES6InAMDModule.ts b/tests/cases/compiler/generatorES6InAMDModule.ts
index a79170c685481..d928ac3377cc1 100644
--- a/tests/cases/compiler/generatorES6InAMDModule.ts
+++ b/tests/cases/compiler/generatorES6InAMDModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 // @module: amd
 export function* foo() {
diff --git a/tests/cases/compiler/generatorES6_1.ts b/tests/cases/compiler/generatorES6_1.ts
index 1f2137b8403d6..f5072999f4acb 100644
--- a/tests/cases/compiler/generatorES6_1.ts
+++ b/tests/cases/compiler/generatorES6_1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 function* foo() {
     yield
diff --git a/tests/cases/compiler/generatorES6_6.ts b/tests/cases/compiler/generatorES6_6.ts
index 708e0e9d52560..1a91195128871 100644
--- a/tests/cases/compiler/generatorES6_6.ts
+++ b/tests/cases/compiler/generatorES6_6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 class C {
   *[Symbol.iterator]() {
diff --git a/tests/cases/compiler/genericArrayAssignment1.ts b/tests/cases/compiler/genericArrayAssignment1.ts
index a10c91cfd3bbf..9e5b613b510c1 100644
--- a/tests/cases/compiler/genericArrayAssignment1.ts
+++ b/tests/cases/compiler/genericArrayAssignment1.ts
@@ -1,4 +1,4 @@
-var s: string[];
-var n: number[];
+declare var s: string[];
+declare var n: number[];
 
 s = n;
\ No newline at end of file
diff --git a/tests/cases/compiler/genericArrayAssignmentCompatErrors.ts b/tests/cases/compiler/genericArrayAssignmentCompatErrors.ts
index 3e58bafebef36..1085cf0fe1224 100644
--- a/tests/cases/compiler/genericArrayAssignmentCompatErrors.ts
+++ b/tests/cases/compiler/genericArrayAssignmentCompatErrors.ts
@@ -1,8 +1,8 @@
 var myCars=new Array(); 
 var myCars2 = new [];
 var myCars3 = new Array({});
-var myCars4: Array; // error
-var myCars5: Array<any>[];
+declare var myCars4: Array; // error
+declare var myCars5: Array<any>[];
  
 myCars = myCars2;
 myCars = myCars3;
diff --git a/tests/cases/compiler/genericCallWithFixedArguments.ts b/tests/cases/compiler/genericCallWithFixedArguments.ts
index 35f19f44886e1..f5cfd48bb3bd5 100644
--- a/tests/cases/compiler/genericCallWithFixedArguments.ts
+++ b/tests/cases/compiler/genericCallWithFixedArguments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A { foo() { } }
 class B { bar() { }} 
 
diff --git a/tests/cases/compiler/genericClassPropertyInheritanceSpecialization.ts b/tests/cases/compiler/genericClassPropertyInheritanceSpecialization.ts
index ae0763e712f8e..3500a01db8079 100644
--- a/tests/cases/compiler/genericClassPropertyInheritanceSpecialization.ts
+++ b/tests/cases/compiler/genericClassPropertyInheritanceSpecialization.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface KnockoutObservableBase<T> {
     peek(): T;
     (): T;
diff --git a/tests/cases/compiler/genericClassWithStaticsUsingTypeArguments.ts b/tests/cases/compiler/genericClassWithStaticsUsingTypeArguments.ts
index 08e22f5d64cc5..7f2638de366ae 100644
--- a/tests/cases/compiler/genericClassWithStaticsUsingTypeArguments.ts
+++ b/tests/cases/compiler/genericClassWithStaticsUsingTypeArguments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Should be error to use 'T' in all declarations within Foo.
 class Foo<T> {
     static a = (n: T) => { };
diff --git a/tests/cases/compiler/genericClassesInModule2.ts b/tests/cases/compiler/genericClassesInModule2.ts
index 8894c3dc38f70..92d2bccbb254d 100644
--- a/tests/cases/compiler/genericClassesInModule2.ts
+++ b/tests/cases/compiler/genericClassesInModule2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: amd
 export class A<T1>{
     constructor( public callback: (self: A<T1>) => void) {
diff --git a/tests/cases/compiler/genericCombinators2.ts b/tests/cases/compiler/genericCombinators2.ts
index d221e37e2a8dc..8ba56a01029db 100644
--- a/tests/cases/compiler/genericCombinators2.ts
+++ b/tests/cases/compiler/genericCombinators2.ts
@@ -9,8 +9,8 @@ interface Combinators {
     map<T, U, V>(c: Collection<T, U>, f: (x: T, y: U) => V): Collection<T, V>;
 }
 
-var _: Combinators;
-var c2: Collection<number, string>;
+declare var _: Combinators;
+declare var c2: Collection<number, string>;
 var rf1 = (x: number, y: string) => { return x.toFixed() };
 var r5a = _.map<number, string, Date>(c2, (x, y) => { return x.toFixed() });
 var r5b = _.map<number, string, Date>(c2, rf1);
\ No newline at end of file
diff --git a/tests/cases/compiler/genericConstraint2.ts b/tests/cases/compiler/genericConstraint2.ts
index 7d739da094bd3..a939b269a073c 100644
--- a/tests/cases/compiler/genericConstraint2.ts
+++ b/tests/cases/compiler/genericConstraint2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Comparable<T> {
     comparer(other: T): number;
 }
diff --git a/tests/cases/compiler/genericConstraintSatisfaction1.ts b/tests/cases/compiler/genericConstraintSatisfaction1.ts
index 976c9535c0338..68e3b3073d551 100644
--- a/tests/cases/compiler/genericConstraintSatisfaction1.ts
+++ b/tests/cases/compiler/genericConstraintSatisfaction1.ts
@@ -3,4 +3,5 @@ interface I<S> {
 }
  
 var x: I<{s: string}>
+declare var x: I<{s: string}>
 x.f({s: 1})
diff --git a/tests/cases/compiler/genericConstructSignatureInInterface.ts b/tests/cases/compiler/genericConstructSignatureInInterface.ts
index b347fd3d80518..c1dd467483a20 100644
--- a/tests/cases/compiler/genericConstructSignatureInInterface.ts
+++ b/tests/cases/compiler/genericConstructSignatureInInterface.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface C {
     new <T>(x: T);
 }
diff --git a/tests/cases/compiler/genericConstructorFunction1.ts b/tests/cases/compiler/genericConstructorFunction1.ts
index 1b6330fb63aca..cb1efab977a55 100644
--- a/tests/cases/compiler/genericConstructorFunction1.ts
+++ b/tests/cases/compiler/genericConstructorFunction1.ts
@@ -1,5 +1,5 @@
 function f1<T>(args: T) {
-    var v1: { [index: string]: new (arg: T) => Date };
+    var v1!: { [index: string]: new (arg: T) => Date };
     var v2 = v1['test'];
     v2(args); 
     return new v2(args); // used to give error
@@ -8,7 +8,7 @@ function f1<T>(args: T) {
 
 interface I1<T> { new (arg: T): Date };
 function f2<T>(args: T) {
-    var v1: { [index: string]: I1<T> };
+    var v1!: { [index: string]: I1<T> };
     var v2 = v1['test'];
     var y = v2(args); 
     return new v2(args); // used to give error
diff --git a/tests/cases/compiler/genericDefaultsJs.ts b/tests/cases/compiler/genericDefaultsJs.ts
index 6aa3640d96195..a433ca249e74b 100644
--- a/tests/cases/compiler/genericDefaultsJs.ts
+++ b/tests/cases/compiler/genericDefaultsJs.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkJs: true
 // @allowJs: true
 // @noEmit: true
diff --git a/tests/cases/compiler/genericDerivedTypeWithSpecializedBase.ts b/tests/cases/compiler/genericDerivedTypeWithSpecializedBase.ts
index ab62f1f5b25a9..43ecf5b219d00 100644
--- a/tests/cases/compiler/genericDerivedTypeWithSpecializedBase.ts
+++ b/tests/cases/compiler/genericDerivedTypeWithSpecializedBase.ts
@@ -6,6 +6,6 @@ class B<U> extends A<string> {
     y: U;
 }
 
-var x: A<number>;
-var y: B<number>;
+declare var x: A<number>;
+declare var y: B<number>;
 x = y;  // error
diff --git a/tests/cases/compiler/genericDerivedTypeWithSpecializedBase2.ts b/tests/cases/compiler/genericDerivedTypeWithSpecializedBase2.ts
index b116f32acf608..025fc6c91d562 100644
--- a/tests/cases/compiler/genericDerivedTypeWithSpecializedBase2.ts
+++ b/tests/cases/compiler/genericDerivedTypeWithSpecializedBase2.ts
@@ -6,6 +6,6 @@ class B<U> extends A<string> {
     y: U;
 }
 
-var x: A<{ length: number; foo: number }>;
-var y: B<number>;
+declare var x: A<{ length: number; foo: number }>;
+declare var y: B<number>;
 x = y;  // error
diff --git a/tests/cases/compiler/genericFunctionCallSignatureReturnTypeMismatch.ts b/tests/cases/compiler/genericFunctionCallSignatureReturnTypeMismatch.ts
index 7cbef9329638f..09f49a61ec57b 100644
--- a/tests/cases/compiler/genericFunctionCallSignatureReturnTypeMismatch.ts
+++ b/tests/cases/compiler/genericFunctionCallSignatureReturnTypeMismatch.ts
@@ -1,8 +1,8 @@
 interface Array<T> {}
 
-var f : { <T>(x:T): T; }
+declare var f : { <T>(x:T): T; }
 
-var g : { <S>() : S[]; };
+declare var g : { <S>() : S[]; };
 f = g;
 
 var s = f("str").toUpperCase();
diff --git a/tests/cases/compiler/genericFunctionSpecializations1.ts b/tests/cases/compiler/genericFunctionSpecializations1.ts
index 7023b9d045ce2..abb63a16245dc 100644
--- a/tests/cases/compiler/genericFunctionSpecializations1.ts
+++ b/tests/cases/compiler/genericFunctionSpecializations1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo3<T>(test: string); // error
 function foo3<T>(test: T) { }
 
diff --git a/tests/cases/compiler/genericFunctionsWithOptionalParameters2.ts b/tests/cases/compiler/genericFunctionsWithOptionalParameters2.ts
index 9f1c1211afad5..d00a78523ec3f 100644
--- a/tests/cases/compiler/genericFunctionsWithOptionalParameters2.ts
+++ b/tests/cases/compiler/genericFunctionsWithOptionalParameters2.ts
@@ -2,7 +2,7 @@ interface Utils {
    fold<T, S>(c: Array<T>, folder?: (s: S, t: T) => T, init?: S): T;
 }
 
-var utils: Utils;
+declare var utils: Utils;
 
 utils.fold(); // error
 utils.fold(null); // no error
diff --git a/tests/cases/compiler/genericImplements.ts b/tests/cases/compiler/genericImplements.ts
index b6b76669b4227..b2468e06352bb 100644
--- a/tests/cases/compiler/genericImplements.ts
+++ b/tests/cases/compiler/genericImplements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A { a; };
 class B { b; };
 interface I {
diff --git a/tests/cases/compiler/genericLambaArgWithoutTypeArguments.ts b/tests/cases/compiler/genericLambaArgWithoutTypeArguments.ts
index a655d2f5ab0c2..f855f13bba616 100644
--- a/tests/cases/compiler/genericLambaArgWithoutTypeArguments.ts
+++ b/tests/cases/compiler/genericLambaArgWithoutTypeArguments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Foo<T> {
    x: T;
 }
diff --git a/tests/cases/compiler/genericOverloadSignatures.ts b/tests/cases/compiler/genericOverloadSignatures.ts
index e68e931e384f9..0da4233de63fe 100644
--- a/tests/cases/compiler/genericOverloadSignatures.ts
+++ b/tests/cases/compiler/genericOverloadSignatures.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface A {
     <T>(x: T): void;
     <T>(x: T): void;
diff --git a/tests/cases/compiler/genericPrototypeProperty2.ts b/tests/cases/compiler/genericPrototypeProperty2.ts
index ba3c22d55430f..e8af247dc2735 100644
--- a/tests/cases/compiler/genericPrototypeProperty2.ts
+++ b/tests/cases/compiler/genericPrototypeProperty2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface EventTarget { x } 
 class BaseEvent {
     target: EventTarget;
diff --git a/tests/cases/compiler/genericSpecializations3.ts b/tests/cases/compiler/genericSpecializations3.ts
index f19ca0c72ba90..3841648b1f83f 100644
--- a/tests/cases/compiler/genericSpecializations3.ts
+++ b/tests/cases/compiler/genericSpecializations3.ts
@@ -2,26 +2,26 @@ interface IFoo<T> {
     foo(x: T): T;
 }
 
-var iFoo: IFoo<number>;
+declare var iFoo: IFoo<number>;
 iFoo.foo(1);
 
 class IntFooBad implements IFoo<number> { // error
     foo(x: string): string { return null; }
 }
 
-var intFooBad: IntFooBad;
+declare var intFooBad: IntFooBad;
 
 class IntFoo implements IFoo<number> {
     foo(x: number): number { return null; }
 }
 
-var intFoo: IntFoo;
+declare var intFoo: IntFoo;
 
 class StringFoo2 implements IFoo<string> {
     foo(x: string): string { return null; }
 }
 
-var stringFoo2: StringFoo2;
+declare var stringFoo2: StringFoo2;
 stringFoo2.foo("hm");
 
 
diff --git a/tests/cases/compiler/genericTypeAssertions3.ts b/tests/cases/compiler/genericTypeAssertions3.ts
index b9d4cccd5a447..b4943b27ddd60 100644
--- a/tests/cases/compiler/genericTypeAssertions3.ts
+++ b/tests/cases/compiler/genericTypeAssertions3.ts
@@ -1,2 +1,3 @@
+// @strict: false
 var r = < <T>(x: T) => T > ((x) => { return null; }); // bug was 'could not find dotted symbol T' on x's annotation in the type assertion instead of no error
 var s = < <T>(x: T) => T > ((x: any) => { return null; }); // no error
diff --git a/tests/cases/compiler/genericTypeAssertions6.ts b/tests/cases/compiler/genericTypeAssertions6.ts
index 4fa99031033f6..866a1fb080fe0 100644
--- a/tests/cases/compiler/genericTypeAssertions6.ts
+++ b/tests/cases/compiler/genericTypeAssertions6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A<T,U> {
     constructor(x) {
         var y = <T>x;
@@ -20,5 +21,5 @@ class B<T extends Date, U extends Date> extends A<T, U> {
     }
 }
 
-var b: B<Date, Date>;
+declare var b: B<Date, Date>;
 var c: A<Date, Date> = <A<Date, Date>>b;
\ No newline at end of file
diff --git a/tests/cases/compiler/genericTypeParameterEquivalence2.ts b/tests/cases/compiler/genericTypeParameterEquivalence2.ts
index 7557e0b8fe733..1c46d9e8c8e4b 100644
--- a/tests/cases/compiler/genericTypeParameterEquivalence2.ts
+++ b/tests/cases/compiler/genericTypeParameterEquivalence2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // compose :: (b->c) -> (a->b) -> (a->c)
 function compose<A, B, C>(f: (b: B) => C, g: (a:A) => B): (a:A) => C {
     return function (a:A) : C {
diff --git a/tests/cases/compiler/genericWithOpenTypeParameters1.ts b/tests/cases/compiler/genericWithOpenTypeParameters1.ts
index 4a6b3d6e7d371..25cbbb6f2d28c 100644
--- a/tests/cases/compiler/genericWithOpenTypeParameters1.ts
+++ b/tests/cases/compiler/genericWithOpenTypeParameters1.ts
@@ -2,7 +2,7 @@ class B<T> {
    foo(x: T): T { return null; }
 }
 
-var x: B<number>;
+declare var x: B<number>;
 x.foo(1); // no error
 var f = <T>(x: B<T>) => { return x.foo(1); } // error
 var f2 = <T>(x: B<T>) => { return x.foo<T>(1); } // error
diff --git a/tests/cases/compiler/generics4.ts b/tests/cases/compiler/generics4.ts
index f1e8be9614d3f..5aa9a3eaca892 100644
--- a/tests/cases/compiler/generics4.ts
+++ b/tests/cases/compiler/generics4.ts
@@ -1,7 +1,7 @@
 class C<T> { private x: T; }
 interface X { f(): string; }
 interface Y { f(): boolean; }
-var a: C<X>;
-var b: C<Y>;
+declare var a: C<X>;
+declare var b: C<Y>;
 
 a = b; // Not ok - return types of "f" are different
\ No newline at end of file
diff --git a/tests/cases/compiler/genericsWithDuplicateTypeParameters1.ts b/tests/cases/compiler/genericsWithDuplicateTypeParameters1.ts
index 5d4797b352862..91d11a2649ddd 100644
--- a/tests/cases/compiler/genericsWithDuplicateTypeParameters1.ts
+++ b/tests/cases/compiler/genericsWithDuplicateTypeParameters1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f<x, x>() { }
 function f2<X, X>(a: X, b: X): X { return null; }
 class C<X, X> {
diff --git a/tests/cases/compiler/getAndSetAsMemberNames.ts b/tests/cases/compiler/getAndSetAsMemberNames.ts
index bae36677f8eb3..f1d859dbb8b7c 100644
--- a/tests/cases/compiler/getAndSetAsMemberNames.ts
+++ b/tests/cases/compiler/getAndSetAsMemberNames.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C1 {
     set: boolean;
     get = 1;
diff --git a/tests/cases/compiler/getterSetterNonAccessor.ts b/tests/cases/compiler/getterSetterNonAccessor.ts
index 4e52d5f90d372..302d248f1f4ec 100644
--- a/tests/cases/compiler/getterSetterNonAccessor.ts
+++ b/tests/cases/compiler/getterSetterNonAccessor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function getFunc():any{return 0;}
 function setFunc(v){}          
 
diff --git a/tests/cases/compiler/giant.ts b/tests/cases/compiler/giant.ts
index a7087654ec0d0..aa75660d63673 100644
--- a/tests/cases/compiler/giant.ts
+++ b/tests/cases/compiler/giant.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 // @declaration: true
 
diff --git a/tests/cases/compiler/globalThisCapture.ts b/tests/cases/compiler/globalThisCapture.ts
index 37ad3b169d538..3376fcc329c6c 100644
--- a/tests/cases/compiler/globalThisCapture.ts
+++ b/tests/cases/compiler/globalThisCapture.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Add a lambda to ensure global 'this' capture is triggered
 (()=>this.window);
 
diff --git a/tests/cases/compiler/grammarAmbiguities1.ts b/tests/cases/compiler/grammarAmbiguities1.ts
index 9634e4088c3d0..e59aff5ac4905 100644
--- a/tests/cases/compiler/grammarAmbiguities1.ts
+++ b/tests/cases/compiler/grammarAmbiguities1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A { foo() { } }
 class B { bar() { }}
 function f(x) { return x; }
diff --git a/tests/cases/compiler/heterogeneousArrayAndOverloads.ts b/tests/cases/compiler/heterogeneousArrayAndOverloads.ts
index 8949acc0f3523..4dc827b104b7e 100644
--- a/tests/cases/compiler/heterogeneousArrayAndOverloads.ts
+++ b/tests/cases/compiler/heterogeneousArrayAndOverloads.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class arrTest {
     test(arg1: number[]);
     test(arg1: string[]);
diff --git a/tests/cases/compiler/i3.ts b/tests/cases/compiler/i3.ts
index a6c1f5cbec9c3..70b4c9e2408e4 100644
--- a/tests/cases/compiler/i3.ts
+++ b/tests/cases/compiler/i3.ts
@@ -1,6 +1,6 @@
 interface I3 { one?: number; }; 
-var x: {one: number};
-var i: I3;
+declare var x: {one: number};
+declare var i: I3;
 
 i = x;
 x = i;
\ No newline at end of file
diff --git a/tests/cases/compiler/icomparable.ts b/tests/cases/compiler/icomparable.ts
index 6391fcd6c8149..2661c9aeccfbc 100644
--- a/tests/cases/compiler/icomparable.ts
+++ b/tests/cases/compiler/icomparable.ts
@@ -1,3 +1,4 @@
+// @strict: false
     interface IComparable<T> {
        compareTo(other: T);
     }
diff --git a/tests/cases/compiler/implementInterfaceAnyMemberWithVoid.ts b/tests/cases/compiler/implementInterfaceAnyMemberWithVoid.ts
index e6cead432c34a..924f1389ead99 100644
--- a/tests/cases/compiler/implementInterfaceAnyMemberWithVoid.ts
+++ b/tests/cases/compiler/implementInterfaceAnyMemberWithVoid.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
     foo(value: number);
 }
diff --git a/tests/cases/compiler/implicitAnyFunctionInvocationWithAnyArguements.ts b/tests/cases/compiler/implicitAnyFunctionInvocationWithAnyArguements.ts
index 4a1325179fba8..b770496bff484 100644
--- a/tests/cases/compiler/implicitAnyFunctionInvocationWithAnyArguements.ts
+++ b/tests/cases/compiler/implicitAnyFunctionInvocationWithAnyArguements.ts
@@ -2,8 +2,8 @@
 // this should be errors
 var arg0 = null;  // error at "arg0"
 var anyArray = [null, undefined];  // error at array literal
-var objL: { v; w; }             // error at "y,z"
-var funcL: (y2) => number;
+declare var objL: { v; w; }             // error at "y,z"
+declare var funcL: (y2) => number;
 function temp1(arg1) { }  // error at "temp1"
 function testFunctionExprC(subReplace: (s: string, ...arg: any[]) => string) { }
 function testFunctionExprC2(eq: (v1: any, v2: any) => number) { };
diff --git a/tests/cases/compiler/implicitAnyInCatch.ts b/tests/cases/compiler/implicitAnyInCatch.ts
index 0f3129f5430d1..532f8c2b17821 100644
--- a/tests/cases/compiler/implicitAnyInCatch.ts
+++ b/tests/cases/compiler/implicitAnyInCatch.ts
@@ -1,4 +1,5 @@
 // @noimplicitany: true
+// @useUnknownInCatchVariables: false
 // this should not be an error
 try { } catch (error) {
     if (error.number === -2147024809) { }
diff --git a/tests/cases/compiler/implicitAnyWidenToAny.ts b/tests/cases/compiler/implicitAnyWidenToAny.ts
index dcbabd38b47e2..4d76a2ed984d6 100644
--- a/tests/cases/compiler/implicitAnyWidenToAny.ts
+++ b/tests/cases/compiler/implicitAnyWidenToAny.ts
@@ -21,7 +21,7 @@ var array3: any[] = [null, undefined];
 var array4: number[] = [null, undefined];
 var array5 = <any[]>[null, undefined];
 
-var objLit: { new (n: number): any; };
+declare var objLit: { new (n: number): any; };
 function anyReturnFunc(): any { }
 var obj0 = new objLit(1);
 var obj1 = anyReturnFunc();
diff --git a/tests/cases/compiler/importHelpersES6.ts b/tests/cases/compiler/importHelpersES6.ts
index 3655aa77420a6..565e71057a376 100644
--- a/tests/cases/compiler/importHelpersES6.ts
+++ b/tests/cases/compiler/importHelpersES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @importHelpers: true
 // @target: es6
 // @experimentalDecorators: true
diff --git a/tests/cases/compiler/inOperator.ts b/tests/cases/compiler/inOperator.ts
index d5d45c0106495..4dff7752b6ead 100644
--- a/tests/cases/compiler/inOperator.ts
+++ b/tests/cases/compiler/inOperator.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var a=[];
 
 for (var x in a) {}
@@ -6,6 +7,6 @@ if (3 in a) {}
 
 var b = '' in 0;
 
-var c: any;
-var y: number;
+declare var c: any;
+declare var y: number;
 if (y in c) { }
diff --git a/tests/cases/compiler/inOperatorWithFunction.ts b/tests/cases/compiler/inOperatorWithFunction.ts
index 87f88ce25dd21..915a907fcd444 100644
--- a/tests/cases/compiler/inOperatorWithFunction.ts
+++ b/tests/cases/compiler/inOperatorWithFunction.ts
@@ -1,2 +1,3 @@
+// @strict: false
 var fn = function (val: boolean) { return val; }
 fn("a" in { "a": true });
diff --git a/tests/cases/compiler/inOperatorWithGeneric.ts b/tests/cases/compiler/inOperatorWithGeneric.ts
index 8dd1bc29d8a53..b99346d1a8cae 100644
--- a/tests/cases/compiler/inOperatorWithGeneric.ts
+++ b/tests/cases/compiler/inOperatorWithGeneric.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C<T> {
     foo(x:T) {
         for (var p in x) {
diff --git a/tests/cases/compiler/incompatibleTypes.ts b/tests/cases/compiler/incompatibleTypes.ts
index 4dbc578cc99c0..4506bec425eff 100644
--- a/tests/cases/compiler/incompatibleTypes.ts
+++ b/tests/cases/compiler/incompatibleTypes.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface IFoo1 {
     p1(): number;
 }
diff --git a/tests/cases/compiler/incorrectClassOverloadChain.ts b/tests/cases/compiler/incorrectClassOverloadChain.ts
index 3315e96be3e2d..fa1244e4f11cd 100644
--- a/tests/cases/compiler/incorrectClassOverloadChain.ts
+++ b/tests/cases/compiler/incorrectClassOverloadChain.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     foo(): string;
     foo(x): number;
diff --git a/tests/cases/compiler/incrementOnTypeParameter.ts b/tests/cases/compiler/incrementOnTypeParameter.ts
index 8b285e7d135e0..1cf66a7347e70 100644
--- a/tests/cases/compiler/incrementOnTypeParameter.ts
+++ b/tests/cases/compiler/incrementOnTypeParameter.ts
@@ -1,8 +1,8 @@
 class C<T> {
-    a: T;
+    a!: T;
     foo() {
         this.a++; 
-        for (var i: T, j = 0; j < 10; i++) { 
+        for (var i: T = this.a, j = 0; j < 10; i++) { 
         }
     }
 }
diff --git a/tests/cases/compiler/indexClassByNumber.ts b/tests/cases/compiler/indexClassByNumber.ts
index 021a9dcadf51c..892b8748a22a8 100644
--- a/tests/cases/compiler/indexClassByNumber.ts
+++ b/tests/cases/compiler/indexClassByNumber.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Shouldn't be able to index a class instance by a number (unless it has declared a number index signature)
 
 class foo { }
diff --git a/tests/cases/compiler/indexIntoArraySubclass.ts b/tests/cases/compiler/indexIntoArraySubclass.ts
index 01d3f50f5dfc3..c00608a086029 100644
--- a/tests/cases/compiler/indexIntoArraySubclass.ts
+++ b/tests/cases/compiler/indexIntoArraySubclass.ts
@@ -1,4 +1,4 @@
 interface Foo2<T> extends Array<T> { }
-var x2: Foo2<string>;
+declare var x2: Foo2<string>;
 var r = x2[0]; // string
 r = 0; //error
\ No newline at end of file
diff --git a/tests/cases/compiler/indexTypeCheck.ts b/tests/cases/compiler/indexTypeCheck.ts
index 33bc4c1c7b281..a9f3626cb9100 100644
--- a/tests/cases/compiler/indexTypeCheck.ts
+++ b/tests/cases/compiler/indexTypeCheck.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Red {
 	[n:number]; // ok
 	[s:string]; // ok
@@ -36,8 +37,8 @@ interface Magenta {
 	[p:Purple]; // error
 }
 
-var yellow: Yellow;
-var blue: Blue;
+declare var yellow: Yellow;
+declare var blue: Blue;
 var s = "some string";
 
 yellow[5]; // ok
@@ -50,7 +51,7 @@ s[<any>{}]; // ok
 
 yellow[blue]; // error
 
-var x:number[];
+declare var x:number[];
 x[0];
 
 class Benchmark {
diff --git a/tests/cases/compiler/indexerSignatureWithRestParam.ts b/tests/cases/compiler/indexerSignatureWithRestParam.ts
index 7b0462ac1989b..6be193331451d 100644
--- a/tests/cases/compiler/indexerSignatureWithRestParam.ts
+++ b/tests/cases/compiler/indexerSignatureWithRestParam.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
     [...x]: string;
 }
diff --git a/tests/cases/compiler/indirectTypeParameterReferences.ts b/tests/cases/compiler/indirectTypeParameterReferences.ts
index c8cb56ad5e714..9dc8f8f2f1bcf 100644
--- a/tests/cases/compiler/indirectTypeParameterReferences.ts
+++ b/tests/cases/compiler/indirectTypeParameterReferences.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Repro from #19043
 
 type B = {b: string}
diff --git a/tests/cases/compiler/inferObjectTypeFromStringLiteralToKeyof.ts b/tests/cases/compiler/inferObjectTypeFromStringLiteralToKeyof.ts
index ab5f2618d30fe..669d562e3bd8c 100644
--- a/tests/cases/compiler/inferObjectTypeFromStringLiteralToKeyof.ts
+++ b/tests/cases/compiler/inferObjectTypeFromStringLiteralToKeyof.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function inference1<T>(name: keyof T): T;
 declare function inference2<T>(target: T, name: keyof T): T;
 declare var two: "a" | "d";
diff --git a/tests/cases/compiler/inferSecondaryParameter.ts b/tests/cases/compiler/inferSecondaryParameter.ts
index 9281075d3d891..b596047a4791e 100644
--- a/tests/cases/compiler/inferSecondaryParameter.ts
+++ b/tests/cases/compiler/inferSecondaryParameter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // type inference on 'bug' should give 'any'
 
 interface Ib { m(test: string, fn: Function); }
diff --git a/tests/cases/compiler/inferTypeArgumentsInSignatureWithRestParameters.ts b/tests/cases/compiler/inferTypeArgumentsInSignatureWithRestParameters.ts
index 81f9f362058cf..e1ad64044fd8c 100644
--- a/tests/cases/compiler/inferTypeArgumentsInSignatureWithRestParameters.ts
+++ b/tests/cases/compiler/inferTypeArgumentsInSignatureWithRestParameters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f<T>(array: T[], ...args) { }
 function g(array: number[], ...args) { }
 function h<T>(nonarray: T, ...args) { }
diff --git a/tests/cases/compiler/inferenceLimit.ts b/tests/cases/compiler/inferenceLimit.ts
index adaf13bad2225..aacc5ddda5e27 100644
--- a/tests/cases/compiler/inferenceLimit.ts
+++ b/tests/cases/compiler/inferenceLimit.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 // @module: commonjs
 // @filename: file1.ts
diff --git a/tests/cases/compiler/inferentialTypingObjectLiteralMethod1.ts b/tests/cases/compiler/inferentialTypingObjectLiteralMethod1.ts
index 85b66f9219285..5b0c907da4588 100644
--- a/tests/cases/compiler/inferentialTypingObjectLiteralMethod1.ts
+++ b/tests/cases/compiler/inferentialTypingObjectLiteralMethod1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Int<T, U> {
     method(x: T): U;
 }
diff --git a/tests/cases/compiler/inferentialTypingObjectLiteralMethod2.ts b/tests/cases/compiler/inferentialTypingObjectLiteralMethod2.ts
index dee3db70c2437..5fc5ef31b4403 100644
--- a/tests/cases/compiler/inferentialTypingObjectLiteralMethod2.ts
+++ b/tests/cases/compiler/inferentialTypingObjectLiteralMethod2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Int<T, U> {
     [s: string]: (x: T) => U;
 }
diff --git a/tests/cases/compiler/inheritance.ts b/tests/cases/compiler/inheritance.ts
index 3910df5c821bc..0ba226565699d 100644
--- a/tests/cases/compiler/inheritance.ts
+++ b/tests/cases/compiler/inheritance.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class B1 {
     public x;
 }
diff --git a/tests/cases/compiler/inheritance1.ts b/tests/cases/compiler/inheritance1.ts
index 1c9b661279346..cb2677a7ae568 100644
--- a/tests/cases/compiler/inheritance1.ts
+++ b/tests/cases/compiler/inheritance1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Control {
     private state: any;
 }
@@ -21,40 +22,40 @@ class Locations implements SelectableControl {
 class Locations1 {
     select() { }
 }
-var sc: SelectableControl;
-var c: Control;
+declare var sc: SelectableControl;
+declare var c: Control;
 
-var b: Button;
+declare var b: Button;
 sc = b;
 c = b;
 b = sc;
 b = c;
 
-var t: TextBox;
+declare var t: TextBox;
 sc = t;
 c = t;
 t = sc;
 t = c;
 
-var i: ImageBase;
+declare var i: ImageBase;
 sc = i;
 c = i;
 i = sc;
 i = c;
 
-var i1: Image1;
+declare var i1: Image1;
 sc = i1;
 c = i1;
 i1 = sc;
 i1 = c;
 
-var l: Locations;
+declare var l: Locations;
 sc = l;
 c = l;
 l = sc;
 l = c;
 
-var l1: Locations1;
+declare var l1: Locations1;
 sc = l1;
 c = l1;
 l1 = sc;
diff --git a/tests/cases/compiler/inheritanceGrandParentPrivateMemberCollision.ts b/tests/cases/compiler/inheritanceGrandParentPrivateMemberCollision.ts
index 45f5a18bff5db..48b17d5090d6a 100644
--- a/tests/cases/compiler/inheritanceGrandParentPrivateMemberCollision.ts
+++ b/tests/cases/compiler/inheritanceGrandParentPrivateMemberCollision.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A {
     private myMethod() { }
 }
diff --git a/tests/cases/compiler/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.ts b/tests/cases/compiler/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.ts
index c0fc0ecc154a6..474f247145806 100644
--- a/tests/cases/compiler/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.ts
+++ b/tests/cases/compiler/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A {
     private myMethod() { }
 }
diff --git a/tests/cases/compiler/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.ts b/tests/cases/compiler/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.ts
index cda344dd6cba1..d03a7779e13d2 100644
--- a/tests/cases/compiler/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.ts
+++ b/tests/cases/compiler/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A {
     public myMethod() { }
 }
diff --git a/tests/cases/compiler/inheritanceMemberAccessorOverridingAccessor.ts b/tests/cases/compiler/inheritanceMemberAccessorOverridingAccessor.ts
index 7585ef2257d8b..f16853e16cd59 100644
--- a/tests/cases/compiler/inheritanceMemberAccessorOverridingAccessor.ts
+++ b/tests/cases/compiler/inheritanceMemberAccessorOverridingAccessor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     get x() {
         return "20";
diff --git a/tests/cases/compiler/inheritanceMemberAccessorOverridingMethod.ts b/tests/cases/compiler/inheritanceMemberAccessorOverridingMethod.ts
index 5684276beb2ca..a3be64bd5a447 100644
--- a/tests/cases/compiler/inheritanceMemberAccessorOverridingMethod.ts
+++ b/tests/cases/compiler/inheritanceMemberAccessorOverridingMethod.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class a {
     x() {
diff --git a/tests/cases/compiler/inheritanceMemberAccessorOverridingProperty.ts b/tests/cases/compiler/inheritanceMemberAccessorOverridingProperty.ts
index 69267c2db07da..d0e9261ebf662 100644
--- a/tests/cases/compiler/inheritanceMemberAccessorOverridingProperty.ts
+++ b/tests/cases/compiler/inheritanceMemberAccessorOverridingProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     x: string;
 }
diff --git a/tests/cases/compiler/inheritanceMemberFuncOverridingAccessor.ts b/tests/cases/compiler/inheritanceMemberFuncOverridingAccessor.ts
index 12cd7345e93fd..70b058adfb0fe 100644
--- a/tests/cases/compiler/inheritanceMemberFuncOverridingAccessor.ts
+++ b/tests/cases/compiler/inheritanceMemberFuncOverridingAccessor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     get x() {
         return "20";
diff --git a/tests/cases/compiler/inheritanceMemberFuncOverridingMethod.ts b/tests/cases/compiler/inheritanceMemberFuncOverridingMethod.ts
index 1b8d908794ebe..59458842d0bc5 100644
--- a/tests/cases/compiler/inheritanceMemberFuncOverridingMethod.ts
+++ b/tests/cases/compiler/inheritanceMemberFuncOverridingMethod.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     x() {
         return "10";
diff --git a/tests/cases/compiler/inheritanceMemberFuncOverridingProperty.ts b/tests/cases/compiler/inheritanceMemberFuncOverridingProperty.ts
index 91080f46e2555..ddc60b5c523e9 100644
--- a/tests/cases/compiler/inheritanceMemberFuncOverridingProperty.ts
+++ b/tests/cases/compiler/inheritanceMemberFuncOverridingProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     x: () => string;
 }
diff --git a/tests/cases/compiler/inheritanceMemberPropertyOverridingAccessor.ts b/tests/cases/compiler/inheritanceMemberPropertyOverridingAccessor.ts
index e3f13bd2e393f..da5d997b2a4ee 100644
--- a/tests/cases/compiler/inheritanceMemberPropertyOverridingAccessor.ts
+++ b/tests/cases/compiler/inheritanceMemberPropertyOverridingAccessor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     private __x: () => string;
     get x() {
diff --git a/tests/cases/compiler/inheritanceMemberPropertyOverridingMethod.ts b/tests/cases/compiler/inheritanceMemberPropertyOverridingMethod.ts
index 719fa338b9d00..f19d4ddcf126c 100644
--- a/tests/cases/compiler/inheritanceMemberPropertyOverridingMethod.ts
+++ b/tests/cases/compiler/inheritanceMemberPropertyOverridingMethod.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     x() {
         return "20";
diff --git a/tests/cases/compiler/inheritanceMemberPropertyOverridingProperty.ts b/tests/cases/compiler/inheritanceMemberPropertyOverridingProperty.ts
index 46dbdf0ab7ac7..fd5da19bef1e7 100644
--- a/tests/cases/compiler/inheritanceMemberPropertyOverridingProperty.ts
+++ b/tests/cases/compiler/inheritanceMemberPropertyOverridingProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     x: () => string;
 }
diff --git a/tests/cases/compiler/inheritanceOfGenericConstructorMethod1.ts b/tests/cases/compiler/inheritanceOfGenericConstructorMethod1.ts
index 66473808cda82..de0bd19214ae4 100644
--- a/tests/cases/compiler/inheritanceOfGenericConstructorMethod1.ts
+++ b/tests/cases/compiler/inheritanceOfGenericConstructorMethod1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A<T> { }
 class B<T> extends A<T> {}
 var a = new A<Date>();
diff --git a/tests/cases/compiler/inheritanceOfGenericConstructorMethod2.ts b/tests/cases/compiler/inheritanceOfGenericConstructorMethod2.ts
index 8b5f53695fbfd..d72cbb119702e 100644
--- a/tests/cases/compiler/inheritanceOfGenericConstructorMethod2.ts
+++ b/tests/cases/compiler/inheritanceOfGenericConstructorMethod2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
    export class C1 { }
    export class C2<T> { }
diff --git a/tests/cases/compiler/inheritanceStaticAccessorOverridingAccessor.ts b/tests/cases/compiler/inheritanceStaticAccessorOverridingAccessor.ts
index c2b3072d820dc..db38768e5cefb 100644
--- a/tests/cases/compiler/inheritanceStaticAccessorOverridingAccessor.ts
+++ b/tests/cases/compiler/inheritanceStaticAccessorOverridingAccessor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     static get x() {
         return "20";
diff --git a/tests/cases/compiler/inheritanceStaticAccessorOverridingMethod.ts b/tests/cases/compiler/inheritanceStaticAccessorOverridingMethod.ts
index d0463f36b4590..7ea35654a5fc8 100644
--- a/tests/cases/compiler/inheritanceStaticAccessorOverridingMethod.ts
+++ b/tests/cases/compiler/inheritanceStaticAccessorOverridingMethod.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     static x() {
         return "20";
diff --git a/tests/cases/compiler/inheritanceStaticAccessorOverridingProperty.ts b/tests/cases/compiler/inheritanceStaticAccessorOverridingProperty.ts
index c438812a7a54b..e6e8185e3620f 100644
--- a/tests/cases/compiler/inheritanceStaticAccessorOverridingProperty.ts
+++ b/tests/cases/compiler/inheritanceStaticAccessorOverridingProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     static x: string;
 }
diff --git a/tests/cases/compiler/inheritanceStaticFuncOverridingAccessor.ts b/tests/cases/compiler/inheritanceStaticFuncOverridingAccessor.ts
index b5f610c00ead7..cd2b407f1b04d 100644
--- a/tests/cases/compiler/inheritanceStaticFuncOverridingAccessor.ts
+++ b/tests/cases/compiler/inheritanceStaticFuncOverridingAccessor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     static get x() {
         return "20";
diff --git a/tests/cases/compiler/inheritanceStaticFuncOverridingAccessorOfFuncType.ts b/tests/cases/compiler/inheritanceStaticFuncOverridingAccessorOfFuncType.ts
index 2518620041c75..6b0a1f60cb08d 100644
--- a/tests/cases/compiler/inheritanceStaticFuncOverridingAccessorOfFuncType.ts
+++ b/tests/cases/compiler/inheritanceStaticFuncOverridingAccessorOfFuncType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     static get x(): () => string {
         return null;
diff --git a/tests/cases/compiler/inheritanceStaticFuncOverridingMethod.ts b/tests/cases/compiler/inheritanceStaticFuncOverridingMethod.ts
index f58342b72ae62..4e33e346d4080 100644
--- a/tests/cases/compiler/inheritanceStaticFuncOverridingMethod.ts
+++ b/tests/cases/compiler/inheritanceStaticFuncOverridingMethod.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     static x() {
         return "10";
diff --git a/tests/cases/compiler/inheritanceStaticFuncOverridingProperty.ts b/tests/cases/compiler/inheritanceStaticFuncOverridingProperty.ts
index 1f0018cfe6122..f42b4b6049aa5 100644
--- a/tests/cases/compiler/inheritanceStaticFuncOverridingProperty.ts
+++ b/tests/cases/compiler/inheritanceStaticFuncOverridingProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     static x: string;
 }
diff --git a/tests/cases/compiler/inheritanceStaticFuncOverridingPropertyOfFuncType.ts b/tests/cases/compiler/inheritanceStaticFuncOverridingPropertyOfFuncType.ts
index c75d965fb29fc..683633379cfcd 100644
--- a/tests/cases/compiler/inheritanceStaticFuncOverridingPropertyOfFuncType.ts
+++ b/tests/cases/compiler/inheritanceStaticFuncOverridingPropertyOfFuncType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     static x: () => string;
 }
diff --git a/tests/cases/compiler/inheritanceStaticFunctionOverridingInstanceProperty.ts b/tests/cases/compiler/inheritanceStaticFunctionOverridingInstanceProperty.ts
index 40f9c6dc1ca96..5665700bd4118 100644
--- a/tests/cases/compiler/inheritanceStaticFunctionOverridingInstanceProperty.ts
+++ b/tests/cases/compiler/inheritanceStaticFunctionOverridingInstanceProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     x: string;
 }
diff --git a/tests/cases/compiler/inheritanceStaticMembersCompatible.ts b/tests/cases/compiler/inheritanceStaticMembersCompatible.ts
index 96f431f42030b..e766aa933916a 100644
--- a/tests/cases/compiler/inheritanceStaticMembersCompatible.ts
+++ b/tests/cases/compiler/inheritanceStaticMembersCompatible.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     static x: a;
 }
diff --git a/tests/cases/compiler/inheritanceStaticMembersIncompatible.ts b/tests/cases/compiler/inheritanceStaticMembersIncompatible.ts
index 3f382983daad1..2f0681e2c904f 100644
--- a/tests/cases/compiler/inheritanceStaticMembersIncompatible.ts
+++ b/tests/cases/compiler/inheritanceStaticMembersIncompatible.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     static x: string;
 }
diff --git a/tests/cases/compiler/inheritanceStaticPropertyOverridingAccessor.ts b/tests/cases/compiler/inheritanceStaticPropertyOverridingAccessor.ts
index e325ae4582aad..217736f85614a 100644
--- a/tests/cases/compiler/inheritanceStaticPropertyOverridingAccessor.ts
+++ b/tests/cases/compiler/inheritanceStaticPropertyOverridingAccessor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 
 class a {
diff --git a/tests/cases/compiler/inheritanceStaticPropertyOverridingMethod.ts b/tests/cases/compiler/inheritanceStaticPropertyOverridingMethod.ts
index 5477b3ec50511..455987988098f 100644
--- a/tests/cases/compiler/inheritanceStaticPropertyOverridingMethod.ts
+++ b/tests/cases/compiler/inheritanceStaticPropertyOverridingMethod.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     static x() {
         return "20";
diff --git a/tests/cases/compiler/inheritanceStaticPropertyOverridingProperty.ts b/tests/cases/compiler/inheritanceStaticPropertyOverridingProperty.ts
index 6d3267098befb..e48e4a1b31028 100644
--- a/tests/cases/compiler/inheritanceStaticPropertyOverridingProperty.ts
+++ b/tests/cases/compiler/inheritanceStaticPropertyOverridingProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     static x: () => string;
 }
diff --git a/tests/cases/compiler/inheritedFunctionAssignmentCompatibility.ts b/tests/cases/compiler/inheritedFunctionAssignmentCompatibility.ts
index 3d55b39a26beb..6f55e76321699 100644
--- a/tests/cases/compiler/inheritedFunctionAssignmentCompatibility.ts
+++ b/tests/cases/compiler/inheritedFunctionAssignmentCompatibility.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface IResultCallback extends Function { }
 
 function fn(cb: IResultCallback) { }
diff --git a/tests/cases/compiler/inheritedMembersAndIndexSignaturesFromDifferentBases.ts b/tests/cases/compiler/inheritedMembersAndIndexSignaturesFromDifferentBases.ts
index 0aa06dcb2305d..958736e0c78d7 100644
--- a/tests/cases/compiler/inheritedMembersAndIndexSignaturesFromDifferentBases.ts
+++ b/tests/cases/compiler/inheritedMembersAndIndexSignaturesFromDifferentBases.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // indexer in B is a subtype of indexer in A
 interface A {
     [s: string]: {
diff --git a/tests/cases/compiler/inheritedMembersAndIndexSignaturesFromDifferentBases2.ts b/tests/cases/compiler/inheritedMembersAndIndexSignaturesFromDifferentBases2.ts
index 28504055dbe3a..e87dab3bea66c 100644
--- a/tests/cases/compiler/inheritedMembersAndIndexSignaturesFromDifferentBases2.ts
+++ b/tests/cases/compiler/inheritedMembersAndIndexSignaturesFromDifferentBases2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface A<T> {
     [n: number]: T;
 }
diff --git a/tests/cases/compiler/inheritedStringIndexersFromDifferentBaseTypes2.ts b/tests/cases/compiler/inheritedStringIndexersFromDifferentBaseTypes2.ts
index 1f4f425527514..db89fb8d1e828 100644
--- a/tests/cases/compiler/inheritedStringIndexersFromDifferentBaseTypes2.ts
+++ b/tests/cases/compiler/inheritedStringIndexersFromDifferentBaseTypes2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // indexer in B is a subtype of indexer in A
 interface A {
     [s: string]: {
diff --git a/tests/cases/compiler/innerExtern.ts b/tests/cases/compiler/innerExtern.ts
index 212181124aeeb..de9406298e762 100644
--- a/tests/cases/compiler/innerExtern.ts
+++ b/tests/cases/compiler/innerExtern.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace A {
     export declare namespace BB {
         export var Elephant;
diff --git a/tests/cases/compiler/innerOverloads.ts b/tests/cases/compiler/innerOverloads.ts
index 553fbdc6e864e..2f460c0710443 100644
--- a/tests/cases/compiler/innerOverloads.ts
+++ b/tests/cases/compiler/innerOverloads.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 function outer() {
     function inner(x:number); // should work
diff --git a/tests/cases/compiler/innerTypeCheckOfLambdaArgument.ts b/tests/cases/compiler/innerTypeCheckOfLambdaArgument.ts
index fdbc17124bb84..b3070a3fe05ec 100644
--- a/tests/cases/compiler/innerTypeCheckOfLambdaArgument.ts
+++ b/tests/cases/compiler/innerTypeCheckOfLambdaArgument.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function takesCallback(callback: (n) =>any) {
 
 }
diff --git a/tests/cases/compiler/instanceOfAssignability.ts b/tests/cases/compiler/instanceOfAssignability.ts
index 909de1ff2a7b0..6f688868d79f7 100644
--- a/tests/cases/compiler/instanceOfAssignability.ts
+++ b/tests/cases/compiler/instanceOfAssignability.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Base {
 	foo: string|number;
 	optional?: number;
diff --git a/tests/cases/compiler/instanceofOperator.ts b/tests/cases/compiler/instanceofOperator.ts
index b7071aebb0d10..b998ef2db2faf 100644
Binary files a/tests/cases/compiler/instanceofOperator.ts and b/tests/cases/compiler/instanceofOperator.ts differ
diff --git a/tests/cases/compiler/intTypeCheck.ts b/tests/cases/compiler/intTypeCheck.ts
index a156309786353..aeb6077461aee 100644
--- a/tests/cases/compiler/intTypeCheck.ts
+++ b/tests/cases/compiler/intTypeCheck.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface i1 {
     //Property Signatures
     p;
@@ -89,7 +90,7 @@ var anyVar: any;
 //
 // Property signatures
 //
-var obj0: i1;
+declare var obj0: i1;
 var obj1: i1 = {
     p: null,
     p3: function ():any { return 0; },
@@ -108,7 +109,7 @@ var obj10: i1 = new {};
 //
 // Call signatures
 //
-var obj11: i2;
+declare var obj11: i2;
 var obj12: i2 = {};
 var obj13: i2 = new Object();
 var obj14: i2 = new obj11;
@@ -122,7 +123,7 @@ var obj21: i2 = new {};
 //
 // Construct Signatures
 //
-var obj22: i3;
+declare var obj22: i3;
 var obj23: i3 = {};
 var obj24: i3 = new Object();
 var obj25: i3 = new obj22;
@@ -136,7 +137,7 @@ var obj32: i3 = new {};
 //
 // Index Signatures
 //
-var obj33: i4;
+declare var obj33: i4;
 var obj34: i4 = {};
 var obj35: i4 = new Object();
 var obj36: i4 = new obj33;
@@ -150,7 +151,7 @@ var obj43: i4 = new {};
 //
 // Interface Derived I1
 //
-var obj44: i5;
+declare var obj44: i5;
 var obj45: i5 = {};
 var obj46: i5 = new Object();
 var obj47: i5 = new obj44;
@@ -164,7 +165,7 @@ var obj54: i5 = new {};
 //
 // Interface Derived I2
 //
-var obj55: i6;
+declare var obj55: i6;
 var obj56: i6 = {};
 var obj57: i6 = new Object();
 var obj58: i6 = new obj55;
@@ -178,7 +179,7 @@ var obj65: i6 = new {};
 //
 // Interface Derived I3
 //
-var obj66: i7;
+declare var obj66: i7;
 var obj67: i7 = {};
 var obj68: i7 = new Object();
 var obj69: i7 = new obj66;
@@ -192,7 +193,7 @@ var obj76: i7 = new {};
 //
 // Interface Derived I4
 //
-var obj77: i8;
+declare var obj77: i8;
 var obj78: i8 = {};
 var obj79: i8 = new Object();
 var obj80: i8 = new obj77;
diff --git a/tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts b/tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts
index d9d296056f800..cec5a83c66d47 100644
--- a/tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts
+++ b/tests/cases/compiler/interfaceExtendsClassWithPrivate1.ts
@@ -14,8 +14,8 @@ class D extends C implements I {
 } 
 
 var c: C;
-var i: I;
-var d: D;
+declare var i: I;
+declare var d: D;
 
 c = i;
 i = c; // error
diff --git a/tests/cases/compiler/interfaceImplementation1.ts b/tests/cases/compiler/interfaceImplementation1.ts
index 74776ed9eefe6..c62eb0a63630c 100644
--- a/tests/cases/compiler/interfaceImplementation1.ts
+++ b/tests/cases/compiler/interfaceImplementation1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I1 {
     iObj:{ };
     iNum:number;
@@ -13,8 +14,8 @@ class C1 implements I1,I2 {
     private iFn();
 	private iFn(n?:number, s?:string) { }
     private iAny:any;
-    private iNum:number;
-    private iObj:{ };
+    private iNum!:number;
+    private iObj!:{ };
 }
 
 interface I3 {
@@ -40,6 +41,6 @@ new a();
 new b();
 */
 
-var c:I4;
+declare var c:I4;
 c[5];
 c["foo"];
diff --git a/tests/cases/compiler/interfaceInheritance.ts b/tests/cases/compiler/interfaceInheritance.ts
index 9553113b11dab..6d690f3ad5bf0 100644
--- a/tests/cases/compiler/interfaceInheritance.ts
+++ b/tests/cases/compiler/interfaceInheritance.ts
@@ -20,19 +20,19 @@ interface I5 {
 }
 
 class C1 implements I2 { // should be an error - it doesn't implement the members of I1
-    public i2P1: string;
+    public i2P1!: string;
 }
 
-var i2: I2;
+declare var i2: I2;
 var i1: I1;
-var i3: I3;
+declare var i3: I3;
 i1 = i2;
 i2 = i3; // should be an error - i3 does not implement the members of i1
 
 var c1: C1;
 
-var i4: I4;
-var i5: I5;
+declare var i4: I4;
+declare var i5: I5;
 
 i4 = i5; // should be an error
 i5 = i4; // should be an error
diff --git a/tests/cases/compiler/interfaceOnly.ts b/tests/cases/compiler/interfaceOnly.ts
index 0a48807e460df..8a89503d3d1ae 100644
--- a/tests/cases/compiler/interfaceOnly.ts
+++ b/tests/cases/compiler/interfaceOnly.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 interface foo {
     foo();
diff --git a/tests/cases/compiler/interfaceWithCommaSeparators.ts b/tests/cases/compiler/interfaceWithCommaSeparators.ts
index 03ae5480ef18d..18511002e1bc8 100644
--- a/tests/cases/compiler/interfaceWithCommaSeparators.ts
+++ b/tests/cases/compiler/interfaceWithCommaSeparators.ts
@@ -1,2 +1,3 @@
+// @strict: false
 var v: { bar(): void, baz }
 interface Foo { bar(): void, baz }
\ No newline at end of file
diff --git a/tests/cases/compiler/interfacedecl.ts b/tests/cases/compiler/interfacedecl.ts
index f08124e893749..f335e5724523b 100644
--- a/tests/cases/compiler/interfacedecl.ts
+++ b/tests/cases/compiler/interfacedecl.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 interface a0 {
     (): string;
diff --git a/tests/cases/compiler/interfacedeclWithIndexerErrors.ts b/tests/cases/compiler/interfacedeclWithIndexerErrors.ts
index 054d5e044ac1b..1f3c0ef52b3df 100644
--- a/tests/cases/compiler/interfacedeclWithIndexerErrors.ts
+++ b/tests/cases/compiler/interfacedeclWithIndexerErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface a0 {
     (): string;
     (a, b, c?: string): number;
diff --git a/tests/cases/compiler/internalAliasUninitializedModule.ts b/tests/cases/compiler/internalAliasUninitializedModule.ts
index eec8d3420e9f7..37e0dd39ad360 100644
--- a/tests/cases/compiler/internalAliasUninitializedModule.ts
+++ b/tests/cases/compiler/internalAliasUninitializedModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 namespace a {
     export namespace b {
diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts
index 9c148ca2d2e48..ee357313fb94d 100644
--- a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 // @declaration: true
 export namespace a {
diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts
index b7d84962869fc..875d96e6a7d8b 100644
--- a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 // @declaration: true
 export namespace a {
diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts
index 6a091f2208b84..69c8e110af420 100644
--- a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts
+++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 export namespace a {
     export namespace b {
@@ -9,7 +10,7 @@ export namespace a {
 
 export namespace c {
     import b = a.b;
-    export var x: b.I;
+    export declare var x: b.I;
     x.foo();
 }
 
diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts
index 9ef9aba771d68..a27d7381255c9 100644
--- a/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: amd
 // @declaration: true
 export namespace a {
diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts
index 03d2121e7b1ed..8b2f3c1928d7f 100644
--- a/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 // @declaration: true
 export namespace a {
diff --git a/tests/cases/compiler/internalAliasWithDottedNameEmit.ts b/tests/cases/compiler/internalAliasWithDottedNameEmit.ts
index ee7e3fbb1946b..a11529a857011 100644
--- a/tests/cases/compiler/internalAliasWithDottedNameEmit.ts
+++ b/tests/cases/compiler/internalAliasWithDottedNameEmit.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 namespace a.b.c {
       export var d;
diff --git a/tests/cases/compiler/intrinsics.ts b/tests/cases/compiler/intrinsics.ts
index 0a1f9431b4dc9..8fdafd6e81c3f 100644
--- a/tests/cases/compiler/intrinsics.ts
+++ b/tests/cases/compiler/intrinsics.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 var hasOwnProperty: hasOwnProperty; // Error
diff --git a/tests/cases/compiler/invalidConstraint1.ts b/tests/cases/compiler/invalidConstraint1.ts
index 074663010b5db..c47ba8bd0a049 100644
--- a/tests/cases/compiler/invalidConstraint1.ts
+++ b/tests/cases/compiler/invalidConstraint1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f<T, U extends { a: T }>() {
     return undefined;
 }
diff --git a/tests/cases/compiler/isolatedDeclarationErrorsFunctionDeclarations.ts b/tests/cases/compiler/isolatedDeclarationErrorsFunctionDeclarations.ts
index b905981eceffc..ccc2cb386004b 100644
--- a/tests/cases/compiler/isolatedDeclarationErrorsFunctionDeclarations.ts
+++ b/tests/cases/compiler/isolatedDeclarationErrorsFunctionDeclarations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @isolatedDeclarations: true
 // @declarationMap: false
diff --git a/tests/cases/compiler/isolatedDeclarationLazySymbols.ts b/tests/cases/compiler/isolatedDeclarationLazySymbols.ts
index adee6b230cb48..2195df64f1ff4 100644
--- a/tests/cases/compiler/isolatedDeclarationLazySymbols.ts
+++ b/tests/cases/compiler/isolatedDeclarationLazySymbols.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @isolatedDeclarations: true
 // @target: ESNext
diff --git a/tests/cases/compiler/isolatedDeclarationsAllowJs.ts b/tests/cases/compiler/isolatedDeclarationsAllowJs.ts
index 7b4704609a5bd..789e864a9d487 100644
--- a/tests/cases/compiler/isolatedDeclarationsAllowJs.ts
+++ b/tests/cases/compiler/isolatedDeclarationsAllowJs.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @isolatedDeclarations: true
 // @allowJS: true
 // @declaration: true
diff --git a/tests/cases/compiler/isolatedModulesDeclaration.ts b/tests/cases/compiler/isolatedModulesDeclaration.ts
index 3d5e7db9b4f86..a83a054162854 100644
--- a/tests/cases/compiler/isolatedModulesDeclaration.ts
+++ b/tests/cases/compiler/isolatedModulesDeclaration.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @isolatedModules: true
 // @declaration: true
 // @target: es6
diff --git a/tests/cases/compiler/isolatedModulesES6.ts b/tests/cases/compiler/isolatedModulesES6.ts
index 12e8d8adb7f8b..30ba7f76cf9e3 100644
--- a/tests/cases/compiler/isolatedModulesES6.ts
+++ b/tests/cases/compiler/isolatedModulesES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @isolatedModules: true
 // @target: es6
 // @filename: file1.ts
diff --git a/tests/cases/compiler/isolatedModulesNonAmbientConstEnum.ts b/tests/cases/compiler/isolatedModulesNonAmbientConstEnum.ts
index d5aae618d8ff6..7d563f07bd9cb 100644
--- a/tests/cases/compiler/isolatedModulesNonAmbientConstEnum.ts
+++ b/tests/cases/compiler/isolatedModulesNonAmbientConstEnum.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @isolatedModules: true
 // @target: es6
 
diff --git a/tests/cases/compiler/isolatedModulesOut.ts b/tests/cases/compiler/isolatedModulesOut.ts
index c977a4b54da66..46455a051c1bf 100644
--- a/tests/cases/compiler/isolatedModulesOut.ts
+++ b/tests/cases/compiler/isolatedModulesOut.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @isolatedModules: true
 // @out:all.js
 // @target: es6
diff --git a/tests/cases/compiler/isolatedModulesSpecifiedModule.ts b/tests/cases/compiler/isolatedModulesSpecifiedModule.ts
index 0e72e6480b6c6..d128f5aa02f05 100644
--- a/tests/cases/compiler/isolatedModulesSpecifiedModule.ts
+++ b/tests/cases/compiler/isolatedModulesSpecifiedModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @isolatedModules: true
 // @module: commonjs
 // @filename: file1.ts
diff --git a/tests/cases/compiler/isolatedModulesUnspecifiedModule.ts b/tests/cases/compiler/isolatedModulesUnspecifiedModule.ts
index 2435f22e952c2..48624333e5806 100644
--- a/tests/cases/compiler/isolatedModulesUnspecifiedModule.ts
+++ b/tests/cases/compiler/isolatedModulesUnspecifiedModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @isolatedModules: true
 // @filename: file1.ts
 export var x;
\ No newline at end of file
diff --git a/tests/cases/compiler/isolatedModulesWithDeclarationFile.ts b/tests/cases/compiler/isolatedModulesWithDeclarationFile.ts
index 01e96b4ec2a63..e5f96f03b8326 100644
--- a/tests/cases/compiler/isolatedModulesWithDeclarationFile.ts
+++ b/tests/cases/compiler/isolatedModulesWithDeclarationFile.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @isolatedModules: true
 // @target: es6
 
diff --git a/tests/cases/compiler/javascriptThisAssignmentInStaticBlock.ts b/tests/cases/compiler/javascriptThisAssignmentInStaticBlock.ts
index f86508dc9860c..94363b7b63378 100644
--- a/tests/cases/compiler/javascriptThisAssignmentInStaticBlock.ts
+++ b/tests/cases/compiler/javascriptThisAssignmentInStaticBlock.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @declaration: true
diff --git a/tests/cases/compiler/jsEnumFunctionLocalNoCrash.ts b/tests/cases/compiler/jsEnumFunctionLocalNoCrash.ts
index 73f9a5453e481..2488cb41dda7e 100644
--- a/tests/cases/compiler/jsEnumFunctionLocalNoCrash.ts
+++ b/tests/cases/compiler/jsEnumFunctionLocalNoCrash.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @checkJs: true
 // @allowJs: true
diff --git a/tests/cases/compiler/jsFileCompilationBindReachabilityErrors.ts b/tests/cases/compiler/jsFileCompilationBindReachabilityErrors.ts
index 29dfd68bb0411..3ec23d3b7e1ce 100644
--- a/tests/cases/compiler/jsFileCompilationBindReachabilityErrors.ts
+++ b/tests/cases/compiler/jsFileCompilationBindReachabilityErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/compiler/jsFileCompilationBindStrictModeErrors.ts b/tests/cases/compiler/jsFileCompilationBindStrictModeErrors.ts
index 527927be6e6f5..ca6ba94501b81 100644
--- a/tests/cases/compiler/jsFileCompilationBindStrictModeErrors.ts
+++ b/tests/cases/compiler/jsFileCompilationBindStrictModeErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/compiler/jsFileESModuleWithEnumTag.ts b/tests/cases/compiler/jsFileESModuleWithEnumTag.ts
index dd6d0b90d69b2..ca26c6ea43d00 100644
--- a/tests/cases/compiler/jsFileESModuleWithEnumTag.ts
+++ b/tests/cases/compiler/jsFileESModuleWithEnumTag.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/compiler/jsNegativeElementAccessNotBound.ts b/tests/cases/compiler/jsNegativeElementAccessNotBound.ts
index c7a204e578fb0..eaa731496e968 100644
--- a/tests/cases/compiler/jsNegativeElementAccessNotBound.ts
+++ b/tests/cases/compiler/jsNegativeElementAccessNotBound.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/compiler/jsdocCallbackAndType.ts b/tests/cases/compiler/jsdocCallbackAndType.ts
index eaecc38135c9f..7113cec389d76 100644
--- a/tests/cases/compiler/jsdocCallbackAndType.ts
+++ b/tests/cases/compiler/jsdocCallbackAndType.ts
@@ -8,6 +8,6 @@
  * @callback B
  */
 /** @type {B<string>} */
-let b;
+let b = {};
 b();
 b(1);
diff --git a/tests/cases/compiler/jsdocInTypeScript.ts b/tests/cases/compiler/jsdocInTypeScript.ts
index be485f59c5540..9750d63d63e6e 100644
--- a/tests/cases/compiler/jsdocInTypeScript.ts
+++ b/tests/cases/compiler/jsdocInTypeScript.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es2015
 // @traceResolution: true
 
diff --git a/tests/cases/compiler/jsdocParamTagInvalid.ts b/tests/cases/compiler/jsdocParamTagInvalid.ts
index 79e17bf8ff18b..164ead9b68f46 100644
--- a/tests/cases/compiler/jsdocParamTagInvalid.ts
+++ b/tests/cases/compiler/jsdocParamTagInvalid.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/compiler/jsdocParameterParsingInvalidName.ts b/tests/cases/compiler/jsdocParameterParsingInvalidName.ts
index 6c3c93d182e65..4e1019dffe34c 100644
--- a/tests/cases/compiler/jsdocParameterParsingInvalidName.ts
+++ b/tests/cases/compiler/jsdocParameterParsingInvalidName.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class c {
     /**
      * @param {string} [`foo]
diff --git a/tests/cases/compiler/jsdocTypedef_propertyWithNoType.ts b/tests/cases/compiler/jsdocTypedef_propertyWithNoType.ts
index bcabe980915d0..9ac5aaf083d89 100644
--- a/tests/cases/compiler/jsdocTypedef_propertyWithNoType.ts
+++ b/tests/cases/compiler/jsdocTypedef_propertyWithNoType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/compiler/jsxEmitWithAttributes.ts b/tests/cases/compiler/jsxEmitWithAttributes.ts
index 1fb7a9ccf8dd1..b6fd56393e70a 100644
--- a/tests/cases/compiler/jsxEmitWithAttributes.ts
+++ b/tests/cases/compiler/jsxEmitWithAttributes.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@jsx: react
 //@target: es6
 //@module: commonjs
diff --git a/tests/cases/compiler/jsxFactoryAndReactNamespace.ts b/tests/cases/compiler/jsxFactoryAndReactNamespace.ts
index 2bdc954da3af8..92548a6b9a3ab 100644
--- a/tests/cases/compiler/jsxFactoryAndReactNamespace.ts
+++ b/tests/cases/compiler/jsxFactoryAndReactNamespace.ts
@@ -1,10 +1,11 @@
-//@jsx: react
-//@target: es6
-//@module: commonjs
-//@reactNamespace: Element
-//@jsxFactory: Element.createElement
-
-// @filename: Element.ts
+// @strict: false
+//@jsx: react
+//@target: es6
+//@module: commonjs
+//@reactNamespace: Element
+//@jsxFactory: Element.createElement
+
+// @filename: Element.ts
 declare namespace JSX {
     interface Element {
         name: string;
@@ -33,12 +34,12 @@ export let createElement = Element.createElement;
 
 function toCamelCase(text: string): string {
     return text[0].toLowerCase() + text.substring(1);
-}
-
-// @filename: test.tsx
+}
+
+// @filename: test.tsx
 import { Element} from './Element';
 
-let c: {
+declare let c: {
 	a?: {
 		b: string
 	}
diff --git a/tests/cases/compiler/jsxFactoryIdentifier.ts b/tests/cases/compiler/jsxFactoryIdentifier.ts
index 0ea5c7e850da5..446081c14bace 100644
--- a/tests/cases/compiler/jsxFactoryIdentifier.ts
+++ b/tests/cases/compiler/jsxFactoryIdentifier.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@jsx: react
 //@target: es6
 //@module: commonjs
diff --git a/tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts b/tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts
index b420d3fd3adc5..19f16484d5807 100644
--- a/tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts
+++ b/tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@jsx: react
 //@target: es6
 //@module: commonjs
diff --git a/tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts b/tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts
index e2d101c5f0998..eacd57541368c 100644
--- a/tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts
+++ b/tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@jsx: react
 //@target: es6
 //@module: commonjs
diff --git a/tests/cases/compiler/jsxFactoryMissingErrorInsideAClass.ts b/tests/cases/compiler/jsxFactoryMissingErrorInsideAClass.ts
index 73b25974f5e5c..66163171755e3 100644
--- a/tests/cases/compiler/jsxFactoryMissingErrorInsideAClass.ts
+++ b/tests/cases/compiler/jsxFactoryMissingErrorInsideAClass.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@jsx: react
 //@target: es6
 //@module: commonjs
diff --git a/tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName.ts b/tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName.ts
index 6f7c584d2320d..cb31583509217 100644
--- a/tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName.ts
+++ b/tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName.ts
@@ -1,9 +1,10 @@
-//@jsx: react
-//@target: es6
-//@module: commonjs
-//@jsxFactory: Element.createElement=
-
-// @filename: Element.ts
+// @strict: false
+//@jsx: react
+//@target: es6
+//@module: commonjs
+//@jsxFactory: Element.createElement=
+
+// @filename: Element.ts
 declare namespace JSX {
     interface Element {
         name: string;
@@ -32,12 +33,12 @@ export let createElement = Element.createElement;
 
 function toCamelCase(text: string): string {
     return text[0].toLowerCase() + text.substring(1);
-}
-
-// @filename: test.tsx
+}
+
+// @filename: test.tsx
 import { Element} from './Element';
 
-let c: {
+declare let c: {
 	a?: {
 		b: string
 	}
diff --git a/tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName2.ts b/tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName2.ts
index 610063f7d341b..5148c5f5ec967 100644
--- a/tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName2.ts
+++ b/tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName2.ts
@@ -1,9 +1,10 @@
-//@jsx: react
-//@target: es6
-//@module: commonjs
-//@jsxFactory: id1 id2
-
-// @filename: Element.ts
+// @strict: false
+//@jsx: react
+//@target: es6
+//@module: commonjs
+//@jsxFactory: id1 id2
+
+// @filename: Element.ts
 declare namespace JSX {
     interface Element {
         name: string;
@@ -32,12 +33,12 @@ export let createElement = Element.createElement;
 
 function toCamelCase(text: string): string {
     return text[0].toLowerCase() + text.substring(1);
-}
-
-// @filename: test.tsx
+}
+
+// @filename: test.tsx
 import { Element} from './Element';
 
-let c: {
+declare let c: {
 	a?: {
 		b: string
 	}
diff --git a/tests/cases/compiler/jsxFactoryQualifiedName.ts b/tests/cases/compiler/jsxFactoryQualifiedName.ts
index 769b7cd566d78..d86455b31efd1 100644
--- a/tests/cases/compiler/jsxFactoryQualifiedName.ts
+++ b/tests/cases/compiler/jsxFactoryQualifiedName.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@jsx: react
 //@target: es6
 //@module: commonjs
diff --git a/tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts b/tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts
index 9b6d23e283e81..e3c6397e4b6f5 100644
--- a/tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts
+++ b/tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@jsx: react
 //@target: es6
 //@module: commonjs
diff --git a/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts b/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts
index 86fd9935a1f40..c29c1db6deae6 100644
--- a/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts
+++ b/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 //@target: es5
 //@jsx: react
diff --git a/tests/cases/compiler/jsxHasLiteralType.tsx b/tests/cases/compiler/jsxHasLiteralType.tsx
index 17132fdad40fd..06157973a7a94 100644
--- a/tests/cases/compiler/jsxHasLiteralType.tsx
+++ b/tests/cases/compiler/jsxHasLiteralType.tsx
@@ -1,7 +1,7 @@
 // @strictNullChecks: true
 // @jsx: react
 // @skipLibCheck: true
-// @libFiles: lib.d.ts,react.d.ts
+/// <reference path="/.lib/react.d.ts" />
 import * as React from "react";
 
 interface Props {
diff --git a/tests/cases/compiler/jsxInferenceProducesLiteralAsExpected.tsx b/tests/cases/compiler/jsxInferenceProducesLiteralAsExpected.tsx
index ce7dc3317164b..b837c5aaa1597 100644
--- a/tests/cases/compiler/jsxInferenceProducesLiteralAsExpected.tsx
+++ b/tests/cases/compiler/jsxInferenceProducesLiteralAsExpected.tsx
@@ -1,5 +1,5 @@
 // @jsx: react
-// @libFiles: lib.d.ts,react.d.ts
+/// <reference path="/.lib/react.d.ts" />
 import React = require("react");
 type FunctionPropertyNames<T> = { [K in keyof T]: T[K] extends Function ? K : never }[keyof T];
 class TestObject {
diff --git a/tests/cases/compiler/jsxPreserveWithJsInput.ts b/tests/cases/compiler/jsxPreserveWithJsInput.ts
index f229e40a55012..66541649c6eb2 100644
--- a/tests/cases/compiler/jsxPreserveWithJsInput.ts
+++ b/tests/cases/compiler/jsxPreserveWithJsInput.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @outdir: out
 // @jsx: preserve
 // @allowjs: true
diff --git a/tests/cases/compiler/jsxSpreadFirstUnionNoErrors.tsx b/tests/cases/compiler/jsxSpreadFirstUnionNoErrors.tsx
index 72c4cc5d20e99..3c85592c20fc0 100644
--- a/tests/cases/compiler/jsxSpreadFirstUnionNoErrors.tsx
+++ b/tests/cases/compiler/jsxSpreadFirstUnionNoErrors.tsx
@@ -1,7 +1,7 @@
 // @jsx: react
-// @libFiles: lib.d.ts,react.d.ts
 // @skipLibCheck: true
 // @allowSyntheticDefaultImports: true
+/// <reference path="/.lib/react.d.ts" />
 import React from "react";
 
 type InfoProps =
diff --git a/tests/cases/compiler/jsxSpreadTag.ts b/tests/cases/compiler/jsxSpreadTag.ts
index 06e5fec1f6ab0..b4204b1ff3f20 100644
--- a/tests/cases/compiler/jsxSpreadTag.ts
+++ b/tests/cases/compiler/jsxSpreadTag.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @jsx: react
 // @target: es2015,esnext
 // @filename: /a.tsx
diff --git a/tests/cases/compiler/keyRemappingKeyofResult.ts b/tests/cases/compiler/keyRemappingKeyofResult.ts
index fcf3f835ac691..ba0b0939ae3cb 100644
--- a/tests/cases/compiler/keyRemappingKeyofResult.ts
+++ b/tests/cases/compiler/keyRemappingKeyofResult.ts
@@ -67,6 +67,7 @@ function g<T>() {
     let x: Oops;
     x = sym;
     x = "str";
+    x = "whatever"; // error
 }
 
 export {};
\ No newline at end of file
diff --git a/tests/cases/compiler/keyRemappingKeyofResult2.ts b/tests/cases/compiler/keyRemappingKeyofResult2.ts
new file mode 100644
index 0000000000000..b77b7af1760a9
--- /dev/null
+++ b/tests/cases/compiler/keyRemappingKeyofResult2.ts
@@ -0,0 +1,34 @@
+// @strict: true
+// @noEmit: true
+
+// https://github.com/microsoft/TypeScript/issues/56239
+
+type Values<T> = T[keyof T];
+
+type ProvidedActor = {
+  src: string;
+  logic: unknown;
+};
+
+interface StateMachineConfig<TActors extends ProvidedActor> {
+  invoke: {
+    src: TActors["src"];
+  };
+}
+
+declare function setup<TActors extends Record<string, unknown>>(_: {
+  actors: {
+    [K in keyof TActors]: TActors[K];
+  };
+}): {
+  createMachine: (
+    config: StateMachineConfig<
+      Values<{
+        [K in keyof TActors as K & string]: {
+          src: K;
+          logic: TActors[K];
+        };
+      }>
+    >,
+  ) => void;
+};
diff --git a/tests/cases/compiler/lambdaParamTypes.ts b/tests/cases/compiler/lambdaParamTypes.ts
index 7a34d4a39ff34..8b96a06106ef1 100644
--- a/tests/cases/compiler/lambdaParamTypes.ts
+++ b/tests/cases/compiler/lambdaParamTypes.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface MyArrayWrapper<T> {
     constructor(initialItems?: T[]);
     doSomething(predicate: (x: T, y: T) => string): void;
diff --git a/tests/cases/compiler/lambdaPropSelf.ts b/tests/cases/compiler/lambdaPropSelf.ts
index 2b80447755a11..2a91aa3874b53 100644
--- a/tests/cases/compiler/lambdaPropSelf.ts
+++ b/tests/cases/compiler/lambdaPropSelf.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare var ko: any;
 
 class Person {
diff --git a/tests/cases/compiler/letConstMatchingParameterNames.ts b/tests/cases/compiler/letConstMatchingParameterNames.ts
index ceb3773bf4634..64118dd3e4fa9 100644
--- a/tests/cases/compiler/letConstMatchingParameterNames.ts
+++ b/tests/cases/compiler/letConstMatchingParameterNames.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 // @target: es5
 let parent = true;
diff --git a/tests/cases/compiler/libMembers.ts b/tests/cases/compiler/libMembers.ts
index 38111f20be342..39d9b5c8f7441 100644
--- a/tests/cases/compiler/libMembers.ts
+++ b/tests/cases/compiler/libMembers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var s="hello";
 s.substring(0);
 s.substring(3,4);
diff --git a/tests/cases/compiler/literalsInComputedProperties1.ts b/tests/cases/compiler/literalsInComputedProperties1.ts
index e3fed5b80aab1..c962b607fad7b 100644
--- a/tests/cases/compiler/literalsInComputedProperties1.ts
+++ b/tests/cases/compiler/literalsInComputedProperties1.ts
@@ -18,20 +18,20 @@ interface A {
     ["4"]:number;
 }
 
-let y:A;
+declare let y:A;
 y[1].toExponential();
 y[2].toExponential();
 y[3].toExponential();
 y[4].toExponential();
 
 class C {
-    1:number;
-    [2]:number;
+    1!:number;
+    [2]!:number;
     "3":number;
-    ["4"]:number;
+    ["4"]!:number;
 }
 
-let z:C;
+declare let z:C;
 z[1].toExponential();
 z[2].toExponential();
 z[3].toExponential();
diff --git a/tests/cases/compiler/localClassesInLoop.ts b/tests/cases/compiler/localClassesInLoop.ts
index 1d5f84d284332..9940300f1c24b 100644
--- a/tests/cases/compiler/localClassesInLoop.ts
+++ b/tests/cases/compiler/localClassesInLoop.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function use(a: any);
 
 "use strict"
diff --git a/tests/cases/compiler/localClassesInLoop_ES6.ts b/tests/cases/compiler/localClassesInLoop_ES6.ts
index 6f0c2c6b33a00..4eeefdc7ab85b 100644
--- a/tests/cases/compiler/localClassesInLoop_ES6.ts
+++ b/tests/cases/compiler/localClassesInLoop_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 declare function use(a: any);
diff --git a/tests/cases/compiler/localVariablesReturnedFromCatchBlocks.ts b/tests/cases/compiler/localVariablesReturnedFromCatchBlocks.ts
index ba277773dd8ea..d04ae1e5dad4c 100644
--- a/tests/cases/compiler/localVariablesReturnedFromCatchBlocks.ts
+++ b/tests/cases/compiler/localVariablesReturnedFromCatchBlocks.ts
@@ -1,3 +1,4 @@
+// @useUnknownInCatchVariables: false
 function f() {
     try {
     } catch (e) {
diff --git a/tests/cases/compiler/mappedTypeNoTypeNoCrash.ts b/tests/cases/compiler/mappedTypeNoTypeNoCrash.ts
index fc9760c7a69b0..11c8cca72688b 100644
--- a/tests/cases/compiler/mappedTypeNoTypeNoCrash.ts
+++ b/tests/cases/compiler/mappedTypeNoTypeNoCrash.ts
@@ -1,2 +1,3 @@
+// @strict: false
 // @declaration: true
 type T0<T> = ({[K in keyof T]}) extends ({[key in K]: T[K]}) ? number : never;
\ No newline at end of file
diff --git a/tests/cases/compiler/mappedTypeRecursiveInference.ts b/tests/cases/compiler/mappedTypeRecursiveInference.ts
index 1b2e34837f6fe..78b13162e06b0 100644
--- a/tests/cases/compiler/mappedTypeRecursiveInference.ts
+++ b/tests/cases/compiler/mappedTypeRecursiveInference.ts
@@ -16,7 +16,7 @@ oub.b
 oub.b.b
 oub.b.a.n.a.n.a
 
-let xhr: XMLHttpRequest;
+declare let xhr: XMLHttpRequest;
 const out2 = foo(xhr);
 out2.responseXML
 out2.responseXML.activeElement.className.length
diff --git a/tests/cases/compiler/mergedModuleDeclarationCodeGen2.ts b/tests/cases/compiler/mergedModuleDeclarationCodeGen2.ts
index 6ece3a4964514..da177b65e9062 100644
--- a/tests/cases/compiler/mergedModuleDeclarationCodeGen2.ts
+++ b/tests/cases/compiler/mergedModuleDeclarationCodeGen2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace my.data.foo {
     export function buz() { }
 }
diff --git a/tests/cases/compiler/mergedModuleDeclarationCodeGen3.ts b/tests/cases/compiler/mergedModuleDeclarationCodeGen3.ts
index 9b11e62d2892d..772bf8faf44ec 100644
--- a/tests/cases/compiler/mergedModuleDeclarationCodeGen3.ts
+++ b/tests/cases/compiler/mergedModuleDeclarationCodeGen3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace my.data {
     export function buz() { }
 }
diff --git a/tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts b/tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts
index 8b58b1f545f39..211e137b84751 100644
--- a/tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts
+++ b/tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace superContain {
     export namespace contain {
         export namespace my.buz {
diff --git a/tests/cases/compiler/metadataOfClassFromAlias.ts b/tests/cases/compiler/metadataOfClassFromAlias.ts
index c7407c8d76603..7de4777970e15 100644
--- a/tests/cases/compiler/metadataOfClassFromAlias.ts
+++ b/tests/cases/compiler/metadataOfClassFromAlias.ts
@@ -2,17 +2,27 @@
 // @emitDecoratorMetadata: true
 // @target: es5
 // @module: commonjs
+// @strict: true, false
 
-// @filename: auxiliry.ts
+// @filename: auxiliary.ts
 export class SomeClass {
     field: string;
 }
 
-//@filename: test.ts
-import { SomeClass } from './auxiliry';
+//@filename: testA.ts
+import { SomeClass } from './auxiliary';
 function annotation(): PropertyDecorator {
     return (target: any): void => { };
 }
 export class ClassA {
-    @annotation() array: SomeClass | null;
+    @annotation() aaa: SomeClass;
+}
+
+//@filename: testB.ts
+import { SomeClass } from './auxiliary';
+function annotation(): PropertyDecorator {
+    return (target: any): void => { };
+}
+export class ClassB {
+    @annotation() bbb: SomeClass | null;
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/metadataOfEventAlias.ts b/tests/cases/compiler/metadataOfEventAlias.ts
index a5b8ffea8502f..4f098777a9ef9 100644
--- a/tests/cases/compiler/metadataOfEventAlias.ts
+++ b/tests/cases/compiler/metadataOfEventAlias.ts
@@ -2,7 +2,6 @@
 // @emitDecoratorMetadata: true
 // @target: es5
 // @skipLibCheck: true
-// @includeBuiltFile: lib.d.ts
 
 // @filename: event.ts
 export interface Event { title: string };
diff --git a/tests/cases/compiler/metadataOfUnion.ts b/tests/cases/compiler/metadataOfUnion.ts
index 2093357cb31e0..a398cfb4a3fe0 100644
--- a/tests/cases/compiler/metadataOfUnion.ts
+++ b/tests/cases/compiler/metadataOfUnion.ts
@@ -1,5 +1,6 @@
 // @experimentalDecorators: true
 // @emitDecoratorMetadata: true
+// @strictPropertyInitialization: false
 function PropDeco(target: Object, propKey: string | symbol) { }
 
 class A {
diff --git a/tests/cases/compiler/metadataOfUnionWithNull.ts b/tests/cases/compiler/metadataOfUnionWithNull.ts
index bb4d93189fc66..066fdfde19c21 100644
--- a/tests/cases/compiler/metadataOfUnionWithNull.ts
+++ b/tests/cases/compiler/metadataOfUnionWithNull.ts
@@ -1,5 +1,7 @@
 // @experimentalDecorators: true
 // @emitDecoratorMetadata: true
+// @strictNullChecks: true, false
+// @strictPropertyInitialization: false
 function PropDeco(target: Object, propKey: string | symbol) { }
 
 class A {
diff --git a/tests/cases/compiler/metadataReferencedWithinFilteredUnion.ts b/tests/cases/compiler/metadataReferencedWithinFilteredUnion.ts
index 6fd19622f8803..1ccb6ff5e1fcf 100644
--- a/tests/cases/compiler/metadataReferencedWithinFilteredUnion.ts
+++ b/tests/cases/compiler/metadataReferencedWithinFilteredUnion.ts
@@ -2,6 +2,9 @@
 // @emitDecoratorMetadata: true
 // @target: es5
 // @filename: Class1.ts
+// @strictNullChecks: true, false
+// @strictPropertyInitialization: false
+
 export class Class1 {
 }
 // @filename: Class2.ts
@@ -12,7 +15,11 @@ function decorate(target: any, propertyKey: string) {
 
 export class Class2 {
     @decorate
-    get prop(): Class1 | undefined {
+    get maybeProp(): Class1 | undefined {
+        return undefined;
+    }
+    @decorate
+    get prop(): Class1 {
         return undefined;
     }
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/methodContainingLocalFunction.ts b/tests/cases/compiler/methodContainingLocalFunction.ts
index 420ac612b2cde..dace65f9f8e26 100644
--- a/tests/cases/compiler/methodContainingLocalFunction.ts
+++ b/tests/cases/compiler/methodContainingLocalFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // The first case here (BugExhibition<T>) caused a crash. Try with different permutations of features.
 class BugExhibition<T> {
diff --git a/tests/cases/compiler/missingCloseParenStatements.ts b/tests/cases/compiler/missingCloseParenStatements.ts
index 7ff34bdae6a16..37327d985bc8a 100644
--- a/tests/cases/compiler/missingCloseParenStatements.ts
+++ b/tests/cases/compiler/missingCloseParenStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var a1, a2, a3 = 0;
 if ( a1 && (a2 + a3 > 0) {
     while( (a2 > 0) && a1
diff --git a/tests/cases/compiler/missingFunctionImplementation.ts b/tests/cases/compiler/missingFunctionImplementation.ts
index e261db3a6670e..f03814e2fb5e0 100644
--- a/tests/cases/compiler/missingFunctionImplementation.ts
+++ b/tests/cases/compiler/missingFunctionImplementation.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 export class C1 {
   m(): void;
diff --git a/tests/cases/compiler/missingFunctionImplementation2.ts b/tests/cases/compiler/missingFunctionImplementation2.ts
index 1717bc663f270..b41db19934487 100644
--- a/tests/cases/compiler/missingFunctionImplementation2.ts
+++ b/tests/cases/compiler/missingFunctionImplementation2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @Filename: missingFunctionImplementation2_a.ts
 export {};
 declare module "./missingFunctionImplementation2_b" {
diff --git a/tests/cases/compiler/missingTypeArguments3.ts b/tests/cases/compiler/missingTypeArguments3.ts
index a0644803af4eb..af9bc645f0159 100644
--- a/tests/cases/compiler/missingTypeArguments3.ts
+++ b/tests/cases/compiler/missingTypeArguments3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare namespace linq {
 
     interface Enumerable<T> {
diff --git a/tests/cases/compiler/mixedExports.ts b/tests/cases/compiler/mixedExports.ts
index 896cb550f4879..ff1ec1969c252 100644
--- a/tests/cases/compiler/mixedExports.ts
+++ b/tests/cases/compiler/mixedExports.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare namespace M {
      function foo();
      export function foo();
diff --git a/tests/cases/compiler/mixingFunctionAndAmbientModule1.ts b/tests/cases/compiler/mixingFunctionAndAmbientModule1.ts
index f6271a80ce33e..198d2c39be437 100644
--- a/tests/cases/compiler/mixingFunctionAndAmbientModule1.ts
+++ b/tests/cases/compiler/mixingFunctionAndAmbientModule1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace A {
     declare namespace My {
         export var x: number;
diff --git a/tests/cases/compiler/mixingStaticAndInstanceOverloads.ts b/tests/cases/compiler/mixingStaticAndInstanceOverloads.ts
index 4def8fcde3e0c..9fa1c50f71771 100644
--- a/tests/cases/compiler/mixingStaticAndInstanceOverloads.ts
+++ b/tests/cases/compiler/mixingStaticAndInstanceOverloads.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C1 {
     // ERROR
     foo1(n: number);
diff --git a/tests/cases/compiler/modFunctionCrash.ts b/tests/cases/compiler/modFunctionCrash.ts
index c1099f974bb59..e1d84c58f171e 100644
--- a/tests/cases/compiler/modFunctionCrash.ts
+++ b/tests/cases/compiler/modFunctionCrash.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare namespace Q {
     function f(fn:()=>void); // typechecking the function type shouldnot crash the compiler
 }
diff --git a/tests/cases/compiler/modifierOnParameter1.ts b/tests/cases/compiler/modifierOnParameter1.ts
index 931911af9b4be..43a464e3bf904 100644
--- a/tests/cases/compiler/modifierOnParameter1.ts
+++ b/tests/cases/compiler/modifierOnParameter1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    constructor(declare p) { }
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts b/tests/cases/compiler/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts
index 51a0ee5d1f532..84ced3a2d8794 100644
--- a/tests/cases/compiler/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts
+++ b/tests/cases/compiler/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5,es2015.core,es2015.symbol.wellknown
 
 function f(x: number, y: number, z: number) {
diff --git a/tests/cases/compiler/moduleAugmentationCollidingNamesInAugmentation1.ts b/tests/cases/compiler/moduleAugmentationCollidingNamesInAugmentation1.ts
index 7cbb78a333bb0..9c6c143a0f133 100644
--- a/tests/cases/compiler/moduleAugmentationCollidingNamesInAugmentation1.ts
+++ b/tests/cases/compiler/moduleAugmentationCollidingNamesInAugmentation1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 // @declaration: true
 
diff --git a/tests/cases/compiler/moduleAugmentationDisallowedExtensions.ts b/tests/cases/compiler/moduleAugmentationDisallowedExtensions.ts
index b4b286db5023e..4f2123da01a11 100644
--- a/tests/cases/compiler/moduleAugmentationDisallowedExtensions.ts
+++ b/tests/cases/compiler/moduleAugmentationDisallowedExtensions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 
 // @filename: x0.ts
diff --git a/tests/cases/compiler/moduleAugmentationGlobal4.ts b/tests/cases/compiler/moduleAugmentationGlobal4.ts
index 44ba2ba9c573a..e4f0b7265bf70 100644
--- a/tests/cases/compiler/moduleAugmentationGlobal4.ts
+++ b/tests/cases/compiler/moduleAugmentationGlobal4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @declaration: true
 
diff --git a/tests/cases/compiler/moduleAugmentationGlobal5.ts b/tests/cases/compiler/moduleAugmentationGlobal5.ts
index f0af540ff60b1..06f36f17a3ac9 100644
--- a/tests/cases/compiler/moduleAugmentationGlobal5.ts
+++ b/tests/cases/compiler/moduleAugmentationGlobal5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @declaration: true
 // @noUncheckedSideEffectImports: false
diff --git a/tests/cases/compiler/moduleAugmentationGlobal6.ts b/tests/cases/compiler/moduleAugmentationGlobal6.ts
index 37e5e33725b2a..7a70c9f7d5ef8 100644
--- a/tests/cases/compiler/moduleAugmentationGlobal6.ts
+++ b/tests/cases/compiler/moduleAugmentationGlobal6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare global {
     interface Array<T> { x }
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/moduleAugmentationGlobal6_1.ts b/tests/cases/compiler/moduleAugmentationGlobal6_1.ts
index d255b7f83196c..7c9690a124bdb 100644
--- a/tests/cases/compiler/moduleAugmentationGlobal6_1.ts
+++ b/tests/cases/compiler/moduleAugmentationGlobal6_1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 global {
     interface Array<T> { x }
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/moduleAugmentationGlobal7.ts b/tests/cases/compiler/moduleAugmentationGlobal7.ts
index 66dd41c8bc9b1..f250e31c67f2f 100644
--- a/tests/cases/compiler/moduleAugmentationGlobal7.ts
+++ b/tests/cases/compiler/moduleAugmentationGlobal7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace A {
     declare global {
         interface Array<T> { x }
diff --git a/tests/cases/compiler/moduleAugmentationGlobal7_1.ts b/tests/cases/compiler/moduleAugmentationGlobal7_1.ts
index b7d99dfd413f8..d834ea5b878bf 100644
--- a/tests/cases/compiler/moduleAugmentationGlobal7_1.ts
+++ b/tests/cases/compiler/moduleAugmentationGlobal7_1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace A {
     global {
         interface Array<T> { x }
diff --git a/tests/cases/compiler/moduleAugmentationGlobal8.ts b/tests/cases/compiler/moduleAugmentationGlobal8.ts
index 5c00c49a8bf46..9014c70c7e358 100644
--- a/tests/cases/compiler/moduleAugmentationGlobal8.ts
+++ b/tests/cases/compiler/moduleAugmentationGlobal8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @module: esnext
 namespace A {
diff --git a/tests/cases/compiler/moduleAugmentationGlobal8_1.ts b/tests/cases/compiler/moduleAugmentationGlobal8_1.ts
index e4900a9be4c5e..224363232b950 100644
--- a/tests/cases/compiler/moduleAugmentationGlobal8_1.ts
+++ b/tests/cases/compiler/moduleAugmentationGlobal8_1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @module: esnext
 namespace A {
diff --git a/tests/cases/compiler/moduleAugmentationImportsAndExports2.ts b/tests/cases/compiler/moduleAugmentationImportsAndExports2.ts
index 8e76475c4043a..8e93d26e48544 100644
--- a/tests/cases/compiler/moduleAugmentationImportsAndExports2.ts
+++ b/tests/cases/compiler/moduleAugmentationImportsAndExports2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @declaration: true
 
@@ -6,7 +7,7 @@ export class A {}
 
 // @filename: f2.ts
 export class B {
-    n: number;
+    n!: number;
 }
 
 // @filename: f3.ts
@@ -36,5 +37,5 @@ declare module "./f1" {
 import {A} from "./f1";
 import "./f3";
 
-let a: A;
+declare let a: A;
 let b = a.foo().n;
\ No newline at end of file
diff --git a/tests/cases/compiler/moduleAugmentationImportsAndExports3.ts b/tests/cases/compiler/moduleAugmentationImportsAndExports3.ts
index ea1d5e435da04..017fd8a289105 100644
--- a/tests/cases/compiler/moduleAugmentationImportsAndExports3.ts
+++ b/tests/cases/compiler/moduleAugmentationImportsAndExports3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @declaration: true
 
@@ -6,7 +7,7 @@ export class A {}
 
 // @filename: f2.ts
 export class B {
-    n: number;
+    n!: number;
 }
 
 // @filename: f3.ts
@@ -34,5 +35,5 @@ declare module "./f1" {
 import {A} from "./f1";
 import "./f3";
 
-let a: A;
+declare let a: A;
 let b = a.foo().n;
\ No newline at end of file
diff --git a/tests/cases/compiler/moduleAugmentationWithNonExistentNamedImport.ts b/tests/cases/compiler/moduleAugmentationWithNonExistentNamedImport.ts
index 6741e58cc91d6..e699ddbc91114 100644
--- a/tests/cases/compiler/moduleAugmentationWithNonExistentNamedImport.ts
+++ b/tests/cases/compiler/moduleAugmentationWithNonExistentNamedImport.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: foo.d.ts
 export = Foo;
 export as namespace Foo;
diff --git a/tests/cases/compiler/moduleAugmentationsBundledOutput1.ts b/tests/cases/compiler/moduleAugmentationsBundledOutput1.ts
index 3792cc821e074..e3f153987eedd 100644
--- a/tests/cases/compiler/moduleAugmentationsBundledOutput1.ts
+++ b/tests/cases/compiler/moduleAugmentationsBundledOutput1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @module: amd
 // @declaration: true
diff --git a/tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts b/tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts
index 68d60977d6204..0a4acde1351fd 100644
--- a/tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts
+++ b/tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace TypeScript {
     export namespace CompilerDiagnostics {
 
diff --git a/tests/cases/compiler/modulePreserve3.ts b/tests/cases/compiler/modulePreserve3.ts
index c15e1b1d4c313..fc4991020130a 100644
--- a/tests/cases/compiler/modulePreserve3.ts
+++ b/tests/cases/compiler/modulePreserve3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: preserve
 // @target: esnext
 // @jsx: react-jsx
diff --git a/tests/cases/compiler/modulePreserveTopLevelAwait1.ts b/tests/cases/compiler/modulePreserveTopLevelAwait1.ts
index 16da28db4a006..79178a110a483 100644
--- a/tests/cases/compiler/modulePreserveTopLevelAwait1.ts
+++ b/tests/cases/compiler/modulePreserveTopLevelAwait1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: preserve
 // @target: es2016, esnext
 // @noEmit: true
diff --git a/tests/cases/compiler/moduleProperty2.ts b/tests/cases/compiler/moduleProperty2.ts
index 2603148161d24..fe17bba13307c 100644
--- a/tests/cases/compiler/moduleProperty2.ts
+++ b/tests/cases/compiler/moduleProperty2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
     function f() {
         var x;
diff --git a/tests/cases/compiler/moduleResolutionWithExtensions_notSupported.ts b/tests/cases/compiler/moduleResolutionWithExtensions_notSupported.ts
index 931c1291e4800..f3fcb70dbbb17 100644
--- a/tests/cases/compiler/moduleResolutionWithExtensions_notSupported.ts
+++ b/tests/cases/compiler/moduleResolutionWithExtensions_notSupported.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @traceResolution: true
 
diff --git a/tests/cases/compiler/moduleResolutionWithExtensions_notSupported2.ts b/tests/cases/compiler/moduleResolutionWithExtensions_notSupported2.ts
index 42741fabad6c0..4cfbff085c726 100644
--- a/tests/cases/compiler/moduleResolutionWithExtensions_notSupported2.ts
+++ b/tests/cases/compiler/moduleResolutionWithExtensions_notSupported2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @allowJs: true
 // @traceResolution: true
diff --git a/tests/cases/compiler/moduleResolutionWithExtensions_notSupported3.ts b/tests/cases/compiler/moduleResolutionWithExtensions_notSupported3.ts
index b665f6932d78b..1fed08b1a144e 100644
--- a/tests/cases/compiler/moduleResolutionWithExtensions_notSupported3.ts
+++ b/tests/cases/compiler/moduleResolutionWithExtensions_notSupported3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @jsx: preserve
 // @traceResolution: true
diff --git a/tests/cases/compiler/moduleResolution_explicitNodeModulesImport_implicitAny.ts b/tests/cases/compiler/moduleResolution_explicitNodeModulesImport_implicitAny.ts
index 97320be01377d..79df7b9d4f326 100644
--- a/tests/cases/compiler/moduleResolution_explicitNodeModulesImport_implicitAny.ts
+++ b/tests/cases/compiler/moduleResolution_explicitNodeModulesImport_implicitAny.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @noImplicitReferences: true
 // @maxNodeModuleJsDepth: 0
diff --git a/tests/cases/compiler/moduleResolution_packageJson_yesAtPackageRoot.ts b/tests/cases/compiler/moduleResolution_packageJson_yesAtPackageRoot.ts
index 64e46c4e71004..3d737515c31e7 100644
--- a/tests/cases/compiler/moduleResolution_packageJson_yesAtPackageRoot.ts
+++ b/tests/cases/compiler/moduleResolution_packageJson_yesAtPackageRoot.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @traceResolution: true
 
diff --git a/tests/cases/compiler/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.ts b/tests/cases/compiler/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.ts
index 9b9f35b41e772..83951ed733dfd 100644
--- a/tests/cases/compiler/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.ts
+++ b/tests/cases/compiler/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @traceResolution: true
 
diff --git a/tests/cases/compiler/moduleResolution_packageJson_yesAtPackageRoot_mainFieldInSubDirectory.ts b/tests/cases/compiler/moduleResolution_packageJson_yesAtPackageRoot_mainFieldInSubDirectory.ts
index 4af56e48e1c3e..d46687b4d7107 100644
--- a/tests/cases/compiler/moduleResolution_packageJson_yesAtPackageRoot_mainFieldInSubDirectory.ts
+++ b/tests/cases/compiler/moduleResolution_packageJson_yesAtPackageRoot_mainFieldInSubDirectory.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @traceResolution: true
 
 // @Filename: /node_modules/foo/package.json
diff --git a/tests/cases/compiler/moduleResolution_relativeImportJsFile.ts b/tests/cases/compiler/moduleResolution_relativeImportJsFile.ts
index 41b6831d582a7..797fb58e7a05e 100644
--- a/tests/cases/compiler/moduleResolution_relativeImportJsFile.ts
+++ b/tests/cases/compiler/moduleResolution_relativeImportJsFile.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 
 // @Filename: /src/b.js
diff --git a/tests/cases/compiler/moduleUnassignedVariable.ts b/tests/cases/compiler/moduleUnassignedVariable.ts
index 6d154df39773b..3d24d50ac2a76 100644
--- a/tests/cases/compiler/moduleUnassignedVariable.ts
+++ b/tests/cases/compiler/moduleUnassignedVariable.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace Bar {
     export var a = 1;
     function fooA() { return a; } // Correct: return Bar.a
diff --git a/tests/cases/compiler/moduleVisibilityTest1.ts b/tests/cases/compiler/moduleVisibilityTest1.ts
index 6e71c4b10d9a5..e996bc23d5bb2 100644
--- a/tests/cases/compiler/moduleVisibilityTest1.ts
+++ b/tests/cases/compiler/moduleVisibilityTest1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 
 namespace OuterMod {
diff --git a/tests/cases/compiler/moduleVisibilityTest2.ts b/tests/cases/compiler/moduleVisibilityTest2.ts
index 79c6187d7b895..d07d6d4e690dc 100644
--- a/tests/cases/compiler/moduleVisibilityTest2.ts
+++ b/tests/cases/compiler/moduleVisibilityTest2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 
 namespace OuterMod {
diff --git a/tests/cases/compiler/module_augmentUninstantiatedModule.ts b/tests/cases/compiler/module_augmentUninstantiatedModule.ts
index 4d71c6c1389f7..3a0b285a20e04 100644
--- a/tests/cases/compiler/module_augmentUninstantiatedModule.ts
+++ b/tests/cases/compiler/module_augmentUninstantiatedModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare module "foo" {
    namespace M {}
    var M;
diff --git a/tests/cases/compiler/module_augmentUninstantiatedModule2.ts b/tests/cases/compiler/module_augmentUninstantiatedModule2.ts
index cfe92bd777015..e16126fe66408 100644
--- a/tests/cases/compiler/module_augmentUninstantiatedModule2.ts
+++ b/tests/cases/compiler/module_augmentUninstantiatedModule2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @moduleResolution: bundler
 
diff --git a/tests/cases/compiler/moduledecl.ts b/tests/cases/compiler/moduledecl.ts
index 8d97e7e73e7a3..0a1a9cf387751 100644
--- a/tests/cases/compiler/moduledecl.ts
+++ b/tests/cases/compiler/moduledecl.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 // @target: es5
 
diff --git a/tests/cases/compiler/multiLineErrors.ts b/tests/cases/compiler/multiLineErrors.ts
index c96f66150e3ca..2c2201cb8d2a4 100644
--- a/tests/cases/compiler/multiLineErrors.ts
+++ b/tests/cases/compiler/multiLineErrors.ts
@@ -16,6 +16,6 @@ interface A2 {
     x: { y: string; };
 }
 
-var t1: A1;
-var t2: A2;
+declare var t1: A1;
+declare var t2: A2;
 t1 = t2;
diff --git a/tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts b/tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts
index 96b552641492f..db50c137b38fa 100644
--- a/tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts
+++ b/tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 return this.edit(role)
     .then((role: Role) =>
         this.roleService.add(role)
diff --git a/tests/cases/compiler/multiModuleFundule1.ts b/tests/cases/compiler/multiModuleFundule1.ts
index 0ab97b6db18fc..28cf19cdb4467 100644
--- a/tests/cases/compiler/multiModuleFundule1.ts
+++ b/tests/cases/compiler/multiModuleFundule1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function C(x: number) { }
 
 namespace C {
diff --git a/tests/cases/compiler/multipleClassPropertyModifiers.ts b/tests/cases/compiler/multipleClassPropertyModifiers.ts
index 8357b5b66760e..7eb233e8c8960 100644
--- a/tests/cases/compiler/multipleClassPropertyModifiers.ts
+++ b/tests/cases/compiler/multipleClassPropertyModifiers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     public static p1;
     static public p2;
diff --git a/tests/cases/compiler/multipleClassPropertyModifiersErrors.ts b/tests/cases/compiler/multipleClassPropertyModifiersErrors.ts
index fba38cf1b0017..d5c233d547a8b 100644
--- a/tests/cases/compiler/multipleClassPropertyModifiersErrors.ts
+++ b/tests/cases/compiler/multipleClassPropertyModifiersErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
 	public public p1;
 	private private p2;
diff --git a/tests/cases/compiler/multipleExportAssignments.ts b/tests/cases/compiler/multipleExportAssignments.ts
index 076ca2e019cd5..cb7eac3f375e0 100644
--- a/tests/cases/compiler/multipleExportAssignments.ts
+++ b/tests/cases/compiler/multipleExportAssignments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 interface connectModule {
     (res, req, next): void;
@@ -6,7 +7,7 @@ interface connectExport {
     use: (mod: connectModule) => connectExport;
     listen: (port: number) => void;
 }
-var server: {
+declare const server: {
     (): connectExport;
     test1: connectModule;
     test2(): connectModule;
diff --git a/tests/cases/compiler/multipleExportAssignmentsInAmbientDeclaration.ts b/tests/cases/compiler/multipleExportAssignmentsInAmbientDeclaration.ts
index 712debc72698d..649c2bb09432d 100644
--- a/tests/cases/compiler/multipleExportAssignmentsInAmbientDeclaration.ts
+++ b/tests/cases/compiler/multipleExportAssignmentsInAmbientDeclaration.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare module "m1" {
     var a: number
     var b: number;
diff --git a/tests/cases/compiler/multipleExports.ts b/tests/cases/compiler/multipleExports.ts
index 0a56c9a719009..913e20caf26c7 100644
--- a/tests/cases/compiler/multipleExports.ts
+++ b/tests/cases/compiler/multipleExports.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 
 export namespace M {
diff --git a/tests/cases/compiler/multipleInheritance.ts b/tests/cases/compiler/multipleInheritance.ts
index c15c6ec1fbc9f..8ce915c5fc9de 100644
--- a/tests/cases/compiler/multipleInheritance.ts
+++ b/tests/cases/compiler/multipleInheritance.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class B1 {
     public x;
 }
diff --git a/tests/cases/compiler/multivar.ts b/tests/cases/compiler/multivar.ts
index 421d32b760d64..72a48396a5909 100644
--- a/tests/cases/compiler/multivar.ts
+++ b/tests/cases/compiler/multivar.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var a,b,c;
 var x=1,y=2,z=3;
 
diff --git a/tests/cases/compiler/namedFunctionExpressionInModule.ts b/tests/cases/compiler/namedFunctionExpressionInModule.ts
index f4da02d6ad273..149d9842ab914 100644
--- a/tests/cases/compiler/namedFunctionExpressionInModule.ts
+++ b/tests/cases/compiler/namedFunctionExpressionInModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace Variables{
     var x = function bar(a, b, c) {
     }
diff --git a/tests/cases/compiler/namedImportNonExistentName.ts b/tests/cases/compiler/namedImportNonExistentName.ts
index 3fd3c3011cc96..1384a53f55b4a 100644
--- a/tests/cases/compiler/namedImportNonExistentName.ts
+++ b/tests/cases/compiler/namedImportNonExistentName.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: foo.d.ts
 export = Foo;
 export as namespace Foo;
@@ -7,7 +8,7 @@ declare namespace Foo {
 }
 
 // @filename: foo2.ts
-let x: { a: string; c: string; } | { b: number; c: number; };
+declare let x: { a: string; c: string; } | { b: number; c: number; };
 export = x
 
 // @filename: bar.ts
diff --git a/tests/cases/compiler/nestedBlockScopedBindings3.ts b/tests/cases/compiler/nestedBlockScopedBindings3.ts
index e073bebadb963..b6630b71fdbef 100644
--- a/tests/cases/compiler/nestedBlockScopedBindings3.ts
+++ b/tests/cases/compiler/nestedBlockScopedBindings3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function a0() {
     {
         for (let x = 0; x < 1; ) {
diff --git a/tests/cases/compiler/nestedBlockScopedBindings4.ts b/tests/cases/compiler/nestedBlockScopedBindings4.ts
index 33ad21e2c429d..d05be62821359 100644
--- a/tests/cases/compiler/nestedBlockScopedBindings4.ts
+++ b/tests/cases/compiler/nestedBlockScopedBindings4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function a0() {
     for (let x; x < 1;) {
         x = x + 1;
diff --git a/tests/cases/compiler/nestedBlockScopedBindings5.ts b/tests/cases/compiler/nestedBlockScopedBindings5.ts
index 65093bcc91fd4..3445597e43fe3 100644
--- a/tests/cases/compiler/nestedBlockScopedBindings5.ts
+++ b/tests/cases/compiler/nestedBlockScopedBindings5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function a0() {
     for (let x in []) {
         x = x + 1;
diff --git a/tests/cases/compiler/nestedBlockScopedBindings6.ts b/tests/cases/compiler/nestedBlockScopedBindings6.ts
index badf1db6e59ae..602b8e73267e7 100644
--- a/tests/cases/compiler/nestedBlockScopedBindings6.ts
+++ b/tests/cases/compiler/nestedBlockScopedBindings6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function a0() {
     for (let x of [1]) {
         x = x + 1;
diff --git a/tests/cases/compiler/nestedIndexer.ts b/tests/cases/compiler/nestedIndexer.ts
index e9a30069fcac9..7c735e9fdf54e 100644
--- a/tests/cases/compiler/nestedIndexer.ts
+++ b/tests/cases/compiler/nestedIndexer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function then(x) {
 
 var match: { [index: number]: string; }
diff --git a/tests/cases/compiler/nestedLoopWithOnlyInnerLetCaptured.ts b/tests/cases/compiler/nestedLoopWithOnlyInnerLetCaptured.ts
index 210465b13dadf..6cbfc29c87747 100644
--- a/tests/cases/compiler/nestedLoopWithOnlyInnerLetCaptured.ts
+++ b/tests/cases/compiler/nestedLoopWithOnlyInnerLetCaptured.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 declare let doSomething;
 
diff --git a/tests/cases/compiler/nestedRecursiveLambda.ts b/tests/cases/compiler/nestedRecursiveLambda.ts
index f1a7223a88a64..ac7dedb3f0769 100644
--- a/tests/cases/compiler/nestedRecursiveLambda.ts
+++ b/tests/cases/compiler/nestedRecursiveLambda.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f(a:any) {
 void (r =>(r => r));
 }
diff --git a/tests/cases/compiler/neverNullishThroughParentheses.ts b/tests/cases/compiler/neverNullishThroughParentheses.ts
new file mode 100644
index 0000000000000..39a0d8f92938c
--- /dev/null
+++ b/tests/cases/compiler/neverNullishThroughParentheses.ts
@@ -0,0 +1,18 @@
+// @strict: true
+
+// Repro for issue where "never nullish" checks miss "never nullish" through parentheses
+
+const x: { y: string | undefined } | undefined = undefined as any;
+
+// Both should error - both expressions are guaranteed to be "oops"
+const foo = x?.y ?? `oops` ?? "";
+const bar = (x?.y ?? `oops`) ?? "";
+
+// Additional test cases with various levels of nesting
+const baz = ((x?.y ?? `oops`)) ?? "";
+const qux = (((x?.y ?? `oops`))) ?? "";
+
+// Test with different types
+const str1 = ("literal") ?? "fallback";
+const str2 = (("nested")) ?? "fallback";
+const nested = ("a" ?? "b") ?? "c";
diff --git a/tests/cases/compiler/newNamesInGlobalAugmentations1.ts b/tests/cases/compiler/newNamesInGlobalAugmentations1.ts
index 53189d5d28afd..9537e390d0ad7 100644
--- a/tests/cases/compiler/newNamesInGlobalAugmentations1.ts
+++ b/tests/cases/compiler/newNamesInGlobalAugmentations1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 
 // @filename: f1.d.ts
diff --git a/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInAccessors.ts b/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInAccessors.ts
index f5115b8a4c282..3c7180beee4d0 100644
--- a/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInAccessors.ts
+++ b/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInAccessors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class class1 {
     get a(): number {
         var x2 = {
diff --git a/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInConstructor.ts b/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInConstructor.ts
index ba868edc566a8..17c936e745803 100644
--- a/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInConstructor.ts
+++ b/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInConstructor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class class1 {
     constructor() {
         var x2 = {
diff --git a/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInFunction.ts b/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInFunction.ts
index 6e931b77de270..954d5c9175279 100644
--- a/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInFunction.ts
+++ b/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 var console: {
     log(val: any);
diff --git a/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInLambda.ts b/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInLambda.ts
index 66d30b29d2ee3..28bac5ae634b6 100644
--- a/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInLambda.ts
+++ b/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInLambda.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function alert(message?: any): void;
 var x = {
     doStuff: (callback) => () => {
diff --git a/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInMethod.ts b/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInMethod.ts
index 1c8fe8a794952..deb87af0dfb51 100644
--- a/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInMethod.ts
+++ b/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInMethod.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var _this = 2;
 class a {
     method1() {
diff --git a/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInProperty.ts b/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInProperty.ts
index 04328d06dc531..b4be84016028c 100644
--- a/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInProperty.ts
+++ b/tests/cases/compiler/noCollisionThisExpressionAndLocalVarInProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class class1 {
     public prop1 = {
         doStuff: (callback) => () => {
diff --git a/tests/cases/compiler/noCollisionThisExpressionInFunctionAndVarInGlobal.ts b/tests/cases/compiler/noCollisionThisExpressionInFunctionAndVarInGlobal.ts
index 3f23fcf1258ab..9486d790f96e4 100644
--- a/tests/cases/compiler/noCollisionThisExpressionInFunctionAndVarInGlobal.ts
+++ b/tests/cases/compiler/noCollisionThisExpressionInFunctionAndVarInGlobal.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 var console: {
     log(val: any);
diff --git a/tests/cases/compiler/noCrashOnNoLib.ts b/tests/cases/compiler/noCrashOnNoLib.ts
index c4cb3f193594e..f8e33513475b2 100644
--- a/tests/cases/compiler/noCrashOnNoLib.ts
+++ b/tests/cases/compiler/noCrashOnNoLib.ts
@@ -1,7 +1,7 @@
 // @noLib: true
 
 export function f() {
-    let e: {}[];
+    let e: {}[] = [];
     while (true) {
       e = [...(e || [])];
     }
diff --git a/tests/cases/compiler/noCrashOnParameterNamedRequire.ts b/tests/cases/compiler/noCrashOnParameterNamedRequire.ts
index bb4b9d53460f6..3d48cbdc5d96b 100644
--- a/tests/cases/compiler/noCrashOnParameterNamedRequire.ts
+++ b/tests/cases/compiler/noCrashOnParameterNamedRequire.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @outDir: ./built
diff --git a/tests/cases/compiler/noImplicitAnyStringIndexerOnObject.ts b/tests/cases/compiler/noImplicitAnyStringIndexerOnObject.ts
index f550bd7bb4d0f..6ab88daf6eec2 100644
--- a/tests/cases/compiler/noImplicitAnyStringIndexerOnObject.ts
+++ b/tests/cases/compiler/noImplicitAnyStringIndexerOnObject.ts
@@ -74,12 +74,12 @@ declare const sym : unique symbol;
 o[sym];
 
 enum NumEnum { a, b }
-let numEnumKey: NumEnum;
+declare let numEnumKey: NumEnum;
 o[numEnumKey];
 
 
 enum StrEnum { a = "a", b = "b" }
-let strEnumKey: StrEnum;
+declare let strEnumKey: StrEnum;
 o[strEnumKey];
 
 
diff --git a/tests/cases/compiler/noImplicitReturnsInAsync2.ts b/tests/cases/compiler/noImplicitReturnsInAsync2.ts
index 20488b6bd370e..25ac1fefc3d29 100644
--- a/tests/cases/compiler/noImplicitReturnsInAsync2.ts
+++ b/tests/cases/compiler/noImplicitReturnsInAsync2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 // @noImplicitReturns: true
 
diff --git a/tests/cases/compiler/noImplicitReturnsWithoutReturnExpression.ts b/tests/cases/compiler/noImplicitReturnsWithoutReturnExpression.ts
index f532b1280d31d..084de174dfe2f 100644
--- a/tests/cases/compiler/noImplicitReturnsWithoutReturnExpression.ts
+++ b/tests/cases/compiler/noImplicitReturnsWithoutReturnExpression.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReturns: true
 function isMissingReturnExpression(): number {
     return;
diff --git a/tests/cases/compiler/noImplicitThisFunctions.ts b/tests/cases/compiler/noImplicitThisFunctions.ts
index 43890762e75b2..5dc7d60790473 100644
--- a/tests/cases/compiler/noImplicitThisFunctions.ts
+++ b/tests/cases/compiler/noImplicitThisFunctions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitThis: true
 
 function f1(x) {
diff --git a/tests/cases/compiler/noParameterReassignmentJSIIFE.ts b/tests/cases/compiler/noParameterReassignmentJSIIFE.ts
index 175e87887ecfd..3b59125987f08 100644
--- a/tests/cases/compiler/noParameterReassignmentJSIIFE.ts
+++ b/tests/cases/compiler/noParameterReassignmentJSIIFE.ts
@@ -1,6 +1,7 @@
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
+// @noImplicitThis: false
 // @filename: index.js
 self.importScripts = (function (importScripts) {
     return function () {
diff --git a/tests/cases/compiler/noUnusedLocals_writeOnlyProperty.ts b/tests/cases/compiler/noUnusedLocals_writeOnlyProperty.ts
index 84e005afd54b6..15e2e0dee2b82 100644
--- a/tests/cases/compiler/noUnusedLocals_writeOnlyProperty.ts
+++ b/tests/cases/compiler/noUnusedLocals_writeOnlyProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noUnusedLocals: true
 
 class C {
diff --git a/tests/cases/compiler/noUnusedLocals_writeOnlyProperty_dynamicNames.ts b/tests/cases/compiler/noUnusedLocals_writeOnlyProperty_dynamicNames.ts
index 065c6f89e7a80..6f1fdad6bd808 100644
--- a/tests/cases/compiler/noUnusedLocals_writeOnlyProperty_dynamicNames.ts
+++ b/tests/cases/compiler/noUnusedLocals_writeOnlyProperty_dynamicNames.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noUnusedLocals: true
 // @lib: es6
 
diff --git a/tests/cases/compiler/noUsedBeforeDefinedErrorInTypeContext.ts b/tests/cases/compiler/noUsedBeforeDefinedErrorInTypeContext.ts
index 7715278f189c0..24bfad7827fa5 100644
--- a/tests/cases/compiler/noUsedBeforeDefinedErrorInTypeContext.ts
+++ b/tests/cases/compiler/noUsedBeforeDefinedErrorInTypeContext.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 
 // https://github.com/microsoft/TypeScript/issues/8775
diff --git a/tests/cases/compiler/nodeResolution4.ts b/tests/cases/compiler/nodeResolution4.ts
index 39868ff504314..5bcb6ec95a8b8 100644
--- a/tests/cases/compiler/nodeResolution4.ts
+++ b/tests/cases/compiler/nodeResolution4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @moduleResolution: bundler
 // @filename: ref.ts
diff --git a/tests/cases/compiler/nodeResolution6.ts b/tests/cases/compiler/nodeResolution6.ts
index c513c6e6d44bb..b1cba10370e7e 100644
--- a/tests/cases/compiler/nodeResolution6.ts
+++ b/tests/cases/compiler/nodeResolution6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @moduleResolution: bundler
 // @filename: node_modules/ref.ts
diff --git a/tests/cases/compiler/nodeResolution8.ts b/tests/cases/compiler/nodeResolution8.ts
index 1961568239982..9b81058e94578 100644
--- a/tests/cases/compiler/nodeResolution8.ts
+++ b/tests/cases/compiler/nodeResolution8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @moduleResolution: bundler
 // @filename: node_modules/a/ref.ts
diff --git a/tests/cases/compiler/nonArrayRestArgs.ts b/tests/cases/compiler/nonArrayRestArgs.ts
index 7078266b91942..a4d2bed39e8e4 100644
--- a/tests/cases/compiler/nonArrayRestArgs.ts
+++ b/tests/cases/compiler/nonArrayRestArgs.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(...rest: number) { // error
 	var x: string = rest[0];
 	return x;
diff --git a/tests/cases/compiler/nonContextuallyTypedLogicalOr.ts b/tests/cases/compiler/nonContextuallyTypedLogicalOr.ts
index cadd60ea398bb..3579b3a07ea83 100644
--- a/tests/cases/compiler/nonContextuallyTypedLogicalOr.ts
+++ b/tests/cases/compiler/nonContextuallyTypedLogicalOr.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Contextual {
     dummy;
     p?: number;
diff --git a/tests/cases/compiler/nonExportedElementsOfMergedModules.ts b/tests/cases/compiler/nonExportedElementsOfMergedModules.ts
index 280af189c59bd..d5de3298c9c84 100644
--- a/tests/cases/compiler/nonExportedElementsOfMergedModules.ts
+++ b/tests/cases/compiler/nonExportedElementsOfMergedModules.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace One {
     enum A { X }
     namespace B {
diff --git a/tests/cases/compiler/nonMergedOverloads.ts b/tests/cases/compiler/nonMergedOverloads.ts
index 582cd72e1f4c1..2ea9ee61105a0 100644
--- a/tests/cases/compiler/nonMergedOverloads.ts
+++ b/tests/cases/compiler/nonMergedOverloads.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var f = 10;
 
 export function f();
diff --git a/tests/cases/compiler/null.ts b/tests/cases/compiler/null.ts
index e8fa9a5d68724..3e02359409378 100644
--- a/tests/cases/compiler/null.ts
+++ b/tests/cases/compiler/null.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 
 var x=null; 
diff --git a/tests/cases/compiler/numberVsBigIntOperations.ts b/tests/cases/compiler/numberVsBigIntOperations.ts
index f53b3a142f914..8d95dca4cf098 100644
--- a/tests/cases/compiler/numberVsBigIntOperations.ts
+++ b/tests/cases/compiler/numberVsBigIntOperations.ts
@@ -58,7 +58,7 @@ result = bigInt !== num;
 num = "3" & 5; num = 2 ** false; // should error, but infer number
 "3" & 5n; 2n ** false; // should error, result in any
 num = ~"3"; num = -false; // should infer number
-let bigIntOrNumber: bigint | number;
+declare let bigIntOrNumber: bigint | number;
 bigIntOrNumber + bigIntOrNumber; // should error, result in any
 bigIntOrNumber << bigIntOrNumber; // should error, result in any
 if (typeof bigIntOrNumber === "bigint") {
@@ -85,14 +85,14 @@ anyValue--; // should infer number
 // Distinguishing numbers from bigints with typeof
 const isBigInt: (x: 0n | 1n) => bigint = (x: 0n | 1n) => x;
 const isNumber: (x: 0 | 1) => number = (x: 0 | 1) => x;
-const zeroOrBigOne: 0 | 1n;
+declare const zeroOrBigOne: 0 | 1n;
 if (typeof zeroOrBigOne === "bigint") isBigInt(zeroOrBigOne);
 else isNumber(zeroOrBigOne);
 
 // Distinguishing truthy from falsy
 const isOne = (x: 1 | 1n) => x;
 if (zeroOrBigOne) isOne(zeroOrBigOne);
-const bigZeroOrOne: 0n | 1;
+declare const bigZeroOrOne: 0n | 1;
 if (bigZeroOrOne) isOne(bigZeroOrOne);
 
 type NumberOrBigint = number | bigint;
diff --git a/tests/cases/compiler/numericIndexExpressions.ts b/tests/cases/compiler/numericIndexExpressions.ts
index 287429c390c81..e93c8c5d89323 100644
--- a/tests/cases/compiler/numericIndexExpressions.ts
+++ b/tests/cases/compiler/numericIndexExpressions.ts
@@ -6,10 +6,10 @@ interface Strings1 {
 }
  
  
-var x: Numbers1;
+declare var x: Numbers1;
 x[1] = 4; // error
 x['1'] = 4; // error
 
-var y: Strings1;
+declare var y: Strings1;
 y['1'] = 4; // should be error
 y[1] = 4; // should be error
\ No newline at end of file
diff --git a/tests/cases/compiler/numericIndexerConstraint1.ts b/tests/cases/compiler/numericIndexerConstraint1.ts
index 9e268ec75d196..382fe465cccfa 100644
--- a/tests/cases/compiler/numericIndexerConstraint1.ts
+++ b/tests/cases/compiler/numericIndexerConstraint1.ts
@@ -1,3 +1,3 @@
 class Foo { foo() { } }
-var x: { [index: string]: number; };
+declare var x: { [index: string]: number; };
 var result: Foo = x["one"]; // error
diff --git a/tests/cases/compiler/numericIndexerConstraint2.ts b/tests/cases/compiler/numericIndexerConstraint2.ts
index 0ee9a210ea7a7..1b47aa889529c 100644
--- a/tests/cases/compiler/numericIndexerConstraint2.ts
+++ b/tests/cases/compiler/numericIndexerConstraint2.ts
@@ -1,4 +1,4 @@
 class Foo { foo() { } }
-var x: { [index: string]: Foo; };
-var a: { one: number; };
+declare var x: { [index: string]: Foo; };
+var a: { one: number; } = { one: 1 };
 x = a;
\ No newline at end of file
diff --git a/tests/cases/compiler/numericIndexerTyping1.ts b/tests/cases/compiler/numericIndexerTyping1.ts
index bedf3d4806f61..6394d4e97a9cc 100644
--- a/tests/cases/compiler/numericIndexerTyping1.ts
+++ b/tests/cases/compiler/numericIndexerTyping1.ts
@@ -5,8 +5,8 @@ interface I {
 interface I2 extends I {
 }
 
-var i: I;
+declare var i: I;
 var r: string = i[1]; // error: numeric indexer returns the type of the string indexer
 
-var i2: I2;
+declare var i2: I2;
 var r2: string = i2[1]; // error: numeric indexer returns the type of the string indexer
\ No newline at end of file
diff --git a/tests/cases/compiler/numericIndexerTyping2.ts b/tests/cases/compiler/numericIndexerTyping2.ts
index f0b477f537b37..bf172194d6174 100644
--- a/tests/cases/compiler/numericIndexerTyping2.ts
+++ b/tests/cases/compiler/numericIndexerTyping2.ts
@@ -5,8 +5,8 @@ class I {
 class I2 extends I {
 }
 
-var i: I;
+declare var i: I;
 var r: string = i[1]; // error: numeric indexer returns the type of the string indexer
 
-var i2: I2;
+declare var i2: I2;
 var r2: string = i2[1]; // error: numeric indexer returns the type of the string indexere
\ No newline at end of file
diff --git a/tests/cases/compiler/numericLiteralsWithTrailingDecimalPoints01.ts b/tests/cases/compiler/numericLiteralsWithTrailingDecimalPoints01.ts
index de45315d8efc1..bb67d55617483 100644
--- a/tests/cases/compiler/numericLiteralsWithTrailingDecimalPoints01.ts
+++ b/tests/cases/compiler/numericLiteralsWithTrailingDecimalPoints01.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 1..toString();
 1.0.toString();
diff --git a/tests/cases/compiler/numericLiteralsWithTrailingDecimalPoints02.ts b/tests/cases/compiler/numericLiteralsWithTrailingDecimalPoints02.ts
index 775175f70c02d..0f004b914142f 100644
--- a/tests/cases/compiler/numericLiteralsWithTrailingDecimalPoints02.ts
+++ b/tests/cases/compiler/numericLiteralsWithTrailingDecimalPoints02.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 // @removeComments: true
 
diff --git a/tests/cases/compiler/objectLitArrayDeclNoNew.ts b/tests/cases/compiler/objectLitArrayDeclNoNew.ts
index 34b6eea40657c..ea3bbe056a81f 100644
--- a/tests/cases/compiler/objectLitArrayDeclNoNew.ts
+++ b/tests/cases/compiler/objectLitArrayDeclNoNew.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 declare var console;
 "use strict";
diff --git a/tests/cases/compiler/objectLitIndexerContextualType.ts b/tests/cases/compiler/objectLitIndexerContextualType.ts
index b687e226cfcf6..452df3a48b24d 100644
--- a/tests/cases/compiler/objectLitIndexerContextualType.ts
+++ b/tests/cases/compiler/objectLitIndexerContextualType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
     [s: string]: (s: string) => number;
 }
diff --git a/tests/cases/compiler/objectLiteralArraySpecialization.ts b/tests/cases/compiler/objectLiteralArraySpecialization.ts
index c152cf36c4b3d..bf9d3430842de 100644
--- a/tests/cases/compiler/objectLiteralArraySpecialization.ts
+++ b/tests/cases/compiler/objectLiteralArraySpecialization.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function create<T>(initialValues?: T[]): MyArrayWrapper<T>;
 interface MyArrayWrapper<T> {
 	constructor(initialItems?: T[]);
diff --git a/tests/cases/compiler/objectLiteralFreshnessWithSpread.ts b/tests/cases/compiler/objectLiteralFreshnessWithSpread.ts
index 7e8044e064ac1..f03ac15511f1d 100644
--- a/tests/cases/compiler/objectLiteralFreshnessWithSpread.ts
+++ b/tests/cases/compiler/objectLiteralFreshnessWithSpread.ts
@@ -1,2 +1,3 @@
+// @strict: false
 let x = { b: 1, extra: 2 }
 let xx: { a, b }  = { a: 1, ...x, z: 3 } // error for 'z', no error for 'extra'
diff --git a/tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts b/tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts
index 368d8d8eb4e44..9120079d59aea 100644
--- a/tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts
+++ b/tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I2 {
     value: string;
     doStuff: (t: string) => string;
diff --git a/tests/cases/compiler/objectLiteralIndexerErrors.ts b/tests/cases/compiler/objectLiteralIndexerErrors.ts
index 7adf65c0f92f1..042f88905ba84 100644
--- a/tests/cases/compiler/objectLiteralIndexerErrors.ts
+++ b/tests/cases/compiler/objectLiteralIndexerErrors.ts
@@ -6,8 +6,8 @@ interface B extends A {
     y: string;
 }
 
-var a: A;
-var b: B;
+declare var a: A;
+declare var b: B;
 var c: any;
 
 var o1: { [s: string]: A;[n: number]: B; } = { x: b, 0: a }; // both indexers are A
diff --git a/tests/cases/compiler/objectPropertyAsClass.ts b/tests/cases/compiler/objectPropertyAsClass.ts
index a4b32acfaae44..188540b39ef37 100644
--- a/tests/cases/compiler/objectPropertyAsClass.ts
+++ b/tests/cases/compiler/objectPropertyAsClass.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @noEmit: true
 // @checkJs: true
diff --git a/tests/cases/compiler/objectRestSpread.ts b/tests/cases/compiler/objectRestSpread.ts
index 25c1512618273..51e9b376beb72 100644
--- a/tests/cases/compiler/objectRestSpread.ts
+++ b/tests/cases/compiler/objectRestSpread.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2017
 // @lib: es2018
 // @noTypesAndSymbols: true
diff --git a/tests/cases/compiler/optionalArgsWithDefaultValues.ts b/tests/cases/compiler/optionalArgsWithDefaultValues.ts
index f42411392b296..34b45451895a6 100644
--- a/tests/cases/compiler/optionalArgsWithDefaultValues.ts
+++ b/tests/cases/compiler/optionalArgsWithDefaultValues.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(x: number, y?:boolean=false, z?=0) {}
 
 class CCC {
diff --git a/tests/cases/compiler/optionalConstructorArgInSuper.ts b/tests/cases/compiler/optionalConstructorArgInSuper.ts
index dcba7da8f9ebe..d74d800851054 100644
--- a/tests/cases/compiler/optionalConstructorArgInSuper.ts
+++ b/tests/cases/compiler/optionalConstructorArgInSuper.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Base {
     constructor(opt?) { }
     foo(other?) { }
diff --git a/tests/cases/compiler/optionalParamAssignmentCompat.ts b/tests/cases/compiler/optionalParamAssignmentCompat.ts
index 60c618eba7471..4bb3cffb55201 100644
--- a/tests/cases/compiler/optionalParamAssignmentCompat.ts
+++ b/tests/cases/compiler/optionalParamAssignmentCompat.ts
@@ -5,6 +5,6 @@ interface I2 {
     p1: I1;
     m1(p1?: string): I1;
 }
-var i2: I2;
+declare var i2: I2;
 var c: I1 = i2.p1; // should be ok
 var d: I1 = i2.m1; // should error
diff --git a/tests/cases/compiler/optionalParamReferencingOtherParams3.ts b/tests/cases/compiler/optionalParamReferencingOtherParams3.ts
index a8e12e45e88cc..fda7c94230a85 100644
--- a/tests/cases/compiler/optionalParamReferencingOtherParams3.ts
+++ b/tests/cases/compiler/optionalParamReferencingOtherParams3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function right(a = b, b = a) {
     a;
     b;
diff --git a/tests/cases/compiler/optionalParamTypeComparison.ts b/tests/cases/compiler/optionalParamTypeComparison.ts
index 1b53f57b1f1e7..fcebf901e2c9d 100644
--- a/tests/cases/compiler/optionalParamTypeComparison.ts
+++ b/tests/cases/compiler/optionalParamTypeComparison.ts
@@ -1,5 +1,5 @@
-var f: (s: string, n?: number) => void;
-var g: (s: string, b?: boolean) => void;
+declare var f: (s: string, n?: number) => void;
+declare var g: (s: string, b?: boolean) => void;
 
 f = g;
 g = f;
\ No newline at end of file
diff --git a/tests/cases/compiler/optionalParameterProperty.ts b/tests/cases/compiler/optionalParameterProperty.ts
index 1f547d4af26a7..f398b526dcbb1 100644
--- a/tests/cases/compiler/optionalParameterProperty.ts
+++ b/tests/cases/compiler/optionalParameterProperty.ts
@@ -1,7 +1,7 @@
 // @strictNullChecks: true
 
 class C {
-    p: number;
+    p: number = 0;
 }
 
 class D extends C { 
diff --git a/tests/cases/compiler/optionalPropertiesSyntax.ts b/tests/cases/compiler/optionalPropertiesSyntax.ts
index 4447575535c1d..d966997b47c51 100644
--- a/tests/cases/compiler/optionalPropertiesSyntax.ts
+++ b/tests/cases/compiler/optionalPropertiesSyntax.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface fnSigs {
     //functions signatures can be optional
     fn(): void;
diff --git a/tests/cases/compiler/optionalPropertiesTest.ts b/tests/cases/compiler/optionalPropertiesTest.ts
index 0f485609a64e8..e0130f4365296 100644
--- a/tests/cases/compiler/optionalPropertiesTest.ts
+++ b/tests/cases/compiler/optionalPropertiesTest.ts
@@ -33,8 +33,8 @@ test7 = {};
 var test8: i4 = { M: 5 }
 test8 = {};
 var test9_1: i2;
-var test9_2: i1;
+declare var test9_2: i1;
 test9_1 = test9_2;
 var test10_1: i1;
-var test10_2: i2;
+declare var test10_2: i2;
 test10_1 = test10_2;
\ No newline at end of file
diff --git a/tests/cases/compiler/orderMattersForSignatureGroupIdentity.ts b/tests/cases/compiler/orderMattersForSignatureGroupIdentity.ts
index d80a56bb47baa..bfb102ca1c146 100644
--- a/tests/cases/compiler/orderMattersForSignatureGroupIdentity.ts
+++ b/tests/cases/compiler/orderMattersForSignatureGroupIdentity.ts
@@ -13,12 +13,12 @@ interface C {
     (x: { s: string }): string
 }
 
-var v: A;
-var v: B;
+declare var v: A;
+declare var v: B;
 
 v({ s: "", n: 0 }).toLowerCase();
 
-var w: A;
-var w: C;
+declare var w: A;
+declare var w: C;
 
 w({ s: "", n: 0 }).toLowerCase();
\ No newline at end of file
diff --git a/tests/cases/compiler/outFileIsDeprecated.ts b/tests/cases/compiler/outFileIsDeprecated.ts
new file mode 100644
index 0000000000000..31c61c9ade00a
--- /dev/null
+++ b/tests/cases/compiler/outFileIsDeprecated.ts
@@ -0,0 +1,15 @@
+// @typeScriptVersion: 6.0
+// @filename: /foo/tsconfig.json
+{
+    "compilerOptions": {
+        "moduleDetection": "auto",
+        "outFile": "dist.js",
+        "ignoreDeprecations": "6.0"
+    }
+}
+
+// @filename: /foo/a.ts
+const a = 1;
+
+// @filename: /foo/b.ts
+const b = 1;
\ No newline at end of file
diff --git a/tests/cases/compiler/overload2.ts b/tests/cases/compiler/overload2.ts
index 17e2dfd0b0b8a..5b3fd9b6ab254 100644
--- a/tests/cases/compiler/overload2.ts
+++ b/tests/cases/compiler/overload2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 enum A { }
 enum B { }
     
diff --git a/tests/cases/compiler/overloadCallTest.ts b/tests/cases/compiler/overloadCallTest.ts
index 97d3265517703..73d605d487d48 100644
--- a/tests/cases/compiler/overloadCallTest.ts
+++ b/tests/cases/compiler/overloadCallTest.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class foo {
     constructor() {
         function bar(): string;
diff --git a/tests/cases/compiler/overloadConsecutiveness.ts b/tests/cases/compiler/overloadConsecutiveness.ts
index ced6d88b80cf9..8018af3d33805 100644
--- a/tests/cases/compiler/overloadConsecutiveness.ts
+++ b/tests/cases/compiler/overloadConsecutiveness.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Making sure compiler won't break with declarations that are consecutive in the AST but not consecutive in the source. Syntax errors intentional.
 
 function f1(), function f1();
diff --git a/tests/cases/compiler/overloadCrash.ts b/tests/cases/compiler/overloadCrash.ts
index 08aab87baabd7..dd16bc9fc3fb8 100644
--- a/tests/cases/compiler/overloadCrash.ts
+++ b/tests/cases/compiler/overloadCrash.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I1 {a:number; b:number;};
 interface I2 {c:number; d:number;};
 interface I3 {a:number; b:number; c:number; d:number;};
diff --git a/tests/cases/compiler/overloadErrorMatchesImplementationElaboaration.ts b/tests/cases/compiler/overloadErrorMatchesImplementationElaboaration.ts
index 39bec86bf04d9..1f73cf9c60cc0 100644
--- a/tests/cases/compiler/overloadErrorMatchesImplementationElaboaration.ts
+++ b/tests/cases/compiler/overloadErrorMatchesImplementationElaboaration.ts
@@ -4,5 +4,5 @@ class EventAggregator
     publish<T>(event: T): void {}
 }
 
-var ea: EventAggregator;
+declare var ea: EventAggregator;
 ea.publish([1,2,3]);
\ No newline at end of file
diff --git a/tests/cases/compiler/overloadModifiersMustAgree.ts b/tests/cases/compiler/overloadModifiersMustAgree.ts
index 95f95397422de..567092bc8d831 100644
--- a/tests/cases/compiler/overloadModifiersMustAgree.ts
+++ b/tests/cases/compiler/overloadModifiersMustAgree.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 class baz {
     public foo();
diff --git a/tests/cases/compiler/overloadOnConstDuplicateOverloads1.ts b/tests/cases/compiler/overloadOnConstDuplicateOverloads1.ts
index 8a9087da6eb76..818797ce30928 100644
--- a/tests/cases/compiler/overloadOnConstDuplicateOverloads1.ts
+++ b/tests/cases/compiler/overloadOnConstDuplicateOverloads1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(a: 'hi', x: string);
 function foo(a: 'hi', x: string);
 function foo(a: any, x: any) {
diff --git a/tests/cases/compiler/overloadOnConstInBaseWithBadImplementationInDerived.ts b/tests/cases/compiler/overloadOnConstInBaseWithBadImplementationInDerived.ts
index 0c2f252c9fdf7..6d3ee81789d45 100644
--- a/tests/cases/compiler/overloadOnConstInBaseWithBadImplementationInDerived.ts
+++ b/tests/cases/compiler/overloadOnConstInBaseWithBadImplementationInDerived.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
     x1(a: number, callback: (x: 'hi') => number);
 }
diff --git a/tests/cases/compiler/overloadOnConstInCallback1.ts b/tests/cases/compiler/overloadOnConstInCallback1.ts
index c3a6c973de0a5..ed40e13614a60 100644
--- a/tests/cases/compiler/overloadOnConstInCallback1.ts
+++ b/tests/cases/compiler/overloadOnConstInCallback1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     x1(a: number, callback: (x: 'hi') => number); // error
     x1(a: number, callback: (x: any) => number) {
diff --git a/tests/cases/compiler/overloadOnConstInObjectLiteralImplementingAnInterface.ts b/tests/cases/compiler/overloadOnConstInObjectLiteralImplementingAnInterface.ts
index 3c1af2963b336..2866e609140c1 100644
--- a/tests/cases/compiler/overloadOnConstInObjectLiteralImplementingAnInterface.ts
+++ b/tests/cases/compiler/overloadOnConstInObjectLiteralImplementingAnInterface.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
     x1(a: number, callback: (x: 'hi') => number);
 }
diff --git a/tests/cases/compiler/overloadOnConstInheritance4.ts b/tests/cases/compiler/overloadOnConstInheritance4.ts
index 60013ee2eeefa..03354279bf6c9 100644
--- a/tests/cases/compiler/overloadOnConstInheritance4.ts
+++ b/tests/cases/compiler/overloadOnConstInheritance4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
     x1(a: number, callback: (x: 'hi') => number);
 }
diff --git a/tests/cases/compiler/overloadOnConstNoAnyImplementation.ts b/tests/cases/compiler/overloadOnConstNoAnyImplementation.ts
index b16696f971080..20c01a4deeeb9 100644
--- a/tests/cases/compiler/overloadOnConstNoAnyImplementation.ts
+++ b/tests/cases/compiler/overloadOnConstNoAnyImplementation.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function x1(a: number, cb: (x: 'hi') => number);
 function x1(a: number, cb: (x: 'bye') => number);
 function x1(a: number, cb: (x: string) => number) {
diff --git a/tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts b/tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts
index 54710254823fc..e1446e2b327e3 100644
--- a/tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts
+++ b/tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
     x1(a: number, callback: (x: 'hi') => number);
 }
@@ -13,7 +14,7 @@ class C {
     }
 }
 
-var c: C;
+declare var c: C;
 c.x1(1, (x: 'hi') => { return 1; } );
 c.x1(1, (x: 'bye') => { return 1; } );
 c.x1(1, (x) => { return 1; } );
diff --git a/tests/cases/compiler/overloadOnConstNoNonSpecializedSignature.ts b/tests/cases/compiler/overloadOnConstNoNonSpecializedSignature.ts
index cb836e590fc6a..683ed8c37f782 100644
--- a/tests/cases/compiler/overloadOnConstNoNonSpecializedSignature.ts
+++ b/tests/cases/compiler/overloadOnConstNoNonSpecializedSignature.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    x1(a: 'hi'); // error, no non-specialized signature in overload list
    x1(a: string) { }
diff --git a/tests/cases/compiler/overloadOnConstNoStringImplementation.ts b/tests/cases/compiler/overloadOnConstNoStringImplementation.ts
index f130dd824070e..5021cbcbdeec1 100644
--- a/tests/cases/compiler/overloadOnConstNoStringImplementation.ts
+++ b/tests/cases/compiler/overloadOnConstNoStringImplementation.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function x2(a: number, cb: (x: 'hi') => number);
 function x2(a: number, cb: (x: 'bye') => number);
 function x2(a: number, cb: (x: any) => number) {
diff --git a/tests/cases/compiler/overloadOnConstNoStringImplementation2.ts b/tests/cases/compiler/overloadOnConstNoStringImplementation2.ts
index a9caec335e35b..7c99834eaf5bb 100644
--- a/tests/cases/compiler/overloadOnConstNoStringImplementation2.ts
+++ b/tests/cases/compiler/overloadOnConstNoStringImplementation2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
     x1(a: number, callback: (x: 'hi') => number);
 }
@@ -13,7 +14,7 @@ class C implements I {
     }
 }
 
-var c: C;
+declare var c: C;
 c.x1(1, (x: 'hi') => { return 1; } );
 c.x1(1, (x: 'bye') => { return 1; } ); 
 c.x1(1, (x: string) => { return 1; } );
diff --git a/tests/cases/compiler/overloadOnGenericClassAndNonGenericClass.ts b/tests/cases/compiler/overloadOnGenericClassAndNonGenericClass.ts
index 083042c5edc34..500d990342e2a 100644
--- a/tests/cases/compiler/overloadOnGenericClassAndNonGenericClass.ts
+++ b/tests/cases/compiler/overloadOnGenericClassAndNonGenericClass.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A { a; }
 class B { b; }
 class C { c; }
diff --git a/tests/cases/compiler/overloadResolutionOnDefaultConstructor1.ts b/tests/cases/compiler/overloadResolutionOnDefaultConstructor1.ts
index f2a889538d09e..5a48afaf85320 100644
--- a/tests/cases/compiler/overloadResolutionOnDefaultConstructor1.ts
+++ b/tests/cases/compiler/overloadResolutionOnDefaultConstructor1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Bar {
     public clone() {
         return new Bar(0);
diff --git a/tests/cases/compiler/overloadResolutionOverCTLambda.ts b/tests/cases/compiler/overloadResolutionOverCTLambda.ts
index 8a494c99f3fd7..b143d190a2db0 100644
--- a/tests/cases/compiler/overloadResolutionOverCTLambda.ts
+++ b/tests/cases/compiler/overloadResolutionOverCTLambda.ts
@@ -1,2 +1,3 @@
+// @strict: false
 function foo(b: (item: number) => boolean) { }
 foo(a => a); // can not convert (number)=>bool to (number)=>number
\ No newline at end of file
diff --git a/tests/cases/compiler/overloadResolutionOverNonCTLambdas.ts b/tests/cases/compiler/overloadResolutionOverNonCTLambdas.ts
index eadaf7c77d749..2f8fab97869ff 100644
--- a/tests/cases/compiler/overloadResolutionOverNonCTLambdas.ts
+++ b/tests/cases/compiler/overloadResolutionOverNonCTLambdas.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace Bugs {
   class A {
   }
diff --git a/tests/cases/compiler/overloadResolutionOverNonCTObjectLit.ts b/tests/cases/compiler/overloadResolutionOverNonCTObjectLit.ts
index 0929650b0655f..aa744fab56f33 100644
--- a/tests/cases/compiler/overloadResolutionOverNonCTObjectLit.ts
+++ b/tests/cases/compiler/overloadResolutionOverNonCTObjectLit.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace Bugs {
                 export interface IToken {
                                 startIndex:number;
diff --git a/tests/cases/compiler/overloadResolutionTest1.ts b/tests/cases/compiler/overloadResolutionTest1.ts
index 6c5a95f7463ac..60972b2e681d7 100644
--- a/tests/cases/compiler/overloadResolutionTest1.ts
+++ b/tests/cases/compiler/overloadResolutionTest1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 function foo(bar:{a:number;}[]):string;
 function foo(bar:{a:boolean;}[]):number;
diff --git a/tests/cases/compiler/overloadResolutionWithAny.ts b/tests/cases/compiler/overloadResolutionWithAny.ts
index f2384daee4fa5..6f30c1701d9f9 100644
--- a/tests/cases/compiler/overloadResolutionWithAny.ts
+++ b/tests/cases/compiler/overloadResolutionWithAny.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var func: {
     (s: string): number;
     (s: any): string;
diff --git a/tests/cases/compiler/overloadWithCallbacksWithDifferingOptionalityOnArgs.ts b/tests/cases/compiler/overloadWithCallbacksWithDifferingOptionalityOnArgs.ts
index 758a7a13c51a3..51ed1165a65b4 100644
--- a/tests/cases/compiler/overloadWithCallbacksWithDifferingOptionalityOnArgs.ts
+++ b/tests/cases/compiler/overloadWithCallbacksWithDifferingOptionalityOnArgs.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function x2(callback: (x?: number) => number);
 function x2(callback: (x: string) => number);
 function x2(callback: (x: any) => number) { }
diff --git a/tests/cases/compiler/overloadingOnConstants1.ts b/tests/cases/compiler/overloadingOnConstants1.ts
index c7f46c3d02915..1ea3687a95fb1 100644
--- a/tests/cases/compiler/overloadingOnConstants1.ts
+++ b/tests/cases/compiler/overloadingOnConstants1.ts
@@ -1,7 +1,7 @@
-class Base { foo() { } }
-class Derived1 extends Base { bar() { } }
-class Derived2 extends Base { baz() { } }
-class Derived3 extends Base { biz() { } }
+class Base { foo() { } }
+class Derived1 extends Base { bar() { } }
+class Derived2 extends Base { baz() { } }
+class Derived3 extends Base { biz() { } }
 
 interface Document2 {
     createElement(tagName: 'canvas'): Derived1;
@@ -10,7 +10,7 @@ interface Document2 {
     createElement(tagName: string): Base;
 }
 
-var d2: Document2;
+declare var d2: Document2;
 
 // these are ok
 var htmlElement: Base = d2.createElement("yo")
diff --git a/tests/cases/compiler/overloadingOnConstantsInImplementation.ts b/tests/cases/compiler/overloadingOnConstantsInImplementation.ts
index 7724584168229..bb3ee2f20cbe9 100644
--- a/tests/cases/compiler/overloadingOnConstantsInImplementation.ts
+++ b/tests/cases/compiler/overloadingOnConstantsInImplementation.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(a: 'hi', x: string);
 function foo(a: 'hi', x: string);
 function foo(a: 'hi', x: any) {
diff --git a/tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts b/tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts
index a139eb8557234..7b7340c4aa859 100644
--- a/tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts
+++ b/tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface A { x }
 interface B { x; y }
 interface C { z }
@@ -16,6 +17,6 @@ var result: number = foo(x => new G(x)); // x has type D, new G(x) fails, so fir
 var result2: number = foo(x => new G<typeof x>(x)); // x has type D, new G(x) fails, so first overload is picked.
 
 var result3: string = foo(x => { // x has type D
-    var y: G<typeof x>; // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
+    var y: G<typeof x> = new G(x); // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
     return y;
 });
diff --git a/tests/cases/compiler/overloadsAndTypeArgumentArity.ts b/tests/cases/compiler/overloadsAndTypeArgumentArity.ts
index ce0eab79d7396..416e5aeb183f7 100644
--- a/tests/cases/compiler/overloadsAndTypeArgumentArity.ts
+++ b/tests/cases/compiler/overloadsAndTypeArgumentArity.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function Callbacks(flags?: string): void;
 declare function Callbacks<T>(flags?: string): void;
 declare function Callbacks<T1, T2>(flags?: string): void;
diff --git a/tests/cases/compiler/overloadsAndTypeArgumentArityErrors.ts b/tests/cases/compiler/overloadsAndTypeArgumentArityErrors.ts
index e8f93a86fd756..5e19d5ac2e1ca 100644
--- a/tests/cases/compiler/overloadsAndTypeArgumentArityErrors.ts
+++ b/tests/cases/compiler/overloadsAndTypeArgumentArityErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function Callbacks(flags?: string): void;
 declare function Callbacks<T>(flags?: string): void;
 declare function Callbacks<T1, T2>(flags?: string): void;
diff --git a/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts b/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts
index e177363ced6a0..d54ca6615a013 100644
--- a/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts
+++ b/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare namespace M {
     // Error because body is not ambient and this overload is
     export function f();
diff --git a/tests/cases/compiler/overloadsWithProvisionalErrors.ts b/tests/cases/compiler/overloadsWithProvisionalErrors.ts
index 7fbfaa68cfa0d..173b853ae6d3f 100644
--- a/tests/cases/compiler/overloadsWithProvisionalErrors.ts
+++ b/tests/cases/compiler/overloadsWithProvisionalErrors.ts
@@ -1,4 +1,4 @@
-var func: {
+declare var func: {
     (s: string): number;
     (lambda: (s: string) => { a: number; b: number }): string;
 };
diff --git a/tests/cases/compiler/overloadsWithinClasses.ts b/tests/cases/compiler/overloadsWithinClasses.ts
index 1af6811feba90..155dca3dca8c8 100644
--- a/tests/cases/compiler/overloadsWithinClasses.ts
+++ b/tests/cases/compiler/overloadsWithinClasses.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class foo {
  
     static fnOverload( ) {}
diff --git a/tests/cases/compiler/parameterPropertyOutsideConstructor.ts b/tests/cases/compiler/parameterPropertyOutsideConstructor.ts
index d852e62ce15df..bb81b4572d4a8 100644
--- a/tests/cases/compiler/parameterPropertyOutsideConstructor.ts
+++ b/tests/cases/compiler/parameterPropertyOutsideConstructor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     foo(public x) {
     }
diff --git a/tests/cases/compiler/paramterDestrcuturingDeclaration.ts b/tests/cases/compiler/paramterDestrcuturingDeclaration.ts
index d05d6076bf066..01a2fe3ad53f8 100644
--- a/tests/cases/compiler/paramterDestrcuturingDeclaration.ts
+++ b/tests/cases/compiler/paramterDestrcuturingDeclaration.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 interface C {
diff --git a/tests/cases/compiler/parenthesizedAsyncArrowFunction.ts b/tests/cases/compiler/parenthesizedAsyncArrowFunction.ts
index 00c1aca653382..ef8061b36ada8 100644
--- a/tests/cases/compiler/parenthesizedAsyncArrowFunction.ts
+++ b/tests/cases/compiler/parenthesizedAsyncArrowFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Repro from #20096
 
 let foo = (async bar => bar);
diff --git a/tests/cases/compiler/parseBigInt.ts b/tests/cases/compiler/parseBigInt.ts
index e50fbb06c9820..ccc45bd947a40 100644
--- a/tests/cases/compiler/parseBigInt.ts
+++ b/tests/cases/compiler/parseBigInt.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 
 // All bases should allow "n" suffix
diff --git a/tests/cases/compiler/parseErrorIncorrectReturnToken.ts b/tests/cases/compiler/parseErrorIncorrectReturnToken.ts
index 0f45c38a3b1b5..8060944c6c1b9 100644
--- a/tests/cases/compiler/parseErrorIncorrectReturnToken.ts
+++ b/tests/cases/compiler/parseErrorIncorrectReturnToken.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 type F1 = {
     (n: number) => string; // should be : not =>
diff --git a/tests/cases/compiler/parseJsxExtends1.ts b/tests/cases/compiler/parseJsxExtends1.ts
index 7dbf396d6efc8..88cbe5440f403 100644
--- a/tests/cases/compiler/parseJsxExtends1.ts
+++ b/tests/cases/compiler/parseJsxExtends1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @jsx: react
 // @filename: index.tsx
 
diff --git a/tests/cases/compiler/parseObjectLiteralsWithoutTypes.ts b/tests/cases/compiler/parseObjectLiteralsWithoutTypes.ts
index 7f00e4b15e796..bc44c12abd7e6 100644
--- a/tests/cases/compiler/parseObjectLiteralsWithoutTypes.ts
+++ b/tests/cases/compiler/parseObjectLiteralsWithoutTypes.ts
@@ -1,3 +1,4 @@
+// @strict: false
 let x: { foo, bar }
 let y: { foo: number, bar }
 let z: { foo, bar: number }
diff --git a/tests/cases/compiler/parseUnaryExpressionNoTypeAssertionInJsx1.ts b/tests/cases/compiler/parseUnaryExpressionNoTypeAssertionInJsx1.ts
index 1c9be1bd45a12..edcec3ad407d6 100644
--- a/tests/cases/compiler/parseUnaryExpressionNoTypeAssertionInJsx1.ts
+++ b/tests/cases/compiler/parseUnaryExpressionNoTypeAssertionInJsx1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @noEmit: true
 // @checkJs: true
diff --git a/tests/cases/compiler/parseUnaryExpressionNoTypeAssertionInJsx4.ts b/tests/cases/compiler/parseUnaryExpressionNoTypeAssertionInJsx4.ts
index 4f892516d10b4..7c6d14cd4bff2 100644
--- a/tests/cases/compiler/parseUnaryExpressionNoTypeAssertionInJsx4.ts
+++ b/tests/cases/compiler/parseUnaryExpressionNoTypeAssertionInJsx4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: index.tsx
 // @jsx: preserve
 
diff --git a/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts b/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts
index 4ec21368fb8c7..5a00f6a96d1ae 100644
--- a/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts
+++ b/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     public f() { };
     private m;
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution6_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution6_classic.ts
index 5ce4bd2a18f54..5e3a16f875d66 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution6_classic.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution6_classic.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 // @traceResolution: true
 
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution6_node.ts b/tests/cases/compiler/pathMappingBasedModuleResolution6_node.ts
index 29a82e5412d9e..c213e1a2447b4 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution6_node.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution6_node.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @traceResolution: true
 
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution7_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution7_classic.ts
index 81c2328df670f..ccc0b8c4b95db 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution7_classic.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution7_classic.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 // @traceResolution: true
 
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts b/tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts
index 1ba9630e0cfab..8dcf7609bf21d 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @traceResolution: true
 
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.ts b/tests/cases/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.ts
index 99e4070ff8a8f..8adfd0282f3a5 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @traceResolution: true
 // @allowJs: true
diff --git a/tests/cases/compiler/potentiallyUncalledDecorators.ts b/tests/cases/compiler/potentiallyUncalledDecorators.ts
index 6a8bc35e43494..49afe4be72d64 100644
--- a/tests/cases/compiler/potentiallyUncalledDecorators.ts
+++ b/tests/cases/compiler/potentiallyUncalledDecorators.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @experimentalDecorators: true
diff --git a/tests/cases/compiler/predicateSemantics.ts b/tests/cases/compiler/predicateSemantics.ts
index 2d36fb200e4fd..e5e22cafaac77 100644
--- a/tests/cases/compiler/predicateSemantics.ts
+++ b/tests/cases/compiler/predicateSemantics.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare let opt: number | undefined;
 
 // OK: One or other operand is possibly nullish
diff --git a/tests/cases/compiler/primitiveMembers.ts b/tests/cases/compiler/primitiveMembers.ts
index 9ac0321035f68..7ccd5c3004a55 100644
--- a/tests/cases/compiler/primitiveMembers.ts
+++ b/tests/cases/compiler/primitiveMembers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var x = 5;
 var r = /yo/;
 r.source;
@@ -6,7 +7,7 @@ x.toBAZ();
 x.toString();
 
 var n = 0;
-var N: Number;
+declare var N: Number;
 
 n = N;  // should not work, as 'number' has a different brand
 N = n; // should work
diff --git a/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts b/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts
index e9fda583a14b4..321f2000c434f 100644
--- a/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts
+++ b/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: amd
 //@declaration: true
 export interface A<T> {
diff --git a/tests/cases/compiler/privacyGloImport.ts b/tests/cases/compiler/privacyGloImport.ts
index a589e9e6ab288..aaa42313c8bdd 100644
--- a/tests/cases/compiler/privacyGloImport.ts
+++ b/tests/cases/compiler/privacyGloImport.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@declaration: true
 namespace m1 {
     export namespace m1_M1_public {
diff --git a/tests/cases/compiler/privacyGloImportParseErrors.ts b/tests/cases/compiler/privacyGloImportParseErrors.ts
index 0d725488952da..8ef5cf2b44363 100644
--- a/tests/cases/compiler/privacyGloImportParseErrors.ts
+++ b/tests/cases/compiler/privacyGloImportParseErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@declaration: true
 namespace m1 {
     export namespace m1_M1_public {
diff --git a/tests/cases/compiler/privacyGloInterface.ts b/tests/cases/compiler/privacyGloInterface.ts
index b56a1da706387..db329c68d78cb 100644
--- a/tests/cases/compiler/privacyGloInterface.ts
+++ b/tests/cases/compiler/privacyGloInterface.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace m1 {
     export class C1_public {
         private f1() {
diff --git a/tests/cases/compiler/privacyImportParseErrors.ts b/tests/cases/compiler/privacyImportParseErrors.ts
index fb9b58ae62995..6f037883a6803 100644
--- a/tests/cases/compiler/privacyImportParseErrors.ts
+++ b/tests/cases/compiler/privacyImportParseErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 export namespace m1 {
     export namespace m1_M1_public {
diff --git a/tests/cases/compiler/privacyInterface.ts b/tests/cases/compiler/privacyInterface.ts
index 13e0d107c09d4..463a9d88fb928 100644
--- a/tests/cases/compiler/privacyInterface.ts
+++ b/tests/cases/compiler/privacyInterface.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 export namespace m1 {
     export class C1_public {
diff --git a/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts b/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts
index 8f2ab891ff891..71c8851f36463 100644
--- a/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts
+++ b/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @declaration: true
 
diff --git a/tests/cases/compiler/privateNameWeakMapCollision.ts b/tests/cases/compiler/privateNameWeakMapCollision.ts
index 22f4af36bf8f0..b9fb33552107a 100644
--- a/tests/cases/compiler/privateNameWeakMapCollision.ts
+++ b/tests/cases/compiler/privateNameWeakMapCollision.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 
 function test() {
diff --git a/tests/cases/compiler/promiseEmptyTupleNoException.ts b/tests/cases/compiler/promiseEmptyTupleNoException.ts
index 84ae24816e4f2..d947f729483bb 100644
--- a/tests/cases/compiler/promiseEmptyTupleNoException.ts
+++ b/tests/cases/compiler/promiseEmptyTupleNoException.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2017
 export async function get(): Promise<[]> {
   let emails = [];
diff --git a/tests/cases/compiler/promisePermutations.ts b/tests/cases/compiler/promisePermutations.ts
index 0ce62be8181a0..00796c2929865 100644
--- a/tests/cases/compiler/promisePermutations.ts
+++ b/tests/cases/compiler/promisePermutations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Promise<T> {
     then<U>(success?: (value: T) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>;
     then<U>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>;
@@ -45,75 +46,75 @@ declare function testFunction12<T>(x: T, y: T): IPromise<T>;
 declare function testFunction12P<T>(x: T): IPromise<T>;
 declare function testFunction12P<T>(x: T, y: T): Promise<T>;
 
-var r1: IPromise<number>;
+declare var r1: IPromise<number>;
 var r1a = r1.then(testFunction, testFunction, testFunction);
 var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, testFunction, testFunction);
 var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
-var s1: Promise<number>;
+declare var s1: Promise<number>;
 var s1a = s1.then(testFunction, testFunction, testFunction);
 var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
 var s1c = s1.then(testFunctionP, testFunction, testFunction);
 var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction, testFunction, testFunction);
 
-var r2: IPromise<{ x: number; }>;
+declare var r2: IPromise<{ x: number; }>;
 var r2a = r2.then(testFunction2, testFunction2, testFunction2);
 var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
-var s2: Promise<{ x: number; }>;
+declare var s2: Promise<{ x: number; }>;
 var s2a = s2.then(testFunction2, testFunction2, testFunction2);
 var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
 var s2c = s2.then(testFunction2P, testFunction2, testFunction2);
 var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
 
-var r3: IPromise<number>;
+declare var r3: IPromise<number>;
 var r3a = r3.then(testFunction3, testFunction3, testFunction3);
 var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3);
-var s3: Promise<number>;
+declare var s3: Promise<number>;
 var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
 var s3c = s3.then(testFunction3P, testFunction3, testFunction3);
 var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3); // error
 
-var r4: IPromise<string>;
-var sIPromise: (x: any) => IPromise<string>;
-var sPromise: (x: any) => Promise<string>;
+declare var r4: IPromise<string>;
+declare var sIPromise: (x: any) => IPromise<string>;
+declare var sPromise: (x: any) => Promise<string>;
 var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
 var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testFunction4, testFunction4); // ok
-var s4: Promise<string>;
+declare var s4: Promise<string>;
 var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error 
 var s4c = s4.then(testFunction4P, testFunction4, testFunction4); // error
 var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, testFunction4P, testFunction4);
 
-var r5: IPromise<string>;
+declare var r5: IPromise<string>;
 var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
 var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s5: Promise<string>;
+declare var s5: Promise<string>;
 var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 var s5b = s5.then(testFunction5P, testFunction5P, testFunction5P); // error
 var s5c = s5.then(testFunction5P, testFunction5, testFunction5); // error
 var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
 
-var r6: IPromise<string>;
+declare var r6: IPromise<string>;
 var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
 var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s6: Promise<string>;
+declare var s6: Promise<string>;
 var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 var s6b = s6.then(testFunction6P, testFunction6P, testFunction6P); // error
 var s6c = s6.then(testFunction6P, testFunction6, testFunction6); // error
 var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
 
-var r7: IPromise<string>;
+declare var r7: IPromise<string>;
 var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s7: Promise<string>;
+declare var s7: Promise<string>;
 var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
 var s7c = r7.then(testFunction7P, testFunction7, testFunction7); // error
 var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromise); // ok?
 
-var r8: IPromise<number>;
-var nIPromise: (x: any) => IPromise<number>;
-var nPromise: (x: any) => Promise<number>;
+declare var r8: IPromise<number>;
+declare var nIPromise: (x: any) => IPromise<number>;
+declare var nPromise: (x: any) => Promise<number>;
 var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
 var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 var s8: Promise<number>;
@@ -122,13 +123,13 @@ var s8b = s8.then(testFunction8P, testFunction8P, testFunction8P); // error
 var s8c = s8.then(testFunction8P, testFunction8, testFunction8); // error
 var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 
-var r9: IPromise<number>;
+declare var r9: IPromise<number>;
 var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 var r9b = r9.then(sIPromise, sIPromise, sIPromise); // ok
 var r9c = r9.then(nIPromise, nIPromise, nIPromise); // ok
 var r9d = r9.then(testFunction, sIPromise, nIPromise); // ok
 var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s9: Promise<number>;
+declare var s9: Promise<number>;
 var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
 var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
@@ -152,9 +153,9 @@ var s10e = s10.then(nIPromise, nPromise, nIPromise); // ok
 var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
 var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
 
-var r11: IPromise<number>;
+declare var r11: IPromise<number>;
 var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
-var s11: Promise<number>;
+declare var s11: Promise<number>;
 var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // error
 var s11c = s11.then(testFunction11P, testFunction11, testFunction11); // error
diff --git a/tests/cases/compiler/promisePermutations2.ts b/tests/cases/compiler/promisePermutations2.ts
index 05a60860929fb..9f07fea58d7ff 100644
--- a/tests/cases/compiler/promisePermutations2.ts
+++ b/tests/cases/compiler/promisePermutations2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // same as promisePermutations but without the same overloads in Promise<T>
 
 interface Promise<T> {
@@ -44,75 +45,75 @@ declare function testFunction12<T>(x: T, y: T): IPromise<T>;
 declare function testFunction12P<T>(x: T): IPromise<T>;
 declare function testFunction12P<T>(x: T, y: T): Promise<T>;
 
-var r1: IPromise<number>;
+declare var r1: IPromise<number>;
 var r1a = r1.then(testFunction, testFunction, testFunction);
 var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, testFunction, testFunction);
 var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
-var s1: Promise<number>;
+declare var s1: Promise<number>;
 var s1a = s1.then(testFunction, testFunction, testFunction);
 var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
 var s1c = s1.then(testFunctionP, testFunction, testFunction);
 var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction, testFunction, testFunction);
 
-var r2: IPromise<{ x: number; }>;
+declare var r2: IPromise<{ x: number; }>;
 var r2a = r2.then(testFunction2, testFunction2, testFunction2);
 var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
-var s2: Promise<{ x: number; }>;
+declare var s2: Promise<{ x: number; }>;
 var s2a = s2.then(testFunction2, testFunction2, testFunction2);
 var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
 var s2c = s2.then(testFunction2P, testFunction2, testFunction2);
 var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
 
-var r3: IPromise<number>;
+declare var r3: IPromise<number>;
 var r3a = r3.then(testFunction3, testFunction3, testFunction3);
 var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3);
-var s3: Promise<number>;
+declare var s3: Promise<number>;
 var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
 var s3c = s3.then(testFunction3P, testFunction3, testFunction3);
 var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3); // Should error
 
-var r4: IPromise<string>;
-var sIPromise: (x: any) => IPromise<string>;
-var sPromise: (x: any) => Promise<string>;
+declare var r4: IPromise<string>;
+declare var sIPromise: (x: any) => IPromise<string>;
+declare var sPromise: (x: any) => Promise<string>;
 var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
 var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testFunction4, testFunction4); // ok
-var s4: Promise<string>;
+declare var s4: Promise<string>;
 var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error 
 var s4c = s4.then(testFunction4P, testFunction4, testFunction4); // error
 var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, testFunction4P, testFunction4);
 
-var r5: IPromise<string>;
+declare var r5: IPromise<string>;
 var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
 var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s5: Promise<string>;
+declare var s5: Promise<string>;
 var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 var s5b = s5.then(testFunction5P, testFunction5P, testFunction5P); // error
 var s5c = s5.then(testFunction5P, testFunction5, testFunction5); // error
 var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
 
-var r6: IPromise<string>;
+declare var r6: IPromise<string>;
 var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
 var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s6: Promise<string>;
+declare var s6: Promise<string>;
 var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 var s6b = s6.then(testFunction6P, testFunction6P, testFunction6P); // error
 var s6c = s6.then(testFunction6P, testFunction6, testFunction6); // error
 var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
 
-var r7: IPromise<string>;
+declare var r7: IPromise<string>;
 var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s7: Promise<string>;
+declare var s7: Promise<string>;
 var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
 var s7c = r7.then(testFunction7P, testFunction7, testFunction7); // error
 var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromise); // ok?
 
-var r8: IPromise<number>;
-var nIPromise: (x: any) => IPromise<number>;
-var nPromise: (x: any) => Promise<number>;
+declare var r8: IPromise<number>;
+declare var nIPromise: (x: any) => IPromise<number>;
+declare var nPromise: (x: any) => Promise<number>;
 var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
 var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 var s8: Promise<number>;
@@ -121,13 +122,13 @@ var s8b = s8.then(testFunction8P, testFunction8P, testFunction8P); // error
 var s8c = s8.then(testFunction8P, testFunction8, testFunction8); // error
 var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 
-var r9: IPromise<number>;
+declare var r9: IPromise<number>;
 var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 var r9b = r9.then(sIPromise, sIPromise, sIPromise); // ok
 var r9c = r9.then(nIPromise, nIPromise, nIPromise); // ok
 var r9d = r9.then(testFunction, sIPromise, nIPromise); // error
 var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s9: Promise<number>;
+declare var s9: Promise<number>;
 var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
 var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
@@ -151,9 +152,9 @@ var s10e = s10.then(nIPromise, nPromise, nIPromise); // ok
 var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
 var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
 
-var r11: IPromise<number>;
+declare var r11: IPromise<number>;
 var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
-var s11: Promise<number>;
+declare var s11: Promise<number>;
 var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // ok
 var s11c = s11.then(testFunction11P, testFunction11, testFunction11); // ok
diff --git a/tests/cases/compiler/promisePermutations3.ts b/tests/cases/compiler/promisePermutations3.ts
index 3aab00b0ed030..1ac0aa98274af 100644
--- a/tests/cases/compiler/promisePermutations3.ts
+++ b/tests/cases/compiler/promisePermutations3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // same as promisePermutations but without the same overloads in IPromise<T>
 
 interface Promise<T> {
@@ -44,75 +45,75 @@ declare function testFunction12<T>(x: T, y: T): IPromise<T>;
 declare function testFunction12P<T>(x: T): IPromise<T>;
 declare function testFunction12P<T>(x: T, y: T): Promise<T>;
 
-var r1: IPromise<number>;
+declare var r1: IPromise<number>;
 var r1a = r1.then(testFunction, testFunction, testFunction);
 var r1b = r1.then(testFunction, testFunction, testFunction).then(testFunction, testFunction, testFunction);
 var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
-var s1: Promise<number>;
+declare var s1: Promise<number>;
 var s1a = s1.then(testFunction, testFunction, testFunction);
 var s1b = s1.then(testFunctionP, testFunctionP, testFunctionP);
 var s1c = s1.then(testFunctionP, testFunction, testFunction);
 var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction, testFunction, testFunction);
 
-var r2: IPromise<{ x: number; }>;
+declare var r2: IPromise<{ x: number; }>;
 var r2a = r2.then(testFunction2, testFunction2, testFunction2);
 var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
-var s2: Promise<{ x: number; }>;
+declare var s2: Promise<{ x: number; }>;
 var s2a = s2.then(testFunction2, testFunction2, testFunction2);
 var s2b = s2.then(testFunction2P, testFunction2P, testFunction2P);
 var s2c = s2.then(testFunction2P, testFunction2, testFunction2);
 var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunction2, testFunction2, testFunction2);
 
-var r3: IPromise<number>;
+declare var r3: IPromise<number>;
 var r3a = r3.then(testFunction3, testFunction3, testFunction3);
 var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3);
-var s3: Promise<number>;
+declare var s3: Promise<number>;
 var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
 var s3c = s3.then(testFunction3P, testFunction3, testFunction3);
 var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunction3, testFunction3, testFunction3);
 
-var r4: IPromise<string>;
-var sIPromise: (x: any) => IPromise<string>;
-var sPromise: (x: any) => Promise<string>;
+declare var r4: IPromise<string>;
+declare var sIPromise: (x: any) => IPromise<string>;
+declare var sPromise: (x: any) => Promise<string>;
 var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
 var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testFunction4, testFunction4); // ok
-var s4: Promise<string>;
+declare var s4: Promise<string>;
 var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error 
 var s4c = s4.then(testFunction4P, testFunction4, testFunction4); // error
 var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, testFunction4P, testFunction4);
 
-var r5: IPromise<string>;
+declare var r5: IPromise<string>;
 var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
 var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s5: Promise<string>;
+declare var s5: Promise<string>;
 var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 var s5b = s5.then(testFunction5P, testFunction5P, testFunction5P); // error
 var s5c = s5.then(testFunction5P, testFunction5, testFunction5); // error
 var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
 
-var r6: IPromise<string>;
+declare var r6: IPromise<string>;
 var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
 var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s6: Promise<string>;
+declare var s6: Promise<string>;
 var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 var s6b = s6.then(testFunction6P, testFunction6P, testFunction6P); // error
 var s6c = s6.then(testFunction6P, testFunction6, testFunction6); // error
 var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPromise); // ok
 
-var r7: IPromise<string>;
+declare var r7: IPromise<string>;
 var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s7: Promise<string>;
+declare var s7: Promise<string>;
 var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
 var s7c = r7.then(testFunction7P, testFunction7, testFunction7); // error
 var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromise); // ok?
 
-var r8: IPromise<number>;
-var nIPromise: (x: any) => IPromise<number>;
-var nPromise: (x: any) => Promise<number>;
+declare var r8: IPromise<number>;
+declare var nIPromise: (x: any) => IPromise<number>;
+declare var nPromise: (x: any) => Promise<number>;
 var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
 var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 var s8: Promise<number>;
@@ -121,13 +122,13 @@ var s8b = s8.then(testFunction8P, testFunction8P, testFunction8P); // error
 var s8c = s8.then(testFunction8P, testFunction8, testFunction8); // error
 var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 
-var r9: IPromise<number>;
+declare var r9: IPromise<number>;
 var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 var r9b = r9.then(sIPromise, sIPromise, sIPromise); // ok
 var r9c = r9.then(nIPromise, nIPromise, nIPromise); // ok
 var r9d = r9.then(testFunction, sIPromise, nIPromise); // error
 var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
-var s9: Promise<number>;
+declare var s9: Promise<number>;
 var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
 var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
@@ -151,9 +152,9 @@ var s10e = s10.then(nIPromise, nPromise, nIPromise); // ok
 var s10f = s10.then(testFunctionP, sIPromise, nIPromise); // error
 var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
 
-var r11: IPromise<number>;
+declare var r11: IPromise<number>;
 var r11a = r11.then(testFunction11, testFunction11, testFunction11); // ok
-var s11: Promise<number>;
+declare var s11: Promise<number>;
 var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // error
 var s11c = s11.then(testFunction11P, testFunction11, testFunction11); // error
diff --git a/tests/cases/compiler/promiseType.ts b/tests/cases/compiler/promiseType.ts
index a61f9bcc65431..254171c639626 100644
--- a/tests/cases/compiler/promiseType.ts
+++ b/tests/cases/compiler/promiseType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 declare var p: Promise<boolean>;
 declare var x: any;
diff --git a/tests/cases/compiler/promiseTypeInference.ts b/tests/cases/compiler/promiseTypeInference.ts
index 49d83ef0094f0..fbb1908c985eb 100644
--- a/tests/cases/compiler/promiseTypeInference.ts
+++ b/tests/cases/compiler/promiseTypeInference.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare class CPromise<T> {
     then<U>(success?: (value: T) => CPromise<U>): CPromise<U>;
 }
diff --git a/tests/cases/compiler/promiseTypeInferenceUnion.ts b/tests/cases/compiler/promiseTypeInferenceUnion.ts
index 7db7aebee4c95..a2bc355352a89 100644
--- a/tests/cases/compiler/promiseTypeInferenceUnion.ts
+++ b/tests/cases/compiler/promiseTypeInferenceUnion.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @lib: esnext
 
diff --git a/tests/cases/compiler/promisesWithConstraints.ts b/tests/cases/compiler/promisesWithConstraints.ts
index d8ce613480fb5..6d8f2feebb546 100644
--- a/tests/cases/compiler/promisesWithConstraints.ts
+++ b/tests/cases/compiler/promisesWithConstraints.ts
@@ -6,15 +6,15 @@ interface CPromise<T extends { x: any; }> {
     then<U extends { x: any; }>(cb: (x: T) => Promise<U>): Promise<U>;
 }
 
-interface Foo { x; }
-interface Bar { x; y; }
+interface Foo { x: any; }
+interface Bar { x: any; y: any; }
 
 var a: Promise<Foo>;
-var b: Promise<Bar>;
+declare var b: Promise<Bar>;
 a = b; // ok
 b = a; // ok
 
 var a2: CPromise<Foo>;
-var b2: CPromise<Bar>;
+declare var b2: CPromise<Bar>;
 a2 = b2; // ok
 b2 = a2; // was error
diff --git a/tests/cases/compiler/propertyAccess1.ts b/tests/cases/compiler/propertyAccess1.ts
index 705e4eadeaed4..ecc567fe5a89a 100644
--- a/tests/cases/compiler/propertyAccess1.ts
+++ b/tests/cases/compiler/propertyAccess1.ts
@@ -1,3 +1,4 @@
-var foo: { a: number; };
+// @strict: false
+declare var foo: { a: number; };
 foo.a = 4;
 foo.b = 5;
\ No newline at end of file
diff --git a/tests/cases/compiler/propertyAccess2.ts b/tests/cases/compiler/propertyAccess2.ts
index 53a5e92058a63..501d812d676f7 100644
--- a/tests/cases/compiler/propertyAccess2.ts
+++ b/tests/cases/compiler/propertyAccess2.ts
@@ -1,2 +1,3 @@
-var foo: number;
+// @strict: false
+declare var foo: number;
 foo.toBAZ();
\ No newline at end of file
diff --git a/tests/cases/compiler/propertyAccess3.ts b/tests/cases/compiler/propertyAccess3.ts
index 5223ca5d24dd3..30eec90538cc9 100644
--- a/tests/cases/compiler/propertyAccess3.ts
+++ b/tests/cases/compiler/propertyAccess3.ts
@@ -1,2 +1,3 @@
-var foo: boolean;
+// @strict: false
+declare var foo: boolean;
 foo.toBAZ();
\ No newline at end of file
diff --git a/tests/cases/compiler/propertyAccess6.ts b/tests/cases/compiler/propertyAccess6.ts
index 1e1da68683d49..992025ad2ec1d 100644
--- a/tests/cases/compiler/propertyAccess6.ts
+++ b/tests/cases/compiler/propertyAccess6.ts
@@ -1,2 +1,3 @@
+// @strict: false
 var foo: any;
 foo.bar = 4;
\ No newline at end of file
diff --git a/tests/cases/compiler/propertyAccess7.ts b/tests/cases/compiler/propertyAccess7.ts
index 9f4e35a4d12f9..918036ebd91fa 100644
--- a/tests/cases/compiler/propertyAccess7.ts
+++ b/tests/cases/compiler/propertyAccess7.ts
@@ -1,2 +1,3 @@
+// @strict: false
 var foo: string;
 foo.toUpperCase();
\ No newline at end of file
diff --git a/tests/cases/compiler/propertyAccessExpressionInnerComments.ts b/tests/cases/compiler/propertyAccessExpressionInnerComments.ts
index fff9401468a5b..83ccf242204d6 100644
--- a/tests/cases/compiler/propertyAccessExpressionInnerComments.ts
+++ b/tests/cases/compiler/propertyAccessExpressionInnerComments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 /*1*/Array/*2*/./*3*/toString/*4*/
 
 /*1*/Array
diff --git a/tests/cases/compiler/propertyAccessOfReadonlyIndexSignature.ts b/tests/cases/compiler/propertyAccessOfReadonlyIndexSignature.ts
index c5f28c5b09732..164bfefca03f4 100644
--- a/tests/cases/compiler/propertyAccessOfReadonlyIndexSignature.ts
+++ b/tests/cases/compiler/propertyAccessOfReadonlyIndexSignature.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Test {
     readonly [key: string]: string;
 }
diff --git a/tests/cases/compiler/propertyAccessOnObjectLiteral.ts b/tests/cases/compiler/propertyAccessOnObjectLiteral.ts
index 89f4021e04be5..3579d66a9cbce 100644
--- a/tests/cases/compiler/propertyAccessOnObjectLiteral.ts
+++ b/tests/cases/compiler/propertyAccessOnObjectLiteral.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A { }
 
 (<A>{}).toString();
diff --git a/tests/cases/compiler/propertyAccessibility1.ts b/tests/cases/compiler/propertyAccessibility1.ts
index ea238fc05967f..1900771d33fe3 100644
--- a/tests/cases/compiler/propertyAccessibility1.ts
+++ b/tests/cases/compiler/propertyAccessibility1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Foo {
   private privProp = 0;
 }
diff --git a/tests/cases/compiler/propertyAccessibility2.ts b/tests/cases/compiler/propertyAccessibility2.ts
index 354a8af185877..b6b237bcc0abd 100644
--- a/tests/cases/compiler/propertyAccessibility2.ts
+++ b/tests/cases/compiler/propertyAccessibility2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
   private static x = 1;
 }
diff --git a/tests/cases/compiler/propertyAssignment.ts b/tests/cases/compiler/propertyAssignment.ts
index 0c8351fb05d2f..7bc93dfbf806f 100644
--- a/tests/cases/compiler/propertyAssignment.ts
+++ b/tests/cases/compiler/propertyAssignment.ts
@@ -1,13 +1,14 @@
+// @strict: false
 
 
-var foo1: { new ():any; }   
-var bar1: { x : number; }
+declare var foo1: { new ():any; }   
+declare var bar1: { x : number; }
 
-var foo2: { [index]; } // should be an error, used to be indexer, now it is a computed property
-var bar2: { x : number; }
+declare var foo2: { [index]; } // should be an error, used to be indexer, now it is a computed property
+declare var bar2: { x : number; }
 
-var foo3: { ():void; }
-var bar3: { x : number; }
+declare var foo3: { ():void; }
+declare var bar3: { x : number; }
 
 
 
diff --git a/tests/cases/compiler/propertyIdentityWithPrivacyMismatch.ts b/tests/cases/compiler/propertyIdentityWithPrivacyMismatch.ts
index d215069686965..960a3b300095e 100644
--- a/tests/cases/compiler/propertyIdentityWithPrivacyMismatch.ts
+++ b/tests/cases/compiler/propertyIdentityWithPrivacyMismatch.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 // @Filename: propertyIdentityWithPrivacyMismatch_0.ts
 declare module 'mod1' {
diff --git a/tests/cases/compiler/propertyOrdering2.ts b/tests/cases/compiler/propertyOrdering2.ts
index bfa7a99fbe528..51d690b92fb1d 100644
--- a/tests/cases/compiler/propertyOrdering2.ts
+++ b/tests/cases/compiler/propertyOrdering2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Foo {
     constructor(public x, y) { }
        foo() {
diff --git a/tests/cases/compiler/propertyParameterWithQuestionMark.ts b/tests/cases/compiler/propertyParameterWithQuestionMark.ts
index ce2d88669c3ed..c391aa911b151 100644
--- a/tests/cases/compiler/propertyParameterWithQuestionMark.ts
+++ b/tests/cases/compiler/propertyParameterWithQuestionMark.ts
@@ -1,9 +1,10 @@
+// @strict: false
 class C {
     constructor(public x?) { }
 }
 
 // x should be an optional property
 var v: C = {}; // Should succeed
-var v2: { x? }
+declare var v2: { x? }
 v = v2; // Should succeed
 var v3: { x } = new C; // Should fail
\ No newline at end of file
diff --git a/tests/cases/compiler/propertySignatures.ts b/tests/cases/compiler/propertySignatures.ts
index b4c73bb304713..9c1c0eb1e6613 100644
--- a/tests/cases/compiler/propertySignatures.ts
+++ b/tests/cases/compiler/propertySignatures.ts
@@ -1,19 +1,20 @@
+// @strict: false
 // Should be error - duplicate identifiers
-var foo1: { a:string; a: string; };
+declare var foo1: { a:string; a: string; };
 
 // Should be OK
-var foo2: { a; };
+declare var foo2: { a; };
 foo2.a = 2;
 foo2.a = "0";
 
 // Should be error
-var foo3: { (): string; (): string; };
+declare var foo3: { (): string; (): string; };
 
 // Should be OK
-var foo4: { (): void; };
+declare var foo4: { (): void; };
 var test = foo();
 
 // Should be OK
-var foo5: {();};
+declare var foo5: {();};
 var test = foo5();
 test.bar = 2;
diff --git a/tests/cases/compiler/propertyWrappedInTry.ts b/tests/cases/compiler/propertyWrappedInTry.ts
index 601842abefbfb..19b47373de72f 100644
--- a/tests/cases/compiler/propertyWrappedInTry.ts
+++ b/tests/cases/compiler/propertyWrappedInTry.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Foo {
 
     try {
diff --git a/tests/cases/compiler/protectedMembers.ts b/tests/cases/compiler/protectedMembers.ts
index b7528f26068fb..694162d2c54e6 100644
--- a/tests/cases/compiler/protectedMembers.ts
+++ b/tests/cases/compiler/protectedMembers.ts
@@ -1,6 +1,7 @@
+// @strict: false
 // Class with protected members
 class C1 {
-    protected x: number;
+    protected x!: number;
     protected static sx: number;
     protected f() {
         return this.x;
@@ -22,8 +23,8 @@ class C2 extends C1 {
 
 // Derived class making protected members public
 class C3 extends C2 {
-    x: number;
-    static sx: number;
+    x!: number;
+    static sx: number
     f() {
         return super.f();
     }
@@ -32,9 +33,9 @@ class C3 extends C2 {
     }
 }
 
-var c1: C1;
-var c2: C2;
-var c3: C3;
+declare var c1: C1;
+declare var c2: C2;
+declare var c3: C3;
 
 // All of these should be errors
 c1.x;
@@ -92,8 +93,8 @@ class A1 {
 class B1 {
     x;
 }
-var a1: A1;
-var b1: B1;
+declare var a1: A1;
+declare var b1: B1;
 a1 = b1;  // Error, B1 doesn't derive from A1
 b1 = a1;  // Error, x is protected in A1 but public in B1
 
diff --git a/tests/cases/compiler/protectedMembersThisParameter.ts b/tests/cases/compiler/protectedMembersThisParameter.ts
index 7a1e3123f597a..e5f0a93f24349 100644
--- a/tests/cases/compiler/protectedMembersThisParameter.ts
+++ b/tests/cases/compiler/protectedMembersThisParameter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Message {
   protected secret(): void {}
 }
diff --git a/tests/cases/compiler/protoAsIndexInIndexExpression.ts b/tests/cases/compiler/protoAsIndexInIndexExpression.ts
index 8764b70e58aeb..8e9b265e93d87 100644
--- a/tests/cases/compiler/protoAsIndexInIndexExpression.ts
+++ b/tests/cases/compiler/protoAsIndexInIndexExpression.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @Filename: protoAsIndexInIndexExpression_0.ts
 export var x;
diff --git a/tests/cases/compiler/protoAssignment.ts b/tests/cases/compiler/protoAssignment.ts
index eac3a4c7fa58e..46c9b7949464f 100644
--- a/tests/cases/compiler/protoAssignment.ts
+++ b/tests/cases/compiler/protoAssignment.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 interface Number extends Comparable<number> {
 
diff --git a/tests/cases/compiler/protoInIndexer.ts b/tests/cases/compiler/protoInIndexer.ts
index dc6a4cfe80922..7c7c00ea708ba 100644
--- a/tests/cases/compiler/protoInIndexer.ts
+++ b/tests/cases/compiler/protoInIndexer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class X {
     constructor() {
         this['__proto__'] = null; // used to cause ICE
diff --git a/tests/cases/compiler/prototypeOnConstructorFunctions.ts b/tests/cases/compiler/prototypeOnConstructorFunctions.ts
index 9db973372d370..d1a07624b7736 100644
--- a/tests/cases/compiler/prototypeOnConstructorFunctions.ts
+++ b/tests/cases/compiler/prototypeOnConstructorFunctions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I1 {
     const: new (options?, element?) => any;
 }
diff --git a/tests/cases/compiler/qualify.ts b/tests/cases/compiler/qualify.ts
index 0e2db204238dd..a58dd0d77fdab 100644
--- a/tests/cases/compiler/qualify.ts
+++ b/tests/cases/compiler/qualify.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
     export var m=0;
     export namespace N {
@@ -41,7 +42,7 @@ namespace Everest {
         export interface I4 {
             z;
         }
-        var v1:I4;
+        var v1:I4 = undefined as any;
         var v2:K1.I3=v1;
         var v3:K1.I3[]=v1;
         var v4:()=>K1.I3=v1;
@@ -54,6 +55,6 @@ interface I {
     k;
 }
 
-var y:I;
+var y:I = undefined as any;
 var x:T.I=y;
 
diff --git a/tests/cases/compiler/reExportUndefined2.ts b/tests/cases/compiler/reExportUndefined2.ts
index 0d3e381fcfa1e..18888e38ce8ac 100644
--- a/tests/cases/compiler/reExportUndefined2.ts
+++ b/tests/cases/compiler/reExportUndefined2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 
 // @filename: a.ts
diff --git a/tests/cases/compiler/reachabilityChecks1.ts b/tests/cases/compiler/reachabilityChecks1.ts
index fbe742b383f2d..499b53a78ad4f 100644
--- a/tests/cases/compiler/reachabilityChecks1.ts
+++ b/tests/cases/compiler/reachabilityChecks1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: false
 // @preserveConstEnums: true
 
diff --git a/tests/cases/compiler/reachabilityChecks11.ts b/tests/cases/compiler/reachabilityChecks11.ts
index abcafb411331a..b8491c668d5ed 100644
--- a/tests/cases/compiler/reachabilityChecks11.ts
+++ b/tests/cases/compiler/reachabilityChecks11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: false
 // @preserveConstEnums: true
 
diff --git a/tests/cases/compiler/reachabilityChecks4.ts b/tests/cases/compiler/reachabilityChecks4.ts
index a853a6e996aa8..9dbcb828f0d68 100644
--- a/tests/cases/compiler/reachabilityChecks4.ts
+++ b/tests/cases/compiler/reachabilityChecks4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noFallthroughCasesInSwitch: true
 
 function foo(x, y) {
diff --git a/tests/cases/compiler/reachabilityChecks5.ts b/tests/cases/compiler/reachabilityChecks5.ts
index 97df11ccb79bb..5e864562f4e8a 100644
--- a/tests/cases/compiler/reachabilityChecks5.ts
+++ b/tests/cases/compiler/reachabilityChecks5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: false
 // @noImplicitReturns: true
 
diff --git a/tests/cases/compiler/reachabilityChecks6.ts b/tests/cases/compiler/reachabilityChecks6.ts
index 725563a44885a..6e48844ef2f99 100644
--- a/tests/cases/compiler/reachabilityChecks6.ts
+++ b/tests/cases/compiler/reachabilityChecks6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: false
 // @noImplicitReturns: true
 
diff --git a/tests/cases/compiler/reachabilityChecks7.ts b/tests/cases/compiler/reachabilityChecks7.ts
index 53702037e3fe0..c715849dbdfff 100644
--- a/tests/cases/compiler/reachabilityChecks7.ts
+++ b/tests/cases/compiler/reachabilityChecks7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @noImplicitReturns: true
 
diff --git a/tests/cases/compiler/readonlyInNonPropertyParameters.ts b/tests/cases/compiler/readonlyInNonPropertyParameters.ts
index e3334e3971986..4ecc5c9414ec2 100644
--- a/tests/cases/compiler/readonlyInNonPropertyParameters.ts
+++ b/tests/cases/compiler/readonlyInNonPropertyParameters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES5
 
 // `readonly` won't work outside of property parameters
diff --git a/tests/cases/compiler/readonlyMembers.ts b/tests/cases/compiler/readonlyMembers.ts
index b625da3b12d09..2dc690cdeee28 100644
--- a/tests/cases/compiler/readonlyMembers.ts
+++ b/tests/cases/compiler/readonlyMembers.ts
@@ -63,10 +63,10 @@ N.a = 1;  // Error
 N.b = 1;
 N.c = 1;
 
-let xx: { readonly [x: string]: string };
+declare let xx: { readonly [x: string]: string };
 let s = xx["foo"];
 xx["foo"] = "abc";  // Error
 
-let yy: { readonly [x: number]: string, [x: string]: string };
+declare let yy: { readonly [x: number]: string, [x: string]: string };
 yy[1] = "abc";  // Error
 yy["foo"] = "abc";
\ No newline at end of file
diff --git a/tests/cases/compiler/recur1.ts b/tests/cases/compiler/recur1.ts
index 61724f80e87a8..d32b4d64fabd0 100644
--- a/tests/cases/compiler/recur1.ts
+++ b/tests/cases/compiler/recur1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var salt:any = new salt.pepper();   
 salt.pepper = function() {}
 
diff --git a/tests/cases/compiler/recursiveClassReferenceTest.ts b/tests/cases/compiler/recursiveClassReferenceTest.ts
index a78e410ad1084..f511760732010 100644
--- a/tests/cases/compiler/recursiveClassReferenceTest.ts
+++ b/tests/cases/compiler/recursiveClassReferenceTest.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 // @sourcemap: true
 // Scenario 1: Test reqursive function call with "this" parameter
diff --git a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts
index b6eeaf94687d6..ea741e89e4a41 100644
--- a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts
+++ b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 // @Filename: recursiveExportAssignmentAndFindAliasedType7_moduleC.ts
 import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleD");
diff --git a/tests/cases/compiler/recursiveGetterAccess.ts b/tests/cases/compiler/recursiveGetterAccess.ts
index 5d4e4b56c7531..a6741a81fb88a 100644
--- a/tests/cases/compiler/recursiveGetterAccess.ts
+++ b/tests/cases/compiler/recursiveGetterAccess.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class MyClass {
 get testProp() { return this.testProp; }
 }
diff --git a/tests/cases/compiler/recursiveInference1.ts b/tests/cases/compiler/recursiveInference1.ts
index 55d2e1642f87a..59b303239a401 100644
--- a/tests/cases/compiler/recursiveInference1.ts
+++ b/tests/cases/compiler/recursiveInference1.ts
@@ -1,2 +1,3 @@
+// @strict: false
 function fib(x:number) { return x <= 1 ? x : fib(x - 1) + fib(x - 2); }
 var result = fib(5);
\ No newline at end of file
diff --git a/tests/cases/compiler/recursiveLetConst.ts b/tests/cases/compiler/recursiveLetConst.ts
index 9e00ae22e9468..aff54f0b58489 100644
--- a/tests/cases/compiler/recursiveLetConst.ts
+++ b/tests/cases/compiler/recursiveLetConst.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target:es6
 'use strict'
 let x = x + 1;
diff --git a/tests/cases/compiler/recursiveNamedLambdaCall.ts b/tests/cases/compiler/recursiveNamedLambdaCall.ts
index 0c0a28d15e4f8..12070e54e6b5d 100644
--- a/tests/cases/compiler/recursiveNamedLambdaCall.ts
+++ b/tests/cases/compiler/recursiveNamedLambdaCall.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 var promise = function( obj ) {
 	
diff --git a/tests/cases/compiler/recursiveProperties.ts b/tests/cases/compiler/recursiveProperties.ts
index 3452c63338ff0..59ec19c4e125d 100644
--- a/tests/cases/compiler/recursiveProperties.ts
+++ b/tests/cases/compiler/recursiveProperties.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 class A {
     get testProp() { return this.testProp; }
diff --git a/tests/cases/compiler/recursiveSpecializationOfSignatures.ts b/tests/cases/compiler/recursiveSpecializationOfSignatures.ts
index 77f2e5970ec74..3d26f28891ff9 100644
--- a/tests/cases/compiler/recursiveSpecializationOfSignatures.ts
+++ b/tests/cases/compiler/recursiveSpecializationOfSignatures.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class S0<B, A> {
 set S1(S2: S0<any,any>) {
 }
diff --git a/tests/cases/compiler/redeclareParameterInCatchBlock.ts b/tests/cases/compiler/redeclareParameterInCatchBlock.ts
index 7f98d68b29d13..781c379a50c53 100644
--- a/tests/cases/compiler/redeclareParameterInCatchBlock.ts
+++ b/tests/cases/compiler/redeclareParameterInCatchBlock.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 
 try {
diff --git a/tests/cases/compiler/reexportMissingDefault.ts b/tests/cases/compiler/reexportMissingDefault.ts
index e661788188c49..aa1ecd35c01ad 100644
--- a/tests/cases/compiler/reexportMissingDefault.ts
+++ b/tests/cases/compiler/reexportMissingDefault.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: b.ts
 export const b = null;
 
diff --git a/tests/cases/compiler/reexportMissingDefault1.ts b/tests/cases/compiler/reexportMissingDefault1.ts
index 22f1966c6d416..1230c7369a8be 100644
--- a/tests/cases/compiler/reexportMissingDefault1.ts
+++ b/tests/cases/compiler/reexportMissingDefault1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @esModuleInterop: true
 // @filename: b.ts
 export const b = null;
diff --git a/tests/cases/compiler/reexportMissingDefault2.ts b/tests/cases/compiler/reexportMissingDefault2.ts
index e7649b88a4762..a1efaaae5dc0b 100644
--- a/tests/cases/compiler/reexportMissingDefault2.ts
+++ b/tests/cases/compiler/reexportMissingDefault2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowSyntheticDefaultImports: true
 // @filename: b.ts
 export const b = null;
diff --git a/tests/cases/compiler/reexportMissingDefault3.ts b/tests/cases/compiler/reexportMissingDefault3.ts
index e28659c87f6ab..00c737f858016 100644
--- a/tests/cases/compiler/reexportMissingDefault3.ts
+++ b/tests/cases/compiler/reexportMissingDefault3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: b.ts
 export const b = null;
 
diff --git a/tests/cases/compiler/reexportMissingDefault4.ts b/tests/cases/compiler/reexportMissingDefault4.ts
index 96b3a1f030b07..86678398ae252 100644
--- a/tests/cases/compiler/reexportMissingDefault4.ts
+++ b/tests/cases/compiler/reexportMissingDefault4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: b.d.ts
 declare var b: number;
 export { b };
diff --git a/tests/cases/compiler/reexportMissingDefault5.ts b/tests/cases/compiler/reexportMissingDefault5.ts
index d3cc13fe229c9..677585a7764c8 100644
--- a/tests/cases/compiler/reexportMissingDefault5.ts
+++ b/tests/cases/compiler/reexportMissingDefault5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: system
 // @filename: b.d.ts
 declare var b: number;
diff --git a/tests/cases/compiler/reexportMissingDefault6.ts b/tests/cases/compiler/reexportMissingDefault6.ts
index 87debfc463f7a..18d0822dcf75a 100644
--- a/tests/cases/compiler/reexportMissingDefault6.ts
+++ b/tests/cases/compiler/reexportMissingDefault6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @filename: b.ts
 export const b = null;
diff --git a/tests/cases/compiler/reexportMissingDefault7.ts b/tests/cases/compiler/reexportMissingDefault7.ts
index 249b7cb4d9233..dfdc6d6017b1f 100644
--- a/tests/cases/compiler/reexportMissingDefault7.ts
+++ b/tests/cases/compiler/reexportMissingDefault7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: ES2015
 // @filename: b.ts
 export const b = null;
diff --git a/tests/cases/compiler/reexportMissingDefault8.ts b/tests/cases/compiler/reexportMissingDefault8.ts
index 2a8f19e9c114e..7f0dad9d1f3db 100644
--- a/tests/cases/compiler/reexportMissingDefault8.ts
+++ b/tests/cases/compiler/reexportMissingDefault8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @esModuleInterop: true
 // @filename: b.ts
 const b = null;
diff --git a/tests/cases/compiler/reexportNameAliasedAndHoisted.ts b/tests/cases/compiler/reexportNameAliasedAndHoisted.ts
index e3c7b23f6de72..8d12653f8f85d 100644
--- a/tests/cases/compiler/reexportNameAliasedAndHoisted.ts
+++ b/tests/cases/compiler/reexportNameAliasedAndHoisted.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: gridview.ts
 export type Sizing = any;
 export const Sizing = null;
diff --git a/tests/cases/compiler/renamingDestructuredPropertyInFunctionType.ts b/tests/cases/compiler/renamingDestructuredPropertyInFunctionType.ts
index 5714dcb887e02..aedec78047a66 100644
--- a/tests/cases/compiler/renamingDestructuredPropertyInFunctionType.ts
+++ b/tests/cases/compiler/renamingDestructuredPropertyInFunctionType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 // @declaration: true
 // GH#37454, GH#41044
diff --git a/tests/cases/compiler/renamingDestructuredPropertyInFunctionType2.ts b/tests/cases/compiler/renamingDestructuredPropertyInFunctionType2.ts
index 3653d833b4303..0036701aea434 100644
--- a/tests/cases/compiler/renamingDestructuredPropertyInFunctionType2.ts
+++ b/tests/cases/compiler/renamingDestructuredPropertyInFunctionType2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: a.d.ts
 type O = { a: string; b: number; c: number; };
 type F1 = (arg: number) => any; 
diff --git a/tests/cases/compiler/renamingDestructuredPropertyInFunctionType3.ts b/tests/cases/compiler/renamingDestructuredPropertyInFunctionType3.ts
index 4b90494734855..8a38fc5d4ac53 100644
--- a/tests/cases/compiler/renamingDestructuredPropertyInFunctionType3.ts
+++ b/tests/cases/compiler/renamingDestructuredPropertyInFunctionType3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 const sym = Symbol();
 type O = Record<symbol, unknown>
diff --git a/tests/cases/compiler/requiredInitializedParameter1.ts b/tests/cases/compiler/requiredInitializedParameter1.ts
index 35d606426f069..0e20d1cefd821 100644
--- a/tests/cases/compiler/requiredInitializedParameter1.ts
+++ b/tests/cases/compiler/requiredInitializedParameter1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f1(a, b = 0, c) { }
 function f2(a, b = 0, c = 0) { }
 function f3(a, b = 0, c?) { }
diff --git a/tests/cases/compiler/requiredInitializedParameter2.ts b/tests/cases/compiler/requiredInitializedParameter2.ts
index 48d42869ee7c8..3e81f89747c61 100644
--- a/tests/cases/compiler/requiredInitializedParameter2.ts
+++ b/tests/cases/compiler/requiredInitializedParameter2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I1 {
     method();
 }
diff --git a/tests/cases/compiler/requiredInitializedParameter3.ts b/tests/cases/compiler/requiredInitializedParameter3.ts
index 803eefb63420b..a34be72d07481 100644
--- a/tests/cases/compiler/requiredInitializedParameter3.ts
+++ b/tests/cases/compiler/requiredInitializedParameter3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@declaration: true
 interface I1 {
     method();
diff --git a/tests/cases/compiler/requiredInitializedParameter4.ts b/tests/cases/compiler/requiredInitializedParameter4.ts
index 4ba15878e43e2..94e2877b956a4 100644
--- a/tests/cases/compiler/requiredInitializedParameter4.ts
+++ b/tests/cases/compiler/requiredInitializedParameter4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@declaration: true
 class C1 {
     method(a = 0, b) { }
diff --git a/tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts b/tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts
index 5cfdbad015f3e..8d206eb5ba1df 100644
--- a/tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts
+++ b/tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts
@@ -1,4 +1,5 @@
 // @declaration: true
+// @strict: false
 namespace rionegrensis {
   export class caniventer extends Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana> {
     salomonseni() : caniventer { var x : caniventer; () => { var y = this; }; return x; }
diff --git a/tests/cases/compiler/restArgMissingName.ts b/tests/cases/compiler/restArgMissingName.ts
index 228ad17314123..52a2d9a50f54e 100644
--- a/tests/cases/compiler/restArgMissingName.ts
+++ b/tests/cases/compiler/restArgMissingName.ts
@@ -1 +1,2 @@
+// @strict: false
 function sum (...) {} 
diff --git a/tests/cases/compiler/restInvalidArgumentType.ts b/tests/cases/compiler/restInvalidArgumentType.ts
index db372fbd4af53..0e69aa9f90dd2 100644
--- a/tests/cases/compiler/restInvalidArgumentType.ts
+++ b/tests/cases/compiler/restInvalidArgumentType.ts
@@ -1,28 +1,28 @@
 enum E { v1, v2 };
 
 function f<T extends { b: string }>(p1: T, p2: T[]) {
-    var t: T;
-
-    var i: T["b"];
-    var k: keyof T;
-
-    var mapped_generic: {[P in keyof T]: T[P]};
-    var mapped: {[P in "b"]: T[P]};
-
-    var union_generic: T | { a: number };
-    var union_primitive: { a: number } | number;
-    var intersection_generic: T & { a: number };
-    var intersection_primitive: { a: number } & string;
-    var num: number;
-    var str: string;
-    var literal_string: "string";
-    var literal_number: 42;
+    var t!: T;
+
+    var i!: T["b"];
+    var k!: keyof T;
+
+    var mapped_generic!: {[P in keyof T]: T[P]};
+    var mapped!: {[P in "b"]: T[P]};
+
+    var union_generic!: T | { a: number };
+    var union_primitive!: { a: number } | number;
+    var intersection_generic!: T & { a: number };
+    var intersection_primitive!: { a: number } & string;
+    var num!: number;
+    var str!: string;
+    var literal_string: "string" = "string";
+    var literal_number: 42 = 42;
     var e: E;
 
-    var u: undefined;
-    var n: null;
+    var u: undefined = undefined;
+    var n: null = null;
 
-    var a: any;
+    var a: any = 0;
 
     var {...r1} = p1;   // Error, generic type paramterre
     var {...r2} = p2;   // OK
diff --git a/tests/cases/compiler/restParamAsOptional.ts b/tests/cases/compiler/restParamAsOptional.ts
index 57f439cbc95d9..5a74a4348350d 100644
--- a/tests/cases/compiler/restParamAsOptional.ts
+++ b/tests/cases/compiler/restParamAsOptional.ts
@@ -1,2 +1,3 @@
+// @strict: false
 function f(...x?) { }
 function f2(...x = []) { }
\ No newline at end of file
diff --git a/tests/cases/compiler/restParamModifier.ts b/tests/cases/compiler/restParamModifier.ts
index 220b7d36d5e33..97533c12d4338 100644
--- a/tests/cases/compiler/restParamModifier.ts
+++ b/tests/cases/compiler/restParamModifier.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     constructor(...public rest: string[]) {}
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/restParamModifier2.ts b/tests/cases/compiler/restParamModifier2.ts
index e007bc56d7c1e..b6a0df84b8c20 100644
--- a/tests/cases/compiler/restParamModifier2.ts
+++ b/tests/cases/compiler/restParamModifier2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     constructor(public ...rest: string[]) {}
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/restParameterNoTypeAnnotation.ts b/tests/cases/compiler/restParameterNoTypeAnnotation.ts
index e6ecf95df0d70..a233909812ac6 100644
--- a/tests/cases/compiler/restParameterNoTypeAnnotation.ts
+++ b/tests/cases/compiler/restParameterNoTypeAnnotation.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(...rest) {   
      var x: number = rest[0];
      return x;   
diff --git a/tests/cases/compiler/restParameterWithBindingPattern1.ts b/tests/cases/compiler/restParameterWithBindingPattern1.ts
index bd6a3b9bbda64..cd2079ffcf085 100644
--- a/tests/cases/compiler/restParameterWithBindingPattern1.ts
+++ b/tests/cases/compiler/restParameterWithBindingPattern1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @sourcemap: true
 
 function a(...{a, b}) { }
\ No newline at end of file
diff --git a/tests/cases/compiler/restParameterWithBindingPattern2.ts b/tests/cases/compiler/restParameterWithBindingPattern2.ts
index d7057885040c5..4132c0f984b5f 100644
--- a/tests/cases/compiler/restParameterWithBindingPattern2.ts
+++ b/tests/cases/compiler/restParameterWithBindingPattern2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @sourcemap: true
 
 function a(...[a, b]) { }
\ No newline at end of file
diff --git a/tests/cases/compiler/returnInfiniteIntersection.ts b/tests/cases/compiler/returnInfiniteIntersection.ts
index 3bb0d1fcc7918..b2ff3b3be45a7 100644
--- a/tests/cases/compiler/returnInfiniteIntersection.ts
+++ b/tests/cases/compiler/returnInfiniteIntersection.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function recursive() {
     let x = <T>(subkey: T) => recursive();
     return x as typeof x & { p };
diff --git a/tests/cases/compiler/returnStatement1.ts b/tests/cases/compiler/returnStatement1.ts
index 06d1bdb956970..b0a72ba977a39 100644
--- a/tests/cases/compiler/returnStatement1.ts
+++ b/tests/cases/compiler/returnStatement1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 
 function f() {
diff --git a/tests/cases/compiler/returnTypeParameterWithModules.ts b/tests/cases/compiler/returnTypeParameterWithModules.ts
index 3b934b6b60408..f9542b6d2f566 100644
--- a/tests/cases/compiler/returnTypeParameterWithModules.ts
+++ b/tests/cases/compiler/returnTypeParameterWithModules.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M1 {
     export function reduce<A>(ar, f, e?): Array<A> {
         return Array.prototype.reduce.apply(ar, e ? [f, e] : [f]);
diff --git a/tests/cases/compiler/returnValueInSetter.ts b/tests/cases/compiler/returnValueInSetter.ts
index 18787f9649038..4423d3f3cd38f 100644
--- a/tests/cases/compiler/returnValueInSetter.ts
+++ b/tests/cases/compiler/returnValueInSetter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class f {
     set x(value) {
         return null; // Should be an error
diff --git a/tests/cases/compiler/scopeCheckExtendedClassInsidePublicMethod2.ts b/tests/cases/compiler/scopeCheckExtendedClassInsidePublicMethod2.ts
index b4902fda03763..37aa8307bb3a0 100644
--- a/tests/cases/compiler/scopeCheckExtendedClassInsidePublicMethod2.ts
+++ b/tests/cases/compiler/scopeCheckExtendedClassInsidePublicMethod2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C { private v; public p; static s; }
 class D extends C {
    public c() {
diff --git a/tests/cases/compiler/scopeCheckExtendedClassInsideStaticMethod1.ts b/tests/cases/compiler/scopeCheckExtendedClassInsideStaticMethod1.ts
index c4af82561385f..9f51238b0ce19 100644
--- a/tests/cases/compiler/scopeCheckExtendedClassInsideStaticMethod1.ts
+++ b/tests/cases/compiler/scopeCheckExtendedClassInsideStaticMethod1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C { private v; public p; static s; }
 class D extends C {
    static c() {
diff --git a/tests/cases/compiler/scopeCheckInsidePublicMethod1.ts b/tests/cases/compiler/scopeCheckInsidePublicMethod1.ts
index 8ff5746a60b09..c9e44e9069add 100644
--- a/tests/cases/compiler/scopeCheckInsidePublicMethod1.ts
+++ b/tests/cases/compiler/scopeCheckInsidePublicMethod1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    static s;
    public a() {
diff --git a/tests/cases/compiler/scopeCheckInsideStaticMethod1.ts b/tests/cases/compiler/scopeCheckInsideStaticMethod1.ts
index f35e7e1f5b7cd..01d65e23cbb80 100644
--- a/tests/cases/compiler/scopeCheckInsideStaticMethod1.ts
+++ b/tests/cases/compiler/scopeCheckInsideStaticMethod1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    private v;
    public p;
diff --git a/tests/cases/compiler/scopeTests.ts b/tests/cases/compiler/scopeTests.ts
index 8cea58550d560..67ab6f69eac4d 100644
--- a/tests/cases/compiler/scopeTests.ts
+++ b/tests/cases/compiler/scopeTests.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C { private v; public p; static s; }
 class D extends C {
   public v: number;
diff --git a/tests/cases/compiler/selfReferencesInFunctionParameters.ts b/tests/cases/compiler/selfReferencesInFunctionParameters.ts
index 95625b9dc95f7..75b005886de92 100644
--- a/tests/cases/compiler/selfReferencesInFunctionParameters.ts
+++ b/tests/cases/compiler/selfReferencesInFunctionParameters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(x: number = x) {
 }
 
diff --git a/tests/cases/compiler/setMethods.ts b/tests/cases/compiler/setMethods.ts
index 14743ce8c2dfa..bd6b2da34cc90 100644
--- a/tests/cases/compiler/setMethods.ts
+++ b/tests/cases/compiler/setMethods.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 
 let numberSet = new Set([0, 1, 2]);
diff --git a/tests/cases/compiler/setterWithReturn.ts b/tests/cases/compiler/setterWithReturn.ts
index cd194e5a072a3..f5570de3291a4 100644
--- a/tests/cases/compiler/setterWithReturn.ts
+++ b/tests/cases/compiler/setterWithReturn.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C234 {
     public set p1(arg1) {
         if (true) {
diff --git a/tests/cases/compiler/shadowedFunctionScopedVariablesByBlockScopedOnes.ts b/tests/cases/compiler/shadowedFunctionScopedVariablesByBlockScopedOnes.ts
index 8aec755a0cd6a..d4f257cddc4a6 100644
--- a/tests/cases/compiler/shadowedFunctionScopedVariablesByBlockScopedOnes.ts
+++ b/tests/cases/compiler/shadowedFunctionScopedVariablesByBlockScopedOnes.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 
 // https://github.com/microsoft/TypeScript/issues/2185
diff --git a/tests/cases/compiler/shadowedReservedCompilerDeclarationsWithNoEmit.ts b/tests/cases/compiler/shadowedReservedCompilerDeclarationsWithNoEmit.ts
index d12ebad67caa3..33dd8ac15745b 100644
--- a/tests/cases/compiler/shadowedReservedCompilerDeclarationsWithNoEmit.ts
+++ b/tests/cases/compiler/shadowedReservedCompilerDeclarationsWithNoEmit.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @noemit: true
 
diff --git a/tests/cases/compiler/sourceMapValidationExportAssignment.ts b/tests/cases/compiler/sourceMapValidationExportAssignment.ts
index 8b0a951415339..fe0b283b8e5d7 100644
--- a/tests/cases/compiler/sourceMapValidationExportAssignment.ts
+++ b/tests/cases/compiler/sourceMapValidationExportAssignment.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: amd
 // @sourcemap: true
 class a {
diff --git a/tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.ts b/tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.ts
index ccf25ae59b7df..a42496e3027be 100644
--- a/tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.ts
+++ b/tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 // @sourcemap: true
 class a {
diff --git a/tests/cases/compiler/specializationsShouldNotAffectEachOther.ts b/tests/cases/compiler/specializationsShouldNotAffectEachOther.ts
index a2f71510bbbf9..8f8d55502abbc 100644
--- a/tests/cases/compiler/specializationsShouldNotAffectEachOther.ts
+++ b/tests/cases/compiler/specializationsShouldNotAffectEachOther.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 interface Series  {
     data: string[];
diff --git a/tests/cases/compiler/specializeVarArgs1.ts b/tests/cases/compiler/specializeVarArgs1.ts
index a8441148175c5..e30c0d26e9aad 100644
--- a/tests/cases/compiler/specializeVarArgs1.ts
+++ b/tests/cases/compiler/specializeVarArgs1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Observable<T>{ }
 
  
diff --git a/tests/cases/compiler/specializedOverloadWithRestParameters.ts b/tests/cases/compiler/specializedOverloadWithRestParameters.ts
index d746076e2c80e..c0cb8c9d7e02b 100644
--- a/tests/cases/compiler/specializedOverloadWithRestParameters.ts
+++ b/tests/cases/compiler/specializedOverloadWithRestParameters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Base { foo() { } }
 class Derived1 extends Base { bar() { } }
 function f(tagName: 'span', ...args): Derived1;   // error
diff --git a/tests/cases/compiler/specializedSignatureAsCallbackParameter1.ts b/tests/cases/compiler/specializedSignatureAsCallbackParameter1.ts
index 72b2a2825df4d..2ceca922f5b76 100644
--- a/tests/cases/compiler/specializedSignatureAsCallbackParameter1.ts
+++ b/tests/cases/compiler/specializedSignatureAsCallbackParameter1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function x3(a: number, cb: (x: number) => number);
 function x3(a: string, cb: (x: number) => number);
 function x3(a: any, cb: (x: number) => number) {
diff --git a/tests/cases/compiler/spreadInvalidArgumentType.ts b/tests/cases/compiler/spreadInvalidArgumentType.ts
index 82e59fbac5921..a368e66211a14 100644
--- a/tests/cases/compiler/spreadInvalidArgumentType.ts
+++ b/tests/cases/compiler/spreadInvalidArgumentType.ts
@@ -1,31 +1,30 @@
 enum E { v1, v2 };
 
 function f<T extends { b: string }>(p1: T, p2: T[]) {
-    var t: T;
+    var t!: T;
 
-    var i: T["b"];
-    var k: keyof T;
+    var i!: T["b"];
+    var k!: keyof T;
 
-    var mapped_generic: {[P in keyof T]: T[P]};
-    var mapped: {[P in "b"]: T[P]};
+    var mapped_generic!: {[P in keyof T]: T[P]};
+    var mapped!: {[P in "b"]: T[P]};
 
-    var union_generic: T | { a: number };
-    var union_primitive: { a: number } | number;
+    var union_generic!: T | { a: number };
+    var union_primitive!: { a: number } | number;
+    var intersection_generic!: T & { a: number };
+    var intersection_primitive!: { a: number } | string;
 
-    var intersection_generic: T & { a: number };
-    var intersection_primitive: { a: number } | string;
+    var num!: number;
+    var str!: number;
+    var literal_string: "string" = "string";
+    var literal_number: 42 = 42;
 
-    var num: number;
-    var str: number;
-    var literal_string: "string";
-    var literal_number: 42;
+    var u: undefined = undefined;
+    var n: null = null;
+    var a: any = 0;
 
-    var u: undefined;
-    var n: null;
-    var a: any;
 
-
-    var e: E;
+    var e!: E;
 
     var o1 = { ...p1 };  // OK, generic type paramterre
     var o2 = { ...p2 };  // OK
diff --git a/tests/cases/compiler/staticAsIdentifier.ts b/tests/cases/compiler/staticAsIdentifier.ts
index acea65b9f09dc..f7f23fa415fe4 100644
--- a/tests/cases/compiler/staticAsIdentifier.ts
+++ b/tests/cases/compiler/staticAsIdentifier.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C1 {
     static static
     [x: string]: string;
diff --git a/tests/cases/compiler/staticClassMemberError.ts b/tests/cases/compiler/staticClassMemberError.ts
index 3d35e598622ea..64e406d3ff3d6 100644
--- a/tests/cases/compiler/staticClassMemberError.ts
+++ b/tests/cases/compiler/staticClassMemberError.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
 	static s;
 	public a() {
diff --git a/tests/cases/compiler/staticMemberExportAccess.ts b/tests/cases/compiler/staticMemberExportAccess.ts
index e508d10b7fe3f..dbb131c246a5f 100644
--- a/tests/cases/compiler/staticMemberExportAccess.ts
+++ b/tests/cases/compiler/staticMemberExportAccess.ts
@@ -10,7 +10,7 @@ namespace Sammy {
 interface JQueryStatic {
     sammy: Sammy; // class instance
 }
-var $: JQueryStatic;
+declare var $: JQueryStatic;
 var instanceOfClassSammy: Sammy = new $.sammy(); // should be error
 var r1 = instanceOfClassSammy.foo(); // r1 is string
 var r2 = $.sammy.foo();
diff --git a/tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts b/tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts
index aa78d4333c641..64a0ca8132db0 100644
--- a/tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts
+++ b/tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface A {
     prop();
 }
diff --git a/tests/cases/compiler/staticModifierAlreadySeen.ts b/tests/cases/compiler/staticModifierAlreadySeen.ts
index fdcc5cafda85d..6cd9dc0c65b6f 100644
--- a/tests/cases/compiler/staticModifierAlreadySeen.ts
+++ b/tests/cases/compiler/staticModifierAlreadySeen.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     static static foo = 1;
     public static static bar() { }
diff --git a/tests/cases/compiler/strictNullNotNullIndexTypeNoLib.ts b/tests/cases/compiler/strictNullNotNullIndexTypeNoLib.ts
index f5df0e2be8b72..bb63ebd45a3f2 100644
--- a/tests/cases/compiler/strictNullNotNullIndexTypeNoLib.ts
+++ b/tests/cases/compiler/strictNullNotNullIndexTypeNoLib.ts
@@ -1,4 +1,5 @@
 // @strictNullChecks: true
+// @strictPropertyInitialization: false
 // @noLib: true
 type Readonly<T> = {readonly [K in keyof T]: T[K]}
 interface A {
diff --git a/tests/cases/compiler/strictNullNotNullIndexTypeShouldWork.ts b/tests/cases/compiler/strictNullNotNullIndexTypeShouldWork.ts
index 954eaee454b6f..3cd2eccef4100 100644
--- a/tests/cases/compiler/strictNullNotNullIndexTypeShouldWork.ts
+++ b/tests/cases/compiler/strictNullNotNullIndexTypeShouldWork.ts
@@ -1,4 +1,5 @@
 // @strictNullChecks: true
+// @strictPropertyInitialization: false
 interface A {
     params?: { name: string; };
 }
diff --git a/tests/cases/compiler/stringIndexerAssignments1.ts b/tests/cases/compiler/stringIndexerAssignments1.ts
index a13f46d273277..473e9a90f1ecf 100644
--- a/tests/cases/compiler/stringIndexerAssignments1.ts
+++ b/tests/cases/compiler/stringIndexerAssignments1.ts
@@ -1,5 +1,5 @@
 var x: { [index: string]: string; one: string; };
-var a: { one: string; };
-var b: { one: number; two: string; };
+declare var a: { one: string; };
+declare var b: { one: number; two: string; };
 x = a;
 x = b; // error
diff --git a/tests/cases/compiler/stringIndexerAssignments2.ts b/tests/cases/compiler/stringIndexerAssignments2.ts
index 0792851ff34e7..c325f43a5038d 100644
--- a/tests/cases/compiler/stringIndexerAssignments2.ts
+++ b/tests/cases/compiler/stringIndexerAssignments2.ts
@@ -1,20 +1,20 @@
 class C1 {
     [index: string]: string
-    one: string;
+    one!: string;
 }
 
 class C2 {
-    one: string;
+    one!: string;
 }
 
 class C3 {
-    one: number;
-    two: string;
+    one!: number;
+    two!: string;
 }
 
-var x: C1;
-var a: C2;
-var b: C3;
+declare var x: C1;
+declare var a: C2;
+declare var b: C3;
 
 x = a;
 x = b;
\ No newline at end of file
diff --git a/tests/cases/compiler/structuralTypeInDeclareFileForModule.ts b/tests/cases/compiler/structuralTypeInDeclareFileForModule.ts
index 12aec8fedfc6d..6058d68d33c32 100644
--- a/tests/cases/compiler/structuralTypeInDeclareFileForModule.ts
+++ b/tests/cases/compiler/structuralTypeInDeclareFileForModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 namespace M { export var x; }
diff --git a/tests/cases/compiler/substitutionTypeForIndexedAccessType2.ts b/tests/cases/compiler/substitutionTypeForIndexedAccessType2.ts
index c687879efd463..97c0f6f538db5 100644
--- a/tests/cases/compiler/substitutionTypeForIndexedAccessType2.ts
+++ b/tests/cases/compiler/substitutionTypeForIndexedAccessType2.ts
@@ -7,9 +7,6 @@ type Str<T extends string> = T
 type Bar<T> = 
   T extends Foo
     ? T['foo'] extends string
-      // Type 'T["foo"]' does not satisfy the constraint 'string'.
-      //  Type 'string | undefined' is not assignable to type 'string'.
-      //   Type 'undefined' is not assignable to type 'string'.(2344)
       ? Str<T['foo']>
       : never
     : never
\ No newline at end of file
diff --git a/tests/cases/compiler/super1.ts b/tests/cases/compiler/super1.ts
index c982bc89e69ee..9631f8c51de24 100644
--- a/tests/cases/compiler/super1.ts
+++ b/tests/cases/compiler/super1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Case 1
 class Base1 {
     public foo() {
diff --git a/tests/cases/compiler/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.ts b/tests/cases/compiler/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.ts
index d633ccb018fc7..e8421cb1e591a 100644
--- a/tests/cases/compiler/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.ts
+++ b/tests/cases/compiler/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 class A<T1, T2> {
     constructor(private map: (value: T1) => T2) {
diff --git a/tests/cases/compiler/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.ts b/tests/cases/compiler/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.ts
index c09fb37db2d09..a546133c9f34d 100644
--- a/tests/cases/compiler/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.ts
+++ b/tests/cases/compiler/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 class A<T1, T2> {
     constructor(private map: (value: T1) => T2) {
diff --git a/tests/cases/compiler/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.ts b/tests/cases/compiler/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.ts
index 99755d87fbf23..d2ac0f6c71a0f 100644
--- a/tests/cases/compiler/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.ts
+++ b/tests/cases/compiler/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 class A {
     constructor(private map: (value: number) => string) {
diff --git a/tests/cases/compiler/superCallFromClassThatHasNoBaseType1.ts b/tests/cases/compiler/superCallFromClassThatHasNoBaseType1.ts
index 5f030bd5562bd..8e28e438474df 100644
--- a/tests/cases/compiler/superCallFromClassThatHasNoBaseType1.ts
+++ b/tests/cases/compiler/superCallFromClassThatHasNoBaseType1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 class A {
     constructor(private map: (value: number) => string) {
diff --git a/tests/cases/compiler/superCallFromFunction1.ts b/tests/cases/compiler/superCallFromFunction1.ts
index 81874204e1af8..1e4de55f0399e 100644
--- a/tests/cases/compiler/superCallFromFunction1.ts
+++ b/tests/cases/compiler/superCallFromFunction1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 function foo() {
     super(value => String(value));
diff --git a/tests/cases/compiler/superNewCall1.ts b/tests/cases/compiler/superNewCall1.ts
index b3792d55221dd..79fbd6ae5bb23 100644
--- a/tests/cases/compiler/superNewCall1.ts
+++ b/tests/cases/compiler/superNewCall1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 class A<T1, T2> {
     constructor(private map: (value: T1) => T2) {
diff --git a/tests/cases/compiler/superWithTypeArgument2.ts b/tests/cases/compiler/superWithTypeArgument2.ts
index a7ecf3986faa9..aedefd55c0831 100644
--- a/tests/cases/compiler/superWithTypeArgument2.ts
+++ b/tests/cases/compiler/superWithTypeArgument2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C<T> {
     foo: T;
 }
diff --git a/tests/cases/compiler/switchCaseCircularRefeference.ts b/tests/cases/compiler/switchCaseCircularRefeference.ts
index 060b90fa8a1cd..ceee4f6a1f698 100644
--- a/tests/cases/compiler/switchCaseCircularRefeference.ts
+++ b/tests/cases/compiler/switchCaseCircularRefeference.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Repro from #9507
 
 function f(x: {a: "A", b} | {a: "C", e}) {
diff --git a/tests/cases/compiler/systemJsForInNoException.ts b/tests/cases/compiler/systemJsForInNoException.ts
index e35c3aa24a353..51742b6379278 100644
--- a/tests/cases/compiler/systemJsForInNoException.ts
+++ b/tests/cases/compiler/systemJsForInNoException.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: system
 // @lib: es6,dom
 export const obj = { a: 1 };
diff --git a/tests/cases/compiler/systemModule11.ts b/tests/cases/compiler/systemModule11.ts
index 15784b2f8c413..8ba8a55f61ec9 100644
--- a/tests/cases/compiler/systemModule11.ts
+++ b/tests/cases/compiler/systemModule11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: system
 // @isolatedModules: true
 
diff --git a/tests/cases/compiler/systemModule4.ts b/tests/cases/compiler/systemModule4.ts
index 2dc46ee68e5f8..83c33f38a8425 100644
--- a/tests/cases/compiler/systemModule4.ts
+++ b/tests/cases/compiler/systemModule4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: system
 
 export var x = 1;
diff --git a/tests/cases/compiler/systemModule8.ts b/tests/cases/compiler/systemModule8.ts
index 4490b2a85294f..cc3bfe33d4353 100644
--- a/tests/cases/compiler/systemModule8.ts
+++ b/tests/cases/compiler/systemModule8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 // @module: system
 
diff --git a/tests/cases/compiler/systemModuleAmbientDeclarations.ts b/tests/cases/compiler/systemModuleAmbientDeclarations.ts
index 5cc0bb98b1e48..4516532efbc63 100644
--- a/tests/cases/compiler/systemModuleAmbientDeclarations.ts
+++ b/tests/cases/compiler/systemModuleAmbientDeclarations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: system
 // @isolatedModules: true
 
diff --git a/tests/cases/compiler/systemModuleConstEnums.ts b/tests/cases/compiler/systemModuleConstEnums.ts
index c3e37e3dbccd7..c93b4fd4bacfe 100644
--- a/tests/cases/compiler/systemModuleConstEnums.ts
+++ b/tests/cases/compiler/systemModuleConstEnums.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: system
 
 declare function use(a: any);
diff --git a/tests/cases/compiler/systemModuleConstEnumsSeparateCompilation.ts b/tests/cases/compiler/systemModuleConstEnumsSeparateCompilation.ts
index 0a50934847cd4..09ff0de67d2dc 100644
--- a/tests/cases/compiler/systemModuleConstEnumsSeparateCompilation.ts
+++ b/tests/cases/compiler/systemModuleConstEnumsSeparateCompilation.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: system
 // @isolatedModules: true
 
diff --git a/tests/cases/compiler/taggedTemplateStringsWithCurriedFunction.ts b/tests/cases/compiler/taggedTemplateStringsWithCurriedFunction.ts
index 3accdd66e844e..6d4ba209fe82f 100644
--- a/tests/cases/compiler/taggedTemplateStringsWithCurriedFunction.ts
+++ b/tests/cases/compiler/taggedTemplateStringsWithCurriedFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: es5
 
 // Originated from #38558
diff --git a/tests/cases/compiler/targetTypeCastTest.ts b/tests/cases/compiler/targetTypeCastTest.ts
index c8b9569b3ef1d..e5817a51dbd20 100644
--- a/tests/cases/compiler/targetTypeCastTest.ts
+++ b/tests/cases/compiler/targetTypeCastTest.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare var Point: { new(x:number, y:number): {x: number; y: number; }; }
 
 function Point(x, y) {
diff --git a/tests/cases/compiler/targetTypeTest1.ts b/tests/cases/compiler/targetTypeTest1.ts
index d2720f2b995e6..e7bbb9cc5f2ad 100644
--- a/tests/cases/compiler/targetTypeTest1.ts
+++ b/tests/cases/compiler/targetTypeTest1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare class Point
 {
       constructor(x: number, y: number);
diff --git a/tests/cases/compiler/testTypings.ts b/tests/cases/compiler/testTypings.ts
index 3d58875ef11bd..b4a70ace11835 100644
--- a/tests/cases/compiler/testTypings.ts
+++ b/tests/cases/compiler/testTypings.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface IComparable<T> {
    compareTo(other: T);
 }
diff --git a/tests/cases/compiler/thisBinding.ts b/tests/cases/compiler/thisBinding.ts
index 86a5bc89aa0e9..1ffdb8febe692 100644
--- a/tests/cases/compiler/thisBinding.ts
+++ b/tests/cases/compiler/thisBinding.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
     export interface I {
 	z;
diff --git a/tests/cases/compiler/thisBinding2.ts b/tests/cases/compiler/thisBinding2.ts
index b478ce9338f4c..1abf7aac0800e 100644
--- a/tests/cases/compiler/thisBinding2.ts
+++ b/tests/cases/compiler/thisBinding2.ts
@@ -2,7 +2,7 @@
 // @noImplicitThis: true
 
 class C {
- x: number;
+ x!: number;
     constructor() {
         this.x = (() => {
    var x = 1;
diff --git a/tests/cases/compiler/thisExpressionInIndexExpression.ts b/tests/cases/compiler/thisExpressionInIndexExpression.ts
index 76c7ef9f9ef3b..dd00c53cf2a6e 100644
--- a/tests/cases/compiler/thisExpressionInIndexExpression.ts
+++ b/tests/cases/compiler/thisExpressionInIndexExpression.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f() {
     return r => r[this];
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/thisInArrowFunctionInStaticInitializer1.ts b/tests/cases/compiler/thisInArrowFunctionInStaticInitializer1.ts
index 3ac1a2428a141..3cb5794e4ecd3 100644
--- a/tests/cases/compiler/thisInArrowFunctionInStaticInitializer1.ts
+++ b/tests/cases/compiler/thisInArrowFunctionInStaticInitializer1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function log(a) { }
 
 class Vector {
diff --git a/tests/cases/compiler/thisInConstructorParameter1.ts b/tests/cases/compiler/thisInConstructorParameter1.ts
index 560eab45f2b4d..44a6f4b6d8255 100644
--- a/tests/cases/compiler/thisInConstructorParameter1.ts
+++ b/tests/cases/compiler/thisInConstructorParameter1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Foo {
     public y;
     constructor(x = this.y) { }
diff --git a/tests/cases/compiler/thisInSuperCall.ts b/tests/cases/compiler/thisInSuperCall.ts
index b7df7cbafad74..92bee95db847d 100644
--- a/tests/cases/compiler/thisInSuperCall.ts
+++ b/tests/cases/compiler/thisInSuperCall.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Base { 
     constructor(x: any) {}
 }
diff --git a/tests/cases/compiler/thisInSuperCall1.ts b/tests/cases/compiler/thisInSuperCall1.ts
index 4370d2b51aa7b..d8893068f344b 100644
--- a/tests/cases/compiler/thisInSuperCall1.ts
+++ b/tests/cases/compiler/thisInSuperCall1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Base { 
     constructor(a: any) {}
 }
diff --git a/tests/cases/compiler/thisInSuperCall2.ts b/tests/cases/compiler/thisInSuperCall2.ts
index 2869ab9a80553..71c6cbd1bf641 100644
--- a/tests/cases/compiler/thisInSuperCall2.ts
+++ b/tests/cases/compiler/thisInSuperCall2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Base { 
     constructor(a: any) {}
 }
diff --git a/tests/cases/compiler/thisInSuperCall3.ts b/tests/cases/compiler/thisInSuperCall3.ts
index c4448dad3314b..74819bb496d74 100644
--- a/tests/cases/compiler/thisInSuperCall3.ts
+++ b/tests/cases/compiler/thisInSuperCall3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Base { 
     constructor(a: any) {}
 }
diff --git a/tests/cases/compiler/thisReferencedInFunctionInsideArrowFunction1.ts b/tests/cases/compiler/thisReferencedInFunctionInsideArrowFunction1.ts
index 390278bc0db16..ff0aac59e3d82 100644
--- a/tests/cases/compiler/thisReferencedInFunctionInsideArrowFunction1.ts
+++ b/tests/cases/compiler/thisReferencedInFunctionInsideArrowFunction1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var foo = (dummy) => { };
 function test()
 {
diff --git a/tests/cases/compiler/topLevel.ts b/tests/cases/compiler/topLevel.ts
index f65df62a850ea..96b322c716488 100644
--- a/tests/cases/compiler/topLevel.ts
+++ b/tests/cases/compiler/topLevel.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface IPoint {
     x:number;
     y:number;
diff --git a/tests/cases/compiler/topLevelBlockExpando.ts b/tests/cases/compiler/topLevelBlockExpando.ts
index 35f758d040700..7fe85d6d138ac 100644
--- a/tests/cases/compiler/topLevelBlockExpando.ts
+++ b/tests/cases/compiler/topLevelBlockExpando.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // https://github.com/microsoft/TypeScript/issues/31972
 
 // @allowJs: true
diff --git a/tests/cases/compiler/topLevelExports.ts b/tests/cases/compiler/topLevelExports.ts
index 916004d89d898..b75616e9ff150 100644
--- a/tests/cases/compiler/topLevelExports.ts
+++ b/tests/cases/compiler/topLevelExports.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: amd
 export var foo = 3;
 
diff --git a/tests/cases/compiler/topLevelLambda.ts b/tests/cases/compiler/topLevelLambda.ts
index 32172be6cd10d..1c9f2bd6aadd8 100644
--- a/tests/cases/compiler/topLevelLambda.ts
+++ b/tests/cases/compiler/topLevelLambda.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
 	var f = () => {this.window;}
 }
diff --git a/tests/cases/compiler/topLevelLambda2.ts b/tests/cases/compiler/topLevelLambda2.ts
index 6e9d53f3b11fc..75e4eac2ca376 100644
--- a/tests/cases/compiler/topLevelLambda2.ts
+++ b/tests/cases/compiler/topLevelLambda2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(x:any) {}
 
 foo(()=>this.window);
\ No newline at end of file
diff --git a/tests/cases/compiler/topLevelLambda4.ts b/tests/cases/compiler/topLevelLambda4.ts
index badf43d900a61..ac4808598ebfb 100644
--- a/tests/cases/compiler/topLevelLambda4.ts
+++ b/tests/cases/compiler/topLevelLambda4.ts
@@ -1,2 +1,3 @@
+// @strict: false
 //@module: esnext
 export var x = () => this.window;
\ No newline at end of file
diff --git a/tests/cases/compiler/trailingCommasES5.ts b/tests/cases/compiler/trailingCommasES5.ts
index b5518e69d90d0..d795edee5c173 100644
--- a/tests/cases/compiler/trailingCommasES5.ts
+++ b/tests/cases/compiler/trailingCommasES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 
 var o1 = { a: 1, b: 2 };
diff --git a/tests/cases/compiler/transformArrowInBlockScopedLoopVarInitializer.ts b/tests/cases/compiler/transformArrowInBlockScopedLoopVarInitializer.ts
index 4f496dc6afe0c..47e5987eb28a9 100644
--- a/tests/cases/compiler/transformArrowInBlockScopedLoopVarInitializer.ts
+++ b/tests/cases/compiler/transformArrowInBlockScopedLoopVarInitializer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 
 // https://github.com/Microsoft/TypeScript/issues/11236
diff --git a/tests/cases/compiler/transformsElideNullUndefinedType.ts b/tests/cases/compiler/transformsElideNullUndefinedType.ts
index 4a493a91d8824..0140169796026 100644
--- a/tests/cases/compiler/transformsElideNullUndefinedType.ts
+++ b/tests/cases/compiler/transformsElideNullUndefinedType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 
 var v0: null;
diff --git a/tests/cases/compiler/tsxDeepAttributeAssignabilityError.tsx b/tests/cases/compiler/tsxDeepAttributeAssignabilityError.tsx
index c52b4b66167b0..7e1844158d3fb 100644
--- a/tests/cases/compiler/tsxDeepAttributeAssignabilityError.tsx
+++ b/tests/cases/compiler/tsxDeepAttributeAssignabilityError.tsx
@@ -1,9 +1,8 @@
 // @jsx: react
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
 
 // @Filename: my-component.tsx
+/// <reference path="/.lib/react.d.ts" />
 import * as React from 'react'
 
 interface MyProps {
diff --git a/tests/cases/compiler/tsxFragmentChildrenCheck.ts b/tests/cases/compiler/tsxFragmentChildrenCheck.ts
index f49835404b4cf..8097778450d5b 100644
--- a/tests/cases/compiler/tsxFragmentChildrenCheck.ts
+++ b/tests/cases/compiler/tsxFragmentChildrenCheck.ts
@@ -1,10 +1,9 @@
 // @jsx: react
 // @noUnusedLocals: true
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
 
 // @Filename: my-component.tsx
+/// <reference path="/.lib/react.d.ts" />
 declare var React: any;
 
 export function MyComponent(props: any) {
diff --git a/tests/cases/compiler/tsxResolveExternalModuleExportsTypes.ts b/tests/cases/compiler/tsxResolveExternalModuleExportsTypes.ts
index e8cfb6aa4e5d4..986f60654f93b 100644
--- a/tests/cases/compiler/tsxResolveExternalModuleExportsTypes.ts
+++ b/tests/cases/compiler/tsxResolveExternalModuleExportsTypes.ts
@@ -1,6 +1,5 @@
 // @module: ES2015
 // @jsx: preserve
-// @libFiles: react.d.ts,lib.d.ts
 
 // @Filename: /node_modules/@types/a/index.d.ts
 declare var a: a.Foo;
@@ -20,5 +19,6 @@ declare module 'a' {
 }
 
 // @Filename: foo.tsx
+/// <reference path="/.lib/react.d.ts" />
 import { Test } from 'a';
 const Foo = (<h1></h1>);
diff --git a/tests/cases/compiler/typeAliasDeclareKeywordNewlines.ts b/tests/cases/compiler/typeAliasDeclareKeywordNewlines.ts
index f8fd5867dd985..ae8a31baa086c 100644
--- a/tests/cases/compiler/typeAliasDeclareKeywordNewlines.ts
+++ b/tests/cases/compiler/typeAliasDeclareKeywordNewlines.ts
@@ -1,11 +1,12 @@
-var declare: string, type: number;
+declare var declare: string;
+declare var type: number;
 
 // The following is invalid but should declare a type alias named 'T1':
 declare type /*unexpected newline*/
 T1 = null;
 const t1: T1 = null; // Assert that T1 is the null type.
 
-let T: null;
+let T: null = null;
 // The following should use a variable named 'declare', use a variable named
 // 'type', and assign to a variable named 'T'.
 declare /*ASI*/
diff --git a/tests/cases/compiler/typeAliasExport.ts b/tests/cases/compiler/typeAliasExport.ts
index 914deba40b57c..98e4ec3532e8e 100644
--- a/tests/cases/compiler/typeAliasExport.ts
+++ b/tests/cases/compiler/typeAliasExport.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare module "a" {
   export default undefined
   export var a;
diff --git a/tests/cases/compiler/typeArgumentConstraintResolution1.ts b/tests/cases/compiler/typeArgumentConstraintResolution1.ts
index c8a0d235b7ac7..9485ca349ff1e 100644
--- a/tests/cases/compiler/typeArgumentConstraintResolution1.ts
+++ b/tests/cases/compiler/typeArgumentConstraintResolution1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo1<T extends Date>(test: T);
 function foo1<T extends Number>(test: string);
 function foo1<T extends String>(test: any) { }
diff --git a/tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts b/tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts
index 29b63dbbadc07..aa4b45aee0092 100644
--- a/tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts
+++ b/tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts
@@ -1,7 +1,8 @@
+// @strict: false
 interface Animal { x }
 interface Giraffe extends Animal { y }
 interface Elephant extends Animal { z }
 function f<T extends Animal>(x: T, y: T): T { return undefined; }
-var g: Giraffe;
-var e: Elephant;
+declare var g: Giraffe;
+declare var e: Elephant;
 f(g, e); // valid because both Giraffe and Elephant satisfy the constraint. T is Animal
\ No newline at end of file
diff --git a/tests/cases/compiler/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.ts b/tests/cases/compiler/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.ts
index 70be28f74eb3b..b83e8644f02da 100644
--- a/tests/cases/compiler/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.ts
+++ b/tests/cases/compiler/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @declaration: true
 // @Filename: file1.ts
diff --git a/tests/cases/compiler/typeCheckTypeArgument.ts b/tests/cases/compiler/typeCheckTypeArgument.ts
index 1647f40dafb2e..9b98ada40122e 100644
--- a/tests/cases/compiler/typeCheckTypeArgument.ts
+++ b/tests/cases/compiler/typeCheckTypeArgument.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 var f: <T extends UNKNOWN>() => void;
 
diff --git a/tests/cases/compiler/typeComparisonCaching.ts b/tests/cases/compiler/typeComparisonCaching.ts
index b47d35c60b681..f1b268243af6b 100644
--- a/tests/cases/compiler/typeComparisonCaching.ts
+++ b/tests/cases/compiler/typeComparisonCaching.ts
@@ -19,9 +19,9 @@ interface D {
 }
 
 var a: A;
-var b: B;
+declare var b: B;
 var c: C;
-var d: D;
+declare var d: D;
 
 a = b;
 c = d; // Should not be allowed
diff --git a/tests/cases/compiler/typeGuardConstructorClassAndNumber.ts b/tests/cases/compiler/typeGuardConstructorClassAndNumber.ts
index 9a6038a9d0197..99f63b23db6d3 100644
--- a/tests/cases/compiler/typeGuardConstructorClassAndNumber.ts
+++ b/tests/cases/compiler/typeGuardConstructorClassAndNumber.ts
@@ -1,9 +1,9 @@
 // Typical case
 class C1 {
-    property1: string;
+    property1!: string;
 }
 
-let var1: C1 | number;
+declare let var1: C1 | number;
 if (var1.constructor == C1) {
     var1; // C1
     var1.property1; // string
diff --git a/tests/cases/compiler/typeGuardConstructorDerivedClass.ts b/tests/cases/compiler/typeGuardConstructorDerivedClass.ts
index 5bca75c7a010b..dc3191fe5bec4 100644
--- a/tests/cases/compiler/typeGuardConstructorDerivedClass.ts
+++ b/tests/cases/compiler/typeGuardConstructorDerivedClass.ts
@@ -1,13 +1,13 @@
 // Derived class with different structures
 class C1 {
-    property1: number;
+    property1!: number;
 }
 
 class C2 extends C1 {
-    property2: number;
+    property2!: number;
 }
 
-let var1: C2 | string;
+declare let var1: C2 | string;
 if (var1.constructor === C1) {
     var1; // never
     var1.property1; // error
@@ -22,7 +22,7 @@ class C3 {}
 
 class C4 extends C3 {}
 
-let var2: C4 | string;
+declare let var2: C4 | string;
 if (var2.constructor === C3) {
     var2; // never
 }
@@ -32,14 +32,14 @@ if (var2.constructor === C4) {
 
 // Disjointly structured classes
 class C5 {
-    property1: number;
+    property1!: number;
 }
 
 class C6 {
-    property2: number;
+    property2!: number;
 }
 
-let let3: C6 | string;
+declare let let3: C6 | string;
 if (let3.constructor === C5) {
     let3; // never
 }
@@ -56,7 +56,7 @@ class C8 {
     property1: number;
 }
 
-let let4: C8 | string;
+declare let let4: C8 | string;
 if (let4.constructor === C7) {
     let4; // never
 }
diff --git a/tests/cases/compiler/typeMatch1.ts b/tests/cases/compiler/typeMatch1.ts
index c4bea3f4b92e0..e2e8fe8f99b82 100644
--- a/tests/cases/compiler/typeMatch1.ts
+++ b/tests/cases/compiler/typeMatch1.ts
@@ -1,10 +1,11 @@
+// @strict: false
 interface I { z; }
 interface I2 { z; }
 
-var x1: { z: number; f(n: number): string; f(s: string): number; }
+declare var x1: { z: number; f(n: number): string; f(s: string): number; }
 var x2: { z:number;f:{(n:number):string;(s:string):number;}; } = x1;
-var i:I;
-var i2:I2;
+declare var i:I;
+declare var i2:I2;
 var x3:{ z; }= i;
 var x4:{ z; }= i2;
 var x5:I=i2;
diff --git a/tests/cases/compiler/typeMatch2.ts b/tests/cases/compiler/typeMatch2.ts
index 695e12df22d70..ae3f261f98d53 100644
--- a/tests/cases/compiler/typeMatch2.ts
+++ b/tests/cases/compiler/typeMatch2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f1() {
 	var a = { x: 1, y: 2 };
 	a = {}; // error
diff --git a/tests/cases/compiler/typeName1.ts b/tests/cases/compiler/typeName1.ts
index dc877d288116f..8d34b1c7e24f9 100644
--- a/tests/cases/compiler/typeName1.ts
+++ b/tests/cases/compiler/typeName1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
     k;
 }
diff --git a/tests/cases/compiler/typeParameterArgumentEquivalence.ts b/tests/cases/compiler/typeParameterArgumentEquivalence.ts
index 8c8e917a536bf..8d3b1757cee9d 100644
--- a/tests/cases/compiler/typeParameterArgumentEquivalence.ts
+++ b/tests/cases/compiler/typeParameterArgumentEquivalence.ts
@@ -1,6 +1,6 @@
 function foo<T>() {
-    var x: (item: number) => boolean;
-    var y: (item: T) => boolean;
+    var x!: (item: number) => boolean;
+    var y!: (item: T) => boolean;
     x = y;  // Should be an error
     y = x;  // Shound be an error
 }
diff --git a/tests/cases/compiler/typeParameterArgumentEquivalence2.ts b/tests/cases/compiler/typeParameterArgumentEquivalence2.ts
index a3038213ef9d2..6804a25ee08fc 100644
--- a/tests/cases/compiler/typeParameterArgumentEquivalence2.ts
+++ b/tests/cases/compiler/typeParameterArgumentEquivalence2.ts
@@ -1,6 +1,6 @@
 function foo<T,U>() {
-    var x: (item: U) => boolean;
-    var y: (item: T) => boolean;
+    var x!: (item: U) => boolean;
+    var y!: (item: T) => boolean;
     x = y;  // Should be an error
     y = x;  // Shound be an error
 }
diff --git a/tests/cases/compiler/typeParameterArgumentEquivalence3.ts b/tests/cases/compiler/typeParameterArgumentEquivalence3.ts
index 6455dffc00f8c..12d05e38cc95e 100644
--- a/tests/cases/compiler/typeParameterArgumentEquivalence3.ts
+++ b/tests/cases/compiler/typeParameterArgumentEquivalence3.ts
@@ -1,6 +1,6 @@
 function foo<T,U>() {
-    var x: (item) => T;
-    var y: (item) => boolean;
+    var x!: (item: any) => T;
+    var y!: (item: any) => boolean;
     x = y;  // Should be an error
     y = x;  // Shound be an error
 }
diff --git a/tests/cases/compiler/typeParameterArgumentEquivalence4.ts b/tests/cases/compiler/typeParameterArgumentEquivalence4.ts
index cdf6bf6410a62..2f63d1b8c14fd 100644
--- a/tests/cases/compiler/typeParameterArgumentEquivalence4.ts
+++ b/tests/cases/compiler/typeParameterArgumentEquivalence4.ts
@@ -1,6 +1,6 @@
 function foo<T,U>() {
-    var x: (item) => U;
-    var y: (item) => T;
+    var x!: (item: any) => U;
+    var y!: (item: any) => T;
     x = y;  // Should be an error
     y = x;  // Shound be an error
 }
diff --git a/tests/cases/compiler/typeParameterArgumentEquivalence5.ts b/tests/cases/compiler/typeParameterArgumentEquivalence5.ts
index 1dc0aaa49ea09..bf967d691eb7e 100644
--- a/tests/cases/compiler/typeParameterArgumentEquivalence5.ts
+++ b/tests/cases/compiler/typeParameterArgumentEquivalence5.ts
@@ -1,6 +1,6 @@
 function foo<T,U>() {
-    var x: () => (item) => U;
-    var y: () => (item) => T;
+    var x!: () => (item: any) => U;
+    var y!: () => (item: any) => T;
     x = y;  // Should be an error
     y = x;  // Shound be an error
 }
diff --git a/tests/cases/compiler/typeParameterAssignmentCompat1.ts b/tests/cases/compiler/typeParameterAssignmentCompat1.ts
index 2f3a2c2e19c63..084b587b1c079 100644
--- a/tests/cases/compiler/typeParameterAssignmentCompat1.ts
+++ b/tests/cases/compiler/typeParameterAssignmentCompat1.ts
@@ -3,16 +3,16 @@ interface Foo<T> {
 }
 
 function f<T, U>(): Foo<U> {
-    var x: Foo<T>;
-    var y: Foo<U>;
+    var x!: Foo<T>;
+    var y!: Foo<U>;
     x = y; // should be an error
     return x;
 }
 
 class C<T> {
     f<U>(): Foo<U> {
-        var x: Foo<T>;
-        var y: Foo<U>;
+        var x!: Foo<T>;
+        var y!: Foo<U>;
         x = y; // should be an error
         return x;
     }
diff --git a/tests/cases/compiler/typeParameterConstrainedToOuterTypeParameter.ts b/tests/cases/compiler/typeParameterConstrainedToOuterTypeParameter.ts
index 25b60a7034c7f..08663d891f407 100644
--- a/tests/cases/compiler/typeParameterConstrainedToOuterTypeParameter.ts
+++ b/tests/cases/compiler/typeParameterConstrainedToOuterTypeParameter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface A<T> {
     <U extends T>(x: U[])
 }
@@ -6,5 +7,5 @@ interface B<T> {
     <U extends T>(x: U)
 }
 
-var a: A<string>
+declare var a: A<string>;
 var b: B<string> = a; // assignment should be legal (both U's get instantiated to any for comparison)
\ No newline at end of file
diff --git a/tests/cases/compiler/typeParameterConstrainedToOuterTypeParameter2.ts b/tests/cases/compiler/typeParameterConstrainedToOuterTypeParameter2.ts
index 5d0653ad5be58..c296ea172dabb 100644
--- a/tests/cases/compiler/typeParameterConstrainedToOuterTypeParameter2.ts
+++ b/tests/cases/compiler/typeParameterConstrainedToOuterTypeParameter2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface A<T> {
     foo<U extends T>(x: A<A<U>>)
 }
diff --git a/tests/cases/compiler/typeParameterDiamond2.ts b/tests/cases/compiler/typeParameterDiamond2.ts
index e099e79626bf6..146c38567e46e 100644
--- a/tests/cases/compiler/typeParameterDiamond2.ts
+++ b/tests/cases/compiler/typeParameterDiamond2.ts
@@ -1,9 +1,9 @@
 function diamondTop<Top>() {
     function diamondMiddle<T extends Top, U>() {
         function diamondBottom<Bottom extends T | U>() {
-            var top: Top;
-            var middle: T | U;
-            var bottom: Bottom;
+            var top!: Top;
+            var middle!: T | U;
+            var bottom!: Bottom;
 
             top = middle;
             middle = bottom;
diff --git a/tests/cases/compiler/typeParameterDiamond3.ts b/tests/cases/compiler/typeParameterDiamond3.ts
index df434d829f2ae..2ae951ecc6c7b 100644
--- a/tests/cases/compiler/typeParameterDiamond3.ts
+++ b/tests/cases/compiler/typeParameterDiamond3.ts
@@ -1,9 +1,9 @@
 function diamondTop<Top>() {
     function diamondMiddle<T, U>() {
         function diamondBottom<Bottom extends Top | T | U>() {
-            var top: Top;
-            var middle: T | U;
-            var bottom: Bottom;
+            var top!: Top;
+            var middle!: T | U;
+            var bottom!: Bottom;
 
             top = middle;
             middle = bottom;
diff --git a/tests/cases/compiler/typeParameterDiamond4.ts b/tests/cases/compiler/typeParameterDiamond4.ts
index d962122edc852..74635e3e9d881 100644
--- a/tests/cases/compiler/typeParameterDiamond4.ts
+++ b/tests/cases/compiler/typeParameterDiamond4.ts
@@ -1,9 +1,9 @@
 function diamondTop<Top>() {
     function diamondMiddle<T, U>() {
         function diamondBottom<Bottom extends Top | T | U>() {
-            var top: Top;
-            var middle: Top | T | U;
-            var bottom: Bottom;
+            var top!: Top;
+            var middle!: Top | T | U;
+            var bottom!: Bottom;
 
             top = middle;
             middle = bottom;
diff --git a/tests/cases/compiler/typeParameterExplicitlyExtendsAny.ts b/tests/cases/compiler/typeParameterExplicitlyExtendsAny.ts
index 1ff14373dcb1e..7ff42d654bd3e 100644
--- a/tests/cases/compiler/typeParameterExplicitlyExtendsAny.ts
+++ b/tests/cases/compiler/typeParameterExplicitlyExtendsAny.ts
@@ -1,11 +1,12 @@
+// @strict: false
 function fee<T>() {
-    var t: T;
+    var t!: T;
     t.blah; // Error
     t.toString; // ok
 }
 
 function fee2<T extends any>() {
-    var t: T;
+    var t!: T;
     t.blah; // ok
     t.toString; // ok
 }
diff --git a/tests/cases/compiler/typeParameterExtendingUnion1.ts b/tests/cases/compiler/typeParameterExtendingUnion1.ts
index 019e722f1e176..aad940a7b8fe2 100644
--- a/tests/cases/compiler/typeParameterExtendingUnion1.ts
+++ b/tests/cases/compiler/typeParameterExtendingUnion1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Animal { run() { } }
 class Cat extends Animal { meow }
 class Dog extends Animal { woof }
diff --git a/tests/cases/compiler/typeParameterExtendingUnion2.ts b/tests/cases/compiler/typeParameterExtendingUnion2.ts
index 347999fa8eb89..4ae130d713060 100644
--- a/tests/cases/compiler/typeParameterExtendingUnion2.ts
+++ b/tests/cases/compiler/typeParameterExtendingUnion2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Animal { run() { } }
 class Cat extends Animal { meow }
 class Dog extends Animal { woof }
diff --git a/tests/cases/compiler/typeParameterFixingWithConstraints.ts b/tests/cases/compiler/typeParameterFixingWithConstraints.ts
index 3d8536ab4cfd6..8ead90d30fd22 100644
--- a/tests/cases/compiler/typeParameterFixingWithConstraints.ts
+++ b/tests/cases/compiler/typeParameterFixingWithConstraints.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface IBar {
     [barId: string]: any;
 }
diff --git a/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments.ts b/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments.ts
index c05b26fd2fcc5..d24329eb285c3 100644
--- a/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments.ts
+++ b/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f<T, U>(y: T, f: (x: T) => U, x: T): [T, U] { return [y, f(x)]; }
 interface A { a: A; }
 interface B extends A { b; }
diff --git a/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts b/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts
index f4f001c9f2795..b73d0babf96b9 100644
--- a/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts
+++ b/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts
@@ -1,7 +1,8 @@
+// @strict: false
 function f<T, U>(y: T, y1: U, p: (z: U) => T, p1: (x: T) => U): [T, U] { return [y, p1(y)]; }
 interface A { a: A; }
 interface B extends A { b; }
 
-var a: A, b: B;
+declare var a: A, b: B;
 
 var d = f(a, b, x => x, x => x); // A => A not assignable to A => B
\ No newline at end of file
diff --git a/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts b/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts
index 1bf4169624db5..a116b51379b90 100644
--- a/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts
+++ b/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts
@@ -1,7 +1,8 @@
+// @strict: false
 function f<T, U>(t1: T, u1: U, pf1: (u2: U) => T, pf2: (t2: T) => U): [T, U] { return [t1, pf2(t1)]; }
 interface A { a: A; }
 interface B extends A { b: B; }
 
-var a: A, b: B;
+declare var a: A, b: B;
 
 var d = f(a, b, u2 => u2.b, t2 => t2);
\ No newline at end of file
diff --git a/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments4.ts b/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments4.ts
index 8fa501906b862..1e38ea16ab48c 100644
--- a/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments4.ts
+++ b/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f<T, U>(y: T, y1: U, p: (z: U) => T, p1: (x: T) => U): [T, U] { return [y, p1(y)]; }
 interface A { a: A; }
 interface B extends A { b; }
diff --git a/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments5.ts b/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments5.ts
index a74eb04269229..049b11e224ebb 100644
--- a/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments5.ts
+++ b/tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f<T, U>(t1: T, u1: U, pf1: (u2: U) => T, pf2: (t2: T) => U): [T, U] { return [t1, pf2(t1)]; }
 interface A { a: A; }
 interface B extends A { b: any; }
diff --git a/tests/cases/compiler/typeParameterWithInvalidConstraintType.ts b/tests/cases/compiler/typeParameterWithInvalidConstraintType.ts
index a97876b0ab34c..97a5d515b3807 100644
--- a/tests/cases/compiler/typeParameterWithInvalidConstraintType.ts
+++ b/tests/cases/compiler/typeParameterWithInvalidConstraintType.ts
@@ -1,6 +1,7 @@
+// @strict: false
 class A<T extends T> {
     foo() {
-        var x: T;
+        var x!: T;
         var a = x.foo();
         var b = new x(123);
         var c = x[1];
diff --git a/tests/cases/compiler/typeParametersShouldNotBeEqual.ts b/tests/cases/compiler/typeParametersShouldNotBeEqual.ts
index e418e53819f28..ab12a935e988c 100644
--- a/tests/cases/compiler/typeParametersShouldNotBeEqual.ts
+++ b/tests/cases/compiler/typeParametersShouldNotBeEqual.ts
@@ -1,5 +1,5 @@
 function ff<T, U>(x: T, y: U) {
-    var z: Object;
+    var z!: Object;
     x = x;  // Ok
     x = y;  // Error
     x = z;  // Error
diff --git a/tests/cases/compiler/typeParametersShouldNotBeEqual2.ts b/tests/cases/compiler/typeParametersShouldNotBeEqual2.ts
index 63e9777769e68..2af7e93747574 100644
--- a/tests/cases/compiler/typeParametersShouldNotBeEqual2.ts
+++ b/tests/cases/compiler/typeParametersShouldNotBeEqual2.ts
@@ -1,5 +1,5 @@
 function ff<T extends Date, U extends Date, V>(x: T, y: U, z: V) {
-    var zz: Object;
+    var zz!: Object;
     x = x;  // Ok
     x = y;  // Ok
     x = z;  // Error
diff --git a/tests/cases/compiler/typeParametersShouldNotBeEqual3.ts b/tests/cases/compiler/typeParametersShouldNotBeEqual3.ts
index e920c271d8396..652f6688f8775 100644
--- a/tests/cases/compiler/typeParametersShouldNotBeEqual3.ts
+++ b/tests/cases/compiler/typeParametersShouldNotBeEqual3.ts
@@ -1,5 +1,5 @@
 function ff<T extends Object, U extends Object>(x: T, y: U) {
-    var z: Object;
+    var z!: Object;
     x = x;  // Ok
     x = y;  // Ok
     x = z;  // Ok
diff --git a/tests/cases/compiler/typeReferenceDirectives1.ts b/tests/cases/compiler/typeReferenceDirectives1.ts
index e355e009152d4..cf18f5092fac1 100644
--- a/tests/cases/compiler/typeReferenceDirectives1.ts
+++ b/tests/cases/compiler/typeReferenceDirectives1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @traceResolution: true
 // @declaration: true
diff --git a/tests/cases/compiler/typeReferenceDirectives10.ts b/tests/cases/compiler/typeReferenceDirectives10.ts
index 1eb796d03fd25..4898b5e224d91 100644
--- a/tests/cases/compiler/typeReferenceDirectives10.ts
+++ b/tests/cases/compiler/typeReferenceDirectives10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @declaration: true
 // @typeRoots: /types
diff --git a/tests/cases/compiler/typeReferenceDirectives11.ts b/tests/cases/compiler/typeReferenceDirectives11.ts
index 645e1da279c83..e556b4a0f55fe 100644
--- a/tests/cases/compiler/typeReferenceDirectives11.ts
+++ b/tests/cases/compiler/typeReferenceDirectives11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @declaration: true
 // @typeRoots: /types
diff --git a/tests/cases/compiler/typeReferenceDirectives12.ts b/tests/cases/compiler/typeReferenceDirectives12.ts
index e7b0bda315198..01e289e067aaf 100644
--- a/tests/cases/compiler/typeReferenceDirectives12.ts
+++ b/tests/cases/compiler/typeReferenceDirectives12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @declaration: true
 // @typeRoots: /types
diff --git a/tests/cases/compiler/typeReferenceDirectives13.ts b/tests/cases/compiler/typeReferenceDirectives13.ts
index f9dede73267bd..c8a0d40df5cfc 100644
--- a/tests/cases/compiler/typeReferenceDirectives13.ts
+++ b/tests/cases/compiler/typeReferenceDirectives13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @declaration: true
 // @typeRoots: /types
diff --git a/tests/cases/compiler/typeReferenceDirectives2.ts b/tests/cases/compiler/typeReferenceDirectives2.ts
index 44218683a5a99..48ada16f0f15d 100644
--- a/tests/cases/compiler/typeReferenceDirectives2.ts
+++ b/tests/cases/compiler/typeReferenceDirectives2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @traceResolution: true
 // @declaration: true
diff --git a/tests/cases/compiler/typeReferenceDirectives3.ts b/tests/cases/compiler/typeReferenceDirectives3.ts
index 8cb2152153de1..c2ca2f55246bb 100644
--- a/tests/cases/compiler/typeReferenceDirectives3.ts
+++ b/tests/cases/compiler/typeReferenceDirectives3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @declaration: true
 // @typeRoots: /types
diff --git a/tests/cases/compiler/typeReferenceDirectives4.ts b/tests/cases/compiler/typeReferenceDirectives4.ts
index a098a2cec7ed0..a9efec22415da 100644
--- a/tests/cases/compiler/typeReferenceDirectives4.ts
+++ b/tests/cases/compiler/typeReferenceDirectives4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @traceResolution: true
 // @declaration: true
diff --git a/tests/cases/compiler/typeReferenceDirectives5.ts b/tests/cases/compiler/typeReferenceDirectives5.ts
index e81ae663e24f6..dad75ff02f17c 100644
--- a/tests/cases/compiler/typeReferenceDirectives5.ts
+++ b/tests/cases/compiler/typeReferenceDirectives5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @traceResolution: true
 // @declaration: true
diff --git a/tests/cases/compiler/typeReferenceDirectives6.ts b/tests/cases/compiler/typeReferenceDirectives6.ts
index edf2ece7e06dc..eb759e2923263 100644
--- a/tests/cases/compiler/typeReferenceDirectives6.ts
+++ b/tests/cases/compiler/typeReferenceDirectives6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @traceResolution: true
 // @declaration: true
diff --git a/tests/cases/compiler/typeReferenceDirectives8.ts b/tests/cases/compiler/typeReferenceDirectives8.ts
index bed69cbf35739..e9f222085ee0f 100644
--- a/tests/cases/compiler/typeReferenceDirectives8.ts
+++ b/tests/cases/compiler/typeReferenceDirectives8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @declaration: true
 // @typeRoots: /types
diff --git a/tests/cases/compiler/typeReferenceDirectives9.ts b/tests/cases/compiler/typeReferenceDirectives9.ts
index 1ad1aa522885b..e497e0af2ee68 100644
--- a/tests/cases/compiler/typeReferenceDirectives9.ts
+++ b/tests/cases/compiler/typeReferenceDirectives9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @declaration: true
 // @typeRoots: /types
diff --git a/tests/cases/compiler/typeResolution.ts b/tests/cases/compiler/typeResolution.ts
index 34832a8d9b2de..ab76032db3889 100644
--- a/tests/cases/compiler/typeResolution.ts
+++ b/tests/cases/compiler/typeResolution.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: amd
 // @sourcemap: true
 export namespace TopLevelModule1 {
diff --git a/tests/cases/compiler/typedArrays-es5.ts b/tests/cases/compiler/typedArrays-es5.ts
index 73081fcf5ee0e..acfb3f70b237e 100644
--- a/tests/cases/compiler/typedArrays-es5.ts
+++ b/tests/cases/compiler/typedArrays-es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 
 const float32Array = new Float32Array(1);
diff --git a/tests/cases/compiler/typedArrays-es6.ts b/tests/cases/compiler/typedArrays-es6.ts
index 9a9809d222f3a..fcf19659d7e1d 100644
--- a/tests/cases/compiler/typedArrays-es6.ts
+++ b/tests/cases/compiler/typedArrays-es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 const float32Array = new Float32Array(1);
diff --git a/tests/cases/compiler/typedArraysSubarray.ts b/tests/cases/compiler/typedArraysSubarray.ts
index f85b953b83962..d0017a51cdeee 100644
--- a/tests/cases/compiler/typedArraysSubarray.ts
+++ b/tests/cases/compiler/typedArraysSubarray.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function int8ArraySubarray() {
     var arr = new Int8Array(10);
     arr.subarray();
diff --git a/tests/cases/compiler/typeofClass.ts b/tests/cases/compiler/typeofClass.ts
index f8062cc46e265..5e8705dd9e369 100644
--- a/tests/cases/compiler/typeofClass.ts
+++ b/tests/cases/compiler/typeofClass.ts
@@ -3,9 +3,9 @@ class K {
     static bar: string;
 }
 
-var k1: K;
+declare var k1: K;
 k1.foo;
 k1.bar;
-var k2: typeof K;
+declare var k2: typeof K;
 k2.foo;
 k2.bar;
\ No newline at end of file
diff --git a/tests/cases/compiler/typeofSimple.ts b/tests/cases/compiler/typeofSimple.ts
index 049ad57bf72c7..9984b384340c0 100644
--- a/tests/cases/compiler/typeofSimple.ts
+++ b/tests/cases/compiler/typeofSimple.ts
@@ -1,12 +1,12 @@
 var v = 3;
-var v2: typeof v;
+var v2: typeof v = v;
 var v3: string = v2; // Not assignment compatible
 
 interface I<T> { x: T; }
 interface J { }
 
-var numberJ: typeof J; //Error, cannot reference type in typeof
-var numberI: I<typeof v2>;
+declare var numberJ: typeof J; //Error, cannot reference type in typeof
+declare var numberI: I<typeof v2>;
 
-var fun: () => I<number>;
+declare var fun: () => I<number>;
 numberI = fun();
\ No newline at end of file
diff --git a/tests/cases/compiler/uncaughtCompilerError1.ts b/tests/cases/compiler/uncaughtCompilerError1.ts
index 9e6c58254a8f5..79b68af21107d 100644
--- a/tests/cases/compiler/uncaughtCompilerError1.ts
+++ b/tests/cases/compiler/uncaughtCompilerError1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare var index, lineTokens, token, tokens;
 
 function f() {
diff --git a/tests/cases/compiler/undefinedTypeAssignment2.ts b/tests/cases/compiler/undefinedTypeAssignment2.ts
index 3f42068e24e2e..d63095bdd01cb 100644
--- a/tests/cases/compiler/undefinedTypeAssignment2.ts
+++ b/tests/cases/compiler/undefinedTypeAssignment2.ts
@@ -1 +1,2 @@
+// @strict: false
 var undefined = void 0;
diff --git a/tests/cases/compiler/underscoreTest1.ts b/tests/cases/compiler/underscoreTest1.ts
index 92e16788e0240..2604a88aa57b2 100644
--- a/tests/cases/compiler/underscoreTest1.ts
+++ b/tests/cases/compiler/underscoreTest1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @Filename: underscoreTest1_underscore.ts
 interface Dictionary<T> {
     [x: string]: T;
@@ -773,7 +774,7 @@ var initialize = _.once(createApplication);
 initialize();
 initialize();
 
-var notes: any[];
+var notes: any[] = [];
 var render = () => alert("rendering...");
 var renderNotes = _.after(notes.length, render);
 _.each(notes, (note) => note.asyncSave({ success: renderNotes }));
diff --git a/tests/cases/compiler/unicodeEscapesInNames02.ts b/tests/cases/compiler/unicodeEscapesInNames02.ts
index f8529f5ceef32..ccdedc4d996ea 100644
--- a/tests/cases/compiler/unicodeEscapesInNames02.ts
+++ b/tests/cases/compiler/unicodeEscapesInNames02.ts
@@ -7,8 +7,8 @@
 
 // @filename: extendedEscapesForAstralsInVarsAndClasses.ts
 // U+102A7 CARIAN LETTER A2
-var 𐊧: string;
-var \u{102A7}: string;
+declare var 𐊧: string;
+declare var \u{102A7}: string;
 
 if (Math.random()) {
     𐊧 = "hello";
diff --git a/tests/cases/compiler/unionExcessPropertyCheckNoApparentPropTypeMismatchErrors.ts b/tests/cases/compiler/unionExcessPropertyCheckNoApparentPropTypeMismatchErrors.ts
index 757c0f9917b37..1124f72104dc5 100644
--- a/tests/cases/compiler/unionExcessPropertyCheckNoApparentPropTypeMismatchErrors.ts
+++ b/tests/cases/compiler/unionExcessPropertyCheckNoApparentPropTypeMismatchErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface IStringDictionary<V> {
 	[name: string]: V;
 }
diff --git a/tests/cases/compiler/unionPropertyExistence.ts b/tests/cases/compiler/unionPropertyExistence.ts
index 6593708889897..d11c832aa9a01 100644
--- a/tests/cases/compiler/unionPropertyExistence.ts
+++ b/tests/cases/compiler/unionPropertyExistence.ts
@@ -18,8 +18,8 @@ interface C {
 type AB = A | B;
 type ABC = C | AB;
 
-var ab: AB;
-var abc: ABC;
+declare var ab: AB;
+declare var abc: ABC;
 
 declare const x: "foo" | "bar";
 declare const bFoo: B | "foo";
diff --git a/tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts b/tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts
index cddcf4d45664d..292f016302518 100644
--- a/tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts
+++ b/tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction2.ts
@@ -14,7 +14,7 @@ class Property {
     public parent: Module | Class;
 }
 
-var c: Class;
-var p: Property;
+declare var c: Class;
+declare var p: Property;
 c = p;
 p = c;
diff --git a/tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction3.ts b/tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction3.ts
index 4bac9ca1b9c83..bceb9a5ac795f 100644
--- a/tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction3.ts
+++ b/tests/cases/compiler/unionTypeWithRecursiveSubtypeReduction3.ts
@@ -1,5 +1,5 @@
-var a27: { prop: number } | { prop: T27 };
+declare var a27: { prop: number } | { prop: T27 };
 type T27 = typeof a27;
 
-var b: T27;
+declare var b: T27;
 var s: string = b;
diff --git a/tests/cases/compiler/uniqueSymbolJs.ts b/tests/cases/compiler/uniqueSymbolJs.ts
index faa4bd5fcf8ad..93b4323f8028b 100644
--- a/tests/cases/compiler/uniqueSymbolJs.ts
+++ b/tests/cases/compiler/uniqueSymbolJs.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @checkJs: true
 // @allowJs: true
diff --git a/tests/cases/compiler/uniqueSymbolPropertyDeclarationEmit.ts b/tests/cases/compiler/uniqueSymbolPropertyDeclarationEmit.ts
index 2456cda2edfd5..da8c42d4c44f3 100644
--- a/tests/cases/compiler/uniqueSymbolPropertyDeclarationEmit.ts
+++ b/tests/cases/compiler/uniqueSymbolPropertyDeclarationEmit.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noTypesAndSymbols: true
 // @esModuleInterop: true
 // @declaration: true
diff --git a/tests/cases/compiler/unknownSymbols1.ts b/tests/cases/compiler/unknownSymbols1.ts
index c091032a7da2a..c6c6502de7c31 100644
--- a/tests/cases/compiler/unknownSymbols1.ts
+++ b/tests/cases/compiler/unknownSymbols1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var x = asdf;
 var y: asdf;
 
diff --git a/tests/cases/compiler/unknownSymbols2.ts b/tests/cases/compiler/unknownSymbols2.ts
index 73b1706ec7060..ccc57f4fe633e 100644
--- a/tests/cases/compiler/unknownSymbols2.ts
+++ b/tests/cases/compiler/unknownSymbols2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
     var x: asdf;
     var y = x + asdf;
diff --git a/tests/cases/compiler/unknownTypeArgOnCall.ts b/tests/cases/compiler/unknownTypeArgOnCall.ts
index f812a75d3bf2b..88a55542966c3 100644
--- a/tests/cases/compiler/unknownTypeArgOnCall.ts
+++ b/tests/cases/compiler/unknownTypeArgOnCall.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Foo<T> {
   public clone<U>() {
    return null;
diff --git a/tests/cases/compiler/untypedArgumentInLambdaExpression.ts b/tests/cases/compiler/untypedArgumentInLambdaExpression.ts
index 97fdc9e79adaf..a17ad6ea90f12 100644
--- a/tests/cases/compiler/untypedArgumentInLambdaExpression.ts
+++ b/tests/cases/compiler/untypedArgumentInLambdaExpression.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function f(fn: (a: string) => string);
  
 f((input): string => {
diff --git a/tests/cases/compiler/untypedFunctionCallsWithTypeParameters1.ts b/tests/cases/compiler/untypedFunctionCallsWithTypeParameters1.ts
index 24e1ca648dbb2..bbc81cf04e1ff 100644
--- a/tests/cases/compiler/untypedFunctionCallsWithTypeParameters1.ts
+++ b/tests/cases/compiler/untypedFunctionCallsWithTypeParameters1.ts
@@ -1,10 +1,11 @@
+// @strict: false
 // none of these function calls should be allowed
 var x = function () { return; };
 var r1 = x<number>();
 var y: any = x;
 var r2 = y<string>();
 
-var c: Function;
+declare var c: Function;
 var r3 = c<number>(); // should be an error
 
 class C implements Function {
@@ -14,29 +15,29 @@ class C implements Function {
     caller = () => { };
 }
 
-var c2: C;
+declare var c2: C;
 var r4 = c2<number>(); // should be an error
 
 class C2 extends Function { } // error
-var c3: C2;
+declare var c3: C2;
 var r5 = c3<number>(); // error
 
 interface I {
     (number): number;
 }
-var z: I;
+declare var z: I;
 var r6 = z<string>(1); // error
 
 interface callable2<T> {
     (a: T): T;
 }
 
-var c4: callable2<number>;
+declare var c4: callable2<number>;
 c4<number>(1);
 interface callable3<T> {
     (a: T): T;
 }
 
-var c5: callable3<number>;
+declare var c5: callable3<number>;
 c5<string>(1); // error
 
diff --git a/tests/cases/compiler/untypedModuleImport_withAugmentation2.ts b/tests/cases/compiler/untypedModuleImport_withAugmentation2.ts
index 8cbf75b662b3b..18cbc927150fd 100644
--- a/tests/cases/compiler/untypedModuleImport_withAugmentation2.ts
+++ b/tests/cases/compiler/untypedModuleImport_withAugmentation2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // This tests that augmenting an untyped module is forbidden even in an ambient context. Contrast with `moduleAugmentationInDependency.ts`.
 
diff --git a/tests/cases/compiler/unusedDestructuring.ts b/tests/cases/compiler/unusedDestructuring.ts
index 1d85f59c7d7ed..bfb47dfc87055 100644
--- a/tests/cases/compiler/unusedDestructuring.ts
+++ b/tests/cases/compiler/unusedDestructuring.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noUnusedLocals: true
 // @noUnusedParameters: true
 
diff --git a/tests/cases/compiler/unusedDestructuringParameters.ts b/tests/cases/compiler/unusedDestructuringParameters.ts
index 7c04235104953..02dc332c8d225 100644
--- a/tests/cases/compiler/unusedDestructuringParameters.ts
+++ b/tests/cases/compiler/unusedDestructuringParameters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedParameters: true
 const f = ([a]) => { };
 f([1]);
diff --git a/tests/cases/compiler/unusedImports13.ts b/tests/cases/compiler/unusedImports13.ts
index af188e70eae99..fb36ac6d41e66 100644
--- a/tests/cases/compiler/unusedImports13.ts
+++ b/tests/cases/compiler/unusedImports13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedLocals:true
 //@module: commonjs
 //@jsx: preserve
diff --git a/tests/cases/compiler/unusedImports14.ts b/tests/cases/compiler/unusedImports14.ts
index 1823d4bb49b5f..6e18037561720 100644
--- a/tests/cases/compiler/unusedImports14.ts
+++ b/tests/cases/compiler/unusedImports14.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedLocals:true
 //@module: commonjs
 //@jsx: react
diff --git a/tests/cases/compiler/unusedImports15.ts b/tests/cases/compiler/unusedImports15.ts
index ef6b277d21de2..7ecc010fb6058 100644
--- a/tests/cases/compiler/unusedImports15.ts
+++ b/tests/cases/compiler/unusedImports15.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedLocals:true
 //@module: commonjs
 //@reactNamespace: Element
diff --git a/tests/cases/compiler/unusedImports16.ts b/tests/cases/compiler/unusedImports16.ts
index ff0c38bb75ea6..834c4752c8e8d 100644
--- a/tests/cases/compiler/unusedImports16.ts
+++ b/tests/cases/compiler/unusedImports16.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedLocals:true
 //@module: commonjs
 //@reactNamespace: Element
diff --git a/tests/cases/compiler/unusedLocalsAndParameters.ts b/tests/cases/compiler/unusedLocalsAndParameters.ts
index a3cab013b7e7e..d54c74a1853f4 100644
--- a/tests/cases/compiler/unusedLocalsAndParameters.ts
+++ b/tests/cases/compiler/unusedLocalsAndParameters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedLocals:true
 //@noUnusedParameters:true
 
diff --git a/tests/cases/compiler/unusedLocalsAndParametersDeferred.ts b/tests/cases/compiler/unusedLocalsAndParametersDeferred.ts
index 75b98308199d5..b9aa2125c4901 100644
--- a/tests/cases/compiler/unusedLocalsAndParametersDeferred.ts
+++ b/tests/cases/compiler/unusedLocalsAndParametersDeferred.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedLocals:true
 //@noUnusedParameters:true
 
diff --git a/tests/cases/compiler/unusedLocalsAndParametersOverloadSignatures.ts b/tests/cases/compiler/unusedLocalsAndParametersOverloadSignatures.ts
index 32affb28be3d1..c7b520efb23ac 100644
--- a/tests/cases/compiler/unusedLocalsAndParametersOverloadSignatures.ts
+++ b/tests/cases/compiler/unusedLocalsAndParametersOverloadSignatures.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedLocals:true
 //@noUnusedParameters:true
 
diff --git a/tests/cases/compiler/unusedLocalsAndParametersTypeAliases.ts b/tests/cases/compiler/unusedLocalsAndParametersTypeAliases.ts
index b94f88845bc2e..d43d47d74f7ff 100644
--- a/tests/cases/compiler/unusedLocalsAndParametersTypeAliases.ts
+++ b/tests/cases/compiler/unusedLocalsAndParametersTypeAliases.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedLocals:true
 //@noUnusedParameters:true
 
diff --git a/tests/cases/compiler/unusedLocalsAndParametersTypeAliases2.ts b/tests/cases/compiler/unusedLocalsAndParametersTypeAliases2.ts
index 23d23a5bc1892..b0f8222262cb3 100644
--- a/tests/cases/compiler/unusedLocalsAndParametersTypeAliases2.ts
+++ b/tests/cases/compiler/unusedLocalsAndParametersTypeAliases2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedLocals:true
 //@noUnusedParameters:true
 
diff --git a/tests/cases/compiler/unusedLocalsInForInOrOf1.ts b/tests/cases/compiler/unusedLocalsInForInOrOf1.ts
new file mode 100644
index 0000000000000..edbdad5c59069
--- /dev/null
+++ b/tests/cases/compiler/unusedLocalsInForInOrOf1.ts
@@ -0,0 +1,59 @@
+// @strict: true
+// @target: esnext
+// @noEmit: true
+// @noUnusedLocals: true
+// @noUnusedParameters: true
+
+for (let x of [1, 2]) {
+  function f() {
+    x;
+  }
+}
+
+for (let x of [1, 2]) {
+  let f = () => {
+    x;
+  };
+}
+
+for (const x of [1, 2]) {
+  function g() {
+    x;
+  }
+}
+
+for (let x in { a: 1, b: 2 }) {
+  function f2() {
+    x;
+  }
+}
+
+for (let x in { a: 1, b: 2 }) {
+  let f2 = () => {
+    x;
+  };
+}
+
+for (const x in { a: 1, b: 2 }) {
+  function g2() {
+    x;
+  }
+}
+
+for (let { x } of [{ x: 1 }, { x: 2 }]) {
+  function f3() {
+    x;
+  }
+}
+
+for (let { x } of [{ x: 1 }, { x: 2 }]) {
+  let f3 = () => {
+    x;
+  };
+}
+
+for (const { x } of [{ x: 1 }, { x: 2 }]) {
+  function g3() {
+    x;
+  }
+}
diff --git a/tests/cases/compiler/unusedLocalsStartingWithUnderscore.ts b/tests/cases/compiler/unusedLocalsStartingWithUnderscore.ts
index 431d4fd15d8cb..79b3e615f5fe7 100644
--- a/tests/cases/compiler/unusedLocalsStartingWithUnderscore.ts
+++ b/tests/cases/compiler/unusedLocalsStartingWithUnderscore.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noUnusedLocals:true
 
 // @Filename: /a.ts
diff --git a/tests/cases/compiler/unusedMethodsInInterface.ts b/tests/cases/compiler/unusedMethodsInInterface.ts
index 29769bc5b115c..d20364666e45c 100644
--- a/tests/cases/compiler/unusedMethodsInInterface.ts
+++ b/tests/cases/compiler/unusedMethodsInInterface.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedLocals:true
 //@noUnusedParameters:true
 
diff --git a/tests/cases/compiler/unusedParameterProperty2.ts b/tests/cases/compiler/unusedParameterProperty2.ts
index 4dc3c5d2dbf5d..21a3f728cb424 100644
--- a/tests/cases/compiler/unusedParameterProperty2.ts
+++ b/tests/cases/compiler/unusedParameterProperty2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedLocals:true
 //@noUnusedParameters:true
 
diff --git a/tests/cases/compiler/unusedParametersInLambda1.ts b/tests/cases/compiler/unusedParametersInLambda1.ts
index 431ac1eb1dce7..4495c816e1de0 100644
--- a/tests/cases/compiler/unusedParametersInLambda1.ts
+++ b/tests/cases/compiler/unusedParametersInLambda1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedLocals:true
 //@noUnusedParameters:true
 
diff --git a/tests/cases/compiler/unusedParametersInLambda2.ts b/tests/cases/compiler/unusedParametersInLambda2.ts
index ed4dfb3404b11..32c4678cc3c3a 100644
--- a/tests/cases/compiler/unusedParametersInLambda2.ts
+++ b/tests/cases/compiler/unusedParametersInLambda2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedLocals:true
 //@noUnusedParameters:true
 
diff --git a/tests/cases/compiler/unusedParametersWithUnderscore.ts b/tests/cases/compiler/unusedParametersWithUnderscore.ts
index e7382e5c2af2c..e0f553b710833 100644
--- a/tests/cases/compiler/unusedParametersWithUnderscore.ts
+++ b/tests/cases/compiler/unusedParametersWithUnderscore.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedLocals:true
 //@noUnusedParameters:true
 
diff --git a/tests/cases/compiler/unusedPrivateMembers.ts b/tests/cases/compiler/unusedPrivateMembers.ts
index 034446a63a09f..261023d59d3f5 100644
--- a/tests/cases/compiler/unusedPrivateMembers.ts
+++ b/tests/cases/compiler/unusedPrivateMembers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@noUnusedLocals:true
 //@noUnusedParameters:true
 //@target:ES5
diff --git a/tests/cases/compiler/unusedPrivateVariableInClass5.ts b/tests/cases/compiler/unusedPrivateVariableInClass5.ts
index 4234f16bdbcd5..757a4d864d1de 100644
--- a/tests/cases/compiler/unusedPrivateVariableInClass5.ts
+++ b/tests/cases/compiler/unusedPrivateVariableInClass5.ts
@@ -2,9 +2,9 @@
 //@noUnusedParameters:true
 
 class greeter {
-    private x: string;
-    private y: string;
-    public  z: string;
+    private x!: string;
+    private y!: string;
+    public  z!: string;
 
     constructor() {
         this.x;
diff --git a/tests/cases/compiler/unusedTypeParameterInFunction2.ts b/tests/cases/compiler/unusedTypeParameterInFunction2.ts
index 76eeb11bb34fc..17524236c2599 100644
--- a/tests/cases/compiler/unusedTypeParameterInFunction2.ts
+++ b/tests/cases/compiler/unusedTypeParameterInFunction2.ts
@@ -2,6 +2,6 @@
 //@noUnusedParameters:true
 
 function f1<X, Y>() {
-    var a: X;
+    var a!: X;
     a;
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/unusedTypeParameterInFunction3.ts b/tests/cases/compiler/unusedTypeParameterInFunction3.ts
index 37f01468156e3..b21da72cdd49c 100644
--- a/tests/cases/compiler/unusedTypeParameterInFunction3.ts
+++ b/tests/cases/compiler/unusedTypeParameterInFunction3.ts
@@ -2,8 +2,8 @@
 //@noUnusedParameters:true
 
 function f1<X, Y, Z>() {
-    var a: X;
-    var b: Z;
+    var a!: X;
+    var b!: Z;
     a;
     b;
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/unusedTypeParameterInFunction4.ts b/tests/cases/compiler/unusedTypeParameterInFunction4.ts
index 56549d9397646..5c53467df44a1 100644
--- a/tests/cases/compiler/unusedTypeParameterInFunction4.ts
+++ b/tests/cases/compiler/unusedTypeParameterInFunction4.ts
@@ -2,8 +2,8 @@
 //@noUnusedParameters:true
 
 function f1<X, Y, Z>() {
-    var a: Y;
-    var b: Z;
+    var a!: Y;
+    var b!: Z;
     a;
     b;
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/unusedTypeParameterInLambda2.ts b/tests/cases/compiler/unusedTypeParameterInLambda2.ts
index 73177a8b09dab..7a0361ba419b7 100644
--- a/tests/cases/compiler/unusedTypeParameterInLambda2.ts
+++ b/tests/cases/compiler/unusedTypeParameterInLambda2.ts
@@ -4,7 +4,7 @@
 class A {
     public f1() {
         return <T, X>() => {
-            var a: X;
+            var a!: X;
             a;
         }
     }
diff --git a/tests/cases/compiler/unusedTypeParameterInMethod1.ts b/tests/cases/compiler/unusedTypeParameterInMethod1.ts
index f58bde3d2a100..c10d08c7b70f3 100644
--- a/tests/cases/compiler/unusedTypeParameterInMethod1.ts
+++ b/tests/cases/compiler/unusedTypeParameterInMethod1.ts
@@ -3,8 +3,8 @@
 
 class A {
     public f1<X, Y, Z>() {
-        var a: Y;
-        var b: Z;
+        var a!: Y;
+        var b!: Z;
         a;
         b;
     }
diff --git a/tests/cases/compiler/unusedTypeParameterInMethod2.ts b/tests/cases/compiler/unusedTypeParameterInMethod2.ts
index f344d188b0a5a..f862d15afc6c9 100644
--- a/tests/cases/compiler/unusedTypeParameterInMethod2.ts
+++ b/tests/cases/compiler/unusedTypeParameterInMethod2.ts
@@ -3,8 +3,8 @@
 
 class A {
     public f1<X, Y, Z>() {
-        var a: X;
-        var b: Z;
+        var a!: X;
+        var b!: Z;
         a;
         b;
     }
diff --git a/tests/cases/compiler/unusedTypeParameterInMethod3.ts b/tests/cases/compiler/unusedTypeParameterInMethod3.ts
index 9734136bd0359..8f3af22fc1497 100644
--- a/tests/cases/compiler/unusedTypeParameterInMethod3.ts
+++ b/tests/cases/compiler/unusedTypeParameterInMethod3.ts
@@ -3,8 +3,8 @@
 
 class A {
     public f1<X, Y, Z>() {
-        var a: X;
-        var b: Y;
+        var a!: X;
+        var b!: Y;
         a;
         b;
     }
diff --git a/tests/cases/compiler/varArgsOnConstructorTypes.ts b/tests/cases/compiler/varArgsOnConstructorTypes.ts
index e6e4a2adc7221..6c70f1be95096 100644
--- a/tests/cases/compiler/varArgsOnConstructorTypes.ts
+++ b/tests/cases/compiler/varArgsOnConstructorTypes.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: amd
 export class A {
     constructor(ctor) { }
diff --git a/tests/cases/compiler/varAsID.ts b/tests/cases/compiler/varAsID.ts
index ec8e61504b267..900559ea5e0f9 100644
--- a/tests/cases/compiler/varAsID.ts
+++ b/tests/cases/compiler/varAsID.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 class Foo {
     var; // ok
diff --git a/tests/cases/compiler/varBlock.ts b/tests/cases/compiler/varBlock.ts
index 5f3121656ba39..893ad101b69fe 100644
--- a/tests/cases/compiler/varBlock.ts
+++ b/tests/cases/compiler/varBlock.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace m2 {
 
     export var a, b2: number = 10, b;
diff --git a/tests/cases/compiler/vardecl.ts b/tests/cases/compiler/vardecl.ts
index 8cdb4c8df225f..1e67daea2dc10 100644
--- a/tests/cases/compiler/vardecl.ts
+++ b/tests/cases/compiler/vardecl.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 var simpleVar;
 
diff --git a/tests/cases/compiler/variableDeclaratorResolvedDuringContextualTyping.ts b/tests/cases/compiler/variableDeclaratorResolvedDuringContextualTyping.ts
index af0f733837910..16bcbc370b09e 100644
--- a/tests/cases/compiler/variableDeclaratorResolvedDuringContextualTyping.ts
+++ b/tests/cases/compiler/variableDeclaratorResolvedDuringContextualTyping.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 namespace WinJS {
     export interface ValueCallback {
diff --git a/tests/cases/compiler/verbatimModuleSyntaxReactReference.ts b/tests/cases/compiler/verbatimModuleSyntaxReactReference.ts
index e3fcf1d34006d..9120386c13bb5 100644
--- a/tests/cases/compiler/verbatimModuleSyntaxReactReference.ts
+++ b/tests/cases/compiler/verbatimModuleSyntaxReactReference.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: preserve
 // @verbatimModuleSyntax: true
 // @jsx: react
diff --git a/tests/cases/compiler/voidOperator1.ts b/tests/cases/compiler/voidOperator1.ts
index 90c1713edaea0..aa73e71d70f0a 100644
--- a/tests/cases/compiler/voidOperator1.ts
+++ b/tests/cases/compiler/voidOperator1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var x: any = void 1;
 var y: void = void 1;
 var z = void 1;
\ No newline at end of file
diff --git a/tests/cases/compiler/voidReturnLambdaValue.ts b/tests/cases/compiler/voidReturnLambdaValue.ts
index 49aaa74af8f74..9432c65fac719 100644
--- a/tests/cases/compiler/voidReturnLambdaValue.ts
+++ b/tests/cases/compiler/voidReturnLambdaValue.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(arg1, arg2, callback:(v1,v2,v3) => void):void {
                 return callback(arg1, arg2, arg2);
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/weakType.ts b/tests/cases/compiler/weakType.ts
index d9415fdef45e6..3d8400a2ff9a4 100644
--- a/tests/cases/compiler/weakType.ts
+++ b/tests/cases/compiler/weakType.ts
@@ -32,7 +32,7 @@ type ChangeOptions = ConfigurableStartEnd & InsertOptions;
 
 function del(options: ConfigurableStartEnd = {},
              error: { error?: number } = {}) {
-    let changes: ChangeOptions[];
+    let changes: ChangeOptions[] = [];
     changes.push(options);
     changes.push(error);
 }
diff --git a/tests/cases/compiler/wellKnownSymbolExpando.ts b/tests/cases/compiler/wellKnownSymbolExpando.ts
index b80fa2bb8b28d..e9ba31536e5ca 100644
--- a/tests/cases/compiler/wellKnownSymbolExpando.ts
+++ b/tests/cases/compiler/wellKnownSymbolExpando.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @target: esnext
 
diff --git a/tests/cases/compiler/widenedTypes1.ts b/tests/cases/compiler/widenedTypes1.ts
index c4b20eff2ae49..1c61ec1c988ec 100644
--- a/tests/cases/compiler/widenedTypes1.ts
+++ b/tests/cases/compiler/widenedTypes1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var a = null;
 var b = undefined;
 
diff --git a/tests/cases/compiler/withExportDecl.ts b/tests/cases/compiler/withExportDecl.ts
index 0b13755c7ad1b..064d773e270f1 100644
--- a/tests/cases/compiler/withExportDecl.ts
+++ b/tests/cases/compiler/withExportDecl.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: amd
 // @declaration: true
 var simpleVar;
diff --git a/tests/cases/compiler/withImportDecl.ts b/tests/cases/compiler/withImportDecl.ts
index 5da2eb17be2a3..f2391cfc65372 100644
--- a/tests/cases/compiler/withImportDecl.ts
+++ b/tests/cases/compiler/withImportDecl.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: amd
 // @declaration: true
 // @Filename: withImportDecl_0.ts
diff --git a/tests/cases/compiler/wrappedIncovations1.ts b/tests/cases/compiler/wrappedIncovations1.ts
index 2c8ee00fe0eb2..7c858e6e87294 100644
--- a/tests/cases/compiler/wrappedIncovations1.ts
+++ b/tests/cases/compiler/wrappedIncovations1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var v = this
   .foo()
   .bar()
diff --git a/tests/cases/compiler/wrappedIncovations2.ts b/tests/cases/compiler/wrappedIncovations2.ts
index eba99b425e4cc..cfad042b84194 100644
--- a/tests/cases/compiler/wrappedIncovations2.ts
+++ b/tests/cases/compiler/wrappedIncovations2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var v = this.
   foo().
   bar().
diff --git a/tests/cases/compiler/wrappedRecursiveGenericType.ts b/tests/cases/compiler/wrappedRecursiveGenericType.ts
index 7180ad047652f..e3dc0a2a11036 100644
--- a/tests/cases/compiler/wrappedRecursiveGenericType.ts
+++ b/tests/cases/compiler/wrappedRecursiveGenericType.ts
@@ -7,7 +7,7 @@ interface B<T> {
     b: A<X<T>>;
     val: T;
 }
-var x: A<number>;
+declare var x: A<number>;
 x.val = 5;         // val -> number
 x.a.val = 5;       // val -> number
 x.a.b.val = 5;     // val -> X<number> (This should be an error)
diff --git a/tests/cases/conformance/Symbols/ES5SymbolProperty2.ts b/tests/cases/conformance/Symbols/ES5SymbolProperty2.ts
index 58dfe44801310..00862a8821f57 100644
--- a/tests/cases/conformance/Symbols/ES5SymbolProperty2.ts
+++ b/tests/cases/conformance/Symbols/ES5SymbolProperty2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES5
 namespace M {
     var Symbol: any;
diff --git a/tests/cases/conformance/Symbols/ES5SymbolProperty5.ts b/tests/cases/conformance/Symbols/ES5SymbolProperty5.ts
index ec46ddad21dc1..3da931380b43e 100644
--- a/tests/cases/conformance/Symbols/ES5SymbolProperty5.ts
+++ b/tests/cases/conformance/Symbols/ES5SymbolProperty5.ts
@@ -1,5 +1,5 @@
 //@target: ES5
-var Symbol: { iterator: symbol };
+declare var Symbol: { iterator: symbol };
 
 class C {
     [Symbol.iterator]() { }
diff --git a/tests/cases/conformance/ambient/ambientDeclarations.ts b/tests/cases/conformance/ambient/ambientDeclarations.ts
index 65312ebe82661..aac02d0712942 100644
--- a/tests/cases/conformance/ambient/ambientDeclarations.ts
+++ b/tests/cases/conformance/ambient/ambientDeclarations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Ambient variable without type annotation
 declare var n;
 
diff --git a/tests/cases/conformance/ambient/ambientDeclarationsExternal.ts b/tests/cases/conformance/ambient/ambientDeclarationsExternal.ts
index 698033cd27163..842925b05fea5 100644
--- a/tests/cases/conformance/ambient/ambientDeclarationsExternal.ts
+++ b/tests/cases/conformance/ambient/ambientDeclarationsExternal.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 //@Filename: decls.ts
 // Ambient external module with export assignment
diff --git a/tests/cases/conformance/ambient/ambientDeclarationsPatterns.ts b/tests/cases/conformance/ambient/ambientDeclarationsPatterns.ts
index d48f50bfa5059..4c5d12df3124b 100644
--- a/tests/cases/conformance/ambient/ambientDeclarationsPatterns.ts
+++ b/tests/cases/conformance/ambient/ambientDeclarationsPatterns.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @Filename: declarations.d.ts
 declare module "foo*baz" {
     export function foo(s: string): void;
diff --git a/tests/cases/conformance/ambient/ambientDeclarationsPatterns_merging1.ts b/tests/cases/conformance/ambient/ambientDeclarationsPatterns_merging1.ts
index d9cd0802f417d..8de1bc560ffa7 100644
--- a/tests/cases/conformance/ambient/ambientDeclarationsPatterns_merging1.ts
+++ b/tests/cases/conformance/ambient/ambientDeclarationsPatterns_merging1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: types.ts
 declare module "*.foo" {
   let everywhere: string;
diff --git a/tests/cases/conformance/ambient/ambientDeclarationsPatterns_merging2.ts b/tests/cases/conformance/ambient/ambientDeclarationsPatterns_merging2.ts
index 7b02846c242b7..83c98ad7a3114 100644
--- a/tests/cases/conformance/ambient/ambientDeclarationsPatterns_merging2.ts
+++ b/tests/cases/conformance/ambient/ambientDeclarationsPatterns_merging2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: types.ts
 declare module "*.foo" {
   let everywhere: string;
diff --git a/tests/cases/conformance/ambient/ambientDeclarationsPatterns_merging3.ts b/tests/cases/conformance/ambient/ambientDeclarationsPatterns_merging3.ts
index 85232eca2208b..715b6afa809b9 100644
--- a/tests/cases/conformance/ambient/ambientDeclarationsPatterns_merging3.ts
+++ b/tests/cases/conformance/ambient/ambientDeclarationsPatterns_merging3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: types.ts
 declare module "*.foo" {
   export interface OhNo { star: string }
diff --git a/tests/cases/conformance/ambient/ambientDeclarationsPatterns_tooManyAsterisks.ts b/tests/cases/conformance/ambient/ambientDeclarationsPatterns_tooManyAsterisks.ts
index 76f9081906ca8..cd93a486d1c72 100644
--- a/tests/cases/conformance/ambient/ambientDeclarationsPatterns_tooManyAsterisks.ts
+++ b/tests/cases/conformance/ambient/ambientDeclarationsPatterns_tooManyAsterisks.ts
@@ -1 +1,2 @@
+// @strict: false
 declare module "too*many*asterisks" { }
diff --git a/tests/cases/conformance/ambient/ambientErrors.ts b/tests/cases/conformance/ambient/ambientErrors.ts
index ea0c92ab4fa37..9a91367b203e4 100644
--- a/tests/cases/conformance/ambient/ambientErrors.ts
+++ b/tests/cases/conformance/ambient/ambientErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Ambient variable with an initializer 
 declare var x = 4;
 
diff --git a/tests/cases/conformance/ambient/ambientInsideNonAmbient.ts b/tests/cases/conformance/ambient/ambientInsideNonAmbient.ts
index a1b6cf479226f..0885ee94ab004 100644
--- a/tests/cases/conformance/ambient/ambientInsideNonAmbient.ts
+++ b/tests/cases/conformance/ambient/ambientInsideNonAmbient.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
     export declare var x;
     export declare function f();
diff --git a/tests/cases/conformance/ambient/ambientInsideNonAmbientExternalModule.ts b/tests/cases/conformance/ambient/ambientInsideNonAmbientExternalModule.ts
index 937246c92dffb..6e550532bdb72 100644
--- a/tests/cases/conformance/ambient/ambientInsideNonAmbientExternalModule.ts
+++ b/tests/cases/conformance/ambient/ambientInsideNonAmbientExternalModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 export declare var x;
 export declare function f();
diff --git a/tests/cases/conformance/async/asyncFunctionDeclarationParameterEvaluation.ts b/tests/cases/conformance/async/asyncFunctionDeclarationParameterEvaluation.ts
index 034f10412d07f..942c566ad4d00 100644
--- a/tests/cases/conformance/async/asyncFunctionDeclarationParameterEvaluation.ts
+++ b/tests/cases/conformance/async/asyncFunctionDeclarationParameterEvaluation.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015,es2017
 // @lib: esnext
 // @noEmitHelpers: true
diff --git a/tests/cases/conformance/async/es2017/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es2017.ts b/tests/cases/conformance/async/es2017/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es2017.ts
index 1ade02c09d2e8..8f6b822448d6c 100644
--- a/tests/cases/conformance/async/es2017/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es2017.ts
+++ b/tests/cases/conformance/async/es2017/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es2017.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @noEmitHelpers: true
 
diff --git a/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction2_es2017.ts b/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction2_es2017.ts
index b11441372ffdc..5521f791d83e2 100644
--- a/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction2_es2017.ts
+++ b/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction2_es2017.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2017
 // @noEmitHelpers: true
 var f = (await) => {
diff --git a/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction3_es2017.ts b/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction3_es2017.ts
index 9b5924fc1455f..a6be01fb86b77 100644
--- a/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction3_es2017.ts
+++ b/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction3_es2017.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2017
 // @noEmitHelpers: true
 function f(await = await) {
diff --git a/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction5_es2017.ts b/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction5_es2017.ts
index aabe5a99372ad..953a245e86230 100644
--- a/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction5_es2017.ts
+++ b/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction5_es2017.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2017
 // @noEmitHelpers: true
 
diff --git a/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction9_es2017.ts b/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction9_es2017.ts
index 93254fee5c746..6d27ce06fdd2a 100644
--- a/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction9_es2017.ts
+++ b/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction9_es2017.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2017
 // @noEmitHelpers: true
 var foo = async (a = await => await): Promise<void> => {
diff --git a/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es2017.ts b/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es2017.ts
index 9b63b7bd468c3..9f36c8447bcc3 100644
--- a/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es2017.ts
+++ b/tests/cases/conformance/async/es2017/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es2017.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2017
 // @noEmitHelpers: true
 
diff --git a/tests/cases/conformance/async/es2017/asyncMethodWithSuperConflict_es6.ts b/tests/cases/conformance/async/es2017/asyncMethodWithSuperConflict_es6.ts
index 88ed3eea5fff4..574bf31123e10 100644
--- a/tests/cases/conformance/async/es2017/asyncMethodWithSuperConflict_es6.ts
+++ b/tests/cases/conformance/async/es2017/asyncMethodWithSuperConflict_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 class A {
     x() {
diff --git a/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration10_es2017.ts b/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration10_es2017.ts
index 9b744713945d0..ec91e7501ca4f 100644
--- a/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration10_es2017.ts
+++ b/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration10_es2017.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2017
 // @noEmitHelpers: true
 async function foo(a = await => await): Promise<void> {
diff --git a/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration2_es2017.ts b/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration2_es2017.ts
index 08711a4cfbd8e..8d4264ef9c71e 100644
--- a/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration2_es2017.ts
+++ b/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration2_es2017.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2017
 // @noEmitHelpers: true
 function f(await) {
diff --git a/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration3_es2017.ts b/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration3_es2017.ts
index 9b5924fc1455f..a6be01fb86b77 100644
--- a/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration3_es2017.ts
+++ b/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration3_es2017.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2017
 // @noEmitHelpers: true
 function f(await = await) {
diff --git a/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration5_es2017.ts b/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration5_es2017.ts
index c57fb73d6d712..6bdfaaa5ab671 100644
--- a/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration5_es2017.ts
+++ b/tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration5_es2017.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2017
 // @noEmitHelpers: true
 async function foo(await): Promise<void> {
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es5.ts
index e6bb588b2b0ac..025204f36ebd5 100644
--- a/tests/cases/conformance/async/es5/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es5.ts
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction2_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction2_es5.ts
index 120b5127a0078..8ecd94eb07b51 100644
--- a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction2_es5.ts
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction2_es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction3_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction3_es5.ts
index 810d7bc7e0568..8591b110fab9a 100644
--- a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction3_es5.ts
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction3_es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction5_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction5_es5.ts
index 728e2e8ee7252..a70d7ec5c4264 100644
--- a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction5_es5.ts
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction5_es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction9_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction9_es5.ts
index 7f1e072a3f2ae..8b5bc1317b98b 100644
--- a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction9_es5.ts
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction9_es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es5.ts
index 7db76c570848e..be37addad4f87 100644
--- a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es5.ts
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
diff --git a/tests/cases/conformance/async/es5/asyncSetter_es5.ts b/tests/cases/conformance/async/es5/asyncSetter_es5.ts
index 419922b080618..8736cccfd67a5 100644
--- a/tests/cases/conformance/async/es5/asyncSetter_es5.ts
+++ b/tests/cases/conformance/async/es5/asyncSetter_es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts
index f1cb80162bd40..a5831c35e1174 100644
--- a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts
index 373677bf58f7a..2ffff7b450ee1 100644
--- a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration2_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration2_es5.ts
index b1e337938e00b..3a96ed9e35d40 100644
--- a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration2_es5.ts
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration2_es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration3_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration3_es5.ts
index 810d7bc7e0568..8591b110fab9a 100644
--- a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration3_es5.ts
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration3_es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration5_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration5_es5.ts
index 3c71741da143a..0accc5cfa74a7 100644
--- a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration5_es5.ts
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration5_es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @lib: es5,es2015.promise
 // @noEmitHelpers: true
diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6.ts
index 1ade02c09d2e8..8f6b822448d6c 100644
--- a/tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6.ts
+++ b/tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @noEmitHelpers: true
 
diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction2_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction2_es6.ts
index bf39735d4603f..7f00a755f8686 100644
--- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction2_es6.ts
+++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction2_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @noEmitHelpers: true
 var f = (await) => {
diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction3_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction3_es6.ts
index 4ae27c596f1ab..1a990dc7c8383 100644
--- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction3_es6.ts
+++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction3_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @noEmitHelpers: true
 function f(await = await) {
diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction5_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction5_es6.ts
index 174a619bdf9f9..e7d58c107e94e 100644
--- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction5_es6.ts
+++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction5_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @noEmitHelpers: true
 
diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction9_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction9_es6.ts
index da041fe472b30..e6ae414295971 100644
--- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction9_es6.ts
+++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction9_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @noEmitHelpers: true
 var foo = async (a = await => await): Promise<void> => {
diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es6.ts
index 6a5086f70d076..f49cd81f6945a 100644
--- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es6.ts
+++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @noEmitHelpers: true
 
diff --git a/tests/cases/conformance/async/es6/asyncSetter_es6.ts b/tests/cases/conformance/async/es6/asyncSetter_es6.ts
index 8eedcbb5288a2..31ac42cd1d9ef 100644
--- a/tests/cases/conformance/async/es6/asyncSetter_es6.ts
+++ b/tests/cases/conformance/async/es6/asyncSetter_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @noEmitHelpers: true
 class C {
diff --git a/tests/cases/conformance/async/es6/asyncWithVarShadowing_es6.ts b/tests/cases/conformance/async/es6/asyncWithVarShadowing_es6.ts
index 9083246dd181a..e2a7a52e7ae7b 100644
--- a/tests/cases/conformance/async/es6/asyncWithVarShadowing_es6.ts
+++ b/tests/cases/conformance/async/es6/asyncWithVarShadowing_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 // @noEmitHelpers: true
 // https://github.com/Microsoft/TypeScript/issues/20461
diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts
index aab1f0013ecf9..1b7e814d548d6 100644
--- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts
+++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @noEmitHelpers: true
 async function foo(a = await => await): Promise<void> {
diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts
index 74018b73678a9..f5407c313cf36 100644
--- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts
+++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @noEmitHelpers: true
 declare class Thenable { then(): void; }
diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration2_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration2_es6.ts
index 25a153b4a3412..569920f2c94e1 100644
--- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration2_es6.ts
+++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration2_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @noEmitHelpers: true
 function f(await) {
diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration3_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration3_es6.ts
index 4ae27c596f1ab..1a990dc7c8383 100644
--- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration3_es6.ts
+++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration3_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @noEmitHelpers: true
 function f(await = await) {
diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration5_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration5_es6.ts
index eb3cd1db55675..50a0723847875 100644
--- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration5_es6.ts
+++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration5_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @noEmitHelpers: true
 async function foo(await): Promise<void> {
diff --git a/tests/cases/conformance/asyncGenerators/asyncGeneratorParameterEvaluation.ts b/tests/cases/conformance/asyncGenerators/asyncGeneratorParameterEvaluation.ts
index b4aef8f71d995..c315ef7af1677 100644
--- a/tests/cases/conformance/asyncGenerators/asyncGeneratorParameterEvaluation.ts
+++ b/tests/cases/conformance/asyncGenerators/asyncGeneratorParameterEvaluation.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015,es2017,es2018
 // @lib: esnext
 // @noEmitHelpers: true
diff --git a/tests/cases/conformance/classes/awaitAndYieldInProperty.ts b/tests/cases/conformance/classes/awaitAndYieldInProperty.ts
index 0de782de2132b..3e0d7a6b15799 100644
--- a/tests/cases/conformance/classes/awaitAndYieldInProperty.ts
+++ b/tests/cases/conformance/classes/awaitAndYieldInProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2019
 // @noTypesAndSymbols: true
 async function* test(x: Promise<string>) {
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts
index 2c59b6f93ccdf..6dff4c4e54af1 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 
 abstract class A {
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractClinterfaceAssignability.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractClinterfaceAssignability.ts
index 682ad6faa0f28..6fc20955aa409 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractClinterfaceAssignability.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractClinterfaceAssignability.ts
@@ -9,15 +9,15 @@ interface IConstructor {
     prototype: I;
 }
 
-var I: IConstructor;
+declare var I: IConstructor;
 
 abstract class A {
     x: number;
     static y: number;
 }
 
-var AA: typeof A;
+declare var AA: typeof A;
 AA = I;
 
-var AAA: typeof I;
+declare var AAA: typeof I;
 AAA = A;
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractCrashedOnce.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractCrashedOnce.ts
index 747b8dafe6ec3..d1c4eda7e7d3c 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractCrashedOnce.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractCrashedOnce.ts
@@ -1,3 +1,4 @@
+// @strict: false
 abstract class foo {
     protected abstract test();
 }
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractDeclarations.d.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractDeclarations.d.ts
index 14dfd1d86d840..f45c437677001 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractDeclarations.d.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractDeclarations.d.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare abstract class A {
     abstract constructor() {}
 }
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractExtends.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractExtends.ts
index 0aa57b75835f8..09afe442c31b6 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractExtends.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractExtends.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 class A {
     foo() {}
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractGeneric.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractGeneric.ts
index f69ea30d0d69d..972f96881615a 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractGeneric.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractGeneric.ts
@@ -1,3 +1,4 @@
+// @strict: false
 abstract class A<T> {
     t: T;
     
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInheritance1.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInheritance1.ts
index ced15607f84f9..9668986793d1e 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInheritance1.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInheritance1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 abstract class A {}
 
 abstract class B extends A {}
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodInNonAbstractClass.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodInNonAbstractClass.ts
index 98a2091bc0cc5..d4b34334bea9c 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodInNonAbstractClass.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodInNonAbstractClass.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A {
     abstract foo();
 }
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMixedWithModifiers.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMixedWithModifiers.ts
index 969a39288e09b..465f918893d70 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMixedWithModifiers.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMixedWithModifiers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 abstract class A {
     abstract foo_a();
 
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads.ts
index c30a03f8217a8..57e049f43930c 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads.ts
@@ -1,3 +1,4 @@
+// @strict: false
 abstract class A {
     abstract foo();
     abstract foo() : number;
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverrideWithAbstract.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverrideWithAbstract.ts
index 7e02dbd4d9864..6afdcf18ed2e2 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverrideWithAbstract.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverrideWithAbstract.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A {
     foo() {}
 }
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractSuperCalls.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractSuperCalls.ts
index e93a670b55fac..3286e775c209f 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractSuperCalls.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractSuperCalls.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 class A {
     foo() { return 1; }
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractUsingAbstractMethods2.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractUsingAbstractMethods2.ts
index e333811c67f1e..2e9e95333cb61 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractUsingAbstractMethods2.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractUsingAbstractMethods2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A {
     abstract foo();
 }
diff --git a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts
index f2eef7c7ce10e..839395bb8a972 100644
--- a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts
@@ -4,7 +4,7 @@ interface I {
 class C extends I { } // error
 
 class C2 extends { foo: string; } { } // error
-var x: { foo: string; }
+declare var x: { foo: string; }
 class C3 extends x { } // error
 
 namespace M { export var x = 1; }
diff --git a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsValidConstructorFunction.ts b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsValidConstructorFunction.ts
index e3664da024e28..c1380e36a3a7f 100644
--- a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsValidConstructorFunction.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsValidConstructorFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo() { }
 
 var x = new foo(); // can be used as a constructor function
diff --git a/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.2.ts b/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.2.ts
index e7c43d68c98cd..6c4dd98275b7a 100644
--- a/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.2.ts
+++ b/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @noTypesAndSymbols: true
 // @noEmit: true
diff --git a/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.3.ts b/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.3.ts
index 7f55d82804fba..95611edacbde4 100644
--- a/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.3.ts
+++ b/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @noTypesAndSymbols: true
 // @noEmit: true
diff --git a/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.ts b/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.ts
index 1d6c683dc7486..f2d74313ad31e 100644
--- a/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.ts
+++ b/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @noTypesAndSymbols: true
 
diff --git a/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterInitializer.2.ts b/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterInitializer.2.ts
index a4f0657f2bfbd..387677c0cfb13 100644
--- a/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterInitializer.2.ts
+++ b/tests/cases/conformance/classes/classExpressions/classWithStaticFieldInParameterInitializer.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @noTypesAndSymbols: true
 // @noEmit: true
diff --git a/tests/cases/conformance/classes/classStaticBlock/classStaticBlock26.ts b/tests/cases/conformance/classes/classStaticBlock/classStaticBlock26.ts
index 75cdbd61d44ca..97037bd6d4b66 100644
--- a/tests/cases/conformance/classes/classStaticBlock/classStaticBlock26.ts
+++ b/tests/cases/conformance/classes/classStaticBlock/classStaticBlock26.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext, es2022
 
 class C {
diff --git a/tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility.ts b/tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility.ts
index 91d235b06fdf0..fd3af1aa9969c 100644
--- a/tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility.ts
+++ b/tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility.ts
@@ -1,21 +1,21 @@
 class C1 {
     constructor(public x: number) { }
 }
-var c1: C1;
+declare var c1: C1;
 c1.x // OK
 
 
 class C2 {
     constructor(private p: number) { }
 }
-var c2: C2;
+declare var c2: C2;
 c2.p // private, error
 
 
 class C3 {
     constructor(protected p: number) { }
 }
-var c3: C3;
+declare var c3: C3;
 c3.p // protected, error
 class Derived extends C3 {
     constructor(p: number) {
diff --git a/tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility2.ts b/tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility2.ts
index 2f5adca95b309..ef92d80406c25 100644
--- a/tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility2.ts
+++ b/tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility2.ts
@@ -1,21 +1,21 @@
 class C1 {
     constructor(public x?: number) { }
 }
-var c1: C1;
+declare var c1: C1;
 c1.x // OK
 
 
 class C2 {
     constructor(private p?: number) { }
 }
-var c2: C2;
+declare var c2: C2;
 c2.p // private, error
 
 
 class C3 {
     constructor(protected p?: number) { }
 }
-var c3: C3;
+declare var c3: C3;
 c3.p // protected, error
 class Derived extends C3 {
     constructor(p: number) {
diff --git a/tests/cases/conformance/classes/constructorDeclarations/classWithTwoConstructorDefinitions.ts b/tests/cases/conformance/classes/constructorDeclarations/classWithTwoConstructorDefinitions.ts
index b3f535c4c3dfd..ca38abecd2b06 100644
--- a/tests/cases/conformance/classes/constructorDeclarations/classWithTwoConstructorDefinitions.ts
+++ b/tests/cases/conformance/classes/constructorDeclarations/classWithTwoConstructorDefinitions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     constructor() { } // error
     constructor(x) { } // error
diff --git a/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues.ts b/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues.ts
index bdbcd7f9592cb..b3ba19a8391ac 100644
--- a/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues.ts
+++ b/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     constructor(x);
     constructor(x = 1) {
diff --git a/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues2.ts b/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues2.ts
index a56389186ef1f..86e6bf1c0a2a0 100644
--- a/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues2.ts
+++ b/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     constructor(x);
     constructor(public x: string = 1) { // error
diff --git a/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorOverloadsWithOptionalParameters.ts b/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorOverloadsWithOptionalParameters.ts
index 3ec148a9729aa..61822575beaca 100644
--- a/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorOverloadsWithOptionalParameters.ts
+++ b/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorOverloadsWithOptionalParameters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     foo: string;
     constructor(x?, y?: any[]); 
diff --git a/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts b/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts
index f4d63da1192fc..ca5f147d77181 100644
--- a/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts
+++ b/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts
@@ -3,7 +3,7 @@ class C {
     constructor(private x: string, protected z: string) { }
 }
 
-var c: C;
+declare var c: C;
 var r = c.y;
 var r2 = c.x; // error
 var r3 = c.z; // error
@@ -13,7 +13,7 @@ class D<T> {
     constructor(a: T, private x: T, protected z: T) { }
 }
 
-var d: D<string>;
+declare var d: D<string>;
 var r = d.y;
 var r2 = d.x; // error
 var r3 = d.a; // error
diff --git a/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts b/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts
index b95891c0845e7..e677788302c37 100644
--- a/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts
+++ b/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts
@@ -3,7 +3,7 @@ class C {
     constructor(y: number) { } // ok
 }
 
-var c: C;
+declare var c: C;
 var r = c.y;
 
 class D {
@@ -11,7 +11,7 @@ class D {
     constructor(public y: number) { } // error
 }
 
-var d: D;
+declare var d: D;
 var r2 = d.y;
 
 class E {
@@ -19,7 +19,7 @@ class E {
     constructor(private y: number) { } // error
 }
 
-var e: E;
+declare var e: E;
 var r3 = e.y; // error
 
 class F {
@@ -27,5 +27,5 @@ class F {
     constructor(protected y: number) { } // error
 }
 
-var f: F;
+declare var f: F;
 var r4 = f.y; // error
diff --git a/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/readonlyInAmbientClass.ts b/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/readonlyInAmbientClass.ts
index c84594eb4f097..a0e63f9e41433 100644
--- a/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/readonlyInAmbientClass.ts
+++ b/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/readonlyInAmbientClass.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare class C{
 	constructor(readonly x: number);
 	method(readonly x: number);
diff --git a/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts b/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts
index 1ede3af785ccf..748e5ee30ff22 100644
--- a/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts
+++ b/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Base {
     x: string;
     constructor(a) { }
diff --git a/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperProperties.ts b/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperProperties.ts
index ab580777d8e5b..2cc495efc2e2b 100644
--- a/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperProperties.ts
+++ b/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperProperties.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @experimentaldecorators: true
 // @target: ES5
 
diff --git a/tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer2.ts b/tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer2.ts
index 757a141bd7a4c..fc11a3fc40b65 100644
--- a/tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer2.ts
+++ b/tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // private indexers not allowed
 
 var x = {
diff --git a/tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts b/tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts
index 0fdbd59913315..ce5d89d7d5c46 100644
--- a/tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts
+++ b/tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     private x: string;
     private get y() { return null; }
@@ -10,7 +11,7 @@ class C {
     private static foo() { }
 }
 
-var c: C;
+declare var c: C;
 // all errors
 c.x;
 c.y;
diff --git a/tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts b/tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts
index 7efe159c058f2..d97fec042548f 100644
--- a/tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts
+++ b/tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     protected x: string;
     protected get y() { return null; }
@@ -10,7 +11,7 @@ class C {
     protected static foo() { }
 }
 
-var c: C;
+declare var c: C;
 // all errors
 c.x;
 c.y;
diff --git a/tests/cases/conformance/classes/members/accessibility/classPropertyIsPublicByDefault.ts b/tests/cases/conformance/classes/members/accessibility/classPropertyIsPublicByDefault.ts
index 7d631175ee8db..27d11ad700e0d 100644
--- a/tests/cases/conformance/classes/members/accessibility/classPropertyIsPublicByDefault.ts
+++ b/tests/cases/conformance/classes/members/accessibility/classPropertyIsPublicByDefault.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     x: string;
     get y() { return null; }
diff --git a/tests/cases/conformance/classes/members/accessibility/privateClassPropertyAccessibleWithinClass.ts b/tests/cases/conformance/classes/members/accessibility/privateClassPropertyAccessibleWithinClass.ts
index cbbf311a00e15..1f3acc71b860f 100644
--- a/tests/cases/conformance/classes/members/accessibility/privateClassPropertyAccessibleWithinClass.ts
+++ b/tests/cases/conformance/classes/members/accessibility/privateClassPropertyAccessibleWithinClass.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // no errors
 
 class C {
diff --git a/tests/cases/conformance/classes/members/accessibility/privateInstanceMemberAccessibility.ts b/tests/cases/conformance/classes/members/accessibility/privateInstanceMemberAccessibility.ts
index f1be3445a5acd..67cc563f1f831 100644
--- a/tests/cases/conformance/classes/members/accessibility/privateInstanceMemberAccessibility.ts
+++ b/tests/cases/conformance/classes/members/accessibility/privateInstanceMemberAccessibility.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Base {
     private foo: string;
 }
diff --git a/tests/cases/conformance/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring.ts b/tests/cases/conformance/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring.ts
index 5e25727d5f6c1..c9b1096f4929d 100644
--- a/tests/cases/conformance/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring.ts
+++ b/tests/cases/conformance/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class K {
     private priv;
     protected prot;
diff --git a/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinClass.ts b/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinClass.ts
index 08f99af59727f..871261fa1315b 100644
--- a/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinClass.ts
+++ b/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinClass.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // no errors
 
diff --git a/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts b/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts
index 1128da7079577..b7ab3683252e8 100644
--- a/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts
+++ b/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts
@@ -1,13 +1,13 @@
 class Base {
-    protected x: string;
+    protected x!: string;
     method() {
         class A {
             methoda() {
-                var b: Base;
-                var d1: Derived1;
-                var d2: Derived2;
-                var d3: Derived3;
-                var d4: Derived4;
+                var b: Base = undefined as any;
+                var d1: Derived1 = undefined as any;
+                var d2: Derived2 = undefined as any;
+                var d3: Derived3 = undefined as any;
+                var d4: Derived4 = undefined as any;
 
                 b.x;            // OK, accessed within their declaring class
                 d1.x;           // OK, accessed within their declaring class
@@ -23,11 +23,11 @@ class Derived1 extends Base {
     method1() {
         class B {
             method1b() {
-                var b: Base;
-                var d1: Derived1;
-                var d2: Derived2;
-                var d3: Derived3;
-                var d4: Derived4;
+                var b: Base = undefined as any;
+                var d1: Derived1 = undefined as any;
+                var d2: Derived2 = undefined as any;
+                var d3: Derived3 = undefined as any;
+                var d4: Derived4 = undefined as any;
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
                 d1.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
@@ -43,11 +43,11 @@ class Derived2 extends Base {
     method2() {
         class C {
             method2c() {
-                var b: Base;
-                var d1: Derived1;
-                var d2: Derived2;
-                var d3: Derived3;
-                var d4: Derived4;
+                var b: Base = undefined as any;
+                var d1: Derived1 = undefined as any;
+                var d2: Derived2 = undefined as any;
+                var d3: Derived3 = undefined as any;
+                var d4: Derived4 = undefined as any;
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
                 d1.x;           // Error, isn't accessed through an instance of the enclosing class
@@ -60,15 +60,15 @@ class Derived2 extends Base {
 }
 
 class Derived3 extends Derived1 {
-    protected x: string;
+    protected x!: string;
     method3() {
         class D {
             method3d() {
-                var b: Base;
-                var d1: Derived1;
-                var d2: Derived2;
-                var d3: Derived3;
-                var d4: Derived4;
+                var b: Base = undefined as any;
+                var d1: Derived1 = undefined as any;
+                var d2: Derived2 = undefined as any;
+                var d3: Derived3 = undefined as any;
+                var d4: Derived4 = undefined as any;
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
                 d1.x;           // Error, isn't accessed through an instance of the enclosing class
@@ -84,11 +84,11 @@ class Derived4 extends Derived2 {
     method4() {
         class E {
             method4e() {
-                var b: Base;
-                var d1: Derived1;
-                var d2: Derived2;
-                var d3: Derived3;
-                var d4: Derived4;
+                var b: Base = undefined as any;
+                var d1: Derived1 = undefined as any;
+                var d2: Derived2 = undefined as any;
+                var d3: Derived3 = undefined as any;
+                var d4: Derived4 = undefined as any;
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
                 d1.x;           // Error, isn't accessed through an instance of the enclosing class
@@ -101,11 +101,11 @@ class Derived4 extends Derived2 {
 }
 
 
-var b: Base;
-var d1: Derived1;
-var d2: Derived2;
-var d3: Derived3;
-var d4: Derived4;
+var b: Base = undefined as any;
+var d1: Derived1 = undefined as any;
+var d2: Derived2 = undefined as any;
+var d3: Derived3 = undefined as any;
+var d4: Derived4 = undefined as any;
 
 b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
 d1.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
diff --git a/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts b/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts
index 0bc89667abae3..39ecaa7ed8653 100644
--- a/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts
+++ b/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts
@@ -1,11 +1,11 @@
 class Base {
-    protected x: string;
+    protected x!: string;
     method() {
-        var b: Base;
-        var d1: Derived1;
-        var d2: Derived2;
-        var d3: Derived3;
-        var d4: Derived4;
+        var b: Base = undefined as any;
+        var d1: Derived1 = undefined as any;
+        var d2: Derived2 = undefined as any;
+        var d3: Derived3 = undefined as any;
+        var d4: Derived4 = undefined as any;
 
         b.x;            // OK, accessed within their declaring class
         d1.x;           // OK, accessed within their declaring class
@@ -17,11 +17,11 @@ class Base {
 
 class Derived1 extends Base {
     method1() {
-        var b: Base;
-        var d1: Derived1;
-        var d2: Derived2;
-        var d3: Derived3;
-        var d4: Derived4;
+        var b: Base = undefined as any;
+        var d1: Derived1 = undefined as any;
+        var d2: Derived2 = undefined as any;
+        var d3: Derived3 = undefined as any;
+        var d4: Derived4 = undefined as any;
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
         d1.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
@@ -33,11 +33,11 @@ class Derived1 extends Base {
 
 class Derived2 extends Base {
     method2() {
-        var b: Base;
-        var d1: Derived1;
-        var d2: Derived2;
-        var d3: Derived3;
-        var d4: Derived4;
+        var b: Base = undefined as any;
+        var d1: Derived1 = undefined as any;
+        var d2: Derived2 = undefined as any;
+        var d3: Derived3 = undefined as any;
+        var d4: Derived4 = undefined as any;
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
         d1.x;           // Error, isn't accessed through an instance of the enclosing class
@@ -48,13 +48,13 @@ class Derived2 extends Base {
 }
 
 class Derived3 extends Derived1 {
-    protected x: string;
+    protected x!: string;
     method3() {
-        var b: Base;
-        var d1: Derived1;
-        var d2: Derived2;
-        var d3: Derived3;
-        var d4: Derived4;
+        var b: Base = undefined as any;
+        var d1: Derived1 = undefined as any;
+        var d2: Derived2 = undefined as any;
+        var d3: Derived3 = undefined as any;
+        var d4: Derived4 = undefined as any;
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
         d1.x;           // Error, isn't accessed through an instance of the enclosing class
@@ -66,11 +66,11 @@ class Derived3 extends Derived1 {
 
 class Derived4 extends Derived2 {
     method4() {
-        var b: Base;
-        var d1: Derived1;
-        var d2: Derived2;
-        var d3: Derived3;
-        var d4: Derived4;
+        var b: Base = undefined as any;
+        var d1: Derived1 = undefined as any;
+        var d2: Derived2 = undefined as any;
+        var d3: Derived3 = undefined as any;
+        var d4: Derived4 = undefined as any;
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
         d1.x;           // Error, isn't accessed through an instance of the enclosing class
@@ -81,11 +81,11 @@ class Derived4 extends Derived2 {
 }
 
 
-var b: Base;
-var d1: Derived1;
-var d2: Derived2;
-var d3: Derived3;
-var d4: Derived4;
+var b: Base = undefined as any;
+var d1: Derived1 = undefined as any;
+var d2: Derived2 = undefined as any;
+var d3: Derived3 = undefined as any;
+var d4: Derived4 = undefined as any;
 
 b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
 d1.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
diff --git a/tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts b/tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts
index b92d29d4d632d..9b0a1505afbb5 100644
--- a/tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts
+++ b/tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts
@@ -1,12 +1,12 @@
 class A {
-    protected x: string;
+    protected x!: string;
     protected f(): string {
         return "hello";
     }
 }
 
 class B extends A {
-    protected y: string;
+    protected y!: string;
     g() {
         var t1 = this.x;
         var t2 = this.f();
@@ -18,19 +18,19 @@ class B extends A {
         var s3 = super.y;    // error
         var s4 = super.z;    // error
 
-        var a: A;
+        var a: A = undefined as any;
         var a1 = a.x;    // error
         var a2 = a.f();  // error
         var a3 = a.y;    // error
         var a4 = a.z;    // error
 
-        var b: B;
+        var b: B = undefined as any;
         var b1 = b.x;
         var b2 = b.f();
         var b3 = b.y;
         var b4 = b.z;    // error
 
-        var c: C;
+        var c: C = undefined as any;
         var c1 = c.x;    // error
         var c2 = c.f();  // error
         var c3 = c.y;    // error
@@ -39,5 +39,5 @@ class B extends A {
 }
 
 class C extends A {
-    protected z: string;
+    protected z!: string;
 }
diff --git a/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassIncludesInheritedMembers.ts b/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassIncludesInheritedMembers.ts
index 297caa3030d78..08e95d434aaf1 100644
--- a/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassIncludesInheritedMembers.ts
+++ b/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassIncludesInheritedMembers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Base {
     a: string;
     b() { }
diff --git a/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity.ts b/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity.ts
index 48c697f5933fe..be384799d9c10 100644
--- a/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity.ts
+++ b/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity.ts
@@ -12,9 +12,9 @@ class E extends D {
     foo(x?: string) { } // ok to add optional parameters
 }
 
-var c: C;
-var d: D;
-var e: E;
+declare var c: C;
+declare var d: D;
+declare var e: E;
 c = e;
 var r = c.foo(1);
 var r2 = e.foo('');
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity2.ts b/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity2.ts
index beff53f06cdf2..b6699050e3375 100644
--- a/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity2.ts
+++ b/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity2.ts
@@ -12,9 +12,9 @@ class E extends D {
     foo(x: number, y?: string) { } // ok to add optional parameters
 }
 
-var c: C;
-var d: D;
-var e: E;
+declare var c: C;
+declare var d: D;
+declare var e: E;
 c = e;
 var r = c.foo(1, 1);
 var r2 = e.foo(1, '');
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity3.ts b/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity3.ts
index 7e9e88c1c9461..d234e93e53343 100644
--- a/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity3.ts
+++ b/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity3.ts
@@ -12,9 +12,9 @@ class E<T> extends D<T> {
     foo(x: T, y?: number) { } // ok to add optional parameters
 }
 
-var c: C<string>;
-var d: D<string>;
-var e: E<string>;
+declare var c: C<string>;
+declare var d: D<string>;
+declare var e: E<string>;
 c = e;
 var r = c.foo('', '');
 var r2 = e.foo('', 1);
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity4.ts b/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity4.ts
index 3fa0cec4318de..e0ffd590430ee 100644
--- a/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity4.ts
+++ b/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity4.ts
@@ -12,9 +12,9 @@ class E extends D {
     public foo(x?: string) { } // ok to add optional parameters
 }
 
-var c: C;
-var d: D;
-var e: E;
+declare var c: C;
+declare var d: D;
+declare var e: E;
 c = e;
 var r = c.foo(1);
 var r2 = e.foo('');
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithAny.ts b/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithAny.ts
index fb649d1d52648..3d38db063aebc 100644
--- a/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithAny.ts
+++ b/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithAny.ts
@@ -49,9 +49,9 @@ class E extends D {
     }
 }
 
-var c: C;
-var d: D;
-var e: E;
+declare var c: C;
+declare var d: D;
+declare var e: E;
 
 c = d;
 c = e;
diff --git a/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny.ts b/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny.ts
index 3d75992cfc437..2bb5b03397e79 100644
--- a/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny.ts
+++ b/tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny.ts
@@ -33,9 +33,9 @@ class E<T extends string> extends D {
     }
 }
 
-var c: C<number>;
-var d: D;
-var e: E<string>;
+declare var c: C<number>;
+declare var d: D;
+declare var e: E<string>;
 
 c = d;
 c = e;
diff --git a/tests/cases/conformance/classes/members/instanceAndStaticMembers/superInStaticMembers1.ts b/tests/cases/conformance/classes/members/instanceAndStaticMembers/superInStaticMembers1.ts
index e716307be1171..6cfde08687620 100644
--- a/tests/cases/conformance/classes/members/instanceAndStaticMembers/superInStaticMembers1.ts
+++ b/tests/cases/conformance/classes/members/instanceAndStaticMembers/superInStaticMembers1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5, es2015, es2021, es2022, esnext
 // @noTypesAndSymbols: true
 
diff --git a/tests/cases/conformance/classes/members/instanceAndStaticMembers/typeOfThisInInstanceMember.ts b/tests/cases/conformance/classes/members/instanceAndStaticMembers/typeOfThisInInstanceMember.ts
index e5f53845282b1..185f8b072ace3 100644
--- a/tests/cases/conformance/classes/members/instanceAndStaticMembers/typeOfThisInInstanceMember.ts
+++ b/tests/cases/conformance/classes/members/instanceAndStaticMembers/typeOfThisInInstanceMember.ts
@@ -16,7 +16,7 @@ class C {
     }
 }
 
-var c: C;
+declare var c: C;
 // all ok
 var r = c.x;
 var ra = c.x.x.x;
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameAccessorsCallExpression.ts b/tests/cases/conformance/classes/members/privateNames/privateNameAccessorsCallExpression.ts
index ce7dae715b6fa..ea5afe9baf7a9 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameAccessorsCallExpression.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameAccessorsCallExpression.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 
 class A {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameBadSuper.ts b/tests/cases/conformance/classes/members/privateNames/privateNameBadSuper.ts
index b3930010db77b..f0b06d6713ee1 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameBadSuper.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameBadSuper.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 class B {};
 class A extends B {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameBadSuperUseDefineForClassFields.ts b/tests/cases/conformance/classes/members/privateNames/privateNameBadSuperUseDefineForClassFields.ts
index bb110342444b3..5326dbbd64d76 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameBadSuperUseDefineForClassFields.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameBadSuperUseDefineForClassFields.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext, es2022
 // @useDefineForClassFields: true
 class B {};
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameComputedPropertyName3.ts b/tests/cases/conformance/classes/members/privateNames/privateNameComputedPropertyName3.ts
index e6639b6bc711e..fe8b9a0565933 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameComputedPropertyName3.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameComputedPropertyName3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext, es2022, es2015
 
 class Foo {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameConstructorSignature.ts b/tests/cases/conformance/classes/members/privateNames/privateNameConstructorSignature.ts
index 9f074b7b6fdd0..bd30223410129 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameConstructorSignature.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameConstructorSignature.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 
 interface D {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameDeclarationMerging.ts b/tests/cases/conformance/classes/members/privateNames/privateNameDeclarationMerging.ts
index 018024073fb32..59827bac6d376 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameDeclarationMerging.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameDeclarationMerging.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 
 class D {};
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameFieldCallExpression.ts b/tests/cases/conformance/classes/members/privateNames/privateNameFieldCallExpression.ts
index 407a59185403e..466a4b79bba86 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameFieldCallExpression.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameFieldCallExpression.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 
 class A {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameFieldInitializer.ts b/tests/cases/conformance/classes/members/privateNames/privateNameFieldInitializer.ts
index decfa7aec78b4..91aa4c78c7410 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameFieldInitializer.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameFieldInitializer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 
 class A {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameFieldsESNext.ts b/tests/cases/conformance/classes/members/privateNames/privateNameFieldsESNext.ts
index 54035233239f1..3c8f644404d0f 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameFieldsESNext.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameFieldsESNext.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext, es2022
 // @useDefineForClassFields: false
 
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameHashCharName.ts b/tests/cases/conformance/classes/members/privateNames/privateNameHashCharName.ts
index 4a076565bfc62..6a2f4e29d7d42 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameHashCharName.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameHashCharName.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 
 #
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameLateSuper.ts b/tests/cases/conformance/classes/members/privateNames/privateNameLateSuper.ts
index 5bc814b9ff87d..73b327e39ccd7 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameLateSuper.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameLateSuper.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 class B {}
 class A extends B {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameLateSuperUseDefineForClassFields.ts b/tests/cases/conformance/classes/members/privateNames/privateNameLateSuperUseDefineForClassFields.ts
index 7cee8f089c632..1789b2c4cc254 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameLateSuperUseDefineForClassFields.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameLateSuperUseDefineForClassFields.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext, es2022
 // @useDefineForClassFields: true
 class B {}
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameMethodCallExpression.ts b/tests/cases/conformance/classes/members/privateNames/privateNameMethodCallExpression.ts
index d76deec97de3e..67f546d04f08e 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameMethodCallExpression.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameMethodCallExpression.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 
 class AA {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameNestedClassFieldShadowing.ts b/tests/cases/conformance/classes/members/privateNames/privateNameNestedClassFieldShadowing.ts
index e7d55345dbeee..45e3ab2f45218 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameNestedClassFieldShadowing.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameNestedClassFieldShadowing.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 
 class Base {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameSetterNoGetter.ts b/tests/cases/conformance/classes/members/privateNames/privateNameSetterNoGetter.ts
index ae0aeda5efd5e..45cc495fcbc71 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameSetterNoGetter.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameSetterNoGetter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 
 const C = class {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameStaticAccessorsCallExpression.ts b/tests/cases/conformance/classes/members/privateNames/privateNameStaticAccessorsCallExpression.ts
index ac5a5ade7e3d2..7e1e370c2a537 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameStaticAccessorsCallExpression.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameStaticAccessorsCallExpression.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 
 class A {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameStaticFieldCallExpression.ts b/tests/cases/conformance/classes/members/privateNames/privateNameStaticFieldCallExpression.ts
index 723a36842c7f7..8ed0021c21eda 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameStaticFieldCallExpression.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameStaticFieldCallExpression.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 
 class A {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameStaticFieldInitializer.ts b/tests/cases/conformance/classes/members/privateNames/privateNameStaticFieldInitializer.ts
index 93763c9608e7d..0f85123fb16a6 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameStaticFieldInitializer.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameStaticFieldInitializer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015, es2022, esnext
 // @useDefineForClassFields: false
 
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameStaticFieldNoInitializer.ts b/tests/cases/conformance/classes/members/privateNames/privateNameStaticFieldNoInitializer.ts
index f596214129e05..1de2045ecd725 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameStaticFieldNoInitializer.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameStaticFieldNoInitializer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015, es2022, esnext
 
 const C = class {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameStaticMethodCallExpression.ts b/tests/cases/conformance/classes/members/privateNames/privateNameStaticMethodCallExpression.ts
index 8205599dc96ab..fa6620870edaf 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameStaticMethodCallExpression.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameStaticMethodCallExpression.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 
 class AA {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNamesInterfaceExtendingClass.ts b/tests/cases/conformance/classes/members/privateNames/privateNamesInterfaceExtendingClass.ts
index c330e117003fe..01f6a8a74894a 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNamesInterfaceExtendingClass.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNamesInterfaceExtendingClass.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 
 class C {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNamesUnique-2.ts b/tests/cases/conformance/classes/members/privateNames/privateNamesUnique-2.ts
index dd79f670e57af..e0cb2da06f63c 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNamesUnique-2.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNamesUnique-2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 // @filename: a.ts
 export class Foo {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNamesUseBeforeDef.ts b/tests/cases/conformance/classes/members/privateNames/privateNamesUseBeforeDef.ts
index c47e709c284f1..604fd439ed28c 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNamesUseBeforeDef.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNamesUseBeforeDef.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 
 class A {
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/accessibilityModifiers.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/accessibilityModifiers.ts
index 43d061f9cf660..d51dd6f91cdff 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/accessibilityModifiers.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/accessibilityModifiers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 
 // No errors
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/autoAccessor11.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/autoAccessor11.ts
index 69b1802417ffe..a1108bdda2d6d 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/autoAccessor11.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/autoAccessor11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2022
 
 class C {
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/canFollowGetSetKeyword.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/canFollowGetSetKeyword.ts
index 6039dedfe306d..d94ad6e55ee5c 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/canFollowGetSetKeyword.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/canFollowGetSetKeyword.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noTypesAndSymbols: true
 class A {
     get
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/defineProperty.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/defineProperty.ts
index 36bdb0b4f3101..3ab2acb61c15d 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/defineProperty.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/defineProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5, esnext
 // @useDefineForClassFields: true
 var x: "p" = "p"
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorLocals.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorLocals.ts
index f620222358ed6..71d6e5a913520 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorLocals.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorLocals.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Initializer expressions for instance member variables are evaluated in the scope of the class constructor body but are not permitted to reference parameters or local variables of the constructor. 
 
 class C {
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts
index 988a45eda78df..82875c7d00ce1 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Initializer expressions for instance member variables are evaluated in the scope of the class constructor body but are not permitted to reference parameters or local variables of the constructor. 
 
 class C {
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithES5.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithES5.ts
index 7704e60c6069b..d6bbb1752f662 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithES5.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 
 class C {
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionOverloadMixingStaticAndInstance.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionOverloadMixingStaticAndInstance.ts
index d573375279310..f979aafd51889 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionOverloadMixingStaticAndInstance.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionOverloadMixingStaticAndInstance.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     foo();
     static foo(); // error
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads.ts
index e9267a2f6e8ef..bed22049ac3a0 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     private foo(x: number);
     private foo(x: number, y: string);
@@ -39,10 +40,10 @@ class D<T> {
 
 }
 
-var c: C;
+declare var c: C;
 var r = c.foo(1); // error
 
-var d: D<number>;
+declare var d: D<number>;
 var r2 = d.foo(2); // error
 
 var r3 = C.foo(1); // error
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicOverloads.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicOverloads.ts
index 9114ae91650a0..f8927c743aec9 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicOverloads.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicOverloads.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     public foo(x: number);
     public foo(x: number, y: string);
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads.ts
index 293db09be14c1..3507a48d545de 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     private foo(x: number);
     public foo(x: number, y: string); // error
@@ -55,8 +56,8 @@ class D<T> {
     protected static baz(x: any, y?: any) { }
 }
 
-var c: C;
+declare var c: C;
 var r = c.foo(1); // error
 
-var d: D<number>;
+declare var d: D<number>;
 var r2 = d.foo(2); // error
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/optionalProperty.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/optionalProperty.ts
index cb563eedf1867..1aec8ffeae4a9 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/optionalProperty.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/optionalProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @useDefineForClassFields: true
 // @noTypesAndSymbols: true
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts
index b6c3b62bbba8d..87352d086683a 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     x: number;
     get x() { // error
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndFunctionWithSameName.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndFunctionWithSameName.ts
index 362d2884a85db..f78d39dc4d9d4 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndFunctionWithSameName.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/propertyAndFunctionWithSameName.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     x: number;
     x() { // error
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts
index 5c098643712d5..2c02bac5c0073 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 class C {
     get x() { return 1; }
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName2.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName2.ts
index e4b639254325d..ba17c07fae585 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName2.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/twoAccessorsWithSameName2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     static get x() { return 1; }
     static get x() { return 1; } // error
diff --git a/tests/cases/conformance/controlFlow/controlFlowForStatement.ts b/tests/cases/conformance/controlFlow/controlFlowForStatement.ts
index d9e46781aa7b5..9699a10f54465 100644
--- a/tests/cases/conformance/controlFlow/controlFlowForStatement.ts
+++ b/tests/cases/conformance/controlFlow/controlFlowForStatement.ts
@@ -1,4 +1,4 @@
-let cond: boolean;
+declare let cond: boolean;
 function a() {
     let x: string | number | boolean;
     for (x = ""; cond; x = 5) {
diff --git a/tests/cases/conformance/controlFlow/typeGuardsNestedAssignments.ts b/tests/cases/conformance/controlFlow/typeGuardsNestedAssignments.ts
index 41e3ffe572e60..9b031015193e7 100644
--- a/tests/cases/conformance/controlFlow/typeGuardsNestedAssignments.ts
+++ b/tests/cases/conformance/controlFlow/typeGuardsNestedAssignments.ts
@@ -1,7 +1,7 @@
 // @strictNullChecks: true
 
 class Foo {
-    x: string;
+    x: string = "";
 }
 
 declare function getFooOrNull(): Foo | null;
diff --git a/tests/cases/conformance/controlFlow/typeGuardsTypeParameters.ts b/tests/cases/conformance/controlFlow/typeGuardsTypeParameters.ts
index 169dbc7a7c8a2..a2bd6ba38a385 100644
--- a/tests/cases/conformance/controlFlow/typeGuardsTypeParameters.ts
+++ b/tests/cases/conformance/controlFlow/typeGuardsTypeParameters.ts
@@ -3,7 +3,7 @@
 // Type guards involving type parameters produce intersection types
 
 class C {
-    prop: string;
+    prop: string = "";
 }
 
 function f1<T>(x: T) {
diff --git a/tests/cases/conformance/declarationEmit/nullPropertyName.ts b/tests/cases/conformance/declarationEmit/nullPropertyName.ts
index fb0b6ae0fb0e2..8e0baf1faa515 100644
--- a/tests/cases/conformance/declarationEmit/nullPropertyName.ts
+++ b/tests/cases/conformance/declarationEmit/nullPropertyName.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 function foo() {}
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts
index 4d7ccc6a82536..c0545f05c9c37 100644
--- a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target:es5
 // @experimentaldecorators: true
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts
index ffbd27136219f..edb86bd521da5 100644
--- a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target:es5
 // @experimentaldecorators: true
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
diff --git a/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts b/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts
index 4e0373ff5d13c..768abd5140e8d 100644
--- a/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts
+++ b/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target:es5
 // @experimentaldecorators: true
 declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod16.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod16.ts
index 400d4fbe5a80a..8d0a4b82a5918 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod16.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod16.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @experimentaldecorators: true
 // @emitdecoratormetadata: true
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod17.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod17.ts
index 1aa25d7f3292c..0e2a4620e2590 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod17.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod17.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @experimentaldecorators: true
 // @emitdecoratormetadata: true
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod18.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod18.ts
index 9417c44c5bac4..eac6295a4991a 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod18.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod18.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @experimentaldecorators: true
 // @emitdecoratormetadata: true
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod19.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod19.ts
index 8f293b31f9063..e42d8876c6f2e 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod19.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod19.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext, es2022, es2015
 // @experimentaldecorators: true
 // @emitdecoratormetadata: true
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts
index b951bd5c8c90a..c65aac9f68f3f 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @experimentaldecorators: true
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts
index 722463b33dab2..3e13ebe4ddfda 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @experimentaldecorators: true
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload2.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload2.ts
index ee5a3f33bf10e..36f780ab115b3 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload2.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @experimentaldecorators: true
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty1.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty1.ts
index 026949fb5b8ec..5a32dcbe922f8 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty1.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @experimentaldecorators: true
 declare function dec(target: any, propertyKey: string): void;
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty10.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty10.ts
index 2b10c0aec0872..703742501bda5 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty10.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @experimentaldecorators: true
 declare function dec(): <T>(target: any, propertyKey: string) => void;
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts
index eb720b20dff85..7503a8d27ca78 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @experimentaldecorators: true
 declare function dec(): <T>(target: any, propertyKey: string) => void;
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty12.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty12.ts
index fb8841df243b4..fd2551c5c63e9 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty12.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @experimentaldecorators: true
 // @emitdecoratormetadata: true
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty13.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty13.ts
index 95977876681ac..5a35801a9cb0c 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty13.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES2015
 // @experimentaldecorators: true
 declare function dec(target: any, propertyKey: string, desc: PropertyDescriptor): void;
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty2.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty2.ts
index 01af3e6ee810e..c72735638f979 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty2.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @experimentaldecorators: true
 declare function dec(target: any, propertyKey: string): void;
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts
index 55fd6fe93e1e8..d3937c8c6b95e 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @experimentaldecorators: true
 declare function dec(target: any, propertyKey: string): void;
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts
index 412a592ece1a6..6c2512da30039 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @experimentaldecorators: true
 declare function dec(target: Function): void;
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts
index 0e11e103ce746..00f762e7a4e88 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @experimentaldecorators: true
 declare function dec(target: Function, propertyKey: string | symbol, paramIndex: number): void;
diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnImportEquals2.ts b/tests/cases/conformance/decorators/invalid/decoratorOnImportEquals2.ts
index 1b99e0e186303..5cdff2c8b008b 100644
--- a/tests/cases/conformance/decorators/invalid/decoratorOnImportEquals2.ts
+++ b/tests/cases/conformance/decorators/invalid/decoratorOnImportEquals2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @Filename: decoratorOnImportEquals2_0.ts
 export var X;
diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnUsing.ts b/tests/cases/conformance/decorators/invalid/decoratorOnUsing.ts
index 815da8de4de27..c5777c92be9c8 100644
--- a/tests/cases/conformance/decorators/invalid/decoratorOnUsing.ts
+++ b/tests/cases/conformance/decorators/invalid/decoratorOnUsing.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 declare function dec<T>(target: T): T;
 
diff --git a/tests/cases/conformance/decorators/missingDecoratorType.ts b/tests/cases/conformance/decorators/missingDecoratorType.ts
index 9b8cdd276f22e..7980f81c87788 100644
--- a/tests/cases/conformance/decorators/missingDecoratorType.ts
+++ b/tests/cases/conformance/decorators/missingDecoratorType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 // @experimentaldecorators: true
 // @noLib: true
diff --git a/tests/cases/conformance/directives/multiline.tsx b/tests/cases/conformance/directives/multiline.tsx
index 740e9936f4d3a..af085f333c52d 100644
--- a/tests/cases/conformance/directives/multiline.tsx
+++ b/tests/cases/conformance/directives/multiline.tsx
@@ -15,7 +15,7 @@ texts.push("100");
 
 // @filename: b.tsx
 // @jsx: react
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 import * as React from "react";
 
 export function MyComponent(props: { foo: string }) {
diff --git a/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.classMethods.es2015.ts b/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.classMethods.es2015.ts
index fe1bc56dd1550..6b81dd93ddc58 100644
--- a/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.classMethods.es2015.ts
+++ b/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.classMethods.es2015.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 // @lib: esnext
 // @filename: C1.ts
diff --git a/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2015.ts b/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2015.ts
index 280bda810d0b8..fcb48c2044451 100644
--- a/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2015.ts
+++ b/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2015.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 // @lib: esnext
 // @filename: F1.ts
diff --git a/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2015.ts b/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2015.ts
index d90e14a19d110..ad0a61d624d17 100644
--- a/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2015.ts
+++ b/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2015.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 // @lib: esnext
 // @filename: F1.ts
diff --git a/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2015.ts b/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2015.ts
index 1998b8674a37e..e0bbb070a66ff 100644
--- a/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2015.ts
+++ b/tests/cases/conformance/emitter/es2015/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2015.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 // @lib: esnext
 // @filename: O1.ts
diff --git a/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.classMethods.es2018.ts b/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.classMethods.es2018.ts
index 6e7dc0622bcb1..db5ff182993f6 100644
--- a/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.classMethods.es2018.ts
+++ b/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.classMethods.es2018.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2018
 // @lib: esnext
 // @filename: C1.ts
diff --git a/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2018.ts b/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2018.ts
index ebeee3e4e270c..b8b9f7e58b150 100644
--- a/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2018.ts
+++ b/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2018.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2018
 // @lib: esnext
 // @filename: F1.ts
diff --git a/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2018.ts b/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2018.ts
index 79bb5a3d25520..45519c9ffaa24 100644
--- a/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2018.ts
+++ b/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2018.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2018
 // @lib: esnext
 // @filename: F1.ts
diff --git a/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2018.ts b/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2018.ts
index d5e1bc7b1f844..96826d10e5c41 100644
--- a/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2018.ts
+++ b/tests/cases/conformance/emitter/es2018/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2018.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2018
 // @lib: esnext
 // @filename: O1.ts
diff --git a/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.classMethods.es5.ts b/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.classMethods.es5.ts
index 0bd75b03649e0..6ce01831bf801 100644
--- a/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.classMethods.es5.ts
+++ b/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.classMethods.es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @lib: esnext
 // @filename: C1.ts
diff --git a/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es5.ts b/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es5.ts
index f7b5caf181c97..038f4fef79209 100644
--- a/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es5.ts
+++ b/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @lib: esnext
 // @filename: F1.ts
diff --git a/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionExpressions.es5.ts b/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionExpressions.es5.ts
index cc756a2f4adf6..7b1b585b11eae 100644
--- a/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionExpressions.es5.ts
+++ b/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionExpressions.es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @lib: esnext
 // @filename: F1.ts
diff --git a/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es5.ts b/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es5.ts
index 8c33be18d1f9e..a47cf524cb0ad 100644
--- a/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es5.ts
+++ b/tests/cases/conformance/emitter/es5/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @lib: esnext
 // @filename: O1.ts
diff --git a/tests/cases/conformance/enums/awaitAndYield.ts b/tests/cases/conformance/enums/awaitAndYield.ts
index c6b477f3929b7..41d683b297343 100644
--- a/tests/cases/conformance/enums/awaitAndYield.ts
+++ b/tests/cases/conformance/enums/awaitAndYield.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES2019
 // @noTypesAndSymbols: true
 async function* test(x: Promise<number>) {
diff --git a/tests/cases/conformance/enums/enumBasics.ts b/tests/cases/conformance/enums/enumBasics.ts
index 0a0f9d920cb0e..f4ddc661a6b8d 100644
--- a/tests/cases/conformance/enums/enumBasics.ts
+++ b/tests/cases/conformance/enums/enumBasics.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Enum without initializers have first member = 0 and successive members = N + 1
 enum E1 {
     A,
diff --git a/tests/cases/conformance/es2019/globalThisUnknown.ts b/tests/cases/conformance/es2019/globalThisUnknown.ts
index b1ae4224e1e29..b4cecd0f1f8b0 100644
--- a/tests/cases/conformance/es2019/globalThisUnknown.ts
+++ b/tests/cases/conformance/es2019/globalThisUnknown.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare let win: Window & typeof globalThis;
 
 // this access should be an error
diff --git a/tests/cases/conformance/es2021/logicalAssignment/logicalAssignment10.ts b/tests/cases/conformance/es2021/logicalAssignment/logicalAssignment10.ts
index 3a83ab8085ae7..c9e0eb78e0a87 100644
--- a/tests/cases/conformance/es2021/logicalAssignment/logicalAssignment10.ts
+++ b/tests/cases/conformance/es2021/logicalAssignment/logicalAssignment10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext, es2021, es2020, es2015
 
 var count = 0;
diff --git a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit13.ts b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit13.ts
index 4e65648acca4e..b2c727d91d312 100644
--- a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit13.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 //@declaration: true
 class C {
diff --git a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit3.ts b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit3.ts
index 553aa871c38c3..a62d16de9f5af 100644
--- a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit3.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 //@declaration: true
 class C {
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty10.ts b/tests/cases/conformance/es6/Symbols/symbolProperty10.ts
index 0f63356eaf686..a35f578e90f2f 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty10.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
     [Symbol.iterator]: { x; y };
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty11.ts b/tests/cases/conformance/es6/Symbols/symbolProperty11.ts
index 1377970613ddf..9196e609f3afc 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty11.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C { }
 interface I {
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty12.ts b/tests/cases/conformance/es6/Symbols/symbolProperty12.ts
index 5a835a34b629f..e0f905ab9b825 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty12.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
     private [Symbol.iterator]: { x };
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty13.ts b/tests/cases/conformance/es6/Symbols/symbolProperty13.ts
index 4b5023e1d0655..c4535f1eafb21 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty13.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
     [Symbol.iterator]: { x; y };
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty14.ts b/tests/cases/conformance/es6/Symbols/symbolProperty14.ts
index 0109ec3be251e..098061d6ab312 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty14.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty14.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
     [Symbol.iterator]: { x; y };
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty15.ts b/tests/cases/conformance/es6/Symbols/symbolProperty15.ts
index 3ec6c6ecc7a9a..3b4acf21b737d 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty15.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty15.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C { }
 interface I {
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty16.ts b/tests/cases/conformance/es6/Symbols/symbolProperty16.ts
index 2b3a976df9883..f52a040d6a74f 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty16.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty16.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
     private [Symbol.iterator]: { x };
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty17.ts b/tests/cases/conformance/es6/Symbols/symbolProperty17.ts
index 737059d0e3bcf..7bd1bf9a03a9b 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty17.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty17.ts
@@ -5,5 +5,5 @@ interface I {
     "__@iterator": string;
 }
 
-var i: I;
+declare var i: I;
 var it = i[Symbol.iterator];
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty19.ts b/tests/cases/conformance/es6/Symbols/symbolProperty19.ts
index df9b99f5ca427..481ffccd7f808 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty19.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty19.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 var i = {
     [Symbol.iterator]: { p: null },
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty39.ts b/tests/cases/conformance/es6/Symbols/symbolProperty39.ts
index af3a95eb155ab..bc55c5c32b987 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty39.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty39.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
     [Symbol.iterator](x: string): string;
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty40.ts b/tests/cases/conformance/es6/Symbols/symbolProperty40.ts
index 91fd953a4d77a..41fd894d0c05b 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty40.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty40.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
     [Symbol.iterator](x: string): string;
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty41.ts b/tests/cases/conformance/es6/Symbols/symbolProperty41.ts
index 9c9583264cd7f..476524fe3122f 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty41.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty41.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
     [Symbol.iterator](x: string): { x: string };
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty42.ts b/tests/cases/conformance/es6/Symbols/symbolProperty42.ts
index 79fbce7bb90cd..fa71ee0b6a287 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty42.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty42.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
     [Symbol.iterator](x: string): string;
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty48.ts b/tests/cases/conformance/es6/Symbols/symbolProperty48.ts
index b8d63f74fe8c2..34780ae8914b2 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty48.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty48.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 namespace M {
     var Symbol;
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty49.ts b/tests/cases/conformance/es6/Symbols/symbolProperty49.ts
index aa1ae1290c9a1..fe637df51775c 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty49.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty49.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 namespace M {
     export var Symbol;
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty56.ts b/tests/cases/conformance/es6/Symbols/symbolProperty56.ts
index a77c88a563752..7937bf3f2ce0d 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty56.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty56.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 var obj = {
     [Symbol.iterator]: 0
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty57.ts b/tests/cases/conformance/es6/Symbols/symbolProperty57.ts
index b60c18a05ee47..dc03bf0f5b17f 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty57.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty57.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 var obj = {
     [Symbol.iterator]: 0
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty8.ts b/tests/cases/conformance/es6/Symbols/symbolProperty8.ts
index 19c6583777ea5..c77acf58e4e23 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty8.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 interface I {
     [Symbol.unscopables]: number;
diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty9.ts b/tests/cases/conformance/es6/Symbols/symbolProperty9.ts
index 33ffcb5ee2501..c1836c501bfc1 100644
--- a/tests/cases/conformance/es6/Symbols/symbolProperty9.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolProperty9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
     [Symbol.iterator]: { x; y };
diff --git a/tests/cases/conformance/es6/Symbols/symbolType14.ts b/tests/cases/conformance/es6/Symbols/symbolType14.ts
index c20a8be874b97..f59762296f053 100644
--- a/tests/cases/conformance/es6/Symbols/symbolType14.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolType14.ts
@@ -1,2 +1,3 @@
+// @strict: false
 //@target: ES6
 new Symbol();
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/Symbols/symbolType15.ts b/tests/cases/conformance/es6/Symbols/symbolType15.ts
index 22f1f9662c0ed..9ac43e9d200ba 100644
--- a/tests/cases/conformance/es6/Symbols/symbolType15.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolType15.ts
@@ -1,5 +1,5 @@
 //@target: ES6
-var sym: symbol;
+declare var sym: symbol;
 var symObj: Symbol;
 
 symObj = sym;
diff --git a/tests/cases/conformance/es6/Symbols/symbolType17.ts b/tests/cases/conformance/es6/Symbols/symbolType17.ts
index 95824f1794bd7..b26a20b356301 100644
--- a/tests/cases/conformance/es6/Symbols/symbolType17.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolType17.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 interface Foo { prop }
 var x: symbol | Foo;
diff --git a/tests/cases/conformance/es6/Symbols/symbolType18.ts b/tests/cases/conformance/es6/Symbols/symbolType18.ts
index caa841717371b..880770f95044a 100644
--- a/tests/cases/conformance/es6/Symbols/symbolType18.ts
+++ b/tests/cases/conformance/es6/Symbols/symbolType18.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 interface Foo { prop }
 var x: symbol | Foo;
diff --git a/tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts b/tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts
index 6b932ded4400c..10b5c64d3e2a8 100644
--- a/tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts
+++ b/tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var f1 = ()
     => { }
 var f2 = (x: string, y: string) /*
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames11_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames11_ES5.ts
index 33288184b16d6..e5c1e3ed79e45 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames11_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames11_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 var s: string;
 var n: number;
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames11_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames11_ES6.ts
index d41c56fe953ed..c981a00628d3c 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames11_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames11_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 var s: string;
 var n: number;
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames16_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames16_ES5.ts
index 01204a1e61949..f42ec5220bffa 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames16_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames16_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 var s: string;
 var n: number;
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames16_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames16_ES6.ts
index c42e6e97177e5..fab59d89ae6bd 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames16_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames16_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 var s: string;
 var n: number;
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames17_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames17_ES5.ts
index e52067cc7f42e..643a9a846a1e1 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames17_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames17_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 var b: boolean;
 class C {
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames17_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames17_ES6.ts
index d795b527d064d..b9610d6c81893 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames17_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames17_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 var b: boolean;
 class C {
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames20_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames20_ES5.ts
index 6cff3715d83a9..6baf229c2d43f 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames20_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames20_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 var obj = {
     [this.bar]: 0
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames20_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames20_ES6.ts
index d31f63d2e87f8..578b7627be739 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames20_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames20_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 var obj = {
     [this.bar]: 0
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES5.ts
index 7c2517cd5145a..7d72d1d233442 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 var methodName = "method";
 var accessorName = "accessor";
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES6.ts
index c63ec81d4e64c..2e640fa5935eb 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 var methodName = "method";
 var accessorName = "accessor";
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES5.ts
index 95099715ad820..694737043885f 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES6.ts
index 36c4e91be4881..a0405cd209e58 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames37_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames37_ES5.ts
index cb931fc31d620..096ee4edd6032 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames37_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames37_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames37_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames37_ES6.ts
index 09fe6235a1c11..d63f1813a0020 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames37_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames37_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES5.ts
index 5ea07aa1605d8..49cd8e6d7ee19 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES6.ts
index 9054979dbd816..57ea723d26421 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES5.ts
index 929332c5d32eb..fcdacbe09ba09 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES6.ts
index f8d4d2a01074a..337a0ef362906 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES5.ts
index 1f34f9ad28728..ea6cc80a5edb6 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 var id;
 class C {
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts
index 45db2c02fe259..bd50abe6d8b51 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 var id;
 class C {
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts
index bba1068fef3b6..1fc31336f198a 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts
index 94d473193d9b9..1753352ba45c1 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames41_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames41_ES5.ts
index 1e8ed7d6cd1ca..0cae4b439d577 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames41_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames41_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames41_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames41_ES6.ts
index a376debec564d..16d9252c8879a 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames41_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames41_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES5.ts
index fc181d5a54839..baf73448b638b 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts
index ded6cb28ce76e..4e21f8ef4ec2e 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES5.ts
index c130692c11827..901ff61a4e689 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES6.ts
index 2502827399742..d3b5ae7973a98 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES5.ts
index 4c9422ed44e26..3c2368c42c476 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES6.ts
index 04c4ad5ed5c36..f73a44d96655a 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts
index c1eb09275c547..fc28430e78587 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts
index e6e058f24abd7..4e8f7dc5f1322 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 class Foo { x }
 class Foo2 { x; y }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames49_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames49_ES5.ts
index 611d6a7d30fca..1bab0a038116b 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames49_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames49_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 var x = {
     p1: 10,
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames49_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames49_ES6.ts
index 58f97a80feb95..1e82334c5342d 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames49_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames49_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 
 var x = {
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames50_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames50_ES5.ts
index f7411e7cb4f78..296ef42c40da4 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames50_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames50_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 var x = {
     p1: 10,
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames50_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames50_ES6.ts
index c599477c2e251..b08aaa25475dd 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames50_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames50_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 
 var x = {
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES5.ts
index 1d467245fb2ce..c4f5d879a17dd 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES5.ts
@@ -1,6 +1,6 @@
 function f<T, K extends keyof T>() {
-    var t: T;
-    var k: K;
+    var t!: T;
+    var k!: K;
     var v = {
         [t]: 0,
         [k]: 1
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES6.ts
index ca209996c4c3c..84a51af1840b6 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES6.ts
@@ -1,7 +1,7 @@
 // @target: es6
 function f<T, K extends keyof T>() {
-    var t: T;
-    var k: K;
+    var t!: T;
+    var k!: K;
     var v = {
         [t]: 0,
         [k]: 1
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES5.ts
index e9d7d6ffab497..25358d08fe6a4 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES5.ts
@@ -1,5 +1,6 @@
+// @strict: false
 // @target: es5
-var b: boolean;
+declare var b: boolean;
 var v = {
     [b]: 0,
     [true]: 1,
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES6.ts
index 590f819c4e4cc..d258c0629f03d 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES6.ts
@@ -1,5 +1,6 @@
+// @strict: false
 // @target: es6
-var b: boolean;
+declare var b: boolean;
 var v = {
     [b]: 0,
     [true]: 1,
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES5.ts
index 0521873d70ca0..07c78ed0e5fbb 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES5.ts
@@ -1,7 +1,7 @@
 // @target: es5
-var p1: number | string;
-var p2: number | number[];
-var p3: string | boolean;
+declare var p1: number | string;
+declare var p2: number | number[];
+declare var p3: string | boolean;
 var v = {
     [p1]: 0,
     [p2]: 1,
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES6.ts
index b21b76b03f2cf..7bfd950e96a05 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES6.ts
@@ -1,7 +1,7 @@
 // @target: es6
-var p1: number | string;
-var p2: number | number[];
-var p3: string | boolean;
+declare var p1: number | string;
+declare var p2: number | number[];
+declare var p3: string | boolean;
 var v = {
     [p1]: 0,
     [p2]: 1,
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES5.ts
index 0723552edc2ec..7282afcc519c9 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES5.ts
@@ -1,7 +1,7 @@
 // @target: es5
 function f<T, U extends string>() {
-    var t: T;
-    var u: U;
+    var t!: T;
+    var u!: U;
     var v = {
         [t]: 0,
         [u]: 1
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES6.ts
index 95b6398a62d71..185af9e63a05b 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES6.ts
@@ -1,7 +1,7 @@
 // @target: es6
 function f<T, U extends string>() {
-    var t: T;
-    var u: U;
+    var t!: T;
+    var u!: U;
     var v = {
         [t]: 0,
         [u]: 1
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames9_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames9_ES5.ts
index e1c675d95e434..8d5857870ce24 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames9_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames9_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 function f(s: string): string;
 function f(n: number): number;
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames9_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames9_ES6.ts
index 21dc4eaa1e9e0..05520f10d1c3a 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames9_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames9_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 function f(s: string): string;
 function f(n: number): number;
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES5.ts
index 1091304b6b2af..72c29d742a170 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @declaration: true
 class C {
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES6.ts
index 100c68653c368..5c8894f4b3322 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 // @declaration: true
 class C {
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES5.ts
index b30b8e1306295..7e7758ab1ad1a 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @declaration: true
 class C {
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES6.ts
index 2f353b854cdfb..07fbe1e10b592 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 // @declaration: true
 class C {
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES5.ts
index eb12ea9b471b4..02d01294445b2 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @declaration: true
 var v = {
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES6.ts
index 3f24075abbfb8..366904c3f9bc0 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 // @declaration: true
 var v = {
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads_ES5.ts
index a025a074e3129..c59c7c48bf555 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads_ES5.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads_ES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 var methodName = "method";
 var accessorName = "accessor";
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads_ES6.ts
index 4d6fe09b80a00..9b2b16003c689 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads_ES6.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads_ES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 var methodName = "method";
 var accessorName = "accessor";
diff --git a/tests/cases/conformance/es6/decorators/class/property/decoratorOnClassProperty1.es6.ts b/tests/cases/conformance/es6/decorators/class/property/decoratorOnClassProperty1.es6.ts
index 4f54960d2bcd8..ae2a253993776 100644
--- a/tests/cases/conformance/es6/decorators/class/property/decoratorOnClassProperty1.es6.ts
+++ b/tests/cases/conformance/es6/decorators/class/property/decoratorOnClassProperty1.es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES2015
 // @module: ES2015
 // @experimentaldecorators: true
diff --git a/tests/cases/conformance/es6/destructuring/declarationInAmbientContext.ts b/tests/cases/conformance/es6/destructuring/declarationInAmbientContext.ts
index a3db3753de489..43f038308a5f5 100644
--- a/tests/cases/conformance/es6/destructuring/declarationInAmbientContext.ts
+++ b/tests/cases/conformance/es6/destructuring/declarationInAmbientContext.ts
@@ -1,2 +1,3 @@
+// @strict: false
 declare var [a, b];  // Error, destructuring declaration not allowed in ambient context
 declare var {c, d};  // Error, destructuring declaration not allowed in ambient context
diff --git a/tests/cases/conformance/es6/destructuring/declarationWithNoInitializer.ts b/tests/cases/conformance/es6/destructuring/declarationWithNoInitializer.ts
index 1fb8b07e585eb..727d0b35765ad 100644
--- a/tests/cases/conformance/es6/destructuring/declarationWithNoInitializer.ts
+++ b/tests/cases/conformance/es6/destructuring/declarationWithNoInitializer.ts
@@ -1,2 +1,3 @@
+// @strict: false
 var [a, b];          // Error, no initializer
 var {c, d};          // Error, no initializer
diff --git a/tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts b/tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts
index a5e663640fbe5..2706432eb126a 100644
--- a/tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts
+++ b/tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts
@@ -1,11 +1,12 @@
+// @strict: false
 function f0() {
     var [] = [1, "hello"];
     var [x] = [1, "hello"];
     var [x, y] = [1, "hello"];
     var [x, y, z] = [1, "hello"];
     var [,, x] = [0, 1, 2];
-    var x: number;
-    var y: string;
+    var x!: number;
+    var y!: string;
 }
 
 function f1() {
@@ -13,9 +14,9 @@ function f1() {
     var [x] = a;
     var [x, y] = a;
     var [x, y, z] = a;
-    var x: number | string;
-    var y: number | string;
-    var z: number | string;
+    var x!: number | string;
+    var y!: number | string;
+    var z!: number | string;
 }
 
 function f2() {
@@ -23,39 +24,39 @@ function f2() {
     var { x } = { x: 5, y: "hello" };     // Error, no y in target
     var { y } = { x: 5, y: "hello" };     // Error, no x in target
     var { x, y } = { x: 5, y: "hello" };
-    var x: number;
-    var y: string;
+    var x!: number;
+    var y!: string;
     var { x: a } = { x: 5, y: "hello" };  // Error, no y in target
     var { y: b } = { x: 5, y: "hello" };  // Error, no x in target
     var { x: a, y: b } = { x: 5, y: "hello" };
-    var a: number;
-    var b: string;
+    var a!: number;
+    var b!: string;
 }
 
 function f3() {
     var [x, [y, [z]]] = [1, ["hello", [true]]];
-    var x: number;
-    var y: string;
-    var z: boolean;
+    var x!: number;
+    var y!: string;
+    var z!: boolean;
 }
 
 function f4() {
     var { a: x, b: { a: y, b: { a: z }}} = { a: 1, b: { a: "hello", b: { a: true } } };
-    var x: number;
-    var y: string;
-    var z: boolean;
+    var x!: number;
+    var y!: string;
+    var z!: boolean;
 }
 
 function f6() {
     var [x = 0, y = ""] = [1, "hello"];
-    var x: number;
-    var y: string;
+    var x!: number;
+    var y!: string;
 }
 
 function f7() {
     var [x = 0, y = 1] = [1, "hello"];  // Error, initializer for y must be string
-    var x: number;
-    var y: string;
+    var x!: number;
+    var y!: string;
 }
 
 function f8() {
@@ -79,16 +80,16 @@ function f11() {
     var { 0: a, 1: b } = { 0: 10, 1: "hello" };
     var { "<": a, ">": b } = { "<": 10, ">": "hello" };
     var { 0: a, 1: b } = [10, "hello"];
-    var a: number;
-    var b: string;
+    var a!: number;
+    var b!: string;
 }
 
 function f12() {
     var [a, [b, { x, y: c }] = ["abc", { x: 10, y: false }]] = [1, ["hello", { x: 5, y: true }]];
-    var a: number;
-    var b: string;
-    var x: number;
-    var c: boolean;
+    var a!: number;
+    var b!: string;
+    var x!: number;
+    var c!: boolean;
 }
 
 function f13() {
@@ -97,9 +98,9 @@ function f13() {
 }
 
 function f14([a = 1, [b = "hello", { x, y: c = false }]]) {
-    var a: number;
-    var b: string;
-    var c: boolean;
+    var a!: number;
+    var b!: string;
+    var c!: boolean;
 }
 f14([2, ["abc", { x: 0, y: true }]]);
 f14([2, ["abc", { x: 0 }]]);
@@ -129,9 +130,9 @@ f17({ c: true });
 f17(f15());
 
 function f18() {
-    var a: number;
-    var b: string;
-    var aa: number[];
+    var a!: number;
+    var b!: string;
+    var aa!: number[];
     ({ a, b } = { a, b });
     ({ a, b } = { b, a });
     [aa[0], b] = [a, b];
@@ -149,13 +150,13 @@ function f19() {
 }
 
 function f20(v: [number, number, number]) {
-    var x: number;
-    var y: number;
-    var z: number;
-    var a0: [];
-    var a1: [number];
-    var a2: [number, number];
-    var a3: [number, number, number];
+    var x!: number;
+    var y!: number;
+    var z!: number;
+    var a0!: [];
+    var a1!: [number];
+    var a2!: [number, number];
+    var a3!: [number, number, number];
     var [...a3] = v;
     var [x, ...a2] = v;
     var [x, y, ...a1] = v;
@@ -167,13 +168,13 @@ function f20(v: [number, number, number]) {
 }
 
 function f21(v: [number, string, boolean]) {
-    var x: number;
-    var y: string;
-    var z: boolean;
-    var a0: [number, string, boolean];
-    var a1: [string, boolean];
-    var a2: [boolean];
-    var a3: [];
+    var x!: number;
+    var y!: string;
+    var z!: boolean;
+    var a0!: [number, string, boolean];
+    var a1!: [string, boolean];
+    var a2!: [boolean];
+    var a3!: [];
     var [...a0] = v;
     var [x, ...a1] = v;
     var [x, y, ...a2] = v;
diff --git a/tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment3.ts b/tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment3.ts
index 243a297ed4381..1e1e9003789bd 100644
--- a/tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment3.ts
+++ b/tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 const [a, b = a] = [1]; // ok
 const [c, d = c, e = e] = [1]; // error for e = e
 const [f, g = f, h = i, i = f] = [1]; // error for h = i
diff --git a/tests/cases/conformance/es6/destructuring/destructuringCatch.ts b/tests/cases/conformance/es6/destructuring/destructuringCatch.ts
index 31afd672084d9..dc2b18e94a31a 100644
--- a/tests/cases/conformance/es6/destructuring/destructuringCatch.ts
+++ b/tests/cases/conformance/es6/destructuring/destructuringCatch.ts
@@ -1,4 +1,5 @@
 // @noImplicitAny: true
+// @useUnknownInCatchVariables: false
 
 try {
     throw [0, 1];
diff --git a/tests/cases/conformance/es6/destructuring/destructuringInFunctionType.ts b/tests/cases/conformance/es6/destructuring/destructuringInFunctionType.ts
index 51333b1ca5333..c034fe47ad51b 100644
--- a/tests/cases/conformance/es6/destructuring/destructuringInFunctionType.ts
+++ b/tests/cases/conformance/es6/destructuring/destructuringInFunctionType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 interface a { a }
diff --git a/tests/cases/conformance/es6/destructuring/destructuringWithLiteralInitializers.ts b/tests/cases/conformance/es6/destructuring/destructuringWithLiteralInitializers.ts
index 17de6dd28583a..77a06f8f30d22 100644
--- a/tests/cases/conformance/es6/destructuring/destructuringWithLiteralInitializers.ts
+++ b/tests/cases/conformance/es6/destructuring/destructuringWithLiteralInitializers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // (arg: { x: any, y: any }) => void
 function f1({ x, y }) { }
 f1({ x: 1, y: 1 });
diff --git a/tests/cases/conformance/es6/destructuring/emptyArrayBindingPatternParameter02.ts b/tests/cases/conformance/es6/destructuring/emptyArrayBindingPatternParameter02.ts
index e9e99c6d0eb4a..04d4b74a372f0 100644
--- a/tests/cases/conformance/es6/destructuring/emptyArrayBindingPatternParameter02.ts
+++ b/tests/cases/conformance/es6/destructuring/emptyArrayBindingPatternParameter02.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 function f(a, []) {
diff --git a/tests/cases/conformance/es6/destructuring/emptyArrayBindingPatternParameter03.ts b/tests/cases/conformance/es6/destructuring/emptyArrayBindingPatternParameter03.ts
index e9e99c6d0eb4a..04d4b74a372f0 100644
--- a/tests/cases/conformance/es6/destructuring/emptyArrayBindingPatternParameter03.ts
+++ b/tests/cases/conformance/es6/destructuring/emptyArrayBindingPatternParameter03.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 function f(a, []) {
diff --git a/tests/cases/conformance/es6/destructuring/emptyObjectBindingPatternParameter02.ts b/tests/cases/conformance/es6/destructuring/emptyObjectBindingPatternParameter02.ts
index 79d026eac9ec9..c42dd50f488a2 100644
--- a/tests/cases/conformance/es6/destructuring/emptyObjectBindingPatternParameter02.ts
+++ b/tests/cases/conformance/es6/destructuring/emptyObjectBindingPatternParameter02.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 function f(a, {}) {
diff --git a/tests/cases/conformance/es6/destructuring/emptyObjectBindingPatternParameter03.ts b/tests/cases/conformance/es6/destructuring/emptyObjectBindingPatternParameter03.ts
index c5d51b20cfa9a..149c4b7035c35 100644
--- a/tests/cases/conformance/es6/destructuring/emptyObjectBindingPatternParameter03.ts
+++ b/tests/cases/conformance/es6/destructuring/emptyObjectBindingPatternParameter03.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 function f({}, a) {
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern10.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern10.ts
index 591cdd2b6a57c..1d1e036433ee2 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern10.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern11.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern11.ts
index 83ab94decec74..5f8ec0daf9f3c 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern11.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern12.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern12.ts
index 079eb25df4a75..d88a8580f233f 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern12.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern13.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern13.ts
index f4909547e2656..28f7778ff3988 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern13.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern14.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern14.ts
index 976c5148232e2..12b68205ea80d 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern14.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern14.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern15.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern15.ts
index ecc686b634a52..db3a6c3927f42 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern15.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern15.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts
index ba2c74681fe53..2978ff96c9d23 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern16.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 function fun(...[a, b]: [Bar, Bar][]) { }
 fun(...new FooIteratorIterator);
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts
index b81114cab2359..8acec1991c2eb 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern17.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern18.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern18.ts
index a03713037d62b..3fe846f449720 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern18.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern18.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern19.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern19.ts
index 32024e83b1b8a..9d522ed812267 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern19.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern19.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern20.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern20.ts
index 6a0e9126734d4..5699956f6d221 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern20.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern20.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern25.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern25.ts
index a47edb4e98761..a648256397256 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern25.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern25.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 function takeFirstTwoEntries(...[[k1, v1], [k2, v2]]) { }
 takeFirstTwoEntries(new Map([["", 0], ["hello", 1]]));
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern3.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern3.ts
index ff63aa7417959..bf2dd83e2027b 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern3.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern30.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern30.ts
index 075ff3fd46793..1bfef44b685dc 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern30.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern30.ts
@@ -1,2 +1,3 @@
+// @strict: false
 //@target: ES6
 const [[k1, v1], [k2, v2]] = new Map([["", true], ["hello", true]])
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern4.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern4.ts
index b5aef9003b134..aeda5f6e05742 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern4.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern5.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern5.ts
index a3911b1f5efc6..ecc1a69c01450 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern5.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern6.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern6.ts
index 057b9aeaffedf..00148faa0570e 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern6.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern7.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern7.ts
index 965b715767072..af22dc9327d2d 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern7.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern8.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern8.ts
index 5638b4c49c69b..c3b99d93b76fa 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern8.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class Bar { x }
 class Foo extends Bar { y }
diff --git a/tests/cases/conformance/es6/destructuring/iterableArrayPattern9.ts b/tests/cases/conformance/es6/destructuring/iterableArrayPattern9.ts
index 1573c55ca8e92..6c728b5c6aa42 100644
--- a/tests/cases/conformance/es6/destructuring/iterableArrayPattern9.ts
+++ b/tests/cases/conformance/es6/destructuring/iterableArrayPattern9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 function fun([a, b] = new FooIterator) { }
 class Bar { x }
diff --git a/tests/cases/conformance/es6/destructuring/restElementWithInitializer1.ts b/tests/cases/conformance/es6/destructuring/restElementWithInitializer1.ts
index 7357e36cc05c2..069f874330bbc 100644
--- a/tests/cases/conformance/es6/destructuring/restElementWithInitializer1.ts
+++ b/tests/cases/conformance/es6/destructuring/restElementWithInitializer1.ts
@@ -1,2 +1,2 @@
-var a: number[];
+declare var a: number[];
 var [...x = a] = a;  // Error, rest element cannot have initializer
diff --git a/tests/cases/conformance/es6/destructuring/restElementWithInitializer2.ts b/tests/cases/conformance/es6/destructuring/restElementWithInitializer2.ts
index dc41aacf0b935..032ff2a32e6be 100644
--- a/tests/cases/conformance/es6/destructuring/restElementWithInitializer2.ts
+++ b/tests/cases/conformance/es6/destructuring/restElementWithInitializer2.ts
@@ -1,3 +1,3 @@
-var a: number[];
+declare var a: number[];
 var x: number[];
 [...x = a] = a;  // Error, rest element cannot have initializer
diff --git a/tests/cases/conformance/es6/destructuring/restElementWithNullInitializer.ts b/tests/cases/conformance/es6/destructuring/restElementWithNullInitializer.ts
index 1b03c533e7d4e..7090c0d316536 100644
--- a/tests/cases/conformance/es6/destructuring/restElementWithNullInitializer.ts
+++ b/tests/cases/conformance/es6/destructuring/restElementWithNullInitializer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo1([...r] = null) {
 }
 
diff --git a/tests/cases/conformance/es6/for-ofStatements/for-of29.ts b/tests/cases/conformance/es6/for-ofStatements/for-of29.ts
index 8df83db158808..7dd18a4d323a1 100644
--- a/tests/cases/conformance/es6/for-ofStatements/for-of29.ts
+++ b/tests/cases/conformance/es6/for-ofStatements/for-of29.ts
@@ -1,5 +1,5 @@
 //@target: ES6
-var iterableWithOptionalIterator: {
+declare var iterableWithOptionalIterator: {
     [Symbol.iterator]?(): Iterator<string>
 };
 
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts
index 42da7c8ff1cfa..2e027bbf90072 100644
--- a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts
@@ -1,3 +1,4 @@
+// @noImplicitAny: false
 // @target: es6
 function * foo(a = yield => yield) {
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration2_es6.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration2_es6.ts
index 729d883e7fc14..7b3900b8513eb 100644
--- a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration2_es6.ts
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration2_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 function f(yield) {
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts
index 57e32e1d9018e..c33874b3b832f 100644
--- a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 function * foo() {
   var v = { [yield]: foo }
diff --git a/tests/cases/conformance/es6/moduleExportsSystem/topLevelVarHoistingCommonJS.ts b/tests/cases/conformance/es6/moduleExportsSystem/topLevelVarHoistingCommonJS.ts
index eb2271a69045c..6c87aa320929a 100644
--- a/tests/cases/conformance/es6/moduleExportsSystem/topLevelVarHoistingCommonJS.ts
+++ b/tests/cases/conformance/es6/moduleExportsSystem/topLevelVarHoistingCommonJS.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: commonjs
 // @noTypesAndSymbols: true
diff --git a/tests/cases/conformance/es6/moduleExportsSystem/topLevelVarHoistingSystem.ts b/tests/cases/conformance/es6/moduleExportsSystem/topLevelVarHoistingSystem.ts
index 496ee04ef66f6..8a193e187a58c 100644
--- a/tests/cases/conformance/es6/moduleExportsSystem/topLevelVarHoistingSystem.ts
+++ b/tests/cases/conformance/es6/moduleExportsSystem/topLevelVarHoistingSystem.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: system
 // @noTypesAndSymbols: true
diff --git a/tests/cases/conformance/es6/modules/defaultExportWithOverloads01.ts b/tests/cases/conformance/es6/modules/defaultExportWithOverloads01.ts
index a6761600a1d70..7ec4531ee7582 100644
--- a/tests/cases/conformance/es6/modules/defaultExportWithOverloads01.ts
+++ b/tests/cases/conformance/es6/modules/defaultExportWithOverloads01.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @target: ES5
 
diff --git a/tests/cases/conformance/es6/modules/defaultExportsCannotMerge04.ts b/tests/cases/conformance/es6/modules/defaultExportsCannotMerge04.ts
index ab72d10504a12..02cf6d53675c3 100644
--- a/tests/cases/conformance/es6/modules/defaultExportsCannotMerge04.ts
+++ b/tests/cases/conformance/es6/modules/defaultExportsCannotMerge04.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @target: ES5
 
diff --git a/tests/cases/conformance/es6/modules/exportsAndImports1-amd.ts b/tests/cases/conformance/es6/modules/exportsAndImports1-amd.ts
index a1d005c8fa99e..26e2890f107ea 100644
--- a/tests/cases/conformance/es6/modules/exportsAndImports1-amd.ts
+++ b/tests/cases/conformance/es6/modules/exportsAndImports1-amd.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 // @target: ES5
 
diff --git a/tests/cases/conformance/es6/modules/exportsAndImports1-es6.ts b/tests/cases/conformance/es6/modules/exportsAndImports1-es6.ts
index 7e29bc0b79e9b..b6db02faced4a 100644
--- a/tests/cases/conformance/es6/modules/exportsAndImports1-es6.ts
+++ b/tests/cases/conformance/es6/modules/exportsAndImports1-es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 // @module: commonjs
 
diff --git a/tests/cases/conformance/es6/modules/exportsAndImports1.ts b/tests/cases/conformance/es6/modules/exportsAndImports1.ts
index 7775a425b2e9f..2d05a71ddc58b 100644
--- a/tests/cases/conformance/es6/modules/exportsAndImports1.ts
+++ b/tests/cases/conformance/es6/modules/exportsAndImports1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 
 // @filename: t1.ts
diff --git a/tests/cases/conformance/es6/modules/exportsAndImports3-amd.ts b/tests/cases/conformance/es6/modules/exportsAndImports3-amd.ts
index 260e9499b5d1a..9bbbb88795970 100644
--- a/tests/cases/conformance/es6/modules/exportsAndImports3-amd.ts
+++ b/tests/cases/conformance/es6/modules/exportsAndImports3-amd.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 // @target: ES5
 
diff --git a/tests/cases/conformance/es6/modules/exportsAndImports3-es6.ts b/tests/cases/conformance/es6/modules/exportsAndImports3-es6.ts
index bf09ccde0b119..d1fe834426e12 100644
--- a/tests/cases/conformance/es6/modules/exportsAndImports3-es6.ts
+++ b/tests/cases/conformance/es6/modules/exportsAndImports3-es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 // @module: commonjs
 
diff --git a/tests/cases/conformance/es6/modules/exportsAndImports3.ts b/tests/cases/conformance/es6/modules/exportsAndImports3.ts
index 1abfb5301cd7e..cff04d1b574fe 100644
--- a/tests/cases/conformance/es6/modules/exportsAndImports3.ts
+++ b/tests/cases/conformance/es6/modules/exportsAndImports3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 
 // @filename: t1.ts
diff --git a/tests/cases/conformance/es6/newTarget/invalidNewTarget.es5.ts b/tests/cases/conformance/es6/newTarget/invalidNewTarget.es5.ts
index cda2d4d2ce7a8..a2701681ff90b 100644
--- a/tests/cases/conformance/es6/newTarget/invalidNewTarget.es5.ts
+++ b/tests/cases/conformance/es6/newTarget/invalidNewTarget.es5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 const a = new.target;
 const b = () => new.target;
diff --git a/tests/cases/conformance/es6/newTarget/invalidNewTarget.es6.ts b/tests/cases/conformance/es6/newTarget/invalidNewTarget.es6.ts
index 5043c160e101b..3383f2e6a096a 100644
--- a/tests/cases/conformance/es6/newTarget/invalidNewTarget.es6.ts
+++ b/tests/cases/conformance/es6/newTarget/invalidNewTarget.es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 const a = new.target;
 const b = () => new.target;
diff --git a/tests/cases/conformance/es6/propertyAccess/propertyAccessNumericLiterals.es6.ts b/tests/cases/conformance/es6/propertyAccess/propertyAccessNumericLiterals.es6.ts
index 81e39965a6a82..5afede0d61121 100644
--- a/tests/cases/conformance/es6/propertyAccess/propertyAccessNumericLiterals.es6.ts
+++ b/tests/cases/conformance/es6/propertyAccess/propertyAccessNumericLiterals.es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 0xffffffff.toString();
 0o01234.toString();
diff --git a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandProperties.ts b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandProperties.ts
index ffeab28958473..262829467672d 100644
--- a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandProperties.ts
+++ b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandProperties.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 var a, b, c;
 
diff --git a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesES6.ts b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesES6.ts
index bf4c2583c078d..33d369a17649f 100644
--- a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesES6.ts
+++ b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 var a, b, c;
 
diff --git a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNoneExistingIdentifier.ts b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNoneExistingIdentifier.ts
index 1f44dc18ae86a..8286550293af7 100644
--- a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNoneExistingIdentifier.ts
+++ b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNoneExistingIdentifier.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var x = {
     x, // OK
     undefinedVariable // Error
diff --git a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts
index 527154c66bd73..a59c95652b9ba 100644
--- a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts
+++ b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // errors
 var y = {
     "stringLiteral",
diff --git a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorWithModule.ts b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorWithModule.ts
index 8d69d1efdb2e2..1e689a886b13f 100644
--- a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorWithModule.ts
+++ b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorWithModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // module export
 var x = "Foo";
 namespace m {
diff --git a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule.ts b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule.ts
index e5c14eb4bc59e..9d4aa4759d5df 100644
--- a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule.ts
+++ b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // module export
 
 namespace m {
diff --git a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModuleES6.ts b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModuleES6.ts
index 0fb20b3a15a6e..0c4b7a500b39d 100644
--- a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModuleES6.ts
+++ b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModuleES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 
 namespace m {
diff --git a/tests/cases/conformance/es6/spread/arrayLiteralSpread.ts b/tests/cases/conformance/es6/spread/arrayLiteralSpread.ts
index da088cc09a052..7cc3ef01a2397 100644
--- a/tests/cases/conformance/es6/spread/arrayLiteralSpread.ts
+++ b/tests/cases/conformance/es6/spread/arrayLiteralSpread.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f0() {
     var a = [1, 2, 3];
     var a1 = [...a];
diff --git a/tests/cases/conformance/es6/spread/arrayLiteralSpreadES5iterable.ts b/tests/cases/conformance/es6/spread/arrayLiteralSpreadES5iterable.ts
index e6fedbc2e5f95..6967a1b3e0c59 100644
--- a/tests/cases/conformance/es6/spread/arrayLiteralSpreadES5iterable.ts
+++ b/tests/cases/conformance/es6/spread/arrayLiteralSpreadES5iterable.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @downlevelIteration: true
 function f0() {
     var a = [1, 2, 3];
diff --git a/tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts b/tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts
index d8be6cbd7c270..38bf590fe92a6 100644
--- a/tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts
+++ b/tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts
@@ -7,7 +7,7 @@
     [x: number]: I;
 }
 
-var f: I;
+declare var f: I;
 
 f `abc`
 
diff --git a/tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTagsES6.ts b/tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTagsES6.ts
index dec483c167893..ec9236198151b 100644
--- a/tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTagsES6.ts
+++ b/tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTagsES6.ts
@@ -8,7 +8,7 @@ interface I {
     [x: number]: I;
 }
 
-var f: I;
+declare var f: I;
 
 f `abc`
 
diff --git a/tests/cases/conformance/es6/templates/taggedTemplateWithConstructableTag02.ts b/tests/cases/conformance/es6/templates/taggedTemplateWithConstructableTag02.ts
index 7c6f009bf237f..9d6b4b64d2149 100644
--- a/tests/cases/conformance/es6/templates/taggedTemplateWithConstructableTag02.ts
+++ b/tests/cases/conformance/es6/templates/taggedTemplateWithConstructableTag02.ts
@@ -2,5 +2,5 @@ interface I {
     new (...args: any[]): string;
     new (): number;
 }
-var tag: I;
+declare var tag: I;
 tag `Hello world!`;
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/variableDeclarations/VariableDeclaration2_es6.ts b/tests/cases/conformance/es6/variableDeclarations/VariableDeclaration2_es6.ts
index 17986424b1334..9ff50c96f89c4 100644
--- a/tests/cases/conformance/es6/variableDeclarations/VariableDeclaration2_es6.ts
+++ b/tests/cases/conformance/es6/variableDeclarations/VariableDeclaration2_es6.ts
@@ -1,2 +1,3 @@
+// @strict: false
 // @target:es6
 const a
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression13_es6.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression13_es6.ts
index 946d971c9dcb1..67cae6933fd48 100644
--- a/tests/cases/conformance/es6/yieldExpressions/YieldExpression13_es6.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression13_es6.ts
@@ -1,2 +1,3 @@
+// @strict: false
 // @target: es6
 function* foo() { yield }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression3_es6.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression3_es6.ts
index 8cf089d33d3e6..52fa40836d9a8 100644
--- a/tests/cases/conformance/es6/yieldExpressions/YieldExpression3_es6.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression3_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 function* foo() {
   yield
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression4_es6.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression4_es6.ts
index 21b5d695d89a4..eecf15e1f4c1b 100644
--- a/tests/cases/conformance/es6/yieldExpressions/YieldExpression4_es6.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression4_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 function* foo() {
   yield;
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression6_es6.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression6_es6.ts
index bc4edfe28699b..90e39dde65f75 100644
--- a/tests/cases/conformance/es6/yieldExpressions/YieldExpression6_es6.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression6_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 function* foo() {
   yield*foo
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression4_es6.ts b/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression4_es6.ts
index d09e7b8004553..0b87209313798 100644
--- a/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression4_es6.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression4_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 function *g() {
     yield * [];
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck31.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck31.ts
index f4082f7b46fa0..06d0547e3d3f8 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck31.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck31.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 function* g2(): Iterator<() => Iterable<(x: string) => number>> {
     yield function* () {
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck36.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck36.ts
index e304dda48281a..b7e91e6663483 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck36.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck36.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 function* g() {
     yield yield 0;
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck37.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck37.ts
index f9fe46f4285b7..29391c1e44b41 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck37.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck37.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 function* g() {
     return yield yield 0;
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck38.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck38.ts
index 03bb28ef0ec63..07b761b4f8d86 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck38.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck38.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 var yield;
 function* g() {
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck39.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck39.ts
index 9dec1b36dc29c..15d9731662bd9 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck39.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck39.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 // @experimentalDecorators: true
 
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck40.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck40.ts
index 2dee3dedf027d..9de53df48dac6 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck40.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck40.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 function* g() {
     class C extends (yield 0) { }
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck41.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck41.ts
index caa4eed0747a2..764c22a597e99 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck41.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck41.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 function* g() {
     let x = {
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck43.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck43.ts
index e2b72f4b790cf..729568a124950 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck43.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck43.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 function* g() {
     let x = {
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck45.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck45.ts
index ce0822da4122f..f527a703cc308 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck45.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck45.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 declare function foo<T, U>(x: T, fun: () => Iterator<(x: T) => U>, fun2: (y: U) => T): T;
 
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck46.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck46.ts
index 53c5c7131dbaa..0d842db1e726e 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck46.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck46.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 declare function foo<T, U>(x: T, fun: () => Iterable<(x: T) => U>, fun2: (y: U) => T): T;
 
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck55.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck55.ts
index 2041764a2f98e..8a7bfdc92b0bc 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck55.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck55.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 function* g() {
     var x = class C extends (yield) {};
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck56.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck56.ts
index 7aa66480a166c..27bdd6bf25814 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck56.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck56.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 function* g() {
     var x = class C {
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck57.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck57.ts
index f972a2a60e33f..148c9d4e67b40 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck57.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck57.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 function* g() {
     class C {
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck58.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck58.ts
index 081979be50587..faa3cbb741bea 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck58.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck58.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 function* g() {
     class C {
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck60.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck60.ts
index 36747936f1749..651dd7c86d3a2 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck60.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck60.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 function* g() {
     class C extends (yield) {};
diff --git a/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCanBeAssigned1.ts b/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCanBeAssigned1.ts
index 35b434b6bac58..7773ddad068b7 100644
--- a/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCanBeAssigned1.ts
+++ b/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCanBeAssigned1.ts
@@ -1,24 +1,24 @@
 enum E { a, b, c }
 
-var a: any;
-var b: number;
-var c: E;
+declare var a: any;
+declare var b: number;
+declare var c: E;
 
-var x1: any;
+declare var x1: any;
 x1 **= a;
 x1 **= b;
 x1 **= c;
 x1 **= null;
 x1 **= undefined;
 
-var x2: number;
+declare var x2: number;
 x2 **= a;
 x2 **= b;
 x2 **= c;
 x2 **= null;
 x2 **= undefined;
 
-var x3: E;
+declare var x3: E;
 x3 **= a;
 x3 **= b;
 x3 **= c;
diff --git a/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCannotBeAssigned.ts b/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCannotBeAssigned.ts
index 93623f667b809..50477fc0a3415 100644
--- a/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCannotBeAssigned.ts
+++ b/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCannotBeAssigned.ts
@@ -1,9 +1,9 @@
 enum E { a, b }
 
-var a: any;
-var b: void;
+declare var a: any;
+declare var b: void;
 
-var x1: boolean;
+declare var x1: boolean;
 x1 **= a;
 x1 **= b;
 x1 **= true;
@@ -14,7 +14,7 @@ x1 **= {};
 x1 **= null;
 x1 **= undefined;
 
-var x2: string;
+declare var x2: string;
 x2 **= a;
 x2 **= b;
 x2 **= true;
@@ -25,7 +25,7 @@ x2 **= {};
 x2 **= null;
 x2 **= undefined;
 
-var x3: {};
+declare var x3: {};
 x3 **= a;
 x3 **= b;
 x3 **= true;
@@ -36,7 +36,7 @@ x3 **= {};
 x3 **= null;
 x3 **= undefined;
 
-var x4: void;
+declare var x4: void;
 x4 **= a;
 x4 **= b;
 x4 **= true;
@@ -47,13 +47,13 @@ x4 **= {};
 x4 **= null;
 x4 **= undefined;
 
-var x5: number;
+declare var x5: number;
 x5 **= b;
 x5 **= true;
 x5 **= ''
 x5 **= {};
 
-var x6: E;
+declare var x6: E;
 x6 **= b;
 x6 **= true;
 x6 **= ''
diff --git a/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts b/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts
index 14bbc3c4be7a5..e293847b46569 100644
--- a/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts
+++ b/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: false
 // expected error for all the LHS of compound assignments (arithmetic and addition)
 var value: any;
diff --git a/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithInvalidOperands.ts b/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithInvalidOperands.ts
index f16ddc61ed5e6..95353a0cc27df 100644
--- a/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithInvalidOperands.ts
+++ b/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithInvalidOperands.ts
@@ -2,12 +2,12 @@
 // an enum type
 enum E { a, b, c }
 
-var a: any;
-var b: boolean;
-var c: number;
-var d: string;
-var e: { a: number };
-var f: Number;
+declare var a: any;
+declare var b: boolean;
+declare var c: number;
+declare var d: string;
+declare var e: { a: number };
+declare var f: Number;
 
 // All of the below should be an error unless otherwise noted
 // operator **
diff --git a/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndInvalidOperands.ts b/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndInvalidOperands.ts
index 7ecec740d416b..b09b30c897661 100644
--- a/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndInvalidOperands.ts
+++ b/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndInvalidOperands.ts
@@ -1,9 +1,9 @@
 // If one operand is the null or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
-var b: string;
-var c: Object;
+declare var a: boolean;
+declare var b: string;
+declare var c: Object;
 
 // operator **
 var r1a1 = null ** a;
diff --git a/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndValidOperands.ts b/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndValidOperands.ts
index acc152ea696d4..bfaadee12f313 100644
--- a/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndValidOperands.ts
+++ b/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndValidOperands.ts
@@ -6,8 +6,8 @@ enum E {
     b
 }
 
-var a: any;
-var b: number;
+declare var a: any;
+declare var b: number;
 
 // operator **
 var r1 = null ** a;
diff --git a/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithTypeParameter.ts b/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithTypeParameter.ts
index d028b5c65750e..cfc392e2910d2 100644
--- a/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithTypeParameter.ts
+++ b/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithTypeParameter.ts
@@ -1,10 +1,10 @@
 // type parameter type is not valid for arithmetic operand
 function foo<T>(t: T) {
-    var a: any;
-    var b: boolean;
-    var c: number;
-    var d: string;
-    var e: {};
+    var a!: any;
+    var b!: boolean;
+    var c!: number;
+    var d!: string;
+    var e!: {};
 
     var r1a1 = a ** t;
     var r2a1 = t ** a;
diff --git a/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts b/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts
index 7693e4a83f9ae..c2cc3e6df547d 100644
--- a/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts
+++ b/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndInvalidOperands.ts
@@ -1,9 +1,9 @@
 // If one operand is the undefined or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
-var b: string;
-var c: Object;
+declare var a: boolean;
+declare var b: string;
+declare var c: Object;
 
 // operator **
 var r1a1 = undefined ** a;
diff --git a/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndValidOperands.ts b/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndValidOperands.ts
index c1862f1bbe918..406df2cb416af 100644
--- a/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndValidOperands.ts
+++ b/tests/cases/conformance/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndValidOperands.ts
@@ -6,8 +6,8 @@ enum E {
     b
 }
 
-var a: any;
-var b: number;
+declare var a: any;
+declare var b: number;
 
 // operator *
 var rk1 = undefined ** a;
diff --git a/tests/cases/conformance/es7/trailingCommasInBindingPatterns.ts b/tests/cases/conformance/es7/trailingCommasInBindingPatterns.ts
index 6323111b04d08..0fa989a5968c2 100644
--- a/tests/cases/conformance/es7/trailingCommasInBindingPatterns.ts
+++ b/tests/cases/conformance/es7/trailingCommasInBindingPatterns.ts
@@ -1,3 +1,4 @@
+// @strict: false
 const [...a,] = [];
 const {...b,} = {};
 let c, d;
diff --git a/tests/cases/conformance/es7/trailingCommasInFunctionParametersAndArguments.ts b/tests/cases/conformance/es7/trailingCommasInFunctionParametersAndArguments.ts
index 6db7ec9c853f2..61885870524c1 100644
--- a/tests/cases/conformance/es7/trailingCommasInFunctionParametersAndArguments.ts
+++ b/tests/cases/conformance/es7/trailingCommasInFunctionParametersAndArguments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 
 function f1(x,) {}
diff --git a/tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-exportModifier.2.ts b/tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-exportModifier.2.ts
index be0fbf0fa4de0..c50d363adcb98 100644
--- a/tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-exportModifier.2.ts
+++ b/tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-exportModifier.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @filename: global.ts
diff --git a/tests/cases/conformance/esDecorators/esDecorators-privateFieldAccess.ts b/tests/cases/conformance/esDecorators/esDecorators-privateFieldAccess.ts
index fe3085e8e989a..f2d3e4ad54e38 100644
--- a/tests/cases/conformance/esDecorators/esDecorators-privateFieldAccess.ts
+++ b/tests/cases/conformance/esDecorators/esDecorators-privateFieldAccess.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @noEmitHelpers: true
 
diff --git a/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata1.ts b/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata1.ts
index f27d19a1805f5..944fd230240a6 100644
--- a/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata1.ts
+++ b/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2022,es2015
 // @noTypesAndSymbols: true
 // @lib: esnext
diff --git a/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata2.ts b/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata2.ts
index ff22999b0f655..b3dfac0f0255e 100644
--- a/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata2.ts
+++ b/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2022,es2015
 // @noTypesAndSymbols: true
 // @lib: esnext
diff --git a/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata3.ts b/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata3.ts
index bcbce9f27d9cd..22d2c371e1201 100644
--- a/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata3.ts
+++ b/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2022,es2015
 // @noTypesAndSymbols: true
 // @lib: esnext
diff --git a/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata4.ts b/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata4.ts
index a8c0fc8b667b2..94fc75a3bc559 100644
--- a/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata4.ts
+++ b/tests/cases/conformance/esDecorators/metadata/esDecoratorsMetadata4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2022,es2015
 // @noTypesAndSymbols: true
 // @lib: esnext
diff --git a/tests/cases/conformance/expressions/arrayLiterals/arrayLiterals.ts b/tests/cases/conformance/expressions/arrayLiterals/arrayLiterals.ts
index 41c5a0b8100bf..f363bde4588db 100644
--- a/tests/cases/conformance/expressions/arrayLiterals/arrayLiterals.ts
+++ b/tests/cases/conformance/expressions/arrayLiterals/arrayLiterals.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Empty array literal with no contextual type has type Undefined[]
 
 var arr1= [[], [1], ['']];
diff --git a/tests/cases/conformance/expressions/asOperator/asOpEmitParens.ts b/tests/cases/conformance/expressions/asOperator/asOpEmitParens.ts
index 7a97a74168ac0..c9c42069896b6 100644
--- a/tests/cases/conformance/expressions/asOperator/asOpEmitParens.ts
+++ b/tests/cases/conformance/expressions/asOperator/asOpEmitParens.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare var x;
 // Must emit as (x + 1) * 3
 (x + 1 as number) * 3;
diff --git a/tests/cases/conformance/expressions/asOperator/asOperatorASI.ts b/tests/cases/conformance/expressions/asOperator/asOperatorASI.ts
index a4dd44a15add1..9bd4fd6001353 100644
--- a/tests/cases/conformance/expressions/asOperator/asOperatorASI.ts
+++ b/tests/cases/conformance/expressions/asOperator/asOperatorASI.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Foo { }
 declare function as(...args: any[]);
 
diff --git a/tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts b/tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts
index 47c6ab7ccda7e..e69729d5bf2ff 100644
--- a/tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts
+++ b/tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // expected error for all the LHS of assignments
 var value: any;
 
diff --git a/tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentLHSCanBeAssigned.ts b/tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentLHSCanBeAssigned.ts
index 7679362a1f202..ff43c9acda9ea 100644
--- a/tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentLHSCanBeAssigned.ts
+++ b/tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentLHSCanBeAssigned.ts
@@ -1,9 +1,9 @@
 enum E { a, b }
 
-var a: any;
-var b: void;
+declare var a: any;
+declare var b: void;
 
-var x1: any;
+declare var x1: any;
 x1 += a;
 x1 += b;
 x1 += true;
@@ -14,7 +14,7 @@ x1 += {};
 x1 += null;
 x1 += undefined;
 
-var x2: string;
+declare var x2: string;
 x2 += a;
 x2 += b;
 x2 += true;
@@ -25,26 +25,26 @@ x2 += {};
 x2 += null;
 x2 += undefined;
 
-var x3: number;
+declare var x3: number;
 x3 += a;
 x3 += 0;
 x3 += E.a;
 x3 += null;
 x3 += undefined;
 
-var x4: E;
+declare var x4: E;
 x4 += a;
 x4 += 0;
 x4 += E.a;
 x4 += null;
 x4 += undefined;
 
-var x5: boolean;
+declare var x5: boolean;
 x5 += a;
 
-var x6: {};
+declare var x6: {};
 x6 += a;
 x6 += '';
 
-var x7: void;
+declare var x7: void;
 x7 += a;
\ No newline at end of file
diff --git a/tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentLHSCannotBeAssigned.ts b/tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentLHSCannotBeAssigned.ts
index c24a89f62c1d4..d142b98b519b1 100644
--- a/tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentLHSCannotBeAssigned.ts
+++ b/tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentLHSCannotBeAssigned.ts
@@ -1,17 +1,17 @@
 // string can add every type, and result string cannot be assigned to below types
 enum E { a, b, c }
 
-var x1: boolean;
+declare var x1: boolean;
 x1 += '';
 
-var x2: number;
+declare var x2: number;
 x2 += '';
 
-var x3: E;
+declare var x3: E;
 x3 += '';
 
-var x4: {a: string};
+declare var x4: {a: string};
 x4 += '';
 
-var x5: void;
+declare var x5: void;
 x5 += '';
\ No newline at end of file
diff --git a/tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentWithInvalidOperands.ts b/tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentWithInvalidOperands.ts
index 20a3897d28cc1..024357ca6bd5d 100644
--- a/tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentWithInvalidOperands.ts
+++ b/tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentWithInvalidOperands.ts
@@ -1,8 +1,8 @@
 enum E { a, b }
 
-var a: void;
+declare var a: void;
 
-var x1: boolean;
+declare var x1: boolean;
 x1 += a;
 x1 += true;
 x1 += 0;
@@ -11,7 +11,7 @@ x1 += {};
 x1 += null;
 x1 += undefined;
 
-var x2: {};
+declare var x2: {};
 x2 += a;
 x2 += true;
 x2 += 0;
@@ -20,7 +20,7 @@ x2 += {};
 x2 += null;
 x2 += undefined;
 
-var x3: void;
+declare var x3: void;
 x3 += a;
 x3 += true;
 x3 += 0;
@@ -29,12 +29,12 @@ x3 += {};
 x3 += null;
 x3 += undefined;
 
-var x4: number;
+declare var x4: number;
 x4 += a;
 x4 += true;
 x4 += {};
 
-var x5: E;
+declare var x5: E;
 x5 += a;
 x5 += true;
 x5 += {};
\ No newline at end of file
diff --git a/tests/cases/conformance/expressions/assignmentOperator/compoundArithmeticAssignmentLHSCanBeAssigned.ts b/tests/cases/conformance/expressions/assignmentOperator/compoundArithmeticAssignmentLHSCanBeAssigned.ts
index 58571c6cfac3e..ec744a9d1b78e 100644
--- a/tests/cases/conformance/expressions/assignmentOperator/compoundArithmeticAssignmentLHSCanBeAssigned.ts
+++ b/tests/cases/conformance/expressions/assignmentOperator/compoundArithmeticAssignmentLHSCanBeAssigned.ts
@@ -1,24 +1,24 @@
 enum E { a, b, c }
 
-var a: any;
-var b: number;
-var c: E;
+declare var a: any;
+declare var b: number;
+declare var c: E;
 
-var x1: any;
+declare var x1: any;
 x1 *= a;
 x1 *= b;
 x1 *= c;
 x1 *= null;
 x1 *= undefined;
 
-var x2: number;
+declare var x2: number;
 x2 *= a;
 x2 *= b;
 x2 *= c;
 x2 *= null;
 x2 *= undefined;
 
-var x3: E;
+declare var x3: E;
 x3 *= a;
 x3 *= b;
 x3 *= c;
diff --git a/tests/cases/conformance/expressions/assignmentOperator/compoundArithmeticAssignmentWithInvalidOperands.ts b/tests/cases/conformance/expressions/assignmentOperator/compoundArithmeticAssignmentWithInvalidOperands.ts
index 7dcb73696f5e4..5f384a0d8e76e 100644
--- a/tests/cases/conformance/expressions/assignmentOperator/compoundArithmeticAssignmentWithInvalidOperands.ts
+++ b/tests/cases/conformance/expressions/assignmentOperator/compoundArithmeticAssignmentWithInvalidOperands.ts
@@ -1,9 +1,9 @@
 enum E { a, b }
 
-var a: any;
-var b: void;
+declare var a: any;
+declare var b: void;
 
-var x1: boolean;
+declare var x1: boolean;
 x1 *= a;
 x1 *= b;
 x1 *= true;
@@ -14,7 +14,7 @@ x1 *= {};
 x1 *= null;
 x1 *= undefined;
 
-var x2: string;
+declare var x2: string;
 x2 *= a;
 x2 *= b;
 x2 *= true;
@@ -25,7 +25,7 @@ x2 *= {};
 x2 *= null;
 x2 *= undefined;
 
-var x3: {};
+declare var x3: {};
 x3 *= a;
 x3 *= b;
 x3 *= true;
@@ -36,7 +36,7 @@ x3 *= {};
 x3 *= null;
 x3 *= undefined;
 
-var x4: void;
+declare var x4: void;
 x4 *= a;
 x4 *= b;
 x4 *= true;
@@ -47,13 +47,13 @@ x4 *= {};
 x4 *= null;
 x4 *= undefined;
 
-var x5: number;
+declare var x5: number;
 x5 *= b;
 x5 *= true;
 x5 *= ''
 x5 *= {};
 
-var x6: E;
+declare var x6: E;
 x6 *= b;
 x6 *= true;
 x6 *= ''
diff --git a/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsReference.ts b/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsReference.ts
index f49e788f21281..3d13d412afda7 100644
--- a/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsReference.ts
+++ b/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsReference.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var value;
 
 // identifiers: variable and parameter
diff --git a/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts b/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts
index e91216d959a7c..c046e29f45b66 100644
--- a/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts
+++ b/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnusedLabels: true
 
 // expected error for all the LHS of compound assignments (arithmetic and addition)
diff --git a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithAnyAndEveryType.ts b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithAnyAndEveryType.ts
index cf4e0b44b8812..49970fee7072f 100644
--- a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithAnyAndEveryType.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithAnyAndEveryType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo() { }
 class C {
     public a: string;
diff --git a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithInvalidOperands.ts b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithInvalidOperands.ts
index 59153b0a33ca5..fd121413a57e4 100644
--- a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithInvalidOperands.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithInvalidOperands.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo() { }
 class C {
     public a: string;
@@ -6,10 +7,10 @@ class C {
 enum E { a, b, c }
 namespace M { export var a }
 
-var a: boolean;
-var b: number;
-var c: Object;
-var d: Number;
+declare var a: boolean;
+declare var b: number;
+declare var c: Object;
+declare var d: Number;
 
 // boolean + every type except any and string
 var r1 = a + a;
diff --git a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndInvalidOperator.ts b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndInvalidOperator.ts
index 66f5eef42f751..ba6c62cfa5a98 100644
--- a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndInvalidOperator.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndInvalidOperator.ts
@@ -2,10 +2,10 @@
 
 function foo(): void { return undefined }
 
-var a: boolean;
-var b: Object;
-var c: void;
-var d: Number;
+declare var a: boolean;
+declare var b: Object;
+declare var c: void;
+declare var d: Number;
 
 // null + boolean/Object
 var r1 = null + a;
diff --git a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndValidOperator.ts b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndValidOperator.ts
index 319bb55e7a153..29622e339efb9 100644
--- a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndValidOperator.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndValidOperator.ts
@@ -2,10 +2,10 @@
 
 enum E { a, b, c }
 
-var a: any;
-var b: number;
-var c: E;
-var d: string;
+declare var a: any;
+declare var b: number;
+declare var c: E;
+declare var d: string;
 
 // null + any
 var r1: any = null + a;
diff --git a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithTypeParameter.ts b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithTypeParameter.ts
index af2c16def6108..02dac66582c38 100644
--- a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithTypeParameter.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithTypeParameter.ts
@@ -2,13 +2,13 @@
 enum E { a, b }
 
 function foo<T, U>(t: T, u: U) {
-    var a: any;
-    var b: boolean;
-    var c: number;
-    var d: string;
-    var e: Object;
-    var g: E;
-    var f: void;
+    let a!: any;
+    let b!: boolean;
+    let c!: number;
+    let d!: string;
+    let e!: Object;
+    let g!: E;
+    let f!: void;
 
     // type parameter as left operand
     var r1: any = t + a; // ok, one operand is any
diff --git a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndInvalidOperands.ts b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndInvalidOperands.ts
index 62739dff8185d..03d466ce7da9b 100644
--- a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndInvalidOperands.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndInvalidOperands.ts
@@ -2,10 +2,10 @@
 
 function foo(): void { return undefined }
 
-var a: boolean;
-var b: Object;
-var c: void;
-var d: Number;
+declare var a: boolean;
+declare var b: Object;
+declare var c: void;
+declare var d: Number;
 
 // undefined + boolean/Object
 var r1 = undefined + a;
diff --git a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndValidOperator.ts b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndValidOperator.ts
index 868374bccbf87..325db7ce257c7 100644
--- a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndValidOperator.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndValidOperator.ts
@@ -2,10 +2,10 @@
 
 enum E { a, b, c }
 
-var a: any;
-var b: number;
-var c: E;
-var d: string;
+declare var a: any;
+declare var b: number;
+declare var c: E;
+declare var d: string;
 
 // undefined + any
 var r1: any = undefined + a;
diff --git a/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithInvalidOperands.ts b/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithInvalidOperands.ts
index b71973b3246bf..2a7b420a1920a 100644
--- a/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithInvalidOperands.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithInvalidOperands.ts
@@ -2,12 +2,12 @@
 // an enum type
 enum E { a, b, c }
 
-var a: any;
-var b: boolean;
-var c: number;
-var d: string;
-var e: { a: number };
-var f: Number;
+declare var a: any;
+declare var b: boolean;
+declare var c: number;
+declare var d: string;
+declare var e: { a: number };
+declare var f: Number;
 
 // All of the below should be an error unless otherwise noted
 // operator *
diff --git a/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndInvalidOperands.ts b/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndInvalidOperands.ts
index 2d2a7a8604654..840c7e3d53126 100644
--- a/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndInvalidOperands.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndInvalidOperands.ts
@@ -1,9 +1,9 @@
 // If one operand is the null or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
-var b: string;
-var c: Object;
+declare var a: boolean;
+declare var b: string;
+declare var c: Object;
 
 // operator *
 var r1a1 = null * a;
diff --git a/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndValidOperands.ts b/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndValidOperands.ts
index d173692f4f749..3fddcbbeb95d7 100644
--- a/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndValidOperands.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndValidOperands.ts
@@ -6,8 +6,8 @@ enum E {
     b
 }
 
-var a: any;
-var b: number;
+declare var a: any;
+declare var b: number;
 
 // operator *
 var ra1 = null * a;
diff --git a/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithTypeParameter.ts b/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithTypeParameter.ts
index 4fa061b6d224c..6855d5343ebce 100644
--- a/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithTypeParameter.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithTypeParameter.ts
@@ -1,10 +1,10 @@
 // type parameter type is not valid for arithmetic operand
 function foo<T>(t: T) {
-    var a: any;
-    var b: boolean;
-    var c: number;
-    var d: string;
-    var e: {};
+    let a!: any;
+    let b!: boolean;
+    let c!: number;
+    let d!: string;
+    let e!: {};
 
     var r1a1 = a * t;
     var r1a2 = a / t;
diff --git a/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts b/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts
index eeca5985f4619..ff602ec0b486f 100644
--- a/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndInvalidOperands.ts
@@ -1,9 +1,9 @@
 // If one operand is the undefined or undefined value, it is treated as having the type of the
 // other operand.
 
-var a: boolean;
-var b: string;
-var c: Object;
+declare var a: boolean;
+declare var b: string;
+declare var c: Object;
 
 // operator *
 var r1a1 = undefined * a;
diff --git a/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndValidOperands.ts b/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndValidOperands.ts
index 69180798aeead..4bc202516cbe1 100644
--- a/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndValidOperands.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndValidOperands.ts
@@ -6,8 +6,8 @@ enum E {
     b
 }
 
-var a: any;
-var b: number;
+declare var a: any;
+declare var b: number;
 
 // operator *
 var ra1 = undefined * a;
diff --git a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalPrimitiveType.ts b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalPrimitiveType.ts
index 8cdeda6f1f3c0..64a661b2a583a 100644
--- a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalPrimitiveType.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalPrimitiveType.ts
@@ -1,10 +1,10 @@
 enum E { a, b, c }
 
-var a: number;
-var b: boolean;
-var c: string;
-var d: void;
-var e: E;
+declare var a: number;
+declare var b: boolean;
+declare var c: string;
+declare var d: void;
+declare var e: E;
 
 // operator <
 var ra1 = a < a;
diff --git a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts
index 575e9f1960388..4fd5abd09773b 100644
--- a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.ts
@@ -10,26 +10,26 @@ class C {
     public c: string;
 }
 
-var a1: { fn(): Base };
-var b1: { new (): Base };
+declare var a1: { fn(): Base };
+declare var b1: { new (): Base };
 
-var a2: { fn(a: number, b: string): void };
-var b2: { fn(a: string): void };
+declare var a2: { fn(a: number, b: string): void };
+declare var b2: { fn(a: string): void };
 
-var a3: { fn(a: Base, b: string): void };
-var b3: { fn(a: Derived, b: Base): void };
+declare var a3: { fn(a: Base, b: string): void };
+declare var b3: { fn(a: Derived, b: Base): void };
 
-var a4: { fn(): Base };
-var b4: { fn(): C };
+declare var a4: { fn(): Base };
+declare var b4: { fn(): C };
 
-var a5: { fn(a?: Base): void };
-var b5: { fn(a?: C): void };
+declare var a5: { fn(a?: Base): void };
+declare var b5: { fn(a?: C): void };
 
-var a6: { fn(...a: Base[]): void };
-var b6: { fn(...a: C[]): void };
+declare var a6: { fn(...a: Base[]): void };
+declare var b6: { fn(...a: C[]): void };
 
-var a7: { fn<T>(t: T): T };
-var b7: { fn<T>(t: T[]): T };
+declare var a7: { fn<T>(t: T): T };
+declare var b7: { fn<T>(t: T[]): T };
 
 // operator <
 var r1a1 = a1 < b1;
diff --git a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts
index 0ec9fa1f91d41..bdfcf2c07fc1e 100644
--- a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.ts
@@ -10,26 +10,26 @@ class C {
     public c: string;
 }
 
-var a1: { fn(): Base };
-var b1: { new (): Base };
+declare var a1: { fn(): Base };
+declare var b1: { new (): Base };
 
-var a2: { new (a: number, b: string): Base };
-var b2: { new (a: string): Base };
+declare var a2: { new (a: number, b: string): Base };
+declare var b2: { new (a: string): Base };
 
-var a3: { new (a: Base, b: string): Base };
-var b3: { new (a: Derived, b: Base): Base };
+declare var a3: { new (a: Base, b: string): Base };
+declare var b3: { new (a: Derived, b: Base): Base };
 
-var a4: { new (): Base };
-var b4: { new (): C };
+declare var a4: { new (): Base };
+declare var b4: { new (): C };
 
-var a5: { new (a?: Base): Base };
-var b5: { new (a?: C): Base };
+declare var a5: { new (a?: Base): Base };
+declare var b5: { new (a?: C): Base };
 
-var a6: { new (...a: Base[]): Base };
-var b6: { new (...a: C[]): Base };
+declare var a6: { new (...a: Base[]): Base };
+declare var b6: { new (...a: C[]): Base };
 
-var a7: { new <T>(t: T): T };
-var b7: { new <T>(t: T[]): T };
+declare var a7: { new <T>(t: T): T };
+declare var b7: { new <T>(t: T[]): T };
 
 // operator <
 var r1a1 = a1 < b1;
diff --git a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts
index fdc9f9e7da075..fcd0b93b146fd 100644
--- a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts
@@ -10,17 +10,17 @@ class C {
     public c: string;
 }
 
-var a1: { [a: string]: string };
-var b1: { [b: string]: number };
+declare var a1: { [a: string]: string };
+declare var b1: { [b: string]: number };
 
-var a2: { [index: string]: Base };
-var b2: { [index: string]: C };
+declare var a2: { [index: string]: Base };
+declare var b2: { [index: string]: C };
 
-var a3: { [index: number]: Base };
-var b3: { [index: number]: C };
+declare var a3: { [index: number]: Base };
+declare var b3: { [index: number]: C };
 
-var a4: { [index: number]: Derived };
-var b4: { [index: string]: Base };
+declare var a4: { [index: number]: Derived };
+declare var b4: { [index: string]: Base };
 
 // operator <
 var r1a1 = a1 < b1;
diff --git a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts
index a293e6c1276f3..4c179f1fd0bb4 100644
--- a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts
@@ -6,8 +6,8 @@ interface B1 {
     b?: string;
 }
 
-var a: A1;
-var b: B1;
+declare var a: A1;
+declare var b: B1;
 
 // operator <
 var ra1 = a < b;
diff --git a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnProperty.ts b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnProperty.ts
index a04c38d3506e5..5bc9af41ae117 100644
--- a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnProperty.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnProperty.ts
@@ -14,10 +14,10 @@ class B2 {
     private a: string;
 }
 
-var a1: A1;
-var b1: B1;
-var a2: A2;
-var b2: B2;
+declare var a1: A1;
+declare var b1: B1;
+declare var a2: A2;
+declare var b2: B2;
 
 // operator <
 var r1a1 = a1 < b1;
diff --git a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipPrimitiveType.ts b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipPrimitiveType.ts
index 07ca640f38a5c..5626154a0ac31 100644
--- a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipPrimitiveType.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipPrimitiveType.ts
@@ -1,10 +1,10 @@
 enum E { a, b, c }
 
-var a: number;
-var b: boolean;
-var c: string;
-var d: void;
-var e: E;
+declare var a: number;
+declare var b: boolean;
+declare var c: string;
+declare var d: void;
+declare var e: E;
 
 // operator <
 var r1a1 = a < b;
diff --git a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsNull.ts b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsNull.ts
index 16a0c4905ae35..94cf6d8a7e9da 100644
--- a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsNull.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsNull.ts
@@ -20,13 +20,13 @@ function foo<T>(t: T) {
     var foo_r8 = null !== t;
 }
 
-var a: boolean;
-var b: number;
-var c: string;
-var d: void;
-var e: E;
-var f: {};
-var g: string[];
+declare var a: boolean;
+declare var b: number;
+declare var c: string;
+declare var d: void;
+declare var e: E;
+declare var f: {};
+declare var g: string[];
 
 // operator <
 var r1a1 = null < a;
diff --git a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnProperty.ts b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnProperty.ts
index 6401feb11c5b4..acc61fd53bf8d 100644
--- a/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnProperty.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Base {
     public a: string;
 }
diff --git a/tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts b/tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts
index 3087a728f1008..de008698d93ee 100644
--- a/tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Foo {}
 enum E { a }
 
@@ -5,12 +6,12 @@ var x: any;
 
 // invalid left operands
 // the left operand is required to be of type Any, the String primitive type, or the Number primitive type
-var a1: boolean;
-var a2: void;
-var a3: {};
-var a4: E;
-var a5: Foo | string;
-var a6: Foo;
+declare var a1: boolean;
+declare var a2: void;
+declare var a3: {};
+declare var a4: E;
+declare var a5: Foo | string;
+declare var a6: Foo;
 
 var ra1 = a1 in x;
 var ra2 = a2 in x;
@@ -26,11 +27,11 @@ var ra11 = a6 in x;
 
 // invalid right operands
 // the right operand is required to be of type Any, an object type, or a type parameter type
-var b1: number;
-var b2: boolean;
-var b3: string;
-var b4: void;
-var b5: string | number;
+declare var b1: number;
+declare var b2: boolean;
+declare var b3: string;
+declare var b4: void;
+declare var b5: string | number;
 
 var rb1 = x in b1;
 var rb2 = x in b2;
diff --git a/tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithValidOperands.ts b/tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithValidOperands.ts
index 3ad3198276eba..ecbb003dfe2a4 100644
--- a/tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithValidOperands.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithValidOperands.ts
@@ -1,11 +1,12 @@
+// @strict: false
 var x: any;
 
 // valid left operands
 // the left operand is required to be of type Any, the String primitive type, or the Number primitive type
-var a1: string;
-var a2: number;
-var a3: string | number | symbol;
-var a4: any;
+declare var a1: string;
+declare var a2: number;
+declare var a3: string | number | symbol;
+declare var a4: any;
 
 var ra1 = x in x;
 var ra2 = a1 in x;
@@ -17,7 +18,7 @@ var ra7 = a4 in x;
 
 // valid right operands
 // the right operand is required to be of type Any, an object type, or a type parameter type
-var b1: {};
+declare var b1: {};
 
 var rb1 = x in b1;
 var rb2 = x in {};
@@ -37,9 +38,9 @@ function unionCase2<T>(t: T | object) {
 interface X { x: number }
 interface Y { y: number }
 
-var c1: X | Y;
-var c2: X;
-var c3: Y;
+declare var c1: X | Y;
+declare var c2: X;
+declare var c3: Y;
 
 var rc1 = x in c1;
 var rc2 = x in (c2 || c3);
diff --git a/tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidOperands.es2015.ts b/tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidOperands.es2015.ts
index d608292502dbf..21cd9b020759a 100644
--- a/tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidOperands.es2015.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidOperands.es2015.ts
@@ -8,9 +8,9 @@ var x: any;
 
 // invalid left operand
 // the left operand is required to be of type Any, an object type, or a type parameter type
-var a1: number;
-var a2: boolean;
-var a3: string;
+declare var a1: number;
+declare var a2: boolean;
+declare var a3: string;
 var a4: void;
 
 var ra1 = a1 instanceof x;
@@ -25,13 +25,13 @@ var ra9 = undefined instanceof x;
 
 // invalid right operand
 // the right operand to be of type Any or a subtype of the 'Function' interface type
-var b1: number;
-var b2: boolean;
-var b3: string;
+declare var b1: number;
+declare var b2: boolean;
+declare var b3: string;
 var b4: void;
-var o1: {};
-var o2: Object;
-var o3: C;
+declare var o1: {};
+declare var o2: Object;
+declare var o3: C;
 
 var rb1 = x instanceof b1;
 var rb2 = x instanceof b2;
@@ -48,10 +48,10 @@ var rb10 = x instanceof o3;
 var rc1 = '' instanceof {};
 
 // @@hasInstance restricts LHS
-var o4: {[Symbol.hasInstance](value: { x: number }): boolean;};
-var o5: { y: string };
+declare var o4: {[Symbol.hasInstance](value: { x: number }): boolean;};
+declare var o5: { y: string };
 var ra10 = o5 instanceof o4;
 
 // invalid @@hasInstance method return type on RHS
-var o6: {[Symbol.hasInstance](value: unknown): number;};
+declare var o6: {[Symbol.hasInstance](value: unknown): number;};
 var rb11 = x instanceof o6;
\ No newline at end of file
diff --git a/tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidOperands.ts b/tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidOperands.ts
index e42b6a8b41f65..a8802d2680f08 100644
--- a/tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidOperands.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidOperands.ts
@@ -6,9 +6,9 @@ var x: any;
 
 // invalid left operand
 // the left operand is required to be of type Any, an object type, or a type parameter type
-var a1: number;
-var a2: boolean;
-var a3: string;
+declare var a1: number;
+declare var a2: boolean;
+declare var a3: string;
 var a4: void;
 
 var ra1 = a1 instanceof x;
@@ -23,13 +23,13 @@ var ra9 = undefined instanceof x;
 
 // invalid right operand
 // the right operand to be of type Any or a subtype of the 'Function' interface type
-var b1: number;
-var b2: boolean;
-var b3: string;
-var b4: void;
-var o1: {};
-var o2: Object;
-var o3: C;
+declare var b1: number;
+declare var b2: boolean;
+declare var b3: string;
+declare var b4: void;
+declare var o1: {};
+declare var o2: Object;
+declare var o3: C;
 
 var rb1 = x instanceof b1;
 var rb2 = x instanceof b2;
diff --git a/tests/cases/conformance/expressions/binaryOperators/logicalAndOperator/logicalAndOperatorWithEveryType.ts b/tests/cases/conformance/expressions/binaryOperators/logicalAndOperator/logicalAndOperatorWithEveryType.ts
index 034af8ed9823c..8892f103c484f 100644
--- a/tests/cases/conformance/expressions/binaryOperators/logicalAndOperator/logicalAndOperatorWithEveryType.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/logicalAndOperator/logicalAndOperatorWithEveryType.ts
@@ -1,16 +1,17 @@
+// @strict: false
 // The && operator permits the operands to be of any type and produces a result of the same
 // type as the second operand.
 
 enum E { a, b, c }
 
 var a1: any;
-var a2: boolean;
-var a3: number
-var a4: string;
-var a5: void;
-var a6: E;
-var a7: {};
-var a8: string[];
+declare var a2: boolean;
+declare var a3: number;
+declare var a4: string;
+declare var a5: void;
+declare var a6: E;
+declare var a7: {};
+declare var a8: string[];
 
 var ra1 = a1 && a1;
 var ra2 = a2 && a1;
diff --git a/tests/cases/conformance/expressions/binaryOperators/logicalOrOperator/logicalOrOperatorWithEveryType.ts b/tests/cases/conformance/expressions/binaryOperators/logicalOrOperator/logicalOrOperatorWithEveryType.ts
index 9ec124449f31d..5de7f9244f441 100644
--- a/tests/cases/conformance/expressions/binaryOperators/logicalOrOperator/logicalOrOperatorWithEveryType.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/logicalOrOperator/logicalOrOperatorWithEveryType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // The || operator permits the operands to be of any type.
 // If the || expression is not contextually typed, the right operand is contextually typed
 // by the type of the left operand and the result is of the best common type of the two
@@ -6,13 +7,13 @@
 enum E { a, b, c }
 
 var a1: any;
-var a2: boolean;
-var a3: number
-var a4: string;
-var a5: void;
-var a6: E;
-var a7: {a: string};
-var a8: string[];
+declare var a2: boolean;
+declare var a3: number;
+declare var a4: string;
+declare var a5: void;
+declare var a6: E;
+declare var a7: {a: string};
+declare var a8: string[];
 
 var ra1 = a1 || a1;         // any       || any is any
 var ra2 = a2 || a1;         // boolean   || any is any
diff --git a/tests/cases/conformance/expressions/commaOperator/commaOperatorInvalidAssignmentType.ts b/tests/cases/conformance/expressions/commaOperator/commaOperatorInvalidAssignmentType.ts
index b0eb6ec4d8b03..0971c7eb170b7 100644
--- a/tests/cases/conformance/expressions/commaOperator/commaOperatorInvalidAssignmentType.ts
+++ b/tests/cases/conformance/expressions/commaOperator/commaOperatorInvalidAssignmentType.ts
@@ -1,12 +1,12 @@
 // @allowUnreachableCode: true
 
-var BOOLEAN: boolean;
-var NUMBER: number;
-var STRING: string;
+declare var BOOLEAN: boolean;
+declare var NUMBER: number;
+declare var STRING: string;
 
-var resultIsBoolean: boolean
-var resultIsNumber: number
-var resultIsString: string
+declare var resultIsBoolean: boolean
+declare var resultIsNumber: number
+declare var resultIsString: string
 
 //Expect errors when the results type is different form the second operand
 resultIsBoolean = (BOOLEAN, STRING);
diff --git a/tests/cases/conformance/expressions/commaOperator/commaOperatorWithSecondOperandAnyType.ts b/tests/cases/conformance/expressions/commaOperator/commaOperatorWithSecondOperandAnyType.ts
index be245dbd6bbe6..d981976c6c4f9 100644
--- a/tests/cases/conformance/expressions/commaOperator/commaOperatorWithSecondOperandAnyType.ts
+++ b/tests/cases/conformance/expressions/commaOperator/commaOperatorWithSecondOperandAnyType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 
 var ANY: any;
diff --git a/tests/cases/conformance/expressions/commaOperator/commaOperatorWithoutOperand.ts b/tests/cases/conformance/expressions/commaOperator/commaOperatorWithoutOperand.ts
index dce2222c967c4..cfe9a270b54a1 100644
--- a/tests/cases/conformance/expressions/commaOperator/commaOperatorWithoutOperand.ts
+++ b/tests/cases/conformance/expressions/commaOperator/commaOperatorWithoutOperand.ts
@@ -1,9 +1,9 @@
 // @allowUnreachableCode: false
-var ANY: any;
-var BOOLEAN: boolean;
-var NUMBER: number;
-var STRING: string;
-var OBJECT: Object;
+declare var ANY: any;
+declare var BOOLEAN: boolean;
+declare var NUMBER: number;
+declare var STRING: string;
+declare var OBJECT: Object;
 
 // Expect to have compiler errors
 // Missing the second operand
diff --git a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsNumberType.ts b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsNumberType.ts
index 2e2c39ef316b1..c1d72bacf76f9 100644
--- a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsNumberType.ts
+++ b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsNumberType.ts
@@ -1,17 +1,17 @@
 //Cond ? Expr1 : Expr2,  Cond is of number type, Expr1 and Expr2 have the same type
-var condNumber: number;
-
-var exprAny1: any;
-var exprBoolean1: boolean;
-var exprNumber1: number;
-var exprString1: string;
-var exprIsObject1: Object;
-
-var exprAny2: any;
-var exprBoolean2: boolean;
-var exprNumber2: number;
-var exprString2: string;
-var exprIsObject2: Object;
+declare var condNumber: number;
+
+declare var exprAny1: any;
+declare var exprBoolean1: boolean;
+declare var exprNumber1: number;
+declare var exprString1: string;
+declare var exprIsObject1: Object;
+
+declare var exprAny2: any;
+declare var exprBoolean2: boolean;
+declare var exprNumber2: number;
+declare var exprString2: string;
+declare var exprIsObject2: Object;
 
 //Cond is a number type variable
 condNumber ? exprAny1 : exprAny2;
diff --git a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsObjectType.ts b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsObjectType.ts
index 24b6970e12bca..85e916febcfcb 100644
--- a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsObjectType.ts
+++ b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsObjectType.ts
@@ -1,17 +1,17 @@
 //Cond ? Expr1 : Expr2,  Cond is of object type, Expr1 and Expr2 have the same type
-var condObject: Object;
-
-var exprAny1: any;
-var exprBoolean1: boolean;
-var exprNumber1: number;
-var exprString1: string;
-var exprIsObject1: Object;
-
-var exprAny2: any;
-var exprBoolean2: boolean;
-var exprNumber2: number;
-var exprString2: string;
-var exprIsObject2: Object;
+declare var condObject: Object;
+
+declare var exprAny1: any;
+declare var exprBoolean1: boolean;
+declare var exprNumber1: number;
+declare var exprString1: string;
+declare var exprIsObject1: Object;
+
+declare var exprAny2: any;
+declare var exprBoolean2: boolean;
+declare var exprNumber2: number;
+declare var exprString2: string;
+declare var exprIsObject2: Object;
 
 function foo() { };
 class C { static doIt: () => void };
diff --git a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsAnyType.ts b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsAnyType.ts
index 3a03dfdacaa67..669a70395e5c3 100644
--- a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsAnyType.ts
+++ b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsAnyType.ts
@@ -1,18 +1,18 @@
 //Cond ? Expr1 : Expr2,  Cond is of any type, Expr1 and Expr2 have the same type
-var condAny: any;
-var x: any;
-
-var exprAny1: any;
-var exprBoolean1: boolean;
-var exprNumber1: number;
-var exprString1: string;
-var exprIsObject1: Object;
-
-var exprAny2: any;
-var exprBoolean2: boolean;
-var exprNumber2: number;
-var exprString2: string;
-var exprIsObject2: Object;
+declare var condAny: any;
+declare var x: any;
+
+declare var exprAny1: any;
+declare var exprBoolean1: boolean;
+declare var exprNumber1: number;
+declare var exprString1: string;
+declare var exprIsObject1: Object;
+
+declare var exprAny2: any;
+declare var exprBoolean2: boolean;
+declare var exprNumber2: number;
+declare var exprString2: string;
+declare var exprIsObject2: Object;
 
 //Cond is an any type variable
 condAny ? exprAny1 : exprAny2;
diff --git a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsStringType.ts b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsStringType.ts
index e8f026d52e31a..a65f4d1467b91 100644
--- a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsStringType.ts
+++ b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsStringType.ts
@@ -1,17 +1,17 @@
 //Cond ? Expr1 : Expr2,  Cond is of string type, Expr1 and Expr2 have the same type
-var condString: string;
+declare var condString: string;
 
-var exprAny1: any;
-var exprBoolean1: boolean;
-var exprNumber1: number;
-var exprString1: string;
-var exprIsObject1: Object;
+declare var exprAny1: any;
+declare var exprBoolean1: boolean;
+declare var exprNumber1: number;
+declare var exprString1: string;
+declare var exprIsObject1: Object;
 
-var exprAny2: any;
-var exprBoolean2: boolean;
-var exprNumber2: number;
-var exprString2: string;
-var exprIsObject2: Object;
+declare var exprAny2: any;
+declare var exprBoolean2: boolean;
+declare var exprNumber2: number;
+declare var exprString2: string;
+declare var exprIsObject2: Object;
 
 //Cond is a string type variable
 condString ? exprAny1 : exprAny2;
diff --git a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT.ts b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT.ts
index f529b4fb9a065..89d2b6a0957cf 100644
--- a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT.ts
+++ b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT.ts
@@ -3,9 +3,9 @@ class X { propertyX: any; propertyX1: number; propertyX2: string };
 class A extends X { propertyA: number };
 class B extends X { propertyB: string };
 
-var x: X;
-var a: A;
-var b: B;
+declare var x: X;
+declare var a: A;
+declare var b: B;
 
 // No errors anymore, uses union types
 true ? a : b;
diff --git a/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts b/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts
index 5900614debb4e..bc97fa0a538ef 100644
--- a/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts
+++ b/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 
 class Base { private p; }
diff --git a/tests/cases/conformance/expressions/contextualTyping/parenthesizedContexualTyping1.ts b/tests/cases/conformance/expressions/contextualTyping/parenthesizedContexualTyping1.ts
index 49dfe75ccc60e..429fc4a268a60 100644
--- a/tests/cases/conformance/expressions/contextualTyping/parenthesizedContexualTyping1.ts
+++ b/tests/cases/conformance/expressions/contextualTyping/parenthesizedContexualTyping1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 function fun<T>(g: (x: T) => T, x: T): T;
 function fun<T>(g: (x: T) => T, h: (y: T) => T, x: T): T;
diff --git a/tests/cases/conformance/expressions/functionCalls/callOverload.ts b/tests/cases/conformance/expressions/functionCalls/callOverload.ts
index abd9b065c9128..c0e524a121ccc 100644
--- a/tests/cases/conformance/expressions/functionCalls/callOverload.ts
+++ b/tests/cases/conformance/expressions/functionCalls/callOverload.ts
@@ -1,7 +1,7 @@
 declare function fn(x: any): void;
 declare function takeTwo(x: any, y: any): void;
 declare function withRest(a: any, ...args: Array<any>): void;
-var n: number[];
+declare var n: number[];
 
 fn(1) // no error
 fn(1, 2, 3, 4)
diff --git a/tests/cases/conformance/expressions/functionCalls/callWithSpreadES6.ts b/tests/cases/conformance/expressions/functionCalls/callWithSpreadES6.ts
index accb6df135d25..6e1bda6d6916a 100644
--- a/tests/cases/conformance/expressions/functionCalls/callWithSpreadES6.ts
+++ b/tests/cases/conformance/expressions/functionCalls/callWithSpreadES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES6
 
 interface X {
diff --git a/tests/cases/conformance/expressions/functionCalls/functionCalls.ts b/tests/cases/conformance/expressions/functionCalls/functionCalls.ts
index 66a575193ce25..534c71c503f40 100644
--- a/tests/cases/conformance/expressions/functionCalls/functionCalls.ts
+++ b/tests/cases/conformance/expressions/functionCalls/functionCalls.ts
@@ -1,6 +1,6 @@
 
 // Invoke function call on value of type 'any' with no type arguments
-var anyVar: any;
+declare var anyVar: any;
 anyVar(0);
 anyVar('');
 
@@ -15,7 +15,7 @@ anyVar<Window>(undefined);
 interface SubFunc extends Function {
     prop: number;
 }
-var subFunc: SubFunc;
+declare var subFunc: SubFunc;
 subFunc(0);
 subFunc('');
 subFunc();
@@ -29,7 +29,7 @@ subFunc<any>();
 
 // Invoke function call on value of type Function with no call signatures with type arguments
 // These should be errors
-var func: Function;
+declare var func: Function;
 func<number>(0);
 func<string>('');
 func<any>();
diff --git a/tests/cases/conformance/expressions/functionCalls/grammarAmbiguities.ts b/tests/cases/conformance/expressions/functionCalls/grammarAmbiguities.ts
index 02440a6b1ca4d..ce433fb8ac5e9 100644
--- a/tests/cases/conformance/expressions/functionCalls/grammarAmbiguities.ts
+++ b/tests/cases/conformance/expressions/functionCalls/grammarAmbiguities.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function f(n: any) { return null; }
 function g<A, B>(x: any) { return null; }
 interface A { }
diff --git a/tests/cases/conformance/expressions/functionCalls/newWithSpread.ts b/tests/cases/conformance/expressions/functionCalls/newWithSpread.ts
index d17919a703625..6695e747b2066 100644
--- a/tests/cases/conformance/expressions/functionCalls/newWithSpread.ts
+++ b/tests/cases/conformance/expressions/functionCalls/newWithSpread.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 function f(x: number, y: number, ...z: string[]) {
 }
diff --git a/tests/cases/conformance/expressions/functionCalls/newWithSpreadES5.ts b/tests/cases/conformance/expressions/functionCalls/newWithSpreadES5.ts
index 25ef34446699c..a4a90e67a717c 100644
--- a/tests/cases/conformance/expressions/functionCalls/newWithSpreadES5.ts
+++ b/tests/cases/conformance/expressions/functionCalls/newWithSpreadES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES5
 
 function f(x: number, y: number, ...z: string[]) {
diff --git a/tests/cases/conformance/expressions/functionCalls/newWithSpreadES6.ts b/tests/cases/conformance/expressions/functionCalls/newWithSpreadES6.ts
index 0068b6cf80e41..9b013116ab8db 100644
--- a/tests/cases/conformance/expressions/functionCalls/newWithSpreadES6.ts
+++ b/tests/cases/conformance/expressions/functionCalls/newWithSpreadES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 
 function f(x: number, y: number, ...z: string[]) {
diff --git a/tests/cases/conformance/expressions/functionCalls/overloadResolution.ts b/tests/cases/conformance/expressions/functionCalls/overloadResolution.ts
index 08d45a7fc4ad0..b8b02af31b159 100644
--- a/tests/cases/conformance/expressions/functionCalls/overloadResolution.ts
+++ b/tests/cases/conformance/expressions/functionCalls/overloadResolution.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class SomeBase {
     private n;
 
diff --git a/tests/cases/conformance/expressions/functionCalls/overloadResolutionClassConstructors.ts b/tests/cases/conformance/expressions/functionCalls/overloadResolutionClassConstructors.ts
index 68384a294680d..976878007bd30 100644
--- a/tests/cases/conformance/expressions/functionCalls/overloadResolutionClassConstructors.ts
+++ b/tests/cases/conformance/expressions/functionCalls/overloadResolutionClassConstructors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class SomeBase {
     private n;
 
diff --git a/tests/cases/conformance/expressions/functionCalls/overloadResolutionConstructors.ts b/tests/cases/conformance/expressions/functionCalls/overloadResolutionConstructors.ts
index fc62f96ff70c5..65f9d7c057004 100644
--- a/tests/cases/conformance/expressions/functionCalls/overloadResolutionConstructors.ts
+++ b/tests/cases/conformance/expressions/functionCalls/overloadResolutionConstructors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class SomeBase {
     private n;
 
@@ -17,7 +18,7 @@ interface fn1 {
     new (s: string): string;
     new (s: number): number;
 }
-var fn1: fn1;
+declare var fn1: fn1;
 
 // Ambiguous call picks the first overload in declaration order
 var s = new fn1(undefined);
@@ -31,7 +32,7 @@ interface fn2 {
     new (s: string, n: number): number;
     new <T>(n: number, t: T): T;
 }
-var fn2: fn2;
+declare var fn2: fn2;
 
 var d = new fn2<Date>(0, undefined);
 var d: Date;
@@ -51,7 +52,7 @@ interface fn3 {
     new<T, U>(s: string, t: T, u: U): U;
     new<T, U, V>(v: V, u: U, t: T): number;
 }
-var fn3: fn3;
+declare var fn3: fn3;
 
 var s = new fn3(3);
 var s = new fn3('', 3, '');
@@ -71,7 +72,7 @@ interface fn4 {
     new<T extends string, U extends number>(n: T, m: U);
     new<T extends number, U extends string>(n: T, m: U);
 }
-var fn4: fn4;
+declare var fn4: fn4;
 
 new fn4<string, number>('', 3);
 new fn4<string, number>(3, ''); // Error
@@ -96,6 +97,6 @@ interface fn5 {
     new(f: (n: string) => void): string;
     new(f: (n: number) => void): number;
 }
-var fn5: fn5;
+declare var fn5: fn5;
 var n = new fn5((n) => n.toFixed());
 var s = new fn5((n) => n.substr(0));
diff --git a/tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceConstructSignatures.ts b/tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceConstructSignatures.ts
index 3bcc2bd538943..0e5d9ad984040 100644
--- a/tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceConstructSignatures.ts
+++ b/tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceConstructSignatures.ts
@@ -1,8 +1,9 @@
+// @strict: false
 // Generic call with no parameters
 interface NoParams {
     new <T>();
 }
-var noParams: NoParams;
+declare var noParams: NoParams;
 new noParams();
 new noParams<string>();
 new noParams<{}>();
@@ -11,7 +12,7 @@ new noParams<{}>();
 interface noGenericParams {
     new <T>(n: string);
 }
-var noGenericParams: noGenericParams;
+declare var noGenericParams: noGenericParams;
 new noGenericParams('');
 new noGenericParams<number>('');
 new noGenericParams<{}>('');
@@ -20,7 +21,7 @@ new noGenericParams<{}>('');
 interface someGenerics1 {
     new <T, U>(n: T, m: number);
 }
-var someGenerics1: someGenerics1;
+declare var someGenerics1: someGenerics1;
 new someGenerics1(3, 4);
 new someGenerics1<string, number>(3, 4); // Error
 new someGenerics1<number, {}>(3, 4);
@@ -29,7 +30,7 @@ new someGenerics1<number, {}>(3, 4);
 interface someGenerics2a {
     new <T>(n: (x: T) => void);
 }
-var someGenerics2a: someGenerics2a;
+declare var someGenerics2a: someGenerics2a;
 new someGenerics2a((n: string) => n);
 new someGenerics2a<string>((n: string) => n);
 new someGenerics2a<string>((n) => n.substr(0));
@@ -37,7 +38,7 @@ new someGenerics2a<string>((n) => n.substr(0));
 interface someGenerics2b {
     new <T, U>(n: (x: T, y: U) => void);
 }
-var someGenerics2b: someGenerics2b;
+declare var someGenerics2b: someGenerics2b;
 new someGenerics2b((n: string, x: number) => n);
 new someGenerics2b<string, number>((n: string, t: number) => n);
 new someGenerics2b<string, number>((n, t) => n.substr(t * t));
@@ -46,7 +47,7 @@ new someGenerics2b<string, number>((n, t) => n.substr(t * t));
 interface someGenerics3 {
     new <T>(producer: () => T);
 }
-var someGenerics3: someGenerics3;
+declare var someGenerics3: someGenerics3;
 new someGenerics3(() => '');
 new someGenerics3<Window>(() => undefined);
 new someGenerics3<number>(() => 3);
@@ -55,7 +56,7 @@ new someGenerics3<number>(() => 3);
 interface someGenerics4 {
     new <T, U>(n: T, f: (x: U) => void);
 }
-var someGenerics4: someGenerics4;
+declare var someGenerics4: someGenerics4;
 new someGenerics4(4, () => null);
 new someGenerics4<string, number>('', () => 3);
 new someGenerics4<string, number>('', (x: string) => ''); // Error
@@ -65,7 +66,7 @@ new someGenerics4<string, number>(null, null);
 interface someGenerics5 {
     new <U, T>(n: T, f: (x: U) => void);
 }
-var someGenerics5: someGenerics5;
+declare var someGenerics5: someGenerics5;
 new someGenerics5(4, () => null);
 new someGenerics5<number, string>('', () => 3);
 new someGenerics5<number, string>('', (x: string) => ''); // Error
@@ -75,7 +76,7 @@ new someGenerics5<string, number>(null, null);
 interface someGenerics6 {
     new <A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A);
 }
-var someGenerics6: someGenerics6;
+declare var someGenerics6: someGenerics6;
 new someGenerics6(n => n, n => n, n => n);
 new someGenerics6<number>(n => n, n => n, n => n);
 new someGenerics6<number>((n: number) => n, (n: string) => n, (n: number) => n); // Error
@@ -85,7 +86,7 @@ new someGenerics6<number>((n: number) => n, (n: number) => n, (n: number) => n);
 interface someGenerics7 {
     new <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C);
 }
-var someGenerics7: someGenerics7;
+declare var someGenerics7: someGenerics7;
 new someGenerics7(n => n, n => n, n => n);
 new someGenerics7<number, string, number>(n => n, n => n, n => n);
 new someGenerics7<number, string, number>((n: number) => n, (n: string) => n, (n: number) => n);
@@ -94,7 +95,7 @@ new someGenerics7<number, string, number>((n: number) => n, (n: string) => n, (n
 interface someGenerics8 {
     new <T>(n: T): T;
 }
-var someGenerics8: someGenerics8;
+declare var someGenerics8: someGenerics8;
 var x = new someGenerics8(someGenerics7);
 new x<string, string, string>(null, null, null);
 
@@ -102,11 +103,11 @@ new x<string, string, string>(null, null, null);
 interface someGenerics9 {
     new <T>(a: T, b: T, c: T): T;
 }
-var someGenerics9: someGenerics9;
+declare var someGenerics9: someGenerics9;
 var a9a = new someGenerics9('', 0, []);
-var a9a: {};
+declare var a9a: {};
 var a9b = new someGenerics9<{ a?: number; b?: string; }>({ a: 0 }, { b: '' }, null);
-var a9b: { a?: number; b?: string; };
+declare var a9b: { a?: number; b?: string; };
 
 // Generic call with multiple parameters of generic type passed arguments with multiple best common types
 interface A91 {
@@ -118,20 +119,20 @@ interface A92 {
     z?: Window;
 }
 var a9e = new someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' });
-var a9e: {};
+declare var a9e: {};
 var a9f = new someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' });
-var a9f: A92;
+declare var a9f: A92;
 
 // Generic call with multiple parameters of generic type passed arguments with a single best common type
 var a9d = new someGenerics9({ x: 3 }, { x: 6 }, { x: 6 });
-var a9d: { x: number; };
+declare var a9d: { x: number; };
 
 // Generic call with multiple parameters of generic type where one argument is of type 'any'
-var anyVar: any;
+declare var anyVar: any;
 var a = new someGenerics9(7, anyVar, 4);
-var a: any;
+declare var a: any;
 
 // Generic call with multiple parameters of generic type where one argument is [] and the other is not 'any'
 var arr = new someGenerics9([], null, undefined);
-var arr: any[];
+declare var arr: any[];
 
diff --git a/tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithObjectLiteral.ts b/tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithObjectLiteral.ts
index df78d7a542167..4d3e3645d6179 100644
--- a/tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithObjectLiteral.ts
+++ b/tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithObjectLiteral.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Computed<T> {
     read(): T;
     write(value: T);
diff --git a/tests/cases/conformance/expressions/functions/arrowFunctionContexts.ts b/tests/cases/conformance/expressions/functions/arrowFunctionContexts.ts
index a3aa4eafc0723..ab02098a5350b 100644
--- a/tests/cases/conformance/expressions/functions/arrowFunctionContexts.ts
+++ b/tests/cases/conformance/expressions/functions/arrowFunctionContexts.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 // Arrow function used in with statement
 with (window) {
diff --git a/tests/cases/conformance/expressions/functions/arrowFunctionExpressions.ts b/tests/cases/conformance/expressions/functions/arrowFunctionExpressions.ts
index 707ef02de822a..ef1723458962b 100644
--- a/tests/cases/conformance/expressions/functions/arrowFunctionExpressions.ts
+++ b/tests/cases/conformance/expressions/functions/arrowFunctionExpressions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // ArrowFormalParameters => AssignmentExpression is equivalent to ArrowFormalParameters => { return AssignmentExpression; }
 var a = (p: string) => p.length;
 var a = (p: string) => { return p.length; }
diff --git a/tests/cases/conformance/expressions/functions/contextuallyTypedFunctionExpressionsAndReturnAnnotations.ts b/tests/cases/conformance/expressions/functions/contextuallyTypedFunctionExpressionsAndReturnAnnotations.ts
index 0a1aceaf376a3..c03d2fcb0ec6e 100644
--- a/tests/cases/conformance/expressions/functions/contextuallyTypedFunctionExpressionsAndReturnAnnotations.ts
+++ b/tests/cases/conformance/expressions/functions/contextuallyTypedFunctionExpressionsAndReturnAnnotations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function foo(x: (y: string) => (y2: number) => void);
 
 // Contextually type the parameter even if there is a return annotation
diff --git a/tests/cases/conformance/expressions/functions/contextuallyTypedIife.ts b/tests/cases/conformance/expressions/functions/contextuallyTypedIife.ts
index ca0d6e6771151..2e27ffce9eb53 100644
--- a/tests/cases/conformance/expressions/functions/contextuallyTypedIife.ts
+++ b/tests/cases/conformance/expressions/functions/contextuallyTypedIife.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // arrow
 (jake => { })("build");
 // function expression
diff --git a/tests/cases/conformance/expressions/identifiers/scopeResolutionIdentifiers.ts b/tests/cases/conformance/expressions/identifiers/scopeResolutionIdentifiers.ts
index cfaf6a177888b..70e3169aa1e0d 100644
--- a/tests/cases/conformance/expressions/identifiers/scopeResolutionIdentifiers.ts
+++ b/tests/cases/conformance/expressions/identifiers/scopeResolutionIdentifiers.ts
@@ -2,25 +2,25 @@
 
 var s: string;
 namespace M1 {
-    export var s: number;
+    export var s: number = 0;
     var n = s;
     var n: number;
 }
 
 namespace M2 {
-    var s: number;
+    var s: number = 0;
     var n = s;
     var n: number;
 }
 
 function fn() {
-    var s: boolean;
+    var s: boolean = false;
     var n = s;
     var n: boolean;
 }
 
 class C {
-    s: Date;
+    s!: Date;
     n = this.s;
     x() {
         var p = this.n;
diff --git a/tests/cases/conformance/expressions/newOperator/newOperatorConformance.ts b/tests/cases/conformance/expressions/newOperator/newOperatorConformance.ts
index b50751c7ae0f6..bf376cc235ef5 100644
--- a/tests/cases/conformance/expressions/newOperator/newOperatorConformance.ts
+++ b/tests/cases/conformance/expressions/newOperator/newOperatorConformance.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 class C0 {
 
diff --git a/tests/cases/conformance/expressions/newOperator/newOperatorErrorCases.ts b/tests/cases/conformance/expressions/newOperator/newOperatorErrorCases.ts
index 3279a42a137ab..92125d0b2b3fa 100644
--- a/tests/cases/conformance/expressions/newOperator/newOperatorErrorCases.ts
+++ b/tests/cases/conformance/expressions/newOperator/newOperatorErrorCases.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 class C0 {
 
diff --git a/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInAsyncGenerator.ts b/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInAsyncGenerator.ts
index 54f6923c3e66c..e72ec1910de1e 100644
--- a/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInAsyncGenerator.ts
+++ b/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInAsyncGenerator.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @lib: esnext
 // @noEmitHelpers: true
diff --git a/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern.2.ts b/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern.2.ts
index 5925fe4d86327..1ccd8375b133f 100644
--- a/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern.2.ts
+++ b/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @noTypesAndSymbols: true
 // @noEmit: true
diff --git a/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern.ts b/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern.ts
index 1231cb5d0fea5..315e66e5fa64c 100644
--- a/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern.ts
+++ b/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @noTypesAndSymbols: true
 
diff --git a/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer.2.ts b/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer.2.ts
index c3da31aa20300..580cd038dbfca 100644
--- a/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer.2.ts
+++ b/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @noTypesAndSymbols: true
 // @noEmit: true
diff --git a/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer.ts b/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer.ts
index f8c5da3042582..96a04c03a594e 100644
--- a/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer.ts
+++ b/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @noTypesAndSymbols: true
 
diff --git a/tests/cases/conformance/expressions/objectLiterals/objectLiteralGettersAndSetters.ts b/tests/cases/conformance/expressions/objectLiterals/objectLiteralGettersAndSetters.ts
index af0622179ac7f..b8784e5d1d721 100644
--- a/tests/cases/conformance/expressions/objectLiterals/objectLiteralGettersAndSetters.ts
+++ b/tests/cases/conformance/expressions/objectLiterals/objectLiteralGettersAndSetters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Get and set accessor with the same name
 var sameName1a = { get 'a'() { return ''; }, set a(n) { var p = n; var p: string; } };
 var sameName2a = { get 0.0() { return ''; }, set 0(n) { var p = n; var p: string; } };
diff --git a/tests/cases/conformance/expressions/optionalChaining/optionalChainingInParameterBindingPattern.2.ts b/tests/cases/conformance/expressions/optionalChaining/optionalChainingInParameterBindingPattern.2.ts
index 423e8a465139d..3255b3df4b73c 100644
--- a/tests/cases/conformance/expressions/optionalChaining/optionalChainingInParameterBindingPattern.2.ts
+++ b/tests/cases/conformance/expressions/optionalChaining/optionalChainingInParameterBindingPattern.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @noTypesAndSymbols: true
 // @noEmit: true
diff --git a/tests/cases/conformance/expressions/optionalChaining/optionalChainingInParameterBindingPattern.ts b/tests/cases/conformance/expressions/optionalChaining/optionalChainingInParameterBindingPattern.ts
index 38cabea7aeef2..38f05fec38d8f 100644
--- a/tests/cases/conformance/expressions/optionalChaining/optionalChainingInParameterBindingPattern.ts
+++ b/tests/cases/conformance/expressions/optionalChaining/optionalChainingInParameterBindingPattern.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @noTypesAndSymbols: true
 
diff --git a/tests/cases/conformance/expressions/optionalChaining/optionalChainingInParameterInitializer.2.ts b/tests/cases/conformance/expressions/optionalChaining/optionalChainingInParameterInitializer.2.ts
index 707be27f114c1..11226d13084b4 100644
--- a/tests/cases/conformance/expressions/optionalChaining/optionalChainingInParameterInitializer.2.ts
+++ b/tests/cases/conformance/expressions/optionalChaining/optionalChainingInParameterInitializer.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @noTypesAndSymbols: true
 // @noEmit: true
diff --git a/tests/cases/conformance/expressions/propertyAccess/propertyAccess.ts b/tests/cases/conformance/expressions/propertyAccess/propertyAccess.ts
index d5ea7e6e06a23..3f5595cb32734 100644
--- a/tests/cases/conformance/expressions/propertyAccess/propertyAccess.ts
+++ b/tests/cases/conformance/expressions/propertyAccess/propertyAccess.ts
@@ -1,8 +1,9 @@
+// @strict: false
 class A {
-    a: number;
+    a!: number;
 }
 class B extends A {
-    b: number;
+    b!: number;
 }
 enum Compass {
     North, South, East, West
@@ -10,7 +11,7 @@ enum Compass {
 
 var numIndex: { [n: number]: string } = { 3: 'three', 'three': 'three' };
 var strIndex: { [n: string]: Compass } = { 'N': Compass.North, 'E': Compass.East };
-var bothIndex:
+declare var bothIndex:
     {
         [n: string]: A;
         [m: number]: B;
@@ -26,8 +27,8 @@ var obj = {
     'literal property': 100
 };
 var anyVar: any = {};
-var stringOrNumber: string | number;
-var someObject: { name: string };
+declare var stringOrNumber: string | number;
+declare var someObject: { name: string };
 
 // Assign to a property access
 obj.y = 4;
diff --git a/tests/cases/conformance/expressions/propertyAccess/propertyAccessNumericLiterals.ts b/tests/cases/conformance/expressions/propertyAccess/propertyAccessNumericLiterals.ts
index 11feb1932b46d..c44fde6a19e79 100644
--- a/tests/cases/conformance/expressions/propertyAccess/propertyAccessNumericLiterals.ts
+++ b/tests/cases/conformance/expressions/propertyAccess/propertyAccessNumericLiterals.ts
@@ -1,3 +1,4 @@
+// @strict: false
 0xffffffff.toString();
 0o01234.toString();
 0b01101101.toString();
diff --git a/tests/cases/conformance/expressions/propertyAccess/propertyAccessStringIndexSignature.ts b/tests/cases/conformance/expressions/propertyAccess/propertyAccessStringIndexSignature.ts
index 7faf758bc9f60..865b800590a36 100644
--- a/tests/cases/conformance/expressions/propertyAccess/propertyAccessStringIndexSignature.ts
+++ b/tests/cases/conformance/expressions/propertyAccess/propertyAccessStringIndexSignature.ts
@@ -1,11 +1,12 @@
+// @noImplicitAny: true, false
 interface Flags { [name: string]: boolean };
-let flags: Flags;
+declare let flags: Flags;
 flags.b;
 flags.f;
 flags.isNotNecessarilyNeverFalse;
 flags['this is fine'];
 
 interface Empty { }
-let empty: Empty;
+declare let empty: Empty;
 empty.nope;
 empty["that's ok"];
diff --git a/tests/cases/conformance/expressions/propertyAccess/propertyAccessStringIndexSignatureNoImplicitAny.ts b/tests/cases/conformance/expressions/propertyAccess/propertyAccessStringIndexSignatureNoImplicitAny.ts
deleted file mode 100644
index bfb64c6098ac5..0000000000000
--- a/tests/cases/conformance/expressions/propertyAccess/propertyAccessStringIndexSignatureNoImplicitAny.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// @noImplicitAny: true
-interface Flags { [name: string]: boolean }
-let flags: Flags;
-flags.b;
-flags.f;
-flags.isNotNecessarilyNeverFalse;
-flags['this is fine'];
-
-interface Empty { }
-let empty: Empty;
-empty.nope;
-empty["not allowed either"];
diff --git a/tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts b/tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts
index 996bde4f9240c..952ca1562136a 100644
--- a/tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts
+++ b/tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //super call in class constructor with no base type
 class NoBase {
     constructor() {
diff --git a/tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts b/tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts
index 252a707821dc0..a15541ad8ff86 100644
--- a/tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts
+++ b/tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //super property access in constructor of class with no base type
 //super property access in instance member function of class with no base type
 //super property access in instance member accessor(get and set) of class with no base type
diff --git a/tests/cases/conformance/expressions/superPropertyAccess/superPropertyAccessNoError.ts b/tests/cases/conformance/expressions/superPropertyAccess/superPropertyAccessNoError.ts
index dcc167f2aef5c..fa183689cd940 100644
--- a/tests/cases/conformance/expressions/superPropertyAccess/superPropertyAccessNoError.ts
+++ b/tests/cases/conformance/expressions/superPropertyAccess/superPropertyAccessNoError.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 //super.publicInstanceMemberFunction in constructor of derived class
 //super.publicInstanceMemberFunction in instance member function of derived class
diff --git a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts
index 3d408c1af3378..fdc2400ee4272 100644
--- a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts
+++ b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class BaseErrClass {
     constructor(t: any) { }
 }
diff --git a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts
index bf017ea70843f..5dca8287eb7da 100644
--- a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts
+++ b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class BaseErrClass {
     constructor(t: any) { }
 }
diff --git a/tests/cases/conformance/expressions/thisKeyword/typeOfThisGeneral.ts b/tests/cases/conformance/expressions/thisKeyword/typeOfThisGeneral.ts
index 99d6a50b00102..db8f2a5c562ae 100644
--- a/tests/cases/conformance/expressions/thisKeyword/typeOfThisGeneral.ts
+++ b/tests/cases/conformance/expressions/thisKeyword/typeOfThisGeneral.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @useDefineForClassFields: false
 class MyTestClass {
@@ -7,28 +8,28 @@ class MyTestClass {
     constructor() {
         //type of 'this' in constructor body is the class instance type
         var p = this.canary;
-        var p: number;
+        var p!: number;
         this.canary = 3;
     }
 
     //type of 'this' in member function param list is the class instance type
     memberFunc(t = this) {
-        var t: MyTestClass;
+        var t!: MyTestClass;
 
         //type of 'this' in member function body is the class instance type
         var p = this;
-        var p: MyTestClass;
+        var p!: MyTestClass;
     }
 
     //type of 'this' in member accessor(get and set) body is the class instance type
     get prop() {
         var p = this;
-        var p: MyTestClass;
+        var p!: MyTestClass;
         return this;
     }
     set prop(v) {
         var p = this;
-        var p: MyTestClass;
+        var p!: MyTestClass;
         p = v;
         v = p;
     }
@@ -36,18 +37,18 @@ class MyTestClass {
     someFunc = () => {
         //type of 'this' in member variable initializer is the class instance type
         var t = this;
-        var t: MyTestClass;
+        var t!: MyTestClass;
     };
 
     //type of 'this' in static function param list is constructor function type
     static staticFn(t = this) {
-        var t: typeof MyTestClass;
+        var t!: typeof MyTestClass;
         var t = MyTestClass;
         t.staticCanary;
 
         //type of 'this' in static function body is constructor function type
         var p = this;
-        var p: typeof MyTestClass;
+        var p!: typeof MyTestClass;
         var p = MyTestClass;
         p.staticCanary;
     }
@@ -55,7 +56,7 @@ class MyTestClass {
     static get staticProp() {
         //type of 'this' in static accessor body is constructor function type
         var p = this;
-        var p: typeof MyTestClass;
+        var p!: typeof MyTestClass;
         var p = MyTestClass;
         p.staticCanary;
         return this;
@@ -63,7 +64,7 @@ class MyTestClass {
     static set staticProp(v: typeof MyTestClass) {
         //type of 'this' in static accessor body is constructor function type
         var p = this;
-        var p: typeof MyTestClass;
+        var p!: typeof MyTestClass;
         var p = MyTestClass;
         p.staticCanary;
     }
@@ -76,28 +77,28 @@ class MyGenericTestClass<T, U> {
     constructor() {
         //type of 'this' in constructor body is the class instance type
         var p = this.canary;
-        var p: number;
+        var p!: number;
         this.canary = 3;
     }
 
     //type of 'this' in member function param list is the class instance type
     memberFunc(t = this) {
-        var t: MyGenericTestClass<T, U>;
+        var t!: MyGenericTestClass<T, U>;
 
         //type of 'this' in member function body is the class instance type
         var p = this;
-        var p: MyGenericTestClass<T, U>;
+        var p!: MyGenericTestClass<T, U>;
     }
 
     //type of 'this' in member accessor(get and set) body is the class instance type
     get prop() {
         var p = this;
-        var p: MyGenericTestClass<T, U>;
+        var p!: MyGenericTestClass<T, U>;
         return this;
     }
     set prop(v) {
         var p = this;
-        var p: MyGenericTestClass<T, U>;
+        var p!: MyGenericTestClass<T, U>;
         p = v;
         v = p;
     }
@@ -105,18 +106,18 @@ class MyGenericTestClass<T, U> {
     someFunc = () => {
         //type of 'this' in member variable initializer is the class instance type
         var t = this;
-        var t: MyGenericTestClass<T, U>;
+        var t!: MyGenericTestClass<T, U>;
     };
 
     //type of 'this' in static function param list is constructor function type
     static staticFn(t = this) {
-        var t: typeof MyGenericTestClass;
+        var t!: typeof MyGenericTestClass;
         var t = MyGenericTestClass;
         t.staticCanary;
 
         //type of 'this' in static function body is constructor function type
         var p = this;
-        var p: typeof MyGenericTestClass;
+        var p!: typeof MyGenericTestClass;
         var p = MyGenericTestClass;
         p.staticCanary;
     }
@@ -124,7 +125,7 @@ class MyGenericTestClass<T, U> {
     static get staticProp() {
         //type of 'this' in static accessor body is constructor function type
         var p = this;
-        var p: typeof MyGenericTestClass;
+        var p!: typeof MyGenericTestClass;
         var p = MyGenericTestClass;
         p.staticCanary;
         return this;
@@ -132,7 +133,7 @@ class MyGenericTestClass<T, U> {
     static set staticProp(v: typeof MyGenericTestClass) {
         //type of 'this' in static accessor body is constructor function type
         var p = this;
-        var p: typeof MyGenericTestClass;
+        var p!: typeof MyGenericTestClass;
         var p = MyGenericTestClass;
         p.staticCanary;
     }
@@ -140,39 +141,39 @@ class MyGenericTestClass<T, U> {
 
 //type of 'this' in a function declaration param list is Any
 function fn(s = this) {
-    var s: any;
+    var s!: any;
     s.spaaaaaaace = 4;
 
     //type of 'this' in a function declaration body is Any
-    var t: any;
+    var t!: any;
     var t = this;
     this.spaaaaace = 4;
 }
 
 //type of 'this' in a function expression param list list is Any
 var q1 = function (s = this) {
-    var s: any;
+    var s!: any;
     s.spaaaaaaace = 4;
 
     //type of 'this' in a function expression body is Any
-    var t: any;
+    var t!: any;
     var t = this;
     this.spaaaaace = 4;
 }
 
 //type of 'this' in a fat arrow expression param list is typeof globalThis
 var q2 = (s = this) => {
-    var s: typeof globalThis;
+    var s!: typeof globalThis;
     s.spaaaaaaace = 4;
 
     //type of 'this' in a fat arrow expression body is typeof globalThis
-    var t: typeof globalThis;
+    var t!: typeof globalThis;
     var t = this;
     this.spaaaaace = 4;
 }
 
-//type of 'this' in global module is GlobalThis
-var t: typeof globalThis;
+//type of 'this' in global namespace is GlobalThis
+var t!: typeof globalThis;
 var t = this;
 this.spaaaaace = 4;
 
diff --git a/tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts b/tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts
index f30eafb39188c..63c8e9a5f1b2a 100644
--- a/tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts
+++ b/tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts
@@ -1,11 +1,12 @@
+// @strict: false
 // Function call whose argument is a 1 arg generic function call with explicit type arguments
 function fn1<T>(t: T) { }
 function fn2(t: any) { }
 
 fn1(fn2<string>(4)); // Error
 
-var a: any;
-var s: string;
+declare var a: any;
+declare var s: string;
 
 // Type assertion of non - unary expression
 var a = <any>"" + 4;
@@ -39,8 +40,8 @@ someOther = <SomeOther>someBase; // Error
 someOther = <SomeOther>someOther;
 
 // Type assertion cannot be a type-predicate type
-var numOrStr: number | string;
-var str: string;
+declare var numOrStr: number | string;
+declare var str: string;
 if(<numOrStr is string>(numOrStr === undefined)) { // Error
 	str = numOrStr; // Error, no narrowing occurred
 }
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardFunction.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardFunction.ts
index 57d56ccc3b68d..d5c6c860ebce7 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardFunction.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 class A {
     propA: number;
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionGenerics.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionGenerics.ts
index d0e108b5735b7..e36c28a925b6d 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionGenerics.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionGenerics.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 class A {
     propA: number;
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts
index 12f6687c4015a..ae594be9d2c4f 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 class RoyalGuard {
     isLeader(): this is LeadGuard {
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts
index 1c449e624f15c..08f9b77f2a044 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 class RoyalGuard {
     isLeader(): this is LeadGuard {
@@ -31,7 +32,7 @@ function invalidGuard(c: any): this is number {
     return false;
 }
 
-let c: number | number[];
+declare var c: number | number[];
 if (invalidGuard(c)) {
     c;
 }
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts
index aa394aaa75b99..d520656569e13 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts
@@ -1,4 +1,4 @@
-let x: string | number;
+declare var x: string | number;
 
 if (typeof x === "string") {
     let n = class {
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormExpr1AndExpr2.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormExpr1AndExpr2.ts
index 1ed8e6ebb04ba..cea7eec58f77f 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormExpr1AndExpr2.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormExpr1AndExpr2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var str: string;
 var bool: boolean;
 var num: number;
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormExpr1OrExpr2.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormExpr1OrExpr2.ts
index 1d72f35828471..9a75076c2643b 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormExpr1OrExpr2.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormExpr1OrExpr2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var str: string;
 var bool: boolean;
 var num: number;
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts
index decf6d99353eb..118463748c7c9 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts
@@ -60,7 +60,7 @@ namespace Test {
 		isFollower: this is GenericFollowerGuard<T>;
 	}
 
-	let guard: GenericGuard<File>;
+	declare var guard: GenericGuard<File>;
 	if (guard.isLeader) {
 		guard.lead();
 	}
@@ -76,7 +76,7 @@ namespace Test {
 		do(): void;
 	}
 
-	let general: SpecificGuard;
+	declare var general: SpecificGuard;
 	if (general.isMoreSpecific) {
 		general.do();
 	}
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts
index 03d650ad6261f..4b4cd755702e9 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts
@@ -1,9 +1,9 @@
 class C { private p: string };
 
-var strOrNum: string | number;
-var strOrBool: string | boolean;
-var numOrBool: number | boolean
-var strOrC: string | C;
+declare var strOrNum: string | number;
+declare var strOrBool: string | boolean;
+declare var numOrBool: number | boolean;
+declare var strOrC: string | C;
 
 // typeof x == s has not effect on typeguard
 if (typeof strOrNum == "string") {
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts
index 19d5495fcbba9..f20709e8c90bf 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts
@@ -1,9 +1,9 @@
 class C { private p: string };
 
-var strOrNum: string | number;
-var strOrBool: string | boolean;
-var numOrBool: number | boolean
-var strOrC: string | C;
+declare var strOrNum: string | number;
+declare var strOrBool: string | boolean;
+declare var numOrBool: number | boolean;
+declare var strOrC: string | C;
 
 // typeof x != s has not effect on typeguard
 if (typeof strOrNum != "string") {
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts
index 92b3103723e57..c072576ec7160 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts
@@ -7,9 +7,9 @@ var strOrNum: string | number;
 var strOrBool: string | boolean;
 var numOrBool: number | boolean
 var strOrNumOrBool: string | number | boolean;
-var strOrC: string | C;
-var numOrC: number | C;
-var boolOrC: boolean | C;
+declare var strOrC: string | C;
+declare var numOrC: number | C;
+declare var boolOrC: boolean | C;
 var emptyObj: {};
 var c: C;
 
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardsWithInstanceOfByConstructorSignature.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardsWithInstanceOfByConstructorSignature.ts
index 39febe097edc0..99add0b7bac11 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardsWithInstanceOfByConstructorSignature.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardsWithInstanceOfByConstructorSignature.ts
@@ -6,13 +6,13 @@ interface A {
 }
 declare var A: AConstructor;
 
-var obj1: A | string;
+declare var obj1: A | string;
 if (obj1 instanceof A) { // narrowed to A.
     obj1.foo;
     obj1.bar;
 }
 
-var obj2: any;
+declare var obj2: any;
 if (obj2 instanceof A) {
     obj2.foo;
     obj2.bar;
@@ -27,14 +27,14 @@ interface B<T> {
 }
 declare var B: BConstructor;
 
-var obj3: B<number> | string;
+declare var obj3: B<number> | string;
 if (obj3 instanceof B) { // narrowed to B<number>.
     obj3.foo = 1;
     obj3.foo = "str";
     obj3.bar = "str";
 }
 
-var obj4: any;
+declare var obj4: any;
 if (obj4 instanceof B) {
     obj4.foo = "str";
     obj4.foo = 1;
@@ -58,7 +58,7 @@ interface C2 {
 }
 declare var C: CConstructor;
 
-var obj5: C1 | A;
+declare var obj5: C1 | A;
 if (obj5 instanceof C) { // narrowed to C1.
     obj5.foo;
     obj5.c;
@@ -66,7 +66,7 @@ if (obj5 instanceof C) { // narrowed to C1.
     obj5.bar2;
 }
 
-var obj6: any;
+declare var obj6: any;
 if (obj6 instanceof C) {
     obj6.foo;
     obj6.bar1;
@@ -79,13 +79,13 @@ interface D {
 }
 declare var D: { new (): D; };
 
-var obj7: D | string;
+declare var obj7: D | string;
 if (obj7 instanceof D) { // narrowed to D.
     obj7.foo;
     obj7.bar;
 }
 
-var obj8: any;
+declare var obj8: any;
 if (obj8 instanceof D) {
     obj8.foo;
     obj8.bar;
@@ -105,14 +105,14 @@ interface E2 {
 }
 declare var E: EConstructor;
 
-var obj9: E1 | A;
+declare var obj9: E1 | A;
 if (obj9 instanceof E) { // narrowed to E1
     obj9.foo;
     obj9.bar1;
     obj9.bar2;
 }
 
-var obj10: any;
+declare var obj10: any;
 if (obj10 instanceof E) {
     obj10.foo;
     obj10.bar1;
@@ -129,13 +129,13 @@ interface F {
 }
 declare var F: FConstructor;
 
-var obj11: F | string;
+declare var obj11: F | string;
 if (obj11 instanceof F) { // can't type narrowing, construct signature returns any.
     obj11.foo;
     obj11.bar;
 }
 
-var obj12: any;
+declare var obj12: any;
 if (obj12 instanceof F) {
     obj12.foo;
     obj12.bar;
@@ -154,13 +154,13 @@ interface G2 {
 }
 declare var G: GConstructor;
 
-var obj13: G1 | G2;
+declare var obj13: G1 | G2;
 if (obj13 instanceof G) { // narrowed to G1. G1 is return type of prototype property.
     obj13.foo1;
     obj13.foo2;
 }
 
-var obj14: any;
+declare var obj14: any;
 if (obj14 instanceof G) {
     obj14.foo1;
     obj14.foo2;
@@ -176,25 +176,25 @@ interface H {
 }
 declare var H: HConstructor;
 
-var obj15: H | string;
+declare var obj15: H | string;
 if (obj15 instanceof H) { // narrowed to H.
     obj15.foo;
     obj15.bar;
 }
 
-var obj16: any;
+declare var obj16: any;
 if (obj16 instanceof H) {
     obj16.foo1;
     obj16.foo2;
 }
 
-var obj17: any;
+declare var obj17: any;
 if (obj17 instanceof Object) { // can't narrow type from 'any' to 'Object'
     obj17.foo1;
     obj17.foo2;
 }
 
-var obj18: any;
+declare var obj18: any;
 if (obj18 instanceof Function) { // can't narrow type from 'any' to 'Function'
     obj18.foo1;
     obj18.foo2;
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardsWithInstanceOfBySymbolHasInstance.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardsWithInstanceOfBySymbolHasInstance.ts
index d47a87a483548..bbb4e97e363bf 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardsWithInstanceOfBySymbolHasInstance.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardsWithInstanceOfBySymbolHasInstance.ts
@@ -9,13 +9,13 @@ interface A {
 }
 declare var A: AConstructor;
 
-var obj1: A | string;
+declare var obj1: A | string;
 if (obj1 instanceof A) { // narrowed to A.
     obj1.foo;
     obj1.bar;
 }
 
-var obj2: any;
+declare var obj2: any;
 if (obj2 instanceof A) {
     obj2.foo;
     obj2.bar;
@@ -31,14 +31,14 @@ interface B<T> {
 }
 declare var B: BConstructor;
 
-var obj3: B<number> | string;
+declare var obj3: B<number> | string;
 if (obj3 instanceof B) { // narrowed to B<number>.
     obj3.foo = 1;
     obj3.foo = "str";
     obj3.bar = "str";
 }
 
-var obj4: any;
+declare var obj4: any;
 if (obj4 instanceof B) {
     obj4.foo = "str";
     obj4.foo = 1;
@@ -63,7 +63,7 @@ interface C2 {
 }
 declare var C: CConstructor;
 
-var obj5: C1 | A;
+declare var obj5: C1 | A;
 if (obj5 instanceof C) { // narrowed to C1.
     obj5.foo;
     obj5.c;
@@ -71,7 +71,7 @@ if (obj5 instanceof C) { // narrowed to C1.
     obj5.bar2;
 }
 
-var obj6: any;
+declare var obj6: any;
 if (obj6 instanceof C) {
     obj6.foo;
     obj6.bar1;
@@ -87,13 +87,13 @@ declare var D: {
     [Symbol.hasInstance](value: unknown): value is D;
 };
 
-var obj7: D | string;
+declare var obj7: D | string;
 if (obj7 instanceof D) { // narrowed to D.
     obj7.foo;
     obj7.bar;
 }
 
-var obj8: any;
+declare var obj8: any;
 if (obj8 instanceof D) {
     obj8.foo;
     obj8.bar;
@@ -114,14 +114,14 @@ interface E2 {
 }
 declare var E: EConstructor;
 
-var obj9: E1 | A;
+declare var obj9: E1 | A;
 if (obj9 instanceof E) { // narrowed to E1
     obj9.foo;
     obj9.bar1;
     obj9.bar2;
 }
 
-var obj10: any;
+declare var obj10: any;
 if (obj10 instanceof E) {
     obj10.foo;
     obj10.bar1;
@@ -139,13 +139,13 @@ interface F {
 }
 declare var F: FConstructor;
 
-var obj11: F | string;
+declare var obj11: F | string;
 if (obj11 instanceof F) { // can't type narrowing, construct signature returns any.
     obj11.foo;
     obj11.bar;
 }
 
-var obj12: any;
+declare var obj12: any;
 if (obj12 instanceof F) {
     obj12.foo;
     obj12.bar;
@@ -165,13 +165,13 @@ interface G2 {
 }
 declare var G: GConstructor;
 
-var obj13: G1 | G2;
+declare var obj13: G1 | G2;
 if (obj13 instanceof G) { // narrowed to G1. G1 is return type of prototype property.
     obj13.foo1;
     obj13.foo2;
 }
 
-var obj14: any;
+declare var obj14: any;
 if (obj14 instanceof G) {
     obj14.foo1;
     obj14.foo2;
@@ -188,25 +188,25 @@ interface H {
 }
 declare var H: HConstructor;
 
-var obj15: H | string;
+declare var obj15: H | string;
 if (obj15 instanceof H) { // narrowed to H.
     obj15.foo;
     obj15.bar;
 }
 
-var obj16: any;
+declare var obj16: any;
 if (obj16 instanceof H) {
     obj16.foo1;
     obj16.foo2;
 }
 
-var obj17: any;
+declare var obj17: any;
 if (obj17 instanceof Object) { // can't narrow type from 'any' to 'Object'
     obj17.foo1;
     obj17.foo2;
 }
 
-var obj18: any;
+declare var obj18: any;
 if (obj18 instanceof Function) { // can't narrow type from 'any' to 'Function'
     obj18.foo1;
     obj18.foo2;
diff --git a/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithAnyOtherType.ts
index b7b63b1371dcd..a45486260d05f 100644
--- a/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithAnyOtherType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithAnyOtherType.ts
@@ -1,12 +1,13 @@
+// @strict: false
 // @allowUnreachableCode: true
 
 // ~ operator on any type
 
-var ANY: any;
-var ANY1;
-var ANY2: any[] = ["", ""];
-var obj: () => {}
-var obj1 = { x:"", y: () => { }};
+declare var ANY: any;
+declare var ANY1;
+declare var ANY2: any[];
+declare var obj: () => {};
+declare var obj1: { x:"", y: () => { }};
 
 function foo(): any {
     var a;
@@ -20,9 +21,9 @@ class A {
     }
 }
 namespace M {
-    export var n: any;
+    export declare var n: any;
 }
-var objA = new A();
+declare var objA: A;
 
 // any other type var
 var ResultIsNumber = ~ANY1;
diff --git a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType.ts
index b6562299cb7de..e7f28b2c3d439 100644
--- a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // -- operator on any type
 
 var ANY: any;
diff --git a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherTypeInvalidOperations.ts b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherTypeInvalidOperations.ts
index 610fea7443c4a..7847102411f51 100644
--- a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherTypeInvalidOperations.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherTypeInvalidOperations.ts
@@ -1,8 +1,9 @@
+// @strict: false
 // -- operator on any type
-var ANY1: any;
+declare var ANY1: any;
 var ANY2: any[] = ["", ""];
 
-var obj: () => {}
+declare var obj: () => {}
 var obj1 = { x: "", y: () => { } };
 function foo(): any {
     var a;
diff --git a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts
index fca19d38daa45..1faae5c4fb80f 100644
--- a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // -- operator on enum type
 
 enum ENUM { };
diff --git a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberTypeInvalidOperations.ts b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberTypeInvalidOperations.ts
index 1e9d96107c888..55e011a613422 100644
--- a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberTypeInvalidOperations.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberTypeInvalidOperations.ts
@@ -1,5 +1,5 @@
 // -- operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
 
 function foo(): number { return 1; }
diff --git a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedBooleanType.ts
index 617417c72520a..91e49a5719112 100644
--- a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedBooleanType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedBooleanType.ts
@@ -1,5 +1,5 @@
 // -- operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 
 function foo(): boolean { return true; }
 
diff --git a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedStringType.ts b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedStringType.ts
index 4b9658a207728..8313dbd93ff60 100644
--- a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedStringType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedStringType.ts
@@ -1,5 +1,5 @@
 // -- operator on string type
-var STRING: string;
+declare var STRING: string;
 var STRING1: string[] = ["", ""];
 
 function foo(): string { return ""; }
diff --git a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithAnyOtherType.ts
index 3954f64481f97..2b3569db3e0d5 100644
--- a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithAnyOtherType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithAnyOtherType.ts
@@ -1,9 +1,10 @@
+// @strict: false
 // delete  operator on any type
 
-var ANY: any;
-var ANY1;
+declare var ANY: any;
+declare var ANY1;
 var ANY2: any[] = ["", ""];
-var obj: () => {};
+declare var obj: () => {};
 var obj1 = { x: "", y: () => { }};
 function foo(): any {
     var a;
diff --git a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithBooleanType.ts
index c574445954352..49601e062b8ad 100644
--- a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithBooleanType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithBooleanType.ts
@@ -1,5 +1,5 @@
 // delete  operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 
 function foo(): boolean { return true; }
 
diff --git a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithNumberType.ts
index 8ce9862705d94..12c562abd124c 100644
--- a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithNumberType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithNumberType.ts
@@ -1,5 +1,5 @@
 // delete  operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
 
 function foo(): number { return 1; }
diff --git a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithStringType.ts b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithStringType.ts
index 90a2a9bc3a9f1..c4d8f9979a2d8 100644
--- a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithStringType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithStringType.ts
@@ -1,5 +1,5 @@
 // delete  operator on string type
-var STRING: string;
+declare var STRING: string;
 var STRING1: string[] = ["", "abc"];
 
 function foo(): string { return "abc"; }
diff --git a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType.ts
index c36cd5ca480b0..85a99657b894d 100644
--- a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // ++ operator on any type
 
 var ANY: any;
diff --git a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherTypeInvalidOperations.ts b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherTypeInvalidOperations.ts
index c5df5cb53a022..8bd7a659f81a5 100644
--- a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherTypeInvalidOperations.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherTypeInvalidOperations.ts
@@ -1,8 +1,9 @@
+// @strict: false
 // ++ operator on any type
 var ANY1: any;
 var ANY2: any[] = [1, 2];
 
-var obj: () => {}
+declare var obj: () => {}
 var obj1 = { x: "", y: () => { } };
 function foo(): any {
     var a;
diff --git a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberTypeInvalidOperations.ts b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberTypeInvalidOperations.ts
index 6485392c3e4bc..ead050ca5fd37 100644
--- a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberTypeInvalidOperations.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberTypeInvalidOperations.ts
@@ -1,11 +1,11 @@
 // ++ operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
 
 function foo(): number { return 1; }
 
 class A {
-    public a: number;
+    public a!: number;
     static foo() { return 1; }
 }
 namespace M {
diff --git a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedBooleanType.ts
index 7985957cee984..998a564b3e221 100644
--- a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedBooleanType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedBooleanType.ts
@@ -1,10 +1,10 @@
 // ++ operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 
 function foo(): boolean { return true; }
 
 class A {
-    public a: boolean;
+    public a!: boolean;
     static foo() { return true; }
 }
 namespace M {
diff --git a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedStringType.ts b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedStringType.ts
index af73a815238f9..b70a81b99175b 100644
--- a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedStringType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedStringType.ts
@@ -1,11 +1,11 @@
 // ++ operator on string type
-var STRING: string;
+declare var STRING: string;
 var STRING1: string[] = ["", ""];
 
 function foo(): string { return ""; }
 
 class A {
-    public a: string;
+    public a!: string;
     static foo() { return ""; }
 }
 namespace M {
diff --git a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorInvalidOperations.ts b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorInvalidOperations.ts
index 5e535a2f8e389..c4ee042263f97 100644
--- a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorInvalidOperations.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorInvalidOperations.ts
@@ -1,5 +1,5 @@
 // Unary operator !
-var b: number;
+declare var b: number;
 
 // operand before !
 var BOOLEAN1 = b!;  //expect error
diff --git a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithAnyOtherType.ts
index a82a6e9625d77..b7723bc7aa385 100644
--- a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithAnyOtherType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithAnyOtherType.ts
@@ -3,7 +3,7 @@
 var ANY: any;
 var ANY1;
 var ANY2: any[] = ["", ""];
-var obj: () => {}
+declare var obj: () => {}
 var obj1 = { x: "", y: () => { }};
 function foo(): any {
     var a;
diff --git a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithBooleanType.ts
index f8e530b348541..bd191eb9400c4 100644
--- a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithBooleanType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithBooleanType.ts
@@ -1,14 +1,14 @@
 // ! operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 
 function foo(): boolean { return true; }
 
 class A {
-    public a: boolean;
+    public a!: boolean;
     static foo() { return false; }
 }
 namespace M {
-    export var n: boolean;
+    export declare var n: boolean;
 }
 
 var objA = new A();
diff --git a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithNumberType.ts
index 492d06084dcb6..8cd379be629ea 100644
--- a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithNumberType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithNumberType.ts
@@ -1,15 +1,15 @@
 // ! operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
 
 function foo(): number { return 1; }
 
 class A {
-    public a: number;
+    public a!: number;
     static foo() { return 1; }
 }
 namespace M {
-    export var n: number;
+    export declare var n: number;
 }
 
 var objA = new A();
diff --git a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithStringType.ts b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithStringType.ts
index 84c311fcfffa6..c7ad76523a714 100644
--- a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithStringType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithStringType.ts
@@ -1,15 +1,15 @@
 // ! operator on string type
-var STRING: string;
+declare var STRING: string;
 var STRING1: string[] = ["", "abc"];
 
 function foo(): string { return "abc"; }
 
 class A {
-    public a: string;
+    public a!: string;
     static foo() { return ""; }
 }
 namespace M {
-    export var n: string;
+    export declare var n: string;
 }
 
 var objA = new A();
diff --git a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithAnyOtherType.ts
index 1bc646fc84dda..6a0196d271727 100644
--- a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithAnyOtherType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithAnyOtherType.ts
@@ -11,7 +11,7 @@ function foo(): any {
     return a;
 }
 class A {
-    public a: any;
+    public a!: any;
     static foo(): any {
         var a;
         return a;
diff --git a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithBooleanType.ts
index 9f2a6a21c2a88..315364d25b425 100644
--- a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithBooleanType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithBooleanType.ts
@@ -1,14 +1,14 @@
 // - operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 
 function foo(): boolean { return true; }
 
 class A {
-    public a: boolean;
+    public a!: boolean;
     static foo() { return false; }
 }
 namespace M {
-    export var n: boolean;
+    export declare var n: boolean;
 }
 
 var objA = new A();
diff --git a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithNumberType.ts
index 681b71e87bb7a..7b149145176bd 100644
--- a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithNumberType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithNumberType.ts
@@ -1,15 +1,15 @@
 // - operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
 
 function foo(): number { return 1; }
 
 class A {
-    public a: number;
+    public a!: number;
     static foo() { return 1; }
 }
 namespace M {
-    export var n: number;
+    export declare var n: number;
 }
 
 var objA = new A();
diff --git a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithStringType.ts b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithStringType.ts
index d2f4480689b2f..e51cecc13146b 100644
--- a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithStringType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithStringType.ts
@@ -1,15 +1,15 @@
 // - operator on string type
-var STRING: string;
+declare var STRING: string;
 var STRING1: string[] = ["", "abc"];
 
 function foo(): string { return "abc"; }
 
 class A {
-    public a: string;
+    public a!: string;
     static foo() { return ""; }
 }
 namespace M {
-    export var n: string;
+    export var n: string = "";
 }
 
 var objA = new A();
diff --git a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithAnyOtherType.ts
index 0f858adad6068..a5e675e575230 100644
--- a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithAnyOtherType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithAnyOtherType.ts
@@ -1,24 +1,25 @@
+// @strict: false
 // + operator on any type
 
-var ANY: any;
-var ANY1;
+declare var ANY: any;
+declare var ANY1: any;
 var ANY2: any[] = ["", ""];
-var obj: () => {}
+declare var obj: () => {}
 var obj1 = { x: (s: string) => { }, y: (s1) => { }};
 
 function foo(): any {
-    var a;
+    var a = undefined;
     return a;
 }
 class A {
-    public a: any;
+    public a!: any;
     static foo() {
-        var a;
+        var a: any = undefined;
         return a;
     }
 }
 namespace M {
-    export var n: any;
+    export var n: any = undefined;
 }
 var objA = new A();
 
diff --git a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithBooleanType.ts
index f636ee849fd96..e9b64121701c0 100644
--- a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithBooleanType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithBooleanType.ts
@@ -1,14 +1,14 @@
 // + operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 
 function foo(): boolean { return true; }
 
 class A {
-    public a: boolean;
+    public a!: boolean;
     static foo() { return false; }
 }
 namespace M {
-    export var n: boolean;
+    export var n: boolean = false;
 }
 
 var objA = new A();
diff --git a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithNumberType.ts
index eae2f4a373f02..68a76d08b4333 100644
--- a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithNumberType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithNumberType.ts
@@ -1,15 +1,15 @@
 // + operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
 
 function foo(): number { return 1; }
 
 class A {
-    public a: number;
+    public a!: number;
     static foo() { return 1; }
 }
 namespace M {
-    export var n: number;
+    export var n: number = 0;
 }
 
 var objA = new A();
diff --git a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithStringType.ts b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithStringType.ts
index 2ba0f993c0fa1..573bb5b472e52 100644
--- a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithStringType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithStringType.ts
@@ -1,15 +1,15 @@
 // + operator on string type
-var STRING: string;
+declare var STRING: string;
 var STRING1: string[] = ["", "abc"];
 
 function foo(): string { return "abc"; }
 
 class A {
-    public a: string;
+    public a!: string;
     static foo() { return ""; }
 }
 namespace M {
-    export var n: string;
+    export var n: string = "";
 }
 
 var objA = new A();
diff --git a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorInvalidOperations.ts b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorInvalidOperations.ts
index 63cb2f2c05be3..fa41f0af0a8b4 100644
--- a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorInvalidOperations.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorInvalidOperations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Unary operator typeof
 
 // opreand before typeof
diff --git a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts
index 1914d968045c2..5b09027f35758 100644
--- a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts
@@ -1,24 +1,25 @@
+// @noImplicitAny: false
 // typeof  operator on any type
 
-var ANY: any;
-var ANY1;
+declare var ANY: any;
+declare var ANY1;
 var ANY2: any[] = ["", ""];
-var obj: () => {}
+declare var obj: () => {};
 var obj1 = { x: "a", y: () => { }};
 
 function foo(): any {
-    var a;
+    var a!: any;
     return a;
 }
 class A {
     public a: any;
     static foo() {
-        var a;
+        var a!: any;
         return a;
     }
 }
 namespace M {
-    export var n: any;
+    export var n!: any;
 }
 var objA = new A();
 
@@ -62,9 +63,9 @@ typeof objA.a;
 typeof M.n;
 
 // use typeof in type query
-var z: any;
-var x: any[];
-var r: () => any;
+var z!: any;
+var x!: any[];
+var r!: () => any;
 z: typeof ANY;
 x: typeof ANY2;
 r: typeof foo;
diff --git a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType.ts
index 5a4bf1abe9e4c..80f874339e6db 100644
--- a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType.ts
@@ -1,7 +1,8 @@
+// @noImplicitAny: false
 // @allowUnusedLabels: true
 
 // typeof  operator on boolean type
-var BOOLEAN: boolean;
+declare var BOOLEAN: boolean;
 
 function foo(): boolean { return true; }
 
@@ -10,7 +11,7 @@ class A {
     static foo() { return false; }
 }
 namespace M {
-    export var n: boolean;
+    export var n!: boolean;
 }
 
 var objA = new A();
@@ -40,9 +41,9 @@ typeof objA.a;
 typeof M.n;
 
 // use typeof in type query
-var z: boolean;
-var x: boolean[];
-var r: () => boolean;
+declare var z: boolean;
+declare var x: boolean[];
+declare var r: () => boolean;
 z: typeof BOOLEAN;
 r: typeof foo;
 var y = { a: true, b: false};
diff --git a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType.ts
index eec41e9ba6c44..a13cfd2b58268 100644
--- a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType.ts
@@ -1,6 +1,6 @@
 // @allowUnusedLabels: true
 // typeof  operator on number type
-var NUMBER: number;
+declare var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
 
 function foo(): number { return 1; }
@@ -10,7 +10,7 @@ class A {
     static foo() { return 1; }
 }
 namespace M {
-    export var n: number;
+    export var n!: number;
 }
 
 var objA = new A();
@@ -46,8 +46,9 @@ typeof M.n;
 typeof objA.a, M.n;
 
 // use typeof in type query
-var z: number;
-var x: number[];
+declare var z: number;
+declare var x: number[];
+declare var r: () => number;
 z: typeof NUMBER;
 x: typeof NUMBER1;
 r: typeof foo;
diff --git a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType.ts b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType.ts
index 4e9a19464fb64..9b56ac7b8878a 100644
--- a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType.ts
@@ -1,5 +1,5 @@
 // typeof  operator on string type
-var STRING: string;
+declare var STRING: string;
 var STRING1: string[] = ["", "abc"];
 
 function foo(): string { return "abc"; }
@@ -9,7 +9,7 @@ class A {
     static foo() { return ""; }
 }
 namespace M {
-    export var n: string;
+    export var n!: string;
 }
 
 var objA = new A();
@@ -44,9 +44,9 @@ typeof foo();
 typeof objA.a, M.n;
 
 // use typeof in type query
-var z: string;
-var x: string[];
-var r: () => string;
+declare var z: string;
+declare var x: string[];
+declare var r: () => string;
 z: typeof STRING;
 x: typeof STRING1;
 r: typeof foo;
diff --git a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorInvalidOperations.ts b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorInvalidOperations.ts
index 7eb4b20abe828..6cd35588b22b6 100644
--- a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorInvalidOperations.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorInvalidOperations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Unary operator void
 
 // operand before void
diff --git a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithAnyOtherType.ts
index 2a0057158e361..66da0b6f2c551 100644
--- a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithAnyOtherType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithAnyOtherType.ts
@@ -1,24 +1,25 @@
+// @noImplicitAny: false
 // void  operator on any type
 
-var ANY: any;
-var ANY1;
+declare var ANY: any;
+declare var ANY1;
 var ANY2: any[] = ["", ""];
-var obj: () => {}
+declare var obj: () => {};
 var obj1 = {x:"",y:1};
 
 function foo(): any {
-    var a;
+    var a!: any;
     return a;
 }
 class A {
     public a: any;
     static foo() {
-        var a;
+        var a!: any;
         return a;
     }
 }
 namespace M {
-    export var n: any;
+    export var n!: any;
 }
 var objA = new A();
 
diff --git a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithBooleanType.ts
index ffbe615132f41..6a4f2b8c4445b 100644
--- a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithBooleanType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithBooleanType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // void  operator on boolean type
 var BOOLEAN: boolean;
 
diff --git a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithEnumType.ts b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithEnumType.ts
index 038aaed648353..007f146446895 100644
--- a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithEnumType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithEnumType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // void  operator on enum type
 
 enum ENUM { };
diff --git a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithNumberType.ts
index aad5daf7586f1..e1a6062bd4431 100644
--- a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithNumberType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithNumberType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // void  operator on number type
 var NUMBER: number;
 var NUMBER1: number[] = [1, 2];
diff --git a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithStringType.ts b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithStringType.ts
index fe4d83149a735..7ed383d669085 100644
--- a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithStringType.ts
+++ b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithStringType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // void  operator on string type
 var STRING: string;
 var STRING1: string[] = ["", "abc"];
diff --git a/tests/cases/conformance/expressions/valuesAndReferences/assignments.ts b/tests/cases/conformance/expressions/valuesAndReferences/assignments.ts
index 5746716b10665..432f2a3e8d234 100644
--- a/tests/cases/conformance/expressions/valuesAndReferences/assignments.ts
+++ b/tests/cases/conformance/expressions/valuesAndReferences/assignments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // In this file:
 //  Assign to a module
 //  Assign to a class
diff --git a/tests/cases/conformance/externalModules/es6/es6modulekindWithES5Target6.ts b/tests/cases/conformance/externalModules/es6/es6modulekindWithES5Target6.ts
index 713cfe7a9f937..3b8e36d70d701 100644
--- a/tests/cases/conformance/externalModules/es6/es6modulekindWithES5Target6.ts
+++ b/tests/cases/conformance/externalModules/es6/es6modulekindWithES5Target6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @module: es2015
 
diff --git a/tests/cases/conformance/externalModules/esnext/esnextmodulekindWithES5Target6.ts b/tests/cases/conformance/externalModules/esnext/esnextmodulekindWithES5Target6.ts
index 2c53a8a9254af..fe0e5e337fccc 100644
--- a/tests/cases/conformance/externalModules/esnext/esnextmodulekindWithES5Target6.ts
+++ b/tests/cases/conformance/externalModules/esnext/esnextmodulekindWithES5Target6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @module: esnext
 
diff --git a/tests/cases/conformance/externalModules/exportAssignTypes.ts b/tests/cases/conformance/externalModules/exportAssignTypes.ts
index 767aef93a7d6b..14b5d1af2dfb7 100644
--- a/tests/cases/conformance/externalModules/exportAssignTypes.ts
+++ b/tests/cases/conformance/externalModules/exportAssignTypes.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @Filename: expString.ts
 var x = "test";
 export = x;
diff --git a/tests/cases/conformance/externalModules/exportAssignmentCircularModules.ts b/tests/cases/conformance/externalModules/exportAssignmentCircularModules.ts
index 025e4f93c9886..1b3d19f4a6ac6 100644
--- a/tests/cases/conformance/externalModules/exportAssignmentCircularModules.ts
+++ b/tests/cases/conformance/externalModules/exportAssignmentCircularModules.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: amd
 // @Filename: foo_0.ts
 import foo1 = require('./foo_1');
diff --git a/tests/cases/conformance/externalModules/exportNonInitializedVariablesAMD.ts b/tests/cases/conformance/externalModules/exportNonInitializedVariablesAMD.ts
index 4875a90842487..dc72652eb61b0 100644
--- a/tests/cases/conformance/externalModules/exportNonInitializedVariablesAMD.ts
+++ b/tests/cases/conformance/externalModules/exportNonInitializedVariablesAMD.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: amd
 
 var;
diff --git a/tests/cases/conformance/externalModules/exportNonInitializedVariablesCommonJS.ts b/tests/cases/conformance/externalModules/exportNonInitializedVariablesCommonJS.ts
index a4a9bbc997d83..420cce6234c79 100644
--- a/tests/cases/conformance/externalModules/exportNonInitializedVariablesCommonJS.ts
+++ b/tests/cases/conformance/externalModules/exportNonInitializedVariablesCommonJS.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: commonjs
 
 var;
diff --git a/tests/cases/conformance/externalModules/exportNonInitializedVariablesES6.ts b/tests/cases/conformance/externalModules/exportNonInitializedVariablesES6.ts
index 0daf3e422d70c..396ef500d9242 100644
--- a/tests/cases/conformance/externalModules/exportNonInitializedVariablesES6.ts
+++ b/tests/cases/conformance/externalModules/exportNonInitializedVariablesES6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 
 var;
diff --git a/tests/cases/conformance/externalModules/exportNonInitializedVariablesSystem.ts b/tests/cases/conformance/externalModules/exportNonInitializedVariablesSystem.ts
index a10175975e56a..3d767964d26d6 100644
--- a/tests/cases/conformance/externalModules/exportNonInitializedVariablesSystem.ts
+++ b/tests/cases/conformance/externalModules/exportNonInitializedVariablesSystem.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: system
 
 var;
diff --git a/tests/cases/conformance/externalModules/exportNonInitializedVariablesUMD.ts b/tests/cases/conformance/externalModules/exportNonInitializedVariablesUMD.ts
index c92632defd812..030bbd189e05a 100644
--- a/tests/cases/conformance/externalModules/exportNonInitializedVariablesUMD.ts
+++ b/tests/cases/conformance/externalModules/exportNonInitializedVariablesUMD.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@module: umd
 
 var;
diff --git a/tests/cases/conformance/externalModules/initializersInDeclarations.ts b/tests/cases/conformance/externalModules/initializersInDeclarations.ts
index b1b5ed6d7c438..77bb4a510bdd2 100644
--- a/tests/cases/conformance/externalModules/initializersInDeclarations.ts
+++ b/tests/cases/conformance/externalModules/initializersInDeclarations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @Filename: file1.d.ts
 
 // Errors: Initializers & statements in declaration file
diff --git a/tests/cases/conformance/externalModules/topLevelAmbientModule.ts b/tests/cases/conformance/externalModules/topLevelAmbientModule.ts
index cab2b9827a989..9a664184e040d 100644
--- a/tests/cases/conformance/externalModules/topLevelAmbientModule.ts
+++ b/tests/cases/conformance/externalModules/topLevelAmbientModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @Filename: foo_0.ts
 declare module "foo" {
diff --git a/tests/cases/conformance/externalModules/topLevelAwait.1.ts b/tests/cases/conformance/externalModules/topLevelAwait.1.ts
index 5a93880a5abda..185aff68775a2 100644
--- a/tests/cases/conformance/externalModules/topLevelAwait.1.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwait.1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015,es2017
 // @module: es2022,esnext,system
 // @experimentalDecorators: true
diff --git a/tests/cases/conformance/externalModules/topLevelAwait.2.ts b/tests/cases/conformance/externalModules/topLevelAwait.2.ts
index 7fd2c1782a7f2..8b652343dcdf5 100644
--- a/tests/cases/conformance/externalModules/topLevelAwait.2.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwait.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: es2022,esnext
 
diff --git a/tests/cases/conformance/externalModules/topLevelAwait.3.ts b/tests/cases/conformance/externalModules/topLevelAwait.3.ts
index 6deeb59afe385..0a9c0bdbbfe49 100644
--- a/tests/cases/conformance/externalModules/topLevelAwait.3.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwait.3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: es2022,esnext
 // @filename: index.d.ts
diff --git a/tests/cases/conformance/externalModules/topLevelAwaitErrors.1.ts b/tests/cases/conformance/externalModules/topLevelAwaitErrors.1.ts
index 7ff5f4f5c892a..d63287dd4a464 100644
--- a/tests/cases/conformance/externalModules/topLevelAwaitErrors.1.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwaitErrors.1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: es2022,esnext
 // @experimentalDecorators: true
diff --git a/tests/cases/conformance/externalModules/topLevelAwaitErrors.10.ts b/tests/cases/conformance/externalModules/topLevelAwaitErrors.10.ts
index af60e3db79005..703d3e995cffb 100644
--- a/tests/cases/conformance/externalModules/topLevelAwaitErrors.10.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwaitErrors.10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: es2022,esnext
 
diff --git a/tests/cases/conformance/externalModules/topLevelAwaitErrors.11.ts b/tests/cases/conformance/externalModules/topLevelAwaitErrors.11.ts
index c200b17ef3598..b8465398597f1 100644
--- a/tests/cases/conformance/externalModules/topLevelAwaitErrors.11.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwaitErrors.11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: commonjs
 
diff --git a/tests/cases/conformance/externalModules/topLevelAwaitErrors.12.ts b/tests/cases/conformance/externalModules/topLevelAwaitErrors.12.ts
index 73c126628bf64..122ad32c5eeb1 100644
--- a/tests/cases/conformance/externalModules/topLevelAwaitErrors.12.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwaitErrors.12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: es2022,esnext
 
diff --git a/tests/cases/conformance/externalModules/topLevelAwaitErrors.2.ts b/tests/cases/conformance/externalModules/topLevelAwaitErrors.2.ts
index 609e374c2cc7e..a33140f42311e 100644
--- a/tests/cases/conformance/externalModules/topLevelAwaitErrors.2.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwaitErrors.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: es2022,esnext
 
diff --git a/tests/cases/conformance/externalModules/topLevelAwaitErrors.3.ts b/tests/cases/conformance/externalModules/topLevelAwaitErrors.3.ts
index 2841a03e0d70a..5c70c272b5bb4 100644
--- a/tests/cases/conformance/externalModules/topLevelAwaitErrors.3.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwaitErrors.3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: es2022,esnext
 
diff --git a/tests/cases/conformance/externalModules/topLevelAwaitErrors.4.ts b/tests/cases/conformance/externalModules/topLevelAwaitErrors.4.ts
index d2216b95ad032..bea8f377988d2 100644
--- a/tests/cases/conformance/externalModules/topLevelAwaitErrors.4.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwaitErrors.4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: es2022,esnext
 
diff --git a/tests/cases/conformance/externalModules/topLevelAwaitErrors.5.ts b/tests/cases/conformance/externalModules/topLevelAwaitErrors.5.ts
index aa76902829906..16e1ae47dd88a 100644
--- a/tests/cases/conformance/externalModules/topLevelAwaitErrors.5.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwaitErrors.5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: es2022,esnext
 
diff --git a/tests/cases/conformance/externalModules/topLevelAwaitErrors.6.ts b/tests/cases/conformance/externalModules/topLevelAwaitErrors.6.ts
index ebee5efe3ed39..abf1d73a08fbd 100644
--- a/tests/cases/conformance/externalModules/topLevelAwaitErrors.6.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwaitErrors.6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: es2022,esnext
 
diff --git a/tests/cases/conformance/externalModules/topLevelAwaitErrors.7.ts b/tests/cases/conformance/externalModules/topLevelAwaitErrors.7.ts
index 10058cc2d8d41..8f9bca530a3a8 100644
--- a/tests/cases/conformance/externalModules/topLevelAwaitErrors.7.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwaitErrors.7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: es2022,esnext
 
diff --git a/tests/cases/conformance/externalModules/topLevelAwaitErrors.8.ts b/tests/cases/conformance/externalModules/topLevelAwaitErrors.8.ts
index 7f6dcb8e134a7..4210e1f51fd96 100644
--- a/tests/cases/conformance/externalModules/topLevelAwaitErrors.8.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwaitErrors.8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: es2022,esnext
 
diff --git a/tests/cases/conformance/externalModules/topLevelAwaitErrors.9.ts b/tests/cases/conformance/externalModules/topLevelAwaitErrors.9.ts
index 7b8d4866927d4..bf9a52327cf89 100644
--- a/tests/cases/conformance/externalModules/topLevelAwaitErrors.9.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwaitErrors.9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: es2022,esnext
 
diff --git a/tests/cases/conformance/externalModules/topLevelAwaitNonModule.ts b/tests/cases/conformance/externalModules/topLevelAwaitNonModule.ts
index 97d4b3b624134..09a2b1bedcf87 100644
--- a/tests/cases/conformance/externalModules/topLevelAwaitNonModule.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwaitNonModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: es2022,esnext
 await x;
diff --git a/tests/cases/conformance/externalModules/topLevelFileModule.ts b/tests/cases/conformance/externalModules/topLevelFileModule.ts
index e6680889d2604..fb6001496a2e6 100644
--- a/tests/cases/conformance/externalModules/topLevelFileModule.ts
+++ b/tests/cases/conformance/externalModules/topLevelFileModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @Filename: vs/foo_0.ts
 export var x: number;
diff --git a/tests/cases/conformance/externalModules/topLevelFileModuleMissing.ts b/tests/cases/conformance/externalModules/topLevelFileModuleMissing.ts
index 860c4fe8294f4..d917df62fd3c2 100644
--- a/tests/cases/conformance/externalModules/topLevelFileModuleMissing.ts
+++ b/tests/cases/conformance/externalModules/topLevelFileModuleMissing.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @Filename: vs/foo_0.ts
 export var x: number;
diff --git a/tests/cases/conformance/externalModules/topLevelModuleDeclarationAndFile.ts b/tests/cases/conformance/externalModules/topLevelModuleDeclarationAndFile.ts
index 456527acfaeda..f393f65a68c00 100644
--- a/tests/cases/conformance/externalModules/topLevelModuleDeclarationAndFile.ts
+++ b/tests/cases/conformance/externalModules/topLevelModuleDeclarationAndFile.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 // @Filename: vs/foo_0/index.ts
 export var x: number = 42;
diff --git a/tests/cases/conformance/externalModules/typeOnly/importsNotUsedAsValues_error.ts b/tests/cases/conformance/externalModules/typeOnly/importsNotUsedAsValues_error.ts
index ae697e7c3cb4e..e4d3f83159a0a 100644
--- a/tests/cases/conformance/externalModules/typeOnly/importsNotUsedAsValues_error.ts
+++ b/tests/cases/conformance/externalModules/typeOnly/importsNotUsedAsValues_error.ts
@@ -9,20 +9,20 @@ export const enum C { One, Two }
 
 // @Filename: /b.ts
 import { A, B } from './a'; // Error
-let a: A;
-let b: B;
+declare let a: A;
+declare let b: B;
 console.log(a, b);
 
 // @Filename: /c.ts
 import Default, * as named from './a'; // Error
-let a: Default;
-let b: named.B;
+declare let a: Default;
+declare let b: named.B;
 console.log(a, b);
 
 // @Filename: /d.ts
 import Default, { A } from './a';
 const a = A;
-let b: Default;
+declare let b: Default;
 console.log(a, b);
 
 // @Filename: /e.ts
@@ -38,8 +38,8 @@ console.log(c, d);
 
 // @Filename: /g.ts
 import { C } from './a';
-let c: C;
-let d: C.Two;
+declare let c: C;
+declare let d: C.Two;
 console.log(c, d);
 
 // @Filename: /h.ts
diff --git a/tests/cases/conformance/externalModules/umd-errors.ts b/tests/cases/conformance/externalModules/umd-errors.ts
index 95e6cb7c7a451..2d052fb11a8af 100644
--- a/tests/cases/conformance/externalModules/umd-errors.ts
+++ b/tests/cases/conformance/externalModules/umd-errors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: commonjs
 
 // @filename: err1.d.ts
diff --git a/tests/cases/conformance/externalModules/umd5.ts b/tests/cases/conformance/externalModules/umd5.ts
index b6d949c2d0a76..75369776d4b7d 100644
--- a/tests/cases/conformance/externalModules/umd5.ts
+++ b/tests/cases/conformance/externalModules/umd5.ts
@@ -10,7 +10,7 @@ export as namespace Foo;
 // @filename: a.ts
 import * as Bar from './foo';
 Bar.fn();
-let x: Bar.Thing;
+declare let x: Bar.Thing;
 let y: number = x.n;
 // should error
 let z = Foo;
diff --git a/tests/cases/conformance/externalModules/umd8.ts b/tests/cases/conformance/externalModules/umd8.ts
index 9a8331fded30e..351acb6cf750d 100644
--- a/tests/cases/conformance/externalModules/umd8.ts
+++ b/tests/cases/conformance/externalModules/umd8.ts
@@ -15,7 +15,7 @@ export as namespace Foo;
 /// <reference path="foo.d.ts" />
 import * as ff from './foo';
 
-let y: Foo; // OK in type position
+declare let y: Foo; // OK in type position
 y.foo();
-let z: Foo.SubThing; // OK in ns position
+declare let z: Foo.SubThing; // OK in ns position
 let x: any = Foo; // Not OK in value position
diff --git a/tests/cases/conformance/fixSignatureCaching.ts b/tests/cases/conformance/fixSignatureCaching.ts
index bfc37919f7823..1f388dce98877 100644
--- a/tests/cases/conformance/fixSignatureCaching.ts
+++ b/tests/cases/conformance/fixSignatureCaching.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Repro from #10697
 
 (function (define, undefined) {
diff --git a/tests/cases/conformance/functions/functionImplementationErrors.ts b/tests/cases/conformance/functions/functionImplementationErrors.ts
index 0a7c7812932f8..d880d2c3de764 100644
--- a/tests/cases/conformance/functions/functionImplementationErrors.ts
+++ b/tests/cases/conformance/functions/functionImplementationErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 
 // FunctionExpression with no return type annotation with multiple return statements with unrelated types
@@ -27,7 +28,7 @@ var f4 = function () {
 function f5(): number {
 }
 
-var m;
+declare var m: any;
 // Function signature with parameter initializer referencing in scope local variable
 function f6(n = m) {
     var m = 4;
diff --git a/tests/cases/conformance/functions/functionImplementations.ts b/tests/cases/conformance/functions/functionImplementations.ts
index 3c5adefd2e40a..e13088f7aa13d 100644
--- a/tests/cases/conformance/functions/functionImplementations.ts
+++ b/tests/cases/conformance/functions/functionImplementations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 
 // FunctionExpression with no return type annotation and no return statement returns void
diff --git a/tests/cases/conformance/functions/functionNameConflicts.ts b/tests/cases/conformance/functions/functionNameConflicts.ts
index 0b12a231fb7ea..d48d3019548a9 100644
--- a/tests/cases/conformance/functions/functionNameConflicts.ts
+++ b/tests/cases/conformance/functions/functionNameConflicts.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //Function and variable of the same name in same declaration space
 //Function overload with different name from implementation signature 
 
diff --git a/tests/cases/conformance/functions/functionOverloadErrors.ts b/tests/cases/conformance/functions/functionOverloadErrors.ts
index 1f917b17fa215..d05d7962fb210 100644
--- a/tests/cases/conformance/functions/functionOverloadErrors.ts
+++ b/tests/cases/conformance/functions/functionOverloadErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //Function overload signature with initializer
 function fn1(x = 3);
 function fn1() { }
diff --git a/tests/cases/conformance/functions/functionOverloadErrorsSyntax.ts b/tests/cases/conformance/functions/functionOverloadErrorsSyntax.ts
index 6c482fb70fcf3..803ad40af2d4a 100644
--- a/tests/cases/conformance/functions/functionOverloadErrorsSyntax.ts
+++ b/tests/cases/conformance/functions/functionOverloadErrorsSyntax.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //Function overload signature with optional parameter followed by non-optional parameter
 function fn4a(x?: number, y: string);
 function fn4a() { }
diff --git a/tests/cases/conformance/functions/functionParameterObjectRestAndInitializers.ts b/tests/cases/conformance/functions/functionParameterObjectRestAndInitializers.ts
index 41c6af41b9513..7c8ac7addd246 100644
--- a/tests/cases/conformance/functions/functionParameterObjectRestAndInitializers.ts
+++ b/tests/cases/conformance/functions/functionParameterObjectRestAndInitializers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 // @noTypesAndSymbols: true
 // https://github.com/microsoft/TypeScript/issues/47079
diff --git a/tests/cases/conformance/functions/functionWithUseStrictAndSimpleParameterList.ts b/tests/cases/conformance/functions/functionWithUseStrictAndSimpleParameterList.ts
index d4b8ced9b42a5..2863f3ad6165c 100644
--- a/tests/cases/conformance/functions/functionWithUseStrictAndSimpleParameterList.ts
+++ b/tests/cases/conformance/functions/functionWithUseStrictAndSimpleParameterList.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function a(a = 10) {
     "use strict";
 }
diff --git a/tests/cases/conformance/functions/functionWithUseStrictAndSimpleParameterList_es2016.ts b/tests/cases/conformance/functions/functionWithUseStrictAndSimpleParameterList_es2016.ts
index 6c9fadd1ac1e7..3daeecc0900c5 100644
--- a/tests/cases/conformance/functions/functionWithUseStrictAndSimpleParameterList_es2016.ts
+++ b/tests/cases/conformance/functions/functionWithUseStrictAndSimpleParameterList_es2016.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2016
 
 function a(a = 10) {
diff --git a/tests/cases/conformance/functions/parameterInitializersBackwardReferencing.ts b/tests/cases/conformance/functions/parameterInitializersBackwardReferencing.ts
index dce4818a5094e..b721ca502940a 100644
--- a/tests/cases/conformance/functions/parameterInitializersBackwardReferencing.ts
+++ b/tests/cases/conformance/functions/parameterInitializersBackwardReferencing.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5, es2015, esnext
 // @noEmit: true
 // @noTypesAndSymbols: true
diff --git a/tests/cases/conformance/functions/parameterInitializersForwardReferencing.2.ts b/tests/cases/conformance/functions/parameterInitializersForwardReferencing.2.ts
index 7aa08e2dbf03d..c2fc0788c2660 100644
--- a/tests/cases/conformance/functions/parameterInitializersForwardReferencing.2.ts
+++ b/tests/cases/conformance/functions/parameterInitializersForwardReferencing.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5, es2015, esnext
 // @noEmit: true
 // @noTypesAndSymbols: true
diff --git a/tests/cases/conformance/functions/parameterInitializersForwardReferencing.ts b/tests/cases/conformance/functions/parameterInitializersForwardReferencing.ts
index fa3549ea2c5bd..31320e24828ae 100644
--- a/tests/cases/conformance/functions/parameterInitializersForwardReferencing.ts
+++ b/tests/cases/conformance/functions/parameterInitializersForwardReferencing.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function left(a, b = a, c = b) {
     a;
     b;
diff --git a/tests/cases/conformance/functions/parameterInitializersForwardReferencing1.ts b/tests/cases/conformance/functions/parameterInitializersForwardReferencing1.ts
index a3b88150f4f37..680fa921ab34d 100644
--- a/tests/cases/conformance/functions/parameterInitializersForwardReferencing1.ts
+++ b/tests/cases/conformance/functions/parameterInitializersForwardReferencing1.ts
@@ -1,3 +1,5 @@
+// @strict: false
+
 let foo: string = "";
 
 function f1 (bar = foo) { // unexpected compiler error; works at runtime
diff --git a/tests/cases/conformance/functions/parameterInitializersForwardReferencing1_es6.ts b/tests/cases/conformance/functions/parameterInitializersForwardReferencing1_es6.ts
index f83eb2dd34ec6..dbe389eb21119 100644
--- a/tests/cases/conformance/functions/parameterInitializersForwardReferencing1_es6.ts
+++ b/tests/cases/conformance/functions/parameterInitializersForwardReferencing1_es6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 
 let foo: string = "";
diff --git a/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates.ts b/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates.ts
index 31cbaa79ec195..92d3c2c6d0c8a 100644
--- a/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates.ts
+++ b/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates.ts
@@ -1,5 +1,5 @@
 class C {
-    private x: number;
+    private x!: number;
 }
 
 interface A extends C {
@@ -11,16 +11,16 @@ interface A {
 }
 
 class D implements A { // error
-    private x: number;
-    y: string;
-    z: string;
+    private x!: number;
+    y!: string;
+    z!: string;
 }
 
 class E implements A { // error
-    x: number;
-    y: string;
-    z: string;
+    x!: number;
+    y!: string;
+    z!: string;
 }
 
-var a: A;
+declare var a: A;
 var r = a.x; // error
\ No newline at end of file
diff --git a/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts b/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts
index ee301bfff9d6b..c8dfb9e90ddc3 100644
--- a/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts
+++ b/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts
@@ -1,9 +1,9 @@
 class C {
-    private x: number;
+    private x!: number;
 }
 
 class C2 {
-    private w: number;
+    private w!: number;
 }
 
 interface A extends C {
@@ -15,17 +15,17 @@ interface A extends C2 {
 }
 
 class D extends C implements A { // error
-    private w: number;
-    y: string;
-    z: string;
+    private w!: number;
+    y!: string;
+    z!: string;
 }
 
 class E extends C2 implements A { // error
-    w: number;
-    y: string;
-    z: string;
+    w!: number;
+    y!: string;
+    z!: string;
 }
 
-var a: A;
+declare var a: A;
 var r = a.x; // error
 var r2 = a.w; // error
\ No newline at end of file
diff --git a/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule.ts b/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule.ts
index d827c65d5035c..f129b97f7bd3a 100644
--- a/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule.ts
+++ b/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule.ts
@@ -15,7 +15,7 @@ namespace M2 {
         bar: number;
     }
 
-    var a: A;
+    declare var a: A;
     var r1 = a.foo; // error
     var r2 = a.bar; 
 
@@ -23,7 +23,7 @@ namespace M2 {
         bar: T;
     }
 
-    var b: B<string>;
+    declare var b: B<string>;
     var r3 = b.foo; // error
     var r4 = b.bar; 
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule2.ts b/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule2.ts
index 1ff421812249d..2021025b90f84 100644
--- a/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule2.ts
+++ b/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule2.ts
@@ -14,7 +14,7 @@ namespace M {
             bar: number;
         }
 
-        var a: A;
+        declare var a: A;
         var r1 = a.foo; // error
         var r2 = a.bar;
 
@@ -22,16 +22,16 @@ namespace M {
             bar: T;
         }
 
-        var b: B<string>;
+        declare var b: B<string>;
         var r3 = b.foo; // error
         var r4 = b.bar;
     }
 
-    var a: A;
+    declare var a: A;
     var r1 = a.foo; 
     var r2 = a.bar; // error
 
-    var b: B<string>;
+    declare var b: B<string>;
     var r3 = b.foo; 
     var r4 = b.bar; // error
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface05.ts b/tests/cases/conformance/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface05.ts
index 1c7dd46de6f48..b60410d91d0a0 100644
--- a/tests/cases/conformance/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface05.ts
+++ b/tests/cases/conformance/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface05.ts
@@ -1,6 +1,6 @@
 "use strict"
 
-var interface: number;
+var interface: number = 123;
 
 // 'interface' is a strict mode reserved word, and so it would be permissible
 // to allow 'interface' and the name of the interface to be on separate lines;
diff --git a/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersection.ts b/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersection.ts
index 003976a2b27c8..c6a49f8f8521f 100644
--- a/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersection.ts
+++ b/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersection.ts
@@ -1,4 +1,5 @@
 // @strictNullChecks: true
+// @strictPropertyInitialization: false
 
 type T1 = { a: number };
 type T2 = T1 & { b: number };
diff --git a/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersectionErrors.ts b/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersectionErrors.ts
index 5a2a37fc22754..70891a7b1038b 100644
--- a/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersectionErrors.ts
+++ b/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersectionErrors.ts
@@ -1,4 +1,5 @@
 // @strictNullChecks: true
+// @strictPropertyInitialization: false
 
 type T1 = { a: number };
 type T2 = T1 & { b: number };
diff --git a/tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts b/tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts
index 79ebfd94dd6d5..bd9629a8e0124 100644
--- a/tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts
+++ b/tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts
@@ -1,5 +1,5 @@
 class Foo {
-    private x: string;
+    private x!: string;
 }
 
 interface I extends Foo {
@@ -7,27 +7,27 @@ interface I extends Foo {
 }
 
 class Bar extends Foo implements I { // ok
-    y: number;
+    y!: number;
 }
 
 class Bar2 extends Foo implements I { // error
-    x: string;
-    y: number;
+    x!: string;
+    y!: number;
 }
 
 class Bar3 extends Foo implements I { // error
-    private x: string;
-    y: number;
+    private x!: string;
+    y!: number;
 }
 
 // another level of indirection
 namespace M {
     class Foo {
-        private x: string;
+        private x!: string;
     }
 
     class Baz extends Foo {
-        z: number;
+        z!: number;
     }
 
     interface I extends Baz {
@@ -35,29 +35,29 @@ namespace M {
     }
 
     class Bar extends Foo implements I { // ok
-        y: number;
-        z: number;
+        y!: number;
+        z!: number;
     }
 
     class Bar2 extends Foo implements I { // error
-        x: string;
-        y: number;
+        x!: string;
+        y!: number;
     }
 
     class Bar3 extends Foo implements I { // error
-        private x: string;
-        y: number;
+        private x!: string;
+        y!: number;
     }
 }
 
 // two levels of privates
 namespace M2 {
     class Foo {
-        private x: string;
+        private x!: string;
     }
 
     class Baz extends Foo {
-        private y: number;
+        private y!: number;
     }
 
     interface I extends Baz {
@@ -65,21 +65,21 @@ namespace M2 {
     }
 
     class Bar extends Foo implements I { // error
-        z: number;
+        z!: number;
     }
 
-    var b: Bar;
+    declare var b: Bar;
     var r1 = b.z;
     var r2 = b.x; // error
     var r3 = b.y; // error
 
     class Bar2 extends Foo implements I { // error
-        x: string;
-        z: number;
+        x!: string;
+        z!: number;
     }
 
     class Bar3 extends Foo implements I { // error
-        private x: string;
-        z: number;
+        private x!: string;
+        z!: number;
     }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates.ts b/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates.ts
index b745fb5b7f1d7..580688a9a9097 100644
--- a/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates.ts
+++ b/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates.ts
@@ -1,5 +1,5 @@
 class Foo {
-    private x: string;
+    private x!: string;
 }
 
 interface I extends Foo { // error
@@ -10,6 +10,6 @@ interface I2 extends Foo {
     y: string;
 }
 
-var i: I2;
+declare var i: I2;
 var r = i.y;
 var r2 = i.x; // error
\ No newline at end of file
diff --git a/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates2.ts b/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates2.ts
index 41646a1d1c7b0..d21a94dea95ed 100644
--- a/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates2.ts
+++ b/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates2.ts
@@ -1,9 +1,9 @@
 class Foo {
-    private x: string;
+    private x!: string;
 }
 
 class Bar {
-    private x: string;
+    private x!: string;
 }
 
 interface I3 extends Foo, Bar { // error
@@ -14,14 +14,14 @@ interface I4 extends Foo, Bar { // error
 }
 
 class Baz {
-    private y: string;
+    private y!: string;
 }
 
 interface I5 extends Foo, Baz {
     z: string;
 }
 
-var i: I5;
+declare var i: I5;
 var r: string = i.z;
 var r2 = i.x; // error
 var r3 = i.y; // error
\ No newline at end of file
diff --git a/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds.ts b/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds.ts
index 6a504a916da41..ff957e83ffe99 100644
--- a/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds.ts
+++ b/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds.ts
@@ -1,5 +1,5 @@
 class Foo {
-    protected x: string;
+    protected x!: string;
 }
 
 interface I extends Foo { // error
@@ -10,6 +10,6 @@ interface I2 extends Foo {
     y: string;
 }
 
-var i: I2;
+declare var i: I2;
 var r = i.y;
 var r2 = i.x; // error
\ No newline at end of file
diff --git a/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds2.ts b/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds2.ts
index 4663709bce8f2..2849aa022678a 100644
--- a/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds2.ts
+++ b/tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds2.ts
@@ -1,9 +1,9 @@
 class Foo {
-    protected x: string;
+    protected x!: string;
 }
 
 class Bar {
-    protected x: string;
+    protected x!: string;
 }
 
 interface I3 extends Foo, Bar { // error
@@ -14,14 +14,14 @@ interface I4 extends Foo, Bar { // error
 }
 
 class Baz {
-    protected y: string;
+    protected y!: string;
 }
 
 interface I5 extends Foo, Baz {
     z: string;
 }
 
-var i: I5;
+declare var i: I5;
 var r: string = i.z;
 var r2 = i.x; // error
 var r3 = i.y; // error
\ No newline at end of file
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts
index 0bac9af2ce139..4e18948b3f502 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace A {
     export interface Point {
         x: number;
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts
index 7f37fe232ce6d..7fa49691c1753 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace A {
     export interface Point {
         x: number;
diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts
index 7cd7cf2315b52..748212d654981 100644
--- a/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts
+++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace A {
 
     export interface Point {
diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts
index f6c4feb4c3c17..ed9a0636c5434 100644
--- a/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts
+++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace A {
 
     interface Point {
diff --git a/tests/cases/conformance/internalModules/exportDeclarations/NonInitializedExportInInternalModule.ts b/tests/cases/conformance/internalModules/exportDeclarations/NonInitializedExportInInternalModule.ts
index 73e29590d63ed..4ed7f1b59830d 100644
--- a/tests/cases/conformance/internalModules/exportDeclarations/NonInitializedExportInInternalModule.ts
+++ b/tests/cases/conformance/internalModules/exportDeclarations/NonInitializedExportInInternalModule.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 namespace Inner {
     var;
diff --git a/tests/cases/conformance/jsdoc/callOfPropertylessConstructorFunction.ts b/tests/cases/conformance/jsdoc/callOfPropertylessConstructorFunction.ts
index 213b66908d907..93c3063d35643 100644
--- a/tests/cases/conformance/jsdoc/callOfPropertylessConstructorFunction.ts
+++ b/tests/cases/conformance/jsdoc/callOfPropertylessConstructorFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/jsdoc/callbackTag2.ts b/tests/cases/conformance/jsdoc/callbackTag2.ts
index 34e71b55bcd71..e353e82aaa956 100644
--- a/tests/cases/conformance/jsdoc/callbackTag2.ts
+++ b/tests/cases/conformance/jsdoc/callbackTag2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/jsdoc/checkJsdocParamOnVariableDeclaredFunctionExpression.ts b/tests/cases/conformance/jsdoc/checkJsdocParamOnVariableDeclaredFunctionExpression.ts
index 09ea30c0cc013..a4e4ab5ff3c3b 100644
--- a/tests/cases/conformance/jsdoc/checkJsdocParamOnVariableDeclaredFunctionExpression.ts
+++ b/tests/cases/conformance/jsdoc/checkJsdocParamOnVariableDeclaredFunctionExpression.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJS: true
 // @suppressOutputPathCheck: true
 
diff --git a/tests/cases/conformance/jsdoc/checkJsdocSatisfiesTag12.ts b/tests/cases/conformance/jsdoc/checkJsdocSatisfiesTag12.ts
index e8e6ad971fb3c..ef523a6524c70 100644
--- a/tests/cases/conformance/jsdoc/checkJsdocSatisfiesTag12.ts
+++ b/tests/cases/conformance/jsdoc/checkJsdocSatisfiesTag12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJS: true
 // @checkJs: true
diff --git a/tests/cases/conformance/jsdoc/checkJsdocTypeTag5.ts b/tests/cases/conformance/jsdoc/checkJsdocTypeTag5.ts
index ecd597c6eb5da..c762dd3707f61 100644
--- a/tests/cases/conformance/jsdoc/checkJsdocTypeTag5.ts
+++ b/tests/cases/conformance/jsdoc/checkJsdocTypeTag5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkJs: true
 // @allowJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/jsdoc/checkJsdocTypeTag6.ts b/tests/cases/conformance/jsdoc/checkJsdocTypeTag6.ts
index 73b387c203e7e..31ac22ce59757 100644
--- a/tests/cases/conformance/jsdoc/checkJsdocTypeTag6.ts
+++ b/tests/cases/conformance/jsdoc/checkJsdocTypeTag6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkJs: true
 // @allowJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/jsdoc/checkJsdocTypeTag7.ts b/tests/cases/conformance/jsdoc/checkJsdocTypeTag7.ts
index 2981292ba7e58..131bffc892e95 100644
--- a/tests/cases/conformance/jsdoc/checkJsdocTypeTag7.ts
+++ b/tests/cases/conformance/jsdoc/checkJsdocTypeTag7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkJs: true
 // @allowJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/jsdoc/checkJsdocTypedefOnlySourceFile.ts b/tests/cases/conformance/jsdoc/checkJsdocTypedefOnlySourceFile.ts
index d991d2f6e1660..39f1ec9e1bc03 100644
--- a/tests/cases/conformance/jsdoc/checkJsdocTypedefOnlySourceFile.ts
+++ b/tests/cases/conformance/jsdoc/checkJsdocTypedefOnlySourceFile.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJS: true
 // @suppressOutputPathCheck: true
 
diff --git a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsClassAccessor.ts b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsClassAccessor.ts
index 2e5717ed05b10..e01d7ebbc9adc 100644
--- a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsClassAccessor.ts
+++ b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsClassAccessor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @target: es2019
diff --git a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsClassLeadingOptional.ts b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsClassLeadingOptional.ts
index b3b27f096e9a9..e1a8c071a6475 100644
--- a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsClassLeadingOptional.ts
+++ b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsClassLeadingOptional.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @target: es5
diff --git a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsDocCommentsOnConsts.ts b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsDocCommentsOnConsts.ts
index f8732cb41479b..82c288f390d76 100644
--- a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsDocCommentsOnConsts.ts
+++ b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsDocCommentsOnConsts.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @target: es5
diff --git a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsEnumTag.ts b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsEnumTag.ts
index fb4749e50868b..b172d8026df79 100644
--- a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsEnumTag.ts
+++ b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsEnumTag.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @target: es5
diff --git a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportedClassAliases.ts b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportedClassAliases.ts
index 37f092d07726b..3f56466132731 100644
--- a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportedClassAliases.ts
+++ b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportedClassAliases.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @outDir: ./out
diff --git a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsFunctionJSDoc.ts b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsFunctionJSDoc.ts
index cfa747d48c8b6..224f06d9a94be 100644
--- a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsFunctionJSDoc.ts
+++ b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsFunctionJSDoc.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @target: es5
diff --git a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsFunctionLikeClasses2.ts b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsFunctionLikeClasses2.ts
index dc58d1e05b4ca..741395cff39f3 100644
--- a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsFunctionLikeClasses2.ts
+++ b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsFunctionLikeClasses2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @target: es5
diff --git a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsGetterSetter.ts b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsGetterSetter.ts
index aacd499707485..80fc4200d200c 100644
--- a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsGetterSetter.ts
+++ b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsGetterSetter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @outDir: ./out
diff --git a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsMissingGenerics.ts b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsMissingGenerics.ts
index ff9396ac90479..e8d5d0d79b253 100644
--- a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsMissingGenerics.ts
+++ b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsMissingGenerics.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @target: es5
diff --git a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsMissingTypeParameters.ts b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsMissingTypeParameters.ts
index c924ef7455282..89d782095b38c 100644
--- a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsMissingTypeParameters.ts
+++ b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsMissingTypeParameters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @target: es5
diff --git a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsNonIdentifierInferredNames.ts b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsNonIdentifierInferredNames.ts
index 6872741c16baa..3c1c90db4f069 100644
--- a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsNonIdentifierInferredNames.ts
+++ b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsNonIdentifierInferredNames.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @target: es6
diff --git a/tests/cases/conformance/jsdoc/enumTag.ts b/tests/cases/conformance/jsdoc/enumTag.ts
index a857d4eccce93..214c3267dd4a0 100644
--- a/tests/cases/conformance/jsdoc/enumTag.ts
+++ b/tests/cases/conformance/jsdoc/enumTag.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/jsdoc/enumTagCircularReference.ts b/tests/cases/conformance/jsdoc/enumTagCircularReference.ts
index c4015b7098566..6d9ebcc10affe 100644
--- a/tests/cases/conformance/jsdoc/enumTagCircularReference.ts
+++ b/tests/cases/conformance/jsdoc/enumTagCircularReference.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/jsdoc/enumTagImported.ts b/tests/cases/conformance/jsdoc/enumTagImported.ts
index 84ce46aa1a317..a660632f49926 100644
--- a/tests/cases/conformance/jsdoc/enumTagImported.ts
+++ b/tests/cases/conformance/jsdoc/enumTagImported.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/jsdoc/enumTagOnExports.ts b/tests/cases/conformance/jsdoc/enumTagOnExports.ts
index ce8bd0b1237d3..9ee015274a742 100644
--- a/tests/cases/conformance/jsdoc/enumTagOnExports.ts
+++ b/tests/cases/conformance/jsdoc/enumTagOnExports.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: enumTagOnExports.js
 // @allowjs: true
 // @checkjs: true
diff --git a/tests/cases/conformance/jsdoc/enumTagOnExports2.ts b/tests/cases/conformance/jsdoc/enumTagOnExports2.ts
index 3a4633138375d..0f0318cd2c1fc 100644
--- a/tests/cases/conformance/jsdoc/enumTagOnExports2.ts
+++ b/tests/cases/conformance/jsdoc/enumTagOnExports2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename: enumTagOnExports.js
 // @allowjs: true
 // @checkjs: true
diff --git a/tests/cases/conformance/jsdoc/enumTagUseBeforeDefCrash.ts b/tests/cases/conformance/jsdoc/enumTagUseBeforeDefCrash.ts
index f8f92b7bcc1bf..afcc357b47a1f 100644
--- a/tests/cases/conformance/jsdoc/enumTagUseBeforeDefCrash.ts
+++ b/tests/cases/conformance/jsdoc/enumTagUseBeforeDefCrash.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/jsdoc/errorIsolation.ts b/tests/cases/conformance/jsdoc/errorIsolation.ts
index d06d76dcac86a..dd9fbb92a33b6 100644
--- a/tests/cases/conformance/jsdoc/errorIsolation.ts
+++ b/tests/cases/conformance/jsdoc/errorIsolation.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @checkJs: true
 // @filename: errorIsolation.js
diff --git a/tests/cases/conformance/jsdoc/importTag24.ts b/tests/cases/conformance/jsdoc/importTag24.ts
index 1db1fe46b9e26..a0c0350634e98 100644
--- a/tests/cases/conformance/jsdoc/importTag24.ts
+++ b/tests/cases/conformance/jsdoc/importTag24.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkJs: true
 // @allowJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/jsdoc/jsdocAccessibilityTagsDeclarations.ts b/tests/cases/conformance/jsdoc/jsdocAccessibilityTagsDeclarations.ts
index b49f732c1bb1c..ece26491d8017 100644
--- a/tests/cases/conformance/jsdoc/jsdocAccessibilityTagsDeclarations.ts
+++ b/tests/cases/conformance/jsdoc/jsdocAccessibilityTagsDeclarations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @target: esnext
diff --git a/tests/cases/conformance/jsdoc/jsdocCatchClauseWithTypeAnnotation.ts b/tests/cases/conformance/jsdoc/jsdocCatchClauseWithTypeAnnotation.ts
index b47776eb1d9c4..41049395a8908 100644
--- a/tests/cases/conformance/jsdoc/jsdocCatchClauseWithTypeAnnotation.ts
+++ b/tests/cases/conformance/jsdoc/jsdocCatchClauseWithTypeAnnotation.ts
@@ -2,6 +2,7 @@
 // @checkJs: true
 // @target: esnext
 // @noImplicitAny: true
+// @useUnknownInCatchVariables: false
 // @outDir: out
 // @Filename: foo.js
 
diff --git a/tests/cases/conformance/jsdoc/jsdocLinkTag8.ts b/tests/cases/conformance/jsdoc/jsdocLinkTag8.ts
index ac817f70f1175..b5eb6ff929826 100644
--- a/tests/cases/conformance/jsdoc/jsdocLinkTag8.ts
+++ b/tests/cases/conformance/jsdoc/jsdocLinkTag8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkJs: true
 // @allowJs: true
 // @target: esnext
diff --git a/tests/cases/conformance/jsdoc/jsdocOuterTypeParameters1.ts b/tests/cases/conformance/jsdoc/jsdocOuterTypeParameters1.ts
index c16a87a57fc34..2d5d261a1b7f6 100644
--- a/tests/cases/conformance/jsdoc/jsdocOuterTypeParameters1.ts
+++ b/tests/cases/conformance/jsdoc/jsdocOuterTypeParameters1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkjs: true
 // @filename: jsdocOuterTypeParameters1.js
 /** @return {T} */
diff --git a/tests/cases/conformance/jsdoc/jsdocOuterTypeParameters2.ts b/tests/cases/conformance/jsdoc/jsdocOuterTypeParameters2.ts
index ed814d315ca21..6c652888f3277 100644
--- a/tests/cases/conformance/jsdoc/jsdocOuterTypeParameters2.ts
+++ b/tests/cases/conformance/jsdoc/jsdocOuterTypeParameters2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkjs: true
 // @filename: jsdocOuterTypeParameters1.js
 /** @return {T} */
diff --git a/tests/cases/conformance/jsdoc/jsdocParamTag2.ts b/tests/cases/conformance/jsdoc/jsdocParamTag2.ts
index 0d34ee5496a69..d607371be9a5d 100644
--- a/tests/cases/conformance/jsdoc/jsdocParamTag2.ts
+++ b/tests/cases/conformance/jsdoc/jsdocParamTag2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJS: true
 // @checkJS: true
 // @noEmit: true
diff --git a/tests/cases/conformance/jsdoc/jsdocReadonlyDeclarations.ts b/tests/cases/conformance/jsdoc/jsdocReadonlyDeclarations.ts
index 1036c2eb7a855..bbe2ff6ffe862 100644
--- a/tests/cases/conformance/jsdoc/jsdocReadonlyDeclarations.ts
+++ b/tests/cases/conformance/jsdoc/jsdocReadonlyDeclarations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @target: esnext
diff --git a/tests/cases/conformance/jsdoc/jsdocTemplateTag.ts b/tests/cases/conformance/jsdoc/jsdocTemplateTag.ts
index e69756c094101..51b9eb5099a12 100644
--- a/tests/cases/conformance/jsdoc/jsdocTemplateTag.ts
+++ b/tests/cases/conformance/jsdoc/jsdocTemplateTag.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/jsdoc/jsdocTemplateTag2.ts b/tests/cases/conformance/jsdoc/jsdocTemplateTag2.ts
index b7e706f124aa4..578e69a615a4c 100644
--- a/tests/cases/conformance/jsdoc/jsdocTemplateTag2.ts
+++ b/tests/cases/conformance/jsdoc/jsdocTemplateTag2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/jsdoc/jsdocTemplateTag3.ts b/tests/cases/conformance/jsdoc/jsdocTemplateTag3.ts
index e05438d304de7..dd603593747d8 100644
--- a/tests/cases/conformance/jsdoc/jsdocTemplateTag3.ts
+++ b/tests/cases/conformance/jsdoc/jsdocTemplateTag3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/jsdoc/jsdocTemplateTagDefault.ts b/tests/cases/conformance/jsdoc/jsdocTemplateTagDefault.ts
index c93359a7a6eb3..d9c615bc1b950 100644
--- a/tests/cases/conformance/jsdoc/jsdocTemplateTagDefault.ts
+++ b/tests/cases/conformance/jsdoc/jsdocTemplateTagDefault.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @declaration: true
diff --git a/tests/cases/conformance/jsdoc/jsdocTemplateTagNameResolution.ts b/tests/cases/conformance/jsdoc/jsdocTemplateTagNameResolution.ts
index a5b4d052ad2de..047ba1bc9a92e 100644
--- a/tests/cases/conformance/jsdoc/jsdocTemplateTagNameResolution.ts
+++ b/tests/cases/conformance/jsdoc/jsdocTemplateTagNameResolution.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @outDir: out
diff --git a/tests/cases/conformance/jsdoc/overloadTag1.ts b/tests/cases/conformance/jsdoc/overloadTag1.ts
index 4eb66b596df44..b7f72c2f30f8b 100644
--- a/tests/cases/conformance/jsdoc/overloadTag1.ts
+++ b/tests/cases/conformance/jsdoc/overloadTag1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkJs: true
 // @allowJs: true
 // @outdir: foo
diff --git a/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject.ts b/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject.ts
index 03c79ce9e1cb4..f79e7ed4ada6a 100644
--- a/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject.ts
+++ b/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject2.ts b/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject2.ts
index a6a68aa0861ed..ff703fc07a58b 100644
--- a/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject2.ts
+++ b/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject3.ts b/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject3.ts
index 8307688a0cdbd..309666dceb0c0 100644
--- a/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject3.ts
+++ b/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject4.ts b/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject4.ts
index 5840308fa0dac..d82d2e478c5d6 100644
--- a/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject4.ts
+++ b/tests/cases/conformance/jsdoc/paramTagNestedWithoutTopLevelObject4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/jsdoc/parseLinkTag.ts b/tests/cases/conformance/jsdoc/parseLinkTag.ts
index c58548cd9b471..8b3b182b36869 100644
--- a/tests/cases/conformance/jsdoc/parseLinkTag.ts
+++ b/tests/cases/conformance/jsdoc/parseLinkTag.ts
@@ -1,3 +1,4 @@
+// @strict: false
 /** trailing @link tag {@link */
 var x;
 /** @returns trailing @link tag {@link */
diff --git a/tests/cases/conformance/jsdoc/syntaxErrors.ts b/tests/cases/conformance/jsdoc/syntaxErrors.ts
index e8a3641cde2d8..2514fa4f5768b 100644
--- a/tests/cases/conformance/jsdoc/syntaxErrors.ts
+++ b/tests/cases/conformance/jsdoc/syntaxErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkJs: true
 // @allowJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/jsdoc/typedefInnerNamepaths.ts b/tests/cases/conformance/jsdoc/typedefInnerNamepaths.ts
index ee71909c2edd9..cce135344befa 100644
--- a/tests/cases/conformance/jsdoc/typedefInnerNamepaths.ts
+++ b/tests/cases/conformance/jsdoc/typedefInnerNamepaths.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/jsx/checkJsxChildrenProperty1.tsx b/tests/cases/conformance/jsx/checkJsxChildrenProperty1.tsx
index 09c003c376c8a..4cf9380cf523c 100644
--- a/tests/cases/conformance/jsx/checkJsxChildrenProperty1.tsx
+++ b/tests/cases/conformance/jsx/checkJsxChildrenProperty1.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/checkJsxChildrenProperty12.tsx b/tests/cases/conformance/jsx/checkJsxChildrenProperty12.tsx
index 679ec05799956..959e5afa4c948 100644
--- a/tests/cases/conformance/jsx/checkJsxChildrenProperty12.tsx
+++ b/tests/cases/conformance/jsx/checkJsxChildrenProperty12.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/checkJsxChildrenProperty13.tsx b/tests/cases/conformance/jsx/checkJsxChildrenProperty13.tsx
index e7918999465ec..826795cdaa28a 100644
--- a/tests/cases/conformance/jsx/checkJsxChildrenProperty13.tsx
+++ b/tests/cases/conformance/jsx/checkJsxChildrenProperty13.tsx
@@ -1,9 +1,8 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
 // @strictNullChecks: true
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/checkJsxChildrenProperty14.tsx b/tests/cases/conformance/jsx/checkJsxChildrenProperty14.tsx
index cac6fc8dc6457..9d146deaa19b1 100644
--- a/tests/cases/conformance/jsx/checkJsxChildrenProperty14.tsx
+++ b/tests/cases/conformance/jsx/checkJsxChildrenProperty14.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/checkJsxChildrenProperty15.tsx b/tests/cases/conformance/jsx/checkJsxChildrenProperty15.tsx
index 7f91b9516dd71..46393c12a89b3 100644
--- a/tests/cases/conformance/jsx/checkJsxChildrenProperty15.tsx
+++ b/tests/cases/conformance/jsx/checkJsxChildrenProperty15.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/checkJsxChildrenProperty2.tsx b/tests/cases/conformance/jsx/checkJsxChildrenProperty2.tsx
index 2f452a0aaf629..8ca4e9d2ef4a9 100644
--- a/tests/cases/conformance/jsx/checkJsxChildrenProperty2.tsx
+++ b/tests/cases/conformance/jsx/checkJsxChildrenProperty2.tsx
@@ -1,9 +1,9 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+// @lib: es5
 // @strictNullChecks: true
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/checkJsxChildrenProperty3.tsx b/tests/cases/conformance/jsx/checkJsxChildrenProperty3.tsx
index c70a2292fa2d6..a89ed0f6fdbd2 100644
--- a/tests/cases/conformance/jsx/checkJsxChildrenProperty3.tsx
+++ b/tests/cases/conformance/jsx/checkJsxChildrenProperty3.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/checkJsxChildrenProperty4.tsx b/tests/cases/conformance/jsx/checkJsxChildrenProperty4.tsx
index 277f2fb55c21d..c5a697f8c2a76 100644
--- a/tests/cases/conformance/jsx/checkJsxChildrenProperty4.tsx
+++ b/tests/cases/conformance/jsx/checkJsxChildrenProperty4.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/checkJsxChildrenProperty5.tsx b/tests/cases/conformance/jsx/checkJsxChildrenProperty5.tsx
index 9b9dfac02b23c..50986cfb7f5e5 100644
--- a/tests/cases/conformance/jsx/checkJsxChildrenProperty5.tsx
+++ b/tests/cases/conformance/jsx/checkJsxChildrenProperty5.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/checkJsxChildrenProperty6.tsx b/tests/cases/conformance/jsx/checkJsxChildrenProperty6.tsx
index 40801539f549e..8185affa64e25 100644
--- a/tests/cases/conformance/jsx/checkJsxChildrenProperty6.tsx
+++ b/tests/cases/conformance/jsx/checkJsxChildrenProperty6.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/checkJsxChildrenProperty7.tsx b/tests/cases/conformance/jsx/checkJsxChildrenProperty7.tsx
index 0a5d120dd197c..f2d63bb3ebdc1 100644
--- a/tests/cases/conformance/jsx/checkJsxChildrenProperty7.tsx
+++ b/tests/cases/conformance/jsx/checkJsxChildrenProperty7.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/checkJsxChildrenProperty8.tsx b/tests/cases/conformance/jsx/checkJsxChildrenProperty8.tsx
index c9c5d70ae3722..a4f09db095d75 100644
--- a/tests/cases/conformance/jsx/checkJsxChildrenProperty8.tsx
+++ b/tests/cases/conformance/jsx/checkJsxChildrenProperty8.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/checkJsxChildrenProperty9.tsx b/tests/cases/conformance/jsx/checkJsxChildrenProperty9.tsx
index 7d3d65fbc6fef..cdd6c310f0479 100644
--- a/tests/cases/conformance/jsx/checkJsxChildrenProperty9.tsx
+++ b/tests/cases/conformance/jsx/checkJsxChildrenProperty9.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/checkJsxGenericTagHasCorrectInferences.tsx b/tests/cases/conformance/jsx/checkJsxGenericTagHasCorrectInferences.tsx
index 04574d4e09810..a4f16579e6d8e 100644
--- a/tests/cases/conformance/jsx/checkJsxGenericTagHasCorrectInferences.tsx
+++ b/tests/cases/conformance/jsx/checkJsxGenericTagHasCorrectInferences.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 import * as React from "react";
 interface BaseProps<T> {
   initialValues: T;
diff --git a/tests/cases/conformance/jsx/commentEmittingInPreserveJsx1.tsx b/tests/cases/conformance/jsx/commentEmittingInPreserveJsx1.tsx
index ebdb36aed1581..54b987007fac2 100644
--- a/tests/cases/conformance/jsx/commentEmittingInPreserveJsx1.tsx
+++ b/tests/cases/conformance/jsx/commentEmittingInPreserveJsx1.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences1.tsx b/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences1.tsx
index 249ea461eee25..4e77ac239ec62 100644
--- a/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences1.tsx
+++ b/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences1.tsx
@@ -2,12 +2,12 @@
 // @jsx: react
 // @moduleResolution: bundler
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
 
 // @filename: declaration.d.ts
 declare module "classnames";
 
 // @filename: 0.tsx
+/// <reference path="/.lib/react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 import * as React from "react";
diff --git a/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences2.tsx b/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences2.tsx
index f56342b38f76e..fba8d428015ca 100644
--- a/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences2.tsx
+++ b/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences2.tsx
@@ -2,12 +2,12 @@
 // @jsx: react
 // @moduleResolution: bundler
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
 
 // @filename: declaration.d.ts
 declare module "classnames";
 
 // @filename: 0.tsx
+/// <reference path="/.lib/react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 import * as React from "react";
diff --git a/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences3.tsx b/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences3.tsx
index 1c0045356871e..de065273ad2a7 100644
--- a/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences3.tsx
+++ b/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences3.tsx
@@ -3,12 +3,12 @@
 // @moduleResolution: bundler
 // @noImplicitAny: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
 
 // @filename: declaration.d.ts
 declare module "classnames";
 
 // @filename: 0.tsx
+/// <reference path="/.lib/react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 import * as React from "react";
diff --git a/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences4.tsx b/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences4.tsx
index 5a31b7525e0e1..429cb59c979e4 100644
--- a/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences4.tsx
+++ b/tests/cases/conformance/jsx/correctlyMarkAliasAsReferences4.tsx
@@ -2,12 +2,12 @@
 // @jsx: react
 // @moduleResolution: bundler
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
 
 // @filename: declaration.d.ts
 declare module "classnames";
 
 // @filename: 0.tsx
+/// <reference path="/.lib/react.d.ts" />
 ///<reference path="declaration.d.ts" />
 import * as cx from 'classnames';
 import * as React from "react";
diff --git a/tests/cases/conformance/jsx/jsxAttributeInitializer.ts b/tests/cases/conformance/jsx/jsxAttributeInitializer.ts
index 95e4c66820531..a0cd1adbb8aa0 100644
--- a/tests/cases/conformance/jsx/jsxAttributeInitializer.ts
+++ b/tests/cases/conformance/jsx/jsxAttributeInitializer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @jsx: preserve, react
 // @filename: a.tsx
 declare var React: any;
diff --git a/tests/cases/conformance/jsx/jsxCheckJsxNoTypeArgumentsAllowed.tsx b/tests/cases/conformance/jsx/jsxCheckJsxNoTypeArgumentsAllowed.tsx
index c3aa9ad2156aa..6acfed7530efc 100644
--- a/tests/cases/conformance/jsx/jsxCheckJsxNoTypeArgumentsAllowed.tsx
+++ b/tests/cases/conformance/jsx/jsxCheckJsxNoTypeArgumentsAllowed.tsx
@@ -1,7 +1,5 @@
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
 // @allowJs: true
 // @outDir: ./out
 // @checkJs: true
@@ -17,6 +15,7 @@ export interface Prop {
 }
 
 // @filename: file.jsx
+/// <reference path="/.lib/react.d.ts" />
 import { MyComp, Prop } from "./component";
 import * as React from "react";
 
diff --git a/tests/cases/conformance/jsx/jsxSpreadOverwritesAttributeStrict.tsx b/tests/cases/conformance/jsx/jsxSpreadOverwritesAttributeStrict.tsx
index 1b7d7133a5416..b75d2cdde9146 100644
--- a/tests/cases/conformance/jsx/jsxSpreadOverwritesAttributeStrict.tsx
+++ b/tests/cases/conformance/jsx/jsxSpreadOverwritesAttributeStrict.tsx
@@ -1,9 +1,9 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @strict: true
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+// @lib: es5
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/jsxUnclosedParserRecovery.ts b/tests/cases/conformance/jsx/jsxUnclosedParserRecovery.ts
index 08b6149d37d91..40de9c2b5101b 100644
--- a/tests/cases/conformance/jsx/jsxUnclosedParserRecovery.ts
+++ b/tests/cases/conformance/jsx/jsxUnclosedParserRecovery.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @Filename: jsxParserRecovery.tsx
 // @jsx: preserve
 
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution15.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution15.tsx
index 92bb9f50e7c9a..82355db60e6f4 100644
--- a/tests/cases/conformance/jsx/tsxAttributeResolution15.tsx
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution15.tsx
@@ -1,9 +1,8 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
 // @noImplicitAny: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution16.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution16.tsx
index 15e8089a5ae12..1780abfeeddcb 100644
--- a/tests/cases/conformance/jsx/tsxAttributeResolution16.tsx
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution16.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxDefaultAttributesResolution1.tsx b/tests/cases/conformance/jsx/tsxDefaultAttributesResolution1.tsx
index b80252bee1b8d..ada5147615d6a 100644
--- a/tests/cases/conformance/jsx/tsxDefaultAttributesResolution1.tsx
+++ b/tests/cases/conformance/jsx/tsxDefaultAttributesResolution1.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxDefaultAttributesResolution2.tsx b/tests/cases/conformance/jsx/tsxDefaultAttributesResolution2.tsx
index 27b1e24e23f32..d0dea90f8cee3 100644
--- a/tests/cases/conformance/jsx/tsxDefaultAttributesResolution2.tsx
+++ b/tests/cases/conformance/jsx/tsxDefaultAttributesResolution2.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxDefaultAttributesResolution3.tsx b/tests/cases/conformance/jsx/tsxDefaultAttributesResolution3.tsx
index 981cdabf464e8..8ac76912cff3d 100644
--- a/tests/cases/conformance/jsx/tsxDefaultAttributesResolution3.tsx
+++ b/tests/cases/conformance/jsx/tsxDefaultAttributesResolution3.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxElementResolution10.tsx b/tests/cases/conformance/jsx/tsxElementResolution10.tsx
index 895f20754a8ae..71788e310b7eb 100644
--- a/tests/cases/conformance/jsx/tsxElementResolution10.tsx
+++ b/tests/cases/conformance/jsx/tsxElementResolution10.tsx
@@ -11,11 +11,11 @@ declare namespace JSX {
 interface Obj1type {
 	new(n: string): { x: number };
 }
-var Obj1: Obj1type;
+declare var Obj1: Obj1type;
 <Obj1 x={10} />; // Error, no render member
 
 interface Obj2type {
 	(n: string): { x: number; render: any; };
 }
-var Obj2: Obj2type;
+declare var Obj2: Obj2type;
 <Obj2 x={32} render={100} />; // OK
diff --git a/tests/cases/conformance/jsx/tsxElementResolution11.tsx b/tests/cases/conformance/jsx/tsxElementResolution11.tsx
index 09c0550de560a..329ab900fcea7 100644
--- a/tests/cases/conformance/jsx/tsxElementResolution11.tsx
+++ b/tests/cases/conformance/jsx/tsxElementResolution11.tsx
@@ -9,17 +9,17 @@ declare namespace JSX {
 interface Obj1type {
 	new(n: string): any;
 }
-var Obj1: Obj1type;
+declare var Obj1: Obj1type;
 <Obj1 x={10} />; // OK
 
 interface Obj2type {
 	new(n: string): { q?: number };
 }
-var Obj2: Obj2type;
+declare var Obj2: Obj2type;
 <Obj2 x={10} />; // Error
 
 interface Obj3type {
 	new(n: string): { x: number; };
 }
-var Obj3: Obj3type;
+declare var Obj3: Obj3type;
 <Obj3 x={10} />; // OK
diff --git a/tests/cases/conformance/jsx/tsxElementResolution12.tsx b/tests/cases/conformance/jsx/tsxElementResolution12.tsx
index a06f2deb0eef6..ffa1d05ba3839 100644
--- a/tests/cases/conformance/jsx/tsxElementResolution12.tsx
+++ b/tests/cases/conformance/jsx/tsxElementResolution12.tsx
@@ -9,19 +9,19 @@ declare namespace JSX {
 interface Obj1type {
 	new(n: string): any;
 }
-var Obj1: Obj1type;
+declare var Obj1: Obj1type;
 <Obj1 x={10} />; // OK
 
 interface Obj2type {
 	new(n: string): { q?: number; pr: any };
 }
-var Obj2: Obj2type;
+declare var Obj2: Obj2type;
 <Obj2 x={10} />; // OK
 
 interface Obj3type {
 	new(n: string): { x: number; };
 }
-var Obj3: Obj3type;
+declare var Obj3: Obj3type;
 <Obj3 x={10} />; // Error
 var attributes: any;
 <Obj3 {...attributes} />; // Error
@@ -30,6 +30,6 @@ var attributes: any;
 interface Obj4type {
 	new(n: string): { x: number; pr: { x: number; } };
 }
-var Obj4: Obj4type;
+declare var Obj4: Obj4type;
 <Obj4 x={10} />; // OK
 <Obj4 x={'10'} />; // Error
diff --git a/tests/cases/conformance/jsx/tsxElementResolution15.tsx b/tests/cases/conformance/jsx/tsxElementResolution15.tsx
index 4142d88184274..7f1c30fc09c09 100644
--- a/tests/cases/conformance/jsx/tsxElementResolution15.tsx
+++ b/tests/cases/conformance/jsx/tsxElementResolution15.tsx
@@ -9,5 +9,5 @@ declare namespace JSX {
 interface Obj1type {
 	new(n: string): {};
 }
-var Obj1: Obj1type;
+declare var Obj1: Obj1type;
 <Obj1 x={10} />; // Error
diff --git a/tests/cases/conformance/jsx/tsxElementResolution8.tsx b/tests/cases/conformance/jsx/tsxElementResolution8.tsx
index 69cd06d7fd344..1530148f34bda 100644
--- a/tests/cases/conformance/jsx/tsxElementResolution8.tsx
+++ b/tests/cases/conformance/jsx/tsxElementResolution8.tsx
@@ -21,16 +21,16 @@ interface Obj1 {
 	new(): {};
 	(): number;
 }
-var Obj1: Obj1;
+declare var Obj1: Obj1;
 <Obj1 />; // OK, prefer construct signatures
 
 interface Obj2 {
 	(): number;
 }
-var Obj2: Obj2;
+declare var Obj2: Obj2;
 <Obj2 />; // Error
 
 interface Obj3 {
 }
-var Obj3: Obj3;
+declare var Obj3: Obj3;
 <Obj3 />; // Error
diff --git a/tests/cases/conformance/jsx/tsxElementResolution9.tsx b/tests/cases/conformance/jsx/tsxElementResolution9.tsx
index c2e4b0bb8a51b..7053a5d8faa58 100644
--- a/tests/cases/conformance/jsx/tsxElementResolution9.tsx
+++ b/tests/cases/conformance/jsx/tsxElementResolution9.tsx
@@ -9,19 +9,19 @@ interface Obj1 {
 	new(n: string): { x: number };
 	new(n: number): { y: string };
 }
-var Obj1: Obj1;
+declare var Obj1: Obj1;
 <Obj1 />; // Error, return type is not an object type
 
 interface Obj2 {
 	(n: string): { x: number };
 	(n: number): { y: string };
 }
-var Obj2: Obj2;
+declare var Obj2: Obj2;
 <Obj2 />; // Error, return type is not an object type
 
 interface Obj3 {
 	(n: string): { x: number };
 	(n: number): { x: number; y: string };
 }
-var Obj3: Obj3;
+declare var Obj3: Obj3;
 <Obj3 x={42} />; // OK
diff --git a/tests/cases/conformance/jsx/tsxEmitSpreadAttribute.ts b/tests/cases/conformance/jsx/tsxEmitSpreadAttribute.ts
index 1c5103442a6bb..4b1f0b6a26507 100644
--- a/tests/cases/conformance/jsx/tsxEmitSpreadAttribute.ts
+++ b/tests/cases/conformance/jsx/tsxEmitSpreadAttribute.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @jsx: react
 // @target: es2015,es2018,esnext
 // @filename: test.tsx
diff --git a/tests/cases/conformance/jsx/tsxGenericAttributesType1.tsx b/tests/cases/conformance/jsx/tsxGenericAttributesType1.tsx
index ebb80771856cb..c459ab9073c68 100644
--- a/tests/cases/conformance/jsx/tsxGenericAttributesType1.tsx
+++ b/tests/cases/conformance/jsx/tsxGenericAttributesType1.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxGenericAttributesType2.tsx b/tests/cases/conformance/jsx/tsxGenericAttributesType2.tsx
index 0b226f9cf902d..1c5ebbb5cfe49 100644
--- a/tests/cases/conformance/jsx/tsxGenericAttributesType2.tsx
+++ b/tests/cases/conformance/jsx/tsxGenericAttributesType2.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxGenericAttributesType3.tsx b/tests/cases/conformance/jsx/tsxGenericAttributesType3.tsx
index 28364b93afc6c..d2ab19cd9614e 100644
--- a/tests/cases/conformance/jsx/tsxGenericAttributesType3.tsx
+++ b/tests/cases/conformance/jsx/tsxGenericAttributesType3.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxGenericAttributesType4.tsx b/tests/cases/conformance/jsx/tsxGenericAttributesType4.tsx
index de918e6bb77b9..788e8d8f43ce7 100644
--- a/tests/cases/conformance/jsx/tsxGenericAttributesType4.tsx
+++ b/tests/cases/conformance/jsx/tsxGenericAttributesType4.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxGenericAttributesType5.tsx b/tests/cases/conformance/jsx/tsxGenericAttributesType5.tsx
index 5e4da2e46f73a..9ce0f19d9cc22 100644
--- a/tests/cases/conformance/jsx/tsxGenericAttributesType5.tsx
+++ b/tests/cases/conformance/jsx/tsxGenericAttributesType5.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxGenericAttributesType6.tsx b/tests/cases/conformance/jsx/tsxGenericAttributesType6.tsx
index 22634ae9f7de6..91fb7e52943dc 100644
--- a/tests/cases/conformance/jsx/tsxGenericAttributesType6.tsx
+++ b/tests/cases/conformance/jsx/tsxGenericAttributesType6.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxGenericAttributesType7.tsx b/tests/cases/conformance/jsx/tsxGenericAttributesType7.tsx
index 07c6f05da1c16..2e2f2a83f1091 100644
--- a/tests/cases/conformance/jsx/tsxGenericAttributesType7.tsx
+++ b/tests/cases/conformance/jsx/tsxGenericAttributesType7.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxGenericAttributesType8.tsx b/tests/cases/conformance/jsx/tsxGenericAttributesType8.tsx
index 77d391f7f39fa..70123ce49ca38 100644
--- a/tests/cases/conformance/jsx/tsxGenericAttributesType8.tsx
+++ b/tests/cases/conformance/jsx/tsxGenericAttributesType8.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxGenericAttributesType9.tsx b/tests/cases/conformance/jsx/tsxGenericAttributesType9.tsx
index 5a3f2b19845a0..ac6333c9abb6d 100644
--- a/tests/cases/conformance/jsx/tsxGenericAttributesType9.tsx
+++ b/tests/cases/conformance/jsx/tsxGenericAttributesType9.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxIntrinsicAttributeErrors.tsx b/tests/cases/conformance/jsx/tsxIntrinsicAttributeErrors.tsx
index f96fa440c729f..8f2e5c8bbd145 100644
--- a/tests/cases/conformance/jsx/tsxIntrinsicAttributeErrors.tsx
+++ b/tests/cases/conformance/jsx/tsxIntrinsicAttributeErrors.tsx
@@ -27,5 +27,5 @@ interface I {
         render(): void
     }
 }
-var E: I;
+declare var E: I;
 <E x={10} />
diff --git a/tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter1.tsx b/tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter1.tsx
index 9d9ae5442cde6..54adbadec55c3 100644
--- a/tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter1.tsx
+++ b/tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter1.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter2.tsx b/tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter2.tsx
index 7b96a88a382cc..617dbaef3b860 100644
--- a/tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter2.tsx
+++ b/tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter2.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter3.tsx b/tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter3.tsx
index 57b9a9e0a8ef9..4bae8cadb3fb7 100644
--- a/tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter3.tsx
+++ b/tests/cases/conformance/jsx/tsxReactComponentWithDefaultTypeParameter3.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSfcReturnNull.tsx b/tests/cases/conformance/jsx/tsxSfcReturnNull.tsx
index 167fbd25c660d..f9d95bc8fe497 100644
--- a/tests/cases/conformance/jsx/tsxSfcReturnNull.tsx
+++ b/tests/cases/conformance/jsx/tsxSfcReturnNull.tsx
@@ -1,9 +1,8 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: amd
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSfcReturnNullStrictNullChecks.tsx b/tests/cases/conformance/jsx/tsxSfcReturnNullStrictNullChecks.tsx
index f66f93a9c1c38..8b3529540cbc8 100644
--- a/tests/cases/conformance/jsx/tsxSfcReturnNullStrictNullChecks.tsx
+++ b/tests/cases/conformance/jsx/tsxSfcReturnNullStrictNullChecks.tsx
@@ -1,10 +1,9 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: amd
-// @noLib: true
 // @strictNullChecks: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx b/tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx
index e8733600f0457..994b855b2fabb 100644
--- a/tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx
+++ b/tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx
@@ -1,10 +1,9 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: commonjs
-// @noLib: true
 // @strictNullChecks: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution1.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution1.tsx
index dfaaa8b3b72da..830548bd64410 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution1.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution1.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution10.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution10.tsx
index 733731731e4b7..3d980ed6b6264 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution10.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution10.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution11.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution11.tsx
index 458cac5bc9835..9c05b8d3c921a 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution11.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution11.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution12.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution12.tsx
index 4e0baa8677beb..e4dde70a75005 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution12.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution12.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution13.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution13.tsx
index a9ebb4caba4d8..f3f98a98bdd72 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution13.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution13.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution14.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution14.tsx
index 5bfe228d10a64..b0560125fb2a1 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution14.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution14.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution15.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution15.tsx
index 2ee07507c0832..43b697b415b79 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution15.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution15.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution16.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution16.tsx
index d197e29fed30e..abad3c91ad046 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution16.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution16.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution17.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution17.tsx
index da5638d3e2a18..26b408ec3d94c 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution17.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution17.tsx
@@ -1,9 +1,7 @@
 // @strictNullChecks: true
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: lib.d.ts
 
 declare global {
     namespace JSX {
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution2.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution2.tsx
index ad8461bc1a736..a85257d498d4f 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution2.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution2.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution3.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution3.tsx
index 1ddf7bca081e4..81591a7fb87fb 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution3.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution3.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution4.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution4.tsx
index 3d39a1a7cc9a5..2f48644139b1c 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution4.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution4.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution5.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution5.tsx
index dcea930fa25e7..697b4f0dbda65 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution5.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution5.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution6.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution6.tsx
index 5c7d9448d1235..cc600e959fe2f 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution6.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution6.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution7.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution7.tsx
index 34cd8254b7af8..5192ffce3d075 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution7.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution7.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution8.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution8.tsx
index 04e61e32eb92b..acb07d0737969 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution8.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution8.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution9.tsx b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution9.tsx
index c14003774c221..000a78251efa1 100644
--- a/tests/cases/conformance/jsx/tsxSpreadAttributesResolution9.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadAttributesResolution9.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxSpreadChildrenInvalidType.tsx b/tests/cases/conformance/jsx/tsxSpreadChildrenInvalidType.tsx
index bd8e70f2f0562..9adc2da969280 100644
--- a/tests/cases/conformance/jsx/tsxSpreadChildrenInvalidType.tsx
+++ b/tests/cases/conformance/jsx/tsxSpreadChildrenInvalidType.tsx
@@ -29,5 +29,5 @@ function TodoListNoError({ todos }: TodoListProps) {
         {...(<Todo key={todos[0].id} todo={todos[0].todo} /> as any)}
     </div>;
 }
-let x: TodoListProps;
+declare let x: TodoListProps;
     <TodoList {...x}/>
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload1.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload1.tsx
index b0da4223ce326..2556e59b23432 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload1.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload1.tsx
@@ -1,9 +1,8 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: amd
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react')
 
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload2.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload2.tsx
index bd86e991a2fe6..02f1171f74e97 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload2.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload2.tsx
@@ -1,9 +1,8 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: amd
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react')
 declare function OneThing(): JSX.Element;
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload3.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload3.tsx
index 1c2afd8253370..e0db0fed1d2bd 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload3.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload3.tsx
@@ -1,9 +1,8 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: amd
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 interface Context {
     color: any;
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx
index 79855c7279138..bafece11148e9 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx
@@ -1,9 +1,8 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: commonjs
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react')
 declare function OneThing(): JSX.Element;
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload5.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload5.tsx
index 61d2297ccd6e0..68e8fad672342 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload5.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload5.tsx
@@ -1,9 +1,8 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: commonjs
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react')
 
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload6.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload6.tsx
index 5cee1a4b79645..585dc4669cf7a 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload6.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload6.tsx
@@ -1,12 +1,14 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: commonjs
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+// @lib: es5
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react')
 
+declare function log(...args: any[]): void;
+
 export interface ClickableProps {
     children?: string;
     className?: string;
@@ -53,7 +55,7 @@ const b3 = <MainButton {...{to: 10000}} {...obj} />;
 const b4 = <MainButton {...obj1} />;  // any; just pick the first overload
 const b5 = <MainButton {...obj1} to="/to/somewhere" />;  // should pick the second overload
 const b6 = <MainButton {...obj2} />;
-const b7 = <MainButton {...{onClick: () => { console.log("hi") }}} />;
+const b7 = <MainButton {...{onClick: () => { log("hi") }}} />;
 const b8 = <MainButton {...{onClick() {}}} />;  // OK; method declaration get retained (See GitHub #13365)
 const b9 = <MainButton to='/some/path' extra-prop>GO</MainButton>;
 const b10 = <MainButton to='/some/path' children="hi" ></MainButton>;
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter1.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter1.tsx
index d9256ee6607a4..d0bfdd5927441 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter1.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter1.tsx
@@ -1,9 +1,8 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: amd
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react')
 
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter2.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter2.tsx
index 2117aedfac150..1d2c5d653688a 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter2.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter2.tsx
@@ -1,9 +1,8 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: amd
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react')
 
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponents1.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponents1.tsx
index 36a11bcc513fe..b43bc8f7d8f4b 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponents1.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponents1.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 function EmptyPropSFC() {
     return <div> Default Greeting </div>;
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponents2.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponents2.tsx
index 01e848f574e6f..6544e57c9c8cc 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponents2.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponents2.tsx
@@ -1,8 +1,8 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+// @lib: es5,dom
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponents3.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponents3.tsx
index 9490e913f929c..a1314889b68e3 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponents3.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponents3.tsx
@@ -1,9 +1,8 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: amd
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments1.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments1.tsx
index 75b9915853b6f..adad5f78b7d90 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments1.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments1.tsx
@@ -1,9 +1,9 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: amd
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+// @lib: es5
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react')
 
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments2.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments2.tsx
index aff36145e152f..596afe5b9dde3 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments2.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments2.tsx
@@ -1,9 +1,9 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: amd
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+// @lib: es5
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react')
 
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments3.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments3.tsx
index b55f9a72b65c4..70e21f20a5ab8 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments3.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments3.tsx
@@ -1,9 +1,8 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: amd
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react')
 
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments4.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments4.tsx
index 6982dbc7a0280..c330dabeda8d8 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments4.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments4.tsx
@@ -1,9 +1,8 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: commonjs
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react')
 
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments5.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments5.tsx
index dcc8701881871..4bd98455f7e88 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments5.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments5.tsx
@@ -1,9 +1,8 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: amd
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react')
 
diff --git a/tests/cases/conformance/jsx/tsxTypeArgumentResolution.tsx b/tests/cases/conformance/jsx/tsxTypeArgumentResolution.tsx
index a52e0b125cf15..ac37886bc94cb 100644
--- a/tests/cases/conformance/jsx/tsxTypeArgumentResolution.tsx
+++ b/tests/cases/conformance/jsx/tsxTypeArgumentResolution.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxTypeArgumentsJsxPreserveOutput.tsx b/tests/cases/conformance/jsx/tsxTypeArgumentsJsxPreserveOutput.tsx
index 0ac1d12eb5a84..a3b2df4dbee1b 100644
--- a/tests/cases/conformance/jsx/tsxTypeArgumentsJsxPreserveOutput.tsx
+++ b/tests/cases/conformance/jsx/tsxTypeArgumentsJsxPreserveOutput.tsx
@@ -1,8 +1,7 @@
 // @filename: foo.tsx
 // @jsx: preserve
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxUnionElementType1.tsx b/tests/cases/conformance/jsx/tsxUnionElementType1.tsx
index 91457469a8d56..95f8138f9c2bf 100644
--- a/tests/cases/conformance/jsx/tsxUnionElementType1.tsx
+++ b/tests/cases/conformance/jsx/tsxUnionElementType1.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: react
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxUnionElementType2.tsx b/tests/cases/conformance/jsx/tsxUnionElementType2.tsx
index ae0c0843b8156..16186043633ef 100644
--- a/tests/cases/conformance/jsx/tsxUnionElementType2.tsx
+++ b/tests/cases/conformance/jsx/tsxUnionElementType2.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: react
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxUnionElementType3.tsx b/tests/cases/conformance/jsx/tsxUnionElementType3.tsx
index 6e021bc99faf2..1dbc5f42210c4 100644
--- a/tests/cases/conformance/jsx/tsxUnionElementType3.tsx
+++ b/tests/cases/conformance/jsx/tsxUnionElementType3.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: react
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxUnionElementType4.tsx b/tests/cases/conformance/jsx/tsxUnionElementType4.tsx
index e7d7b6ff5ff2e..490b66555d057 100644
--- a/tests/cases/conformance/jsx/tsxUnionElementType4.tsx
+++ b/tests/cases/conformance/jsx/tsxUnionElementType4.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: react
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxUnionElementType5.tsx b/tests/cases/conformance/jsx/tsxUnionElementType5.tsx
index 2f3d96f4eccad..556974e42487a 100644
--- a/tests/cases/conformance/jsx/tsxUnionElementType5.tsx
+++ b/tests/cases/conformance/jsx/tsxUnionElementType5.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: react
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxUnionElementType6.tsx b/tests/cases/conformance/jsx/tsxUnionElementType6.tsx
index e4d2514dbd4a2..02e3c395ab95f 100644
--- a/tests/cases/conformance/jsx/tsxUnionElementType6.tsx
+++ b/tests/cases/conformance/jsx/tsxUnionElementType6.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: react
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxUnionTypeComponent1.tsx b/tests/cases/conformance/jsx/tsxUnionTypeComponent1.tsx
index 09635bbaa161b..93822e05b3e1f 100644
--- a/tests/cases/conformance/jsx/tsxUnionTypeComponent1.tsx
+++ b/tests/cases/conformance/jsx/tsxUnionTypeComponent1.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: react
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/tsxUnionTypeComponent2.tsx b/tests/cases/conformance/jsx/tsxUnionTypeComponent2.tsx
index 394e5e07d34a4..840146a18d0d1 100644
--- a/tests/cases/conformance/jsx/tsxUnionTypeComponent2.tsx
+++ b/tests/cases/conformance/jsx/tsxUnionTypeComponent2.tsx
@@ -1,8 +1,7 @@
 // @filename: file.tsx
 // @jsx: react
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react');
 
diff --git a/tests/cases/conformance/jsx/unicodeEscapesInJsxtags.tsx b/tests/cases/conformance/jsx/unicodeEscapesInJsxtags.tsx
index ac6611933ad4f..8373fd66809d3 100644
--- a/tests/cases/conformance/jsx/unicodeEscapesInJsxtags.tsx
+++ b/tests/cases/conformance/jsx/unicodeEscapesInJsxtags.tsx
@@ -1,10 +1,9 @@
 // @filename: file.tsx
 // @jsx: react
-// @noLib: true
 // @skipLibCheck: true
 // @target: es2015
 // @moduleResolution: bundler
-// @libFiles: react.d.ts,lib.d.ts
+/// <reference path="/.lib/react.d.ts" />
 import * as React from "react";
 declare global {
     namespace JSX {
diff --git a/tests/cases/conformance/moduleResolution/extensionLoadingPriority.ts b/tests/cases/conformance/moduleResolution/extensionLoadingPriority.ts
index 9ddb1dcec8e33..3d46f1b1fff21 100644
--- a/tests/cases/conformance/moduleResolution/extensionLoadingPriority.ts
+++ b/tests/cases/conformance/moduleResolution/extensionLoadingPriority.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @moduleResolution: classic,node16,nodenext,bundler
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/moduleResolution/packageJsonMain.ts b/tests/cases/conformance/moduleResolution/packageJsonMain.ts
index 6bf21cfaa3a82..9e60250fb65b6 100644
--- a/tests/cases/conformance/moduleResolution/packageJsonMain.ts
+++ b/tests/cases/conformance/moduleResolution/packageJsonMain.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @currentDirectory: /
 // @traceResolution: true
diff --git a/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts b/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts
index c6e684b3fe1ba..c495a87ad2cfb 100644
--- a/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts
+++ b/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @currentDirectory: /
 // @traceResolution: true
diff --git a/tests/cases/conformance/moduleResolution/untypedModuleImport.ts b/tests/cases/conformance/moduleResolution/untypedModuleImport.ts
index 2ea07db3ee496..cb335181e4607 100644
--- a/tests/cases/conformance/moduleResolution/untypedModuleImport.ts
+++ b/tests/cases/conformance/moduleResolution/untypedModuleImport.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @currentDirectory: /
 // This tests that importing from a JS file globally works in an untyped way.
diff --git a/tests/cases/conformance/moduleResolution/untypedModuleImport_allowJs.ts b/tests/cases/conformance/moduleResolution/untypedModuleImport_allowJs.ts
index fe509189d9667..bf4704f73033b 100644
--- a/tests/cases/conformance/moduleResolution/untypedModuleImport_allowJs.ts
+++ b/tests/cases/conformance/moduleResolution/untypedModuleImport_allowJs.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @currentDirectory: /
 // @allowJs: true
diff --git a/tests/cases/conformance/moduleResolution/untypedModuleImport_vsAmbient.ts b/tests/cases/conformance/moduleResolution/untypedModuleImport_vsAmbient.ts
index e157772a5edad..2f27b67f0e535 100644
--- a/tests/cases/conformance/moduleResolution/untypedModuleImport_vsAmbient.ts
+++ b/tests/cases/conformance/moduleResolution/untypedModuleImport_vsAmbient.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @currentDirectory: /
 // This tests that an ambient module declaration overrides an untyped import.
diff --git a/tests/cases/conformance/moduleResolution/untypedModuleImport_withAugmentation.ts b/tests/cases/conformance/moduleResolution/untypedModuleImport_withAugmentation.ts
index e27c1232d2587..b62fc6a7245e3 100644
--- a/tests/cases/conformance/moduleResolution/untypedModuleImport_withAugmentation.ts
+++ b/tests/cases/conformance/moduleResolution/untypedModuleImport_withAugmentation.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitReferences: true
 // @currentDirectory: /
 // This tests that augmenting an untyped module is forbidden.
diff --git a/tests/cases/conformance/node/allowJs/nodeModulesAllowJsImportAssignment.ts b/tests/cases/conformance/node/allowJs/nodeModulesAllowJsImportAssignment.ts
index 7e16936af2a1d..9cc719adac682 100644
--- a/tests/cases/conformance/node/allowJs/nodeModulesAllowJsImportAssignment.ts
+++ b/tests/cases/conformance/node/allowJs/nodeModulesAllowJsImportAssignment.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: node16,node18,node20,nodenext
 // @declaration: true
 // @allowJs: true
diff --git a/tests/cases/conformance/node/allowJs/nodeModulesAllowJsTopLevelAwait.ts b/tests/cases/conformance/node/allowJs/nodeModulesAllowJsTopLevelAwait.ts
index 4443169375e7e..9bef9ae71b79c 100644
--- a/tests/cases/conformance/node/allowJs/nodeModulesAllowJsTopLevelAwait.ts
+++ b/tests/cases/conformance/node/allowJs/nodeModulesAllowJsTopLevelAwait.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: node16,node18,node20,nodenext
 // @declaration: true
 // @allowJs: true
diff --git a/tests/cases/conformance/node/nodeModulesImportAssignments.ts b/tests/cases/conformance/node/nodeModulesImportAssignments.ts
index 2e702fe5b2a23..88bd450c5f5b0 100644
--- a/tests/cases/conformance/node/nodeModulesImportAssignments.ts
+++ b/tests/cases/conformance/node/nodeModulesImportAssignments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: node16,node18,node20,nodenext
 // @declaration: true
 // @filename: subfolder/index.ts
diff --git a/tests/cases/conformance/node/nodeModulesImportAttributesTypeModeDeclarationEmitErrors.ts b/tests/cases/conformance/node/nodeModulesImportAttributesTypeModeDeclarationEmitErrors.ts
index 8829c0fcdfd70..6b4e070a98fae 100644
--- a/tests/cases/conformance/node/nodeModulesImportAttributesTypeModeDeclarationEmitErrors.ts
+++ b/tests/cases/conformance/node/nodeModulesImportAttributesTypeModeDeclarationEmitErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: node16,node18,node20,nodenext
 // @declaration: true
 // @outDir: out
diff --git a/tests/cases/conformance/node/nodeModulesImportTypeModeDeclarationEmitErrors1.ts b/tests/cases/conformance/node/nodeModulesImportTypeModeDeclarationEmitErrors1.ts
index 455cc038bd691..bc412a1729510 100644
--- a/tests/cases/conformance/node/nodeModulesImportTypeModeDeclarationEmitErrors1.ts
+++ b/tests/cases/conformance/node/nodeModulesImportTypeModeDeclarationEmitErrors1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: node16,node18,node20,nodenext
 // @declaration: true
 // @outDir: out
diff --git a/tests/cases/conformance/node/nodeModulesTopLevelAwait.ts b/tests/cases/conformance/node/nodeModulesTopLevelAwait.ts
index fd796367e694a..e4ea126385260 100644
--- a/tests/cases/conformance/node/nodeModulesTopLevelAwait.ts
+++ b/tests/cases/conformance/node/nodeModulesTopLevelAwait.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @module: node16,node18,node20,nodenext
 // @declaration: true
 // @filename: subfolder/index.ts
diff --git a/tests/cases/conformance/override/override_js2.ts b/tests/cases/conformance/override/override_js2.ts
index 2de6b1662712e..c48ae80a0bfc6 100644
--- a/tests/cases/conformance/override/override_js2.ts
+++ b/tests/cases/conformance/override/override_js2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitOverride: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/override/override_js3.ts b/tests/cases/conformance/override/override_js3.ts
index f36a29e37796d..110359c01475d 100644
--- a/tests/cases/conformance/override/override_js3.ts
+++ b/tests/cases/conformance/override/override_js3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noImplicitOverride: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.classMethods.es2018.ts b/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.classMethods.es2018.ts
index 719d373983b54..5ba5c2f9a662b 100644
--- a/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.classMethods.es2018.ts
+++ b/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.classMethods.es2018.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2018
 // @lib: esnext
 // @noEmit: true
diff --git a/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.functionDeclarations.es2018.ts b/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.functionDeclarations.es2018.ts
index 10cbc2204bb15..1b52bac20c9e7 100644
--- a/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.functionDeclarations.es2018.ts
+++ b/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.functionDeclarations.es2018.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2018
 // @lib: esnext
 // @noEmit: true
diff --git a/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.functionExpressions.es2018.ts b/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.functionExpressions.es2018.ts
index 92bbcf50c5983..20bb2d7900ed3 100644
--- a/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.functionExpressions.es2018.ts
+++ b/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.functionExpressions.es2018.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2018
 // @lib: esnext
 // @noEmit: true
diff --git a/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.objectLiteralMethods.es2018.ts b/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.objectLiteralMethods.es2018.ts
index dc9ffb4dddb12..8f7699ace8e26 100644
--- a/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.objectLiteralMethods.es2018.ts
+++ b/tests/cases/conformance/parser/ecmascript2018/asyncGenerators/parser.asyncGenerators.objectLiteralMethods.es2018.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2018
 // @skipLibCheck: true
 // @lib: esnext
diff --git a/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors2.ts b/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors2.ts
index 99fab6497f30d..4921161305155 100644
--- a/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors2.ts
+++ b/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     set Foo(a) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts
index a2ba74bdb14eb..d4a19bf73ea75 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class C {
     set Foo(a) { }
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts
index 5fc896002d7d5..8b501afda3ec1 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts
@@ -1,2 +1,3 @@
+// @strict: false
 // @target: es5
 var v = { set Foo(a) { } };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors6.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors6.ts
index 4d2aa80828be6..2a0a0773fc61e 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors6.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 declare class C {
   set foo(v) { }
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors8.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors8.ts
index 2d8af279224dd..f3240641c58b4 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors8.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors8.ts
@@ -1,2 +1,3 @@
+// @strict: false
 // @target: es5
 var v = { set foo() { } }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors9.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors9.ts
index 7f61bd2d4d636..9c88ffc54e054 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors9.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors9.ts
@@ -1,2 +1,3 @@
+// @strict: false
 // @target: es5
 var v = { set foo(a, b) { } }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeAnnotation1.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeAnnotation1.ts
index 8b3d11292780d..b4e3165652b27 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeAnnotation1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeAnnotation1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class C {
    set foo(v): number {
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeParameters1.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeParameters1.ts
index 16a09906d76d9..77f42555cecfc 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeParameters1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeParameters1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class C {
    set foo<T>(v) { }
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression10.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression10.ts
index 66fb0382581fc..0ae4ac42cf9e7 100644
--- a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression10.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowjs: true
 // @checkjs: true
 // @outdir: out
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression11.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression11.ts
index 1009993375376..117a0a1ac61f9 100644
--- a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression11.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowjs: true
 // @checkjs: true
 // @outdir: out
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts
index fd06ce651c6bf..7aa2de1787c27 100644
--- a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowjs: true
 // @checkjs: true
 // @outdir: out
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression15.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression15.ts
index 7eae203ea576f..882f87fff7944 100644
--- a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression15.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression15.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowjs: true
 // @checkjs: true
 // @outdir: out
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression16.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression16.ts
index 27a7591865c82..86151af372d12 100644
--- a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression16.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression16.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowjs: true
 // @checkjs: true
 // @outdir: out
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression17.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression17.ts
index 94a4f59b5c3be..92e8f14f636db 100644
--- a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression17.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression17.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowjs: true
 // @checkjs: true
 // @outdir: out
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression8.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression8.ts
index 6590f0dac984f..d88d00e033c21 100644
--- a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression8.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowjs: true
 // @checkjs: true
 // @outdir: out
diff --git a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression9.ts b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression9.ts
index 504425234039c..03548b7b82cb0 100644
--- a/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression9.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowjs: true
 // @checkjs: true
 // @outdir: out
diff --git a/tests/cases/conformance/parser/ecmascript5/AutomaticSemicolonInsertion/parserAutomaticSemicolonInsertion1.ts b/tests/cases/conformance/parser/ecmascript5/AutomaticSemicolonInsertion/parserAutomaticSemicolonInsertion1.ts
index 1c9e1681a5ecf..7fd1923b5f2a7 100644
--- a/tests/cases/conformance/parser/ecmascript5/AutomaticSemicolonInsertion/parserAutomaticSemicolonInsertion1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/AutomaticSemicolonInsertion/parserAutomaticSemicolonInsertion1.ts
@@ -2,12 +2,12 @@ interface I {
     (): void;
 }
  
-var i: I;
+declare var i: I;
 var o: Object;
 o = i;
 i = o;
  
-var a: {
+declare var a: {
     (): void
 }
 o = a;
diff --git a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration10.ts b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration10.ts
index 5dbbdbaca85c3..8aa2e7918068e 100644
--- a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration10.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    constructor();
    foo();
diff --git a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration12.ts b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration12.ts
index 86d64905d5c3d..5248d023f6e9b 100644
--- a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration12.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    constructor();
    constructor(a) { }
diff --git a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration13.ts b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration13.ts
index f58340bc491da..bbc057e4bb478 100644
--- a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration13.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    foo();
    bar() { }
diff --git a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration14.ts b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration14.ts
index a91f34253fa11..ad7333d9bb42a 100644
--- a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration14.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration14.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    foo();
    constructor();
diff --git a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration15.ts b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration15.ts
index 6b28c5200893b..78caec37b2f4d 100644
--- a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration15.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration15.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    foo();
    constructor() { }
diff --git a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration16.ts b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration16.ts
index b345892ec2e11..46af221520b3c 100644
--- a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration16.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration16.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    foo();
    foo() { }
diff --git a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration17.ts b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration17.ts
index a709f7d7bcca0..d9a9c5aa1e553 100644
--- a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration17.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration17.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es5
 declare class Enumerator {
     public atEnd(): boolean;
diff --git a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration19.ts b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration19.ts
index 65d9bd0a57c6a..3bf18835e3276 100644
--- a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration19.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration19.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     foo();
     "foo"() { }
diff --git a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration20.ts b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration20.ts
index 6c8540e833d71..f65a2e85274d0 100644
--- a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration20.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration20.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     0();
     "0"() { }
diff --git a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration21.ts b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration21.ts
index c9a54f97ef598..eeff13aebe850 100644
--- a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration21.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration21.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     0();
     1() { }
diff --git a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration22.ts b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration22.ts
index ec6da6d269c7c..ba9c8ab0552f1 100644
--- a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration22.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration22.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     "foo"();
     "bar"() { }
diff --git a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration26.ts b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration26.ts
index 4d5395733a774..92be5906ff2d9 100644
--- a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration26.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration26.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    var
    public
diff --git a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration9.ts b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration9.ts
index 620dc45a4df52..84d4d63da65c3 100644
--- a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration9.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    foo();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName11.ts b/tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName11.ts
index b5e27ecc71b38..8d5c2dd8b0b65 100644
--- a/tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName11.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES5
 class C {
    [e]();
diff --git a/tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName7.ts b/tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName7.ts
index 280dc1a5a0ddd..43117e32fb72b 100644
--- a/tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName7.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES5
 class C {
    [e]
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic2.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic2.ts
index 30045cf9f056e..18a0b86e396d3 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Outer
 {
 static public;
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic5.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic5.ts
index 49db39132c623..777c4eb3881d5 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Outer
 {
 static public
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic6.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic6.ts
index 75f4e7105fcbb..78e9a9fb4c236 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic6.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Outer
 {
 static public
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction4.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction4.ts
index a63e70a4ac15b..a008321d28cc7 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var v = (a, b) => {
    
 };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4.ts
index a63e70a4ac15b..a008321d28cc7 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var v = (a, b) => {
    
 };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable2.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable2.ts
index 7399b78df859f..971b62177d5a5 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Interface
 interface IPoint {
     getDist(): number;
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ParameterLists/parserErrorRecovery_ParameterList1.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ParameterLists/parserErrorRecovery_ParameterList1.ts
index 05ad1d455a6df..f77b6342d271e 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ParameterLists/parserErrorRecovery_ParameterList1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ParameterLists/parserErrorRecovery_ParameterList1.ts
@@ -1,2 +1,3 @@
+// @strict: false
 function f(a {
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ParameterLists/parserErrorRecovery_ParameterList2.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ParameterLists/parserErrorRecovery_ParameterList2.ts
index 1d42033558839..fac3459cbea16 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ParameterLists/parserErrorRecovery_ParameterList2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ParameterLists/parserErrorRecovery_ParameterList2.ts
@@ -1,2 +1,3 @@
+// @strict: false
 function f(a, {
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserCommaInTypeMemberList2.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserCommaInTypeMemberList2.ts
index 57e008de50736..cd105b4afd572 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserCommaInTypeMemberList2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserCommaInTypeMemberList2.ts
@@ -1 +1,2 @@
+// @strict: false
 var s = $.extend< { workItem: any }, { workItem: any, width: string }>({ workItem: this._workItem }, {});
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonInClass1.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonInClass1.ts
index a63016987d328..ad51a67dc153a 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonInClass1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonInClass1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class a {
     //constructor ();
     constructor (n: number);
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserMissingLambdaOpenBrace1.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserMissingLambdaOpenBrace1.ts
index 1ea7f809eadd9..e53e5cac1fcc7 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserMissingLambdaOpenBrace1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserMissingLambdaOpenBrace1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     where(filter: Iterator<T, boolean>): Query<T> {
         return fromDoWhile(test =>
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature1.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature1.ts
index ffd28ee38320b..844b7603426c0 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Foo{
     public biz;
 }
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature2.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature2.ts
index 97230c998999e..0059be4dd720f 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Foo{
     public
     biz;
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts
index c4c56acf5787c..aea4db3053750 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 export function foo() {
    export var x = this;
 }
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserStatementIsNotAMemberVariableDeclaration1.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserStatementIsNotAMemberVariableDeclaration1.ts
index c029cbf8b12dc..6fece13180a39 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserStatementIsNotAMemberVariableDeclaration1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserStatementIsNotAMemberVariableDeclaration1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 return {
 
   "set": function (key, value) {
diff --git a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.ts b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.ts
index e6360d755c2f8..d86483408693d 100644
--- a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare namespace M {
   declare function F();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration4.ts b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration4.ts
index 07ca5a5cd92a1..7117d66d34eba 100644
--- a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration4.ts
@@ -1,2 +1,3 @@
+// @strict: false
 function foo();
 function bar() { }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration5.ts b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration5.ts
index 971b7757ba9d1..afea76ed86fbb 100644
--- a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration5.ts
@@ -1,2 +1,3 @@
+// @strict: false
 function foo();
 function foo() { }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration6.ts b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration6.ts
index 4f656130ae1bb..6f19f19b93d2d 100644
--- a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration6.ts
+++ b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 {
     function foo();
     function bar() { }
diff --git a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration7.ts b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration7.ts
index 3684110c82ca0..a74836f3639a3 100644
--- a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration7.ts
+++ b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 namespace M {
    function foo();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts
index f1b8f0efc027d..70f8e590a44ab 100644
--- a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts
+++ b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare namespace M {
    function foo();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts b/tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts
index de73aaa7d73d9..918af917d257d 100644
--- a/tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts
@@ -1,3 +1,4 @@
+// @strict: false
 export class Game {
     private position = new DisplayPosition([), 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0], NoMove, 0);
     private prevConfig: SeedCoords[][];
diff --git a/tests/cases/conformance/parser/ecmascript5/Generics/parserCastVersusArrowFunction1.ts b/tests/cases/conformance/parser/ecmascript5/Generics/parserCastVersusArrowFunction1.ts
index 1f19bd2b39da9..bf20c3ca7accc 100644
--- a/tests/cases/conformance/parser/ecmascript5/Generics/parserCastVersusArrowFunction1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Generics/parserCastVersusArrowFunction1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var v = <T>() => 1;
 var v = <T>a;
 
diff --git a/tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts b/tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts
index 2a99284ab03f6..41288f466d67d 100644
--- a/tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts
+++ b/tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    static static [x: string]: string;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature1.ts b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature1.ts
index 853817d41c5e6..a3abdcdde2e5d 100644
--- a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   [...a]
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature10.ts b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature10.ts
index 06b9ce8393d51..c1956c8960023 100644
--- a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature10.ts
+++ b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
    [a, b]: number
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature11.ts b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature11.ts
index 1c78f24a213b3..e2a14b1de0682 100644
--- a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature11.ts
+++ b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
         [p]; // Used to be indexer, now it is a computed property
         [p1: string];
diff --git a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature2.ts b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature2.ts
index 58cd613071434..f7aa09975a572 100644
--- a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   [public a]
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature3.ts b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature3.ts
index fe072303e1211..bd9fccda234cc 100644
--- a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature3.ts
+++ b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   [a?]
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature4.ts b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature4.ts
index a6cf3a720a9cf..d5e54619ebf2e 100644
--- a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   [a = 0] // Used to be indexer, now it is a computed property
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature5.ts b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature5.ts
index e77c8fe9bb08d..93d927d88b529 100644
--- a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   [a] // Used to be indexer, now it is a computed property
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration13.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration13.ts
index 935f70c1c907e..c84e7864a81f8 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration13.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class C {
    set Foo() { }
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration16.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration16.ts
index 1bb0a7c7ebcb7..2ed7d3b077e28 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration16.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration16.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class C {
    set Foo(a = 1) { }
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration18.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration18.ts
index 94a7a62295ec7..cb9a38201b84e 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration18.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration18.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class C {
    set Foo(...a) { }
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts
index e27e000ef2026..3de5bf8e3ee27 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class C {
   set a(i) { }
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts
index 4e71fad535b0f..cc0173de8d22b 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class C {
   set "a"(i) { }
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts
index 1ef5cb83fbd96..db71579f82ee1 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class C {
   set 0(i) { }
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts
index f95d5f109308c..f1d099e1ea1c6 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 class C {
     static static get Foo() { }
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts b/tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts
index 5bde3b5913acb..30eb9fef1db70 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     static static Foo() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration1.ts b/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration1.ts
index 9bf32173ca1b0..776ae1b30227c 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
   public public Foo;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts b/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts
index 17edcab37be77..7e67163a11898 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
   static static Foo;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration3.ts b/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration3.ts
index bb77460191af2..3d5916ae9c1c9 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration3.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
   static public Foo;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration4.ts b/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration4.ts
index 7f647ffb3bf8d..00b86bfe6a042 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
   export Foo;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration5.ts b/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration5.ts
index 98c4f9a75bbf3..6470b2935eea0 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
   declare Foo;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature1.ts b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature1.ts
index 070155319e87d..87b8bd74cea5c 100644
--- a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   A();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature10.ts b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature10.ts
index a58885e8489a1..31397cca82ef1 100644
--- a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature10.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   1?();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature11.ts b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature11.ts
index 864121a7e5fdd..f1b07b30bcdcb 100644
--- a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature11.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   2<T>();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature12.ts b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature12.ts
index c051e41cec6c1..75c2de1554ce8 100644
--- a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature12.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   3?<T>();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature2.ts b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature2.ts
index b20ebadc1ff05..1f06aa8d0a8a4 100644
--- a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   B?();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature3.ts b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature3.ts
index da0ec4e395b6f..e2582b30388fb 100644
--- a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature3.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   C<T>();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature4.ts b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature4.ts
index daa26cb933b0b..ce21c60d9a28c 100644
--- a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   D?<T>();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature5.ts b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature5.ts
index 1f0688a37f4b8..8cdae039cd923 100644
--- a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   "E"();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature6.ts b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature6.ts
index 601f48a2f3211..9e8bd6797a889 100644
--- a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature6.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   "F"?();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature7.ts b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature7.ts
index ff9df7bffe599..aeae8a0e12c0b 100644
--- a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature7.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   "G"<T>();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature8.ts b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature8.ts
index 7af4b0bf93b59..42cb46b04cb2b 100644
--- a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature8.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   "H"?<T>();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature9.ts b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature9.ts
index a54321bbec453..6b5c3984a6a5b 100644
--- a/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature9.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   0();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts
index e0045fc9f9e9a..ea167f26c4e0f 100644
--- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare namespace string {
     interface X { }
     export function foo(s: string);
diff --git a/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType3.ts b/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType3.ts
index b154600fb0982..2494b1c0d8a11 100644
--- a/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType3.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var v: {
   x; 
   y
diff --git a/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType4.ts b/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType4.ts
index e0b986e88bf34..c2116f9639913 100644
--- a/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var v: {
   x
   y
diff --git a/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType5.ts b/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType5.ts
index 0687805280beb..c86b1a9590b6a 100644
--- a/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var v: {
    A: B
    <T>;
diff --git a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList1.ts b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList1.ts
index 7d3efaab39d8f..8a92b2c448e3b 100644
--- a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    F(...A, B) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList10.ts b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList10.ts
index 0f9d35c39046b..b22b8b09522e9 100644
--- a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList10.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    foo(...bar = 0) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList12.ts b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList12.ts
index 83756bdfa69dd..caa7adaddbe03 100644
--- a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList12.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList12.ts
@@ -1,2 +1,3 @@
+// @strict: false
 function F(a,) {
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList13.ts b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList13.ts
index 1e0e09b84f576..3733f417b4776 100644
--- a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList13.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
     new (public x);
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList14.ts b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList14.ts
index 41a3ab483579a..6cdcb6aa41dbd 100644
--- a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList14.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList14.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare class C {
   foo(a = 1): void;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList15.ts b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList15.ts
index 02f258e24598e..6745ee6d9ed8b 100644
--- a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList15.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList15.ts
@@ -1,2 +1,3 @@
+// @strict: false
 function foo(a = 4);
 function foo(a, b) {}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList16.ts b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList16.ts
index 08a64f51b1604..61262507ea982 100644
--- a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList16.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList16.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    foo(a = 4);
    foo(a, b) { }
diff --git a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList17.ts b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList17.ts
index 27ada9c2c76b9..b926a94e3fdf9 100644
--- a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList17.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList17.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    constructor(a = 4);
    constructor(a, b) { }
diff --git a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList3.ts b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList3.ts
index 2e5a617fb08a1..8ec5c7eddc07f 100644
--- a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList3.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
   F(A?, B) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList4.ts b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList4.ts
index 71e4fe05f5bce..2ad3af4d4c94a 100644
--- a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList4.ts
@@ -1,2 +1,3 @@
+// @strict: false
 function F(public A) {
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList5.ts b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList5.ts
index 667875b36d8d6..70b8f80822cfe 100644
--- a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList5.ts
@@ -1,2 +1,3 @@
+// @strict: false
 function A(): (public B) => C {
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList6.ts b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList6.ts
index 3e81cd934a1f5..e36ac5d9ac5b2 100644
--- a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList6.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
   constructor(C: (public A) => any) {
   }
diff --git a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList9.ts b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList9.ts
index be93e72f12938..d77bc5ed6ab02 100644
--- a/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList9.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    foo(...bar?) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature1.ts b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature1.ts
index ae94fdfc67158..223403620d3ae 100644
--- a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   A;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature10.ts b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature10.ts
index f43b28d14e22b..53c395b340cd7 100644
--- a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature10.ts
+++ b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   1?;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature11.ts b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature11.ts
index 97066c891696a..295b10e03a80c 100644
--- a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature11.ts
+++ b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   2:any;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature12.ts b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature12.ts
index 2adf46d49928c..7b1f967c9d80f 100644
--- a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature12.ts
+++ b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   3?:any;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature2.ts b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature2.ts
index ecf5feacb5ef3..e00309c71402a 100644
--- a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   B?;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature5.ts b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature5.ts
index b20b6918b55d2..056d174930af3 100644
--- a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   "E";
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature6.ts b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature6.ts
index 059de959e2f6b..a39694926d907 100644
--- a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature6.ts
+++ b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   "F"?;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature9.ts b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature9.ts
index 685fff45b85c9..b7bf2d8660056 100644
--- a/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature9.ts
+++ b/tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
   0;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Protected/Protected8.ts b/tests/cases/conformance/parser/ecmascript5/Protected/Protected8.ts
index 5337751fb1e3c..12294a7534ab2 100644
--- a/tests/cases/conformance/parser/ecmascript5/Protected/Protected8.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Protected/Protected8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
    protected
    p
diff --git a/tests/cases/conformance/parser/ecmascript5/Protected/Protected9.ts b/tests/cases/conformance/parser/ecmascript5/Protected/Protected9.ts
index 4e24e28ec1a76..962d4e6208fd9 100644
--- a/tests/cases/conformance/parser/ecmascript5/Protected/Protected9.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Protected/Protected9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
    constructor(protected p) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts b/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts
index 5622ca5097594..99b4ad8a10b29 100644
--- a/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts
+++ b/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts
@@ -1,4 +1,5 @@
-// @lib: es5
+// @useUnknownInCatchVariables: false
+// @lib: es5
 //
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 // 
diff --git a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509534.ts b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509534.ts
index 3183bebe93a43..1ba81956186af 100644
--- a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509534.ts
+++ b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509534.ts
@@ -1,3 +1,4 @@
+// @strict: false
 "use strict";
 var config = require("../config");
 module.exports.route = function (server) {
diff --git a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546.ts b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546.ts
index bfb48ee0e303b..e3516c0efd144 100644
--- a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546.ts
+++ b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546.ts
@@ -1,3 +1,4 @@
+// @strict: false
 export class Logger { 
      public
 }
diff --git a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_1.ts b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_1.ts
index bfb48ee0e303b..e3516c0efd144 100644
--- a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 export class Logger { 
      public
 }
diff --git a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts
index ca1a460120445..327009cf50ebb 100644
--- a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 "use strict";
 
 export class Logger { 
diff --git a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509630.ts b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509630.ts
index 65a4bf7522e2c..2dc54cfcd1333 100644
--- a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509630.ts
+++ b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509630.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class Type {
     public examples = [ // typing here
 }
diff --git a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser642331.ts b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser642331.ts
index 52fbbb38c443c..09b2e296d956e 100644
--- a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser642331.ts
+++ b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser642331.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class test {
     constructor (static) { }
 }
diff --git a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser642331_1.ts b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser642331_1.ts
index 5152a182c7c16..5a103888509d7 100644
--- a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser642331_1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser642331_1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 "use strict";
 
 class test {
diff --git a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser643728.ts b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser643728.ts
index e0fa488500d72..d60d751e3521d 100644
--- a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser643728.ts
+++ b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser643728.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface C {
     foo;
     new;
diff --git a/tests/cases/conformance/parser/ecmascript5/RegularExpressions/parserRegularExpression6.ts b/tests/cases/conformance/parser/ecmascript5/RegularExpressions/parserRegularExpression6.ts
index 7180a2f6540a4..d7effca46b22f 100644
--- a/tests/cases/conformance/parser/ecmascript5/RegularExpressions/parserRegularExpression6.ts
+++ b/tests/cases/conformance/parser/ecmascript5/RegularExpressions/parserRegularExpression6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare var a;
 a /= 1; // parse as infix
 a = /=/; // parse as regexp
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity6.ts b/tests/cases/conformance/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity6.ts
index e2e742fd6bf9e..d43674f4b795a 100644
--- a/tests/cases/conformance/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity6.ts
+++ b/tests/cases/conformance/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function c255lsqr8h(a7, a6, a5, a4, a3, a2, a1, a0) {
     let r = [];
     let v;
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement18.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement18.ts
index a7dff6f225bd7..759cc1a505eb9 100644
--- a/tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement18.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement18.ts
@@ -1,2 +1,3 @@
+// @strict: false
 //@target: ES5
 for (var of of of) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement19.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement19.ts
index 730f574be33ea..944aa894881a5 100644
--- a/tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement19.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement19.ts
@@ -1,2 +1,3 @@
+// @strict: false
 //@target: ES5
 for (var of in of) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement20.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement20.ts
index edffb88a1e367..226342f484fb0 100644
--- a/tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement20.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement20.ts
@@ -1,2 +1,3 @@
+// @strict: false
 //@target: ES5
 for (var of = 0 in of) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement2.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement2.ts
index 387d2cbe88fdb..1e6bc2d015ab9 100644
--- a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var a;
 var b = [];
 var c;
diff --git a/tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode10.ts b/tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode10.ts
index 623418abc1721..a7cb8588b130d 100644
--- a/tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode10.ts
+++ b/tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 "use strict";
 function f(eval) {
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode11.ts b/tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode11.ts
index 58c6e0ef7b5d8..d7456bbda0673 100644
--- a/tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode11.ts
+++ b/tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 "use strict";
 var v = function f(eval) {
 };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode12.ts b/tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode12.ts
index e83743471968f..d18966e8fdcf6 100644
--- a/tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode12.ts
+++ b/tests/cases/conformance/parser/ecmascript5/StrictMode/parserStrictMode12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: ES5
 "use strict";
 var v = { set foo(eval) { } }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.ts b/tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.ts
index 14b003f4f9369..202f2af208467 100644
--- a/tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare namespace M {
    declare var v;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/parserAstSpans1.ts b/tests/cases/conformance/parser/ecmascript5/parserAstSpans1.ts
index b96c6f7397327..0010269c9ba6d 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserAstSpans1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserAstSpans1.ts
@@ -17,28 +17,28 @@ interface i1 {
     nc_l1: () => void;
 }
 class c1 implements i1 {
-    public i1_p1: number;
+    public i1_p1!: number;
     public i1_f1() {
     }
-    public i1_l1: () => void;
-    public i1_nc_p1: number;
+    public i1_l1!: () => void;
+    public i1_nc_p1!: number;
     public i1_nc_f1() {
     }
-    public i1_nc_l1: () => void;
+    public i1_nc_l1!: () => void;
     /** c1_p1*/
-    public p1: number;
+    public p1!: number;
     /** c1_f1*/
     public f1() {
     }
     /** c1_l1*/
-    public l1: () => void;
+    public l1!: () => void;
     /** c1_nc_p1*/
-    public nc_p1: number;
+    public nc_p1!: number;
     /** c1_nc_f1*/
     public nc_f1() {
     }
     /** c1_nc_l1*/
-    public nc_l1: () => void;
+    public nc_l1!: () => void;
 }
 var i1_i: i1;
 i1_i.i1_f1();
@@ -79,14 +79,14 @@ class c2 {
     public get c2_prop() {
         return 10;
     }
-    public c2_nc_p1: number;
+    public c2_nc_p1!: number;
     public c2_nc_f1() {
     }
     public get c2_nc_prop() {
         return 10;
     }
     /** c2 p1*/
-    public p1: number;
+    public p1!: number;
     /** c2 f1*/
     public f1() {
     }
@@ -94,7 +94,7 @@ class c2 {
     public get prop() {
         return 10;
     }
-    public nc_p1: number;
+    public nc_p1!: number;
     public nc_f1() {
     }
     public get nc_prop() {
@@ -111,7 +111,7 @@ class c3 extends c2 {
         this.p1 = super.c2_p1;
     }
     /** c3 p1*/
-    public p1: number;
+    public p1!: number;
     /** c3 f1*/
     public f1() {
     }
@@ -119,7 +119,7 @@ class c3 extends c2 {
     public get prop() {
         return 10;
     }
-    public nc_p1: number;
+    public nc_p1!: number;
     public nc_f1() {
     }
     public get nc_prop() {
@@ -208,10 +208,10 @@ i2_i.nc_l1();
 
 /**c5 class*/
 class c5 {
-    public b: number;
+    public b!: number;
 }
 class c6 extends c5 {
-    public d;
+    public d!: any;
     constructor() {
         super();
         this.d = super.b;
diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource1.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource1.ts
index 69499c512c2b7..aa5fb320c4383 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserRealSource1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. 
 // See LICENSE.txt in the project root for complete license information.
 
diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts
index 9e0016bd99e35..55ae0a8df9858 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. 
 // See LICENSE.txt in the project root for complete license information.
 
diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts
index e4aff55ca36e1..e3d085b835bca 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. 
 // See LICENSE.txt in the project root for complete license information.
 
diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource12.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource12.ts
index 3a50638c3d205..3108bdee2a0fb 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserRealSource12.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. 
 // See LICENSE.txt in the project root for complete license information.
 
diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource13.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource13.ts
index 22966321e9b9d..78cd98eab4275 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserRealSource13.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. 
 // See LICENSE.txt in the project root for complete license information.
 
diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts
index 49bb0ad75a3ab..8e8623060269a 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. 
 // See LICENSE.txt in the project root for complete license information.
 
diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource2.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource2.ts
index a961fceb518e6..4b4854e868c61 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserRealSource2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. 
 // See LICENSE.txt in the project root for complete license information.
 
diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource4.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource4.ts
index e2c93f08e17db..472113ccb6f84 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserRealSource4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. 
 // See LICENSE.txt in the project root for complete license information.
 
diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource5.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource5.ts
index c1546dc54e144..2c6b6ada72440 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserRealSource5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. 
 // See LICENSE.txt in the project root for complete license information.
 
diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts
index ae26f557656e7..56412e17fcea1 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. 
 // See LICENSE.txt in the project root for complete license information.
 
diff --git a/tests/cases/conformance/parser/ecmascript5/parserS12.11_A3_T4.ts b/tests/cases/conformance/parser/ecmascript5/parserS12.11_A3_T4.ts
index 00def2926f002..cdac07097671b 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserS12.11_A3_T4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserS12.11_A3_T4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff --git a/tests/cases/conformance/parser/ecmascript5/parserUsingConstructorAsIdentifier.ts b/tests/cases/conformance/parser/ecmascript5/parserUsingConstructorAsIdentifier.ts
index 130fee103af10..74d2f43b1f113 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserUsingConstructorAsIdentifier.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserUsingConstructorAsIdentifier.ts
@@ -1,3 +1,4 @@
+// @strict: false
         function define(constructor, instanceMembers, staticMembers) {
             constructor = constructor || function () { };
             PluginUtilities.Utilities.markSupportedForProcessing(constructor);
diff --git a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName11.ts b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName11.ts
index 17af42fcca36a..180b5a7ebc43b 100644
--- a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName11.ts
+++ b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
    [e]();
diff --git a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName17.ts b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName17.ts
index 6e6485ea85f31..fc2284dd2fdff 100644
--- a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName17.ts
+++ b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName17.ts
@@ -1,2 +1,3 @@
+// @strict: false
 //@target: ES6
 var v = { set [e](v) { } }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName19.ts b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName19.ts
index f190dadb92c9e..38a686bb2427a 100644
--- a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName19.ts
+++ b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName19.ts
@@ -1,2 +1,3 @@
+// @strict: false
 //@target: ES6
 var v: { [e]? };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName24.ts b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName24.ts
index 8ff0f753e1fa5..62b7194212589 100644
--- a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName24.ts
+++ b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName24.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
     set [e](v) { }
diff --git a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName25.ts b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName25.ts
index 3bf29e66baeb0..f246ef43f92e6 100644
--- a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName25.ts
+++ b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName25.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
     // No ASI
diff --git a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName26.ts b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName26.ts
index e6eaa682b5922..5ffdb26021252 100644
--- a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName26.ts
+++ b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName26.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 enum E {
     // No ASI
diff --git a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName27.ts b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName27.ts
index d52b7d43cfc94..9b1f43147e01f 100644
--- a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName27.ts
+++ b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName27.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
     // No ASI
diff --git a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName33.ts b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName33.ts
index 2ca7ac84af70d..1d8211c7627bd 100644
--- a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName33.ts
+++ b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName33.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
     // No ASI
diff --git a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName7.ts b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName7.ts
index 8f918c6116049..322e0acd43d5c 100644
--- a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName7.ts
+++ b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
    [e]
diff --git a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName8.ts b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName8.ts
index 6e55c04b7a17c..44887f508dda3 100644
--- a/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName8.ts
+++ b/tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@target: ES6
 class C {
    public [e]
diff --git a/tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement18.ts b/tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement18.ts
index 268dc163dde25..1ff351dc4a58b 100644
--- a/tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement18.ts
+++ b/tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement18.ts
@@ -1,2 +1,3 @@
+// @strict: false
 //@target: ES6
 for (var of of of) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement19.ts b/tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement19.ts
index 4dff469112b74..16352bafe4951 100644
--- a/tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement19.ts
+++ b/tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement19.ts
@@ -1,2 +1,3 @@
+// @strict: false
 //@target: ES6
 for (var of in of) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement20.ts b/tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement20.ts
index d0b7b75175da9..ea05df9e8555c 100644
--- a/tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement20.ts
+++ b/tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement20.ts
@@ -1,2 +1,3 @@
+// @strict: false
 //@target: ES6
 for (var of = 0 in of) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/salsa/binderUninitializedModuleExportsAssignment.ts b/tests/cases/conformance/salsa/binderUninitializedModuleExportsAssignment.ts
index ef3ef213d3608..b75daaffd967e 100644
--- a/tests/cases/conformance/salsa/binderUninitializedModuleExportsAssignment.ts
+++ b/tests/cases/conformance/salsa/binderUninitializedModuleExportsAssignment.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/circularMultipleAssignmentDeclaration.ts b/tests/cases/conformance/salsa/circularMultipleAssignmentDeclaration.ts
index bc2c992dafcc8..21e45070a9c7e 100644
--- a/tests/cases/conformance/salsa/circularMultipleAssignmentDeclaration.ts
+++ b/tests/cases/conformance/salsa/circularMultipleAssignmentDeclaration.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @filename:circularMultipleAssignmentDeclaration.js
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/commonJSAliasedExport.ts b/tests/cases/conformance/salsa/commonJSAliasedExport.ts
index 08eda40909058..b42ba3f383b0c 100644
--- a/tests/cases/conformance/salsa/commonJSAliasedExport.ts
+++ b/tests/cases/conformance/salsa/commonJSAliasedExport.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkJs: true
 // @outdir: out/
 // @declaration: true
diff --git a/tests/cases/conformance/salsa/conflictingCommonJSES2015Exports.ts b/tests/cases/conformance/salsa/conflictingCommonJSES2015Exports.ts
index 35acd416e79b1..32ab91dcd3d6c 100644
--- a/tests/cases/conformance/salsa/conflictingCommonJSES2015Exports.ts
+++ b/tests/cases/conformance/salsa/conflictingCommonJSES2015Exports.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkJs: true
 // @allowJS: true
 // @noEmit: true
diff --git a/tests/cases/conformance/salsa/constructorFunctions.ts b/tests/cases/conformance/salsa/constructorFunctions.ts
index 35eae4b0e2891..28b9b5720b26f 100644
--- a/tests/cases/conformance/salsa/constructorFunctions.ts
+++ b/tests/cases/conformance/salsa/constructorFunctions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/salsa/constructorFunctions2.ts b/tests/cases/conformance/salsa/constructorFunctions2.ts
index 439fe5e49113c..73de94a16940f 100644
--- a/tests/cases/conformance/salsa/constructorFunctions2.ts
+++ b/tests/cases/conformance/salsa/constructorFunctions2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/salsa/expandoOnAlias.ts b/tests/cases/conformance/salsa/expandoOnAlias.ts
index 1a2ecb09f8170..0c592d030cfb8 100644
--- a/tests/cases/conformance/salsa/expandoOnAlias.ts
+++ b/tests/cases/conformance/salsa/expandoOnAlias.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @declaration: true
diff --git a/tests/cases/conformance/salsa/exportNestedNamespaces2.ts b/tests/cases/conformance/salsa/exportNestedNamespaces2.ts
index 3745d3bd2c402..6ab567f50da04 100644
--- a/tests/cases/conformance/salsa/exportNestedNamespaces2.ts
+++ b/tests/cases/conformance/salsa/exportNestedNamespaces2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/salsa/inferringClassMembersFromAssignments8.ts b/tests/cases/conformance/salsa/inferringClassMembersFromAssignments8.ts
index 2126bd17ff1c7..8d57ec12f6de9 100644
--- a/tests/cases/conformance/salsa/inferringClassMembersFromAssignments8.ts
+++ b/tests/cases/conformance/salsa/inferringClassMembersFromAssignments8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // no inference in TS files, even for `this` aliases:
 
 var app = function() {
diff --git a/tests/cases/conformance/salsa/jsObjectsMarkedAsOpenEnded.ts b/tests/cases/conformance/salsa/jsObjectsMarkedAsOpenEnded.ts
index 4991d674d5e75..c5acf58763f99 100644
--- a/tests/cases/conformance/salsa/jsObjectsMarkedAsOpenEnded.ts
+++ b/tests/cases/conformance/salsa/jsObjectsMarkedAsOpenEnded.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @outFile: output.js
 // @allowJs: true
 
diff --git a/tests/cases/conformance/salsa/mixedPropertyElementAccessAssignmentDeclaration.ts b/tests/cases/conformance/salsa/mixedPropertyElementAccessAssignmentDeclaration.ts
index 8dd13383df00c..723e06254cbb4 100644
--- a/tests/cases/conformance/salsa/mixedPropertyElementAccessAssignmentDeclaration.ts
+++ b/tests/cases/conformance/salsa/mixedPropertyElementAccessAssignmentDeclaration.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Should not crash: #34642
 var arr = [];
 arr[0].prop[2] = {};
diff --git a/tests/cases/conformance/salsa/moduleExportAlias2.ts b/tests/cases/conformance/salsa/moduleExportAlias2.ts
index 027cc83e6f1e2..76b9494b5a180 100644
--- a/tests/cases/conformance/salsa/moduleExportAlias2.ts
+++ b/tests/cases/conformance/salsa/moduleExportAlias2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @checkJs: true
 // @allowJS: true
 // @noEmit: true
diff --git a/tests/cases/conformance/salsa/moduleExportAssignment2.ts b/tests/cases/conformance/salsa/moduleExportAssignment2.ts
index decb27392126c..ad5cba5229441 100644
--- a/tests/cases/conformance/salsa/moduleExportAssignment2.ts
+++ b/tests/cases/conformance/salsa/moduleExportAssignment2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/moduleExportAssignment4.ts b/tests/cases/conformance/salsa/moduleExportAssignment4.ts
index 979c423b6ddac..46458ff364b81 100644
--- a/tests/cases/conformance/salsa/moduleExportAssignment4.ts
+++ b/tests/cases/conformance/salsa/moduleExportAssignment4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/privateIdentifierExpando.ts b/tests/cases/conformance/salsa/privateIdentifierExpando.ts
index 2f31c3a369982..048141ddd81e8 100644
--- a/tests/cases/conformance/salsa/privateIdentifierExpando.ts
+++ b/tests/cases/conformance/salsa/privateIdentifierExpando.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @declaration: true
diff --git a/tests/cases/conformance/salsa/propertyAssignmentOnImportedSymbol.ts b/tests/cases/conformance/salsa/propertyAssignmentOnImportedSymbol.ts
index 083cf23baac06..77637f760014d 100644
--- a/tests/cases/conformance/salsa/propertyAssignmentOnImportedSymbol.ts
+++ b/tests/cases/conformance/salsa/propertyAssignmentOnImportedSymbol.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/salsa/propertyAssignmentOnParenthesizedNumber.ts b/tests/cases/conformance/salsa/propertyAssignmentOnParenthesizedNumber.ts
index 7bfd76959a01a..2fdb6150c2383 100644
--- a/tests/cases/conformance/salsa/propertyAssignmentOnParenthesizedNumber.ts
+++ b/tests/cases/conformance/salsa/propertyAssignmentOnParenthesizedNumber.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/salsa/propertyAssignmentOnUnresolvedImportedSymbol.ts b/tests/cases/conformance/salsa/propertyAssignmentOnUnresolvedImportedSymbol.ts
index a879367e06f2a..c279603da69cb 100644
--- a/tests/cases/conformance/salsa/propertyAssignmentOnUnresolvedImportedSymbol.ts
+++ b/tests/cases/conformance/salsa/propertyAssignmentOnUnresolvedImportedSymbol.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/salsa/propertyAssignmentUseParentType1.ts b/tests/cases/conformance/salsa/propertyAssignmentUseParentType1.ts
index 500ae6f2fe377..0719ba037aa0b 100644
--- a/tests/cases/conformance/salsa/propertyAssignmentUseParentType1.ts
+++ b/tests/cases/conformance/salsa/propertyAssignmentUseParentType1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface N {
     (): boolean
     num: 123;
diff --git a/tests/cases/conformance/salsa/propertyAssignmentUseParentType2.ts b/tests/cases/conformance/salsa/propertyAssignmentUseParentType2.ts
index 53696abbf8110..7f2a22a54dc33 100644
--- a/tests/cases/conformance/salsa/propertyAssignmentUseParentType2.ts
+++ b/tests/cases/conformance/salsa/propertyAssignmentUseParentType2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/salsa/propertyAssignmentUseParentType3.ts b/tests/cases/conformance/salsa/propertyAssignmentUseParentType3.ts
index 9a1357fd52bee..e8924a5bc132f 100644
--- a/tests/cases/conformance/salsa/propertyAssignmentUseParentType3.ts
+++ b/tests/cases/conformance/salsa/propertyAssignmentUseParentType3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // don't use the parent type if it's a function declaration (#33741)
 
 function foo1(): number {
diff --git a/tests/cases/conformance/salsa/prototypePropertyAssignmentMergeAcrossFiles2.ts b/tests/cases/conformance/salsa/prototypePropertyAssignmentMergeAcrossFiles2.ts
index 6d1018d7afc9c..109c9893d9d98 100644
--- a/tests/cases/conformance/salsa/prototypePropertyAssignmentMergeAcrossFiles2.ts
+++ b/tests/cases/conformance/salsa/prototypePropertyAssignmentMergeAcrossFiles2.ts
@@ -16,10 +16,10 @@ Ns.Two.prototype = {
 /**
  * @type {Ns.One}
  */
-var one;
+var one = undefined;
 one.wat;
 /**
  * @type {Ns.Two}
  */
-var two;
+var two = undefined;
 two.wat;
diff --git a/tests/cases/conformance/salsa/topLevelThisAssignment.ts b/tests/cases/conformance/salsa/topLevelThisAssignment.ts
index 7cf806450a0ef..51750fc37b42c 100644
--- a/tests/cases/conformance/salsa/topLevelThisAssignment.ts
+++ b/tests/cases/conformance/salsa/topLevelThisAssignment.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @outFile: output.js
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment.ts
index d8b9a28c56953..cef975fe3e727 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment10.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment10.ts
index aa700b2800262..fe454857fc9c4 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment10.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment10_1.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment10_1.ts
index 5e5228874d223..cf76bc6993e25 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment10_1.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment10_1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment11.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment11.ts
index 308da40f3c46b..90624bd19751f 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment11.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment12.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment12.ts
index 9724da7198246..4fd632a0ec59e 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment12.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment13.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment13.ts
index 201560d5055ef..bd629bccc54e0 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment13.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment14.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment14.ts
index b3aaaf1702b80..28472ca2583ae 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment14.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment14.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment15.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment15.ts
index c8099a033953c..2e8ae589f1189 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment15.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment15.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment16.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment16.ts
index 534e3bcc4c3aa..2816e4c74ea32 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment16.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment16.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment17.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment17.ts
index 14358c8a725dd..d82c879de184d 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment17.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment17.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment18.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment18.ts
index 40525ef019179..9cb6d0167c0cf 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment18.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment18.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment19.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment19.ts
index 985dd5714ef82..7cae0bfc73df3 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment19.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment19.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment2.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment2.ts
index 5931a9960fdc4..f60f42d09964c 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment2.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment20.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment20.ts
index 13214cbf4480e..146c1fd591976 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment20.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment20.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment21.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment21.ts
index 968a8206c195e..da9906d145f06 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment21.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment21.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment23.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment23.ts
index 18923e0a5a8f6..a6081940e44a1 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment23.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment23.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @checkJs: true
 // @allowJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment24.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment24.ts
index e11d9c7ac5523..35bca77d21d2e 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment24.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment24.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @checkJs: true
 // @allowJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment25.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment25.ts
index 37c24366da9eb..47f7a1c077dab 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment25.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment25.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @checkJs: true
 // @allowJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment27.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment27.ts
index 71963749f1a1b..1489a87f1df48 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment27.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment27.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment28.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment28.ts
index 5a9ffd3e415ce..53142852cb0aa 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment28.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment28.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment29.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment29.ts
index 1882731c8f106..fd5f7e8b4a2c8 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment29.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment29.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 function ExpandoDecl(n: number) {
     return n.toString();
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment3.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment3.ts
index 1ae7f06f5b2c3..4ead372ce20ad 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment3.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment30.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment30.ts
index e24c8ec2b944a..35fb35a1d85e9 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment30.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment30.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Combo {
     (): number;
     p?: { [s: string]: number };
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment31.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment31.ts
index 7c11a2a64bbec..33bbdee513fd6 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment31.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment31.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function ExpandoMerge(n: number) {
     return n;
 }
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment32.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment32.ts
index 498aa151e7306..97ea9a2c9b296 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment32.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment32.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @Filename: expando.ts
 function ExpandoMerge(n: number) {
     return n;
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment33.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment33.ts
index d98f689329dd3..22d62e807028e 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment33.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment33.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @Filename: ns.ts
 namespace ExpandoMerge {
     export var p3 = 333;
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment34.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment34.ts
index 1c6be8f01718d..768e48bfa6a84 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment34.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment34.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowjs: true
 // @checkjs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment35.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment35.ts
index 952fdd7c9c02d..e0a2cd5e55073 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment35.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment35.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment37.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment37.ts
index 0e60c78621ead..abadd6fc0953e 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment37.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment37.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment4.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment4.ts
index 14e84ad556817..a744914afce93 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment4.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment40.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment40.ts
index 43600eac441ad..7b6a8b15d0771 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment40.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment40.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment5.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment5.ts
index 844f308f9b888..cfa3f0edd8717 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment5.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment6.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment6.ts
index fb66f9399729b..a86e315806a49 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment6.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment7.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment7.ts
index 7e42915ddcb41..43e34c7cea01b 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment7.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment8.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment8.ts
index 798ede6a0c59a..687438b1b5b9e 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment8.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment8_1.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment8_1.ts
index 2d6040e319dba..fc2fd66dd8954 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment8_1.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment8_1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment9.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment9.ts
index cdb2a0e2af3f2..aea087753ad1f 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment9.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment9_1.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment9_1.ts
index 61f6de98abbae..30dfc536cdc0b 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignment9_1.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment9_1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignmentOutOfOrder.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignmentOutOfOrder.ts
index f0d861a6a29d3..515dca1e21e96 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignmentOutOfOrder.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignmentOutOfOrder.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @noEmit: true
 // @allowJs: true
 // @checkJs: true
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignmentWithExport.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignmentWithExport.ts
index ed4ca168bf7cf..5a3c9991a88eb 100644
--- a/tests/cases/conformance/salsa/typeFromPropertyAssignmentWithExport.ts
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignmentWithExport.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @Filename: a.js
diff --git a/tests/cases/conformance/salsa/typeFromPrototypeAssignment4.ts b/tests/cases/conformance/salsa/typeFromPrototypeAssignment4.ts
index 426e327981c6e..6c728b1d98522 100644
--- a/tests/cases/conformance/salsa/typeFromPrototypeAssignment4.ts
+++ b/tests/cases/conformance/salsa/typeFromPrototypeAssignment4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @emitDeclarationOnly: true
diff --git a/tests/cases/conformance/salsa/unannotatedParametersAreOptional.ts b/tests/cases/conformance/salsa/unannotatedParametersAreOptional.ts
index d64261a572eef..50240a42abfa9 100644
--- a/tests/cases/conformance/salsa/unannotatedParametersAreOptional.ts
+++ b/tests/cases/conformance/salsa/unannotatedParametersAreOptional.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/statements/VariableStatements/everyTypeWithInitializer.ts b/tests/cases/conformance/statements/VariableStatements/everyTypeWithInitializer.ts
index dda7d3b6c6064..234edfebf6c1d 100644
--- a/tests/cases/conformance/statements/VariableStatements/everyTypeWithInitializer.ts
+++ b/tests/cases/conformance/statements/VariableStatements/everyTypeWithInitializer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I {
     id: number;
 }
diff --git a/tests/cases/conformance/statements/VariableStatements/recursiveInitializer.ts b/tests/cases/conformance/statements/VariableStatements/recursiveInitializer.ts
index ddfba652201fe..34a71a14a78bb 100644
--- a/tests/cases/conformance/statements/VariableStatements/recursiveInitializer.ts
+++ b/tests/cases/conformance/statements/VariableStatements/recursiveInitializer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // number unless otherwise specified
 var n1 = n1++;
 var n2: number = n2 + n2;
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.1.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.1.ts
index 71ab320393561..eb9bc5f0ef6a8 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.1.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2022,es2017,es2015,es5
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.10.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.10.ts
index 1f132c396407c..952eb3609ffbd 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.10.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.11.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.11.ts
index d22e7abcc7086..15cb3adb39a72 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.11.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.12.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.12.ts
index 6013970105c30..e376ffbac2501 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.12.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.13.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.13.ts
index c1a88f304148d..b3354d67e05f7 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.13.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.14.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.14.ts
index 9a32c0614ee45..b18fa19085070 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.14.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.14.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.15.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.15.ts
index f92136565435d..ea3fd765b2534 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.15.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.15.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.16.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.16.ts
index 867d58ae3ffde..7bf67b4d8f597 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.16.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.16.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.17.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.17.ts
index 21b021fb1ddb4..8c4fc694f6248 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.17.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.17.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.3.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.3.ts
index cf1eee443b6bc..8a76e1d0481f8 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.3.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2022,es2017,es2015,es5
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.5.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.5.ts
index b172bdab826f5..a2c2990f336e1 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.5.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.7.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.7.ts
index f246cd1aaab41..5f9c6198e3b79 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.7.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.8.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.8.ts
index 1dfa88ce88b6f..0b7e0d469fc07 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.8.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.9.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.9.ts
index b9fba2635669e..0a686d3414b9e 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.9.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: es2022
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInFor.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInFor.ts
index 0f075d4a752b8..e702087171535 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInFor.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInFor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2022,es2017,es2015,es5
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForAwaitOf.2.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForAwaitOf.2.ts
index 77f00d6463624..5d290c678e7f1 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForAwaitOf.2.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForAwaitOf.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForAwaitOf.3.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForAwaitOf.3.ts
index bf52c85e25aa3..f60e2bdd16d81 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForAwaitOf.3.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForAwaitOf.3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5,esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForAwaitOf.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForAwaitOf.ts
index 8f488313a91d9..210cc162be3ce 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForAwaitOf.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForAwaitOf.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2022,es2017,es2015,es5
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForIn.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForIn.ts
index 12621f830853e..71186e858a34a 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForIn.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForIn.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.1.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.1.ts
index cd26c931d2acd..28542ff4d1e65 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.1.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2022,es2017,es2015,es5
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.2.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.2.ts
index 4d6ac155a9c46..5202438a73a2c 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.2.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.3.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.3.ts
index e686baa1120c7..d13bd315e303f 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.3.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.4.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.4.ts
index 6edaa895a3bc7..9ea33f0e27c77 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.4.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.5.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.5.ts
index 2838da346d2f8..a3f38ef64ace4 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.5.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsInForOf.5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5,esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsWithImportHelpers.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsWithImportHelpers.ts
index 2dd393031dffb..a9a1bcae83c3b 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsWithImportHelpers.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsWithImportHelpers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2022
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsWithIteratorObject.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsWithIteratorObject.ts
index de8fdd378da79..05a979365dcad 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsWithIteratorObject.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarationsWithIteratorObject.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.1.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.1.ts
index 9cc4228a349f7..84ea08b65ccd9 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.1.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2022,es2017,es2015,es5
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.10.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.10.ts
index 13a77b4379a94..f72a70d9a2662 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.10.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.11.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.11.ts
index 603e25901b9bd..d7cdd5a6b24e6 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.11.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.12.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.12.ts
index fd24eff921836..d8b80703fae64 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.12.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2018
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.13.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.13.ts
index 164c1fae81852..f3b0819e562e0 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.13.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.13.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.14.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.14.ts
index 7489f99a03d60..2f517ff29af41 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.14.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.14.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.15.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.15.ts
index 79b0032da9003..042912b97e641 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.15.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.15.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.16.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.16.ts
index 570d8c22990ce..596fac8b2cf34 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.16.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.16.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.17.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.17.ts
index 6b3eef52e2e9b..7e4cae4904bf9 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.17.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.17.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.3.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.3.ts
index 90991a578edce..aaf51c860419e 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.3.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2022,es2017,es2015,es5
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.5.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.5.ts
index c328e3e9914d1..3cd6fa06aceba 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.5.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.7.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.7.ts
index 4f0a3620529d3..ee3aad12129cc 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.7.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.8.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.8.ts
index 70859a4313708..fd38283c95968 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.8.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.9.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.9.ts
index cec1bd79ee30c..a317447a87d33 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.9.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: es2022
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInFor.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInFor.ts
index a7209fa70ceba..6eec19e39511f 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInFor.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInFor.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2022,es2017,es2015,es5
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForAwaitOf.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForAwaitOf.ts
index 807e2acce50d1..d0bad2154c1b0 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForAwaitOf.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForAwaitOf.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2022,es2017,es2015,es5
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForIn.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForIn.ts
index ea9c191edd4a5..dc9b62f7df5e6 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForIn.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForIn.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.1.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.1.ts
index be2412cb1b24f..64c2a7dd71c96 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.1.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2022,es2017,es2015,es5
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.2.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.2.ts
index 50ffa8ec3555d..983199ac6b208 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.2.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.3.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.3.ts
index a897bf1961330..9ce3cd28ecd7b 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.3.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.4.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.4.ts
index 359a01d2b06fd..bc2b809bd12e3 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.4.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.1.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.1.ts
index e6da37efd08f2..c94abd98e798a 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.1.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.10.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.10.ts
index 09228bd94e081..20a5a6ddc25e3 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.10.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.11.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.11.ts
index e3b426e0669e2..0fd95a1e53c75 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.11.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.12.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.12.ts
index e925063f9d346..640ec5f3bd688 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.12.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.2.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.2.ts
index d34b1d21e54b6..f56b769d92b9b 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.2.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.3.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.3.ts
index f3fdfea70b31a..d408a100d180a 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.3.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.4.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.4.ts
index 9ef4a5802bac2..b2b5274080baf 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.4.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.5.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.5.ts
index 4062f99c9b062..9a6a93bd53b8a 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.5.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.6.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.6.ts
index 334e1a3a21d12..38f9d89dad2a5 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.6.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.7.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.7.ts
index 8e24ea3bd5c9e..42311c685dd7d 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.7.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.8.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.8.ts
index fad68539c46cf..80c1f30368d35 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.8.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.9.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.9.ts
index cc26af1c70bf2..79728432e8c57 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.9.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithESClassDecorators.9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithImportHelpers.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithImportHelpers.ts
index 5a96faa75f873..525ca7ce67373 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithImportHelpers.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithImportHelpers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2022
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithIteratorObject.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithIteratorObject.ts
index 59ba2516fea27..51829b00ae823 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithIteratorObject.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithIteratorObject.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @module: esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.1.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.1.ts
index 72d1e56f2d204..8bab888b9129e 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.1.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.10.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.10.ts
index be1f669030e1b..66ae56daff785 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.10.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.10.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.11.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.11.ts
index b7a7e36341113..68734242536f7 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.11.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.11.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.12.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.12.ts
index d650e4a248952..48025f27a56c1 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.12.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.12.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.2.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.2.ts
index 58d5a73ca3f33..82f53984a7116 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.2.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.3.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.3.ts
index 680afb945a8e3..655addbfada33 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.3.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.4.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.4.ts
index 61a67f91fe984..fc271fffb46cd 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.4.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.5.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.5.ts
index f3fb2c4980159..950ce59e8dca8 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.5.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.6.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.6.ts
index 27d3c78e46e7b..11d81f432452b 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.6.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.7.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.7.ts
index 972810f29da56..a20996720eab4 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.7.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.7.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.8.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.8.ts
index 9ea6a419e8750..e4890799bce42 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.8.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.8.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.9.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.9.ts
index 48dc496c5e325..71446fad573de 100644
--- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.9.ts
+++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsWithLegacyClassDecorators.9.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext,es2015,es5
 // @module: commonjs,system,esnext
 // @lib: esnext
diff --git a/tests/cases/conformance/statements/breakStatements/forInBreakStatements.ts b/tests/cases/conformance/statements/breakStatements/forInBreakStatements.ts
index ffc99ee904bf3..b83bec4725bde 100644
--- a/tests/cases/conformance/statements/breakStatements/forInBreakStatements.ts
+++ b/tests/cases/conformance/statements/breakStatements/forInBreakStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnusedLabels: true
 
 for(var x in {}) {
diff --git a/tests/cases/conformance/statements/continueStatements/forInContinueStatements.ts b/tests/cases/conformance/statements/continueStatements/forInContinueStatements.ts
index b5ccd8189ca1b..377a16c63bdaa 100644
--- a/tests/cases/conformance/statements/continueStatements/forInContinueStatements.ts
+++ b/tests/cases/conformance/statements/continueStatements/forInContinueStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnusedLabels: true
 
 for(var x in {}) {
diff --git a/tests/cases/conformance/statements/for-inStatements/for-inStatements.ts b/tests/cases/conformance/statements/for-inStatements/for-inStatements.ts
index daaeeee0c1494..48d838bdbae67 100644
--- a/tests/cases/conformance/statements/for-inStatements/for-inStatements.ts
+++ b/tests/cases/conformance/statements/for-inStatements/for-inStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var aString: string;
 for (aString in {}) { }
 
diff --git a/tests/cases/conformance/statements/for-inStatements/for-inStatementsArray.ts b/tests/cases/conformance/statements/for-inStatements/for-inStatementsArray.ts
index 6acf8d4b35515..213aba60de795 100644
--- a/tests/cases/conformance/statements/for-inStatements/for-inStatementsArray.ts
+++ b/tests/cases/conformance/statements/for-inStatements/for-inStatementsArray.ts
@@ -1,3 +1,4 @@
+// @strict: false
 let a: Date[];
 let b: boolean[];
 
diff --git a/tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts b/tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts
index c87ab6cea03b9..87063a132c302 100644
--- a/tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts
+++ b/tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts
@@ -1,6 +1,6 @@
 // @noImplicitAny: true
 
-let a: Date[];
+declare let a: Date[];
 
 for (let x in a) {
     let a1 = a[x + 1];
diff --git a/tests/cases/conformance/statements/for-inStatements/for-inStatementsAsyncIdentifier.ts b/tests/cases/conformance/statements/for-inStatements/for-inStatementsAsyncIdentifier.ts
index ae63dd31362ab..71b053ced4d35 100644
--- a/tests/cases/conformance/statements/for-inStatements/for-inStatementsAsyncIdentifier.ts
+++ b/tests/cases/conformance/statements/for-inStatements/for-inStatementsAsyncIdentifier.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 
 var async;
diff --git a/tests/cases/conformance/statements/for-inStatements/for-inStatementsDestructuring3.ts b/tests/cases/conformance/statements/for-inStatements/for-inStatementsDestructuring3.ts
index 411261dee43a0..69cb50b0d049e 100644
--- a/tests/cases/conformance/statements/for-inStatements/for-inStatementsDestructuring3.ts
+++ b/tests/cases/conformance/statements/for-inStatements/for-inStatementsDestructuring3.ts
@@ -1,2 +1,3 @@
+// @strict: false
 var a, b;
 for ([a, b] in []) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-inStatements/for-inStatementsDestructuring4.ts b/tests/cases/conformance/statements/for-inStatements/for-inStatementsDestructuring4.ts
index 816dd564b6a1b..21f320eddf053 100644
--- a/tests/cases/conformance/statements/for-inStatements/for-inStatementsDestructuring4.ts
+++ b/tests/cases/conformance/statements/for-inStatements/for-inStatementsDestructuring4.ts
@@ -1,2 +1,3 @@
+// @strict: false
 var a, b;
 for ({a, b} in []) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts b/tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts
index f12f85e4705f7..8d7f216e7adcb 100644
--- a/tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts
+++ b/tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var aNumber: number;
 for (aNumber in {}) { }
 
@@ -12,7 +13,7 @@ for (var idx : number in {}) { }
 function fn(): void { }
 for (var x in fn()) { }
 
-var c : string, d:string, e;
+declare var c : string, d:string, e: any;
 
 for (var x in c || d) { }
 for (var x in e ? c : d) { }
@@ -57,6 +58,6 @@ interface I {
     id: number;
     [idx: number]: number;
 }
-var i: I;
+declare var i: I;
 
 for (var x in i[42]) { } 
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of14.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of14.ts
index 26dcea71a0eef..0ebaef0e46656 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of14.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of14.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (const v of []) {
     var x = v;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of15.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of15.ts
index 2124870d7e39a..23ce008a9d996 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of15.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of15.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (let v of []) {
     v;
     for (const v of []) {
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of16.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of16.ts
index d1354999340af..48020436de103 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of16.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of16.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (let v of []) {
     v;
     for (let v of []) {
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of18.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of18.ts
index e7de82d278587..8fc00c02d73ba 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of18.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of18.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (let v of []) {
     v;
 }
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of19.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of19.ts
index 447048c374b07..fff8fef1633dc 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of19.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of19.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (let v of []) {
     v;
     function foo() {
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of2.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of2.ts
index 5015082a4a954..882c9d86b2fac 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of2.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (var v of []) {
     var x = v;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts
index 6a1a77d82ae7f..010164a7aaa6c 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (let v of []) {
     let v;
     for (let v of [v]) {
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of21.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of21.ts
index cb0c3cf2329e1..87338239529fc 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of21.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of21.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (let v of []) {
     for (let _i of []) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts
index ef35b6efd9c23..fa74f83a195fb 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (var x of [1, 2, 3]) {
     let _a = 0;
     console.log(x);
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts
index 7d93246f2bbe3..76c90c718c5df 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (var x of [1, 2, 3]) {
     var _a = 0;
     console.log(x);
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of24.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of24.ts
index 7e025183f5fed..82c6ade7dabe5 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of24.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of24.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var a = [1, 2, 3];
 for (var v of a) {
     let a = 0;
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts
index 7017991c7f2fb..1ca3f8dbb4a80 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@sourcemap: true
 var a = [1, 2, 3];
 for (var v of a) {
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts
index 13a386309bb64..376e979d3ad12 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts
@@ -1,3 +1,4 @@
+// @strict: false
 //@sourcemap: true
 for (var [a = 0, b = 1] of [2, 3]) {
     a;
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts
index 4a56779b68db4..356bdc0d863ee 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (var {x: a = 0, y: b = 1} of [2, 3]) {
     a;
     b;
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts
index 00f36f7d5d231..d43be28ce6b3c 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (let [a = 0, b = 1] of [2, 3]) {
     a;
     b;
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts
index 5b5e52e75c5f2..2354253f9a842 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (const {x: a = 0, y: b = 1} of [2, 3]) {
     a;
     b;
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of4.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of4.ts
index 42fb4c01bdcd6..2d01d97abeff2 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of4.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (var v of [])
     var x = v;
 var y = v;
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of5.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of5.ts
index ee968515d6545..a32ecb13c06c3 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of5.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (var _a of []) {
     var x = _a;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of6.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of6.ts
index a04ee2d6177bf..9afd8ac36b3c3 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of6.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of6.ts
@@ -1,3 +1,4 @@
+// @strict: false
 for (var w of []) {
     for (var v of []) {
         var x = [w, v];
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck11.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck11.ts
index a39371a4843be..f20682c7de7b3 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck11.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck11.ts
@@ -1,4 +1,4 @@
 //@target: ES5
-var union: string | number[];
+declare var union: string | number[];
 var v: string;
 for (v of union) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck14.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck14.ts
index 9474fcec5d909..3f58e9d4ac93c 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck14.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck14.ts
@@ -1,4 +1,4 @@
 //@target: ES5
 //@lib: ES6
-var union: string | Set<number>
+declare var union: string | Set<number>
 for (const e of union) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck7.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck7.ts
index 4f7dd1c6d3f0f..dd6e6b8fa77da 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck7.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck7.ts
@@ -1,3 +1,3 @@
 //@target: ES5
-var union: string | number;
+declare var union: string | number;
 for (var v of union) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck8.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck8.ts
index 2c9f3b63d1db6..43ee909f8530e 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck8.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck8.ts
@@ -1,4 +1,4 @@
 //@target: ES5
-var union: string | string[]| number[]| symbol[];
+declare var union: string | string[]| number[]| symbol[];
 var v: symbol;
 for (v of union) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck9.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck9.ts
index 3c68f329f0e25..4baa2f49843d5 100644
--- a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck9.ts
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck9.ts
@@ -1,3 +1,3 @@
 //@target: ES5
-var union: string | string[] | number | symbol;
+declare var union: string | string[] | number | symbol;
 for (let v of union) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/throwStatements/throwInEnclosingStatements.ts b/tests/cases/conformance/statements/throwStatements/throwInEnclosingStatements.ts
index c5875327b50af..ba4b438609eaa 100644
--- a/tests/cases/conformance/statements/throwStatements/throwInEnclosingStatements.ts
+++ b/tests/cases/conformance/statements/throwStatements/throwInEnclosingStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 
 function fn(x) {
diff --git a/tests/cases/conformance/statements/throwStatements/throwStatements.ts b/tests/cases/conformance/statements/throwStatements/throwStatements.ts
index 5825ed6c2e0df..0a350061f834a 100644
--- a/tests/cases/conformance/statements/throwStatements/throwStatements.ts
+++ b/tests/cases/conformance/statements/throwStatements/throwStatements.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 
 // all legal
diff --git a/tests/cases/conformance/statements/tryStatements/catchClauseWithTypeAnnotation.ts b/tests/cases/conformance/statements/tryStatements/catchClauseWithTypeAnnotation.ts
index 6f3bd6a4c15db..0a59dc34e2a81 100644
--- a/tests/cases/conformance/statements/tryStatements/catchClauseWithTypeAnnotation.ts
+++ b/tests/cases/conformance/statements/tryStatements/catchClauseWithTypeAnnotation.ts
@@ -1,3 +1,4 @@
+// @useUnknownInCatchVariables: false
 type any1 = any;
 type unknown1 = unknown;
 
diff --git a/tests/cases/conformance/types/any/narrowExceptionVariableInCatchClause.ts b/tests/cases/conformance/types/any/narrowExceptionVariableInCatchClause.ts
index dfa60a415f91a..7915a9168ad8c 100644
--- a/tests/cases/conformance/types/any/narrowExceptionVariableInCatchClause.ts
+++ b/tests/cases/conformance/types/any/narrowExceptionVariableInCatchClause.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare function isFooError(x: any): x is { type: 'foo'; dontPanic(); };
 
 function tryCatch() {
diff --git a/tests/cases/conformance/types/any/narrowFromAnyWithTypePredicate.ts b/tests/cases/conformance/types/any/narrowFromAnyWithTypePredicate.ts
index 473bd349b5f91..64b313f9babf4 100644
--- a/tests/cases/conformance/types/any/narrowFromAnyWithTypePredicate.ts
+++ b/tests/cases/conformance/types/any/narrowFromAnyWithTypePredicate.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare var x: any;
 declare function isFunction(x): x is Function;
 declare function isObject(x): x is Object;
diff --git a/tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.1.ts b/tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.1.ts
index 6d39be9cef75e..2c8dd74d59f81 100644
--- a/tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.1.ts
+++ b/tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2018
 // @lib: esnext
 // @noEmit: true
diff --git a/tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts b/tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts
index 0053f71b98679..f17847f022502 100644
--- a/tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts
+++ b/tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2018
 // @lib: esnext
 // @noEmit: true
diff --git a/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx b/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx
index ca309d23a1255..08a1abb38cb22 100644
--- a/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx
+++ b/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx
@@ -1,12 +1,14 @@
 // @filename: file.tsx
 // @jsx: preserve
 // @module: commonjs
-// @noLib: true
 // @skipLibCheck: true
-// @libFiles: react.d.ts,lib.d.ts
+// @lib: es5
+/// <reference path="/.lib/react.d.ts" />
 
 import React = require('react')
 
+declare function log(...args: any[]): void;
+
 export interface ClickableProps {
     children?: string;
     className?: string;
@@ -31,13 +33,13 @@ export function MainButton(props: ButtonProps | LinkProps): JSX.Element {
     return this._buildMainButton(props);
 }
 
-const b0 = <MainButton {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type "left" | "right"
-const b2 = <MainButton onClick={(k)=>{console.log(k)}} extra />;  // k has type "left" | "right"
+const b0 = <MainButton {...{onClick: (k) => {log(k)}}} extra />;  // k has type "left" | "right"
+const b2 = <MainButton onClick={(k)=>{log(k)}} extra />;  // k has type "left" | "right"
 const b3 = <MainButton {...{goTo:"home"}} extra />;  // goTo has type"home" | "contact"
 const b4 = <MainButton goTo="home" extra />;  // goTo has type "home" | "contact"
 
 export function NoOverload(buttonProps: ButtonProps): JSX.Element { return undefined }
-const c1 = <NoOverload  {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type any
+const c1 = <NoOverload  {...{onClick: (k) => {log(k)}}} extra />;  // k has type any
 
 export function NoOverload1(linkProps: LinkProps): JSX.Element { return undefined }
 const d1 = <NoOverload1 {...{goTo:"home"}} extra  />;  // goTo has type "home" | "contact"
diff --git a/tests/cases/conformance/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionInferenceError.ts b/tests/cases/conformance/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionInferenceError.ts
index 867b6526c1277..0a05c1c353f95 100644
--- a/tests/cases/conformance/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionInferenceError.ts
+++ b/tests/cases/conformance/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionInferenceError.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
   test: string
 }
diff --git a/tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts b/tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts
index 00a299ea24421..5b0e4d40b1039 100644
--- a/tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts
+++ b/tests/cases/conformance/types/intersection/intersectionTypeAssignment.ts
@@ -1,7 +1,7 @@
-var a: { a: string };
-var b: { b: string };
-var x: { a: string, b: string };
-var y: { a: string } & { b: string };
+declare var a: { a: string };
+declare var b: { b: string };
+declare var x: { a: string, b: string };
+declare var y: { a: string } & { b: string };
 
 a = x;
 a = y;
diff --git a/tests/cases/conformance/types/intersection/intersectionTypeInference.ts b/tests/cases/conformance/types/intersection/intersectionTypeInference.ts
index 32a419ff03a55..747a1b1548e52 100644
--- a/tests/cases/conformance/types/intersection/intersectionTypeInference.ts
+++ b/tests/cases/conformance/types/intersection/intersectionTypeInference.ts
@@ -1,5 +1,5 @@
 function extend<T, U>(obj1: T, obj2: U): T & U {
-    var result: T & U;
+    var result!: T & U;
     obj1 = result;
     obj2 = result;
     result = obj1;  // Error
diff --git a/tests/cases/conformance/types/intersection/intersectionTypeReadonly.ts b/tests/cases/conformance/types/intersection/intersectionTypeReadonly.ts
index 78bc557ac63aa..97e192d02c94b 100644
--- a/tests/cases/conformance/types/intersection/intersectionTypeReadonly.ts
+++ b/tests/cases/conformance/types/intersection/intersectionTypeReadonly.ts
@@ -13,13 +13,13 @@ interface DifferentType {
 interface DifferentName {
     readonly other: number;
 }
-let base: Base;
+declare let base: Base;
 base.value = 12 // error, lhs can't be a readonly property
-let identical: Base & Identical;
+declare let identical: Base & Identical;
 identical.value = 12; // error, lhs can't be a readonly property
-let mutable: Base & Mutable;
+declare let mutable: Base & Mutable;
 mutable.value = 12;
-let differentType: Base & DifferentType;
+declare let differentType: Base & DifferentType;
 differentType.value = 12; // error, lhs can't be a readonly property
-let differentName: Base & DifferentName;
+declare let differentName: Base & DifferentName;
 differentName.value = 12; // error, property 'value' doesn't exist
diff --git a/tests/cases/conformance/types/intersection/operatorsAndIntersectionTypes.ts b/tests/cases/conformance/types/intersection/operatorsAndIntersectionTypes.ts
index 5689d2218401a..fc451895739d8 100644
--- a/tests/cases/conformance/types/intersection/operatorsAndIntersectionTypes.ts
+++ b/tests/cases/conformance/types/intersection/operatorsAndIntersectionTypes.ts
@@ -1,3 +1,4 @@
+// @strict: false
 type Guid = string & { $Guid };          // Tagged string type
 type SerialNo = number & { $SerialNo };  // Tagged number type
 
diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
index 56ff157a67fd0..35123a89fb35d 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
@@ -1,4 +1,5 @@
 // @strictNullChecks: true
+// @strictPropertyInitialization: false
 // @declaration: true
 
 class Shape {
diff --git a/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks01.ts b/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks01.ts
index 3179be186ea48..6996071113294 100644
--- a/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks01.ts
+++ b/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks01.ts
@@ -1,5 +1,5 @@
-let x: "foo";
-let y: "foo" | "bar";
+declare let x: "foo";
+declare let y: "foo" | "bar";
 
 let b: boolean;
 b = x === y;
diff --git a/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks02.ts b/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks02.ts
index 25a687a8941a8..ac9cc950c75d7 100644
--- a/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks02.ts
+++ b/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks02.ts
@@ -1,5 +1,5 @@
-let x: "foo";
-let y: "foo" | "bar";
+declare let x: "foo";
+declare let y: "foo" | "bar";
 
 let b: boolean;
 b = x == y;
diff --git a/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks03.ts b/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks03.ts
index b4fb064818728..0bc8d4942625f 100644
--- a/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks03.ts
+++ b/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks03.ts
@@ -6,8 +6,8 @@ interface Refrigerator extends Runnable {
     makesFoodGoBrrr: boolean;
 }
 
-let x: string;
-let y: "foo" | Refrigerator;
+declare let x: string;
+declare let y: "foo" | Refrigerator;
 
 let b: boolean;
 b = x === y;
diff --git a/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks04.ts b/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks04.ts
index 01e1c0896fb2a..a1bfb478ef944 100644
--- a/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks04.ts
+++ b/tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks04.ts
@@ -6,8 +6,8 @@ interface Refrigerator extends Runnable {
     makesFoodGoBrrr: boolean;
 }
 
-let x: string;
-let y: "foo" | Refrigerator;
+declare let x: string;
+declare let y: "foo" | Refrigerator;
 
 let b: boolean;
 b = x == y;
diff --git a/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements01.ts b/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements01.ts
index b1c1aaa64cae2..3eb6211f88d1b 100644
--- a/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements01.ts
+++ b/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements01.ts
@@ -1,5 +1,5 @@
-let x: "foo";
-let y: "foo" | "bar"; 
+declare let x: "foo";
+declare let y: "foo" | "bar";
 
 switch (x) {
     case "foo":
diff --git a/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements02.ts b/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements02.ts
index d396eb16bed00..95da681f2baf7 100644
--- a/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements02.ts
+++ b/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements02.ts
@@ -1,5 +1,5 @@
-let x: "foo";
-let y: "foo" | "bar";
+declare let x: "foo";
+declare let y: "foo" | "bar";
 
 let b: boolean;
 b = x == y;
diff --git a/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements03.ts b/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements03.ts
index 289ffd11060f3..bfb9288e4aa4d 100644
--- a/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements03.ts
+++ b/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements03.ts
@@ -1,6 +1,6 @@
-let x: "foo";
-let y: "foo" | "bar"; 
-let z: "bar";
+declare let x: "foo";
+declare let y: "foo" | "bar";
+declare let z: "bar";
 
 declare function randBool(): boolean;
 
diff --git a/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements04.ts b/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements04.ts
index ee119cd1db544..1ec62e52169f8 100644
--- a/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements04.ts
+++ b/tests/cases/conformance/types/literal/stringLiteralsWithSwitchStatements04.ts
@@ -1,5 +1,5 @@
-let x: "foo";
-let y: "foo" | "bar"; 
+declare let x: "foo";
+declare let y: "foo" | "bar";
 
 declare function randBool(): boolean;
 
diff --git a/tests/cases/conformance/types/localTypes/localTypes4.ts b/tests/cases/conformance/types/localTypes/localTypes4.ts
index 388d5efb637d4..422782c6f669f 100644
--- a/tests/cases/conformance/types/localTypes/localTypes4.ts
+++ b/tests/cases/conformance/types/localTypes/localTypes4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 
 function f1() {
diff --git a/tests/cases/conformance/types/mapped/mappedTypeAsClauseRecursiveNoCrash1.ts b/tests/cases/conformance/types/mapped/mappedTypeAsClauseRecursiveNoCrash1.ts
new file mode 100644
index 0000000000000..e6d25ff1796f8
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/mappedTypeAsClauseRecursiveNoCrash1.ts
@@ -0,0 +1,42 @@
+// @strict: true
+// @noEmit: true
+
+// https://github.com/microsoft/TypeScript/issues/60476
+
+export type FlattenType<Source extends object, Target> = {
+  [Key in keyof Source as Key extends string
+    ? Source[Key] extends object
+      ? `${Key}.${keyof FlattenType<Source[Key], Target> & string}`
+      : Key
+    : never]-?: Target;
+};
+
+type FieldSelect = {
+  table: string;
+  field: string;
+};
+
+type Address = {
+  postCode: string;
+  description: string;
+  address: string;
+};
+
+type User = {
+  id: number;
+  name: string;
+  address: Address;
+};
+
+type FlattenedUser = FlattenType<User, FieldSelect>;
+type FlattenedUserKeys = keyof FlattenType<User, FieldSelect>;
+
+export type FlattenTypeKeys<Source extends object, Target> = keyof {
+  [Key in keyof Source as Key extends string
+    ? Source[Key] extends object
+      ? `${Key}.${keyof FlattenType<Source[Key], Target> & string}`
+      : Key
+    : never]-?: Target;
+};
+
+type FlattenedUserKeys2 = FlattenTypeKeys<User, FieldSelect>;
diff --git a/tests/cases/conformance/types/mapped/mappedTypeConstraints2.ts b/tests/cases/conformance/types/mapped/mappedTypeConstraints2.ts
index 250be640f631e..83738d21a5cc1 100644
--- a/tests/cases/conformance/types/mapped/mappedTypeConstraints2.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypeConstraints2.ts
@@ -46,6 +46,14 @@ function f6<K extends string>(obj: Mapped6<K>, key: keyof Mapped6<K>) {
   let s: `_${string}` = obj[key]; // Error
 }
 
+type Mapped7<K extends string> = {
+  [P in K as [P] extends [`_${string}`] ? P : never]: P;
+};
+
+function f7<K extends string>(obj: Mapped7<K>, key: keyof Mapped7<K>) {
+  let s: `_${string}` = obj[key];
+}
+
 // Repro from #47794
 
 type Foo<T extends string> = {
diff --git a/tests/cases/conformance/types/mapped/mappedTypeErrors.ts b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
index a38979054ecff..f3a6cf2d36854 100644
--- a/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
@@ -110,6 +110,9 @@ setState(foo, { c: true });  // Error
 
 class C<T> {
     state: T;
+    constructor(initialState: T) {
+        this.state = initialState;
+    }
     setState<K extends keyof T>(props: Pick<T, K>) {
         for (let k in props) {
             this.state[k] = props[k];
@@ -117,7 +120,7 @@ class C<T> {
     }
 }
 
-let c = new C<Foo>();
+let c = new C<Foo>({ a: "hello", b: 42 });
 c.setState({ a: "test", b: 43 });
 c.setState({ a: "hi" });
 c.setState({ b: undefined });
diff --git a/tests/cases/conformance/types/mapped/mappedTypeProperties.ts b/tests/cases/conformance/types/mapped/mappedTypeProperties.ts
index 407e0eaf56da7..67adc2c75c220 100644
--- a/tests/cases/conformance/types/mapped/mappedTypeProperties.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypeProperties.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 export type PlaceType = 'openSky' | 'roofed' | 'garage'
 type Before = {
diff --git a/tests/cases/conformance/types/members/augmentedTypeAssignmentCompatIndexSignature.ts b/tests/cases/conformance/types/members/augmentedTypeAssignmentCompatIndexSignature.ts
index 2997cec1734ee..d72c0ea809d1c 100644
--- a/tests/cases/conformance/types/members/augmentedTypeAssignmentCompatIndexSignature.ts
+++ b/tests/cases/conformance/types/members/augmentedTypeAssignmentCompatIndexSignature.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Foo { a }
 interface Bar { b }
 
diff --git a/tests/cases/conformance/types/members/augmentedTypeBracketAccessIndexSignature.ts b/tests/cases/conformance/types/members/augmentedTypeBracketAccessIndexSignature.ts
index 0efb6c2a19c8d..0154918e0a1fc 100644
--- a/tests/cases/conformance/types/members/augmentedTypeBracketAccessIndexSignature.ts
+++ b/tests/cases/conformance/types/members/augmentedTypeBracketAccessIndexSignature.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Foo { a }
 interface Bar { b }
 
diff --git a/tests/cases/conformance/types/members/classWithPrivateProperty.ts b/tests/cases/conformance/types/members/classWithPrivateProperty.ts
index bdc9a5356ac10..d833fbc141d9e 100644
--- a/tests/cases/conformance/types/members/classWithPrivateProperty.ts
+++ b/tests/cases/conformance/types/members/classWithPrivateProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // accessing any private outside the class is an error
 
 class C {
diff --git a/tests/cases/conformance/types/members/classWithProtectedProperty.ts b/tests/cases/conformance/types/members/classWithProtectedProperty.ts
index 96bc615c020f1..6ef87e1dfc44b 100644
--- a/tests/cases/conformance/types/members/classWithProtectedProperty.ts
+++ b/tests/cases/conformance/types/members/classWithProtectedProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // accessing any protected outside the class is an error
 
 class C {
diff --git a/tests/cases/conformance/types/members/classWithPublicProperty.ts b/tests/cases/conformance/types/members/classWithPublicProperty.ts
index 804e4991fe4a2..a850c24e9ebea 100644
--- a/tests/cases/conformance/types/members/classWithPublicProperty.ts
+++ b/tests/cases/conformance/types/members/classWithPublicProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     public x;
     public a = '';
diff --git a/tests/cases/conformance/types/members/duplicatePropertyNames.ts b/tests/cases/conformance/types/members/duplicatePropertyNames.ts
index 15335b7c5f129..822d7a8b235f1 100644
--- a/tests/cases/conformance/types/members/duplicatePropertyNames.ts
+++ b/tests/cases/conformance/types/members/duplicatePropertyNames.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // duplicate property names are an error in all types
 
 interface Number {
diff --git a/tests/cases/conformance/types/members/objectTypeHidingMembersOfExtendedObject.ts b/tests/cases/conformance/types/members/objectTypeHidingMembersOfExtendedObject.ts
index b18dc498bb6c3..ba2f68e12cc86 100644
--- a/tests/cases/conformance/types/members/objectTypeHidingMembersOfExtendedObject.ts
+++ b/tests/cases/conformance/types/members/objectTypeHidingMembersOfExtendedObject.ts
@@ -1,10 +1,11 @@
+// @strict: false
 // @skipDefaultLibCheck: false
 class A {
-    foo: string;
+    foo!: string;
 }
 
 class B extends A {
-    bar: string;
+    bar!: string;
 }
 
 interface Object {
@@ -14,11 +15,11 @@ interface Object {
 
 class C {
     valueOf() { }
-    data: B;
+    data!: B;
     [x: string]: any;
 }
 
-var c: C;
+declare var c: C;
 var r1: void = c.valueOf();
 var r1b: B = c.data;
 var r1c = r1b['hm']; // should be 'Object'
@@ -30,7 +31,7 @@ interface I {
     [x: string]: any;
 }
 
-var i: I;
+declare var i: I;
 var r2: void = i.valueOf();
 var r2b: B = i.data;
 var r2c = r2b['hm']; // should be 'Object'
@@ -46,7 +47,7 @@ var r3b: B = a.data;
 var r3c = r3b['hm']; // should be 'Object'
 var r3d = i['hm'];
 
-var b: {
+declare var b: {
     valueOf(): void;
     data: B;
     [x: string]: any;
diff --git a/tests/cases/conformance/types/members/objectTypeHidingMembersOfObjectAssignmentCompat.ts b/tests/cases/conformance/types/members/objectTypeHidingMembersOfObjectAssignmentCompat.ts
index d6b17149fb9c5..410db154f8e24 100644
--- a/tests/cases/conformance/types/members/objectTypeHidingMembersOfObjectAssignmentCompat.ts
+++ b/tests/cases/conformance/types/members/objectTypeHidingMembersOfObjectAssignmentCompat.ts
@@ -2,15 +2,15 @@ interface I {
     toString(): void;
 }
 
-var i: I;
-var o: Object;
+declare var i: I;
+declare var o: Object;
 o = i; // error
 i = o; // ok
 
 class C {
     toString(): void { }
 }
-var c: C;
+declare var c: C;
 o = c; // error
 c = o; // ok
 
diff --git a/tests/cases/conformance/types/members/objectTypeHidingMembersOfObjectAssignmentCompat2.ts b/tests/cases/conformance/types/members/objectTypeHidingMembersOfObjectAssignmentCompat2.ts
index 3111d22b91517..7b0553aeea18a 100644
--- a/tests/cases/conformance/types/members/objectTypeHidingMembersOfObjectAssignmentCompat2.ts
+++ b/tests/cases/conformance/types/members/objectTypeHidingMembersOfObjectAssignmentCompat2.ts
@@ -2,15 +2,15 @@ interface I {
     toString(): number;
 }
 
-var i: I;
-var o: Object;
+declare var i: I;
+declare var o: Object;
 o = i; // error
 i = o; // error
 
 class C {
     toString(): number { return 1; }
 }
-var c: C;
+declare var c: C;
 o = c; // error
 c = o; // error
 
diff --git a/tests/cases/conformance/types/members/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts b/tests/cases/conformance/types/members/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts
index 4361d082e30ec..db3cf5bc5e77a 100644
--- a/tests/cases/conformance/types/members/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts
+++ b/tests/cases/conformance/types/members/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types with call signatures can override members of Function
 // no errors expected below 
 
diff --git a/tests/cases/conformance/types/members/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts b/tests/cases/conformance/types/members/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts
index 9bb2971814001..69a10cce1826a 100644
--- a/tests/cases/conformance/types/members/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts
+++ b/tests/cases/conformance/types/members/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts
@@ -2,12 +2,12 @@ interface I {
     (): void;
 }
 
-var i: I;
-var f: Object;
+declare var i: I;
+declare var f: Object;
 f = i;
 i = f;
 
-var a: {
+declare var a: {
     (): void
 }
 f = a;
diff --git a/tests/cases/conformance/types/members/objectTypeWithConstructSignatureAppearsToBeFunctionType.ts b/tests/cases/conformance/types/members/objectTypeWithConstructSignatureAppearsToBeFunctionType.ts
index 1a3f38c9dee60..d86c28a70fe5b 100644
--- a/tests/cases/conformance/types/members/objectTypeWithConstructSignatureAppearsToBeFunctionType.ts
+++ b/tests/cases/conformance/types/members/objectTypeWithConstructSignatureAppearsToBeFunctionType.ts
@@ -4,12 +4,12 @@ interface I {
     new(): number;
 }
 
-var i: I;
+declare var i: I;
 var r2: number = i();
 var r2b: number = new i();
 var r2c: (x: any, y?: any) => any = i.apply;
 
-var b: {
+declare var b: {
     new(): number;
 }
 
diff --git a/tests/cases/conformance/types/members/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts b/tests/cases/conformance/types/members/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts
index b9fb469940287..4d78c2c947e8d 100644
--- a/tests/cases/conformance/types/members/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts
+++ b/tests/cases/conformance/types/members/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Function {
     data: number;
     [x: string]: Object;
diff --git a/tests/cases/conformance/types/members/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts b/tests/cases/conformance/types/members/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts
index 6e3057e4bb15e..cf745954e237a 100644
--- a/tests/cases/conformance/types/members/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts
+++ b/tests/cases/conformance/types/members/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts
@@ -2,12 +2,12 @@ interface I {
     new(): any;
 }
 
-var i: I;
-var f: Object;
+declare var i: I;
+declare var f: Object;
 f = i;
 i = f;
 
-var a: {
+declare var a: {
     new(): any
 }
 f = a;
diff --git a/tests/cases/conformance/types/members/objectTypeWithDuplicateNumericProperty.ts b/tests/cases/conformance/types/members/objectTypeWithDuplicateNumericProperty.ts
index a3fc549b7a035..3fa36deaa0b3b 100644
--- a/tests/cases/conformance/types/members/objectTypeWithDuplicateNumericProperty.ts
+++ b/tests/cases/conformance/types/members/objectTypeWithDuplicateNumericProperty.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // numeric properties must be distinct after a ToNumber operation
 // so the below are all errors
 
diff --git a/tests/cases/conformance/types/members/objectTypeWithStringIndexerHidingObjectIndexer.ts b/tests/cases/conformance/types/members/objectTypeWithStringIndexerHidingObjectIndexer.ts
index 797ad2cb09153..3ef2800bd4cfa 100644
--- a/tests/cases/conformance/types/members/objectTypeWithStringIndexerHidingObjectIndexer.ts
+++ b/tests/cases/conformance/types/members/objectTypeWithStringIndexerHidingObjectIndexer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @skipDefaultLibCheck: false
 // object types can define string indexers that are more specific than the default 'any' that would be returned
 // no errors expected below 
@@ -9,20 +10,20 @@ var o = {};
 var r = o['']; // should be Object
 
 class C {
-    foo: string;
+    foo!: string;
     [x: string]: string;
 }
-var c: C;
+declare var c: C;
 var r2: string = c[''];
 
 interface I {
     bar: string;
     [x: string]: string;
 }
-var i: I;
+declare var i: I;
 var r3: string = i[''];
 
-var o2: {
+declare var o2: {
     baz: string;
     [x: string]: string;
 }
diff --git a/tests/cases/conformance/types/members/objectTypeWithStringNamedNumericProperty.ts b/tests/cases/conformance/types/members/objectTypeWithStringNamedNumericProperty.ts
index c379906da4ad8..d3c99433892bd 100644
--- a/tests/cases/conformance/types/members/objectTypeWithStringNamedNumericProperty.ts
+++ b/tests/cases/conformance/types/members/objectTypeWithStringNamedNumericProperty.ts
@@ -15,7 +15,7 @@ class C {
     "-1": Date;
 }
 
-var c: C;
+declare var c: C;
 var r1 = c['0.1'];
 var r2 = c['.1'];
 var r3 = c['1'];
@@ -46,7 +46,7 @@ interface I {
     "-1": Date;
 }
 
-var i: I;
+declare var i: I;
 var r1 = i['0.1'];
 var r2 = i['.1'];
 var r3 = i['1'];
@@ -66,7 +66,7 @@ var r11 = i[-0x1]
 var r12 = i[01]
 var r13 = i[-01]
 
-var a: {
+declare var a: {
     "0.1": void;
     ".1": Object;
     "1": number;
diff --git a/tests/cases/conformance/types/members/objectTypeWithStringNamedPropertyOfIllegalCharacters.ts b/tests/cases/conformance/types/members/objectTypeWithStringNamedPropertyOfIllegalCharacters.ts
index 766f56bdd2681..a34f2b679e64a 100644
--- a/tests/cases/conformance/types/members/objectTypeWithStringNamedPropertyOfIllegalCharacters.ts
+++ b/tests/cases/conformance/types/members/objectTypeWithStringNamedPropertyOfIllegalCharacters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     "   ": number;
     "a   b": string;
diff --git a/tests/cases/conformance/types/members/typesWithSpecializedCallSignatures.ts b/tests/cases/conformance/types/members/typesWithSpecializedCallSignatures.ts
index 9eef3476f2da1..5b424461d4b50 100644
--- a/tests/cases/conformance/types/members/typesWithSpecializedCallSignatures.ts
+++ b/tests/cases/conformance/types/members/typesWithSpecializedCallSignatures.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // basic uses of specialized signatures without errors
 
 class Base { foo: string }
diff --git a/tests/cases/conformance/types/members/typesWithSpecializedConstructSignatures.ts b/tests/cases/conformance/types/members/typesWithSpecializedConstructSignatures.ts
index 7c84e76f14e3b..d55fdb12f1453 100644
--- a/tests/cases/conformance/types/members/typesWithSpecializedConstructSignatures.ts
+++ b/tests/cases/conformance/types/members/typesWithSpecializedConstructSignatures.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // basic uses of specialized signatures without errors
 
 class Base { foo: string }
diff --git a/tests/cases/conformance/types/namedTypes/genericInstantiationEquivalentToObjectLiteral.ts b/tests/cases/conformance/types/namedTypes/genericInstantiationEquivalentToObjectLiteral.ts
index a6686f0ae3524..b1a21aeefd202 100644
--- a/tests/cases/conformance/types/namedTypes/genericInstantiationEquivalentToObjectLiteral.ts
+++ b/tests/cases/conformance/types/namedTypes/genericInstantiationEquivalentToObjectLiteral.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface Pair<T1, T2> { first: T1; second: T2; }
 var x: Pair<string, number>
 var y: { first: string; second: number; }
diff --git a/tests/cases/conformance/types/namedTypes/optionalMethods.ts b/tests/cases/conformance/types/namedTypes/optionalMethods.ts
index 932521425f9f6..4691a850693ac 100644
--- a/tests/cases/conformance/types/namedTypes/optionalMethods.ts
+++ b/tests/cases/conformance/types/namedTypes/optionalMethods.ts
@@ -19,7 +19,7 @@ function test1(x: Foo) {
 }
 
 class Bar {
-    a: number;
+    a: number = 0;
     b?: number;
     c? = 2;
     constructor(public d?: number, public e = 10) {}
diff --git a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAccessProperty.ts b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAccessProperty.ts
index cf902c12e65f3..971dd5c29e68a 100644
--- a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAccessProperty.ts
+++ b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAccessProperty.ts
@@ -1,4 +1,4 @@
-var a: object;
+var a: object = {};
 a.toString();
 a.nonExist(); // error
 
diff --git a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts
index 83801652865dc..647427eb5c501 100644
--- a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts
+++ b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts
@@ -1,6 +1,6 @@
 var x = {};
 var y = {foo: "bar"};
-var a: object;
+var a: object = {};
 x = a;
 y = a; // expect error
 a = x;
diff --git a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts
index d56c02fafe98d..c4e2865fe0396 100644
--- a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts
+++ b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts
@@ -4,7 +4,7 @@ function returnObject(): object {
     return {};
 }
 
-var nonPrimitive: object;
+var nonPrimitive: object = {};
 var primitive: boolean;
 
 takeObject(nonPrimitive);
diff --git a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForIn.ts b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForIn.ts
index 2ec8cf83cb740..930d3ecb07da4 100644
--- a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForIn.ts
+++ b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForIn.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var a: object;
 
 for (var key in a) {
diff --git a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForInNoImplicitAny.ts b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForInNoImplicitAny.ts
index 1050cdea4976b..7e5b781642a98 100644
--- a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForInNoImplicitAny.ts
+++ b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForInNoImplicitAny.ts
@@ -1,5 +1,6 @@
-// @noImplicitAny: true
-var a: object;
+// @strict: false
+
+var a: object = {};
 
 for (var key in a) {
     var value = a[key]; // error
diff --git a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForInSupressError.ts b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForInSupressError.ts
index 3f63faee6040c..3a6b34e0fc0cf 100644
--- a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForInSupressError.ts
+++ b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveIndexingWithForInSupressError.ts
@@ -1,6 +1,6 @@
 // @noImplicitAny: true
 // @suppressImplicitAnyIndexErrors: true
-var a: object;
+var a: object = {};
 
 for (var key in a) {
     var value = a[key];
diff --git a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveNarrow.ts b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveNarrow.ts
index 2df691958dec4..d28ef5c179e15 100644
--- a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveNarrow.ts
+++ b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveNarrow.ts
@@ -1,8 +1,8 @@
 class Narrow {
-    narrowed: boolean
+    narrowed!: boolean
 }
 
-var a: object
+declare var a: object;
 
 if (a instanceof Narrow) {
     a.narrowed; // ok
@@ -13,7 +13,7 @@ if (typeof a === 'number') {
     a.toFixed(); // error, never
 }
 
-var b: object | null
+declare var b: object | null;
 
 if (typeof b === 'object') {
    b.toString(); // ok, object | null
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithOptionalParameterAndInitializer.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithOptionalParameterAndInitializer.ts
index 17baab5b8dd99..ccfb5d1505596 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithOptionalParameterAndInitializer.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithOptionalParameterAndInitializer.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Optional parameters cannot also have initializer expressions, these are all errors
 
 function foo(x?: number = 1) { }
@@ -15,7 +16,7 @@ class C {
     foo(x?: number = 1) { }
 }
 
-var c: C;
+declare var c: C;
 c.foo();
 c.foo(1);
 
@@ -24,13 +25,13 @@ interface I {
     foo(x: number, y?: number = 1);
 }
 
-var i: I;
+declare var i: I;
 i();
 i(1);
 i.foo(1);
 i.foo(1, 2);
 
-var a: {
+declare var a: {
     (x?: number = 1);
     foo(x? = 1);
 }
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutAnnotationsOrBody.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutAnnotationsOrBody.ts
index a73e224112eae..ef42d00e9bb17 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutAnnotationsOrBody.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutAnnotationsOrBody.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Call signatures without a return type annotation and function body return 'any'
 
 function foo(x) { }
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference.ts
index fa3de3127291a..0390d0b68cf89 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowUnreachableCode: true
 
 // Call signatures without a return type should infer one from the function body (if present)
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType.ts
index 84b63bf8dee36..4190b2677783d 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Each pair of signatures in these types has a signature that should cause an error. 
 // Overloads, generic or not, that differ only by return type are an error.
 interface I {
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType2.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType2.ts
index 6da8e576b3421..c212c6bb6791b 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType2.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Normally it is an error to have multiple overloads which differ only by return type in a single type declaration.
 // Here the multiple overloads come from multiple bases.
 
@@ -7,7 +8,7 @@ interface I<T> {
 
 interface A extends I<number>, I<string> { }
 
-var x: A;
+declare var x: A;
 // BUG 822524
 var r = x.foo(1); // no error
 var r2 = x.foo(''); // error
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType3.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType3.ts
index 3b5cef704445e..3fa12759ff1ce 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType3.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Normally it is an error to have multiple overloads with identical signatures in a single type declaration.
 // Here the multiple overloads come from multiple merged declarations.
 
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithAccessibilityModifiersOnParameters.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithAccessibilityModifiersOnParameters.ts
index 82489f6e4c460..a2f8853e12123 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithAccessibilityModifiersOnParameters.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithAccessibilityModifiersOnParameters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Call signature parameters do not allow accessibility modifiers
 
 function foo(public x, private y) { }
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithDuplicateParameters.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithDuplicateParameters.ts
index d5ff0c1f56fe2..0b72aa8ab4106 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithDuplicateParameters.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithDuplicateParameters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Duplicate parameter names are always an error
 
 function foo(x, x) { }
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters.ts
index 34edfba671d80..69034b7e6a6fd 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Optional parameters should be valid in all the below casts
 
 function foo(x?: number) { }
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters2.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters2.ts
index 4f31726f8299a..c93c4c8a2b1b7 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters2.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Optional parameters should be valid in all the below casts
 
 function foo(x?: number);
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithParameterInitializers.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithParameterInitializers.ts
index acbc2083ef388..33ca662118c34 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithParameterInitializers.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithParameterInitializers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Optional parameters allow initializers only in implementation signatures
 
 function foo(x = 1) { }
@@ -15,7 +16,7 @@ class C {
     foo(x = 1) { }
 }
 
-var c: C;
+declare var c: C;
 c.foo();
 c.foo(1);
 
@@ -25,14 +26,14 @@ interface I {
     foo(x: number, y = 1);
 }
 
-var i: I;
+declare var i: I;
 i();
 i(1);
 i.foo(1);
 i.foo(1, 2);
 
 // these are errors
-var a: {
+declare var a: {
     (x = 1);
     foo(x = 1);
 }
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithParameterInitializers2.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithParameterInitializers2.ts
index 04f1acd84ca3f..4a49fe35f76cb 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithParameterInitializers2.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignaturesWithParameterInitializers2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Optional parameters allow initializers only in implementation signatures
 // All the below declarations are errors
 
@@ -12,7 +13,7 @@ class C {
     foo(x = 1) { }
 }
 
-var c: C;
+declare var c: C;
 c.foo();
 c.foo(1);
 
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters.ts
index e2f9dbce983cb..eb9b12e44a6dd 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Parameter properties are only valid in constructor definitions, not even in other forms of construct signatures
 
 class C {
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts
index bebaa03276122..9869db0261903 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Parameter properties are not valid in overloads of constructors
 
 class C {
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/identicalCallSignatures.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/identicalCallSignatures.ts
index 0bbedcc253135..a47383bdac2ae 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/identicalCallSignatures.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/identicalCallSignatures.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Each pair of call signatures in these types have a duplicate signature error.
 // Identical call signatures should generate an error.
 interface I {
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/identicalCallSignatures2.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/identicalCallSignatures2.ts
index 1d9bb8443560e..abb6b97923c93 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/identicalCallSignatures2.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/identicalCallSignatures2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Normally it is an error to have multiple overloads with identical signatures in a single type declaration.
 // Here the multiple overloads come from multiple bases.
 
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/identicalCallSignatures3.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/identicalCallSignatures3.ts
index 2c47993fbe53c..5c95b74a84030 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/identicalCallSignatures3.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/identicalCallSignatures3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Normally it is an error to have multiple overloads with identical signatures in a single type declaration.
 // Here the multiple overloads come from multiple merged declarations, so we do not report errors.
 
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny.ts
index 432c905765443..d39cd000621bf 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny.ts
@@ -1,3 +1,4 @@
+// @strict: false
 function foo(x) { return x; }
 var f = function foo(x) { return x; }
 var f2 = (x) => x;
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParameterWithoutAnnotationIsAnyArray.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParameterWithoutAnnotationIsAnyArray.ts
index 9dd2960a7a11f..c6a94dfa17c7f 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParameterWithoutAnnotationIsAnyArray.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParameterWithoutAnnotationIsAnyArray.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Rest parameters without type annotations are 'any', errors only for the functions with 2 rest params
 
 function foo(...x) { }
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParametersOfNonArrayTypes.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParametersOfNonArrayTypes.ts
index 8b816f42ee5fa..5edf17ea4acfa 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParametersOfNonArrayTypes.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParametersOfNonArrayTypes.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Rest parameters must be an array type if they have a type annotation, so all these are errors
 
 function foo(...x: string) { }
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParametersOfNonArrayTypes2.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParametersOfNonArrayTypes2.ts
index 2b5cfec1bb364..5f5e07260a576 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParametersOfNonArrayTypes2.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParametersOfNonArrayTypes2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Rest parameters must be an array type if they have a type annotation, 
 // user defined subtypes of array do not count, all of these are errors
 
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParametersWithArrayTypeAnnotations.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParametersWithArrayTypeAnnotations.ts
index 4f37f4ce1cbd4..51393c27a02e1 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParametersWithArrayTypeAnnotations.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/restParametersWithArrayTypeAnnotations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Rest parameters must be an array type if they have a type annotation, errors only for the functions with 2 rest params
 
 function foo(...x: number[]) { }
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts
index 01f33fbd7bb50..f5f4b98738d6c 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 function foo(x: 'a');
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.ts
index 70735b8edd78d..32ce43d7e3c36 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Specialized signatures must be a subtype of a non-specialized signature
 // All the below should not be errors
 
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts
index a8bf323850b2f..3a267792e19a1 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // String literal types are only valid in overload signatures
 
 function foo(x: 'hi') { }
diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts
index baaea8ee750a5..21fd1b682f5e9 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // String literal types are only valid in overload signatures
 
 function foo(x: any);
diff --git a/tests/cases/conformance/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads2.ts b/tests/cases/conformance/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads2.ts
index 71fbcd6d97c28..8bdaaab2f2c42 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads2.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads2.ts
@@ -34,6 +34,6 @@ interface I<T> {
     new (x: T, y: number): C2<T>;
 }
 
-var i2: I<number>;
+declare var i2: I<number>;
 var r4 = new i2(1, '');
 var r5 = new i2(1, 1);
\ No newline at end of file
diff --git a/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts b/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts
index 44f6ed27bbf9e..f0cb8bdaafa2c 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // String indexer types constrain the types of named properties in their containing type
 
 interface MyNumber extends Number {
diff --git a/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations2.ts b/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations2.ts
index e9dd1e9ec3038..44ac9a67e80fb 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations2.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // String indexer providing a constraint of a user defined type
 
 class A {
diff --git a/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations.ts b/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations.ts
index 83e56cb037915..6aa24a0d2db60 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // String indexer types constrain the types of named properties in their containing type
 
 interface MyString extends String {
diff --git a/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts b/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts
index d38850a6ae203..d2bd70e8e0d2f 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // String indexer providing a constraint of a user defined type
 
 class A {
diff --git a/tests/cases/conformance/types/objectTypeLiteral/methodSignatures/objectTypesWithOptionalProperties2.ts b/tests/cases/conformance/types/objectTypeLiteral/methodSignatures/objectTypesWithOptionalProperties2.ts
index 4f1c79d0268e1..1a2663252225f 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/methodSignatures/objectTypesWithOptionalProperties2.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/methodSignatures/objectTypesWithOptionalProperties2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Illegal attempts to define optional methods
 
 var a: {
diff --git a/tests/cases/conformance/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation.ts b/tests/cases/conformance/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation.ts
index 42f42eb3127c2..714b9eb6edd9e 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     foo;
 }
diff --git a/tests/cases/conformance/types/objectTypeLiteral/propertySignatures/propertyNamesOfReservedWords.ts b/tests/cases/conformance/types/objectTypeLiteral/propertySignatures/propertyNamesOfReservedWords.ts
index 6673465381f50..ac849df89c397 100644
--- a/tests/cases/conformance/types/objectTypeLiteral/propertySignatures/propertyNamesOfReservedWords.ts
+++ b/tests/cases/conformance/types/objectTypeLiteral/propertySignatures/propertyNamesOfReservedWords.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     abstract;
     as;
diff --git a/tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface.ts b/tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface.ts
index ebfeeaf807148..2592f92c3a7be 100644
--- a/tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface.ts
+++ b/tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface.ts
@@ -1,4 +1,4 @@
 var x = true;
-var a: Boolean;
+declare var a: Boolean;
 x = a;
 a = x;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface2.ts b/tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface2.ts
index ae0e817bdc90d..4d8a5117a1c01 100644
--- a/tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface2.ts
+++ b/tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface2.ts
@@ -7,8 +7,8 @@ interface NotBoolean {
 }
 
 var x = true;
-var a: Boolean;
-var b: NotBoolean;
+declare var a: Boolean;
+declare var b: NotBoolean;
 
 a = x;
 a = b;
diff --git a/tests/cases/conformance/types/primitives/enum/validEnumAssignments.ts b/tests/cases/conformance/types/primitives/enum/validEnumAssignments.ts
index 2c8e5634ddbb9..30d0b1a391707 100644
--- a/tests/cases/conformance/types/primitives/enum/validEnumAssignments.ts
+++ b/tests/cases/conformance/types/primitives/enum/validEnumAssignments.ts
@@ -3,9 +3,9 @@ enum E {
     B
 }
 
-var n: number;
-var a: any;
-var e: E;
+declare var n: number;
+declare var a: any;
+declare var e: E;
 
 n = e;
 n = E.A;
diff --git a/tests/cases/conformance/types/primitives/number/assignFromNumberInterface.ts b/tests/cases/conformance/types/primitives/number/assignFromNumberInterface.ts
index 7e3e5a17f4681..d4d03eb6a7e5c 100644
--- a/tests/cases/conformance/types/primitives/number/assignFromNumberInterface.ts
+++ b/tests/cases/conformance/types/primitives/number/assignFromNumberInterface.ts
@@ -1,4 +1,4 @@
 var x = 1;
-var a: Number;
+declare var a: Number;
 x = a;
 a = x;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts b/tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts
index da7da7c7a064e..1923e1cb56396 100644
--- a/tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts
+++ b/tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts
@@ -12,8 +12,8 @@ interface NotNumber {
 }
 
 var x = 1;
-var a: Number;
-var b: NotNumber;
+declare var a: Number;
+declare var b: NotNumber;
 
 a = x; 
 a = b; 
diff --git a/tests/cases/conformance/types/primitives/string/assignFromStringInterface.ts b/tests/cases/conformance/types/primitives/string/assignFromStringInterface.ts
index 59f7c5eecea61..cff5e51165ee5 100644
--- a/tests/cases/conformance/types/primitives/string/assignFromStringInterface.ts
+++ b/tests/cases/conformance/types/primitives/string/assignFromStringInterface.ts
@@ -1,4 +1,4 @@
 var x = '';
-var a: String;
+declare var a: String;
 x = a;
 a = x;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts b/tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts
index 9c971ea5614e1..9e6677ddbe609 100644
--- a/tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts
+++ b/tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts
@@ -35,8 +35,8 @@ interface NotString {
 }
 
 var x = '';
-var a: String;
-var b: NotString;
+declare var a: String;
+declare var b: NotString;
 
 a = x;
 a = b;
diff --git a/tests/cases/conformance/types/primitives/stringLiteral/stringLiteralType.ts b/tests/cases/conformance/types/primitives/stringLiteral/stringLiteralType.ts
index 7082bcccb440e..89b379effd225 100644
--- a/tests/cases/conformance/types/primitives/stringLiteral/stringLiteralType.ts
+++ b/tests/cases/conformance/types/primitives/stringLiteral/stringLiteralType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var x: 'hi';
 
 function f(x: 'hi');
diff --git a/tests/cases/conformance/types/primitives/void/invalidAssignmentsToVoid.ts b/tests/cases/conformance/types/primitives/void/invalidAssignmentsToVoid.ts
index 73612df0b8d54..ebf6b031cefb5 100644
--- a/tests/cases/conformance/types/primitives/void/invalidAssignmentsToVoid.ts
+++ b/tests/cases/conformance/types/primitives/void/invalidAssignmentsToVoid.ts
@@ -4,13 +4,13 @@ x = true;
 x = '';
 x = {}
 
-class C { foo: string; }
-var c: C;
+class C { foo!: string; }
+declare var c: C;
 x = C;
 x = c;
 
 interface I { foo: string; }
-var i: I;
+declare var i: I;
 x = i;
 
 namespace M { export var x = 1; }
diff --git a/tests/cases/conformance/types/primitives/void/invalidVoidValues.ts b/tests/cases/conformance/types/primitives/void/invalidVoidValues.ts
index 89e6d4ae9b200..85f7d91edef49 100644
--- a/tests/cases/conformance/types/primitives/void/invalidVoidValues.ts
+++ b/tests/cases/conformance/types/primitives/void/invalidVoidValues.ts
@@ -7,12 +7,12 @@ enum E { A }
 x = E;
 x = E.A;
 
-class C { foo: string }
-var a: C;
+class C { foo!: string }
+declare var a: C;
 x = a;
 
 interface I { foo: string }
-var b: I;
+declare var b: I;
 x = b;
 
 x = { f() {} }
diff --git a/tests/cases/conformance/types/rest/objectRest.ts b/tests/cases/conformance/types/rest/objectRest.ts
index 7403340c7cb4f..48aca913bfd52 100644
--- a/tests/cases/conformance/types/rest/objectRest.ts
+++ b/tests/cases/conformance/types/rest/objectRest.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 var o = { a: 1, b: 'no' }
 var { ...clone } = o;
@@ -10,24 +11,24 @@ var { b: { '0': n, '1': oooo }, ...justA } = o;
 let o2 = { c: 'terrible idea?', d: 'yes' };
 var { d: renamed, ...d } = o2;
 
-let nestedrest: { x: number, n1: { y: number, n2: { z: number, n3: { n4: number } } }, rest: number, restrest: number };
+declare let nestedrest: { x: number, n1: { y: number, n2: { z: number, n3: { n4: number } } }, rest: number, restrest: number };
 var { x, n1: { y, n2: { z, n3: { ...nr } } }, ...restrest } = nestedrest;
 
-let complex: { x: { ka, ki }, y: number };
+declare let complex: { x: { ka, ki }, y: number };
 var { x: { ka, ...nested }, y: other, ...rest } = complex;
 ({x: { ka, ...nested }, y: other, ...rest} = complex);
 var { x, ...fresh } = { x: 1, y: 2 };
 ({ x, ...fresh } = { x: 1, y: 2 });
 
 class Removable {
-    private x: number;
-    protected y: number;
+    private x!: number;
+    protected y!: number;
     set z(value: number) { }
     get both(): number { return 12 }
     set both(value: number) { }
     m() { }
-    removed: string;
-    remainder: string;
+    removed!: string;
+    remainder!: string;
 }
 interface I {
     m(): void;
diff --git a/tests/cases/conformance/types/rest/objectRest2.ts b/tests/cases/conformance/types/rest/objectRest2.ts
index 4a38123f1ac15..221900907519e 100644
--- a/tests/cases/conformance/types/rest/objectRest2.ts
+++ b/tests/cases/conformance/types/rest/objectRest2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @lib: es2015
 // @target: es2015
 // test for #12203
diff --git a/tests/cases/conformance/types/rest/objectRestAssignment.ts b/tests/cases/conformance/types/rest/objectRestAssignment.ts
index dedc99b1f713a..6063cc26b9ec2 100644
--- a/tests/cases/conformance/types/rest/objectRestAssignment.ts
+++ b/tests/cases/conformance/types/rest/objectRestAssignment.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 let ka: any;
 let nested: { ki };
diff --git a/tests/cases/conformance/types/rest/objectRestCatchES5.ts b/tests/cases/conformance/types/rest/objectRestCatchES5.ts
index 0e568d32b5863..0bc69dd38ebb2 100644
--- a/tests/cases/conformance/types/rest/objectRestCatchES5.ts
+++ b/tests/cases/conformance/types/rest/objectRestCatchES5.ts
@@ -1,2 +1,4 @@
+// @strict: false
+
 let a = 1, b = 2;
 try {} catch ({ a, ...b }) {}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/rest/objectRestForOf.ts b/tests/cases/conformance/types/rest/objectRestForOf.ts
index 4f675b1f15b91..59351ffa1e5cd 100644
--- a/tests/cases/conformance/types/rest/objectRestForOf.ts
+++ b/tests/cases/conformance/types/rest/objectRestForOf.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 let array: { x: number, y: string }[];
 for (let { x, ...restOf } of array) {
diff --git a/tests/cases/conformance/types/rest/objectRestNegative.ts b/tests/cases/conformance/types/rest/objectRestNegative.ts
index 13d214e453de4..1ccea201f8e65 100644
--- a/tests/cases/conformance/types/rest/objectRestNegative.ts
+++ b/tests/cases/conformance/types/rest/objectRestNegative.ts
@@ -14,5 +14,5 @@ function generic<T extends { x, y }>(t: T) {
     return rest;
 }
 
-let rest: { b: string }
+let rest: { b: string } = { b: "" };
 ({a, ...rest.b + rest.b} = o);
diff --git a/tests/cases/conformance/types/rest/objectRestParameter.ts b/tests/cases/conformance/types/rest/objectRestParameter.ts
index 5b6faeb797829..abdf0d0b6b571 100644
--- a/tests/cases/conformance/types/rest/objectRestParameter.ts
+++ b/tests/cases/conformance/types/rest/objectRestParameter.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es2015
 function cloneAgain({ a, ...clone }: { a: number, b: string }): void {
 }
diff --git a/tests/cases/conformance/types/rest/objectRestParameterES5.ts b/tests/cases/conformance/types/rest/objectRestParameterES5.ts
index 07a15ffbd4415..a7388b68bd1d1 100644
--- a/tests/cases/conformance/types/rest/objectRestParameterES5.ts
+++ b/tests/cases/conformance/types/rest/objectRestParameterES5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es5
 function cloneAgain({ a, ...clone }: { a: number, b: string }): void {
 }
diff --git a/tests/cases/conformance/types/rest/objectRestPropertyMustBeLast.ts b/tests/cases/conformance/types/rest/objectRestPropertyMustBeLast.ts
index 2e4e17dc302ce..b4865e3ed97b9 100644
--- a/tests/cases/conformance/types/rest/objectRestPropertyMustBeLast.ts
+++ b/tests/cases/conformance/types/rest/objectRestPropertyMustBeLast.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var {...a, x } = { x: 1 };    // Error, rest must be last property
 ({...a, x } = { x: 1 });      // Error, rest must be last property
 
diff --git a/tests/cases/conformance/types/rest/objectRestReadonly.ts b/tests/cases/conformance/types/rest/objectRestReadonly.ts
index be6006203481b..8e819edd57a95 100644
--- a/tests/cases/conformance/types/rest/objectRestReadonly.ts
+++ b/tests/cases/conformance/types/rest/objectRestReadonly.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // #23734
 type ObjType = {
   foo: string
diff --git a/tests/cases/conformance/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes.ts b/tests/cases/conformance/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes.ts
index bed9753b5f9fa..3015596580a18 100644
--- a/tests/cases/conformance/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes.ts
+++ b/tests/cases/conformance/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // valid uses of arrays of function types
 
 var x: () => string[];
diff --git a/tests/cases/conformance/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes2.ts b/tests/cases/conformance/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes2.ts
index 48397b90a820a..728d399c9f334 100644
--- a/tests/cases/conformance/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes2.ts
+++ b/tests/cases/conformance/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // valid uses of arrays of function types
 
 var x: new () => string[];
diff --git a/tests/cases/conformance/types/specifyingTypes/typeLiterals/functionLiteralForOverloads.ts b/tests/cases/conformance/types/specifyingTypes/typeLiterals/functionLiteralForOverloads.ts
index d3ffdbe56a3d0..c141070943f40 100644
--- a/tests/cases/conformance/types/specifyingTypes/typeLiterals/functionLiteralForOverloads.ts
+++ b/tests/cases/conformance/types/specifyingTypes/typeLiterals/functionLiteralForOverloads.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // basic uses of function literals with overloads
 
 var f: {
diff --git a/tests/cases/conformance/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.ts b/tests/cases/conformance/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.ts
index 4ba6a76000f18..5f40d9c85caaa 100644
--- a/tests/cases/conformance/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.ts
+++ b/tests/cases/conformance/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // basic uses of function literals with constructor overloads
 
 class C {
diff --git a/tests/cases/conformance/types/specifyingTypes/typeLiterals/parenthesizedTypes.ts b/tests/cases/conformance/types/specifyingTypes/typeLiterals/parenthesizedTypes.ts
index 92959698885c5..eb4f22d1e83de 100644
--- a/tests/cases/conformance/types/specifyingTypes/typeLiterals/parenthesizedTypes.ts
+++ b/tests/cases/conformance/types/specifyingTypes/typeLiterals/parenthesizedTypes.ts
@@ -1,3 +1,4 @@
+// @strict: false
 var a: string;
 var a: (string);
 var a: ((string) | string | (((string))));
diff --git a/tests/cases/conformance/types/specifyingTypes/typeQueries/circularTypeofWithVarOrFunc.ts b/tests/cases/conformance/types/specifyingTypes/typeQueries/circularTypeofWithVarOrFunc.ts
index d80f16458f04d..2e72559acbce8 100644
--- a/tests/cases/conformance/types/specifyingTypes/typeQueries/circularTypeofWithVarOrFunc.ts
+++ b/tests/cases/conformance/types/specifyingTypes/typeQueries/circularTypeofWithVarOrFunc.ts
@@ -1,3 +1,4 @@
+// @strict: false
 type typeAlias1 = typeof varOfAliasedType1;
 var varOfAliasedType1: typeAlias1;
 
diff --git a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeQueryOnClass.ts b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeQueryOnClass.ts
index 3e8ee82c74924..ad0fb1169273c 100644
--- a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeQueryOnClass.ts
+++ b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeQueryOnClass.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C<T> {
     constructor(x: number);
     constructor(x: string);
diff --git a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofClass2.ts b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofClass2.ts
index df1898a5436a4..5afbe5ab57daf 100644
--- a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofClass2.ts
+++ b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofClass2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     constructor(x: number);
     constructor(x: string);
diff --git a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofTypeParameter.ts b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofTypeParameter.ts
index 7d5ca0ae9315e..99d3267c57d68 100644
--- a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofTypeParameter.ts
+++ b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofTypeParameter.ts
@@ -1,5 +1,5 @@
 function f<T>(x: T): T {
-    var a: typeof x;
-    var y: typeof T;
+    var a!: typeof x;
+    var y!: typeof T;
     return a;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts
index 5099887a7491c..b6db5a13ac18f 100644
--- a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts
+++ b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // it is an error to use a generic type without type arguments
 // all of these are errors 
 
diff --git a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts
index 5099887a7491c..b6db5a13ac18f 100644
--- a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts
+++ b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // it is an error to use a generic type without type arguments
 // all of these are errors 
 
diff --git a/tests/cases/conformance/types/spread/objectSpreadNegative.ts b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
index 00dfd440667b3..28936bbdeb127 100644
--- a/tests/cases/conformance/types/spread/objectSpreadNegative.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
@@ -7,7 +7,7 @@ class PrivateOptionalX {
     private x?: number;
 }
 class PublicX {
-    public x: number;
+    public x: number = 42;
 }
 declare let publicX: PublicX;
 declare let privateOptionalX: PrivateOptionalX;
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts
index 388f4567ed72a..41fb04f247102 100644
--- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 // Should all be strings.
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts
index ba1894065339d..b766ad6b5d85b 100644
--- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 type Kind = "A" | "B"
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts
index 9fdc942a3f25a..509ac4e41c462 100644
--- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 type Kind = "A" | "B"
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags03.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags03.ts
index 96011d27255d9..d8b439bbf9890 100644
--- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags03.ts
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags03.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 type Kind = "A" | "B"
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts
index 05f8c5111180b..57f983b3ef079 100644
--- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 type T = "foo" | "bar" | "baz";
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts
index ee61efc37cac5..004553c8a3d7b 100644
--- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 type T = string | "foo" | "bar" | "baz";
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts
index 96a4f035c4baa..356b3455f25e9 100644
--- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 type T = number | "foo" | "bar";
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts
index 9f37e272b460c..d3ddb1fb3b6ce 100644
--- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 type T = "" | "foo";
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts
index 4f0063876876a..d253cdc04b36a 100644
--- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 let a: "";
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts
index 0044113440561..660dc62ac91af 100644
--- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 type PrimitiveName = 'string' | 'number' | 'boolean';
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts
index 9e142702026d5..a0634cceb2d04 100644
--- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 function getFalsyPrimitive(x: "string"): string;
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts
index 2199ff3a7c782..1876c5742cc06 100644
--- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 type Kind = "A" | "B"
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts
index 28c34d3c74a99..83855b9d2dfcd 100644
--- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts
@@ -1,9 +1,9 @@
 // @declaration: true
 
-let abc: "ABC" = "ABC";
-let xyz: "XYZ" = "XYZ";
-let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
-let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
+declare let abc: "ABC";
+declare let xyz: "XYZ";
+declare let abcOrXyz: "ABC" | "XYZ";
+declare let abcOrXyzOrNumber: "ABC" | "XYZ" | number;
 
 let a = "" + abc;
 let b = abc + "";
diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts
index cf66f66e47c30..75b04b2b9daf4 100644
--- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts
+++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts
@@ -1,9 +1,9 @@
 // @declaration: true
 
-let abc: "ABC" = "ABC";
-let xyz: "XYZ" = "XYZ";
-let abcOrXyz: "ABC" | "XYZ" = abc || xyz;
-let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100;
+declare let abc: "ABC";
+declare let xyz: "XYZ";
+declare let abcOrXyz: "ABC" | "XYZ";
+declare let abcOrXyzOrNumber: "ABC" | "XYZ" | number;
 
 let a = abcOrXyzOrNumber + 100;
 let b = 100 + abcOrXyzOrNumber;
diff --git a/tests/cases/conformance/types/thisType/contextualThisTypeInJavascript.ts b/tests/cases/conformance/types/thisType/contextualThisTypeInJavascript.ts
index 53e6c1bae7ebf..5d4620dcd2994 100644
--- a/tests/cases/conformance/types/thisType/contextualThisTypeInJavascript.ts
+++ b/tests/cases/conformance/types/thisType/contextualThisTypeInJavascript.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts b/tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts
index 0671fc785076d..2438e40d19b42 100644
--- a/tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts
+++ b/tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts
@@ -9,7 +9,7 @@ interface Unused {
     implicitNoThis(m: number): number;
 }
 class C implements I {
-    n: number;
+    n!: number;
     explicitThis(this: this, m: number): number {
         return this.n + m;
     }
@@ -38,7 +38,7 @@ let o2: I = {
 }
 let x = i.explicitThis;
 let n = x(12); // callee:void doesn't match this:I
-let u: Unused;
+declare let u: Unused;
 let y = u.implicitNoThis;
 n = y(12); // ok, callee:void matches this:any
 c.explicitVoid = c.implicitThis // ok, implicitThis(this:any)
diff --git a/tests/cases/conformance/types/thisType/thisTypeInFunctions.ts b/tests/cases/conformance/types/thisType/thisTypeInFunctions.ts
index 481e1630092b5..ca7d3c7f44a6e 100644
--- a/tests/cases/conformance/types/thisType/thisTypeInFunctions.ts
+++ b/tests/cases/conformance/types/thisType/thisTypeInFunctions.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // body checking
 class B {
     n: number;
@@ -100,8 +101,8 @@ let unspecifiedLambdaToSpecified: (this: {y: number}, x: number) => number = uns
 let specifiedLambdaToSpecified: (this: {y: number}, x: number) => number = specifiedLambda;
 
 
-let explicitCFunction: (this: C, m: number) => number;
-let explicitPropertyFunction: (this: {n: number}, m: number) => number;
+declare let explicitCFunction: (this: C, m: number) => number;
+declare let explicitPropertyFunction: (this: {n: number}, m: number) => number;
 c.explicitC = explicitCFunction;
 c.explicitC = function(this: C, m: number) { return this.n + m };
 c.explicitProperty = explicitPropertyFunction;
diff --git a/tests/cases/conformance/types/thisType/thisTypeInFunctions3.ts b/tests/cases/conformance/types/thisType/thisTypeInFunctions3.ts
index 01d7fd0430bfa..660c691bde1b6 100644
--- a/tests/cases/conformance/types/thisType/thisTypeInFunctions3.ts
+++ b/tests/cases/conformance/types/thisType/thisTypeInFunctions3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 declare class Base {
     check<TProp extends this>(prop: TProp): boolean;
 }
diff --git a/tests/cases/conformance/types/thisType/thisTypeInFunctions4.ts b/tests/cases/conformance/types/thisType/thisTypeInFunctions4.ts
index ade3e65e02902..c8e268a60f7a2 100644
--- a/tests/cases/conformance/types/thisType/thisTypeInFunctions4.ts
+++ b/tests/cases/conformance/types/thisType/thisTypeInFunctions4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 type WrongObject = {value: number};
 type CorrectObject = {name: string};
 
diff --git a/tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts b/tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts
index 20f59cbfe02a4..d21c22b9a4bcb 100644
--- a/tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts
+++ b/tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: es6
 
 class C {
@@ -103,7 +104,7 @@ let reconstructed: {
 
 // lambdas have this: void for assignability purposes (and this unbound (free) for body checking)
 let d = new D();
-let explicitXProperty: (this: { x: number }, m: number) => number;
+declare let explicitXProperty: (this: { x: number }, m: number) => number;
 
 // from differing object types
 c.explicitC = function(this: D, m: number) { return this.x + m };
diff --git a/tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts b/tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts
index 85a035d472b30..5fe4b3de3ec34 100644
--- a/tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts
+++ b/tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts
@@ -4,9 +4,9 @@ interface StrNum extends Array<string|number> {
     length: 2;
 }
 
-var x: [string, number];
-var y: StrNum
-var z: {
+declare var x: [string, number];
+declare var y: StrNum
+declare var z: {
     0: string;
     1: number;
     length: 2;
diff --git a/tests/cases/conformance/types/tuple/named/namedTupleMembers.ts b/tests/cases/conformance/types/tuple/named/namedTupleMembers.ts
index 9846c4f5b0f98..510a08c4b061a 100644
--- a/tests/cases/conformance/types/tuple/named/namedTupleMembers.ts
+++ b/tests/cases/conformance/types/tuple/named/namedTupleMembers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 export type Segment = [length: number, count: number];
diff --git a/tests/cases/conformance/types/tuple/named/namedTupleMembersErrors.ts b/tests/cases/conformance/types/tuple/named/namedTupleMembersErrors.ts
index ecd90aebd7ddd..2c4fddcdf7a2d 100644
--- a/tests/cases/conformance/types/tuple/named/namedTupleMembersErrors.ts
+++ b/tests/cases/conformance/types/tuple/named/namedTupleMembersErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @declaration: true
 
 export type Segment1 = [length: number, number];
diff --git a/tests/cases/conformance/types/tuple/strictTupleLength.ts b/tests/cases/conformance/types/tuple/strictTupleLength.ts
index eaa9111e55713..d9033f0f3175f 100644
--- a/tests/cases/conformance/types/tuple/strictTupleLength.ts
+++ b/tests/cases/conformance/types/tuple/strictTupleLength.ts
@@ -1,7 +1,7 @@
-var t0: [];
-var t1: [number];
-var t2: [number, number];
-var arr: number[];
+declare var t0: [];
+declare var t1: [number];
+declare var t2: [number, number];
+declare var arr: number[];
 
 var len0: 0 = t0.length;
 var len1: 1 = t1.length;
@@ -12,7 +12,7 @@ var t1 = t2; // error
 var t2 = t1; // error
 
 type A<T extends any[]> = T['length'];
-var b: A<[boolean]>;
+declare var b: A<[boolean]>;
 var c: 1 = b;
 
 t1 = arr; // error with or without strict
diff --git a/tests/cases/conformance/types/tuple/wideningTuples1.ts b/tests/cases/conformance/types/tuple/wideningTuples1.ts
index f4885435dcfab..7cd9551fd9d4d 100644
--- a/tests/cases/conformance/types/tuple/wideningTuples1.ts
+++ b/tests/cases/conformance/types/tuple/wideningTuples1.ts
@@ -1,3 +1,4 @@
+//@strict: false
 //@noImplicitAny: true
 declare function foo<T extends [any]>(x: T): T;
 
diff --git a/tests/cases/conformance/types/tuple/wideningTuples2.ts b/tests/cases/conformance/types/tuple/wideningTuples2.ts
index d8bf124854663..5a69be75de73e 100644
--- a/tests/cases/conformance/types/tuple/wideningTuples2.ts
+++ b/tests/cases/conformance/types/tuple/wideningTuples2.ts
@@ -1,3 +1,4 @@
+//@strict: false
 //@noImplicitAny: true
 var foo: () => [any] = function bar() {
     let intermediate = bar();
diff --git a/tests/cases/conformance/types/tuple/wideningTuples3.ts b/tests/cases/conformance/types/tuple/wideningTuples3.ts
index a6837be2a0fac..5a140bbefdfdf 100644
--- a/tests/cases/conformance/types/tuple/wideningTuples3.ts
+++ b/tests/cases/conformance/types/tuple/wideningTuples3.ts
@@ -1,3 +1,4 @@
+//@strict: false
 //@noImplicitAny: true
 var a: [any];
 
diff --git a/tests/cases/conformance/types/tuple/wideningTuples4.ts b/tests/cases/conformance/types/tuple/wideningTuples4.ts
index 550ba07f60012..2583e194495e9 100644
--- a/tests/cases/conformance/types/tuple/wideningTuples4.ts
+++ b/tests/cases/conformance/types/tuple/wideningTuples4.ts
@@ -1,3 +1,4 @@
+//@strict: false
 var a: [any];
 
 var b = a = [undefined, null];
diff --git a/tests/cases/conformance/types/tuple/wideningTuples5.ts b/tests/cases/conformance/types/tuple/wideningTuples5.ts
index 36434c6eafe22..67ec7f31c85bb 100644
--- a/tests/cases/conformance/types/tuple/wideningTuples5.ts
+++ b/tests/cases/conformance/types/tuple/wideningTuples5.ts
@@ -1,2 +1,3 @@
+//@strict: false
 //@noImplicitAny: true
 var [a, b] = [undefined, null];
\ No newline at end of file
diff --git a/tests/cases/conformance/types/tuple/wideningTuples6.ts b/tests/cases/conformance/types/tuple/wideningTuples6.ts
index cac228ecb4d02..be2bd335c6aa3 100644
--- a/tests/cases/conformance/types/tuple/wideningTuples6.ts
+++ b/tests/cases/conformance/types/tuple/wideningTuples6.ts
@@ -1,3 +1,4 @@
+//@strict: false
 var [a, b] = [undefined, null];
 a = "";
 b = "";
\ No newline at end of file
diff --git a/tests/cases/conformance/types/tuple/wideningTuples7.ts b/tests/cases/conformance/types/tuple/wideningTuples7.ts
index 1a4d212d3622d..3091df5b3cb87 100644
--- a/tests/cases/conformance/types/tuple/wideningTuples7.ts
+++ b/tests/cases/conformance/types/tuple/wideningTuples7.ts
@@ -1,3 +1,4 @@
+//@strict: false
 //@noImplicitAny: true
 var foo = function bar() {
     let intermediate: [string];
diff --git a/tests/cases/conformance/types/typeAliases/asiPreventsParsingAsTypeAlias02.ts b/tests/cases/conformance/types/typeAliases/asiPreventsParsingAsTypeAlias02.ts
index 9357dbbfe09b7..609f77330f2a0 100644
--- a/tests/cases/conformance/types/typeAliases/asiPreventsParsingAsTypeAlias02.ts
+++ b/tests/cases/conformance/types/typeAliases/asiPreventsParsingAsTypeAlias02.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 var type;
 var string;
diff --git a/tests/cases/conformance/types/typeParameters/typeArgumentLists/callGenericFunctionWithIncorrectNumberOfTypeArguments.ts b/tests/cases/conformance/types/typeParameters/typeArgumentLists/callGenericFunctionWithIncorrectNumberOfTypeArguments.ts
index 24251a41e74e4..77e53d2656103 100644
--- a/tests/cases/conformance/types/typeParameters/typeArgumentLists/callGenericFunctionWithIncorrectNumberOfTypeArguments.ts
+++ b/tests/cases/conformance/types/typeParameters/typeArgumentLists/callGenericFunctionWithIncorrectNumberOfTypeArguments.ts
@@ -9,7 +9,7 @@ var f2 = <T, U>(x: T, y: U): T => { return null; }
 var r2 = f2<number>(1, '');
 var r2b = f2<number, string, number>(1, '');
 
-var f3: { <T, U>(x: T, y: U): T; }
+declare var f3: { <T, U>(x: T, y: U): T; };
 var r3 = f3<number>(1, '');
 var r3b = f3<number, string, number>(1, '');
 
@@ -24,7 +24,7 @@ var r4b = (new C()).f<number, string, number>(1, '');
 interface I {
     f<T, U>(x: T, y: U): T;
 }
-var i: I;
+declare var i: I;
 var r5 = i.f<number>(1, '');
 var r5b = i.f<number, string, number>(1, '');
 
@@ -39,6 +39,6 @@ var r6b = (new C2()).f<number, string, number>(1, '');
 interface I2<T, U> {
     f(x: T, y: U): T;
 }
-var i2: I2<number, string>;
+declare var i2: I2<number, string>;
 var r7 = i2.f<number>(1, '');
 var r7b = i2.f<number, string, number>(1, '');
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeParameters/typeArgumentLists/callNonGenericFunctionWithTypeArguments.ts b/tests/cases/conformance/types/typeParameters/typeArgumentLists/callNonGenericFunctionWithTypeArguments.ts
index 6110d3bc88e22..5540f0e1973ca 100644
--- a/tests/cases/conformance/types/typeParameters/typeArgumentLists/callNonGenericFunctionWithTypeArguments.ts
+++ b/tests/cases/conformance/types/typeParameters/typeArgumentLists/callNonGenericFunctionWithTypeArguments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // it is always illegal to provide type arguments to a non-generic function
 // all invocations here are illegal
 
@@ -7,7 +8,7 @@ var r = f<string>(1);
 var f2 = (x: number) => { return null; }
 var r2 = f2<string>(1);
 
-var f3: { (x: number): any; }
+declare var f3: { (x: number): any; }
 var r3 = f3<string>(1);
 
 class C {
@@ -20,7 +21,7 @@ var r4 = (new C()).f<string>(1);
 interface I {
     f(x: number): any;
 }
-var i: I;
+declare var i: I;
 var r5 = i.f<string>(1);
 
 class C2 {
@@ -33,11 +34,11 @@ var r6 = (new C2()).f<string>(1);
 interface I2 {
     f(x: number);
 }
-var i2: I2;
+declare var i2: I2;
 var r7 = i2.f<string>(1);
 
-var a;
+declare var a;
 var r8 = a<number>();
 
-var a2: any;
+declare var a2: any;
 var r8 = a2<number>();
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction.ts b/tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction.ts
index ba1c5b003f703..daa34e6945e1e 100644
--- a/tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction.ts
+++ b/tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // satisfaction of a constraint to Function, no errors expected
 
 function foo<T extends Function>(x: T): T { return x; }
diff --git a/tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts b/tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts
index ac202d4461642..5ef8fcce82557 100644
--- a/tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts
+++ b/tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // satisfaction of a constraint to Function, all of these invocations are errors unless otherwise noted
 
 function foo<T extends Function>(x: T): T { return x; }
@@ -12,13 +13,13 @@ class C {
     foo: string;
 }
 
-var b: { new (x: string): string };
+declare var b: { new (x: string): string };
 
 class C2<T> {
     foo: T;
 }
 
-var b2: { new <T>(x: T): T };
+declare var b2: { new <T>(x: T): T };
 
 var r = foo2(new Function());
 var r2 = foo2((x: string[]) => x);
@@ -30,7 +31,7 @@ var r13 = foo2(C2);
 var r14 = foo2(b2);
 
 interface F2 extends Function { foo: string; }
-var f2: F2;
+declare var f2: F2;
 var r16 = foo2(f2);
 
 function fff<T extends { (): void }, U extends T>(x: T, y: U) {
diff --git a/tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.ts b/tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.ts
index 6c32014789621..04ff6c0b5b423 100644
--- a/tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.ts
+++ b/tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // satisfaction of a constraint to Function, no errors expected
 
 function foo<T extends (x: string) => string>(x: T): T { return x; }
diff --git a/tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiateNonGenericTypeWithTypeArguments.ts b/tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiateNonGenericTypeWithTypeArguments.ts
index 93bb57d973f70..1bb94fe4c354d 100644
--- a/tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiateNonGenericTypeWithTypeArguments.ts
+++ b/tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiateNonGenericTypeWithTypeArguments.ts
@@ -1,8 +1,9 @@
+// @strict: false
 // it is an error to provide type arguments to a non-generic call
 // all of these are errors
 
 class C {
-    x: string;
+    x!: string;
 }
 
 var c = new C<number>();
@@ -10,7 +11,7 @@ var c = new C<number>();
 function Foo(): void { }
 var r = new Foo<number>();
 
-var f: { (): void };
+declare var f: { (): void };
 var r2 = new f<number>();
 
 var a: any;
diff --git a/tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively.ts b/tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively.ts
index 0a4e70a2890b0..7152a2968f8d1 100644
--- a/tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively.ts
+++ b/tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // using a type parameter as a constraint for a type parameter is valid
 // no errors expected
 
diff --git a/tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively2.ts b/tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively2.ts
index f1e074aa9f7a0..66fcf669f82c9 100644
--- a/tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively2.ts
+++ b/tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // using a type parameter as a constraint for a type parameter is invalid
 // these should be errors at the type parameter constraint declarations, and have no downstream errors
 
diff --git a/tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints.ts b/tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints.ts
index b731d8da42a72..3bc94dd5fe4b3 100644
--- a/tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints.ts
+++ b/tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints.ts
@@ -11,6 +11,6 @@ interface Foo extends Date {
     foo: string;
 }
 
-var y: Foo = null;
+var y: Foo = {} as Foo;
 var c = new C(y);
 var r = c.foo(y);
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints.ts b/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints.ts
index b89016ecff50d..ff7372615a667 100644
--- a/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints.ts
+++ b/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // generic types should behave as if they have properties of their constraint type
 // no errors expected 
 
diff --git a/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints2.ts b/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints2.ts
index 10f3a498848f8..33ffdde834cf4 100644
--- a/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints2.ts
+++ b/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // generic types should behave as if they have properties of their constraint type
 
 class A {
diff --git a/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.ts b/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.ts
index 6167485f1be3a..d33e2c5a17874 100644
--- a/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.ts
+++ b/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // generic types should behave as if they have properties of their constraint type
 
 class A {
diff --git a/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints4.ts b/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints4.ts
index 3aaa657088a56..7d1989a9339c0 100644
--- a/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints4.ts
+++ b/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints4.ts
@@ -1,6 +1,7 @@
+// @strict: false
 class C<T extends Date> {
     f() {
-        var x: T;
+        var x: T = {} as any;
         var a = x['notHere'](); // should be string
         return a + x.notHere();
     }
@@ -11,11 +12,11 @@ var r = (new C<Date>()).f();
 interface I<T extends Date> {
     foo: T;
 }
-var i: I<Date>;
+declare var i: I<Date>;
 var r2 = i.foo.notHere();
 var r2b = i.foo['notHere']();
 
-var a: {
+declare var a: {
     <T extends Date>(): T;
 }
 var r3: string = a().notHere();
diff --git a/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts b/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts
index b3e7c5ea4f5d5..d9a36e843268a 100644
--- a/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts
+++ b/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class A {
     foo(): string { return ''; }
 }
@@ -10,7 +11,7 @@ class B extends A {
 
 class C<U extends T, T extends A> {
     f() {
-        var x: U;
+        var x: U = {} as any;
         var a = x['foo'](); // should be string
         return a + x.foo() + x.notHere();
     }
@@ -21,11 +22,11 @@ var r = (new C<B, A>()).f();
 interface I<U extends T, T extends A> {
     foo: U;
 }
-var i: I<B, A>;
+declare var i: I<B, A>;
 var r2 = i.foo.notHere();
 var r2b = i.foo['foo']();
 
-var a: {
+declare var a: {
     <U extends T, T extends A>(): U;
 }
 // BUG 794164
diff --git a/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithoutConstraints.ts b/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithoutConstraints.ts
index 1660d67a4e2ed..656d2e472c95f 100644
--- a/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithoutConstraints.ts
+++ b/tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithoutConstraints.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C<T> {
     f() {
         var x: T;
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignabilityInInheritance.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignabilityInInheritance.ts
index ae927567cce1d..7af0408fdd736 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignabilityInInheritance.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignabilityInInheritance.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // any is not a subtype of any other types, errors expected on all the below derived classes unless otherwise noted
 
 interface I {
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2.ts
index 2f3831196ddf8..7ce16225bae76 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // any is not a subtype of any other types, but is assignable, all the below should work
 
 interface I {
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts
index 3811809742cc1..b7ae9f1c4a2ea 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts
@@ -1,10 +1,10 @@
-var numStrTuple: [number, string];
-var numNumTuple: [number, number];
-var numEmptyObjTuple: [number, {}];
-var emptyObjTuple: [{}];
+declare var numStrTuple: [number, string];
+declare var numNumTuple: [number, number];
+declare var numEmptyObjTuple: [number, {}];
+declare var emptyObjTuple: [{}];
 
-var numArray: number[];
-var emptyObjArray: {}[];
+declare var numArray: number[];
+declare var emptyObjArray: {}[];
 
 // no error
 numArray = numNumTuple;
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts
index 7549351d13102..5bb9f483fa701 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts
@@ -3,8 +3,8 @@
 interface T {
     (x: number): void;
 }
-var t: T;
-var a: { (x: number): void };
+declare var t: T;
+declare var a: { (x: number): void };
 
 t = a;
 a = t;
@@ -12,8 +12,8 @@ a = t;
 interface S {
     (x: number): string;
 }
-var s: S;
-var a2: { (x: number): string };
+declare var s: S;
+declare var a2: { (x: number): string };
 t = s;
 t = a2;
 a = s;
@@ -29,8 +29,8 @@ a = function (x: number) { return ''; }
 interface S2 {
     (x: string): void;
 }
-var s2: S2;
-var a3: { (x: string): void };
+declare var s2: S2;
+declare var a3: { (x: string): void };
 // these are errors
 t = s2;
 t = a3;
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts
index b09250d2ab9ef..3d98320fb5aaf 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts
@@ -3,8 +3,8 @@
 interface T {
     f(x: number): void;
 }
-var t: T;
-var a: { f(x: number): void };
+declare var t: T;
+declare var a: { f(x: number): void };
 
 t = a;
 a = t;
@@ -12,8 +12,8 @@ a = t;
 interface S {
     f(x: number): string;
 }
-var s: S;
-var a2: { f(x: number): string };
+declare var s: S;
+declare var a2: { f(x: number): string };
 t = s;
 t = a2;
 a = s;
@@ -36,8 +36,8 @@ a = function (x: number) { return ''; }
 interface S2 {
     f(x: string): void;
 }
-var s2: S2;
-var a3: { f(x: string): void };
+declare var s2: S2;
+declare var a3: { f(x: string): void };
 // these are errors
 t = s2;
 t = a3;
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3.ts
index f8c7b63501085..7ecca3ec0235b 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3.ts
@@ -5,33 +5,33 @@ class Derived extends Base { bar: string; }
 class Derived2 extends Derived { baz: string; }
 class OtherDerived extends Base { bing: string; }
 
-var a: (x: number) => number[];
-var a2: (x: number) => string[];
-var a3: (x: number) => void;
-var a4: (x: string, y: number) => string;
-var a5: (x: (arg: string) => number) => string;
-var a6: (x: (arg: Base) => Derived) => Base;
-var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
-var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-var a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-var a10: (...x: Derived[]) => Derived;
-var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
-var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
-var a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
-var a14: (x: { a: string; b: number }) => Object;
-var a15: {
+declare var a: (x: number) => number[];
+declare var a2: (x: number) => string[];
+declare var a3: (x: number) => void;
+declare var a4: (x: string, y: number) => string;
+declare var a5: (x: (arg: string) => number) => string;
+declare var a6: (x: (arg: Base) => Derived) => Base;
+declare var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
+declare var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+declare var a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+declare var a10: (...x: Derived[]) => Derived;
+declare var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+declare var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+declare var a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
+declare var a14: (x: { a: string; b: number }) => Object;
+declare var a15: {
     (x: number): number[];
     (x: string): string[];
 }
-var a16: {
+declare var a16: {
     <T extends Derived>(x: T): number[];
     <U extends Base>(x: U): number[];
 }
-var a17: {
+declare var a17: {
     (x: (a: number) => number): number[];
     (x: (a: string) => string): string[];
 };
-var a18: {
+declare var a18: {
     (x: {
         (a: number): number;
         (a: string): string;
@@ -42,57 +42,57 @@ var a18: {
     }): any[];
 }
 
-var b: <T>(x: T) => T[]; 
+declare var b: <T>(x: T) => T[]; 
 a = b; // ok
 b = a; // ok
-var b2: <T>(x: T) => string[]; 
+declare var b2: <T>(x: T) => string[]; 
 a2 = b2; // ok 
 b2 = a2; // ok
-var b3: <T>(x: T) => T; 
+declare var b3: <T>(x: T) => T; 
 a3 = b3; // ok
 b3 = a3; // ok
-var b4: <T, U>(x: T, y: U) => T; 
+declare var b4: <T, U>(x: T, y: U) => T; 
 a4 = b4; // ok
 b4 = a4; // ok
-var b5: <T, U>(x: (arg: T) => U) => T; 
+declare var b5: <T, U>(x: (arg: T) => U) => T; 
 a5 = b5; // ok
 b5 = a5; // ok
-var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
+declare var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
 a6 = b6; // ok
 b6 = a6; // ok
-var b7: <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
+declare var b7: <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
 a7 = b7; // ok
 b7 = a7; // ok
-var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
+declare var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
 a8 = b8; // ok
 b8 = a8; // ok
-var b9: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
+declare var b9: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
 a9 = b9; // ok
 b9 = a9; // ok
-var b10: <T extends Derived>(...x: T[]) => T; 
+declare var b10: <T extends Derived>(...x: T[]) => T; 
 a10 = b10; // ok
 b10 = a10; // ok
-var b11: <T extends Base>(x: T, y: T) => T; 
+declare var b11: <T extends Base>(x: T, y: T) => T; 
 a11 = b11; // ok
 b11 = a11; // ok
-var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
+declare var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
 a12 = b12; // ok
 b12 = a12; // ok
-var b13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
+declare var b13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
 a13 = b13; // ok
 b13 = a13; // ok
-var b14: <T>(x: { a: T; b: T }) => T; 
+declare var b14: <T>(x: { a: T; b: T }) => T; 
 a14 = b14; // ok
 b14 = a14; // ok
-var b15: <T>(x: T) => T[]; 
+declare var b15: <T>(x: T) => T[]; 
 a15 = b15; // ok
 b15 = a15; // ok
-var b16: <T extends Base>(x: T) => number[];
+declare var b16: <T extends Base>(x: T) => number[];
 a16 = b16; // ok
 b16 = a16; // ok
-var b17: <T>(x: (a: T) => T) => T[]; // ok
+declare var b17: <T>(x: (a: T) => T) => T[]; // ok
 a17 = b17; // ok
 b17 = a17; // ok
-var b18: <T>(x: (a: T) => T) => T[]; 
+declare var b18: <T>(x: (a: T) => T) => T[]; 
 a18 = b18; // ok
 b18 = a18; // ok
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4.ts
index 8d19894899039..fb99cdfe62e0e 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4.ts
@@ -8,18 +8,18 @@ namespace Errors {
 
     namespace WithNonGenericSignaturesInBaseType {
         // target type with non-generic call signatures
-        var a2: (x: number) => string[];
-        var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived2;
-        var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-        var a10: (...x: Base[]) => Base;
-        var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
-        var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
-        var a14: {
+        declare var a2: (x: number) => string[];
+        declare var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived2;
+        declare var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+        declare var a10: (...x: Base[]) => Base;
+        declare var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+        declare var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+        declare var a14: {
                 (x: number): number[];
                 (x: string): string[];
             };
-        var a15: (x: { a: string; b: number }) => number;
-        var a16: {
+        declare var a15: (x: { a: string; b: number }) => number;
+        declare var a16: {
                 (x: {
                     (a: number): number;
                     (a?: number): number;
@@ -29,7 +29,7 @@ namespace Errors {
                     (a?: boolean): boolean;
                 }): boolean[];
             };
-        var a17: {
+        declare var a17: {
                 (x: {
                     <T extends Derived>(a: T): T;
                     <T extends Base>(a: T): T;
@@ -40,58 +40,58 @@ namespace Errors {
                 }): any[];
             };
 
-        var b2: <T, U>(x: T) => U[]; 
+        declare var b2: <T, U>(x: T) => U[]; 
         a2 = b2;
         b2 = a2;
 
-        var b7: <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
+        declare var b7: <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
         a7 = b7;
         b7 = a7;
 
-        var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
+        declare var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
         a8 = b8; // error, { foo: number } and Base are incompatible
         b8 = a8; // error, { foo: number } and Base are incompatible
 
         
-        var b10: <T extends Derived>(...x: T[]) => T; 
+        declare var b10: <T extends Derived>(...x: T[]) => T; 
         a10 = b10;
         b10 = a10;
 
-        var b11: <T extends Derived>(x: T, y: T) => T; 
+        declare var b11: <T extends Derived>(x: T, y: T) => T; 
         a11 = b11;
         b11 = a11;
 
-        var b12: <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
+        declare var b12: <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
         a12 = b12;
         b12 = a12;
 
-        var b15: <T>(x: { a: T; b: T }) => T; 
+        declare var b15: <T>(x: { a: T; b: T }) => T; 
         a15 = b15;
         b15 = a15;
 
-        var b15a: <T extends Base>(x: { a: T; b: T }) => number; 
+        declare var b15a: <T extends Base>(x: { a: T; b: T }) => number; 
         a15 = b15a;
         b15a = a15;
 
-        var b16: <T>(x: (a: T) => T) => T[];
+        declare var b16: <T>(x: (a: T) => T) => T[];
         a16 = b16;
         b16 = a16;
 
-        var b17: <T>(x: (a: T) => T) => any[];
+        declare var b17: <T>(x: (a: T) => T) => any[];
         a17 = b17;
         b17 = a17;
     }
 
     namespace WithGenericSignaturesInBaseType {
         // target type has generic call signature
-        var a2: <T>(x: T) => T[];
-        var b2: <T>(x: T) => string[];
+        declare var a2: <T>(x: T) => T[];
+        declare var b2: <T>(x: T) => string[];
         a2 = b2;
         b2 = a2;
 
         // target type has generic call signature
-        var a3: <T>(x: T) => string[];
-        var b3: <T>(x: T) => T[]; 
+        declare var a3: <T>(x: T) => string[];
+        declare var b3: <T>(x: T) => T[]; 
         a3 = b3;
         b3 = a3;
     }
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures5.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures5.ts
index 9f3b5f72c95ff..a541d4f27a9a9 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures5.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures5.ts
@@ -5,20 +5,20 @@ class Derived extends Base { bar: string; }
 class Derived2 extends Derived { baz: string; }
 class OtherDerived extends Base { bing: string; }
 
-var a: <T>(x: T) => T[];
-var a2: <T>(x: T) => string[];
-var a3: <T>(x: T) => void;
-var a4: <T,U>(x: T, y: U) => string;
-var a5: <T,U>(x: (arg: T) => U) => T;
-var a6: <T extends Base>(x: (arg: T) => Derived) => T;
-var a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
-var a15: <T>(x: { a: T; b: T }) => T[];
-var a16: <T extends Base>(x: { a: T; b: T }) => T[];
-var a17: {
+declare var a: <T>(x: T) => T[];
+declare var a2: <T>(x: T) => string[];
+declare var a3: <T>(x: T) => void;
+declare var a4: <T,U>(x: T, y: U) => string;
+declare var a5: <T,U>(x: (arg: T) => U) => T;
+declare var a6: <T extends Base>(x: (arg: T) => Derived) => T;
+declare var a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
+declare var a15: <T>(x: { a: T; b: T }) => T[];
+declare var a16: <T extends Base>(x: { a: T; b: T }) => T[];
+declare var a17: {
     <T extends Derived>(x: (a: T) => T): T[];
     <T extends Base>(x: (a: T) => T): T[];        
 };
-var a18: {
+declare var a18: {
     (x: {
         <T extends Derived>(a: T): T;
         <T extends Base>(a: T): T;
@@ -29,36 +29,36 @@ var a18: {
     }): any[];
 };
 
-var b: <T>(x: T) => T[]; 
+declare var b: <T>(x: T) => T[]; 
 a = b; // ok
 b = a; // ok
-var b2: <T>(x: T) => string[]; 
+declare var b2: <T>(x: T) => string[]; 
 a2 = b2; // ok
 b2 = a2; // ok
-var b3: <T>(x: T) => T; 
+declare var b3: <T>(x: T) => T; 
 a3 = b3; // ok
 b3 = a3; // ok
-var b4: <T, U>(x: T, y: U) => string; 
+declare var b4: <T, U>(x: T, y: U) => string; 
 a4 = b4; // ok
 b4 = a4; // ok
-var b5: <T, U>(x: (arg: T) => U) => T; 
+declare var b5: <T, U>(x: (arg: T) => U) => T; 
 a5 = b5; // ok
 b5 = a5; // ok
-var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
+declare var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
 a6 = b6; // ok
 b6 = a6; // ok
-var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+declare var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 a11 = b11; // ok
 b11 = a11; // ok
-var b15: <U, V>(x: { a: U; b: V; }) => U[]; 
+declare var b15: <U, V>(x: { a: U; b: V; }) => U[]; 
 a15 = b15; // ok, T = U, T = V
 b15 = a15; // ok
-var b16: <T>(x: { a: T; b: T }) => T[]; 
+declare var b16: <T>(x: { a: T; b: T }) => T[]; 
 a15 = b16; // ok
 b15 = a16; // ok
-var b17: <T>(x: (a: T) => T) => T[]; 
+declare var b17: <T>(x: (a: T) => T) => T[]; 
 a17 = b17; // ok
 b17 = a17; // ok
-var b18: (x: <T>(a: T) => T) => any[]; 
+declare var b18: (x: <T>(a: T) => T) => any[]; 
 a18 = b18; // ok
 b18 = a18; // ok
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures6.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures6.ts
index 40104fc4c734a..bb5f366006dff 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures6.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures6.ts
@@ -17,26 +17,26 @@ interface A {
     a16: <T extends Base>(x: { a: T; b: T }) => T[];
 }
 
-var x: A;
+declare var x: A;
 
-var b: <T>(x: T) => T[]; 
+declare var b: <T>(x: T) => T[]; 
 x.a = b;
 b = x.a;
-var b2: <T>(x: T) => string[]; 
+declare var b2: <T>(x: T) => string[]; 
 x.a2 = b2;
 b2 = x.a2;
-var b3: <T>(x: T) => T;
+declare var b3: <T>(x: T) => T;
 x.a3 = b3;
 b3 = x.a3;
-var b4: <T, U>(x: T, y: U) => string; 
+declare var b4: <T, U>(x: T, y: U) => string; 
 x.a4 = b4;
 b4 = x.a4;
-var b5: <T, U>(x: (arg: T) => U) => T; 
+declare var b5: <T, U>(x: (arg: T) => U) => T; 
 x.a5 = b5;
 b5 = x.a5;
-var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+declare var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 x.a11 = b11;
 b11 = x.a11;
-var b16: <T>(x: { a: T; b: T }) => T[]; 
+declare var b16: <T>(x: { a: T; b: T }) => T[]; 
 x.a16 = b16;
 b16 = x.a16;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters.ts
index 90e376af6457b..26a96820dc409 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters.ts
@@ -8,9 +8,9 @@ interface Base {
     a5: (x?: number, y?: number) => number;
     a6: (x: number, y: number) => number;
 }
-var b: Base;
+declare var b: Base;
 
-var a: () => number;
+declare var a: () => number;
     a = () => 1 // ok, same number of required params
     a = (x?: number) => 1; // ok, same number of required params
     a = (x: number) => 1; // error, too many required params
@@ -21,7 +21,7 @@ var a: () => number;
     a = b.a5; // ok
     a = b.a6; // error
 
-var a2: (x?: number) => number; 
+declare var a2: (x?: number) => number; 
     a2 = () => 1; // ok, same number of required params
     a2 = (x?: number) => 1; // ok, same number of required params
     a2 = (x: number) => 1; // ok, same number of params
@@ -32,7 +32,7 @@ var a2: (x?: number) => number;
     a2 = b.a5; // ok
     a2 = b.a6; // error
 
-var a3: (x: number) => number; 
+declare var a3: (x: number) => number; 
     a3 = () => 1; // ok, fewer required params
     a3 = (x?: number) => 1; // ok, fewer required params
     a3 = (x: number) => 1; // ok, same number of required params
@@ -44,7 +44,7 @@ var a3: (x: number) => number;
     a3 = b.a5; // ok
     a3 = b.a6; // error
 
-var a4: (x: number, y?: number) => number;
+declare var a4: (x: number, y?: number) => number;
     a4 = () => 1; // ok, fewer required params
     a4 = (x?: number, y?: number) => 1; // ok, fewer required params
     a4 = (x: number) => 1; // ok, same number of required params
@@ -56,7 +56,7 @@ var a4: (x: number, y?: number) => number;
     a4 = b.a5; // ok
     a4 = b.a6; // ok, same number of params
 
-var a5: (x?: number, y?: number) => number;
+declare var a5: (x?: number, y?: number) => number;
     a5 = () => 1; // ok, fewer required params
     a5 = (x?: number, y?: number) => 1; // ok, fewer required params
     a5 = (x: number) => 1; // ok, fewer params in lambda
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures.ts
index f96d60555c03a..9db38ad94c275 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures.ts
@@ -3,8 +3,8 @@
 interface T {
     new (x: number): void;
 }
-var t: T;
-var a: { new (x: number): void };
+declare var t: T;
+declare var a: { new (x: number): void };
 
 t = a;
 a = t;
@@ -12,8 +12,8 @@ a = t;
 interface S {
     new (x: number): string;
 }
-var s: S;
-var a2: { new (x: number): string };
+declare var s: S;
+declare var a2: { new (x: number): string };
 t = s;
 t = a2;
 a = s;
@@ -22,8 +22,8 @@ a = a2;
 interface S2 {
     (x: string): void;
 }
-var s2: S2;
-var a3: { (x: string): void };
+declare var s2: S2;
+declare var a3: { (x: string): void };
 // these are errors
 t = s2;
 t = a3;
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts
index 2de241cc3c489..82df5ccfa00af 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2.ts
@@ -3,8 +3,8 @@
 interface T {
     f: new (x: number) => void;
 }
-var t: T;
-var a: { f: new (x: number) => void };
+declare var t: T;
+declare var a: { f: new (x: number) => void };
 
 t = a;
 a = t;
@@ -12,8 +12,8 @@ a = t;
 interface S {
     f: new (x: number) => string;
 }
-var s: S;
-var a2: { f: new (x: number) => string };
+declare var s: S;
+declare var a2: { f: new (x: number) => string };
 t = s;
 t = a2;
 a = s;
@@ -28,8 +28,8 @@ a = function (x: number) { return ''; }
 interface S2 {
     f(x: string): void;
 }
-var s2: S2;
-var a3: { f(x: string): void };
+declare var s2: S2;
+declare var a3: { f(x: string): void };
 // these are errors
 t = s2;
 t = a3;
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3.ts
index 455300694e4f4..caf721e2a3e89 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3.ts
@@ -5,33 +5,33 @@ class Derived extends Base { bar: string; }
 class Derived2 extends Derived { baz: string; }
 class OtherDerived extends Base { bing: string; }
 
-var a: new (x: number) => number[];
-var a2: new (x: number) => string[];
-var a3: new (x: number) => void;
-var a4: new (x: string, y: number) => string;
-var a5: new (x: (arg: string) => number) => string;
-var a6: new (x: (arg: Base) => Derived) => Base;
-var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
-var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-var a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-var a10: new (...x: Derived[]) => Derived;
-var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
-var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
-var a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
-var a14: new (x: { a: string; b: number }) => Object;
-var a15: {
+declare var a: new (x: number) => number[];
+declare var a2: new (x: number) => string[];
+declare var a3: new (x: number) => void;
+declare var a4: new (x: string, y: number) => string;
+declare var a5: new (x: (arg: string) => number) => string;
+declare var a6: new (x: (arg: Base) => Derived) => Base;
+declare var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
+declare var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+declare var a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+declare var a10: new (...x: Derived[]) => Derived;
+declare var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+declare var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+declare var a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
+declare var a14: new (x: { a: string; b: number }) => Object;
+declare var a15: {
     new (x: number): number[];
     new (x: string): string[];
 }
-var a16: {
+declare var a16: {
     new <T extends Derived>(x: T): number[];
     new <U extends Base>(x: U): number[];
 }
-var a17: {
+declare var a17: {
     new (x: new (a: number) => number): number[];
     new (x: new (a: string) => string): string[];
 };
-var a18: {
+declare var a18: {
     new (x: {
         new (a: number): number;
         new (a: string): string;
@@ -42,57 +42,57 @@ var a18: {
     }): any[];
 }
 
-var b: new <T>(x: T) => T[]; 
+declare var b: new <T>(x: T) => T[]; 
 a = b; // ok
 b = a; // ok
-var b2: new <T>(x: T) => string[]; 
+declare var b2: new <T>(x: T) => string[]; 
 a2 = b2; // ok 
 b2 = a2; // ok
-var b3: new <T>(x: T) => T; 
+declare var b3: new <T>(x: T) => T; 
 a3 = b3; // ok
 b3 = a3; // ok
-var b4: new <T, U>(x: T, y: U) => T; 
+declare var b4: new <T, U>(x: T, y: U) => T; 
 a4 = b4; // ok
 b4 = a4; // ok
-var b5: new <T, U>(x: (arg: T) => U) => T; 
+declare var b5: new <T, U>(x: (arg: T) => U) => T; 
 a5 = b5; // ok
 b5 = a5; // ok
-var b6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
+declare var b6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
 a6 = b6; // ok
 b6 = a6; // ok
-var b7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
+declare var b7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
 a7 = b7; // ok
 b7 = a7; // ok
-var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
+declare var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
 a8 = b8; // ok
 b8 = a8; // ok
-var b9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
+declare var b9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
 a9 = b9; // ok
 b9 = a9; // ok
-var b10: new <T extends Derived>(...x: T[]) => T; 
+declare var b10: new <T extends Derived>(...x: T[]) => T; 
 a10 = b10; // ok
 b10 = a10; // ok
-var b11: new <T extends Base>(x: T, y: T) => T; 
+declare var b11: new <T extends Base>(x: T, y: T) => T; 
 a11 = b11; // ok
 b11 = a11; // ok
-var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
+declare var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
 a12 = b12; // ok
 b12 = a12; // ok
-var b13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
+declare var b13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
 a13 = b13; // ok
 b13 = a13; // ok
-var b14: new <T>(x: { a: T; b: T }) => T; 
+declare var b14: new <T>(x: { a: T; b: T }) => T; 
 a14 = b14; // ok
 b14 = a14; // ok
-var b15: new <T>(x: T) => T[]; 
+declare var b15: new <T>(x: T) => T[]; 
 a15 = b15; // ok
 b15 = a15; // ok
-var b16: new <T extends Base>(x: T) => number[];
+declare var b16: new <T extends Base>(x: T) => number[];
 a16 = b16; // ok
 b16 = a16; // ok
-var b17: new <T>(x: new (a: T) => T) => T[]; // ok
+declare var b17: new <T>(x: new (a: T) => T) => T[]; // ok
 a17 = b17; // ok
 b17 = a17; // ok
-var b18: new <T>(x: new (a: T) => T) => T[]; 
+declare var b18: new <T>(x: new (a: T) => T) => T[]; 
 a18 = b18; // ok
 b18 = a18; // ok
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts
index e63a4131b769e..94fc96a44303c 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts
@@ -8,18 +8,18 @@ namespace Errors {
 
     namespace WithNonGenericSignaturesInBaseType {
         // target type with non-generic call signatures
-        var a2: new (x: number) => string[];
-        var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived2;
-        var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
-        var a10: new (...x: Base[]) => Base;
-        var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
-        var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
-        var a14: {
+        declare var a2: new (x: number) => string[];
+        declare var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived2;
+        declare var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
+        declare var a10: new (...x: Base[]) => Base;
+        declare var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
+        declare var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
+        declare var a14: {
                 new (x: number): number[];
                 new (x: string): string[];
             };
-        var a15: new (x: { a: string; b: number }) => number;
-        var a16: {
+        declare var a15: new (x: { a: string; b: number }) => number;
+        declare var a16: {
                 new (x: {
                     new (a: number): number;
                     new (a?: number): number;
@@ -29,7 +29,7 @@ namespace Errors {
                     new (a?: boolean): boolean;
                 }): boolean[];
             };
-        var a17: {
+        declare var a17: {
                 new (x: {
                     new <T extends Derived>(a: T): T;
                     new <T extends Base>(a: T): T;
@@ -40,58 +40,58 @@ namespace Errors {
                 }): any[];
             };
 
-        var b2: new <T, U>(x: T) => U[]; 
+        declare var b2: new <T, U>(x: T) => U[]; 
         a2 = b2; // ok
         b2 = a2; // ok
 
-        var b7: new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
+        declare var b7: new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
         a7 = b7; // ok
         b7 = a7; // ok
 
-        var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
+        declare var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
         a8 = b8; // error, type mismatch
         b8 = a8; // error
 
         
-        var b10: new <T extends Derived>(...x: T[]) => T; 
+        declare var b10: new <T extends Derived>(...x: T[]) => T; 
         a10 = b10; // ok
         b10 = a10; // ok
 
-        var b11: new <T extends Derived>(x: T, y: T) => T; 
+        declare var b11: new <T extends Derived>(x: T, y: T) => T; 
         a11 = b11; // ok
         b11 = a11; // ok
 
-        var b12: new <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
+        declare var b12: new <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
         a12 = b12; // ok
         b12 = a12; // ok
 
-        var b15: new <T>(x: { a: T; b: T }) => T; 
+        declare var b15: new <T>(x: { a: T; b: T }) => T; 
         a15 = b15; // ok
         b15 = a15; // ok
 
-        var b15a: new <T extends Base>(x: { a: T; b: T }) => number; 
+        declare var b15a: new <T extends Base>(x: { a: T; b: T }) => number; 
         a15 = b15a; // ok
         b15a = a15; // ok
 
-        var b16: new <T>(x: (a: T) => T) => T[];
+        declare var b16: new <T>(x: (a: T) => T) => T[];
         a16 = b16; // error
         b16 = a16; // error
 
-        var b17: new <T>(x: (a: T) => T) => any[];
+        declare var b17: new <T>(x: (a: T) => T) => any[];
         a17 = b17; // error
         b17 = a17; // error
     }
 
     namespace WithGenericSignaturesInBaseType {
         // target type has generic call signature
-        var a2: new <T>(x: T) => T[];
-        var b2: new <T>(x: T) => string[];
+        declare var a2: new <T>(x: T) => T[];
+        declare var b2: new <T>(x: T) => string[];
         a2 = b2; // ok
         b2 = a2; // ok
 
         // target type has generic call signature
-        var a3: new <T>(x: T) => string[];
-        var b3: new <T>(x: T) => T[]; 
+        declare var a3: new <T>(x: T) => string[];
+        declare var b3: new <T>(x: T) => T[]; 
         a3 = b3; // ok
         b3 = a3; // ok
     }
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures5.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures5.ts
index 917d4a5b03125..de0bf55d25575 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures5.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures5.ts
@@ -5,20 +5,20 @@ class Derived extends Base { bar: string; }
 class Derived2 extends Derived { baz: string; }
 class OtherDerived extends Base { bing: string; }
 
-var a: new <T>(x: T) => T[];
-var a2: new <T>(x: T) => string[];
-var a3: new <T>(x: T) => void;
-var a4: new <T, U>(x: T, y: U) => string;
-var a5: new <T, U>(x: new (arg: T) => U) => T;
-var a6: new <T extends Base>(x: new (arg: T) => Derived) => T;
-var a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
-var a15: new <T>(x: { a: T; b: T }) => T[];
-var a16: new <T extends Base>(x: { a: T; b: T }) => T[];
-var a17: {
+declare var a: new <T>(x: T) => T[];
+declare var a2: new <T>(x: T) => string[];
+declare var a3: new <T>(x: T) => void;
+declare var a4: new <T, U>(x: T, y: U) => string;
+declare var a5: new <T, U>(x: new (arg: T) => U) => T;
+declare var a6: new <T extends Base>(x: new (arg: T) => Derived) => T;
+declare var a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
+declare var a15: new <T>(x: { a: T; b: T }) => T[];
+declare var a16: new <T extends Base>(x: { a: T; b: T }) => T[];
+declare var a17: {
     new <T extends Derived>(x: new (a: T) => T): T[];
     new <T extends Base>(x: new (a: T) => T): T[];        
 };
-var a18: {
+declare var a18: {
     new (x: {
         new <T extends Derived>(a: T): T;
         new <T extends Base>(a: T): T;
@@ -29,36 +29,36 @@ var a18: {
     }): any[];
 };
 
-var b: new <T>(x: T) => T[]; 
+declare var b: new <T>(x: T) => T[]; 
 a = b; // ok
 b = a; // ok
-var b2: new <T>(x: T) => string[]; 
+declare var b2: new <T>(x: T) => string[]; 
 a2 = b2; // ok
 b2 = a2; // ok
-var b3: new <T>(x: T) => T; 
+declare var b3: new <T>(x: T) => T; 
 a3 = b3; // ok
 b3 = a3; // ok
-var b4: new <T, U>(x: T, y: U) => string; 
+declare var b4: new <T, U>(x: T, y: U) => string; 
 a4 = b4; // ok
 b4 = a4; // ok
-var b5: new <T, U>(x: new (arg: T) => U) => T; 
+declare var b5: new <T, U>(x: new (arg: T) => U) => T; 
 a5 = b5; // ok
 b5 = a5; // ok
-var b6: new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T; 
+declare var b6: new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T; 
 a6 = b6; // ok
 b6 = a6; // ok
-var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+declare var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 a11 = b11; // ok
 b11 = a11; // ok
-var b15: new <U, V>(x: { a: U; b: V; }) => U[]; 
+declare var b15: new <U, V>(x: { a: U; b: V; }) => U[]; 
 a15 = b15; // ok
 b15 = a15; // ok
-var b16: new <T>(x: { a: T; b: T }) => T[]; 
+declare var b16: new <T>(x: { a: T; b: T }) => T[]; 
 a15 = b16; // ok
 b15 = a16; // ok
-var b17: new <T>(x: new (a: T) => T) => T[]; 
+declare var b17: new <T>(x: new (a: T) => T) => T[]; 
 a17 = b17; // ok
 b17 = a17; // ok
-var b18: new (x: new <T>(a: T) => T) => any[]; 
+declare var b18: new (x: new <T>(a: T) => T) => any[]; 
 a18 = b18; // ok
 b18 = a18; // ok
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures6.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures6.ts
index 32a4aa50e1484..e13d82fbbf9ee 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures6.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures6.ts
@@ -17,26 +17,26 @@ interface A {
     a16: new <T extends Base>(x: { a: T; b: T }) => T[];
 }
 
-var x: A;
+declare var x: A;
 
-var b: new <T>(x: T) => T[]; 
+declare var b: new <T>(x: T) => T[]; 
 x.a = b;
 b = x.a;
-var b2: new <T>(x: T) => string[]; 
+declare var b2: new <T>(x: T) => string[]; 
 x.a2 = b2;
 b2 = x.a2;
-var b3: new <T>(x: T) => T;
+declare var b3: new <T>(x: T) => T;
 x.a3 = b3;
 b3 = x.a3;
-var b4: new <T, U>(x: T, y: U) => string; 
+declare var b4: new <T, U>(x: T, y: U) => string; 
 x.a4 = b4;
 b4 = x.a4;
-var b5: new <T, U>(x: (arg: T) => U) => T; 
+declare var b5: new <T, U>(x: (arg: T) => U) => T; 
 x.a5 = b5;
 b5 = x.a5;
-var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
+declare var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 x.a11 = b11;
 b11 = x.a11;
-var b16: new <T>(x: { a: T; b: T }) => T[]; 
+declare var b16: new <T>(x: { a: T; b: T }) => T[]; 
 x.a16 = b16;
 b16 = x.a16;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignaturesWithOptionalParameters.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignaturesWithOptionalParameters.ts
index c873c8b778ba1..bc9846a12be72 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignaturesWithOptionalParameters.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignaturesWithOptionalParameters.ts
@@ -8,9 +8,9 @@ interface Base {
     a5: new (x?: number, y?: number) => number;
     a6: new (x: number, y: number) => number;
 }
-var b: Base;
+declare var b: Base;
 
-var a: new () => number;
+declare var a: new () => number;
     a = b.a; // ok
     a = b.a2; // ok
     a = b.a3; // error
@@ -18,7 +18,7 @@ var a: new () => number;
     a = b.a5; // ok
     a = b.a6; // error
 
-var a2: new (x?: number) => number; 
+declare var a2: new (x?: number) => number; 
     a2 = b.a; // ok
     a2 = b.a2; // ok
     a2 = b.a3; // ok
@@ -26,7 +26,7 @@ var a2: new (x?: number) => number;
     a2 = b.a5; // ok
     a2 = b.a6; // error
 
-var a3: new (x: number) => number; 
+declare var a3: new (x: number) => number; 
     a3 = b.a; // ok
     a3 = b.a2; // ok
     a3 = b.a3; // ok
@@ -34,7 +34,7 @@ var a3: new (x: number) => number;
     a3 = b.a5; // ok
     a3 = b.a6; // error
 
-var a4: new (x: number, y?: number) => number;
+declare var a4: new (x: number, y?: number) => number;
     a4 = b.a; // ok
     a4 = b.a2; // ok
     a4 = b.a3; // ok
@@ -42,7 +42,7 @@ var a4: new (x: number, y?: number) => number;
     a4 = b.a5; // ok
     a4 = b.a6; // ok
 
-var a5: new (x?: number, y?: number) => number;
+declare var a5: new (x?: number, y?: number) => number;
     a5 = b.a; // ok
     a5 = b.a2; // ok
     a5 = b.a3; // ok
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithDiscriminatedUnion.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithDiscriminatedUnion.ts
index a717a1c718d80..c51fef7169ea4 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithDiscriminatedUnion.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithDiscriminatedUnion.ts
@@ -98,7 +98,7 @@ namespace GH14865 {
     }
 
     const a: Style2 = { type: "A", data: "whatevs" };
-    let b: Style1;
+    declare let b: Style1;
     a.type; // "A" | "B"
     b.type; // "A" | "B"
     b = a; // should be assignable
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures2.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures2.ts
index e2cc7a69ee5a6..910055cf839d9 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures2.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures2.ts
@@ -8,8 +8,8 @@ interface B {
     <S>(x: S, ...y: S[]): void
 }
 
-var a: A;
-var b: B;
+declare var a: A;
+declare var b: B;
 
 // Both errors
 a = b;
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures4.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures4.ts
index 8207a2861803a..40473bd2d1f89 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures4.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures4.ts
@@ -4,8 +4,8 @@ interface I2<T> {
     p: T
 }
 
-var x: <T extends I2<T>>(z: T) => void
-var y: <T extends I2<I2<T>>>(z: T) => void
+declare var x: <T extends I2<T>>(z: T) => void;
+declare var y: <T extends I2<I2<T>>>(z: T) => void;
 
 // These both do not make sense as we would eventually be comparing I2<T> to I2<I2<T>>, and they are self referencing anyway
 x = y 
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts
index c5fb6773a9508..a0ae57dc67b34 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // call signatures in derived types must have the same or fewer optional parameters as the target for assignment
 
 namespace ClassTypeParam {
@@ -56,8 +57,8 @@ namespace GenericSignaturesInvalid {
 
 
     function foo<T>() {
-        var b: Base2;
-        var t: Target<T>;
+        var b!: Base2;
+        var t!: Target<T>;
 
         // all errors
         b.a = t.a;
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts
index 42a8dee654e6c..2a51413f35e96 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts
@@ -8,12 +8,12 @@ class A {
     [x: number]: Base;
 }
 
-var a: A;
-var b: { [x: number]: Derived; }
+declare var a: A;
+declare var b: { [x: number]: Derived; }
 a = b;
 b = a; // error
 
-var b2: { [x: number]: Derived2; }
+declare var b2: { [x: number]: Derived2; }
 a = b2;
 b2 = a; // error
 
@@ -27,16 +27,16 @@ namespace Generics {
     }
 
     function foo<T extends Base>() {
-        var a: A<T>;
-        var b: { [x: number]: Derived; }
+        var a!: A<T>;
+        var b!: { [x: number]: Derived; }
         a = b; // error
         b = a; // error
 
-        var b2: { [x: number]: Derived2; }
+        var b2!: { [x: number]: Derived2; }
         a = b2; // error
         b2 = a; // error
 
-        var b3: { [x: number]: T; }
+        var b3!: { [x: number]: T; }
         a = b3; // ok
         b3 = a; // ok
     }
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts
index ff0cb4a931905..51a9a56980398 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts
@@ -8,12 +8,12 @@ interface A {
     [x: number]: Base;
 }
 
-var a: A;
-var b: { [x: number]: Derived; }
+declare var a: A;
+declare var b: { [x: number]: Derived; }
 a = b;
 b = a; // error
 
-var b2: { [x: number]: Derived2; }
+declare var b2: { [x: number]: Derived2; }
 a = b2;
 b2 = a; // error
 
@@ -27,16 +27,16 @@ namespace Generics {
     }
 
     function foo<T extends Base>() {
-        var a: A<T>;
-        var b: { [x: number]: Derived; }
+        var a!: A<T>;
+        var b!: { [x: number]: Derived; }
         a = b; // error
         b = a; // error
 
-        var b2: { [x: number]: Derived2; }
+        var b2!: { [x: number]: Derived2; }
         a = b2; // error
         b2 = a; // error
 
-        var b3: { [x: number]: T; }
+        var b3!: { [x: number]: T; }
         a = b3; // ok
         b3 = a; // ok
     }
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts
index 249e2b8e7ce36..304f5ca3c89ff 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts
@@ -8,8 +8,8 @@ class A {
     [x: number]: Derived;
 }
 
-var a: A;
-var b: { [x: number]: Base; };
+declare var a: A;
+declare var b: { [x: number]: Base; };
 
 a = b; // error
 b = a; // ok
@@ -18,7 +18,7 @@ class B2 extends A {
     [x: number]: Derived2; // ok
 }
 
-var b2: { [x: number]: Derived2; };
+declare var b2: { [x: number]: Derived2; };
 a = b2; // ok
 b2 = a; // error
 
@@ -28,12 +28,12 @@ namespace Generics {
     }
 
     function foo<T extends Derived>() {
-        var a: A<T>;
-        var b: { [x: number]: Derived; };
+        var a!: A<T>;
+        var b!: { [x: number]: Derived; };
         a = b; // error
         b = a; // ok
 
-        var b2: { [x: number]: T; };
+        var b2!: { [x: number]: T; };
         a = b2; // ok
         b2 = a; // ok
     }
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.ts
index 74a2c2e941088..10d9652615f7a 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M
 // no errors expected
 
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers2.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers2.ts
index a45da064822a6..4572f93998e10 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers2.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M
 // additional optional properties do not cause errors
 
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3.ts
index 6e9a210db4b1c..2e239afdc1cbf 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M
 // additional optional properties do not cause errors
 
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts
index e2b127f223117..27b35033718dd 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // members N and M of types S and T have the same name, same accessibility, same optionality, and N is not assignable M
 
 namespace OnlyDerived {
@@ -7,16 +8,16 @@ namespace OnlyDerived {
 
     class S { foo: Derived; }
     class T { foo: Derived2; }
-    var s: S;
-    var t: T;
+    declare var s: S;
+    declare var t: T;
 
     interface S2 { foo: Derived; }
     interface T2 { foo: Derived2; }
-    var s2: S2;
-    var t2: T2;
+    declare var s2: S2;
+    declare var t2: T2;
 
-    var a: { foo: Derived; }
-    var b: { foo: Derived2; }
+    declare var a: { foo: Derived; }
+    declare var b: { foo: Derived2; }
 
     var a2 = { foo: new Derived() };
     var b2 = { foo: new Derived2() };
@@ -52,16 +53,16 @@ namespace WithBase {
 
     class S { foo: Base; }
     class T { foo: Derived2; }
-    var s: S;
-    var t: T;
+    declare var s: S;
+    declare var t: T;
 
     interface S2 { foo: Base; }
     interface T2 { foo: Derived2; }
-    var s2: S2;
-    var t2: T2;
+    declare var s2: S2;
+    declare var t2: T2;
 
-    var a: { foo: Base; }
-    var b: { foo: Derived2; }
+    declare var a: { foo: Base; }
+    declare var b: { foo: Derived2; }
 
     var a2 = { foo: new Base() };
     var b2 = { foo: new Derived2() };
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts
index 74abe305cf0cf..3c901625b61c7 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5.ts
@@ -1,14 +1,15 @@
+// @strict: false
 class C {
     foo: string;
 }
 
-var c: C;
+declare var c: C;
 
 interface I {
     fooo: string;
 }
 
-var i: I;
+declare var i: I;
 
 c = i; // error
 i = c; // error
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility.ts
index b151a2946f0e6..649c124b2f884 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M
 
 namespace TargetIsPublic {
@@ -10,9 +11,9 @@ namespace TargetIsPublic {
         foo: string;
     }
 
-    var a: { foo: string; }
-    var b: Base;
-    var i: I;
+    declare var a: { foo: string; };
+    declare var b: Base;
+    declare var i: I;
 
     // sources
     class D {
@@ -22,8 +23,8 @@ namespace TargetIsPublic {
     class E {
         private foo: string;
     }
-    var d: D;
-    var e: E;
+    declare var d: D;
+    declare var e: E;
 
     a = b;
     a = i;
@@ -62,9 +63,9 @@ namespace TargetIsPublic {
     interface I extends Base {
     }
 
-    var a: { foo: string; }
-    var b: Base;
-    var i: I;
+    declare var a: { foo: string; };
+    declare var b: Base;
+    declare var i: I;
 
     // sources
     class D {
@@ -75,8 +76,8 @@ namespace TargetIsPublic {
         private foo: string;
     }
 
-    var d: D;
-    var e: E;
+    declare var d: D;
+    declare var e: E;
 
     a = b; // error
     a = i; // error
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames.ts
index b25c949f42626..0a4a44e5adebb 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M
 // numeric named properties work correctly, no errors expected
 
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality.ts
index 9af58367a8bce..54ea1f3871c96 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Derived member is not optional but base member is, should be ok
 
 class Base { foo: string; }
@@ -9,9 +10,9 @@ namespace TargetHasOptional {
     interface C {
         opt?: Base
     }
-    var c: C;
+    declare var c: C;
 
-    var a: { opt?: Base; }
+    declare var a: { opt?: Base; };
     var b: typeof a = { opt: new Base() }
 
     // sources
@@ -24,9 +25,9 @@ namespace TargetHasOptional {
     interface F {
         opt?: Derived;
     }
-    var d: D;
-    var e: E;
-    var f: F;
+    declare var d: D;
+    declare var e: E;
+    declare var f: F;
 
     // all ok
     c = d;
@@ -51,9 +52,9 @@ namespace SourceHasOptional {
     interface C {
         opt: Base
     }
-    var c: C;
+    declare var c: C;
 
-    var a: { opt: Base; }
+    declare var a: { opt: Base; };
     var b = { opt: new Base() }
 
     // sources
@@ -66,9 +67,9 @@ namespace SourceHasOptional {
     interface F {
         opt: Derived;
     }
-    var d: D;
-    var e: E;
-    var f: F;
+    declare var d: D;
+    declare var e: E;
+    declare var f: F;
 
     c = d; // error
     c = e; // error
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts
index b34322ce514b5..22298bfaa6986 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // M is optional and S contains no property with the same name as M
 // N is optional and T contains no property with the same name as N
 
@@ -10,9 +11,9 @@ namespace TargetHasOptional {
     interface C {
         opt?: Base
     }
-    var c: C;
+    declare var c: C;
 
-    var a: { opt?: Base; }
+    declare var a: { opt?: Base; };
     var b: typeof a = { opt: new Base() }
 
     // sources
@@ -25,9 +26,9 @@ namespace TargetHasOptional {
     interface F {
         other?: Derived;
     }
-    var d: D;
-    var e: E;
-    var f: F;
+    declare var d: D;
+    declare var e: E;
+    declare var f: F;
 
     // disallowed by weak type checking
     c = d;
@@ -52,9 +53,9 @@ namespace SourceHasOptional {
     interface C {
         opt: Base
     }
-    var c: C;
+    declare var c: C;
 
-    var a: { opt: Base; }
+    declare var a: { opt: Base; };
     var b = { opt: new Base() }
 
     // sources
@@ -67,9 +68,9 @@ namespace SourceHasOptional {
     interface F {
         other: Derived;
     }
-    var d: D;
-    var e: E;
-    var f: F;
+    declare var d: D;
+    declare var e: E;
+    declare var f: F;
 
     c = d; // error
     c = e; // error
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts
index e767ef94976f3..32e1ec0bb2ee8 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts
@@ -1,19 +1,20 @@
+// @strict: false
 // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M
 // string named numeric properties work correctly, errors below unless otherwise noted
 
 namespace JustStrings {
     class S { '1': string; }
     class T { '1.': string; }
-    var s: S;
-    var t: T;
+    declare var s: S;
+    declare var t: T;
 
     interface S2 { '1': string; bar?: string }
     interface T2 { '1.0': string; baz?: string }
-    var s2: S2;
-    var t2: T2;
+    declare var s2: S2;
+    declare var t2: T2;
 
-    var a: { '1.': string; bar?: string }
-    var b: { '1.0': string; baz?: string }
+    declare var a: { '1.': string; bar?: string };
+    declare var b: { '1.0': string; baz?: string };
 
     var a2 = { '1.0': '' };
     var b2 = { '1': '' };
@@ -45,16 +46,16 @@ namespace JustStrings {
 namespace NumbersAndStrings {
     class S { '1': string; }
     class T { 1: string; }
-    var s: S;
-    var t: T;
+    declare var s: S;
+    declare var t: T;
 
     interface S2 { '1': string; bar?: string }
     interface T2 { 1.0: string; baz?: string }
-    var s2: S2;
-    var t2: T2;
+    declare var s2: S2;
+    declare var t2: T2;
 
-    var a: { '1.': string; bar?: string }
-    var b: { 1.0: string; baz?: string }
+    declare var a: { '1.': string; bar?: string };
+    declare var b: { 1.0: string; baz?: string };
 
     var a2 = { '1.0': '' };
     var b2 = { 1.: '' };
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts
index 8c5ffbc930906..fe888f189f032 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts
@@ -8,13 +8,13 @@ class A {
     [x: string]: Base;
 }
 
-var a: A;
+declare var a: A;
 
-var b: { [x: string]: Derived; }
+declare var b: { [x: string]: Derived; };
 a = b; // ok
 b = a; // error
 
-var b2: { [x: string]: Derived2; }
+declare var b2: { [x: string]: Derived2; };
 a = b2; // ok
 b2 = a; // error
 
@@ -27,8 +27,8 @@ namespace Generics {
         [x: string]: Derived; // ok
     }
 
-    var b1: { [x: string]: Derived; };
-    var a1: A<Base>;
+    declare var b1: { [x: string]: Derived; };
+    declare var a1: A<Base>;
     a1 = b1; // ok
     b1 = a1; // error
 
@@ -36,7 +36,7 @@ namespace Generics {
         [x: string]: Derived2; // ok
     }
 
-    var b2: { [x: string]: Derived2; };
+    declare var b2: { [x: string]: Derived2; };
     a1 = b2; // ok
     b2 = a1; // error
 
@@ -50,4 +50,4 @@ namespace Generics {
         a3 = b4; // error
         b4 = a3; // error
     }
-}
\ No newline at end of file
+}
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts
index 68a37a0416247..830ea07c75e89 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts
@@ -8,13 +8,13 @@ interface A {
     [x: string]: Base;
 }
 
-var a: A;
+declare var a: A;
 
-var b: { [x: string]: Derived; }
+declare var b: { [x: string]: Derived; };
 a = b; // ok
 b = a; // error
 
-var b2: { [x: string]: Derived2; }
+declare var b2: { [x: string]: Derived2; };
 a = b2; // ok
 b2 = a; // error
 
@@ -27,8 +27,8 @@ namespace Generics {
         [x: string]: Derived; // ok
     }
 
-    var b1: { [x: string]: Derived; };
-    var a1: A<Base>;
+    declare var b1: { [x: string]: Derived; };
+    declare var a1: A<Base>;
     a1 = b1; // ok
     b1 = a1; // error
 
@@ -36,17 +36,17 @@ namespace Generics {
         [x: string]: Derived2; // ok
     }
 
-    var b2: { [x: string]: Derived2; };
+    declare var b2: { [x: string]: Derived2; };
     a1 = b2; // ok
     b2 = a1; // error
 
     function foo<T extends Base>() {
-        var b3: { [x: string]: Derived; };
-        var a3: A<T>;
+        var b3!: { [x: string]: Derived; };
+        var a3!: A<T>;
         a3 = b3; // error
         b3 = a3; // error
 
-        var b4: { [x: string]: Derived2; };
+        var b4!: { [x: string]: Derived2; };
         a3 = b4; // error
         b4 = a3; // error
     }
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer3.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer3.ts
index 6956a47a2eff4..6ede9b50046ef 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer3.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer3.ts
@@ -4,8 +4,8 @@ interface Base { foo: string; }
 interface Derived extends Base { bar: string; }
 interface Derived2 extends Derived { baz: string; }
 
-var a: A;
-var b1: { [x: string]: string; }
+declare var a: A;
+declare var b1: { [x: string]: string; };
 a = b1; // error
 b1 = a; // error
 
@@ -15,8 +15,8 @@ namespace Generics {
     }
    
     function foo<T extends Derived>() {
-        var a: A<T>;
-        var b: { [x: string]: string; }
+        var a!: A<T>;
+        var b!: { [x: string]: string; };
         a = b; // error
         b = a; // error
     }
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance.ts
index ac822681356da..f01397b1b34ab 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance.ts
@@ -40,7 +40,7 @@ namespace MemberWithConstructSignature {
         a3: new <T>(x: T) => void;
     }
 
-    var b: Base;
+    declare var b: Base;
     var r = new b.a(1);
 
     // S's
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignabilityInInheritance.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignabilityInInheritance.ts
index c04673b29fc67..af0f6dffc1ca4 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignabilityInInheritance.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignabilityInInheritance.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // enum is only a subtype of number, no types are subtypes of enum, all of these except the first are errors
 
 
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType.ts
index b0f55331d7033..3b26b385b660c 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class C {
     foo: string;
 }
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/nullAssignedToUndefined.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/nullAssignedToUndefined.ts
index 9c3cd92571a34..b923cb8250003 100644
--- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/nullAssignedToUndefined.ts
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/nullAssignedToUndefined.ts
@@ -1,2 +1,3 @@
+// @strict: false
 var x = undefined = null; // error
 var y: typeof undefined = null; // ok, widened
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeRelationships/bestCommonType/bestCommonTypeOfTuple2.ts b/tests/cases/conformance/types/typeRelationships/bestCommonType/bestCommonTypeOfTuple2.ts
index e3487f6bee2f7..ea0893c9d7b06 100644
--- a/tests/cases/conformance/types/typeRelationships/bestCommonType/bestCommonTypeOfTuple2.ts
+++ b/tests/cases/conformance/types/typeRelationships/bestCommonType/bestCommonTypeOfTuple2.ts
@@ -8,11 +8,11 @@ class F extends C { f }
 class C1 implements base1 { i = "foo"; c }
 class D1 extends C1 { i = "bar"; d }
 
-var t1: [C, base];
-var t2: [C, D];
-var t3: [C1, D1];
-var t4: [base1, C1];
-var t5: [C1, F]
+declare var t1: [C, base];
+declare var t2: [C, D];
+declare var t3: [C1, D1];
+declare var t4: [base1, C1];
+declare var t5: [C1, F]
 
 var e11 = t1[4]; // base
 var e21 = t2[4]; // {}
diff --git a/tests/cases/conformance/types/typeRelationships/bestCommonType/heterogeneousArrayLiterals.ts b/tests/cases/conformance/types/typeRelationships/bestCommonType/heterogeneousArrayLiterals.ts
index e9a0121e45536..a49055f337a1b 100644
--- a/tests/cases/conformance/types/typeRelationships/bestCommonType/heterogeneousArrayLiterals.ts
+++ b/tests/cases/conformance/types/typeRelationships/bestCommonType/heterogeneousArrayLiterals.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // type of an array is the best common type of its elements (plus its contextual type if it exists)
 
 var a = [1, '']; // {}[]
diff --git a/tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts b/tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts
index 1afc760ef851a..398903b5400ac 100644
--- a/tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts
+++ b/tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I1 {
     p1: number
 }
diff --git a/tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithUnionTypes01.ts b/tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithUnionTypes01.ts
index 3010c5f159a76..784f052b7f517 100644
--- a/tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithUnionTypes01.ts
+++ b/tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithUnionTypes01.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I1 {
     p1: number
 }
diff --git a/tests/cases/conformance/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics.ts b/tests/cases/conformance/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics.ts
index e7260831a432f..e2162c923ee2d 100644
--- a/tests/cases/conformance/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics.ts
+++ b/tests/cases/conformance/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class List<T> {
     data: T;
     next: List<List<T>>;
diff --git a/tests/cases/conformance/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation.ts b/tests/cases/conformance/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation.ts
index 49c561e2adb96..8078959d6e24f 100644
--- a/tests/cases/conformance/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation.ts
+++ b/tests/cases/conformance/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation.ts
@@ -11,13 +11,13 @@ interface OwnerList<U> extends List<List<U>> {
     name: string;
 }
 
-var list: List<string>;
-var ownerList: OwnerList<string>;
+declare var list: List<string>;
+declare var ownerList: OwnerList<string>;
 list = ownerList; 
 
 function other<T>(x: T) {
     var list: List<T>;
-    var ownerList: OwnerList<T>;
+    var ownerList!: OwnerList<T>;
     list = ownerList; 
 
 }
diff --git a/tests/cases/conformance/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.ts b/tests/cases/conformance/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.ts
index 6eba1f2836aa4..80ea279e1d648 100644
--- a/tests/cases/conformance/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.ts
+++ b/tests/cases/conformance/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.ts
@@ -1,3 +1,4 @@
+// @strict: false
 class List<T> {
     data: T;
     next: List<List<T>>;
diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber.ts
index 8d312791b649b..c480ec2117804 100644
--- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber.ts
+++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // enums are only subtypes of number, any and no other types
 
 enum E { A }
diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/nullIsSubtypeOfEverythingButUndefined.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/nullIsSubtypeOfEverythingButUndefined.ts
index ec976b6227016..1e24417d6071a 100644
--- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/nullIsSubtypeOfEverythingButUndefined.ts
+++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/nullIsSubtypeOfEverythingButUndefined.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // null is a subtype of any other types except undefined
 
 var r0 = true ? null : null;
diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts
index 01e0c7ba067a6..5369064f03d1c 100644
--- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts
+++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // string literal types are subtypes of string, any
 
 // ok
diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfAny.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfAny.ts
index fc24f4120deaf..6409c57290210 100644
--- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfAny.ts
+++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfAny.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // every type is a subtype of any, no errors expected
 
 interface I {
diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfUnion.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfUnion.ts
index 188cc9142bb87..badb7cfc1bb8f 100644
--- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfUnion.ts
+++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfUnion.ts
@@ -1,3 +1,4 @@
+// @strict: false
 enum E { e1, e2 }
 interface I8 { [x: string]: number[]; }
 class A { foo: number; }
diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures4.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures4.ts
index e86fc51d443ee..ebdcce2b2a920 100644
--- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures4.ts
+++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // checking subtype relations for function types as it relates to contextual signature instantiation
 
 class Base { foo: string; }
diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures4.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures4.ts
index 830139d3fafd2..689834cf6639d 100644
--- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures4.ts
+++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures4.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // checking subtype relations for function types as it relates to contextual signature instantiation
 
 class Base { foo: string; }
diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality2.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality2.ts
index ac8f5642f7084..e8b85619f6b18 100644
--- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality2.ts
+++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality2.ts
@@ -28,6 +28,6 @@ interface S3 extends T3 {
 }
 
 // object literal case
-var a: { Foo: Base; }
-var b: { Foo?: Derived; }
+declare var a: { Foo: Base; }
+declare var b: { Foo?: Derived; }
 var r = true ? a : b; // ok
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype.ts
index 1004d557cc418..a42120749d1a2 100644
--- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype.ts
+++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype.ts
@@ -1,3 +1,4 @@
+// @strict: false
 enum e {
     e1,
     e2
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity.ts
index 225a974181478..aec2eb15fad0d 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2.ts
index fefde23a69416..6573636412789 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures.ts
index 94038f6df9de3..34c60a4c6475c 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2.ts
index 699f0f73f7a02..873a3cd8dea6d 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures3.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures3.ts
index e054c29a2f16f..c4087f7a11fa3 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures3.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 interface I {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts
index b62b558d06533..4d333face5b86 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.ts
index 0e8ba5340a15e..7a0fc6d79f295 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 interface I {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.ts
index 0aaf7c30f20ed..c5b729ae184cd 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithComplexConstraints.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithComplexConstraints.ts
index d31e756e9ccb7..be4745e51e1f1 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithComplexConstraints.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithComplexConstraints.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface A {
       <T extends {
             <S extends A>(x: T, y: S): void
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures.ts
index efec6a715b3da..4e18f23eebb01 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2.ts
index 63e5167a4c924..7ee4838fc6727 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class B {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.ts
index b8fc424b21b6b..cdb7c572fa223 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class B {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures.ts
index d95bc486dfc4d..cf3409181ce56 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2.ts
index 5c009926a09d6..f49a0300961c5 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts
index ede6da40400a9..004375a62d765 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts
index 5fb315c4da98f..89314d01c95a9 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts
index aaae2cbf33330..d8a8ddaec0610 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts
index 97a657606e2bd..5b76b5425cdc5 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts
index df7533d9063f6..08810f4422a04 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts
index e3bd868941608..4536033bda8b5 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts
index 95239269b9a07..da26115e20e32 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts
index 9e01aaec49fe4..32d51862afd64 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts
index c5454cc41e181..91b4cdaee0c13 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts
index b8620f04d1dc7..b6bff8bb3d57e 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts
index f39d23637acc0..97642263acd84 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts
index 974f53cb9c222..3460bf9e10383 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts
index 47bab5dab815d..9384c6b35f40d 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts
index 14f4933a154ba..ad681a20e77a0 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.ts
index 9c072e8936abf..9ec72b56e46b6 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts
index 2e0a98d557681..b5a22b535222a 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts
index fe01df25646b6..bc79ca5ac6674 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class B<U, V> {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.ts
index 20d7dbab13ffe..10343aa044157 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class B<U> {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.ts
index 56dc5a051cd8b..70fecca5edeee 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.ts
index 6c4a282228d93..d40f8fa075373 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.ts
index 8c9a08137f7ee..9b181400cacd6 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those 
 // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, 
 // optional or rest) and types, and identical return types.
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers1.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers1.ts
index 867199d9051e0..4a4a5d03d9ab0 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers1.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers1.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers2.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers2.ts
index ea9d7d04ee227..66ea74752f8d9 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class Base { foo: string; }
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers3.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers3.ts
index d3f22604c4477..5217c6abae488 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers3.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers3.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality.ts
index 7c241951050e3..2bf8d68664520 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates.ts
index b9e390158cc45..c407e3364cfa6 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2.ts
index 769e59f06d1fd..35e9aae1785f7 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class C<T> {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics.ts
index 813a8333e5fb4..5b9d1428e3fe6 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers.ts
index f511e56bc30f2..2534d9a2dbe67 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class A {
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers2.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers2.ts
index d8af511910d96..a544c47721281 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers2.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object types are identical structurally
 
 class Base { foo: string; }
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/primtiveTypesAreIdentical.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/primtiveTypesAreIdentical.ts
index d560122724a98..b43fd1cb7f297 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/primtiveTypesAreIdentical.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/primtiveTypesAreIdentical.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // primitive types are identical to themselves so these overloads will all cause errors
 
 function foo1(x: number);
diff --git a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.ts b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.ts
index 0495789326402..64f146a8058b3 100644
--- a/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // type parameters from the same declaration are identical to themself
 
 function foo1<T>(x: T);
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallToOverloadedMethodWithOverloadedArguments.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallToOverloadedMethodWithOverloadedArguments.ts
index 27dad55cf3c9f..2d48a0e73fc1f 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallToOverloadedMethodWithOverloadedArguments.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallToOverloadedMethodWithOverloadedArguments.ts
@@ -6,7 +6,7 @@ namespace m1 {
 
     declare function testFunction(n: number): Promise<number>;
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
     var newPromise = numPromise.then(testFunction);
 }
 
@@ -20,7 +20,7 @@ namespace m2 {
     declare function testFunction(n: number): Promise<number>;
     declare function testFunction(s: string): Promise<string>;
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
     var newPromise = numPromise.then(testFunction);
 }
 
@@ -34,7 +34,7 @@ namespace m3 {
 
     declare function testFunction(n: number): Promise<number>;
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
     var newPromise = numPromise.then(testFunction);
 }
 
@@ -49,7 +49,7 @@ namespace m4 {
     declare function testFunction(n: number): Promise<number>;
     declare function testFunction(s: string): Promise<string>;
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
     var newPromise = numPromise.then(testFunction);
 }
 
@@ -65,7 +65,7 @@ namespace m5 {
     declare function testFunction(n: number): Promise<number>;
     declare function testFunction(s: string): Promise<string>;
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
     var newPromise = numPromise.then(testFunction);
 }
 
@@ -81,6 +81,6 @@ namespace m6 {
     declare function testFunction(s: string): Promise<string>;
     declare function testFunction(b: boolean): Promise<boolean>;
 
-    var numPromise: Promise<number>;
+    declare var numPromise: Promise<number>;
     var newPromise = numPromise.then(testFunction);
 }
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallTypeArgumentInference.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallTypeArgumentInference.ts
index 15b0c1cb9c96e..4f1dce9061fe5 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallTypeArgumentInference.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallTypeArgumentInference.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Basic type inference with generic calls, no errors expected
 
 function foo<T>(t: T) {
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.ts
index 601f79066777b..ff79f725c8ef9 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Basic type inference with generic calls and constraints, no errors expected
 
 class Base { foo: string; }
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference2.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference2.ts
index 56e18745caa55..9814537f996dd 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference2.ts
@@ -1,7 +1,8 @@
+// @strict: false
 // Generic call with parameters of T and U, U extends T, no parameter of type U
 
 function foo<T, U extends T>(t: T) {
-    var u: U;
+    var u!: U;
     return u;
 }
 
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstructorTypedArguments5.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstructorTypedArguments5.ts
index 9cd517edd2182..874b535f35119 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstructorTypedArguments5.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstructorTypedArguments5.ts
@@ -4,12 +4,12 @@ function foo<T, U>(arg: { cb: new(t: T) => U }) {
     return new arg.cb(null);
 }
 
-var arg: { cb: new<T>(x: T) => string };
+declare var arg: { cb: new<T>(x: T) => string };
 var r = foo(arg); // {}
 // more args not allowed
-var arg2: { cb: new <T>(x: T, y: T) => string };
+declare var arg2: { cb: new <T>(x: T, y: T) => string };
 var r2 = foo(arg2); // error
-var arg3: { cb: new (x: string, y: number) => string };
+declare var arg3: { cb: new (x: string, y: number) => string };
 var r3 = foo(arg3); // error
 
 function foo2<T, U>(arg: { cb: new(t: T, t2: T) => U }) {
@@ -18,7 +18,7 @@ function foo2<T, U>(arg: { cb: new(t: T, t2: T) => U }) {
 
 // fewer args ok
 var r4 = foo(arg); // {}
-var arg4: { cb: new (x: string) => string };
+declare var arg4: { cb: new (x: string) => string };
 var r6 = foo(arg4); // string
-var arg5: { cb: new () => string };
+declare var arg5: { cb: new () => string };
 var r7 = foo(arg5); // string
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments2.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments2.ts
index 0d02afe9c880a..5582b96b5a900 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments2.ts
@@ -11,9 +11,9 @@ interface I {
 interface I2<T> {
     new (x: T): T;
 }
-var i: I;
-var i2: I2<string>;
-var a: {
+declare var i: I;
+declare var i2: I2<string>;
+declare var a: {
     new <T>(x: T): T;
 }
 
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments.ts
index f685d27d60d32..5a4aec289fcb5 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // When a function expression is inferentially typed (section 4.9.3) and a type assigned to a parameter in that expression references type parameters for which inferences are being made, 
 // the corresponding inferred type arguments to become fixed and no further candidate inferences are made for them.
 
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts
index ed1ea0b7fb7fb..00345af384705 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts
@@ -1,9 +1,10 @@
+// @strict: false
 // When a function expression is inferentially typed (section 4.9.3) and a type assigned to a parameter in that expression references type parameters for which inferences are being made, 
 // the corresponding inferred type arguments to become fixed and no further candidate inferences are made for them.
 
 namespace onlyT {
     function foo<T>(a: (x: T) => T, b: (x: T) => T) {
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
         return r;
     }
 
@@ -17,7 +18,7 @@ namespace onlyT {
     }
 
     function foo2<T extends Date>(a: (x: T) => T, b: (x: T) => T) {
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
         return r;
     }
 
@@ -30,7 +31,7 @@ namespace onlyT {
     enum F { A }
 
     function foo3<T>(x: T, a: (x: T) => T, b: (x: T) => T) {
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
         return r;
     }
 
@@ -39,7 +40,7 @@ namespace onlyT {
 
 namespace TU {
     function foo<T, U>(a: (x: T) => T, b: (x: U) => U) {
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
         return r;
     }
 
@@ -52,7 +53,7 @@ namespace TU {
     }
 
     function foo2<T extends Date, U extends Date>(a: (x: T) => T, b: (x: U) => U) {
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
         return r;
     }
 
@@ -65,7 +66,7 @@ namespace TU {
     enum F { A }
 
     function foo3<T>(x: T, a: (x: T) => T, b: (x: U) => U) {
-        var r: (x: T) => T;
+        var r!: (x: T) => T;
         return r;
     }
 
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments3.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments3.ts
index 82b917efa3e27..0d5ffda296639 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments3.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments3.ts
@@ -1,8 +1,9 @@
+// @strict: false
 // When a function expression is inferentially typed (section 4.9.3) and a type assigned to a parameter in that expression references type parameters for which inferences are being made, 
 // the corresponding inferred type arguments to become fixed and no further candidate inferences are made for them.
 
 function foo<T>(x: T, a: (x: T) => T, b: (x: T) => T) {
-    var r: (x: T) => T;
+    var r!: (x: T) => T;
     return r;
 }
 
@@ -20,7 +21,7 @@ var r6 = foo(E.A, (x: number) => E.A, (x: F) => F.A); // number => number
 
 
 function foo2<T, U>(x: T, a: (x: T) => U, b: (x: T) => U) {
-    var r: (x: T) => U;
+    var r!: (x: T) => U;
     return r;
 }
 
@@ -28,6 +29,6 @@ var r8 = foo2('', (x) => '', (x) => null); // string => string
 var r9 = foo2(null, (x) => '', (x) => ''); // any => any
 var r10 = foo2(null, (x: Object) => '', (x: string) => ''); // Object => Object
 
-var x: (a: string) => boolean;
+declare var x: (a: string) => boolean;
 var r11 = foo2(x, (a1: (y: string) => string) => (n: Object) => 1, (a2: (z: string) => string) => 2); // error
 var r12 = foo2(x, (a1: (y: string) => boolean) => (n: Object) => 1, (a2: (z: string) => boolean) => 2); // error
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgs.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgs.ts
index 002749f3f6568..fb1d400b8071f 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgs.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgs.ts
@@ -11,7 +11,7 @@ class X<T> {
 }
 
 function foo<T>(t: X<T>, t2: X<T>) {
-    var x: T;
+    var x!: T;
     return x;
 }
 
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts
index a7e7e337eadc6..d372066c26514 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts
@@ -11,14 +11,14 @@ class Derived2 extends Base {
 }
 
 function f<T extends Base>(a: { x: T; y: T }) {
-    var r: T;
+    var r!: T;
     return r;
 }
 
 var r1 = f({ x: new Derived(), y: new Derived2() }); // error because neither is supertype of the other
 
 function f2<T extends Base, U extends { x: T; y: T }>(a: U) {
-    var r: T;
+    var r!: T;
     return r;
 }
 
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts
index 5a026de8bc562..6f05d9ec37d85 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts
@@ -13,8 +13,8 @@ function foo<T, U extends T>(t: T, t2: U) {
     return (x: T) => t2;
 }
 
-var c: C;
-var d: D;
+declare var c: C;
+declare var d: D;
 var r = foo(c, d);
 var r2 = foo(d, c); // error because C does not extend D
 var r3 = foo(c, { x: '', foo: c });
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts
index b1ac6fc82d788..bf5d95f2bb009 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts
@@ -13,8 +13,8 @@ function foo<T, U extends T>(t: T, t2: U) {
     return (x: T) => t2;
 }
 
-var c: C;
-var d: D;
+declare var c: C;
+declare var d: D;
 var r2 = foo(d, c); // the constraints are self-referencing, no downstream error
 var r9 = foo(() => 1, () => { }); // the constraints are self-referencing, no downstream error
 
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments2.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments2.ts
index 0041e31ec7330..041d13523e574 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments2.ts
@@ -2,7 +2,7 @@
 // Inferences are made quadratic-pairwise to and from these overload sets
 
 namespace NonGenericParameter {
-    var a: {
+    declare var a: {
         new(x: boolean): boolean;
         new(x: string): string;
     }
@@ -11,7 +11,7 @@ namespace NonGenericParameter {
         return cb;
     }
 
-    var b: { new <T, U>(x: T): U }
+    declare var b: { new <T, U>(x: T): U }
     var r3 = foo4(b); // ok
 }
 
@@ -20,14 +20,14 @@ namespace GenericParameter {
         return cb;
     }
 
-    var a: { new <T>(x: T): T };
+    declare var a: { new <T>(x: T): T };
     var r6 = foo5(a); // ok
 
     function foo6<T>(cb: { new(x: T): string; new(x: T, y?: T): string }) {
         return cb;
     }
 
-    var b: { new <T>(x: T, y: T): string };
+    declare var b: { new <T>(x: T, y: T): string };
     var r10 = foo6(b); // error
 
     function foo7<T>(x:T, cb: { new(x: T): string; new(x: T, y?: T): string }) {
@@ -35,6 +35,6 @@ namespace GenericParameter {
     }
 
     var r13 = foo7(1, a); // ok
-    var c: { new<T>(x: T): number; new<T>(x: number): T; }
+    declare var c: { new<T>(x: T): number; new<T>(x: number): T; }
     var r14 = foo7(1, c); // ok
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments.ts
index ebe561b60b42f..f75391451f9c5 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // Function typed arguments with multiple signatures must be passed an implementation that matches all of them
 // Inferences are made quadratic-pairwise to and from these overload sets
 
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments2.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments2.ts
index 535a631951121..91bab0fc2dd45 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments2.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments2.ts
@@ -1,8 +1,9 @@
+// @strict: false
 // Function typed arguments with multiple signatures must be passed an implementation that matches all of them
 // Inferences are made quadratic-pairwise to and from these overload sets
 
 namespace NonGenericParameter {
-    var a: {
+    declare var a: {
         (x: boolean): boolean;
         (x: string): string;
     }
@@ -11,7 +12,7 @@ namespace NonGenericParameter {
         return cb;
     }
 
-    var r3 = foo4(<T, U>(x: T) => { var r: U; return r }); // ok
+    var r3 = foo4(<T, U>(x: T) => { var r!: U; return r }); // ok
 }
 
 namespace GenericParameter {
@@ -32,6 +33,6 @@ namespace GenericParameter {
     }
 
     var r13 = foo7(1, <T>(x: T) => x); // ok
-    var a: { <T>(x: T): number; <T>(x: number): T; }
+    declare var a: { <T>(x: T): number; <T>(x: number): T; }
     var r14 = foo7(1, a); // ok
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts
index 60198e1c510ba..4e464ff5cda33 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts
@@ -3,7 +3,8 @@
 } 
 
 var i1: I<string, number>;
-var i2: I<{}, {}>;
+declare var i1: I<string, number>;
+declare var i2: I<{}, {}>;
 
 // no error
 i1.tuple1 = ["foo", 5];
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithFunctionTypedMemberArguments.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithFunctionTypedMemberArguments.ts
index b2ab3c3a7546c..3df4e96528cfc 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithFunctionTypedMemberArguments.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithFunctionTypedMemberArguments.ts
@@ -31,7 +31,7 @@ namespace WithCandidates {
         }
     }
 
-    var c: C<number>;
+    declare var c: C<number>;
     var r4 = c.foo2(1, function <Z>(a: Z) { return '' }); // string, contextual signature instantiation is applied to generic functions
     var r5 = c.foo2(1, (a) => ''); // string
     var r6 = c.foo2<string, number>('', <Z>(a: Z) => 1); // number
@@ -42,7 +42,7 @@ namespace WithCandidates {
         }
     }
 
-    var c2: C2<number, string>;
+    declare var c2: C2<number, string>;
     var r7 = c2.foo3(1, <Z>(a: Z) => '', ''); // string
     var r8 = c2.foo3(1, function (a) { return '' }, ''); // string
 
@@ -51,7 +51,7 @@ namespace WithCandidates {
             return cb(x);
         }
     }
-    var c3: C3<number, string>;
+    declare var c3: C3<number, string>;
 
     function other<T, U>(t: T, u: U) {
         var r10 = c.foo2(1, (x: T) => ''); // error
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/indexSignatureTypeInference.ts b/tests/cases/conformance/types/typeRelationships/typeInference/indexSignatureTypeInference.ts
index 66fcb53d76c71..3bdb5323e7180 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/indexSignatureTypeInference.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/indexSignatureTypeInference.ts
@@ -9,8 +9,8 @@ interface StringMap<T> {
 declare function numberMapToArray<T>(object: NumberMap<T>): T[];
 declare function stringMapToArray<T>(object: StringMap<T>): T[];
 
-var numberMap: NumberMap<Function>;
-var stringMap: StringMap<Function>;
+declare var numberMap: NumberMap<Function>;
+declare var stringMap: StringMap<Function>;
 
 var v1: Function[];
 var v1 = numberMapToArray(numberMap);  // Ok
diff --git a/tests/cases/conformance/types/typeRelationships/widenedTypes/arrayLiteralWidened.ts b/tests/cases/conformance/types/typeRelationships/widenedTypes/arrayLiteralWidened.ts
index 05428422129c6..1f03b2c0eb25c 100644
--- a/tests/cases/conformance/types/typeRelationships/widenedTypes/arrayLiteralWidened.ts
+++ b/tests/cases/conformance/types/typeRelationships/widenedTypes/arrayLiteralWidened.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // array literals are widened upon assignment according to their element type
 
 var a = []; // any[]
diff --git a/tests/cases/conformance/types/typeRelationships/widenedTypes/initializersWidened.ts b/tests/cases/conformance/types/typeRelationships/widenedTypes/initializersWidened.ts
index 2eeb96194b753..3aafa14b98c08 100644
--- a/tests/cases/conformance/types/typeRelationships/widenedTypes/initializersWidened.ts
+++ b/tests/cases/conformance/types/typeRelationships/widenedTypes/initializersWidened.ts
@@ -1,3 +1,5 @@
+// @noImplicitAny: false
+
 // these are widened to any at the point of assignment
 
 var x1 = null;
@@ -6,8 +8,8 @@ var z1 = void 0;
 
 // these are not widened
 
-var x2: null;
-var y2: undefined;
+declare var x2: null;
+declare var y2: undefined;
 
 var x3: null = null;
 var y3: undefined = undefined;
diff --git a/tests/cases/conformance/types/typeRelationships/widenedTypes/objectLiteralWidened.ts b/tests/cases/conformance/types/typeRelationships/widenedTypes/objectLiteralWidened.ts
index 8b51e526882e7..27bcec7276562 100644
--- a/tests/cases/conformance/types/typeRelationships/widenedTypes/objectLiteralWidened.ts
+++ b/tests/cases/conformance/types/typeRelationships/widenedTypes/objectLiteralWidened.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // object literal properties are widened to any
 
 var x1 = {
diff --git a/tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts b/tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts
index b6b328a5d0936..0b802fe9880af 100644
--- a/tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts
+++ b/tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts
@@ -1,8 +1,8 @@
-var str: string;
-var num: number;
+declare var str: string;
+declare var num: number;
 var strOrNumber: string | number = str || num;
-var objStr: { prop: string };
-var objNum: { prop: number };
+declare var objStr: { prop: string };
+declare var objNum: { prop: number };
 var objStrOrNum1: { prop: string } | { prop: number } = objStr || objNum;
 var objStrOrNum2: { prop: string | number } = objStr || objNum;
 // Below is error because :
@@ -37,8 +37,8 @@ interface I11 {
 interface I21 {
     commonMethodDifferentReturnType(a: string, b: number): number;
 }
-var i11: I11;
-var i21: I21;
+declare var i11: I11;
+declare var i21: I21;
 var i11Ori21: I11 | I21 = i11;
 var i11Ori21: I11 | I21 = i21;
 var i11Ori21: I11 | I21 = { // Like i1
@@ -53,7 +53,7 @@ var i11Ori21: I11 | I21 = { // Like i2
         return z;
     },
 };
-var strOrNumber: string | number;
+declare var strOrNumber: string | number;
 var i11Ori21: I11 | I21 = { // Like i1 and i2 both
     commonMethodDifferentReturnType: (a, b) => strOrNumber,
 };
\ No newline at end of file
diff --git a/tests/cases/conformance/types/union/unionTypeCallSignatures.ts b/tests/cases/conformance/types/union/unionTypeCallSignatures.ts
index 532dd9f3e1f1a..486265d94dcbc 100644
--- a/tests/cases/conformance/types/union/unionTypeCallSignatures.ts
+++ b/tests/cases/conformance/types/union/unionTypeCallSignatures.ts
@@ -1,74 +1,74 @@
-var numOrDate: number | Date;
-var strOrBoolean: string | boolean;
-var strOrNum: string | number;
+declare var numOrDate: number | Date;
+declare var strOrBoolean: string | boolean;
+declare var strOrNum: string | number;
 
 // If each type in U has call signatures and the sets of call signatures are identical ignoring return types, 
 // U has the same set of call signatures, but with return types that are unions of the return types of the respective call signatures from each type in U.
-var unionOfDifferentReturnType: { (a: number): number; } | { (a: number): Date; };
+declare var unionOfDifferentReturnType: { (a: number): number; } | { (a: number): Date; };
 numOrDate = unionOfDifferentReturnType(10);
 strOrBoolean = unionOfDifferentReturnType("hello"); // error 
 unionOfDifferentReturnType1(true); // error in type of parameter
 
-var unionOfDifferentReturnType1: { (a: number): number; (a: string): string; } | { (a: number): Date; (a: string): boolean; };
+declare var unionOfDifferentReturnType1: { (a: number): number; (a: string): string; } | { (a: number): Date; (a: string): boolean; };
 numOrDate = unionOfDifferentReturnType1(10);
 strOrBoolean = unionOfDifferentReturnType1("hello");
 unionOfDifferentReturnType1(true); // error in type of parameter
 unionOfDifferentReturnType1(); // error missing parameter
 
-var unionOfDifferentParameterTypes: { (a: number): number; } | { (a: string): Date; };
+declare var unionOfDifferentParameterTypes: { (a: number): number; } | { (a: string): Date; };
 unionOfDifferentParameterTypes(10);// error - no call signatures
 unionOfDifferentParameterTypes("hello");// error - no call signatures
 unionOfDifferentParameterTypes();// error - no call signatures
 
-var unionOfDifferentNumberOfSignatures: { (a: number): number; } | { (a: number): Date; (a: string): boolean; };
+declare var unionOfDifferentNumberOfSignatures: { (a: number): number; } | { (a: number): Date; (a: string): boolean; };
 unionOfDifferentNumberOfSignatures(); // error - no call signatures
 unionOfDifferentNumberOfSignatures(10); // error - no call signatures
 unionOfDifferentNumberOfSignatures("hello"); // error - no call signatures
 
-var unionWithDifferentParameterCount: { (a: string): string; } | { (a: string, b: number): number; } ;
+declare var unionWithDifferentParameterCount: { (a: string): string; } | { (a: string, b: number): number; } ;
 unionWithDifferentParameterCount();// needs more args
 unionWithDifferentParameterCount("hello");// needs more args
 unionWithDifferentParameterCount("hello", 10);// OK
 
-var unionWithOptionalParameter1: { (a: string, b?: number): string; } | { (a: string, b?: number): number; };
+declare var unionWithOptionalParameter1: { (a: string, b?: number): string; } | { (a: string, b?: number): number; };
 strOrNum = unionWithOptionalParameter1('hello');
 strOrNum = unionWithOptionalParameter1('hello', 10);
 strOrNum = unionWithOptionalParameter1('hello', "hello"); // error in parameter type
 strOrNum = unionWithOptionalParameter1(); // error
 
-var unionWithOptionalParameter2: { (a: string, b?: number): string; } | { (a: string, b: number): number };
+declare var unionWithOptionalParameter2: { (a: string, b?: number): string; } | { (a: string, b: number): number };
 strOrNum = unionWithOptionalParameter2('hello'); // error no call signature
 strOrNum = unionWithOptionalParameter2('hello', 10); // error no call signature
 strOrNum = unionWithOptionalParameter2('hello', "hello"); // error no call signature
 strOrNum = unionWithOptionalParameter2(); // error no call signature
 
-var unionWithOptionalParameter3: { (a: string, b?: number): string; } | { (a: string): number; };
+declare var unionWithOptionalParameter3: { (a: string, b?: number): string; } | { (a: string): number; };
 strOrNum = unionWithOptionalParameter3('hello');
 strOrNum = unionWithOptionalParameter3('hello', 10); // ok
 strOrNum = unionWithOptionalParameter3('hello', "hello"); // wrong argument type
 strOrNum = unionWithOptionalParameter3(); // needs more args
 
-var unionWithRestParameter1: { (a: string, ...b: number[]): string; } | { (a: string, ...b: number[]): number };
+declare var unionWithRestParameter1: { (a: string, ...b: number[]): string; } | { (a: string, ...b: number[]): number };
 strOrNum = unionWithRestParameter1('hello');
 strOrNum = unionWithRestParameter1('hello', 10);
 strOrNum = unionWithRestParameter1('hello', 10, 11);
 strOrNum = unionWithRestParameter1('hello', "hello"); // error in parameter type
 strOrNum = unionWithRestParameter1(); // error
 
-var unionWithRestParameter2: { (a: string, ...b: number[]): string; } | { (a: string, b: number): number };
+declare var unionWithRestParameter2: { (a: string, ...b: number[]): string; } | { (a: string, b: number): number };
 strOrNum = unionWithRestParameter2('hello'); // error no call signature
 strOrNum = unionWithRestParameter2('hello', 10); // error no call signature
 strOrNum = unionWithRestParameter2('hello', 10, 11); // error no call signature
 strOrNum = unionWithRestParameter2('hello', "hello"); // error no call signature
 strOrNum = unionWithRestParameter2(); // error no call signature
 
-var unionWithRestParameter3: { (a: string, ...b: number[]): string; } | { (a: string): number };
+declare var unionWithRestParameter3: { (a: string, ...b: number[]): string; } | { (a: string): number };
 strOrNum = unionWithRestParameter3('hello');
 strOrNum = unionWithRestParameter3('hello', 10); // error no call signature
 strOrNum = unionWithRestParameter3('hello', 10, 11); // error no call signature
 strOrNum = unionWithRestParameter3('hello', "hello"); // wrong argument type
 strOrNum = unionWithRestParameter3(); // error no call signature
 
-var unionWithRestParameter4: { (...a: string[]): string; } | { (a: string, b: string): number; };
+declare var unionWithRestParameter4: { (...a: string[]): string; } | { (a: string, b: string): number; };
 strOrNum = unionWithRestParameter4("hello"); // error supplied parameters do not match any call signature
 strOrNum = unionWithRestParameter4("hello", "world");
diff --git a/tests/cases/conformance/types/union/unionTypeCallSignatures4.ts b/tests/cases/conformance/types/union/unionTypeCallSignatures4.ts
index 9ac96262bdcc4..17009d6c37e29 100644
--- a/tests/cases/conformance/types/union/unionTypeCallSignatures4.ts
+++ b/tests/cases/conformance/types/union/unionTypeCallSignatures4.ts
@@ -4,22 +4,22 @@ type F3 = (a: string, ...rest: string[]) => void;
 type F4 = (a: string, b?: string, ...rest: string[]) => void;
 type F5 = (a: string, b: string) => void;
 
-var f12: F1 | F2;
+declare var f12: F1 | F2;
 f12("a");
 f12("a", "b");
 f12("a", "b", "c");  // ok
 
-var f34: F3 | F4;
+declare var f34: F3 | F4;
 f34("a");
 f34("a", "b");
 f34("a", "b", "c");
 
-var f1234: F1 | F2 | F3 | F4;
+declare var f1234: F1 | F2 | F3 | F4;
 f1234("a");
 f1234("a", "b");
 f1234("a", "b", "c");  // ok
 
-var f12345: F1 | F2 | F3 | F4 | F5;
+declare var f12345: F1 | F2 | F3 | F4 | F5;
 f12345("a");  // error
 f12345("a", "b");
 f12345("a", "b", "c");  // error
diff --git a/tests/cases/conformance/types/union/unionTypeConstructSignatures.ts b/tests/cases/conformance/types/union/unionTypeConstructSignatures.ts
index 3e0d509fe97f3..1368f2ec6d764 100644
--- a/tests/cases/conformance/types/union/unionTypeConstructSignatures.ts
+++ b/tests/cases/conformance/types/union/unionTypeConstructSignatures.ts
@@ -1,73 +1,73 @@
-var numOrDate: number | Date;
-var strOrBoolean: string | boolean;
-var strOrNum: string | number;
+declare var numOrDate: number | Date;
+declare var strOrBoolean: string | boolean;
+declare var strOrNum: string | number;
 
 // If each type in U has construct signatures and the sets of construct signatures are identical ignoring return types,
 // U has the same set of construct signatures, but with return types that are unions of the return types of the respective construct signatures from each type in U.
-var unionOfDifferentReturnType: { new (a: number): number; } | { new (a: number): Date; };
+declare var unionOfDifferentReturnType: { new (a: number): number; } | { new (a: number): Date; };
 numOrDate = new unionOfDifferentReturnType(10);
 strOrBoolean = new unionOfDifferentReturnType("hello"); // error
 new unionOfDifferentReturnType1(true); // error in type of parameter
 
-var unionOfDifferentReturnType1: { new (a: number): number; new (a: string): string; } | { new (a: number): Date; new (a: string): boolean; };
+declare var unionOfDifferentReturnType1: { new (a: number): number; new (a: string): string; } | { new (a: number): Date; new (a: string): boolean; };
 numOrDate = new unionOfDifferentReturnType1(10);
 strOrBoolean = new unionOfDifferentReturnType1("hello");
 new unionOfDifferentReturnType1(true); // error in type of parameter
 new unionOfDifferentReturnType1(); // error missing parameter
 
-var unionOfDifferentParameterTypes: { new (a: number): number; } | { new (a: string): Date; };
+declare var unionOfDifferentParameterTypes: { new (a: number): number; } | { new (a: string): Date; };
 new unionOfDifferentParameterTypes(10);// error - no call signatures
 new unionOfDifferentParameterTypes("hello");// error - no call signatures
 new unionOfDifferentParameterTypes();// error - no call signatures
 
-var unionOfDifferentNumberOfSignatures: { new (a: number): number; } | { new (a: number): Date; new (a: string): boolean; };
+declare var unionOfDifferentNumberOfSignatures: { new (a: number): number; } | { new (a: number): Date; new (a: string): boolean; };
 new unionOfDifferentNumberOfSignatures(); // error - no call signatures
 new unionOfDifferentNumberOfSignatures(10); // error - no call signatures
 new unionOfDifferentNumberOfSignatures("hello"); // error - no call signatures
 
-var unionWithDifferentParameterCount: { new (a: string): string; } | { new (a: string, b: number): number; };
+declare var unionWithDifferentParameterCount: { new (a: string): string; } | { new (a: string, b: number): number; };
 new unionWithDifferentParameterCount();// needs more args
 new unionWithDifferentParameterCount("hello");// needs more args
 new unionWithDifferentParameterCount("hello", 10);// ok
 
-var unionWithOptionalParameter1: { new (a: string, b?: number): string; } | { new (a: string, b?: number): number; };
+declare var unionWithOptionalParameter1: { new (a: string, b?: number): string; } | { new (a: string, b?: number): number; };
 strOrNum = new unionWithOptionalParameter1('hello');
 strOrNum = new unionWithOptionalParameter1('hello', 10);
 strOrNum = new unionWithOptionalParameter1('hello', "hello"); // error in parameter type
 strOrNum = new unionWithOptionalParameter1(); // error
 
-var unionWithOptionalParameter2: { new (a: string, b?: number): string; } | { new (a: string, b: number): number };
+declare var unionWithOptionalParameter2: { new (a: string, b?: number): string; } | { new (a: string, b: number): number };
 strOrNum = new unionWithOptionalParameter2('hello'); // error no call signature
 strOrNum = new unionWithOptionalParameter2('hello', 10); // error no call signature
 strOrNum = new unionWithOptionalParameter2('hello', "hello"); // error no call signature
 strOrNum = new unionWithOptionalParameter2(); // error no call signature
 
-var unionWithOptionalParameter3: { new (a: string, b?: number): string; } | { new (a: string): number; };
+declare var unionWithOptionalParameter3: { new (a: string, b?: number): string; } | { new (a: string): number; };
 strOrNum = new unionWithOptionalParameter3('hello'); // error no call signature
 strOrNum = new unionWithOptionalParameter3('hello', 10); // ok
 strOrNum = new unionWithOptionalParameter3('hello', "hello"); // wrong type
 strOrNum = new unionWithOptionalParameter3(); // error no call signature
 
-var unionWithRestParameter1: { new (a: string, ...b: number[]): string; } | { new (a: string, ...b: number[]): number };
+declare var unionWithRestParameter1: { new (a: string, ...b: number[]): string; } | { new (a: string, ...b: number[]): number };
 strOrNum = new unionWithRestParameter1('hello');
 strOrNum = new unionWithRestParameter1('hello', 10);
 strOrNum = new unionWithRestParameter1('hello', 10, 11);
 strOrNum = new unionWithRestParameter1('hello', "hello"); // error in parameter type
 strOrNum = new unionWithRestParameter1(); // error
 
-var unionWithRestParameter2: { new (a: string, ...b: number[]): string; } | { new (a: string, b: number): number };
+declare var unionWithRestParameter2: { new (a: string, ...b: number[]): string; } | { new (a: string, b: number): number };
 strOrNum = new unionWithRestParameter2('hello'); // error no call signature
 strOrNum = new unionWithRestParameter2('hello', 10); // error no call signature
 strOrNum = new unionWithRestParameter2('hello', 10, 11); // error no call signature
 strOrNum = new unionWithRestParameter2('hello', "hello"); // error no call signature
 strOrNum = new unionWithRestParameter2(); // error no call signature
 
-var unionWithRestParameter3: { new (a: string, ...b: number[]): string; } | { new (a: string): number };
+declare var unionWithRestParameter3: { new (a: string, ...b: number[]): string; } | { new (a: string): number };
 strOrNum = new unionWithRestParameter3('hello'); // error no call signature
 strOrNum = new unionWithRestParameter3('hello', 10); // ok
 strOrNum = new unionWithRestParameter3('hello', 10, 11); // ok
 strOrNum = new unionWithRestParameter3('hello', "hello"); // wrong type
 strOrNum = new unionWithRestParameter3(); // error no call signature
 
-var unionWithAbstractSignature: (abstract new (a: string) => string) | (new (a: string) => string);
+declare var unionWithAbstractSignature: (abstract new (a: string) => string) | (new (a: string) => string);
 new unionWithAbstractSignature('hello');
diff --git a/tests/cases/conformance/types/union/unionTypeFromArrayLiteral.ts b/tests/cases/conformance/types/union/unionTypeFromArrayLiteral.ts
index c6b575846732a..a5def4e6aafe2 100644
--- a/tests/cases/conformance/types/union/unionTypeFromArrayLiteral.ts
+++ b/tests/cases/conformance/types/union/unionTypeFromArrayLiteral.ts
@@ -16,7 +16,7 @@ class C { foo() { } }
 class D { foo2() { } }
 class E extends C { foo3() { } }
 class F extends C { foo4() { } }
-var c: C, d: D, e: E, f: F;
+declare var c: C, d: D, e: E, f: F;
 var arr6 = [c, d];  // (C | D)[]
 var arr7 = [c, d, e]; // (C | D)[]
 var arr8 = [c, e]; // C[]
diff --git a/tests/cases/conformance/types/union/unionTypeMembers.ts b/tests/cases/conformance/types/union/unionTypeMembers.ts
index 73c6867e9acde..29371dfb92cce 100644
--- a/tests/cases/conformance/types/union/unionTypeMembers.ts
+++ b/tests/cases/conformance/types/union/unionTypeMembers.ts
@@ -30,10 +30,10 @@ interface I2<T> {
 
 // a union type U has those members that are present in every one of its constituent types, 
 // with types that are unions of the respective members in the constituent types
-var x : I1<number> | I2<number>;
-var str: string;
-var num: number;
-var strOrNum: string | number;
+declare var x : I1<number> | I2<number>;
+declare var str: string;
+declare var num: number;
+declare var strOrNum: string | number;
 
 // If each type in U has a property P, U has a property P of a union type of the types of P from each type in U.
 str = x.commonPropertyType; // string
diff --git a/tests/cases/conformance/types/union/unionTypePropertyAccessibility.ts b/tests/cases/conformance/types/union/unionTypePropertyAccessibility.ts
index 531ffe96e8350..d4d6470f0202a 100644
--- a/tests/cases/conformance/types/union/unionTypePropertyAccessibility.ts
+++ b/tests/cases/conformance/types/union/unionTypePropertyAccessibility.ts
@@ -14,21 +14,21 @@ class Private {
     private member: number;
 }
 
-var v1: Default;
-var v2: Public;
-var v3: Protected;
-var v4: Private;
-var v5: Default | Public;
-var v6: Default | Protected;
-var v7: Default | Private;
-var v8: Public | Protected;
-var v9: Public | Private;
-var v10: Protected | Private;
-var v11: Default | Public | Protected;
-var v12: Default | Public | Private;
-var v13: Default | Protected | Private;
-var v14: Public | Private | Protected;
-var v15: Default | Public | Private | Protected;
+declare var v1: Default;
+declare var v2: Public;
+declare var v3: Protected;
+declare var v4: Private;
+declare var v5: Default | Public;
+declare var v6: Default | Protected;
+declare var v7: Default | Private;
+declare var v8: Public | Protected;
+declare var v9: Public | Private;
+declare var v10: Protected | Private;
+declare var v11: Default | Public | Protected;
+declare var v12: Default | Public | Private;
+declare var v13: Default | Protected | Private;
+declare var v14: Public | Private | Protected;
+declare var v15: Default | Public | Private | Protected;
 
 v1.member;
 v2.member;
diff --git a/tests/cases/conformance/types/union/unionTypeReadonly.ts b/tests/cases/conformance/types/union/unionTypeReadonly.ts
index 89cf1cbfd377d..d3926e8f3a160 100644
--- a/tests/cases/conformance/types/union/unionTypeReadonly.ts
+++ b/tests/cases/conformance/types/union/unionTypeReadonly.ts
@@ -13,14 +13,14 @@ interface DifferentType {
 interface DifferentName {
     readonly other: number;
 }
-let base: Base;
+declare let base: Base;
 base.value = 12 // error, lhs can't be a readonly property
-let identical: Base | Identical;
+declare let identical: Base | Identical;
 identical.value = 12; // error, lhs can't be a readonly property
-let mutable: Base | Mutable;
+declare let mutable: Base | Mutable;
 mutable.value = 12; // error, lhs can't be a readonly property
-let differentType: Base | DifferentType;
+declare let differentType: Base | DifferentType;
 differentType.value = 12; // error, lhs can't be a readonly property
-let differentName: Base | DifferentName;
+declare let differentName: Base | DifferentName;
 differentName.value = 12; // error, property 'value' doesn't exist
 
diff --git a/tests/cases/conformance/types/union/unionTypeReduction.ts b/tests/cases/conformance/types/union/unionTypeReduction.ts
index 8bc3d1cdc8cea..c4f6453391abb 100644
--- a/tests/cases/conformance/types/union/unionTypeReduction.ts
+++ b/tests/cases/conformance/types/union/unionTypeReduction.ts
@@ -1,3 +1,4 @@
+// @strict: false
 interface I2 {
     (): number;
     (q): boolean;
diff --git a/tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsErrors.ts b/tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsErrors.ts
index 2c6bcf9d6ccd7..1e75ba25384a3 100644
--- a/tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsErrors.ts
+++ b/tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsErrors.ts
@@ -1,3 +1,4 @@
+// @strict: false
 // @target: esnext
 // @useDefineForClassFields: false
 
diff --git a/tests/cases/conformance/types/witness/witness.ts b/tests/cases/conformance/types/witness/witness.ts
index 0c19b422ebff2..297b16f776f80 100644
--- a/tests/cases/conformance/types/witness/witness.ts
+++ b/tests/cases/conformance/types/witness/witness.ts
@@ -1,4 +1,4 @@
-
+// @strict: false
 
 
 
@@ -113,7 +113,7 @@ var propAcc1 = {
 };
 var propAcc1: { m: any; }
 
-// Property access of module member
+// Property access of namespace member
 namespace M2 {
     export var x = M2.x;
     var y = x;
diff --git a/tests/cases/fourslash/addMemberInDeclarationFile.ts b/tests/cases/fourslash/addMemberInDeclarationFile.ts
index 1d2e900512db8..a8558bfaa76b3 100644
--- a/tests/cases/fourslash/addMemberInDeclarationFile.ts
+++ b/tests/cases/fourslash/addMemberInDeclarationFile.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: ./declarations.d.ts
 //// interface Response {}
 
diff --git a/tests/cases/fourslash/annotateWithTypeFromJSDoc1.ts b/tests/cases/fourslash/annotateWithTypeFromJSDoc1.ts
index f57c1a8101bd6..80c8f168b865a 100644
--- a/tests/cases/fourslash/annotateWithTypeFromJSDoc1.ts
+++ b/tests/cases/fourslash/annotateWithTypeFromJSDoc1.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @Filename: test123.ts
 /////** @type {number} */
 ////var [|x|];
diff --git a/tests/cases/fourslash/annotateWithTypeFromJSDoc10.ts b/tests/cases/fourslash/annotateWithTypeFromJSDoc10.ts
index 98cc31e32075b..ba5fb3ecfdbb6 100644
--- a/tests/cases/fourslash/annotateWithTypeFromJSDoc10.ts
+++ b/tests/cases/fourslash/annotateWithTypeFromJSDoc10.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 /////**
 //// * @param {?} x
 //// * @returns {number}
diff --git a/tests/cases/fourslash/annotateWithTypeFromJSDoc11.ts b/tests/cases/fourslash/annotateWithTypeFromJSDoc11.ts
index a08906ef91a19..6a59fa45a467b 100644
--- a/tests/cases/fourslash/annotateWithTypeFromJSDoc11.ts
+++ b/tests/cases/fourslash/annotateWithTypeFromJSDoc11.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 /////**
 //// * @param {?} x
 //// * @returns {number}
diff --git a/tests/cases/fourslash/annotateWithTypeFromJSDoc12.ts b/tests/cases/fourslash/annotateWithTypeFromJSDoc12.ts
index ec1ab37022214..d7a73c3f35091 100644
--- a/tests/cases/fourslash/annotateWithTypeFromJSDoc12.ts
+++ b/tests/cases/fourslash/annotateWithTypeFromJSDoc12.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////class C {
 ////    /**
 ////     * @return {...*}
diff --git a/tests/cases/fourslash/annotateWithTypeFromJSDoc17.ts b/tests/cases/fourslash/annotateWithTypeFromJSDoc17.ts
index c452dd4516f20..f2cb9b9ded395 100644
--- a/tests/cases/fourslash/annotateWithTypeFromJSDoc17.ts
+++ b/tests/cases/fourslash/annotateWithTypeFromJSDoc17.ts
@@ -1,4 +1,5 @@
 /// <reference path='fourslash.ts' />
+// @strict: false
 ////class C {
 ////    /**
 ////     * @param {number} x - the first parameter
diff --git a/tests/cases/fourslash/annotateWithTypeFromJSDoc18.ts b/tests/cases/fourslash/annotateWithTypeFromJSDoc18.ts
index 9fc2e966028aa..043ff1d043053 100644
--- a/tests/cases/fourslash/annotateWithTypeFromJSDoc18.ts
+++ b/tests/cases/fourslash/annotateWithTypeFromJSDoc18.ts
@@ -1,4 +1,5 @@
 /// <reference path='fourslash.ts' />
+// @strict: false
 ////class C {
 ////    /** @param {number} value */
 ////    set c(value) { return value }
diff --git a/tests/cases/fourslash/annotateWithTypeFromJSDoc3.ts b/tests/cases/fourslash/annotateWithTypeFromJSDoc3.ts
index f7d0522018abd..de7bc34e174e6 100644
--- a/tests/cases/fourslash/annotateWithTypeFromJSDoc3.ts
+++ b/tests/cases/fourslash/annotateWithTypeFromJSDoc3.ts
@@ -1,4 +1,5 @@
 /// <reference path='fourslash.ts' />
+// @strict: false
 /////**
 //// * @param {number} x - the first parameter
 //// * @param {{ a: string, b: Date }} y - the most complex parameter
diff --git a/tests/cases/fourslash/annotateWithTypeFromJSDoc6.ts b/tests/cases/fourslash/annotateWithTypeFromJSDoc6.ts
index dbb75590fb2ba..8e384be0f32d3 100644
--- a/tests/cases/fourslash/annotateWithTypeFromJSDoc6.ts
+++ b/tests/cases/fourslash/annotateWithTypeFromJSDoc6.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////declare class C {
 ////    /** @type {number | null} */
 ////    p;
diff --git a/tests/cases/fourslash/annotateWithTypeFromJSDoc7.ts b/tests/cases/fourslash/annotateWithTypeFromJSDoc7.ts
index 0d43bde45d49b..f9ce9f7a15265 100644
--- a/tests/cases/fourslash/annotateWithTypeFromJSDoc7.ts
+++ b/tests/cases/fourslash/annotateWithTypeFromJSDoc7.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 /////**
 //// * @param {number} x
 //// * @returns {number}
diff --git a/tests/cases/fourslash/annotateWithTypeFromJSDoc8.ts b/tests/cases/fourslash/annotateWithTypeFromJSDoc8.ts
index ca9450c1e6ff0..cbc6ca33cdd9a 100644
--- a/tests/cases/fourslash/annotateWithTypeFromJSDoc8.ts
+++ b/tests/cases/fourslash/annotateWithTypeFromJSDoc8.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 /////**
 //// * @param {number} x
 //// * @returns {number}
diff --git a/tests/cases/fourslash/annotateWithTypeFromJSDoc9.5.ts b/tests/cases/fourslash/annotateWithTypeFromJSDoc9.5.ts
index aa17b0591c85d..a7196ef0e411e 100644
--- a/tests/cases/fourslash/annotateWithTypeFromJSDoc9.5.ts
+++ b/tests/cases/fourslash/annotateWithTypeFromJSDoc9.5.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 /////**
 //// * @template T
 //// * @param {T} x
diff --git a/tests/cases/fourslash/annotateWithTypeFromJSDoc9.ts b/tests/cases/fourslash/annotateWithTypeFromJSDoc9.ts
index f664d5be6b7b8..138bb3f27561e 100644
--- a/tests/cases/fourslash/annotateWithTypeFromJSDoc9.ts
+++ b/tests/cases/fourslash/annotateWithTypeFromJSDoc9.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 /////**
 //// * @param {?} x
 //// * @returns {number}
diff --git a/tests/cases/fourslash/autoImportAllowImportingTsExtensionsPackageJsonImports1.ts b/tests/cases/fourslash/autoImportAllowImportingTsExtensionsPackageJsonImports1.ts
index 6b6a7e21a9951..24a151868f6c2 100644
--- a/tests/cases/fourslash/autoImportAllowImportingTsExtensionsPackageJsonImports1.ts
+++ b/tests/cases/fourslash/autoImportAllowImportingTsExtensionsPackageJsonImports1.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: node18
 // @allowImportingTsExtensions: true
 
diff --git a/tests/cases/fourslash/autoImportFileExcludePatterns2.ts b/tests/cases/fourslash/autoImportFileExcludePatterns2.ts
index 8c5296189a2cd..e40f9f3654fd1 100644
--- a/tests/cases/fourslash/autoImportFileExcludePatterns2.ts
+++ b/tests/cases/fourslash/autoImportFileExcludePatterns2.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /lib/components/button/Button.ts
 //// export function Button() {}
 
diff --git a/tests/cases/fourslash/autoImportFileExcludePatterns3.ts b/tests/cases/fourslash/autoImportFileExcludePatterns3.ts
index 8f8ff5d4a1ed7..1795d74facafd 100644
--- a/tests/cases/fourslash/autoImportFileExcludePatterns3.ts
+++ b/tests/cases/fourslash/autoImportFileExcludePatterns3.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: commonjs
 
 // @Filename: /ambient1.d.ts
diff --git a/tests/cases/fourslash/autoImportNoPackageJson_commonjs.ts b/tests/cases/fourslash/autoImportNoPackageJson_commonjs.ts
index 1d9a0ad323303..0251e33d42ad1 100644
--- a/tests/cases/fourslash/autoImportNoPackageJson_commonjs.ts
+++ b/tests/cases/fourslash/autoImportNoPackageJson_commonjs.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: commonjs
 
 // @Filename: /node_modules/lit/index.d.cts
diff --git a/tests/cases/fourslash/autoImportNoPackageJson_nodenext.ts b/tests/cases/fourslash/autoImportNoPackageJson_nodenext.ts
index 364025a999123..ce18cbf6e7f3f 100644
--- a/tests/cases/fourslash/autoImportNoPackageJson_nodenext.ts
+++ b/tests/cases/fourslash/autoImportNoPackageJson_nodenext.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: node18
 
 // @Filename: /node_modules/lit/index.d.cts
diff --git a/tests/cases/fourslash/autoImportSameNameDefaultExported.ts b/tests/cases/fourslash/autoImportSameNameDefaultExported.ts
index aad12f9cca54f..da36e13f88135 100644
--- a/tests/cases/fourslash/autoImportSameNameDefaultExported.ts
+++ b/tests/cases/fourslash/autoImportSameNameDefaultExported.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: commonjs
 
 // @Filename: /node_modules/antd/index.d.ts
diff --git a/tests/cases/fourslash/autoImport_node12_node_modules1.ts b/tests/cases/fourslash/autoImport_node12_node_modules1.ts
index 80a9e1573113b..0c90dde666a12 100644
--- a/tests/cases/fourslash/autoImport_node12_node_modules1.ts
+++ b/tests/cases/fourslash/autoImport_node12_node_modules1.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: node16
 
 // @Filename: /node_modules/undici/index.d.ts
diff --git a/tests/cases/fourslash/cloduleAsBaseClass.ts b/tests/cases/fourslash/cloduleAsBaseClass.ts
index 9de78e58cce82..d4881c27e107c 100644
--- a/tests/cases/fourslash/cloduleAsBaseClass.ts
+++ b/tests/cases/fourslash/cloduleAsBaseClass.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+// @strict: false
 ////class A {
 ////    constructor(x: number) { }
 ////    foo() { }
diff --git a/tests/cases/fourslash/cloduleAsBaseClass2.ts b/tests/cases/fourslash/cloduleAsBaseClass2.ts
index c628a0f859a2d..e517d1049642d 100644
--- a/tests/cases/fourslash/cloduleAsBaseClass2.ts
+++ b/tests/cases/fourslash/cloduleAsBaseClass2.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 // @Filename: cloduleAsBaseClass2_0.ts
 ////class A {
 ////    constructor(x: number) { }
diff --git a/tests/cases/fourslash/cloduleTypeOf1.ts b/tests/cases/fourslash/cloduleTypeOf1.ts
index 6d57ff2f45c5a..b7ce305b68086 100644
--- a/tests/cases/fourslash/cloduleTypeOf1.ts
+++ b/tests/cases/fourslash/cloduleTypeOf1.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////class C<T> {
 ////    static foo(x: number) { }
 ////    x: T;
diff --git a/tests/cases/fourslash/codeFixAddMissingAsync2.ts b/tests/cases/fourslash/codeFixAddMissingAsync2.ts
index 3f610ae141bbd..aaadea94be5a9 100644
--- a/tests/cases/fourslash/codeFixAddMissingAsync2.ts
+++ b/tests/cases/fourslash/codeFixAddMissingAsync2.ts
@@ -1,4 +1,5 @@
 /// <reference path="fourslash.ts" />
+// @strict: false
 ////interface Stuff {
 ////    b: () => Promise<string>;
 ////}
diff --git a/tests/cases/fourslash/codeFixAddMissingDeclareProperty.ts b/tests/cases/fourslash/codeFixAddMissingDeclareProperty.ts
index e4ebea338f6c3..3fbf486511756 100644
--- a/tests/cases/fourslash/codeFixAddMissingDeclareProperty.ts
+++ b/tests/cases/fourslash/codeFixAddMissingDeclareProperty.ts
@@ -1,4 +1,5 @@
 /// <reference path='fourslash.ts' />
+// @strict: false
 // @useDefineForClassFields: true
 
 ////class B {
diff --git a/tests/cases/fourslash/codeFixAddMissingEnumMember12.ts b/tests/cases/fourslash/codeFixAddMissingEnumMember12.ts
index af813c71f7f5b..4935e1323288d 100644
--- a/tests/cases/fourslash/codeFixAddMissingEnumMember12.ts
+++ b/tests/cases/fourslash/codeFixAddMissingEnumMember12.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////const x; // this is x
 ////
 ////// this is E
diff --git a/tests/cases/fourslash/codeFixAddMissingProperties1.ts b/tests/cases/fourslash/codeFixAddMissingProperties1.ts
index 0d82892c02ca1..ee9cb81160251 100644
--- a/tests/cases/fourslash/codeFixAddMissingProperties1.ts
+++ b/tests/cases/fourslash/codeFixAddMissingProperties1.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////interface Foo {
 ////    a: number;
 ////    b: string;
diff --git a/tests/cases/fourslash/codeFixAddMissingProperties33.ts b/tests/cases/fourslash/codeFixAddMissingProperties33.ts
index c034471a4205a..4ada2d89fdc54 100644
--- a/tests/cases/fourslash/codeFixAddMissingProperties33.ts
+++ b/tests/cases/fourslash/codeFixAddMissingProperties33.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @strict: false
 ////interface Foo {
 ////    a: number;
 ////    b: string;
diff --git a/tests/cases/fourslash/codeFixAddMissingProperties37.ts b/tests/cases/fourslash/codeFixAddMissingProperties37.ts
index cdc0b7e82f775..9811e04e93324 100644
--- a/tests/cases/fourslash/codeFixAddMissingProperties37.ts
+++ b/tests/cases/fourslash/codeFixAddMissingProperties37.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////interface I {
 ////    x: number;
 ////    y: number;
diff --git a/tests/cases/fourslash/codeFixAddMissingProperties43.ts b/tests/cases/fourslash/codeFixAddMissingProperties43.ts
index bf50ec73974c9..086ef47fb0f25 100644
--- a/tests/cases/fourslash/codeFixAddMissingProperties43.ts
+++ b/tests/cases/fourslash/codeFixAddMissingProperties43.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////interface Foo {
 ////    a: number;
 ////    b: string;
diff --git a/tests/cases/fourslash/codeFixAddMissingProperties44.ts b/tests/cases/fourslash/codeFixAddMissingProperties44.ts
index 5cb87bd2a53d9..f648912e8ab40 100644
--- a/tests/cases/fourslash/codeFixAddMissingProperties44.ts
+++ b/tests/cases/fourslash/codeFixAddMissingProperties44.ts
@@ -1,4 +1,5 @@
 /// <reference path='fourslash.ts' />
+// @strict: false
 // @lib: es2020
 // @target: es2020
 
diff --git a/tests/cases/fourslash/codeFixAddMissingProperties6.ts b/tests/cases/fourslash/codeFixAddMissingProperties6.ts
index d4d4e2eb8dd98..b042ba5aa1970 100644
--- a/tests/cases/fourslash/codeFixAddMissingProperties6.ts
+++ b/tests/cases/fourslash/codeFixAddMissingProperties6.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////interface I {
 ////    x: number;
 ////    y: number;
diff --git a/tests/cases/fourslash/codeFixAwaitInSyncFunction13.ts b/tests/cases/fourslash/codeFixAwaitInSyncFunction13.ts
index 57fb74a4fe091..a1fc9b722936f 100644
--- a/tests/cases/fourslash/codeFixAwaitInSyncFunction13.ts
+++ b/tests/cases/fourslash/codeFixAwaitInSyncFunction13.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 ////const f: () => Promise<number | string> = () => {
 ////    await Promise.resolve('foo');
 ////}
diff --git a/tests/cases/fourslash/codeFixAwaitInSyncFunction6.5.ts b/tests/cases/fourslash/codeFixAwaitInSyncFunction6.5.ts
index b33d50078ef19..99d54ddd95a53 100644
--- a/tests/cases/fourslash/codeFixAwaitInSyncFunction6.5.ts
+++ b/tests/cases/fourslash/codeFixAwaitInSyncFunction6.5.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////const f = promise => {
 ////    await promise;
 ////}
diff --git a/tests/cases/fourslash/codeFixAwaitInSyncFunction6.ts b/tests/cases/fourslash/codeFixAwaitInSyncFunction6.ts
index 5fc50a4f9d7f5..314edcc3ce63d 100644
--- a/tests/cases/fourslash/codeFixAwaitInSyncFunction6.ts
+++ b/tests/cases/fourslash/codeFixAwaitInSyncFunction6.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////const f = (promise) => {
 ////    await promise;
 ////}
diff --git a/tests/cases/fourslash/codeFixCannotFindModule_suggestion.ts b/tests/cases/fourslash/codeFixCannotFindModule_suggestion.ts
index 83e17f170ba0e..205a1c9a84f02 100644
--- a/tests/cases/fourslash/codeFixCannotFindModule_suggestion.ts
+++ b/tests/cases/fourslash/codeFixCannotFindModule_suggestion.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @moduleResolution: bundler
 // @Filename: /node_modules/abs/subModule.js
 ////export const x = 0;
diff --git a/tests/cases/fourslash/codeFixChangeJSDocSyntax15.ts b/tests/cases/fourslash/codeFixChangeJSDocSyntax15.ts
index 748eae2716189..832e8df3926a7 100644
--- a/tests/cases/fourslash/codeFixChangeJSDocSyntax15.ts
+++ b/tests/cases/fourslash/codeFixChangeJSDocSyntax15.ts
@@ -1,4 +1,5 @@
 /// <reference path='fourslash.ts' />
+// @strict: false
 //// var f = <[|function(number?): number|]>(x => x);
 
 verify.codeFix({
diff --git a/tests/cases/fourslash/codeFixClassExtendAbstractMethodWithLongName.ts b/tests/cases/fourslash/codeFixClassExtendAbstractMethodWithLongName.ts
index 313b85657312c..7ca369c20761c 100644
--- a/tests/cases/fourslash/codeFixClassExtendAbstractMethodWithLongName.ts
+++ b/tests/cases/fourslash/codeFixClassExtendAbstractMethodWithLongName.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 ////namespace some.really.long.generated.type.goes.here.you.know.this_.should.be.pretty.simple {
 ////  export interface Yah {}
 ////}
diff --git a/tests/cases/fourslash/codeFixClassExtendAbstractSomePropertiesPresent.ts b/tests/cases/fourslash/codeFixClassExtendAbstractSomePropertiesPresent.ts
index 0a9df34bc8851..b127cfefda22e 100644
--- a/tests/cases/fourslash/codeFixClassExtendAbstractSomePropertiesPresent.ts
+++ b/tests/cases/fourslash/codeFixClassExtendAbstractSomePropertiesPresent.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noImplicitOverride: true
 //// abstract class A {
 ////    abstract x: number;
diff --git a/tests/cases/fourslash/codeFixClassImplementClassMemberAnonymousClass.ts b/tests/cases/fourslash/codeFixClassImplementClassMemberAnonymousClass.ts
index ee8b8cafffeae..84b9236c94847 100644
--- a/tests/cases/fourslash/codeFixClassImplementClassMemberAnonymousClass.ts
+++ b/tests/cases/fourslash/codeFixClassImplementClassMemberAnonymousClass.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// class A {
 ////     foo() {
 ////         return class { x: number; }
diff --git a/tests/cases/fourslash/codeFixClassImplementClassPropertyModifiers.ts b/tests/cases/fourslash/codeFixClassImplementClassPropertyModifiers.ts
index 9614213798fb8..d20c3302b5e55 100644
--- a/tests/cases/fourslash/codeFixClassImplementClassPropertyModifiers.ts
+++ b/tests/cases/fourslash/codeFixClassImplementClassPropertyModifiers.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////abstract class A {
 ////    abstract x: number;
 ////    private y: number;
diff --git a/tests/cases/fourslash/codeFixClassImplementClassPropertyTypeQuery.ts b/tests/cases/fourslash/codeFixClassImplementClassPropertyTypeQuery.ts
index 3c34de1e1bf61..fe2f291c2b654 100644
--- a/tests/cases/fourslash/codeFixClassImplementClassPropertyTypeQuery.ts
+++ b/tests/cases/fourslash/codeFixClassImplementClassPropertyTypeQuery.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////class A {
 ////    A: typeof A;
 ////}
diff --git a/tests/cases/fourslash/codeFixClassImplementDeepInheritance.ts b/tests/cases/fourslash/codeFixClassImplementDeepInheritance.ts
index c9a568effbf8a..1f01ea708c271 100644
--- a/tests/cases/fourslash/codeFixClassImplementDeepInheritance.ts
+++ b/tests/cases/fourslash/codeFixClassImplementDeepInheritance.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////// Referenced throughout the inheritance chain.
 ////interface I0 { a: number }
 ////
diff --git a/tests/cases/fourslash/codeFixClassImplementInterfaceComputedPropertyNameWellKnownSymbols.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceComputedPropertyNameWellKnownSymbols.ts
index 371d6115b14bb..f9eebb3e727d8 100644
--- a/tests/cases/fourslash/codeFixClassImplementInterfaceComputedPropertyNameWellKnownSymbols.ts
+++ b/tests/cases/fourslash/codeFixClassImplementInterfaceComputedPropertyNameWellKnownSymbols.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @lib: es2017
 
 ////interface I<Species> {
diff --git a/tests/cases/fourslash/codeFixClassImplementInterfaceDuplicateMember2.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceDuplicateMember2.ts
index 9b4831e07024d..0058806179c39 100644
--- a/tests/cases/fourslash/codeFixClassImplementInterfaceDuplicateMember2.ts
+++ b/tests/cases/fourslash/codeFixClassImplementInterfaceDuplicateMember2.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// interface I1 {
 ////     x: number;
 //// }
diff --git a/tests/cases/fourslash/codeFixClassImplementInterfaceHeritageClauseAlreadyHaveMember.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceHeritageClauseAlreadyHaveMember.ts
index b67bd966f9ea0..6c9923b62a3be 100644
--- a/tests/cases/fourslash/codeFixClassImplementInterfaceHeritageClauseAlreadyHaveMember.ts
+++ b/tests/cases/fourslash/codeFixClassImplementInterfaceHeritageClauseAlreadyHaveMember.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// class Base {
 ////     foo: number;
 //// }
diff --git a/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements1.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements1.ts
index 13d58d0ad6e9b..0be3862475738 100644
--- a/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements1.ts
+++ b/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements1.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// interface I1 {
 ////     x: number;
 //// }
diff --git a/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements2.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements2.ts
index 946b6495c5f98..517ce22074043 100644
--- a/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements2.ts
+++ b/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplements2.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// interface I1 {
 ////     x: number;
 //// }
diff --git a/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplementsIntersection2.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplementsIntersection2.ts
index e43c44063e634..8b7bb55705aee 100644
--- a/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplementsIntersection2.ts
+++ b/tests/cases/fourslash/codeFixClassImplementInterfaceMultipleImplementsIntersection2.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// interface I1 {
 ////     x: number;
 //// }
diff --git a/tests/cases/fourslash/codeFixClassImplementInterfaceOptionalProperty.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceOptionalProperty.ts
index 9cb6f47773329..6c2b7717f381d 100644
--- a/tests/cases/fourslash/codeFixClassImplementInterfaceOptionalProperty.ts
+++ b/tests/cases/fourslash/codeFixClassImplementInterfaceOptionalProperty.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////interface IPerson {
 ////    name: string;
 ////    birthday?: string;
diff --git a/tests/cases/fourslash/codeFixClassImplementInterfaceSomePropertiesPresent.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceSomePropertiesPresent.ts
index 4b61ea41e40b7..2b93b0e4a78e9 100644
--- a/tests/cases/fourslash/codeFixClassImplementInterfaceSomePropertiesPresent.ts
+++ b/tests/cases/fourslash/codeFixClassImplementInterfaceSomePropertiesPresent.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////
 //// interface I {
 ////     x: number;
diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue10.ts b/tests/cases/fourslash/codeFixCorrectReturnValue10.ts
index 61523d804b1a7..89ab1a6b9be15 100644
--- a/tests/cases/fourslash/codeFixCorrectReturnValue10.ts
+++ b/tests/cases/fourslash/codeFixCorrectReturnValue10.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// const a: ((() => number) | (() => undefined)) = () => { 1 }
 
 verify.codeFixAvailable([
diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue18.ts b/tests/cases/fourslash/codeFixCorrectReturnValue18.ts
index a5f7eca4c1ab0..3e911df6577b0 100644
--- a/tests/cases/fourslash/codeFixCorrectReturnValue18.ts
+++ b/tests/cases/fourslash/codeFixCorrectReturnValue18.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //@Filename: file.tsx
 //// declare namespace JSX {
 ////     interface Element { }
diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue19.ts b/tests/cases/fourslash/codeFixCorrectReturnValue19.ts
index 4b13495bac63e..3bda538a4f50d 100644
--- a/tests/cases/fourslash/codeFixCorrectReturnValue19.ts
+++ b/tests/cases/fourslash/codeFixCorrectReturnValue19.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //@Filename: file.tsx
 //// declare namespace JSX {
 ////     interface Element { }
diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue20.ts b/tests/cases/fourslash/codeFixCorrectReturnValue20.ts
index 81072badec043..fa654e987af30 100644
--- a/tests/cases/fourslash/codeFixCorrectReturnValue20.ts
+++ b/tests/cases/fourslash/codeFixCorrectReturnValue20.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //@Filename: file.tsx
 //// declare namespace JSX {
 ////     interface Element { }
diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue8.ts b/tests/cases/fourslash/codeFixCorrectReturnValue8.ts
index 640f84af4d047..b1ff11eedb3c5 100644
--- a/tests/cases/fourslash/codeFixCorrectReturnValue8.ts
+++ b/tests/cases/fourslash/codeFixCorrectReturnValue8.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// function Foo (a: (() => number) | (() => undefined) ) { a() }
 //// Foo(() => { 1 })
 
diff --git a/tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile6.ts b/tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile6.ts
index 952628c6cac89..7db7808c46e38 100644
--- a/tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile6.ts
+++ b/tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile6.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @allowjs: true
 // @noEmit: true
 // @checkJs: true
diff --git a/tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile7.ts b/tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile7.ts
index 11f027d4f35b9..b68de9267e672 100644
--- a/tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile7.ts
+++ b/tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile7.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @allowjs: true
 // @noEmit: true
 // @checkJs: true
diff --git a/tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile8.ts b/tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile8.ts
index 334b275c87771..5f20a9502aed9 100644
--- a/tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile8.ts
+++ b/tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile8.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @allowjs: true
 // @noEmit: true
 // @checkJs: true
diff --git a/tests/cases/fourslash/codeFixForgottenThisPropertyAccess01.ts b/tests/cases/fourslash/codeFixForgottenThisPropertyAccess01.ts
index 22ca176aa032d..5f0dddaabcf8d 100644
--- a/tests/cases/fourslash/codeFixForgottenThisPropertyAccess01.ts
+++ b/tests/cases/fourslash/codeFixForgottenThisPropertyAccess01.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @Filename: /a.ts
 ////export const foo = 0;
 
diff --git a/tests/cases/fourslash/codeFixForgottenThisPropertyAccess02.ts b/tests/cases/fourslash/codeFixForgottenThisPropertyAccess02.ts
index 6f6c6f5510d41..ec019c348b8d0 100644
--- a/tests/cases/fourslash/codeFixForgottenThisPropertyAccess02.ts
+++ b/tests/cases/fourslash/codeFixForgottenThisPropertyAccess02.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////class C {
 ////    constructor(public foo) {
 ////    }
diff --git a/tests/cases/fourslash/codeFixForgottenThisPropertyAccess03.ts b/tests/cases/fourslash/codeFixForgottenThisPropertyAccess03.ts
index 2dd1c47b6f7a3..52b7c7faa66e0 100644
--- a/tests/cases/fourslash/codeFixForgottenThisPropertyAccess03.ts
+++ b/tests/cases/fourslash/codeFixForgottenThisPropertyAccess03.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////class C {
 ////    foo: number;
 ////    constructor() {[|
diff --git a/tests/cases/fourslash/codeFixInferFromUsageConstructor.ts b/tests/cases/fourslash/codeFixInferFromUsageConstructor.ts
index aa74fb2f6ffb2..d9a7e062ebc00 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageConstructor.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageConstructor.ts
@@ -1,4 +1,5 @@
 /// <reference path='fourslash.ts' />
+// @strict: false
 // @strictNullChecks: true
 
 ////class TokenType {
diff --git a/tests/cases/fourslash/codeFixInferFromUsageConstructorFunctionJS.ts b/tests/cases/fourslash/codeFixInferFromUsageConstructorFunctionJS.ts
index 2177e5b8ea03c..894d34fa18535 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageConstructorFunctionJS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageConstructorFunctionJS.ts
@@ -1,4 +1,5 @@
 /// <reference path='fourslash.ts' />
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noImplicitAny: true
diff --git a/tests/cases/fourslash/codeFixInferFromUsageGetter2.ts b/tests/cases/fourslash/codeFixInferFromUsageGetter2.ts
index a50d471ad12d3..38649188bd316 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageGetter2.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageGetter2.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noImplicitAny: true
 ////class C {
 ////    [|get x() |]{
diff --git a/tests/cases/fourslash/codeFixInferFromUsageInaccessibleTypes.ts b/tests/cases/fourslash/codeFixInferFromUsageInaccessibleTypes.ts
index 91dfcffafc0d8..10687392cce2e 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageInaccessibleTypes.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageInaccessibleTypes.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noImplicitAny: true
 ////function f1(a) { a; }
 ////function h1() {
diff --git a/tests/cases/fourslash/codeFixInferFromUsageOptionalParam.ts b/tests/cases/fourslash/codeFixInferFromUsageOptionalParam.ts
index f9b7277e4cc73..3796cdd1efcf8 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageOptionalParam.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageOptionalParam.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noImplicitAny: true
 ////function f([|a? |]){
 ////    a;
diff --git a/tests/cases/fourslash/codeFixInferFromUsageOptionalParamJS.ts b/tests/cases/fourslash/codeFixInferFromUsageOptionalParamJS.ts
index dbf29fe2f5d4e..d18b35aedf54b 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageOptionalParamJS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageOptionalParamJS.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noImplicitAny: true
diff --git a/tests/cases/fourslash/codeFixInferFromUsageRestParam.ts b/tests/cases/fourslash/codeFixInferFromUsageRestParam.ts
index b4713181d9ad9..b4179fb15b59f 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageRestParam.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageRestParam.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noImplicitAny: true
 ////function f(a: number, [|...rest |]){
 ////    a; rest;
diff --git a/tests/cases/fourslash/codeFixInferFromUsageRestParam2.ts b/tests/cases/fourslash/codeFixInferFromUsageRestParam2.ts
index 0b0d0e1dfbfa9..15fd04c6271d1 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageRestParam2.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageRestParam2.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noImplicitAny: true
 ////function f(a: number, [|...rest |]){
 ////    a; rest;
diff --git a/tests/cases/fourslash/codeFixInferFromUsageRestParam2JS.ts b/tests/cases/fourslash/codeFixInferFromUsageRestParam2JS.ts
index d5c1fd54bb59a..1b3e36430a4f2 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageRestParam2JS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageRestParam2JS.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noImplicitAny: true
diff --git a/tests/cases/fourslash/codeFixInferFromUsageRestParamJS.ts b/tests/cases/fourslash/codeFixInferFromUsageRestParamJS.ts
index 4b7f046ca18af..d6086ebf6dbbe 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageRestParamJS.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageRestParamJS.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noImplicitAny: true
diff --git a/tests/cases/fourslash/codeFixInferFromUsageString.ts b/tests/cases/fourslash/codeFixInferFromUsageString.ts
index d58998cf4a31a..a6c66af0511ce 100644
--- a/tests/cases/fourslash/codeFixInferFromUsageString.ts
+++ b/tests/cases/fourslash/codeFixInferFromUsageString.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noImplicitAny: true
 //// function foo([|p, a, b |]) {
 ////     var x
diff --git a/tests/cases/fourslash/codeFixInitializePrivatePropertyJS.ts b/tests/cases/fourslash/codeFixInitializePrivatePropertyJS.ts
index 1b991d06a1c5c..b61be3d567329 100644
--- a/tests/cases/fourslash/codeFixInitializePrivatePropertyJS.ts
+++ b/tests/cases/fourslash/codeFixInitializePrivatePropertyJS.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @allowjs: true
 // @checkJs: true
 
diff --git a/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports28-long-types.ts b/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports28-long-types.ts
index 1de6a9ea124d7..a3ef35e5ff4a0 100644
--- a/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports28-long-types.ts
+++ b/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports28-long-types.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 // @isolatedDeclarations: true
 // @declaration: true
 // fileName: code.ts
diff --git a/tests/cases/fourslash/codeFixOverrideModifier10.ts b/tests/cases/fourslash/codeFixOverrideModifier10.ts
index 362fd859608bc..0e2af30da7024 100644
--- a/tests/cases/fourslash/codeFixOverrideModifier10.ts
+++ b/tests/cases/fourslash/codeFixOverrideModifier10.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noImplicitOverride: true
 
 //// class B {
diff --git a/tests/cases/fourslash/codeFixOverrideModifier9.ts b/tests/cases/fourslash/codeFixOverrideModifier9.ts
index 0361a75e52fe2..4b581dd1f4787 100644
--- a/tests/cases/fourslash/codeFixOverrideModifier9.ts
+++ b/tests/cases/fourslash/codeFixOverrideModifier9.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noImplicitOverride: true
 
 //// class B {
diff --git a/tests/cases/fourslash/codeFixOverrideModifier_js1.ts b/tests/cases/fourslash/codeFixOverrideModifier_js1.ts
index 8f3584021cb92..bd8c4f4876d01 100644
--- a/tests/cases/fourslash/codeFixOverrideModifier_js1.ts
+++ b/tests/cases/fourslash/codeFixOverrideModifier_js1.ts
@@ -1,4 +1,5 @@
 /// <reference path='fourslash.ts' />
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
diff --git a/tests/cases/fourslash/codeFixRenameUnmatchedParameterJS1.ts b/tests/cases/fourslash/codeFixRenameUnmatchedParameterJS1.ts
index ccc7c97115026..f880c469aa01a 100644
--- a/tests/cases/fourslash/codeFixRenameUnmatchedParameterJS1.ts
+++ b/tests/cases/fourslash/codeFixRenameUnmatchedParameterJS1.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @filename: /a.js
diff --git a/tests/cases/fourslash/codeFixRenameUnmatchedParameterJS2.ts b/tests/cases/fourslash/codeFixRenameUnmatchedParameterJS2.ts
index 89acd2ff5904f..02f14bf1b447c 100644
--- a/tests/cases/fourslash/codeFixRenameUnmatchedParameterJS2.ts
+++ b/tests/cases/fourslash/codeFixRenameUnmatchedParameterJS2.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @filename: /a.js
diff --git a/tests/cases/fourslash/codeFixRenameUnmatchedParameterJS3.ts b/tests/cases/fourslash/codeFixRenameUnmatchedParameterJS3.ts
index 13c11a224c9b9..f1f97a0e70d47 100644
--- a/tests/cases/fourslash/codeFixRenameUnmatchedParameterJS3.ts
+++ b/tests/cases/fourslash/codeFixRenameUnmatchedParameterJS3.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 // @filename: /a.js
diff --git a/tests/cases/fourslash/codeFixSpellingVsMissingMember.ts b/tests/cases/fourslash/codeFixSpellingVsMissingMember.ts
index 71fd41d5c7c01..5352f4b4a9599 100644
--- a/tests/cases/fourslash/codeFixSpellingVsMissingMember.ts
+++ b/tests/cases/fourslash/codeFixSpellingVsMissingMember.ts
@@ -2,6 +2,7 @@
 
 // Tests that the spelling fix is returned first.
 
+// @strict: false
 ////class C {
 ////    foof: number;
 ////    method() {
diff --git a/tests/cases/fourslash/codeFixUndeclaredAcrossFiles1.ts b/tests/cases/fourslash/codeFixUndeclaredAcrossFiles1.ts
index a8171668751d2..73f72c499d15c 100644
--- a/tests/cases/fourslash/codeFixUndeclaredAcrossFiles1.ts
+++ b/tests/cases/fourslash/codeFixUndeclaredAcrossFiles1.ts
@@ -1,4 +1,5 @@
 /// <reference path='fourslash.ts' />
+// @strict: false
 // @allowJs: true
 // @checkJs: true
 
diff --git a/tests/cases/fourslash/codeFixUndeclaredClassInstance.ts b/tests/cases/fourslash/codeFixUndeclaredClassInstance.ts
index 024ec144092c8..a432861ae5d6d 100644
--- a/tests/cases/fourslash/codeFixUndeclaredClassInstance.ts
+++ b/tests/cases/fourslash/codeFixUndeclaredClassInstance.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// class A {
 ////     a: number;
 ////     b: string;
diff --git a/tests/cases/fourslash/codeFixUndeclaredClassInstanceWithTypeParams.ts b/tests/cases/fourslash/codeFixUndeclaredClassInstanceWithTypeParams.ts
index 34e359feea89f..9711ad9b959a8 100644
--- a/tests/cases/fourslash/codeFixUndeclaredClassInstanceWithTypeParams.ts
+++ b/tests/cases/fourslash/codeFixUndeclaredClassInstanceWithTypeParams.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// class A<T> {
 ////     a: number;
 ////     b: string;
diff --git a/tests/cases/fourslash/codeFixUndeclaredPropertyFunctionEmptyClass.ts b/tests/cases/fourslash/codeFixUndeclaredPropertyFunctionEmptyClass.ts
index 6f0a5de3557b1..1bf54f8fc213b 100644
--- a/tests/cases/fourslash/codeFixUndeclaredPropertyFunctionEmptyClass.ts
+++ b/tests/cases/fourslash/codeFixUndeclaredPropertyFunctionEmptyClass.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// [|class A {
 ////     constructor() {
 ////         this.x = function(x: number, y?: A){
diff --git a/tests/cases/fourslash/codeFixUndeclaredPropertyFunctionNonEmptyClass.ts b/tests/cases/fourslash/codeFixUndeclaredPropertyFunctionNonEmptyClass.ts
index 30d7e13cb56cb..acda34621165b 100644
--- a/tests/cases/fourslash/codeFixUndeclaredPropertyFunctionNonEmptyClass.ts
+++ b/tests/cases/fourslash/codeFixUndeclaredPropertyFunctionNonEmptyClass.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// [|class A {
 ////     y: number;
 ////     constructor(public a: number) {
diff --git a/tests/cases/fourslash/codeFixUndeclaredPropertyObjectLiteral.ts b/tests/cases/fourslash/codeFixUndeclaredPropertyObjectLiteral.ts
index a2647c5a21e33..8eec6c164f6f0 100644
--- a/tests/cases/fourslash/codeFixUndeclaredPropertyObjectLiteral.ts
+++ b/tests/cases/fourslash/codeFixUndeclaredPropertyObjectLiteral.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// [|class A {
 ////     constructor() {
 ////         let e: any = 10;
diff --git a/tests/cases/fourslash/codeFixUnusedIdentifier_deleteWrite2.ts b/tests/cases/fourslash/codeFixUnusedIdentifier_deleteWrite2.ts
index 2fe01399355a0..8723e1e4a16b4 100644
--- a/tests/cases/fourslash/codeFixUnusedIdentifier_deleteWrite2.ts
+++ b/tests/cases/fourslash/codeFixUnusedIdentifier_deleteWrite2.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noLib: true
 // @noUnusedLocals: true
 
diff --git a/tests/cases/fourslash/codeFixUnusedIdentifier_prefix.ts b/tests/cases/fourslash/codeFixUnusedIdentifier_prefix.ts
index 80b2b9bb75ceb..55b4e00a1c404 100644
--- a/tests/cases/fourslash/codeFixUnusedIdentifier_prefix.ts
+++ b/tests/cases/fourslash/codeFixUnusedIdentifier_prefix.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noUnusedLocals: true
 // @noUnusedParameters: true
 
diff --git a/tests/cases/fourslash/codeFixUnusedIdentifier_suggestion.ts b/tests/cases/fourslash/codeFixUnusedIdentifier_suggestion.ts
index 19e06e0616593..08574d2d655ed 100644
--- a/tests/cases/fourslash/codeFixUnusedIdentifier_suggestion.ts
+++ b/tests/cases/fourslash/codeFixUnusedIdentifier_suggestion.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////function f([|p|]) {
 ////    const [|x|] = 0;
 ////}
diff --git a/tests/cases/fourslash/codefixInferFromUsageNullish.ts b/tests/cases/fourslash/codefixInferFromUsageNullish.ts
index d1073a9d9a958..66a2f04264f5f 100644
--- a/tests/cases/fourslash/codefixInferFromUsageNullish.ts
+++ b/tests/cases/fourslash/codefixInferFromUsageNullish.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noImplicitAny: true
 ////declare const a: string
 ////function wat([|b |]) {
diff --git a/tests/cases/fourslash/commentsInterfaceFourslash.ts b/tests/cases/fourslash/commentsInterfaceFourslash.ts
index 9501e9ba28723..aa06e3ccaab7f 100644
--- a/tests/cases/fourslash/commentsInterfaceFourslash.ts
+++ b/tests/cases/fourslash/commentsInterfaceFourslash.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 /////** this is interface 1*/
 ////interface i/*1*/1 {
 ////}
diff --git a/tests/cases/fourslash/completionAfterAtChar.ts b/tests/cases/fourslash/completionAfterAtChar.ts
index dbdfc89a27ca6..b6552527d250b 100644
--- a/tests/cases/fourslash/completionAfterAtChar.ts
+++ b/tests/cases/fourslash/completionAfterAtChar.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////@a/**/
 
 verify.completions({ marker: "", exact: completion.globals });
diff --git a/tests/cases/fourslash/completionAfterBackslashFollowingString.ts b/tests/cases/fourslash/completionAfterBackslashFollowingString.ts
index f3b1b6b195bf1..fc4255d96f6f0 100644
--- a/tests/cases/fourslash/completionAfterBackslashFollowingString.ts
+++ b/tests/cases/fourslash/completionAfterBackslashFollowingString.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////Harness.newLine = ""\n/**/
 
 verify.completions({ marker: "", exact: completion.globals });
diff --git a/tests/cases/fourslash/completionAfterBrace.ts b/tests/cases/fourslash/completionAfterBrace.ts
index b9951459137c1..0401b0aff996e 100644
--- a/tests/cases/fourslash/completionAfterBrace.ts
+++ b/tests/cases/fourslash/completionAfterBrace.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////
 //// }/**/
 ////
diff --git a/tests/cases/fourslash/completionAfterDotDotDot.ts b/tests/cases/fourslash/completionAfterDotDotDot.ts
index fc9ab05bbaede..8dc9af83d5e4c 100644
--- a/tests/cases/fourslash/completionAfterDotDotDot.ts
+++ b/tests/cases/fourslash/completionAfterDotDotDot.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////.../**/
 
 verify.completions({ marker: "", exact: completion.globals });
diff --git a/tests/cases/fourslash/completionAfterGlobalThis.ts b/tests/cases/fourslash/completionAfterGlobalThis.ts
index f1c8aa59302f1..6c193ef3adc73 100644
--- a/tests/cases/fourslash/completionAfterGlobalThis.ts
+++ b/tests/cases/fourslash/completionAfterGlobalThis.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////globalThis./**/
 
 verify.completions({
diff --git a/tests/cases/fourslash/completionAfterNewline.ts b/tests/cases/fourslash/completionAfterNewline.ts
index 94637a9fd9b41..ec88be07df995 100644
--- a/tests/cases/fourslash/completionAfterNewline.ts
+++ b/tests/cases/fourslash/completionAfterNewline.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 // issue: https://github.com/microsoft/TypeScript/issues/54729
 // Tests that `isCompletionListBlocker` returns true at position 1, and returns false after a newline.
 
diff --git a/tests/cases/fourslash/completionAfterNewline2.ts b/tests/cases/fourslash/completionAfterNewline2.ts
index 495800ce17875..f50d2a2698c69 100644
--- a/tests/cases/fourslash/completionAfterNewline2.ts
+++ b/tests/cases/fourslash/completionAfterNewline2.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 // issue: https://github.com/microsoft/TypeScript/issues/54729
 // Tests that `isCompletionListBlocker` returns true at position 1, and returns false after a newline.
 
diff --git a/tests/cases/fourslash/completionAtCaseClause.ts b/tests/cases/fourslash/completionAtCaseClause.ts
index 48c5a1c465856..17582373978b4 100644
--- a/tests/cases/fourslash/completionAtCaseClause.ts
+++ b/tests/cases/fourslash/completionAtCaseClause.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 ////case /**/
 
 verify.completions({ marker: "", exact: completion.globals });
diff --git a/tests/cases/fourslash/completionCloneQuestionToken.ts b/tests/cases/fourslash/completionCloneQuestionToken.ts
index 67df1cabb4a90..71ea89081b436 100644
--- a/tests/cases/fourslash/completionCloneQuestionToken.ts
+++ b/tests/cases/fourslash/completionCloneQuestionToken.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 // @Filename: /file2.ts
 //// type TCallback<T = any> = (options: T) => any;
 //// type InKeyOf<E> = { [K in keyof E]?: TCallback<E[K]>; };
diff --git a/tests/cases/fourslash/completionEntryForUnionMethod.ts b/tests/cases/fourslash/completionEntryForUnionMethod.ts
index 48dce525f32b2..402559018d296 100644
--- a/tests/cases/fourslash/completionEntryForUnionMethod.ts
+++ b/tests/cases/fourslash/completionEntryForUnionMethod.ts
@@ -1,5 +1,7 @@
 ///<reference path="fourslash.ts" />
 
+// @lib: es5
+
 ////var y: Array<string>|Array<number>;
 ////y.map/**/(
 
diff --git a/tests/cases/fourslash/completionEntryInJsFile.ts b/tests/cases/fourslash/completionEntryInJsFile.ts
index 3d7acf8ad4357..dd0a9c8cd2535 100644
--- a/tests/cases/fourslash/completionEntryInJsFile.ts
+++ b/tests/cases/fourslash/completionEntryInJsFile.ts
@@ -1,5 +1,6 @@
 ///<reference path="fourslash.ts" />
 
+// @lib: es5
 // @allowJs: true
 // @Filename: /Foo.js
 //// /*global*/
diff --git a/tests/cases/fourslash/completionForStringLiteral13.ts b/tests/cases/fourslash/completionForStringLiteral13.ts
index 5e3c7a56a2e26..5e0d12f3bf706 100644
--- a/tests/cases/fourslash/completionForStringLiteral13.ts
+++ b/tests/cases/fourslash/completionForStringLiteral13.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////interface SymbolConstructor {
 ////    readonly species: symbol;
 ////}
diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImport14.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport14.ts
index e3bc4eccdc1f2..8f7423650efc5 100644
--- a/tests/cases/fourslash/completionForStringLiteralNonrelativeImport14.ts
+++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport14.ts
@@ -5,6 +5,7 @@
 // @Filename: tsconfig.json
 //// {
 ////     "compilerOptions": {
+////         "lib": ["es5"],
 ////         "baseUrl": "./modules",
 ////         "paths": {
 ////             "/module1": ["some/path/whatever.ts"],
@@ -27,7 +28,7 @@
 
 verify.completions({
     marker: ["import_as0",],
-    exact: ["lib", "lib.decorators", "lib.decorators.legacy", "tests",
+    exact: ["home", "tests",
         {
             name: "/module1",
             replacementSpan: {
@@ -50,7 +51,7 @@ verify.completions({
 
 verify.completions({
     marker: ["import_equals0",],
-    exact: ["lib", "lib.decorators", "lib.decorators.legacy", "tests",
+    exact: ["home", "tests",
         {
             name: "/module1",
             replacementSpan: {
@@ -72,7 +73,7 @@ verify.completions({
 
 verify.completions({
     marker: ["require0",],
-    exact: ["lib", "lib.decorators", "lib.decorators.legacy", "tests",
+    exact: ["home", "tests",
         {
             name: "/module1",
             replacementSpan: {
diff --git a/tests/cases/fourslash/completionImportMeta.ts b/tests/cases/fourslash/completionImportMeta.ts
index 255c1aa569af1..08f241e1079ad 100644
--- a/tests/cases/fourslash/completionImportMeta.ts
+++ b/tests/cases/fourslash/completionImportMeta.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 // @Filename: a.ts
 ////import./*1*/
 
diff --git a/tests/cases/fourslash/completionInIncompleteCallExpression.ts b/tests/cases/fourslash/completionInIncompleteCallExpression.ts
index eb24d0abce699..947c0c44c5d97 100644
--- a/tests/cases/fourslash/completionInIncompleteCallExpression.ts
+++ b/tests/cases/fourslash/completionInIncompleteCallExpression.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////var array = [1, 2, 4]
 ////function a4(x, y, z) { }
 ////a4(...<crash>/**/
diff --git a/tests/cases/fourslash/completionListAfterRegularExpressionLiteral01.ts b/tests/cases/fourslash/completionListAfterRegularExpressionLiteral01.ts
index 9451280e237b1..b4f7f21d72431 100644
--- a/tests/cases/fourslash/completionListAfterRegularExpressionLiteral01.ts
+++ b/tests/cases/fourslash/completionListAfterRegularExpressionLiteral01.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 ////let v = 100;
 /////a/./**/
 
diff --git a/tests/cases/fourslash/completionListAfterRegularExpressionLiteral1.ts b/tests/cases/fourslash/completionListAfterRegularExpressionLiteral1.ts
index 872b216462510..119ea4103b26f 100644
--- a/tests/cases/fourslash/completionListAfterRegularExpressionLiteral1.ts
+++ b/tests/cases/fourslash/completionListAfterRegularExpressionLiteral1.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 /////a/./**/
 
 verify.completions({
diff --git a/tests/cases/fourslash/completionListAfterStringLiteral1.ts b/tests/cases/fourslash/completionListAfterStringLiteral1.ts
index 51b5903be0193..29252bdbb3525 100644
--- a/tests/cases/fourslash/completionListAfterStringLiteral1.ts
+++ b/tests/cases/fourslash/completionListAfterStringLiteral1.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 ////"a"./**/
 
 verify.completions({
diff --git a/tests/cases/fourslash/completionListBuilderLocations_Modules.ts b/tests/cases/fourslash/completionListBuilderLocations_Modules.ts
index 29530ccbdef53..60a4ea74051d8 100644
--- a/tests/cases/fourslash/completionListBuilderLocations_Modules.ts
+++ b/tests/cases/fourslash/completionListBuilderLocations_Modules.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 ////module A/*moduleName1*/
 
 
diff --git a/tests/cases/fourslash/completionListBuilderLocations_VariableDeclarations.ts b/tests/cases/fourslash/completionListBuilderLocations_VariableDeclarations.ts
index bae2812d9c776..a8522200d4711 100644
--- a/tests/cases/fourslash/completionListBuilderLocations_VariableDeclarations.ts
+++ b/tests/cases/fourslash/completionListBuilderLocations_VariableDeclarations.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 ////var x = a/*var1*/
 
 ////var x = (b/*var2*/
diff --git a/tests/cases/fourslash/completionListClassMembers.ts b/tests/cases/fourslash/completionListClassMembers.ts
index 9e7c920ca1cf6..52569f7926929 100644
--- a/tests/cases/fourslash/completionListClassMembers.ts
+++ b/tests/cases/fourslash/completionListClassMembers.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 
 ////class Class {
 ////    private privateInstanceMethod() { }
diff --git a/tests/cases/fourslash/completionListDefaultTypeArgumentPositionTypeOnly.ts b/tests/cases/fourslash/completionListDefaultTypeArgumentPositionTypeOnly.ts
index d42049c5eccd6..28949ea662e16 100644
--- a/tests/cases/fourslash/completionListDefaultTypeArgumentPositionTypeOnly.ts
+++ b/tests/cases/fourslash/completionListDefaultTypeArgumentPositionTypeOnly.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 //// const foo = "foo";
 //// function test1<T = /*1*/>() {}
 
diff --git a/tests/cases/fourslash/completionListForGenericInstance1.ts b/tests/cases/fourslash/completionListForGenericInstance1.ts
index 718b90ca65c22..ba141dc828aa4 100644
--- a/tests/cases/fourslash/completionListForGenericInstance1.ts
+++ b/tests/cases/fourslash/completionListForGenericInstance1.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////interface Iterator<T, U> {
 ////    (value: T, index: any, list: any): U
 ////}
diff --git a/tests/cases/fourslash/completionListFunctionExpression.ts b/tests/cases/fourslash/completionListFunctionExpression.ts
index 4b7f75dc6e0f3..bb131ed93328e 100644
--- a/tests/cases/fourslash/completionListFunctionExpression.ts
+++ b/tests/cases/fourslash/completionListFunctionExpression.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
+
 ////class DataHandler {
 ////    dataArray: Uint8Array;
 ////    loadData(filename) {
diff --git a/tests/cases/fourslash/completionListFunctionMembers.ts b/tests/cases/fourslash/completionListFunctionMembers.ts
index f53b66b1c0310..5da69c269c630 100644
--- a/tests/cases/fourslash/completionListFunctionMembers.ts
+++ b/tests/cases/fourslash/completionListFunctionMembers.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////function fnc1() {
 ////    var bar = 1;
 ////    function foob(){ }
diff --git a/tests/cases/fourslash/completionListInClassStaticBlocks.ts b/tests/cases/fourslash/completionListInClassStaticBlocks.ts
index c4e1147cb83a8..6f3dd2989b8cc 100644
--- a/tests/cases/fourslash/completionListInClassStaticBlocks.ts
+++ b/tests/cases/fourslash/completionListInClassStaticBlocks.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @target: esnext
 ////class Foo {
 ////    static #a = 1;
diff --git a/tests/cases/fourslash/completionListInComments3.ts b/tests/cases/fourslash/completionListInComments3.ts
index a874ab8e953e1..b5b7d462770e2 100644
--- a/tests/cases/fourslash/completionListInComments3.ts
+++ b/tests/cases/fourslash/completionListInComments3.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 //// /*{| "name": "1" |}
 
 //// /*  {| "name": "2" |}
diff --git a/tests/cases/fourslash/completionListInExtendsClause.ts b/tests/cases/fourslash/completionListInExtendsClause.ts
index 144f99b83e7b6..1aa43acf8f197 100644
--- a/tests/cases/fourslash/completionListInExtendsClause.ts
+++ b/tests/cases/fourslash/completionListInExtendsClause.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 ////interface IFoo {
 ////    method();
 ////}
diff --git a/tests/cases/fourslash/completionListInFunctionDeclaration.ts b/tests/cases/fourslash/completionListInFunctionDeclaration.ts
index 3ba4b7d47755c..ca89e95efd1ab 100644
--- a/tests/cases/fourslash/completionListInFunctionDeclaration.ts
+++ b/tests/cases/fourslash/completionListInFunctionDeclaration.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 ////var a = 0;
 ////function foo(/**/
 
diff --git a/tests/cases/fourslash/completionListInIndexSignature01.ts b/tests/cases/fourslash/completionListInIndexSignature01.ts
index 5bcc01ce8678f..1d64e3dfb207a 100644
--- a/tests/cases/fourslash/completionListInIndexSignature01.ts
+++ b/tests/cases/fourslash/completionListInIndexSignature01.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 ////interface I<T> {
 ////    [/*1*/]: T;
 ////    [/*2*/]: T;
diff --git a/tests/cases/fourslash/completionListInIndexSignature02.ts b/tests/cases/fourslash/completionListInIndexSignature02.ts
index 9f808fe2c3e2c..d8dd7c63fcadf 100644
--- a/tests/cases/fourslash/completionListInIndexSignature02.ts
+++ b/tests/cases/fourslash/completionListInIndexSignature02.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 ////interface I<T> {
 ////    [x: /*1*/]: T;
 ////    [: /*2*/]: T
diff --git a/tests/cases/fourslash/completionListInTemplateLiteralParts1.ts b/tests/cases/fourslash/completionListInTemplateLiteralParts1.ts
index 509b08c80c274..5360e7dc2e58a 100644
--- a/tests/cases/fourslash/completionListInTemplateLiteralParts1.ts
+++ b/tests/cases/fourslash/completionListInTemplateLiteralParts1.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 /////*0*/`  $ { ${/*1*/ 10/*2*/ + 1.1/*3*/ /*4*/} 12312`/*5*/
 ////
 /////*6*/`asdasd${/*7*/ 2 + 1.1 /*8*/} 12312 {
diff --git a/tests/cases/fourslash/completionListInTypeLiteralInTypeParameter9.ts b/tests/cases/fourslash/completionListInTypeLiteralInTypeParameter9.ts
index 13f75f74c8a3a..2306864d902a9 100644
--- a/tests/cases/fourslash/completionListInTypeLiteralInTypeParameter9.ts
+++ b/tests/cases/fourslash/completionListInTypeLiteralInTypeParameter9.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 ////interface Foo {
 ////    one: string;
 ////    two: {
diff --git a/tests/cases/fourslash/completionListInTypeParameterOfClassExpression1.ts b/tests/cases/fourslash/completionListInTypeParameterOfClassExpression1.ts
index 15f150cef62c1..d14036d88c1af 100644
--- a/tests/cases/fourslash/completionListInTypeParameterOfClassExpression1.ts
+++ b/tests/cases/fourslash/completionListInTypeParameterOfClassExpression1.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////var C0 = class D</*0*/
 ////var C1 = class D</*1*/T> {}
 ////var C2 = class D<T, /*2*/
diff --git a/tests/cases/fourslash/completionListInvalidMemberNames2.ts b/tests/cases/fourslash/completionListInvalidMemberNames2.ts
index b7f18b7f71b05..0307431ee8ddc 100644
--- a/tests/cases/fourslash/completionListInvalidMemberNames2.ts
+++ b/tests/cases/fourslash/completionListInvalidMemberNames2.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 // TODO: we should probably support this like we do in completionListInvalidMemberNames.ts
 
 ////declare var Symbol: SymbolConstructor;
diff --git a/tests/cases/fourslash/completionListIsGlobalCompletion.ts b/tests/cases/fourslash/completionListIsGlobalCompletion.ts
index 9516b8e4f34ab..0fb87b80f1977 100644
--- a/tests/cases/fourslash/completionListIsGlobalCompletion.ts
+++ b/tests/cases/fourslash/completionListIsGlobalCompletion.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 // @Filename: file.ts
 ////export var x = 10;
 ////export var y = 10;
diff --git a/tests/cases/fourslash/completionListOnAliases2.ts b/tests/cases/fourslash/completionListOnAliases2.ts
index 3783a270a6b5f..6f41ab240de9c 100644
--- a/tests/cases/fourslash/completionListOnAliases2.ts
+++ b/tests/cases/fourslash/completionListOnAliases2.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 ////namespace M {
 ////    export interface I { }
 ////    export class C {
diff --git a/tests/cases/fourslash/completionListStaticMembers.ts b/tests/cases/fourslash/completionListStaticMembers.ts
index 558fbe64630f8..4722ba9666cd7 100644
--- a/tests/cases/fourslash/completionListStaticMembers.ts
+++ b/tests/cases/fourslash/completionListStaticMembers.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////class Foo {
 ////    static a() {}
 ////    static b() {}
diff --git a/tests/cases/fourslash/completionListStaticProtectedMembers2.ts b/tests/cases/fourslash/completionListStaticProtectedMembers2.ts
index 180211c9aaf49..f5c2dadf83c34 100644
--- a/tests/cases/fourslash/completionListStaticProtectedMembers2.ts
+++ b/tests/cases/fourslash/completionListStaticProtectedMembers2.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////class Base {
 ////    private static privateMethod() { }
 ////    private static privateProperty;
diff --git a/tests/cases/fourslash/completionListStaticProtectedMembers3.ts b/tests/cases/fourslash/completionListStaticProtectedMembers3.ts
index 47b498f97453c..e93a3e27d130a 100644
--- a/tests/cases/fourslash/completionListStaticProtectedMembers3.ts
+++ b/tests/cases/fourslash/completionListStaticProtectedMembers3.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////class Base {
 ////    private static privateMethod() { }
 ////    private static privateProperty;
diff --git a/tests/cases/fourslash/completionListStaticProtectedMembers4.ts b/tests/cases/fourslash/completionListStaticProtectedMembers4.ts
index 10f0d9ec140aa..9f60052dc8943 100644
--- a/tests/cases/fourslash/completionListStaticProtectedMembers4.ts
+++ b/tests/cases/fourslash/completionListStaticProtectedMembers4.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////class Base {
 ////    private static privateMethod() { }
 ////    private static privateProperty;
diff --git a/tests/cases/fourslash/completionListsThroughTransitiveBaseClasses.ts b/tests/cases/fourslash/completionListsThroughTransitiveBaseClasses.ts
index f4fd276502807..0d63653b93f43 100644
--- a/tests/cases/fourslash/completionListsThroughTransitiveBaseClasses.ts
+++ b/tests/cases/fourslash/completionListsThroughTransitiveBaseClasses.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////declare class A {
 ////    static foo;
 ////}
diff --git a/tests/cases/fourslash/completionListsThroughTransitiveBaseClasses2.ts b/tests/cases/fourslash/completionListsThroughTransitiveBaseClasses2.ts
index 5adade8c2a70b..035f030a4819d 100644
--- a/tests/cases/fourslash/completionListsThroughTransitiveBaseClasses2.ts
+++ b/tests/cases/fourslash/completionListsThroughTransitiveBaseClasses2.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////declare class A {
 ////    foo;
 ////}
diff --git a/tests/cases/fourslash/completionNoParentLocation.ts b/tests/cases/fourslash/completionNoParentLocation.ts
index 72fc96c8689aa..1cbf088241cda 100644
--- a/tests/cases/fourslash/completionNoParentLocation.ts
+++ b/tests/cases/fourslash/completionNoParentLocation.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 //// /**/
 //// type foo = any;
 //// declare const foo: any;
diff --git a/tests/cases/fourslash/completionOfInterfaceAndVar.ts b/tests/cases/fourslash/completionOfInterfaceAndVar.ts
index 748078f2b4e97..a591525be4d95 100644
--- a/tests/cases/fourslash/completionOfInterfaceAndVar.ts
+++ b/tests/cases/fourslash/completionOfInterfaceAndVar.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////interface AnalyserNode {
 ////}
 ////declare var AnalyserNode: {
diff --git a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral.ts b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral.ts
index 4ceac5508f4f3..f9b947acbb135 100644
--- a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral.ts
+++ b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
+
 //// declare const foo: number;
 //// interface Empty {}
 //// interface Typed { typed: number; }
diff --git a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral2.ts b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral2.ts
index 54e5a1e75c766..848983ddce668 100644
--- a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral2.ts
+++ b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral2.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
+
 //// const foo = 1;
 //// const bar = 2;
 
diff --git a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral3.ts b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral3.ts
index 37e873abf9da3..02677ad8c8a13 100644
--- a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral3.ts
+++ b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral3.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
+
 //// const foo = 1;
 //// const bar = 2;
 //// const obj = {
diff --git a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral4.ts b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral4.ts
index d35b2d8acd6ee..f96519021a83a 100644
--- a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral4.ts
+++ b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral4.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
+
 //// const foo = 1;
 //// const bar = 2;
 //// const obj: any = {
diff --git a/tests/cases/fourslash/completionTypeAssertion.ts b/tests/cases/fourslash/completionTypeAssertion.ts
index fbfe72ac455cc..99a5b857e65c7 100644
--- a/tests/cases/fourslash/completionTypeAssertion.ts
+++ b/tests/cases/fourslash/completionTypeAssertion.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 //// var x = 'something'
 //// var y = this as/*1*/
 
diff --git a/tests/cases/fourslash/completionTypeGuard.ts b/tests/cases/fourslash/completionTypeGuard.ts
index e072fd5798561..42aa08e084107 100644
--- a/tests/cases/fourslash/completionTypeGuard.ts
+++ b/tests/cases/fourslash/completionTypeGuard.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 //// const x = "str";
 //// function assert1(condition: any, msg?: string): /*1*/ ;
 //// function assert2(condition: any, msg?: string): /*2*/ { }
diff --git a/tests/cases/fourslash/completionsAtGenericTypeArguments.ts b/tests/cases/fourslash/completionsAtGenericTypeArguments.ts
index 216ae6cab703e..79148e8cfb5af 100644
--- a/tests/cases/fourslash/completionsAtGenericTypeArguments.ts
+++ b/tests/cases/fourslash/completionsAtGenericTypeArguments.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 ////class Foo<T1, T2> {}
 ////const foo = new Foo</*1*/, /*2*/,
 ////
diff --git a/tests/cases/fourslash/completionsClassPropertiesAssignment.ts b/tests/cases/fourslash/completionsClassPropertiesAssignment.ts
index 2d1039742212d..521271df03f3a 100644
--- a/tests/cases/fourslash/completionsClassPropertiesAssignment.ts
+++ b/tests/cases/fourslash/completionsClassPropertiesAssignment.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////class Class1 {
 ////   public a = this./*0*/
 ////   protected b = /*1*/
diff --git a/tests/cases/fourslash/completionsCommentsClass.ts b/tests/cases/fourslash/completionsCommentsClass.ts
index 23355469f56d3..78ae3bffb4e62 100644
--- a/tests/cases/fourslash/completionsCommentsClass.ts
+++ b/tests/cases/fourslash/completionsCommentsClass.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 /////** This is class c2 without constructor*/
 ////class c2 {
 ////}
diff --git a/tests/cases/fourslash/completionsCommentsClassMembers.ts b/tests/cases/fourslash/completionsCommentsClassMembers.ts
index 13820c945cb2d..bf505012327d5 100644
--- a/tests/cases/fourslash/completionsCommentsClassMembers.ts
+++ b/tests/cases/fourslash/completionsCommentsClassMembers.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 /////** This is comment for c1*/
 ////class c1 {
 ////    /** p1 is property of c1*/
diff --git a/tests/cases/fourslash/completionsCommentsCommentParsing.ts b/tests/cases/fourslash/completionsCommentsCommentParsing.ts
index e810f6010fdb3..9d82db8e7ab3d 100644
--- a/tests/cases/fourslash/completionsCommentsCommentParsing.ts
+++ b/tests/cases/fourslash/completionsCommentsCommentParsing.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 /////// This is simple /// comments
 ////function simple() {
 ////}
diff --git a/tests/cases/fourslash/completionsCommentsFunctionDeclaration.ts b/tests/cases/fourslash/completionsCommentsFunctionDeclaration.ts
index 604c96113d4c6..2d15446f14d9c 100644
--- a/tests/cases/fourslash/completionsCommentsFunctionDeclaration.ts
+++ b/tests/cases/fourslash/completionsCommentsFunctionDeclaration.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 /////** This comment should appear for foo*/
 ////function foo() {
 ////}
diff --git a/tests/cases/fourslash/completionsCommentsFunctionExpression.ts b/tests/cases/fourslash/completionsCommentsFunctionExpression.ts
index 74f8e1676b39c..e7a26229f6782 100644
--- a/tests/cases/fourslash/completionsCommentsFunctionExpression.ts
+++ b/tests/cases/fourslash/completionsCommentsFunctionExpression.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 // test arrow doc comments
 /////** lambdaFoo var comment*/
 ////var lambdaFoo = /** this is lambda comment*/ (/**param a*/a: number, /**param b*/b: number) => /*2*/a + b;
diff --git a/tests/cases/fourslash/completionsCommitCharactersAfterDot.ts b/tests/cases/fourslash/completionsCommitCharactersAfterDot.ts
index c6acdc7074e25..1711d563b3164 100644
--- a/tests/cases/fourslash/completionsCommitCharactersAfterDot.ts
+++ b/tests/cases/fourslash/completionsCommitCharactersAfterDot.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 //// declare const obj: { banana: 1 };
 //// const x = obj./*1*/
 //// declare module obj./*2*/ {}
diff --git a/tests/cases/fourslash/completionsCommitCharactersGlobal.ts b/tests/cases/fourslash/completionsCommitCharactersGlobal.ts
index 7dd0a498d394b..08d26b2907d8b 100644
--- a/tests/cases/fourslash/completionsCommitCharactersGlobal.ts
+++ b/tests/cases/fourslash/completionsCommitCharactersGlobal.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 //// declare function func(a: string, b: number): { a: string, b: number };
 //// const x1 = func(/*1*/)
 //// const x2 = func
diff --git a/tests/cases/fourslash/completionsExportImport.ts b/tests/cases/fourslash/completionsExportImport.ts
index d3d5055e129ce..9dc2d2322ac88 100644
--- a/tests/cases/fourslash/completionsExportImport.ts
+++ b/tests/cases/fourslash/completionsExportImport.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 ////declare global {
 ////    namespace N {
 ////        const foo: number;
diff --git a/tests/cases/fourslash/completionsImportWithKeyword.ts b/tests/cases/fourslash/completionsImportWithKeyword.ts
index 4c4016bf5494e..19da271f54205 100644
--- a/tests/cases/fourslash/completionsImportWithKeyword.ts
+++ b/tests/cases/fourslash/completionsImportWithKeyword.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @allowJs: true
 // @Filename: a.ts
 //// const f = {
diff --git a/tests/cases/fourslash/completionsImport_ambient.ts b/tests/cases/fourslash/completionsImport_ambient.ts
index a7bc23a5a94de..b3249d12bf89d 100644
--- a/tests/cases/fourslash/completionsImport_ambient.ts
+++ b/tests/cases/fourslash/completionsImport_ambient.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: commonjs
 
 // @Filename: a.d.ts
diff --git a/tests/cases/fourslash/completionsImport_asKeyword.ts b/tests/cases/fourslash/completionsImport_asKeyword.ts
index 87c2d92e165f6..a09e3c61e4a84 100644
--- a/tests/cases/fourslash/completionsImport_asKeyword.ts
+++ b/tests/cases/fourslash/completionsImport_asKeyword.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /a.ts
 ////export function as() {}
 
diff --git a/tests/cases/fourslash/completionsImport_default_reExport.ts b/tests/cases/fourslash/completionsImport_default_reExport.ts
index cdb06c70461f9..0bed4929be473 100644
--- a/tests/cases/fourslash/completionsImport_default_reExport.ts
+++ b/tests/cases/fourslash/completionsImport_default_reExport.ts
@@ -1,4 +1,5 @@
 /// <reference path="fourslash.ts" />
+// @lib: es5
 // @module: commonjs
 // @allowJs: true
 
diff --git a/tests/cases/fourslash/completionsImport_duplicatePackages_scoped.ts b/tests/cases/fourslash/completionsImport_duplicatePackages_scoped.ts
index 567757ffac39f..3fa2f64134cb2 100644
--- a/tests/cases/fourslash/completionsImport_duplicatePackages_scoped.ts
+++ b/tests/cases/fourslash/completionsImport_duplicatePackages_scoped.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: commonjs
 // @esModuleInterop: true
 
diff --git a/tests/cases/fourslash/completionsImport_duplicatePackages_scopedTypes.ts b/tests/cases/fourslash/completionsImport_duplicatePackages_scopedTypes.ts
index 970e6cde0a3fc..9c898113ecde2 100644
--- a/tests/cases/fourslash/completionsImport_duplicatePackages_scopedTypes.ts
+++ b/tests/cases/fourslash/completionsImport_duplicatePackages_scopedTypes.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: commonjs
 // @esModuleInterop: true
 
diff --git a/tests/cases/fourslash/completionsImport_duplicatePackages_scopedTypesAndNotTypes.ts b/tests/cases/fourslash/completionsImport_duplicatePackages_scopedTypesAndNotTypes.ts
index 116d3145fc178..846a504bf8c3a 100644
--- a/tests/cases/fourslash/completionsImport_duplicatePackages_scopedTypesAndNotTypes.ts
+++ b/tests/cases/fourslash/completionsImport_duplicatePackages_scopedTypesAndNotTypes.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: commonjs
 // @esModuleInterop: true
 
diff --git a/tests/cases/fourslash/completionsImport_duplicatePackages_types.ts b/tests/cases/fourslash/completionsImport_duplicatePackages_types.ts
index f29a52c018890..85842cd5d6fba 100644
--- a/tests/cases/fourslash/completionsImport_duplicatePackages_types.ts
+++ b/tests/cases/fourslash/completionsImport_duplicatePackages_types.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: commonjs
 // @esModuleInterop: true
 
diff --git a/tests/cases/fourslash/completionsImport_duplicatePackages_typesAndNotTypes.ts b/tests/cases/fourslash/completionsImport_duplicatePackages_typesAndNotTypes.ts
index bf9218cd82723..c7e13cb073473 100644
--- a/tests/cases/fourslash/completionsImport_duplicatePackages_typesAndNotTypes.ts
+++ b/tests/cases/fourslash/completionsImport_duplicatePackages_typesAndNotTypes.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: commonjs
 // @esModuleInterop: true
 
diff --git a/tests/cases/fourslash/completionsImport_exportEquals_global.ts b/tests/cases/fourslash/completionsImport_exportEquals_global.ts
index 27d26c387b735..f0e9929455d14 100644
--- a/tests/cases/fourslash/completionsImport_exportEquals_global.ts
+++ b/tests/cases/fourslash/completionsImport_exportEquals_global.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: es6
 
 // @Filename: /console.d.ts
diff --git a/tests/cases/fourslash/completionsImport_filteredByPackageJson_ambient.ts b/tests/cases/fourslash/completionsImport_filteredByPackageJson_ambient.ts
index 6c827be3966ee..0025d606e4007 100644
--- a/tests/cases/fourslash/completionsImport_filteredByPackageJson_ambient.ts
+++ b/tests/cases/fourslash/completionsImport_filteredByPackageJson_ambient.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 //@noEmit: true
 
 //@Filename: /package.json
diff --git a/tests/cases/fourslash/completionsImport_keywords.ts b/tests/cases/fourslash/completionsImport_keywords.ts
index ca9030876df21..ecfd85634d921 100644
--- a/tests/cases/fourslash/completionsImport_keywords.ts
+++ b/tests/cases/fourslash/completionsImport_keywords.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /a.ts
 ////const _break = 0;
 ////export { _break as break };
diff --git a/tests/cases/fourslash/completionsImport_preferUpdatingExistingImport.ts b/tests/cases/fourslash/completionsImport_preferUpdatingExistingImport.ts
index 14933e083a90e..c4215421eba8b 100644
--- a/tests/cases/fourslash/completionsImport_preferUpdatingExistingImport.ts
+++ b/tests/cases/fourslash/completionsImport_preferUpdatingExistingImport.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: commonjs
 
 // @Filename: /deep/module/why/you/want/this/path.ts
diff --git a/tests/cases/fourslash/completionsImport_promoteTypeOnly1.ts b/tests/cases/fourslash/completionsImport_promoteTypeOnly1.ts
index 926e19d9124d8..0fabe060e862d 100644
--- a/tests/cases/fourslash/completionsImport_promoteTypeOnly1.ts
+++ b/tests/cases/fourslash/completionsImport_promoteTypeOnly1.ts
@@ -1,4 +1,5 @@
 /// <reference path="fourslash.ts" />
+// @lib: es5
 // @module: es2015
 
 // @Filename: /exports.ts
diff --git a/tests/cases/fourslash/completionsImport_reExportDefault.ts b/tests/cases/fourslash/completionsImport_reExportDefault.ts
index 1a84942123b93..8a070b31c3a4e 100644
--- a/tests/cases/fourslash/completionsImport_reExportDefault.ts
+++ b/tests/cases/fourslash/completionsImport_reExportDefault.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: esnext
 
 // @Filename: /a/b/impl.ts
diff --git a/tests/cases/fourslash/completionsImport_reExportDefault2.ts b/tests/cases/fourslash/completionsImport_reExportDefault2.ts
index 85975f7f0d6ca..8a3b82392fc94 100644
--- a/tests/cases/fourslash/completionsImport_reExportDefault2.ts
+++ b/tests/cases/fourslash/completionsImport_reExportDefault2.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: preserve
 // @checkJs: true
 
diff --git a/tests/cases/fourslash/completionsImport_reexportTransient.ts b/tests/cases/fourslash/completionsImport_reexportTransient.ts
index 30b16c9e853f8..edcc370d45581 100644
--- a/tests/cases/fourslash/completionsImport_reexportTransient.ts
+++ b/tests/cases/fourslash/completionsImport_reexportTransient.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @esModuleInterop: true
 
 // @Filename: /transient.d.ts
diff --git a/tests/cases/fourslash/completionsImport_satisfiesKeyword.ts b/tests/cases/fourslash/completionsImport_satisfiesKeyword.ts
index a01f45dca6120..d20cad9c54538 100644
--- a/tests/cases/fourslash/completionsImport_satisfiesKeyword.ts
+++ b/tests/cases/fourslash/completionsImport_satisfiesKeyword.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /a.ts
 ////export function satisfies() {}
 
diff --git a/tests/cases/fourslash/completionsImport_uriStyleNodeCoreModules1.ts b/tests/cases/fourslash/completionsImport_uriStyleNodeCoreModules1.ts
index d8d1d89289b6d..ad35d6749d5e0 100644
--- a/tests/cases/fourslash/completionsImport_uriStyleNodeCoreModules1.ts
+++ b/tests/cases/fourslash/completionsImport_uriStyleNodeCoreModules1.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: commonjs
 
 // @Filename: /node_modules/@types/node/index.d.ts
diff --git a/tests/cases/fourslash/completionsImport_uriStyleNodeCoreModules2.ts b/tests/cases/fourslash/completionsImport_uriStyleNodeCoreModules2.ts
index 788ac92e0f8c6..0e94709d8a942 100644
--- a/tests/cases/fourslash/completionsImport_uriStyleNodeCoreModules2.ts
+++ b/tests/cases/fourslash/completionsImport_uriStyleNodeCoreModules2.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: commonjs
 
 // @Filename: /node_modules/@types/node/index.d.ts
diff --git a/tests/cases/fourslash/completionsImport_uriStyleNodeCoreModules3.ts b/tests/cases/fourslash/completionsImport_uriStyleNodeCoreModules3.ts
index 9e0748fadc433..a00a7678737f7 100644
--- a/tests/cases/fourslash/completionsImport_uriStyleNodeCoreModules3.ts
+++ b/tests/cases/fourslash/completionsImport_uriStyleNodeCoreModules3.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @module: commonjs
 
 // @Filename: /node_modules/@types/node/index.d.ts
diff --git a/tests/cases/fourslash/completionsInitializerCommitCharacter.ts b/tests/cases/fourslash/completionsInitializerCommitCharacter.ts
index 69c5c06b71533..5abcb613ba991 100644
--- a/tests/cases/fourslash/completionsInitializerCommitCharacter.ts
+++ b/tests/cases/fourslash/completionsInitializerCommitCharacter.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: file1.ts
 //// const mySpecialVar = 1;
 //// const foo = mySpec/**/
diff --git a/tests/cases/fourslash/completionsJSDocNoCrash2.ts b/tests/cases/fourslash/completionsJSDocNoCrash2.ts
index e37d4452245d4..ca229c812ad53 100644
--- a/tests/cases/fourslash/completionsJSDocNoCrash2.ts
+++ b/tests/cases/fourslash/completionsJSDocNoCrash2.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
 // @strict: true
 
 // @filename: index.ts
diff --git a/tests/cases/fourslash/completionsJsdocParamTypeBeforeName.ts b/tests/cases/fourslash/completionsJsdocParamTypeBeforeName.ts
index b638c2d0cc8b0..22377d5c99fca 100644
--- a/tests/cases/fourslash/completionsJsdocParamTypeBeforeName.ts
+++ b/tests/cases/fourslash/completionsJsdocParamTypeBeforeName.ts
@@ -1,4 +1,7 @@
 /// <reference path="fourslash.ts" />
+
+// @lib: es5
+
 //// /** @param /*name1*/ {/*type*/} /*name2*/ */
 //// function toString(obj) {}
 
diff --git a/tests/cases/fourslash/completionsMergedDeclarations1.ts b/tests/cases/fourslash/completionsMergedDeclarations1.ts
index c39f166a0df67..9e7c43110369b 100644
--- a/tests/cases/fourslash/completionsMergedDeclarations1.ts
+++ b/tests/cases/fourslash/completionsMergedDeclarations1.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////interface Point {
 ////    x: number;
 ////    y: number;
diff --git a/tests/cases/fourslash/completionsNamespaceMergedWithClass.ts b/tests/cases/fourslash/completionsNamespaceMergedWithClass.ts
index 215bc44426f25..6327962743d48 100644
--- a/tests/cases/fourslash/completionsNamespaceMergedWithClass.ts
+++ b/tests/cases/fourslash/completionsNamespaceMergedWithClass.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////class C {
 ////    static m() { }
 ////}
diff --git a/tests/cases/fourslash/completionsOverridingMethod9.ts b/tests/cases/fourslash/completionsOverridingMethod9.ts
index 5026f3aa8aac6..d99f1bd0a7adf 100644
--- a/tests/cases/fourslash/completionsOverridingMethod9.ts
+++ b/tests/cases/fourslash/completionsOverridingMethod9.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @strict: false
 // @Filename: a.ts
 // @newline: LF
 
diff --git a/tests/cases/fourslash/completionsPaths_importType.ts b/tests/cases/fourslash/completionsPaths_importType.ts
index 93f1c7cb5ebed..eb7728ec31de4 100644
--- a/tests/cases/fourslash/completionsPaths_importType.ts
+++ b/tests/cases/fourslash/completionsPaths_importType.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @allowJs: true
 // @moduleResolution: bundler
 // @Filename: /ns.ts
@@ -24,11 +25,9 @@ verify.completions(
     {
         marker: "2",
         exact: [
-            { name: "lib", kind: "script", kindModifiers: ".d.ts" },
-            { name: "lib.decorators", kind: "script", kindModifiers: ".d.ts" },
-            { name: "lib.decorators.legacy", kind: "script", kindModifiers: ".d.ts" },
             { name: "ns", kind: "script", kindModifiers: ".ts" },
             { name: "user", kind: "script", kindModifiers: ".js" },
+            { name: "home", kind: "directory" },
             { name: "node_modules", kind: "directory" },
         ],
         isNewIdentifierLocation: true
diff --git a/tests/cases/fourslash/completionsSelfDeclaring2.ts b/tests/cases/fourslash/completionsSelfDeclaring2.ts
index a068837c00701..472e09b4b4a8c 100644
--- a/tests/cases/fourslash/completionsSelfDeclaring2.ts
+++ b/tests/cases/fourslash/completionsSelfDeclaring2.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 //// function f1<T>(x: T) {}
 //// f1({ abc/*1*/ });
 
diff --git a/tests/cases/fourslash/completionsStringMethods.ts b/tests/cases/fourslash/completionsStringMethods.ts
index d65ad7dee34f5..50b870efbc8d7 100644
--- a/tests/cases/fourslash/completionsStringMethods.ts
+++ b/tests/cases/fourslash/completionsStringMethods.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 //// var s = "foo"./*1*/
 
 verify.baselineCompletions()
diff --git a/tests/cases/fourslash/completionsThisProperties_globalSameName.ts b/tests/cases/fourslash/completionsThisProperties_globalSameName.ts
index f267cba504329..1e2884bb2b336 100644
--- a/tests/cases/fourslash/completionsThisProperties_globalSameName.ts
+++ b/tests/cases/fourslash/completionsThisProperties_globalSameName.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: globals.d.ts
 //// declare var foot: string;
 
diff --git a/tests/cases/fourslash/completionsTypeAssertionKeywords.ts b/tests/cases/fourslash/completionsTypeAssertionKeywords.ts
index 100ab6e51e25e..8dfaa96de6b09 100644
--- a/tests/cases/fourslash/completionsTypeAssertionKeywords.ts
+++ b/tests/cases/fourslash/completionsTypeAssertionKeywords.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////const a = {
 ////  b: 42 as /*0*/
 ////};
diff --git a/tests/cases/fourslash/completionsWithDeprecatedTag5.ts b/tests/cases/fourslash/completionsWithDeprecatedTag5.ts
index dcdf45626d9c2..1f387ece198e6 100644
--- a/tests/cases/fourslash/completionsWithDeprecatedTag5.ts
+++ b/tests/cases/fourslash/completionsWithDeprecatedTag5.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
+
 ////class Foo {
 ////    /** @deprecated m */
 ////    static m() {}
diff --git a/tests/cases/fourslash/completionsWritingSpreadArgument.ts b/tests/cases/fourslash/completionsWritingSpreadArgument.ts
index 5fd4eaad1791d..7dbd58eb8568e 100644
--- a/tests/cases/fourslash/completionsWritingSpreadArgument.ts
+++ b/tests/cases/fourslash/completionsWritingSpreadArgument.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////
 //// const [] = [Math.min(./*marker*/)]
 ////
diff --git a/tests/cases/fourslash/consistentContextualTypeErrorsAfterEdits.ts b/tests/cases/fourslash/consistentContextualTypeErrorsAfterEdits.ts
index 27feb9eac590d..a6f980133f535 100644
--- a/tests/cases/fourslash/consistentContextualTypeErrorsAfterEdits.ts
+++ b/tests/cases/fourslash/consistentContextualTypeErrorsAfterEdits.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 //// class A {
 ////     foo: string;
 //// }
diff --git a/tests/cases/fourslash/constEnumsEmitOutputInMultipleFiles.ts b/tests/cases/fourslash/constEnumsEmitOutputInMultipleFiles.ts
index 6cf29e8b6fedc..f0d8c10462af7 100644
--- a/tests/cases/fourslash/constEnumsEmitOutputInMultipleFiles.ts
+++ b/tests/cases/fourslash/constEnumsEmitOutputInMultipleFiles.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 // @Filename: a.ts
 // @newLine: lf
 ////const enum TestEnum {
diff --git a/tests/cases/fourslash/contextualTypingOfArrayLiterals.ts b/tests/cases/fourslash/contextualTypingOfArrayLiterals.ts
index 7318eeee6cb33..1a553e52f7669 100644
--- a/tests/cases/fourslash/contextualTypingOfArrayLiterals.ts
+++ b/tests/cases/fourslash/contextualTypingOfArrayLiterals.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////class C {
 ////    name: string;
 ////    age: number;
diff --git a/tests/cases/fourslash/defaultParamsAndContextualTypes.ts b/tests/cases/fourslash/defaultParamsAndContextualTypes.ts
index b5e05fd937751..56e08348ff15e 100644
--- a/tests/cases/fourslash/defaultParamsAndContextualTypes.ts
+++ b/tests/cases/fourslash/defaultParamsAndContextualTypes.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts"/>
 
+// @strict: false
 ////interface FooOptions {
 ////    text?: string;
 ////}
diff --git a/tests/cases/fourslash/deprecatedInheritedJSDocOverload.ts b/tests/cases/fourslash/deprecatedInheritedJSDocOverload.ts
index 838d984bae0a9..1cb1cc35d4a6e 100644
--- a/tests/cases/fourslash/deprecatedInheritedJSDocOverload.ts
+++ b/tests/cases/fourslash/deprecatedInheritedJSDocOverload.ts
@@ -1,3 +1,4 @@
+// @strict: false
 
 //// interface PartialObserver<T> {}
 //// interface Subscription {}
diff --git a/tests/cases/fourslash/derivedTypeIndexerWithGenericConstraints.ts b/tests/cases/fourslash/derivedTypeIndexerWithGenericConstraints.ts
index 82dfe9429e1b2..a11a5976b6f75 100644
--- a/tests/cases/fourslash/derivedTypeIndexerWithGenericConstraints.ts
+++ b/tests/cases/fourslash/derivedTypeIndexerWithGenericConstraints.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////class CollectionItem {
 ////    x: number;
 ////}
diff --git a/tests/cases/fourslash/diagnosticsJsFileCompilationDuplicateFunctionImplementation.ts b/tests/cases/fourslash/diagnosticsJsFileCompilationDuplicateFunctionImplementation.ts
index 268944e010a39..01767fef7bc5f 100644
--- a/tests/cases/fourslash/diagnosticsJsFileCompilationDuplicateFunctionImplementation.ts
+++ b/tests/cases/fourslash/diagnosticsJsFileCompilationDuplicateFunctionImplementation.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @strict: false
 // @declaration: true
 // @newLine: lf
 // @outFile: out.js
diff --git a/tests/cases/fourslash/emptyArrayInference.ts b/tests/cases/fourslash/emptyArrayInference.ts
index 195acdf33d5c2..a7ed3da94ac95 100644
--- a/tests/cases/fourslash/emptyArrayInference.ts
+++ b/tests/cases/fourslash/emptyArrayInference.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////var x/*1*/x = true ? [1] : [undefined]; 
 ////var y/*2*/y = true ? [1] : [];
 
diff --git a/tests/cases/fourslash/exhaustiveCaseCompletions3.ts b/tests/cases/fourslash/exhaustiveCaseCompletions3.ts
index f93e176773866..3f14668a7dd27 100644
--- a/tests/cases/fourslash/exhaustiveCaseCompletions3.ts
+++ b/tests/cases/fourslash/exhaustiveCaseCompletions3.ts
@@ -2,6 +2,7 @@
 
 // Where the exhaustive case completion appears or not.
 
+// @lib: es5
 // @newline: LF
 // @Filename: /main.ts
 //// enum E {
diff --git a/tests/cases/fourslash/exhaustiveCaseCompletions4.ts b/tests/cases/fourslash/exhaustiveCaseCompletions4.ts
index 6240b4454f082..8760afe8a292c 100644
--- a/tests/cases/fourslash/exhaustiveCaseCompletions4.ts
+++ b/tests/cases/fourslash/exhaustiveCaseCompletions4.ts
@@ -2,6 +2,7 @@
 
 // Filter existing values.
 
+// @lib: es5
 // @newline: LF
 //// enum E {
 ////     A = 0,
diff --git a/tests/cases/fourslash/exhaustiveCaseCompletions9.ts b/tests/cases/fourslash/exhaustiveCaseCompletions9.ts
index 12c873599685d..27a009054626a 100644
--- a/tests/cases/fourslash/exhaustiveCaseCompletions9.ts
+++ b/tests/cases/fourslash/exhaustiveCaseCompletions9.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @newline: LF
 ////switch (Math.random() ? 123 : 456) {
 ////    case "foo!":
diff --git a/tests/cases/fourslash/exportEqualCallableInterface.ts b/tests/cases/fourslash/exportEqualCallableInterface.ts
index 7c707ddef4f7c..66aa2274fa4fc 100644
--- a/tests/cases/fourslash/exportEqualCallableInterface.ts
+++ b/tests/cases/fourslash/exportEqualCallableInterface.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 // @Filename: exportEqualCallableInterface_file0.ts
 ////interface x {
 ////    (): Date;
diff --git a/tests/cases/fourslash/exportEqualTypes.ts b/tests/cases/fourslash/exportEqualTypes.ts
index 0853fc9fc791f..4b9c6a8ab9938 100644
--- a/tests/cases/fourslash/exportEqualTypes.ts
+++ b/tests/cases/fourslash/exportEqualTypes.ts
@@ -1,5 +1,7 @@
 /// <reference path='./fourslash.ts'/>
 
+// @lib: es5
+// @strict: false
 // @Filename: exportEqualTypes_file0.ts
 ////interface x {
 ////    (): Date;
diff --git a/tests/cases/fourslash/extendArrayInterfaceMember.ts b/tests/cases/fourslash/extendArrayInterfaceMember.ts
index cc1460b126e54..ee1eb812769ab 100644
--- a/tests/cases/fourslash/extendArrayInterfaceMember.ts
+++ b/tests/cases/fourslash/extendArrayInterfaceMember.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts"/>
 
+// @strict: false
 ////var x = [1, 2, 3];
 ////var /*y*/y = x.pop(/*1*/5/*2*/);
 ////
diff --git a/tests/cases/fourslash/extendInterfaceOverloadedMethod.ts b/tests/cases/fourslash/extendInterfaceOverloadedMethod.ts
index dd4332c24736b..4d172cdf4ff98 100644
--- a/tests/cases/fourslash/extendInterfaceOverloadedMethod.ts
+++ b/tests/cases/fourslash/extendInterfaceOverloadedMethod.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////interface A<T> {
 ////    foo(a: T): B<T>;
 ////    foo(): void ;
diff --git a/tests/cases/fourslash/extendsTArray.ts b/tests/cases/fourslash/extendsTArray.ts
index 8f655b9db4591..c305c7ca85090 100644
--- a/tests/cases/fourslash/extendsTArray.ts
+++ b/tests/cases/fourslash/extendsTArray.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////interface I1<T> {
 ////    (a: T): T;
 ////}
diff --git a/tests/cases/fourslash/externalModuleWithExportAssignment.ts b/tests/cases/fourslash/externalModuleWithExportAssignment.ts
index b1ca09f80bbb7..2174b77168b1e 100644
--- a/tests/cases/fourslash/externalModuleWithExportAssignment.ts
+++ b/tests/cases/fourslash/externalModuleWithExportAssignment.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 // @Filename: externalModuleWithExportAssignment_file0.ts
 ////namespace m2 {
 ////    export interface connectModule {
diff --git a/tests/cases/fourslash/extractFunctionContainingThis3.ts b/tests/cases/fourslash/extractFunctionContainingThis3.ts
index 505f241239ac2..cef16f5fb180f 100644
--- a/tests/cases/fourslash/extractFunctionContainingThis3.ts
+++ b/tests/cases/fourslash/extractFunctionContainingThis3.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 
+// @strict: false
 ////const foo = {
 ////    bar: "1",
 ////    baz() {
diff --git a/tests/cases/fourslash/findAllReferencesDynamicImport1.ts b/tests/cases/fourslash/findAllReferencesDynamicImport1.ts
index cd1d5774ed411..36d4dd60d184d 100644
--- a/tests/cases/fourslash/findAllReferencesDynamicImport1.ts
+++ b/tests/cases/fourslash/findAllReferencesDynamicImport1.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 // @Filename: foo.ts
 //// export function foo() { return "foo"; }
 
diff --git a/tests/cases/fourslash/findAllRefsReExportLocal.ts b/tests/cases/fourslash/findAllRefsReExportLocal.ts
index 3bbf73b5df380..99c02a2b54554 100644
--- a/tests/cases/fourslash/findAllRefsReExportLocal.ts
+++ b/tests/cases/fourslash/findAllRefsReExportLocal.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @noLib: true
+// @strict: false
 
 // @Filename: /a.ts
 ////[|var /*ax0*/[|{| "isDefinition": true, "contextRangeIndex": 0 |}x|];|]
diff --git a/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment.ts b/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment.ts
index 53eb837cbd5be..175e48c11ae65 100644
--- a/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment.ts
+++ b/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 //// var /*0*/name = "Foo";
 ////
 //// var obj = { /*1*/name };
diff --git a/tests/cases/fourslash/fixExactOptionalUnassignableProperties11.ts b/tests/cases/fourslash/fixExactOptionalUnassignableProperties11.ts
index 094c0288ecead..ac5fa67ac3f76 100644
--- a/tests/cases/fourslash/fixExactOptionalUnassignableProperties11.ts
+++ b/tests/cases/fourslash/fixExactOptionalUnassignableProperties11.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 // @strictNullChecks: true
 // @exactOptionalPropertyTypes: true
 //// interface IC {
@@ -11,7 +12,7 @@
 //// declare var j: J
 //// class C {
 ////     ic: IC
-////     m() { this.ic/**/ = j }
+////     constructor() { this.ic/**/ = j }
 //// }
 verify.codeFixAvailable([
     { description: ts.Diagnostics.Add_undefined_to_optional_property_type.message }
@@ -30,7 +31,7 @@ interface J {
 declare var j: J
 class C {
     ic: IC
-    m() { this.ic = j }
+    constructor() { this.ic = j }
 }`,
 });
 
diff --git a/tests/cases/fourslash/fixExactOptionalUnassignableProperties12.ts b/tests/cases/fourslash/fixExactOptionalUnassignableProperties12.ts
index 0e81cc8e67e11..b46b3bbf3f112 100644
--- a/tests/cases/fourslash/fixExactOptionalUnassignableProperties12.ts
+++ b/tests/cases/fourslash/fixExactOptionalUnassignableProperties12.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 // @strictNullChecks: true
 // @exactOptionalPropertyTypes: true
 //// interface IC2 {
@@ -9,10 +10,10 @@
 ////     a?: number | undefined
 //// }
 //// declare var j: J
-//// class C {
+//// interface C {
 ////     ic2: IC2
 //// }
-//// var c = new C()
+//// declare var c: C
 //// c.ic2/**/ = j
 verify.codeFixAvailable([
     { description: ts.Diagnostics.Add_undefined_to_optional_property_type.message }
@@ -29,10 +30,10 @@ interface J {
     a?: number | undefined
 }
 declare var j: J
-class C {
+interface C {
     ic2: IC2
 }
-var c = new C()
+declare var c: C
 c.ic2 = j`,
 });
 
diff --git a/tests/cases/fourslash/fixingTypeParametersQuickInfo.ts b/tests/cases/fourslash/fixingTypeParametersQuickInfo.ts
index fb7fcb69cc572..b9974c1aaa182 100644
--- a/tests/cases/fourslash/fixingTypeParametersQuickInfo.ts
+++ b/tests/cases/fourslash/fixingTypeParametersQuickInfo.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////declare function f<T>(x: T, y: (p: T) => T, z: (p: T) => T): T;
 ////var /*1*/result = /*2*/f(0, /*3*/x => null, /*4*/x => x.blahblah);
 
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
index 9ec091fe67004..c53af3e78a24e 100644
--- a/tests/cases/fourslash/fourslash.ts
+++ b/tests/cases/fourslash/fourslash.ts
@@ -128,7 +128,8 @@ declare namespace ts {
         allowSyntheticDefaultImports?: boolean;
         allowNonTsExtensions?: boolean;
         resolveJsonModule?: boolean;
-        [key: string]: string | number | boolean | undefined;
+        lib?: string[];
+        [key: string]: string | number | boolean | string[] | undefined;
     }
 
     function flatMap<T, U>(array: ReadonlyArray<T>, mapfn: (x: T, i: number) => U | ReadonlyArray<U> | undefined): U[];
diff --git a/tests/cases/fourslash/functionTypes.ts b/tests/cases/fourslash/functionTypes.ts
index 222bbf2fd97fb..c964d62bcf45f 100644
--- a/tests/cases/fourslash/functionTypes.ts
+++ b/tests/cases/fourslash/functionTypes.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+// @strict: false
 ////var f: Function;
 ////function g() { }
 ////
diff --git a/tests/cases/fourslash/genericInterfacePropertyInference1.ts b/tests/cases/fourslash/genericInterfacePropertyInference1.ts
index 60f4cf0dda3d1..6e2595e73cf2c 100644
--- a/tests/cases/fourslash/genericInterfacePropertyInference1.ts
+++ b/tests/cases/fourslash/genericInterfacePropertyInference1.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////interface I {
 ////    x: number;
 ////}
diff --git a/tests/cases/fourslash/genericInterfacePropertyInference2.ts b/tests/cases/fourslash/genericInterfacePropertyInference2.ts
index a3600865a9e5b..0f6ea7d0e93a9 100644
--- a/tests/cases/fourslash/genericInterfacePropertyInference2.ts
+++ b/tests/cases/fourslash/genericInterfacePropertyInference2.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////interface I {
 ////    x: number;
 ////}
diff --git a/tests/cases/fourslash/genericMapTyping1.ts b/tests/cases/fourslash/genericMapTyping1.ts
index 47514c9616829..3623d417b93fe 100644
--- a/tests/cases/fourslash/genericMapTyping1.ts
+++ b/tests/cases/fourslash/genericMapTyping1.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @strict: false
 ////interface Iterator_<T, U> {
 ////    (value: T, index: any, list: any): U;
 ////}
diff --git a/tests/cases/fourslash/genericObjectBaseType.ts b/tests/cases/fourslash/genericObjectBaseType.ts
index acca6c3c33b8f..e4acbdbcd344e 100644
--- a/tests/cases/fourslash/genericObjectBaseType.ts
+++ b/tests/cases/fourslash/genericObjectBaseType.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// class C<T> {
 ////     constructor(){}
 ////     foo(a: T) {
diff --git a/tests/cases/fourslash/genericRespecialization1.ts b/tests/cases/fourslash/genericRespecialization1.ts
index 3264052aea9c5..e69742b6653cf 100644
--- a/tests/cases/fourslash/genericRespecialization1.ts
+++ b/tests/cases/fourslash/genericRespecialization1.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// class Food {
 ////     private amount: number;
 ////     constructor(public name: string) {
diff --git a/tests/cases/fourslash/getCompletionEntryDetails2.ts b/tests/cases/fourslash/getCompletionEntryDetails2.ts
index 26ca1b9c4544c..4f21955b82c80 100644
--- a/tests/cases/fourslash/getCompletionEntryDetails2.ts
+++ b/tests/cases/fourslash/getCompletionEntryDetails2.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 ////class Foo {
 ////}
 ////namespace Foo {
diff --git a/tests/cases/fourslash/getDeclarationDiagnostics.ts b/tests/cases/fourslash/getDeclarationDiagnostics.ts
index 575586efb9459..3a35f8240423e 100644
--- a/tests/cases/fourslash/getDeclarationDiagnostics.ts
+++ b/tests/cases/fourslash/getDeclarationDiagnostics.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @strict: false
 // @declaration: true
 // @outFile: true
 
diff --git a/tests/cases/fourslash/getEmitOutputTsxFile_React.ts b/tests/cases/fourslash/getEmitOutputTsxFile_React.ts
index 0620f6d83ef7f..046eaa79da23b 100644
--- a/tests/cases/fourslash/getEmitOutputTsxFile_React.ts
+++ b/tests/cases/fourslash/getEmitOutputTsxFile_React.ts
@@ -4,6 +4,7 @@
 // @declaration: true
 // @sourceMap: true
 // @jsx: react
+// @strict: false
 
 // @Filename: inputFile1.ts
 // @emitThisFile: true
diff --git a/tests/cases/fourslash/getJavaScriptCompletions20.ts b/tests/cases/fourslash/getJavaScriptCompletions20.ts
index 1f989933d3e13..e53317d030b68 100644
--- a/tests/cases/fourslash/getJavaScriptCompletions20.ts
+++ b/tests/cases/fourslash/getJavaScriptCompletions20.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: file.js
 //// /**
diff --git a/tests/cases/fourslash/getSemanticDiagnosticForDeclaration.ts b/tests/cases/fourslash/getSemanticDiagnosticForDeclaration.ts
index 72739c665be62..b27f86c768830 100644
--- a/tests/cases/fourslash/getSemanticDiagnosticForDeclaration.ts
+++ b/tests/cases/fourslash/getSemanticDiagnosticForDeclaration.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @strict: false
 // @module: CommonJS
 // @declaration: true
 //// export function /*1*/foo/*2*/() {
diff --git a/tests/cases/fourslash/globalCompletionListInsideObjectLiterals.ts b/tests/cases/fourslash/globalCompletionListInsideObjectLiterals.ts
index 7b053f484ca85..59d0b065840f6 100644
--- a/tests/cases/fourslash/globalCompletionListInsideObjectLiterals.ts
+++ b/tests/cases/fourslash/globalCompletionListInsideObjectLiterals.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////namespace ObjectLiterals {
 ////    interface MyPoint {
 ////        x1: number;
diff --git a/tests/cases/fourslash/goToDefinitionInstanceof1.ts b/tests/cases/fourslash/goToDefinitionInstanceof1.ts
index 39c0d55eaeaa9..6cc4d40e7fd27 100644
--- a/tests/cases/fourslash/goToDefinitionInstanceof1.ts
+++ b/tests/cases/fourslash/goToDefinitionInstanceof1.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 //// class /*end*/ C {
 //// }
 //// declare var obj: any;
diff --git a/tests/cases/fourslash/goToDefinitionShorthandProperty01.ts b/tests/cases/fourslash/goToDefinitionShorthandProperty01.ts
index 677549382e80b..de7a09f2e40fd 100644
--- a/tests/cases/fourslash/goToDefinitionShorthandProperty01.ts
+++ b/tests/cases/fourslash/goToDefinitionShorthandProperty01.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 //// var /*valueDeclaration1*/name = "hello";
 //// var /*valueDeclaration2*/id = 100000;
 //// declare var /*valueDeclaration3*/id;
diff --git a/tests/cases/fourslash/goToTypeDefinitionImportMeta.ts b/tests/cases/fourslash/goToTypeDefinitionImportMeta.ts
index e25537beee7d4..a1ef8cf18f4cb 100644
--- a/tests/cases/fourslash/goToTypeDefinitionImportMeta.ts
+++ b/tests/cases/fourslash/goToTypeDefinitionImportMeta.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
 // @module: esnext
 // @Filename: foo.ts
 /////// <reference path='./bar.d.ts' />
diff --git a/tests/cases/fourslash/goToTypeDefinitionModifiers.ts b/tests/cases/fourslash/goToTypeDefinitionModifiers.ts
index 25b79734fa40f..b5f60e1206b4b 100644
--- a/tests/cases/fourslash/goToTypeDefinitionModifiers.ts
+++ b/tests/cases/fourslash/goToTypeDefinitionModifiers.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 // @Filename: /a.ts
 //// /*export*/export class A/*A*/ {
 //// 
diff --git a/tests/cases/fourslash/goToTypeDefinition_Pick.ts b/tests/cases/fourslash/goToTypeDefinition_Pick.ts
index 5c61f3becaa76..7f080ccb22505 100644
--- a/tests/cases/fourslash/goToTypeDefinition_Pick.ts
+++ b/tests/cases/fourslash/goToTypeDefinition_Pick.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 //// type User = { id: number; name: string; };
 //// declare const user: Pick<User, "name">
 //// /*reference*/user
diff --git a/tests/cases/fourslash/goToTypeDefinition_arrayType.ts b/tests/cases/fourslash/goToTypeDefinition_arrayType.ts
index 5de1f2f9bc2c6..7b5692ff19636 100644
--- a/tests/cases/fourslash/goToTypeDefinition_arrayType.ts
+++ b/tests/cases/fourslash/goToTypeDefinition_arrayType.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 //// type User = { name: string };
 //// declare const users: User[]
 //// /*reference*/users
diff --git a/tests/cases/fourslash/goToTypeDefinition_promiseType.ts b/tests/cases/fourslash/goToTypeDefinition_promiseType.ts
index bc8fe43c07a79..e8e93a0e751b1 100644
--- a/tests/cases/fourslash/goToTypeDefinition_promiseType.ts
+++ b/tests/cases/fourslash/goToTypeDefinition_promiseType.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5,es2015.promise
+
 //// type User = { name: string };
 //// async function /*reference*/getUser() { return { name: "Bob" } satisfies User as User }
 ////
diff --git a/tests/cases/fourslash/importNameCodeFixJsEnding.ts b/tests/cases/fourslash/importNameCodeFixJsEnding.ts
index 3ab4215e7f758..9bc0581299f03 100644
--- a/tests/cases/fourslash/importNameCodeFixJsEnding.ts
+++ b/tests/cases/fourslash/importNameCodeFixJsEnding.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
 // @module: commonjs
 
 // @Filename: /node_modules/lit/package.json
diff --git a/tests/cases/fourslash/importNameCodeFix_jsx2.ts b/tests/cases/fourslash/importNameCodeFix_jsx2.ts
index c2aba295e94d9..65b14de8cebfa 100644
--- a/tests/cases/fourslash/importNameCodeFix_jsx2.ts
+++ b/tests/cases/fourslash/importNameCodeFix_jsx2.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @jsx: react
 // @module: esnext
 // @esModuleInterop: true
diff --git a/tests/cases/fourslash/importNameCodeFix_jsx3.ts b/tests/cases/fourslash/importNameCodeFix_jsx3.ts
index 5982a30485475..c92640d208508 100644
--- a/tests/cases/fourslash/importNameCodeFix_jsx3.ts
+++ b/tests/cases/fourslash/importNameCodeFix_jsx3.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @jsx: react
 // @module: esnext
 // @esModuleInterop: true
diff --git a/tests/cases/fourslash/importNameCodeFix_jsx5.ts b/tests/cases/fourslash/importNameCodeFix_jsx5.ts
index 2b298bd46e47c..28b088153faf8 100644
--- a/tests/cases/fourslash/importNameCodeFix_jsx5.ts
+++ b/tests/cases/fourslash/importNameCodeFix_jsx5.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @jsx: react
 // @module: esnext
 // @esModuleInterop: true
diff --git a/tests/cases/fourslash/importNameCodeFix_jsx6.ts b/tests/cases/fourslash/importNameCodeFix_jsx6.ts
index 07c207f5cc54b..b078ce31e581f 100644
--- a/tests/cases/fourslash/importNameCodeFix_jsx6.ts
+++ b/tests/cases/fourslash/importNameCodeFix_jsx6.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @jsx: react
 // @module: esnext
 // @esModuleInterop: true
diff --git a/tests/cases/fourslash/importNameCodeFix_noDestructureNonObjectLiteral.ts b/tests/cases/fourslash/importNameCodeFix_noDestructureNonObjectLiteral.ts
index db1c899d70dc8..68b34d38b7f97 100644
--- a/tests/cases/fourslash/importNameCodeFix_noDestructureNonObjectLiteral.ts
+++ b/tests/cases/fourslash/importNameCodeFix_noDestructureNonObjectLiteral.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
 // @target: es2015
 // @strict: true
 // @esModuleInterop: true
diff --git a/tests/cases/fourslash/incompatibleOverride.ts b/tests/cases/fourslash/incompatibleOverride.ts
index 1ce0b07def189..155a88c5972e5 100644
--- a/tests/cases/fourslash/incompatibleOverride.ts
+++ b/tests/cases/fourslash/incompatibleOverride.ts
@@ -2,6 +2,7 @@
 
 // Squiggle for implementing a derived class with an incompatible override is too large
 
+// @strict: false
 //// class Foo { xyz: string; }
 //// class Bar extends Foo { /*1*/xyz/*2*/: number = 1; }
 //// class Baz extends Foo { public /*3*/xyz/*4*/: number = 2; }
diff --git a/tests/cases/fourslash/incorrectJsDocObjectLiteralType.ts b/tests/cases/fourslash/incorrectJsDocObjectLiteralType.ts
index dee82fd1f3525..dfc14f5a451cf 100644
--- a/tests/cases/fourslash/incorrectJsDocObjectLiteralType.ts
+++ b/tests/cases/fourslash/incorrectJsDocObjectLiteralType.ts
@@ -1,5 +1,7 @@
 ///<reference path="fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /a.ts
 ////
 
diff --git a/tests/cases/fourslash/incrementalEditInvocationExpressionAboveInterfaceDeclaration.ts b/tests/cases/fourslash/incrementalEditInvocationExpressionAboveInterfaceDeclaration.ts
index c8a73727e3551..9fb8961b494ff 100644
--- a/tests/cases/fourslash/incrementalEditInvocationExpressionAboveInterfaceDeclaration.ts
+++ b/tests/cases/fourslash/incrementalEditInvocationExpressionAboveInterfaceDeclaration.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 ////declare function alert(message?: any): void;
 /////*1*/
 ////interface Foo {
diff --git a/tests/cases/fourslash/inheritedModuleMembersForClodule2.ts b/tests/cases/fourslash/inheritedModuleMembersForClodule2.ts
index 8c1150be0c748..87139fce98541 100644
--- a/tests/cases/fourslash/inheritedModuleMembersForClodule2.ts
+++ b/tests/cases/fourslash/inheritedModuleMembersForClodule2.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @strict: false
 ////namespace M {
 ////    export namespace A {
 ////        var o;
diff --git a/tests/cases/fourslash/inlayHintsInteractiveMultifile1.ts b/tests/cases/fourslash/inlayHintsInteractiveMultifile1.ts
index db990eebd1ffa..0d93b628a3aa3 100644
--- a/tests/cases/fourslash/inlayHintsInteractiveMultifile1.ts
+++ b/tests/cases/fourslash/inlayHintsInteractiveMultifile1.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /a.ts
 //// export interface Foo { a: string }
 
diff --git a/tests/cases/fourslash/invertedCloduleAfterQuickInfo.ts b/tests/cases/fourslash/invertedCloduleAfterQuickInfo.ts
index 7c593913bb0f5..ce6ec86e26d13 100644
--- a/tests/cases/fourslash/invertedCloduleAfterQuickInfo.ts
+++ b/tests/cases/fourslash/invertedCloduleAfterQuickInfo.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @strict: false
 ////namespace M {
 ////    namespace A {
 ////        var o;
diff --git a/tests/cases/fourslash/jsDocFunctionTypeCompletionsNoCrash.ts b/tests/cases/fourslash/jsDocFunctionTypeCompletionsNoCrash.ts
index 316cc027754d8..96eb5d7813f66 100644
--- a/tests/cases/fourslash/jsDocFunctionTypeCompletionsNoCrash.ts
+++ b/tests/cases/fourslash/jsDocFunctionTypeCompletionsNoCrash.ts
@@ -1,5 +1,7 @@
 ///<reference path="fourslash.ts" />
 
+// @lib: es5
+
 //// /**
 ////  * @returns {function/**/(): string}
 ////  */
diff --git a/tests/cases/fourslash/jsDocTypeTagQuickInfo1.ts b/tests/cases/fourslash/jsDocTypeTagQuickInfo1.ts
index 240c00e228384..612e8d3ade08c 100644
--- a/tests/cases/fourslash/jsDocTypeTagQuickInfo1.ts
+++ b/tests/cases/fourslash/jsDocTypeTagQuickInfo1.ts
@@ -1,4 +1,5 @@
 /// <reference path="fourslash.ts" />
+// @lib: es5
 // @allowJs: true
 // @Filename: jsDocTypeTag1.js
 //// /** @type {String} */
diff --git a/tests/cases/fourslash/jsDocTypeTagQuickInfo2.ts b/tests/cases/fourslash/jsDocTypeTagQuickInfo2.ts
index 7c79116b04199..67a7dcb2682c5 100644
--- a/tests/cases/fourslash/jsDocTypeTagQuickInfo2.ts
+++ b/tests/cases/fourslash/jsDocTypeTagQuickInfo2.ts
@@ -1,4 +1,5 @@
 /// <reference path="fourslash.ts" />
+// @lib: es5
 // @allowJs: true
 // @Filename: jsDocTypeTag2.js
 //// /** @type {string} */
diff --git a/tests/cases/fourslash/jsFileJsdocTypedefTagTypeExpressionCompletion3.ts b/tests/cases/fourslash/jsFileJsdocTypedefTagTypeExpressionCompletion3.ts
index 602b5423c4943..0922e5d74a58c 100644
--- a/tests/cases/fourslash/jsFileJsdocTypedefTagTypeExpressionCompletion3.ts
+++ b/tests/cases/fourslash/jsFileJsdocTypedefTagTypeExpressionCompletion3.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: jsFileJsdocTypedefTagTypeExpressionCompletion3_typedef.js
 
diff --git a/tests/cases/fourslash/jsdocExtendsTagCompletion.ts b/tests/cases/fourslash/jsdocExtendsTagCompletion.ts
index 1af4d0e24cfb6..f33cc4d9638bd 100644
--- a/tests/cases/fourslash/jsdocExtendsTagCompletion.ts
+++ b/tests/cases/fourslash/jsdocExtendsTagCompletion.ts
@@ -1,5 +1,7 @@
 ///<reference path="fourslash.ts" />
 
+// @lib: es5
+
 /////** @extends {/**/} */
 ////class A {}
 
diff --git a/tests/cases/fourslash/jsdocImplementsTagCompletion.ts b/tests/cases/fourslash/jsdocImplementsTagCompletion.ts
index 4407dfb317799..38286ba8fd3b3 100644
--- a/tests/cases/fourslash/jsdocImplementsTagCompletion.ts
+++ b/tests/cases/fourslash/jsdocImplementsTagCompletion.ts
@@ -1,5 +1,7 @@
 ///<reference path="fourslash.ts" />
 
+// @lib: es5
+
 /////** @implements {/**/} */
 ////class A {}
 
diff --git a/tests/cases/fourslash/jsdocPropertyTagCompletion.ts b/tests/cases/fourslash/jsdocPropertyTagCompletion.ts
index 903806471b071..fed92aacb13bc 100644
--- a/tests/cases/fourslash/jsdocPropertyTagCompletion.ts
+++ b/tests/cases/fourslash/jsdocPropertyTagCompletion.ts
@@ -1,5 +1,7 @@
 ///<reference path="fourslash.ts" />
 
+// @lib: es5
+
 /////**
 //// * @typedef {Object} Foo
 //// * @property {/**/}
diff --git a/tests/cases/fourslash/jsdocSatisfiesTagCompletion1.ts b/tests/cases/fourslash/jsdocSatisfiesTagCompletion1.ts
index 6e9e257e51e98..09a2eb93d3f3c 100644
--- a/tests/cases/fourslash/jsdocSatisfiesTagCompletion1.ts
+++ b/tests/cases/fourslash/jsdocSatisfiesTagCompletion1.ts
@@ -1,5 +1,6 @@
 ///<reference path="fourslash.ts" />
 
+// @lib: es5
 // @noEmit: true
 // @allowJS: true
 // @checkJs: true
diff --git a/tests/cases/fourslash/jsdocTemplateTagCompletion.ts b/tests/cases/fourslash/jsdocTemplateTagCompletion.ts
index bca1287fd6a33..dd618f5921a4f 100644
--- a/tests/cases/fourslash/jsdocTemplateTagCompletion.ts
+++ b/tests/cases/fourslash/jsdocTemplateTagCompletion.ts
@@ -1,5 +1,7 @@
 ///<reference path="fourslash.ts" />
 
+// @lib: es5
+
 /////**
 //// * @template {/**/} T
 //// * @typedef {Object} Foo
diff --git a/tests/cases/fourslash/jsdocThrowsTagCompletion.ts b/tests/cases/fourslash/jsdocThrowsTagCompletion.ts
index 84184de808686..59eae68ffd419 100644
--- a/tests/cases/fourslash/jsdocThrowsTagCompletion.ts
+++ b/tests/cases/fourslash/jsdocThrowsTagCompletion.ts
@@ -1,5 +1,7 @@
 ///<reference path="fourslash.ts" />
 
+// @lib: es5
+
 /////**
 //// * @throws {/**/} description
 //// */
diff --git a/tests/cases/fourslash/jsdocTypedefTagTypeExpressionCompletion.ts b/tests/cases/fourslash/jsdocTypedefTagTypeExpressionCompletion.ts
index 9f5c8112edd05..68a86f995d7b5 100644
--- a/tests/cases/fourslash/jsdocTypedefTagTypeExpressionCompletion.ts
+++ b/tests/cases/fourslash/jsdocTypedefTagTypeExpressionCompletion.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
+
 ////interface I {
 ////    age: number;
 ////}
diff --git a/tests/cases/fourslash/jsxAttributeSnippetCompletionAfterTypeArgs.ts b/tests/cases/fourslash/jsxAttributeSnippetCompletionAfterTypeArgs.ts
index f22d6a7c86e4f..6b0ef2e2f62b6 100644
--- a/tests/cases/fourslash/jsxAttributeSnippetCompletionAfterTypeArgs.ts
+++ b/tests/cases/fourslash/jsxAttributeSnippetCompletionAfterTypeArgs.ts
@@ -1,4 +1,5 @@
 /// <reference path="fourslash.ts" />
+// @strict: false
 //@Filename: file.tsx
 
 ////declare const React: any;
diff --git a/tests/cases/fourslash/jsxAttributeSnippetCompletionClosed.ts b/tests/cases/fourslash/jsxAttributeSnippetCompletionClosed.ts
index 636c5bb1ab23c..b73a15acae97e 100644
--- a/tests/cases/fourslash/jsxAttributeSnippetCompletionClosed.ts
+++ b/tests/cases/fourslash/jsxAttributeSnippetCompletionClosed.ts
@@ -1,4 +1,5 @@
 /// <reference path="fourslash.ts" />
+// @strict: false
 //@Filename: file.tsx
 ////interface NestedInterface {
 ////    Foo: NestedInterface;
diff --git a/tests/cases/fourslash/jsxAttributeSnippetCompletionUnclosed.ts b/tests/cases/fourslash/jsxAttributeSnippetCompletionUnclosed.ts
index 5816f56500d10..1581047f114fa 100644
--- a/tests/cases/fourslash/jsxAttributeSnippetCompletionUnclosed.ts
+++ b/tests/cases/fourslash/jsxAttributeSnippetCompletionUnclosed.ts
@@ -1,4 +1,5 @@
 /// <reference path="fourslash.ts" />
+// @strict: false
 //@Filename: file.tsx
 ////interface NestedInterface {
 ////    Foo: NestedInterface;
diff --git a/tests/cases/fourslash/memberCompletionInForEach1.ts b/tests/cases/fourslash/memberCompletionInForEach1.ts
index f26a5e409ba82..43dca0d2c7879 100644
--- a/tests/cases/fourslash/memberCompletionInForEach1.ts
+++ b/tests/cases/fourslash/memberCompletionInForEach1.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////var x: string[] = [];
 ////x.forEach(function (y) { y/*1*/
 ////x.forEach(y => y/*2*/
diff --git a/tests/cases/fourslash/memberListOnConstructorType.ts b/tests/cases/fourslash/memberListOnConstructorType.ts
index 336814aca4187..3a5f516d9228b 100644
--- a/tests/cases/fourslash/memberListOnConstructorType.ts
+++ b/tests/cases/fourslash/memberListOnConstructorType.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////var f: new () => void;
 ////f./*1*/
 
diff --git a/tests/cases/fourslash/moveToNewFile_moveJsxImport1.ts b/tests/cases/fourslash/moveToNewFile_moveJsxImport1.ts
index f1c86b53a51cc..cb65c17cfdc55 100644
--- a/tests/cases/fourslash/moveToNewFile_moveJsxImport1.ts
+++ b/tests/cases/fourslash/moveToNewFile_moveJsxImport1.ts
@@ -1,8 +1,6 @@
 /// <reference path='fourslash.ts' />
 
 // @jsx: preserve
-// @noLib: true
-// @libFiles: react.d.ts,lib.d.ts
 
 // @Filename: file.tsx
 //// import React = require('react');
diff --git a/tests/cases/fourslash/moveToNewFile_moveJsxImport2.ts b/tests/cases/fourslash/moveToNewFile_moveJsxImport2.ts
index d7ac317eba36e..7184b10cb3fef 100644
--- a/tests/cases/fourslash/moveToNewFile_moveJsxImport2.ts
+++ b/tests/cases/fourslash/moveToNewFile_moveJsxImport2.ts
@@ -1,8 +1,6 @@
 /// <reference path='fourslash.ts' />
 
 // @jsx: preserve
-// @noLib: true
-// @libFiles: react.d.ts,lib.d.ts
 
 // @Filename: file.tsx
 //// import React = require('react');
diff --git a/tests/cases/fourslash/moveToNewFile_moveJsxImport3.ts b/tests/cases/fourslash/moveToNewFile_moveJsxImport3.ts
index 9adfa9fd14a91..5079d07bc78db 100644
--- a/tests/cases/fourslash/moveToNewFile_moveJsxImport3.ts
+++ b/tests/cases/fourslash/moveToNewFile_moveJsxImport3.ts
@@ -1,8 +1,6 @@
 /// <reference path='fourslash.ts' />
 
 // @jsx: preserve
-// @noLib: true
-// @libFiles: react.d.ts,lib.d.ts
 
 // @Filename: file.tsx
 //// import React = require('react');
diff --git a/tests/cases/fourslash/moveToNewFile_moveJsxImport4.ts b/tests/cases/fourslash/moveToNewFile_moveJsxImport4.ts
index b0cc169a86956..92ca4897e6ccc 100644
--- a/tests/cases/fourslash/moveToNewFile_moveJsxImport4.ts
+++ b/tests/cases/fourslash/moveToNewFile_moveJsxImport4.ts
@@ -1,8 +1,6 @@
 /// <reference path='fourslash.ts' />
 
 // @jsx: preserve
-// @noLib: true
-// @libFiles: react.d.ts,lib.d.ts,leftpad.d.ts
 
 // @Filename: file.tsx
 //// import React = require('leftpad');
diff --git a/tests/cases/fourslash/multiModuleClodule.ts b/tests/cases/fourslash/multiModuleClodule.ts
index 146abf8dbe9f0..87acad675c869 100644
--- a/tests/cases/fourslash/multiModuleClodule.ts
+++ b/tests/cases/fourslash/multiModuleClodule.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////class C {
 ////    constructor(x: number) { }
 ////    foo() { }
diff --git a/tests/cases/fourslash/multiModuleFundule.ts b/tests/cases/fourslash/multiModuleFundule.ts
index 8856759144b16..b7d23b482ccd8 100644
--- a/tests/cases/fourslash/multiModuleFundule.ts
+++ b/tests/cases/fourslash/multiModuleFundule.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////function C(x: number) { }
 ////
 ////namespace C {
diff --git a/tests/cases/fourslash/navigateToIIFE.ts b/tests/cases/fourslash/navigateToIIFE.ts
index acf168506499f..16a4dc16b4134 100644
--- a/tests/cases/fourslash/navigateToIIFE.ts
+++ b/tests/cases/fourslash/navigateToIIFE.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /a.ts
 ////(function () {
 ////    "use strict";
diff --git a/tests/cases/fourslash/navigateToImport.ts b/tests/cases/fourslash/navigateToImport.ts
index afb85fa7eed33..6ad1f129f1cc6 100644
--- a/tests/cases/fourslash/navigateToImport.ts
+++ b/tests/cases/fourslash/navigateToImport.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: library.ts
 ////[|export function foo() {}|]
 ////[|export function bar() {}|]
diff --git a/tests/cases/fourslash/navigateToSymbolIterator.ts b/tests/cases/fourslash/navigateToSymbolIterator.ts
index e26e81f7496ad..8a950450cbed8 100644
--- a/tests/cases/fourslash/navigateToSymbolIterator.ts
+++ b/tests/cases/fourslash/navigateToSymbolIterator.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @lib: es5
+
 ////class C {
 ////    [|[Symbol.iterator]() {}|]
 ////}
diff --git a/tests/cases/fourslash/navigationItemsExactMatch2.ts b/tests/cases/fourslash/navigationItemsExactMatch2.ts
index 1a4af3dae11c4..b1714f2730382 100644
--- a/tests/cases/fourslash/navigationItemsExactMatch2.ts
+++ b/tests/cases/fourslash/navigationItemsExactMatch2.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
+
 ////namespace Shapes {
 ////    [|class Point {
 ////        [|private _origin = 0.0;|]
diff --git a/tests/cases/fourslash/navigationItemsOverloads1.ts b/tests/cases/fourslash/navigationItemsOverloads1.ts
index 55b35f00c75dc..089d2cfa5775e 100644
--- a/tests/cases/fourslash/navigationItemsOverloads1.ts
+++ b/tests/cases/fourslash/navigationItemsOverloads1.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
+
 ////function overload(a: string): boolean;
 ////function overload(b: boolean): boolean;
 ////function overload(b: number): boolean;
diff --git a/tests/cases/fourslash/navigationItemsOverloadsBroken1.ts b/tests/cases/fourslash/navigationItemsOverloadsBroken1.ts
index b30a24ba3f45a..5a475cbd70c98 100644
--- a/tests/cases/fourslash/navigationItemsOverloadsBroken1.ts
+++ b/tests/cases/fourslash/navigationItemsOverloadsBroken1.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
+
 ////function overload1(a: string): boolean;
 ////function overload1(b: boolean): boolean;
 ////function overload1(b: number): boolean;
diff --git a/tests/cases/fourslash/navigationItemsOverloadsBroken2.ts b/tests/cases/fourslash/navigationItemsOverloadsBroken2.ts
index eb1e9dcc11cde..9cc20fc79c858 100644
--- a/tests/cases/fourslash/navigationItemsOverloadsBroken2.ts
+++ b/tests/cases/fourslash/navigationItemsOverloadsBroken2.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
+
 ////function overload1(a: string): boolean;
 ////function overload1(b: boolean): boolean;
 ////[|function overload1(x: any, b = (function overload() { return false })): boolean {
diff --git a/tests/cases/fourslash/navigationItemsPrefixMatch2.ts b/tests/cases/fourslash/navigationItemsPrefixMatch2.ts
index 35bcd128b7a33..0356c62925518 100644
--- a/tests/cases/fourslash/navigationItemsPrefixMatch2.ts
+++ b/tests/cases/fourslash/navigationItemsPrefixMatch2.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
+
 ////namespace Shapes {
 ////    export class Point {
 ////        [|private originality = 0.0;|]
diff --git a/tests/cases/fourslash/navigationItemsSubStringMatch.ts b/tests/cases/fourslash/navigationItemsSubStringMatch.ts
index 95cb4ea2fb074..156e72cb597c0 100644
--- a/tests/cases/fourslash/navigationItemsSubStringMatch.ts
+++ b/tests/cases/fourslash/navigationItemsSubStringMatch.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
+
 /////// Module
 ////[|{| "name": "MyShapes", "kind": "module" |}namespace MyShapes {
 ////
diff --git a/tests/cases/fourslash/navigationItemsSubStringMatch2.ts b/tests/cases/fourslash/navigationItemsSubStringMatch2.ts
index 325306f1dc01a..e23490b4590a8 100644
--- a/tests/cases/fourslash/navigationItemsSubStringMatch2.ts
+++ b/tests/cases/fourslash/navigationItemsSubStringMatch2.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
+
 ////namespace Shapes {
 ////    export class Point {
 ////        [|private originPointAtTheHorizon = 0.0;|]
diff --git a/tests/cases/fourslash/noSuggestionDiagnosticsOnParseError.ts b/tests/cases/fourslash/noSuggestionDiagnosticsOnParseError.ts
index c36d5352e7fd7..0f6569bacdc2b 100644
--- a/tests/cases/fourslash/noSuggestionDiagnosticsOnParseError.ts
+++ b/tests/cases/fourslash/noSuggestionDiagnosticsOnParseError.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @Filename: /a.ts
 ////export {};
 ////const a = 1 d;
diff --git a/tests/cases/fourslash/nonExistingImport.ts b/tests/cases/fourslash/nonExistingImport.ts
index 50b5e334de43e..1748217bf046f 100644
--- a/tests/cases/fourslash/nonExistingImport.ts
+++ b/tests/cases/fourslash/nonExistingImport.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 ////namespace m {
 ////    import foo = module(_foo);
 ////    var n: num/*1*/
diff --git a/tests/cases/fourslash/objectLiteralCallSignatures.ts b/tests/cases/fourslash/objectLiteralCallSignatures.ts
index 3749d26fb4e62..7926af77395f7 100644
--- a/tests/cases/fourslash/objectLiteralCallSignatures.ts
+++ b/tests/cases/fourslash/objectLiteralCallSignatures.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////var /*1*/x: {
 ////    func1(x: number): number;         // Method signature
 ////    func2: (x: number) => number;     // Function type literal
diff --git a/tests/cases/fourslash/parenthesisFatArrows.ts b/tests/cases/fourslash/parenthesisFatArrows.ts
index ea123b986e447..2bdc235e76b03 100644
--- a/tests/cases/fourslash/parenthesisFatArrows.ts
+++ b/tests/cases/fourslash/parenthesisFatArrows.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts"/>
 
+// @strict: false
 ////x => x;
 ////(y) => y;
 /////**/
diff --git a/tests/cases/fourslash/pasteLambdaOverModule.ts b/tests/cases/fourslash/pasteLambdaOverModule.ts
index f85b9d902c21a..5637baac373dc 100644
--- a/tests/cases/fourslash/pasteLambdaOverModule.ts
+++ b/tests/cases/fourslash/pasteLambdaOverModule.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @strict: false
 //// /**/
 
 goTo.marker();
diff --git a/tests/cases/fourslash/quickInfoForContextuallyTypedFunctionInTaggedTemplateExpression2.ts b/tests/cases/fourslash/quickInfoForContextuallyTypedFunctionInTaggedTemplateExpression2.ts
index 0c72575d936ac..12fbd6865dfe4 100644
--- a/tests/cases/fourslash/quickInfoForContextuallyTypedFunctionInTaggedTemplateExpression2.ts
+++ b/tests/cases/fourslash/quickInfoForContextuallyTypedFunctionInTaggedTemplateExpression2.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @strict: false
 ////function tempTag2(templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number;
 ////function tempTag2(templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string;
 ////function tempTag2(...rest: any[]): any {
diff --git a/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName03.ts b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName03.ts
index 9378c99126c64..aadd48680f7d1 100644
--- a/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName03.ts
+++ b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName03.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////interface Recursive {
 ////    next?: Recursive;
 ////    value: any;
diff --git a/tests/cases/fourslash/quickInfoForShorthandProperty.ts b/tests/cases/fourslash/quickInfoForShorthandProperty.ts
index c863663eff060..6dd36a29b3c39 100644
--- a/tests/cases/fourslash/quickInfoForShorthandProperty.ts
+++ b/tests/cases/fourslash/quickInfoForShorthandProperty.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// var name1 = undefined, id1 = undefined;
 //// var /*obj1*/obj1 = {/*name1*/name1, /*id1*/id1};
 //// var name2 = "Hello";
diff --git a/tests/cases/fourslash/quickInfoGenericTypeArgumentInference1.ts b/tests/cases/fourslash/quickInfoGenericTypeArgumentInference1.ts
index 3b8bff11dca22..837e48ea82692 100644
--- a/tests/cases/fourslash/quickInfoGenericTypeArgumentInference1.ts
+++ b/tests/cases/fourslash/quickInfoGenericTypeArgumentInference1.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////namespace Underscore {
 ////    export interface Iterator<T, U> {
 ////        (value: T, index: any, list: any): U;
diff --git a/tests/cases/fourslash/quickInfoJsDocNonDiscriminatedUnionSharedProp.ts b/tests/cases/fourslash/quickInfoJsDocNonDiscriminatedUnionSharedProp.ts
index ad4300f2696dd..18fb506d05cae 100644
--- a/tests/cases/fourslash/quickInfoJsDocNonDiscriminatedUnionSharedProp.ts
+++ b/tests/cases/fourslash/quickInfoJsDocNonDiscriminatedUnionSharedProp.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 //// interface Entries {
 ////   /**
 ////    * Plugins info...
diff --git a/tests/cases/fourslash/quickInfoMeaning.ts b/tests/cases/fourslash/quickInfoMeaning.ts
index 6728cb2bc0673..4ad0864a93792 100644
--- a/tests/cases/fourslash/quickInfoMeaning.ts
+++ b/tests/cases/fourslash/quickInfoMeaning.ts
@@ -1,5 +1,7 @@
 ///<reference path="fourslash.ts" />
 
+// @lib: es5
+
 // Testing that quickInfo gets information with a corresponding meaning: values to values, types to types.
 // For quick info purposes, we don't resolve past aliases.
 // However, when we have an alias for a type, the quickInfo for a value with the same should skip the alias, and vice versa.
diff --git a/tests/cases/fourslash/quickInfoOnCatchVariable.ts b/tests/cases/fourslash/quickInfoOnCatchVariable.ts
index 07e86c2ed818f..f6c4ba3e6729c 100644
--- a/tests/cases/fourslash/quickInfoOnCatchVariable.ts
+++ b/tests/cases/fourslash/quickInfoOnCatchVariable.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @strict: false
 //// function f() {
 ////    try { } catch (/**/e) { }
 //// }
diff --git a/tests/cases/fourslash/quickInfoOnMergedInterfacesWithIncrementalEdits.ts b/tests/cases/fourslash/quickInfoOnMergedInterfacesWithIncrementalEdits.ts
index d3bbb125e8d20..46540ac07f6b1 100644
--- a/tests/cases/fourslash/quickInfoOnMergedInterfacesWithIncrementalEdits.ts
+++ b/tests/cases/fourslash/quickInfoOnMergedInterfacesWithIncrementalEdits.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////namespace MM {
 ////    interface B<T> {
 ////        foo: number;
diff --git a/tests/cases/fourslash/quickInfoOnMergedModule.ts b/tests/cases/fourslash/quickInfoOnMergedModule.ts
index b9225e2b0bc09..8d8d7a3781b78 100644
--- a/tests/cases/fourslash/quickInfoOnMergedModule.ts
+++ b/tests/cases/fourslash/quickInfoOnMergedModule.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////namespace M2 {
 ////    export interface A {
 ////        foo: string;
diff --git a/tests/cases/fourslash/quickInfoOnNarrowedTypeInModule.ts b/tests/cases/fourslash/quickInfoOnNarrowedTypeInModule.ts
index 2f834c9515b8d..b5d9ee7f933f9 100644
--- a/tests/cases/fourslash/quickInfoOnNarrowedTypeInModule.ts
+++ b/tests/cases/fourslash/quickInfoOnNarrowedTypeInModule.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////var strOrNum: string | number;
 ////namespace m {
 ////    var nonExportedStrOrNum: string | number;
diff --git a/tests/cases/fourslash/quickInfoSignatureOptionalParameterFromUnion1.ts b/tests/cases/fourslash/quickInfoSignatureOptionalParameterFromUnion1.ts
index dce4bfdf0ad56..56b17d9c59cde 100644
--- a/tests/cases/fourslash/quickInfoSignatureOptionalParameterFromUnion1.ts
+++ b/tests/cases/fourslash/quickInfoSignatureOptionalParameterFromUnion1.ts
@@ -2,6 +2,7 @@
 
 // https://github.com/microsoft/TypeScript/issues/55574
 
+// @strict: false
 //// declare const optionals:
 ////   | ((a?: { a: true }) => unknown)
 ////   | ((b?: { b: true }) => unknown);
diff --git a/tests/cases/fourslash/quickInfoSignatureRestParameterFromUnion2.ts b/tests/cases/fourslash/quickInfoSignatureRestParameterFromUnion2.ts
index d53beebd5d8cc..0707d8f69f8ee 100644
--- a/tests/cases/fourslash/quickInfoSignatureRestParameterFromUnion2.ts
+++ b/tests/cases/fourslash/quickInfoSignatureRestParameterFromUnion2.ts
@@ -2,6 +2,7 @@
 
 // https://github.com/microsoft/TypeScript/issues/55574
 
+// @strict: false
 //// declare const rest:
 ////   | ((a?: { a: true }, ...rest: string[]) => unknown)
 ////   | ((b?: { b: true }) => unknown);
diff --git a/tests/cases/fourslash/quickInfoUntypedModuleImport.ts b/tests/cases/fourslash/quickInfoUntypedModuleImport.ts
index a10b260cc70e8..d9a020ce8b7d9 100644
--- a/tests/cases/fourslash/quickInfoUntypedModuleImport.ts
+++ b/tests/cases/fourslash/quickInfoUntypedModuleImport.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
+
 // @Filename: node_modules/foo/index.js
 //// /*index*/{}
 
diff --git a/tests/cases/fourslash/quickInfoWidenedTypes.ts b/tests/cases/fourslash/quickInfoWidenedTypes.ts
index 1ece274690bd7..3d69b22dea4b3 100644
--- a/tests/cases/fourslash/quickInfoWidenedTypes.ts
+++ b/tests/cases/fourslash/quickInfoWidenedTypes.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////var /*1*/a = null;                   // var a: any
 ////var /*2*/b = undefined;              // var b: any
 ////var /*3*/c = { x: 0, y: null };	// var c: { x: number, y: any }
diff --git a/tests/cases/fourslash/quickinfoVerbosityLibType.ts b/tests/cases/fourslash/quickinfoVerbosityLibType.ts
index c6f5ee46d0599..5220eaf68ff21 100644
--- a/tests/cases/fourslash/quickinfoVerbosityLibType.ts
+++ b/tests/cases/fourslash/quickinfoVerbosityLibType.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 //// interface Apple {
 ////     color: string;
 ////     size: number;
diff --git a/tests/cases/fourslash/quickinfoVerbosityRecursiveType.ts b/tests/cases/fourslash/quickinfoVerbosityRecursiveType.ts
index 8bd4d17edb297..53553577cf881 100644
--- a/tests/cases/fourslash/quickinfoVerbosityRecursiveType.ts
+++ b/tests/cases/fourslash/quickinfoVerbosityRecursiveType.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 //// type Node/*N*/<T> = {
 ////     value: T;
 ////     left: Node<T> | undefined;
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess10.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess10.ts
index 7161dd18d7cfa..fdf5e3d28192c 100644
--- a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess10.ts
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess10.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 //// class A {
 ////     /*a*/public a?: string = "foo";/*b*/
 //// }
diff --git a/tests/cases/fourslash/referencesForModifiers.ts b/tests/cases/fourslash/referencesForModifiers.ts
index e21d22a21e1d3..48b29a004827d 100644
--- a/tests/cases/fourslash/referencesForModifiers.ts
+++ b/tests/cases/fourslash/referencesForModifiers.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////[|/*declareModifier*/declare /*abstractModifier*/abstract class C1 {
 ////    [|/*staticModifier*/static a;|]
 ////    [|/*readonlyModifier*/readonly b;|]
diff --git a/tests/cases/fourslash/renameBindingElementInitializerExternal.ts b/tests/cases/fourslash/renameBindingElementInitializerExternal.ts
index e3c55039141aa..bc6cd8c46a2d8 100644
--- a/tests/cases/fourslash/renameBindingElementInitializerExternal.ts
+++ b/tests/cases/fourslash/renameBindingElementInitializerExternal.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
+// @lib: es5
+
 ////[|const [|{| "contextRangeIndex": 0 |}external|] = true;|]
 ////
 ////function f({
diff --git a/tests/cases/fourslash/renameDestructuringAssignmentInFor.ts b/tests/cases/fourslash/renameDestructuringAssignmentInFor.ts
index 9accf745717b5..975ae6b6460c3 100644
--- a/tests/cases/fourslash/renameDestructuringAssignmentInFor.ts
+++ b/tests/cases/fourslash/renameDestructuringAssignmentInFor.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////interface I {
 ////    [|[|{| "contextRangeIndex": 0 |}property1|]: number;|]
 ////    property2: string;
diff --git a/tests/cases/fourslash/renameDestructuringAssignmentInForOf.ts b/tests/cases/fourslash/renameDestructuringAssignmentInForOf.ts
index f0deafa50d1e6..69b1dd01d80b3 100644
--- a/tests/cases/fourslash/renameDestructuringAssignmentInForOf.ts
+++ b/tests/cases/fourslash/renameDestructuringAssignmentInForOf.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////interface I {
 ////    [|[|{| "contextRangeIndex": 0 |}property1|]: number;|]
 ////    property2: string;
diff --git a/tests/cases/fourslash/renameDestructuringAssignmentNestedInFor2.ts b/tests/cases/fourslash/renameDestructuringAssignmentNestedInFor2.ts
index 265842eaf5a5f..4ee012e22b9fa 100644
--- a/tests/cases/fourslash/renameDestructuringAssignmentNestedInFor2.ts
+++ b/tests/cases/fourslash/renameDestructuringAssignmentNestedInFor2.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////interface MultiRobot {
 ////    name: string;
 ////    skills: {
diff --git a/tests/cases/fourslash/renameDestructuringAssignmentNestedInForOf.ts b/tests/cases/fourslash/renameDestructuringAssignmentNestedInForOf.ts
index cd598e7636287..048576092fbcf 100644
--- a/tests/cases/fourslash/renameDestructuringAssignmentNestedInForOf.ts
+++ b/tests/cases/fourslash/renameDestructuringAssignmentNestedInForOf.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 ////interface MultiRobot {
 ////    name: string;
 ////    skills: {
diff --git a/tests/cases/fourslash/semanticModernClassificationConstructorTypes.ts b/tests/cases/fourslash/semanticModernClassificationConstructorTypes.ts
index 25ef45b29b628..bf9a309c2d910 100644
--- a/tests/cases/fourslash/semanticModernClassificationConstructorTypes.ts
+++ b/tests/cases/fourslash/semanticModernClassificationConstructorTypes.ts
@@ -1,3 +1,5 @@
+// @lib: es5
+
 //// Object.create(null);
 //// const x = Promise.resolve(Number.MAX_VALUE);
 //// if (x instanceof Promise) {}
diff --git a/tests/cases/fourslash/semanticModernClassificationFunctions.ts b/tests/cases/fourslash/semanticModernClassificationFunctions.ts
index 730fe9aad206c..0dc1eeb447ca5 100644
--- a/tests/cases/fourslash/semanticModernClassificationFunctions.ts
+++ b/tests/cases/fourslash/semanticModernClassificationFunctions.ts
@@ -1,3 +1,5 @@
+// @lib: es5
+
 //// function foo(p1) {
 ////   return foo(Math.abs(p1))
 //// }
diff --git a/tests/cases/fourslash/server/autoImportCrossPackage_pathsAndSymlink.ts b/tests/cases/fourslash/server/autoImportCrossPackage_pathsAndSymlink.ts
index 0b6f618d761ae..e88b2452dd6e3 100644
--- a/tests/cases/fourslash/server/autoImportCrossPackage_pathsAndSymlink.ts
+++ b/tests/cases/fourslash/server/autoImportCrossPackage_pathsAndSymlink.ts
@@ -23,6 +23,7 @@
 //// {
 ////   "compilerOptions": {
 ////     "composite": true,
+////     "lib": ["es5"],
 ////     "module": "esnext",
 ////     "moduleResolution": "bundler",
 ////     "paths": {
diff --git a/tests/cases/fourslash/server/autoImportCrossProject_baseUrl_toDist.ts b/tests/cases/fourslash/server/autoImportCrossProject_baseUrl_toDist.ts
index 9aa44a10bf65b..9d8e9fcf1976e 100644
--- a/tests/cases/fourslash/server/autoImportCrossProject_baseUrl_toDist.ts
+++ b/tests/cases/fourslash/server/autoImportCrossProject_baseUrl_toDist.ts
@@ -3,6 +3,7 @@
 // @Filename: /home/src/workspaces/project/common/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "commonjs",
 ////     "outDir": "dist",
 ////     "composite": true
@@ -18,6 +19,7 @@
 // @Filename: /home/src/workspaces/project/web/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "esnext",
 ////     "moduleResolution": "node",
 ////     "noEmit": true,
diff --git a/tests/cases/fourslash/server/autoImportCrossProject_paths_sharedOutDir.ts b/tests/cases/fourslash/server/autoImportCrossProject_paths_sharedOutDir.ts
index b177f044c6a2a..4f07749e43268 100644
--- a/tests/cases/fourslash/server/autoImportCrossProject_paths_sharedOutDir.ts
+++ b/tests/cases/fourslash/server/autoImportCrossProject_paths_sharedOutDir.ts
@@ -3,6 +3,7 @@
 // @Filename: /home/src/workspaces/project/tsconfig.base.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "commonjs",
 ////     "baseUrl": ".",
 ////     "paths": {
diff --git a/tests/cases/fourslash/server/autoImportCrossProject_paths_stripSrc.ts b/tests/cases/fourslash/server/autoImportCrossProject_paths_stripSrc.ts
index 3c533cd9436c6..1b35620d0b16f 100644
--- a/tests/cases/fourslash/server/autoImportCrossProject_paths_stripSrc.ts
+++ b/tests/cases/fourslash/server/autoImportCrossProject_paths_stripSrc.ts
@@ -6,6 +6,7 @@
 // @Filename: /home/src/workspaces/project/packages/app/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "commonjs",
 ////     "outDir": "dist",
 ////     "rootDir": "src",
@@ -33,7 +34,7 @@
 
 // @Filename: /home/src/workspaces/project/packages/dep/tsconfig.json
 //// {
-////   "compilerOptions": { "outDir": "dist", "rootDir": "src", "module": "commonjs" }
+////   "compilerOptions": { "lib": ["es5"], "outDir": "dist", "rootDir": "src", "module": "commonjs" }
 //// }
 
 // @Filename: /home/src/workspaces/project/packages/dep/src/main.ts
diff --git a/tests/cases/fourslash/server/autoImportCrossProject_paths_toDist.ts b/tests/cases/fourslash/server/autoImportCrossProject_paths_toDist.ts
index 88705acd973a8..00e43f3d08c63 100644
--- a/tests/cases/fourslash/server/autoImportCrossProject_paths_toDist.ts
+++ b/tests/cases/fourslash/server/autoImportCrossProject_paths_toDist.ts
@@ -6,6 +6,7 @@
 // @Filename: /home/src/workspaces/project/packages/app/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "commonjs",
 ////     "outDir": "dist",
 ////     "rootDir": "src",
@@ -33,7 +34,7 @@
 
 // @Filename: /home/src/workspaces/project/packages/dep/tsconfig.json
 //// {
-////   "compilerOptions": { "outDir": "dist", "rootDir": "src", "module": "commonjs" }
+////   "compilerOptions": { "lib": ["es5"], "outDir": "dist", "rootDir": "src", "module": "commonjs" }
 //// }
 
 // @Filename: /home/src/workspaces/project/packages/dep/src/main.ts
diff --git a/tests/cases/fourslash/server/autoImportCrossProject_paths_toDist2.ts b/tests/cases/fourslash/server/autoImportCrossProject_paths_toDist2.ts
index 66bff52ffbc04..515fa5eb34f44 100644
--- a/tests/cases/fourslash/server/autoImportCrossProject_paths_toDist2.ts
+++ b/tests/cases/fourslash/server/autoImportCrossProject_paths_toDist2.ts
@@ -3,6 +3,7 @@
 // @Filename: /home/src/workspaces/project/common/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "commonjs",
 ////     "outDir": "dist",
 ////     "composite": true
@@ -18,6 +19,7 @@
 // @Filename: /home/src/workspaces/project/web/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "esnext",
 ////     "moduleResolution": "node",
 ////     "noEmit": true,
diff --git a/tests/cases/fourslash/server/autoImportCrossProject_paths_toSrc.ts b/tests/cases/fourslash/server/autoImportCrossProject_paths_toSrc.ts
index 230b6c7817808..ddddd413dda83 100644
--- a/tests/cases/fourslash/server/autoImportCrossProject_paths_toSrc.ts
+++ b/tests/cases/fourslash/server/autoImportCrossProject_paths_toSrc.ts
@@ -6,6 +6,7 @@
 // @Filename: /home/src/workspaces/project/packages/app/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "commonjs",
 ////     "outDir": "dist",
 ////     "rootDir": "src",
@@ -33,7 +34,7 @@
 
 // @Filename: /home/src/workspaces/project/packages/dep/tsconfig.json
 //// {
-////   "compilerOptions": { "outDir": "dist", "rootDir": "src", "module": "commonjs" }
+////   "compilerOptions": { "lib": ["es5"], "outDir": "dist", "rootDir": "src", "module": "commonjs" }
 //// }
 
 // @Filename: /home/src/workspaces/project/packages/dep/src/main.ts
diff --git a/tests/cases/fourslash/server/autoImportCrossProject_symlinks_stripSrc.ts b/tests/cases/fourslash/server/autoImportCrossProject_symlinks_stripSrc.ts
index febf4f2f948d2..e2466102cb14a 100644
--- a/tests/cases/fourslash/server/autoImportCrossProject_symlinks_stripSrc.ts
+++ b/tests/cases/fourslash/server/autoImportCrossProject_symlinks_stripSrc.ts
@@ -6,6 +6,7 @@
 // @Filename: /home/src/workspaces/project/packages/app/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "commonjs",
 ////     "outDir": "dist",
 ////     "rootDir": "src",
@@ -26,7 +27,7 @@
 
 // @Filename: /home/src/workspaces/project/packages/dep/tsconfig.json
 //// {
-////   "compilerOptions": { "outDir": "dist", "rootDir": "src", "module": "commonjs" }
+////   "compilerOptions": { "lib": ["es5"], "outDir": "dist", "rootDir": "src", "module": "commonjs" }
 //// }
 
 // @Filename: /home/src/workspaces/project/packages/dep/src/index.ts
diff --git a/tests/cases/fourslash/server/autoImportCrossProject_symlinks_toDist.ts b/tests/cases/fourslash/server/autoImportCrossProject_symlinks_toDist.ts
index cc3d6fbe1aee3..74666bfc1a3e5 100644
--- a/tests/cases/fourslash/server/autoImportCrossProject_symlinks_toDist.ts
+++ b/tests/cases/fourslash/server/autoImportCrossProject_symlinks_toDist.ts
@@ -6,6 +6,7 @@
 // @Filename: /home/src/workspaces/project/packages/app/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "commonjs",
 ////     "outDir": "dist",
 ////     "rootDir": "src",
@@ -26,7 +27,7 @@
 
 // @Filename: /home/src/workspaces/project/packages/dep/tsconfig.json
 //// {
-////   "compilerOptions": { "outDir": "dist", "rootDir": "src", "module": "commonjs" }
+////   "compilerOptions": { "lib": ["es5"], "outDir": "dist", "rootDir": "src", "module": "commonjs" }
 //// }
 
 // @Filename: /home/src/workspaces/project/packages/dep/src/index.ts
diff --git a/tests/cases/fourslash/server/autoImportCrossProject_symlinks_toSrc.ts b/tests/cases/fourslash/server/autoImportCrossProject_symlinks_toSrc.ts
index 70fe851e9b774..8248f56c22eb5 100644
--- a/tests/cases/fourslash/server/autoImportCrossProject_symlinks_toSrc.ts
+++ b/tests/cases/fourslash/server/autoImportCrossProject_symlinks_toSrc.ts
@@ -6,6 +6,7 @@
 // @Filename: /home/src/workspaces/project/packages/app/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "commonjs",
 ////     "outDir": "dist",
 ////     "rootDir": "src",
@@ -23,7 +24,7 @@
 
 // @Filename: /home/src/workspaces/project/packages/dep/tsconfig.json
 //// {
-////   "compilerOptions": { "outDir": "dist", "rootDir": "src", "module": "commonjs" }
+////   "compilerOptions": { "lib": ["es5"], "outDir": "dist", "rootDir": "src", "module": "commonjs" }
 //// }
 
 // @Filename: /home/src/workspaces/project/packages/dep/src/index.ts
diff --git a/tests/cases/fourslash/server/autoImportFileExcludePatterns1.ts b/tests/cases/fourslash/server/autoImportFileExcludePatterns1.ts
index 095a9be5cbf21..225f8d4b82f8d 100644
--- a/tests/cases/fourslash/server/autoImportFileExcludePatterns1.ts
+++ b/tests/cases/fourslash/server/autoImportFileExcludePatterns1.ts
@@ -1,6 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
 // @module: commonjs
+// @lib: es5
 
 // @Filename: /home/src/workspaces/project/node_modules/aws-sdk/package.json
 //// { "name": "aws-sdk", "version": "2.0.0", "main": "index.js" }
diff --git a/tests/cases/fourslash/server/autoImportFileExcludePatterns2.ts b/tests/cases/fourslash/server/autoImportFileExcludePatterns2.ts
index 05e353f6fb3e6..02c7ea0d014ba 100644
--- a/tests/cases/fourslash/server/autoImportFileExcludePatterns2.ts
+++ b/tests/cases/fourslash/server/autoImportFileExcludePatterns2.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @module: commonjs
 
 // @Filename: /home/src/workspaces/project/node_modules/aws-sdk/package.json
diff --git a/tests/cases/fourslash/server/autoImportFileExcludePatterns_networkPaths.ts b/tests/cases/fourslash/server/autoImportFileExcludePatterns_networkPaths.ts
index fe19e79213e68..8bfe9fa381578 100644
--- a/tests/cases/fourslash/server/autoImportFileExcludePatterns_networkPaths.ts
+++ b/tests/cases/fourslash/server/autoImportFileExcludePatterns_networkPaths.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @module: commonjs
 
 // @Filename: //tsclient/home/src/solution/project/node_modules/aws-sdk/package.json
diff --git a/tests/cases/fourslash/server/autoImportFileExcludePatterns_symlinks.ts b/tests/cases/fourslash/server/autoImportFileExcludePatterns_symlinks.ts
index 5d28e20d7cbfc..2c68d5219b294 100644
--- a/tests/cases/fourslash/server/autoImportFileExcludePatterns_symlinks.ts
+++ b/tests/cases/fourslash/server/autoImportFileExcludePatterns_symlinks.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @module: commonjs
 
 // @Filename: /home/src/workspaces/project/node_modules/.store/@remix-run-server-runtime-virtual-c72daf0d/package/package.json
diff --git a/tests/cases/fourslash/server/autoImportFileExcludePatterns_symlinks2.ts b/tests/cases/fourslash/server/autoImportFileExcludePatterns_symlinks2.ts
index aae7e01096fb5..d6a9bde726925 100644
--- a/tests/cases/fourslash/server/autoImportFileExcludePatterns_symlinks2.ts
+++ b/tests/cases/fourslash/server/autoImportFileExcludePatterns_symlinks2.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @module: commonjs
 
 // @Filename: c:/workspaces/project/node_modules/.store/aws-sdk-virtual-adfe098/package/package.json
diff --git a/tests/cases/fourslash/server/autoImportFileExcludePatterns_windowsPaths.ts b/tests/cases/fourslash/server/autoImportFileExcludePatterns_windowsPaths.ts
index c506a625bc9b2..6746a0460acc6 100644
--- a/tests/cases/fourslash/server/autoImportFileExcludePatterns_windowsPaths.ts
+++ b/tests/cases/fourslash/server/autoImportFileExcludePatterns_windowsPaths.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @module: commonjs
 
 // @Filename: c:/workspaces/project/node_modules/aws-sdk/package.json
diff --git a/tests/cases/fourslash/server/autoImportNodeModuleSymlinkRenamed.ts b/tests/cases/fourslash/server/autoImportNodeModuleSymlinkRenamed.ts
index 633eb86323b06..0940052276faf 100644
--- a/tests/cases/fourslash/server/autoImportNodeModuleSymlinkRenamed.ts
+++ b/tests/cases/fourslash/server/autoImportNodeModuleSymlinkRenamed.ts
@@ -16,6 +16,7 @@
 // @Filename: /home/src/workspaces/solution/packages/utils/tsconfig.json
 //// {
 ////     "compilerOptions": {
+////         "lib": ["es5"],
 ////         "composite": true,
 ////         "module": "nodenext",
 ////         "rootDir": "src",
@@ -39,6 +40,7 @@
 // @Filename: /home/src/workspaces/solution/packages/web/tsconfig.json
 //// {
 ////     "compilerOptions": {
+////         "lib": ["es5"],
 ////         "composite": true,
 ////         "module": "esnext",
 ////         "moduleResolution": "bundler",
diff --git a/tests/cases/fourslash/server/autoImportPackageJsonFilterExistingImport1.ts b/tests/cases/fourslash/server/autoImportPackageJsonFilterExistingImport1.ts
index 2a17d942a51cc..b8d7b1d9acdf1 100644
--- a/tests/cases/fourslash/server/autoImportPackageJsonFilterExistingImport1.ts
+++ b/tests/cases/fourslash/server/autoImportPackageJsonFilterExistingImport1.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @module: preserve
 
 // @Filename: /home/src/workspaces/project/node_modules/@types/react/index.d.ts
diff --git a/tests/cases/fourslash/server/autoImportPackageJsonFilterExistingImport2.ts b/tests/cases/fourslash/server/autoImportPackageJsonFilterExistingImport2.ts
index 386bd0bd7d295..f617054ef61b1 100644
--- a/tests/cases/fourslash/server/autoImportPackageJsonFilterExistingImport2.ts
+++ b/tests/cases/fourslash/server/autoImportPackageJsonFilterExistingImport2.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @module: preserve
 
 // @Filename: /home/src/workspaces/project/node_modules/@types/react/index.d.ts
diff --git a/tests/cases/fourslash/server/autoImportPackageJsonFilterExistingImport3.ts b/tests/cases/fourslash/server/autoImportPackageJsonFilterExistingImport3.ts
index 5b71a495d5196..4387219157598 100644
--- a/tests/cases/fourslash/server/autoImportPackageJsonFilterExistingImport3.ts
+++ b/tests/cases/fourslash/server/autoImportPackageJsonFilterExistingImport3.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @module: preserve
 
 // @Filename: /home/src/workspaces/project/node_modules/@types/node/index.d.ts
diff --git a/tests/cases/fourslash/server/autoImportProvider1.ts b/tests/cases/fourslash/server/autoImportProvider1.ts
index 78e7bdda8b9d5..90037e7af85bf 100644
--- a/tests/cases/fourslash/server/autoImportProvider1.ts
+++ b/tests/cases/fourslash/server/autoImportProvider1.ts
@@ -7,7 +7,7 @@
 //// export class PatternValidator {}
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// {}
+//// { "compilerOptions": { "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/package.json
 //// { "dependencies": { "@angular/forms": "*" } }
diff --git a/tests/cases/fourslash/server/autoImportProvider2.ts b/tests/cases/fourslash/server/autoImportProvider2.ts
index 61d10383a6f6e..3f3a9653f95ef 100644
--- a/tests/cases/fourslash/server/autoImportProvider2.ts
+++ b/tests/cases/fourslash/server/autoImportProvider2.ts
@@ -14,7 +14,7 @@
 //// export declare class IndirectDependency
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// {}
+//// { "compilerOptions": { "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/package.json
 //// { "dependencies": { "direct-dependency": "*" } }
diff --git a/tests/cases/fourslash/server/autoImportProvider3.ts b/tests/cases/fourslash/server/autoImportProvider3.ts
index 1f6024116c24a..2e1fd2c18b059 100644
--- a/tests/cases/fourslash/server/autoImportProvider3.ts
+++ b/tests/cases/fourslash/server/autoImportProvider3.ts
@@ -16,10 +16,10 @@
 //// { "private": true, "dependencies": { "common-dependency": "*" } }
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "files": [], "references": [{ "path": "packages/a" }] }
+//// { "compilerOptions": { "lib": ["es5"] }, "files": [], "references": [{ "path": "packages/a" }] }
 
 // @Filename: /home/src/workspaces/project/packages/a/tsconfig.json
-//// { "compilerOptions": { "target": "esnext", "composite": true } }
+//// { "compilerOptions": { "lib": ["es5"], "target": "esnext", "composite": true } }
 
 // @Filename: /home/src/workspaces/project/packages/a/package.json
 //// { "peerDependencies": { "package-dependency": "*" } }
diff --git a/tests/cases/fourslash/server/autoImportProvider4.ts b/tests/cases/fourslash/server/autoImportProvider4.ts
index b90b87ccd8c35..d5f04a31fc177 100644
--- a/tests/cases/fourslash/server/autoImportProvider4.ts
+++ b/tests/cases/fourslash/server/autoImportProvider4.ts
@@ -4,7 +4,7 @@
 //// { "dependencies": { "b": "*" } }
 
 // @Filename: /home/src/workspaces/project/a/tsconfig.json
-//// { "compilerOptions": { "module": "commonjs", "target": "esnext" }, "references": [{ "path": "../b" }] }
+//// { "compilerOptions": { "lib": ["es5"], "module": "commonjs", "target": "esnext" }, "references": [{ "path": "../b" }] }
 
 // @Filename: /home/src/workspaces/project/a/index.ts
 //// new Shape/**/
@@ -13,7 +13,7 @@
 //// { "types": "out/index.d.ts" }
 
 // @Filename: /home/src/workspaces/project/b/tsconfig.json
-//// { "compilerOptions": { "outDir": "out", "composite": true } }
+//// { "compilerOptions": { "lib": ["es5"], "outDir": "out", "composite": true } }
 
 // @Filename: /home/src/workspaces/project/b/index.ts
 //// export class Shape {}
diff --git a/tests/cases/fourslash/server/autoImportProvider5.ts b/tests/cases/fourslash/server/autoImportProvider5.ts
index 5e2c151b741c4..8efa7cd36caed 100644
--- a/tests/cases/fourslash/server/autoImportProvider5.ts
+++ b/tests/cases/fourslash/server/autoImportProvider5.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /home/src/workspaces/project/package.json
 //// { "dependencies": { "react-hook-form": "*" } }
 
diff --git a/tests/cases/fourslash/server/autoImportProvider7.ts b/tests/cases/fourslash/server/autoImportProvider7.ts
index 75ccc671f02af..0050136762569 100644
--- a/tests/cases/fourslash/server/autoImportProvider7.ts
+++ b/tests/cases/fourslash/server/autoImportProvider7.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "commonjs" } }
+//// { "compilerOptions": { "lib": ["es5"], "module": "commonjs" } }
 
 // @Filename: /home/src/workspaces/project/package.json
 //// { "dependencies": { "mylib": "file:packages/mylib" } }
diff --git a/tests/cases/fourslash/server/autoImportProvider8.ts b/tests/cases/fourslash/server/autoImportProvider8.ts
index 34b52b91c7370..4448cd4d18a1c 100644
--- a/tests/cases/fourslash/server/autoImportProvider8.ts
+++ b/tests/cases/fourslash/server/autoImportProvider8.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "commonjs" } }
+//// { "compilerOptions": { "lib": ["es5"], "module": "commonjs" } }
 
 // @Filename: /home/src/workspaces/project/package.json
 //// { "dependencies": { "mylib": "file:packages/mylib" } }
diff --git a/tests/cases/fourslash/server/autoImportProvider9.ts b/tests/cases/fourslash/server/autoImportProvider9.ts
index 135f230b15759..2f96c25cc0700 100644
--- a/tests/cases/fourslash/server/autoImportProvider9.ts
+++ b/tests/cases/fourslash/server/autoImportProvider9.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @module: preserve
 
 // @Filename: /home/src/workspaces/project/index.ts
diff --git a/tests/cases/fourslash/server/autoImportProvider_exportMap1.ts b/tests/cases/fourslash/server/autoImportProvider_exportMap1.ts
index 1914393ed301c..0574517ac5589 100644
--- a/tests/cases/fourslash/server/autoImportProvider_exportMap1.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_exportMap1.ts
@@ -3,6 +3,7 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "nodenext"
 ////   }
 //// }
diff --git a/tests/cases/fourslash/server/autoImportProvider_exportMap2.ts b/tests/cases/fourslash/server/autoImportProvider_exportMap2.ts
index be0dfda31eed0..37ac12f25b079 100644
--- a/tests/cases/fourslash/server/autoImportProvider_exportMap2.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_exportMap2.ts
@@ -5,8 +5,9 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
-////     "module": "commonjs"
-////     "moduleResolution": "node10",
+////     "lib": ["es5"],
+////     "module": "commonjs",
+////     "moduleResolution": "node10"
 ////   }
 //// }
 
diff --git a/tests/cases/fourslash/server/autoImportProvider_exportMap3.ts b/tests/cases/fourslash/server/autoImportProvider_exportMap3.ts
index 8f1c8080188f0..efdd59bc54975 100644
--- a/tests/cases/fourslash/server/autoImportProvider_exportMap3.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_exportMap3.ts
@@ -5,7 +5,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
-////     "module": "nodenext"
+////     "module": "nodenext",
+////     "lib": ["es5"]
 ////   }
 //// }
 
diff --git a/tests/cases/fourslash/server/autoImportProvider_exportMap4.ts b/tests/cases/fourslash/server/autoImportProvider_exportMap4.ts
index 454ab0cdc5787..950e86dfa2880 100644
--- a/tests/cases/fourslash/server/autoImportProvider_exportMap4.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_exportMap4.ts
@@ -5,7 +5,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
-////     "module": "nodenext"
+////     "module": "nodenext",
+////     "lib": ["es5"]
 ////   }
 //// }
 
diff --git a/tests/cases/fourslash/server/autoImportProvider_exportMap5.ts b/tests/cases/fourslash/server/autoImportProvider_exportMap5.ts
index eb7de32f08c54..ec70e18465f2c 100644
--- a/tests/cases/fourslash/server/autoImportProvider_exportMap5.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_exportMap5.ts
@@ -5,7 +5,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
-////     "module": "nodenext"
+////     "module": "nodenext",
+////     "lib": ["es5"]
 ////   }
 //// }
 
diff --git a/tests/cases/fourslash/server/autoImportProvider_exportMap6.ts b/tests/cases/fourslash/server/autoImportProvider_exportMap6.ts
index 07fe4977928dc..45e507428f9cb 100644
--- a/tests/cases/fourslash/server/autoImportProvider_exportMap6.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_exportMap6.ts
@@ -5,7 +5,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
-////     "module": "nodenext"
+////     "module": "nodenext",
+////     "lib": ["es5"]
 ////   }
 //// }
 
diff --git a/tests/cases/fourslash/server/autoImportProvider_exportMap7.ts b/tests/cases/fourslash/server/autoImportProvider_exportMap7.ts
index 6eb4af0addb92..f2494248df8c0 100644
--- a/tests/cases/fourslash/server/autoImportProvider_exportMap7.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_exportMap7.ts
@@ -5,7 +5,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
-////     "module": "nodenext"
+////     "module": "nodenext",
+////     "lib": ["es5"]
 ////   }
 //// }
 
diff --git a/tests/cases/fourslash/server/autoImportProvider_exportMap8.ts b/tests/cases/fourslash/server/autoImportProvider_exportMap8.ts
index 83e8994ba7f4f..73102eb4e1d24 100644
--- a/tests/cases/fourslash/server/autoImportProvider_exportMap8.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_exportMap8.ts
@@ -5,7 +5,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
-////     "module": "nodenext"
+////     "module": "nodenext",
+////     "lib": ["es5"]
 ////   }
 //// }
 
diff --git a/tests/cases/fourslash/server/autoImportProvider_exportMap9.ts b/tests/cases/fourslash/server/autoImportProvider_exportMap9.ts
index 984bafa5776e5..c1b497652ff83 100644
--- a/tests/cases/fourslash/server/autoImportProvider_exportMap9.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_exportMap9.ts
@@ -5,7 +5,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
-////     "module": "nodenext"
+////     "module": "nodenext",
+////     "lib": ["es5"]
 ////   }
 //// }
 
diff --git a/tests/cases/fourslash/server/autoImportProvider_globalTypingsCache.ts b/tests/cases/fourslash/server/autoImportProvider_globalTypingsCache.ts
index 98ea1cebed4b8..e0eafb22970f0 100644
--- a/tests/cases/fourslash/server/autoImportProvider_globalTypingsCache.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_globalTypingsCache.ts
@@ -10,7 +10,7 @@
 //// { "dependencies": { "react-router-dom": "*" } }
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "commonjs", "allowJs": true, "checkJs": true, "maxNodeModuleJsDepth": 2 }, "typeAcquisition": { "enable": true } }
+//// { "compilerOptions": { "module": "commonjs", "lib": ["es5"], "allowJs": true, "checkJs": true, "maxNodeModuleJsDepth": 2 }, "typeAcquisition": { "enable": true } }
 
 // @Filename: /home/src/workspaces/project/node_modules/react-router-dom/package.json
 //// { "name": "react-router-dom", "version": "16.8.4", "main": "index.js" }
diff --git a/tests/cases/fourslash/server/autoImportProvider_importsMap1.ts b/tests/cases/fourslash/server/autoImportProvider_importsMap1.ts
index 27b279c4999f0..d8eb2bd0d560d 100644
--- a/tests/cases/fourslash/server/autoImportProvider_importsMap1.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_importsMap1.ts
@@ -4,6 +4,7 @@
 //// {
 ////   "compilerOptions": {
 ////     "module": "nodenext",
+////     "lib": ["es5"],
 ////     "rootDir": "src",
 ////     "outDir": "dist"
 ////   }
diff --git a/tests/cases/fourslash/server/autoImportProvider_importsMap2.ts b/tests/cases/fourslash/server/autoImportProvider_importsMap2.ts
index a65a0a1c5b28a..d6ac0d7d5b696 100644
--- a/tests/cases/fourslash/server/autoImportProvider_importsMap2.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_importsMap2.ts
@@ -4,6 +4,7 @@
 //// {
 ////   "compilerOptions": {
 ////     "module": "nodenext",
+////     "lib": ["es5"],
 ////     "rootDir": "src",
 ////     "outDir": "dist"
 ////   }
diff --git a/tests/cases/fourslash/server/autoImportProvider_importsMap3.ts b/tests/cases/fourslash/server/autoImportProvider_importsMap3.ts
index d388d073df6c1..26973286129cf 100644
--- a/tests/cases/fourslash/server/autoImportProvider_importsMap3.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_importsMap3.ts
@@ -4,6 +4,7 @@
 //// {
 ////   "compilerOptions": {
 ////     "module": "nodenext",
+////     "lib": ["es5"],
 ////     "rootDir": "src",
 ////     "outDir": "dist"
 ////   }
diff --git a/tests/cases/fourslash/server/autoImportProvider_importsMap4.ts b/tests/cases/fourslash/server/autoImportProvider_importsMap4.ts
index 18835ce4012c8..b5d4e40bae82c 100644
--- a/tests/cases/fourslash/server/autoImportProvider_importsMap4.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_importsMap4.ts
@@ -4,6 +4,7 @@
 //// {
 ////   "compilerOptions": {
 ////     "module": "nodenext",
+////     "lib": ["es5"],
 ////     "rootDir": "src",
 ////     "outDir": "dist"
 ////   }
diff --git a/tests/cases/fourslash/server/autoImportProvider_importsMap5.ts b/tests/cases/fourslash/server/autoImportProvider_importsMap5.ts
index 7fab15502abe7..ad1cbf499a8a6 100644
--- a/tests/cases/fourslash/server/autoImportProvider_importsMap5.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_importsMap5.ts
@@ -4,6 +4,7 @@
 //// {
 ////   "compilerOptions": {
 ////     "module": "nodenext",
+////     "lib": ["es5"],
 ////     "rootDir": "src",
 ////     "outDir": "dist",
 ////     "declarationDir": "types",
diff --git a/tests/cases/fourslash/server/autoImportProvider_namespaceSameNameAsIntrinsic.ts b/tests/cases/fourslash/server/autoImportProvider_namespaceSameNameAsIntrinsic.ts
index 52cc56ffd2f45..b5d75df367a24 100644
--- a/tests/cases/fourslash/server/autoImportProvider_namespaceSameNameAsIntrinsic.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_namespaceSameNameAsIntrinsic.ts
@@ -14,7 +14,7 @@
 //// { "dependencies": { "fp-ts": "^0.10.4" } }
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "commonjs" } }
+//// { "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/index.ts
 //// type A = { name: string/**/ }
diff --git a/tests/cases/fourslash/server/autoImportProvider_pnpm.ts b/tests/cases/fourslash/server/autoImportProvider_pnpm.ts
index 3676e696759fc..cc8bfc0b81728 100644
--- a/tests/cases/fourslash/server/autoImportProvider_pnpm.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_pnpm.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "commonjs" } }
+//// { "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/package.json
 //// { "dependencies": { "mobx": "*" } }
diff --git a/tests/cases/fourslash/server/autoImportProvider_referencesCrash.ts b/tests/cases/fourslash/server/autoImportProvider_referencesCrash.ts
index 09efaa4c9e3b4..97d1ab10efc64 100644
--- a/tests/cases/fourslash/server/autoImportProvider_referencesCrash.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_referencesCrash.ts
@@ -4,7 +4,7 @@
 //// {}
 
 // @Filename: /home/src/workspaces/project/a/tsconfig.json
-//// {}
+//// { "compilerOptions": { "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/a/index.ts
 //// class A {}
@@ -19,7 +19,7 @@
 
 // @Filename: /home/src/workspaces/project/b/tsconfig.json
 //// {
-////   "compilerOptions": { "disableSourceOfProjectReferenceRedirect": true },
+////   "compilerOptions": { "disableSourceOfProjectReferenceRedirect": true, "lib": ["es5"] },
 ////   "references": [{ "path": "../a" }]
 //// }
 
@@ -31,7 +31,7 @@
 //// { "dependencies": { "a": "*" } }
 
 // @Filename: /home/src/workspaces/project/c/tsconfig.json
-//// { "references" [{ "path": "../a" }] }
+//// { "compilerOptions": { "lib": ["es5"] }, "references" [{ "path": "../a" }] }
 
 // @Filename: /home/src/workspaces/project/c/index.ts
 //// export {};
diff --git a/tests/cases/fourslash/server/autoImportProvider_wildcardExports1.ts b/tests/cases/fourslash/server/autoImportProvider_wildcardExports1.ts
index e4bcf3dec237e..1be87c02cc105 100644
--- a/tests/cases/fourslash/server/autoImportProvider_wildcardExports1.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_wildcardExports1.ts
@@ -43,7 +43,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////     "compilerOptions": {
-////         "module": "nodenext"
+////         "module": "nodenext",
+////         "lib": ["es5"]
 ////     }
 //// }
 
diff --git a/tests/cases/fourslash/server/autoImportProvider_wildcardExports2.ts b/tests/cases/fourslash/server/autoImportProvider_wildcardExports2.ts
index 3f2076df3186f..2ec153b107cc1 100644
--- a/tests/cases/fourslash/server/autoImportProvider_wildcardExports2.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_wildcardExports2.ts
@@ -26,7 +26,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////     "compilerOptions": {
-////         "module": "nodenext"
+////         "module": "nodenext",
+////         "lib": ["es5"]
 ////     }
 //// }
 
diff --git a/tests/cases/fourslash/server/autoImportProvider_wildcardExports3.ts b/tests/cases/fourslash/server/autoImportProvider_wildcardExports3.ts
index c0bfc82408e81..e60a796d7e132 100644
--- a/tests/cases/fourslash/server/autoImportProvider_wildcardExports3.ts
+++ b/tests/cases/fourslash/server/autoImportProvider_wildcardExports3.ts
@@ -27,7 +27,8 @@
 ////     "module": "esnext",
 ////     "moduleResolution": "bundler",
 ////     "noEmit": true,
-////     "jsx": "preserve"
+////     "jsx": "preserve",
+////     "lib": ["es5"]
 ////   },
 ////  "include": ["app"]
 //// }
diff --git a/tests/cases/fourslash/server/autoImportReExportFromAmbientModule.ts b/tests/cases/fourslash/server/autoImportReExportFromAmbientModule.ts
index 281f4eb8d33a3..e96b11e8247ec 100644
--- a/tests/cases/fourslash/server/autoImportReExportFromAmbientModule.ts
+++ b/tests/cases/fourslash/server/autoImportReExportFromAmbientModule.ts
@@ -3,7 +3,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
-////     "module": "commonjs"
+////     "module": "commonjs",
+////     "lib": ["es5"]
 ////   }
 //// }
 
diff --git a/tests/cases/fourslash/server/autoImportRelativePathToMonorepoPackage.ts b/tests/cases/fourslash/server/autoImportRelativePathToMonorepoPackage.ts
index 42037dbdf795d..104c6280db02c 100644
--- a/tests/cases/fourslash/server/autoImportRelativePathToMonorepoPackage.ts
+++ b/tests/cases/fourslash/server/autoImportRelativePathToMonorepoPackage.ts
@@ -3,7 +3,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
-////     "module": "nodenext"
+////     "module": "nodenext",
+////     "lib": ["es5"]
 ////   }
 //// }
 
diff --git a/tests/cases/fourslash/server/autoImportSymlinkedJsPackages.ts b/tests/cases/fourslash/server/autoImportSymlinkedJsPackages.ts
index ba36703168634..ac41a6393f32d 100644
--- a/tests/cases/fourslash/server/autoImportSymlinkedJsPackages.ts
+++ b/tests/cases/fourslash/server/autoImportSymlinkedJsPackages.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /home/src/workspaces/project/packages/a/package.json
 //// {
 ////   "name": "package-a",
@@ -19,7 +21,7 @@
 
 // @link: /home/src/workspaces/project/packages/b -> /home/src/workspaces/project/packages/a/node_modules/package-b
 
-config.setCompilerOptionsForInferredProjects({ module: "commonjs", allowJs: true, maxNodeModulesJsDepth: 2 });
+config.setCompilerOptionsForInferredProjects({ module: "commonjs", lib: ["es5"], allowJs: true, maxNodeModulesJsDepth: 2 });
 goTo.marker("");
 verify.completions({
   marker: "",
diff --git a/tests/cases/fourslash/server/brace01.ts b/tests/cases/fourslash/server/brace01.ts
index 845f96ac9a346..14ca5d2f9e1d2 100644
--- a/tests/cases/fourslash/server/brace01.ts
+++ b/tests/cases/fourslash/server/brace01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 //////curly braces
 ////module Foo [|{
 ////    class Bar [|{
diff --git a/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts b/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts
index db1ec66d944e7..2a7f7f1f512cd 100644
--- a/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts
+++ b/tests/cases/fourslash/server/callHierarchyContainerNameServer.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
+
 ////function /**/f() {}
 ////
 ////class A {
diff --git a/tests/cases/fourslash/server/completionEntryDetailAcrossFiles01.ts b/tests/cases/fourslash/server/completionEntryDetailAcrossFiles01.ts
index 6d4324adb8877..0732111168185 100644
--- a/tests/cases/fourslash/server/completionEntryDetailAcrossFiles01.ts
+++ b/tests/cases/fourslash/server/completionEntryDetailAcrossFiles01.ts
@@ -1,6 +1,8 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
+// @allowJs: true
 // @Filename: a.js
 //// /**
 ////  * Modify the parameter
diff --git a/tests/cases/fourslash/server/completionEntryDetailAcrossFiles02.ts b/tests/cases/fourslash/server/completionEntryDetailAcrossFiles02.ts
index fb131ce5d7ace..13a7751bf7068 100644
--- a/tests/cases/fourslash/server/completionEntryDetailAcrossFiles02.ts
+++ b/tests/cases/fourslash/server/completionEntryDetailAcrossFiles02.ts
@@ -1,6 +1,8 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
+// @allowJs: true
 // @Filename: a.js
 //// /**
 ////  * Modify the parameter
diff --git a/tests/cases/fourslash/server/completions01.ts b/tests/cases/fourslash/server/completions01.ts
index 21fb7145ebbad..150507e1d349a 100644
--- a/tests/cases/fourslash/server/completions01.ts
+++ b/tests/cases/fourslash/server/completions01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ////var x: string[] = [];
 ////x.forEach(function (y) { y/*1*/
 ////x.forEach(y => y/*2*/
diff --git a/tests/cases/fourslash/server/completions02.ts b/tests/cases/fourslash/server/completions02.ts
index 240c19412ab7b..3f035d4ebc65e 100644
--- a/tests/cases/fourslash/server/completions02.ts
+++ b/tests/cases/fourslash/server/completions02.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ////class Foo {
 ////}
 ////namespace Foo {
diff --git a/tests/cases/fourslash/server/completions03.ts b/tests/cases/fourslash/server/completions03.ts
index ad8aeff2b77ae..33d03f37c19b3 100644
--- a/tests/cases/fourslash/server/completions03.ts
+++ b/tests/cases/fourslash/server/completions03.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 // issue: https://github.com/Microsoft/TypeScript/issues/10108
 
 //// interface Foo {
diff --git a/tests/cases/fourslash/server/completionsImport_addToNamedWithDifferentCacheValue.ts b/tests/cases/fourslash/server/completionsImport_addToNamedWithDifferentCacheValue.ts
index a97e078202be1..2bc2952dd1908 100644
--- a/tests/cases/fourslash/server/completionsImport_addToNamedWithDifferentCacheValue.ts
+++ b/tests/cases/fourslash/server/completionsImport_addToNamedWithDifferentCacheValue.ts
@@ -5,7 +5,7 @@
 // bug, which, if fixed, would prevent the later crash.
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "commonjs" } }
+//// { "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/packages/mylib/package.json
 //// { "name": "mylib", "version": "1.0.0", "main": "index.js" }
diff --git a/tests/cases/fourslash/server/completionsImport_computedSymbolName.ts b/tests/cases/fourslash/server/completionsImport_computedSymbolName.ts
index a7eded32cf5a4..abf3b6eca5a31 100644
--- a/tests/cases/fourslash/server/completionsImport_computedSymbolName.ts
+++ b/tests/cases/fourslash/server/completionsImport_computedSymbolName.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "commonjs" } }
+//// { "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/node_modules/@types/ts-node/index.d.ts
 //// export {};
diff --git a/tests/cases/fourslash/server/completionsImport_defaultAndNamedConflict_server.ts b/tests/cases/fourslash/server/completionsImport_defaultAndNamedConflict_server.ts
index c09444c8cf72d..90bc4698d9549 100644
--- a/tests/cases/fourslash/server/completionsImport_defaultAndNamedConflict_server.ts
+++ b/tests/cases/fourslash/server/completionsImport_defaultAndNamedConflict_server.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "noLib": true } }
+//// { "compilerOptions": { "noLib": true, "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/someModule.ts
 //// export const someModule = 0;
diff --git a/tests/cases/fourslash/server/completionsImport_jsModuleExportsAssignment.ts b/tests/cases/fourslash/server/completionsImport_jsModuleExportsAssignment.ts
index f2f0e98dcc9a7..cb7a459da791d 100644
--- a/tests/cases/fourslash/server/completionsImport_jsModuleExportsAssignment.ts
+++ b/tests/cases/fourslash/server/completionsImport_jsModuleExportsAssignment.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "commonjs", "allowJs": true } }
+//// { "compilerOptions": { "module": "commonjs", "allowJs": true, "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/third_party/marked/src/defaults.js
 //// function getDefaults() {
diff --git a/tests/cases/fourslash/server/completionsImport_mergedReExport.ts b/tests/cases/fourslash/server/completionsImport_mergedReExport.ts
index 8a0b7ad0a861d..dc3c31bc78d27 100644
--- a/tests/cases/fourslash/server/completionsImport_mergedReExport.ts
+++ b/tests/cases/fourslash/server/completionsImport_mergedReExport.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "commonjs" } }
+//// { "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/package.json
 //// { "dependencies": { "@jest/types": "*", "ts-jest": "*" } }
diff --git a/tests/cases/fourslash/server/completionsImport_sortingModuleSpecifiers.ts b/tests/cases/fourslash/server/completionsImport_sortingModuleSpecifiers.ts
index 07fddf4c8177a..1977a4e3ea092 100644
--- a/tests/cases/fourslash/server/completionsImport_sortingModuleSpecifiers.ts
+++ b/tests/cases/fourslash/server/completionsImport_sortingModuleSpecifiers.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: tsconfig.json
-//// { "compilerOptions": { "module": "commonjs" } }
+//// { "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 // @Filename: path.d.ts
 //// declare module "path/posix" {
diff --git a/tests/cases/fourslash/server/completionsOverridingMethodCrash2.ts b/tests/cases/fourslash/server/completionsOverridingMethodCrash2.ts
index e1fab3fe2f119..f2b38c47462d1 100644
--- a/tests/cases/fourslash/server/completionsOverridingMethodCrash2.ts
+++ b/tests/cases/fourslash/server/completionsOverridingMethodCrash2.ts
@@ -3,7 +3,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
-////     "module": "nodenext"
+////     "module": "nodenext",
+////     "lib": ["es5"]
 ////   }
 //// }
 
diff --git a/tests/cases/fourslash/server/completionsServerCommitCharacters.ts b/tests/cases/fourslash/server/completionsServerCommitCharacters.ts
index 6873b4b40eb84..cd8c882594f98 100644
--- a/tests/cases/fourslash/server/completionsServerCommitCharacters.ts
+++ b/tests/cases/fourslash/server/completionsServerCommitCharacters.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /home/src/workspaces/project/src/index.ts
 //// const a: "aa" | "bb" = "/**/";
 
diff --git a/tests/cases/fourslash/server/configurePlugin.ts b/tests/cases/fourslash/server/configurePlugin.ts
index 251a343217125..79ea89e4ec150 100644
--- a/tests/cases/fourslash/server/configurePlugin.ts
+++ b/tests/cases/fourslash/server/configurePlugin.ts
@@ -3,6 +3,7 @@
 // @Filename: tsconfig.json
 //// {
 ////     "compilerOptions": {
+////         "lib": ["es5"],
 ////         "plugins": [
 ////             { "name": "configurable-diagnostic-adder" , "message": "configured error" }
 ////         ]
diff --git a/tests/cases/fourslash/server/convertFunctionToEs6Class-server1.ts b/tests/cases/fourslash/server/convertFunctionToEs6Class-server1.ts
index 7e34b109f5ccc..bcc9edfe18439 100644
--- a/tests/cases/fourslash/server/convertFunctionToEs6Class-server1.ts
+++ b/tests/cases/fourslash/server/convertFunctionToEs6Class-server1.ts
@@ -1,8 +1,9 @@
-// @allowNonTsExtensions: true
-// @Filename: test123.js
-
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
+// @allowNonTsExtensions: true
+
+// @Filename: test123.js
 //// // Comment
 //// function fn() {
 ////     this.baz = 10;
diff --git a/tests/cases/fourslash/server/convertFunctionToEs6Class-server2.ts b/tests/cases/fourslash/server/convertFunctionToEs6Class-server2.ts
index 470325c5ae7c7..a3d18973f3e38 100644
--- a/tests/cases/fourslash/server/convertFunctionToEs6Class-server2.ts
+++ b/tests/cases/fourslash/server/convertFunctionToEs6Class-server2.ts
@@ -1,3 +1,4 @@
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: test123.js
 
diff --git a/tests/cases/fourslash/server/declarationMapGoToDefinition.ts b/tests/cases/fourslash/server/declarationMapGoToDefinition.ts
index f051ffed97fdd..ab3cb046604f8 100644
--- a/tests/cases/fourslash/server/declarationMapGoToDefinition.ts
+++ b/tests/cases/fourslash/server/declarationMapGoToDefinition.ts
@@ -1,4 +1,5 @@
 /// <reference path="../fourslash.ts" />
+// @lib: es5
 // @Filename: index.ts
 ////export class Foo {
 ////    member: string;
diff --git a/tests/cases/fourslash/server/declarationMapsEnableMapping_NoInline.ts b/tests/cases/fourslash/server/declarationMapsEnableMapping_NoInline.ts
index fffd4662f0892..752993e70aff6 100644
--- a/tests/cases/fourslash/server/declarationMapsEnableMapping_NoInline.ts
+++ b/tests/cases/fourslash/server/declarationMapsEnableMapping_NoInline.ts
@@ -3,6 +3,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 ////{
 ////    "compilerOptions": {
+////        "lib": ["es5"],
+////        "strict": false,
 ////        "outDir": "./dist",
 ////        "inlineSourceMap": true,
 ////        "declaration": true,
diff --git a/tests/cases/fourslash/server/declarationMapsEnableMapping_NoInlineSources.ts b/tests/cases/fourslash/server/declarationMapsEnableMapping_NoInlineSources.ts
index d0720f53a481c..3c6cf114c69b5 100644
--- a/tests/cases/fourslash/server/declarationMapsEnableMapping_NoInlineSources.ts
+++ b/tests/cases/fourslash/server/declarationMapsEnableMapping_NoInlineSources.ts
@@ -3,6 +3,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 ////{
 ////    "compilerOptions": {
+////        "lib": ["es5"],
+////        "strict": false,
 ////        "outDir": "./dist",
 ////        "inlineSourceMap": true,
 ////        "inlineSources": true,
diff --git a/tests/cases/fourslash/server/declarationMapsGeneratedMapsEnableMapping.ts b/tests/cases/fourslash/server/declarationMapsGeneratedMapsEnableMapping.ts
index 12f60211ede0c..a22b21dac6839 100644
--- a/tests/cases/fourslash/server/declarationMapsGeneratedMapsEnableMapping.ts
+++ b/tests/cases/fourslash/server/declarationMapsGeneratedMapsEnableMapping.ts
@@ -3,6 +3,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 ////{
 ////    "compilerOptions": {
+////        "lib": ["es5"],
+////        "strict": false,
 ////        "outDir": "./dist",
 ////        "declaration": true,
 ////        "declarationMap": true,
diff --git a/tests/cases/fourslash/server/declarationMapsGeneratedMapsEnableMapping2.ts b/tests/cases/fourslash/server/declarationMapsGeneratedMapsEnableMapping2.ts
index fe529c2794925..5111f36139879 100644
--- a/tests/cases/fourslash/server/declarationMapsGeneratedMapsEnableMapping2.ts
+++ b/tests/cases/fourslash/server/declarationMapsGeneratedMapsEnableMapping2.ts
@@ -3,6 +3,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 ////{
 ////    "compilerOptions": {
+////        "lib": ["es5"],
+////        "strict": false,
 ////        "outDir": "./dist",
 ////        "sourceMap": true,
 ////        "sourceRoot": "/home/src/workspaces/project/",
diff --git a/tests/cases/fourslash/server/declarationMapsGeneratedMapsEnableMapping3.ts b/tests/cases/fourslash/server/declarationMapsGeneratedMapsEnableMapping3.ts
index b27faeb8919a2..b9adc8fd269fc 100644
--- a/tests/cases/fourslash/server/declarationMapsGeneratedMapsEnableMapping3.ts
+++ b/tests/cases/fourslash/server/declarationMapsGeneratedMapsEnableMapping3.ts
@@ -3,6 +3,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 ////{
 ////    "compilerOptions": {
+////        "lib": ["es5"],
+////        "strict": false,
 ////        "outDir": "./dist",
 ////        "sourceRoot": "/home/src/workspaces/project/",
 ////        "declaration": true,
diff --git a/tests/cases/fourslash/server/declarationMapsGoToDefinitionRelativeSourceRoot.ts b/tests/cases/fourslash/server/declarationMapsGoToDefinitionRelativeSourceRoot.ts
index ba3447a28c4ff..2f6e52d01fb08 100644
--- a/tests/cases/fourslash/server/declarationMapsGoToDefinitionRelativeSourceRoot.ts
+++ b/tests/cases/fourslash/server/declarationMapsGoToDefinitionRelativeSourceRoot.ts
@@ -1,4 +1,5 @@
 /// <reference path="../fourslash.ts" />
+// @lib: es5
 // @Filename: index.ts
 ////export class Foo {
 ////    member: string;
diff --git a/tests/cases/fourslash/server/declarationMapsGoToDefinitionSameNameDifferentDirectory.ts b/tests/cases/fourslash/server/declarationMapsGoToDefinitionSameNameDifferentDirectory.ts
index 078aecb6418bb..6c029e9d29d79 100644
--- a/tests/cases/fourslash/server/declarationMapsGoToDefinitionSameNameDifferentDirectory.ts
+++ b/tests/cases/fourslash/server/declarationMapsGoToDefinitionSameNameDifferentDirectory.ts
@@ -21,6 +21,8 @@
 ////    "$schema": "http://json.schemastore.org/tsconfig",
 ////    "compileOnSave": true,
 ////    "compilerOptions": {
+////      "lib": ["es5"],
+////      "strict": false,
 ////      "sourceMap": true,
 ////      "declaration": true,
 ////      "declarationMap": true
diff --git a/tests/cases/fourslash/server/declarationMapsOutOfDateMapping.ts b/tests/cases/fourslash/server/declarationMapsOutOfDateMapping.ts
index 89345b2316a5b..1bf0e76a41d4c 100644
--- a/tests/cases/fourslash/server/declarationMapsOutOfDateMapping.ts
+++ b/tests/cases/fourslash/server/declarationMapsOutOfDateMapping.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /home/src/workspaces/project/node_modules/a/dist/index.d.ts
 ////export declare class Foo {
 ////    bar: any;
diff --git a/tests/cases/fourslash/server/definition01.ts b/tests/cases/fourslash/server/definition01.ts
index 2760a38d0a6e1..69f27e8a2dbf1 100644
--- a/tests/cases/fourslash/server/definition01.ts
+++ b/tests/cases/fourslash/server/definition01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 // @Filename: b.ts
 ////import n = require([|'./a/*1*/'|]);
 ////var x = new n.Foo();
diff --git a/tests/cases/fourslash/server/documentHighlights01.ts b/tests/cases/fourslash/server/documentHighlights01.ts
index 235f8af5e679e..524a223d9d9d4 100644
--- a/tests/cases/fourslash/server/documentHighlights01.ts
+++ b/tests/cases/fourslash/server/documentHighlights01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 // @Filename: a.ts
 ////function [|f|](x: typeof [|f|]) {
 ////    [|f|]([|f|]);
diff --git a/tests/cases/fourslash/server/documentHighlights02.ts b/tests/cases/fourslash/server/documentHighlights02.ts
index a5f06ddd5c2d4..4af12c01062ff 100644
--- a/tests/cases/fourslash/server/documentHighlights02.ts
+++ b/tests/cases/fourslash/server/documentHighlights02.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 // @Filename: a.ts
 ////function [|foo|] () {
 ////	return 1;
diff --git a/tests/cases/fourslash/server/documentHighlightsTypeParameterInHeritageClause01.ts b/tests/cases/fourslash/server/documentHighlightsTypeParameterInHeritageClause01.ts
index 1829ce91f0379..90906b7f4d84f 100644
--- a/tests/cases/fourslash/server/documentHighlightsTypeParameterInHeritageClause01.ts
+++ b/tests/cases/fourslash/server/documentHighlightsTypeParameterInHeritageClause01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
+
 ////interface I<[|T|]> extends I<[|T|]>, [|T|] {
 ////}
 
diff --git a/tests/cases/fourslash/server/fixExtractToInnerFunctionDuplicaton.ts b/tests/cases/fourslash/server/fixExtractToInnerFunctionDuplicaton.ts
index e782b26388f72..e77d189ae790c 100644
--- a/tests/cases/fourslash/server/fixExtractToInnerFunctionDuplicaton.ts
+++ b/tests/cases/fourslash/server/fixExtractToInnerFunctionDuplicaton.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
+
 //// function foo(): void { /*x*/console.log('a');/*y*/ }
 
 goTo.select("x","y");
diff --git a/tests/cases/fourslash/server/format01.ts b/tests/cases/fourslash/server/format01.ts
index d103a607df151..ad5dfafbf2ecf 100644
--- a/tests/cases/fourslash/server/format01.ts
+++ b/tests/cases/fourslash/server/format01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 /////**/namespace Default{var x= ( { } ) ;}
 
 
diff --git a/tests/cases/fourslash/server/formatBracketInSwitchCase.ts b/tests/cases/fourslash/server/formatBracketInSwitchCase.ts
index 116138f9743bc..db290fb0e83be 100644
--- a/tests/cases/fourslash/server/formatBracketInSwitchCase.ts
+++ b/tests/cases/fourslash/server/formatBracketInSwitchCase.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ////switch (x) {
 ////    case[]:
 ////}
diff --git a/tests/cases/fourslash/server/formatOnEnter.ts b/tests/cases/fourslash/server/formatOnEnter.ts
index 29ac3ed6adb08..11338a975e8e8 100644
--- a/tests/cases/fourslash/server/formatOnEnter.ts
+++ b/tests/cases/fourslash/server/formatOnEnter.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 /////*3*/function listAPIFiles (path : string): string[] {
 ////    /*1*/
 ////    /*2*/
diff --git a/tests/cases/fourslash/server/formatSpaceBetweenFunctionAndArrayIndex.ts b/tests/cases/fourslash/server/formatSpaceBetweenFunctionAndArrayIndex.ts
index 7f2cbb8148faf..67b9bba7dd90d 100644
--- a/tests/cases/fourslash/server/formatSpaceBetweenFunctionAndArrayIndex.ts
+++ b/tests/cases/fourslash/server/formatSpaceBetweenFunctionAndArrayIndex.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ////
 ////function test() {
 ////    return [];
diff --git a/tests/cases/fourslash/server/formatTrimRemainingRangets b/tests/cases/fourslash/server/formatTrimRemainingRange.ts
similarity index 81%
rename from tests/cases/fourslash/server/formatTrimRemainingRangets
rename to tests/cases/fourslash/server/formatTrimRemainingRange.ts
index ebc1294236c1a..476a18e66522a 100644
--- a/tests/cases/fourslash/server/formatTrimRemainingRangets
+++ b/tests/cases/fourslash/server/formatTrimRemainingRange.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ////     ;
 ////     /*
 ////     
@@ -8,6 +10,6 @@
 format.document();
 verify.currentFileContentIs(
 `;
-    /*
+/*
  
 */`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/server/formatonkey01.ts b/tests/cases/fourslash/server/formatonkey01.ts
index 73e817ce3b3bf..f7dd9e4e62af5 100644
--- a/tests/cases/fourslash/server/formatonkey01.ts
+++ b/tests/cases/fourslash/server/formatonkey01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ////switch (1) {
 ////    case 1:
 ////        {
diff --git a/tests/cases/fourslash/server/getFileReferences_deduplicate.ts b/tests/cases/fourslash/server/getFileReferences_deduplicate.ts
index 1e7aacbf25679..f1b568db54420 100644
--- a/tests/cases/fourslash/server/getFileReferences_deduplicate.ts
+++ b/tests/cases/fourslash/server/getFileReferences_deduplicate.ts
@@ -1,19 +1,21 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// { "files": [], "references": [{ "path": "tsconfig.build.json" }, { "path": "tsconfig.test.json" }] }
 
 // @Filename: /home/src/workspaces/project/tsconfig.utils.json
-//// { "compilerOptions": { "rootDir": "src", "outDir": "dist/utils", "composite": true }, "files": ["util.ts"] }
+//// { "compilerOptions": { "lib": ["es5"], "rootDir": "src", "outDir": "dist/utils", "composite": true }, "files": ["util.ts"] }
 
 // @Filename: /home/src/workspaces/project/tsconfig.build.json
-//// { "compilerOptions": { "rootDir": "src", "outDir": "dist/build", "composite": true }, "files": ["index.ts"], "references": [{ "path": "tsconfig.utils.json" }] }
+//// { "compilerOptions": { "lib": ["es5"], "rootDir": "src", "outDir": "dist/build", "composite": true }, "files": ["index.ts"], "references": [{ "path": "tsconfig.utils.json" }] }
 
 // @Filename: /home/src/workspaces/project/index.ts
 //// export * from "./util";
 
 // @Filename: /home/src/workspaces/project/tsconfig.test.json
-//// { "compilerOptions": { "rootDir": "src", "outDir": "dist/test", "composite": true }, "files": ["test.ts", "index.ts"], "references": [{ "path": "tsconfig.utils.json" }] }
+//// { "compilerOptions": { "lib": ["es5"], "rootDir": "src", "outDir": "dist/test", "composite": true }, "files": ["test.ts", "index.ts"], "references": [{ "path": "tsconfig.utils.json" }] }
 
 // @Filename: /home/src/workspaces/project/test.ts
 //// import "./util";
diff --git a/tests/cases/fourslash/server/getFileReferences_server1.ts b/tests/cases/fourslash/server/getFileReferences_server1.ts
index 80a8eb77f7ae9..df21e91c89ffa 100644
--- a/tests/cases/fourslash/server/getFileReferences_server1.ts
+++ b/tests/cases/fourslash/server/getFileReferences_server1.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// {}
+//// { "compilerOptions": { "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/a.ts
 //// export const a = 0;
diff --git a/tests/cases/fourslash/server/getFileReferences_server2.ts b/tests/cases/fourslash/server/getFileReferences_server2.ts
index 784545f3018e9..39ce6853970db 100644
--- a/tests/cases/fourslash/server/getFileReferences_server2.ts
+++ b/tests/cases/fourslash/server/getFileReferences_server2.ts
@@ -4,13 +4,13 @@
 //// { "files": [], "references": [{ "path": "packages/server" }, { "path": "packages/client" }] }
 
 // @Filename: /home/src/workspaces/project/packages/shared/tsconfig.json
-//// { "compilerOptions": { "rootDir": "src", "outDir": "dist", "composite": true } }
+//// { "compilerOptions": { "lib": ["es5"], "rootDir": "src", "outDir": "dist", "composite": true } }
 
 // @Filename: /home/src/workspaces/project/packages/shared/src/referenced.ts
 //// export {};
 
 // @Filename: /home/src/workspaces/project/packages/server/tsconfig.json
-//// { "compilerOptions": { "checkJs": true }, "references": [{ "path": "../shared" }] }
+//// { "compilerOptions": { "lib": ["es5"], "checkJs": true }, "references": [{ "path": "../shared" }] }
 
 // @Filename: /home/src/workspaces/project/packages/server/index.js
 //// const mod = require("../shared/src/referenced");
@@ -19,7 +19,7 @@
 //// const blah = require("../shared/dist/referenced");
 
 // @Filename: /home/src/workspaces/project/packages/client/tsconfig.json
-//// { "compilerOptions": { "paths": { "@shared/*": ["../shared/src/*"] } }, "references": [{ "path": "../shared" }] }
+//// { "compilerOptions": { "lib": ["es5"], "paths": { "@shared/*": ["../shared/src/*"] } }, "references": [{ "path": "../shared" }] }
 
 // @Filename: /home/src/workspaces/project/packages/client/index.ts
 //// import "@shared/referenced";
diff --git a/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics01.ts b/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics01.ts
index 1a888cb8b8f19..b5662177bb41f 100644
--- a/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics01.ts
+++ b/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics01.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @allowJs: true
 // @Filename: a.js
 ////var ===;
diff --git a/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics02.ts b/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics02.ts
index 8b182bd98eb31..8b34790473d1e 100644
--- a/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics02.ts
+++ b/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics02.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @allowJs: true
 // @Filename: b.js
 ////var a = "a";
diff --git a/tests/cases/fourslash/server/getOutliningSpansForComments.ts b/tests/cases/fourslash/server/getOutliningSpansForComments.ts
index 1c1d38454e7a6..11108484565c0 100644
--- a/tests/cases/fourslash/server/getOutliningSpansForComments.ts
+++ b/tests/cases/fourslash/server/getOutliningSpansForComments.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ////[|/*
 ////    Block comment at the beginning of the file before module:
 ////        line one of the comment
diff --git a/tests/cases/fourslash/server/getOutliningSpansForRegions.ts b/tests/cases/fourslash/server/getOutliningSpansForRegions.ts
index dbfe68204dc75..cf36bdcbe856c 100644
--- a/tests/cases/fourslash/server/getOutliningSpansForRegions.ts
+++ b/tests/cases/fourslash/server/getOutliningSpansForRegions.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ////// region without label
 ////[|// #region
 ////
diff --git a/tests/cases/fourslash/server/getOutliningSpansForRegionsNoSingleLineFolds.ts b/tests/cases/fourslash/server/getOutliningSpansForRegionsNoSingleLineFolds.ts
index c2ee165e91907..ad1ef29c15d66 100644
--- a/tests/cases/fourslash/server/getOutliningSpansForRegionsNoSingleLineFolds.ts
+++ b/tests/cases/fourslash/server/getOutliningSpansForRegionsNoSingleLineFolds.ts
@@ -1,3 +1,5 @@
+// @lib: es5
+
 ////[|//#region
 ////function foo()[| {
 ////
diff --git a/tests/cases/fourslash/server/goToDefinitionScriptImportServer.ts b/tests/cases/fourslash/server/goToDefinitionScriptImportServer.ts
index 22ec6d07ae3ac..d7ac97ee5d810 100644
--- a/tests/cases/fourslash/server/goToDefinitionScriptImportServer.ts
+++ b/tests/cases/fourslash/server/goToDefinitionScriptImportServer.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /home/src/workspaces/project/scriptThing.ts
 //// /*1d*/console.log("woooo side effects")
 
diff --git a/tests/cases/fourslash/server/goToImplementation_inDifferentFiles.ts b/tests/cases/fourslash/server/goToImplementation_inDifferentFiles.ts
index 1ce4a65f170dd..e6f2a3d55b619 100644
--- a/tests/cases/fourslash/server/goToImplementation_inDifferentFiles.ts
+++ b/tests/cases/fourslash/server/goToImplementation_inDifferentFiles.ts
@@ -1,5 +1,7 @@
 /// <reference path='../fourslash.ts'/>
 
+// @lib: es5
+
 // @Filename: /home/src/workspaces/project/bar.ts
 ////import {Foo} from './foo'
 ////
diff --git a/tests/cases/fourslash/server/goToSource10_mapFromAtTypes3.ts b/tests/cases/fourslash/server/goToSource10_mapFromAtTypes3.ts
index b9478ab28ca48..da9c00c72718a 100644
--- a/tests/cases/fourslash/server/goToSource10_mapFromAtTypes3.ts
+++ b/tests/cases/fourslash/server/goToSource10_mapFromAtTypes3.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @moduleResolution: bundler
 // @Filename: /home/src/workspaces/project/node_modules/lodash/package.json
 //// { "name": "lodash", "version": "4.17.15", "main": "./lodash.js" }
diff --git a/tests/cases/fourslash/server/goToSource11_propertyOfAlias.ts b/tests/cases/fourslash/server/goToSource11_propertyOfAlias.ts
index 5cf50bc173314..ed18c300d3ac8 100644
--- a/tests/cases/fourslash/server/goToSource11_propertyOfAlias.ts
+++ b/tests/cases/fourslash/server/goToSource11_propertyOfAlias.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @moduleResolution: bundler
 // @Filename: /home/src/workspaces/project/a.js
 //// export const a = { /*end*/a: 'a' };
diff --git a/tests/cases/fourslash/server/goToSource12_callbackParam.ts b/tests/cases/fourslash/server/goToSource12_callbackParam.ts
index e2a2cb0ba30d1..a91285567fbdf 100644
--- a/tests/cases/fourslash/server/goToSource12_callbackParam.ts
+++ b/tests/cases/fourslash/server/goToSource12_callbackParam.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @moduleResolution: bundler
 // Actual yargs doesn't work like this because the implementation package's
 // main entry exports a small function wrapper function whose return value
diff --git a/tests/cases/fourslash/server/goToSource13_nodenext.ts b/tests/cases/fourslash/server/goToSource13_nodenext.ts
index a1c3bfa4121d5..a5f112a3dae4f 100644
--- a/tests/cases/fourslash/server/goToSource13_nodenext.ts
+++ b/tests/cases/fourslash/server/goToSource13_nodenext.ts
@@ -22,6 +22,7 @@
 //// {
 ////   "compilerOptions": {
 ////       "module": "node16",
+////       "lib": ["es5"],
 ////       "strict": true,
 ////       "outDir": "./out",
 //// 
diff --git a/tests/cases/fourslash/server/goToSource14_unresolvedRequireDestructuring.ts b/tests/cases/fourslash/server/goToSource14_unresolvedRequireDestructuring.ts
index 1009ca4f65f50..cc2f9dd286668 100644
--- a/tests/cases/fourslash/server/goToSource14_unresolvedRequireDestructuring.ts
+++ b/tests/cases/fourslash/server/goToSource14_unresolvedRequireDestructuring.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @allowJs: true
 
 // @Filename: /home/src/workspaces/project/index.js
diff --git a/tests/cases/fourslash/server/goToSource15_bundler.ts b/tests/cases/fourslash/server/goToSource15_bundler.ts
index 65978f3b9bb21..0a5f592b47030 100644
--- a/tests/cases/fourslash/server/goToSource15_bundler.ts
+++ b/tests/cases/fourslash/server/goToSource15_bundler.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "esnext", "moduleResolution": "bundler" } }
+//// { "compilerOptions": { "module": "esnext", "moduleResolution": "bundler", "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/node_modules/react/package.json
 //// { "name": "react", "version": "16.8.6", "main": "index.js" }
diff --git a/tests/cases/fourslash/server/goToSource16_callbackParamDifferentFile.ts b/tests/cases/fourslash/server/goToSource16_callbackParamDifferentFile.ts
index f6bb51667a533..d52fb40c442a7 100644
--- a/tests/cases/fourslash/server/goToSource16_callbackParamDifferentFile.ts
+++ b/tests/cases/fourslash/server/goToSource16_callbackParamDifferentFile.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @moduleResolution: bundler
 // This is just modified repro to ensure we are resolving module specifier thats not already present in the file
 
diff --git a/tests/cases/fourslash/server/goToSource17_AddsFileToProject.ts b/tests/cases/fourslash/server/goToSource17_AddsFileToProject.ts
index 0f0bec0c89a70..8e4ddefd5f639 100644
--- a/tests/cases/fourslash/server/goToSource17_AddsFileToProject.ts
+++ b/tests/cases/fourslash/server/goToSource17_AddsFileToProject.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @moduleResolution: bundler
 // This is just made up repro where the js file will be added to auxillary project because its not already part of the project
 // Where in js file doesnt already have import to the corresponding js file hence will be added to project at later on stage
diff --git a/tests/cases/fourslash/server/goToSource18_reusedFromDifferentFolder.ts b/tests/cases/fourslash/server/goToSource18_reusedFromDifferentFolder.ts
index 44acf89343bdf..b086c5340b1e3 100644
--- a/tests/cases/fourslash/server/goToSource18_reusedFromDifferentFolder.ts
+++ b/tests/cases/fourslash/server/goToSource18_reusedFromDifferentFolder.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @moduleResolution: bundler
 // This is just made up repro where the js file will be added to auxillary project because its not already part of the project
 // Where in js file doesnt already have import to the corresponding js file hence will be added to project at later on stage
diff --git a/tests/cases/fourslash/server/goToSource1_localJsBesideDts.ts b/tests/cases/fourslash/server/goToSource1_localJsBesideDts.ts
index ad955b9355f4e..33f882eb31d9f 100644
--- a/tests/cases/fourslash/server/goToSource1_localJsBesideDts.ts
+++ b/tests/cases/fourslash/server/goToSource1_localJsBesideDts.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /home/src/workspaces/project/a.js
 //// export const /*end*/a = "a";
 
diff --git a/tests/cases/fourslash/server/goToSource2_nodeModulesWithTypes.ts b/tests/cases/fourslash/server/goToSource2_nodeModulesWithTypes.ts
index 024df9bcadda6..252358e6598bf 100644
--- a/tests/cases/fourslash/server/goToSource2_nodeModulesWithTypes.ts
+++ b/tests/cases/fourslash/server/goToSource2_nodeModulesWithTypes.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @moduleResolution: bundler
 // @Filename: /home/src/workspaces/project/node_modules/foo/package.json
 //// { "name": "foo", "version": "1.0.0", "main": "./lib/main.js", "types": "./types/main.d.ts" }
diff --git a/tests/cases/fourslash/server/goToSource3_nodeModulesAtTypes.ts b/tests/cases/fourslash/server/goToSource3_nodeModulesAtTypes.ts
index c0715e545e80e..995a43bf7c065 100644
--- a/tests/cases/fourslash/server/goToSource3_nodeModulesAtTypes.ts
+++ b/tests/cases/fourslash/server/goToSource3_nodeModulesAtTypes.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @moduleResolution: bundler
 // @Filename: /home/src/workspaces/project/node_modules/foo/package.json
 //// { "name": "foo", "version": "1.0.0", "main": "./lib/main.js" }
diff --git a/tests/cases/fourslash/server/goToSource5_sameAsGoToDef1.ts b/tests/cases/fourslash/server/goToSource5_sameAsGoToDef1.ts
index b5080f2f198cb..edc5f1a087446 100644
--- a/tests/cases/fourslash/server/goToSource5_sameAsGoToDef1.ts
+++ b/tests/cases/fourslash/server/goToSource5_sameAsGoToDef1.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /home/src/workspaces/project/a.ts
 //// export const /*end*/a = 'a';
 
diff --git a/tests/cases/fourslash/server/goToSource6_sameAsGoToDef2.ts b/tests/cases/fourslash/server/goToSource6_sameAsGoToDef2.ts
index e89468d441101..9ee65362e4cdc 100644
--- a/tests/cases/fourslash/server/goToSource6_sameAsGoToDef2.ts
+++ b/tests/cases/fourslash/server/goToSource6_sameAsGoToDef2.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /home/src/workspaces/project/node_modules/foo/package.json
 //// { "name": "foo", "version": "1.2.3", "typesVersions": { "*": { "*": ["./types/*"] } } }
 
diff --git a/tests/cases/fourslash/server/goToSource7_conditionallyMinified.ts b/tests/cases/fourslash/server/goToSource7_conditionallyMinified.ts
index 2ff5c94c0b59b..9d7b2b11fc8b9 100644
--- a/tests/cases/fourslash/server/goToSource7_conditionallyMinified.ts
+++ b/tests/cases/fourslash/server/goToSource7_conditionallyMinified.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @moduleResolution: bundler
 // @Filename: /home/src/workspaces/project/node_modules/react/package.json
 //// { "name": "react", "version": "16.8.6", "main": "index.js" }
diff --git a/tests/cases/fourslash/server/goToSource8_mapFromAtTypes.ts b/tests/cases/fourslash/server/goToSource8_mapFromAtTypes.ts
index 5a8daaa985f64..6eebee1c1bc3f 100644
--- a/tests/cases/fourslash/server/goToSource8_mapFromAtTypes.ts
+++ b/tests/cases/fourslash/server/goToSource8_mapFromAtTypes.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @moduleResolution: bundler
 // @Filename: /home/src/workspaces/project/node_modules/lodash/package.json
 //// { "name": "lodash", "version": "4.17.15", "main": "./lodash.js" }
diff --git a/tests/cases/fourslash/server/goToSource9_mapFromAtTypes2.ts b/tests/cases/fourslash/server/goToSource9_mapFromAtTypes2.ts
index 4a776772da3bb..0cb45a7bd6740 100644
--- a/tests/cases/fourslash/server/goToSource9_mapFromAtTypes2.ts
+++ b/tests/cases/fourslash/server/goToSource9_mapFromAtTypes2.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @moduleResolution: bundler
 // @Filename: /home/src/workspaces/project/node_modules/lodash/package.json
 //// { "name": "lodash", "version": "4.17.15", "main": "./lodash.js" }
diff --git a/tests/cases/fourslash/server/implementation01.ts b/tests/cases/fourslash/server/implementation01.ts
index 553b9e800621e..bac08a229c49b 100644
--- a/tests/cases/fourslash/server/implementation01.ts
+++ b/tests/cases/fourslash/server/implementation01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ////interface Fo/*1*/o {}
 ////class /*2*/Bar implements Foo {}
 
diff --git a/tests/cases/fourslash/server/impliedNodeFormat.ts b/tests/cases/fourslash/server/impliedNodeFormat.ts
index e12c3d9b7f27b..05d0b4e3a7017 100644
--- a/tests/cases/fourslash/server/impliedNodeFormat.ts
+++ b/tests/cases/fourslash/server/impliedNodeFormat.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "nodenext" } }
+//// { "compilerOptions": { "module": "nodenext", "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/package.json
 //// { "name": "foo", "type": "module", "exports": { ".": "./main.js" } }
diff --git a/tests/cases/fourslash/server/importCompletions_importsMap1.ts b/tests/cases/fourslash/server/importCompletions_importsMap1.ts
index 530704bfb5d74..38ebe148f19d6 100644
--- a/tests/cases/fourslash/server/importCompletions_importsMap1.ts
+++ b/tests/cases/fourslash/server/importCompletions_importsMap1.ts
@@ -4,6 +4,7 @@
 //// {
 ////   "compilerOptions": {
 ////     "module": "nodenext",
+////     "lib": ["es5"],
 ////     "rootDir": "src",
 ////     "outDir": "dist"
 ////   }
diff --git a/tests/cases/fourslash/server/importCompletions_importsMap2.ts b/tests/cases/fourslash/server/importCompletions_importsMap2.ts
index 10ea87f0aca2d..1d68884b21901 100644
--- a/tests/cases/fourslash/server/importCompletions_importsMap2.ts
+++ b/tests/cases/fourslash/server/importCompletions_importsMap2.ts
@@ -4,6 +4,7 @@
 //// {
 ////   "compilerOptions": {
 ////     "module": "nodenext",
+////     "lib": ["es5"],
 ////     "rootDir": "src",
 ////     "outDir": "dist"
 ////   }
diff --git a/tests/cases/fourslash/server/importCompletions_importsMap3.ts b/tests/cases/fourslash/server/importCompletions_importsMap3.ts
index 01776d771a3db..380b5fb1dc64a 100644
--- a/tests/cases/fourslash/server/importCompletions_importsMap3.ts
+++ b/tests/cases/fourslash/server/importCompletions_importsMap3.ts
@@ -4,6 +4,7 @@
 //// {
 ////   "compilerOptions": {
 ////     "module": "nodenext",
+////     "lib": ["es5"],
 ////     "rootDir": "src",
 ////     "outDir": "dist"
 ////   }
diff --git a/tests/cases/fourslash/server/importCompletions_importsMap4.ts b/tests/cases/fourslash/server/importCompletions_importsMap4.ts
index 3e15b253f4710..dc769f91d4aa1 100644
--- a/tests/cases/fourslash/server/importCompletions_importsMap4.ts
+++ b/tests/cases/fourslash/server/importCompletions_importsMap4.ts
@@ -4,6 +4,7 @@
 //// {
 ////   "compilerOptions": {
 ////     "module": "nodenext",
+////     "lib": ["es5"],
 ////     "rootDir": "src",
 ////     "outDir": "dist"
 ////   }
diff --git a/tests/cases/fourslash/server/importCompletions_importsMap5.ts b/tests/cases/fourslash/server/importCompletions_importsMap5.ts
index 0b240075a1e66..d790ae0ecbb6a 100644
--- a/tests/cases/fourslash/server/importCompletions_importsMap5.ts
+++ b/tests/cases/fourslash/server/importCompletions_importsMap5.ts
@@ -4,6 +4,7 @@
 //// {
 ////   "compilerOptions": {
 ////     "module": "nodenext",
+////     "lib": ["es5"],
 ////     "rootDir": "src",
 ////     "outDir": "dist",
 ////     "declarationDir": "types",
diff --git a/tests/cases/fourslash/server/importFixes_ambientCircularDefaultCrash.ts b/tests/cases/fourslash/server/importFixes_ambientCircularDefaultCrash.ts
index 63def17939b88..028d700fd82cf 100644
--- a/tests/cases/fourslash/server/importFixes_ambientCircularDefaultCrash.ts
+++ b/tests/cases/fourslash/server/importFixes_ambientCircularDefaultCrash.ts
@@ -3,7 +3,8 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
-////     "module": "preserve"
+////     "module": "preserve",
+////     "lib": ["es5"]
 ////   }
 //// }
 
diff --git a/tests/cases/fourslash/server/importNameCodeFix_externalNonRelateive2.ts b/tests/cases/fourslash/server/importNameCodeFix_externalNonRelateive2.ts
index 8231ff48a805f..f1c3ec1fa4a73 100644
--- a/tests/cases/fourslash/server/importNameCodeFix_externalNonRelateive2.ts
+++ b/tests/cases/fourslash/server/importNameCodeFix_externalNonRelateive2.ts
@@ -4,6 +4,7 @@
 //// {
 ////   "compilerOptions": {
 ////     "module": "commonjs",
+////     "lib": ["es5"],
 ////     "paths": {
 ////       "shared/*": ["../../shared/*"]
 ////     }
diff --git a/tests/cases/fourslash/server/importNameCodeFix_externalNonRelative1.ts b/tests/cases/fourslash/server/importNameCodeFix_externalNonRelative1.ts
index bfd5396fd1e64..a4b39c5687268 100644
--- a/tests/cases/fourslash/server/importNameCodeFix_externalNonRelative1.ts
+++ b/tests/cases/fourslash/server/importNameCodeFix_externalNonRelative1.ts
@@ -4,6 +4,7 @@
 //// {
 ////   "compilerOptions": {
 ////     "module": "commonjs",
+////     "lib": ["es5"],
 ////     "paths": {
 ////       "pkg-1/*": ["./packages/pkg-1/src/*"],
 ////       "pkg-2/*": ["./packages/pkg-2/src/*"]
@@ -31,7 +32,7 @@
 // @Filename: /home/src/workspaces/project/packages/pkg-2/tsconfig.json
 //// {
 ////   "extends": "../../tsconfig.base.json",
-////   "compilerOptions": { "outDir": "dist", "rootDir": "src", "composite": true }
+////   "compilerOptions": { "outDir": "dist", "rootDir": "src", "composite": true, "lib": ["es5"] }
 //// }
 
 // @Filename: /home/src/workspaces/project/packages/pkg-2/src/index.ts
diff --git a/tests/cases/fourslash/server/importNameCodeFix_pnpm1.ts b/tests/cases/fourslash/server/importNameCodeFix_pnpm1.ts
index a412649767e16..b28172efa2175 100644
--- a/tests/cases/fourslash/server/importNameCodeFix_pnpm1.ts
+++ b/tests/cases/fourslash/server/importNameCodeFix_pnpm1.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "commonjs" } }
+//// { "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts
 //// export declare function Component(): void;
diff --git a/tests/cases/fourslash/server/importStatementCompletions_pnpm1.ts b/tests/cases/fourslash/server/importStatementCompletions_pnpm1.ts
index 7e6a498959509..1df6761ecea2f 100644
--- a/tests/cases/fourslash/server/importStatementCompletions_pnpm1.ts
+++ b/tests/cases/fourslash/server/importStatementCompletions_pnpm1.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "commonjs" } }
+//// { "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts
 //// export declare function Component(): void;
diff --git a/tests/cases/fourslash/server/importStatementCompletions_pnpmTransitive.ts b/tests/cases/fourslash/server/importStatementCompletions_pnpmTransitive.ts
index e05e2e266b607..c1a92aec3804f 100644
--- a/tests/cases/fourslash/server/importStatementCompletions_pnpmTransitive.ts
+++ b/tests/cases/fourslash/server/importStatementCompletions_pnpmTransitive.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "commonjs" } }
+//// { "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/node_modules/.pnpm/@types+react@17.0.7/node_modules/@types/react/index.d.ts
 //// import "csstype";
diff --git a/tests/cases/fourslash/server/importSuggestionsCache_ambient.ts b/tests/cases/fourslash/server/importSuggestionsCache_ambient.ts
index 1e18873c07d4b..d44dabafcdbaa 100644
--- a/tests/cases/fourslash/server/importSuggestionsCache_ambient.ts
+++ b/tests/cases/fourslash/server/importSuggestionsCache_ambient.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "compilerOptions": { "module": "esnext" } }
+////{ "compilerOptions": { "module": "esnext", "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/ambient.d.ts
 ////declare module 'ambient' {
diff --git a/tests/cases/fourslash/server/importSuggestionsCache_coreNodeModules.ts b/tests/cases/fourslash/server/importSuggestionsCache_coreNodeModules.ts
index a636e93f0e89c..3a1503cbb107f 100644
--- a/tests/cases/fourslash/server/importSuggestionsCache_coreNodeModules.ts
+++ b/tests/cases/fourslash/server/importSuggestionsCache_coreNodeModules.ts
@@ -4,6 +4,7 @@
 ////{
 ////  "compilerOptions": {
 ////    "module": "esnext",
+////    "lib": ["es5"],
 ////    "allowJs": true,
 ////    "checkJs": true,
 ////    "typeRoots": [
diff --git a/tests/cases/fourslash/server/importSuggestionsCache_exportUndefined.ts b/tests/cases/fourslash/server/importSuggestionsCache_exportUndefined.ts
index 83938188ccb4f..6114901634655 100644
--- a/tests/cases/fourslash/server/importSuggestionsCache_exportUndefined.ts
+++ b/tests/cases/fourslash/server/importSuggestionsCache_exportUndefined.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "compilerOptions": { "module": "esnext" } }
+////{ "compilerOptions": { "module": "esnext", "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/undefined.ts
 ////export = undefined;
diff --git a/tests/cases/fourslash/server/importSuggestionsCache_invalidPackageJson.ts b/tests/cases/fourslash/server/importSuggestionsCache_invalidPackageJson.ts
index 0f313a071ff87..a1ca0c11aaff8 100644
--- a/tests/cases/fourslash/server/importSuggestionsCache_invalidPackageJson.ts
+++ b/tests/cases/fourslash/server/importSuggestionsCache_invalidPackageJson.ts
@@ -1,8 +1,11 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
+
 // @Filename: /home/src/workspaces/project/jsconfig.json
 ////{
 ////  "compilerOptions": {
+////    "lib": ["es5"],
 ////    "module": "commonjs",
 ////  },
 ////}
diff --git a/tests/cases/fourslash/server/importSuggestionsCache_moduleAugmentation.ts b/tests/cases/fourslash/server/importSuggestionsCache_moduleAugmentation.ts
index 4241243654821..84b207caa8054 100644
--- a/tests/cases/fourslash/server/importSuggestionsCache_moduleAugmentation.ts
+++ b/tests/cases/fourslash/server/importSuggestionsCache_moduleAugmentation.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "compilerOptions": { "module": "esnext" } }
+////{ "compilerOptions": { "module": "esnext", "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/node_modules/@types/react/index.d.ts
 ////export function useState(): void;
diff --git a/tests/cases/fourslash/server/isDefinitionAcrossGlobalProjects.ts b/tests/cases/fourslash/server/isDefinitionAcrossGlobalProjects.ts
index 1d219e7c3e018..b4fdaeb8e6b46 100644
--- a/tests/cases/fourslash/server/isDefinitionAcrossGlobalProjects.ts
+++ b/tests/cases/fourslash/server/isDefinitionAcrossGlobalProjects.ts
@@ -71,6 +71,7 @@
 ////{
 ////    "compilerOptions": {
 ////        "composite": true,
+////        "lib": ["es5"],
 ////    },
 ////    "references": [
 ////        { "path": "a" },
@@ -86,6 +87,7 @@
 ////        "declarationMap": true,
 ////        "module": "none",
 ////        "emitDeclarationOnly": true,
+////        "lib": ["es5"],
 ////    }
 ////}
 
diff --git a/tests/cases/fourslash/server/isDefinitionAcrossModuleProjects.ts b/tests/cases/fourslash/server/isDefinitionAcrossModuleProjects.ts
index c81ec01209b8a..60a4557f9f4f8 100644
--- a/tests/cases/fourslash/server/isDefinitionAcrossModuleProjects.ts
+++ b/tests/cases/fourslash/server/isDefinitionAcrossModuleProjects.ts
@@ -112,6 +112,7 @@
 ////{
 ////    "compilerOptions": {
 ////        "composite": true,
+////        "lib": ["es5"],
 ////    },
 ////    "references": [
 ////        { "path": "a" },
@@ -128,6 +129,7 @@
 ////        "declarationMap": true,
 ////        "module": "CommonJS",
 ////        "emitDeclarationOnly": true,
+////        "lib": ["es5"],
 ////    }
 ////}
 
diff --git a/tests/cases/fourslash/server/jsdocCallbackTag.ts b/tests/cases/fourslash/server/jsdocCallbackTag.ts
index df1b9e1296919..e9c24a1bcb778 100644
--- a/tests/cases/fourslash/server/jsdocCallbackTag.ts
+++ b/tests/cases/fourslash/server/jsdocCallbackTag.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+// @strict: false
 // @allowNonTsExtensions: true
 // @Filename: jsdocCallbackTag.js
 //// /**
diff --git a/tests/cases/fourslash/server/jsdocCallbackTagNavigateTo.ts b/tests/cases/fourslash/server/jsdocCallbackTagNavigateTo.ts
index 2beaf99ed7073..c13c2b57b8b53 100644
--- a/tests/cases/fourslash/server/jsdocCallbackTagNavigateTo.ts
+++ b/tests/cases/fourslash/server/jsdocCallbackTagNavigateTo.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: jsDocCallback.js
 
diff --git a/tests/cases/fourslash/server/jsdocCallbackTagRename01.ts b/tests/cases/fourslash/server/jsdocCallbackTagRename01.ts
index b733c909cc5d2..4f1fec2956804 100644
--- a/tests/cases/fourslash/server/jsdocCallbackTagRename01.ts
+++ b/tests/cases/fourslash/server/jsdocCallbackTagRename01.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: jsDocCallback.js
 ////
diff --git a/tests/cases/fourslash/server/jsdocParamTagSpecialKeywords.ts b/tests/cases/fourslash/server/jsdocParamTagSpecialKeywords.ts
index 2d7606ccbebc0..0989969bf3b9d 100644
--- a/tests/cases/fourslash/server/jsdocParamTagSpecialKeywords.ts
+++ b/tests/cases/fourslash/server/jsdocParamTagSpecialKeywords.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: test.js
 //// /**
diff --git a/tests/cases/fourslash/server/jsdocTypedefTag.ts b/tests/cases/fourslash/server/jsdocTypedefTag.ts
index ed27e6e29ef49..ae653fc7b5967 100644
--- a/tests/cases/fourslash/server/jsdocTypedefTag.ts
+++ b/tests/cases/fourslash/server/jsdocTypedefTag.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: jsdocCompletion_typedef.js
 
diff --git a/tests/cases/fourslash/server/jsdocTypedefTag1.ts b/tests/cases/fourslash/server/jsdocTypedefTag1.ts
index 4c7bde499eb60..4957e669bf5ad 100644
--- a/tests/cases/fourslash/server/jsdocTypedefTag1.ts
+++ b/tests/cases/fourslash/server/jsdocTypedefTag1.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es2015
 // @allowNonTsExtensions: true
 // @Filename: jsdocCompletion_typedef.js
 
diff --git a/tests/cases/fourslash/server/jsdocTypedefTag2.ts b/tests/cases/fourslash/server/jsdocTypedefTag2.ts
index 601db94513045..7c96537f2b573 100644
--- a/tests/cases/fourslash/server/jsdocTypedefTag2.ts
+++ b/tests/cases/fourslash/server/jsdocTypedefTag2.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: jsdocCompletion_typedef.js
 
diff --git a/tests/cases/fourslash/server/jsdocTypedefTagGoToDefinition.ts b/tests/cases/fourslash/server/jsdocTypedefTagGoToDefinition.ts
index 8a60a0e3e2955..9388feb208a04 100644
--- a/tests/cases/fourslash/server/jsdocTypedefTagGoToDefinition.ts
+++ b/tests/cases/fourslash/server/jsdocTypedefTagGoToDefinition.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: jsdocCompletion_typedef.js
 
diff --git a/tests/cases/fourslash/server/jsdocTypedefTagNamespace.ts b/tests/cases/fourslash/server/jsdocTypedefTagNamespace.ts
index 297238530f07b..8f446bfb6e5d0 100644
--- a/tests/cases/fourslash/server/jsdocTypedefTagNamespace.ts
+++ b/tests/cases/fourslash/server/jsdocTypedefTagNamespace.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: jsdocCompletion_typedef.js
 
diff --git a/tests/cases/fourslash/server/jsdocTypedefTagNavigateTo.ts b/tests/cases/fourslash/server/jsdocTypedefTagNavigateTo.ts
index 212394159a8b0..a3e03728e32fe 100644
--- a/tests/cases/fourslash/server/jsdocTypedefTagNavigateTo.ts
+++ b/tests/cases/fourslash/server/jsdocTypedefTagNavigateTo.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: jsDocTypedef_form2.js
 ////
diff --git a/tests/cases/fourslash/server/jsdocTypedefTagRename01.ts b/tests/cases/fourslash/server/jsdocTypedefTagRename01.ts
index 5634dd1e5c2c2..ba7a3716caec3 100644
--- a/tests/cases/fourslash/server/jsdocTypedefTagRename01.ts
+++ b/tests/cases/fourslash/server/jsdocTypedefTagRename01.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: jsDocTypedef_form1.js
 ////
diff --git a/tests/cases/fourslash/server/jsdocTypedefTagRename02.ts b/tests/cases/fourslash/server/jsdocTypedefTagRename02.ts
index 38f6c0645cc03..bbf62bc5adaae 100644
--- a/tests/cases/fourslash/server/jsdocTypedefTagRename02.ts
+++ b/tests/cases/fourslash/server/jsdocTypedefTagRename02.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: jsDocTypedef_form2.js
 ////
diff --git a/tests/cases/fourslash/server/jsdocTypedefTagRename03.ts b/tests/cases/fourslash/server/jsdocTypedefTagRename03.ts
index e3512b49c5421..de1ad5ee82989 100644
--- a/tests/cases/fourslash/server/jsdocTypedefTagRename03.ts
+++ b/tests/cases/fourslash/server/jsdocTypedefTagRename03.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: jsDocTypedef_form3.js
 ////
diff --git a/tests/cases/fourslash/server/jsdocTypedefTagRename04.ts b/tests/cases/fourslash/server/jsdocTypedefTagRename04.ts
index b7bf220512a5d..5ffe88166f78c 100644
--- a/tests/cases/fourslash/server/jsdocTypedefTagRename04.ts
+++ b/tests/cases/fourslash/server/jsdocTypedefTagRename04.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: jsDocTypedef_form2.js
 ////
diff --git a/tests/cases/fourslash/server/moveToFile_emptyTargetFile.ts b/tests/cases/fourslash/server/moveToFile_emptyTargetFile.ts
index 1daaf8c0d66eb..1aee75ab76712 100644
--- a/tests/cases/fourslash/server/moveToFile_emptyTargetFile.ts
+++ b/tests/cases/fourslash/server/moveToFile_emptyTargetFile.ts
@@ -9,7 +9,7 @@
 /////** empty */
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-///// { "compilerOptions": { "newLine": "lf" } }
+///// { "compilerOptions": { "newLine": "lf", "lib": ["es5"] } }
 
 verify.moveToFile({
     newFileContents: {
diff --git a/tests/cases/fourslash/server/navbar01.ts b/tests/cases/fourslash/server/navbar01.ts
index 6ce89312ddd1e..c03d916d8ba20 100644
--- a/tests/cases/fourslash/server/navbar01.ts
+++ b/tests/cases/fourslash/server/navbar01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ////// Interface
 ////interface IPoint {
 ////    getDist(): number;
diff --git a/tests/cases/fourslash/server/navto01.ts b/tests/cases/fourslash/server/navto01.ts
index 0faf7fbf403ae..37912c9648358 100644
--- a/tests/cases/fourslash/server/navto01.ts
+++ b/tests/cases/fourslash/server/navto01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 /////// Module
 ////[|{| "name": "MyShapes", "kind": "module" |}namespace MyShapes {
 ////
diff --git a/tests/cases/fourslash/server/navto_serverExcludeLib.ts b/tests/cases/fourslash/server/navto_serverExcludeLib.ts
index 26e256d6f6dbb..b0b4528221729 100644
--- a/tests/cases/fourslash/server/navto_serverExcludeLib.ts
+++ b/tests/cases/fourslash/server/navto_serverExcludeLib.ts
@@ -5,7 +5,7 @@
 //// const [|weirdName: number = 1|];
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// {}
+//// { "compilerOptions": { "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/node_modules/bar/index.d.ts
 //// export const [|weirdName: number|];
diff --git a/tests/cases/fourslash/server/ngProxy1.ts b/tests/cases/fourslash/server/ngProxy1.ts
index 9c75a21e83861..7a67a614d0fd4 100644
--- a/tests/cases/fourslash/server/ngProxy1.ts
+++ b/tests/cases/fourslash/server/ngProxy1.ts
@@ -3,6 +3,7 @@
 // @Filename: tsconfig.json
 //// {
 ////     "compilerOptions": {
+////         "lib": ["es5"],
 ////         "plugins": [
 ////             { "name": "quickinfo-augmeneter", "message": "hello world" }
 ////         ]
diff --git a/tests/cases/fourslash/server/ngProxy2.ts b/tests/cases/fourslash/server/ngProxy2.ts
index 33f28eb31d53c..b4fa4179c3ac5 100644
--- a/tests/cases/fourslash/server/ngProxy2.ts
+++ b/tests/cases/fourslash/server/ngProxy2.ts
@@ -3,6 +3,7 @@
 // @Filename: tsconfig.json
 //// {
 ////     "compilerOptions": {
+////         "lib": ["es5"],
 ////         "plugins": [
 ////             { "name": "invalidmodulename" }
 ////         ]
diff --git a/tests/cases/fourslash/server/ngProxy3.ts b/tests/cases/fourslash/server/ngProxy3.ts
index 5b9ea26d1dd88..70f00721db4d6 100644
--- a/tests/cases/fourslash/server/ngProxy3.ts
+++ b/tests/cases/fourslash/server/ngProxy3.ts
@@ -3,6 +3,7 @@
 // @Filename: tsconfig.json
 //// {
 ////     "compilerOptions": {
+////         "lib": ["es5"],
 ////         "plugins": [
 ////             { "name": "create-thrower" }
 ////         ]
diff --git a/tests/cases/fourslash/server/ngProxy4.ts b/tests/cases/fourslash/server/ngProxy4.ts
index 69455903dfbc9..6c71a3f6b5634 100644
--- a/tests/cases/fourslash/server/ngProxy4.ts
+++ b/tests/cases/fourslash/server/ngProxy4.ts
@@ -3,6 +3,7 @@
 // @Filename: tsconfig.json
 //// {
 ////     "compilerOptions": {
+////         "lib": ["es5"],
 ////         "plugins": [
 ////             { "name": "diagnostic-adder" }
 ////         ]
diff --git a/tests/cases/fourslash/server/nodeNextModuleKindCaching1.ts b/tests/cases/fourslash/server/nodeNextModuleKindCaching1.ts
index c68123b7d07b5..d5dce315ecd7f 100644
--- a/tests/cases/fourslash/server/nodeNextModuleKindCaching1.ts
+++ b/tests/cases/fourslash/server/nodeNextModuleKindCaching1.ts
@@ -3,6 +3,7 @@
 // @Filename: tsconfig.json
 ////{
 ////    "compilerOptions": {
+////      "lib": ["es5"],
 ////      "rootDir": "src",
 ////      "outDir": "dist",
 ////      "target": "ES2020",
diff --git a/tests/cases/fourslash/server/nodeNextPathCompletions.ts b/tests/cases/fourslash/server/nodeNextPathCompletions.ts
index 7d637abb8df3a..1875523ca39e0 100644
--- a/tests/cases/fourslash/server/nodeNextPathCompletions.ts
+++ b/tests/cases/fourslash/server/nodeNextPathCompletions.ts
@@ -31,7 +31,7 @@
 //// }
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "nodenext" }, "files": ["./src/foo.ts"] }
+//// { "compilerOptions": { "lib": ["es5"], "module": "nodenext" }, "files": ["./src/foo.ts"] }
 
 // @Filename: /home/src/workspaces/project/src/foo.ts
 //// import { fooFromIndex } from "/**/";
diff --git a/tests/cases/fourslash/server/nonJsDeclarationFilePathCompletions.ts b/tests/cases/fourslash/server/nonJsDeclarationFilePathCompletions.ts
index 6c46981d1c9e7..2f00a0fdd7288 100644
--- a/tests/cases/fourslash/server/nonJsDeclarationFilePathCompletions.ts
+++ b/tests/cases/fourslash/server/nonJsDeclarationFilePathCompletions.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts" />
 
+// @lib: es5
 // @allowArbitraryExtensions: true
 // @Filename: /home/src/workspaces/project/mod.d.html.ts
 ////export declare class HtmlModuleThing {}
diff --git a/tests/cases/fourslash/server/occurrences01.ts b/tests/cases/fourslash/server/occurrences01.ts
index 7d59d132df8a5..741112008f7b6 100644
--- a/tests/cases/fourslash/server/occurrences01.ts
+++ b/tests/cases/fourslash/server/occurrences01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ////foo: [|switch|] (10) {
 ////    [|case|] 1:
 ////    [|case|] 2:
diff --git a/tests/cases/fourslash/server/occurrences02.ts b/tests/cases/fourslash/server/occurrences02.ts
index af5c478891fc9..8a826ec49c146 100644
--- a/tests/cases/fourslash/server/occurrences02.ts
+++ b/tests/cases/fourslash/server/occurrences02.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ////function [|f|](x: typeof [|f|]) {
 ////    [|f|]([|f|]);
 ////}
diff --git a/tests/cases/fourslash/server/openFile.ts b/tests/cases/fourslash/server/openFile.ts
index e30bccc488a19..f700815f7054e 100644
--- a/tests/cases/fourslash/server/openFile.ts
+++ b/tests/cases/fourslash/server/openFile.ts
@@ -7,7 +7,7 @@
 ////var t = '10';
 
 // @Filename: tsconfig.json
-////{ "files": ["test.ts", "test1.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["test.ts", "test1.ts"] }
 
 var overridingContent = "var t = 10; t.";
 goTo.file("test.ts", overridingContent);
diff --git a/tests/cases/fourslash/server/openFileWithSyntaxKind.ts b/tests/cases/fourslash/server/openFileWithSyntaxKind.ts
index 16e05cf408092..973dd981689a2 100644
--- a/tests/cases/fourslash/server/openFileWithSyntaxKind.ts
+++ b/tests/cases/fourslash/server/openFileWithSyntaxKind.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 // Because the fourslash runner automatically opens the first file with the default setting,
 // to test the openFile function, the targeted file cannot be the first one.
 
diff --git a/tests/cases/fourslash/server/packageJsonImportsFailedLookups.ts b/tests/cases/fourslash/server/packageJsonImportsFailedLookups.ts
index 0f497d240e9fc..c6583c508098c 100644
--- a/tests/cases/fourslash/server/packageJsonImportsFailedLookups.ts
+++ b/tests/cases/fourslash/server/packageJsonImportsFailedLookups.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
 // @Filename: /a/b/c/d/e/tsconfig.json
-//// { "compilerOptions": { "module": "nodenext" } }
+//// { "compilerOptions": { "lib": ["es5"], "module": "nodenext" } }
 
 // @Filename: /a/b/c/d/e/package.json
 //// {
diff --git a/tests/cases/fourslash/server/pasteEdits_addInNextLine.ts b/tests/cases/fourslash/server/pasteEdits_addInNextLine.ts
index d04d0d2736a67..ba9f8ff76e16a 100644
--- a/tests/cases/fourslash/server/pasteEdits_addInNextLine.ts
+++ b/tests/cases/fourslash/server/pasteEdits_addInNextLine.ts
@@ -16,7 +16,7 @@
 //// [|export const k = a+ t;|]
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "b.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_blankTargetFile.ts b/tests/cases/fourslash/server/pasteEdits_blankTargetFile.ts
index 711f50eaed1b8..7ec394a9fc1ad 100644
--- a/tests/cases/fourslash/server/pasteEdits_blankTargetFile.ts
+++ b/tests/cases/fourslash/server/pasteEdits_blankTargetFile.ts
@@ -15,7 +15,7 @@
 //// console.log("abc");
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["folder/c.ts", "a.ts", "b.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["folder/c.ts", "a.ts", "b.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_defaultExport1.ts b/tests/cases/fourslash/server/pasteEdits_defaultExport1.ts
index c04342ef37ab4..8d636818a102f 100644
--- a/tests/cases/fourslash/server/pasteEdits_defaultExport1.ts
+++ b/tests/cases/fourslash/server/pasteEdits_defaultExport1.ts
@@ -13,7 +13,7 @@
 //// }
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["folder/c.ts", "a.ts", "b.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["folder/c.ts", "a.ts", "b.ts"] }
 
 const range = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_defaultExport2.ts b/tests/cases/fourslash/server/pasteEdits_defaultExport2.ts
index bb8adbc78a522..5f9a5b1fe6a2a 100644
--- a/tests/cases/fourslash/server/pasteEdits_defaultExport2.ts
+++ b/tests/cases/fourslash/server/pasteEdits_defaultExport2.ts
@@ -10,7 +10,7 @@
 //// }
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["folder/c.ts", "a.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["folder/c.ts", "a.ts"] }
 
 const range = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_defaultImport.ts b/tests/cases/fourslash/server/pasteEdits_defaultImport.ts
index d2eafb4291c45..3b6d38bcf82e8 100644
--- a/tests/cases/fourslash/server/pasteEdits_defaultImport.ts
+++ b/tests/cases/fourslash/server/pasteEdits_defaultImport.ts
@@ -21,7 +21,7 @@
 //// }
 
 // @Filename: /home/src/workspaces/project/folder/tsconfig.json
-////{ "compilerOptions": { "module": "nodenext" }, "files": ["folder/c.ts", "a.ts", "b.mts"] }
+////{ "compilerOptions": { "lib": ["es5"], "module": "nodenext" }, "files": ["folder/c.ts", "a.ts", "b.mts"] }
 
 const range = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_existingImports1.ts b/tests/cases/fourslash/server/pasteEdits_existingImports1.ts
index aab1d27689a52..3fdc3884de463 100644
--- a/tests/cases/fourslash/server/pasteEdits_existingImports1.ts
+++ b/tests/cases/fourslash/server/pasteEdits_existingImports1.ts
@@ -17,7 +17,7 @@
 //// export const t3 = 1;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["target.ts", "other.ts", "other2.ts", "other3.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["target.ts", "other.ts", "other2.ts", "other3.ts"] }
 
 verify.pasteEdits({
     args: {
diff --git a/tests/cases/fourslash/server/pasteEdits_existingImports2.ts b/tests/cases/fourslash/server/pasteEdits_existingImports2.ts
index 009d83bbeb43d..98a59d68d6e86 100644
--- a/tests/cases/fourslash/server/pasteEdits_existingImports2.ts
+++ b/tests/cases/fourslash/server/pasteEdits_existingImports2.ts
@@ -23,7 +23,7 @@
 //// [|export const m = t3 + t2 + n;|]
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["target.ts", "originalFile.ts", "other.ts", "other2.ts", "other3.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["target.ts", "originalFile.ts", "other.ts", "other2.ts", "other3.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_globalAndLocal1.ts b/tests/cases/fourslash/server/pasteEdits_globalAndLocal1.ts
index 492cdd90ef4bb..683b093e1c1bf 100644
--- a/tests/cases/fourslash/server/pasteEdits_globalAndLocal1.ts
+++ b/tests/cases/fourslash/server/pasteEdits_globalAndLocal1.ts
@@ -19,7 +19,7 @@
 
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["target.ts", "globals.d.ts", "test.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["target.ts", "globals.d.ts", "test.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_globalAndLocal2.ts b/tests/cases/fourslash/server/pasteEdits_globalAndLocal2.ts
index 6e0ec85ee2427..af027cfca7bc9 100644
--- a/tests/cases/fourslash/server/pasteEdits_globalAndLocal2.ts
+++ b/tests/cases/fourslash/server/pasteEdits_globalAndLocal2.ts
@@ -21,7 +21,7 @@
 //// }
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["target.ts", "globals.d.ts", "test.ts", "lifecycle.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["target.ts", "globals.d.ts", "test.ts", "lifecycle.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_knownSourceFile.ts b/tests/cases/fourslash/server/pasteEdits_knownSourceFile.ts
index c0ed4eae407c4..724cdea9352d1 100644
--- a/tests/cases/fourslash/server/pasteEdits_knownSourceFile.ts
+++ b/tests/cases/fourslash/server/pasteEdits_knownSourceFile.ts
@@ -15,7 +15,7 @@
 ////const t = 9;|]
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["file1.ts", "file2.ts", "target.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["file1.ts", "file2.ts", "target.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({ 
diff --git a/tests/cases/fourslash/server/pasteEdits_multiplePastes1.ts b/tests/cases/fourslash/server/pasteEdits_multiplePastes1.ts
index 3570d889133ef..72cc05f16a092 100644
--- a/tests/cases/fourslash/server/pasteEdits_multiplePastes1.ts
+++ b/tests/cases/fourslash/server/pasteEdits_multiplePastes1.ts
@@ -17,7 +17,7 @@
 //// export const s = 12;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["file1.ts", "target.ts", "file3.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["file1.ts", "target.ts", "file3.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_multiplePastes2.ts b/tests/cases/fourslash/server/pasteEdits_multiplePastes2.ts
index 3f8a8024e09a4..e17b41c78a5ad 100644
--- a/tests/cases/fourslash/server/pasteEdits_multiplePastes2.ts
+++ b/tests/cases/fourslash/server/pasteEdits_multiplePastes2.ts
@@ -19,7 +19,7 @@
 //// export const bb = 2;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["file1.ts", "target.ts", "other.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["file1.ts", "target.ts", "other.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_multiplePastes3.ts b/tests/cases/fourslash/server/pasteEdits_multiplePastes3.ts
index 6ea80efe7b810..1c80347cd2115 100644
--- a/tests/cases/fourslash/server/pasteEdits_multiplePastes3.ts
+++ b/tests/cases/fourslash/server/pasteEdits_multiplePastes3.ts
@@ -22,7 +22,7 @@
 //// export const bb = 2;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["file1.ts", "target.ts", "other.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["file1.ts", "target.ts", "other.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_multiplePastes4.ts b/tests/cases/fourslash/server/pasteEdits_multiplePastes4.ts
index eb0cc989805e3..6690b2bede9b8 100644
--- a/tests/cases/fourslash/server/pasteEdits_multiplePastes4.ts
+++ b/tests/cases/fourslash/server/pasteEdits_multiplePastes4.ts
@@ -17,7 +17,7 @@
 //// export const s = 12;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["file1.ts", "target.ts", "file3.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["file1.ts", "target.ts", "file3.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_multiplePastesConsistentlyLargerInSize.ts b/tests/cases/fourslash/server/pasteEdits_multiplePastesConsistentlyLargerInSize.ts
index 72d6efd719106..8995f6e6d6fae 100644
--- a/tests/cases/fourslash/server/pasteEdits_multiplePastesConsistentlyLargerInSize.ts
+++ b/tests/cases/fourslash/server/pasteEdits_multiplePastesConsistentlyLargerInSize.ts
@@ -33,7 +33,7 @@
 //// export const tomato = 4;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "b.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts"] }
 
 verify.pasteEdits({
     args: {
diff --git a/tests/cases/fourslash/server/pasteEdits_multiplePastesConsistentlySmallerInSize.ts b/tests/cases/fourslash/server/pasteEdits_multiplePastesConsistentlySmallerInSize.ts
index 82f07cd952e3f..de308fa42743e 100644
--- a/tests/cases/fourslash/server/pasteEdits_multiplePastesConsistentlySmallerInSize.ts
+++ b/tests/cases/fourslash/server/pasteEdits_multiplePastesConsistentlySmallerInSize.ts
@@ -40,7 +40,7 @@
 //// export const tomato = 4;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "b.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts"] }
 
 verify.pasteEdits({
     args: {
diff --git a/tests/cases/fourslash/server/pasteEdits_multiplePastesEqualInSize.ts b/tests/cases/fourslash/server/pasteEdits_multiplePastesEqualInSize.ts
index cf98564e6c246..8b967f093d17b 100644
--- a/tests/cases/fourslash/server/pasteEdits_multiplePastesEqualInSize.ts
+++ b/tests/cases/fourslash/server/pasteEdits_multiplePastesEqualInSize.ts
@@ -32,7 +32,7 @@
 //// export const tomato = 4;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "b.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts"] }
 
 verify.pasteEdits({
     args: {
diff --git a/tests/cases/fourslash/server/pasteEdits_multiplePastesGrowingAndShrinkingInSize.ts b/tests/cases/fourslash/server/pasteEdits_multiplePastesGrowingAndShrinkingInSize.ts
index 5948632da0f7c..c977cabbb05d4 100644
--- a/tests/cases/fourslash/server/pasteEdits_multiplePastesGrowingAndShrinkingInSize.ts
+++ b/tests/cases/fourslash/server/pasteEdits_multiplePastesGrowingAndShrinkingInSize.ts
@@ -29,7 +29,7 @@
 //// export const tomato = 3;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "b.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts"] }
 
 verify.pasteEdits({
     args: {
diff --git a/tests/cases/fourslash/server/pasteEdits_multiplePastesGrowingInSize.ts b/tests/cases/fourslash/server/pasteEdits_multiplePastesGrowingInSize.ts
index 8d43cc4fcceb0..5e0e0c196844c 100644
--- a/tests/cases/fourslash/server/pasteEdits_multiplePastesGrowingInSize.ts
+++ b/tests/cases/fourslash/server/pasteEdits_multiplePastesGrowingInSize.ts
@@ -33,7 +33,7 @@
 //// export const tomato = 4;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "b.ts", "c.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts", "c.ts"] }
 
 verify.pasteEdits({
     args: {
diff --git a/tests/cases/fourslash/server/pasteEdits_multiplePastesShrinkingInSize.ts b/tests/cases/fourslash/server/pasteEdits_multiplePastesShrinkingInSize.ts
index 034a4544e6e57..3674c0418847a 100644
--- a/tests/cases/fourslash/server/pasteEdits_multiplePastesShrinkingInSize.ts
+++ b/tests/cases/fourslash/server/pasteEdits_multiplePastesShrinkingInSize.ts
@@ -33,7 +33,7 @@
 //// export const tomato = 4;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "b.ts", "c.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts", "c.ts"] }
 
 verify.pasteEdits({
     args: {
diff --git a/tests/cases/fourslash/server/pasteEdits_namespaceImport.ts b/tests/cases/fourslash/server/pasteEdits_namespaceImport.ts
index ded500926fa96..b5e644e14df31 100644
--- a/tests/cases/fourslash/server/pasteEdits_namespaceImport.ts
+++ b/tests/cases/fourslash/server/pasteEdits_namespaceImport.ts
@@ -22,7 +22,7 @@
 //// 
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["folder/c.ts", "a.ts", "b.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["folder/c.ts", "a.ts", "b.ts"] }
 
 const range = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_noImportNeeded.ts b/tests/cases/fourslash/server/pasteEdits_noImportNeeded.ts
index d65cbdf62601b..353205b1623b3 100644
--- a/tests/cases/fourslash/server/pasteEdits_noImportNeeded.ts
+++ b/tests/cases/fourslash/server/pasteEdits_noImportNeeded.ts
@@ -9,7 +9,7 @@
 //// [|export|] const foo: Foo = {}
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "b.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_noImportNeededInUpdatedProgram.ts b/tests/cases/fourslash/server/pasteEdits_noImportNeededInUpdatedProgram.ts
index b07709a5b639e..c29d5d99b502c 100644
--- a/tests/cases/fourslash/server/pasteEdits_noImportNeededInUpdatedProgram.ts
+++ b/tests/cases/fourslash/server/pasteEdits_noImportNeededInUpdatedProgram.ts
@@ -7,7 +7,7 @@
 //// export const b = 10;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "b.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "b.ts"] }
 
 verify.pasteEdits({
     args: {
diff --git a/tests/cases/fourslash/server/pasteEdits_pasteComments.ts b/tests/cases/fourslash/server/pasteEdits_pasteComments.ts
index c950f0ebf2f02..bdd0e5dfc86bb 100644
--- a/tests/cases/fourslash/server/pasteEdits_pasteComments.ts
+++ b/tests/cases/fourslash/server/pasteEdits_pasteComments.ts
@@ -6,7 +6,7 @@
 //// const c = 10;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["target.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["target.ts"] }
 
 verify.pasteEdits({
     args: {
diff --git a/tests/cases/fourslash/server/pasteEdits_pasteIntoSameFile.ts b/tests/cases/fourslash/server/pasteEdits_pasteIntoSameFile.ts
index e264dfd0000ba..67a45ce348c1c 100644
--- a/tests/cases/fourslash/server/pasteEdits_pasteIntoSameFile.ts
+++ b/tests/cases/fourslash/server/pasteEdits_pasteIntoSameFile.ts
@@ -8,7 +8,7 @@
 //// console.log("test");
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["target.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["target.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_rangeSelection0.ts b/tests/cases/fourslash/server/pasteEdits_rangeSelection0.ts
index 5ab90a9b480d2..bd55f52012656 100644
--- a/tests/cases/fourslash/server/pasteEdits_rangeSelection0.ts
+++ b/tests/cases/fourslash/server/pasteEdits_rangeSelection0.ts
@@ -10,7 +10,7 @@
 //// x
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "folder/target.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_rangeSelection1.ts b/tests/cases/fourslash/server/pasteEdits_rangeSelection1.ts
index f9276c236dadb..45d415f720f81 100644
--- a/tests/cases/fourslash/server/pasteEdits_rangeSelection1.ts
+++ b/tests/cases/fourslash/server/pasteEdits_rangeSelection1.ts
@@ -10,7 +10,7 @@
 //// x
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "folder/target.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_rangeSelection2.ts b/tests/cases/fourslash/server/pasteEdits_rangeSelection2.ts
index 4f6992b1f1868..75e6daea5a769 100644
--- a/tests/cases/fourslash/server/pasteEdits_rangeSelection2.ts
+++ b/tests/cases/fourslash/server/pasteEdits_rangeSelection2.ts
@@ -9,7 +9,7 @@
 //// [|foo()|]
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "folder/target.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_rangeSelection3.ts b/tests/cases/fourslash/server/pasteEdits_rangeSelection3.ts
index d9cd323acdab1..9d875abf2fc74 100644
--- a/tests/cases/fourslash/server/pasteEdits_rangeSelection3.ts
+++ b/tests/cases/fourslash/server/pasteEdits_rangeSelection3.ts
@@ -9,7 +9,7 @@
 //// [|foo()|]
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "folder/target.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_rangeSelection4.ts b/tests/cases/fourslash/server/pasteEdits_rangeSelection4.ts
index 56c6d6ce60c0c..81f3eea239e37 100644
--- a/tests/cases/fourslash/server/pasteEdits_rangeSelection4.ts
+++ b/tests/cases/fourslash/server/pasteEdits_rangeSelection4.ts
@@ -12,7 +12,7 @@
 //// foo()|]
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "folder/target.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_rangeSelection5.ts b/tests/cases/fourslash/server/pasteEdits_rangeSelection5.ts
index df881e68744c8..d666a321cfad9 100644
--- a/tests/cases/fourslash/server/pasteEdits_rangeSelection5.ts
+++ b/tests/cases/fourslash/server/pasteEdits_rangeSelection5.ts
@@ -9,7 +9,7 @@
 //// foo()|]
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "folder/target.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_rangeSelection6.ts b/tests/cases/fourslash/server/pasteEdits_rangeSelection6.ts
index 607e98f052ff6..6f19af4e54b71 100644
--- a/tests/cases/fourslash/server/pasteEdits_rangeSelection6.ts
+++ b/tests/cases/fourslash/server/pasteEdits_rangeSelection6.ts
@@ -12,7 +12,7 @@
 //// x|]
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "folder/target.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_rangeSelection7.ts b/tests/cases/fourslash/server/pasteEdits_rangeSelection7.ts
index cf8deea6bcc22..68fd008ea4051 100644
--- a/tests/cases/fourslash/server/pasteEdits_rangeSelection7.ts
+++ b/tests/cases/fourslash/server/pasteEdits_rangeSelection7.ts
@@ -12,7 +12,7 @@
 //// x
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "folder/target.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_rangeSelection8.ts b/tests/cases/fourslash/server/pasteEdits_rangeSelection8.ts
index 13a54c2f854f7..b014b85f2674b 100644
--- a/tests/cases/fourslash/server/pasteEdits_rangeSelection8.ts
+++ b/tests/cases/fourslash/server/pasteEdits_rangeSelection8.ts
@@ -12,7 +12,7 @@
 //// a|]aaa
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "folder/target.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_rangeSelection9.ts b/tests/cases/fourslash/server/pasteEdits_rangeSelection9.ts
index 872746f4ba141..ba623642db1b4 100644
--- a/tests/cases/fourslash/server/pasteEdits_rangeSelection9.ts
+++ b/tests/cases/fourslash/server/pasteEdits_rangeSelection9.ts
@@ -10,7 +10,7 @@
 //// /* another comment */
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["a.ts", "folder/target.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["a.ts", "folder/target.ts"] }
 
 const ranges = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_requireImportJsx.ts b/tests/cases/fourslash/server/pasteEdits_requireImportJsx.ts
index f7be3b8f61c4a..d60d7c5ddb8d4 100644
--- a/tests/cases/fourslash/server/pasteEdits_requireImportJsx.ts
+++ b/tests/cases/fourslash/server/pasteEdits_requireImportJsx.ts
@@ -20,7 +20,7 @@
 ////}
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["folder/c.jsx", "react.d.ts", "b.jsx"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["folder/c.jsx", "react.d.ts", "b.jsx"] }
 
 const range = test.ranges();
 verify.pasteEdits({
diff --git a/tests/cases/fourslash/server/pasteEdits_revertUpdatedFile.ts b/tests/cases/fourslash/server/pasteEdits_revertUpdatedFile.ts
index c5d5d9c6c7bcd..8424ca464432d 100644
--- a/tests/cases/fourslash/server/pasteEdits_revertUpdatedFile.ts
+++ b/tests/cases/fourslash/server/pasteEdits_revertUpdatedFile.ts
@@ -15,7 +15,7 @@
 //// export const t2 = 1;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["target.ts", "other.ts", "other2.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["target.ts", "other.ts", "other2.ts"] }
 
 verify.pasteEdits({
     args: {
diff --git a/tests/cases/fourslash/server/pasteEdits_unknownSourceFile.ts b/tests/cases/fourslash/server/pasteEdits_unknownSourceFile.ts
index fb49a61ab94bb..9fabac1c82f69 100644
--- a/tests/cases/fourslash/server/pasteEdits_unknownSourceFile.ts
+++ b/tests/cases/fourslash/server/pasteEdits_unknownSourceFile.ts
@@ -12,7 +12,7 @@
 //// export interface Test4 {}
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["file1.ts", "file2.ts"] }
+////{ "compilerOptions": { "lib": ["es5"] }, "files": ["file1.ts", "file2.ts"] }
 
 verify.pasteEdits({
     args: {
diff --git a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard1.ts b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard1.ts
index 0bc1ad2dbdacc..076f2d1920f35 100644
--- a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard1.ts
+++ b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard1.ts
@@ -3,6 +3,7 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "nodenext",
 ////     "rootDir": "src",
 ////     "outDir": "dist"
diff --git a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard2.ts b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard2.ts
index 5dbbeba52d78c..1d125258a382b 100644
--- a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard2.ts
+++ b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard2.ts
@@ -3,6 +3,7 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "nodenext",
 ////     "rootDir": "src",
 ////     "outDir": "dist"
diff --git a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard3.ts b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard3.ts
index 443382bdf4811..f30a542581596 100644
--- a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard3.ts
+++ b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard3.ts
@@ -3,6 +3,7 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "nodenext",
 ////     "rootDir": "src",
 ////     "outDir": "dist",
diff --git a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard4.ts b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard4.ts
index ae393be7ce4d6..d293f551136a6 100644
--- a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard4.ts
+++ b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard4.ts
@@ -3,6 +3,7 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "nodenext",
 ////     "rootDir": "src",
 ////     "outDir": "dist"
diff --git a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard5.ts b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard5.ts
index d63f313c1773e..23864b789d5a5 100644
--- a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard5.ts
+++ b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard5.ts
@@ -3,6 +3,7 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "nodenext",
 ////     "rootDir": "src",
 ////     "outDir": "dist/esm",
diff --git a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard6.ts b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard6.ts
index 79026a3f7c2b3..8224a10bd56e3 100644
--- a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard6.ts
+++ b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard6.ts
@@ -3,6 +3,7 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "nodenext",
 ////     "rootDir": "src",
 ////     "outDir": "dist"
diff --git a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard7.ts b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard7.ts
index c26da613c1304..bb00367b3df12 100644
--- a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard7.ts
+++ b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard7.ts
@@ -3,6 +3,7 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "nodenext",
 ////     "rootDir": "src",
 ////     "outDir": "dist"
diff --git a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard8.ts b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard8.ts
index c26da613c1304..bb00367b3df12 100644
--- a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard8.ts
+++ b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard8.ts
@@ -3,6 +3,7 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "nodenext",
 ////     "rootDir": "src",
 ////     "outDir": "dist"
diff --git a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard9.ts b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard9.ts
index fdbe7436f4d96..be96d317e95b4 100644
--- a/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard9.ts
+++ b/tests/cases/fourslash/server/pathCompletionsPackageJsonImportsSrcNoDistWildcard9.ts
@@ -3,6 +3,7 @@
 // @Filename: /home/src/workspaces/project/tsconfig.json
 //// {
 ////   "compilerOptions": {
+////     "lib": ["es5"],
 ////     "module": "nodenext",
 ////     "rootDir": "src",
 ////     "outDir": "dist",
diff --git a/tests/cases/fourslash/server/projectInfo01.ts b/tests/cases/fourslash/server/projectInfo01.ts
index ff89af47d4bb3..ff5680b04f60f 100644
--- a/tests/cases/fourslash/server/projectInfo01.ts
+++ b/tests/cases/fourslash/server/projectInfo01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 // @Filename: a.ts
 ////export var test = "test String"
 
@@ -14,11 +16,11 @@
 ////console.log("nothing");
 
 goTo.file("a.ts")
-verify.ProjectInfo(["/home/src/tslibs/TS/Lib/lib.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts", "a.ts"])
+verify.ProjectInfo(["/home/src/tslibs/TS/Lib/lib.es5.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts", "a.ts"])
 goTo.file("b.ts")
-verify.ProjectInfo(["/home/src/tslibs/TS/Lib/lib.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts", "a.ts", "b.ts"])
+verify.ProjectInfo(["/home/src/tslibs/TS/Lib/lib.es5.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts", "a.ts", "b.ts"])
 goTo.file("c.ts")
-verify.ProjectInfo(["/home/src/tslibs/TS/Lib/lib.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts", "a.ts", "b.ts", "c.ts"])
+verify.ProjectInfo(["/home/src/tslibs/TS/Lib/lib.es5.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts", "a.ts", "b.ts", "c.ts"])
 goTo.file("d.ts")
-verify.ProjectInfo(["/home/src/tslibs/TS/Lib/lib.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts", "d.ts"])
+verify.ProjectInfo(["/home/src/tslibs/TS/Lib/lib.es5.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts", "d.ts"])
 
diff --git a/tests/cases/fourslash/server/projectInfo02.ts b/tests/cases/fourslash/server/projectInfo02.ts
index d4c39e6bdac45..d90078e337128 100644
--- a/tests/cases/fourslash/server/projectInfo02.ts
+++ b/tests/cases/fourslash/server/projectInfo02.ts
@@ -7,7 +7,7 @@
 ////export var test2 = "test String"
 
 // @Filename: tsconfig.json
-////{ "files": ["a.ts", "b.ts"] }
+////{ "files": ["a.ts", "b.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 goTo.file("a.ts")
-verify.ProjectInfo(["/home/src/tslibs/TS/Lib/lib.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts", "a.ts", "b.ts", "tsconfig.json"])
+verify.ProjectInfo(["/home/src/tslibs/TS/Lib/lib.es5.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts", "a.ts", "b.ts", "tsconfig.json"])
diff --git a/tests/cases/fourslash/server/projectWithNonExistentFiles.ts b/tests/cases/fourslash/server/projectWithNonExistentFiles.ts
index 282119ac10b90..76eea5255ded7 100644
--- a/tests/cases/fourslash/server/projectWithNonExistentFiles.ts
+++ b/tests/cases/fourslash/server/projectWithNonExistentFiles.ts
@@ -7,7 +7,7 @@
 ////export var test2 = "test String"
 
 // @Filename: tsconfig.json
-////{ "files": ["a.ts", "c.ts", "b.ts"] }
+////{ "files": ["a.ts", "c.ts", "b.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 goTo.file("a.ts");
-verify.ProjectInfo(["/home/src/tslibs/TS/Lib/lib.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts", "a.ts", "b.ts", "tsconfig.json"])
+verify.ProjectInfo(["/home/src/tslibs/TS/Lib/lib.es5.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.d.ts", "/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts", "a.ts", "b.ts", "tsconfig.json"])
diff --git a/tests/cases/fourslash/server/quickinfo01.ts b/tests/cases/fourslash/server/quickinfo01.ts
index f1f4bb4ddff40..cf4d6fbb95e81 100644
--- a/tests/cases/fourslash/server/quickinfo01.ts
+++ b/tests/cases/fourslash/server/quickinfo01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ////interface One {
 ////    commonProperty: number;
 ////    commonFunction(): number;
diff --git a/tests/cases/fourslash/server/quickinfoVerbosityServer.ts b/tests/cases/fourslash/server/quickinfoVerbosityServer.ts
index 9fc9eeb7082e1..980d89c6659e8 100644
--- a/tests/cases/fourslash/server/quickinfoVerbosityServer.ts
+++ b/tests/cases/fourslash/server/quickinfoVerbosityServer.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 //// type FooType = string | number
 //// const foo/*a*/: FooType = 1
 
diff --git a/tests/cases/fourslash/server/quickinfoWrongComment.ts b/tests/cases/fourslash/server/quickinfoWrongComment.ts
index 9f96d2c665aea..e4b6ff856310f 100644
--- a/tests/cases/fourslash/server/quickinfoWrongComment.ts
+++ b/tests/cases/fourslash/server/quickinfoWrongComment.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 //// interface I {
 ////     /** The colour */
 ////     readonly colour: string
diff --git a/tests/cases/fourslash/server/referenceToEmptyObject.ts b/tests/cases/fourslash/server/referenceToEmptyObject.ts
index b740736d2bcc3..0e284e10efbe5 100644
--- a/tests/cases/fourslash/server/referenceToEmptyObject.ts
+++ b/tests/cases/fourslash/server/referenceToEmptyObject.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////const obj = {}/*1*/;
 
 verify.baselineFindAllReferences('1');
diff --git a/tests/cases/fourslash/server/references01.ts b/tests/cases/fourslash/server/references01.ts
index 214d8caf0645d..9fa83a565c793 100644
--- a/tests/cases/fourslash/server/references01.ts
+++ b/tests/cases/fourslash/server/references01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 // Global class reference.
 
 // @Filename: /home/src/workspaces/project/referencesForGlobals_1.ts
diff --git a/tests/cases/fourslash/server/referencesInConfiguredProject.ts b/tests/cases/fourslash/server/referencesInConfiguredProject.ts
index 528272d126bb3..8b1b8ab6bdafe 100644
--- a/tests/cases/fourslash/server/referencesInConfiguredProject.ts
+++ b/tests/cases/fourslash/server/referencesInConfiguredProject.ts
@@ -11,6 +11,6 @@
 ////var c = /*1*/globalClass();
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-////{ "files": ["referencesForGlobals_1.ts", "referencesForGlobals_2.ts"] }
+////{ "files": ["referencesForGlobals_1.ts", "referencesForGlobals_2.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 verify.baselineFindAllReferences('1')
diff --git a/tests/cases/fourslash/server/referencesInEmptyFile.ts b/tests/cases/fourslash/server/referencesInEmptyFile.ts
index f9ac25f1ae829..214393ffc7c2c 100644
--- a/tests/cases/fourslash/server/referencesInEmptyFile.ts
+++ b/tests/cases/fourslash/server/referencesInEmptyFile.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 /////*1*/
 
 verify.baselineFindAllReferences('1');
diff --git a/tests/cases/fourslash/server/referencesInEmptyFileWithMultipleProjects.ts b/tests/cases/fourslash/server/referencesInEmptyFileWithMultipleProjects.ts
index c5564895b9128..f5fccc3889e6c 100644
--- a/tests/cases/fourslash/server/referencesInEmptyFileWithMultipleProjects.ts
+++ b/tests/cases/fourslash/server/referencesInEmptyFileWithMultipleProjects.ts
@@ -1,14 +1,14 @@
 /// <reference path="../fourslash.ts"/>
 
 // @Filename: /home/src/workspaces/project/a/tsconfig.json
-////{ "files": ["a.ts"] }
+////{ "files": ["a.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/a/a.ts
 /////// <reference path="../b/b.ts" />
 /////*1*/;
 
 // @Filename: /home/src/workspaces/project/b/tsconfig.json
-////{ "files": ["b.ts"] }
+////{ "files": ["b.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/b/b.ts
 /////*2*/;
diff --git a/tests/cases/fourslash/server/referencesInStringLiteralValueWithMultipleProjects.ts b/tests/cases/fourslash/server/referencesInStringLiteralValueWithMultipleProjects.ts
index 45fb7dd2f60c0..b30be5e5dd79e 100644
--- a/tests/cases/fourslash/server/referencesInStringLiteralValueWithMultipleProjects.ts
+++ b/tests/cases/fourslash/server/referencesInStringLiteralValueWithMultipleProjects.ts
@@ -1,14 +1,14 @@
 /// <reference path="../fourslash.ts"/>
 
 // @Filename: /home/src/workspaces/project/a/tsconfig.json
-////{ "files": ["a.ts"] }
+////{ "files": ["a.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/a/a.ts
 /////// <reference path="../b/b.ts" />
 ////const str: string = "hello/*1*/";
 
 // @Filename: /home/src/workspaces/project/b/tsconfig.json
-////{ "files": ["b.ts"] }
+////{ "files": ["b.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/b/b.ts
 ////const str2: string = "hello/*2*/";
diff --git a/tests/cases/fourslash/server/referencesToNonPropertyNameStringLiteral.ts b/tests/cases/fourslash/server/referencesToNonPropertyNameStringLiteral.ts
index cf21c74c2d56e..5e82bd975a935 100644
--- a/tests/cases/fourslash/server/referencesToNonPropertyNameStringLiteral.ts
+++ b/tests/cases/fourslash/server/referencesToNonPropertyNameStringLiteral.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ////const str: string = "hello/*1*/";
 
 verify.baselineFindAllReferences('1')
diff --git a/tests/cases/fourslash/server/referencesToStringLiteralValue.ts b/tests/cases/fourslash/server/referencesToStringLiteralValue.ts
index ee5c9fca9c02f..25c3ef89a735e 100644
--- a/tests/cases/fourslash/server/referencesToStringLiteralValue.ts
+++ b/tests/cases/fourslash/server/referencesToStringLiteralValue.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 ////const s: string = "some /*1*/ string";
 
 verify.baselineFindAllReferences('1');
diff --git a/tests/cases/fourslash/server/rename01.ts b/tests/cases/fourslash/server/rename01.ts
index 66909fe3aeeb1..137c3d6b07abb 100644
--- a/tests/cases/fourslash/server/rename01.ts
+++ b/tests/cases/fourslash/server/rename01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ///////<reference path="./Bar.ts" />
 
 ////[|function [|{| "contextRangeIndex": 0 |}Bar|]() {
diff --git a/tests/cases/fourslash/server/renameInConfiguredProject.ts b/tests/cases/fourslash/server/renameInConfiguredProject.ts
index 2bc7e3272ca12..5691fc920a72f 100644
--- a/tests/cases/fourslash/server/renameInConfiguredProject.ts
+++ b/tests/cases/fourslash/server/renameInConfiguredProject.ts
@@ -7,7 +7,7 @@
 ////var y = [|globalName|];
 
 // @Filename: tsconfig.json
-////{ "files": ["referencesForGlobals_1.ts", "referencesForGlobals_2.ts"] }
+////{ "files": ["referencesForGlobals_1.ts", "referencesForGlobals_2.ts"], "compilerOptions": { "lib": ["es5"] } }
 
 const [rDef, ...ranges] = test.ranges();
 verify.baselineRename(ranges, { findInStrings: true, findInComments: true });
diff --git a/tests/cases/fourslash/server/renameNamedImport.ts b/tests/cases/fourslash/server/renameNamedImport.ts
index 48e45863903b6..de6d04ab71cca 100644
--- a/tests/cases/fourslash/server/renameNamedImport.ts
+++ b/tests/cases/fourslash/server/renameNamedImport.ts
@@ -1,21 +1,21 @@
 /// <reference path='../fourslash.ts' />
 
 // @Filename: /home/src/workspaces/project/lib/tsconfig.json
-//// {}
+//// { "compilerOptions": { "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/lib/index.ts
 //// const unrelatedLocalVariable = 123;
 //// export const someExportedVariable = unrelatedLocalVariable;
 
 // @Filename: /home/src/workspaces/project/src/tsconfig.json
-//// {}
+//// { "compilerOptions": { "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/src/index.ts
 //// import { /*i*/someExportedVariable } from '../lib/index';
 //// someExportedVariable;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// {}
+//// { "compilerOptions": { "lib": ["es5"] } }
 
 goTo.file("/home/src/workspaces/project/lib/index.ts");
 goTo.file("/home/src/workspaces/project/src/index.ts");
diff --git a/tests/cases/fourslash/server/renameNamespaceImport.ts b/tests/cases/fourslash/server/renameNamespaceImport.ts
index 66d6ba78bdb1c..3984eaa92b506 100644
--- a/tests/cases/fourslash/server/renameNamespaceImport.ts
+++ b/tests/cases/fourslash/server/renameNamespaceImport.ts
@@ -1,21 +1,21 @@
 /// <reference path='../fourslash.ts' />
 
 // @Filename: /home/src/workspaces/project/lib/tsconfig.json
-//// {}
+//// { "compilerOptions": { "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/lib/index.ts
 //// const unrelatedLocalVariable = 123;
 //// export const someExportedVariable = unrelatedLocalVariable;
 
 // @Filename: /home/src/workspaces/project/src/tsconfig.json
-//// {}
+//// { "compilerOptions": { "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/src/index.ts
 //// import * as /*i*/lib from '../lib/index';
 //// lib.someExportedVariable;
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// {}
+//// { "compilerOptions": { "lib": ["es5"] } }
 
 goTo.file("/home/src/workspaces/project/lib/index.ts");
 goTo.file("/home/src/workspaces/project/src/index.ts");
diff --git a/tests/cases/fourslash/server/rewriteRelativeImportExtensionsProjectReferences1.ts b/tests/cases/fourslash/server/rewriteRelativeImportExtensionsProjectReferences1.ts
index 2b0190c97e9d8..d40e0ca5331c6 100644
--- a/tests/cases/fourslash/server/rewriteRelativeImportExtensionsProjectReferences1.ts
+++ b/tests/cases/fourslash/server/rewriteRelativeImportExtensionsProjectReferences1.ts
@@ -3,6 +3,7 @@
 // @Filename: packages/common/tsconfig.json
 //// {
 ////     "compilerOptions": {
+////         "lib": ["es5"],
 ////         "composite": true,
 ////         "rootDir": "src",
 ////         "outDir": "dist",
@@ -32,6 +33,7 @@
 ////     "compilerOptions": {
 ////         "module": "nodenext",
 ////         "rewriteRelativeImportExtensions": true,
+////         "lib": ["es5"],
 ////         "rootDir": "src",
 ////         "outDir": "dist",
 ////         "resolveJsonModule": false,
diff --git a/tests/cases/fourslash/server/rewriteRelativeImportExtensionsProjectReferences2.ts b/tests/cases/fourslash/server/rewriteRelativeImportExtensionsProjectReferences2.ts
index 3db2dbd16cefd..1c0c0b2f72f04 100644
--- a/tests/cases/fourslash/server/rewriteRelativeImportExtensionsProjectReferences2.ts
+++ b/tests/cases/fourslash/server/rewriteRelativeImportExtensionsProjectReferences2.ts
@@ -3,6 +3,7 @@
 // @Filename: src/tsconfig-base.json
 //// {
 ////     "compilerOptions": {
+////         "lib": ["es5"],
 ////         "module": "nodenext",
 ////         "composite": true,
 ////         "rootDir": ".",
@@ -14,7 +15,7 @@
 // @Filename: src/compiler/tsconfig.json
 //// {
 ////     "extends": "../tsconfig-base.json",
-////     "compilerOptions": {}
+////     "compilerOptions": { "lib": ["es5"] }
 //// }
 
 // @Filename: src/compiler/parser.ts
@@ -23,7 +24,7 @@
 // @Filename: src/services/tsconfig.json
 //// {
 ////     "extends": "../tsconfig-base.json",
-////     "compilerOptions": {},
+////     "compilerOptions": { "lib": ["es5"] },
 ////     "references": [
 ////         { "path": "../compiler" }
 ////     ]
diff --git a/tests/cases/fourslash/server/rewriteRelativeImportExtensionsProjectReferences3.ts b/tests/cases/fourslash/server/rewriteRelativeImportExtensionsProjectReferences3.ts
index 9ae9f8b1ff620..7e78459f67f9f 100644
--- a/tests/cases/fourslash/server/rewriteRelativeImportExtensionsProjectReferences3.ts
+++ b/tests/cases/fourslash/server/rewriteRelativeImportExtensionsProjectReferences3.ts
@@ -3,6 +3,7 @@
 // @Filename: src/tsconfig-base.json
 //// {
 ////     "compilerOptions": {
+////         "lib": ["es5"],
 ////         "module": "nodenext",
 ////         "composite": true,
 ////         "rewriteRelativeImportExtensions": true,
@@ -13,6 +14,7 @@
 //// {
 ////     "extends": "../tsconfig-base.json",
 ////     "compilerOptions": {
+////         "lib": ["es5"],
 ////         "rootDir": ".",
 ////         "outDir": "../../dist/compiler",
 //// }
@@ -24,6 +26,7 @@
 //// {
 ////     "extends": "../tsconfig-base.json",
 ////     "compilerOptions": {
+////         "lib": ["es5"],
 ////         "rootDir": ".",
 ////         "outDir": "../../dist/services",
 ////     },
diff --git a/tests/cases/fourslash/server/semanticClassificationJs1.ts b/tests/cases/fourslash/server/semanticClassificationJs1.ts
index a330acf7ca402..1eaf0cc54764f 100644
--- a/tests/cases/fourslash/server/semanticClassificationJs1.ts
+++ b/tests/cases/fourslash/server/semanticClassificationJs1.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 //// @Filename: index.js
 //// 
 //// var Thing = 0;
diff --git a/tests/cases/fourslash/server/signatureHelp01.ts b/tests/cases/fourslash/server/signatureHelp01.ts
index f358eae2b490f..1890aa0fefba2 100644
--- a/tests/cases/fourslash/server/signatureHelp01.ts
+++ b/tests/cases/fourslash/server/signatureHelp01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 ////function foo(data: number) {
 ////}
 ////
diff --git a/tests/cases/fourslash/server/signatureHelpJSDocCallbackTag.ts b/tests/cases/fourslash/server/signatureHelpJSDocCallbackTag.ts
index 65a831ebd5598..e8dc12b46a3f8 100644
--- a/tests/cases/fourslash/server/signatureHelpJSDocCallbackTag.ts
+++ b/tests/cases/fourslash/server/signatureHelpJSDocCallbackTag.ts
@@ -1,5 +1,6 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
 // @allowNonTsExtensions: true
 // @Filename: jsdocCallbackTag.js
 //// /**
diff --git a/tests/cases/fourslash/server/tripleSlashReferenceResolutionMode.ts b/tests/cases/fourslash/server/tripleSlashReferenceResolutionMode.ts
index 1e3db99154e4e..273f3c1418671 100644
--- a/tests/cases/fourslash/server/tripleSlashReferenceResolutionMode.ts
+++ b/tests/cases/fourslash/server/tripleSlashReferenceResolutionMode.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "nodenext", "declaration": true, "strict": true, "outDir": "out" }, "files": ["./index.ts"] }
+//// { "compilerOptions": { "lib": ["es5"], "module": "nodenext", "declaration": true, "strict": true, "outDir": "out" }, "files": ["./index.ts"] }
 
 // @Filename: /home/src/workspaces/project/package.json
 //// { "private": true, "type": "commonjs" }
diff --git a/tests/cases/fourslash/server/tsconfigComputedPropertyError.ts b/tests/cases/fourslash/server/tsconfigComputedPropertyError.ts
index 7d2eef6b04c88..fd0eb4501416f 100644
--- a/tests/cases/fourslash/server/tsconfigComputedPropertyError.ts
+++ b/tests/cases/fourslash/server/tsconfigComputedPropertyError.ts
@@ -3,6 +3,7 @@
 // @filename: tsconfig.json
 ////{
 ////    ["oops!" + 42]: "true",
+////    "compilerOptions": { "lib": ["es5"] },
 ////    "files": [
 ////        "nonexistentfile.ts"
 ////    ],
diff --git a/tests/cases/fourslash/server/tsxIncrementalServer.ts b/tests/cases/fourslash/server/tsxIncrementalServer.ts
index 9ae51406c2fa8..d4d53ced2cf73 100644
--- a/tests/cases/fourslash/server/tsxIncrementalServer.ts
+++ b/tests/cases/fourslash/server/tsxIncrementalServer.ts
@@ -1,5 +1,7 @@
 /// <reference path='../fourslash.ts' />
 
+// @lib: es5
+
 //// /**/
 
 goTo.marker();
diff --git a/tests/cases/fourslash/server/typeReferenceOnServer.ts b/tests/cases/fourslash/server/typeReferenceOnServer.ts
index 5a3273da7d7d7..1884cb5cb993e 100644
--- a/tests/cases/fourslash/server/typeReferenceOnServer.ts
+++ b/tests/cases/fourslash/server/typeReferenceOnServer.ts
@@ -1,5 +1,7 @@
 /// <reference path='../fourslash.ts' />
 
+// @lib: es5
+
 /////// <reference types="foo" />
 ////var x: number;
 ////x./*1*/
diff --git a/tests/cases/fourslash/server/typedefinition01.ts b/tests/cases/fourslash/server/typedefinition01.ts
index 8c59c4ace3112..cab505f39c4c8 100644
--- a/tests/cases/fourslash/server/typedefinition01.ts
+++ b/tests/cases/fourslash/server/typedefinition01.ts
@@ -1,5 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
+// @lib: es5
+
 // @Filename: b.ts
 ////import n = require('./a');
 ////var x/*1*/ = new n.Foo();
diff --git a/tests/cases/fourslash/signatureHelpCallExpressionJs.ts b/tests/cases/fourslash/signatureHelpCallExpressionJs.ts
index 3b19ddb393ac5..db7e19c383cd1 100644
--- a/tests/cases/fourslash/signatureHelpCallExpressionJs.ts
+++ b/tests/cases/fourslash/signatureHelpCallExpressionJs.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 // @checkJs: true
 // @allowJs: true
 
diff --git a/tests/cases/fourslash/signatureHelpOptionalCall2.ts b/tests/cases/fourslash/signatureHelpOptionalCall2.ts
index ab388398177a0..0a400444c2440 100644
--- a/tests/cases/fourslash/signatureHelpOptionalCall2.ts
+++ b/tests/cases/fourslash/signatureHelpOptionalCall2.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////declare const fnTest: undefined | ((str: string, num: number) => void);
 ////fnTest?.(/*1*/);
 
diff --git a/tests/cases/fourslash/squiggleFunctionExpression.ts b/tests/cases/fourslash/squiggleFunctionExpression.ts
index 75cca339e9daf..1d28f445d7cc2 100644
--- a/tests/cases/fourslash/squiggleFunctionExpression.ts
+++ b/tests/cases/fourslash/squiggleFunctionExpression.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts"/>
 
+// @strict: false
 ////function takesCallback(callback: (n) => any) { }
 ////takesCallback(function inner(n) { var /*1*/k/*2*/: string = 10; });
 
diff --git a/tests/cases/fourslash/squiggleIllegalSubclassOverride.ts b/tests/cases/fourslash/squiggleIllegalSubclassOverride.ts
index c97c6c75fcf5b..103fd13132cc6 100644
--- a/tests/cases/fourslash/squiggleIllegalSubclassOverride.ts
+++ b/tests/cases/fourslash/squiggleIllegalSubclassOverride.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts"/>
 
+// @strict: false
 ////class Foo {
 ////    public x: number;
 ////}
diff --git a/tests/cases/fourslash/superInDerivedTypeOfGenericWithStatics.ts b/tests/cases/fourslash/superInDerivedTypeOfGenericWithStatics.ts
index 03ff229fd582f..5472c1d1eebd4 100644
--- a/tests/cases/fourslash/superInDerivedTypeOfGenericWithStatics.ts
+++ b/tests/cases/fourslash/superInDerivedTypeOfGenericWithStatics.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
+// @strict: false
 ////namespace M {
 ////   export class C<T extends Date> {
 ////      static foo(): C<Date> {
diff --git a/tests/cases/fourslash/tsxCompletionNonTagLessThan.ts b/tests/cases/fourslash/tsxCompletionNonTagLessThan.ts
index a0b1f8ffdc3f6..fb25e763069ff 100644
--- a/tests/cases/fourslash/tsxCompletionNonTagLessThan.ts
+++ b/tests/cases/fourslash/tsxCompletionNonTagLessThan.ts
@@ -1,22 +1,24 @@
 /// <reference path='fourslash.ts'/>
 
+// @lib: es5
+
 // @Filename: /a.tsx
 ////var x: Array<numb/*a*/;
 ////[].map<numb/*b*/;
 ////1 < Infini/*c*/;
 
-verify.completions(
-    {
-    marker: ["a", "b"],
-    includes: {
+verify.completions(
+    {
+    marker: ["a", "b"],
+    includes: {
         name: "number",
         sortText: completion.SortText.GlobalsOrKeywords
-    },
-    excludes: "SVGNumber"
     },
-    {
+    excludes: "SVGNumber"
+    },
+    {
         marker: "c",
-        includes: {
+        includes: {
             name: "Infinity",
             sortText: completion.SortText.GlobalsOrKeywords
         }
diff --git a/tests/cases/fourslash/tsxCompletionOnOpeningTagWithoutJSX1.ts b/tests/cases/fourslash/tsxCompletionOnOpeningTagWithoutJSX1.ts
index 8947f117ad507..31d1839a0f156 100644
--- a/tests/cases/fourslash/tsxCompletionOnOpeningTagWithoutJSX1.ts
+++ b/tests/cases/fourslash/tsxCompletionOnOpeningTagWithoutJSX1.ts
@@ -1,5 +1,7 @@
 /// <reference path='fourslash.ts' />
 
+// @lib: es5
+
 //@Filename: file.tsx
 //// var x = 'something'
 //// var y = </**/;
diff --git a/tests/cases/fourslash/tsxSignatureHelp1.ts b/tests/cases/fourslash/tsxSignatureHelp1.ts
index e8e14b57f951f..1169da8a3cfb9 100644
--- a/tests/cases/fourslash/tsxSignatureHelp1.ts
+++ b/tests/cases/fourslash/tsxSignatureHelp1.ts
@@ -1,10 +1,8 @@
 /// <reference path='fourslash.ts' />
 
-//@Filename: file.tsx
 // @jsx: preserve
-// @noLib: true
-// @libFiles: react.d.ts,lib.d.ts
 
+//@Filename: file.tsx
 //// import React = require('react');
 //// export interface ClickableProps {
 ////     children?: string;
diff --git a/tests/cases/fourslash/tsxSignatureHelp2.ts b/tests/cases/fourslash/tsxSignatureHelp2.ts
index 0a965eeb50b2d..75c1238b71944 100644
--- a/tests/cases/fourslash/tsxSignatureHelp2.ts
+++ b/tests/cases/fourslash/tsxSignatureHelp2.ts
@@ -1,10 +1,8 @@
 /// <reference path='fourslash.ts' />
 
-//@Filename: file.tsx
 // @jsx: preserve
-// @noLib: true
-// @libFiles: react.d.ts,lib.d.ts
 
+//@Filename: file.tsx
 //// import React = require('react');
 //// export interface ClickableProps {
 ////     children?: string;
diff --git a/tests/cases/fourslash/unclosedArrayErrorRecovery.ts b/tests/cases/fourslash/unclosedArrayErrorRecovery.ts
index 3d9e4acea5351..790fc72cf60f1 100644
--- a/tests/cases/fourslash/unclosedArrayErrorRecovery.ts
+++ b/tests/cases/fourslash/unclosedArrayErrorRecovery.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @strict: false
 ////var table: number[;
 /////**/table.push(1)
 
diff --git a/tests/cases/fourslash/underscoreTypings02.ts b/tests/cases/fourslash/underscoreTypings02.ts
index be7d20427e229..bf7fdeaca1d69 100644
--- a/tests/cases/fourslash/underscoreTypings02.ts
+++ b/tests/cases/fourslash/underscoreTypings02.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
 
+// @strict: false
 // @module: CommonJS
 
 //// interface Dictionary<T> {
diff --git a/tests/cases/fourslash/unusedClassInNamespace4.ts b/tests/cases/fourslash/unusedClassInNamespace4.ts
index 8b856379acbf0..ecbc7f213a8c9 100644
--- a/tests/cases/fourslash/unusedClassInNamespace4.ts
+++ b/tests/cases/fourslash/unusedClassInNamespace4.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noUnusedLocals: true
 // @noUnusedParameters:true
 //// [| namespace Validation {
diff --git a/tests/cases/fourslash/unusedParameterInFunction2.ts b/tests/cases/fourslash/unusedParameterInFunction2.ts
index 96a710df911f0..c53aedad6d56c 100644
--- a/tests/cases/fourslash/unusedParameterInFunction2.ts
+++ b/tests/cases/fourslash/unusedParameterInFunction2.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noUnusedParameters: true
 ////function [|greeter(x,y)|] {
 ////    use(x);
diff --git a/tests/cases/fourslash/unusedParameterInLambda3.ts b/tests/cases/fourslash/unusedParameterInLambda3.ts
index 20742f4bd3778..a478baf950ca8 100644
--- a/tests/cases/fourslash/unusedParameterInLambda3.ts
+++ b/tests/cases/fourslash/unusedParameterInLambda3.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noUnusedLocals: true
 // @noUnusedParameters: true
 ////[|/*~a*/(/*~b*/x/*~c*/,/*~d*/y/*~e*/)/*~f*/ => /*~g*/x/*~h*/|]
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda3.ts b/tests/cases/fourslash/unusedTypeParametersInLambda3.ts
index 764e75294b9bb..937865a5916d6 100644
--- a/tests/cases/fourslash/unusedTypeParametersInLambda3.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInLambda3.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noUnusedLocals: true
 // @noUnusedParameters: true
 //// class A<Dummy> { public x: Dummy }
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda4.ts b/tests/cases/fourslash/unusedTypeParametersInLambda4.ts
index 14bdb64549b51..a1cd928745c3b 100644
--- a/tests/cases/fourslash/unusedTypeParametersInLambda4.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInLambda4.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noUnusedParameters: true
 //// class A<T> {
 ////    public x: T;
diff --git a/tests/cases/fourslash/unusedVariableInClass1.ts b/tests/cases/fourslash/unusedVariableInClass1.ts
index 9e7235841c938..66d18087325cf 100644
--- a/tests/cases/fourslash/unusedVariableInClass1.ts
+++ b/tests/cases/fourslash/unusedVariableInClass1.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noUnusedLocals: true
 ////class greeter {
 ////    [|private greeting: string;|]
diff --git a/tests/cases/fourslash/unusedVariableInClass2.ts b/tests/cases/fourslash/unusedVariableInClass2.ts
index a4302b4dd535a..d183580601e7a 100644
--- a/tests/cases/fourslash/unusedVariableInClass2.ts
+++ b/tests/cases/fourslash/unusedVariableInClass2.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noUnusedLocals: true
 ////class greeter {
 ////    [|public greeting1;
diff --git a/tests/cases/fourslash/unusedVariableInClass4.ts b/tests/cases/fourslash/unusedVariableInClass4.ts
index ec5d5f973a2d6..f3ab0bad887ea 100644
--- a/tests/cases/fourslash/unusedVariableInClass4.ts
+++ b/tests/cases/fourslash/unusedVariableInClass4.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
 
+// @strict: false
 // @noUnusedLocals: false
 ////class greeter {
 ////    [|private greeting: string;|]
diff --git a/tests/cases/project/mapRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/cases/project/mapRootAbsolutePathModuleMultifolderNoOutdir.json
index 5087290bd40a3..cc544ef225db9 100644
--- a/tests/cases/project/mapRootAbsolutePathModuleMultifolderNoOutdir.json
+++ b/tests/cases/project/mapRootAbsolutePathModuleMultifolderNoOutdir.json
@@ -8,5 +8,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles",
-    "resolveMapRoot": true
+    "resolveMapRoot": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/cases/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
index 4558ad9db0cde..ac626ab5c4dcd 100644
--- a/tests/cases/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles",
-    "resolveMapRoot": true
+    "resolveMapRoot": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index 9e1f3b8653621..abc281cbb7715 100644
--- a/tests/cases/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles",
-    "resolveMapRoot": true
+    "resolveMapRoot": true,
+    "strict": false
 }
diff --git a/tests/cases/project/mapRootAbsolutePathModuleSimpleNoOutdir.json b/tests/cases/project/mapRootAbsolutePathModuleSimpleNoOutdir.json
index 537b91d657f77..9cc6c83afe038 100644
--- a/tests/cases/project/mapRootAbsolutePathModuleSimpleNoOutdir.json
+++ b/tests/cases/project/mapRootAbsolutePathModuleSimpleNoOutdir.json
@@ -8,5 +8,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles",
-    "resolveMapRoot": true
+    "resolveMapRoot": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/cases/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
index d654942a7bc25..bbbecbc8a4604 100644
--- a/tests/cases/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/cases/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles",
-    "resolveMapRoot": true
+    "resolveMapRoot": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/cases/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index 0e46c7f6555d4..6521342e9c718 100644
--- a/tests/cases/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles",
-    "resolveMapRoot": true
+    "resolveMapRoot": true,
+    "strict": false
 }
diff --git a/tests/cases/project/mapRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/cases/project/mapRootAbsolutePathModuleSubfolderNoOutdir.json
index bfd1a7fa83206..5e014e647840c 100644
--- a/tests/cases/project/mapRootAbsolutePathModuleSubfolderNoOutdir.json
+++ b/tests/cases/project/mapRootAbsolutePathModuleSubfolderNoOutdir.json
@@ -8,5 +8,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles",
-    "resolveMapRoot": true
+    "resolveMapRoot": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/cases/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
index 1327f970aed3b..6bd5fafefde32 100644
--- a/tests/cases/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles",
-    "resolveMapRoot": true
+    "resolveMapRoot": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index da34468ad2c98..b76ed127b376c 100644
--- a/tests/cases/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles",
-    "resolveMapRoot": true
+    "resolveMapRoot": true,
+    "strict": false
 }
diff --git a/tests/cases/project/mapRootRelativePathModuleMultifolderNoOutdir.json b/tests/cases/project/mapRootRelativePathModuleMultifolderNoOutdir.json
index d73b017ae64f0..43c5449fc4a86 100644
--- a/tests/cases/project/mapRootRelativePathModuleMultifolderNoOutdir.json
+++ b/tests/cases/project/mapRootRelativePathModuleMultifolderNoOutdir.json
@@ -7,5 +7,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "../mapFiles"
+    "mapRoot": "../mapFiles",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/cases/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
index 4cde500ff7818..e935174ce88be 100644
--- a/tests/cases/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "../mapFiles"
+    "mapRoot": "../mapFiles",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
index b1124122faa56..dd48855dfb283 100644
--- a/tests/cases/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "../mapFiles"
+    "mapRoot": "../mapFiles",
+    "strict": false
 }
diff --git a/tests/cases/project/mapRootRelativePathModuleSimpleNoOutdir.json b/tests/cases/project/mapRootRelativePathModuleSimpleNoOutdir.json
index 65443cee955b8..a562768758c8d 100644
--- a/tests/cases/project/mapRootRelativePathModuleSimpleNoOutdir.json
+++ b/tests/cases/project/mapRootRelativePathModuleSimpleNoOutdir.json
@@ -7,5 +7,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "../mapFiles"
+    "mapRoot": "../mapFiles",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/cases/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json
index f2ecede27e3a3..0efd02d7da697 100644
--- a/tests/cases/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/cases/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "../mapFiles"
+    "mapRoot": "../mapFiles",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/cases/project/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
index 01528e90545d0..4f82affee8e5b 100644
--- a/tests/cases/project/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "../mapFiles"
+    "mapRoot": "../mapFiles",
+    "strict": false
 }
diff --git a/tests/cases/project/mapRootRelativePathModuleSubfolderNoOutdir.json b/tests/cases/project/mapRootRelativePathModuleSubfolderNoOutdir.json
index 65d6cdd5e3328..e80ea823d0f31 100644
--- a/tests/cases/project/mapRootRelativePathModuleSubfolderNoOutdir.json
+++ b/tests/cases/project/mapRootRelativePathModuleSubfolderNoOutdir.json
@@ -7,5 +7,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "../mapFiles"
+    "mapRoot": "../mapFiles",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/cases/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
index 57a577eda3a59..e18f83a27baeb 100644
--- a/tests/cases/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "../mapFiles"
+    "mapRoot": "../mapFiles",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
index 75396128b8a2b..52ac43a01cf9f 100644
--- a/tests/cases/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "../mapFiles"
+    "mapRoot": "../mapFiles",
+    "strict": false
 }
diff --git a/tests/cases/project/maprootUrlModuleMultifolderNoOutdir.json b/tests/cases/project/maprootUrlModuleMultifolderNoOutdir.json
index 3ddc91c7e1862..4364a73bfed24 100644
--- a/tests/cases/project/maprootUrlModuleMultifolderNoOutdir.json
+++ b/tests/cases/project/maprootUrlModuleMultifolderNoOutdir.json
@@ -7,5 +7,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "http://www.typescriptlang.org/"
+    "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/maprootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/cases/project/maprootUrlModuleMultifolderSpecifyOutputDirectory.json
index 49f143504f21d..7544eccb4a0fc 100644
--- a/tests/cases/project/maprootUrlModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/maprootUrlModuleMultifolderSpecifyOutputDirectory.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "http://www.typescriptlang.org/"
+    "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/maprootUrlModuleMultifolderSpecifyOutputFile.json
index c96ede8705fcf..fdf138218f6d2 100644
--- a/tests/cases/project/maprootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlModuleMultifolderSpecifyOutputFile.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "http://www.typescriptlang.org/"
+    "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false
 }
diff --git a/tests/cases/project/maprootUrlModuleSimpleNoOutdir.json b/tests/cases/project/maprootUrlModuleSimpleNoOutdir.json
index 24c30b1e887a9..16a1312fe3180 100644
--- a/tests/cases/project/maprootUrlModuleSimpleNoOutdir.json
+++ b/tests/cases/project/maprootUrlModuleSimpleNoOutdir.json
@@ -7,5 +7,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "http://www.typescriptlang.org/"
+    "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/maprootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/cases/project/maprootUrlModuleSimpleSpecifyOutputDirectory.json
index cdd13cfaf5905..5a2c70d055055 100644
--- a/tests/cases/project/maprootUrlModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/cases/project/maprootUrlModuleSimpleSpecifyOutputDirectory.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "http://www.typescriptlang.org/"
+    "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/cases/project/maprootUrlModuleSimpleSpecifyOutputFile.json
index 6e47b94dbf7d1..3090f15b2ee3b 100644
--- a/tests/cases/project/maprootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlModuleSimpleSpecifyOutputFile.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "http://www.typescriptlang.org/"
+    "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false
 }
diff --git a/tests/cases/project/maprootUrlModuleSubfolderNoOutdir.json b/tests/cases/project/maprootUrlModuleSubfolderNoOutdir.json
index 33fcd7984a006..6164a628d94f4 100644
--- a/tests/cases/project/maprootUrlModuleSubfolderNoOutdir.json
+++ b/tests/cases/project/maprootUrlModuleSubfolderNoOutdir.json
@@ -7,5 +7,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "http://www.typescriptlang.org/"
+    "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/maprootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/cases/project/maprootUrlModuleSubfolderSpecifyOutputDirectory.json
index 82d8706c8d48e..3821ed559ce2b 100644
--- a/tests/cases/project/maprootUrlModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/maprootUrlModuleSubfolderSpecifyOutputDirectory.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "http://www.typescriptlang.org/"
+    "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/maprootUrlModuleSubfolderSpecifyOutputFile.json
index b05befb815ed0..f49f4e1bd4d73 100644
--- a/tests/cases/project/maprootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlModuleSubfolderSpecifyOutputFile.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "mapRoot": "http://www.typescriptlang.org/"
+    "mapRoot": "http://www.typescriptlang.org/",
+    "strict": false
 }
diff --git a/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json b/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json
index e14fde0b9363d..9207aa247ea5c 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json
@@ -8,5 +8,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
index c88a0790cc98a..08dab0372c3cf 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
index 2426f75c45f74..441d3e3d3f25e 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
diff --git a/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json b/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json
index d441ec86048eb..53c8ee6e57d5e 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json
@@ -8,5 +8,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json
index a7d01b95e2a19..6790857d4fe54 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
index 03d5a55a9c275..24b3ecfa09d5e 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
diff --git a/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json b/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json
index 9cb263892146e..a20cd0b59ac9a 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json
@@ -8,5 +8,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
index 4e40f8664721c..bb07256720a99 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
index 36f32dccf78f0..03591eed43b59 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
diff --git a/tests/cases/project/outModuleMultifolderNoOutdir.json b/tests/cases/project/outModuleMultifolderNoOutdir.json
index 67e28f13cdc5b..25aeab7af0ee7 100644
--- a/tests/cases/project/outModuleMultifolderNoOutdir.json
+++ b/tests/cases/project/outModuleMultifolderNoOutdir.json
@@ -5,5 +5,6 @@
         "test.ts"
     ],
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/outModuleMultifolderSpecifyOutputDirectory.json b/tests/cases/project/outModuleMultifolderSpecifyOutputDirectory.json
index 3ee3c32622d4b..e8f8b4754bce9 100644
--- a/tests/cases/project/outModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/outModuleMultifolderSpecifyOutputDirectory.json
@@ -6,5 +6,6 @@
     ],
     "outDir": "outdir/simple",
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/outModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/outModuleMultifolderSpecifyOutputFile.json
index 69f028cabca40..2ed2dd0427abe 100644
--- a/tests/cases/project/outModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/outModuleMultifolderSpecifyOutputFile.json
@@ -6,5 +6,6 @@
     ],
     "outFile": "bin/test.js",
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
diff --git a/tests/cases/project/outModuleSimpleNoOutdir.json b/tests/cases/project/outModuleSimpleNoOutdir.json
index 45818f2a3ec74..f586c6f14f83c 100644
--- a/tests/cases/project/outModuleSimpleNoOutdir.json
+++ b/tests/cases/project/outModuleSimpleNoOutdir.json
@@ -5,5 +5,6 @@
         "test.ts"
     ],
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/outModuleSimpleSpecifyOutputDirectory.json b/tests/cases/project/outModuleSimpleSpecifyOutputDirectory.json
index e47e24888b849..90633d9f29408 100644
--- a/tests/cases/project/outModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/cases/project/outModuleSimpleSpecifyOutputDirectory.json
@@ -6,5 +6,6 @@
     ],
     "outDir": "outdir/simple",
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/outModuleSimpleSpecifyOutputFile.json b/tests/cases/project/outModuleSimpleSpecifyOutputFile.json
index b8b573d84ede1..826da79dfe899 100644
--- a/tests/cases/project/outModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/outModuleSimpleSpecifyOutputFile.json
@@ -6,5 +6,6 @@
     ],
     "outFile": "bin/test.js",
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
diff --git a/tests/cases/project/outModuleSubfolderNoOutdir.json b/tests/cases/project/outModuleSubfolderNoOutdir.json
index b17beca58bb55..797c29691401c 100644
--- a/tests/cases/project/outModuleSubfolderNoOutdir.json
+++ b/tests/cases/project/outModuleSubfolderNoOutdir.json
@@ -5,5 +5,6 @@
         "test.ts"
     ],
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/outModuleSubfolderSpecifyOutputDirectory.json b/tests/cases/project/outModuleSubfolderSpecifyOutputDirectory.json
index 6c5e806a1bfaf..ada57175424cd 100644
--- a/tests/cases/project/outModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/outModuleSubfolderSpecifyOutputDirectory.json
@@ -6,5 +6,6 @@
     ],
     "outDir": "outdir/simple",
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/outModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/outModuleSubfolderSpecifyOutputFile.json
index 4e7dc934f9335..3ea605f4785e1 100644
--- a/tests/cases/project/outModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/outModuleSubfolderSpecifyOutputFile.json
@@ -6,5 +6,6 @@
     ],
     "outFile": "bin/test.js",
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
diff --git a/tests/cases/project/relativeNested.json b/tests/cases/project/relativeNested.json
index fd6dd35adde31..303a2588c8bbf 100644
--- a/tests/cases/project/relativeNested.json
+++ b/tests/cases/project/relativeNested.json
@@ -4,5 +4,6 @@
     "inputFiles": [
         "app.ts"
     ],
-    "runTest": true
+    "runTest": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourceRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/cases/project/sourceRootAbsolutePathModuleMultifolderNoOutdir.json
index 9dfda4b9700a1..a31ca436ab433 100644
--- a/tests/cases/project/sourceRootAbsolutePathModuleMultifolderNoOutdir.json
+++ b/tests/cases/project/sourceRootAbsolutePathModuleMultifolderNoOutdir.json
@@ -8,5 +8,6 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src",
-    "resolveSourceRoot": true
+    "resolveSourceRoot": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/cases/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
index d5b4f2c37917b..3c5013cc3e9b9 100644
--- a/tests/cases/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src",
-    "resolveSourceRoot": true
+    "resolveSourceRoot": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index c6af4fe75a7bb..598e68f66c780 100644
--- a/tests/cases/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src",
-    "resolveSourceRoot": true
+    "resolveSourceRoot": true,
+    "strict": false
 }
diff --git a/tests/cases/project/sourceRootAbsolutePathModuleSimpleNoOutdir.json b/tests/cases/project/sourceRootAbsolutePathModuleSimpleNoOutdir.json
index 16ce6ccd12c79..22dbe3a1e4304 100644
--- a/tests/cases/project/sourceRootAbsolutePathModuleSimpleNoOutdir.json
+++ b/tests/cases/project/sourceRootAbsolutePathModuleSimpleNoOutdir.json
@@ -8,5 +8,6 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_simple/src",
-    "resolveSourceRoot": true
+    "resolveSourceRoot": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/cases/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
index 85e261ac98eb0..ea977bea87bf9 100644
--- a/tests/cases/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/cases/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_simple/src",
-    "resolveSourceRoot": true
+    "resolveSourceRoot": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/cases/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index 9648defa58261..7d1f791005241 100644
--- a/tests/cases/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_simple/src",
-    "resolveSourceRoot": true
+    "resolveSourceRoot": true,
+    "strict": false
 }
diff --git a/tests/cases/project/sourceRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/cases/project/sourceRootAbsolutePathModuleSubfolderNoOutdir.json
index 631e9fc4c69a0..0717b9d1f7cce 100644
--- a/tests/cases/project/sourceRootAbsolutePathModuleSubfolderNoOutdir.json
+++ b/tests/cases/project/sourceRootAbsolutePathModuleSubfolderNoOutdir.json
@@ -8,5 +8,6 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src",
-    "resolveSourceRoot": true
+    "resolveSourceRoot": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/cases/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
index 14c0b10cd7be1..916c60b8f580c 100644
--- a/tests/cases/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src",
-    "resolveSourceRoot": true
+    "resolveSourceRoot": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index 8426036bd71fc..56473123c00df 100644
--- a/tests/cases/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -9,5 +9,6 @@
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src",
-    "resolveSourceRoot": true
+    "resolveSourceRoot": true,
+    "strict": false
 }
diff --git a/tests/cases/project/sourceRootRelativePathModuleMultifolderNoOutdir.json b/tests/cases/project/sourceRootRelativePathModuleMultifolderNoOutdir.json
index babfe6e7dcada..5241e3c28dfea 100644
--- a/tests/cases/project/sourceRootRelativePathModuleMultifolderNoOutdir.json
+++ b/tests/cases/project/sourceRootRelativePathModuleMultifolderNoOutdir.json
@@ -7,5 +7,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "../src"
+    "sourceRoot": "../src",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/cases/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
index 82debf7fd0fca..71beb67ae07e1 100644
--- a/tests/cases/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "../src"
+    "sourceRoot": "../src",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
index 68663e8772582..f02c7d1254e1b 100644
--- a/tests/cases/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "../src"
+    "sourceRoot": "../src",
+    "strict": false
 }
diff --git a/tests/cases/project/sourceRootRelativePathModuleSimpleNoOutdir.json b/tests/cases/project/sourceRootRelativePathModuleSimpleNoOutdir.json
index bef3c046ddbaa..0570ed3e2c04f 100644
--- a/tests/cases/project/sourceRootRelativePathModuleSimpleNoOutdir.json
+++ b/tests/cases/project/sourceRootRelativePathModuleSimpleNoOutdir.json
@@ -7,5 +7,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "../src"
+    "sourceRoot": "../src",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/cases/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json
index dc5436a4549d5..31ca2ece3151f 100644
--- a/tests/cases/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/cases/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "../src"
+    "sourceRoot": "../src",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/cases/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
index 3428665793889..3a7a7d1020964 100644
--- a/tests/cases/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "../src"
+    "sourceRoot": "../src",
+    "strict": false
 }
diff --git a/tests/cases/project/sourceRootRelativePathModuleSubfolderNoOutdir.json b/tests/cases/project/sourceRootRelativePathModuleSubfolderNoOutdir.json
index c9473fef00aab..32df91ca47d24 100644
--- a/tests/cases/project/sourceRootRelativePathModuleSubfolderNoOutdir.json
+++ b/tests/cases/project/sourceRootRelativePathModuleSubfolderNoOutdir.json
@@ -7,5 +7,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "../src"
+    "sourceRoot": "../src",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/cases/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
index 2051e4458cbe4..5810f6c2adaea 100644
--- a/tests/cases/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "../src"
+    "sourceRoot": "../src",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
index 8836464991c87..9e2c47361d905 100644
--- a/tests/cases/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "../src"
+    "sourceRoot": "../src",
+    "strict": false
 }
diff --git a/tests/cases/project/sourcemapModuleMultifolderNoOutdir.json b/tests/cases/project/sourcemapModuleMultifolderNoOutdir.json
index 396da18824e3c..e0eb1180bee8b 100644
--- a/tests/cases/project/sourcemapModuleMultifolderNoOutdir.json
+++ b/tests/cases/project/sourcemapModuleMultifolderNoOutdir.json
@@ -6,5 +6,6 @@
     ],
     "sourceMap": true,
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourcemapModuleMultifolderSpecifyOutputDirectory.json b/tests/cases/project/sourcemapModuleMultifolderSpecifyOutputDirectory.json
index 7d511b26fba84..8d80a26b2c9d7 100644
--- a/tests/cases/project/sourcemapModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/sourcemapModuleMultifolderSpecifyOutputDirectory.json
@@ -7,5 +7,6 @@
     "outDir": "outdir/simple",
     "sourceMap": true,
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/sourcemapModuleMultifolderSpecifyOutputFile.json
index c2b1ca6cf1ea8..01ea018748839 100644
--- a/tests/cases/project/sourcemapModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourcemapModuleMultifolderSpecifyOutputFile.json
@@ -7,5 +7,6 @@
     "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
diff --git a/tests/cases/project/sourcemapModuleSimpleNoOutdir.json b/tests/cases/project/sourcemapModuleSimpleNoOutdir.json
index 9c216c83b3e18..8e42fda5c463e 100644
--- a/tests/cases/project/sourcemapModuleSimpleNoOutdir.json
+++ b/tests/cases/project/sourcemapModuleSimpleNoOutdir.json
@@ -6,5 +6,6 @@
     ],
     "sourceMap": true,
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourcemapModuleSimpleSpecifyOutputDirectory.json b/tests/cases/project/sourcemapModuleSimpleSpecifyOutputDirectory.json
index 9ddde0f9cf2a2..d9d82ca5000ea 100644
--- a/tests/cases/project/sourcemapModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/cases/project/sourcemapModuleSimpleSpecifyOutputDirectory.json
@@ -7,5 +7,6 @@
     "outDir": "outdir/simple",
     "sourceMap": true,
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/cases/project/sourcemapModuleSimpleSpecifyOutputFile.json
index 82a0221663f94..d04d5e67cbc82 100644
--- a/tests/cases/project/sourcemapModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/sourcemapModuleSimpleSpecifyOutputFile.json
@@ -7,5 +7,6 @@
     "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
diff --git a/tests/cases/project/sourcemapModuleSubfolderNoOutdir.json b/tests/cases/project/sourcemapModuleSubfolderNoOutdir.json
index 68dc3bfef3f37..c6988c1042c04 100644
--- a/tests/cases/project/sourcemapModuleSubfolderNoOutdir.json
+++ b/tests/cases/project/sourcemapModuleSubfolderNoOutdir.json
@@ -6,5 +6,6 @@
     ],
     "sourceMap": true,
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourcemapModuleSubfolderSpecifyOutputDirectory.json b/tests/cases/project/sourcemapModuleSubfolderSpecifyOutputDirectory.json
index 230bf9d72bb1e..2f589731b5c08 100644
--- a/tests/cases/project/sourcemapModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/sourcemapModuleSubfolderSpecifyOutputDirectory.json
@@ -7,5 +7,6 @@
     "outDir": "outdir/simple",
     "sourceMap": true,
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/sourcemapModuleSubfolderSpecifyOutputFile.json
index a29ec4429bd45..26ab22f8fbd0f 100644
--- a/tests/cases/project/sourcemapModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourcemapModuleSubfolderSpecifyOutputFile.json
@@ -7,5 +7,6 @@
     "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
diff --git a/tests/cases/project/sourcerootUrlModuleMultifolderNoOutdir.json b/tests/cases/project/sourcerootUrlModuleMultifolderNoOutdir.json
index c5016fa8e06e0..d0b6b6af1265f 100644
--- a/tests/cases/project/sourcerootUrlModuleMultifolderNoOutdir.json
+++ b/tests/cases/project/sourcerootUrlModuleMultifolderNoOutdir.json
@@ -7,5 +7,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/cases/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
index b9dc757ecd9d1..3ffbf2acab08e 100644
--- a/tests/cases/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
index dd6be1a792063..5623308f175a4 100644
--- a/tests/cases/project/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
diff --git a/tests/cases/project/sourcerootUrlModuleSimpleNoOutdir.json b/tests/cases/project/sourcerootUrlModuleSimpleNoOutdir.json
index ecfcc1ab5b786..3aac1d7cd08c4 100644
--- a/tests/cases/project/sourcerootUrlModuleSimpleNoOutdir.json
+++ b/tests/cases/project/sourcerootUrlModuleSimpleNoOutdir.json
@@ -7,5 +7,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/cases/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json
index 87d949fa30d95..8bce27e12bfc0 100644
--- a/tests/cases/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json
+++ b/tests/cases/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/cases/project/sourcerootUrlModuleSimpleSpecifyOutputFile.json
index a3b2de48d0296..a961680ca8754 100644
--- a/tests/cases/project/sourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/sourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
diff --git a/tests/cases/project/sourcerootUrlModuleSubfolderNoOutdir.json b/tests/cases/project/sourcerootUrlModuleSubfolderNoOutdir.json
index 1fda23eb1161b..01f3311b5b90a 100644
--- a/tests/cases/project/sourcerootUrlModuleSubfolderNoOutdir.json
+++ b/tests/cases/project/sourcerootUrlModuleSubfolderNoOutdir.json
@@ -7,5 +7,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/cases/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
index ebae37db88ff2..6a29fe524cb7f 100644
--- a/tests/cases/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
+++ b/tests/cases/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/cases/project/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
index 4f8404137f8e9..d321ceea36b31 100644
--- a/tests/cases/project/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -8,5 +8,6 @@
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
-    "sourceRoot": "http://typescript.codeplex.com/"
+    "sourceRoot": "http://typescript.codeplex.com/",
+    "strict": false
 }
diff --git a/tests/cases/project/visibilityOfTypeUsedAcrossModules.json b/tests/cases/project/visibilityOfTypeUsedAcrossModules.json
index 5be7459dab8fc..f3806ab6982a2 100644
--- a/tests/cases/project/visibilityOfTypeUsedAcrossModules.json
+++ b/tests/cases/project/visibilityOfTypeUsedAcrossModules.json
@@ -4,5 +4,6 @@
     "inputFiles": [
         "commands.ts"
     ],
-    "baselineCheck": true
+    "baselineCheck": true,
+    "strict": false
 }
\ No newline at end of file
diff --git a/tests/lib/lib.d.ts b/tests/lib/lib.d.ts
deleted file mode 100644
index 4db2f7ac2ac56..0000000000000
--- a/tests/lib/lib.d.ts
+++ /dev/null
@@ -1,17291 +0,0 @@
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABILITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-
-/////////////////////////////
-/// ECMAScript APIs
-/////////////////////////////
-
-declare var NaN: number;
-declare var Infinity: number;
-
-/**
-  * Evaluates JavaScript code and executes it.
-  * @param x A String value that contains valid JavaScript code.
-  */
-declare function eval(x: string): any;
-
-/**
-  * Converts A string to an integer.
-  * @param s A string to convert into a number.
-  * @param radix A value between 2 and 36 that specifies the base of the number in numString.
-  * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
-  * All other strings are considered decimal.
-  */
-declare function parseInt(s: string, radix?: number): number;
-
-/**
-  * Converts a string to a floating-point number.
-  * @param string A string that contains a floating-point number.
-  */
-declare function parseFloat(string: string): number;
-
-/**
-  * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a number).
-  * @param number A numeric value.
-  */
-declare function isNaN(number: number): boolean;
-
-/**
-  * Determines whether a supplied number is finite.
-  * @param number Any numeric value.
-  */
-declare function isFinite(number: number): boolean;
-
-/**
-  * Gets the unencoded version of an encoded Uniform Resource Identifier (URI).
-  * @param encodedURI A value representing an encoded URI.
-  */
-declare function decodeURI(encodedURI: string): string;
-
-/**
-  * Gets the unencoded version of an encoded component of a Uniform Resource Identifier (URI).
-  * @param encodedURIComponent A value representing an encoded URI component.
-  */
-declare function decodeURIComponent(encodedURIComponent: string): string;
-
-/**
-  * Encodes a text string as a valid Uniform Resource Identifier (URI)
-  * @param uri A value representing an encoded URI.
-  */
-declare function encodeURI(uri: string): string;
-
-/**
-  * Encodes a text string as a valid component of a Uniform Resource Identifier (URI).
-  * @param uriComponent A value representing an encoded URI component.
-  */
-declare function encodeURIComponent(uriComponent: string | number | boolean): string;
-
-/**
-  * Computes a new string in which certain characters have been replaced by a hexadecimal escape sequence.
-  * @param string A string value
-  */
-declare function escape(string: string): string;
-
-/**
-  * Computes a new string in which hexadecimal escape sequences are replaced with the character that it represents.
-  * @param string A string value
-  */
-declare function unescape(string: string): string;
-
-interface PropertyDescriptor {
-    configurable?: boolean;
-    enumerable?: boolean;
-    value?: any;
-    writable?: boolean;
-    get? (): any;
-    set? (v: any): void;
-}
-
-interface PropertyDescriptorMap {
-    [s: string]: PropertyDescriptor;
-}
-
-interface Object {
-    /** The initial value of Object.prototype.constructor is the standard built-in Object constructor. */
-    constructor: Function;
-
-    /** Returns a string representation of an object. */
-    toString(): string;
-
-    /** Returns a date converted to a string using the current locale. */
-    toLocaleString(): string;
-
-    /** Returns the primitive value of the specified object. */
-    valueOf(): Object;
-
-    /**
-      * Determines whether an object has a property with the specified name.
-      * @param v A property name.
-      */
-    hasOwnProperty(v: string): boolean;
-
-    /**
-      * Determines whether an object exists in another object's prototype chain.
-      * @param v Another object whose prototype chain is to be checked.
-      */
-    isPrototypeOf(v: Object): boolean;
-
-    /**
-      * Determines whether a specified property is enumerable.
-      * @param v A property name.
-      */
-    propertyIsEnumerable(v: string): boolean;
-}
-
-interface ObjectConstructor {
-    new (value?: any): Object;
-    (): any;
-    (value: any): any;
-
-    /** A reference to the prototype for a class of objects. */
-    prototype: Object;
-
-    /**
-      * Returns the prototype of an object.
-      * @param o The object that references the prototype.
-      */
-    getPrototypeOf(o: any): any;
-
-    /**
-      * Gets the own property descriptor of the specified object.
-      * An own property descriptor is one that is defined directly on the object and is not inherited from the object's prototype.
-      * @param o Object that contains the property.
-      * @param p Name of the property.
-    */
-    getOwnPropertyDescriptor(o: any, p: string): PropertyDescriptor;
-
-    /**
-      * Returns the names of the own properties of an object. The own properties of an object are those that are defined directly
-      * on that object, and are not inherited from the object's prototype. The properties of an object include both fields (objects) and functions.
-      * @param o Object that contains the own properties.
-      */
-    getOwnPropertyNames(o: any): string[];
-
-    /**
-      * Creates an object that has the specified prototype, and that optionally contains specified properties.
-      * @param o Object to use as a prototype. May be null
-      * @param properties JavaScript object that contains one or more property descriptors.
-      */
-    create(o: any, properties?: PropertyDescriptorMap): any;
-
-    /**
-      * Adds a property to an object, or modifies attributes of an existing property.
-      * @param o Object on which to add or modify the property. This can be a native JavaScript object (that is, a user-defined object or a built in object) or a DOM object.
-      * @param p The property name.
-      * @param attributes Descriptor for the property. It can be for a data property or an accessor property.
-      */
-    defineProperty<T>(o: T, p: string, attributes: PropertyDescriptor): T;
-
-    /**
-      * Adds one or more properties to an object, and/or modifies attributes of existing properties.
-      * @param o Object on which to add or modify the properties. This can be a native JavaScript object or a DOM object.
-      * @param properties JavaScript object that contains one or more descriptor objects. Each descriptor object describes a data property or an accessor property.
-      */
-    defineProperties<T>(o: T, properties: PropertyDescriptorMap): T;
-
-    /**
-      * Prevents the modification of attributes of existing properties, and prevents the addition of new properties.
-      * @param o Object on which to lock the attributes.
-      */
-    seal<T>(o: T): T;
-
-    /**
-      * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
-      * @param o Object on which to lock the attributes.
-      */
-    freeze<T>(o: T): T;
-
-    /**
-      * Prevents the addition of new properties to an object.
-      * @param o Object to make non-extensible.
-      */
-    preventExtensions<T>(o: T): T;
-
-    /**
-      * Returns true if existing property attributes cannot be modified in an object and new properties cannot be added to the object.
-      * @param o Object to test.
-      */
-    isSealed(o: any): boolean;
-
-    /**
-      * Returns true if existing property attributes and values cannot be modified in an object, and new properties cannot be added to the object.
-      * @param o Object to test.
-      */
-    isFrozen(o: any): boolean;
-
-    /**
-      * Returns a value that indicates whether new properties can be added to an object.
-      * @param o Object to test.
-      */
-    isExtensible(o: any): boolean;
-
-    /**
-      * Returns the names of the enumerable properties and methods of an object.
-      * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.
-      */
-    keys(o: any): string[];
-}
-
-/**
-  * Provides functionality common to all JavaScript objects.
-  */
-declare var Object: ObjectConstructor;
-
-/**
-  * Creates a new function.
-  */
-interface Function {
-    /**
-      * Calls the function, substituting the specified object for the this value of the function, and the specified array for the arguments of the function.
-      * @param thisArg The object to be used as the this object.
-      * @param argArray A set of arguments to be passed to the function.
-      */
-    apply(thisArg: any, argArray?: any): any;
-
-    /**
-      * Calls a method of an object, substituting another object for the current object.
-      * @param thisArg The object to be used as the current object.
-      * @param argArray A list of arguments to be passed to the method.
-      */
-    call(thisArg: any, ...argArray: any[]): any;
-
-    /**
-      * For a given function, creates a bound function that has the same body as the original function.
-      * The this object of the bound function is associated with the specified object, and has the specified initial parameters.
-      * @param thisArg An object to which the this keyword can refer inside the new function.
-      * @param argArray A list of arguments to be passed to the new function.
-      */
-    bind(thisArg: any, ...argArray: any[]): any;
-
-    prototype: any;
-    length: number;
-
-    // Non-standard extensions
-    arguments: any;
-    caller: Function;
-}
-
-interface FunctionConstructor {
-    /**
-      * Creates a new function.
-      * @param args A list of arguments the function accepts.
-      */
-    new (...args: string[]): Function;
-    (...args: string[]): Function;
-    prototype: Function;
-}
-
-declare var Function: FunctionConstructor;
-
-interface IArguments {
-    [index: number]: any;
-    length: number;
-    callee: Function;
-}
-
-interface String {
-    /** Returns a string representation of a string. */
-    toString(): string;
-
-    /**
-      * Returns the character at the specified index.
-      * @param pos The zero-based index of the desired character.
-      */
-    charAt(pos: number): string;
-
-    /**
-      * Returns the Unicode value of the character at the specified location.
-      * @param index The zero-based index of the desired character. If there is no character at the specified index, NaN is returned.
-      */
-    charCodeAt(index: number): number;
-
-    /**
-      * Returns a string that contains the concatenation of two or more strings.
-      * @param strings The strings to append to the end of the string.
-      */
-    concat(...strings: string[]): string;
-
-    /**
-      * Returns the position of the first occurrence of a substring.
-      * @param searchString The substring to search for in the string
-      * @param position The index at which to begin searching the String object. If omitted, search starts at the beginning of the string.
-      */
-    indexOf(searchString: string, position?: number): number;
-
-    /**
-      * Returns the last occurrence of a substring in the string.
-      * @param searchString The substring to search for.
-      * @param position The index at which to begin searching. If omitted, the search begins at the end of the string.
-      */
-    lastIndexOf(searchString: string, position?: number): number;
-
-    /**
-      * Determines whether two strings are equivalent in the current locale.
-      * @param that String to compare to target string
-      */
-    localeCompare(that: string): number;
-
-    /**
-      * Matches a string with a regular expression, and returns an array containing the results of that search.
-      * @param regexp A variable name or string literal containing the regular expression pattern and flags.
-      */
-    match(regexp: string): RegExpMatchArray;
-
-    /**
-      * Matches a string with a regular expression, and returns an array containing the results of that search.
-      * @param regexp A regular expression object that contains the regular expression pattern and applicable flags.
-      */
-    match(regexp: RegExp): RegExpMatchArray;
-
-    /**
-      * Replaces text in a string, using a regular expression or search string.
-      * @param searchValue A string that represents the regular expression.
-      * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
-      */
-    replace(searchValue: string, replaceValue: string): string;
-
-    /**
-      * Replaces text in a string, using a regular expression or search string.
-      * @param searchValue A string that represents the regular expression.
-      * @param replacer A function that returns the replacement text.
-      */
-    replace(searchValue: string, replacer: (substring: string, ...args: any[]) => string): string;
-
-    /**
-      * Replaces text in a string, using a regular expression or search string.
-      * @param searchValue A Regular Expression object containing the regular expression pattern and applicable flags.
-      * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
-      */
-    replace(searchValue: RegExp, replaceValue: string): string;
-
-    /**
-      * Replaces text in a string, using a regular expression or search string.
-      * @param searchValue A Regular Expression object containing the regular expression pattern and applicable flags
-      * @param replacer A function that returns the replacement text.
-      */
-    replace(searchValue: RegExp, replacer: (substring: string, ...args: any[]) => string): string;
-
-    /**
-      * Finds the first substring match in a regular expression search.
-      * @param regexp The regular expression pattern and applicable flags.
-      */
-    search(regexp: string): number;
-
-    /**
-      * Finds the first substring match in a regular expression search.
-      * @param regexp The regular expression pattern and applicable flags.
-      */
-    search(regexp: RegExp): number;
-
-    /**
-      * Returns a section of a string.
-      * @param start The index to the beginning of the specified portion of stringObj.
-      * @param end The index to the end of the specified portion of stringObj. The substring includes the characters up to, but not including, the character indicated by end.
-      * If this value is not specified, the substring continues to the end of stringObj.
-      */
-    slice(start?: number, end?: number): string;
-
-    /**
-      * Split a string into substrings using the specified separator and return them as an array.
-      * @param separator A string that identifies character or characters to use in separating the string. If omitted, a single-element array containing the entire string is returned.
-      * @param limit A value used to limit the number of elements returned in the array.
-      */
-    split(separator: string, limit?: number): string[];
-
-    /**
-      * Split a string into substrings using the specified separator and return them as an array.
-      * @param separator A Regular Express that identifies character or characters to use in separating the string. If omitted, a single-element array containing the entire string is returned.
-      * @param limit A value used to limit the number of elements returned in the array.
-      */
-    split(separator: RegExp, limit?: number): string[];
-
-    /**
-      * Returns the substring at the specified location within a String object.
-      * @param start The zero-based index number indicating the beginning of the substring.
-      * @param end Zero-based index number indicating the end of the substring. The substring includes the characters up to, but not including, the character indicated by end.
-      * If end is omitted, the characters from start through the end of the original string are returned.
-      */
-    substring(start: number, end?: number): string;
-
-    /** Converts all the alphabetic characters in a string to lowercase. */
-    toLowerCase(): string;
-
-    /** Converts all alphabetic characters to lowercase, taking into account the host environment's current locale. */
-    toLocaleLowerCase(): string;
-
-    /** Converts all the alphabetic characters in a string to uppercase. */
-    toUpperCase(): string;
-
-    /** Returns a string where all alphabetic characters have been converted to uppercase, taking into account the host environment's current locale. */
-    toLocaleUpperCase(): string;
-
-    /** Removes the leading and trailing white space and line terminator characters from a string. */
-    trim(): string;
-
-    /** Returns the length of a String object. */
-    length: number;
-
-    // IE extensions
-    /**
-      * Gets a substring beginning at the specified location and having the specified length.
-      * @param from The starting position of the desired substring. The index of the first character in the string is zero.
-      * @param length The number of characters to include in the returned substring.
-      */
-    substr(from: number, length?: number): string;
-
-    /** Returns the primitive value of the specified object. */
-    valueOf(): string;
-
-    [index: number]: string;
-}
-
-interface StringConstructor {
-    new (value?: any): String;
-    (value?: any): string;
-    prototype: String;
-    fromCharCode(...codes: number[]): string;
-}
-
-/**
-  * Allows manipulation and formatting of text strings and determination and location of substrings within strings.
-  */
-declare var String: StringConstructor;
-
-interface Boolean {
-    /** Returns the primitive value of the specified object. */
-    valueOf(): boolean;
-}
-
-interface BooleanConstructor {
-    new (value?: any): Boolean;
-    (value?: any): boolean;
-    prototype: Boolean;
-}
-
-declare var Boolean: BooleanConstructor;
-
-interface Number {
-    /**
-      * Returns a string representation of an object.
-      * @param radix Specifies a radix for converting numeric values to strings. This value is only used for numbers.
-      */
-    toString(radix?: number): string;
-
-    /**
-      * Returns a string representing a number in fixed-point notation.
-      * @param fractionDigits Number of digits after the decimal point. Must be in the range 0 - 20, inclusive.
-      */
-    toFixed(fractionDigits?: number): string;
-
-    /**
-      * Returns a string containing a number represented in exponential notation.
-      * @param fractionDigits Number of digits after the decimal point. Must be in the range 0 - 20, inclusive.
-      */
-    toExponential(fractionDigits?: number): string;
-
-    /**
-      * Returns a string containing a number represented either in exponential or fixed-point notation with a specified number of digits.
-      * @param precision Number of significant digits. Must be in the range 1 - 21, inclusive.
-      */
-    toPrecision(precision?: number): string;
-
-    /** Returns the primitive value of the specified object. */
-    valueOf(): number;
-}
-
-interface NumberConstructor {
-    new (value?: any): Number;
-    (value?: any): number;
-    prototype: Number;
-
-    /** The largest number that can be represented in JavaScript. Equal to approximately 1.79E+308. */
-    MAX_VALUE: number;
-
-    /** The closest number to zero that can be represented in JavaScript. Equal to approximately 5.00E-324. */
-    MIN_VALUE: number;
-
-    /**
-      * A value that is not a number.
-      * In equality comparisons, NaN does not equal any value, including itself. To test whether a value is equivalent to NaN, use the isNaN function.
-      */
-    NaN: number;
-
-    /**
-      * A value that is less than the largest negative number that can be represented in JavaScript.
-      * JavaScript displays NEGATIVE_INFINITY values as -infinity.
-      */
-    NEGATIVE_INFINITY: number;
-
-    /**
-      * A value greater than the largest number that can be represented in JavaScript.
-      * JavaScript displays POSITIVE_INFINITY values as infinity.
-      */
-    POSITIVE_INFINITY: number;
-}
-
-/** An object that represents a number of any kind. All JavaScript numbers are 64-bit floating-point numbers. */
-declare var Number: NumberConstructor;
-
-interface TemplateStringsArray extends Array<string> {
-    raw: string[];
-}
-
-interface Math {
-    /** The mathematical constant e. This is Euler's number, the base of natural logarithms. */
-    E: number;
-    /** The natural logarithm of 10. */
-    LN10: number;
-    /** The natural logarithm of 2. */
-    LN2: number;
-    /** The base-2 logarithm of e. */
-    LOG2E: number;
-    /** The base-10 logarithm of e. */
-    LOG10E: number;
-    /** Pi. This is the ratio of the circumference of a circle to its diameter. */
-    PI: number;
-    /** The square root of 0.5, or, equivalently, one divided by the square root of 2. */
-    SQRT1_2: number;
-    /** The square root of 2. */
-    SQRT2: number;
-    /**
-      * Returns the absolute value of a number (the value without regard to whether it is positive or negative).
-      * For example, the absolute value of -5 is the same as the absolute value of 5.
-      * @param x A numeric expression for which the absolute value is needed.
-      */
-    abs(x: number): number;
-    /**
-      * Returns the arc cosine (or inverse cosine) of a number.
-      * @param x A numeric expression.
-      */
-    acos(x: number): number;
-    /**
-      * Returns the arcsine of a number.
-      * @param x A numeric expression.
-      */
-    asin(x: number): number;
-    /**
-      * Returns the arctangent of a number.
-      * @param x A numeric expression for which the arctangent is needed.
-      */
-    atan(x: number): number;
-    /**
-      * Returns the angle (in radians) from the X axis to a point.
-      * @param y A numeric expression representing the cartesian y-coordinate.
-      * @param x A numeric expression representing the cartesian x-coordinate.
-      */
-    atan2(y: number, x: number): number;
-    /**
-      * Returns the smallest number greater than or equal to its numeric argument.
-      * @param x A numeric expression.
-      */
-    ceil(x: number): number;
-    /**
-      * Returns the cosine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    cos(x: number): number;
-    /**
-      * Returns e (the base of natural logarithms) raised to a power.
-      * @param x A numeric expression representing the power of e.
-      */
-    exp(x: number): number;
-    /**
-      * Returns the greatest number less than or equal to its numeric argument.
-      * @param x A numeric expression.
-      */
-    floor(x: number): number;
-    /**
-      * Returns the natural logarithm (base e) of a number.
-      * @param x A numeric expression.
-      */
-    log(x: number): number;
-    /**
-      * Returns the larger of a set of supplied numeric expressions.
-      * @param values Numeric expressions to be evaluated.
-      */
-    max(...values: number[]): number;
-    /**
-      * Returns the smaller of a set of supplied numeric expressions.
-      * @param values Numeric expressions to be evaluated.
-      */
-    min(...values: number[]): number;
-    /**
-      * Returns the value of a base expression taken to a specified power.
-      * @param x The base value of the expression.
-      * @param y The exponent value of the expression.
-      */
-    pow(x: number, y: number): number;
-    /** Returns a pseudorandom number between 0 and 1. */
-    random(): number;
-    /**
-      * Returns a supplied numeric expression rounded to the nearest number.
-      * @param x The value to be rounded to the nearest number.
-      */
-    round(x: number): number;
-    /**
-      * Returns the sine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    sin(x: number): number;
-    /**
-      * Returns the square root of a number.
-      * @param x A numeric expression.
-      */
-    sqrt(x: number): number;
-    /**
-      * Returns the tangent of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    tan(x: number): number;
-}
-/** An intrinsic object that provides basic mathematics functionality and constants. */
-declare var Math: Math;
-
-/** Enables basic storage and retrieval of dates and times. */
-interface Date {
-    /** Returns a string representation of a date. The format of the string depends on the locale. */
-    toString(): string;
-    /** Returns a date as a string value. */
-    toDateString(): string;
-    /** Returns a time as a string value. */
-    toTimeString(): string;
-    /** Returns a value as a string value appropriate to the host environment's current locale. */
-    toLocaleString(): string;
-    /** Returns a date as a string value appropriate to the host environment's current locale. */
-    toLocaleDateString(): string;
-    /** Returns a time as a string value appropriate to the host environment's current locale. */
-    toLocaleTimeString(): string;
-    /** Returns the stored time value in milliseconds since midnight, January 1, 1970 UTC. */
-    valueOf(): number;
-    /** Gets the time value in milliseconds. */
-    getTime(): number;
-    /** Gets the year, using local time. */
-    getFullYear(): number;
-    /** Gets the year using Universal Coordinated Time (UTC). */
-    getUTCFullYear(): number;
-    /** Gets the month, using local time. */
-    getMonth(): number;
-    /** Gets the month of a Date object using Universal Coordinated Time (UTC). */
-    getUTCMonth(): number;
-    /** Gets the day-of-the-month, using local time. */
-    getDate(): number;
-    /** Gets the day-of-the-month, using Universal Coordinated Time (UTC). */
-    getUTCDate(): number;
-    /** Gets the day of the week, using local time. */
-    getDay(): number;
-    /** Gets the day of the week using Universal Coordinated Time (UTC). */
-    getUTCDay(): number;
-    /** Gets the hours in a date, using local time. */
-    getHours(): number;
-    /** Gets the hours value in a Date object using Universal Coordinated Time (UTC). */
-    getUTCHours(): number;
-    /** Gets the minutes of a Date object, using local time. */
-    getMinutes(): number;
-    /** Gets the minutes of a Date object using Universal Coordinated Time (UTC). */
-    getUTCMinutes(): number;
-    /** Gets the seconds of a Date object, using local time. */
-    getSeconds(): number;
-    /** Gets the seconds of a Date object using Universal Coordinated Time (UTC). */
-    getUTCSeconds(): number;
-    /** Gets the milliseconds of a Date, using local time. */
-    getMilliseconds(): number;
-    /** Gets the milliseconds of a Date object using Universal Coordinated Time (UTC). */
-    getUTCMilliseconds(): number;
-    /** Gets the difference in minutes between Universal Coordinated Time (UTC) and the time on the local computer. */
-    getTimezoneOffset(): number;
-    /**
-      * Sets the date and time value in the Date object.
-      * @param time A numeric value representing the number of elapsed milliseconds since midnight, January 1, 1970 GMT.
-      */
-    setTime(time: number): number;
-    /**
-      * Sets the milliseconds value in the Date object using local time.
-      * @param ms A numeric value equal to the millisecond value.
-      */
-    setMilliseconds(ms: number): number;
-    /**
-      * Sets the milliseconds value in the Date object using Universal Coordinated Time (UTC).
-      * @param ms A numeric value equal to the millisecond value.
-      */
-    setUTCMilliseconds(ms: number): number;
-
-    /**
-      * Sets the seconds value in the Date object using local time.
-      * @param sec A numeric value equal to the seconds value.
-      * @param ms A numeric value equal to the milliseconds value.
-      */
-    setSeconds(sec: number, ms?: number): number;
-    /**
-      * Sets the seconds value in the Date object using Universal Coordinated Time (UTC).
-      * @param sec A numeric value equal to the seconds value.
-      * @param ms A numeric value equal to the milliseconds value.
-      */
-    setUTCSeconds(sec: number, ms?: number): number;
-    /**
-      * Sets the minutes value in the Date object using local time.
-      * @param min A numeric value equal to the minutes value.
-      * @param sec A numeric value equal to the seconds value.
-      * @param ms A numeric value equal to the milliseconds value.
-      */
-    setMinutes(min: number, sec?: number, ms?: number): number;
-    /**
-      * Sets the minutes value in the Date object using Universal Coordinated Time (UTC).
-      * @param min A numeric value equal to the minutes value.
-      * @param sec A numeric value equal to the seconds value.
-      * @param ms A numeric value equal to the milliseconds value.
-      */
-    setUTCMinutes(min: number, sec?: number, ms?: number): number;
-    /**
-      * Sets the hour value in the Date object using local time.
-      * @param hours A numeric value equal to the hours value.
-      * @param min A numeric value equal to the minutes value.
-      * @param sec A numeric value equal to the seconds value.
-      * @param ms A numeric value equal to the milliseconds value.
-      */
-    setHours(hours: number, min?: number, sec?: number, ms?: number): number;
-    /**
-      * Sets the hours value in the Date object using Universal Coordinated Time (UTC).
-      * @param hours A numeric value equal to the hours value.
-      * @param min A numeric value equal to the minutes value.
-      * @param sec A numeric value equal to the seconds value.
-      * @param ms A numeric value equal to the milliseconds value.
-      */
-    setUTCHours(hours: number, min?: number, sec?: number, ms?: number): number;
-    /**
-      * Sets the numeric day-of-the-month value of the Date object using local time.
-      * @param date A numeric value equal to the day of the month.
-      */
-    setDate(date: number): number;
-    /**
-      * Sets the numeric day of the month in the Date object using Universal Coordinated Time (UTC).
-      * @param date A numeric value equal to the day of the month.
-      */
-    setUTCDate(date: number): number;
-    /**
-      * Sets the month value in the Date object using local time.
-      * @param month A numeric value equal to the month. The value for January is 0, and other month values follow consecutively.
-      * @param date A numeric value representing the day of the month. If this value is not supplied, the value from a call to the getDate method is used.
-      */
-    setMonth(month: number, date?: number): number;
-    /**
-      * Sets the month value in the Date object using Universal Coordinated Time (UTC).
-      * @param month A numeric value equal to the month. The value for January is 0, and other month values follow consecutively.
-      * @param date A numeric value representing the day of the month. If it is not supplied, the value from a call to the getUTCDate method is used.
-      */
-    setUTCMonth(month: number, date?: number): number;
-    /**
-      * Sets the year of the Date object using local time.
-      * @param year A numeric value for the year.
-      * @param month A zero-based numeric value for the month (0 for January, 11 for December). Must be specified if numDate is specified.
-      * @param date A numeric value equal for the day of the month.
-      */
-    setFullYear(year: number, month?: number, date?: number): number;
-    /**
-      * Sets the year value in the Date object using Universal Coordinated Time (UTC).
-      * @param year A numeric value equal to the year.
-      * @param month A numeric value equal to the month. The value for January is 0, and other month values follow consecutively. Must be supplied if numDate is supplied.
-      * @param date A numeric value equal to the day of the month.
-      */
-    setUTCFullYear(year: number, month?: number, date?: number): number;
-    /** Returns a date converted to a string using Universal Coordinated Time (UTC). */
-    toUTCString(): string;
-    /** Returns a date as a string value in ISO format. */
-    toISOString(): string;
-    /** Used by the JSON.stringify method to enable the transformation of an object's data for JavaScript Object Notation (JSON) serialization. */
-    toJSON(key?: any): string;
-}
-
-interface DateConstructor {
-    new (): Date;
-    new (value: number): Date;
-    new (value: string): Date;
-    new (year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date;
-    (): string;
-    prototype: Date;
-    /**
-      * Parses a string containing a date, and returns the number of milliseconds between that date and midnight, January 1, 1970.
-      * @param s A date string
-      */
-    parse(s: string): number;
-    /**
-      * Returns the number of milliseconds between midnight, January 1, 1970 Universal Coordinated Time (UTC) (or GMT) and the specified date.
-      * @param year The full year designation is required for cross-century date accuracy. If year is between 0 and 99 is used, then year is assumed to be 1900 + year.
-      * @param month The month as an number between 0 and 11 (January to December).
-      * @param date The date as an number between 1 and 31.
-      * @param hours Must be supplied if minutes is supplied. An number from 0 to 23 (midnight to 11pm) that specifies the hour.
-      * @param minutes Must be supplied if seconds is supplied. An number from 0 to 59 that specifies the minutes.
-      * @param seconds Must be supplied if milliseconds is supplied. An number from 0 to 59 that specifies the seconds.
-      * @param ms An number from 0 to 999 that specifies the milliseconds.
-      */
-    UTC(year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): number;
-    now(): number;
-}
-
-declare var Date: DateConstructor;
-
-interface RegExpMatchArray extends Array<string> {
-    index?: number;
-    input?: string;
-}
-
-interface RegExpExecArray extends Array<string> {
-    index: number;
-    input: string;
-}
-
-interface RegExp {
-    /**
-      * Executes a search on a string using a regular expression pattern, and returns an array containing the results of that search.
-      * @param string The String object or string literal on which to perform the search.
-      */
-    exec(string: string): RegExpExecArray;
-
-    /**
-      * Returns a Boolean value that indicates whether or not a pattern exists in a searched string.
-      * @param string String on which to perform the search.
-      */
-    test(string: string): boolean;
-
-    /** Returns a copy of the text of the regular expression pattern. Read-only. The regExp argument is a Regular expression object. It can be a variable name or a literal. */
-    source: string;
-
-    /** Returns a Boolean value indicating the state of the global flag (g) used with a regular expression. Default is false. Read-only. */
-    global: boolean;
-
-    /** Returns a Boolean value indicating the state of the ignoreCase flag (i) used with a regular expression. Default is false. Read-only. */
-    ignoreCase: boolean;
-
-    /** Returns a Boolean value indicating the state of the multiline flag (m) used with a regular expression. Default is false. Read-only. */
-    multiline: boolean;
-
-    lastIndex: number;
-
-    // Non-standard extensions
-    compile(): RegExp;
-}
-
-interface RegExpConstructor {
-    new (pattern: string, flags?: string): RegExp;
-    (pattern: string, flags?: string): RegExp;
-    prototype: RegExp;
-
-    // Non-standard extensions
-    $1: string;
-    $2: string;
-    $3: string;
-    $4: string;
-    $5: string;
-    $6: string;
-    $7: string;
-    $8: string;
-    $9: string;
-    lastMatch: string;
-}
-
-declare var RegExp: RegExpConstructor;
-
-interface Error {
-    name: string;
-    message: string;
-}
-
-interface ErrorConstructor {
-    new (message?: string): Error;
-    (message?: string): Error;
-    prototype: Error;
-}
-
-declare var Error: ErrorConstructor;
-
-interface EvalError extends Error {
-}
-
-interface EvalErrorConstructor {
-    new (message?: string): EvalError;
-    (message?: string): EvalError;
-    prototype: EvalError;
-}
-
-declare var EvalError: EvalErrorConstructor;
-
-interface RangeError extends Error {
-}
-
-interface RangeErrorConstructor {
-    new (message?: string): RangeError;
-    (message?: string): RangeError;
-    prototype: RangeError;
-}
-
-declare var RangeError: RangeErrorConstructor;
-
-interface ReferenceError extends Error {
-}
-
-interface ReferenceErrorConstructor {
-    new (message?: string): ReferenceError;
-    (message?: string): ReferenceError;
-    prototype: ReferenceError;
-}
-
-declare var ReferenceError: ReferenceErrorConstructor;
-
-interface SyntaxError extends Error {
-}
-
-interface SyntaxErrorConstructor {
-    new (message?: string): SyntaxError;
-    (message?: string): SyntaxError;
-    prototype: SyntaxError;
-}
-
-declare var SyntaxError: SyntaxErrorConstructor;
-
-interface TypeError extends Error {
-}
-
-interface TypeErrorConstructor {
-    new (message?: string): TypeError;
-    (message?: string): TypeError;
-    prototype: TypeError;
-}
-
-declare var TypeError: TypeErrorConstructor;
-
-interface URIError extends Error {
-}
-
-interface URIErrorConstructor {
-    new (message?: string): URIError;
-    (message?: string): URIError;
-    prototype: URIError;
-}
-
-declare var URIError: URIErrorConstructor;
-
-interface JSON {
-    /**
-      * Converts a JavaScript Object Notation (JSON) string into an object.
-      * @param text A valid JSON string.
-      * @param reviver A function that transforms the results. This function is called for each member of the object.
-      * If a member contains nested objects, the nested objects are transformed before the parent object is.
-      */
-    parse(text: string, reviver?: (key: any, value: any) => any): any;
-    /**
-      * Converts a JavaScript value to a JavaScript Object Notation (JSON) string.
-      * @param value A JavaScript value, usually an object or array, to be converted.
-      */
-    stringify(value: any): string;
-    /**
-      * Converts a JavaScript value to a JavaScript Object Notation (JSON) string.
-      * @param value A JavaScript value, usually an object or array, to be converted.
-      * @param replacer A function that transforms the results.
-      */
-    stringify(value: any, replacer: (key: string, value: any) => any): string;
-    /**
-      * Converts a JavaScript value to a JavaScript Object Notation (JSON) string.
-      * @param value A JavaScript value, usually an object or array, to be converted.
-      * @param replacer Array that transforms the results.
-      */
-    stringify(value: any, replacer: any[]): string;
-    /**
-      * Converts a JavaScript value to a JavaScript Object Notation (JSON) string.
-      * @param value A JavaScript value, usually an object or array, to be converted.
-      * @param replacer A function that transforms the results.
-      * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read.
-      */
-    stringify(value: any, replacer: (key: string, value: any) => any, space: string | number): string;
-    /**
-      * Converts a JavaScript value to a JavaScript Object Notation (JSON) string.
-      * @param value A JavaScript value, usually an object or array, to be converted.
-      * @param replacer Array that transforms the results.
-      * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read.
-      */
-    stringify(value: any, replacer: any[], space: string | number): string;
-}
-/**
-  * An intrinsic object that provides functions to convert JavaScript values to and from the JavaScript Object Notation (JSON) format.
-  */
-declare var JSON: JSON;
-
-
-/////////////////////////////
-/// ECMAScript Array API (specially handled by compiler)
-/////////////////////////////
-
-interface Array<T> {
-    /**
-      * Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
-      */
-    length: number;
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-    toLocaleString(): string;
-    /**
-      * Appends new elements to an array, and returns the new length of the array.
-      * @param items New elements of the Array.
-      */
-    push(...items: T[]): number;
-    /**
-      * Removes the last element from an array and returns it.
-      */
-    pop(): T;
-    /**
-      * Combines two or more arrays.
-      * @param items Additional items to add to the end of array1.
-      */
-    concat<U extends T[]>(...items: U[]): T[];
-    /**
-      * Combines two or more arrays.
-      * @param items Additional items to add to the end of array1.
-      */
-    concat(...items: T[]): T[];
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-    /**
-      * Reverses the elements in an Array.
-      */
-    reverse(): T[];
-    /**
-      * Removes the first element from an array and returns it.
-      */
-    shift(): T;
-    /**
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): T[];
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If omitted, the elements are sorted in ascending, UTF-16 code unit order.
-      */
-    sort(compareFn?: (a: T, b: T) => number): T[];
-
-    /**
-      * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
-      * @param start The zero-based location in the array from which to start removing elements.
-      */
-    splice(start: number): T[];
-
-    /**
-      * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
-      * @param start The zero-based location in the array from which to start removing elements.
-      * @param deleteCount The number of elements to remove.
-      * @param items Elements to insert into the array in place of the deleted elements.
-      */
-    splice(start: number, deleteCount: number, ...items: T[]): T[];
-
-    /**
-      * Inserts new elements at the start of an array.
-      * @param items  Elements to insert at the start of the Array.
-      */
-    unshift(...items: T[]): number;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0.
-      */
-    indexOf(searchElement: T, fromIndex?: number): number;
-
-    /**
-      * Returns the index of the last occurrence of a specified value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array.
-      */
-    lastIndexOf(searchElement: T, fromIndex?: number): number;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
-      */
-    every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
-      */
-    some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach calls the callbackfn function one time for each element in the array.
-      * @param thisArg  An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
-      */
-    forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map method calls the callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
-      */
-    map<U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[];
-
-    /**
-      * Returns the elements of an array that meet the condition specified in a callback function.
-      * @param callbackfn A function that accepts up to three arguments. The filter method calls the callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
-      */
-    filter(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
-
-    [n: number]: T;
-}
-
-interface ArrayConstructor {
-    new (arrayLength?: number): any[];
-    new <T>(arrayLength: number): T[];
-    new <T>(...items: T[]): T[];
-    (arrayLength?: number): any[];
-    <T>(arrayLength: number): T[];
-    <T>(...items: T[]): T[];
-    isArray(arg: any): arg is Array<any>;
-    prototype: Array<any>;
-}
-
-declare var Array: ArrayConstructor;
-
-interface TypedPropertyDescriptor<T> {
-    enumerable?: boolean;
-    configurable?: boolean;
-    writable?: boolean;
-    value?: T;
-    get?: () => T;
-    set?: (value: T) => void;
-}
-
-declare type ClassDecorator = <TFunction extends Function>(target: TFunction) => TFunction | void;
-declare type PropertyDecorator = (target: Object, propertyKey: string | symbol) => void;
-declare type MethodDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
-declare type ParameterDecorator = (target: Object, propertyKey: string | symbol, parameterIndex: number) => void;
-
-declare type PromiseConstructorLike = new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void) => PromiseLike<T>;
-
-interface PromiseLike<T> {
-    /**
-    * Attaches callbacks for the resolution and/or rejection of the Promise.
-    * @param onfulfilled The callback to execute when the Promise is resolved.
-    * @param onrejected The callback to execute when the Promise is rejected.
-    * @returns A Promise for the completion of which ever callback is executed.
-    */
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<TResult>;
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): PromiseLike<TResult>;
-}
-
-interface ArrayLike<T> {
-    length: number;
-    [n: number]: T;
-}
-
-
-/**
-  * Represents a raw buffer of binary data, which is used to store data for the
-  * different typed arrays. ArrayBuffers cannot be read from or written to directly,
-  * but can be passed to a typed array or DataView Object to interpret the raw
-  * buffer as needed.
-  */
-interface ArrayBuffer {
-    /**
-      * Read-only. The length of the ArrayBuffer (in bytes).
-      */
-    byteLength: number;
-
-    /**
-      * Returns a section of an ArrayBuffer.
-      */
-    slice(begin:number, end?:number): ArrayBuffer;
-}
-
-interface ArrayBufferConstructor {
-    prototype: ArrayBuffer;
-    new (byteLength: number): ArrayBuffer;
-    isView(arg: any): arg is ArrayBufferView;
-}
-declare var ArrayBuffer: ArrayBufferConstructor;
-
-interface ArrayBufferView {
-    /**
-      * The ArrayBuffer instance referenced by the array.
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-}
-
-interface DataView {
-    buffer: ArrayBuffer;
-    byteLength: number;
-    byteOffset: number;
-    /**
-      * Gets the Float32 value at the specified byte offset from the start of the view. There is
-      * no alignment constraint; multi-byte values may be fetched from any offset.
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getFloat32(byteOffset: number, littleEndian?: boolean): number;
-
-    /**
-      * Gets the Float64 value at the specified byte offset from the start of the view. There is
-      * no alignment constraint; multi-byte values may be fetched from any offset.
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getFloat64(byteOffset: number, littleEndian?: boolean): number;
-
-    /**
-      * Gets the Int8 value at the specified byte offset from the start of the view. There is
-      * no alignment constraint; multi-byte values may be fetched from any offset.
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getInt8(byteOffset: number): number;
-
-    /**
-      * Gets the Int16 value at the specified byte offset from the start of the view. There is
-      * no alignment constraint; multi-byte values may be fetched from any offset.
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getInt16(byteOffset: number, littleEndian?: boolean): number;
-    /**
-      * Gets the Int32 value at the specified byte offset from the start of the view. There is
-      * no alignment constraint; multi-byte values may be fetched from any offset.
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getInt32(byteOffset: number, littleEndian?: boolean): number;
-
-    /**
-      * Gets the Uint8 value at the specified byte offset from the start of the view. There is
-      * no alignment constraint; multi-byte values may be fetched from any offset.
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getUint8(byteOffset: number): number;
-
-    /**
-      * Gets the Uint16 value at the specified byte offset from the start of the view. There is
-      * no alignment constraint; multi-byte values may be fetched from any offset.
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getUint16(byteOffset: number, littleEndian?: boolean): number;
-
-    /**
-      * Gets the Uint32 value at the specified byte offset from the start of the view. There is
-      * no alignment constraint; multi-byte values may be fetched from any offset.
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getUint32(byteOffset: number, littleEndian?: boolean): number;
-
-    /**
-      * Stores an Float32 value at the specified byte offset from the start of the view.
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      * @param littleEndian If false or undefined, a big-endian value should be written,
-      * otherwise a little-endian value should be written.
-      */
-    setFloat32(byteOffset: number, value: number, littleEndian?: boolean): void;
-
-    /**
-      * Stores an Float64 value at the specified byte offset from the start of the view.
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      * @param littleEndian If false or undefined, a big-endian value should be written,
-      * otherwise a little-endian value should be written.
-      */
-    setFloat64(byteOffset: number, value: number, littleEndian?: boolean): void;
-
-    /**
-      * Stores an Int8 value at the specified byte offset from the start of the view.
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      */
-    setInt8(byteOffset: number, value: number): void;
-
-    /**
-      * Stores an Int16 value at the specified byte offset from the start of the view.
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      * @param littleEndian If false or undefined, a big-endian value should be written,
-      * otherwise a little-endian value should be written.
-      */
-    setInt16(byteOffset: number, value: number, littleEndian?: boolean): void;
-
-    /**
-      * Stores an Int32 value at the specified byte offset from the start of the view.
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      * @param littleEndian If false or undefined, a big-endian value should be written,
-      * otherwise a little-endian value should be written.
-      */
-    setInt32(byteOffset: number, value: number, littleEndian?: boolean): void;
-
-    /**
-      * Stores an Uint8 value at the specified byte offset from the start of the view.
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      */
-    setUint8(byteOffset: number, value: number): void;
-
-    /**
-      * Stores an Uint16 value at the specified byte offset from the start of the view.
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      * @param littleEndian If false or undefined, a big-endian value should be written,
-      * otherwise a little-endian value should be written.
-      */
-    setUint16(byteOffset: number, value: number, littleEndian?: boolean): void;
-
-    /**
-      * Stores an Uint32 value at the specified byte offset from the start of the view.
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      * @param littleEndian If false or undefined, a big-endian value should be written,
-      * otherwise a little-endian value should be written.
-      */
-    setUint32(byteOffset: number, value: number, littleEndian?: boolean): void;
-}
-
-interface DataViewConstructor {
-    new (buffer: ArrayBuffer & { BYTES_PER_ELEMENT?: never }, byteOffset?: number, byteLength?: number): DataView;
-}
-declare var DataView: DataViewConstructor;
-
-/**
-  * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested
-  * number of bytes could not be allocated an exception is raised.
-  */
-interface Int8Array {
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array.
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /**
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the
-      * length of the array.
-      * @param start If start is negative, it is treated as length+start. If end is negative, it
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value.
-      */
-    copyWithin(target: number, start: number, end?: number): Int8Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls
-      * the callbackfn function for each element in array1 until the callbackfn returns false,
-      * or until the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    every(callbackfn: (value: number, index: number, array: Int8Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as
-        * length+start where length is the length of the array.
-        * @param end index to stop filling the array at. If end is negative, it is treated as
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Int8Array;
-
-    /**
-      * Returns the elements of an array that meet the condition specified in a callback function.
-      * @param callbackfn A function that accepts up to three arguments. The filter method calls
-      * the callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    filter(callbackfn: (value: number, index: number, array: Int8Array) => boolean, thisArg?: any): Int8Array;
-
-    /**
-      * Returns the value of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /**
-      * Returns the index of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg  An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Int8Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map method calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    map(callbackfn: (value: number, index: number, array: Int8Array) => number, thisArg?: any): Int8Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int8Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int8Array) => U, initialValue: U): U;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int8Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int8Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array.
-      */
-    reverse(): Int8Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /**
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Int8Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until
-      * the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    some(callbackfn: (value: number, index: number, array: Int8Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If
-      * omitted, the elements are sorted in ascending, numerical order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Int8Array;
-
-    /**
-      * Gets a new Int8Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive.
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin?: number, end?: number): Int8Array;
-
-    /**
-      * Converts a number to a string by using the current locale.
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-interface Int8ArrayConstructor {
-    prototype: Int8Array;
-    new (length: number): Int8Array;
-    new (array: ArrayLike<number>): Int8Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int8Array;
-
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Int8Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array;
-
-}
-declare var Int8Array: Int8ArrayConstructor;
-
-/**
-  * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint8Array {
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array.
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /**
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the
-      * length of the array.
-      * @param start If start is negative, it is treated as length+start. If end is negative, it
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value.
-      */
-    copyWithin(target: number, start: number, end?: number): Uint8Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls
-      * the callbackfn function for each element in array1 until the callbackfn returns false,
-      * or until the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    every(callbackfn: (value: number, index: number, array: Uint8Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as
-        * length+start where length is the length of the array.
-        * @param end index to stop filling the array at. If end is negative, it is treated as
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Uint8Array;
-
-    /**
-      * Returns the elements of an array that meet the condition specified in a callback function.
-      * @param callbackfn A function that accepts up to three arguments. The filter method calls
-      * the callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    filter(callbackfn: (value: number, index: number, array: Uint8Array) => boolean, thisArg?: any): Uint8Array;
-
-    /**
-      * Returns the value of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /**
-      * Returns the index of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg  An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Uint8Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map method calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    map(callbackfn: (value: number, index: number, array: Uint8Array) => number, thisArg?: any): Uint8Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint8Array) => U, initialValue: U): U;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint8Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array.
-      */
-    reverse(): Uint8Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /**
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Uint8Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until
-      * the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    some(callbackfn: (value: number, index: number, array: Uint8Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If
-      * omitted, the elements are sorted in ascending, numerical order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Uint8Array;
-
-    /**
-      * Gets a new Uint8Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive.
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin?: number, end?: number): Uint8Array;
-
-    /**
-      * Converts a number to a string by using the current locale.
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Uint8ArrayConstructor {
-    prototype: Uint8Array;
-    new (length: number): Uint8Array;
-    new (array: ArrayLike<number>): Uint8Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8Array;
-
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Uint8Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array;
-
-}
-declare var Uint8Array: Uint8ArrayConstructor;
-
-/**
-  * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0.
-  * If the requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint8ClampedArray {
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array.
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /**
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the
-      * length of the array.
-      * @param start If start is negative, it is treated as length+start. If end is negative, it
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value.
-      */
-    copyWithin(target: number, start: number, end?: number): Uint8ClampedArray;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls
-      * the callbackfn function for each element in array1 until the callbackfn returns false,
-      * or until the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    every(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as
-        * length+start where length is the length of the array.
-        * @param end index to stop filling the array at. If end is negative, it is treated as
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Uint8ClampedArray;
-
-    /**
-      * Returns the elements of an array that meet the condition specified in a callback function.
-      * @param callbackfn A function that accepts up to three arguments. The filter method calls
-      * the callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    filter(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => boolean, thisArg?: any): Uint8ClampedArray;
-
-    /**
-      * Returns the value of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /**
-      * Returns the index of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg  An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map method calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    map(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => number, thisArg?: any): Uint8ClampedArray;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => U, initialValue: U): U;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array.
-      */
-    reverse(): Uint8ClampedArray;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: Uint8ClampedArray, offset?: number): void;
-
-    /**
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Uint8ClampedArray;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until
-      * the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    some(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If
-      * omitted, the elements are sorted in ascending, numerical order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Uint8ClampedArray;
-
-    /**
-      * Gets a new Uint8ClampedArray view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive.
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin?: number, end?: number): Uint8ClampedArray;
-
-    /**
-      * Converts a number to a string by using the current locale.
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Uint8ClampedArrayConstructor {
-    prototype: Uint8ClampedArray;
-    new (length: number): Uint8ClampedArray;
-    new (array: ArrayLike<number>): Uint8ClampedArray;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8ClampedArray;
-
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Uint8ClampedArray;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray;
-}
-declare var Uint8ClampedArray: Uint8ClampedArrayConstructor;
-
-/**
-  * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Int16Array {
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array.
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /**
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the
-      * length of the array.
-      * @param start If start is negative, it is treated as length+start. If end is negative, it
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value.
-      */
-    copyWithin(target: number, start: number, end?: number): Int16Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls
-      * the callbackfn function for each element in array1 until the callbackfn returns false,
-      * or until the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    every(callbackfn: (value: number, index: number, array: Int16Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as
-        * length+start where length is the length of the array.
-        * @param end index to stop filling the array at. If end is negative, it is treated as
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Int16Array;
-
-    /**
-      * Returns the elements of an array that meet the condition specified in a callback function.
-      * @param callbackfn A function that accepts up to three arguments. The filter method calls
-      * the callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    filter(callbackfn: (value: number, index: number, array: Int16Array) => boolean, thisArg?: any): Int16Array;
-
-    /**
-      * Returns the value of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /**
-      * Returns the index of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg  An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Int16Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map method calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    map(callbackfn: (value: number, index: number, array: Int16Array) => number, thisArg?: any): Int16Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int16Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int16Array) => U, initialValue: U): U;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int16Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int16Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array.
-      */
-    reverse(): Int16Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /**
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Int16Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until
-      * the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    some(callbackfn: (value: number, index: number, array: Int16Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If
-      * omitted, the elements are sorted in ascending, numerical order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Int16Array;
-
-    /**
-      * Gets a new Int16Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive.
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin?: number, end?: number): Int16Array;
-
-    /**
-      * Converts a number to a string by using the current locale.
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Int16ArrayConstructor {
-    prototype: Int16Array;
-    new (length: number): Int16Array;
-    new (array: ArrayLike<number>): Int16Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int16Array;
-
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Int16Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array;
-
-}
-declare var Int16Array: Int16ArrayConstructor;
-
-/**
-  * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint16Array {
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array.
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /**
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the
-      * length of the array.
-      * @param start If start is negative, it is treated as length+start. If end is negative, it
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value.
-      */
-    copyWithin(target: number, start: number, end?: number): Uint16Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls
-      * the callbackfn function for each element in array1 until the callbackfn returns false,
-      * or until the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    every(callbackfn: (value: number, index: number, array: Uint16Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as
-        * length+start where length is the length of the array.
-        * @param end index to stop filling the array at. If end is negative, it is treated as
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Uint16Array;
-
-    /**
-      * Returns the elements of an array that meet the condition specified in a callback function.
-      * @param callbackfn A function that accepts up to three arguments. The filter method calls
-      * the callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    filter(callbackfn: (value: number, index: number, array: Uint16Array) => boolean, thisArg?: any): Uint16Array;
-
-    /**
-      * Returns the value of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /**
-      * Returns the index of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg  An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Uint16Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map method calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    map(callbackfn: (value: number, index: number, array: Uint16Array) => number, thisArg?: any): Uint16Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint16Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint16Array) => U, initialValue: U): U;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint16Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint16Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array.
-      */
-    reverse(): Uint16Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /**
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Uint16Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until
-      * the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    some(callbackfn: (value: number, index: number, array: Uint16Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If
-      * omitted, the elements are sorted in ascending, numerical order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Uint16Array;
-
-    /**
-      * Gets a new Uint16Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive.
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin?: number, end?: number): Uint16Array;
-
-    /**
-      * Converts a number to a string by using the current locale.
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Uint16ArrayConstructor {
-    prototype: Uint16Array;
-    new (length: number): Uint16Array;
-    new (array: ArrayLike<number>): Uint16Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint16Array;
-
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Uint16Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array;
-
-}
-declare var Uint16Array: Uint16ArrayConstructor;
-/**
-  * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Int32Array {
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array.
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /**
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the
-      * length of the array.
-      * @param start If start is negative, it is treated as length+start. If end is negative, it
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value.
-      */
-    copyWithin(target: number, start: number, end?: number): Int32Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls
-      * the callbackfn function for each element in array1 until the callbackfn returns false,
-      * or until the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    every(callbackfn: (value: number, index: number, array: Int32Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as
-        * length+start where length is the length of the array.
-        * @param end index to stop filling the array at. If end is negative, it is treated as
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Int32Array;
-
-    /**
-      * Returns the elements of an array that meet the condition specified in a callback function.
-      * @param callbackfn A function that accepts up to three arguments. The filter method calls
-      * the callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    filter(callbackfn: (value: number, index: number, array: Int32Array) => boolean, thisArg?: any): Int32Array;
-
-    /**
-      * Returns the value of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /**
-      * Returns the index of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg  An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Int32Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map method calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    map(callbackfn: (value: number, index: number, array: Int32Array) => number, thisArg?: any): Int32Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int32Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int32Array) => U, initialValue: U): U;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int32Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int32Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array.
-      */
-    reverse(): Int32Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /**
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Int32Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until
-      * the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    some(callbackfn: (value: number, index: number, array: Int32Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If
-      * omitted, the elements are sorted in ascending, numerical order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Int32Array;
-
-    /**
-      * Gets a new Int32Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive.
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin?: number, end?: number): Int32Array;
-
-    /**
-      * Converts a number to a string by using the current locale.
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Int32ArrayConstructor {
-    prototype: Int32Array;
-    new (length: number): Int32Array;
-    new (array: ArrayLike<number>): Int32Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int32Array;
-
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Int32Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array;
-}
-declare var Int32Array: Int32ArrayConstructor;
-
-/**
-  * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint32Array {
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array.
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /**
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the
-      * length of the array.
-      * @param start If start is negative, it is treated as length+start. If end is negative, it
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value.
-      */
-    copyWithin(target: number, start: number, end?: number): Uint32Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls
-      * the callbackfn function for each element in array1 until the callbackfn returns false,
-      * or until the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    every(callbackfn: (value: number, index: number, array: Uint32Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as
-        * length+start where length is the length of the array.
-        * @param end index to stop filling the array at. If end is negative, it is treated as
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Uint32Array;
-
-    /**
-      * Returns the elements of an array that meet the condition specified in a callback function.
-      * @param callbackfn A function that accepts up to three arguments. The filter method calls
-      * the callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    filter(callbackfn: (value: number, index: number, array: Uint32Array) => boolean, thisArg?: any): Uint32Array;
-
-    /**
-      * Returns the value of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /**
-      * Returns the index of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg  An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Uint32Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map method calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    map(callbackfn: (value: number, index: number, array: Uint32Array) => number, thisArg?: any): Uint32Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint32Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint32Array) => U, initialValue: U): U;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint32Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint32Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array.
-      */
-    reverse(): Uint32Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /**
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Uint32Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until
-      * the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    some(callbackfn: (value: number, index: number, array: Uint32Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If
-      * omitted, the elements are sorted in ascending, numerical order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Uint32Array;
-
-    /**
-      * Gets a new Uint32Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive.
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin?: number, end?: number): Uint32Array;
-
-    /**
-      * Converts a number to a string by using the current locale.
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Uint32ArrayConstructor {
-    prototype: Uint32Array;
-    new (length: number): Uint32Array;
-    new (array: ArrayLike<number>): Uint32Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint32Array;
-
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Uint32Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array;
-}
-declare var Uint32Array: Uint32ArrayConstructor;
-
-/**
-  * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
-  * of bytes could not be allocated an exception is raised.
-  */
-interface Float32Array {
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array.
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /**
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the
-      * length of the array.
-      * @param start If start is negative, it is treated as length+start. If end is negative, it
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value.
-      */
-    copyWithin(target: number, start: number, end?: number): Float32Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls
-      * the callbackfn function for each element in array1 until the callbackfn returns false,
-      * or until the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    every(callbackfn: (value: number, index: number, array: Float32Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as
-        * length+start where length is the length of the array.
-        * @param end index to stop filling the array at. If end is negative, it is treated as
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Float32Array;
-
-    /**
-      * Returns the elements of an array that meet the condition specified in a callback function.
-      * @param callbackfn A function that accepts up to three arguments. The filter method calls
-      * the callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    filter(callbackfn: (value: number, index: number, array: Float32Array) => boolean, thisArg?: any): Float32Array;
-
-    /**
-      * Returns the value of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /**
-      * Returns the index of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg  An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Float32Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map method calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    map(callbackfn: (value: number, index: number, array: Float32Array) => number, thisArg?: any): Float32Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float32Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Float32Array) => U, initialValue: U): U;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float32Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Float32Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array.
-      */
-    reverse(): Float32Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /**
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Float32Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until
-      * the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    some(callbackfn: (value: number, index: number, array: Float32Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If
-      * omitted, the elements are sorted in ascending, numerical order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Float32Array;
-
-    /**
-      * Gets a new Float32Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive.
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin?: number, end?: number): Float32Array;
-
-    /**
-      * Converts a number to a string by using the current locale.
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Float32ArrayConstructor {
-    prototype: Float32Array;
-    new (length: number): Float32Array;
-    new (array: ArrayLike<number>): Float32Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Float32Array;
-
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Float32Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array;
-
-}
-declare var Float32Array: Float32ArrayConstructor;
-
-/**
-  * A typed array of 64-bit float values. The contents are initialized to 0. If the requested
-  * number of bytes could not be allocated an exception is raised.
-  */
-interface Float64Array {
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array.
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /**
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the
-      * length of the array.
-      * @param start If start is negative, it is treated as length+start. If end is negative, it
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value.
-      */
-    copyWithin(target: number, start: number, end?: number): Float64Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls
-      * the callbackfn function for each element in array1 until the callbackfn returns false,
-      * or until the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    every(callbackfn: (value: number, index: number, array: Float64Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as
-        * length+start where length is the length of the array.
-        * @param end index to stop filling the array at. If end is negative, it is treated as
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Float64Array;
-
-    /**
-      * Returns the elements of an array that meet the condition specified in a callback function.
-      * @param callbackfn A function that accepts up to three arguments. The filter method calls
-      * the callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    filter(callbackfn: (value: number, index: number, array: Float64Array) => boolean, thisArg?: any): Float64Array;
-
-    /**
-      * Returns the value of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /**
-      * Returns the index of the first element in the array where predicate is true, and undefined
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending
-      * order, until it finds one where predicate returns true. If such an element is found, find
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg  An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Float64Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map method calls the
-      * callbackfn function one time for each element in the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    map(callbackfn: (value: number, index: number, array: Float64Array) => number, thisArg?: any): Float64Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float64Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of
-      * the callback function is the accumulated result, and is provided as an argument in the next
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Float64Array) => U, initialValue: U): U;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float64Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array, in descending order.
-      * The return value of the callback function is the accumulated result, and is provided as an
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Float64Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array.
-      */
-    reverse(): Float64Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /**
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Float64Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until
-      * the end of the array.
-      * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-      * If thisArg is omitted, undefined is used as the this value.
-      */
-    some(callbackfn: (value: number, index: number, array: Float64Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If
-      * omitted, the elements are sorted in ascending, numerical order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Float64Array;
-
-    /**
-      * Gets a new Float64Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive.
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin?: number, end?: number): Float64Array;
-
-    /**
-      * Converts a number to a string by using the current locale.
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Float64ArrayConstructor {
-    prototype: Float64Array;
-    new (length: number): Float64Array;
-    new (array: ArrayLike<number>): Float64Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Float64Array;
-
-    /**
-      * The size in bytes of each element in the array.
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Float64Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
-}
-declare var Float64Array: Float64ArrayConstructor;
-/////////////////////////////
-/// ECMAScript Internationalization API
-/////////////////////////////
-
-declare namespace Intl {
-    interface CollatorOptions {
-        usage?: string;
-        localeMatcher?: string;
-        numeric?: boolean;
-        caseFirst?: string;
-        sensitivity?: string;
-        ignorePunctuation?: boolean;
-    }
-
-    interface ResolvedCollatorOptions {
-        locale: string;
-        usage: string;
-        sensitivity: string;
-        ignorePunctuation: boolean;
-        collation: string;
-        caseFirst: string;
-        numeric: boolean;
-    }
-
-    interface Collator {
-        compare(x: string, y: string): number;
-        resolvedOptions(): ResolvedCollatorOptions;
-    }
-    var Collator: {
-        new (locales?: string[], options?: CollatorOptions): Collator;
-        new (locale?: string, options?: CollatorOptions): Collator;
-        (locales?: string[], options?: CollatorOptions): Collator;
-        (locale?: string, options?: CollatorOptions): Collator;
-        supportedLocalesOf(locales: string[], options?: CollatorOptions): string[];
-        supportedLocalesOf(locale: string, options?: CollatorOptions): string[];
-    }
-
-    interface NumberFormatOptions {
-        localeMatcher?: string;
-        style?: string;
-        compactDisplay?: string;
-        currency?: string;
-        currencyDisplay?: string;
-        unit?: string;
-        unitDisplay?: string;
-        useGrouping?: boolean;
-        minimumIntegerDigits?: number;
-        minimumFractionDigits?: number;
-        maximumFractionDigits?: number;
-        minimumSignificantDigits?: number;
-        maximumSignificantDigits?: number;
-        notation?: string;
-        signDisplay?: string;
-    }
-
-    interface ResolvedNumberFormatOptions {
-        locale: string;
-        numberingSystem: string;
-        style: string;
-        compactDisplay?: string;
-        currency?: string;
-        currencyDisplay?: string;
-        unit?: string;
-        unitDisplay?: string;
-        minimumIntegerDigits: number;
-        minimumFractionDigits: number;
-        maximumFractionDigits: number;
-        minimumSignificantDigits?: number;
-        maximumSignificantDigits?: number;
-        useGrouping: boolean;
-        notation?: string;
-        signDisplay?: string;
-    }
-
-    interface NumberFormat {
-        format(value: number): string;
-        resolvedOptions(): ResolvedNumberFormatOptions;
-    }
-    var NumberFormat: {
-        new (locales?: string[], options?: NumberFormatOptions): NumberFormat;
-        new (locale?: string, options?: NumberFormatOptions): NumberFormat;
-        (locales?: string[], options?: NumberFormatOptions): NumberFormat;
-        (locale?: string, options?: NumberFormatOptions): NumberFormat;
-        supportedLocalesOf(locales: string[], options?: NumberFormatOptions): string[];
-        supportedLocalesOf(locale: string, options?: NumberFormatOptions): string[];
-    }
-
-    interface DateTimeFormatOptions {
-        dateStyle?: "full" | "long" | "medium" | "short";
-        timeStyle?: "full" | "long" | "medium" | "short";
-        calendar?: "buddhist" | "chinese" | " coptic" | "ethiopia" | "ethiopic" | "gregory" | " hebrew" | "indian" | "islamic" | "iso8601" | " japanese" | "persian" | "roc";
-        dayPeriod?: "narrow" | "short" | " long";
-        numberingSystem?: "arab" | "arabext" | " bali" | "beng" | "deva" | "fullwide" | " gujr" | "guru" | "hanidec" | "khmr" | " knda" | "laoo" | "latn" | "limb" | "mlym" | " mong" | "mymr" | "orya" | "tamldec" | " telu" | "thai" | "tibt";
-        localeMatcher?: "best fit" | "lookup";
-        timeZone?: string;
-        hour12?: boolean;
-        hourCycle?: "h11" | "h12" | "h23" | "h24";
-        formatMatcher?: "best fit" | "basic";
-        weekday?: "long" | "short" | "narrow";
-        era?: "long" | "short" | "narrow";
-        year?: "numeric" | "2-digit";
-        month?: "numeric" | "2-digit" |"long" | "short" | "narrow";
-        day?: "numeric" | "2-digit";
-        hour?: "numeric" | "2-digit";
-        minute?: "numeric" | "2-digit";
-        second?: "numeric" | "2-digit";
-        fractionalSecondDigits?: 1 | 2 | 3;
-        timeZoneName?: "long" | "short";
-    }
-
-    interface ResolvedDateTimeFormatOptions {
-        locale: string;
-        calendar: string;
-        numberingSystem: string;
-        timeZone: string;
-        hour12?: boolean;
-        weekday?: string;
-        era?: string;
-        year?: string;
-        month?: string;
-        day?: string;
-        hour?: string;
-        minute?: string;
-        second?: string;
-        timeZoneName?: string;
-    }
-
-    interface DateTimeFormat {
-        format(date?: Date | number): string;
-        resolvedOptions(): ResolvedDateTimeFormatOptions;
-    }
-    var DateTimeFormat: {
-        new (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
-        new (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
-        (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
-        (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
-        supportedLocalesOf(locales: string[], options?: DateTimeFormatOptions): string[];
-        supportedLocalesOf(locale: string, options?: DateTimeFormatOptions): string[];
-    }
-}
-
-interface String {
-    /**
-      * Determines whether two strings are equivalent in the current locale.
-      * @param that String to compare to target string
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details.
-      * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details.
-      */
-    localeCompare(that: string, locales: string[], options?: Intl.CollatorOptions): number;
-
-    /**
-      * Determines whether two strings are equivalent in the current locale.
-      * @param that String to compare to target string
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details.
-      * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details.
-      */
-    localeCompare(that: string, locale: string, options?: Intl.CollatorOptions): number;
-}
-
-interface Number {
-    /**
-      * Converts a number to a string by using the current or specified locale.
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locales?: string[], options?: Intl.NumberFormatOptions): string;
-
-    /**
-      * Converts a number to a string by using the current or specified locale.
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locale?: string, options?: Intl.NumberFormatOptions): string;
-}
-
-interface Date {
-    /**
-      * Converts a date and time to a string by using the current or specified locale.
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locales?: string[], options?: Intl.DateTimeFormatOptions): string;
-    /**
-      * Converts a date to a string by using the current or specified locale.
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleDateString(locales?: string[], options?: Intl.DateTimeFormatOptions): string;
-
-    /**
-      * Converts a time to a string by using the current or specified locale.
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleTimeString(locale?: string[], options?: Intl.DateTimeFormatOptions): string;
-
-    /**
-      * Converts a date and time to a string by using the current or specified locale.
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
-
-    /**
-      * Converts a date to a string by using the current or specified locale.
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleDateString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
-
-    /**
-      * Converts a time to a string by using the current or specified locale.
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleTimeString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
-}
-
-
-/////////////////////////////
-/// IE DOM APIs
-/////////////////////////////
-
-interface Algorithm {
-    name?: string;
-}
-
-interface AriaRequestEventInit extends EventInit {
-    attributeName?: string;
-    attributeValue?: string;
-}
-
-interface ClipboardEventInit extends EventInit {
-    data?: string;
-    dataType?: string;
-}
-
-interface CommandEventInit extends EventInit {
-    commandName?: string;
-    detail?: string;
-}
-
-interface CompositionEventInit extends UIEventInit {
-    data?: string;
-}
-
-interface ConfirmSiteSpecificExceptionsInformation extends ExceptionInformation {
-    arrayOfDomainStrings?: string[];
-}
-
-interface CustomEventInit extends EventInit {
-    detail?: any;
-}
-
-interface DeviceAccelerationDict {
-    x?: number;
-    y?: number;
-    z?: number;
-}
-
-interface DeviceRotationRateDict {
-    alpha?: number;
-    beta?: number;
-    gamma?: number;
-}
-
-interface EventInit {
-    bubbles?: boolean;
-    cancelable?: boolean;
-}
-
-interface ExceptionInformation {
-    domain?: string;
-}
-
-interface FocusEventInit extends UIEventInit {
-    relatedTarget?: EventTarget;
-}
-
-interface HashChangeEventInit extends EventInit {
-    newURL?: string;
-    oldURL?: string;
-}
-
-interface KeyAlgorithm {
-    name?: string;
-}
-
-interface KeyboardEventInit extends SharedKeyboardAndMouseEventInit {
-    key?: string;
-    location?: number;
-    repeat?: boolean;
-}
-
-interface MouseEventInit extends SharedKeyboardAndMouseEventInit {
-    screenX?: number;
-    screenY?: number;
-    clientX?: number;
-    clientY?: number;
-    button?: number;
-    buttons?: number;
-    relatedTarget?: EventTarget;
-}
-
-interface MsZoomToOptions {
-    contentX?: number;
-    contentY?: number;
-    viewportX?: string;
-    viewportY?: string;
-    scaleFactor?: number;
-    animate?: string;
-}
-
-interface MutationObserverInit {
-    childList?: boolean;
-    attributes?: boolean;
-    characterData?: boolean;
-    subtree?: boolean;
-    attributeOldValue?: boolean;
-    characterDataOldValue?: boolean;
-    attributeFilter?: string[];
-}
-
-interface ObjectURLOptions {
-    oneTimeOnly?: boolean;
-}
-
-interface PointerEventInit extends MouseEventInit {
-    pointerId?: number;
-    width?: number;
-    height?: number;
-    pressure?: number;
-    tiltX?: number;
-    tiltY?: number;
-    pointerType?: string;
-    isPrimary?: boolean;
-}
-
-interface PositionOptions {
-    enableHighAccuracy?: boolean;
-    timeout?: number;
-    maximumAge?: number;
-}
-
-interface SharedKeyboardAndMouseEventInit extends UIEventInit {
-    ctrlKey?: boolean;
-    shiftKey?: boolean;
-    altKey?: boolean;
-    metaKey?: boolean;
-    keyModifierStateAltGraph?: boolean;
-    keyModifierStateCapsLock?: boolean;
-    keyModifierStateFn?: boolean;
-    keyModifierStateFnLock?: boolean;
-    keyModifierStateHyper?: boolean;
-    keyModifierStateNumLock?: boolean;
-    keyModifierStateOS?: boolean;
-    keyModifierStateScrollLock?: boolean;
-    keyModifierStateSuper?: boolean;
-    keyModifierStateSymbol?: boolean;
-    keyModifierStateSymbolLock?: boolean;
-}
-
-interface StoreExceptionsInformation extends ExceptionInformation {
-    siteName?: string;
-    explanationString?: string;
-    detailURI?: string;
-}
-
-interface StoreSiteSpecificExceptionsInformation extends StoreExceptionsInformation {
-    arrayOfDomainStrings?: string[];
-}
-
-interface UIEventInit extends EventInit {
-    view?: Window;
-    detail?: number;
-}
-
-interface WebGLContextAttributes {
-    alpha?: boolean;
-    depth?: boolean;
-    stencil?: boolean;
-    antialias?: boolean;
-    premultipliedAlpha?: boolean;
-    preserveDrawingBuffer?: boolean;
-}
-
-interface WebGLContextEventInit extends EventInit {
-    statusMessage?: string;
-}
-
-interface WheelEventInit extends MouseEventInit {
-    deltaX?: number;
-    deltaY?: number;
-    deltaZ?: number;
-    deltaMode?: number;
-}
-
-interface EventListener {
-    (evt: Event): void;
-}
-
-interface ANGLE_instanced_arrays {
-    drawArraysInstancedANGLE(mode: number, first: number, count: number, primcount: number): void;
-    drawElementsInstancedANGLE(mode: number, count: number, type: number, offset: number, primcount: number): void;
-    vertexAttribDivisorANGLE(index: number, divisor: number): void;
-    VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
-}
-
-declare var ANGLE_instanced_arrays: {
-    prototype: ANGLE_instanced_arrays;
-    new(): ANGLE_instanced_arrays;
-    VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
-}
-
-interface AnalyserNode extends AudioNode {
-    fftSize: number;
-    frequencyBinCount: number;
-    maxDecibels: number;
-    minDecibels: number;
-    smoothingTimeConstant: number;
-    getByteFrequencyData(array: Uint8Array): void;
-    getByteTimeDomainData(array: Uint8Array): void;
-    getFloatFrequencyData(array: Float32Array): void;
-    getFloatTimeDomainData(array: Float32Array): void;
-}
-
-declare var AnalyserNode: {
-    prototype: AnalyserNode;
-    new(): AnalyserNode;
-}
-
-interface AnimationEvent extends Event {
-    animationName: string;
-    elapsedTime: number;
-    initAnimationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, animationNameArg: string, elapsedTimeArg: number): void;
-}
-
-declare var AnimationEvent: {
-    prototype: AnimationEvent;
-    new(): AnimationEvent;
-}
-
-interface ApplicationCache extends EventTarget {
-    oncached: (ev: Event) => any;
-    onchecking: (ev: Event) => any;
-    ondownloading: (ev: Event) => any;
-    onerror: (ev: Event) => any;
-    onnoupdate: (ev: Event) => any;
-    onobsolete: (ev: Event) => any;
-    onprogress: (ev: ProgressEvent) => any;
-    onupdateready: (ev: Event) => any;
-    status: number;
-    abort(): void;
-    swapCache(): void;
-    update(): void;
-    CHECKING: number;
-    DOWNLOADING: number;
-    IDLE: number;
-    OBSOLETE: number;
-    UNCACHED: number;
-    UPDATEREADY: number;
-    addEventListener(type: "cached", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "checking", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "downloading", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "noupdate", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "obsolete", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "updateready", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var ApplicationCache: {
-    prototype: ApplicationCache;
-    new(): ApplicationCache;
-    CHECKING: number;
-    DOWNLOADING: number;
-    IDLE: number;
-    OBSOLETE: number;
-    UNCACHED: number;
-    UPDATEREADY: number;
-}
-
-interface AriaRequestEvent extends Event {
-    attributeName: string;
-    attributeValue: string;
-}
-
-declare var AriaRequestEvent: {
-    prototype: AriaRequestEvent;
-    new(type: string, eventInitDict?: AriaRequestEventInit): AriaRequestEvent;
-}
-
-interface Attr extends Node {
-    name: string;
-    ownerElement: Element;
-    specified: boolean;
-    value: string;
-}
-
-declare var Attr: {
-    prototype: Attr;
-    new(): Attr;
-}
-
-interface AudioBuffer {
-    duration: number;
-    length: number;
-    numberOfChannels: number;
-    sampleRate: number;
-    getChannelData(channel: number): Float32Array;
-}
-
-declare var AudioBuffer: {
-    prototype: AudioBuffer;
-    new(): AudioBuffer;
-}
-
-interface AudioBufferSourceNode extends AudioNode {
-    buffer: AudioBuffer;
-    loop: boolean;
-    loopEnd: number;
-    loopStart: number;
-    onended: (ev: Event) => any;
-    playbackRate: AudioParam;
-    start(when?: number, offset?: number, duration?: number): void;
-    stop(when?: number): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var AudioBufferSourceNode: {
-    prototype: AudioBufferSourceNode;
-    new(): AudioBufferSourceNode;
-}
-
-interface AudioContext extends EventTarget {
-    currentTime: number;
-    destination: AudioDestinationNode;
-    listener: AudioListener;
-    sampleRate: number;
-    createAnalyser(): AnalyserNode;
-    createBiquadFilter(): BiquadFilterNode;
-    createBuffer(numberOfChannels: number, length: number, sampleRate: number): AudioBuffer;
-    createBufferSource(): AudioBufferSourceNode;
-    createChannelMerger(numberOfInputs?: number): ChannelMergerNode;
-    createChannelSplitter(numberOfOutputs?: number): ChannelSplitterNode;
-    createConvolver(): ConvolverNode;
-    createDelay(maxDelayTime?: number): DelayNode;
-    createDynamicsCompressor(): DynamicsCompressorNode;
-    createGain(): GainNode;
-    createMediaElementSource(mediaElement: HTMLMediaElement): MediaElementAudioSourceNode;
-    createOscillator(): OscillatorNode;
-    createPanner(): PannerNode;
-    createPeriodicWave(real: Float32Array, imag: Float32Array): PeriodicWave;
-    createScriptProcessor(bufferSize?: number, numberOfInputChannels?: number, numberOfOutputChannels?: number): ScriptProcessorNode;
-    createStereoPanner(): StereoPannerNode;
-    createWaveShaper(): WaveShaperNode;
-    decodeAudioData(audioData: ArrayBuffer, successCallback: DecodeSuccessCallback, errorCallback?: DecodeErrorCallback): void;
-}
-
-declare var AudioContext: {
-    prototype: AudioContext;
-    new(): AudioContext;
-}
-
-interface AudioDestinationNode extends AudioNode {
-    maxChannelCount: number;
-}
-
-declare var AudioDestinationNode: {
-    prototype: AudioDestinationNode;
-    new(): AudioDestinationNode;
-}
-
-interface AudioListener {
-    dopplerFactor: number;
-    speedOfSound: number;
-    setOrientation(x: number, y: number, z: number, xUp: number, yUp: number, zUp: number): void;
-    setPosition(x: number, y: number, z: number): void;
-    setVelocity(x: number, y: number, z: number): void;
-}
-
-declare var AudioListener: {
-    prototype: AudioListener;
-    new(): AudioListener;
-}
-
-interface AudioNode extends EventTarget {
-    channelCount: number;
-    channelCountMode: string;
-    channelInterpretation: string;
-    context: AudioContext;
-    numberOfInputs: number;
-    numberOfOutputs: number;
-    connect(destination: AudioNode, output?: number, input?: number): void;
-    disconnect(output?: number): void;
-}
-
-declare var AudioNode: {
-    prototype: AudioNode;
-    new(): AudioNode;
-}
-
-interface AudioParam {
-    defaultValue: number;
-    value: number;
-    cancelScheduledValues(startTime: number): void;
-    exponentialRampToValueAtTime(value: number, endTime: number): void;
-    linearRampToValueAtTime(value: number, endTime: number): void;
-    setTargetAtTime(target: number, startTime: number, timeConstant: number): void;
-    setValueAtTime(value: number, startTime: number): void;
-    setValueCurveAtTime(values: Float32Array, startTime: number, duration: number): void;
-}
-
-declare var AudioParam: {
-    prototype: AudioParam;
-    new(): AudioParam;
-}
-
-interface AudioProcessingEvent extends Event {
-    inputBuffer: AudioBuffer;
-    outputBuffer: AudioBuffer;
-    playbackTime: number;
-}
-
-declare var AudioProcessingEvent: {
-    prototype: AudioProcessingEvent;
-    new(): AudioProcessingEvent;
-}
-
-interface AudioTrack {
-    enabled: boolean;
-    id: string;
-    kind: string;
-    label: string;
-    language: string;
-    sourceBuffer: SourceBuffer;
-}
-
-declare var AudioTrack: {
-    prototype: AudioTrack;
-    new(): AudioTrack;
-}
-
-interface AudioTrackList extends EventTarget {
-    length: number;
-    onaddtrack: (ev: TrackEvent) => any;
-    onchange: (ev: Event) => any;
-    onremovetrack: (ev: TrackEvent) => any;
-    getTrackById(id: string): AudioTrack;
-    item(index: number): AudioTrack;
-    addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "removetrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-    [index: number]: AudioTrack;
-}
-
-declare var AudioTrackList: {
-    prototype: AudioTrackList;
-    new(): AudioTrackList;
-}
-
-interface BarProp {
-    visible: boolean;
-}
-
-declare var BarProp: {
-    prototype: BarProp;
-    new(): BarProp;
-}
-
-interface BeforeUnloadEvent extends Event {
-    returnValue: any;
-}
-
-declare var BeforeUnloadEvent: {
-    prototype: BeforeUnloadEvent;
-    new(): BeforeUnloadEvent;
-}
-
-interface BiquadFilterNode extends AudioNode {
-    Q: AudioParam;
-    detune: AudioParam;
-    frequency: AudioParam;
-    gain: AudioParam;
-    type: string;
-    getFrequencyResponse(frequencyHz: Float32Array, magResponse: Float32Array, phaseResponse: Float32Array): void;
-}
-
-declare var BiquadFilterNode: {
-    prototype: BiquadFilterNode;
-    new(): BiquadFilterNode;
-}
-
-interface Blob {
-    size: number;
-    type: string;
-    msClose(): void;
-    msDetachStream(): any;
-    slice(start?: number, end?: number, contentType?: string): Blob;
-}
-
-declare var Blob: {
-    prototype: Blob;
-    new (blobParts?: any[], options?: BlobPropertyBag): Blob;
-}
-
-interface CDATASection extends Text {
-}
-
-declare var CDATASection: {
-    prototype: CDATASection;
-    new(): CDATASection;
-}
-
-interface CSS {
-    supports(property: string, value?: string): boolean;
-}
-declare var CSS: CSS;
-
-interface CSSConditionRule extends CSSGroupingRule {
-    conditionText: string;
-}
-
-declare var CSSConditionRule: {
-    prototype: CSSConditionRule;
-    new(): CSSConditionRule;
-}
-
-interface CSSFontFaceRule extends CSSRule {
-    style: CSSStyleDeclaration;
-}
-
-declare var CSSFontFaceRule: {
-    prototype: CSSFontFaceRule;
-    new(): CSSFontFaceRule;
-}
-
-interface CSSGroupingRule extends CSSRule {
-    cssRules: CSSRuleList;
-    deleteRule(index?: number): void;
-    insertRule(rule: string, index?: number): number;
-}
-
-declare var CSSGroupingRule: {
-    prototype: CSSGroupingRule;
-    new(): CSSGroupingRule;
-}
-
-interface CSSImportRule extends CSSRule {
-    href: string;
-    media: MediaList;
-    styleSheet: CSSStyleSheet;
-}
-
-declare var CSSImportRule: {
-    prototype: CSSImportRule;
-    new(): CSSImportRule;
-}
-
-interface CSSKeyframeRule extends CSSRule {
-    keyText: string;
-    style: CSSStyleDeclaration;
-}
-
-declare var CSSKeyframeRule: {
-    prototype: CSSKeyframeRule;
-    new(): CSSKeyframeRule;
-}
-
-interface CSSKeyframesRule extends CSSRule {
-    cssRules: CSSRuleList;
-    name: string;
-    appendRule(rule: string): void;
-    deleteRule(rule: string): void;
-    findRule(rule: string): CSSKeyframeRule;
-}
-
-declare var CSSKeyframesRule: {
-    prototype: CSSKeyframesRule;
-    new(): CSSKeyframesRule;
-}
-
-interface CSSMediaRule extends CSSConditionRule {
-    media: MediaList;
-}
-
-declare var CSSMediaRule: {
-    prototype: CSSMediaRule;
-    new(): CSSMediaRule;
-}
-
-interface CSSNamespaceRule extends CSSRule {
-    namespaceURI: string;
-    prefix: string;
-}
-
-declare var CSSNamespaceRule: {
-    prototype: CSSNamespaceRule;
-    new(): CSSNamespaceRule;
-}
-
-interface CSSPageRule extends CSSRule {
-    pseudoClass: string;
-    selector: string;
-    selectorText: string;
-    style: CSSStyleDeclaration;
-}
-
-declare var CSSPageRule: {
-    prototype: CSSPageRule;
-    new(): CSSPageRule;
-}
-
-interface CSSRule {
-    cssText: string;
-    parentRule: CSSRule;
-    parentStyleSheet: CSSStyleSheet;
-    type: number;
-    CHARSET_RULE: number;
-    FONT_FACE_RULE: number;
-    IMPORT_RULE: number;
-    KEYFRAMES_RULE: number;
-    KEYFRAME_RULE: number;
-    MEDIA_RULE: number;
-    NAMESPACE_RULE: number;
-    PAGE_RULE: number;
-    STYLE_RULE: number;
-    SUPPORTS_RULE: number;
-    UNKNOWN_RULE: number;
-    VIEWPORT_RULE: number;
-}
-
-declare var CSSRule: {
-    prototype: CSSRule;
-    new(): CSSRule;
-    CHARSET_RULE: number;
-    FONT_FACE_RULE: number;
-    IMPORT_RULE: number;
-    KEYFRAMES_RULE: number;
-    KEYFRAME_RULE: number;
-    MEDIA_RULE: number;
-    NAMESPACE_RULE: number;
-    PAGE_RULE: number;
-    STYLE_RULE: number;
-    SUPPORTS_RULE: number;
-    UNKNOWN_RULE: number;
-    VIEWPORT_RULE: number;
-}
-
-interface CSSRuleList {
-    length: number;
-    item(index: number): CSSRule;
-    [index: number]: CSSRule;
-}
-
-declare var CSSRuleList: {
-    prototype: CSSRuleList;
-    new(): CSSRuleList;
-}
-
-interface CSSStyleDeclaration {
-    alignContent: string;
-    alignItems: string;
-    alignSelf: string;
-    alignmentBaseline: string;
-    animation: string;
-    animationDelay: string;
-    animationDirection: string;
-    animationDuration: string;
-    animationFillMode: string;
-    animationIterationCount: string;
-    animationName: string;
-    animationPlayState: string;
-    animationTimingFunction: string;
-    backfaceVisibility: string;
-    background: string;
-    backgroundAttachment: string;
-    backgroundClip: string;
-    backgroundColor: string;
-    backgroundImage: string;
-    backgroundOrigin: string;
-    backgroundPosition: string;
-    backgroundPositionX: string;
-    backgroundPositionY: string;
-    backgroundRepeat: string;
-    backgroundSize: string;
-    baselineShift: string;
-    border: string;
-    borderBottom: string;
-    borderBottomColor: string;
-    borderBottomLeftRadius: string;
-    borderBottomRightRadius: string;
-    borderBottomStyle: string;
-    borderBottomWidth: string;
-    borderCollapse: string;
-    borderColor: string;
-    borderImage: string;
-    borderImageOutset: string;
-    borderImageRepeat: string;
-    borderImageSlice: string;
-    borderImageSource: string;
-    borderImageWidth: string;
-    borderLeft: string;
-    borderLeftColor: string;
-    borderLeftStyle: string;
-    borderLeftWidth: string;
-    borderRadius: string;
-    borderRight: string;
-    borderRightColor: string;
-    borderRightStyle: string;
-    borderRightWidth: string;
-    borderSpacing: string;
-    borderStyle: string;
-    borderTop: string;
-    borderTopColor: string;
-    borderTopLeftRadius: string;
-    borderTopRightRadius: string;
-    borderTopStyle: string;
-    borderTopWidth: string;
-    borderWidth: string;
-    bottom: string;
-    boxShadow: string;
-    boxSizing: string;
-    breakAfter: string;
-    breakBefore: string;
-    breakInside: string;
-    captionSide: string;
-    clear: string;
-    clip: string;
-    clipPath: string;
-    clipRule: string;
-    color: string;
-    colorInterpolationFilters: string;
-    columnCount: any;
-    columnFill: string;
-    columnGap: any;
-    columnRule: string;
-    columnRuleColor: any;
-    columnRuleStyle: string;
-    columnRuleWidth: any;
-    columnSpan: string;
-    columnWidth: any;
-    columns: string;
-    content: string;
-    counterIncrement: string;
-    counterReset: string;
-    cssFloat: string;
-    cssText: string;
-    cursor: string;
-    direction: string;
-    display: string;
-    dominantBaseline: string;
-    emptyCells: string;
-    enableBackground: string;
-    fill: string;
-    fillOpacity: string;
-    fillRule: string;
-    filter: string;
-    flex: string;
-    flexBasis: string;
-    flexDirection: string;
-    flexFlow: string;
-    flexGrow: string;
-    flexShrink: string;
-    flexWrap: string;
-    floodColor: string;
-    floodOpacity: string;
-    font: string;
-    fontFamily: string;
-    fontFeatureSettings: string;
-    fontSize: string;
-    fontSizeAdjust: string;
-    fontStretch: string;
-    fontStyle: string;
-    fontVariant: string;
-    fontWeight: string;
-    glyphOrientationHorizontal: string;
-    glyphOrientationVertical: string;
-    height: string;
-    imeMode: string;
-    justifyContent: string;
-    kerning: string;
-    left: string;
-    length: number;
-    letterSpacing: string;
-    lightingColor: string;
-    lineHeight: string;
-    listStyle: string;
-    listStyleImage: string;
-    listStylePosition: string;
-    listStyleType: string;
-    margin: string;
-    marginBottom: string;
-    marginLeft: string;
-    marginRight: string;
-    marginTop: string;
-    marker: string;
-    markerEnd: string;
-    markerMid: string;
-    markerStart: string;
-    mask: string;
-    maxHeight: string;
-    maxWidth: string;
-    minHeight: string;
-    minWidth: string;
-    msContentZoomChaining: string;
-    msContentZoomLimit: string;
-    msContentZoomLimitMax: any;
-    msContentZoomLimitMin: any;
-    msContentZoomSnap: string;
-    msContentZoomSnapPoints: string;
-    msContentZoomSnapType: string;
-    msContentZooming: string;
-    msFlowFrom: string;
-    msFlowInto: string;
-    msFontFeatureSettings: string;
-    msGridColumn: any;
-    msGridColumnAlign: string;
-    msGridColumnSpan: any;
-    msGridColumns: string;
-    msGridRow: any;
-    msGridRowAlign: string;
-    msGridRowSpan: any;
-    msGridRows: string;
-    msHighContrastAdjust: string;
-    msHyphenateLimitChars: string;
-    msHyphenateLimitLines: any;
-    msHyphenateLimitZone: any;
-    msHyphens: string;
-    msImeAlign: string;
-    msOverflowStyle: string;
-    msScrollChaining: string;
-    msScrollLimit: string;
-    msScrollLimitXMax: any;
-    msScrollLimitXMin: any;
-    msScrollLimitYMax: any;
-    msScrollLimitYMin: any;
-    msScrollRails: string;
-    msScrollSnapPointsX: string;
-    msScrollSnapPointsY: string;
-    msScrollSnapType: string;
-    msScrollSnapX: string;
-    msScrollSnapY: string;
-    msScrollTranslation: string;
-    msTextCombineHorizontal: string;
-    msTextSizeAdjust: any;
-    msTouchAction: string;
-    msTouchSelect: string;
-    msUserSelect: string;
-    msWrapFlow: string;
-    msWrapMargin: any;
-    msWrapThrough: string;
-    opacity: string;
-    order: string;
-    orphans: string;
-    outline: string;
-    outlineColor: string;
-    outlineStyle: string;
-    outlineWidth: string;
-    overflow: string;
-    overflowX: string;
-    overflowY: string;
-    padding: string;
-    paddingBottom: string;
-    paddingLeft: string;
-    paddingRight: string;
-    paddingTop: string;
-    pageBreakAfter: string;
-    pageBreakBefore: string;
-    pageBreakInside: string;
-    parentRule: CSSRule;
-    perspective: string;
-    perspectiveOrigin: string;
-    pointerEvents: string;
-    position: string;
-    quotes: string;
-    right: string;
-    rubyAlign: string;
-    rubyOverhang: string;
-    rubyPosition: string;
-    stopColor: string;
-    stopOpacity: string;
-    stroke: string;
-    strokeDasharray: string;
-    strokeDashoffset: string;
-    strokeLinecap: string;
-    strokeLinejoin: string;
-    strokeMiterlimit: string;
-    strokeOpacity: string;
-    strokeWidth: string;
-    tableLayout: string;
-    textAlign: string;
-    textAlignLast: string;
-    textAnchor: string;
-    textDecoration: string;
-    textFillColor: string;
-    textIndent: string;
-    textJustify: string;
-    textKashida: string;
-    textKashidaSpace: string;
-    textOverflow: string;
-    textShadow: string;
-    textTransform: string;
-    textUnderlinePosition: string;
-    top: string;
-    touchAction: string;
-    transform: string;
-    transformOrigin: string;
-    transformStyle: string;
-    transition: string;
-    transitionDelay: string;
-    transitionDuration: string;
-    transitionProperty: string;
-    transitionTimingFunction: string;
-    unicodeBidi: string;
-    verticalAlign: string;
-    visibility: string;
-    webkitAlignContent: string;
-    webkitAlignItems: string;
-    webkitAlignSelf: string;
-    webkitAnimation: string;
-    webkitAnimationDelay: string;
-    webkitAnimationDirection: string;
-    webkitAnimationDuration: string;
-    webkitAnimationFillMode: string;
-    webkitAnimationIterationCount: string;
-    webkitAnimationName: string;
-    webkitAnimationPlayState: string;
-    webkitAnimationTimingFunction: string;
-    webkitAppearance: string;
-    webkitBackfaceVisibility: string;
-    webkitBackground: string;
-    webkitBackgroundAttachment: string;
-    webkitBackgroundClip: string;
-    webkitBackgroundColor: string;
-    webkitBackgroundImage: string;
-    webkitBackgroundOrigin: string;
-    webkitBackgroundPosition: string;
-    webkitBackgroundPositionX: string;
-    webkitBackgroundPositionY: string;
-    webkitBackgroundRepeat: string;
-    webkitBackgroundSize: string;
-    webkitBorderBottomLeftRadius: string;
-    webkitBorderBottomRightRadius: string;
-    webkitBorderImage: string;
-    webkitBorderImageOutset: string;
-    webkitBorderImageRepeat: string;
-    webkitBorderImageSlice: string;
-    webkitBorderImageSource: string;
-    webkitBorderImageWidth: string;
-    webkitBorderRadius: string;
-    webkitBorderTopLeftRadius: string;
-    webkitBorderTopRightRadius: string;
-    webkitBoxAlign: string;
-    webkitBoxDirection: string;
-    webkitBoxFlex: string;
-    webkitBoxOrdinalGroup: string;
-    webkitBoxOrient: string;
-    webkitBoxPack: string;
-    webkitBoxSizing: string;
-    webkitColumnBreakAfter: string;
-    webkitColumnBreakBefore: string;
-    webkitColumnBreakInside: string;
-    webkitColumnCount: any;
-    webkitColumnGap: any;
-    webkitColumnRule: string;
-    webkitColumnRuleColor: any;
-    webkitColumnRuleStyle: string;
-    webkitColumnRuleWidth: any;
-    webkitColumnSpan: string;
-    webkitColumnWidth: any;
-    webkitColumns: string;
-    webkitFilter: string;
-    webkitFlex: string;
-    webkitFlexBasis: string;
-    webkitFlexDirection: string;
-    webkitFlexFlow: string;
-    webkitFlexGrow: string;
-    webkitFlexShrink: string;
-    webkitFlexWrap: string;
-    webkitJustifyContent: string;
-    webkitOrder: string;
-    webkitPerspective: string;
-    webkitPerspectiveOrigin: string;
-    webkitTapHighlightColor: string;
-    webkitTextFillColor: string;
-    webkitTextSizeAdjust: any;
-    webkitTransform: string;
-    webkitTransformOrigin: string;
-    webkitTransformStyle: string;
-    webkitTransition: string;
-    webkitTransitionDelay: string;
-    webkitTransitionDuration: string;
-    webkitTransitionProperty: string;
-    webkitTransitionTimingFunction: string;
-    webkitUserSelect: string;
-    webkitWritingMode: string;
-    whiteSpace: string;
-    widows: string;
-    width: string;
-    wordBreak: string;
-    wordSpacing: string;
-    wordWrap: string;
-    writingMode: string;
-    zIndex: string;
-    zoom: string;
-    getPropertyPriority(propertyName: string): string;
-    getPropertyValue(propertyName: string): string;
-    item(index: number): string;
-    removeProperty(propertyName: string): string;
-    setProperty(propertyName: string, value: string, priority?: string): void;
-    [index: number]: string;
-}
-
-declare var CSSStyleDeclaration: {
-    prototype: CSSStyleDeclaration;
-    new(): CSSStyleDeclaration;
-}
-
-interface CSSStyleRule extends CSSRule {
-    readOnly: boolean;
-    selectorText: string;
-    style: CSSStyleDeclaration;
-}
-
-declare var CSSStyleRule: {
-    prototype: CSSStyleRule;
-    new(): CSSStyleRule;
-}
-
-interface CSSStyleSheet extends StyleSheet {
-    cssRules: CSSRuleList;
-    cssText: string;
-    href: string;
-    id: string;
-    imports: StyleSheetList;
-    isAlternate: boolean;
-    isPrefAlternate: boolean;
-    ownerRule: CSSRule;
-    owningElement: Element;
-    pages: StyleSheetPageList;
-    readOnly: boolean;
-    rules: CSSRuleList;
-    addImport(bstrURL: string, lIndex?: number): number;
-    addPageRule(bstrSelector: string, bstrStyle: string, lIndex?: number): number;
-    addRule(bstrSelector: string, bstrStyle?: string, lIndex?: number): number;
-    deleteRule(index?: number): void;
-    insertRule(rule: string, index?: number): number;
-    removeImport(lIndex: number): void;
-    removeRule(lIndex: number): void;
-}
-
-declare var CSSStyleSheet: {
-    prototype: CSSStyleSheet;
-    new(): CSSStyleSheet;
-}
-
-interface CSSSupportsRule extends CSSConditionRule {
-}
-
-declare var CSSSupportsRule: {
-    prototype: CSSSupportsRule;
-    new(): CSSSupportsRule;
-}
-
-interface CanvasGradient {
-    addColorStop(offset: number, color: string): void;
-}
-
-declare var CanvasGradient: {
-    prototype: CanvasGradient;
-    new(): CanvasGradient;
-}
-
-interface CanvasPattern {
-}
-
-declare var CanvasPattern: {
-    prototype: CanvasPattern;
-    new(): CanvasPattern;
-}
-
-interface CanvasRenderingContext2D {
-    canvas: HTMLCanvasElement;
-    fillStyle: string | CanvasGradient | CanvasPattern;
-    font: string;
-    globalAlpha: number;
-    globalCompositeOperation: string;
-    lineCap: string;
-    lineDashOffset: number;
-    lineJoin: string;
-    lineWidth: number;
-    miterLimit: number;
-    msFillRule: string;
-    msImageSmoothingEnabled: boolean;
-    shadowBlur: number;
-    shadowColor: string;
-    shadowOffsetX: number;
-    shadowOffsetY: number;
-    strokeStyle: string | CanvasGradient | CanvasPattern;
-    textAlign: string;
-    textBaseline: string;
-    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
-    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
-    beginPath(): void;
-    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
-    clearRect(x: number, y: number, w: number, h: number): void;
-    clip(fillRule?: string): void;
-    closePath(): void;
-    createImageData(imageDataOrSw: number | ImageData, sh?: number): ImageData;
-    createLinearGradient(x0: number, y0: number, x1: number, y1: number): CanvasGradient;
-    createPattern(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, repetition: string): CanvasPattern;
-    createRadialGradient(x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): CanvasGradient;
-    drawImage(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, offsetX: number, offsetY: number, width?: number, height?: number, canvasOffsetX?: number, canvasOffsetY?: number, canvasImageWidth?: number, canvasImageHeight?: number): void;
-    fill(fillRule?: string): void;
-    fillRect(x: number, y: number, w: number, h: number): void;
-    fillText(text: string, x: number, y: number, maxWidth?: number): void;
-    getImageData(sx: number, sy: number, sw: number, sh: number): ImageData;
-    getLineDash(): number[];
-    isPointInPath(x: number, y: number, fillRule?: string): boolean;
-    lineTo(x: number, y: number): void;
-    measureText(text: string): TextMetrics;
-    moveTo(x: number, y: number): void;
-    putImageData(imagedata: ImageData, dx: number, dy: number, dirtyX?: number, dirtyY?: number, dirtyWidth?: number, dirtyHeight?: number): void;
-    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
-    rect(x: number, y: number, w: number, h: number): void;
-    restore(): void;
-    rotate(angle: number): void;
-    save(): void;
-    scale(x: number, y: number): void;
-    setLineDash(segments: number[]): void;
-    setTransform(m11: number, m12: number, m21: number, m22: number, dx: number, dy: number): void;
-    stroke(): void;
-    strokeRect(x: number, y: number, w: number, h: number): void;
-    strokeText(text: string, x: number, y: number, maxWidth?: number): void;
-    transform(m11: number, m12: number, m21: number, m22: number, dx: number, dy: number): void;
-    translate(x: number, y: number): void;
-}
-
-declare var CanvasRenderingContext2D: {
-    prototype: CanvasRenderingContext2D;
-    new(): CanvasRenderingContext2D;
-}
-
-interface ChannelMergerNode extends AudioNode {
-}
-
-declare var ChannelMergerNode: {
-    prototype: ChannelMergerNode;
-    new(): ChannelMergerNode;
-}
-
-interface ChannelSplitterNode extends AudioNode {
-}
-
-declare var ChannelSplitterNode: {
-    prototype: ChannelSplitterNode;
-    new(): ChannelSplitterNode;
-}
-
-interface CharacterData extends Node, ChildNode {
-    data: string;
-    length: number;
-    appendData(arg: string): void;
-    deleteData(offset: number, count: number): void;
-    insertData(offset: number, arg: string): void;
-    replaceData(offset: number, count: number, arg: string): void;
-    substringData(offset: number, count: number): string;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var CharacterData: {
-    prototype: CharacterData;
-    new(): CharacterData;
-}
-
-interface ClientRect {
-    bottom: number;
-    height: number;
-    left: number;
-    right: number;
-    top: number;
-    width: number;
-}
-
-declare var ClientRect: {
-    prototype: ClientRect;
-    new(): ClientRect;
-}
-
-interface ClientRectList {
-    length: number;
-    item(index: number): ClientRect;
-    [index: number]: ClientRect;
-}
-
-declare var ClientRectList: {
-    prototype: ClientRectList;
-    new(): ClientRectList;
-}
-
-interface ClipboardEvent extends Event {
-    clipboardData: DataTransfer;
-}
-
-declare var ClipboardEvent: {
-    prototype: ClipboardEvent;
-    new(type: string, eventInitDict?: ClipboardEventInit): ClipboardEvent;
-}
-
-interface CloseEvent extends Event {
-    code: number;
-    reason: string;
-    wasClean: boolean;
-    initCloseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, wasCleanArg: boolean, codeArg: number, reasonArg: string): void;
-}
-
-declare var CloseEvent: {
-    prototype: CloseEvent;
-    new(): CloseEvent;
-}
-
-interface CommandEvent extends Event {
-    commandName: string;
-    detail: string;
-}
-
-declare var CommandEvent: {
-    prototype: CommandEvent;
-    new(type: string, eventInitDict?: CommandEventInit): CommandEvent;
-}
-
-interface Comment extends CharacterData {
-    text: string;
-}
-
-declare var Comment: {
-    prototype: Comment;
-    new(): Comment;
-}
-
-interface CompositionEvent extends UIEvent {
-    data: string;
-    locale: string;
-    initCompositionEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, dataArg: string, locale: string): void;
-}
-
-declare var CompositionEvent: {
-    prototype: CompositionEvent;
-    new(typeArg: string, eventInitDict?: CompositionEventInit): CompositionEvent;
-}
-
-interface Console {
-    assert(test?: boolean, message?: string, ...optionalParams: any[]): void;
-    clear(): void;
-    count(countTitle?: string): void;
-    debug(message?: string, ...optionalParams: any[]): void;
-    dir(value?: any, ...optionalParams: any[]): void;
-    dirxml(value: any): void;
-    error(message?: any, ...optionalParams: any[]): void;
-    group(groupTitle?: string): void;
-    groupCollapsed(groupTitle?: string): void;
-    groupEnd(): void;
-    info(message?: any, ...optionalParams: any[]): void;
-    log(message?: any, ...optionalParams: any[]): void;
-    msIsIndependentlyComposed(element: Element): boolean;
-    profile(reportName?: string): void;
-    profileEnd(): void;
-    select(element: Element): void;
-    time(timerName?: string): void;
-    timeEnd(timerName?: string): void;
-    trace(): void;
-    warn(message?: any, ...optionalParams: any[]): void;
-}
-
-declare var Console: {
-    prototype: Console;
-    new(): Console;
-}
-
-interface ConvolverNode extends AudioNode {
-    buffer: AudioBuffer;
-    normalize: boolean;
-}
-
-declare var ConvolverNode: {
-    prototype: ConvolverNode;
-    new(): ConvolverNode;
-}
-
-interface Coordinates {
-    accuracy: number;
-    altitude: number;
-    altitudeAccuracy: number;
-    heading: number;
-    latitude: number;
-    longitude: number;
-    speed: number;
-}
-
-declare var Coordinates: {
-    prototype: Coordinates;
-    new(): Coordinates;
-}
-
-interface Crypto extends Object, RandomSource {
-    subtle: SubtleCrypto;
-}
-
-declare var Crypto: {
-    prototype: Crypto;
-    new(): Crypto;
-}
-
-interface CryptoKey {
-    algorithm: KeyAlgorithm;
-    extractable: boolean;
-    type: string;
-    usages: string[];
-}
-
-declare var CryptoKey: {
-    prototype: CryptoKey;
-    new(): CryptoKey;
-}
-
-interface CryptoKeyPair {
-    privateKey: CryptoKey;
-    publicKey: CryptoKey;
-}
-
-declare var CryptoKeyPair: {
-    prototype: CryptoKeyPair;
-    new(): CryptoKeyPair;
-}
-
-interface CustomEvent extends Event {
-    detail: any;
-    initCustomEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, detailArg: any): void;
-}
-
-declare var CustomEvent: {
-    prototype: CustomEvent;
-    new(typeArg: string, eventInitDict?: CustomEventInit): CustomEvent;
-}
-
-interface DOMError {
-    name: string;
-    toString(): string;
-}
-
-declare var DOMError: {
-    prototype: DOMError;
-    new(): DOMError;
-}
-
-interface DOMException {
-    code: number;
-    message: string;
-    name: string;
-    toString(): string;
-    ABORT_ERR: number;
-    DATA_CLONE_ERR: number;
-    DOMSTRING_SIZE_ERR: number;
-    HIERARCHY_REQUEST_ERR: number;
-    INDEX_SIZE_ERR: number;
-    INUSE_ATTRIBUTE_ERR: number;
-    INVALID_ACCESS_ERR: number;
-    INVALID_CHARACTER_ERR: number;
-    INVALID_MODIFICATION_ERR: number;
-    INVALID_NODE_TYPE_ERR: number;
-    INVALID_STATE_ERR: number;
-    NAMESPACE_ERR: number;
-    NETWORK_ERR: number;
-    NOT_FOUND_ERR: number;
-    NOT_SUPPORTED_ERR: number;
-    NO_DATA_ALLOWED_ERR: number;
-    NO_MODIFICATION_ALLOWED_ERR: number;
-    PARSE_ERR: number;
-    QUOTA_EXCEEDED_ERR: number;
-    SECURITY_ERR: number;
-    SERIALIZE_ERR: number;
-    SYNTAX_ERR: number;
-    TIMEOUT_ERR: number;
-    TYPE_MISMATCH_ERR: number;
-    URL_MISMATCH_ERR: number;
-    VALIDATION_ERR: number;
-    WRONG_DOCUMENT_ERR: number;
-}
-
-declare var DOMException: {
-    prototype: DOMException;
-    new(): DOMException;
-    ABORT_ERR: number;
-    DATA_CLONE_ERR: number;
-    DOMSTRING_SIZE_ERR: number;
-    HIERARCHY_REQUEST_ERR: number;
-    INDEX_SIZE_ERR: number;
-    INUSE_ATTRIBUTE_ERR: number;
-    INVALID_ACCESS_ERR: number;
-    INVALID_CHARACTER_ERR: number;
-    INVALID_MODIFICATION_ERR: number;
-    INVALID_NODE_TYPE_ERR: number;
-    INVALID_STATE_ERR: number;
-    NAMESPACE_ERR: number;
-    NETWORK_ERR: number;
-    NOT_FOUND_ERR: number;
-    NOT_SUPPORTED_ERR: number;
-    NO_DATA_ALLOWED_ERR: number;
-    NO_MODIFICATION_ALLOWED_ERR: number;
-    PARSE_ERR: number;
-    QUOTA_EXCEEDED_ERR: number;
-    SECURITY_ERR: number;
-    SERIALIZE_ERR: number;
-    SYNTAX_ERR: number;
-    TIMEOUT_ERR: number;
-    TYPE_MISMATCH_ERR: number;
-    URL_MISMATCH_ERR: number;
-    VALIDATION_ERR: number;
-    WRONG_DOCUMENT_ERR: number;
-}
-
-interface DOMImplementation {
-    createDocument(namespaceURI: string, qualifiedName: string, doctype: DocumentType): Document;
-    createDocumentType(qualifiedName: string, publicId: string, systemId: string): DocumentType;
-    createHTMLDocument(title: string): Document;
-    hasFeature(feature: string, version: string): boolean;
-}
-
-declare var DOMImplementation: {
-    prototype: DOMImplementation;
-    new(): DOMImplementation;
-}
-
-interface DOMParser {
-    parseFromString(source: string, mimeType: string): Document;
-}
-
-declare var DOMParser: {
-    prototype: DOMParser;
-    new(): DOMParser;
-}
-
-interface DOMSettableTokenList extends DOMTokenList {
-    value: string;
-}
-
-declare var DOMSettableTokenList: {
-    prototype: DOMSettableTokenList;
-    new(): DOMSettableTokenList;
-}
-
-interface DOMStringList {
-    length: number;
-    contains(str: string): boolean;
-    item(index: number): string;
-    [index: number]: string;
-}
-
-declare var DOMStringList: {
-    prototype: DOMStringList;
-    new(): DOMStringList;
-}
-
-interface DOMStringMap {
-    [name: string]: string;
-}
-
-declare var DOMStringMap: {
-    prototype: DOMStringMap;
-    new(): DOMStringMap;
-}
-
-interface DOMTokenList {
-    length: number;
-    add(...token: string[]): void;
-    contains(token: string): boolean;
-    item(index: number): string;
-    remove(...token: string[]): void;
-    toString(): string;
-    toggle(token: string, force?: boolean): boolean;
-    [index: number]: string;
-}
-
-declare var DOMTokenList: {
-    prototype: DOMTokenList;
-    new(): DOMTokenList;
-}
-
-interface DataCue extends TextTrackCue {
-    data: ArrayBuffer;
-}
-
-declare var DataCue: {
-    prototype: DataCue;
-    new(): DataCue;
-}
-
-interface DataTransfer {
-    dropEffect: string;
-    effectAllowed: string;
-    files: FileList;
-    items: DataTransferItemList;
-    types: DOMStringList;
-    clearData(format?: string): boolean;
-    getData(format: string): string;
-    setData(format: string, data: string): boolean;
-}
-
-declare var DataTransfer: {
-    prototype: DataTransfer;
-    new(): DataTransfer;
-}
-
-interface DataTransferItem {
-    kind: string;
-    type: string;
-    getAsFile(): File;
-    getAsString(_callback: FunctionStringCallback): void;
-}
-
-declare var DataTransferItem: {
-    prototype: DataTransferItem;
-    new(): DataTransferItem;
-}
-
-interface DataTransferItemList {
-    length: number;
-    add(data: File): DataTransferItem;
-    clear(): void;
-    item(index: number): File;
-    remove(index: number): void;
-    [index: number]: File;
-}
-
-declare var DataTransferItemList: {
-    prototype: DataTransferItemList;
-    new(): DataTransferItemList;
-}
-
-interface DeferredPermissionRequest {
-    id: number;
-    type: string;
-    uri: string;
-    allow(): void;
-    deny(): void;
-}
-
-declare var DeferredPermissionRequest: {
-    prototype: DeferredPermissionRequest;
-    new(): DeferredPermissionRequest;
-}
-
-interface DelayNode extends AudioNode {
-    delayTime: AudioParam;
-}
-
-declare var DelayNode: {
-    prototype: DelayNode;
-    new(): DelayNode;
-}
-
-interface DeviceAcceleration {
-    x: number;
-    y: number;
-    z: number;
-}
-
-declare var DeviceAcceleration: {
-    prototype: DeviceAcceleration;
-    new(): DeviceAcceleration;
-}
-
-interface DeviceMotionEvent extends Event {
-    acceleration: DeviceAcceleration;
-    accelerationIncludingGravity: DeviceAcceleration;
-    interval: number;
-    rotationRate: DeviceRotationRate;
-    initDeviceMotionEvent(type: string, bubbles: boolean, cancelable: boolean, acceleration: DeviceAccelerationDict, accelerationIncludingGravity: DeviceAccelerationDict, rotationRate: DeviceRotationRateDict, interval: number): void;
-}
-
-declare var DeviceMotionEvent: {
-    prototype: DeviceMotionEvent;
-    new(): DeviceMotionEvent;
-}
-
-interface DeviceOrientationEvent extends Event {
-    absolute: boolean;
-    alpha: number;
-    beta: number;
-    gamma: number;
-    initDeviceOrientationEvent(type: string, bubbles: boolean, cancelable: boolean, alpha: number, beta: number, gamma: number, absolute: boolean): void;
-}
-
-declare var DeviceOrientationEvent: {
-    prototype: DeviceOrientationEvent;
-    new(): DeviceOrientationEvent;
-}
-
-interface DeviceRotationRate {
-    alpha: number;
-    beta: number;
-    gamma: number;
-}
-
-declare var DeviceRotationRate: {
-    prototype: DeviceRotationRate;
-    new(): DeviceRotationRate;
-}
-
-interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEvent {
-    /**
-      * Sets or gets the URL for the current document.
-      */
-    URL: string;
-    /**
-      * Gets the URL for the document, stripped of any character encoding.
-      */
-    URLUnencoded: string;
-    /**
-      * Gets the object that has the focus when the parent document has focus.
-      */
-    activeElement: Element;
-    /**
-      * Sets or gets the color of all active links in the document.
-      */
-    alinkColor: string;
-    /**
-      * Returns a reference to the collection of elements contained by the object.
-      */
-    all: HTMLCollection;
-    /**
-      * Retrieves a collection of all a objects that have a name and/or id property. Objects in this collection are in HTML source order.
-      */
-    anchors: HTMLCollection;
-    /**
-      * Retrieves a collection of all applet objects in the document.
-      */
-    applets: HTMLCollection;
-    /**
-      * Deprecated. Sets or retrieves a value that indicates the background color behind the object.
-      */
-    bgColor: string;
-    /**
-      * Specifies the beginning and end of the document body.
-      */
-    body: HTMLElement;
-    characterSet: string;
-    /**
-      * Gets or sets the character set used to encode the object.
-      */
-    charset: string;
-    /**
-      * Gets a value that indicates whether standards-compliant mode is switched on for the object.
-      */
-    compatMode: string;
-    cookie: string;
-    /**
-      * Gets the default character set from the current regional language settings.
-      */
-    defaultCharset: string;
-    defaultView: Window;
-    /**
-      * Sets or gets a value that indicates whether the document can be edited.
-      */
-    designMode: string;
-    /**
-      * Sets or retrieves a value that indicates the reading order of the object.
-      */
-    dir: string;
-    /**
-      * Gets an object representing the document type declaration associated with the current document.
-      */
-    doctype: DocumentType;
-    /**
-      * Gets a reference to the root node of the document.
-      */
-    documentElement: HTMLElement;
-    /**
-      * Sets or gets the security domain of the document.
-      */
-    domain: string;
-    /**
-      * Retrieves a collection of all embed objects in the document.
-      */
-    embeds: HTMLCollection;
-    /**
-      * Sets or gets the foreground (text) color of the document.
-      */
-    fgColor: string;
-    /**
-      * Retrieves a collection, in source order, of all form objects in the document.
-      */
-    forms: HTMLCollection;
-    fullscreenElement: Element;
-    fullscreenEnabled: boolean;
-    head: HTMLHeadElement;
-    hidden: boolean;
-    /**
-      * Retrieves a collection, in source order, of img objects in the document.
-      */
-    images: HTMLCollection;
-    /**
-      * Gets the implementation object of the current document.
-      */
-    implementation: DOMImplementation;
-    /**
-      * Returns the character encoding used to create the webpage that is loaded into the document object.
-      */
-    inputEncoding: string;
-    /**
-      * Gets the date that the page was last modified, if the page supplies one.
-      */
-    lastModified: string;
-    /**
-      * Sets or gets the color of the document links.
-      */
-    linkColor: string;
-    /**
-      * Retrieves a collection of all a objects that specify the href property and all area objects in the document.
-      */
-    links: HTMLCollection;
-    /**
-      * Contains information about the current URL.
-      */
-    location: Location;
-    media: string;
-    msCSSOMElementFloatMetrics: boolean;
-    msCapsLockWarningOff: boolean;
-    msHidden: boolean;
-    msVisibilityState: string;
-    /**
-      * Fires when the user aborts the download.
-      * @param ev The event.
-      */
-    onabort: (ev: Event) => any;
-    /**
-      * Fires when the object is set as the active element.
-      * @param ev The event.
-      */
-    onactivate: (ev: UIEvent) => any;
-    /**
-      * Fires immediately before the object is set as the active element.
-      * @param ev The event.
-      */
-    onbeforeactivate: (ev: UIEvent) => any;
-    /**
-      * Fires immediately before the activeElement is changed from the current object to another object in the parent document.
-      * @param ev The event.
-      */
-    onbeforedeactivate: (ev: UIEvent) => any;
-    /**
-      * Fires when the object loses the input focus.
-      * @param ev The focus event.
-      */
-    onblur: (ev: FocusEvent) => any;
-    /**
-      * Occurs when playback is possible, but would require further buffering.
-      * @param ev The event.
-      */
-    oncanplay: (ev: Event) => any;
-    oncanplaythrough: (ev: Event) => any;
-    /**
-      * Fires when the contents of the object or selection have changed.
-      * @param ev The event.
-      */
-    onchange: (ev: Event) => any;
-    /**
-      * Fires when the user clicks the left mouse button on the object
-      * @param ev The mouse event.
-      */
-    onclick: (ev: MouseEvent) => any;
-    /**
-      * Fires when the user clicks the right mouse button in the client area, opening the context menu.
-      * @param ev The mouse event.
-      */
-    oncontextmenu: (ev: PointerEvent) => any;
-    /**
-      * Fires when the user double-clicks the object.
-      * @param ev The mouse event.
-      */
-    ondblclick: (ev: MouseEvent) => any;
-    /**
-      * Fires when the activeElement is changed from the current object to another object in the parent document.
-      * @param ev The UI Event
-      */
-    ondeactivate: (ev: UIEvent) => any;
-    /**
-      * Fires on the source object continuously during a drag operation.
-      * @param ev The event.
-      */
-    ondrag: (ev: DragEvent) => any;
-    /**
-      * Fires on the source object when the user releases the mouse at the close of a drag operation.
-      * @param ev The event.
-      */
-    ondragend: (ev: DragEvent) => any;
-    /**
-      * Fires on the target element when the user drags the object to a valid drop target.
-      * @param ev The drag event.
-      */
-    ondragenter: (ev: DragEvent) => any;
-    /**
-      * Fires on the target object when the user moves the mouse out of a valid drop target during a drag operation.
-      * @param ev The drag event.
-      */
-    ondragleave: (ev: DragEvent) => any;
-    /**
-      * Fires on the target element continuously while the user drags the object over a valid drop target.
-      * @param ev The event.
-      */
-    ondragover: (ev: DragEvent) => any;
-    /**
-      * Fires on the source object when the user starts to drag a text selection or selected object.
-      * @param ev The event.
-      */
-    ondragstart: (ev: DragEvent) => any;
-    ondrop: (ev: DragEvent) => any;
-    /**
-      * Occurs when the duration attribute is updated.
-      * @param ev The event.
-      */
-    ondurationchange: (ev: Event) => any;
-    /**
-      * Occurs when the media element is reset to its initial state.
-      * @param ev The event.
-      */
-    onemptied: (ev: Event) => any;
-    /**
-      * Occurs when the end of playback is reached.
-      * @param ev The event
-      */
-    onended: (ev: Event) => any;
-    /**
-      * Fires when an error occurs during object loading.
-      * @param ev The event.
-      */
-    onerror: (ev: Event) => any;
-    /**
-      * Fires when the object receives focus.
-      * @param ev The event.
-      */
-    onfocus: (ev: FocusEvent) => any;
-    onfullscreenchange: (ev: Event) => any;
-    onfullscreenerror: (ev: Event) => any;
-    oninput: (ev: Event) => any;
-    /**
-      * Fires when the user presses a key.
-      * @param ev The keyboard event
-      */
-    onkeydown: (ev: KeyboardEvent) => any;
-    /**
-      * Fires when the user presses an alphanumeric key.
-      * @param ev The event.
-      */
-    onkeypress: (ev: KeyboardEvent) => any;
-    /**
-      * Fires when the user releases a key.
-      * @param ev The keyboard event
-      */
-    onkeyup: (ev: KeyboardEvent) => any;
-    /**
-      * Fires immediately after the browser loads the object.
-      * @param ev The event.
-      */
-    onload: (ev: Event) => any;
-    /**
-      * Occurs when media data is loaded at the current playback position.
-      * @param ev The event.
-      */
-    onloadeddata: (ev: Event) => any;
-    /**
-      * Occurs when the duration and dimensions of the media have been determined.
-      * @param ev The event.
-      */
-    onloadedmetadata: (ev: Event) => any;
-    /**
-      * Occurs when Internet Explorer begins looking for media data.
-      * @param ev The event.
-      */
-    onloadstart: (ev: Event) => any;
-    /**
-      * Fires when the user clicks the object with either mouse button.
-      * @param ev The mouse event.
-      */
-    onmousedown: (ev: MouseEvent) => any;
-    /**
-      * Fires when the user moves the mouse over the object.
-      * @param ev The mouse event.
-      */
-    onmousemove: (ev: MouseEvent) => any;
-    /**
-      * Fires when the user moves the mouse pointer outside the boundaries of the object.
-      * @param ev The mouse event.
-      */
-    onmouseout: (ev: MouseEvent) => any;
-    /**
-      * Fires when the user moves the mouse pointer into the object.
-      * @param ev The mouse event.
-      */
-    onmouseover: (ev: MouseEvent) => any;
-    /**
-      * Fires when the user releases a mouse button while the mouse is over the object.
-      * @param ev The mouse event.
-      */
-    onmouseup: (ev: MouseEvent) => any;
-    /**
-      * Fires when the wheel button is rotated.
-      * @param ev The mouse event
-      */
-    onmousewheel: (ev: MouseWheelEvent) => any;
-    onmscontentzoom: (ev: UIEvent) => any;
-    onmsgesturechange: (ev: MSGestureEvent) => any;
-    onmsgesturedoubletap: (ev: MSGestureEvent) => any;
-    onmsgestureend: (ev: MSGestureEvent) => any;
-    onmsgesturehold: (ev: MSGestureEvent) => any;
-    onmsgesturestart: (ev: MSGestureEvent) => any;
-    onmsgesturetap: (ev: MSGestureEvent) => any;
-    onmsinertiastart: (ev: MSGestureEvent) => any;
-    onmsmanipulationstatechanged: (ev: MSManipulationEvent) => any;
-    onmspointercancel: (ev: MSPointerEvent) => any;
-    onmspointerdown: (ev: MSPointerEvent) => any;
-    onmspointerenter: (ev: MSPointerEvent) => any;
-    onmspointerleave: (ev: MSPointerEvent) => any;
-    onmspointermove: (ev: MSPointerEvent) => any;
-    onmspointerout: (ev: MSPointerEvent) => any;
-    onmspointerover: (ev: MSPointerEvent) => any;
-    onmspointerup: (ev: MSPointerEvent) => any;
-    /**
-      * Occurs when an item is removed from a Jump List of a webpage running in Site Mode.
-      * @param ev The event.
-      */
-    onmssitemodejumplistitemremoved: (ev: MSSiteModeEvent) => any;
-    /**
-      * Occurs when a user clicks a button in a Thumbnail Toolbar of a webpage running in Site Mode.
-      * @param ev The event.
-      */
-    onmsthumbnailclick: (ev: MSSiteModeEvent) => any;
-    /**
-      * Occurs when playback is paused.
-      * @param ev The event.
-      */
-    onpause: (ev: Event) => any;
-    /**
-      * Occurs when the play method is requested.
-      * @param ev The event.
-      */
-    onplay: (ev: Event) => any;
-    /**
-      * Occurs when the audio or video has started playing.
-      * @param ev The event.
-      */
-    onplaying: (ev: Event) => any;
-    onpointerlockchange: (ev: Event) => any;
-    onpointerlockerror: (ev: Event) => any;
-    /**
-      * Occurs to indicate progress while downloading media data.
-      * @param ev The event.
-      */
-    onprogress: (ev: ProgressEvent) => any;
-    /**
-      * Occurs when the playback rate is increased or decreased.
-      * @param ev The event.
-      */
-    onratechange: (ev: Event) => any;
-    /**
-      * Fires when the state of the object has changed.
-      * @param ev The event
-      */
-    onreadystatechange: (ev: ProgressEvent) => any;
-    /**
-      * Fires when the user resets a form.
-      * @param ev The event.
-      */
-    onreset: (ev: Event) => any;
-    /**
-      * Fires when the user repositions the scroll box in the scroll bar on the object.
-      * @param ev The event.
-      */
-    onscroll: (ev: UIEvent) => any;
-    /**
-      * Occurs when the seek operation ends.
-      * @param ev The event.
-      */
-    onseeked: (ev: Event) => any;
-    /**
-      * Occurs when the current playback position is moved.
-      * @param ev The event.
-      */
-    onseeking: (ev: Event) => any;
-    /**
-      * Fires when the current selection changes.
-      * @param ev The event.
-      */
-    onselect: (ev: UIEvent) => any;
-    onselectstart: (ev: Event) => any;
-    /**
-      * Occurs when the download has stopped.
-      * @param ev The event.
-      */
-    onstalled: (ev: Event) => any;
-    /**
-      * Fires when the user clicks the Stop button or leaves the Web page.
-      * @param ev The event.
-      */
-    onstop: (ev: Event) => any;
-    onsubmit: (ev: Event) => any;
-    /**
-      * Occurs if the load operation has been intentionally halted.
-      * @param ev The event.
-      */
-    onsuspend: (ev: Event) => any;
-    /**
-      * Occurs to indicate the current playback position.
-      * @param ev The event.
-      */
-    ontimeupdate: (ev: Event) => any;
-    ontouchcancel: (ev: TouchEvent) => any;
-    ontouchend: (ev: TouchEvent) => any;
-    ontouchmove: (ev: TouchEvent) => any;
-    ontouchstart: (ev: TouchEvent) => any;
-    /**
-      * Occurs when the volume is changed, or playback is muted or unmuted.
-      * @param ev The event.
-      */
-    onvolumechange: (ev: Event) => any;
-    /**
-      * Occurs when playback stops because the next frame of a video resource is not available.
-      * @param ev The event.
-      */
-    onwaiting: (ev: Event) => any;
-    onwebkitfullscreenchange: (ev: Event) => any;
-    onwebkitfullscreenerror: (ev: Event) => any;
-    plugins: HTMLCollection;
-    pointerLockElement: Element;
-    /**
-      * Retrieves a value that indicates the current state of the object.
-      */
-    readyState: string;
-    /**
-      * Gets the URL of the location that referred the user to the current page.
-      */
-    referrer: string;
-    /**
-      * Gets the root svg element in the document hierarchy.
-      */
-    rootElement: SVGSVGElement;
-    /**
-      * Retrieves a collection of all script objects in the document.
-      */
-    scripts: HTMLCollection;
-    security: string;
-    /**
-      * Retrieves a collection of styleSheet objects representing the style sheets that correspond to each instance of a link or style object in the document.
-      */
-    styleSheets: StyleSheetList;
-    /**
-      * Contains the title of the document.
-      */
-    title: string;
-    visibilityState: string;
-    /**
-      * Sets or gets the color of the links that the user has visited.
-      */
-    vlinkColor: string;
-    webkitCurrentFullScreenElement: Element;
-    webkitFullscreenElement: Element;
-    webkitFullscreenEnabled: boolean;
-    webkitIsFullScreen: boolean;
-    xmlEncoding: string;
-    xmlStandalone: boolean;
-    /**
-      * Gets or sets the version attribute specified in the declaration of an XML document.
-      */
-    xmlVersion: string;
-    adoptNode(source: Node): Node;
-    captureEvents(): void;
-    clear(): void;
-    /**
-      * Closes an output stream and forces the sent data to display.
-      */
-    close(): void;
-    /**
-      * Creates an attribute object with a specified name.
-      * @param name String that sets the attribute object's name.
-      */
-    createAttribute(name: string): Attr;
-    createAttributeNS(namespaceURI: string, qualifiedName: string): Attr;
-    createCDATASection(data: string): CDATASection;
-    /**
-      * Creates a comment object with the specified data.
-      * @param data Sets the comment object's data.
-      */
-    createComment(data: string): Comment;
-    /**
-      * Creates a new document.
-      */
-    createDocumentFragment(): DocumentFragment;
-    /**
-      * Creates an instance of the element for the specified tag.
-      * @param tagName The name of an element.
-      */
-    createElement(tagName: "a"): HTMLAnchorElement;
-    createElement(tagName: "abbr"): HTMLPhraseElement;
-    createElement(tagName: "acronym"): HTMLPhraseElement;
-    createElement(tagName: "address"): HTMLBlockElement;
-    createElement(tagName: "applet"): HTMLAppletElement;
-    createElement(tagName: "area"): HTMLAreaElement;
-    createElement(tagName: "audio"): HTMLAudioElement;
-    createElement(tagName: "b"): HTMLPhraseElement;
-    createElement(tagName: "base"): HTMLBaseElement;
-    createElement(tagName: "basefont"): HTMLBaseFontElement;
-    createElement(tagName: "bdo"): HTMLPhraseElement;
-    createElement(tagName: "big"): HTMLPhraseElement;
-    createElement(tagName: "blockquote"): HTMLBlockElement;
-    createElement(tagName: "body"): HTMLBodyElement;
-    createElement(tagName: "br"): HTMLBRElement;
-    createElement(tagName: "button"): HTMLButtonElement;
-    createElement(tagName: "canvas"): HTMLCanvasElement;
-    createElement(tagName: "caption"): HTMLTableCaptionElement;
-    createElement(tagName: "center"): HTMLBlockElement;
-    createElement(tagName: "cite"): HTMLPhraseElement;
-    createElement(tagName: "code"): HTMLPhraseElement;
-    createElement(tagName: "col"): HTMLTableColElement;
-    createElement(tagName: "colgroup"): HTMLTableColElement;
-    createElement(tagName: "datalist"): HTMLDataListElement;
-    createElement(tagName: "dd"): HTMLDDElement;
-    createElement(tagName: "del"): HTMLModElement;
-    createElement(tagName: "dfn"): HTMLPhraseElement;
-    createElement(tagName: "dir"): HTMLDirectoryElement;
-    createElement(tagName: "div"): HTMLDivElement;
-    createElement(tagName: "dl"): HTMLDListElement;
-    createElement(tagName: "dt"): HTMLDTElement;
-    createElement(tagName: "em"): HTMLPhraseElement;
-    createElement(tagName: "embed"): HTMLEmbedElement;
-    createElement(tagName: "fieldset"): HTMLFieldSetElement;
-    createElement(tagName: "font"): HTMLFontElement;
-    createElement(tagName: "form"): HTMLFormElement;
-    createElement(tagName: "frame"): HTMLFrameElement;
-    createElement(tagName: "frameset"): HTMLFrameSetElement;
-    createElement(tagName: "h1"): HTMLHeadingElement;
-    createElement(tagName: "h2"): HTMLHeadingElement;
-    createElement(tagName: "h3"): HTMLHeadingElement;
-    createElement(tagName: "h4"): HTMLHeadingElement;
-    createElement(tagName: "h5"): HTMLHeadingElement;
-    createElement(tagName: "h6"): HTMLHeadingElement;
-    createElement(tagName: "head"): HTMLHeadElement;
-    createElement(tagName: "hr"): HTMLHRElement;
-    createElement(tagName: "html"): HTMLHtmlElement;
-    createElement(tagName: "i"): HTMLPhraseElement;
-    createElement(tagName: "iframe"): HTMLIFrameElement;
-    createElement(tagName: "img"): HTMLImageElement;
-    createElement(tagName: "input"): HTMLInputElement;
-    createElement(tagName: "ins"): HTMLModElement;
-    createElement(tagName: "isindex"): HTMLIsIndexElement;
-    createElement(tagName: "kbd"): HTMLPhraseElement;
-    createElement(tagName: "keygen"): HTMLBlockElement;
-    createElement(tagName: "label"): HTMLLabelElement;
-    createElement(tagName: "legend"): HTMLLegendElement;
-    createElement(tagName: "li"): HTMLLIElement;
-    createElement(tagName: "link"): HTMLLinkElement;
-    createElement(tagName: "listing"): HTMLBlockElement;
-    createElement(tagName: "map"): HTMLMapElement;
-    createElement(tagName: "marquee"): HTMLMarqueeElement;
-    createElement(tagName: "menu"): HTMLMenuElement;
-    createElement(tagName: "meta"): HTMLMetaElement;
-    createElement(tagName: "nextid"): HTMLNextIdElement;
-    createElement(tagName: "nobr"): HTMLPhraseElement;
-    createElement(tagName: "object"): HTMLObjectElement;
-    createElement(tagName: "ol"): HTMLOListElement;
-    createElement(tagName: "optgroup"): HTMLOptGroupElement;
-    createElement(tagName: "option"): HTMLOptionElement;
-    createElement(tagName: "p"): HTMLParagraphElement;
-    createElement(tagName: "param"): HTMLParamElement;
-    createElement(tagName: "plaintext"): HTMLBlockElement;
-    createElement(tagName: "pre"): HTMLPreElement;
-    createElement(tagName: "progress"): HTMLProgressElement;
-    createElement(tagName: "q"): HTMLQuoteElement;
-    createElement(tagName: "rt"): HTMLPhraseElement;
-    createElement(tagName: "ruby"): HTMLPhraseElement;
-    createElement(tagName: "s"): HTMLPhraseElement;
-    createElement(tagName: "samp"): HTMLPhraseElement;
-    createElement(tagName: "script"): HTMLScriptElement;
-    createElement(tagName: "select"): HTMLSelectElement;
-    createElement(tagName: "small"): HTMLPhraseElement;
-    createElement(tagName: "source"): HTMLSourceElement;
-    createElement(tagName: "span"): HTMLSpanElement;
-    createElement(tagName: "strike"): HTMLPhraseElement;
-    createElement(tagName: "strong"): HTMLPhraseElement;
-    createElement(tagName: "style"): HTMLStyleElement;
-    createElement(tagName: "sub"): HTMLPhraseElement;
-    createElement(tagName: "sup"): HTMLPhraseElement;
-    createElement(tagName: "table"): HTMLTableElement;
-    createElement(tagName: "tbody"): HTMLTableSectionElement;
-    createElement(tagName: "td"): HTMLTableDataCellElement;
-    createElement(tagName: "textarea"): HTMLTextAreaElement;
-    createElement(tagName: "tfoot"): HTMLTableSectionElement;
-    createElement(tagName: "th"): HTMLTableHeaderCellElement;
-    createElement(tagName: "thead"): HTMLTableSectionElement;
-    createElement(tagName: "title"): HTMLTitleElement;
-    createElement(tagName: "tr"): HTMLTableRowElement;
-    createElement(tagName: "track"): HTMLTrackElement;
-    createElement(tagName: "tt"): HTMLPhraseElement;
-    createElement(tagName: "u"): HTMLPhraseElement;
-    createElement(tagName: "ul"): HTMLUListElement;
-    createElement(tagName: "var"): HTMLPhraseElement;
-    createElement(tagName: "video"): HTMLVideoElement;
-    createElement(tagName: "x-ms-webview"): MSHTMLWebViewElement;
-    createElement(tagName: "xmp"): HTMLBlockElement;
-    createElement(tagName: string): HTMLElement;
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "a"): SVGAElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "circle"): SVGCircleElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "clipPath"): SVGClipPathElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "componentTransferFunction"): SVGComponentTransferFunctionElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "defs"): SVGDefsElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "desc"): SVGDescElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "ellipse"): SVGEllipseElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feBlend"): SVGFEBlendElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feColorMatrix"): SVGFEColorMatrixElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feComponentTransfer"): SVGFEComponentTransferElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feComposite"): SVGFECompositeElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feConvolveMatrix"): SVGFEConvolveMatrixElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDiffuseLighting"): SVGFEDiffuseLightingElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDisplacementMap"): SVGFEDisplacementMapElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDistantLight"): SVGFEDistantLightElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFlood"): SVGFEFloodElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncA"): SVGFEFuncAElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncB"): SVGFEFuncBElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncG"): SVGFEFuncGElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncR"): SVGFEFuncRElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feGaussianBlur"): SVGFEGaussianBlurElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feImage"): SVGFEImageElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMerge"): SVGFEMergeElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMergeNode"): SVGFEMergeNodeElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMorphology"): SVGFEMorphologyElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feOffset"): SVGFEOffsetElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "fePointLight"): SVGFEPointLightElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feSpecularLighting"): SVGFESpecularLightingElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feSpotLight"): SVGFESpotLightElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feTile"): SVGFETileElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feTurbulence"): SVGFETurbulenceElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "filter"): SVGFilterElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "foreignObject"): SVGForeignObjectElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "g"): SVGGElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "image"): SVGImageElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "gradient"): SVGGradientElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "line"): SVGLineElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "linearGradient"): SVGLinearGradientElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "marker"): SVGMarkerElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "mask"): SVGMaskElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "path"): SVGPathElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "metadata"): SVGMetadataElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "pattern"): SVGPatternElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "polygon"): SVGPolygonElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "polyline"): SVGPolylineElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "radialGradient"): SVGRadialGradientElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "rect"): SVGRectElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "svg"): SVGSVGElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "script"): SVGScriptElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "stop"): SVGStopElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "style"): SVGStyleElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "switch"): SVGSwitchElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "symbol"): SVGSymbolElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "tspan"): SVGTSpanElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textContent"): SVGTextContentElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "text"): SVGTextElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textPath"): SVGTextPathElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textPositioning"): SVGTextPositioningElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "title"): SVGTitleElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "use"): SVGUseElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "view"): SVGViewElement
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: string): SVGElement
-    createElementNS(namespaceURI: string, qualifiedName: string): Element;
-    createExpression(expression: string, resolver: XPathNSResolver): XPathExpression;
-    createNSResolver(nodeResolver: Node): XPathNSResolver;
-    /**
-      * Creates a NodeIterator object that you can use to traverse filtered lists of nodes or elements in a document.
-      * @param root The root element or node to start traversing on.
-      * @param whatToShow The type of nodes or elements to appear in the node list
-      * @param filter A custom NodeFilter function to use. For more information, see filter. Use null for no filter.
-      * @param entityReferenceExpansion A flag that specifies whether entity reference nodes are expanded.
-      */
-    createNodeIterator(root: Node, whatToShow?: number, filter?: NodeFilter, entityReferenceExpansion?: boolean): NodeIterator;
-    createProcessingInstruction(target: string, data: string): ProcessingInstruction;
-    /**
-      *  Returns an empty range object that has both of its boundary points positioned at the beginning of the document.
-      */
-    createRange(): Range;
-    /**
-      * Creates a text string from the specified value.
-      * @param data String that specifies the nodeValue property of the text node.
-      */
-    createTextNode(data: string): Text;
-    createTouch(view: any, target: EventTarget, identifier: number, pageX: number, pageY: number, screenX: number, screenY: number): Touch;
-    createTouchList(...touches: Touch[]): TouchList;
-    /**
-      * Creates a TreeWalker object that you can use to traverse filtered lists of nodes or elements in a document.
-      * @param root The root element or node to start traversing on.
-      * @param whatToShow The type of nodes or elements to appear in the node list. For more information, see whatToShow.
-      * @param filter A custom NodeFilter function to use.
-      * @param entityReferenceExpansion A flag that specifies whether entity reference nodes are expanded.
-      */
-    createTreeWalker(root: Node, whatToShow?: number, filter?: NodeFilter, entityReferenceExpansion?: boolean): TreeWalker;
-    /**
-      * Returns the element for the specified x coordinate and the specified y coordinate.
-      * @param x The x-offset
-      * @param y The y-offset
-      */
-    elementFromPoint(x: number, y: number): Element;
-    evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver, type: number, result: XPathResult): XPathResult;
-    /**
-      * Executes a command on the current document, current selection, or the given range.
-      * @param commandId String that specifies the command to execute. This command can be any of the command identifiers that can be executed in script.
-      * @param showUI Display the user interface, defaults to false.
-      * @param value Value to assign.
-      */
-    execCommand(commandId: string, showUI?: boolean, value?: any): boolean;
-    /**
-      * Displays help information for the given command identifier.
-      * @param commandId Displays help information for the given command identifier.
-      */
-    execCommandShowHelp(commandId: string): boolean;
-    exitFullscreen(): void;
-    exitPointerLock(): void;
-    /**
-      * Causes the element to receive the focus and executes the code specified by the onfocus event.
-      */
-    focus(): void;
-    /**
-      * Returns a reference to the first object with the specified value of the ID or NAME attribute.
-      * @param elementId String that specifies the ID value. Case-insensitive.
-      */
-    getElementById(elementId: string): HTMLElement;
-    getElementsByClassName(classNames: string): NodeListOf<Element>;
-    /**
-      * Gets a collection of objects based on the value of the NAME or ID attribute.
-      * @param elementName Gets a collection of objects based on the value of the NAME or ID attribute.
-      */
-    getElementsByName(elementName: string): NodeListOf<Element>;
-    /**
-      * Retrieves a collection of objects based on the specified element name.
-      * @param name Specifies the name of an element.
-      */
-    getElementsByTagName(tagname: "a"): NodeListOf<HTMLAnchorElement>;
-    getElementsByTagName(tagname: "abbr"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "acronym"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "address"): NodeListOf<HTMLBlockElement>;
-    getElementsByTagName(tagname: "applet"): NodeListOf<HTMLAppletElement>;
-    getElementsByTagName(tagname: "area"): NodeListOf<HTMLAreaElement>;
-    getElementsByTagName(tagname: "article"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "aside"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "audio"): NodeListOf<HTMLAudioElement>;
-    getElementsByTagName(tagname: "b"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "base"): NodeListOf<HTMLBaseElement>;
-    getElementsByTagName(tagname: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    getElementsByTagName(tagname: "bdo"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "big"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "blockquote"): NodeListOf<HTMLBlockElement>;
-    getElementsByTagName(tagname: "body"): NodeListOf<HTMLBodyElement>;
-    getElementsByTagName(tagname: "br"): NodeListOf<HTMLBRElement>;
-    getElementsByTagName(tagname: "button"): NodeListOf<HTMLButtonElement>;
-    getElementsByTagName(tagname: "canvas"): NodeListOf<HTMLCanvasElement>;
-    getElementsByTagName(tagname: "caption"): NodeListOf<HTMLTableCaptionElement>;
-    getElementsByTagName(tagname: "center"): NodeListOf<HTMLBlockElement>;
-    getElementsByTagName(tagname: "circle"): NodeListOf<SVGCircleElement>;
-    getElementsByTagName(tagname: "cite"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "clippath"): NodeListOf<SVGClipPathElement>;
-    getElementsByTagName(tagname: "code"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "col"): NodeListOf<HTMLTableColElement>;
-    getElementsByTagName(tagname: "colgroup"): NodeListOf<HTMLTableColElement>;
-    getElementsByTagName(tagname: "datalist"): NodeListOf<HTMLDataListElement>;
-    getElementsByTagName(tagname: "dd"): NodeListOf<HTMLDDElement>;
-    getElementsByTagName(tagname: "defs"): NodeListOf<SVGDefsElement>;
-    getElementsByTagName(tagname: "del"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(tagname: "desc"): NodeListOf<SVGDescElement>;
-    getElementsByTagName(tagname: "dfn"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "dir"): NodeListOf<HTMLDirectoryElement>;
-    getElementsByTagName(tagname: "div"): NodeListOf<HTMLDivElement>;
-    getElementsByTagName(tagname: "dl"): NodeListOf<HTMLDListElement>;
-    getElementsByTagName(tagname: "dt"): NodeListOf<HTMLDTElement>;
-    getElementsByTagName(tagname: "ellipse"): NodeListOf<SVGEllipseElement>;
-    getElementsByTagName(tagname: "em"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "embed"): NodeListOf<HTMLEmbedElement>;
-    getElementsByTagName(tagname: "feblend"): NodeListOf<SVGFEBlendElement>;
-    getElementsByTagName(tagname: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
-    getElementsByTagName(tagname: "fecomponenttransfer"): NodeListOf<SVGFEComponentTransferElement>;
-    getElementsByTagName(tagname: "fecomposite"): NodeListOf<SVGFECompositeElement>;
-    getElementsByTagName(tagname: "feconvolvematrix"): NodeListOf<SVGFEConvolveMatrixElement>;
-    getElementsByTagName(tagname: "fediffuselighting"): NodeListOf<SVGFEDiffuseLightingElement>;
-    getElementsByTagName(tagname: "fedisplacementmap"): NodeListOf<SVGFEDisplacementMapElement>;
-    getElementsByTagName(tagname: "fedistantlight"): NodeListOf<SVGFEDistantLightElement>;
-    getElementsByTagName(tagname: "feflood"): NodeListOf<SVGFEFloodElement>;
-    getElementsByTagName(tagname: "fefunca"): NodeListOf<SVGFEFuncAElement>;
-    getElementsByTagName(tagname: "fefuncb"): NodeListOf<SVGFEFuncBElement>;
-    getElementsByTagName(tagname: "fefuncg"): NodeListOf<SVGFEFuncGElement>;
-    getElementsByTagName(tagname: "fefuncr"): NodeListOf<SVGFEFuncRElement>;
-    getElementsByTagName(tagname: "fegaussianblur"): NodeListOf<SVGFEGaussianBlurElement>;
-    getElementsByTagName(tagname: "feimage"): NodeListOf<SVGFEImageElement>;
-    getElementsByTagName(tagname: "femerge"): NodeListOf<SVGFEMergeElement>;
-    getElementsByTagName(tagname: "femergenode"): NodeListOf<SVGFEMergeNodeElement>;
-    getElementsByTagName(tagname: "femorphology"): NodeListOf<SVGFEMorphologyElement>;
-    getElementsByTagName(tagname: "feoffset"): NodeListOf<SVGFEOffsetElement>;
-    getElementsByTagName(tagname: "fepointlight"): NodeListOf<SVGFEPointLightElement>;
-    getElementsByTagName(tagname: "fespecularlighting"): NodeListOf<SVGFESpecularLightingElement>;
-    getElementsByTagName(tagname: "fespotlight"): NodeListOf<SVGFESpotLightElement>;
-    getElementsByTagName(tagname: "fetile"): NodeListOf<SVGFETileElement>;
-    getElementsByTagName(tagname: "feturbulence"): NodeListOf<SVGFETurbulenceElement>;
-    getElementsByTagName(tagname: "fieldset"): NodeListOf<HTMLFieldSetElement>;
-    getElementsByTagName(tagname: "figcaption"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "figure"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "filter"): NodeListOf<SVGFilterElement>;
-    getElementsByTagName(tagname: "font"): NodeListOf<HTMLFontElement>;
-    getElementsByTagName(tagname: "footer"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "foreignobject"): NodeListOf<SVGForeignObjectElement>;
-    getElementsByTagName(tagname: "form"): NodeListOf<HTMLFormElement>;
-    getElementsByTagName(tagname: "frame"): NodeListOf<HTMLFrameElement>;
-    getElementsByTagName(tagname: "frameset"): NodeListOf<HTMLFrameSetElement>;
-    getElementsByTagName(tagname: "g"): NodeListOf<SVGGElement>;
-    getElementsByTagName(tagname: "h1"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "h2"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "h3"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "h4"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "h5"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "h6"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "head"): NodeListOf<HTMLHeadElement>;
-    getElementsByTagName(tagname: "header"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "hgroup"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "hr"): NodeListOf<HTMLHRElement>;
-    getElementsByTagName(tagname: "html"): NodeListOf<HTMLHtmlElement>;
-    getElementsByTagName(tagname: "i"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "iframe"): NodeListOf<HTMLIFrameElement>;
-    getElementsByTagName(tagname: "image"): NodeListOf<SVGImageElement>;
-    getElementsByTagName(tagname: "img"): NodeListOf<HTMLImageElement>;
-    getElementsByTagName(tagname: "input"): NodeListOf<HTMLInputElement>;
-    getElementsByTagName(tagname: "ins"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(tagname: "isindex"): NodeListOf<HTMLIsIndexElement>;
-    getElementsByTagName(tagname: "kbd"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "keygen"): NodeListOf<HTMLBlockElement>;
-    getElementsByTagName(tagname: "label"): NodeListOf<HTMLLabelElement>;
-    getElementsByTagName(tagname: "legend"): NodeListOf<HTMLLegendElement>;
-    getElementsByTagName(tagname: "li"): NodeListOf<HTMLLIElement>;
-    getElementsByTagName(tagname: "line"): NodeListOf<SVGLineElement>;
-    getElementsByTagName(tagname: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
-    getElementsByTagName(tagname: "link"): NodeListOf<HTMLLinkElement>;
-    getElementsByTagName(tagname: "listing"): NodeListOf<HTMLBlockElement>;
-    getElementsByTagName(tagname: "map"): NodeListOf<HTMLMapElement>;
-    getElementsByTagName(tagname: "mark"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "marker"): NodeListOf<SVGMarkerElement>;
-    getElementsByTagName(tagname: "marquee"): NodeListOf<HTMLMarqueeElement>;
-    getElementsByTagName(tagname: "mask"): NodeListOf<SVGMaskElement>;
-    getElementsByTagName(tagname: "menu"): NodeListOf<HTMLMenuElement>;
-    getElementsByTagName(tagname: "meta"): NodeListOf<HTMLMetaElement>;
-    getElementsByTagName(tagname: "metadata"): NodeListOf<SVGMetadataElement>;
-    getElementsByTagName(tagname: "nav"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "nextid"): NodeListOf<HTMLNextIdElement>;
-    getElementsByTagName(tagname: "nobr"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "noframes"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "noscript"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "object"): NodeListOf<HTMLObjectElement>;
-    getElementsByTagName(tagname: "ol"): NodeListOf<HTMLOListElement>;
-    getElementsByTagName(tagname: "optgroup"): NodeListOf<HTMLOptGroupElement>;
-    getElementsByTagName(tagname: "option"): NodeListOf<HTMLOptionElement>;
-    getElementsByTagName(tagname: "p"): NodeListOf<HTMLParagraphElement>;
-    getElementsByTagName(tagname: "param"): NodeListOf<HTMLParamElement>;
-    getElementsByTagName(tagname: "path"): NodeListOf<SVGPathElement>;
-    getElementsByTagName(tagname: "pattern"): NodeListOf<SVGPatternElement>;
-    getElementsByTagName(tagname: "plaintext"): NodeListOf<HTMLBlockElement>;
-    getElementsByTagName(tagname: "polygon"): NodeListOf<SVGPolygonElement>;
-    getElementsByTagName(tagname: "polyline"): NodeListOf<SVGPolylineElement>;
-    getElementsByTagName(tagname: "pre"): NodeListOf<HTMLPreElement>;
-    getElementsByTagName(tagname: "progress"): NodeListOf<HTMLProgressElement>;
-    getElementsByTagName(tagname: "q"): NodeListOf<HTMLQuoteElement>;
-    getElementsByTagName(tagname: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
-    getElementsByTagName(tagname: "rect"): NodeListOf<SVGRectElement>;
-    getElementsByTagName(tagname: "rt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "ruby"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "s"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "samp"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "script"): NodeListOf<HTMLScriptElement>;
-    getElementsByTagName(tagname: "section"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "select"): NodeListOf<HTMLSelectElement>;
-    getElementsByTagName(tagname: "small"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "source"): NodeListOf<HTMLSourceElement>;
-    getElementsByTagName(tagname: "span"): NodeListOf<HTMLSpanElement>;
-    getElementsByTagName(tagname: "stop"): NodeListOf<SVGStopElement>;
-    getElementsByTagName(tagname: "strike"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "strong"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "style"): NodeListOf<HTMLStyleElement>;
-    getElementsByTagName(tagname: "sub"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "sup"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "svg"): NodeListOf<SVGSVGElement>;
-    getElementsByTagName(tagname: "switch"): NodeListOf<SVGSwitchElement>;
-    getElementsByTagName(tagname: "symbol"): NodeListOf<SVGSymbolElement>;
-    getElementsByTagName(tagname: "table"): NodeListOf<HTMLTableElement>;
-    getElementsByTagName(tagname: "tbody"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(tagname: "td"): NodeListOf<HTMLTableDataCellElement>;
-    getElementsByTagName(tagname: "text"): NodeListOf<SVGTextElement>;
-    getElementsByTagName(tagname: "textpath"): NodeListOf<SVGTextPathElement>;
-    getElementsByTagName(tagname: "textarea"): NodeListOf<HTMLTextAreaElement>;
-    getElementsByTagName(tagname: "tfoot"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(tagname: "th"): NodeListOf<HTMLTableHeaderCellElement>;
-    getElementsByTagName(tagname: "thead"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(tagname: "title"): NodeListOf<HTMLTitleElement>;
-    getElementsByTagName(tagname: "tr"): NodeListOf<HTMLTableRowElement>;
-    getElementsByTagName(tagname: "track"): NodeListOf<HTMLTrackElement>;
-    getElementsByTagName(tagname: "tspan"): NodeListOf<SVGTSpanElement>;
-    getElementsByTagName(tagname: "tt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "u"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "ul"): NodeListOf<HTMLUListElement>;
-    getElementsByTagName(tagname: "use"): NodeListOf<SVGUseElement>;
-    getElementsByTagName(tagname: "var"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "video"): NodeListOf<HTMLVideoElement>;
-    getElementsByTagName(tagname: "view"): NodeListOf<SVGViewElement>;
-    getElementsByTagName(tagname: "wbr"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
-    getElementsByTagName(tagname: "xmp"): NodeListOf<HTMLBlockElement>;
-    getElementsByTagName(tagname: string): NodeListOf<Element>;
-    getElementsByTagNameNS(namespaceURI: string, localName: string): NodeListOf<Element>;
-    /**
-      * Returns an object representing the current selection of the document that is loaded into the object displaying a webpage.
-      */
-    getSelection(): Selection;
-    /**
-      * Gets a value indicating whether the object currently has focus.
-      */
-    hasFocus(): boolean;
-    importNode(importedNode: Node, deep: boolean): Node;
-    msElementsFromPoint(x: number, y: number): NodeList;
-    msElementsFromRect(left: number, top: number, width: number, height: number): NodeList;
-    /**
-      * Opens a new window and loads a document specified by a given URL. Also, opens a new window that uses the url parameter and the name parameter to collect the output of the write method and the writeln method.
-      * @param url Specifies a MIME type for the document.
-      * @param name Specifies the name of the window. This name is used as the value for the TARGET attribute on a form or an anchor element.
-      * @param features Contains a list of items separated by commas. Each item consists of an option and a value, separated by an equals sign (for example, "fullscreen=yes, toolbar=yes"). The following values are supported.
-      * @param replace Specifies whether the existing entry for the document is replaced in the history list.
-      */
-    open(url?: string, name?: string, features?: string, replace?: boolean): Document;
-    /**
-      * Returns a Boolean value that indicates whether a specified command can be successfully executed using execCommand, given the current state of the document.
-      * @param commandId Specifies a command identifier.
-      */
-    queryCommandEnabled(commandId: string): boolean;
-    /**
-      * Returns a Boolean value that indicates whether the specified command is in the indeterminate state.
-      * @param commandId String that specifies a command identifier.
-      */
-    queryCommandIndeterm(commandId: string): boolean;
-    /**
-      * Returns a Boolean value that indicates the current state of the command.
-      * @param commandId String that specifies a command identifier.
-      */
-    queryCommandState(commandId: string): boolean;
-    /**
-      * Returns a Boolean value that indicates whether the current command is supported on the current range.
-      * @param commandId Specifies a command identifier.
-      */
-    queryCommandSupported(commandId: string): boolean;
-    /**
-      * Retrieves the string associated with a command.
-      * @param commandId String that contains the identifier of a command. This can be any command identifier given in the list of Command Identifiers.
-      */
-    queryCommandText(commandId: string): string;
-    /**
-      * Returns the current value of the document, range, or current selection for the given command.
-      * @param commandId String that specifies a command identifier.
-      */
-    queryCommandValue(commandId: string): string;
-    releaseEvents(): void;
-    /**
-      * Allows updating the print settings for the page.
-      */
-    updateSettings(): void;
-    webkitCancelFullScreen(): void;
-    webkitExitFullscreen(): void;
-    /**
-      * Writes one or more HTML expressions to a document in the specified window.
-      * @param content Specifies the text and HTML tags to write.
-      */
-    write(...content: string[]): void;
-    /**
-      * Writes one or more HTML expressions, followed by a carriage return, to a document in the specified window.
-      * @param content The text and HTML tags to write.
-      */
-    writeln(...content: string[]): void;
-    addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "fullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "fullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mssitemodejumplistitemremoved", listener: (ev: MSSiteModeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "msthumbnailclick", listener: (ev: MSSiteModeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerlockchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerlockerror", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "readystatechange", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stop", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var Document: {
-    prototype: Document;
-    new(): Document;
-}
-
-interface DocumentFragment extends Node, NodeSelector {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var DocumentFragment: {
-    prototype: DocumentFragment;
-    new(): DocumentFragment;
-}
-
-interface DocumentType extends Node, ChildNode {
-    entities: NamedNodeMap;
-    internalSubset: string;
-    name: string;
-    notations: NamedNodeMap;
-    publicId: string;
-    systemId: string;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var DocumentType: {
-    prototype: DocumentType;
-    new(): DocumentType;
-}
-
-interface DragEvent extends MouseEvent {
-    dataTransfer: DataTransfer;
-    initDragEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, dataTransferArg: DataTransfer): void;
-    msConvertURL(file: File, targetType: string, targetURL?: string): void;
-}
-
-declare var DragEvent: {
-    prototype: DragEvent;
-    new(): DragEvent;
-}
-
-interface DynamicsCompressorNode extends AudioNode {
-    attack: AudioParam;
-    knee: AudioParam;
-    ratio: AudioParam;
-    reduction: AudioParam;
-    release: AudioParam;
-    threshold: AudioParam;
-}
-
-declare var DynamicsCompressorNode: {
-    prototype: DynamicsCompressorNode;
-    new(): DynamicsCompressorNode;
-}
-
-interface EXT_texture_filter_anisotropic {
-    MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
-    TEXTURE_MAX_ANISOTROPY_EXT: number;
-}
-
-declare var EXT_texture_filter_anisotropic: {
-    prototype: EXT_texture_filter_anisotropic;
-    new(): EXT_texture_filter_anisotropic;
-    MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
-    TEXTURE_MAX_ANISOTROPY_EXT: number;
-}
-
-interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelector, ChildNode {
-    classList: DOMTokenList;
-    clientHeight: number;
-    clientLeft: number;
-    clientTop: number;
-    clientWidth: number;
-    msContentZoomFactor: number;
-    msRegionOverflow: string;
-    onariarequest: (ev: AriaRequestEvent) => any;
-    oncommand: (ev: CommandEvent) => any;
-    ongotpointercapture: (ev: PointerEvent) => any;
-    onlostpointercapture: (ev: PointerEvent) => any;
-    onmsgesturechange: (ev: MSGestureEvent) => any;
-    onmsgesturedoubletap: (ev: MSGestureEvent) => any;
-    onmsgestureend: (ev: MSGestureEvent) => any;
-    onmsgesturehold: (ev: MSGestureEvent) => any;
-    onmsgesturestart: (ev: MSGestureEvent) => any;
-    onmsgesturetap: (ev: MSGestureEvent) => any;
-    onmsgotpointercapture: (ev: MSPointerEvent) => any;
-    onmsinertiastart: (ev: MSGestureEvent) => any;
-    onmslostpointercapture: (ev: MSPointerEvent) => any;
-    onmspointercancel: (ev: MSPointerEvent) => any;
-    onmspointerdown: (ev: MSPointerEvent) => any;
-    onmspointerenter: (ev: MSPointerEvent) => any;
-    onmspointerleave: (ev: MSPointerEvent) => any;
-    onmspointermove: (ev: MSPointerEvent) => any;
-    onmspointerout: (ev: MSPointerEvent) => any;
-    onmspointerover: (ev: MSPointerEvent) => any;
-    onmspointerup: (ev: MSPointerEvent) => any;
-    ontouchcancel: (ev: TouchEvent) => any;
-    ontouchend: (ev: TouchEvent) => any;
-    ontouchmove: (ev: TouchEvent) => any;
-    ontouchstart: (ev: TouchEvent) => any;
-    onwebkitfullscreenchange: (ev: Event) => any;
-    onwebkitfullscreenerror: (ev: Event) => any;
-    scrollHeight: number;
-    scrollLeft: number;
-    scrollTop: number;
-    scrollWidth: number;
-    tagName: string;
-    id: string;
-    className: string;
-    getAttribute(name?: string): string;
-    getAttributeNS(namespaceURI: string, localName: string): string;
-    getAttributeNode(name: string): Attr;
-    getAttributeNodeNS(namespaceURI: string, localName: string): Attr;
-    getBoundingClientRect(): ClientRect;
-    getClientRects(): ClientRectList;
-    getElementsByTagName(name: "a"): NodeListOf<HTMLAnchorElement>;
-    getElementsByTagName(name: "abbr"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "acronym"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "address"): NodeListOf<HTMLBlockElement>;
-    getElementsByTagName(name: "applet"): NodeListOf<HTMLAppletElement>;
-    getElementsByTagName(name: "area"): NodeListOf<HTMLAreaElement>;
-    getElementsByTagName(name: "article"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "aside"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "audio"): NodeListOf<HTMLAudioElement>;
-    getElementsByTagName(name: "b"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "base"): NodeListOf<HTMLBaseElement>;
-    getElementsByTagName(name: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    getElementsByTagName(name: "bdo"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "big"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "blockquote"): NodeListOf<HTMLBlockElement>;
-    getElementsByTagName(name: "body"): NodeListOf<HTMLBodyElement>;
-    getElementsByTagName(name: "br"): NodeListOf<HTMLBRElement>;
-    getElementsByTagName(name: "button"): NodeListOf<HTMLButtonElement>;
-    getElementsByTagName(name: "canvas"): NodeListOf<HTMLCanvasElement>;
-    getElementsByTagName(name: "caption"): NodeListOf<HTMLTableCaptionElement>;
-    getElementsByTagName(name: "center"): NodeListOf<HTMLBlockElement>;
-    getElementsByTagName(name: "circle"): NodeListOf<SVGCircleElement>;
-    getElementsByTagName(name: "cite"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "clippath"): NodeListOf<SVGClipPathElement>;
-    getElementsByTagName(name: "code"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "col"): NodeListOf<HTMLTableColElement>;
-    getElementsByTagName(name: "colgroup"): NodeListOf<HTMLTableColElement>;
-    getElementsByTagName(name: "datalist"): NodeListOf<HTMLDataListElement>;
-    getElementsByTagName(name: "dd"): NodeListOf<HTMLDDElement>;
-    getElementsByTagName(name: "defs"): NodeListOf<SVGDefsElement>;
-    getElementsByTagName(name: "del"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(name: "desc"): NodeListOf<SVGDescElement>;
-    getElementsByTagName(name: "dfn"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "dir"): NodeListOf<HTMLDirectoryElement>;
-    getElementsByTagName(name: "div"): NodeListOf<HTMLDivElement>;
-    getElementsByTagName(name: "dl"): NodeListOf<HTMLDListElement>;
-    getElementsByTagName(name: "dt"): NodeListOf<HTMLDTElement>;
-    getElementsByTagName(name: "ellipse"): NodeListOf<SVGEllipseElement>;
-    getElementsByTagName(name: "em"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "embed"): NodeListOf<HTMLEmbedElement>;
-    getElementsByTagName(name: "feblend"): NodeListOf<SVGFEBlendElement>;
-    getElementsByTagName(name: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
-    getElementsByTagName(name: "fecomponenttransfer"): NodeListOf<SVGFEComponentTransferElement>;
-    getElementsByTagName(name: "fecomposite"): NodeListOf<SVGFECompositeElement>;
-    getElementsByTagName(name: "feconvolvematrix"): NodeListOf<SVGFEConvolveMatrixElement>;
-    getElementsByTagName(name: "fediffuselighting"): NodeListOf<SVGFEDiffuseLightingElement>;
-    getElementsByTagName(name: "fedisplacementmap"): NodeListOf<SVGFEDisplacementMapElement>;
-    getElementsByTagName(name: "fedistantlight"): NodeListOf<SVGFEDistantLightElement>;
-    getElementsByTagName(name: "feflood"): NodeListOf<SVGFEFloodElement>;
-    getElementsByTagName(name: "fefunca"): NodeListOf<SVGFEFuncAElement>;
-    getElementsByTagName(name: "fefuncb"): NodeListOf<SVGFEFuncBElement>;
-    getElementsByTagName(name: "fefuncg"): NodeListOf<SVGFEFuncGElement>;
-    getElementsByTagName(name: "fefuncr"): NodeListOf<SVGFEFuncRElement>;
-    getElementsByTagName(name: "fegaussianblur"): NodeListOf<SVGFEGaussianBlurElement>;
-    getElementsByTagName(name: "feimage"): NodeListOf<SVGFEImageElement>;
-    getElementsByTagName(name: "femerge"): NodeListOf<SVGFEMergeElement>;
-    getElementsByTagName(name: "femergenode"): NodeListOf<SVGFEMergeNodeElement>;
-    getElementsByTagName(name: "femorphology"): NodeListOf<SVGFEMorphologyElement>;
-    getElementsByTagName(name: "feoffset"): NodeListOf<SVGFEOffsetElement>;
-    getElementsByTagName(name: "fepointlight"): NodeListOf<SVGFEPointLightElement>;
-    getElementsByTagName(name: "fespecularlighting"): NodeListOf<SVGFESpecularLightingElement>;
-    getElementsByTagName(name: "fespotlight"): NodeListOf<SVGFESpotLightElement>;
-    getElementsByTagName(name: "fetile"): NodeListOf<SVGFETileElement>;
-    getElementsByTagName(name: "feturbulence"): NodeListOf<SVGFETurbulenceElement>;
-    getElementsByTagName(name: "fieldset"): NodeListOf<HTMLFieldSetElement>;
-    getElementsByTagName(name: "figcaption"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "figure"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "filter"): NodeListOf<SVGFilterElement>;
-    getElementsByTagName(name: "font"): NodeListOf<HTMLFontElement>;
-    getElementsByTagName(name: "footer"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "foreignobject"): NodeListOf<SVGForeignObjectElement>;
-    getElementsByTagName(name: "form"): NodeListOf<HTMLFormElement>;
-    getElementsByTagName(name: "frame"): NodeListOf<HTMLFrameElement>;
-    getElementsByTagName(name: "frameset"): NodeListOf<HTMLFrameSetElement>;
-    getElementsByTagName(name: "g"): NodeListOf<SVGGElement>;
-    getElementsByTagName(name: "h1"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "h2"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "h3"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "h4"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "h5"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "h6"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "head"): NodeListOf<HTMLHeadElement>;
-    getElementsByTagName(name: "header"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "hgroup"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "hr"): NodeListOf<HTMLHRElement>;
-    getElementsByTagName(name: "html"): NodeListOf<HTMLHtmlElement>;
-    getElementsByTagName(name: "i"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "iframe"): NodeListOf<HTMLIFrameElement>;
-    getElementsByTagName(name: "image"): NodeListOf<SVGImageElement>;
-    getElementsByTagName(name: "img"): NodeListOf<HTMLImageElement>;
-    getElementsByTagName(name: "input"): NodeListOf<HTMLInputElement>;
-    getElementsByTagName(name: "ins"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(name: "isindex"): NodeListOf<HTMLIsIndexElement>;
-    getElementsByTagName(name: "kbd"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "keygen"): NodeListOf<HTMLBlockElement>;
-    getElementsByTagName(name: "label"): NodeListOf<HTMLLabelElement>;
-    getElementsByTagName(name: "legend"): NodeListOf<HTMLLegendElement>;
-    getElementsByTagName(name: "li"): NodeListOf<HTMLLIElement>;
-    getElementsByTagName(name: "line"): NodeListOf<SVGLineElement>;
-    getElementsByTagName(name: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
-    getElementsByTagName(name: "link"): NodeListOf<HTMLLinkElement>;
-    getElementsByTagName(name: "listing"): NodeListOf<HTMLBlockElement>;
-    getElementsByTagName(name: "map"): NodeListOf<HTMLMapElement>;
-    getElementsByTagName(name: "mark"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "marker"): NodeListOf<SVGMarkerElement>;
-    getElementsByTagName(name: "marquee"): NodeListOf<HTMLMarqueeElement>;
-    getElementsByTagName(name: "mask"): NodeListOf<SVGMaskElement>;
-    getElementsByTagName(name: "menu"): NodeListOf<HTMLMenuElement>;
-    getElementsByTagName(name: "meta"): NodeListOf<HTMLMetaElement>;
-    getElementsByTagName(name: "metadata"): NodeListOf<SVGMetadataElement>;
-    getElementsByTagName(name: "nav"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "nextid"): NodeListOf<HTMLNextIdElement>;
-    getElementsByTagName(name: "nobr"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "noframes"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "noscript"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "object"): NodeListOf<HTMLObjectElement>;
-    getElementsByTagName(name: "ol"): NodeListOf<HTMLOListElement>;
-    getElementsByTagName(name: "optgroup"): NodeListOf<HTMLOptGroupElement>;
-    getElementsByTagName(name: "option"): NodeListOf<HTMLOptionElement>;
-    getElementsByTagName(name: "p"): NodeListOf<HTMLParagraphElement>;
-    getElementsByTagName(name: "param"): NodeListOf<HTMLParamElement>;
-    getElementsByTagName(name: "path"): NodeListOf<SVGPathElement>;
-    getElementsByTagName(name: "pattern"): NodeListOf<SVGPatternElement>;
-    getElementsByTagName(name: "plaintext"): NodeListOf<HTMLBlockElement>;
-    getElementsByTagName(name: "polygon"): NodeListOf<SVGPolygonElement>;
-    getElementsByTagName(name: "polyline"): NodeListOf<SVGPolylineElement>;
-    getElementsByTagName(name: "pre"): NodeListOf<HTMLPreElement>;
-    getElementsByTagName(name: "progress"): NodeListOf<HTMLProgressElement>;
-    getElementsByTagName(name: "q"): NodeListOf<HTMLQuoteElement>;
-    getElementsByTagName(name: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
-    getElementsByTagName(name: "rect"): NodeListOf<SVGRectElement>;
-    getElementsByTagName(name: "rt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "ruby"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "s"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "samp"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "script"): NodeListOf<HTMLScriptElement>;
-    getElementsByTagName(name: "section"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "select"): NodeListOf<HTMLSelectElement>;
-    getElementsByTagName(name: "small"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "source"): NodeListOf<HTMLSourceElement>;
-    getElementsByTagName(name: "span"): NodeListOf<HTMLSpanElement>;
-    getElementsByTagName(name: "stop"): NodeListOf<SVGStopElement>;
-    getElementsByTagName(name: "strike"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "strong"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "style"): NodeListOf<HTMLStyleElement>;
-    getElementsByTagName(name: "sub"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "sup"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "svg"): NodeListOf<SVGSVGElement>;
-    getElementsByTagName(name: "switch"): NodeListOf<SVGSwitchElement>;
-    getElementsByTagName(name: "symbol"): NodeListOf<SVGSymbolElement>;
-    getElementsByTagName(name: "table"): NodeListOf<HTMLTableElement>;
-    getElementsByTagName(name: "tbody"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(name: "td"): NodeListOf<HTMLTableDataCellElement>;
-    getElementsByTagName(name: "text"): NodeListOf<SVGTextElement>;
-    getElementsByTagName(name: "textpath"): NodeListOf<SVGTextPathElement>;
-    getElementsByTagName(name: "textarea"): NodeListOf<HTMLTextAreaElement>;
-    getElementsByTagName(name: "tfoot"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(name: "th"): NodeListOf<HTMLTableHeaderCellElement>;
-    getElementsByTagName(name: "thead"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(name: "title"): NodeListOf<HTMLTitleElement>;
-    getElementsByTagName(name: "tr"): NodeListOf<HTMLTableRowElement>;
-    getElementsByTagName(name: "track"): NodeListOf<HTMLTrackElement>;
-    getElementsByTagName(name: "tspan"): NodeListOf<SVGTSpanElement>;
-    getElementsByTagName(name: "tt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "u"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "ul"): NodeListOf<HTMLUListElement>;
-    getElementsByTagName(name: "use"): NodeListOf<SVGUseElement>;
-    getElementsByTagName(name: "var"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "video"): NodeListOf<HTMLVideoElement>;
-    getElementsByTagName(name: "view"): NodeListOf<SVGViewElement>;
-    getElementsByTagName(name: "wbr"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
-    getElementsByTagName(name: "xmp"): NodeListOf<HTMLBlockElement>;
-    getElementsByTagName(name: string): NodeListOf<Element>;
-    getElementsByTagNameNS(namespaceURI: string, localName: string): NodeListOf<Element>;
-    hasAttribute(name: string): boolean;
-    hasAttributeNS(namespaceURI: string, localName: string): boolean;
-    msGetRegionContent(): MSRangeCollection;
-    msGetUntransformedBounds(): ClientRect;
-    msMatchesSelector(selectors: string): boolean;
-    msReleasePointerCapture(pointerId: number): void;
-    msSetPointerCapture(pointerId: number): void;
-    msZoomTo(args: MsZoomToOptions): void;
-    releasePointerCapture(pointerId: number): void;
-    removeAttribute(name?: string): void;
-    removeAttributeNS(namespaceURI: string, localName: string): void;
-    removeAttributeNode(oldAttr: Attr): Attr;
-    requestFullscreen(): void;
-    requestPointerLock(): void;
-    setAttribute(name?: string, value?: string): void;
-    setAttributeNS(namespaceURI: string, qualifiedName: string, value: string): void;
-    setAttributeNode(newAttr: Attr): Attr;
-    setAttributeNodeNS(newAttr: Attr): Attr;
-    setPointerCapture(pointerId: number): void;
-    webkitMatchesSelector(selectors: string): boolean;
-    webkitRequestFullScreen(): void;
-    webkitRequestFullscreen(): void;
-    getElementsByClassName(classNames: string): NodeListOf<Element>;
-    addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var Element: {
-    prototype: Element;
-    new(): Element;
-}
-
-interface ErrorEvent extends Event {
-    colno: number;
-    error: any;
-    filename: string;
-    lineno: number;
-    message: string;
-    initErrorEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, messageArg: string, filenameArg: string, linenoArg: number): void;
-}
-
-declare var ErrorEvent: {
-    prototype: ErrorEvent;
-    new(): ErrorEvent;
-}
-
-interface Event {
-    bubbles: boolean;
-    cancelBubble: boolean;
-    cancelable: boolean;
-    currentTarget: EventTarget;
-    defaultPrevented: boolean;
-    eventPhase: number;
-    isTrusted: boolean;
-    returnValue: boolean;
-    srcElement: Element;
-    target: EventTarget;
-    timeStamp: number;
-    type: string;
-    initEvent(eventTypeArg: string, canBubbleArg: boolean, cancelableArg: boolean): void;
-    preventDefault(): void;
-    stopImmediatePropagation(): void;
-    stopPropagation(): void;
-    AT_TARGET: number;
-    BUBBLING_PHASE: number;
-    CAPTURING_PHASE: number;
-}
-
-declare var Event: {
-    prototype: Event;
-    new(type: string, eventInitDict?: EventInit): Event;
-    AT_TARGET: number;
-    BUBBLING_PHASE: number;
-    CAPTURING_PHASE: number;
-}
-
-interface EventTarget {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-    dispatchEvent(evt: Event): boolean;
-    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var EventTarget: {
-    prototype: EventTarget;
-    new(): EventTarget;
-}
-
-interface External {
-}
-
-declare var External: {
-    prototype: External;
-    new(): External;
-}
-
-interface File extends Blob {
-    lastModifiedDate: any;
-    name: string;
-}
-
-declare var File: {
-    prototype: File;
-    new (parts: (ArrayBuffer | ArrayBufferView | Blob | string)[], filename: string, properties?: FilePropertyBag): File;
-}
-
-interface FileList {
-    length: number;
-    item(index: number): File;
-    [index: number]: File;
-}
-
-declare var FileList: {
-    prototype: FileList;
-    new(): FileList;
-}
-
-interface FileReader extends EventTarget, MSBaseReader {
-    error: DOMError;
-    readAsArrayBuffer(blob: Blob): void;
-    readAsBinaryString(blob: Blob): void;
-    readAsDataURL(blob: Blob): void;
-    readAsText(blob: Blob, encoding?: string): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var FileReader: {
-    prototype: FileReader;
-    new(): FileReader;
-}
-
-interface FocusEvent extends UIEvent {
-    relatedTarget: EventTarget;
-    initFocusEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, relatedTargetArg: EventTarget): void;
-}
-
-declare var FocusEvent: {
-    prototype: FocusEvent;
-    new(typeArg: string, eventInitDict?: FocusEventInit): FocusEvent;
-}
-
-interface FormData {
-    append(name: any, value: any, blobName?: string): void;
-}
-
-declare var FormData: {
-    prototype: FormData;
-    new (form?: HTMLFormElement): FormData;
-}
-
-interface GainNode extends AudioNode {
-    gain: AudioParam;
-}
-
-declare var GainNode: {
-    prototype: GainNode;
-    new(): GainNode;
-}
-
-interface Gamepad {
-    axes: number[];
-    buttons: GamepadButton[];
-    connected: boolean;
-    id: string;
-    index: number;
-    mapping: string;
-    timestamp: number;
-}
-
-declare var Gamepad: {
-    prototype: Gamepad;
-    new(): Gamepad;
-}
-
-interface GamepadButton {
-    pressed: boolean;
-    value: number;
-}
-
-declare var GamepadButton: {
-    prototype: GamepadButton;
-    new(): GamepadButton;
-}
-
-interface GamepadEvent extends Event {
-    gamepad: Gamepad;
-}
-
-declare var GamepadEvent: {
-    prototype: GamepadEvent;
-    new(): GamepadEvent;
-}
-
-interface Geolocation {
-    clearWatch(watchId: number): void;
-    getCurrentPosition(successCallback: PositionCallback, errorCallback?: PositionErrorCallback, options?: PositionOptions): void;
-    watchPosition(successCallback: PositionCallback, errorCallback?: PositionErrorCallback, options?: PositionOptions): number;
-}
-
-declare var Geolocation: {
-    prototype: Geolocation;
-    new(): Geolocation;
-}
-
-interface HTMLAllCollection extends HTMLCollection {
-    namedItem(name: string): Element;
-}
-
-declare var HTMLAllCollection: {
-    prototype: HTMLAllCollection;
-    new(): HTMLAllCollection;
-}
-
-interface HTMLAnchorElement extends HTMLElement {
-    Methods: string;
-    /**
-      * Sets or retrieves the character set used to encode the object.
-      */
-    charset: string;
-    /**
-      * Sets or retrieves the coordinates of the object.
-      */
-    coords: string;
-    /**
-      * Contains the anchor portion of the URL including the hash sign (#).
-      */
-    hash: string;
-    /**
-      * Contains the hostname and port values of the URL.
-      */
-    host: string;
-    /**
-      * Contains the hostname of a URL.
-      */
-    hostname: string;
-    /**
-      * Sets or retrieves a destination URL or an anchor point.
-      */
-    href: string;
-    /**
-      * Sets or retrieves the language code of the object.
-      */
-    hreflang: string;
-    mimeType: string;
-    /**
-      * Sets or retrieves the shape of the object.
-      */
-    name: string;
-    nameProp: string;
-    /**
-      * Contains the pathname of the URL.
-      */
-    pathname: string;
-    /**
-      * Sets or retrieves the port number associated with a URL.
-      */
-    port: string;
-    /**
-      * Contains the protocol of the URL.
-      */
-    protocol: string;
-    protocolLong: string;
-    /**
-      * Sets or retrieves the relationship between the object and the destination of the link.
-      */
-    rel: string;
-    /**
-      * Sets or retrieves the relationship between the object and the destination of the link.
-      */
-    rev: string;
-    /**
-      * Sets or retrieves the substring of the href property that follows the question mark.
-      */
-    search: string;
-    /**
-      * Sets or retrieves the shape of the object.
-      */
-    shape: string;
-    /**
-      * Sets or retrieves the window or frame at which to target content.
-      */
-    target: string;
-    /**
-      * Retrieves or sets the text of the object as a string.
-      */
-    text: string;
-    type: string;
-    urn: string;
-    /**
-      * Returns a string representation of an object.
-      */
-    toString(): string;
-}
-
-declare var HTMLAnchorElement: {
-    prototype: HTMLAnchorElement;
-    new(): HTMLAnchorElement;
-}
-
-interface HTMLAppletElement extends HTMLElement {
-    /**
-      * Retrieves a string of the URL where the object tag can be found. This is often the href of the document that the object is in, or the value set by a base element.
-      */
-    BaseHref: string;
-    align: string;
-    /**
-      * Sets or retrieves a text alternative to the graphic.
-      */
-    alt: string;
-    /**
-      * Gets or sets the optional alternative HTML script to execute if the object fails to load.
-      */
-    altHtml: string;
-    /**
-      * Sets or retrieves a character string that can be used to implement your own archive functionality for the object.
-      */
-    archive: string;
-    border: string;
-    code: string;
-    /**
-      * Sets or retrieves the URL of the component.
-      */
-    codeBase: string;
-    /**
-      * Sets or retrieves the Internet media type for the code associated with the object.
-      */
-    codeType: string;
-    /**
-      * Address of a pointer to the document this page or frame contains. If there is no document, then null will be returned.
-      */
-    contentDocument: Document;
-    /**
-      * Sets or retrieves the URL that references the data of the object.
-      */
-    data: string;
-    /**
-      * Sets or retrieves a character string that can be used to implement your own declare functionality for the object.
-      */
-    declare: boolean;
-    form: HTMLFormElement;
-    /**
-      * Sets or retrieves the height of the object.
-      */
-    height: string;
-    hspace: number;
-    /**
-      * Sets or retrieves the shape of the object.
-      */
-    name: string;
-    object: string;
-    /**
-      * Sets or retrieves a message to be displayed while an object is loading.
-      */
-    standby: string;
-    /**
-      * Returns the content type of the object.
-      */
-    type: string;
-    /**
-      * Sets or retrieves the URL, often with a bookmark extension (#name), to use as a client-side image map.
-      */
-    useMap: string;
-    vspace: number;
-    width: number;
-}
-
-declare var HTMLAppletElement: {
-    prototype: HTMLAppletElement;
-    new(): HTMLAppletElement;
-}
-
-interface HTMLAreaElement extends HTMLElement {
-    /**
-      * Sets or retrieves a text alternative to the graphic.
-      */
-    alt: string;
-    /**
-      * Sets or retrieves the coordinates of the object.
-      */
-    coords: string;
-    /**
-      * Sets or retrieves the subsection of the href property that follows the number sign (#).
-      */
-    hash: string;
-    /**
-      * Sets or retrieves the hostname and port number of the location or URL.
-      */
-    host: string;
-    /**
-      * Sets or retrieves the host name part of the location or URL.
-      */
-    hostname: string;
-    /**
-      * Sets or retrieves a destination URL or an anchor point.
-      */
-    href: string;
-    /**
-      * Sets or gets whether clicks in this region cause action.
-      */
-    noHref: boolean;
-    /**
-      * Sets or retrieves the file name or path specified by the object.
-      */
-    pathname: string;
-    /**
-      * Sets or retrieves the port number associated with a URL.
-      */
-    port: string;
-    /**
-      * Sets or retrieves the protocol portion of a URL.
-      */
-    protocol: string;
-    rel: string;
-    /**
-      * Sets or retrieves the substring of the href property that follows the question mark.
-      */
-    search: string;
-    /**
-      * Sets or retrieves the shape of the object.
-      */
-    shape: string;
-    /**
-      * Sets or retrieves the window or frame at which to target content.
-      */
-    target: string;
-    /**
-      * Returns a string representation of an object.
-      */
-    toString(): string;
-}
-
-declare var HTMLAreaElement: {
-    prototype: HTMLAreaElement;
-    new(): HTMLAreaElement;
-}
-
-interface HTMLAreasCollection extends HTMLCollection {
-    /**
-      * Adds an element to the areas, controlRange, or options collection.
-      */
-    add(element: HTMLElement, before?: HTMLElement | number): void;
-    /**
-      * Removes an element from the collection.
-      */
-    remove(index?: number): void;
-}
-
-declare var HTMLAreasCollection: {
-    prototype: HTMLAreasCollection;
-    new(): HTMLAreasCollection;
-}
-
-interface HTMLAudioElement extends HTMLMediaElement {
-}
-
-declare var HTMLAudioElement: {
-    prototype: HTMLAudioElement;
-    new(): HTMLAudioElement;
-}
-
-interface HTMLBRElement extends HTMLElement {
-    /**
-      * Sets or retrieves the side on which floating objects are not to be positioned when any IHTMLBlockElement is inserted into the document.
-      */
-    clear: string;
-}
-
-declare var HTMLBRElement: {
-    prototype: HTMLBRElement;
-    new(): HTMLBRElement;
-}
-
-interface HTMLBaseElement extends HTMLElement {
-    /**
-      * Gets or sets the baseline URL on which relative links are based.
-      */
-    href: string;
-    /**
-      * Sets or retrieves the window or frame at which to target content.
-      */
-    target: string;
-}
-
-declare var HTMLBaseElement: {
-    prototype: HTMLBaseElement;
-    new(): HTMLBaseElement;
-}
-
-interface HTMLBaseFontElement extends HTMLElement, DOML2DeprecatedColorProperty {
-    /**
-      * Sets or retrieves the current typeface family.
-      */
-    face: string;
-    /**
-      * Sets or retrieves the font size of the object.
-      */
-    size: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLBaseFontElement: {
-    prototype: HTMLBaseFontElement;
-    new(): HTMLBaseFontElement;
-}
-
-interface HTMLBlockElement extends HTMLElement {
-    /**
-      * Sets or retrieves reference information about the object.
-      */
-    cite: string;
-    clear: string;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    width: number;
-}
-
-declare var HTMLBlockElement: {
-    prototype: HTMLBlockElement;
-    new(): HTMLBlockElement;
-}
-
-interface HTMLBodyElement extends HTMLElement {
-    aLink: any;
-    background: string;
-    bgColor: any;
-    bgProperties: string;
-    link: any;
-    noWrap: boolean;
-    onafterprint: (ev: Event) => any;
-    onbeforeprint: (ev: Event) => any;
-    onbeforeunload: (ev: BeforeUnloadEvent) => any;
-    onblur: (ev: FocusEvent) => any;
-    onerror: (ev: Event) => any;
-    onfocus: (ev: FocusEvent) => any;
-    onhashchange: (ev: HashChangeEvent) => any;
-    onload: (ev: Event) => any;
-    onmessage: (ev: MessageEvent) => any;
-    onoffline: (ev: Event) => any;
-    ononline: (ev: Event) => any;
-    onorientationchange: (ev: Event) => any;
-    onpagehide: (ev: PageTransitionEvent) => any;
-    onpageshow: (ev: PageTransitionEvent) => any;
-    onpopstate: (ev: PopStateEvent) => any;
-    onresize: (ev: UIEvent) => any;
-    onstorage: (ev: StorageEvent) => any;
-    onunload: (ev: Event) => any;
-    text: any;
-    vLink: any;
-    createTextRange(): TextRange;
-    addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "afterprint", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "popstate", listener: (ev: PopStateEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "resize", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "storage", listener: (ev: StorageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "unload", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLBodyElement: {
-    prototype: HTMLBodyElement;
-    new(): HTMLBodyElement;
-}
-
-interface HTMLButtonElement extends HTMLElement {
-    /**
-      * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.
-      */
-    autofocus: boolean;
-    disabled: boolean;
-    /**
-      * Retrieves a reference to the form that the object is embedded in.
-      */
-    form: HTMLFormElement;
-    /**
-      * Overrides the action attribute (where the data on a form is sent) on the parent form element.
-      */
-    formAction: string;
-    /**
-      * Used to override the encoding (formEnctype attribute) specified on the form element.
-      */
-    formEnctype: string;
-    /**
-      * Overrides the submit method attribute previously specified on a form element.
-      */
-    formMethod: string;
-    /**
-      * Overrides any validation or required attributes on a form or form elements to allow it to be submitted without validation. This can be used to create a "save draft"-type submit option.
-      */
-    formNoValidate: string;
-    /**
-      * Overrides the target attribute on a form element.
-      */
-    formTarget: string;
-    /**
-      * Sets or retrieves the name of the object.
-      */
-    name: string;
-    status: any;
-    /**
-      * Gets the classification and default behavior of the button.
-      */
-    type: string;
-    /**
-      * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
-      */
-    validationMessage: string;
-    /**
-      * Returns a  ValidityState object that represents the validity states of an element.
-      */
-    validity: ValidityState;
-    /**
-      * Sets or retrieves the default or selected value of the control.
-      */
-    value: string;
-    /**
-      * Returns whether an element will successfully validate based on forms validation rules and constraints.
-      */
-    willValidate: boolean;
-    /**
-      * Returns whether a form will validate when it is submitted, without having to submit it.
-      */
-    checkValidity(): boolean;
-    /**
-      * Creates a TextRange object for the element.
-      */
-    createTextRange(): TextRange;
-    /**
-      * Sets a custom error message that is displayed when a form is submitted.
-      * @param error Sets a custom error message that is displayed when a form is submitted.
-      */
-    setCustomValidity(error: string): void;
-}
-
-declare var HTMLButtonElement: {
-    prototype: HTMLButtonElement;
-    new(): HTMLButtonElement;
-}
-
-interface HTMLCanvasElement extends HTMLElement {
-    /**
-      * Gets or sets the height of a canvas element on a document.
-      */
-    height: number;
-    /**
-      * Gets or sets the width of a canvas element on a document.
-      */
-    width: number;
-    /**
-      * Returns an object that provides methods and properties for drawing and manipulating images and graphics on a canvas element in a document. A context object includes information about colors, line widths, fonts, and other graphic parameters that can be drawn on a canvas.
-      * @param contextId The identifier (ID) of the type of canvas to create. Internet Explorer 9 and Internet Explorer 10 support only a 2-D context using canvas.getContext("2d"); IE11 Preview also supports 3-D or WebGL context using canvas.getContext("experimental-webgl");
-      */
-    getContext(contextId: "2d"): CanvasRenderingContext2D;
-    getContext(contextId: "experimental-webgl"): WebGLRenderingContext;
-    getContext(contextId: string, ...args: any[]): CanvasRenderingContext2D | WebGLRenderingContext;
-    /**
-      * Returns a blob object encoded as a Portable Network Graphics (PNG) format from a canvas image or drawing.
-      */
-    msToBlob(): Blob;
-    /**
-      * Returns the content of the current canvas as an image that you can use as a source for another canvas or an HTML element.
-      * @param type The standard MIME type for the image format to return. If you do not specify this parameter, the default value is a PNG format image.
-      */
-    toDataURL(type?: string, ...args: any[]): string;
-}
-
-declare var HTMLCanvasElement: {
-    prototype: HTMLCanvasElement;
-    new(): HTMLCanvasElement;
-}
-
-interface HTMLCollection {
-    /**
-      * Sets or retrieves the number of objects in a collection.
-      */
-    length: number;
-    /**
-      * Retrieves an object from various collections.
-      */
-    item(nameOrIndex?: any, optionalIndex?: any): Element;
-    /**
-      * Retrieves a select object or an object from an options collection.
-      */
-    namedItem(name: string): Element;
-    [index: number]: Element;
-}
-
-declare var HTMLCollection: {
-    prototype: HTMLCollection;
-    new(): HTMLCollection;
-}
-
-interface HTMLDDElement extends HTMLElement {
-    /**
-      * Sets or retrieves whether the browser automatically performs wordwrap.
-      */
-    noWrap: boolean;
-}
-
-declare var HTMLDDElement: {
-    prototype: HTMLDDElement;
-    new(): HTMLDDElement;
-}
-
-interface HTMLDListElement extends HTMLElement {
-    compact: boolean;
-}
-
-declare var HTMLDListElement: {
-    prototype: HTMLDListElement;
-    new(): HTMLDListElement;
-}
-
-interface HTMLDTElement extends HTMLElement {
-    /**
-      * Sets or retrieves whether the browser automatically performs wordwrap.
-      */
-    noWrap: boolean;
-}
-
-declare var HTMLDTElement: {
-    prototype: HTMLDTElement;
-    new(): HTMLDTElement;
-}
-
-interface HTMLDataListElement extends HTMLElement {
-    options: HTMLCollection;
-}
-
-declare var HTMLDataListElement: {
-    prototype: HTMLDataListElement;
-    new(): HTMLDataListElement;
-}
-
-interface HTMLDirectoryElement extends HTMLElement {
-    compact: boolean;
-}
-
-declare var HTMLDirectoryElement: {
-    prototype: HTMLDirectoryElement;
-    new(): HTMLDirectoryElement;
-}
-
-interface HTMLDivElement extends HTMLElement {
-    /**
-      * Sets or retrieves how the object is aligned with adjacent text.
-      */
-    align: string;
-    /**
-      * Sets or retrieves whether the browser automatically performs wordwrap.
-      */
-    noWrap: boolean;
-}
-
-declare var HTMLDivElement: {
-    prototype: HTMLDivElement;
-    new(): HTMLDivElement;
-}
-
-interface HTMLDocument extends Document {
-}
-
-declare var HTMLDocument: {
-    prototype: HTMLDocument;
-    new(): HTMLDocument;
-}
-
-interface HTMLElement extends Element {
-    accessKey: string;
-    children: HTMLCollection;
-    contentEditable: string;
-    dataset: DOMStringMap;
-    dir: string;
-    draggable: boolean;
-    hidden: boolean;
-    hideFocus: boolean;
-    innerHTML: string;
-    innerText: string;
-    isContentEditable: boolean;
-    lang: string;
-    offsetHeight: number;
-    offsetLeft: number;
-    offsetParent: Element;
-    offsetTop: number;
-    offsetWidth: number;
-    onabort: (ev: Event) => any;
-    onactivate: (ev: UIEvent) => any;
-    onbeforeactivate: (ev: UIEvent) => any;
-    onbeforecopy: (ev: DragEvent) => any;
-    onbeforecut: (ev: DragEvent) => any;
-    onbeforedeactivate: (ev: UIEvent) => any;
-    onbeforepaste: (ev: DragEvent) => any;
-    onblur: (ev: FocusEvent) => any;
-    oncanplay: (ev: Event) => any;
-    oncanplaythrough: (ev: Event) => any;
-    onchange: (ev: Event) => any;
-    onclick: (ev: MouseEvent) => any;
-    oncontextmenu: (ev: PointerEvent) => any;
-    oncopy: (ev: DragEvent) => any;
-    oncuechange: (ev: Event) => any;
-    oncut: (ev: DragEvent) => any;
-    ondblclick: (ev: MouseEvent) => any;
-    ondeactivate: (ev: UIEvent) => any;
-    ondrag: (ev: DragEvent) => any;
-    ondragend: (ev: DragEvent) => any;
-    ondragenter: (ev: DragEvent) => any;
-    ondragleave: (ev: DragEvent) => any;
-    ondragover: (ev: DragEvent) => any;
-    ondragstart: (ev: DragEvent) => any;
-    ondrop: (ev: DragEvent) => any;
-    ondurationchange: (ev: Event) => any;
-    onemptied: (ev: Event) => any;
-    onended: (ev: Event) => any;
-    onerror: (ev: Event) => any;
-    onfocus: (ev: FocusEvent) => any;
-    oninput: (ev: Event) => any;
-    onkeydown: (ev: KeyboardEvent) => any;
-    onkeypress: (ev: KeyboardEvent) => any;
-    onkeyup: (ev: KeyboardEvent) => any;
-    onload: (ev: Event) => any;
-    onloadeddata: (ev: Event) => any;
-    onloadedmetadata: (ev: Event) => any;
-    onloadstart: (ev: Event) => any;
-    onmousedown: (ev: MouseEvent) => any;
-    onmouseenter: (ev: MouseEvent) => any;
-    onmouseleave: (ev: MouseEvent) => any;
-    onmousemove: (ev: MouseEvent) => any;
-    onmouseout: (ev: MouseEvent) => any;
-    onmouseover: (ev: MouseEvent) => any;
-    onmouseup: (ev: MouseEvent) => any;
-    onmousewheel: (ev: MouseWheelEvent) => any;
-    onmscontentzoom: (ev: UIEvent) => any;
-    onmsmanipulationstatechanged: (ev: MSManipulationEvent) => any;
-    onpaste: (ev: DragEvent) => any;
-    onpause: (ev: Event) => any;
-    onplay: (ev: Event) => any;
-    onplaying: (ev: Event) => any;
-    onprogress: (ev: ProgressEvent) => any;
-    onratechange: (ev: Event) => any;
-    onreset: (ev: Event) => any;
-    onscroll: (ev: UIEvent) => any;
-    onseeked: (ev: Event) => any;
-    onseeking: (ev: Event) => any;
-    onselect: (ev: UIEvent) => any;
-    onselectstart: (ev: Event) => any;
-    onstalled: (ev: Event) => any;
-    onsubmit: (ev: Event) => any;
-    onsuspend: (ev: Event) => any;
-    ontimeupdate: (ev: Event) => any;
-    onvolumechange: (ev: Event) => any;
-    onwaiting: (ev: Event) => any;
-    outerHTML: string;
-    outerText: string;
-    spellcheck: boolean;
-    style: CSSStyleDeclaration;
-    tabIndex: number;
-    title: string;
-    blur(): void;
-    click(): void;
-    contains(child: HTMLElement): boolean;
-    dragDrop(): boolean;
-    focus(): void;
-    insertAdjacentElement(position: string, insertedElement: Element): Element;
-    insertAdjacentHTML(where: string, html: string): void;
-    insertAdjacentText(where: string, text: string): void;
-    msGetInputContext(): MSInputMethodContext;
-    scrollIntoView(top?: boolean): void;
-    setActive(): void;
-    addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLElement: {
-    prototype: HTMLElement;
-    new(): HTMLElement;
-}
-
-interface HTMLEmbedElement extends HTMLElement, GetSVGDocument {
-    /**
-      * Sets or retrieves the height of the object.
-      */
-    height: string;
-    hidden: any;
-    /**
-      * Gets or sets whether the DLNA PlayTo device is available.
-      */
-    msPlayToDisabled: boolean;
-    /**
-      * Gets or sets the path to the preferred media source. This enables the Play To target device to stream the media content, which can be DRM protected, from a different location, such as a cloud media server.
-      */
-    msPlayToPreferredSourceUri: string;
-    /**
-      * Gets or sets the primary DLNA PlayTo device.
-      */
-    msPlayToPrimary: boolean;
-    /**
-      * Gets the source associated with the media element for use by the PlayToManager.
-      */
-    msPlayToSource: any;
-    /**
-      * Sets or retrieves the name of the object.
-      */
-    name: string;
-    /**
-      * Retrieves the palette used for the embedded document.
-      */
-    palette: string;
-    /**
-      * Retrieves the URL of the plug-in used to view an embedded document.
-      */
-    pluginspage: string;
-    readyState: string;
-    /**
-      * Sets or retrieves a URL to be loaded by the object.
-      */
-    src: string;
-    /**
-      * Sets or retrieves the height and width units of the embed object.
-      */
-    units: string;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    width: string;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLEmbedElement: {
-    prototype: HTMLEmbedElement;
-    new(): HTMLEmbedElement;
-}
-
-interface HTMLFieldSetElement extends HTMLElement {
-    /**
-      * Sets or retrieves how the object is aligned with adjacent text.
-      */
-    align: string;
-    disabled: boolean;
-    /**
-      * Retrieves a reference to the form that the object is embedded in.
-      */
-    form: HTMLFormElement;
-    /**
-      * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
-      */
-    validationMessage: string;
-    /**
-      * Returns a  ValidityState object that represents the validity states of an element.
-      */
-    validity: ValidityState;
-    /**
-      * Returns whether an element will successfully validate based on forms validation rules and constraints.
-      */
-    willValidate: boolean;
-    /**
-      * Returns whether a form will validate when it is submitted, without having to submit it.
-      */
-    checkValidity(): boolean;
-    /**
-      * Sets a custom error message that is displayed when a form is submitted.
-      * @param error Sets a custom error message that is displayed when a form is submitted.
-      */
-    setCustomValidity(error: string): void;
-}
-
-declare var HTMLFieldSetElement: {
-    prototype: HTMLFieldSetElement;
-    new(): HTMLFieldSetElement;
-}
-
-interface HTMLFontElement extends HTMLElement, DOML2DeprecatedColorProperty, DOML2DeprecatedSizeProperty {
-    /**
-      * Sets or retrieves the current typeface family.
-      */
-    face: string;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLFontElement: {
-    prototype: HTMLFontElement;
-    new(): HTMLFontElement;
-}
-
-interface HTMLFormElement extends HTMLElement {
-    /**
-      * Sets or retrieves a list of character encodings for input data that must be accepted by the server processing the form.
-      */
-    acceptCharset: string;
-    /**
-      * Sets or retrieves the URL to which the form content is sent for processing.
-      */
-    action: string;
-    /**
-      * Specifies whether autocomplete is applied to an editable text field.
-      */
-    autocomplete: string;
-    /**
-      * Retrieves a collection, in source order, of all controls in a given form.
-      */
-    elements: HTMLCollection;
-    /**
-      * Sets or retrieves the MIME encoding for the form.
-      */
-    encoding: string;
-    /**
-      * Sets or retrieves the encoding type for the form.
-      */
-    enctype: string;
-    /**
-      * Sets or retrieves the number of objects in a collection.
-      */
-    length: number;
-    /**
-      * Sets or retrieves how to send the form data to the server.
-      */
-    method: string;
-    /**
-      * Sets or retrieves the name of the object.
-      */
-    name: string;
-    /**
-      * Designates a form that is not validated when submitted.
-      */
-    noValidate: boolean;
-    /**
-      * Sets or retrieves the window or frame at which to target content.
-      */
-    target: string;
-    /**
-      * Returns whether a form will validate when it is submitted, without having to submit it.
-      */
-    checkValidity(): boolean;
-    /**
-      * Retrieves a form object or an object from an elements collection.
-      * @param name Variant of type Number or String that specifies the object or collection to retrieve. If this parameter is a Number, it is the zero-based index of the object. If this parameter is a string, all objects with matching name or id properties are retrieved, and a collection is returned if more than one match is made.
-      * @param index Variant of type Number that specifies the zero-based index of the object to retrieve when a collection is returned.
-      */
-    item(name?: any, index?: any): any;
-    /**
-      * Retrieves a form object or an object from an elements collection.
-      */
-    namedItem(name: string): any;
-    /**
-      * Fires when the user resets a form.
-      */
-    reset(): void;
-    /**
-      * Fires when a FORM is about to be submitted.
-      */
-    submit(): void;
-    [name: string]: any;
-}
-
-declare var HTMLFormElement: {
-    prototype: HTMLFormElement;
-    new(): HTMLFormElement;
-}
-
-interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
-    /**
-      * Specifies the properties of a border drawn around an object.
-      */
-    border: string;
-    /**
-      * Sets or retrieves the border color of the object.
-      */
-    borderColor: any;
-    /**
-      * Retrieves the document object of the page or frame.
-      */
-    contentDocument: Document;
-    /**
-      * Retrieves the object of the specified.
-      */
-    contentWindow: Window;
-    /**
-      * Sets or retrieves whether to display a border for the frame.
-      */
-    frameBorder: string;
-    /**
-      * Sets or retrieves the amount of additional space between the frames.
-      */
-    frameSpacing: any;
-    /**
-      * Sets or retrieves the height of the object.
-      */
-    height: string | number;
-    /**
-      * Sets or retrieves a URI to a long description of the object.
-      */
-    longDesc: string;
-    /**
-      * Sets or retrieves the top and bottom margin heights before displaying the text in a frame.
-      */
-    marginHeight: string;
-    /**
-      * Sets or retrieves the left and right margin widths before displaying the text in a frame.
-      */
-    marginWidth: string;
-    /**
-      * Sets or retrieves the frame name.
-      */
-    name: string;
-    /**
-      * Sets or retrieves whether the user can resize the frame.
-      */
-    noResize: boolean;
-    /**
-      * Raised when the object has been completely received from the server.
-      */
-    onload: (ev: Event) => any;
-    /**
-      * Sets or retrieves whether the frame can be scrolled.
-      */
-    scrolling: string;
-    /**
-      * Sets the value indicating whether the source file of a frame or iframe has specific security restrictions applied.
-      */
-    security: any;
-    /**
-      * Sets or retrieves a URL to be loaded by the object.
-      */
-    src: string;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    width: string | number;
-    addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLFrameElement: {
-    prototype: HTMLFrameElement;
-    new(): HTMLFrameElement;
-}
-
-interface HTMLFrameSetElement extends HTMLElement {
-    border: string;
-    /**
-      * Sets or retrieves the border color of the object.
-      */
-    borderColor: any;
-    /**
-      * Sets or retrieves the frame widths of the object.
-      */
-    cols: string;
-    /**
-      * Sets or retrieves whether to display a border for the frame.
-      */
-    frameBorder: string;
-    /**
-      * Sets or retrieves the amount of additional space between the frames.
-      */
-    frameSpacing: any;
-    name: string;
-    onafterprint: (ev: Event) => any;
-    onbeforeprint: (ev: Event) => any;
-    onbeforeunload: (ev: BeforeUnloadEvent) => any;
-    /**
-      * Fires when the object loses the input focus.
-      */
-    onblur: (ev: FocusEvent) => any;
-    onerror: (ev: Event) => any;
-    /**
-      * Fires when the object receives focus.
-      */
-    onfocus: (ev: FocusEvent) => any;
-    onhashchange: (ev: HashChangeEvent) => any;
-    onload: (ev: Event) => any;
-    onmessage: (ev: MessageEvent) => any;
-    onoffline: (ev: Event) => any;
-    ononline: (ev: Event) => any;
-    onorientationchange: (ev: Event) => any;
-    onpagehide: (ev: PageTransitionEvent) => any;
-    onpageshow: (ev: PageTransitionEvent) => any;
-    onresize: (ev: UIEvent) => any;
-    onstorage: (ev: StorageEvent) => any;
-    onunload: (ev: Event) => any;
-    /**
-      * Sets or retrieves the frame heights of the object.
-      */
-    rows: string;
-    addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "resize", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "storage", listener: (ev: StorageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "unload", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLFrameSetElement: {
-    prototype: HTMLFrameSetElement;
-    new(): HTMLFrameSetElement;
-}
-
-interface HTMLHRElement extends HTMLElement, DOML2DeprecatedColorProperty, DOML2DeprecatedSizeProperty {
-    /**
-      * Sets or retrieves how the object is aligned with adjacent text.
-      */
-    align: string;
-    /**
-      * Sets or retrieves whether the horizontal rule is drawn with 3-D shading.
-      */
-    noShade: boolean;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    width: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLHRElement: {
-    prototype: HTMLHRElement;
-    new(): HTMLHRElement;
-}
-
-interface HTMLHeadElement extends HTMLElement {
-    profile: string;
-}
-
-declare var HTMLHeadElement: {
-    prototype: HTMLHeadElement;
-    new(): HTMLHeadElement;
-}
-
-interface HTMLHeadingElement extends HTMLElement {
-    /**
-      * Sets or retrieves a value that indicates the table alignment.
-      */
-    align: string;
-    clear: string;
-}
-
-declare var HTMLHeadingElement: {
-    prototype: HTMLHeadingElement;
-    new(): HTMLHeadingElement;
-}
-
-interface HTMLHtmlElement extends HTMLElement {
-    /**
-      * Sets or retrieves the DTD version that governs the current document.
-      */
-    version: string;
-}
-
-declare var HTMLHtmlElement: {
-    prototype: HTMLHtmlElement;
-    new(): HTMLHtmlElement;
-}
-
-interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
-    /**
-      * Sets or retrieves how the object is aligned with adjacent text.
-      */
-    align: string;
-    allowFullscreen: boolean;
-    /**
-      * Specifies the properties of a border drawn around an object.
-      */
-    border: string;
-    /**
-      * Retrieves the document object of the page or frame.
-      */
-    contentDocument: Document;
-    /**
-      * Retrieves the object of the specified.
-      */
-    contentWindow: Window;
-    /**
-      * Sets or retrieves whether to display a border for the frame.
-      */
-    frameBorder: string;
-    /**
-      * Sets or retrieves the amount of additional space between the frames.
-      */
-    frameSpacing: any;
-    /**
-      * Sets or retrieves the height of the object.
-      */
-    height: string;
-    /**
-      * Sets or retrieves the horizontal margin for the object.
-      */
-    hspace: number;
-    /**
-      * Sets or retrieves a URI to a long description of the object.
-      */
-    longDesc: string;
-    /**
-      * Sets or retrieves the top and bottom margin heights before displaying the text in a frame.
-      */
-    marginHeight: string;
-    /**
-      * Sets or retrieves the left and right margin widths before displaying the text in a frame.
-      */
-    marginWidth: string;
-    /**
-      * Sets or retrieves the frame name.
-      */
-    name: string;
-    /**
-      * Sets or retrieves whether the user can resize the frame.
-      */
-    noResize: boolean;
-    /**
-      * Raised when the object has been completely received from the server.
-      */
-    onload: (ev: Event) => any;
-    sandbox: DOMSettableTokenList;
-    /**
-      * Sets or retrieves whether the frame can be scrolled.
-      */
-    scrolling: string;
-    /**
-      * Sets the value indicating whether the source file of a frame or iframe has specific security restrictions applied.
-      */
-    security: any;
-    /**
-      * Sets or retrieves a URL to be loaded by the object.
-      */
-    src: string;
-    /**
-      * Sets or retrieves the vertical margin for the object.
-      */
-    vspace: number;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    width: string;
-    addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLIFrameElement: {
-    prototype: HTMLIFrameElement;
-    new(): HTMLIFrameElement;
-}
-
-interface HTMLImageElement extends HTMLElement {
-    /**
-      * Sets or retrieves how the object is aligned with adjacent text.
-      */
-    align: string;
-    /**
-      * Sets or retrieves a text alternative to the graphic.
-      */
-    alt: string;
-    /**
-      * Specifies the properties of a border drawn around an object.
-      */
-    border: string;
-    /**
-      * Retrieves whether the object is fully loaded.
-      */
-    complete: boolean;
-    crossOrigin: string;
-    currentSrc: string;
-    /**
-      * Sets or retrieves the height of the object.
-      */
-    height: number;
-    /**
-      * Sets or retrieves the width of the border to draw around the object.
-      */
-    hspace: number;
-    /**
-      * Sets or retrieves whether the image is a server-side image map.
-      */
-    isMap: boolean;
-    /**
-      * Sets or retrieves a Uniform Resource Identifier (URI) to a long description of the object.
-      */
-    longDesc: string;
-    /**
-      * Gets or sets whether the DLNA PlayTo device is available.
-      */
-    msPlayToDisabled: boolean;
-    msPlayToPreferredSourceUri: string;
-    /**
-      * Gets or sets the primary DLNA PlayTo device.
-      */
-    msPlayToPrimary: boolean;
-    /**
-      * Gets the source associated with the media element for use by the PlayToManager.
-      */
-    msPlayToSource: any;
-    /**
-      * Sets or retrieves the name of the object.
-      */
-    name: string;
-    /**
-      * The original height of the image resource before sizing.
-      */
-    naturalHeight: number;
-    /**
-      * The original width of the image resource before sizing.
-      */
-    naturalWidth: number;
-    /**
-      * The address or URL of the a media resource that is to be considered.
-      */
-    src: string;
-    srcset: string;
-    /**
-      * Sets or retrieves the URL, often with a bookmark extension (#name), to use as a client-side image map.
-      */
-    useMap: string;
-    /**
-      * Sets or retrieves the vertical margin for the object.
-      */
-    vspace: number;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    width: number;
-    x: number;
-    y: number;
-    msGetAsCastingSource(): any;
-}
-
-declare var HTMLImageElement: {
-    prototype: HTMLImageElement;
-    new(): HTMLImageElement;
-    create(): HTMLImageElement;
-}
-
-interface HTMLInputElement extends HTMLElement {
-    /**
-      * Sets or retrieves a comma-separated list of content types.
-      */
-    accept: string;
-    /**
-      * Sets or retrieves how the object is aligned with adjacent text.
-      */
-    align: string;
-    /**
-      * Sets or retrieves a text alternative to the graphic.
-      */
-    alt: string;
-    /**
-      * Specifies whether autocomplete is applied to an editable text field.
-      */
-    autocomplete: string;
-    /**
-      * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.
-      */
-    autofocus: boolean;
-    /**
-      * Sets or retrieves the width of the border to draw around the object.
-      */
-    border: string;
-    /**
-      * Sets or retrieves the state of the check box or radio button.
-      */
-    checked: boolean;
-    /**
-      * Retrieves whether the object is fully loaded.
-      */
-    complete: boolean;
-    /**
-      * Sets or retrieves the state of the check box or radio button.
-      */
-    defaultChecked: boolean;
-    /**
-      * Sets or retrieves the initial contents of the object.
-      */
-    defaultValue: string;
-    disabled: boolean;
-    /**
-      * Returns a FileList object on a file type input object.
-      */
-    files: FileList;
-    /**
-      * Retrieves a reference to the form that the object is embedded in.
-      */
-    form: HTMLFormElement;
-    /**
-      * Overrides the action attribute (where the data on a form is sent) on the parent form element.
-      */
-    formAction: string;
-    /**
-      * Used to override the encoding (formEnctype attribute) specified on the form element.
-      */
-    formEnctype: string;
-    /**
-      * Overrides the submit method attribute previously specified on a form element.
-      */
-    formMethod: string;
-    /**
-      * Overrides any validation or required attributes on a form or form elements to allow it to be submitted without validation. This can be used to create a "save draft"-type submit option.
-      */
-    formNoValidate: string;
-    /**
-      * Overrides the target attribute on a form element.
-      */
-    formTarget: string;
-    /**
-      * Sets or retrieves the height of the object.
-      */
-    height: string;
-    /**
-      * Sets or retrieves the width of the border to draw around the object.
-      */
-    hspace: number;
-    indeterminate: boolean;
-    /**
-      * Specifies the ID of a pre-defined datalist of options for an input element.
-      */
-    list: HTMLElement;
-    /**
-      * Defines the maximum acceptable value for an input element with type="number".When used with the min and step attributes, lets you control the range and increment (such as only even numbers) that the user can enter into an input field.
-      */
-    max: string;
-    /**
-      * Sets or retrieves the maximum number of characters that the user can enter in a text control.
-      */
-    maxLength: number;
-    /**
-      * Defines the minimum acceptable value for an input element with type="number". When used with the max and step attributes, lets you control the range and increment (such as even numbers only) that the user can enter into an input field.
-      */
-    min: string;
-    /**
-      * Sets or retrieves the Boolean value indicating whether multiple items can be selected from a list.
-      */
-    multiple: boolean;
-    /**
-      * Sets or retrieves the name of the object.
-      */
-    name: string;
-    /**
-      * Gets or sets a string containing a regular expression that the user's input must match.
-      */
-    pattern: string;
-    /**
-      * Gets or sets a text string that is displayed in an input field as a hint or prompt to users as the format or type of information they need to enter.The text appears in an input field until the user puts focus on the field.
-      */
-    placeholder: string;
-    readOnly: boolean;
-    /**
-      * When present, marks an element that can't be submitted without a value.
-      */
-    required: boolean;
-    /**
-      * Gets or sets the end position or offset of a text selection.
-      */
-    selectionEnd: number;
-    /**
-      * Gets or sets the starting position or offset of a text selection.
-      */
-    selectionStart: number;
-    size: number;
-    /**
-      * The address or URL of the a media resource that is to be considered.
-      */
-    src: string;
-    status: boolean;
-    /**
-      * Defines an increment or jump between values that you want to allow the user to enter. When used with the max and min attributes, lets you control the range and increment (for example, allow only even numbers) that the user can enter into an input field.
-      */
-    step: string;
-    /**
-      * Returns the content type of the object.
-      */
-    type: string;
-    /**
-      * Sets or retrieves the URL, often with a bookmark extension (#name), to use as a client-side image map.
-      */
-    useMap: string;
-    /**
-      * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
-      */
-    validationMessage: string;
-    /**
-      * Returns a  ValidityState object that represents the validity states of an element.
-      */
-    validity: ValidityState;
-    /**
-      * Returns the value of the data at the cursor's current position.
-      */
-    value: string;
-    valueAsDate: Date;
-    /**
-      * Returns the input field value as a number.
-      */
-    valueAsNumber: number;
-    /**
-      * Sets or retrieves the vertical margin for the object.
-      */
-    vspace: number;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    width: string;
-    /**
-      * Returns whether an element will successfully validate based on forms validation rules and constraints.
-      */
-    willValidate: boolean;
-    /**
-      * Returns whether a form will validate when it is submitted, without having to submit it.
-      */
-    checkValidity(): boolean;
-    /**
-      * Creates a TextRange object for the element.
-      */
-    createTextRange(): TextRange;
-    /**
-      * Makes the selection equal to the current object.
-      */
-    select(): void;
-    /**
-      * Sets a custom error message that is displayed when a form is submitted.
-      * @param error Sets a custom error message that is displayed when a form is submitted.
-      */
-    setCustomValidity(error: string): void;
-    /**
-      * Sets the start and end positions of a selection in a text field.
-      * @param start The offset into the text field for the start of the selection.
-      * @param end The offset into the text field for the end of the selection.
-      */
-    setSelectionRange(start: number, end: number): void;
-    /**
-      * Decrements a range input control's value by the value given by the Step attribute. If the optional parameter is used, it will decrement the input control's step value multiplied by the parameter's value.
-      * @param n Value to decrement the value by.
-      */
-    stepDown(n?: number): void;
-    /**
-      * Increments a range input control's value by the value given by the Step attribute. If the optional parameter is used, will increment the input control's value by that value.
-      * @param n Value to increment the value by.
-      */
-    stepUp(n?: number): void;
-}
-
-declare var HTMLInputElement: {
-    prototype: HTMLInputElement;
-    new(): HTMLInputElement;
-}
-
-interface HTMLIsIndexElement extends HTMLElement {
-    /**
-      * Sets or retrieves the URL to which the form content is sent for processing.
-      */
-    action: string;
-    /**
-      * Retrieves a reference to the form that the object is embedded in.
-      */
-    form: HTMLFormElement;
-    prompt: string;
-}
-
-declare var HTMLIsIndexElement: {
-    prototype: HTMLIsIndexElement;
-    new(): HTMLIsIndexElement;
-}
-
-interface HTMLLIElement extends HTMLElement {
-    type: string;
-    /**
-      * Sets or retrieves the value of a list item.
-      */
-    value: number;
-}
-
-declare var HTMLLIElement: {
-    prototype: HTMLLIElement;
-    new(): HTMLLIElement;
-}
-
-interface HTMLLabelElement extends HTMLElement {
-    /**
-      * Retrieves a reference to the form that the object is embedded in.
-      */
-    form: HTMLFormElement;
-    /**
-      * Sets or retrieves the object to which the given label object is assigned.
-      */
-    htmlFor: string;
-}
-
-declare var HTMLLabelElement: {
-    prototype: HTMLLabelElement;
-    new(): HTMLLabelElement;
-}
-
-interface HTMLLegendElement extends HTMLElement {
-    /**
-      * Retrieves a reference to the form that the object is embedded in.
-      */
-    align: string;
-    /**
-      * Retrieves a reference to the form that the object is embedded in.
-      */
-    form: HTMLFormElement;
-}
-
-declare var HTMLLegendElement: {
-    prototype: HTMLLegendElement;
-    new(): HTMLLegendElement;
-}
-
-interface HTMLLinkElement extends HTMLElement, LinkStyle {
-    /**
-      * Sets or retrieves the character set used to encode the object.
-      */
-    charset: string;
-    disabled: boolean;
-    /**
-      * Sets or retrieves a destination URL or an anchor point.
-      */
-    href: string;
-    /**
-      * Sets or retrieves the language code of the object.
-      */
-    hreflang: string;
-    /**
-      * Sets or retrieves the media type.
-      */
-    media: string;
-    /**
-      * Sets or retrieves the relationship between the object and the destination of the link.
-      */
-    rel: string;
-    /**
-      * Sets or retrieves the relationship between the object and the destination of the link.
-      */
-    rev: string;
-    /**
-      * Sets or retrieves the window or frame at which to target content.
-      */
-    target: string;
-    /**
-      * Sets or retrieves the MIME type of the object.
-      */
-    type: string;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLLinkElement: {
-    prototype: HTMLLinkElement;
-    new(): HTMLLinkElement;
-}
-
-interface HTMLMapElement extends HTMLElement {
-    /**
-      * Retrieves a collection of the area objects defined for the given map object.
-      */
-    areas: HTMLAreasCollection;
-    /**
-      * Sets or retrieves the name of the object.
-      */
-    name: string;
-}
-
-declare var HTMLMapElement: {
-    prototype: HTMLMapElement;
-    new(): HTMLMapElement;
-}
-
-interface HTMLMarqueeElement extends HTMLElement {
-    behavior: string;
-    bgColor: any;
-    direction: string;
-    height: string;
-    hspace: number;
-    loop: number;
-    onbounce: (ev: Event) => any;
-    onfinish: (ev: Event) => any;
-    onstart: (ev: Event) => any;
-    scrollAmount: number;
-    scrollDelay: number;
-    trueSpeed: boolean;
-    vspace: number;
-    width: string;
-    start(): void;
-    stop(): void;
-    addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "bounce", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "finish", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "start", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLMarqueeElement: {
-    prototype: HTMLMarqueeElement;
-    new(): HTMLMarqueeElement;
-}
-
-interface HTMLMediaElement extends HTMLElement {
-    /**
-      * Returns an AudioTrackList object with the audio tracks for a given video element.
-      */
-    audioTracks: AudioTrackList;
-    /**
-      * Gets or sets a value that indicates whether to start playing the media automatically.
-      */
-    autoplay: boolean;
-    /**
-      * Gets a collection of buffered time ranges.
-      */
-    buffered: TimeRanges;
-    /**
-      * Gets or sets a flag that indicates whether the client provides a set of controls for the media (in case the developer does not include controls for the player).
-      */
-    controls: boolean;
-    /**
-      * Gets the address or URL of the current media resource that is selected by IHTMLMediaElement.
-      */
-    currentSrc: string;
-    /**
-      * Gets or sets the current playback position, in seconds.
-      */
-    currentTime: number;
-    defaultMuted: boolean;
-    /**
-      * Gets or sets the default playback rate when the user is not using fast forward or reverse for a video or audio resource.
-      */
-    defaultPlaybackRate: number;
-    /**
-      * Returns the duration in seconds of the current media resource. A NaN value is returned if duration is not available, or Infinity if the media resource is streaming.
-      */
-    duration: number;
-    /**
-      * Gets information about whether the playback has ended or not.
-      */
-    ended: boolean;
-    /**
-      * Returns an object representing the current error state of the audio or video element.
-      */
-    error: MediaError;
-    /**
-      * Gets or sets a flag to specify whether playback should restart after it completes.
-      */
-    loop: boolean;
-    /**
-      * Specifies the purpose of the audio or video media, such as background audio or alerts.
-      */
-    msAudioCategory: string;
-    /**
-      * Specifies the output device id that the audio will be sent to.
-      */
-    msAudioDeviceType: string;
-    msGraphicsTrustStatus: MSGraphicsTrust;
-    /**
-      * Gets the MSMediaKeys object, which is used for decrypting media data, that is associated with this media element.
-      */
-    msKeys: MSMediaKeys;
-    /**
-      * Gets or sets whether the DLNA PlayTo device is available.
-      */
-    msPlayToDisabled: boolean;
-    /**
-      * Gets or sets the path to the preferred media source. This enables the Play To target device to stream the media content, which can be DRM protected, from a different location, such as a cloud media server.
-      */
-    msPlayToPreferredSourceUri: string;
-    /**
-      * Gets or sets the primary DLNA PlayTo device.
-      */
-    msPlayToPrimary: boolean;
-    /**
-      * Gets the source associated with the media element for use by the PlayToManager.
-      */
-    msPlayToSource: any;
-    /**
-      * Specifies whether or not to enable low-latency playback on the media element.
-      */
-    msRealTime: boolean;
-    /**
-      * Gets or sets a flag that indicates whether the audio (either audio or the audio track on video media) is muted.
-      */
-    muted: boolean;
-    /**
-      * Gets the current network activity for the element.
-      */
-    networkState: number;
-    onmsneedkey: (ev: MSMediaKeyNeededEvent) => any;
-    /**
-      * Gets a flag that specifies whether playback is paused.
-      */
-    paused: boolean;
-    /**
-      * Gets or sets the current rate of speed for the media resource to play. This speed is expressed as a multiple of the normal speed of the media resource.
-      */
-    playbackRate: number;
-    /**
-      * Gets TimeRanges for the current media resource that has been played.
-      */
-    played: TimeRanges;
-    /**
-      * Gets or sets the current playback position, in seconds.
-      */
-    preload: string;
-    readyState: any;
-    /**
-      * Returns a TimeRanges object that represents the ranges of the current media resource that can be seeked.
-      */
-    seekable: TimeRanges;
-    /**
-      * Gets a flag that indicates whether the the client is currently moving to a new playback position in the media resource.
-      */
-    seeking: boolean;
-    /**
-      * The address or URL of the a media resource that is to be considered.
-      */
-    src: string;
-    textTracks: TextTrackList;
-    videoTracks: VideoTrackList;
-    /**
-      * Gets or sets the volume level for audio portions of the media element.
-      */
-    volume: number;
-    addTextTrack(kind: string, label?: string, language?: string): TextTrack;
-    /**
-      * Returns a string that specifies whether the client can play a given media resource type.
-      */
-    canPlayType(type: string): string;
-    /**
-      * Fires immediately after the client loads the object.
-      */
-    load(): void;
-    /**
-      * Clears all effects from the media pipeline.
-      */
-    msClearEffects(): void;
-    msGetAsCastingSource(): any;
-    /**
-      * Inserts the specified audio effect into media pipeline.
-      */
-    msInsertAudioEffect(activatableClassId: string, effectRequired: boolean, config?: any): void;
-    msSetMediaKeys(mediaKeys: MSMediaKeys): void;
-    /**
-      * Specifies the media protection manager for a given media pipeline.
-      */
-    msSetMediaProtectionManager(mediaProtectionManager?: any): void;
-    /**
-      * Pauses the current playback and sets paused to TRUE. This can be used to test whether the media is playing or paused. You can also use the pause or play events to tell whether the media is playing or not.
-      */
-    pause(): void;
-    /**
-      * Loads and starts playback of a media resource.
-      */
-    play(): void;
-    HAVE_CURRENT_DATA: number;
-    HAVE_ENOUGH_DATA: number;
-    HAVE_FUTURE_DATA: number;
-    HAVE_METADATA: number;
-    HAVE_NOTHING: number;
-    NETWORK_EMPTY: number;
-    NETWORK_IDLE: number;
-    NETWORK_LOADING: number;
-    NETWORK_NO_SOURCE: number;
-    addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "msneedkey", listener: (ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLMediaElement: {
-    prototype: HTMLMediaElement;
-    new(): HTMLMediaElement;
-    HAVE_CURRENT_DATA: number;
-    HAVE_ENOUGH_DATA: number;
-    HAVE_FUTURE_DATA: number;
-    HAVE_METADATA: number;
-    HAVE_NOTHING: number;
-    NETWORK_EMPTY: number;
-    NETWORK_IDLE: number;
-    NETWORK_LOADING: number;
-    NETWORK_NO_SOURCE: number;
-}
-
-interface HTMLMenuElement extends HTMLElement {
-    compact: boolean;
-    type: string;
-}
-
-declare var HTMLMenuElement: {
-    prototype: HTMLMenuElement;
-    new(): HTMLMenuElement;
-}
-
-interface HTMLMetaElement extends HTMLElement {
-    /**
-      * Sets or retrieves the character set used to encode the object.
-      */
-    charset: string;
-    /**
-      * Gets or sets meta-information to associate with httpEquiv or name.
-      */
-    content: string;
-    /**
-      * Gets or sets information used to bind the value of a content attribute of a meta element to an HTTP response header.
-      */
-    httpEquiv: string;
-    /**
-      * Sets or retrieves the value specified in the content attribute of the meta object.
-      */
-    name: string;
-    /**
-      * Sets or retrieves a scheme to be used in interpreting the value of a property specified for the object.
-      */
-    scheme: string;
-    /**
-      * Sets or retrieves the URL property that will be loaded after the specified time has elapsed.
-      */
-    url: string;
-}
-
-declare var HTMLMetaElement: {
-    prototype: HTMLMetaElement;
-    new(): HTMLMetaElement;
-}
-
-interface HTMLModElement extends HTMLElement {
-    /**
-      * Sets or retrieves reference information about the object.
-      */
-    cite: string;
-    /**
-      * Sets or retrieves the date and time of a modification to the object.
-      */
-    dateTime: string;
-}
-
-declare var HTMLModElement: {
-    prototype: HTMLModElement;
-    new(): HTMLModElement;
-}
-
-interface HTMLNextIdElement extends HTMLElement {
-    n: string;
-}
-
-declare var HTMLNextIdElement: {
-    prototype: HTMLNextIdElement;
-    new(): HTMLNextIdElement;
-}
-
-interface HTMLOListElement extends HTMLElement {
-    compact: boolean;
-    /**
-      * The starting number.
-      */
-    start: number;
-    type: string;
-}
-
-declare var HTMLOListElement: {
-    prototype: HTMLOListElement;
-    new(): HTMLOListElement;
-}
-
-interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
-    /**
-      * Retrieves a string of the URL where the object tag can be found. This is often the href of the document that the object is in, or the value set by a base element.
-      */
-    BaseHref: string;
-    align: string;
-    /**
-      * Sets or retrieves a text alternative to the graphic.
-      */
-    alt: string;
-    /**
-      * Gets or sets the optional alternative HTML script to execute if the object fails to load.
-      */
-    altHtml: string;
-    /**
-      * Sets or retrieves a character string that can be used to implement your own archive functionality for the object.
-      */
-    archive: string;
-    border: string;
-    /**
-      * Sets or retrieves the URL of the file containing the compiled Java class.
-      */
-    code: string;
-    /**
-      * Sets or retrieves the URL of the component.
-      */
-    codeBase: string;
-    /**
-      * Sets or retrieves the Internet media type for the code associated with the object.
-      */
-    codeType: string;
-    /**
-      * Retrieves the document object of the page or frame.
-      */
-    contentDocument: Document;
-    /**
-      * Sets or retrieves the URL that references the data of the object.
-      */
-    data: string;
-    declare: boolean;
-    /**
-      * Retrieves a reference to the form that the object is embedded in.
-      */
-    form: HTMLFormElement;
-    /**
-      * Sets or retrieves the height of the object.
-      */
-    height: string;
-    hspace: number;
-    /**
-      * Gets or sets whether the DLNA PlayTo device is available.
-      */
-    msPlayToDisabled: boolean;
-    /**
-      * Gets or sets the path to the preferred media source. This enables the Play To target device to stream the media content, which can be DRM protected, from a different location, such as a cloud media server.
-      */
-    msPlayToPreferredSourceUri: string;
-    /**
-      * Gets or sets the primary DLNA PlayTo device.
-      */
-    msPlayToPrimary: boolean;
-    /**
-      * Gets the source associated with the media element for use by the PlayToManager.
-      */
-    msPlayToSource: any;
-    /**
-      * Sets or retrieves the name of the object.
-      */
-    name: string;
-    /**
-      * Retrieves the contained object.
-      */
-    object: any;
-    readyState: number;
-    /**
-      * Sets or retrieves a message to be displayed while an object is loading.
-      */
-    standby: string;
-    /**
-      * Sets or retrieves the MIME type of the object.
-      */
-    type: string;
-    /**
-      * Sets or retrieves the URL, often with a bookmark extension (#name), to use as a client-side image map.
-      */
-    useMap: string;
-    /**
-      * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
-      */
-    validationMessage: string;
-    /**
-      * Returns a  ValidityState object that represents the validity states of an element.
-      */
-    validity: ValidityState;
-    vspace: number;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    width: string;
-    /**
-      * Returns whether an element will successfully validate based on forms validation rules and constraints.
-      */
-    willValidate: boolean;
-    /**
-      * Returns whether a form will validate when it is submitted, without having to submit it.
-      */
-    checkValidity(): boolean;
-    /**
-      * Sets a custom error message that is displayed when a form is submitted.
-      * @param error Sets a custom error message that is displayed when a form is submitted.
-      */
-    setCustomValidity(error: string): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLObjectElement: {
-    prototype: HTMLObjectElement;
-    new(): HTMLObjectElement;
-}
-
-interface HTMLOptGroupElement extends HTMLElement {
-    /**
-      * Sets or retrieves the status of an option.
-      */
-    defaultSelected: boolean;
-    disabled: boolean;
-    /**
-      * Retrieves a reference to the form that the object is embedded in.
-      */
-    form: HTMLFormElement;
-    /**
-      * Sets or retrieves the ordinal position of an option in a list box.
-      */
-    index: number;
-    /**
-      * Sets or retrieves a value that you can use to implement your own label functionality for the object.
-      */
-    label: string;
-    /**
-      * Sets or retrieves whether the option in the list box is the default item.
-      */
-    selected: boolean;
-    /**
-      * Sets or retrieves the text string specified by the option tag.
-      */
-    text: string;
-    /**
-      * Sets or retrieves the value which is returned to the server when the form control is submitted.
-      */
-    value: string;
-}
-
-declare var HTMLOptGroupElement: {
-    prototype: HTMLOptGroupElement;
-    new(): HTMLOptGroupElement;
-}
-
-interface HTMLOptionElement extends HTMLElement {
-    /**
-      * Sets or retrieves the status of an option.
-      */
-    defaultSelected: boolean;
-    disabled: boolean;
-    /**
-      * Retrieves a reference to the form that the object is embedded in.
-      */
-    form: HTMLFormElement;
-    /**
-      * Sets or retrieves the ordinal position of an option in a list box.
-      */
-    index: number;
-    /**
-      * Sets or retrieves a value that you can use to implement your own label functionality for the object.
-      */
-    label: string;
-    /**
-      * Sets or retrieves whether the option in the list box is the default item.
-      */
-    selected: boolean;
-    /**
-      * Sets or retrieves the text string specified by the option tag.
-      */
-    text: string;
-    /**
-      * Sets or retrieves the value which is returned to the server when the form control is submitted.
-      */
-    value: string;
-}
-
-declare var HTMLOptionElement: {
-    prototype: HTMLOptionElement;
-    new(): HTMLOptionElement;
-    create(): HTMLOptionElement;
-}
-
-interface HTMLParagraphElement extends HTMLElement {
-    /**
-      * Sets or retrieves how the object is aligned with adjacent text.
-      */
-    align: string;
-    clear: string;
-}
-
-declare var HTMLParagraphElement: {
-    prototype: HTMLParagraphElement;
-    new(): HTMLParagraphElement;
-}
-
-interface HTMLParamElement extends HTMLElement {
-    /**
-      * Sets or retrieves the name of an input parameter for an element.
-      */
-    name: string;
-    /**
-      * Sets or retrieves the content type of the resource designated by the value attribute.
-      */
-    type: string;
-    /**
-      * Sets or retrieves the value of an input parameter for an element.
-      */
-    value: string;
-    /**
-      * Sets or retrieves the data type of the value attribute.
-      */
-    valueType: string;
-}
-
-declare var HTMLParamElement: {
-    prototype: HTMLParamElement;
-    new(): HTMLParamElement;
-}
-
-interface HTMLPhraseElement extends HTMLElement {
-    /**
-      * Sets or retrieves reference information about the object.
-      */
-    cite: string;
-    /**
-      * Sets or retrieves the date and time of a modification to the object.
-      */
-    dateTime: string;
-}
-
-declare var HTMLPhraseElement: {
-    prototype: HTMLPhraseElement;
-    new(): HTMLPhraseElement;
-}
-
-interface HTMLPreElement extends HTMLElement {
-    /**
-      * Indicates a citation by rendering text in italic type.
-      */
-    cite: string;
-    clear: string;
-    /**
-      * Sets or gets a value that you can use to implement your own width functionality for the object.
-      */
-    width: number;
-}
-
-declare var HTMLPreElement: {
-    prototype: HTMLPreElement;
-    new(): HTMLPreElement;
-}
-
-interface HTMLProgressElement extends HTMLElement {
-    /**
-      * Retrieves a reference to the form that the object is embedded in.
-      */
-    form: HTMLFormElement;
-    /**
-      * Defines the maximum, or "done" value for a progress element.
-      */
-    max: number;
-    /**
-      * Returns the quotient of value/max when the value attribute is set (determinate progress bar), or -1 when the value attribute is missing (indeterminate progress bar).
-      */
-    position: number;
-    /**
-      * Sets or gets the current value of a progress element. The value must be a non-negative number between 0 and the max value.
-      */
-    value: number;
-}
-
-declare var HTMLProgressElement: {
-    prototype: HTMLProgressElement;
-    new(): HTMLProgressElement;
-}
-
-interface HTMLQuoteElement extends HTMLElement {
-    /**
-      * Sets or retrieves reference information about the object.
-      */
-    cite: string;
-    /**
-      * Sets or retrieves the date and time of a modification to the object.
-      */
-    dateTime: string;
-}
-
-declare var HTMLQuoteElement: {
-    prototype: HTMLQuoteElement;
-    new(): HTMLQuoteElement;
-}
-
-interface HTMLScriptElement extends HTMLElement {
-    async: boolean;
-    /**
-      * Sets or retrieves the character set used to encode the object.
-      */
-    charset: string;
-    /**
-      * Sets or retrieves the status of the script.
-      */
-    defer: boolean;
-    /**
-      * Sets or retrieves the event for which the script is written.
-      */
-    event: string;
-    /**
-      * Sets or retrieves the object that is bound to the event script.
-      */
-    htmlFor: string;
-    /**
-      * Retrieves the URL to an external file that contains the source code or data.
-      */
-    src: string;
-    /**
-      * Retrieves or sets the text of the object as a string.
-      */
-    text: string;
-    /**
-      * Sets or retrieves the MIME type for the associated scripting engine.
-      */
-    type: string;
-}
-
-declare var HTMLScriptElement: {
-    prototype: HTMLScriptElement;
-    new(): HTMLScriptElement;
-}
-
-interface HTMLSelectElement extends HTMLElement {
-    /**
-      * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.
-      */
-    autofocus: boolean;
-    disabled: boolean;
-    /**
-      * Retrieves a reference to the form that the object is embedded in.
-      */
-    form: HTMLFormElement;
-    /**
-      * Sets or retrieves the number of objects in a collection.
-      */
-    length: number;
-    /**
-      * Sets or retrieves the Boolean value indicating whether multiple items can be selected from a list.
-      */
-    multiple: boolean;
-    /**
-      * Sets or retrieves the name of the object.
-      */
-    name: string;
-    options: HTMLSelectElement;
-    /**
-      * When present, marks an element that can't be submitted without a value.
-      */
-    required: boolean;
-    /**
-      * Sets or retrieves the index of the selected option in a select object.
-      */
-    selectedIndex: number;
-    /**
-      * Sets or retrieves the number of rows in the list box.
-      */
-    size: number;
-    /**
-      * Retrieves the type of select control based on the value of the MULTIPLE attribute.
-      */
-    type: string;
-    /**
-      * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
-      */
-    validationMessage: string;
-    /**
-      * Returns a  ValidityState object that represents the validity states of an element.
-      */
-    validity: ValidityState;
-    /**
-      * Sets or retrieves the value which is returned to the server when the form control is submitted.
-      */
-    value: string;
-    /**
-      * Returns whether an element will successfully validate based on forms validation rules and constraints.
-      */
-    willValidate: boolean;
-    /**
-      * Adds an element to the areas, controlRange, or options collection.
-      * @param element Variant of type Number that specifies the index position in the collection where the element is placed. If no value is given, the method places the element at the end of the collection.
-      * @param before Variant of type Object that specifies an element to insert before, or null to append the object to the collection.
-      */
-    add(element: HTMLElement, before?: HTMLElement | number): void;
-    /**
-      * Returns whether a form will validate when it is submitted, without having to submit it.
-      */
-    checkValidity(): boolean;
-    /**
-      * Retrieves a select object or an object from an options collection.
-      * @param name Variant of type Number or String that specifies the object or collection to retrieve. If this parameter is an integer, it is the zero-based index of the object. If this parameter is a string, all objects with matching name or id properties are retrieved, and a collection is returned if more than one match is made.
-      * @param index Variant of type Number that specifies the zero-based index of the object to retrieve when a collection is returned.
-      */
-    item(name?: any, index?: any): any;
-    /**
-      * Retrieves a select object or an object from an options collection.
-      * @param namedItem A String that specifies the name or id property of the object to retrieve. A collection is returned if more than one match is made.
-      */
-    namedItem(name: string): any;
-    /**
-      * Removes an element from the collection.
-      * @param index Number that specifies the zero-based index of the element to remove from the collection.
-      */
-    remove(index?: number): void;
-    /**
-      * Sets a custom error message that is displayed when a form is submitted.
-      * @param error Sets a custom error message that is displayed when a form is submitted.
-      */
-    setCustomValidity(error: string): void;
-    [name: string]: any;
-}
-
-declare var HTMLSelectElement: {
-    prototype: HTMLSelectElement;
-    new(): HTMLSelectElement;
-}
-
-interface HTMLSourceElement extends HTMLElement {
-    /**
-      * Gets or sets the intended media type of the media source.
-     */
-    media: string;
-    msKeySystem: string;
-    /**
-      * The address or URL of the a media resource that is to be considered.
-      */
-    src: string;
-    /**
-     * Gets or sets the MIME type of a media resource.
-     */
-    type: string;
-}
-
-declare var HTMLSourceElement: {
-    prototype: HTMLSourceElement;
-    new(): HTMLSourceElement;
-}
-
-interface HTMLSpanElement extends HTMLElement {
-}
-
-declare var HTMLSpanElement: {
-    prototype: HTMLSpanElement;
-    new(): HTMLSpanElement;
-}
-
-interface HTMLStyleElement extends HTMLElement, LinkStyle {
-    /**
-      * Sets or retrieves the media type.
-      */
-    media: string;
-    /**
-      * Retrieves the CSS language in which the style sheet is written.
-      */
-    type: string;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLStyleElement: {
-    prototype: HTMLStyleElement;
-    new(): HTMLStyleElement;
-}
-
-interface HTMLTableCaptionElement extends HTMLElement {
-    /**
-      * Sets or retrieves the alignment of the caption or legend.
-      */
-    align: string;
-    /**
-      * Sets or retrieves whether the caption appears at the top or bottom of the table.
-      */
-    vAlign: string;
-}
-
-declare var HTMLTableCaptionElement: {
-    prototype: HTMLTableCaptionElement;
-    new(): HTMLTableCaptionElement;
-}
-
-interface HTMLTableCellElement extends HTMLElement, HTMLTableAlignment {
-    /**
-      * Sets or retrieves abbreviated text for the object.
-      */
-    abbr: string;
-    /**
-      * Sets or retrieves how the object is aligned with adjacent text.
-      */
-    align: string;
-    /**
-      * Sets or retrieves a comma-delimited list of conceptual categories associated with the object.
-      */
-    axis: string;
-    bgColor: any;
-    /**
-      * Retrieves the position of the object in the cells collection of a row.
-      */
-    cellIndex: number;
-    /**
-      * Sets or retrieves the number columns in the table that the object should span.
-      */
-    colSpan: number;
-    /**
-      * Sets or retrieves a list of header cells that provide information for the object.
-      */
-    headers: string;
-    /**
-      * Sets or retrieves the height of the object.
-      */
-    height: any;
-    /**
-      * Sets or retrieves whether the browser automatically performs wordwrap.
-      */
-    noWrap: boolean;
-    /**
-      * Sets or retrieves how many rows in a table the cell should span.
-      */
-    rowSpan: number;
-    /**
-      * Sets or retrieves the group of cells in a table to which the object's information applies.
-      */
-    scope: string;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    width: string;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLTableCellElement: {
-    prototype: HTMLTableCellElement;
-    new(): HTMLTableCellElement;
-}
-
-interface HTMLTableColElement extends HTMLElement, HTMLTableAlignment {
-    /**
-      * Sets or retrieves the alignment of the object relative to the display or table.
-      */
-    align: string;
-    /**
-      * Sets or retrieves the number of columns in the group.
-      */
-    span: number;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    width: any;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLTableColElement: {
-    prototype: HTMLTableColElement;
-    new(): HTMLTableColElement;
-}
-
-interface HTMLTableDataCellElement extends HTMLTableCellElement {
-}
-
-declare var HTMLTableDataCellElement: {
-    prototype: HTMLTableDataCellElement;
-    new(): HTMLTableDataCellElement;
-}
-
-interface HTMLTableElement extends HTMLElement {
-    /**
-      * Sets or retrieves a value that indicates the table alignment.
-      */
-    align: string;
-    bgColor: any;
-    /**
-      * Sets or retrieves the width of the border to draw around the object.
-      */
-    border: string;
-    /**
-      * Sets or retrieves the border color of the object.
-      */
-    borderColor: any;
-    /**
-      * Retrieves the caption object of a table.
-      */
-    caption: HTMLTableCaptionElement;
-    /**
-      * Sets or retrieves the amount of space between the border of the cell and the content of the cell.
-      */
-    cellPadding: string;
-    /**
-      * Sets or retrieves the amount of space between cells in a table.
-      */
-    cellSpacing: string;
-    /**
-      * Sets or retrieves the number of columns in the table.
-      */
-    cols: number;
-    /**
-      * Sets or retrieves the way the border frame around the table is displayed.
-      */
-    frame: string;
-    /**
-      * Sets or retrieves the height of the object.
-      */
-    height: any;
-    /**
-      * Sets or retrieves the number of horizontal rows contained in the object.
-      */
-    rows: HTMLCollection;
-    /**
-      * Sets or retrieves which dividing lines (inner borders) are displayed.
-      */
-    rules: string;
-    /**
-      * Sets or retrieves a description and/or structure of the object.
-      */
-    summary: string;
-    /**
-      * Retrieves a collection of all tBody objects in the table. Objects in this collection are in source order.
-      */
-    tBodies: HTMLCollection;
-    /**
-      * Retrieves the tFoot object of the table.
-      */
-    tFoot: HTMLTableSectionElement;
-    /**
-      * Retrieves the tHead object of the table.
-      */
-    tHead: HTMLTableSectionElement;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    width: string;
-    /**
-      * Creates an empty caption element in the table.
-      */
-    createCaption(): HTMLElement;
-    /**
-      * Creates an empty tBody element in the table.
-      */
-    createTBody(): HTMLElement;
-    /**
-      * Creates an empty tFoot element in the table.
-      */
-    createTFoot(): HTMLElement;
-    /**
-      * Returns the tHead element object if successful, or null otherwise.
-      */
-    createTHead(): HTMLElement;
-    /**
-      * Deletes the caption element and its contents from the table.
-      */
-    deleteCaption(): void;
-    /**
-      * Removes the specified row (tr) from the element and from the rows collection.
-      * @param index Number that specifies the zero-based position in the rows collection of the row to remove.
-      */
-    deleteRow(index?: number): void;
-    /**
-      * Deletes the tFoot element and its contents from the table.
-      */
-    deleteTFoot(): void;
-    /**
-      * Deletes the tHead element and its contents from the table.
-      */
-    deleteTHead(): void;
-    /**
-      * Creates a new row (tr) in the table, and adds the row to the rows collection.
-      * @param index Number that specifies where to insert the row in the rows collection. The default value is -1, which appends the new row to the end of the rows collection.
-      */
-    insertRow(index?: number): HTMLElement;
-}
-
-declare var HTMLTableElement: {
-    prototype: HTMLTableElement;
-    new(): HTMLTableElement;
-}
-
-interface HTMLTableHeaderCellElement extends HTMLTableCellElement {
-    /**
-      * Sets or retrieves the group of cells in a table to which the object's information applies.
-      */
-    scope: string;
-}
-
-declare var HTMLTableHeaderCellElement: {
-    prototype: HTMLTableHeaderCellElement;
-    new(): HTMLTableHeaderCellElement;
-}
-
-interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
-    /**
-      * Sets or retrieves how the object is aligned with adjacent text.
-      */
-    align: string;
-    bgColor: any;
-    /**
-      * Retrieves a collection of all cells in the table row.
-      */
-    cells: HTMLCollection;
-    /**
-      * Sets or retrieves the height of the object.
-      */
-    height: any;
-    /**
-      * Retrieves the position of the object in the rows collection for the table.
-      */
-    rowIndex: number;
-    /**
-      * Retrieves the position of the object in the collection.
-      */
-    sectionRowIndex: number;
-    /**
-      * Removes the specified cell from the table row, as well as from the cells collection.
-      * @param index Number that specifies the zero-based position of the cell to remove from the table row. If no value is provided, the last cell in the cells collection is deleted.
-      */
-    deleteCell(index?: number): void;
-    /**
-      * Creates a new cell in the table row, and adds the cell to the cells collection.
-      * @param index Number that specifies where to insert the cell in the tr. The default value is -1, which appends the new cell to the end of the cells collection.
-      */
-    insertCell(index?: number): HTMLElement;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLTableRowElement: {
-    prototype: HTMLTableRowElement;
-    new(): HTMLTableRowElement;
-}
-
-interface HTMLTableSectionElement extends HTMLElement, HTMLTableAlignment {
-    /**
-      * Sets or retrieves a value that indicates the table alignment.
-      */
-    align: string;
-    /**
-      * Sets or retrieves the number of horizontal rows contained in the object.
-      */
-    rows: HTMLCollection;
-    /**
-      * Removes the specified row (tr) from the element and from the rows collection.
-      * @param index Number that specifies the zero-based position in the rows collection of the row to remove.
-      */
-    deleteRow(index?: number): void;
-    /**
-      * Creates a new row (tr) in the table, and adds the row to the rows collection.
-      * @param index Number that specifies where to insert the row in the rows collection. The default value is -1, which appends the new row to the end of the rows collection.
-      */
-    insertRow(index?: number): HTMLElement;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLTableSectionElement: {
-    prototype: HTMLTableSectionElement;
-    new(): HTMLTableSectionElement;
-}
-
-interface HTMLTextAreaElement extends HTMLElement {
-    /**
-      * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.
-      */
-    autofocus: boolean;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    cols: number;
-    /**
-      * Sets or retrieves the initial contents of the object.
-      */
-    defaultValue: string;
-    disabled: boolean;
-    /**
-      * Retrieves a reference to the form that the object is embedded in.
-      */
-    form: HTMLFormElement;
-    /**
-      * Sets or retrieves the maximum number of characters that the user can enter in a text control.
-      */
-    maxLength: number;
-    /**
-      * Sets or retrieves the name of the object.
-      */
-    name: string;
-    /**
-      * Gets or sets a text string that is displayed in an input field as a hint or prompt to users as the format or type of information they need to enter.The text appears in an input field until the user puts focus on the field.
-      */
-    placeholder: string;
-    /**
-      * Sets or retrieves the value indicated whether the content of the object is read-only.
-      */
-    readOnly: boolean;
-    /**
-      * When present, marks an element that can't be submitted without a value.
-      */
-    required: boolean;
-    /**
-      * Sets or retrieves the number of horizontal rows contained in the object.
-      */
-    rows: number;
-    /**
-      * Gets or sets the end position or offset of a text selection.
-      */
-    selectionEnd: number;
-    /**
-      * Gets or sets the starting position or offset of a text selection.
-      */
-    selectionStart: number;
-    /**
-      * Sets or retrieves the value indicating whether the control is selected.
-      */
-    status: any;
-    /**
-      * Retrieves the type of control.
-      */
-    type: string;
-    /**
-      * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
-      */
-    validationMessage: string;
-    /**
-      * Returns a  ValidityState object that represents the validity states of an element.
-      */
-    validity: ValidityState;
-    /**
-      * Retrieves or sets the text in the entry field of the textArea element.
-      */
-    value: string;
-    /**
-      * Returns whether an element will successfully validate based on forms validation rules and constraints.
-      */
-    willValidate: boolean;
-    /**
-      * Sets or retrieves how to handle wordwrapping in the object.
-      */
-    wrap: string;
-    /**
-      * Returns whether a form will validate when it is submitted, without having to submit it.
-      */
-    checkValidity(): boolean;
-    /**
-      * Creates a TextRange object for the element.
-      */
-    createTextRange(): TextRange;
-    /**
-      * Highlights the input area of a form element.
-      */
-    select(): void;
-    /**
-      * Sets a custom error message that is displayed when a form is submitted.
-      * @param error Sets a custom error message that is displayed when a form is submitted.
-      */
-    setCustomValidity(error: string): void;
-    /**
-      * Sets the start and end positions of a selection in a text field.
-      * @param start The offset into the text field for the start of the selection.
-      * @param end The offset into the text field for the end of the selection.
-      */
-    setSelectionRange(start: number, end: number): void;
-}
-
-declare var HTMLTextAreaElement: {
-    prototype: HTMLTextAreaElement;
-    new(): HTMLTextAreaElement;
-}
-
-interface HTMLTitleElement extends HTMLElement {
-    /**
-      * Retrieves or sets the text of the object as a string.
-      */
-    text: string;
-}
-
-declare var HTMLTitleElement: {
-    prototype: HTMLTitleElement;
-    new(): HTMLTitleElement;
-}
-
-interface HTMLTrackElement extends HTMLElement {
-    default: boolean;
-    kind: string;
-    label: string;
-    readyState: number;
-    src: string;
-    srclang: string;
-    track: TextTrack;
-    ERROR: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
-}
-
-declare var HTMLTrackElement: {
-    prototype: HTMLTrackElement;
-    new(): HTMLTrackElement;
-    ERROR: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
-}
-
-interface HTMLUListElement extends HTMLElement {
-    compact: boolean;
-    type: string;
-}
-
-declare var HTMLUListElement: {
-    prototype: HTMLUListElement;
-    new(): HTMLUListElement;
-}
-
-interface HTMLUnknownElement extends HTMLElement {
-}
-
-declare var HTMLUnknownElement: {
-    prototype: HTMLUnknownElement;
-    new(): HTMLUnknownElement;
-}
-
-interface HTMLVideoElement extends HTMLMediaElement {
-    /**
-      * Gets or sets the height of the video element.
-      */
-    height: number;
-    msHorizontalMirror: boolean;
-    msIsLayoutOptimalForPlayback: boolean;
-    msIsStereo3D: boolean;
-    msStereo3DPackingMode: string;
-    msStereo3DRenderMode: string;
-    msZoom: boolean;
-    onMSVideoFormatChanged: (ev: Event) => any;
-    onMSVideoFrameStepCompleted: (ev: Event) => any;
-    onMSVideoOptimalLayoutChanged: (ev: Event) => any;
-    /**
-      * Gets or sets a URL of an image to display, for example, like a movie poster. This can be a still frame from the video, or another image if no video data is available.
-      */
-    poster: string;
-    /**
-      * Gets the intrinsic height of a video in CSS pixels, or zero if the dimensions are not known.
-      */
-    videoHeight: number;
-    /**
-      * Gets the intrinsic width of a video in CSS pixels, or zero if the dimensions are not known.
-      */
-    videoWidth: number;
-    webkitDisplayingFullscreen: boolean;
-    webkitSupportsFullscreen: boolean;
-    /**
-      * Gets or sets the width of the video element.
-      */
-    width: number;
-    getVideoPlaybackQuality(): VideoPlaybackQuality;
-    msFrameStep(forward: boolean): void;
-    msInsertVideoEffect(activatableClassId: string, effectRequired: boolean, config?: any): void;
-    msSetVideoRectangle(left: number, top: number, right: number, bottom: number): void;
-    webkitEnterFullScreen(): void;
-    webkitEnterFullscreen(): void;
-    webkitExitFullScreen(): void;
-    webkitExitFullscreen(): void;
-    addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSVideoFormatChanged", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSVideoFrameStepCompleted", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSVideoOptimalLayoutChanged", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "msneedkey", listener: (ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var HTMLVideoElement: {
-    prototype: HTMLVideoElement;
-    new(): HTMLVideoElement;
-}
-
-interface HashChangeEvent extends Event {
-    newURL: string;
-    oldURL: string;
-}
-
-declare var HashChangeEvent: {
-    prototype: HashChangeEvent;
-    new(type: string, eventInitDict?: HashChangeEventInit): HashChangeEvent;
-}
-
-interface History {
-    length: number;
-    state: any;
-    back(distance?: any): void;
-    forward(distance?: any): void;
-    go(delta?: any): void;
-    pushState(statedata: any, title?: string, url?: string): void;
-    replaceState(statedata: any, title?: string, url?: string): void;
-}
-
-declare var History: {
-    prototype: History;
-    new(): History;
-}
-
-interface IDBCursor {
-    direction: string;
-    key: any;
-    primaryKey: any;
-    source: any;
-    advance(count: number): void;
-    continue(key?: any): void;
-    delete(): IDBRequest;
-    update(value: any): IDBRequest;
-    NEXT: string;
-    NEXT_NO_DUPLICATE: string;
-    PREV: string;
-    PREV_NO_DUPLICATE: string;
-}
-
-declare var IDBCursor: {
-    prototype: IDBCursor;
-    new(): IDBCursor;
-    NEXT: string;
-    NEXT_NO_DUPLICATE: string;
-    PREV: string;
-    PREV_NO_DUPLICATE: string;
-}
-
-interface IDBCursorWithValue extends IDBCursor {
-    value: any;
-}
-
-declare var IDBCursorWithValue: {
-    prototype: IDBCursorWithValue;
-    new(): IDBCursorWithValue;
-}
-
-interface IDBDatabase extends EventTarget {
-    name: string;
-    objectStoreNames: DOMStringList;
-    onabort: (ev: Event) => any;
-    onerror: (ev: Event) => any;
-    version: string;
-    close(): void;
-    createObjectStore(name: string, optionalParameters?: any): IDBObjectStore;
-    deleteObjectStore(name: string): void;
-    transaction(storeNames: any, mode?: string): IDBTransaction;
-    addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var IDBDatabase: {
-    prototype: IDBDatabase;
-    new(): IDBDatabase;
-}
-
-interface IDBFactory {
-    cmp(first: any, second: any): number;
-    deleteDatabase(name: string): IDBOpenDBRequest;
-    open(name: string, version?: number): IDBOpenDBRequest;
-}
-
-declare var IDBFactory: {
-    prototype: IDBFactory;
-    new(): IDBFactory;
-}
-
-interface IDBIndex {
-    keyPath: string;
-    name: string;
-    objectStore: IDBObjectStore;
-    unique: boolean;
-    count(key?: any): IDBRequest;
-    get(key: any): IDBRequest;
-    getKey(key: any): IDBRequest;
-    openCursor(range?: IDBKeyRange, direction?: string): IDBRequest;
-    openKeyCursor(range?: IDBKeyRange, direction?: string): IDBRequest;
-}
-
-declare var IDBIndex: {
-    prototype: IDBIndex;
-    new(): IDBIndex;
-}
-
-interface IDBKeyRange {
-    lower: any;
-    lowerOpen: boolean;
-    upper: any;
-    upperOpen: boolean;
-}
-
-declare var IDBKeyRange: {
-    prototype: IDBKeyRange;
-    new(): IDBKeyRange;
-    bound(lower: any, upper: any, lowerOpen?: boolean, upperOpen?: boolean): IDBKeyRange;
-    lowerBound(bound: any, open?: boolean): IDBKeyRange;
-    only(value: any): IDBKeyRange;
-    upperBound(bound: any, open?: boolean): IDBKeyRange;
-}
-
-interface IDBObjectStore {
-    indexNames: DOMStringList;
-    keyPath: string;
-    name: string;
-    transaction: IDBTransaction;
-    add(value: any, key?: any): IDBRequest;
-    clear(): IDBRequest;
-    count(key?: any): IDBRequest;
-    createIndex(name: string, keyPath: string, optionalParameters?: any): IDBIndex;
-    delete(key: any): IDBRequest;
-    deleteIndex(indexName: string): void;
-    get(key: any): IDBRequest;
-    index(name: string): IDBIndex;
-    openCursor(range?: any, direction?: string): IDBRequest;
-    put(value: any, key?: any): IDBRequest;
-}
-
-declare var IDBObjectStore: {
-    prototype: IDBObjectStore;
-    new(): IDBObjectStore;
-}
-
-interface IDBOpenDBRequest extends IDBRequest {
-    onblocked: (ev: Event) => any;
-    onupgradeneeded: (ev: IDBVersionChangeEvent) => any;
-    addEventListener(type: "blocked", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "success", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "upgradeneeded", listener: (ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var IDBOpenDBRequest: {
-    prototype: IDBOpenDBRequest;
-    new(): IDBOpenDBRequest;
-}
-
-interface IDBRequest extends EventTarget {
-    error: DOMError;
-    onerror: (ev: Event) => any;
-    onsuccess: (ev: Event) => any;
-    readyState: string;
-    result: any;
-    source: any;
-    transaction: IDBTransaction;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "success", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var IDBRequest: {
-    prototype: IDBRequest;
-    new(): IDBRequest;
-}
-
-interface IDBTransaction extends EventTarget {
-    db: IDBDatabase;
-    error: DOMError;
-    mode: string;
-    onabort: (ev: Event) => any;
-    oncomplete: (ev: Event) => any;
-    onerror: (ev: Event) => any;
-    abort(): void;
-    objectStore(name: string): IDBObjectStore;
-    READ_ONLY: string;
-    READ_WRITE: string;
-    VERSION_CHANGE: string;
-    addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var IDBTransaction: {
-    prototype: IDBTransaction;
-    new(): IDBTransaction;
-    READ_ONLY: string;
-    READ_WRITE: string;
-    VERSION_CHANGE: string;
-}
-
-interface IDBVersionChangeEvent extends Event {
-    newVersion: number;
-    oldVersion: number;
-}
-
-declare var IDBVersionChangeEvent: {
-    prototype: IDBVersionChangeEvent;
-    new(): IDBVersionChangeEvent;
-}
-
-interface ImageData {
-    data: number[];
-    height: number;
-    width: number;
-}
-
-declare var ImageData: {
-    prototype: ImageData;
-    new(width: number, height: number): ImageData;
-    new(array: Uint8ClampedArray, width: number, height: number): ImageData;
-}
-
-interface KeyboardEvent extends UIEvent {
-    altKey: boolean;
-    char: string;
-    charCode: number;
-    ctrlKey: boolean;
-    key: string;
-    keyCode: number;
-    locale: string;
-    location: number;
-    metaKey: boolean;
-    repeat: boolean;
-    shiftKey: boolean;
-    which: number;
-    getModifierState(keyArg: string): boolean;
-    initKeyboardEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, keyArg: string, locationArg: number, modifiersListArg: string, repeat: boolean, locale: string): void;
-    DOM_KEY_LOCATION_JOYSTICK: number;
-    DOM_KEY_LOCATION_LEFT: number;
-    DOM_KEY_LOCATION_MOBILE: number;
-    DOM_KEY_LOCATION_NUMPAD: number;
-    DOM_KEY_LOCATION_RIGHT: number;
-    DOM_KEY_LOCATION_STANDARD: number;
-}
-
-declare var KeyboardEvent: {
-    prototype: KeyboardEvent;
-    new(typeArg: string, eventInitDict?: KeyboardEventInit): KeyboardEvent;
-    DOM_KEY_LOCATION_JOYSTICK: number;
-    DOM_KEY_LOCATION_LEFT: number;
-    DOM_KEY_LOCATION_MOBILE: number;
-    DOM_KEY_LOCATION_NUMPAD: number;
-    DOM_KEY_LOCATION_RIGHT: number;
-    DOM_KEY_LOCATION_STANDARD: number;
-}
-
-interface Location {
-    hash: string;
-    host: string;
-    hostname: string;
-    href: string;
-    origin: string;
-    pathname: string;
-    port: string;
-    protocol: string;
-    search: string;
-    assign(url: string): void;
-    reload(forcedReload?: boolean): void;
-    replace(url: string): void;
-    toString(): string;
-}
-
-declare var Location: {
-    prototype: Location;
-    new(): Location;
-}
-
-interface LongRunningScriptDetectedEvent extends Event {
-    executionTime: number;
-    stopPageScriptExecution: boolean;
-}
-
-declare var LongRunningScriptDetectedEvent: {
-    prototype: LongRunningScriptDetectedEvent;
-    new(): LongRunningScriptDetectedEvent;
-}
-
-interface MSApp {
-    clearTemporaryWebDataAsync(): MSAppAsyncOperation;
-    createBlobFromRandomAccessStream(type: string, seeker: any): Blob;
-    createDataPackage(object: any): any;
-    createDataPackageFromSelection(): any;
-    createFileFromStorageFile(storageFile: any): File;
-    createStreamFromInputStream(type: string, inputStream: any): MSStream;
-    execAsyncAtPriority(asynchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): void;
-    execAtPriority(synchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): any;
-    getCurrentPriority(): string;
-    getHtmlPrintDocumentSourceAsync(htmlDoc: any): any;
-    getViewId(view: any): any;
-    isTaskScheduledAtPriorityOrHigher(priority: string): boolean;
-    pageHandlesAllApplicationActivations(enabled: boolean): void;
-    suppressSubdownloadCredentialPrompts(suppress: boolean): void;
-    terminateApp(exceptionObject: any): void;
-    CURRENT: string;
-    HIGH: string;
-    IDLE: string;
-    NORMAL: string;
-}
-declare var MSApp: MSApp;
-
-interface MSAppAsyncOperation extends EventTarget {
-    error: DOMError;
-    oncomplete: (ev: Event) => any;
-    onerror: (ev: Event) => any;
-    readyState: number;
-    result: any;
-    start(): void;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
-    addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var MSAppAsyncOperation: {
-    prototype: MSAppAsyncOperation;
-    new(): MSAppAsyncOperation;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
-}
-
-interface MSBlobBuilder {
-    append(data: any, endings?: string): void;
-    getBlob(contentType?: string): Blob;
-}
-
-declare var MSBlobBuilder: {
-    prototype: MSBlobBuilder;
-    new(): MSBlobBuilder;
-}
-
-interface MSCSSMatrix {
-    a: number;
-    b: number;
-    c: number;
-    d: number;
-    e: number;
-    f: number;
-    m11: number;
-    m12: number;
-    m13: number;
-    m14: number;
-    m21: number;
-    m22: number;
-    m23: number;
-    m24: number;
-    m31: number;
-    m32: number;
-    m33: number;
-    m34: number;
-    m41: number;
-    m42: number;
-    m43: number;
-    m44: number;
-    inverse(): MSCSSMatrix;
-    multiply(secondMatrix: MSCSSMatrix): MSCSSMatrix;
-    rotate(angleX: number, angleY?: number, angleZ?: number): MSCSSMatrix;
-    rotateAxisAngle(x: number, y: number, z: number, angle: number): MSCSSMatrix;
-    scale(scaleX: number, scaleY?: number, scaleZ?: number): MSCSSMatrix;
-    setMatrixValue(value: string): void;
-    skewX(angle: number): MSCSSMatrix;
-    skewY(angle: number): MSCSSMatrix;
-    toString(): string;
-    translate(x: number, y: number, z?: number): MSCSSMatrix;
-}
-
-declare var MSCSSMatrix: {
-    prototype: MSCSSMatrix;
-    new(text?: string): MSCSSMatrix;
-}
-
-interface MSGesture {
-    target: Element;
-    addPointer(pointerId: number): void;
-    stop(): void;
-}
-
-declare var MSGesture: {
-    prototype: MSGesture;
-    new(): MSGesture;
-}
-
-interface MSGestureEvent extends UIEvent {
-    clientX: number;
-    clientY: number;
-    expansion: number;
-    gestureObject: any;
-    hwTimestamp: number;
-    offsetX: number;
-    offsetY: number;
-    rotation: number;
-    scale: number;
-    screenX: number;
-    screenY: number;
-    translationX: number;
-    translationY: number;
-    velocityAngular: number;
-    velocityExpansion: number;
-    velocityX: number;
-    velocityY: number;
-    initGestureEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, offsetXArg: number, offsetYArg: number, translationXArg: number, translationYArg: number, scaleArg: number, expansionArg: number, rotationArg: number, velocityXArg: number, velocityYArg: number, velocityExpansionArg: number, velocityAngularArg: number, hwTimestampArg: number): void;
-    MSGESTURE_FLAG_BEGIN: number;
-    MSGESTURE_FLAG_CANCEL: number;
-    MSGESTURE_FLAG_END: number;
-    MSGESTURE_FLAG_INERTIA: number;
-    MSGESTURE_FLAG_NONE: number;
-}
-
-declare var MSGestureEvent: {
-    prototype: MSGestureEvent;
-    new(): MSGestureEvent;
-    MSGESTURE_FLAG_BEGIN: number;
-    MSGESTURE_FLAG_CANCEL: number;
-    MSGESTURE_FLAG_END: number;
-    MSGESTURE_FLAG_INERTIA: number;
-    MSGESTURE_FLAG_NONE: number;
-}
-
-interface MSGraphicsTrust {
-    constrictionActive: boolean;
-    status: string;
-}
-
-declare var MSGraphicsTrust: {
-    prototype: MSGraphicsTrust;
-    new(): MSGraphicsTrust;
-}
-
-interface MSHTMLWebViewElement extends HTMLElement {
-    canGoBack: boolean;
-    canGoForward: boolean;
-    containsFullScreenElement: boolean;
-    documentTitle: string;
-    height: number;
-    settings: MSWebViewSettings;
-    src: string;
-    width: number;
-    addWebAllowedObject(name: string, applicationObject: any): void;
-    buildLocalStreamUri(contentIdentifier: string, relativePath: string): string;
-    capturePreviewToBlobAsync(): MSWebViewAsyncOperation;
-    captureSelectedContentToDataPackageAsync(): MSWebViewAsyncOperation;
-    getDeferredPermissionRequestById(id: number): DeferredPermissionRequest;
-    getDeferredPermissionRequests(): DeferredPermissionRequest[];
-    goBack(): void;
-    goForward(): void;
-    invokeScriptAsync(scriptName: string, ...args: any[]): MSWebViewAsyncOperation;
-    navigate(uri: string): void;
-    navigateToLocalStreamUri(source: string, streamResolver: any): void;
-    navigateToString(contents: string): void;
-    navigateWithHttpRequestMessage(requestMessage: any): void;
-    refresh(): void;
-    stop(): void;
-}
-
-declare var MSHTMLWebViewElement: {
-    prototype: MSHTMLWebViewElement;
-    new(): MSHTMLWebViewElement;
-}
-
-interface MSInputMethodContext extends EventTarget {
-    compositionEndOffset: number;
-    compositionStartOffset: number;
-    oncandidatewindowhide: (ev: Event) => any;
-    oncandidatewindowshow: (ev: Event) => any;
-    oncandidatewindowupdate: (ev: Event) => any;
-    target: HTMLElement;
-    getCandidateWindowClientRect(): ClientRect;
-    getCompositionAlternatives(): string[];
-    hasComposition(): boolean;
-    isCandidateWindowVisible(): boolean;
-    addEventListener(type: "MSCandidateWindowHide", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSCandidateWindowShow", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSCandidateWindowUpdate", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var MSInputMethodContext: {
-    prototype: MSInputMethodContext;
-    new(): MSInputMethodContext;
-}
-
-interface MSManipulationEvent extends UIEvent {
-    currentState: number;
-    inertiaDestinationX: number;
-    inertiaDestinationY: number;
-    lastState: number;
-    initMSManipulationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, lastState: number, currentState: number): void;
-    MS_MANIPULATION_STATE_ACTIVE: number;
-    MS_MANIPULATION_STATE_CANCELLED: number;
-    MS_MANIPULATION_STATE_COMMITTED: number;
-    MS_MANIPULATION_STATE_DRAGGING: number;
-    MS_MANIPULATION_STATE_INERTIA: number;
-    MS_MANIPULATION_STATE_PRESELECT: number;
-    MS_MANIPULATION_STATE_SELECTING: number;
-    MS_MANIPULATION_STATE_STOPPED: number;
-}
-
-declare var MSManipulationEvent: {
-    prototype: MSManipulationEvent;
-    new(): MSManipulationEvent;
-    MS_MANIPULATION_STATE_ACTIVE: number;
-    MS_MANIPULATION_STATE_CANCELLED: number;
-    MS_MANIPULATION_STATE_COMMITTED: number;
-    MS_MANIPULATION_STATE_DRAGGING: number;
-    MS_MANIPULATION_STATE_INERTIA: number;
-    MS_MANIPULATION_STATE_PRESELECT: number;
-    MS_MANIPULATION_STATE_SELECTING: number;
-    MS_MANIPULATION_STATE_STOPPED: number;
-}
-
-interface MSMediaKeyError {
-    code: number;
-    systemCode: number;
-    MS_MEDIA_KEYERR_CLIENT: number;
-    MS_MEDIA_KEYERR_DOMAIN: number;
-    MS_MEDIA_KEYERR_HARDWARECHANGE: number;
-    MS_MEDIA_KEYERR_OUTPUT: number;
-    MS_MEDIA_KEYERR_SERVICE: number;
-    MS_MEDIA_KEYERR_UNKNOWN: number;
-}
-
-declare var MSMediaKeyError: {
-    prototype: MSMediaKeyError;
-    new(): MSMediaKeyError;
-    MS_MEDIA_KEYERR_CLIENT: number;
-    MS_MEDIA_KEYERR_DOMAIN: number;
-    MS_MEDIA_KEYERR_HARDWARECHANGE: number;
-    MS_MEDIA_KEYERR_OUTPUT: number;
-    MS_MEDIA_KEYERR_SERVICE: number;
-    MS_MEDIA_KEYERR_UNKNOWN: number;
-}
-
-interface MSMediaKeyMessageEvent extends Event {
-    destinationURL: string;
-    message: Uint8Array;
-}
-
-declare var MSMediaKeyMessageEvent: {
-    prototype: MSMediaKeyMessageEvent;
-    new(): MSMediaKeyMessageEvent;
-}
-
-interface MSMediaKeyNeededEvent extends Event {
-    initData: Uint8Array;
-}
-
-declare var MSMediaKeyNeededEvent: {
-    prototype: MSMediaKeyNeededEvent;
-    new(): MSMediaKeyNeededEvent;
-}
-
-interface MSMediaKeySession extends EventTarget {
-    error: MSMediaKeyError;
-    keySystem: string;
-    sessionId: string;
-    close(): void;
-    update(key: Uint8Array): void;
-}
-
-declare var MSMediaKeySession: {
-    prototype: MSMediaKeySession;
-    new(): MSMediaKeySession;
-}
-
-interface MSMediaKeys {
-    keySystem: string;
-    createSession(type: string, initData: Uint8Array, cdmData?: Uint8Array): MSMediaKeySession;
-}
-
-declare var MSMediaKeys: {
-    prototype: MSMediaKeys;
-    new(keySystem: string): MSMediaKeys;
-    isTypeSupported(keySystem: string, type?: string): boolean;
-}
-
-interface MSMimeTypesCollection {
-    length: number;
-}
-
-declare var MSMimeTypesCollection: {
-    prototype: MSMimeTypesCollection;
-    new(): MSMimeTypesCollection;
-}
-
-interface MSPluginsCollection {
-    length: number;
-    refresh(reload?: boolean): void;
-}
-
-declare var MSPluginsCollection: {
-    prototype: MSPluginsCollection;
-    new(): MSPluginsCollection;
-}
-
-interface MSPointerEvent extends MouseEvent {
-    currentPoint: any;
-    height: number;
-    hwTimestamp: number;
-    intermediatePoints: any;
-    isPrimary: boolean;
-    pointerId: number;
-    pointerType: any;
-    pressure: number;
-    rotation: number;
-    tiltX: number;
-    tiltY: number;
-    width: number;
-    getCurrentPoint(element: Element): void;
-    getIntermediatePoints(element: Element): void;
-    initPointerEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, offsetXArg: number, offsetYArg: number, widthArg: number, heightArg: number, pressure: number, rotation: number, tiltX: number, tiltY: number, pointerIdArg: number, pointerType: any, hwTimestampArg: number, isPrimary: boolean): void;
-}
-
-declare var MSPointerEvent: {
-    prototype: MSPointerEvent;
-    new(typeArg: string, eventInitDict?: PointerEventInit): MSPointerEvent;
-}
-
-interface MSRangeCollection {
-    length: number;
-    item(index: number): Range;
-    [index: number]: Range;
-}
-
-declare var MSRangeCollection: {
-    prototype: MSRangeCollection;
-    new(): MSRangeCollection;
-}
-
-interface MSSiteModeEvent extends Event {
-    actionURL: string;
-    buttonID: number;
-}
-
-declare var MSSiteModeEvent: {
-    prototype: MSSiteModeEvent;
-    new(): MSSiteModeEvent;
-}
-
-interface MSStream {
-    type: string;
-    msClose(): void;
-    msDetachStream(): any;
-}
-
-declare var MSStream: {
-    prototype: MSStream;
-    new(): MSStream;
-}
-
-interface MSStreamReader extends EventTarget, MSBaseReader {
-    error: DOMError;
-    readAsArrayBuffer(stream: MSStream, size?: number): void;
-    readAsBinaryString(stream: MSStream, size?: number): void;
-    readAsBlob(stream: MSStream, size?: number): void;
-    readAsDataURL(stream: MSStream, size?: number): void;
-    readAsText(stream: MSStream, encoding?: string, size?: number): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var MSStreamReader: {
-    prototype: MSStreamReader;
-    new(): MSStreamReader;
-}
-
-interface MSWebViewAsyncOperation extends EventTarget {
-    error: DOMError;
-    oncomplete: (ev: Event) => any;
-    onerror: (ev: Event) => any;
-    readyState: number;
-    result: any;
-    target: MSHTMLWebViewElement;
-    type: number;
-    start(): void;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
-    TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
-    TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
-    TYPE_INVOKE_SCRIPT: number;
-    addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var MSWebViewAsyncOperation: {
-    prototype: MSWebViewAsyncOperation;
-    new(): MSWebViewAsyncOperation;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
-    TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
-    TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
-    TYPE_INVOKE_SCRIPT: number;
-}
-
-interface MSWebViewSettings {
-    isIndexedDBEnabled: boolean;
-    isJavaScriptEnabled: boolean;
-}
-
-declare var MSWebViewSettings: {
-    prototype: MSWebViewSettings;
-    new(): MSWebViewSettings;
-}
-
-interface MediaElementAudioSourceNode extends AudioNode {
-}
-
-declare var MediaElementAudioSourceNode: {
-    prototype: MediaElementAudioSourceNode;
-    new(): MediaElementAudioSourceNode;
-}
-
-interface MediaError {
-    code: number;
-    msExtendedCode: number;
-    MEDIA_ERR_ABORTED: number;
-    MEDIA_ERR_DECODE: number;
-    MEDIA_ERR_NETWORK: number;
-    MEDIA_ERR_SRC_NOT_SUPPORTED: number;
-    MS_MEDIA_ERR_ENCRYPTED: number;
-}
-
-declare var MediaError: {
-    prototype: MediaError;
-    new(): MediaError;
-    MEDIA_ERR_ABORTED: number;
-    MEDIA_ERR_DECODE: number;
-    MEDIA_ERR_NETWORK: number;
-    MEDIA_ERR_SRC_NOT_SUPPORTED: number;
-    MS_MEDIA_ERR_ENCRYPTED: number;
-}
-
-interface MediaList {
-    length: number;
-    mediaText: string;
-    appendMedium(newMedium: string): void;
-    deleteMedium(oldMedium: string): void;
-    item(index: number): string;
-    toString(): string;
-    [index: number]: string;
-}
-
-declare var MediaList: {
-    prototype: MediaList;
-    new(): MediaList;
-}
-
-interface MediaQueryList {
-    matches: boolean;
-    media: string;
-    addListener(listener: MediaQueryListListener): void;
-    removeListener(listener: MediaQueryListListener): void;
-}
-
-declare var MediaQueryList: {
-    prototype: MediaQueryList;
-    new(): MediaQueryList;
-}
-
-interface MediaSource extends EventTarget {
-    activeSourceBuffers: SourceBufferList;
-    duration: number;
-    readyState: number;
-    sourceBuffers: SourceBufferList;
-    addSourceBuffer(type: string): SourceBuffer;
-    endOfStream(error?: number): void;
-    removeSourceBuffer(sourceBuffer: SourceBuffer): void;
-}
-
-declare var MediaSource: {
-    prototype: MediaSource;
-    new(): MediaSource;
-    isTypeSupported(type: string): boolean;
-}
-
-interface MessageChannel {
-    port1: MessagePort;
-    port2: MessagePort;
-}
-
-declare var MessageChannel: {
-    prototype: MessageChannel;
-    new(): MessageChannel;
-}
-
-interface MessageEvent extends Event {
-    data: any;
-    origin: string;
-    ports: any;
-    source: Window;
-    initMessageEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, dataArg: any, originArg: string, lastEventIdArg: string, sourceArg: Window): void;
-}
-
-declare var MessageEvent: {
-    prototype: MessageEvent;
-    new(type: string, eventInitDict?: MessageEventInit): MessageEvent;
-}
-
-interface MessagePort extends EventTarget {
-    onmessage: (ev: MessageEvent) => any;
-    close(): void;
-    postMessage(message?: any, ports?: any): void;
-    start(): void;
-    addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var MessagePort: {
-    prototype: MessagePort;
-    new(): MessagePort;
-}
-
-interface MimeType {
-    description: string;
-    enabledPlugin: Plugin;
-    suffixes: string;
-    type: string;
-}
-
-declare var MimeType: {
-    prototype: MimeType;
-    new(): MimeType;
-}
-
-interface MimeTypeArray {
-    length: number;
-    item(index: number): Plugin;
-    namedItem(type: string): Plugin;
-    [index: number]: Plugin;
-}
-
-declare var MimeTypeArray: {
-    prototype: MimeTypeArray;
-    new(): MimeTypeArray;
-}
-
-interface MouseEvent extends UIEvent {
-    altKey: boolean;
-    button: number;
-    buttons: number;
-    clientX: number;
-    clientY: number;
-    ctrlKey: boolean;
-    fromElement: Element;
-    layerX: number;
-    layerY: number;
-    metaKey: boolean;
-    movementX: number;
-    movementY: number;
-    offsetX: number;
-    offsetY: number;
-    pageX: number;
-    pageY: number;
-    relatedTarget: EventTarget;
-    screenX: number;
-    screenY: number;
-    shiftKey: boolean;
-    toElement: Element;
-    which: number;
-    x: number;
-    y: number;
-    getModifierState(keyArg: string): boolean;
-    initMouseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget): void;
-}
-
-declare var MouseEvent: {
-    prototype: MouseEvent;
-    new(typeArg: string, eventInitDict?: MouseEventInit): MouseEvent;
-}
-
-interface MouseWheelEvent extends MouseEvent {
-    wheelDelta: number;
-    wheelDeltaX: number;
-    wheelDeltaY: number;
-    initMouseWheelEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, buttonArg: number, relatedTargetArg: EventTarget, modifiersListArg: string, wheelDeltaArg: number): void;
-}
-
-declare var MouseWheelEvent: {
-    prototype: MouseWheelEvent;
-    new(): MouseWheelEvent;
-}
-
-interface MutationEvent extends Event {
-    attrChange: number;
-    attrName: string;
-    newValue: string;
-    prevValue: string;
-    relatedNode: Node;
-    initMutationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, relatedNodeArg: Node, prevValueArg: string, newValueArg: string, attrNameArg: string, attrChangeArg: number): void;
-    ADDITION: number;
-    MODIFICATION: number;
-    REMOVAL: number;
-}
-
-declare var MutationEvent: {
-    prototype: MutationEvent;
-    new(): MutationEvent;
-    ADDITION: number;
-    MODIFICATION: number;
-    REMOVAL: number;
-}
-
-interface MutationObserver {
-    disconnect(): void;
-    observe(target: Node, options: MutationObserverInit): void;
-    takeRecords(): MutationRecord[];
-}
-
-declare var MutationObserver: {
-    prototype: MutationObserver;
-    new(callback: MutationCallback): MutationObserver;
-}
-
-interface MutationRecord {
-    addedNodes: NodeList;
-    attributeName: string;
-    attributeNamespace: string;
-    nextSibling: Node;
-    oldValue: string;
-    previousSibling: Node;
-    removedNodes: NodeList;
-    target: Node;
-    type: string;
-}
-
-declare var MutationRecord: {
-    prototype: MutationRecord;
-    new(): MutationRecord;
-}
-
-interface NamedNodeMap {
-    length: number;
-    getNamedItem(name: string): Attr;
-    getNamedItemNS(namespaceURI: string, localName: string): Attr;
-    item(index: number): Attr;
-    removeNamedItem(name: string): Attr;
-    removeNamedItemNS(namespaceURI: string, localName: string): Attr;
-    setNamedItem(arg: Attr): Attr;
-    setNamedItemNS(arg: Attr): Attr;
-    [index: number]: Attr;
-}
-
-declare var NamedNodeMap: {
-    prototype: NamedNodeMap;
-    new(): NamedNodeMap;
-}
-
-interface NavigationCompletedEvent extends NavigationEvent {
-    isSuccess: boolean;
-    webErrorStatus: number;
-}
-
-declare var NavigationCompletedEvent: {
-    prototype: NavigationCompletedEvent;
-    new(): NavigationCompletedEvent;
-}
-
-interface NavigationEvent extends Event {
-    uri: string;
-}
-
-declare var NavigationEvent: {
-    prototype: NavigationEvent;
-    new(): NavigationEvent;
-}
-
-interface NavigationEventWithReferrer extends NavigationEvent {
-    referer: string;
-}
-
-declare var NavigationEventWithReferrer: {
-    prototype: NavigationEventWithReferrer;
-    new(): NavigationEventWithReferrer;
-}
-
-interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorContentUtils, NavigatorStorageUtils, NavigatorGeolocation, MSNavigatorDoNotTrack, MSFileSaver {
-    appCodeName: string;
-    appMinorVersion: string;
-    browserLanguage: string;
-    connectionSpeed: number;
-    cookieEnabled: boolean;
-    cpuClass: string;
-    language: string;
-    maxTouchPoints: number;
-    mimeTypes: MSMimeTypesCollection;
-    msManipulationViewsEnabled: boolean;
-    msMaxTouchPoints: number;
-    msPointerEnabled: boolean;
-    plugins: MSPluginsCollection;
-    pointerEnabled: boolean;
-    systemLanguage: string;
-    userLanguage: string;
-    webdriver: boolean;
-    getGamepads(): Gamepad[];
-    javaEnabled(): boolean;
-    msLaunchUri(uri: string, successCallback?: MSLaunchUriCallback, noHandlerCallback?: MSLaunchUriCallback): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var Navigator: {
-    prototype: Navigator;
-    new(): Navigator;
-}
-
-interface Node extends EventTarget {
-    attributes: NamedNodeMap;
-    baseURI: string;
-    childNodes: NodeList;
-    firstChild: Node;
-    lastChild: Node;
-    localName: string;
-    namespaceURI: string;
-    nextSibling: Node;
-    nodeName: string;
-    nodeType: number;
-    nodeValue: string;
-    ownerDocument: Document;
-    parentElement: HTMLElement;
-    parentNode: Node;
-    prefix: string;
-    previousSibling: Node;
-    textContent: string;
-    appendChild(newChild: Node): Node;
-    cloneNode(deep?: boolean): Node;
-    compareDocumentPosition(other: Node): number;
-    hasAttributes(): boolean;
-    hasChildNodes(): boolean;
-    insertBefore(newChild: Node, refChild?: Node): Node;
-    isDefaultNamespace(namespaceURI: string): boolean;
-    isEqualNode(arg: Node): boolean;
-    isSameNode(other: Node): boolean;
-    lookupNamespaceURI(prefix: string): string;
-    lookupPrefix(namespaceURI: string): string;
-    normalize(): void;
-    removeChild(oldChild: Node): Node;
-    replaceChild(newChild: Node, oldChild: Node): Node;
-    ATTRIBUTE_NODE: number;
-    CDATA_SECTION_NODE: number;
-    COMMENT_NODE: number;
-    DOCUMENT_FRAGMENT_NODE: number;
-    DOCUMENT_NODE: number;
-    DOCUMENT_POSITION_CONTAINED_BY: number;
-    DOCUMENT_POSITION_CONTAINS: number;
-    DOCUMENT_POSITION_DISCONNECTED: number;
-    DOCUMENT_POSITION_FOLLOWING: number;
-    DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
-    DOCUMENT_POSITION_PRECEDING: number;
-    DOCUMENT_TYPE_NODE: number;
-    ELEMENT_NODE: number;
-    ENTITY_NODE: number;
-    ENTITY_REFERENCE_NODE: number;
-    NOTATION_NODE: number;
-    PROCESSING_INSTRUCTION_NODE: number;
-    TEXT_NODE: number;
-}
-
-declare var Node: {
-    prototype: Node;
-    new(): Node;
-    ATTRIBUTE_NODE: number;
-    CDATA_SECTION_NODE: number;
-    COMMENT_NODE: number;
-    DOCUMENT_FRAGMENT_NODE: number;
-    DOCUMENT_NODE: number;
-    DOCUMENT_POSITION_CONTAINED_BY: number;
-    DOCUMENT_POSITION_CONTAINS: number;
-    DOCUMENT_POSITION_DISCONNECTED: number;
-    DOCUMENT_POSITION_FOLLOWING: number;
-    DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
-    DOCUMENT_POSITION_PRECEDING: number;
-    DOCUMENT_TYPE_NODE: number;
-    ELEMENT_NODE: number;
-    ENTITY_NODE: number;
-    ENTITY_REFERENCE_NODE: number;
-    NOTATION_NODE: number;
-    PROCESSING_INSTRUCTION_NODE: number;
-    TEXT_NODE: number;
-}
-
-interface NodeFilter {
-    acceptNode(n: Node): number;
-}
-
-declare var NodeFilter: {
-    FILTER_ACCEPT: number;
-    FILTER_REJECT: number;
-    FILTER_SKIP: number;
-    SHOW_ALL: number;
-    SHOW_ATTRIBUTE: number;
-    SHOW_CDATA_SECTION: number;
-    SHOW_COMMENT: number;
-    SHOW_DOCUMENT: number;
-    SHOW_DOCUMENT_FRAGMENT: number;
-    SHOW_DOCUMENT_TYPE: number;
-    SHOW_ELEMENT: number;
-    SHOW_ENTITY: number;
-    SHOW_ENTITY_REFERENCE: number;
-    SHOW_NOTATION: number;
-    SHOW_PROCESSING_INSTRUCTION: number;
-    SHOW_TEXT: number;
-}
-
-interface NodeIterator {
-    expandEntityReferences: boolean;
-    filter: NodeFilter;
-    root: Node;
-    whatToShow: number;
-    detach(): void;
-    nextNode(): Node;
-    previousNode(): Node;
-}
-
-declare var NodeIterator: {
-    prototype: NodeIterator;
-    new(): NodeIterator;
-}
-
-interface NodeList {
-    length: number;
-    item(index: number): Node;
-    [index: number]: Node;
-}
-
-declare var NodeList: {
-    prototype: NodeList;
-    new(): NodeList;
-}
-
-interface OES_element_index_uint {
-}
-
-declare var OES_element_index_uint: {
-    prototype: OES_element_index_uint;
-    new(): OES_element_index_uint;
-}
-
-interface OES_standard_derivatives {
-    FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
-}
-
-declare var OES_standard_derivatives: {
-    prototype: OES_standard_derivatives;
-    new(): OES_standard_derivatives;
-    FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
-}
-
-interface OES_texture_float {
-}
-
-declare var OES_texture_float: {
-    prototype: OES_texture_float;
-    new(): OES_texture_float;
-}
-
-interface OES_texture_float_linear {
-}
-
-declare var OES_texture_float_linear: {
-    prototype: OES_texture_float_linear;
-    new(): OES_texture_float_linear;
-}
-
-interface OfflineAudioCompletionEvent extends Event {
-    renderedBuffer: AudioBuffer;
-}
-
-declare var OfflineAudioCompletionEvent: {
-    prototype: OfflineAudioCompletionEvent;
-    new(): OfflineAudioCompletionEvent;
-}
-
-interface OfflineAudioContext extends AudioContext {
-    oncomplete: (ev: Event) => any;
-    startRendering(): void;
-    addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var OfflineAudioContext: {
-    prototype: OfflineAudioContext;
-    new(numberOfChannels: number, length: number, sampleRate: number): OfflineAudioContext;
-}
-
-interface OscillatorNode extends AudioNode {
-    detune: AudioParam;
-    frequency: AudioParam;
-    onended: (ev: Event) => any;
-    type: string;
-    setPeriodicWave(periodicWave: PeriodicWave): void;
-    start(when?: number): void;
-    stop(when?: number): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var OscillatorNode: {
-    prototype: OscillatorNode;
-    new(): OscillatorNode;
-}
-
-interface PageTransitionEvent extends Event {
-    persisted: boolean;
-}
-
-declare var PageTransitionEvent: {
-    prototype: PageTransitionEvent;
-    new(): PageTransitionEvent;
-}
-
-interface PannerNode extends AudioNode {
-    coneInnerAngle: number;
-    coneOuterAngle: number;
-    coneOuterGain: number;
-    distanceModel: string;
-    maxDistance: number;
-    panningModel: string;
-    refDistance: number;
-    rolloffFactor: number;
-    setOrientation(x: number, y: number, z: number): void;
-    setPosition(x: number, y: number, z: number): void;
-    setVelocity(x: number, y: number, z: number): void;
-}
-
-declare var PannerNode: {
-    prototype: PannerNode;
-    new(): PannerNode;
-}
-
-interface PerfWidgetExternal {
-    activeNetworkRequestCount: number;
-    averageFrameTime: number;
-    averagePaintTime: number;
-    extraInformationEnabled: boolean;
-    independentRenderingEnabled: boolean;
-    irDisablingContentString: string;
-    irStatusAvailable: boolean;
-    maxCpuSpeed: number;
-    paintRequestsPerSecond: number;
-    performanceCounter: number;
-    performanceCounterFrequency: number;
-    addEventListener(eventType: string, callback: Function): void;
-    getMemoryUsage(): number;
-    getProcessCpuUsage(): number;
-    getRecentCpuUsage(last: number): any;
-    getRecentFrames(last: number): any;
-    getRecentMemoryUsage(last: number): any;
-    getRecentPaintRequests(last: number): any;
-    removeEventListener(eventType: string, callback: Function): void;
-    repositionWindow(x: number, y: number): void;
-    resizeWindow(width: number, height: number): void;
-}
-
-declare var PerfWidgetExternal: {
-    prototype: PerfWidgetExternal;
-    new(): PerfWidgetExternal;
-}
-
-interface Performance {
-    navigation: PerformanceNavigation;
-    timing: PerformanceTiming;
-    clearMarks(markName?: string): void;
-    clearMeasures(measureName?: string): void;
-    clearResourceTimings(): void;
-    getEntries(): any;
-    getEntriesByName(name: string, entryType?: string): any;
-    getEntriesByType(entryType: string): any;
-    getMarks(markName?: string): any;
-    getMeasures(measureName?: string): any;
-    mark(markName: string): void;
-    measure(measureName: string, startMarkName?: string, endMarkName?: string): void;
-    now(): number;
-    setResourceTimingBufferSize(maxSize: number): void;
-    toJSON(): any;
-}
-
-declare var Performance: {
-    prototype: Performance;
-    new(): Performance;
-}
-
-interface PerformanceEntry {
-    duration: number;
-    entryType: string;
-    name: string;
-    startTime: number;
-}
-
-declare var PerformanceEntry: {
-    prototype: PerformanceEntry;
-    new(): PerformanceEntry;
-}
-
-interface PerformanceMark extends PerformanceEntry {
-}
-
-declare var PerformanceMark: {
-    prototype: PerformanceMark;
-    new(): PerformanceMark;
-}
-
-interface PerformanceMeasure extends PerformanceEntry {
-}
-
-declare var PerformanceMeasure: {
-    prototype: PerformanceMeasure;
-    new(): PerformanceMeasure;
-}
-
-interface PerformanceNavigation {
-    redirectCount: number;
-    type: number;
-    toJSON(): any;
-    TYPE_BACK_FORWARD: number;
-    TYPE_NAVIGATE: number;
-    TYPE_RELOAD: number;
-    TYPE_RESERVED: number;
-}
-
-declare var PerformanceNavigation: {
-    prototype: PerformanceNavigation;
-    new(): PerformanceNavigation;
-    TYPE_BACK_FORWARD: number;
-    TYPE_NAVIGATE: number;
-    TYPE_RELOAD: number;
-    TYPE_RESERVED: number;
-}
-
-interface PerformanceNavigationTiming extends PerformanceEntry {
-    connectEnd: number;
-    connectStart: number;
-    domComplete: number;
-    domContentLoadedEventEnd: number;
-    domContentLoadedEventStart: number;
-    domInteractive: number;
-    domLoading: number;
-    domainLookupEnd: number;
-    domainLookupStart: number;
-    fetchStart: number;
-    loadEventEnd: number;
-    loadEventStart: number;
-    navigationStart: number;
-    redirectCount: number;
-    redirectEnd: number;
-    redirectStart: number;
-    requestStart: number;
-    responseEnd: number;
-    responseStart: number;
-    type: string;
-    unloadEventEnd: number;
-    unloadEventStart: number;
-}
-
-declare var PerformanceNavigationTiming: {
-    prototype: PerformanceNavigationTiming;
-    new(): PerformanceNavigationTiming;
-}
-
-interface PerformanceResourceTiming extends PerformanceEntry {
-    connectEnd: number;
-    connectStart: number;
-    domainLookupEnd: number;
-    domainLookupStart: number;
-    fetchStart: number;
-    initiatorType: string;
-    redirectEnd: number;
-    redirectStart: number;
-    requestStart: number;
-    responseEnd: number;
-    responseStart: number;
-}
-
-declare var PerformanceResourceTiming: {
-    prototype: PerformanceResourceTiming;
-    new(): PerformanceResourceTiming;
-}
-
-interface PerformanceTiming {
-    connectEnd: number;
-    connectStart: number;
-    domComplete: number;
-    domContentLoadedEventEnd: number;
-    domContentLoadedEventStart: number;
-    domInteractive: number;
-    domLoading: number;
-    domainLookupEnd: number;
-    domainLookupStart: number;
-    fetchStart: number;
-    loadEventEnd: number;
-    loadEventStart: number;
-    msFirstPaint: number;
-    navigationStart: number;
-    redirectEnd: number;
-    redirectStart: number;
-    requestStart: number;
-    responseEnd: number;
-    responseStart: number;
-    unloadEventEnd: number;
-    unloadEventStart: number;
-    toJSON(): any;
-}
-
-declare var PerformanceTiming: {
-    prototype: PerformanceTiming;
-    new(): PerformanceTiming;
-}
-
-interface PeriodicWave {
-}
-
-declare var PeriodicWave: {
-    prototype: PeriodicWave;
-    new(): PeriodicWave;
-}
-
-interface PermissionRequest extends DeferredPermissionRequest {
-    state: string;
-    defer(): void;
-}
-
-declare var PermissionRequest: {
-    prototype: PermissionRequest;
-    new(): PermissionRequest;
-}
-
-interface PermissionRequestedEvent extends Event {
-    permissionRequest: PermissionRequest;
-}
-
-declare var PermissionRequestedEvent: {
-    prototype: PermissionRequestedEvent;
-    new(): PermissionRequestedEvent;
-}
-
-interface Plugin {
-    description: string;
-    filename: string;
-    length: number;
-    name: string;
-    version: string;
-    item(index: number): MimeType;
-    namedItem(type: string): MimeType;
-    [index: number]: MimeType;
-}
-
-declare var Plugin: {
-    prototype: Plugin;
-    new(): Plugin;
-}
-
-interface PluginArray {
-    length: number;
-    item(index: number): Plugin;
-    namedItem(name: string): Plugin;
-    refresh(reload?: boolean): void;
-    [index: number]: Plugin;
-}
-
-declare var PluginArray: {
-    prototype: PluginArray;
-    new(): PluginArray;
-}
-
-interface PointerEvent extends MouseEvent {
-    currentPoint: any;
-    height: number;
-    hwTimestamp: number;
-    intermediatePoints: any;
-    isPrimary: boolean;
-    pointerId: number;
-    pointerType: any;
-    pressure: number;
-    rotation: number;
-    tiltX: number;
-    tiltY: number;
-    width: number;
-    getCurrentPoint(element: Element): void;
-    getIntermediatePoints(element: Element): void;
-    initPointerEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, offsetXArg: number, offsetYArg: number, widthArg: number, heightArg: number, pressure: number, rotation: number, tiltX: number, tiltY: number, pointerIdArg: number, pointerType: any, hwTimestampArg: number, isPrimary: boolean): void;
-}
-
-declare var PointerEvent: {
-    prototype: PointerEvent;
-    new(typeArg: string, eventInitDict?: PointerEventInit): PointerEvent;
-}
-
-interface PopStateEvent extends Event {
-    state: any;
-    initPopStateEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, stateArg: any): void;
-}
-
-declare var PopStateEvent: {
-    prototype: PopStateEvent;
-    new(): PopStateEvent;
-}
-
-interface Position {
-    coords: Coordinates;
-    timestamp: number;
-}
-
-declare var Position: {
-    prototype: Position;
-    new(): Position;
-}
-
-interface PositionError {
-    code: number;
-    message: string;
-    toString(): string;
-    PERMISSION_DENIED: number;
-    POSITION_UNAVAILABLE: number;
-    TIMEOUT: number;
-}
-
-declare var PositionError: {
-    prototype: PositionError;
-    new(): PositionError;
-    PERMISSION_DENIED: number;
-    POSITION_UNAVAILABLE: number;
-    TIMEOUT: number;
-}
-
-interface ProcessingInstruction extends CharacterData {
-    target: string;
-}
-
-declare var ProcessingInstruction: {
-    prototype: ProcessingInstruction;
-    new(): ProcessingInstruction;
-}
-
-interface ProgressEvent extends Event {
-    lengthComputable: boolean;
-    loaded: number;
-    total: number;
-    initProgressEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, lengthComputableArg: boolean, loadedArg: number, totalArg: number): void;
-}
-
-declare var ProgressEvent: {
-    prototype: ProgressEvent;
-    new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent;
-}
-
-interface Range {
-    collapsed: boolean;
-    commonAncestorContainer: Node;
-    endContainer: Node;
-    endOffset: number;
-    startContainer: Node;
-    startOffset: number;
-    cloneContents(): DocumentFragment;
-    cloneRange(): Range;
-    collapse(toStart: boolean): void;
-    compareBoundaryPoints(how: number, sourceRange: Range): number;
-    createContextualFragment(fragment: string): DocumentFragment;
-    deleteContents(): void;
-    detach(): void;
-    expand(Unit: string): boolean;
-    extractContents(): DocumentFragment;
-    getBoundingClientRect(): ClientRect;
-    getClientRects(): ClientRectList;
-    insertNode(newNode: Node): void;
-    selectNode(refNode: Node): void;
-    selectNodeContents(refNode: Node): void;
-    setEnd(refNode: Node, offset: number): void;
-    setEndAfter(refNode: Node): void;
-    setEndBefore(refNode: Node): void;
-    setStart(refNode: Node, offset: number): void;
-    setStartAfter(refNode: Node): void;
-    setStartBefore(refNode: Node): void;
-    surroundContents(newParent: Node): void;
-    toString(): string;
-    END_TO_END: number;
-    END_TO_START: number;
-    START_TO_END: number;
-    START_TO_START: number;
-}
-
-declare var Range: {
-    prototype: Range;
-    new(): Range;
-    END_TO_END: number;
-    END_TO_START: number;
-    START_TO_END: number;
-    START_TO_START: number;
-}
-
-interface SVGAElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
-    target: SVGAnimatedString;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGAElement: {
-    prototype: SVGAElement;
-    new(): SVGAElement;
-}
-
-interface SVGAngle {
-    unitType: number;
-    value: number;
-    valueAsString: string;
-    valueInSpecifiedUnits: number;
-    convertToSpecifiedUnits(unitType: number): void;
-    newValueSpecifiedUnits(unitType: number, valueInSpecifiedUnits: number): void;
-    SVG_ANGLETYPE_DEG: number;
-    SVG_ANGLETYPE_GRAD: number;
-    SVG_ANGLETYPE_RAD: number;
-    SVG_ANGLETYPE_UNKNOWN: number;
-    SVG_ANGLETYPE_UNSPECIFIED: number;
-}
-
-declare var SVGAngle: {
-    prototype: SVGAngle;
-    new(): SVGAngle;
-    SVG_ANGLETYPE_DEG: number;
-    SVG_ANGLETYPE_GRAD: number;
-    SVG_ANGLETYPE_RAD: number;
-    SVG_ANGLETYPE_UNKNOWN: number;
-    SVG_ANGLETYPE_UNSPECIFIED: number;
-}
-
-interface SVGAnimatedAngle {
-    animVal: SVGAngle;
-    baseVal: SVGAngle;
-}
-
-declare var SVGAnimatedAngle: {
-    prototype: SVGAnimatedAngle;
-    new(): SVGAnimatedAngle;
-}
-
-interface SVGAnimatedBoolean {
-    animVal: boolean;
-    baseVal: boolean;
-}
-
-declare var SVGAnimatedBoolean: {
-    prototype: SVGAnimatedBoolean;
-    new(): SVGAnimatedBoolean;
-}
-
-interface SVGAnimatedEnumeration {
-    animVal: number;
-    baseVal: number;
-}
-
-declare var SVGAnimatedEnumeration: {
-    prototype: SVGAnimatedEnumeration;
-    new(): SVGAnimatedEnumeration;
-}
-
-interface SVGAnimatedInteger {
-    animVal: number;
-    baseVal: number;
-}
-
-declare var SVGAnimatedInteger: {
-    prototype: SVGAnimatedInteger;
-    new(): SVGAnimatedInteger;
-}
-
-interface SVGAnimatedLength {
-    animVal: SVGLength;
-    baseVal: SVGLength;
-}
-
-declare var SVGAnimatedLength: {
-    prototype: SVGAnimatedLength;
-    new(): SVGAnimatedLength;
-}
-
-interface SVGAnimatedLengthList {
-    animVal: SVGLengthList;
-    baseVal: SVGLengthList;
-}
-
-declare var SVGAnimatedLengthList: {
-    prototype: SVGAnimatedLengthList;
-    new(): SVGAnimatedLengthList;
-}
-
-interface SVGAnimatedNumber {
-    animVal: number;
-    baseVal: number;
-}
-
-declare var SVGAnimatedNumber: {
-    prototype: SVGAnimatedNumber;
-    new(): SVGAnimatedNumber;
-}
-
-interface SVGAnimatedNumberList {
-    animVal: SVGNumberList;
-    baseVal: SVGNumberList;
-}
-
-declare var SVGAnimatedNumberList: {
-    prototype: SVGAnimatedNumberList;
-    new(): SVGAnimatedNumberList;
-}
-
-interface SVGAnimatedPreserveAspectRatio {
-    animVal: SVGPreserveAspectRatio;
-    baseVal: SVGPreserveAspectRatio;
-}
-
-declare var SVGAnimatedPreserveAspectRatio: {
-    prototype: SVGAnimatedPreserveAspectRatio;
-    new(): SVGAnimatedPreserveAspectRatio;
-}
-
-interface SVGAnimatedRect {
-    animVal: SVGRect;
-    baseVal: SVGRect;
-}
-
-declare var SVGAnimatedRect: {
-    prototype: SVGAnimatedRect;
-    new(): SVGAnimatedRect;
-}
-
-interface SVGAnimatedString {
-    animVal: string;
-    baseVal: string;
-}
-
-declare var SVGAnimatedString: {
-    prototype: SVGAnimatedString;
-    new(): SVGAnimatedString;
-}
-
-interface SVGAnimatedTransformList {
-    animVal: SVGTransformList;
-    baseVal: SVGTransformList;
-}
-
-declare var SVGAnimatedTransformList: {
-    prototype: SVGAnimatedTransformList;
-    new(): SVGAnimatedTransformList;
-}
-
-interface SVGCircleElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    cx: SVGAnimatedLength;
-    cy: SVGAnimatedLength;
-    r: SVGAnimatedLength;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGCircleElement: {
-    prototype: SVGCircleElement;
-    new(): SVGCircleElement;
-}
-
-interface SVGClipPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes {
-    clipPathUnits: SVGAnimatedEnumeration;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGClipPathElement: {
-    prototype: SVGClipPathElement;
-    new(): SVGClipPathElement;
-}
-
-interface SVGComponentTransferFunctionElement extends SVGElement {
-    amplitude: SVGAnimatedNumber;
-    exponent: SVGAnimatedNumber;
-    intercept: SVGAnimatedNumber;
-    offset: SVGAnimatedNumber;
-    slope: SVGAnimatedNumber;
-    tableValues: SVGAnimatedNumberList;
-    type: SVGAnimatedEnumeration;
-    SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
-}
-
-declare var SVGComponentTransferFunctionElement: {
-    prototype: SVGComponentTransferFunctionElement;
-    new(): SVGComponentTransferFunctionElement;
-    SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
-}
-
-interface SVGDefsElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGDefsElement: {
-    prototype: SVGDefsElement;
-    new(): SVGDefsElement;
-}
-
-interface SVGDescElement extends SVGElement, SVGStylable, SVGLangSpace {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGDescElement: {
-    prototype: SVGDescElement;
-    new(): SVGDescElement;
-}
-
-interface SVGElement extends Element {
-    id: string;
-    onclick: (ev: MouseEvent) => any;
-    ondblclick: (ev: MouseEvent) => any;
-    onfocusin: (ev: FocusEvent) => any;
-    onfocusout: (ev: FocusEvent) => any;
-    onload: (ev: Event) => any;
-    onmousedown: (ev: MouseEvent) => any;
-    onmousemove: (ev: MouseEvent) => any;
-    onmouseout: (ev: MouseEvent) => any;
-    onmouseover: (ev: MouseEvent) => any;
-    onmouseup: (ev: MouseEvent) => any;
-    ownerSVGElement: SVGSVGElement;
-    viewportElement: SVGElement;
-    xmlbase: string;
-    className: any;
-    addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focusin", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focusout", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGElement: {
-    prototype: SVGElement;
-    new(): SVGElement;
-}
-
-interface SVGElementInstance extends EventTarget {
-    childNodes: SVGElementInstanceList;
-    correspondingElement: SVGElement;
-    correspondingUseElement: SVGUseElement;
-    firstChild: SVGElementInstance;
-    lastChild: SVGElementInstance;
-    nextSibling: SVGElementInstance;
-    parentNode: SVGElementInstance;
-    previousSibling: SVGElementInstance;
-}
-
-declare var SVGElementInstance: {
-    prototype: SVGElementInstance;
-    new(): SVGElementInstance;
-}
-
-interface SVGElementInstanceList {
-    length: number;
-    item(index: number): SVGElementInstance;
-}
-
-declare var SVGElementInstanceList: {
-    prototype: SVGElementInstanceList;
-    new(): SVGElementInstanceList;
-}
-
-interface SVGEllipseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    cx: SVGAnimatedLength;
-    cy: SVGAnimatedLength;
-    rx: SVGAnimatedLength;
-    ry: SVGAnimatedLength;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGEllipseElement: {
-    prototype: SVGEllipseElement;
-    new(): SVGEllipseElement;
-}
-
-interface SVGFEBlendElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    in2: SVGAnimatedString;
-    mode: SVGAnimatedEnumeration;
-    SVG_FEBLEND_MODE_COLOR: number;
-    SVG_FEBLEND_MODE_COLOR_BURN: number;
-    SVG_FEBLEND_MODE_COLOR_DODGE: number;
-    SVG_FEBLEND_MODE_DARKEN: number;
-    SVG_FEBLEND_MODE_DIFFERENCE: number;
-    SVG_FEBLEND_MODE_EXCLUSION: number;
-    SVG_FEBLEND_MODE_HARD_LIGHT: number;
-    SVG_FEBLEND_MODE_HUE: number;
-    SVG_FEBLEND_MODE_LIGHTEN: number;
-    SVG_FEBLEND_MODE_LUMINOSITY: number;
-    SVG_FEBLEND_MODE_MULTIPLY: number;
-    SVG_FEBLEND_MODE_NORMAL: number;
-    SVG_FEBLEND_MODE_OVERLAY: number;
-    SVG_FEBLEND_MODE_SATURATION: number;
-    SVG_FEBLEND_MODE_SCREEN: number;
-    SVG_FEBLEND_MODE_SOFT_LIGHT: number;
-    SVG_FEBLEND_MODE_UNKNOWN: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFEBlendElement: {
-    prototype: SVGFEBlendElement;
-    new(): SVGFEBlendElement;
-    SVG_FEBLEND_MODE_COLOR: number;
-    SVG_FEBLEND_MODE_COLOR_BURN: number;
-    SVG_FEBLEND_MODE_COLOR_DODGE: number;
-    SVG_FEBLEND_MODE_DARKEN: number;
-    SVG_FEBLEND_MODE_DIFFERENCE: number;
-    SVG_FEBLEND_MODE_EXCLUSION: number;
-    SVG_FEBLEND_MODE_HARD_LIGHT: number;
-    SVG_FEBLEND_MODE_HUE: number;
-    SVG_FEBLEND_MODE_LIGHTEN: number;
-    SVG_FEBLEND_MODE_LUMINOSITY: number;
-    SVG_FEBLEND_MODE_MULTIPLY: number;
-    SVG_FEBLEND_MODE_NORMAL: number;
-    SVG_FEBLEND_MODE_OVERLAY: number;
-    SVG_FEBLEND_MODE_SATURATION: number;
-    SVG_FEBLEND_MODE_SCREEN: number;
-    SVG_FEBLEND_MODE_SOFT_LIGHT: number;
-    SVG_FEBLEND_MODE_UNKNOWN: number;
-}
-
-interface SVGFEColorMatrixElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    type: SVGAnimatedEnumeration;
-    values: SVGAnimatedNumberList;
-    SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
-    SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
-    SVG_FECOLORMATRIX_TYPE_MATRIX: number;
-    SVG_FECOLORMATRIX_TYPE_SATURATE: number;
-    SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFEColorMatrixElement: {
-    prototype: SVGFEColorMatrixElement;
-    new(): SVGFEColorMatrixElement;
-    SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
-    SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
-    SVG_FECOLORMATRIX_TYPE_MATRIX: number;
-    SVG_FECOLORMATRIX_TYPE_SATURATE: number;
-    SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
-}
-
-interface SVGFEComponentTransferElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFEComponentTransferElement: {
-    prototype: SVGFEComponentTransferElement;
-    new(): SVGFEComponentTransferElement;
-}
-
-interface SVGFECompositeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    in2: SVGAnimatedString;
-    k1: SVGAnimatedNumber;
-    k2: SVGAnimatedNumber;
-    k3: SVGAnimatedNumber;
-    k4: SVGAnimatedNumber;
-    operator: SVGAnimatedEnumeration;
-    SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
-    SVG_FECOMPOSITE_OPERATOR_ATOP: number;
-    SVG_FECOMPOSITE_OPERATOR_IN: number;
-    SVG_FECOMPOSITE_OPERATOR_OUT: number;
-    SVG_FECOMPOSITE_OPERATOR_OVER: number;
-    SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
-    SVG_FECOMPOSITE_OPERATOR_XOR: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFECompositeElement: {
-    prototype: SVGFECompositeElement;
-    new(): SVGFECompositeElement;
-    SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
-    SVG_FECOMPOSITE_OPERATOR_ATOP: number;
-    SVG_FECOMPOSITE_OPERATOR_IN: number;
-    SVG_FECOMPOSITE_OPERATOR_OUT: number;
-    SVG_FECOMPOSITE_OPERATOR_OVER: number;
-    SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
-    SVG_FECOMPOSITE_OPERATOR_XOR: number;
-}
-
-interface SVGFEConvolveMatrixElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    bias: SVGAnimatedNumber;
-    divisor: SVGAnimatedNumber;
-    edgeMode: SVGAnimatedEnumeration;
-    in1: SVGAnimatedString;
-    kernelMatrix: SVGAnimatedNumberList;
-    kernelUnitLengthX: SVGAnimatedNumber;
-    kernelUnitLengthY: SVGAnimatedNumber;
-    orderX: SVGAnimatedInteger;
-    orderY: SVGAnimatedInteger;
-    preserveAlpha: SVGAnimatedBoolean;
-    targetX: SVGAnimatedInteger;
-    targetY: SVGAnimatedInteger;
-    SVG_EDGEMODE_DUPLICATE: number;
-    SVG_EDGEMODE_NONE: number;
-    SVG_EDGEMODE_UNKNOWN: number;
-    SVG_EDGEMODE_WRAP: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFEConvolveMatrixElement: {
-    prototype: SVGFEConvolveMatrixElement;
-    new(): SVGFEConvolveMatrixElement;
-    SVG_EDGEMODE_DUPLICATE: number;
-    SVG_EDGEMODE_NONE: number;
-    SVG_EDGEMODE_UNKNOWN: number;
-    SVG_EDGEMODE_WRAP: number;
-}
-
-interface SVGFEDiffuseLightingElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    diffuseConstant: SVGAnimatedNumber;
-    in1: SVGAnimatedString;
-    kernelUnitLengthX: SVGAnimatedNumber;
-    kernelUnitLengthY: SVGAnimatedNumber;
-    surfaceScale: SVGAnimatedNumber;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFEDiffuseLightingElement: {
-    prototype: SVGFEDiffuseLightingElement;
-    new(): SVGFEDiffuseLightingElement;
-}
-
-interface SVGFEDisplacementMapElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    in2: SVGAnimatedString;
-    scale: SVGAnimatedNumber;
-    xChannelSelector: SVGAnimatedEnumeration;
-    yChannelSelector: SVGAnimatedEnumeration;
-    SVG_CHANNEL_A: number;
-    SVG_CHANNEL_B: number;
-    SVG_CHANNEL_G: number;
-    SVG_CHANNEL_R: number;
-    SVG_CHANNEL_UNKNOWN: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFEDisplacementMapElement: {
-    prototype: SVGFEDisplacementMapElement;
-    new(): SVGFEDisplacementMapElement;
-    SVG_CHANNEL_A: number;
-    SVG_CHANNEL_B: number;
-    SVG_CHANNEL_G: number;
-    SVG_CHANNEL_R: number;
-    SVG_CHANNEL_UNKNOWN: number;
-}
-
-interface SVGFEDistantLightElement extends SVGElement {
-    azimuth: SVGAnimatedNumber;
-    elevation: SVGAnimatedNumber;
-}
-
-declare var SVGFEDistantLightElement: {
-    prototype: SVGFEDistantLightElement;
-    new(): SVGFEDistantLightElement;
-}
-
-interface SVGFEFloodElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFEFloodElement: {
-    prototype: SVGFEFloodElement;
-    new(): SVGFEFloodElement;
-}
-
-interface SVGFEFuncAElement extends SVGComponentTransferFunctionElement {
-}
-
-declare var SVGFEFuncAElement: {
-    prototype: SVGFEFuncAElement;
-    new(): SVGFEFuncAElement;
-}
-
-interface SVGFEFuncBElement extends SVGComponentTransferFunctionElement {
-}
-
-declare var SVGFEFuncBElement: {
-    prototype: SVGFEFuncBElement;
-    new(): SVGFEFuncBElement;
-}
-
-interface SVGFEFuncGElement extends SVGComponentTransferFunctionElement {
-}
-
-declare var SVGFEFuncGElement: {
-    prototype: SVGFEFuncGElement;
-    new(): SVGFEFuncGElement;
-}
-
-interface SVGFEFuncRElement extends SVGComponentTransferFunctionElement {
-}
-
-declare var SVGFEFuncRElement: {
-    prototype: SVGFEFuncRElement;
-    new(): SVGFEFuncRElement;
-}
-
-interface SVGFEGaussianBlurElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    stdDeviationX: SVGAnimatedNumber;
-    stdDeviationY: SVGAnimatedNumber;
-    setStdDeviation(stdDeviationX: number, stdDeviationY: number): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFEGaussianBlurElement: {
-    prototype: SVGFEGaussianBlurElement;
-    new(): SVGFEGaussianBlurElement;
-}
-
-interface SVGFEImageElement extends SVGElement, SVGFilterPrimitiveStandardAttributes, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired {
-    preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFEImageElement: {
-    prototype: SVGFEImageElement;
-    new(): SVGFEImageElement;
-}
-
-interface SVGFEMergeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFEMergeElement: {
-    prototype: SVGFEMergeElement;
-    new(): SVGFEMergeElement;
-}
-
-interface SVGFEMergeNodeElement extends SVGElement {
-    in1: SVGAnimatedString;
-}
-
-declare var SVGFEMergeNodeElement: {
-    prototype: SVGFEMergeNodeElement;
-    new(): SVGFEMergeNodeElement;
-}
-
-interface SVGFEMorphologyElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    operator: SVGAnimatedEnumeration;
-    radiusX: SVGAnimatedNumber;
-    radiusY: SVGAnimatedNumber;
-    SVG_MORPHOLOGY_OPERATOR_DILATE: number;
-    SVG_MORPHOLOGY_OPERATOR_ERODE: number;
-    SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFEMorphologyElement: {
-    prototype: SVGFEMorphologyElement;
-    new(): SVGFEMorphologyElement;
-    SVG_MORPHOLOGY_OPERATOR_DILATE: number;
-    SVG_MORPHOLOGY_OPERATOR_ERODE: number;
-    SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
-}
-
-interface SVGFEOffsetElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    dx: SVGAnimatedNumber;
-    dy: SVGAnimatedNumber;
-    in1: SVGAnimatedString;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFEOffsetElement: {
-    prototype: SVGFEOffsetElement;
-    new(): SVGFEOffsetElement;
-}
-
-interface SVGFEPointLightElement extends SVGElement {
-    x: SVGAnimatedNumber;
-    y: SVGAnimatedNumber;
-    z: SVGAnimatedNumber;
-}
-
-declare var SVGFEPointLightElement: {
-    prototype: SVGFEPointLightElement;
-    new(): SVGFEPointLightElement;
-}
-
-interface SVGFESpecularLightingElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    kernelUnitLengthX: SVGAnimatedNumber;
-    kernelUnitLengthY: SVGAnimatedNumber;
-    specularConstant: SVGAnimatedNumber;
-    specularExponent: SVGAnimatedNumber;
-    surfaceScale: SVGAnimatedNumber;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFESpecularLightingElement: {
-    prototype: SVGFESpecularLightingElement;
-    new(): SVGFESpecularLightingElement;
-}
-
-interface SVGFESpotLightElement extends SVGElement {
-    limitingConeAngle: SVGAnimatedNumber;
-    pointsAtX: SVGAnimatedNumber;
-    pointsAtY: SVGAnimatedNumber;
-    pointsAtZ: SVGAnimatedNumber;
-    specularExponent: SVGAnimatedNumber;
-    x: SVGAnimatedNumber;
-    y: SVGAnimatedNumber;
-    z: SVGAnimatedNumber;
-}
-
-declare var SVGFESpotLightElement: {
-    prototype: SVGFESpotLightElement;
-    new(): SVGFESpotLightElement;
-}
-
-interface SVGFETileElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFETileElement: {
-    prototype: SVGFETileElement;
-    new(): SVGFETileElement;
-}
-
-interface SVGFETurbulenceElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    baseFrequencyX: SVGAnimatedNumber;
-    baseFrequencyY: SVGAnimatedNumber;
-    numOctaves: SVGAnimatedInteger;
-    seed: SVGAnimatedNumber;
-    stitchTiles: SVGAnimatedEnumeration;
-    type: SVGAnimatedEnumeration;
-    SVG_STITCHTYPE_NOSTITCH: number;
-    SVG_STITCHTYPE_STITCH: number;
-    SVG_STITCHTYPE_UNKNOWN: number;
-    SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
-    SVG_TURBULENCE_TYPE_TURBULENCE: number;
-    SVG_TURBULENCE_TYPE_UNKNOWN: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFETurbulenceElement: {
-    prototype: SVGFETurbulenceElement;
-    new(): SVGFETurbulenceElement;
-    SVG_STITCHTYPE_NOSTITCH: number;
-    SVG_STITCHTYPE_STITCH: number;
-    SVG_STITCHTYPE_UNKNOWN: number;
-    SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
-    SVG_TURBULENCE_TYPE_TURBULENCE: number;
-    SVG_TURBULENCE_TYPE_UNKNOWN: number;
-}
-
-interface SVGFilterElement extends SVGElement, SVGUnitTypes, SVGStylable, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired {
-    filterResX: SVGAnimatedInteger;
-    filterResY: SVGAnimatedInteger;
-    filterUnits: SVGAnimatedEnumeration;
-    height: SVGAnimatedLength;
-    primitiveUnits: SVGAnimatedEnumeration;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
-    setFilterRes(filterResX: number, filterResY: number): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGFilterElement: {
-    prototype: SVGFilterElement;
-    new(): SVGFilterElement;
-}
-
-interface SVGForeignObjectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    height: SVGAnimatedLength;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGForeignObjectElement: {
-    prototype: SVGForeignObjectElement;
-    new(): SVGForeignObjectElement;
-}
-
-interface SVGGElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGGElement: {
-    prototype: SVGGElement;
-    new(): SVGGElement;
-}
-
-interface SVGGradientElement extends SVGElement, SVGStylable, SVGExternalResourcesRequired, SVGURIReference, SVGUnitTypes {
-    gradientTransform: SVGAnimatedTransformList;
-    gradientUnits: SVGAnimatedEnumeration;
-    spreadMethod: SVGAnimatedEnumeration;
-    SVG_SPREADMETHOD_PAD: number;
-    SVG_SPREADMETHOD_REFLECT: number;
-    SVG_SPREADMETHOD_REPEAT: number;
-    SVG_SPREADMETHOD_UNKNOWN: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGGradientElement: {
-    prototype: SVGGradientElement;
-    new(): SVGGradientElement;
-    SVG_SPREADMETHOD_PAD: number;
-    SVG_SPREADMETHOD_REFLECT: number;
-    SVG_SPREADMETHOD_REPEAT: number;
-    SVG_SPREADMETHOD_UNKNOWN: number;
-}
-
-interface SVGImageElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
-    height: SVGAnimatedLength;
-    preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGImageElement: {
-    prototype: SVGImageElement;
-    new(): SVGImageElement;
-}
-
-interface SVGLength {
-    unitType: number;
-    value: number;
-    valueAsString: string;
-    valueInSpecifiedUnits: number;
-    convertToSpecifiedUnits(unitType: number): void;
-    newValueSpecifiedUnits(unitType: number, valueInSpecifiedUnits: number): void;
-    SVG_LENGTHTYPE_CM: number;
-    SVG_LENGTHTYPE_EMS: number;
-    SVG_LENGTHTYPE_EXS: number;
-    SVG_LENGTHTYPE_IN: number;
-    SVG_LENGTHTYPE_MM: number;
-    SVG_LENGTHTYPE_NUMBER: number;
-    SVG_LENGTHTYPE_PC: number;
-    SVG_LENGTHTYPE_PERCENTAGE: number;
-    SVG_LENGTHTYPE_PT: number;
-    SVG_LENGTHTYPE_PX: number;
-    SVG_LENGTHTYPE_UNKNOWN: number;
-}
-
-declare var SVGLength: {
-    prototype: SVGLength;
-    new(): SVGLength;
-    SVG_LENGTHTYPE_CM: number;
-    SVG_LENGTHTYPE_EMS: number;
-    SVG_LENGTHTYPE_EXS: number;
-    SVG_LENGTHTYPE_IN: number;
-    SVG_LENGTHTYPE_MM: number;
-    SVG_LENGTHTYPE_NUMBER: number;
-    SVG_LENGTHTYPE_PC: number;
-    SVG_LENGTHTYPE_PERCENTAGE: number;
-    SVG_LENGTHTYPE_PT: number;
-    SVG_LENGTHTYPE_PX: number;
-    SVG_LENGTHTYPE_UNKNOWN: number;
-}
-
-interface SVGLengthList {
-    numberOfItems: number;
-    appendItem(newItem: SVGLength): SVGLength;
-    clear(): void;
-    getItem(index: number): SVGLength;
-    initialize(newItem: SVGLength): SVGLength;
-    insertItemBefore(newItem: SVGLength, index: number): SVGLength;
-    removeItem(index: number): SVGLength;
-    replaceItem(newItem: SVGLength, index: number): SVGLength;
-}
-
-declare var SVGLengthList: {
-    prototype: SVGLengthList;
-    new(): SVGLengthList;
-}
-
-interface SVGLineElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    x1: SVGAnimatedLength;
-    x2: SVGAnimatedLength;
-    y1: SVGAnimatedLength;
-    y2: SVGAnimatedLength;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGLineElement: {
-    prototype: SVGLineElement;
-    new(): SVGLineElement;
-}
-
-interface SVGLinearGradientElement extends SVGGradientElement {
-    x1: SVGAnimatedLength;
-    x2: SVGAnimatedLength;
-    y1: SVGAnimatedLength;
-    y2: SVGAnimatedLength;
-}
-
-declare var SVGLinearGradientElement: {
-    prototype: SVGLinearGradientElement;
-    new(): SVGLinearGradientElement;
-}
-
-interface SVGMarkerElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox {
-    markerHeight: SVGAnimatedLength;
-    markerUnits: SVGAnimatedEnumeration;
-    markerWidth: SVGAnimatedLength;
-    orientAngle: SVGAnimatedAngle;
-    orientType: SVGAnimatedEnumeration;
-    refX: SVGAnimatedLength;
-    refY: SVGAnimatedLength;
-    setOrientToAngle(angle: SVGAngle): void;
-    setOrientToAuto(): void;
-    SVG_MARKERUNITS_STROKEWIDTH: number;
-    SVG_MARKERUNITS_UNKNOWN: number;
-    SVG_MARKERUNITS_USERSPACEONUSE: number;
-    SVG_MARKER_ORIENT_ANGLE: number;
-    SVG_MARKER_ORIENT_AUTO: number;
-    SVG_MARKER_ORIENT_UNKNOWN: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGMarkerElement: {
-    prototype: SVGMarkerElement;
-    new(): SVGMarkerElement;
-    SVG_MARKERUNITS_STROKEWIDTH: number;
-    SVG_MARKERUNITS_UNKNOWN: number;
-    SVG_MARKERUNITS_USERSPACEONUSE: number;
-    SVG_MARKER_ORIENT_ANGLE: number;
-    SVG_MARKER_ORIENT_AUTO: number;
-    SVG_MARKER_ORIENT_UNKNOWN: number;
-}
-
-interface SVGMaskElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes {
-    height: SVGAnimatedLength;
-    maskContentUnits: SVGAnimatedEnumeration;
-    maskUnits: SVGAnimatedEnumeration;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGMaskElement: {
-    prototype: SVGMaskElement;
-    new(): SVGMaskElement;
-}
-
-interface SVGMatrix {
-    a: number;
-    b: number;
-    c: number;
-    d: number;
-    e: number;
-    f: number;
-    flipX(): SVGMatrix;
-    flipY(): SVGMatrix;
-    inverse(): SVGMatrix;
-    multiply(secondMatrix: SVGMatrix): SVGMatrix;
-    rotate(angle: number): SVGMatrix;
-    rotateFromVector(x: number, y: number): SVGMatrix;
-    scale(scaleFactor: number): SVGMatrix;
-    scaleNonUniform(scaleFactorX: number, scaleFactorY: number): SVGMatrix;
-    skewX(angle: number): SVGMatrix;
-    skewY(angle: number): SVGMatrix;
-    translate(x: number, y: number): SVGMatrix;
-}
-
-declare var SVGMatrix: {
-    prototype: SVGMatrix;
-    new(): SVGMatrix;
-}
-
-interface SVGMetadataElement extends SVGElement {
-}
-
-declare var SVGMetadataElement: {
-    prototype: SVGMetadataElement;
-    new(): SVGMetadataElement;
-}
-
-interface SVGNumber {
-    value: number;
-}
-
-declare var SVGNumber: {
-    prototype: SVGNumber;
-    new(): SVGNumber;
-}
-
-interface SVGNumberList {
-    numberOfItems: number;
-    appendItem(newItem: SVGNumber): SVGNumber;
-    clear(): void;
-    getItem(index: number): SVGNumber;
-    initialize(newItem: SVGNumber): SVGNumber;
-    insertItemBefore(newItem: SVGNumber, index: number): SVGNumber;
-    removeItem(index: number): SVGNumber;
-    replaceItem(newItem: SVGNumber, index: number): SVGNumber;
-}
-
-declare var SVGNumberList: {
-    prototype: SVGNumberList;
-    new(): SVGNumberList;
-}
-
-interface SVGPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPathData {
-    createSVGPathSegArcAbs(x: number, y: number, r1: number, r2: number, angle: number, largeArcFlag: boolean, sweepFlag: boolean): SVGPathSegArcAbs;
-    createSVGPathSegArcRel(x: number, y: number, r1: number, r2: number, angle: number, largeArcFlag: boolean, sweepFlag: boolean): SVGPathSegArcRel;
-    createSVGPathSegClosePath(): SVGPathSegClosePath;
-    createSVGPathSegCurvetoCubicAbs(x: number, y: number, x1: number, y1: number, x2: number, y2: number): SVGPathSegCurvetoCubicAbs;
-    createSVGPathSegCurvetoCubicRel(x: number, y: number, x1: number, y1: number, x2: number, y2: number): SVGPathSegCurvetoCubicRel;
-    createSVGPathSegCurvetoCubicSmoothAbs(x: number, y: number, x2: number, y2: number): SVGPathSegCurvetoCubicSmoothAbs;
-    createSVGPathSegCurvetoCubicSmoothRel(x: number, y: number, x2: number, y2: number): SVGPathSegCurvetoCubicSmoothRel;
-    createSVGPathSegCurvetoQuadraticAbs(x: number, y: number, x1: number, y1: number): SVGPathSegCurvetoQuadraticAbs;
-    createSVGPathSegCurvetoQuadraticRel(x: number, y: number, x1: number, y1: number): SVGPathSegCurvetoQuadraticRel;
-    createSVGPathSegCurvetoQuadraticSmoothAbs(x: number, y: number): SVGPathSegCurvetoQuadraticSmoothAbs;
-    createSVGPathSegCurvetoQuadraticSmoothRel(x: number, y: number): SVGPathSegCurvetoQuadraticSmoothRel;
-    createSVGPathSegLinetoAbs(x: number, y: number): SVGPathSegLinetoAbs;
-    createSVGPathSegLinetoHorizontalAbs(x: number): SVGPathSegLinetoHorizontalAbs;
-    createSVGPathSegLinetoHorizontalRel(x: number): SVGPathSegLinetoHorizontalRel;
-    createSVGPathSegLinetoRel(x: number, y: number): SVGPathSegLinetoRel;
-    createSVGPathSegLinetoVerticalAbs(y: number): SVGPathSegLinetoVerticalAbs;
-    createSVGPathSegLinetoVerticalRel(y: number): SVGPathSegLinetoVerticalRel;
-    createSVGPathSegMovetoAbs(x: number, y: number): SVGPathSegMovetoAbs;
-    createSVGPathSegMovetoRel(x: number, y: number): SVGPathSegMovetoRel;
-    getPathSegAtLength(distance: number): number;
-    getPointAtLength(distance: number): SVGPoint;
-    getTotalLength(): number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGPathElement: {
-    prototype: SVGPathElement;
-    new(): SVGPathElement;
-}
-
-interface SVGPathSeg {
-    pathSegType: number;
-    pathSegTypeAsLetter: string;
-    PATHSEG_ARC_ABS: number;
-    PATHSEG_ARC_REL: number;
-    PATHSEG_CLOSEPATH: number;
-    PATHSEG_CURVETO_CUBIC_ABS: number;
-    PATHSEG_CURVETO_CUBIC_REL: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
-    PATHSEG_LINETO_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_REL: number;
-    PATHSEG_LINETO_REL: number;
-    PATHSEG_LINETO_VERTICAL_ABS: number;
-    PATHSEG_LINETO_VERTICAL_REL: number;
-    PATHSEG_MOVETO_ABS: number;
-    PATHSEG_MOVETO_REL: number;
-    PATHSEG_UNKNOWN: number;
-}
-
-declare var SVGPathSeg: {
-    prototype: SVGPathSeg;
-    new(): SVGPathSeg;
-    PATHSEG_ARC_ABS: number;
-    PATHSEG_ARC_REL: number;
-    PATHSEG_CLOSEPATH: number;
-    PATHSEG_CURVETO_CUBIC_ABS: number;
-    PATHSEG_CURVETO_CUBIC_REL: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
-    PATHSEG_LINETO_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_REL: number;
-    PATHSEG_LINETO_REL: number;
-    PATHSEG_LINETO_VERTICAL_ABS: number;
-    PATHSEG_LINETO_VERTICAL_REL: number;
-    PATHSEG_MOVETO_ABS: number;
-    PATHSEG_MOVETO_REL: number;
-    PATHSEG_UNKNOWN: number;
-}
-
-interface SVGPathSegArcAbs extends SVGPathSeg {
-    angle: number;
-    largeArcFlag: boolean;
-    r1: number;
-    r2: number;
-    sweepFlag: boolean;
-    x: number;
-    y: number;
-}
-
-declare var SVGPathSegArcAbs: {
-    prototype: SVGPathSegArcAbs;
-    new(): SVGPathSegArcAbs;
-}
-
-interface SVGPathSegArcRel extends SVGPathSeg {
-    angle: number;
-    largeArcFlag: boolean;
-    r1: number;
-    r2: number;
-    sweepFlag: boolean;
-    x: number;
-    y: number;
-}
-
-declare var SVGPathSegArcRel: {
-    prototype: SVGPathSegArcRel;
-    new(): SVGPathSegArcRel;
-}
-
-interface SVGPathSegClosePath extends SVGPathSeg {
-}
-
-declare var SVGPathSegClosePath: {
-    prototype: SVGPathSegClosePath;
-    new(): SVGPathSegClosePath;
-}
-
-interface SVGPathSegCurvetoCubicAbs extends SVGPathSeg {
-    x: number;
-    x1: number;
-    x2: number;
-    y: number;
-    y1: number;
-    y2: number;
-}
-
-declare var SVGPathSegCurvetoCubicAbs: {
-    prototype: SVGPathSegCurvetoCubicAbs;
-    new(): SVGPathSegCurvetoCubicAbs;
-}
-
-interface SVGPathSegCurvetoCubicRel extends SVGPathSeg {
-    x: number;
-    x1: number;
-    x2: number;
-    y: number;
-    y1: number;
-    y2: number;
-}
-
-declare var SVGPathSegCurvetoCubicRel: {
-    prototype: SVGPathSegCurvetoCubicRel;
-    new(): SVGPathSegCurvetoCubicRel;
-}
-
-interface SVGPathSegCurvetoCubicSmoothAbs extends SVGPathSeg {
-    x: number;
-    x2: number;
-    y: number;
-    y2: number;
-}
-
-declare var SVGPathSegCurvetoCubicSmoothAbs: {
-    prototype: SVGPathSegCurvetoCubicSmoothAbs;
-    new(): SVGPathSegCurvetoCubicSmoothAbs;
-}
-
-interface SVGPathSegCurvetoCubicSmoothRel extends SVGPathSeg {
-    x: number;
-    x2: number;
-    y: number;
-    y2: number;
-}
-
-declare var SVGPathSegCurvetoCubicSmoothRel: {
-    prototype: SVGPathSegCurvetoCubicSmoothRel;
-    new(): SVGPathSegCurvetoCubicSmoothRel;
-}
-
-interface SVGPathSegCurvetoQuadraticAbs extends SVGPathSeg {
-    x: number;
-    x1: number;
-    y: number;
-    y1: number;
-}
-
-declare var SVGPathSegCurvetoQuadraticAbs: {
-    prototype: SVGPathSegCurvetoQuadraticAbs;
-    new(): SVGPathSegCurvetoQuadraticAbs;
-}
-
-interface SVGPathSegCurvetoQuadraticRel extends SVGPathSeg {
-    x: number;
-    x1: number;
-    y: number;
-    y1: number;
-}
-
-declare var SVGPathSegCurvetoQuadraticRel: {
-    prototype: SVGPathSegCurvetoQuadraticRel;
-    new(): SVGPathSegCurvetoQuadraticRel;
-}
-
-interface SVGPathSegCurvetoQuadraticSmoothAbs extends SVGPathSeg {
-    x: number;
-    y: number;
-}
-
-declare var SVGPathSegCurvetoQuadraticSmoothAbs: {
-    prototype: SVGPathSegCurvetoQuadraticSmoothAbs;
-    new(): SVGPathSegCurvetoQuadraticSmoothAbs;
-}
-
-interface SVGPathSegCurvetoQuadraticSmoothRel extends SVGPathSeg {
-    x: number;
-    y: number;
-}
-
-declare var SVGPathSegCurvetoQuadraticSmoothRel: {
-    prototype: SVGPathSegCurvetoQuadraticSmoothRel;
-    new(): SVGPathSegCurvetoQuadraticSmoothRel;
-}
-
-interface SVGPathSegLinetoAbs extends SVGPathSeg {
-    x: number;
-    y: number;
-}
-
-declare var SVGPathSegLinetoAbs: {
-    prototype: SVGPathSegLinetoAbs;
-    new(): SVGPathSegLinetoAbs;
-}
-
-interface SVGPathSegLinetoHorizontalAbs extends SVGPathSeg {
-    x: number;
-}
-
-declare var SVGPathSegLinetoHorizontalAbs: {
-    prototype: SVGPathSegLinetoHorizontalAbs;
-    new(): SVGPathSegLinetoHorizontalAbs;
-}
-
-interface SVGPathSegLinetoHorizontalRel extends SVGPathSeg {
-    x: number;
-}
-
-declare var SVGPathSegLinetoHorizontalRel: {
-    prototype: SVGPathSegLinetoHorizontalRel;
-    new(): SVGPathSegLinetoHorizontalRel;
-}
-
-interface SVGPathSegLinetoRel extends SVGPathSeg {
-    x: number;
-    y: number;
-}
-
-declare var SVGPathSegLinetoRel: {
-    prototype: SVGPathSegLinetoRel;
-    new(): SVGPathSegLinetoRel;
-}
-
-interface SVGPathSegLinetoVerticalAbs extends SVGPathSeg {
-    y: number;
-}
-
-declare var SVGPathSegLinetoVerticalAbs: {
-    prototype: SVGPathSegLinetoVerticalAbs;
-    new(): SVGPathSegLinetoVerticalAbs;
-}
-
-interface SVGPathSegLinetoVerticalRel extends SVGPathSeg {
-    y: number;
-}
-
-declare var SVGPathSegLinetoVerticalRel: {
-    prototype: SVGPathSegLinetoVerticalRel;
-    new(): SVGPathSegLinetoVerticalRel;
-}
-
-interface SVGPathSegList {
-    numberOfItems: number;
-    appendItem(newItem: SVGPathSeg): SVGPathSeg;
-    clear(): void;
-    getItem(index: number): SVGPathSeg;
-    initialize(newItem: SVGPathSeg): SVGPathSeg;
-    insertItemBefore(newItem: SVGPathSeg, index: number): SVGPathSeg;
-    removeItem(index: number): SVGPathSeg;
-    replaceItem(newItem: SVGPathSeg, index: number): SVGPathSeg;
-}
-
-declare var SVGPathSegList: {
-    prototype: SVGPathSegList;
-    new(): SVGPathSegList;
-}
-
-interface SVGPathSegMovetoAbs extends SVGPathSeg {
-    x: number;
-    y: number;
-}
-
-declare var SVGPathSegMovetoAbs: {
-    prototype: SVGPathSegMovetoAbs;
-    new(): SVGPathSegMovetoAbs;
-}
-
-interface SVGPathSegMovetoRel extends SVGPathSeg {
-    x: number;
-    y: number;
-}
-
-declare var SVGPathSegMovetoRel: {
-    prototype: SVGPathSegMovetoRel;
-    new(): SVGPathSegMovetoRel;
-}
-
-interface SVGPatternElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox, SVGURIReference, SVGUnitTypes {
-    height: SVGAnimatedLength;
-    patternContentUnits: SVGAnimatedEnumeration;
-    patternTransform: SVGAnimatedTransformList;
-    patternUnits: SVGAnimatedEnumeration;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGPatternElement: {
-    prototype: SVGPatternElement;
-    new(): SVGPatternElement;
-}
-
-interface SVGPoint {
-    x: number;
-    y: number;
-    matrixTransform(matrix: SVGMatrix): SVGPoint;
-}
-
-declare var SVGPoint: {
-    prototype: SVGPoint;
-    new(): SVGPoint;
-}
-
-interface SVGPointList {
-    numberOfItems: number;
-    appendItem(newItem: SVGPoint): SVGPoint;
-    clear(): void;
-    getItem(index: number): SVGPoint;
-    initialize(newItem: SVGPoint): SVGPoint;
-    insertItemBefore(newItem: SVGPoint, index: number): SVGPoint;
-    removeItem(index: number): SVGPoint;
-    replaceItem(newItem: SVGPoint, index: number): SVGPoint;
-}
-
-declare var SVGPointList: {
-    prototype: SVGPointList;
-    new(): SVGPointList;
-}
-
-interface SVGPolygonElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPoints {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGPolygonElement: {
-    prototype: SVGPolygonElement;
-    new(): SVGPolygonElement;
-}
-
-interface SVGPolylineElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPoints {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGPolylineElement: {
-    prototype: SVGPolylineElement;
-    new(): SVGPolylineElement;
-}
-
-interface SVGPreserveAspectRatio {
-    align: number;
-    meetOrSlice: number;
-    SVG_MEETORSLICE_MEET: number;
-    SVG_MEETORSLICE_SLICE: number;
-    SVG_MEETORSLICE_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_NONE: number;
-    SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
-}
-
-declare var SVGPreserveAspectRatio: {
-    prototype: SVGPreserveAspectRatio;
-    new(): SVGPreserveAspectRatio;
-    SVG_MEETORSLICE_MEET: number;
-    SVG_MEETORSLICE_SLICE: number;
-    SVG_MEETORSLICE_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_NONE: number;
-    SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
-}
-
-interface SVGRadialGradientElement extends SVGGradientElement {
-    cx: SVGAnimatedLength;
-    cy: SVGAnimatedLength;
-    fx: SVGAnimatedLength;
-    fy: SVGAnimatedLength;
-    r: SVGAnimatedLength;
-}
-
-declare var SVGRadialGradientElement: {
-    prototype: SVGRadialGradientElement;
-    new(): SVGRadialGradientElement;
-}
-
-interface SVGRect {
-    height: number;
-    width: number;
-    x: number;
-    y: number;
-}
-
-declare var SVGRect: {
-    prototype: SVGRect;
-    new(): SVGRect;
-}
-
-interface SVGRectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    height: SVGAnimatedLength;
-    rx: SVGAnimatedLength;
-    ry: SVGAnimatedLength;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGRectElement: {
-    prototype: SVGRectElement;
-    new(): SVGRectElement;
-}
-
-interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTests, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan {
-    contentScriptType: string;
-    contentStyleType: string;
-    currentScale: number;
-    currentTranslate: SVGPoint;
-    height: SVGAnimatedLength;
-    onabort: (ev: Event) => any;
-    onerror: (ev: Event) => any;
-    onresize: (ev: UIEvent) => any;
-    onscroll: (ev: UIEvent) => any;
-    onunload: (ev: Event) => any;
-    onzoom: (ev: SVGZoomEvent) => any;
-    pixelUnitToMillimeterX: number;
-    pixelUnitToMillimeterY: number;
-    screenPixelToMillimeterX: number;
-    screenPixelToMillimeterY: number;
-    viewport: SVGRect;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
-    checkEnclosure(element: SVGElement, rect: SVGRect): boolean;
-    checkIntersection(element: SVGElement, rect: SVGRect): boolean;
-    createSVGAngle(): SVGAngle;
-    createSVGLength(): SVGLength;
-    createSVGMatrix(): SVGMatrix;
-    createSVGNumber(): SVGNumber;
-    createSVGPoint(): SVGPoint;
-    createSVGRect(): SVGRect;
-    createSVGTransform(): SVGTransform;
-    createSVGTransformFromMatrix(matrix: SVGMatrix): SVGTransform;
-    deselectAll(): void;
-    forceRedraw(): void;
-    getComputedStyle(elt: Element, pseudoElt?: string): CSSStyleDeclaration;
-    getCurrentTime(): number;
-    getElementById(elementId: string): Element;
-    getEnclosureList(rect: SVGRect, referenceElement: SVGElement): NodeList;
-    getIntersectionList(rect: SVGRect, referenceElement: SVGElement): NodeList;
-    pauseAnimations(): void;
-    setCurrentTime(seconds: number): void;
-    suspendRedraw(maxWaitMilliseconds: number): number;
-    unpauseAnimations(): void;
-    unsuspendRedraw(suspendHandleID: number): void;
-    unsuspendRedrawAll(): void;
-    addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "SVGAbort", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "SVGError", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "SVGUnload", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "SVGZoom", listener: (ev: SVGZoomEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focusin", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focusout", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "resize", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGSVGElement: {
-    prototype: SVGSVGElement;
-    new(): SVGSVGElement;
-}
-
-interface SVGScriptElement extends SVGElement, SVGExternalResourcesRequired, SVGURIReference {
-    type: string;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGScriptElement: {
-    prototype: SVGScriptElement;
-    new(): SVGScriptElement;
-}
-
-interface SVGStopElement extends SVGElement, SVGStylable {
-    offset: SVGAnimatedNumber;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGStopElement: {
-    prototype: SVGStopElement;
-    new(): SVGStopElement;
-}
-
-interface SVGStringList {
-    numberOfItems: number;
-    appendItem(newItem: string): string;
-    clear(): void;
-    getItem(index: number): string;
-    initialize(newItem: string): string;
-    insertItemBefore(newItem: string, index: number): string;
-    removeItem(index: number): string;
-    replaceItem(newItem: string, index: number): string;
-}
-
-declare var SVGStringList: {
-    prototype: SVGStringList;
-    new(): SVGStringList;
-}
-
-interface SVGStyleElement extends SVGElement, SVGLangSpace {
-    media: string;
-    title: string;
-    type: string;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGStyleElement: {
-    prototype: SVGStyleElement;
-    new(): SVGStyleElement;
-}
-
-interface SVGSwitchElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGSwitchElement: {
-    prototype: SVGSwitchElement;
-    new(): SVGSwitchElement;
-}
-
-interface SVGSymbolElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGSymbolElement: {
-    prototype: SVGSymbolElement;
-    new(): SVGSymbolElement;
-}
-
-interface SVGTSpanElement extends SVGTextPositioningElement {
-}
-
-declare var SVGTSpanElement: {
-    prototype: SVGTSpanElement;
-    new(): SVGTSpanElement;
-}
-
-interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    lengthAdjust: SVGAnimatedEnumeration;
-    textLength: SVGAnimatedLength;
-    getCharNumAtPosition(point: SVGPoint): number;
-    getComputedTextLength(): number;
-    getEndPositionOfChar(charnum: number): SVGPoint;
-    getExtentOfChar(charnum: number): SVGRect;
-    getNumberOfChars(): number;
-    getRotationOfChar(charnum: number): number;
-    getStartPositionOfChar(charnum: number): SVGPoint;
-    getSubStringLength(charnum: number, nchars: number): number;
-    selectSubString(charnum: number, nchars: number): void;
-    LENGTHADJUST_SPACING: number;
-    LENGTHADJUST_SPACINGANDGLYPHS: number;
-    LENGTHADJUST_UNKNOWN: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGTextContentElement: {
-    prototype: SVGTextContentElement;
-    new(): SVGTextContentElement;
-    LENGTHADJUST_SPACING: number;
-    LENGTHADJUST_SPACINGANDGLYPHS: number;
-    LENGTHADJUST_UNKNOWN: number;
-}
-
-interface SVGTextElement extends SVGTextPositioningElement, SVGTransformable {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGTextElement: {
-    prototype: SVGTextElement;
-    new(): SVGTextElement;
-}
-
-interface SVGTextPathElement extends SVGTextContentElement, SVGURIReference {
-    method: SVGAnimatedEnumeration;
-    spacing: SVGAnimatedEnumeration;
-    startOffset: SVGAnimatedLength;
-    TEXTPATH_METHODTYPE_ALIGN: number;
-    TEXTPATH_METHODTYPE_STRETCH: number;
-    TEXTPATH_METHODTYPE_UNKNOWN: number;
-    TEXTPATH_SPACINGTYPE_AUTO: number;
-    TEXTPATH_SPACINGTYPE_EXACT: number;
-    TEXTPATH_SPACINGTYPE_UNKNOWN: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGTextPathElement: {
-    prototype: SVGTextPathElement;
-    new(): SVGTextPathElement;
-    TEXTPATH_METHODTYPE_ALIGN: number;
-    TEXTPATH_METHODTYPE_STRETCH: number;
-    TEXTPATH_METHODTYPE_UNKNOWN: number;
-    TEXTPATH_SPACINGTYPE_AUTO: number;
-    TEXTPATH_SPACINGTYPE_EXACT: number;
-    TEXTPATH_SPACINGTYPE_UNKNOWN: number;
-}
-
-interface SVGTextPositioningElement extends SVGTextContentElement {
-    dx: SVGAnimatedLengthList;
-    dy: SVGAnimatedLengthList;
-    rotate: SVGAnimatedNumberList;
-    x: SVGAnimatedLengthList;
-    y: SVGAnimatedLengthList;
-}
-
-declare var SVGTextPositioningElement: {
-    prototype: SVGTextPositioningElement;
-    new(): SVGTextPositioningElement;
-}
-
-interface SVGTitleElement extends SVGElement, SVGStylable, SVGLangSpace {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGTitleElement: {
-    prototype: SVGTitleElement;
-    new(): SVGTitleElement;
-}
-
-interface SVGTransform {
-    angle: number;
-    matrix: SVGMatrix;
-    type: number;
-    setMatrix(matrix: SVGMatrix): void;
-    setRotate(angle: number, cx: number, cy: number): void;
-    setScale(sx: number, sy: number): void;
-    setSkewX(angle: number): void;
-    setSkewY(angle: number): void;
-    setTranslate(tx: number, ty: number): void;
-    SVG_TRANSFORM_MATRIX: number;
-    SVG_TRANSFORM_ROTATE: number;
-    SVG_TRANSFORM_SCALE: number;
-    SVG_TRANSFORM_SKEWX: number;
-    SVG_TRANSFORM_SKEWY: number;
-    SVG_TRANSFORM_TRANSLATE: number;
-    SVG_TRANSFORM_UNKNOWN: number;
-}
-
-declare var SVGTransform: {
-    prototype: SVGTransform;
-    new(): SVGTransform;
-    SVG_TRANSFORM_MATRIX: number;
-    SVG_TRANSFORM_ROTATE: number;
-    SVG_TRANSFORM_SCALE: number;
-    SVG_TRANSFORM_SKEWX: number;
-    SVG_TRANSFORM_SKEWY: number;
-    SVG_TRANSFORM_TRANSLATE: number;
-    SVG_TRANSFORM_UNKNOWN: number;
-}
-
-interface SVGTransformList {
-    numberOfItems: number;
-    appendItem(newItem: SVGTransform): SVGTransform;
-    clear(): void;
-    consolidate(): SVGTransform;
-    createSVGTransformFromMatrix(matrix: SVGMatrix): SVGTransform;
-    getItem(index: number): SVGTransform;
-    initialize(newItem: SVGTransform): SVGTransform;
-    insertItemBefore(newItem: SVGTransform, index: number): SVGTransform;
-    removeItem(index: number): SVGTransform;
-    replaceItem(newItem: SVGTransform, index: number): SVGTransform;
-}
-
-declare var SVGTransformList: {
-    prototype: SVGTransformList;
-    new(): SVGTransformList;
-}
-
-interface SVGUnitTypes {
-    SVG_UNIT_TYPE_OBJECTBOUNDINGBOX: number;
-    SVG_UNIT_TYPE_UNKNOWN: number;
-    SVG_UNIT_TYPE_USERSPACEONUSE: number;
-}
-declare var SVGUnitTypes: SVGUnitTypes;
-
-interface SVGUseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
-    animatedInstanceRoot: SVGElementInstance;
-    height: SVGAnimatedLength;
-    instanceRoot: SVGElementInstance;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGUseElement: {
-    prototype: SVGUseElement;
-    new(): SVGUseElement;
-}
-
-interface SVGViewElement extends SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan {
-    viewTarget: SVGStringList;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var SVGViewElement: {
-    prototype: SVGViewElement;
-    new(): SVGViewElement;
-}
-
-interface SVGZoomAndPan {
-    SVG_ZOOMANDPAN_DISABLE: number;
-    SVG_ZOOMANDPAN_MAGNIFY: number;
-    SVG_ZOOMANDPAN_UNKNOWN: number;
-}
-declare var SVGZoomAndPan: SVGZoomAndPan;
-
-interface SVGZoomEvent extends UIEvent {
-    newScale: number;
-    newTranslate: SVGPoint;
-    previousScale: number;
-    previousTranslate: SVGPoint;
-    zoomRectScreen: SVGRect;
-}
-
-declare var SVGZoomEvent: {
-    prototype: SVGZoomEvent;
-    new(): SVGZoomEvent;
-}
-
-interface Screen extends EventTarget {
-    availHeight: number;
-    availWidth: number;
-    bufferDepth: number;
-    colorDepth: number;
-    deviceXDPI: number;
-    deviceYDPI: number;
-    fontSmoothingEnabled: boolean;
-    height: number;
-    logicalXDPI: number;
-    logicalYDPI: number;
-    msOrientation: string;
-    onmsorientationchange: (ev: Event) => any;
-    pixelDepth: number;
-    systemXDPI: number;
-    systemYDPI: number;
-    width: number;
-    msLockOrientation(orientations: string | string[]): boolean;
-    msUnlockOrientation(): void;
-    addEventListener(type: "MSOrientationChange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var Screen: {
-    prototype: Screen;
-    new(): Screen;
-}
-
-interface ScriptNotifyEvent extends Event {
-    callingUri: string;
-    value: string;
-}
-
-declare var ScriptNotifyEvent: {
-    prototype: ScriptNotifyEvent;
-    new(): ScriptNotifyEvent;
-}
-
-interface ScriptProcessorNode extends AudioNode {
-    bufferSize: number;
-    onaudioprocess: (ev: AudioProcessingEvent) => any;
-    addEventListener(type: "audioprocess", listener: (ev: AudioProcessingEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var ScriptProcessorNode: {
-    prototype: ScriptProcessorNode;
-    new(): ScriptProcessorNode;
-}
-
-interface Selection {
-    anchorNode: Node;
-    anchorOffset: number;
-    focusNode: Node;
-    focusOffset: number;
-    isCollapsed: boolean;
-    rangeCount: number;
-    type: string;
-    addRange(range: Range): void;
-    collapse(parentNode: Node, offset: number): void;
-    collapseToEnd(): void;
-    collapseToStart(): void;
-    containsNode(node: Node, partlyContained: boolean): boolean;
-    deleteFromDocument(): void;
-    empty(): void;
-    extend(newNode: Node, offset: number): void;
-    getRangeAt(index: number): Range;
-    removeAllRanges(): void;
-    removeRange(range: Range): void;
-    selectAllChildren(parentNode: Node): void;
-    setBaseAndExtent(baseNode: Node, baseOffset: number, extentNode: Node, extentOffset: number): void;
-    toString(): string;
-}
-
-declare var Selection: {
-    prototype: Selection;
-    new(): Selection;
-}
-
-interface SourceBuffer extends EventTarget {
-    appendWindowEnd: number;
-    appendWindowStart: number;
-    audioTracks: AudioTrackList;
-    buffered: TimeRanges;
-    mode: string;
-    timestampOffset: number;
-    updating: boolean;
-    videoTracks: VideoTrackList;
-    abort(): void;
-    appendBuffer(data: ArrayBuffer | ArrayBufferView): void;
-    appendStream(stream: MSStream, maxSize?: number): void;
-    remove(start: number, end: number): void;
-}
-
-declare var SourceBuffer: {
-    prototype: SourceBuffer;
-    new(): SourceBuffer;
-}
-
-interface SourceBufferList extends EventTarget {
-    length: number;
-    item(index: number): SourceBuffer;
-    [index: number]: SourceBuffer;
-}
-
-declare var SourceBufferList: {
-    prototype: SourceBufferList;
-    new(): SourceBufferList;
-}
-
-interface StereoPannerNode extends AudioNode {
-    pan: AudioParam;
-}
-
-declare var StereoPannerNode: {
-    prototype: StereoPannerNode;
-    new(): StereoPannerNode;
-}
-
-interface Storage {
-    length: number;
-    clear(): void;
-    getItem(key: string): any;
-    key(index: number): string;
-    removeItem(key: string): void;
-    setItem(key: string, data: string): void;
-    [key: string]: any;
-    [index: number]: string;
-}
-
-declare var Storage: {
-    prototype: Storage;
-    new(): Storage;
-}
-
-interface StorageEvent extends Event {
-    key: string;
-    newValue: any;
-    oldValue: any;
-    storageArea: Storage;
-    url: string;
-    initStorageEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, keyArg: string, oldValueArg: any, newValueArg: any, urlArg: string, storageAreaArg: Storage): void;
-}
-
-declare var StorageEvent: {
-    prototype: StorageEvent;
-    new(): StorageEvent;
-}
-
-interface StyleMedia {
-    type: string;
-    matchMedium(mediaquery: string): boolean;
-}
-
-declare var StyleMedia: {
-    prototype: StyleMedia;
-    new(): StyleMedia;
-}
-
-interface StyleSheet {
-    disabled: boolean;
-    href: string;
-    media: MediaList;
-    ownerNode: Node;
-    parentStyleSheet: StyleSheet;
-    title: string;
-    type: string;
-}
-
-declare var StyleSheet: {
-    prototype: StyleSheet;
-    new(): StyleSheet;
-}
-
-interface StyleSheetList {
-    length: number;
-    item(index?: number): StyleSheet;
-    [index: number]: StyleSheet;
-}
-
-declare var StyleSheetList: {
-    prototype: StyleSheetList;
-    new(): StyleSheetList;
-}
-
-interface StyleSheetPageList {
-    length: number;
-    item(index: number): CSSPageRule;
-    [index: number]: CSSPageRule;
-}
-
-declare var StyleSheetPageList: {
-    prototype: StyleSheetPageList;
-    new(): StyleSheetPageList;
-}
-
-interface SubtleCrypto {
-    decrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
-    deriveBits(algorithm: string | Algorithm, baseKey: CryptoKey, length: number): any;
-    deriveKey(algorithm: string | Algorithm, baseKey: CryptoKey, derivedKeyType: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    digest(algorithm: string | Algorithm, data: ArrayBufferView): any;
-    encrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
-    exportKey(format: string, key: CryptoKey): any;
-    generateKey(algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    importKey(format: string, keyData: ArrayBufferView, algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    sign(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
-    unwrapKey(format: string, wrappedKey: ArrayBufferView, unwrappingKey: CryptoKey, unwrapAlgorithm: string | Algorithm, unwrappedKeyAlgorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    verify(algorithm: string | Algorithm, key: CryptoKey, signature: ArrayBufferView, data: ArrayBufferView): any;
-    wrapKey(format: string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: string | Algorithm): any;
-}
-
-declare var SubtleCrypto: {
-    prototype: SubtleCrypto;
-    new(): SubtleCrypto;
-}
-
-interface Text extends CharacterData {
-    wholeText: string;
-    replaceWholeText(content: string): Text;
-    splitText(offset: number): Text;
-}
-
-declare var Text: {
-    prototype: Text;
-    new(): Text;
-}
-
-interface TextEvent extends UIEvent {
-    data: string;
-    inputMethod: number;
-    locale: string;
-    initTextEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, dataArg: string, inputMethod: number, locale: string): void;
-    DOM_INPUT_METHOD_DROP: number;
-    DOM_INPUT_METHOD_HANDWRITING: number;
-    DOM_INPUT_METHOD_IME: number;
-    DOM_INPUT_METHOD_KEYBOARD: number;
-    DOM_INPUT_METHOD_MULTIMODAL: number;
-    DOM_INPUT_METHOD_OPTION: number;
-    DOM_INPUT_METHOD_PASTE: number;
-    DOM_INPUT_METHOD_SCRIPT: number;
-    DOM_INPUT_METHOD_UNKNOWN: number;
-    DOM_INPUT_METHOD_VOICE: number;
-}
-
-declare var TextEvent: {
-    prototype: TextEvent;
-    new(): TextEvent;
-    DOM_INPUT_METHOD_DROP: number;
-    DOM_INPUT_METHOD_HANDWRITING: number;
-    DOM_INPUT_METHOD_IME: number;
-    DOM_INPUT_METHOD_KEYBOARD: number;
-    DOM_INPUT_METHOD_MULTIMODAL: number;
-    DOM_INPUT_METHOD_OPTION: number;
-    DOM_INPUT_METHOD_PASTE: number;
-    DOM_INPUT_METHOD_SCRIPT: number;
-    DOM_INPUT_METHOD_UNKNOWN: number;
-    DOM_INPUT_METHOD_VOICE: number;
-}
-
-interface TextMetrics {
-    width: number;
-}
-
-declare var TextMetrics: {
-    prototype: TextMetrics;
-    new(): TextMetrics;
-}
-
-interface TextRange {
-    boundingHeight: number;
-    boundingLeft: number;
-    boundingTop: number;
-    boundingWidth: number;
-    htmlText: string;
-    offsetLeft: number;
-    offsetTop: number;
-    text: string;
-    collapse(start?: boolean): void;
-    compareEndPoints(how: string, sourceRange: TextRange): number;
-    duplicate(): TextRange;
-    execCommand(cmdID: string, showUI?: boolean, value?: any): boolean;
-    execCommandShowHelp(cmdID: string): boolean;
-    expand(Unit: string): boolean;
-    findText(string: string, count?: number, flags?: number): boolean;
-    getBookmark(): string;
-    getBoundingClientRect(): ClientRect;
-    getClientRects(): ClientRectList;
-    inRange(range: TextRange): boolean;
-    isEqual(range: TextRange): boolean;
-    move(unit: string, count?: number): number;
-    moveEnd(unit: string, count?: number): number;
-    moveStart(unit: string, count?: number): number;
-    moveToBookmark(bookmark: string): boolean;
-    moveToElementText(element: Element): void;
-    moveToPoint(x: number, y: number): void;
-    parentElement(): Element;
-    pasteHTML(html: string): void;
-    queryCommandEnabled(cmdID: string): boolean;
-    queryCommandIndeterm(cmdID: string): boolean;
-    queryCommandState(cmdID: string): boolean;
-    queryCommandSupported(cmdID: string): boolean;
-    queryCommandText(cmdID: string): string;
-    queryCommandValue(cmdID: string): any;
-    scrollIntoView(fStart?: boolean): void;
-    select(): void;
-    setEndPoint(how: string, SourceRange: TextRange): void;
-}
-
-declare var TextRange: {
-    prototype: TextRange;
-    new(): TextRange;
-}
-
-interface TextRangeCollection {
-    length: number;
-    item(index: number): TextRange;
-    [index: number]: TextRange;
-}
-
-declare var TextRangeCollection: {
-    prototype: TextRangeCollection;
-    new(): TextRangeCollection;
-}
-
-interface TextTrack extends EventTarget {
-    activeCues: TextTrackCueList;
-    cues: TextTrackCueList;
-    inBandMetadataTrackDispatchType: string;
-    kind: string;
-    label: string;
-    language: string;
-    mode: any;
-    oncuechange: (ev: Event) => any;
-    onerror: (ev: Event) => any;
-    onload: (ev: Event) => any;
-    readyState: number;
-    addCue(cue: TextTrackCue): void;
-    removeCue(cue: TextTrackCue): void;
-    DISABLED: number;
-    ERROR: number;
-    HIDDEN: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
-    SHOWING: number;
-    addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var TextTrack: {
-    prototype: TextTrack;
-    new(): TextTrack;
-    DISABLED: number;
-    ERROR: number;
-    HIDDEN: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
-    SHOWING: number;
-}
-
-interface TextTrackCue extends EventTarget {
-    endTime: number;
-    id: string;
-    onenter: (ev: Event) => any;
-    onexit: (ev: Event) => any;
-    pauseOnExit: boolean;
-    startTime: number;
-    text: string;
-    track: TextTrack;
-    getCueAsHTML(): DocumentFragment;
-    addEventListener(type: "enter", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "exit", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var TextTrackCue: {
-    prototype: TextTrackCue;
-    new(startTime: number, endTime: number, text: string): TextTrackCue;
-}
-
-interface TextTrackCueList {
-    length: number;
-    getCueById(id: string): TextTrackCue;
-    item(index: number): TextTrackCue;
-    [index: number]: TextTrackCue;
-}
-
-declare var TextTrackCueList: {
-    prototype: TextTrackCueList;
-    new(): TextTrackCueList;
-}
-
-interface TextTrackList extends EventTarget {
-    length: number;
-    onaddtrack: (ev: TrackEvent) => any;
-    item(index: number): TextTrack;
-    addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-    [index: number]: TextTrack;
-}
-
-declare var TextTrackList: {
-    prototype: TextTrackList;
-    new(): TextTrackList;
-}
-
-interface TimeRanges {
-    length: number;
-    end(index: number): number;
-    start(index: number): number;
-}
-
-declare var TimeRanges: {
-    prototype: TimeRanges;
-    new(): TimeRanges;
-}
-
-interface Touch {
-    clientX: number;
-    clientY: number;
-    identifier: number;
-    pageX: number;
-    pageY: number;
-    screenX: number;
-    screenY: number;
-    target: EventTarget;
-}
-
-declare var Touch: {
-    prototype: Touch;
-    new(): Touch;
-}
-
-interface TouchEvent extends UIEvent {
-    altKey: boolean;
-    changedTouches: TouchList;
-    ctrlKey: boolean;
-    metaKey: boolean;
-    shiftKey: boolean;
-    targetTouches: TouchList;
-    touches: TouchList;
-}
-
-declare var TouchEvent: {
-    prototype: TouchEvent;
-    new(): TouchEvent;
-}
-
-interface TouchList {
-    length: number;
-    item(index: number): Touch;
-    [index: number]: Touch;
-}
-
-declare var TouchList: {
-    prototype: TouchList;
-    new(): TouchList;
-}
-
-interface TrackEvent extends Event {
-    track: any;
-}
-
-declare var TrackEvent: {
-    prototype: TrackEvent;
-    new(): TrackEvent;
-}
-
-interface TransitionEvent extends Event {
-    elapsedTime: number;
-    propertyName: string;
-    initTransitionEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, propertyNameArg: string, elapsedTimeArg: number): void;
-}
-
-declare var TransitionEvent: {
-    prototype: TransitionEvent;
-    new(): TransitionEvent;
-}
-
-interface TreeWalker {
-    currentNode: Node;
-    expandEntityReferences: boolean;
-    filter: NodeFilter;
-    root: Node;
-    whatToShow: number;
-    firstChild(): Node;
-    lastChild(): Node;
-    nextNode(): Node;
-    nextSibling(): Node;
-    parentNode(): Node;
-    previousNode(): Node;
-    previousSibling(): Node;
-}
-
-declare var TreeWalker: {
-    prototype: TreeWalker;
-    new(): TreeWalker;
-}
-
-interface UIEvent extends Event {
-    detail: number;
-    view: Window;
-    initUIEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number): void;
-}
-
-declare var UIEvent: {
-    prototype: UIEvent;
-    new(type: string, eventInitDict?: UIEventInit): UIEvent;
-}
-
-interface URL {
-    createObjectURL(object: any, options?: ObjectURLOptions): string;
-    revokeObjectURL(url: string): void;
-}
-declare var URL: URL;
-
-interface UnviewableContentIdentifiedEvent extends NavigationEventWithReferrer {
-    mediaType: string;
-}
-
-declare var UnviewableContentIdentifiedEvent: {
-    prototype: UnviewableContentIdentifiedEvent;
-    new(): UnviewableContentIdentifiedEvent;
-}
-
-interface ValidityState {
-    badInput: boolean;
-    customError: boolean;
-    patternMismatch: boolean;
-    rangeOverflow: boolean;
-    rangeUnderflow: boolean;
-    stepMismatch: boolean;
-    tooLong: boolean;
-    typeMismatch: boolean;
-    valid: boolean;
-    valueMissing: boolean;
-}
-
-declare var ValidityState: {
-    prototype: ValidityState;
-    new(): ValidityState;
-}
-
-interface VideoPlaybackQuality {
-    corruptedVideoFrames: number;
-    creationTime: number;
-    droppedVideoFrames: number;
-    totalFrameDelay: number;
-    totalVideoFrames: number;
-}
-
-declare var VideoPlaybackQuality: {
-    prototype: VideoPlaybackQuality;
-    new(): VideoPlaybackQuality;
-}
-
-interface VideoTrack {
-    id: string;
-    kind: string;
-    label: string;
-    language: string;
-    selected: boolean;
-    sourceBuffer: SourceBuffer;
-}
-
-declare var VideoTrack: {
-    prototype: VideoTrack;
-    new(): VideoTrack;
-}
-
-interface VideoTrackList extends EventTarget {
-    length: number;
-    onaddtrack: (ev: TrackEvent) => any;
-    onchange: (ev: Event) => any;
-    onremovetrack: (ev: TrackEvent) => any;
-    selectedIndex: number;
-    getTrackById(id: string): VideoTrack;
-    item(index: number): VideoTrack;
-    addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "removetrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-    [index: number]: VideoTrack;
-}
-
-declare var VideoTrackList: {
-    prototype: VideoTrackList;
-    new(): VideoTrackList;
-}
-
-interface WEBGL_compressed_texture_s3tc {
-    COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
-    COMPRESSED_RGB_S3TC_DXT1_EXT: number;
-}
-
-declare var WEBGL_compressed_texture_s3tc: {
-    prototype: WEBGL_compressed_texture_s3tc;
-    new(): WEBGL_compressed_texture_s3tc;
-    COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
-    COMPRESSED_RGB_S3TC_DXT1_EXT: number;
-}
-
-interface WEBGL_debug_renderer_info {
-    UNMASKED_RENDERER_WEBGL: number;
-    UNMASKED_VENDOR_WEBGL: number;
-}
-
-declare var WEBGL_debug_renderer_info: {
-    prototype: WEBGL_debug_renderer_info;
-    new(): WEBGL_debug_renderer_info;
-    UNMASKED_RENDERER_WEBGL: number;
-    UNMASKED_VENDOR_WEBGL: number;
-}
-
-interface WEBGL_depth_texture {
-    UNSIGNED_INT_24_8_WEBGL: number;
-}
-
-declare var WEBGL_depth_texture: {
-    prototype: WEBGL_depth_texture;
-    new(): WEBGL_depth_texture;
-    UNSIGNED_INT_24_8_WEBGL: number;
-}
-
-interface WaveShaperNode extends AudioNode {
-    curve: Float32Array;
-    oversample: string;
-}
-
-declare var WaveShaperNode: {
-    prototype: WaveShaperNode;
-    new(): WaveShaperNode;
-}
-
-interface WebGLActiveInfo {
-    name: string;
-    size: number;
-    type: number;
-}
-
-declare var WebGLActiveInfo: {
-    prototype: WebGLActiveInfo;
-    new(): WebGLActiveInfo;
-}
-
-interface WebGLBuffer extends WebGLObject {
-}
-
-declare var WebGLBuffer: {
-    prototype: WebGLBuffer;
-    new(): WebGLBuffer;
-}
-
-interface WebGLContextEvent extends Event {
-    statusMessage: string;
-}
-
-declare var WebGLContextEvent: {
-    prototype: WebGLContextEvent;
-    new(): WebGLContextEvent;
-}
-
-interface WebGLFramebuffer extends WebGLObject {
-}
-
-declare var WebGLFramebuffer: {
-    prototype: WebGLFramebuffer;
-    new(): WebGLFramebuffer;
-}
-
-interface WebGLObject {
-}
-
-declare var WebGLObject: {
-    prototype: WebGLObject;
-    new(): WebGLObject;
-}
-
-interface WebGLProgram extends WebGLObject {
-}
-
-declare var WebGLProgram: {
-    prototype: WebGLProgram;
-    new(): WebGLProgram;
-}
-
-interface WebGLRenderbuffer extends WebGLObject {
-}
-
-declare var WebGLRenderbuffer: {
-    prototype: WebGLRenderbuffer;
-    new(): WebGLRenderbuffer;
-}
-
-interface WebGLRenderingContext {
-    canvas: HTMLCanvasElement;
-    drawingBufferHeight: number;
-    drawingBufferWidth: number;
-    activeTexture(texture: number): void;
-    attachShader(program: WebGLProgram, shader: WebGLShader): void;
-    bindAttribLocation(program: WebGLProgram, index: number, name: string): void;
-    bindBuffer(target: number, buffer: WebGLBuffer): void;
-    bindFramebuffer(target: number, framebuffer: WebGLFramebuffer): void;
-    bindRenderbuffer(target: number, renderbuffer: WebGLRenderbuffer): void;
-    bindTexture(target: number, texture: WebGLTexture): void;
-    blendColor(red: number, green: number, blue: number, alpha: number): void;
-    blendEquation(mode: number): void;
-    blendEquationSeparate(modeRGB: number, modeAlpha: number): void;
-    blendFunc(sfactor: number, dfactor: number): void;
-    blendFuncSeparate(srcRGB: number, dstRGB: number, srcAlpha: number, dstAlpha: number): void;
-    bufferData(target: number, size: number | ArrayBufferView | ArrayBuffer, usage: number): void;
-    bufferSubData(target: number, offset: number, data: ArrayBufferView | ArrayBuffer): void;
-    checkFramebufferStatus(target: number): number;
-    clear(mask: number): void;
-    clearColor(red: number, green: number, blue: number, alpha: number): void;
-    clearDepth(depth: number): void;
-    clearStencil(s: number): void;
-    colorMask(red: boolean, green: boolean, blue: boolean, alpha: boolean): void;
-    compileShader(shader: WebGLShader): void;
-    compressedTexImage2D(target: number, level: number, internalformat: number, width: number, height: number, border: number, data: ArrayBufferView): void;
-    compressedTexSubImage2D(target: number, level: number, xoffset: number, yoffset: number, width: number, height: number, format: number, data: ArrayBufferView): void;
-    copyTexImage2D(target: number, level: number, internalformat: number, x: number, y: number, width: number, height: number, border: number): void;
-    copyTexSubImage2D(target: number, level: number, xoffset: number, yoffset: number, x: number, y: number, width: number, height: number): void;
-    createBuffer(): WebGLBuffer;
-    createFramebuffer(): WebGLFramebuffer;
-    createProgram(): WebGLProgram;
-    createRenderbuffer(): WebGLRenderbuffer;
-    createShader(type: number): WebGLShader;
-    createTexture(): WebGLTexture;
-    cullFace(mode: number): void;
-    deleteBuffer(buffer: WebGLBuffer): void;
-    deleteFramebuffer(framebuffer: WebGLFramebuffer): void;
-    deleteProgram(program: WebGLProgram): void;
-    deleteRenderbuffer(renderbuffer: WebGLRenderbuffer): void;
-    deleteShader(shader: WebGLShader): void;
-    deleteTexture(texture: WebGLTexture): void;
-    depthFunc(func: number): void;
-    depthMask(flag: boolean): void;
-    depthRange(zNear: number, zFar: number): void;
-    detachShader(program: WebGLProgram, shader: WebGLShader): void;
-    disable(cap: number): void;
-    disableVertexAttribArray(index: number): void;
-    drawArrays(mode: number, first: number, count: number): void;
-    drawElements(mode: number, count: number, type: number, offset: number): void;
-    enable(cap: number): void;
-    enableVertexAttribArray(index: number): void;
-    finish(): void;
-    flush(): void;
-    framebufferRenderbuffer(target: number, attachment: number, renderbuffertarget: number, renderbuffer: WebGLRenderbuffer): void;
-    framebufferTexture2D(target: number, attachment: number, textarget: number, texture: WebGLTexture, level: number): void;
-    frontFace(mode: number): void;
-    generateMipmap(target: number): void;
-    getActiveAttrib(program: WebGLProgram, index: number): WebGLActiveInfo;
-    getActiveUniform(program: WebGLProgram, index: number): WebGLActiveInfo;
-    getAttachedShaders(program: WebGLProgram): WebGLShader[];
-    getAttribLocation(program: WebGLProgram, name: string): number;
-    getBufferParameter(target: number, pname: number): any;
-    getContextAttributes(): WebGLContextAttributes;
-    getError(): number;
-    getExtension(name: string): any;
-    getFramebufferAttachmentParameter(target: number, attachment: number, pname: number): any;
-    getParameter(pname: number): any;
-    getProgramInfoLog(program: WebGLProgram): string;
-    getProgramParameter(program: WebGLProgram, pname: number): any;
-    getRenderbufferParameter(target: number, pname: number): any;
-    getShaderInfoLog(shader: WebGLShader): string;
-    getShaderParameter(shader: WebGLShader, pname: number): any;
-    getShaderPrecisionFormat(shadertype: number, precisiontype: number): WebGLShaderPrecisionFormat;
-    getShaderSource(shader: WebGLShader): string;
-    getSupportedExtensions(): string[];
-    getTexParameter(target: number, pname: number): any;
-    getUniform(program: WebGLProgram, location: WebGLUniformLocation): any;
-    getUniformLocation(program: WebGLProgram, name: string): WebGLUniformLocation;
-    getVertexAttrib(index: number, pname: number): any;
-    getVertexAttribOffset(index: number, pname: number): number;
-    hint(target: number, mode: number): void;
-    isBuffer(buffer: WebGLBuffer): boolean;
-    isContextLost(): boolean;
-    isEnabled(cap: number): boolean;
-    isFramebuffer(framebuffer: WebGLFramebuffer): boolean;
-    isProgram(program: WebGLProgram): boolean;
-    isRenderbuffer(renderbuffer: WebGLRenderbuffer): boolean;
-    isShader(shader: WebGLShader): boolean;
-    isTexture(texture: WebGLTexture): boolean;
-    lineWidth(width: number): void;
-    linkProgram(program: WebGLProgram): void;
-    pixelStorei(pname: number, param: number): void;
-    polygonOffset(factor: number, units: number): void;
-    readPixels(x: number, y: number, width: number, height: number, format: number, type: number, pixels: ArrayBufferView): void;
-    renderbufferStorage(target: number, internalformat: number, width: number, height: number): void;
-    sampleCoverage(value: number, invert: boolean): void;
-    scissor(x: number, y: number, width: number, height: number): void;
-    shaderSource(shader: WebGLShader, source: string): void;
-    stencilFunc(func: number, ref: number, mask: number): void;
-    stencilFuncSeparate(face: number, func: number, ref: number, mask: number): void;
-    stencilMask(mask: number): void;
-    stencilMaskSeparate(face: number, mask: number): void;
-    stencilOp(fail: number, zfail: number, zpass: number): void;
-    stencilOpSeparate(face: number, fail: number, zfail: number, zpass: number): void;
-    texImage2D(target: number, level: number, internalformat: number, width: number, height: number, border: number, format: number, type: number, pixels: ArrayBufferView): void;
-    texImage2D(target: number, level: number, internalformat: number, format: number, type: number, image: HTMLImageElement): void;
-    texImage2D(target: number, level: number, internalformat: number, format: number, type: number, canvas: HTMLCanvasElement): void;
-    texImage2D(target: number, level: number, internalformat: number, format: number, type: number, video: HTMLVideoElement): void;
-    texImage2D(target: number, level: number, internalformat: number, format: number, type: number, pixels: ImageData): void;
-    texParameterf(target: number, pname: number, param: number): void;
-    texParameteri(target: number, pname: number, param: number): void;
-    texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, width: number, height: number, format: number, type: number, pixels: ArrayBufferView): void;
-    texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, image: HTMLImageElement): void;
-    texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, canvas: HTMLCanvasElement): void;
-    texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, video: HTMLVideoElement): void;
-    texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, pixels: ImageData): void;
-    uniform1f(location: WebGLUniformLocation, x: number): void;
-    uniform1fv(location: WebGLUniformLocation, v: Float32Array): void;
-    uniform1i(location: WebGLUniformLocation, x: number): void;
-    uniform1iv(location: WebGLUniformLocation, v: Int32Array): void;
-    uniform2f(location: WebGLUniformLocation, x: number, y: number): void;
-    uniform2fv(location: WebGLUniformLocation, v: Float32Array): void;
-    uniform2i(location: WebGLUniformLocation, x: number, y: number): void;
-    uniform2iv(location: WebGLUniformLocation, v: Int32Array): void;
-    uniform3f(location: WebGLUniformLocation, x: number, y: number, z: number): void;
-    uniform3fv(location: WebGLUniformLocation, v: Float32Array): void;
-    uniform3i(location: WebGLUniformLocation, x: number, y: number, z: number): void;
-    uniform3iv(location: WebGLUniformLocation, v: Int32Array): void;
-    uniform4f(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
-    uniform4fv(location: WebGLUniformLocation, v: Float32Array): void;
-    uniform4i(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
-    uniform4iv(location: WebGLUniformLocation, v: Int32Array): void;
-    uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
-    uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
-    uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
-    useProgram(program: WebGLProgram): void;
-    validateProgram(program: WebGLProgram): void;
-    vertexAttrib1f(indx: number, x: number): void;
-    vertexAttrib1fv(indx: number, values: Float32Array): void;
-    vertexAttrib2f(indx: number, x: number, y: number): void;
-    vertexAttrib2fv(indx: number, values: Float32Array): void;
-    vertexAttrib3f(indx: number, x: number, y: number, z: number): void;
-    vertexAttrib3fv(indx: number, values: Float32Array): void;
-    vertexAttrib4f(indx: number, x: number, y: number, z: number, w: number): void;
-    vertexAttrib4fv(indx: number, values: Float32Array): void;
-    vertexAttribPointer(indx: number, size: number, type: number, normalized: boolean, stride: number, offset: number): void;
-    viewport(x: number, y: number, width: number, height: number): void;
-    ACTIVE_ATTRIBUTES: number;
-    ACTIVE_TEXTURE: number;
-    ACTIVE_UNIFORMS: number;
-    ALIASED_LINE_WIDTH_RANGE: number;
-    ALIASED_POINT_SIZE_RANGE: number;
-    ALPHA: number;
-    ALPHA_BITS: number;
-    ALWAYS: number;
-    ARRAY_BUFFER: number;
-    ARRAY_BUFFER_BINDING: number;
-    ATTACHED_SHADERS: number;
-    BACK: number;
-    BLEND: number;
-    BLEND_COLOR: number;
-    BLEND_DST_ALPHA: number;
-    BLEND_DST_RGB: number;
-    BLEND_EQUATION: number;
-    BLEND_EQUATION_ALPHA: number;
-    BLEND_EQUATION_RGB: number;
-    BLEND_SRC_ALPHA: number;
-    BLEND_SRC_RGB: number;
-    BLUE_BITS: number;
-    BOOL: number;
-    BOOL_VEC2: number;
-    BOOL_VEC3: number;
-    BOOL_VEC4: number;
-    BROWSER_DEFAULT_WEBGL: number;
-    BUFFER_SIZE: number;
-    BUFFER_USAGE: number;
-    BYTE: number;
-    CCW: number;
-    CLAMP_TO_EDGE: number;
-    COLOR_ATTACHMENT0: number;
-    COLOR_BUFFER_BIT: number;
-    COLOR_CLEAR_VALUE: number;
-    COLOR_WRITEMASK: number;
-    COMPILE_STATUS: number;
-    COMPRESSED_TEXTURE_FORMATS: number;
-    CONSTANT_ALPHA: number;
-    CONSTANT_COLOR: number;
-    CONTEXT_LOST_WEBGL: number;
-    CULL_FACE: number;
-    CULL_FACE_MODE: number;
-    CURRENT_PROGRAM: number;
-    CURRENT_VERTEX_ATTRIB: number;
-    CW: number;
-    DECR: number;
-    DECR_WRAP: number;
-    DELETE_STATUS: number;
-    DEPTH_ATTACHMENT: number;
-    DEPTH_BITS: number;
-    DEPTH_BUFFER_BIT: number;
-    DEPTH_CLEAR_VALUE: number;
-    DEPTH_COMPONENT: number;
-    DEPTH_COMPONENT16: number;
-    DEPTH_FUNC: number;
-    DEPTH_RANGE: number;
-    DEPTH_STENCIL: number;
-    DEPTH_STENCIL_ATTACHMENT: number;
-    DEPTH_TEST: number;
-    DEPTH_WRITEMASK: number;
-    DITHER: number;
-    DONT_CARE: number;
-    DST_ALPHA: number;
-    DST_COLOR: number;
-    DYNAMIC_DRAW: number;
-    ELEMENT_ARRAY_BUFFER: number;
-    ELEMENT_ARRAY_BUFFER_BINDING: number;
-    EQUAL: number;
-    FASTEST: number;
-    FLOAT: number;
-    FLOAT_MAT2: number;
-    FLOAT_MAT3: number;
-    FLOAT_MAT4: number;
-    FLOAT_VEC2: number;
-    FLOAT_VEC3: number;
-    FLOAT_VEC4: number;
-    FRAGMENT_SHADER: number;
-    FRAMEBUFFER: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
-    FRAMEBUFFER_BINDING: number;
-    FRAMEBUFFER_COMPLETE: number;
-    FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
-    FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
-    FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
-    FRAMEBUFFER_UNSUPPORTED: number;
-    FRONT: number;
-    FRONT_AND_BACK: number;
-    FRONT_FACE: number;
-    FUNC_ADD: number;
-    FUNC_REVERSE_SUBTRACT: number;
-    FUNC_SUBTRACT: number;
-    GENERATE_MIPMAP_HINT: number;
-    GEQUAL: number;
-    GREATER: number;
-    GREEN_BITS: number;
-    HIGH_FLOAT: number;
-    HIGH_INT: number;
-    IMPLEMENTATION_COLOR_READ_FORMAT: number;
-    IMPLEMENTATION_COLOR_READ_TYPE: number;
-    INCR: number;
-    INCR_WRAP: number;
-    INT: number;
-    INT_VEC2: number;
-    INT_VEC3: number;
-    INT_VEC4: number;
-    INVALID_ENUM: number;
-    INVALID_FRAMEBUFFER_OPERATION: number;
-    INVALID_OPERATION: number;
-    INVALID_VALUE: number;
-    INVERT: number;
-    KEEP: number;
-    LEQUAL: number;
-    LESS: number;
-    LINEAR: number;
-    LINEAR_MIPMAP_LINEAR: number;
-    LINEAR_MIPMAP_NEAREST: number;
-    LINES: number;
-    LINE_LOOP: number;
-    LINE_STRIP: number;
-    LINE_WIDTH: number;
-    LINK_STATUS: number;
-    LOW_FLOAT: number;
-    LOW_INT: number;
-    LUMINANCE: number;
-    LUMINANCE_ALPHA: number;
-    MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
-    MAX_CUBE_MAP_TEXTURE_SIZE: number;
-    MAX_FRAGMENT_UNIFORM_VECTORS: number;
-    MAX_RENDERBUFFER_SIZE: number;
-    MAX_TEXTURE_IMAGE_UNITS: number;
-    MAX_TEXTURE_SIZE: number;
-    MAX_VARYING_VECTORS: number;
-    MAX_VERTEX_ATTRIBS: number;
-    MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
-    MAX_VERTEX_UNIFORM_VECTORS: number;
-    MAX_VIEWPORT_DIMS: number;
-    MEDIUM_FLOAT: number;
-    MEDIUM_INT: number;
-    MIRRORED_REPEAT: number;
-    NEAREST: number;
-    NEAREST_MIPMAP_LINEAR: number;
-    NEAREST_MIPMAP_NEAREST: number;
-    NEVER: number;
-    NICEST: number;
-    NONE: number;
-    NOTEQUAL: number;
-    NO_ERROR: number;
-    ONE: number;
-    ONE_MINUS_CONSTANT_ALPHA: number;
-    ONE_MINUS_CONSTANT_COLOR: number;
-    ONE_MINUS_DST_ALPHA: number;
-    ONE_MINUS_DST_COLOR: number;
-    ONE_MINUS_SRC_ALPHA: number;
-    ONE_MINUS_SRC_COLOR: number;
-    OUT_OF_MEMORY: number;
-    PACK_ALIGNMENT: number;
-    POINTS: number;
-    POLYGON_OFFSET_FACTOR: number;
-    POLYGON_OFFSET_FILL: number;
-    POLYGON_OFFSET_UNITS: number;
-    RED_BITS: number;
-    RENDERBUFFER: number;
-    RENDERBUFFER_ALPHA_SIZE: number;
-    RENDERBUFFER_BINDING: number;
-    RENDERBUFFER_BLUE_SIZE: number;
-    RENDERBUFFER_DEPTH_SIZE: number;
-    RENDERBUFFER_GREEN_SIZE: number;
-    RENDERBUFFER_HEIGHT: number;
-    RENDERBUFFER_INTERNAL_FORMAT: number;
-    RENDERBUFFER_RED_SIZE: number;
-    RENDERBUFFER_STENCIL_SIZE: number;
-    RENDERBUFFER_WIDTH: number;
-    RENDERER: number;
-    REPEAT: number;
-    REPLACE: number;
-    RGB: number;
-    RGB565: number;
-    RGB5_A1: number;
-    RGBA: number;
-    RGBA4: number;
-    SAMPLER_2D: number;
-    SAMPLER_CUBE: number;
-    SAMPLES: number;
-    SAMPLE_ALPHA_TO_COVERAGE: number;
-    SAMPLE_BUFFERS: number;
-    SAMPLE_COVERAGE: number;
-    SAMPLE_COVERAGE_INVERT: number;
-    SAMPLE_COVERAGE_VALUE: number;
-    SCISSOR_BOX: number;
-    SCISSOR_TEST: number;
-    SHADER_TYPE: number;
-    SHADING_LANGUAGE_VERSION: number;
-    SHORT: number;
-    SRC_ALPHA: number;
-    SRC_ALPHA_SATURATE: number;
-    SRC_COLOR: number;
-    STATIC_DRAW: number;
-    STENCIL_ATTACHMENT: number;
-    STENCIL_BACK_FAIL: number;
-    STENCIL_BACK_FUNC: number;
-    STENCIL_BACK_PASS_DEPTH_FAIL: number;
-    STENCIL_BACK_PASS_DEPTH_PASS: number;
-    STENCIL_BACK_REF: number;
-    STENCIL_BACK_VALUE_MASK: number;
-    STENCIL_BACK_WRITEMASK: number;
-    STENCIL_BITS: number;
-    STENCIL_BUFFER_BIT: number;
-    STENCIL_CLEAR_VALUE: number;
-    STENCIL_FAIL: number;
-    STENCIL_FUNC: number;
-    STENCIL_INDEX: number;
-    STENCIL_INDEX8: number;
-    STENCIL_PASS_DEPTH_FAIL: number;
-    STENCIL_PASS_DEPTH_PASS: number;
-    STENCIL_REF: number;
-    STENCIL_TEST: number;
-    STENCIL_VALUE_MASK: number;
-    STENCIL_WRITEMASK: number;
-    STREAM_DRAW: number;
-    SUBPIXEL_BITS: number;
-    TEXTURE: number;
-    TEXTURE0: number;
-    TEXTURE1: number;
-    TEXTURE10: number;
-    TEXTURE11: number;
-    TEXTURE12: number;
-    TEXTURE13: number;
-    TEXTURE14: number;
-    TEXTURE15: number;
-    TEXTURE16: number;
-    TEXTURE17: number;
-    TEXTURE18: number;
-    TEXTURE19: number;
-    TEXTURE2: number;
-    TEXTURE20: number;
-    TEXTURE21: number;
-    TEXTURE22: number;
-    TEXTURE23: number;
-    TEXTURE24: number;
-    TEXTURE25: number;
-    TEXTURE26: number;
-    TEXTURE27: number;
-    TEXTURE28: number;
-    TEXTURE29: number;
-    TEXTURE3: number;
-    TEXTURE30: number;
-    TEXTURE31: number;
-    TEXTURE4: number;
-    TEXTURE5: number;
-    TEXTURE6: number;
-    TEXTURE7: number;
-    TEXTURE8: number;
-    TEXTURE9: number;
-    TEXTURE_2D: number;
-    TEXTURE_BINDING_2D: number;
-    TEXTURE_BINDING_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_X: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
-    TEXTURE_CUBE_MAP_POSITIVE_X: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Y: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Z: number;
-    TEXTURE_MAG_FILTER: number;
-    TEXTURE_MIN_FILTER: number;
-    TEXTURE_WRAP_S: number;
-    TEXTURE_WRAP_T: number;
-    TRIANGLES: number;
-    TRIANGLE_FAN: number;
-    TRIANGLE_STRIP: number;
-    UNPACK_ALIGNMENT: number;
-    UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
-    UNPACK_FLIP_Y_WEBGL: number;
-    UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
-    UNSIGNED_BYTE: number;
-    UNSIGNED_INT: number;
-    UNSIGNED_SHORT: number;
-    UNSIGNED_SHORT_4_4_4_4: number;
-    UNSIGNED_SHORT_5_5_5_1: number;
-    UNSIGNED_SHORT_5_6_5: number;
-    VALIDATE_STATUS: number;
-    VENDOR: number;
-    VERSION: number;
-    VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
-    VERTEX_ATTRIB_ARRAY_ENABLED: number;
-    VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
-    VERTEX_ATTRIB_ARRAY_POINTER: number;
-    VERTEX_ATTRIB_ARRAY_SIZE: number;
-    VERTEX_ATTRIB_ARRAY_STRIDE: number;
-    VERTEX_ATTRIB_ARRAY_TYPE: number;
-    VERTEX_SHADER: number;
-    VIEWPORT: number;
-    ZERO: number;
-}
-
-declare var WebGLRenderingContext: {
-    prototype: WebGLRenderingContext;
-    new(): WebGLRenderingContext;
-    ACTIVE_ATTRIBUTES: number;
-    ACTIVE_TEXTURE: number;
-    ACTIVE_UNIFORMS: number;
-    ALIASED_LINE_WIDTH_RANGE: number;
-    ALIASED_POINT_SIZE_RANGE: number;
-    ALPHA: number;
-    ALPHA_BITS: number;
-    ALWAYS: number;
-    ARRAY_BUFFER: number;
-    ARRAY_BUFFER_BINDING: number;
-    ATTACHED_SHADERS: number;
-    BACK: number;
-    BLEND: number;
-    BLEND_COLOR: number;
-    BLEND_DST_ALPHA: number;
-    BLEND_DST_RGB: number;
-    BLEND_EQUATION: number;
-    BLEND_EQUATION_ALPHA: number;
-    BLEND_EQUATION_RGB: number;
-    BLEND_SRC_ALPHA: number;
-    BLEND_SRC_RGB: number;
-    BLUE_BITS: number;
-    BOOL: number;
-    BOOL_VEC2: number;
-    BOOL_VEC3: number;
-    BOOL_VEC4: number;
-    BROWSER_DEFAULT_WEBGL: number;
-    BUFFER_SIZE: number;
-    BUFFER_USAGE: number;
-    BYTE: number;
-    CCW: number;
-    CLAMP_TO_EDGE: number;
-    COLOR_ATTACHMENT0: number;
-    COLOR_BUFFER_BIT: number;
-    COLOR_CLEAR_VALUE: number;
-    COLOR_WRITEMASK: number;
-    COMPILE_STATUS: number;
-    COMPRESSED_TEXTURE_FORMATS: number;
-    CONSTANT_ALPHA: number;
-    CONSTANT_COLOR: number;
-    CONTEXT_LOST_WEBGL: number;
-    CULL_FACE: number;
-    CULL_FACE_MODE: number;
-    CURRENT_PROGRAM: number;
-    CURRENT_VERTEX_ATTRIB: number;
-    CW: number;
-    DECR: number;
-    DECR_WRAP: number;
-    DELETE_STATUS: number;
-    DEPTH_ATTACHMENT: number;
-    DEPTH_BITS: number;
-    DEPTH_BUFFER_BIT: number;
-    DEPTH_CLEAR_VALUE: number;
-    DEPTH_COMPONENT: number;
-    DEPTH_COMPONENT16: number;
-    DEPTH_FUNC: number;
-    DEPTH_RANGE: number;
-    DEPTH_STENCIL: number;
-    DEPTH_STENCIL_ATTACHMENT: number;
-    DEPTH_TEST: number;
-    DEPTH_WRITEMASK: number;
-    DITHER: number;
-    DONT_CARE: number;
-    DST_ALPHA: number;
-    DST_COLOR: number;
-    DYNAMIC_DRAW: number;
-    ELEMENT_ARRAY_BUFFER: number;
-    ELEMENT_ARRAY_BUFFER_BINDING: number;
-    EQUAL: number;
-    FASTEST: number;
-    FLOAT: number;
-    FLOAT_MAT2: number;
-    FLOAT_MAT3: number;
-    FLOAT_MAT4: number;
-    FLOAT_VEC2: number;
-    FLOAT_VEC3: number;
-    FLOAT_VEC4: number;
-    FRAGMENT_SHADER: number;
-    FRAMEBUFFER: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
-    FRAMEBUFFER_BINDING: number;
-    FRAMEBUFFER_COMPLETE: number;
-    FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
-    FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
-    FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
-    FRAMEBUFFER_UNSUPPORTED: number;
-    FRONT: number;
-    FRONT_AND_BACK: number;
-    FRONT_FACE: number;
-    FUNC_ADD: number;
-    FUNC_REVERSE_SUBTRACT: number;
-    FUNC_SUBTRACT: number;
-    GENERATE_MIPMAP_HINT: number;
-    GEQUAL: number;
-    GREATER: number;
-    GREEN_BITS: number;
-    HIGH_FLOAT: number;
-    HIGH_INT: number;
-    IMPLEMENTATION_COLOR_READ_FORMAT: number;
-    IMPLEMENTATION_COLOR_READ_TYPE: number;
-    INCR: number;
-    INCR_WRAP: number;
-    INT: number;
-    INT_VEC2: number;
-    INT_VEC3: number;
-    INT_VEC4: number;
-    INVALID_ENUM: number;
-    INVALID_FRAMEBUFFER_OPERATION: number;
-    INVALID_OPERATION: number;
-    INVALID_VALUE: number;
-    INVERT: number;
-    KEEP: number;
-    LEQUAL: number;
-    LESS: number;
-    LINEAR: number;
-    LINEAR_MIPMAP_LINEAR: number;
-    LINEAR_MIPMAP_NEAREST: number;
-    LINES: number;
-    LINE_LOOP: number;
-    LINE_STRIP: number;
-    LINE_WIDTH: number;
-    LINK_STATUS: number;
-    LOW_FLOAT: number;
-    LOW_INT: number;
-    LUMINANCE: number;
-    LUMINANCE_ALPHA: number;
-    MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
-    MAX_CUBE_MAP_TEXTURE_SIZE: number;
-    MAX_FRAGMENT_UNIFORM_VECTORS: number;
-    MAX_RENDERBUFFER_SIZE: number;
-    MAX_TEXTURE_IMAGE_UNITS: number;
-    MAX_TEXTURE_SIZE: number;
-    MAX_VARYING_VECTORS: number;
-    MAX_VERTEX_ATTRIBS: number;
-    MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
-    MAX_VERTEX_UNIFORM_VECTORS: number;
-    MAX_VIEWPORT_DIMS: number;
-    MEDIUM_FLOAT: number;
-    MEDIUM_INT: number;
-    MIRRORED_REPEAT: number;
-    NEAREST: number;
-    NEAREST_MIPMAP_LINEAR: number;
-    NEAREST_MIPMAP_NEAREST: number;
-    NEVER: number;
-    NICEST: number;
-    NONE: number;
-    NOTEQUAL: number;
-    NO_ERROR: number;
-    ONE: number;
-    ONE_MINUS_CONSTANT_ALPHA: number;
-    ONE_MINUS_CONSTANT_COLOR: number;
-    ONE_MINUS_DST_ALPHA: number;
-    ONE_MINUS_DST_COLOR: number;
-    ONE_MINUS_SRC_ALPHA: number;
-    ONE_MINUS_SRC_COLOR: number;
-    OUT_OF_MEMORY: number;
-    PACK_ALIGNMENT: number;
-    POINTS: number;
-    POLYGON_OFFSET_FACTOR: number;
-    POLYGON_OFFSET_FILL: number;
-    POLYGON_OFFSET_UNITS: number;
-    RED_BITS: number;
-    RENDERBUFFER: number;
-    RENDERBUFFER_ALPHA_SIZE: number;
-    RENDERBUFFER_BINDING: number;
-    RENDERBUFFER_BLUE_SIZE: number;
-    RENDERBUFFER_DEPTH_SIZE: number;
-    RENDERBUFFER_GREEN_SIZE: number;
-    RENDERBUFFER_HEIGHT: number;
-    RENDERBUFFER_INTERNAL_FORMAT: number;
-    RENDERBUFFER_RED_SIZE: number;
-    RENDERBUFFER_STENCIL_SIZE: number;
-    RENDERBUFFER_WIDTH: number;
-    RENDERER: number;
-    REPEAT: number;
-    REPLACE: number;
-    RGB: number;
-    RGB565: number;
-    RGB5_A1: number;
-    RGBA: number;
-    RGBA4: number;
-    SAMPLER_2D: number;
-    SAMPLER_CUBE: number;
-    SAMPLES: number;
-    SAMPLE_ALPHA_TO_COVERAGE: number;
-    SAMPLE_BUFFERS: number;
-    SAMPLE_COVERAGE: number;
-    SAMPLE_COVERAGE_INVERT: number;
-    SAMPLE_COVERAGE_VALUE: number;
-    SCISSOR_BOX: number;
-    SCISSOR_TEST: number;
-    SHADER_TYPE: number;
-    SHADING_LANGUAGE_VERSION: number;
-    SHORT: number;
-    SRC_ALPHA: number;
-    SRC_ALPHA_SATURATE: number;
-    SRC_COLOR: number;
-    STATIC_DRAW: number;
-    STENCIL_ATTACHMENT: number;
-    STENCIL_BACK_FAIL: number;
-    STENCIL_BACK_FUNC: number;
-    STENCIL_BACK_PASS_DEPTH_FAIL: number;
-    STENCIL_BACK_PASS_DEPTH_PASS: number;
-    STENCIL_BACK_REF: number;
-    STENCIL_BACK_VALUE_MASK: number;
-    STENCIL_BACK_WRITEMASK: number;
-    STENCIL_BITS: number;
-    STENCIL_BUFFER_BIT: number;
-    STENCIL_CLEAR_VALUE: number;
-    STENCIL_FAIL: number;
-    STENCIL_FUNC: number;
-    STENCIL_INDEX: number;
-    STENCIL_INDEX8: number;
-    STENCIL_PASS_DEPTH_FAIL: number;
-    STENCIL_PASS_DEPTH_PASS: number;
-    STENCIL_REF: number;
-    STENCIL_TEST: number;
-    STENCIL_VALUE_MASK: number;
-    STENCIL_WRITEMASK: number;
-    STREAM_DRAW: number;
-    SUBPIXEL_BITS: number;
-    TEXTURE: number;
-    TEXTURE0: number;
-    TEXTURE1: number;
-    TEXTURE10: number;
-    TEXTURE11: number;
-    TEXTURE12: number;
-    TEXTURE13: number;
-    TEXTURE14: number;
-    TEXTURE15: number;
-    TEXTURE16: number;
-    TEXTURE17: number;
-    TEXTURE18: number;
-    TEXTURE19: number;
-    TEXTURE2: number;
-    TEXTURE20: number;
-    TEXTURE21: number;
-    TEXTURE22: number;
-    TEXTURE23: number;
-    TEXTURE24: number;
-    TEXTURE25: number;
-    TEXTURE26: number;
-    TEXTURE27: number;
-    TEXTURE28: number;
-    TEXTURE29: number;
-    TEXTURE3: number;
-    TEXTURE30: number;
-    TEXTURE31: number;
-    TEXTURE4: number;
-    TEXTURE5: number;
-    TEXTURE6: number;
-    TEXTURE7: number;
-    TEXTURE8: number;
-    TEXTURE9: number;
-    TEXTURE_2D: number;
-    TEXTURE_BINDING_2D: number;
-    TEXTURE_BINDING_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_X: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
-    TEXTURE_CUBE_MAP_POSITIVE_X: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Y: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Z: number;
-    TEXTURE_MAG_FILTER: number;
-    TEXTURE_MIN_FILTER: number;
-    TEXTURE_WRAP_S: number;
-    TEXTURE_WRAP_T: number;
-    TRIANGLES: number;
-    TRIANGLE_FAN: number;
-    TRIANGLE_STRIP: number;
-    UNPACK_ALIGNMENT: number;
-    UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
-    UNPACK_FLIP_Y_WEBGL: number;
-    UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
-    UNSIGNED_BYTE: number;
-    UNSIGNED_INT: number;
-    UNSIGNED_SHORT: number;
-    UNSIGNED_SHORT_4_4_4_4: number;
-    UNSIGNED_SHORT_5_5_5_1: number;
-    UNSIGNED_SHORT_5_6_5: number;
-    VALIDATE_STATUS: number;
-    VENDOR: number;
-    VERSION: number;
-    VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
-    VERTEX_ATTRIB_ARRAY_ENABLED: number;
-    VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
-    VERTEX_ATTRIB_ARRAY_POINTER: number;
-    VERTEX_ATTRIB_ARRAY_SIZE: number;
-    VERTEX_ATTRIB_ARRAY_STRIDE: number;
-    VERTEX_ATTRIB_ARRAY_TYPE: number;
-    VERTEX_SHADER: number;
-    VIEWPORT: number;
-    ZERO: number;
-}
-
-interface WebGLShader extends WebGLObject {
-}
-
-declare var WebGLShader: {
-    prototype: WebGLShader;
-    new(): WebGLShader;
-}
-
-interface WebGLShaderPrecisionFormat {
-    precision: number;
-    rangeMax: number;
-    rangeMin: number;
-}
-
-declare var WebGLShaderPrecisionFormat: {
-    prototype: WebGLShaderPrecisionFormat;
-    new(): WebGLShaderPrecisionFormat;
-}
-
-interface WebGLTexture extends WebGLObject {
-}
-
-declare var WebGLTexture: {
-    prototype: WebGLTexture;
-    new(): WebGLTexture;
-}
-
-interface WebGLUniformLocation {
-}
-
-declare var WebGLUniformLocation: {
-    prototype: WebGLUniformLocation;
-    new(): WebGLUniformLocation;
-}
-
-interface WebKitCSSMatrix {
-    a: number;
-    b: number;
-    c: number;
-    d: number;
-    e: number;
-    f: number;
-    m11: number;
-    m12: number;
-    m13: number;
-    m14: number;
-    m21: number;
-    m22: number;
-    m23: number;
-    m24: number;
-    m31: number;
-    m32: number;
-    m33: number;
-    m34: number;
-    m41: number;
-    m42: number;
-    m43: number;
-    m44: number;
-    inverse(): WebKitCSSMatrix;
-    multiply(secondMatrix: WebKitCSSMatrix): WebKitCSSMatrix;
-    rotate(angleX: number, angleY?: number, angleZ?: number): WebKitCSSMatrix;
-    rotateAxisAngle(x: number, y: number, z: number, angle: number): WebKitCSSMatrix;
-    scale(scaleX: number, scaleY?: number, scaleZ?: number): WebKitCSSMatrix;
-    setMatrixValue(value: string): void;
-    skewX(angle: number): WebKitCSSMatrix;
-    skewY(angle: number): WebKitCSSMatrix;
-    toString(): string;
-    translate(x: number, y: number, z?: number): WebKitCSSMatrix;
-}
-
-declare var WebKitCSSMatrix: {
-    prototype: WebKitCSSMatrix;
-    new(text?: string): WebKitCSSMatrix;
-}
-
-interface WebKitPoint {
-    x: number;
-    y: number;
-}
-
-declare var WebKitPoint: {
-    prototype: WebKitPoint;
-    new(x?: number, y?: number): WebKitPoint;
-}
-
-interface WebSocket extends EventTarget {
-    binaryType: string;
-    bufferedAmount: number;
-    extensions: string;
-    onclose: (ev: CloseEvent) => any;
-    onerror: (ev: Event) => any;
-    onmessage: (ev: MessageEvent) => any;
-    onopen: (ev: Event) => any;
-    protocol: string;
-    readyState: number;
-    url: string;
-    close(code?: number, reason?: string): void;
-    send(data: any): void;
-    CLOSED: number;
-    CLOSING: number;
-    CONNECTING: number;
-    OPEN: number;
-    addEventListener(type: "close", listener: (ev: CloseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "open", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var WebSocket: {
-    prototype: WebSocket;
-    new(url: string, protocols?: string | string[]): WebSocket;
-    CLOSED: number;
-    CLOSING: number;
-    CONNECTING: number;
-    OPEN: number;
-}
-
-interface WheelEvent extends MouseEvent {
-    deltaMode: number;
-    deltaX: number;
-    deltaY: number;
-    deltaZ: number;
-    getCurrentPoint(element: Element): void;
-    initWheelEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, buttonArg: number, relatedTargetArg: EventTarget, modifiersListArg: string, deltaXArg: number, deltaYArg: number, deltaZArg: number, deltaMode: number): void;
-    DOM_DELTA_LINE: number;
-    DOM_DELTA_PAGE: number;
-    DOM_DELTA_PIXEL: number;
-}
-
-declare var WheelEvent: {
-    prototype: WheelEvent;
-    new(typeArg: string, eventInitDict?: WheelEventInit): WheelEvent;
-    DOM_DELTA_LINE: number;
-    DOM_DELTA_PAGE: number;
-    DOM_DELTA_PIXEL: number;
-}
-
-interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64 {
-    animationStartTime: number;
-    applicationCache: ApplicationCache;
-    clientInformation: Navigator;
-    closed: boolean;
-    crypto: Crypto;
-    defaultStatus: string;
-    devicePixelRatio: number;
-    doNotTrack: string;
-    document: Document;
-    event: Event;
-    external: External;
-    frameElement: Element;
-    frames: Window;
-    history: History;
-    innerHeight: number;
-    innerWidth: number;
-    length: number;
-    location: Location;
-    locationbar: BarProp;
-    menubar: BarProp;
-    msAnimationStartTime: number;
-    name: string;
-    navigator: Navigator;
-    offscreenBuffering: string | boolean;
-    onabort: (ev: Event) => any;
-    onafterprint: (ev: Event) => any;
-    onbeforeprint: (ev: Event) => any;
-    onbeforeunload: (ev: BeforeUnloadEvent) => any;
-    onblur: (ev: FocusEvent) => any;
-    oncanplay: (ev: Event) => any;
-    oncanplaythrough: (ev: Event) => any;
-    onchange: (ev: Event) => any;
-    onclick: (ev: MouseEvent) => any;
-    oncompassneedscalibration: (ev: Event) => any;
-    oncontextmenu: (ev: PointerEvent) => any;
-    ondblclick: (ev: MouseEvent) => any;
-    ondevicemotion: (ev: DeviceMotionEvent) => any;
-    ondeviceorientation: (ev: DeviceOrientationEvent) => any;
-    ondrag: (ev: DragEvent) => any;
-    ondragend: (ev: DragEvent) => any;
-    ondragenter: (ev: DragEvent) => any;
-    ondragleave: (ev: DragEvent) => any;
-    ondragover: (ev: DragEvent) => any;
-    ondragstart: (ev: DragEvent) => any;
-    ondrop: (ev: DragEvent) => any;
-    ondurationchange: (ev: Event) => any;
-    onemptied: (ev: Event) => any;
-    onended: (ev: Event) => any;
-    onerror: ErrorEventHandler;
-    onfocus: (ev: FocusEvent) => any;
-    onhashchange: (ev: HashChangeEvent) => any;
-    oninput: (ev: Event) => any;
-    onkeydown: (ev: KeyboardEvent) => any;
-    onkeypress: (ev: KeyboardEvent) => any;
-    onkeyup: (ev: KeyboardEvent) => any;
-    onload: (ev: Event) => any;
-    onloadeddata: (ev: Event) => any;
-    onloadedmetadata: (ev: Event) => any;
-    onloadstart: (ev: Event) => any;
-    onmessage: (ev: MessageEvent) => any;
-    onmousedown: (ev: MouseEvent) => any;
-    onmouseenter: (ev: MouseEvent) => any;
-    onmouseleave: (ev: MouseEvent) => any;
-    onmousemove: (ev: MouseEvent) => any;
-    onmouseout: (ev: MouseEvent) => any;
-    onmouseover: (ev: MouseEvent) => any;
-    onmouseup: (ev: MouseEvent) => any;
-    onmousewheel: (ev: MouseWheelEvent) => any;
-    onmsgesturechange: (ev: MSGestureEvent) => any;
-    onmsgesturedoubletap: (ev: MSGestureEvent) => any;
-    onmsgestureend: (ev: MSGestureEvent) => any;
-    onmsgesturehold: (ev: MSGestureEvent) => any;
-    onmsgesturestart: (ev: MSGestureEvent) => any;
-    onmsgesturetap: (ev: MSGestureEvent) => any;
-    onmsinertiastart: (ev: MSGestureEvent) => any;
-    onmspointercancel: (ev: MSPointerEvent) => any;
-    onmspointerdown: (ev: MSPointerEvent) => any;
-    onmspointerenter: (ev: MSPointerEvent) => any;
-    onmspointerleave: (ev: MSPointerEvent) => any;
-    onmspointermove: (ev: MSPointerEvent) => any;
-    onmspointerout: (ev: MSPointerEvent) => any;
-    onmspointerover: (ev: MSPointerEvent) => any;
-    onmspointerup: (ev: MSPointerEvent) => any;
-    onoffline: (ev: Event) => any;
-    ononline: (ev: Event) => any;
-    onorientationchange: (ev: Event) => any;
-    onpagehide: (ev: PageTransitionEvent) => any;
-    onpageshow: (ev: PageTransitionEvent) => any;
-    onpause: (ev: Event) => any;
-    onplay: (ev: Event) => any;
-    onplaying: (ev: Event) => any;
-    onpopstate: (ev: PopStateEvent) => any;
-    onprogress: (ev: ProgressEvent) => any;
-    onratechange: (ev: Event) => any;
-    onreadystatechange: (ev: ProgressEvent) => any;
-    onreset: (ev: Event) => any;
-    onresize: (ev: UIEvent) => any;
-    onscroll: (ev: UIEvent) => any;
-    onseeked: (ev: Event) => any;
-    onseeking: (ev: Event) => any;
-    onselect: (ev: UIEvent) => any;
-    onstalled: (ev: Event) => any;
-    onstorage: (ev: StorageEvent) => any;
-    onsubmit: (ev: Event) => any;
-    onsuspend: (ev: Event) => any;
-    ontimeupdate: (ev: Event) => any;
-    ontouchcancel: any;
-    ontouchend: any;
-    ontouchmove: any;
-    ontouchstart: any;
-    onunload: (ev: Event) => any;
-    onvolumechange: (ev: Event) => any;
-    onwaiting: (ev: Event) => any;
-    opener: Window;
-    orientation: string | number;
-    outerHeight: number;
-    outerWidth: number;
-    pageXOffset: number;
-    pageYOffset: number;
-    parent: Window;
-    performance: Performance;
-    personalbar: BarProp;
-    screen: Screen;
-    screenLeft: number;
-    screenTop: number;
-    screenX: number;
-    screenY: number;
-    scrollX: number;
-    scrollY: number;
-    scrollbars: BarProp;
-    self: Window;
-    status: string;
-    statusbar: BarProp;
-    styleMedia: StyleMedia;
-    toolbar: BarProp;
-    top: Window;
-    window: Window;
-    URL: URL;
-    alert(message?: any): void;
-    blur(): void;
-    cancelAnimationFrame(handle: number): void;
-    captureEvents(): void;
-    close(): void;
-    confirm(message?: string): boolean;
-    focus(): void;
-    getComputedStyle(elt: Element, pseudoElt?: string): CSSStyleDeclaration;
-    getMatchedCSSRules(elt: Element, pseudoElt?: string): CSSRuleList;
-    getSelection(): Selection;
-    matchMedia(mediaQuery: string): MediaQueryList;
-    moveBy(x?: number, y?: number): void;
-    moveTo(x?: number, y?: number): void;
-    msCancelRequestAnimationFrame(handle: number): void;
-    msMatchMedia(mediaQuery: string): MediaQueryList;
-    msRequestAnimationFrame(callback: FrameRequestCallback): number;
-    msWriteProfilerMark(profilerMarkName: string): void;
-    open(url?: string, target?: string, features?: string, replace?: boolean): any;
-    postMessage(message: any, targetOrigin: string, ports?: any): void;
-    print(): void;
-    prompt(message?: string, _default?: string): string;
-    releaseEvents(): void;
-    requestAnimationFrame(callback: FrameRequestCallback): number;
-    resizeBy(x?: number, y?: number): void;
-    resizeTo(x?: number, y?: number): void;
-    scroll(x?: number, y?: number): void;
-    scrollBy(x?: number, y?: number): void;
-    scrollTo(x?: number, y?: number): void;
-    webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
-    webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
-    addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "afterprint", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "compassneedscalibration", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "devicemotion", listener: (ev: DeviceMotionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deviceorientation", listener: (ev: DeviceOrientationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "popstate", listener: (ev: PopStateEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "readystatechange", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "resize", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "storage", listener: (ev: StorageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "unload", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-    [index: number]: Window;
-}
-
-declare var Window: {
-    prototype: Window;
-    new(): Window;
-}
-
-interface Worker extends EventTarget, AbstractWorker {
-    onmessage: (ev: MessageEvent) => any;
-    postMessage(message: any, ports?: any): void;
-    terminate(): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var Worker: {
-    prototype: Worker;
-    new(stringUrl: string): Worker;
-}
-
-interface XMLDocument extends Document {
-}
-
-declare var XMLDocument: {
-    prototype: XMLDocument;
-    new(): XMLDocument;
-}
-
-interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
-    msCaching: string;
-    onreadystatechange: (ev: ProgressEvent) => any;
-    readyState: number;
-    response: any;
-    responseBody: any;
-    responseText: string;
-    responseType: string;
-    responseXML: any;
-    status: number;
-    statusText: string;
-    timeout: number;
-    upload: XMLHttpRequestUpload;
-    withCredentials: boolean;
-    abort(): void;
-    getAllResponseHeaders(): string;
-    getResponseHeader(header: string): string;
-    msCachingEnabled(): boolean;
-    open(method: string, url: string, async?: boolean, user?: string, password?: string): void;
-    overrideMimeType(mime: string): void;
-    send(data?: Document): void;
-    send(data?: string): void;
-    send(data?: any): void;
-    setRequestHeader(header: string, value: string): void;
-    DONE: number;
-    HEADERS_RECEIVED: number;
-    LOADING: number;
-    OPENED: number;
-    UNSENT: number;
-    addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadend", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "readystatechange", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeout", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var XMLHttpRequest: {
-    prototype: XMLHttpRequest;
-    new(): XMLHttpRequest;
-    DONE: number;
-    HEADERS_RECEIVED: number;
-    LOADING: number;
-    OPENED: number;
-    UNSENT: number;
-    create(): XMLHttpRequest;
-}
-
-interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var XMLHttpRequestUpload: {
-    prototype: XMLHttpRequestUpload;
-    new(): XMLHttpRequestUpload;
-}
-
-interface XMLSerializer {
-    serializeToString(target: Node): string;
-}
-
-declare var XMLSerializer: {
-    prototype: XMLSerializer;
-    new(): XMLSerializer;
-}
-
-interface XPathEvaluator {
-    createExpression(expression: string, resolver: XPathNSResolver): XPathExpression;
-    createNSResolver(nodeResolver?: Node): XPathNSResolver;
-    evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver, type: number, result: XPathResult): XPathResult;
-}
-
-declare var XPathEvaluator: {
-    prototype: XPathEvaluator;
-    new(): XPathEvaluator;
-}
-
-interface XPathExpression {
-    evaluate(contextNode: Node, type: number, result: XPathResult): XPathExpression;
-}
-
-declare var XPathExpression: {
-    prototype: XPathExpression;
-    new(): XPathExpression;
-}
-
-interface XPathNSResolver {
-    lookupNamespaceURI(prefix: string): string;
-}
-
-declare var XPathNSResolver: {
-    prototype: XPathNSResolver;
-    new(): XPathNSResolver;
-}
-
-interface XPathResult {
-    booleanValue: boolean;
-    invalidIteratorState: boolean;
-    numberValue: number;
-    resultType: number;
-    singleNodeValue: Node;
-    snapshotLength: number;
-    stringValue: string;
-    iterateNext(): Node;
-    snapshotItem(index: number): Node;
-    ANY_TYPE: number;
-    ANY_UNORDERED_NODE_TYPE: number;
-    BOOLEAN_TYPE: number;
-    FIRST_ORDERED_NODE_TYPE: number;
-    NUMBER_TYPE: number;
-    ORDERED_NODE_ITERATOR_TYPE: number;
-    ORDERED_NODE_SNAPSHOT_TYPE: number;
-    STRING_TYPE: number;
-    UNORDERED_NODE_ITERATOR_TYPE: number;
-    UNORDERED_NODE_SNAPSHOT_TYPE: number;
-}
-
-declare var XPathResult: {
-    prototype: XPathResult;
-    new(): XPathResult;
-    ANY_TYPE: number;
-    ANY_UNORDERED_NODE_TYPE: number;
-    BOOLEAN_TYPE: number;
-    FIRST_ORDERED_NODE_TYPE: number;
-    NUMBER_TYPE: number;
-    ORDERED_NODE_ITERATOR_TYPE: number;
-    ORDERED_NODE_SNAPSHOT_TYPE: number;
-    STRING_TYPE: number;
-    UNORDERED_NODE_ITERATOR_TYPE: number;
-    UNORDERED_NODE_SNAPSHOT_TYPE: number;
-}
-
-interface XSLTProcessor {
-    clearParameters(): void;
-    getParameter(namespaceURI: string, localName: string): any;
-    importStylesheet(style: Node): void;
-    removeParameter(namespaceURI: string, localName: string): void;
-    reset(): void;
-    setParameter(namespaceURI: string, localName: string, value: any): void;
-    transformToDocument(source: Node): Document;
-    transformToFragment(source: Node, document: Document): DocumentFragment;
-}
-
-declare var XSLTProcessor: {
-    prototype: XSLTProcessor;
-    new(): XSLTProcessor;
-}
-
-interface AbstractWorker {
-    onerror: (ev: Event) => any;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-interface ChildNode {
-    remove(): void;
-}
-
-interface DOML2DeprecatedColorProperty {
-    color: string;
-}
-
-interface DOML2DeprecatedSizeProperty {
-    size: number;
-}
-
-interface DocumentEvent {
-    createEvent(eventInterface:"AnimationEvent"): AnimationEvent;
-    createEvent(eventInterface:"AriaRequestEvent"): AriaRequestEvent;
-    createEvent(eventInterface:"AudioProcessingEvent"): AudioProcessingEvent;
-    createEvent(eventInterface:"BeforeUnloadEvent"): BeforeUnloadEvent;
-    createEvent(eventInterface:"ClipboardEvent"): ClipboardEvent;
-    createEvent(eventInterface:"CloseEvent"): CloseEvent;
-    createEvent(eventInterface:"CommandEvent"): CommandEvent;
-    createEvent(eventInterface:"CompositionEvent"): CompositionEvent;
-    createEvent(eventInterface:"CustomEvent"): CustomEvent;
-    createEvent(eventInterface:"DeviceMotionEvent"): DeviceMotionEvent;
-    createEvent(eventInterface:"DeviceOrientationEvent"): DeviceOrientationEvent;
-    createEvent(eventInterface:"DragEvent"): DragEvent;
-    createEvent(eventInterface:"ErrorEvent"): ErrorEvent;
-    createEvent(eventInterface:"Event"): Event;
-    createEvent(eventInterface:"Events"): Event;
-    createEvent(eventInterface:"FocusEvent"): FocusEvent;
-    createEvent(eventInterface:"GamepadEvent"): GamepadEvent;
-    createEvent(eventInterface:"HashChangeEvent"): HashChangeEvent;
-    createEvent(eventInterface:"IDBVersionChangeEvent"): IDBVersionChangeEvent;
-    createEvent(eventInterface:"KeyboardEvent"): KeyboardEvent;
-    createEvent(eventInterface:"LongRunningScriptDetectedEvent"): LongRunningScriptDetectedEvent;
-    createEvent(eventInterface:"MSGestureEvent"): MSGestureEvent;
-    createEvent(eventInterface:"MSManipulationEvent"): MSManipulationEvent;
-    createEvent(eventInterface:"MSMediaKeyMessageEvent"): MSMediaKeyMessageEvent;
-    createEvent(eventInterface:"MSMediaKeyNeededEvent"): MSMediaKeyNeededEvent;
-    createEvent(eventInterface:"MSPointerEvent"): MSPointerEvent;
-    createEvent(eventInterface:"MSSiteModeEvent"): MSSiteModeEvent;
-    createEvent(eventInterface:"MessageEvent"): MessageEvent;
-    createEvent(eventInterface:"MouseEvent"): MouseEvent;
-    createEvent(eventInterface:"MouseEvents"): MouseEvent;
-    createEvent(eventInterface:"MouseWheelEvent"): MouseWheelEvent;
-    createEvent(eventInterface:"MutationEvent"): MutationEvent;
-    createEvent(eventInterface:"MutationEvents"): MutationEvent;
-    createEvent(eventInterface:"NavigationCompletedEvent"): NavigationCompletedEvent;
-    createEvent(eventInterface:"NavigationEvent"): NavigationEvent;
-    createEvent(eventInterface:"NavigationEventWithReferrer"): NavigationEventWithReferrer;
-    createEvent(eventInterface:"OfflineAudioCompletionEvent"): OfflineAudioCompletionEvent;
-    createEvent(eventInterface:"PageTransitionEvent"): PageTransitionEvent;
-    createEvent(eventInterface:"PermissionRequestedEvent"): PermissionRequestedEvent;
-    createEvent(eventInterface:"PointerEvent"): PointerEvent;
-    createEvent(eventInterface:"PopStateEvent"): PopStateEvent;
-    createEvent(eventInterface:"ProgressEvent"): ProgressEvent;
-    createEvent(eventInterface:"SVGZoomEvent"): SVGZoomEvent;
-    createEvent(eventInterface:"SVGZoomEvents"): SVGZoomEvent;
-    createEvent(eventInterface:"ScriptNotifyEvent"): ScriptNotifyEvent;
-    createEvent(eventInterface:"StorageEvent"): StorageEvent;
-    createEvent(eventInterface:"TextEvent"): TextEvent;
-    createEvent(eventInterface:"TouchEvent"): TouchEvent;
-    createEvent(eventInterface:"TrackEvent"): TrackEvent;
-    createEvent(eventInterface:"TransitionEvent"): TransitionEvent;
-    createEvent(eventInterface:"UIEvent"): UIEvent;
-    createEvent(eventInterface:"UIEvents"): UIEvent;
-    createEvent(eventInterface:"UnviewableContentIdentifiedEvent"): UnviewableContentIdentifiedEvent;
-    createEvent(eventInterface:"WebGLContextEvent"): WebGLContextEvent;
-    createEvent(eventInterface:"WheelEvent"): WheelEvent;
-    createEvent(eventInterface: string): Event;
-}
-
-interface ElementTraversal {
-    childElementCount: number;
-    firstElementChild: Element;
-    lastElementChild: Element;
-    nextElementSibling: Element;
-    previousElementSibling: Element;
-}
-
-interface GetSVGDocument {
-    getSVGDocument(): Document;
-}
-
-interface GlobalEventHandlers {
-    onpointercancel: (ev: PointerEvent) => any;
-    onpointerdown: (ev: PointerEvent) => any;
-    onpointerenter: (ev: PointerEvent) => any;
-    onpointerleave: (ev: PointerEvent) => any;
-    onpointermove: (ev: PointerEvent) => any;
-    onpointerout: (ev: PointerEvent) => any;
-    onpointerover: (ev: PointerEvent) => any;
-    onpointerup: (ev: PointerEvent) => any;
-    onwheel: (ev: WheelEvent) => any;
-    addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-interface HTMLTableAlignment {
-    /**
-      * Sets or retrieves a value that you can use to implement your own ch functionality for the object.
-      */
-    ch: string;
-    /**
-      * Sets or retrieves a value that you can use to implement your own chOff functionality for the object.
-      */
-    chOff: string;
-    /**
-      * Sets or retrieves how text and other content are vertically aligned within the object that contains them.
-      */
-    vAlign: string;
-}
-
-interface IDBEnvironment {
-    indexedDB: IDBFactory;
-    msIndexedDB: IDBFactory;
-}
-
-interface LinkStyle {
-    sheet: StyleSheet;
-}
-
-interface MSBaseReader {
-    onabort: (ev: Event) => any;
-    onerror: (ev: Event) => any;
-    onload: (ev: Event) => any;
-    onloadend: (ev: ProgressEvent) => any;
-    onloadstart: (ev: Event) => any;
-    onprogress: (ev: ProgressEvent) => any;
-    readyState: number;
-    result: any;
-    abort(): void;
-    DONE: number;
-    EMPTY: number;
-    LOADING: number;
-    addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadend", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-interface MSFileSaver {
-    msSaveBlob(blob: any, defaultName?: string): boolean;
-    msSaveOrOpenBlob(blob: any, defaultName?: string): boolean;
-}
-
-interface MSNavigatorDoNotTrack {
-    confirmSiteSpecificTrackingException(args: ConfirmSiteSpecificExceptionsInformation): boolean;
-    confirmWebWideTrackingException(args: ExceptionInformation): boolean;
-    removeSiteSpecificTrackingException(args: ExceptionInformation): void;
-    removeWebWideTrackingException(args: ExceptionInformation): void;
-    storeSiteSpecificTrackingException(args: StoreSiteSpecificExceptionsInformation): void;
-    storeWebWideTrackingException(args: StoreExceptionsInformation): void;
-}
-
-interface NavigatorContentUtils {
-}
-
-interface NavigatorGeolocation {
-    geolocation: Geolocation;
-}
-
-interface NavigatorID {
-    appName: string;
-    appVersion: string;
-    platform: string;
-    product: string;
-    productSub: string;
-    userAgent: string;
-    vendor: string;
-    vendorSub: string;
-}
-
-interface NavigatorOnLine {
-    onLine: boolean;
-}
-
-interface NavigatorStorageUtils {
-}
-
-interface NodeSelector {
-    querySelector(selectors: string): Element;
-    querySelectorAll(selectors: string): NodeListOf<Element>;
-}
-
-interface RandomSource {
-    getRandomValues(array: ArrayBufferView): ArrayBufferView;
-}
-
-interface SVGAnimatedPathData {
-    pathSegList: SVGPathSegList;
-}
-
-interface SVGAnimatedPoints {
-    animatedPoints: SVGPointList;
-    points: SVGPointList;
-}
-
-interface SVGExternalResourcesRequired {
-    externalResourcesRequired: SVGAnimatedBoolean;
-}
-
-interface SVGFilterPrimitiveStandardAttributes extends SVGStylable {
-    height: SVGAnimatedLength;
-    result: SVGAnimatedString;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
-}
-
-interface SVGFitToViewBox {
-    preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
-    viewBox: SVGAnimatedRect;
-}
-
-interface SVGLangSpace {
-    xmllang: string;
-    xmlspace: string;
-}
-
-interface SVGLocatable {
-    farthestViewportElement: SVGElement;
-    nearestViewportElement: SVGElement;
-    getBBox(): SVGRect;
-    getCTM(): SVGMatrix;
-    getScreenCTM(): SVGMatrix;
-    getTransformToElement(element: SVGElement): SVGMatrix;
-}
-
-interface SVGStylable {
-    className: any;
-    style: CSSStyleDeclaration;
-}
-
-interface SVGTests {
-    requiredExtensions: SVGStringList;
-    requiredFeatures: SVGStringList;
-    systemLanguage: SVGStringList;
-    hasExtension(extension: string): boolean;
-}
-
-interface SVGTransformable extends SVGLocatable {
-    transform: SVGAnimatedTransformList;
-}
-
-interface SVGURIReference {
-    href: SVGAnimatedString;
-}
-
-interface WindowBase64 {
-    atob(encodedString: string): string;
-    btoa(rawString: string): string;
-}
-
-interface WindowConsole {
-    console: Console;
-}
-
-interface WindowLocalStorage {
-    localStorage: Storage;
-}
-
-interface WindowSessionStorage {
-    sessionStorage: Storage;
-}
-
-interface WindowTimers extends Object, WindowTimersExtension {
-    clearInterval(handle: number): void;
-    clearTimeout(handle: number): void;
-    setInterval(handler: any, timeout?: any, ...args: any[]): number;
-    setTimeout(handler: any, timeout?: any, ...args: any[]): number;
-}
-
-interface WindowTimersExtension {
-    clearImmediate(handle: number): void;
-    msClearImmediate(handle: number): void;
-    msSetImmediate(expression: any, ...args: any[]): number;
-    setImmediate(expression: any, ...args: any[]): number;
-}
-
-interface XMLHttpRequestEventTarget {
-    onabort: (ev: Event) => any;
-    onerror: (ev: Event) => any;
-    onload: (ev: Event) => any;
-    onloadend: (ev: ProgressEvent) => any;
-    onloadstart: (ev: Event) => any;
-    onprogress: (ev: ProgressEvent) => any;
-    ontimeout: (ev: ProgressEvent) => any;
-    addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadend", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeout", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-interface NodeListOf<TNode extends Node> extends NodeList {
-    length: number;
-    item(index: number): TNode;
-    [index: number]: TNode;
-}
-
-interface BlobPropertyBag {
-    type?: string;
-    endings?: string;
-}
-
-interface FilePropertyBag {
-    type?: string;
-    lastModified?: number;
-}
-
-interface EventListenerObject {
-    handleEvent(evt: Event): void;
-}
-
-interface MessageEventInit extends EventInit {
-    data?: any;
-    origin?: string;
-    lastEventId?: string;
-    channel?: string;
-    source?: any;
-    ports?: MessagePort[];
-}
-
-interface ProgressEventInit extends EventInit {
-    lengthComputable?: boolean;
-    loaded?: number;
-    total?: number;
-}
-
-declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
-
-interface ErrorEventHandler {
-    (message: string, filename?: string, lineno?: number, colno?: number, error?:Error): void;
-}
-interface PositionCallback {
-    (position: Position): void;
-}
-interface PositionErrorCallback {
-    (error: PositionError): void;
-}
-interface MediaQueryListListener {
-    (mql: MediaQueryList): void;
-}
-interface MSLaunchUriCallback {
-    (): void;
-}
-interface FrameRequestCallback {
-    (time: number): void;
-}
-interface MSUnsafeFunctionCallback {
-    (): any;
-}
-interface MSExecAtPriorityFunctionCallback {
-    (...args: any[]): any;
-}
-interface MutationCallback {
-    (mutations: MutationRecord[], observer: MutationObserver): void;
-}
-interface DecodeSuccessCallback {
-    (decodedData: AudioBuffer): void;
-}
-interface DecodeErrorCallback {
-    (): void;
-}
-interface FunctionStringCallback {
-    (data: string): void;
-}
-declare var Audio: {new(src?: string): HTMLAudioElement; };
-declare var Image: {new(width?: number, height?: number): HTMLImageElement; };
-declare var Option: {new(text?: string, value?: string, defaultSelected?: boolean, selected?: boolean): HTMLOptionElement; };
-declare var animationStartTime: number;
-declare var applicationCache: ApplicationCache;
-declare var clientInformation: Navigator;
-declare var closed: boolean;
-declare var crypto: Crypto;
-declare var defaultStatus: string;
-declare var devicePixelRatio: number;
-declare var doNotTrack: string;
-declare var document: Document;
-declare var event: Event;
-declare var external: External;
-declare var frameElement: Element;
-declare var frames: Window;
-declare var history: History;
-declare var innerHeight: number;
-declare var innerWidth: number;
-declare var length: number;
-declare var location: Location;
-declare var locationbar: BarProp;
-declare var menubar: BarProp;
-declare var msAnimationStartTime: number;
-declare var name: string;
-declare var navigator: Navigator;
-declare var offscreenBuffering: string | boolean;
-declare var onabort: (ev: Event) => any;
-declare var onafterprint: (ev: Event) => any;
-declare var onbeforeprint: (ev: Event) => any;
-declare var onbeforeunload: (ev: BeforeUnloadEvent) => any;
-declare var onblur: (ev: FocusEvent) => any;
-declare var oncanplay: (ev: Event) => any;
-declare var oncanplaythrough: (ev: Event) => any;
-declare var onchange: (ev: Event) => any;
-declare var onclick: (ev: MouseEvent) => any;
-declare var oncompassneedscalibration: (ev: Event) => any;
-declare var oncontextmenu: (ev: PointerEvent) => any;
-declare var ondblclick: (ev: MouseEvent) => any;
-declare var ondevicemotion: (ev: DeviceMotionEvent) => any;
-declare var ondeviceorientation: (ev: DeviceOrientationEvent) => any;
-declare var ondrag: (ev: DragEvent) => any;
-declare var ondragend: (ev: DragEvent) => any;
-declare var ondragenter: (ev: DragEvent) => any;
-declare var ondragleave: (ev: DragEvent) => any;
-declare var ondragover: (ev: DragEvent) => any;
-declare var ondragstart: (ev: DragEvent) => any;
-declare var ondrop: (ev: DragEvent) => any;
-declare var ondurationchange: (ev: Event) => any;
-declare var onemptied: (ev: Event) => any;
-declare var onended: (ev: Event) => any;
-declare var onerror: ErrorEventHandler;
-declare var onfocus: (ev: FocusEvent) => any;
-declare var onhashchange: (ev: HashChangeEvent) => any;
-declare var oninput: (ev: Event) => any;
-declare var onkeydown: (ev: KeyboardEvent) => any;
-declare var onkeypress: (ev: KeyboardEvent) => any;
-declare var onkeyup: (ev: KeyboardEvent) => any;
-declare var onload: (ev: Event) => any;
-declare var onloadeddata: (ev: Event) => any;
-declare var onloadedmetadata: (ev: Event) => any;
-declare var onloadstart: (ev: Event) => any;
-declare var onmessage: (ev: MessageEvent) => any;
-declare var onmousedown: (ev: MouseEvent) => any;
-declare var onmouseenter: (ev: MouseEvent) => any;
-declare var onmouseleave: (ev: MouseEvent) => any;
-declare var onmousemove: (ev: MouseEvent) => any;
-declare var onmouseout: (ev: MouseEvent) => any;
-declare var onmouseover: (ev: MouseEvent) => any;
-declare var onmouseup: (ev: MouseEvent) => any;
-declare var onmousewheel: (ev: MouseWheelEvent) => any;
-declare var onmsgesturechange: (ev: MSGestureEvent) => any;
-declare var onmsgesturedoubletap: (ev: MSGestureEvent) => any;
-declare var onmsgestureend: (ev: MSGestureEvent) => any;
-declare var onmsgesturehold: (ev: MSGestureEvent) => any;
-declare var onmsgesturestart: (ev: MSGestureEvent) => any;
-declare var onmsgesturetap: (ev: MSGestureEvent) => any;
-declare var onmsinertiastart: (ev: MSGestureEvent) => any;
-declare var onmspointercancel: (ev: MSPointerEvent) => any;
-declare var onmspointerdown: (ev: MSPointerEvent) => any;
-declare var onmspointerenter: (ev: MSPointerEvent) => any;
-declare var onmspointerleave: (ev: MSPointerEvent) => any;
-declare var onmspointermove: (ev: MSPointerEvent) => any;
-declare var onmspointerout: (ev: MSPointerEvent) => any;
-declare var onmspointerover: (ev: MSPointerEvent) => any;
-declare var onmspointerup: (ev: MSPointerEvent) => any;
-declare var onoffline: (ev: Event) => any;
-declare var ononline: (ev: Event) => any;
-declare var onorientationchange: (ev: Event) => any;
-declare var onpagehide: (ev: PageTransitionEvent) => any;
-declare var onpageshow: (ev: PageTransitionEvent) => any;
-declare var onpause: (ev: Event) => any;
-declare var onplay: (ev: Event) => any;
-declare var onplaying: (ev: Event) => any;
-declare var onpopstate: (ev: PopStateEvent) => any;
-declare var onprogress: (ev: ProgressEvent) => any;
-declare var onratechange: (ev: Event) => any;
-declare var onreadystatechange: (ev: ProgressEvent) => any;
-declare var onreset: (ev: Event) => any;
-declare var onresize: (ev: UIEvent) => any;
-declare var onscroll: (ev: UIEvent) => any;
-declare var onseeked: (ev: Event) => any;
-declare var onseeking: (ev: Event) => any;
-declare var onselect: (ev: UIEvent) => any;
-declare var onstalled: (ev: Event) => any;
-declare var onstorage: (ev: StorageEvent) => any;
-declare var onsubmit: (ev: Event) => any;
-declare var onsuspend: (ev: Event) => any;
-declare var ontimeupdate: (ev: Event) => any;
-declare var ontouchcancel: any;
-declare var ontouchend: any;
-declare var ontouchmove: any;
-declare var ontouchstart: any;
-declare var onunload: (ev: Event) => any;
-declare var onvolumechange: (ev: Event) => any;
-declare var onwaiting: (ev: Event) => any;
-declare var opener: Window;
-declare var orientation: string | number;
-declare var outerHeight: number;
-declare var outerWidth: number;
-declare var pageXOffset: number;
-declare var pageYOffset: number;
-declare var parent: Window;
-declare var performance: Performance;
-declare var personalbar: BarProp;
-declare var screen: Screen;
-declare var screenLeft: number;
-declare var screenTop: number;
-declare var screenX: number;
-declare var screenY: number;
-declare var scrollX: number;
-declare var scrollY: number;
-declare var scrollbars: BarProp;
-declare var self: Window;
-declare var status: string;
-declare var statusbar: BarProp;
-declare var styleMedia: StyleMedia;
-declare var toolbar: BarProp;
-declare var top: Window;
-declare var window: Window;
-declare var URL: URL;
-declare function alert(message?: any): void;
-declare function blur(): void;
-declare function cancelAnimationFrame(handle: number): void;
-declare function captureEvents(): void;
-declare function close(): void;
-declare function confirm(message?: string): boolean;
-declare function focus(): void;
-declare function getComputedStyle(elt: Element, pseudoElt?: string): CSSStyleDeclaration;
-declare function getMatchedCSSRules(elt: Element, pseudoElt?: string): CSSRuleList;
-declare function getSelection(): Selection;
-declare function matchMedia(mediaQuery: string): MediaQueryList;
-declare function moveBy(x?: number, y?: number): void;
-declare function moveTo(x?: number, y?: number): void;
-declare function msCancelRequestAnimationFrame(handle: number): void;
-declare function msMatchMedia(mediaQuery: string): MediaQueryList;
-declare function msRequestAnimationFrame(callback: FrameRequestCallback): number;
-declare function msWriteProfilerMark(profilerMarkName: string): void;
-declare function open(url?: string, target?: string, features?: string, replace?: boolean): any;
-declare function postMessage(message: any, targetOrigin: string, ports?: any): void;
-declare function print(): void;
-declare function prompt(message?: string, _default?: string): string;
-declare function releaseEvents(): void;
-declare function requestAnimationFrame(callback: FrameRequestCallback): number;
-declare function resizeBy(x?: number, y?: number): void;
-declare function resizeTo(x?: number, y?: number): void;
-declare function scroll(x?: number, y?: number): void;
-declare function scrollBy(x?: number, y?: number): void;
-declare function scrollTo(x?: number, y?: number): void;
-declare function webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
-declare function webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
-declare function toString(): string;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-declare function dispatchEvent(evt: Event): boolean;
-declare function removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-declare function clearInterval(handle: number): void;
-declare function clearTimeout(handle: number): void;
-declare function setInterval(handler: any, timeout?: any, ...args: any[]): number;
-declare function setTimeout(handler: any, timeout?: any, ...args: any[]): number;
-declare function clearImmediate(handle: number): void;
-declare function msClearImmediate(handle: number): void;
-declare function msSetImmediate(expression: any, ...args: any[]): number;
-declare function setImmediate(expression: any, ...args: any[]): number;
-declare var sessionStorage: Storage;
-declare var localStorage: Storage;
-declare var console: Console;
-declare var onpointercancel: (ev: PointerEvent) => any;
-declare var onpointerdown: (ev: PointerEvent) => any;
-declare var onpointerenter: (ev: PointerEvent) => any;
-declare var onpointerleave: (ev: PointerEvent) => any;
-declare var onpointermove: (ev: PointerEvent) => any;
-declare var onpointerout: (ev: PointerEvent) => any;
-declare var onpointerover: (ev: PointerEvent) => any;
-declare var onpointerup: (ev: PointerEvent) => any;
-declare var onwheel: (ev: WheelEvent) => any;
-declare var indexedDB: IDBFactory;
-declare var msIndexedDB: IDBFactory;
-declare function atob(encodedString: string): string;
-declare function btoa(rawString: string): string;
-declare function addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "afterprint", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "compassneedscalibration", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "devicemotion", listener: (ev: DeviceMotionEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "deviceorientation", listener: (ev: DeviceOrientationEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "popstate", listener: (ev: PopStateEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "readystatechange", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "resize", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "storage", listener: (ev: StorageEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "unload", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-/////////////////////////////
-/// WorkerGlobalScope APIs
-/////////////////////////////
-// These are only available in a Web Worker
-declare function importScripts(...urls: string[]): void;
-
-
-/////////////////////////////
-/// Windows Script Host APIS
-/////////////////////////////
-
-
-interface ActiveXObject {
-    new (s: string): any;
-}
-declare var ActiveXObject: ActiveXObject;
-
-interface ITextWriter {
-    Write(s: string): void;
-    WriteLine(s: string): void;
-    Close(): void;
-}
-
-interface TextStreamBase {
-    /**
-     * The column number of the current character position in an input stream.
-     */
-    Column: number;
-
-    /**
-     * The current line number in an input stream.
-     */
-    Line: number;
-
-    /**
-     * Closes a text stream.
-     * It is not necessary to close standard streams; they close automatically when the process ends. If
-     * you close a standard stream, be aware that any other pointers to that standard stream become invalid.
-     */
-    Close(): void;
-}
-
-interface TextStreamWriter extends TextStreamBase {
-    /**
-     * Sends a string to an output stream.
-     */
-    Write(s: string): void;
-
-    /**
-     * Sends a specified number of blank lines (newline characters) to an output stream.
-     */
-    WriteBlankLines(intLines: number): void;
-
-    /**
-     * Sends a string followed by a newline character to an output stream.
-     */
-    WriteLine(s: string): void;
-}
-
-interface TextStreamReader extends TextStreamBase {
-    /**
-     * Returns a specified number of characters from an input stream, starting at the current pointer position.
-     * Does not return until the ENTER key is pressed.
-     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
-     */
-    Read(characters: number): string;
-
-    /**
-     * Returns all characters from an input stream.
-     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
-     */
-    ReadAll(): string;
-
-    /**
-     * Returns an entire line from an input stream.
-     * Although this method extracts the newline character, it does not add it to the returned string.
-     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
-     */
-    ReadLine(): string;
-
-    /**
-     * Skips a specified number of characters when reading from an input text stream.
-     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
-     * @param characters Positive number of characters to skip forward. (Backward skipping is not supported.)
-     */
-    Skip(characters: number): void;
-
-    /**
-     * Skips the next line when reading from an input text stream.
-     * Can only be used on a stream in reading mode, not writing or appending mode.
-     */
-    SkipLine(): void;
-
-    /**
-     * Indicates whether the stream pointer position is at the end of a line.
-     */
-    AtEndOfLine: boolean;
-
-    /**
-     * Indicates whether the stream pointer position is at the end of a stream.
-     */
-    AtEndOfStream: boolean;
-}
-
-declare var WScript: {
-    /**
-    * Outputs text to either a message box (under WScript.exe) or the command console window followed by
-    * a newline (under CScript.exe).
-    */
-    Echo(s: any): void;
-
-    /**
-     * Exposes the write-only error output stream for the current script.
-     * Can be accessed only while using CScript.exe.
-     */
-    StdErr: TextStreamWriter;
-
-    /**
-     * Exposes the write-only output stream for the current script.
-     * Can be accessed only while using CScript.exe.
-     */
-    StdOut: TextStreamWriter;
-    Arguments: { length: number; Item(n: number): string; };
-
-    /**
-     *  The full path of the currently running script.
-     */
-    ScriptFullName: string;
-
-    /**
-     * Forces the script to stop immediately, with an optional exit code.
-     */
-    Quit(exitCode?: number): number;
-
-    /**
-     * The Windows Script Host build version number.
-     */
-    BuildVersion: number;
-
-    /**
-     * Fully qualified path of the host executable.
-     */
-    FullName: string;
-
-    /**
-     * Gets/sets the script mode - interactive(true) or batch(false).
-     */
-    Interactive: boolean;
-
-    /**
-     * The name of the host executable (WScript.exe or CScript.exe).
-     */
-    Name: string;
-
-    /**
-     * Path of the directory containing the host executable.
-     */
-    Path: string;
-
-    /**
-     * The filename of the currently running script.
-     */
-    ScriptName: string;
-
-    /**
-     * Exposes the read-only input stream for the current script.
-     * Can be accessed only while using CScript.exe.
-     */
-    StdIn: TextStreamReader;
-
-    /**
-     * Windows Script Host version
-     */
-    Version: string;
-
-    /**
-     * Connects a COM object's event sources to functions named with a given prefix, in the form prefix_event.
-     */
-    ConnectObject(objEventSource: any, strPrefix: string): void;
-
-    /**
-     * Creates a COM object.
-     * @param strProgiID
-     * @param strPrefix Function names in the form prefix_event will be bound to this object's COM events.
-     */
-    CreateObject(strProgID: string, strPrefix?: string): any;
-
-    /**
-     * Disconnects a COM object from its event sources.
-     */
-    DisconnectObject(obj: any): void;
-
-    /**
-     * Retrieves an existing object with the specified ProgID from memory, or creates a new one from a file.
-     * @param strPathname Fully qualified path to the file containing the object persisted to disk.
-     *                       For objects in memory, pass a zero-length string.
-     * @param strProgID
-     * @param strPrefix Function names in the form prefix_event will be bound to this object's COM events.
-     */
-    GetObject(strPathname: string, strProgID?: string, strPrefix?: string): any;
-
-    /**
-     * Suspends script execution for a specified length of time, then continues execution.
-     * @param intTime Interval (in milliseconds) to suspend script execution.
-     */
-    Sleep(intTime: number): void;
-};
-
-/**
- * Allows enumerating over a COM collection, which may not have indexed item access.
- */
-interface Enumerator<T> {
-    /**
-     * Returns true if the current item is the last one in the collection, or the collection is empty,
-     * or the current item is undefined.
-     */
-    atEnd(): boolean;
-
-    /**
-     * Returns the current item in the collection
-     */
-    item(): T;
-
-    /**
-     * Resets the current item in the collection to the first item. If there are no items in the collection,
-     * the current item is set to undefined.
-     */
-    moveFirst(): void;
-
-    /**
-     * Moves the current item to the next item in the collection. If the enumerator is at the end of
-     * the collection or the collection is empty, the current item is set to undefined.
-     */
-    moveNext(): void;
-}
-
-interface EnumeratorConstructor {
-    new <T>(collection: any): Enumerator<T>;
-    new (collection: any): Enumerator<any>;
-}
-
-declare var Enumerator: EnumeratorConstructor;
-
-/**
- * Enables reading from a COM safe array, which might have an alternate lower bound, or multiple dimensions.
- */
-interface VBArray<T> {
-    /**
-     * Returns the number of dimensions (1-based).
-     */
-    dimensions(): number;
-
-    /**
-     * Takes an index for each dimension in the array, and returns the item at the corresponding location.
-     */
-    getItem(dimension1Index: number, ...dimensionNIndexes: number[]): T;
-
-    /**
-     * Returns the smallest available index for a given dimension.
-     * @param dimension 1-based dimension (defaults to 1)
-     */
-    lbound(dimension?: number): number;
-
-    /**
-     * Returns the largest available index for a given dimension.
-     * @param dimension 1-based dimension (defaults to 1)
-     */
-    ubound(dimension?: number): number;
-
-    /**
-     * Returns a Javascript array with all the elements in the VBArray. If there are multiple dimensions,
-     * each successive dimension is appended to the end of the array.
-     * Example: [[1,2,3],[4,5,6]] becomes [1,2,3,4,5,6]
-     */
-    toArray(): T[];
-}
-
-interface VBArrayConstructor {
-    new <T>(safeArray: any): VBArray<T>;
-    new (safeArray: any): VBArray<any>;
-}
-
-declare var VBArray: VBArrayConstructor;